Skip to content

Commit 786c629

Browse files
author
Peter Di Pasquale
committed
Updated EVR Module and Level Stream filters to always use uppercase for internal consistency
1 parent e8959d0 commit 786c629

3 files changed

Lines changed: 16 additions & 8 deletions

File tree

src/realtime/MCWSEVRLevelStreamProvider.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class MCWSEVRLevelStreamProvider extends MCWSStreamProvider {
3131
* @returns {String} The key
3232
*/
3333
getKey(domainObject) {
34-
return domainObject.telemetry.level;
34+
return domainObject.telemetry.level.toUpperCase();
3535
}
3636
}
3737

src/realtime/MCWSEVRStreamProvider.js

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,27 @@ class MCWSEVRStreamProvider extends MCWSStreamProvider {
3232
*/
3333
getKey(domainObject) {
3434
// Can subscribe only by EVR module even if subscribing by EVR
35+
// This is the default cause for EVRs that contain a module.
3536
let module = domainObject.telemetry
3637
&& domainObject.telemetry.definition
3738
&& domainObject.telemetry.definition.module
38-
&& domainObject.telemetry.definition.module.toLowerCase();
39+
&& domainObject.telemetry.definition.module.toUpperCase();
40+
41+
// This is the top-level vista.evrModule object, which contains
42+
// A module definition but not in the definition object.
43+
// This must be captured before an attempt at legacy EVRs is made
44+
// in case the module has underscores in it.
45+
if (!module || module.length <= 0) {
46+
module = domainObject.telemetry
47+
&& domainObject.telemetry.module
48+
&& domainObject.telemetry.module.toUpperCase();
49+
}
3950

4051
// legacy inference of module by evr_name
41-
// if this fallback is used will break on module names containing underscores
52+
// This should *never* occur with modern telemetry dictionaries.
4253
if (!module || module.length <= 0) {
4354
console.warn('Legacy domain objects should not be used anymore!');
44-
module = domainObject.telemetry.evr_name ?
45-
domainObject.telemetry.evr_name.split("_")[0].toLowerCase() :
46-
domainObject.telemetry.module.toLowerCase();
55+
module = domainObject.telemetry.evr_name.split("_")[0].toUpperCase()
4756
}
4857

4958
return module;

src/realtime/MCWSStreamWorkerScript.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,7 @@
194194
const data = JSON.parse(message.data);
195195

196196
data.forEach((datum) => {
197-
const key = datum[property];
198-
197+
const key = datum[property].toUpperCase();
199198
if (subscribers[key] > 0) {
200199
self.postMessage({
201200
url: url,

0 commit comments

Comments
 (0)