node-red-contrib-tak-registration 0.14.0 → 0.15.0

package/tak-registration.html

@@ -159,11 +159,11 @@
     <h3>Sending marker position...</h3>
     <dl class="message-properties">
         <dt>payload <span class="property-type">object</span></dt>
-        <dd>a "standard" <b>node-red worldmap</b> format msg.payload containing `name, lat, lon, SIDC or cottype or aistype,
-            (alt), (speed), (bearing), (layer), (remarks)`, where SIDC is the standard mil 2525C code, eg SFGPU, or cottype is the
+        <dd>a "standard" <b>node-red worldmap</b> format msg.payload containing <code>name, lat, lon, SIDC or cottype or aistype,
+            (alt), (speed), (bearing), (layer), (remarks)</code>, where SIDC is the standard mil 2525C code, eg SFGPU, or cottype is the
             CoT type, eg a-f-g-u, or aistype is the AIS type code, eg 80 for a tanker. The layer will get turned into a hashtag
-            which can then be selected on/off in the TAK app layers control, and any `remarks` will get added to the CoT remarks
-            field.</dd>
+            which can then be selected on/off in the TAK app layers control, and any <code>remarks</code> will get added to the CoT remarks
+            field. You can also set the <code>icon</code> property to specify one of the inbuilt custom icons if you know the magic iconset codes.</dd>
     </dl>
 
     <h3>Updating gateway position...</h3>

package/tak-registration.js

@@ -290,12 +290,14 @@ module.exports = function (RED) {
             else if (typeof msg.payload === "object" && !msg.payload.hasOwnProperty("name") && msg.payload.hasOwnProperty("lat") && msg.payload.hasOwnProperty("lon")) {
                 node.lat = msg.payload.lat;
                 node.lon = msg.payload.lon;
+                if (msg.payload.hasOwnProperty("altft")) { node.alt = parseInt(msg.payload.alt * 0.3048); }
                 if (msg.payload.hasOwnProperty("alt")) { node.alt = parseInt(msg.payload.alt); }
             }
             // Handle a generic worldmap style object
             else if (typeof msg.payload === "object" && msg.payload.hasOwnProperty("name")) {
                 var shapeXML = ``;
                 var linkXML = ``;
+                var userIcon = ``;
                 var d = new Date();
                 var st = d.toISOString();
                 var ttl = ((msg.payload.ttl || 0) * 1000) || 60000;
@@ -303,6 +305,7 @@ module.exports = function (RED) {
                 if (msg.payload.tag) { tag += " " + msg.payload.tag }
                 if (msg.payload.layer) { tag += " #" + msg.payload.layer }
                 else { tag += " #Worldmap"; }
+                if (!msg.payload?.alt && msg.payload?.altft) { msg.payload.alt = msg.payload.altft * 0.3048}
 
                 // Handle simple markers
                 if (msg.payload.hasOwnProperty("lat") && msg.payload.hasOwnProperty("lon")) {
@@ -316,10 +319,15 @@ module.exports = function (RED) {
                             type = s.split('').join('-').replace('s-', 'a-').replace('-p-', '-');
                         }
                     }
-                    if (msg.payload.icon === 'fa-circle fa-fw') {
-                        type = 'b-m-p-s-m';
-                        shapeXML = '<color argb="' + convertWMtoCOTColour(msg.payload.iconColor.replace('#', '')) + '"/>';
-                        shapeXML = shapeXML + '<usericon iconsetpath="COT_MAPPING_SPOTMAP/b-m-p-s-m/-16711681"/>';
+                    if (msg.payload.hasOwnProperty("icon")) {
+                        if (msg.payload.icon === 'fa-circle fa-fw') {
+                            type = 'b-m-p-s-m';
+                            shapeXML = '<color argb="' + convertWMtoCOTColour(msg.payload.iconColor.replace('#', '')) + '"/>';
+                            shapeXML = shapeXML + '<usericon iconsetpath="COT_MAPPING_SPOTMAP/b-m-p-s-m/-16711681"/>';
+                        }
+                        else {
+                            userIcon = `<usericon iconsetpath="${msg.payload.icon}"/>`;
+                        }
                     }
                 }
 
@@ -443,14 +451,15 @@ module.exports = function (RED) {
                 var et = Date.now() + ttl;
                 et = (new Date(et)).toISOString();
 
-                msg.payload = `<event version="2.0" uid="${msg.payload.name}" type="${type}" time="${st}" start="${st}" stale="${et}" how="h-e">
+                msg.payload = `<event version="2.0" uid="NRC-${msg.payload.name}" type="${type}" time="${st}" start="${st}" stale="${et}" how="h-e">
                     <point lat="${msg.payload.lat || 0}" lon="${msg.payload.lon || 0}" hae="${parseInt(msg.payload.alt || invalid)}" le="9999999.0" ce="9999999.0"/>
                     <detail>
-                        <takv device="${os.hostname()}" os="${os.platform()}" platform="NRedTAK" version="${ver}"/>
-                        <track course="${msg.payload.bearing || 9999999.0}" speed="${parseInt(msg.payload.speed) || 0}"/>}
+                        <takv device="${os.hostname()}" os="${os.platform()}" platform="NodeRedTAK" version="${ver}"/>
+                        <track course="${msg.payload.bearing || 9999999.0}" speed="${parseInt(msg.payload.speed) || 0}"/>
                         <contact callsign="${msg.payload.name}"/>
                         ${linkXML}
                         <remarks source="${node.callsign}">${tag}</remarks>
+                        ${userIcon}
                         ${shapeXML}
                     </detail>
                 </event>`

package/node_modules/axios/SECURITY.md

@@ -1,6 +0,0 @@
-# Reporting a Vulnerability
-
-If you discover a security vulnerability in axios please disclose it via [our huntr page](https://huntr.dev/repos/axios/axios/). Bounty eligibility, CVE assignment, response times and past reports are all there.
-
-
-Thank you for improving the security of axios.