signalk-vessels-to-ais 1.3.0 → 1.5.0

package/README.md

@@ -9,6 +9,8 @@ User can configure:
 - Own data can be added to AIS sending
 
 New:
+- v1.5.0, fix: callSign reading 
+- v1.4.0, add: Event output name to user configurable 
 - v1.3.0, add: Navigational Status variations
 - v1.2.2, fix: if own position is not available
 - v1.2.1, fix: own vessel sending

package/index.js

@@ -43,6 +43,7 @@ module.exports = function createPlugin(app) {
   const setStatus = app.setPluginStatus || app.setProviderStatus;
 
   let useTag;
+  let eventName
 
   const httpsAgent = new https.Agent({
     rejectUnauthorized: false,
@@ -52,6 +53,7 @@ module.exports = function createPlugin(app) {
 
   plugin.start = function (options) {
     useTag = options.useTag;
+    eventName = options.eventName;
 
     positionUpdate = options.position_update * 60;
     distance = options.distance;
@@ -149,7 +151,7 @@ module.exports = function createPlugin(app) {
     }
     if (sentence && sentence.length > 0) {
       app.debug(taggString + sentence);
-      app.emit('nmea0183out', taggString + sentence);
+      app.emit(eventName, taggString + sentence);
     }
   }
 
@@ -254,11 +256,7 @@ module.exports = function createPlugin(app) {
               dst = jsonContent[jsonKey].navigation.destination.commonName.value;
             } catch (error) { dst = ''; }
             try {
-              if (i === 0) {
-                callSign = jsonContent[jsonKey].communication.callsignVhf;
-              } else {
-                callSign = jsonContent[jsonKey].communication.value.callsignVhf;
-              }
+              callSign = jsonContent[jsonKey].communication.callsignVhf.value || jsonContent[jsonKey].communication.callsignVhf;                
             } catch (error) { callSign = ''; }
             try {
               imo = (jsonContent[jsonKey].registrations.value.imo).substring(4, 20);
@@ -297,11 +295,6 @@ module.exports = function createPlugin(app) {
 
             if (i === 0) {
               own = true;
-              if (sendOwn) {
-                ais = 'A';
-              } else {
-                ais = '';
-              }
             } else {
               own = false;
             }
@@ -378,7 +371,7 @@ module.exports = function createPlugin(app) {
                 dimD: beam,
               };
 
-              if (aisDelay && (ais === 'A' || ais === 'B')) {
+              if (aisDelay && (ais === 'A' || ais === 'B' || ais === 'BASE')) {
                 // eslint-disable-next-line no-useless-concat
                 app.debug(`Distance range: ${distance}km, AIS target distance: ${dist}km` + `, Class ${ais} Vessel` + `, MMSI:${mmsi}`);
                 if (ais === 'A') {
@@ -387,11 +380,15 @@ module.exports = function createPlugin(app) {
                   aisOut(encMsg5, aisTime);
                 }
                 if (ais === 'B') {
-                  app.debug(`class B, ${i}, time: ${aisTime}`);
+                  app.debug(`class ${ais}, ${i}, time: ${aisTime}`);
                   aisOut(encMsg18, aisTime);
                   aisOut(encMsg240, aisTime);
                   aisOut(encMsg241, aisTime);
                 }
+                if (ais === 'BASE') {
+                  app.debug(`class ${ais}, ${i}, time: ${aisTime}`);
+                  aisOut(encMsg3, aisTime);
+                }
                 app.debug('--------------------------------------------------------');
               }
             }
@@ -444,6 +441,11 @@ module.exports = function createPlugin(app) {
         default: 100,
         title: 'AIS target within range [km]',
       },
+      eventName: {
+        type: 'string',
+        default: 'nmea0183out',
+        title: 'Output event name',
+      },
     },
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "signalk-vessels-to-ais",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "SignalK server plugin to convert other vessel data to NMEA0183 AIS format and forward it out to 3rd party applications",
   "main": "index.js",
   "scripts": {