@mxtommy/kip 1.2.3 → 1.3.0

package/src/app/signalk-delta.service.spec.ts

@@ -1,15 +1,15 @@
-import { TestBed, inject } from '@angular/core/testing';
-
-import { SignalKDeltaService } from './signalk-delta.service';
-
-describe('SignalkDeltaService', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [SignalKDeltaService]
-    });
-  });
-
-  it('should be created', inject([SignalKDeltaService], (service: SignalKDeltaService) => {
-    expect(service).toBeTruthy();
-  }));
-});
+import { TestBed, inject } from '@angular/core/testing';
+
+import { SignalKDeltaService } from './signalk-delta.service';
+
+describe('SignalkDeltaService', () => {
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [SignalKDeltaService]
+    });
+  });
+
+  it('should be created', inject([SignalKDeltaService], (service: SignalKDeltaService) => {
+    expect(service).toBeTruthy();
+  }));
+});

package/src/app/signalk-delta.service.ts

@@ -1,97 +1,97 @@
-import { Injectable } from '@angular/core';
-import { Observable ,  Subject, Subscription } from 'rxjs';
-import { SignalKService } from './signalk.service';
-import { IDeltaMessage } from './signalk-interfaces';
-import { NotificationsService } from './notifications.service';
-import { AppSettingsService } from "./app-settings.service";
-
-
-@Injectable()
-export class SignalKDeltaService {
-
-  signalKRequests = new Subject<IDeltaMessage>();      // requests service subs to this (avoids circular dependency in services)
-
-  constructor(
-    private SignalKService: SignalKService,
-    private notificationsService: NotificationsService,
-    ) { }
-
-  processWebsocketMessage(message: IDeltaMessage) {
-    // Read raw message and route to appropriate sub
-    if (typeof(message.self) != 'undefined') {  // is Hello message
-      this.SignalKService.setSelf(message.self);
-      this.SignalKService.setServerVersion(message.version);
-      return;
-    }
-
-
-    if (typeof(message.updates) != 'undefined') {
-      this.processUpdateDelta(message); // is Data Update process further
-    }
-
-    if (typeof(message.requestId) != 'undefined') {
-      this.signalKRequests.next(message); // is a Request, send to signalk-request service.
-    }
-
-  }
-
-  public processUpdateDelta(message:IDeltaMessage) {
-    let context: string;
-    if (typeof(message.context) == 'undefined') {
-      context = 'self'; //default if not defined
-    } else {
-      context = message.context;
-    }
-
-    // process message Updates
-    for (let update of message.updates) {
-      // get source identifier. 'src' is nmea2k and 'talker' is nmea0183
-      let source = '';
-      if ((update.source !== undefined) && (update.source.type !== undefined) && update.source.label !== undefined) {
-        if (update.source.type == 'NMEA2000') {
-          source = update.source.label + '.' + update.source.src;
-        } else if (update.source.type == 'NMEA0183') {
-          source = update.source.label + '.' + update.source.talker;
-        } else {
-          // donno what it is...
-          source = update.source.label;
-        }
-      } else if (update['$source'] !== undefined) {
-        source = update['$source'];
-      } else if ((update.source !== undefined) && (update.source.src !== undefined) && (update.source.label !== undefined)) {
-        source = update.source.label + '.' + update.source.src;
-      } else if (update.source.label !== undefined) {
-        source = update.source.label;
-      } else {
-        source = "unknown";
-      }
-
-      // process message values
-      let timestamp = Date.parse(update.timestamp); //TODO, supposedly not reliable
-      for (let value of update.values) {
-        if (/^notifications./.test(value.path)) {   // is a notification message, pass to notification service
-          this.notificationsService.processNotificationDelta(value.path, value.value);
-        } else {
-          // it's a data update. Update local tree
-          let fullPath = context + '.' + value.path;
-          if (value.path == '') { fullPath = context; } // if path is empty we shouldn't have a . at the end
-          if ( (typeof(value.value) == 'object') && (value.value !== null)) {
-            // compound data
-            let keys = Object.keys(value.value);
-            for (let i = 0; i < keys.length; i++) {
-              this.SignalKService.updatePathData(fullPath + '.' + keys[i], source, timestamp, value.value[keys[i]]);
-            }
-          } else {
-            // simple data
-            this.SignalKService.updatePathData(fullPath, source, timestamp, value.value);
-          }
-        }
-      }
-    }
-  }
-
-  public subscribeRequest(): Observable<IDeltaMessage> {
-    return this.signalKRequests.asObservable();
-  }
-
- }
+import { Injectable } from '@angular/core';
+import { Observable ,  Subject, Subscription } from 'rxjs';
+import { SignalKService } from './signalk.service';
+import { IDeltaMessage } from './signalk-interfaces';
+import { NotificationsService } from './notifications.service';
+import { AppSettingsService } from "./app-settings.service";
+
+
+@Injectable()
+export class SignalKDeltaService {
+
+  signalKRequests = new Subject<IDeltaMessage>();      // requests service subs to this (avoids circular dependency in services)
+
+  constructor(
+    private SignalKService: SignalKService,
+    private notificationsService: NotificationsService,
+    ) { }
+
+  processWebsocketMessage(message: IDeltaMessage) {
+    // Read raw message and route to appropriate sub
+    if (typeof(message.self) != 'undefined') {  // is Hello message
+      this.SignalKService.setSelf(message.self);
+      this.SignalKService.setServerVersion(message.version);
+      return;
+    }
+
+
+    if (typeof(message.updates) != 'undefined') {
+      this.processUpdateDelta(message); // is Data Update process further
+    }
+
+    if (typeof(message.requestId) != 'undefined') {
+      this.signalKRequests.next(message); // is a Request, send to signalk-request service.
+    }
+
+  }
+
+  public processUpdateDelta(message:IDeltaMessage) {
+    let context: string;
+    if (typeof(message.context) == 'undefined') {
+      context = 'self'; //default if not defined
+    } else {
+      context = message.context;
+    }
+
+    // process message Updates
+    for (let update of message.updates) {
+      // get source identifier. 'src' is nmea2k and 'talker' is nmea0183
+      let source = '';
+      if ((update.source !== undefined) && (update.source.type !== undefined) && update.source.label !== undefined) {
+        if (update.source.type == 'NMEA2000') {
+          source = update.source.label + '.' + update.source.src;
+        } else if (update.source.type == 'NMEA0183') {
+          source = update.source.label + '.' + update.source.talker;
+        } else {
+          // donno what it is...
+          source = update.source.label;
+        }
+      } else if (update['$source'] !== undefined) {
+        source = update['$source'];
+      } else if ((update.source !== undefined) && (update.source.src !== undefined) && (update.source.label !== undefined)) {
+        source = update.source.label + '.' + update.source.src;
+      } else if (update.source.label !== undefined) {
+        source = update.source.label;
+      } else {
+        source = "unknown";
+      }
+
+      // process message values
+      let timestamp = Date.parse(update.timestamp); //TODO, supposedly not reliable
+      for (let value of update.values) {
+        if (/^notifications./.test(value.path)) {   // is a notification message, pass to notification service
+          this.notificationsService.processNotificationDelta(value.path, value.value);
+        } else {
+          // it's a data update. Update local tree
+          let fullPath = context + '.' + value.path;
+          if (value.path == '') { fullPath = context; } // if path is empty we shouldn't have a . at the end
+          if ( (typeof(value.value) == 'object') && (value.value !== null)) {
+            // compound data
+            let keys = Object.keys(value.value);
+            for (let i = 0; i < keys.length; i++) {
+              this.SignalKService.updatePathData(fullPath + '.' + keys[i], source, timestamp, value.value[keys[i]]);
+            }
+          } else {
+            // simple data
+            this.SignalKService.updatePathData(fullPath, source, timestamp, value.value);
+          }
+        }
+      }
+    }
+  }
+
+  public subscribeRequest(): Observable<IDeltaMessage> {
+    return this.signalKRequests.asObservable();
+  }
+
+ }

package/src/app/signalk-full.service.ts

@@ -1,99 +1,99 @@
-import { Injectable } from '@angular/core';
-
-import { SignalKService } from './signalk.service';
-
-@Injectable()
-export class SignalKFullService {
-
-  constructor(private SignalKService: SignalKService,) { }
-
-
-  processFullUpdate(data) {
-
-    //set self urn
-    this.SignalKService.setSelf(data.self)
-
-    // set Sources
-    //this.SignalKService.setDataFull(data);
-
-    // so we will walk the array recusively
-    this.findKeys(data);
-  }
-
-  findKeys(data, currentPath: string[] = []) {
-    let path = currentPath.join('.');
-
-    if (data === null) { //notifications don't have timestamp... hmmm TODO get notif into tree...
-      return;
-    }
-    if (path == 'sources') { return; } // ignore the sources tree
-    
-    if ( (typeof(data) == 'string') || (typeof(data) == 'number') || (typeof(data) == 'boolean')) {  // is it a simple value?
-      let timestamp = Date.now();
-      let source = 'noSource'
-      this.SignalKService.updatePathData(path, source, timestamp, data);
-      this.SignalKService.setDefaultSource(path, source);
-      return;
-    }     
-    else if ('timestamp' in data) { // is it a timestamped value?
-
-      // try and get source
-      let source: string;
-      if (typeof(data['$source']) == 'string') {
-        source = data['$source'];
-      } else if (typeof(data['source']) == 'object') {
-        source = data['source']['label'];
-      } else {
-        source = 'noSource';
-      }
-      
-      let timestamp = Date.parse(data.timestamp);
-
-
-      // is it a normal value, or a compound value?
-      if ('value' in data) {
-        if (typeof(data['value']) == 'object' && (data['value'] !== null)) {
-          // compound
-          Object.keys(data['value']).forEach(key => {
-            let compoundPath = path+"."+key;
-            this.SignalKService.updatePathData(compoundPath, source, timestamp, data.value[key]);
-            this.SignalKService.setDefaultSource(compoundPath, source);       
-            // try and get metadata.
-            if (typeof(data['meta']) == 'object') {
-              //does meta have one with properties for each one?
-              if (typeof(data.meta['properties']) == 'object' && typeof(data.meta.properties[key]) == 'object') {
-                this.SignalKService.setMeta(compoundPath, data.meta.properties[key]);
-              } else {
-                this.SignalKService.setMeta(compoundPath, data['meta']);
-              }
-            }
-          });
-        } else {
-          //simple
-          this.SignalKService.updatePathData(path, source, timestamp, data.value);
-          this.SignalKService.setDefaultSource(path, source);
-          // try and get metadata.
-          if (typeof(data['meta']) == 'object') {
-            this.SignalKService.setMeta(path, data['meta']);
-          } 
-        }
-      }
-
-      return;
-    }
-    
-    // it's not a value, dig deaper
-    else {
-      // process children
-      let keys = Object.keys(data);
-      let len = keys.length;
-      for (let i = 0; i < len; i += 1) {
-        let newPath = currentPath.slice();
-        newPath.push(keys[i])
-        this.findKeys(data[keys[i]], newPath);
-      }
-    }
-  }
- 
-
-}
+import { Injectable } from '@angular/core';
+
+import { SignalKService } from './signalk.service';
+
+@Injectable()
+export class SignalKFullService {
+
+  constructor(private SignalKService: SignalKService,) { }
+
+
+  processFullUpdate(data) {
+
+    //set self urn
+    this.SignalKService.setSelf(data.self)
+
+    // set Sources
+    //this.SignalKService.setDataFull(data);
+
+    // so we will walk the array recusively
+    this.findKeys(data);
+  }
+
+  findKeys(data, currentPath: string[] = []) {
+    let path = currentPath.join('.');
+
+    if (data === null) { //notifications don't have timestamp... hmmm TODO get notif into tree...
+      return;
+    }
+    if (path == 'sources') { return; } // ignore the sources tree
+    
+    if ( (typeof(data) == 'string') || (typeof(data) == 'number') || (typeof(data) == 'boolean')) {  // is it a simple value?
+      let timestamp = Date.now();
+      let source = 'noSource'
+      this.SignalKService.updatePathData(path, source, timestamp, data);
+      this.SignalKService.setDefaultSource(path, source);
+      return;
+    }     
+    else if ('timestamp' in data) { // is it a timestamped value?
+
+      // try and get source
+      let source: string;
+      if (typeof(data['$source']) == 'string') {
+        source = data['$source'];
+      } else if (typeof(data['source']) == 'object') {
+        source = data['source']['label'];
+      } else {
+        source = 'noSource';
+      }
+      
+      let timestamp = Date.parse(data.timestamp);
+
+
+      // is it a normal value, or a compound value?
+      if ('value' in data) {
+        if (typeof(data['value']) == 'object' && (data['value'] !== null)) {
+          // compound
+          Object.keys(data['value']).forEach(key => {
+            let compoundPath = path+"."+key;
+            this.SignalKService.updatePathData(compoundPath, source, timestamp, data.value[key]);
+            this.SignalKService.setDefaultSource(compoundPath, source);       
+            // try and get metadata.
+            if (typeof(data['meta']) == 'object') {
+              //does meta have one with properties for each one?
+              if (typeof(data.meta['properties']) == 'object' && typeof(data.meta.properties[key]) == 'object') {
+                this.SignalKService.setMeta(compoundPath, data.meta.properties[key]);
+              } else {
+                this.SignalKService.setMeta(compoundPath, data['meta']);
+              }
+            }
+          });
+        } else {
+          //simple
+          this.SignalKService.updatePathData(path, source, timestamp, data.value);
+          this.SignalKService.setDefaultSource(path, source);
+          // try and get metadata.
+          if (typeof(data['meta']) == 'object') {
+            this.SignalKService.setMeta(path, data['meta']);
+          } 
+        }
+      }
+
+      return;
+    }
+    
+    // it's not a value, dig deaper
+    else {
+      // process children
+      let keys = Object.keys(data);
+      let len = keys.length;
+      for (let i = 0; i < len; i += 1) {
+        let newPath = currentPath.slice();
+        newPath.push(keys[i])
+        this.findKeys(data[keys[i]], newPath);
+      }
+    }
+  }
+ 
+
+}