@tak-ps/node-cot 2.1.2 → 2.2.0

package/CHANGELOG.md

@@ -10,6 +10,15 @@
 
 ## Version History
 
+### v2.2.0
+
+- :bug: Bugfixes in default values
+- :bug: Ensure `to_geojson` is a function call that doesn't modify underlying message
+
+### v2.1.3
+
+- :bug: Continue squashing a ton of small expectation issues to get an MVP of a point on TAK
+
 ### v2.1.2
 
 - :bug: Parse GeoJSON Point coords into COT

package/index.js

@@ -1,5 +1,3 @@
 import XML from './src/xml.js';
 
-export {
-    XML
-};
+export { XML };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@tak-ps/node-cot",
     "type": "module",
-    "version": "2.1.2",
+    "version": "2.2.0",
     "description": "Lightweight JavaScript library for parsing and manipulating TAK messages",
     "main": "index.js",
     "scripts": {

package/src/util.js

@@ -26,6 +26,21 @@ export default class Util {
         };
     }
 
+    /**
+     * Return an event.display object with as many defaults as possible
+     *
+     * @param {String} [callsign=UNKNOWN] Display Callsign
+     *
+     * @returns {Object}
+     */
+    static cot_event_display(callsign = 'UNKNOWN') {
+        return {
+            contact: {
+                _attributes: { callsign }
+            }
+        };
+    }
+
     /**
      * Generate a random UUID
      *

package/src/xml.js

@@ -40,12 +40,16 @@ export default class XMLCot {
         if (!feature.properties) throw new Error('Feature must have properties');
 
         const cot = {
-            'event': {
-                '_attributes': Util.cot_event_attr(feature.properties.type || 'a-f-G', feature.properties.how || 'm-g'),
-                'point': Util.cot_point()
+            event: {
+                _attributes: Util.cot_event_attr(feature.properties.type || 'a-f-G', feature.properties.how || 'm-g'),
+                point: Util.cot_point(),
+                display: Util.cot_event_display(feature.properties.callsign)
             }
         };
 
+        if (feature.id) cot.event._attributes.uid = feature.id;
+        if (feature.properties.callsign && !feature.id) cot.event._attributes.uid = feature.properties.callsign;
+
         for (const key of ['time', 'start', 'stale', 'type', 'how']) {
             if (feature.properties[key]) cot.event._attributes[key] = feature.properties[key];
         }
@@ -62,19 +66,27 @@ export default class XMLCot {
      * @returns {Object}
      */
     to_geojson() {
+        const raw = JSON.parse(JSON.stringify(this.raw));
+        if (!raw.event.detail) raw.event.detail = {};
+        if (!raw.event.detail.contact) raw.event.detail.contact = {};
+        if (!raw.event.detail.contact._attributes) raw.event.detail.contact._attributes = {};
+
         const geojson = {
-            id: this.raw.event._attributes.uid,
+            id: raw.event._attributes.uid,
             type: 'Feature',
             properties: {
-                time: this.raw.event._attributes.time,
-                start: this.raw.event._attributes.start,
-                stale: this.raw.event._attributes.stale
+                callsign: raw.event.detail.contact._attributes.callsign || 'UNKNOWN',
+                type: raw.event._attributes.type,
+                how: raw.event._attributes.how,
+                time: raw.event._attributes.time,
+                start: raw.event._attributes.start,
+                stale: raw.event._attributes.stale
             },
             geometry: {
                 type: 'Point',
                 coordinates: [
-                    this.raw.event.point._attributes.lon,
-                    this.raw.event.point._attributes.lon
+                    raw.event.point._attributes.lon,
+                    raw.event.point._attributes.lon
                 ]
             }
         };
@@ -94,11 +106,11 @@ export default class XMLCot {
      * @returns {XMLCot}
      */
     static ping() {
-        return {
+        return new XMLCot({
             event: {
                 _attributes: Util.cot_event_attr('t-x-c-t', 'h-g-i-g-o'),
                 point: Util.cot_point()
             }
-        };
+        });
     }
 }