@tak-ps/node-cot 2.6.0 → 2.7.0

package/CHANGELOG.md

@@ -10,6 +10,10 @@
 
 ## Version History
 
+### v2.7.0
+
+- :rocket: Improved date parsing in CoT messages created using from_geojson
+
 ### v2.6.0
 
 - :tada: Add support for passing style properties via GeoJSON Properties

package/lib/util.js

@@ -98,9 +98,11 @@ export default class Util {
         if (!start) start = new Date(now).toISOString();
 
         if (!stale) {
-            stale = new Date(now + 20 * 1000).toISOString();
+            stale = new Date(new Date(start).getTime() + 20 * 1000).toISOString();
         } else if (!isNaN(parseInt(stale))) {
-            stale = new Date(now + 20 * 1000).toISOString();
+            stale = new Date(new Date(start).getTime() + stale * 1000).toISOString();
+        } else if (typeof stale === 'string') {
+            stale = new Date(stale).toISOString();
         }
 
         return { time, start, stale };

package/lib/xml.js

@@ -61,10 +61,13 @@ export default class XMLCot {
         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']) {
+        for (const key of ['type', 'how']) {
             if (feature.properties[key]) cot.event._attributes[key] = feature.properties[key];
         }
 
+        const dts = Util.cot_date(feature.properties.time, feature.properties.start, feature.properties.stale);
+        Object.assign(cot.event._attributes, dts);
+
         if (!feature.geometry) throw new Error('Must have Geometry');
         if (!['Point', 'Polygon', 'LineString'].includes(feature.geometry.type)) throw new Error('Unsupported Geoemtry Type');