Update 2.10.0: values jumping between sources

Fixes #420
mxtommy · Jun 4, 2024 · 0562900 · 0562900
1 parent 61cfbd3
commit 0562900
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# V 2.10.1
+## Fixes
+* Values jumping between sources. Fixes #420
 # V 2.10.0
 ## BREAKING CHANGE
 * Requires Signal K v2.8+

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mxtommy/kip",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "description": "An advanced and versatile marine instrumentation package to display Signal K data.",
   "license": "MIT",
   "author": {

diff --git a/src/app/core/services/data.service.ts b/src/app/core/services/data.service.ts
@@ -169,9 +169,9 @@ export class DataService implements OnDestroy {
   }
 
   public subscribePath(path: string, source: string): Observable<IPathUpdate> {
-    const entry = this._pathRegister.find(entry => entry.path == path);
-    if (entry) {
-      return entry.pathDataUpdate$;
+    const matchingPaths = this._pathRegister.find(item => item.path === path && item.source === source);
+    if (matchingPaths) {
+      return matchingPaths.pathDataUpdate$;
     }
 
     let currentValue: string = null;
@@ -301,13 +301,22 @@ export class DataService implements OnDestroy {
     }
 
     // Update path register Subjects with new data
-    const item = this._pathRegister.find(item => item.path == updatePath);
-    if (item) {
-        const pathData: IPathData = {
-          value: pathItem.pathValue,
-          timestamp: new Date(pathItem.pathTimestamp)
-        };
-        item._pathData$.next(pathData);
+    const pathRegisterItems = this._pathRegister.filter(item => item.path === updatePath);
+    if (pathRegisterItems.length) {
+      const pathData: IPathData = {
+        value: pathItem.pathValue,
+        timestamp: new Date(pathItem.pathTimestamp)
+      };
+
+      const defaultSource = pathRegisterItems.find(item => item.source === "default");
+      if (defaultSource) {
+        defaultSource._pathData$.next(pathData);
+      }
+
+      const thisSource = pathRegisterItems.find(item => item.source === dataPath.source);
+      if (thisSource) {
+        thisSource._pathData$.next(pathData);
+      }
     }
 
     // Push full tree if data-browser or Zones component are observing

diff --git a/src/app/widget-config/path-control-config/path-control-config.component.ts b/src/app/widget-config/path-control-config/path-control-config.component.ts
@@ -154,6 +154,9 @@ export class ModalPathControlConfigComponent implements OnInit, OnChanges, OnDes
             this.pathFormGroup.controls['source'].setValue('default', {onlySelf: true});
           }
         }
+        else if (this.pathFormGroup.controls['source'].value != 'default') {
+          this.pathFormGroup.controls['source'].setValue('', {onlySelf: true});
+        }
       } else if (Object.keys(pathObject.sources).length > 1) {
         this.availableSources = Object.keys(pathObject.sources);
         if (this.pathFormGroup.controls['source'].value == 'default') {