@tak-ps/node-cot 2.1.3 → 2.2.1

package/CHANGELOG.md

@@ -10,6 +10,15 @@
 
 ## Version History
 
+### v2.2.1
+
+- :bug: `event.display` => `event.detail`
+
+### 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

package/package.json

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

package/src/util.js

@@ -27,13 +27,13 @@ export default class Util {
     }
 
     /**
-     * Return an event.display object with as many defaults as possible
+     * Return an event.detail object with as many defaults as possible
      *
      * @param {String} [callsign=UNKNOWN] Display Callsign
      *
      * @returns {Object}
      */
-    static cot_event_display(callsign = 'UNKNOWN') {
+    static cot_event_detail(callsign = 'UNKNOWN') {
         return {
             contact: {
                 _attributes: { callsign }

package/src/xml.js

@@ -43,7 +43,7 @@ export default class XMLCot {
             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)
+                detail: Util.cot_event_detail(feature.properties.callsign)
             }
         };
 
@@ -66,20 +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: {
-                callsign: this.raw.event.display.contact._attributes.callsign || 'UNKNOWN',
-                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
                 ]
             }
         };
@@ -99,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()
             }
-        };
+        });
     }
 }