node-red-contrib-web-worldmap 2.21.5 → 2.21.9

package/CHANGELOG.md

@@ -1,6 +1,7 @@
 ### Change Log for Node-RED Worldmap
 
- - v2.21.5 - Fix handling of "old" sjip nav to ship navigat
+ - v2.21.8 - Let SIDC/icon short code be only 4 chars long
+ - v2.21.5 - Fix handling of "old" ship nav to ship navigation
  - v2.21.4 - Fix speed leader length. Add transparentPixels option.
  - v2.21.3 - Add zoom to bounds action. Adjust map layers max zoom levels.
  - v2.21.2 - Expand ship nav to ship navigation.

package/README.md

@@ -11,7 +11,9 @@ map web page for plotting "things" on.
 
 ### Updates
 
-- v2.21.5 - Fix handling of "old" sjip nav to ship navigation
+- v2.21.9 - Unbreak Drawing layer that I must have broken recently
+- v2.21.8 - Let SIDC/icon short code be only 4 chars long
+- v2.21.5 - Fix handling of "old" ship nav to ship navigation
 - v2.21.4 - Fix speed leader length. Add transparentPixels option..
 - v2.21.3 - Add zoom to bounds action. Adjust map layers max zoom levels.
 - v2.21.2 - Expand ship nav to ship navigation.
@@ -28,13 +30,6 @@ map web page for plotting "things" on.
 - v2.16.3 - Ensure polygons can be deleted.
 - v2.16.2 - Better handling of unpacked kmz objects.
 - v2.16.0 - Allow specifying custom base map server.
-- v2.15.8 - Adjust ui check timing for UI worldmap.
-- v2.15.7 - Tidy up geoJson handling a bit more.
-- v2.15.5 - Fix SIDC icons to accept unicoded icons as labels.
-- v2.15.4 - Let clear heatmap command do what it says.
-- v2.15.3 - Fix panit command to work, try to use alt units, popup alignments.
-- v2.15.0 - Let speed be text and specify units if required (kt,kn,knots,mph,kmh,kph) default m/s.
-- v2.14.0 - Let geojson features be clickable if added as overlay.
 
 - see [CHANGELOG](https://github.com/dceejay/RedMap/blob/master/CHANGELOG.md) for full list of changes.
 
@@ -463,6 +458,13 @@ Or with an input box
         contextmenu: '<input name="slide1" type="range" min="1" max="100" value="50" onchange=\'feedback(this.name,this.value,"myEventName")\' >'
     }
 
+Example simple form
+
+```
+[{"id":"7351100bacb1f5fe","type":"function","z":"4aa2ed2fd1b11362","name":"","func":"msg.payload = { command: {\ncontextmenu: String.raw`\nText <input type=\"text\" id=\"sometext\" value=\"hello\"><br/>\nNumber <input type=\"number\" id=\"somenum\" value=\"5\"><br/>\n<input type=\"button\" value=\"Send\" onclick=\n'feedback(\"myform\",{\n    \"st\":document.getElementById(\"sometext\").value,\n    \"sn\":document.getElementById(\"somenum\").value,\n})'\n>\n`\n}}\nreturn msg;","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":350,"y":360,"wires":[["a6a82f2e8efc44fc"]]},{"id":"7b595f0c8f6ac710","type":"worldmap in","z":"4aa2ed2fd1b11362","name":"","path":"/worldmap","events":"connect","x":195,"y":360,"wires":[["7351100bacb1f5fe"]]}]
+```
+
+
 See the section on **Utility Functions** for details of the feedback function.
 
 #### To add and remove a legend

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "2.21.5",
+    "version": "2.21.9",
     "description": "A Node-RED node to provide a web page of a world map for plotting things on.",
     "dependencies": {
         "@turf/bezier-spline": "~6.5.0",

package/worldmap/worldmap.js

@@ -28,7 +28,10 @@ var heat;
 var minimap;
 var sidebyside;
 var layercontrol;
+var drawControl;
 var drawingColour = "#910000";
+var sendRoute;
+var sendDrawing;
 
 var iconSz = {
     "Team/Crew": 24,
@@ -653,7 +656,8 @@ map.on('moveend', function() {
 //});
 
 // single right click to add a marker
-var addmenu = "<b>Add marker</b><br><input type='text' id='rinput' autofocus onkeydown='if (event.keyCode == 13) addThing();' placeholder='name (,icon, layer, colour, heading)'/>";
+var addmenu = "<b>Add marker</b><br><input type='text' id='rinput' autofocus onkeydown='if (event.keyCode == 13) addThing();' placeholder='name (,icon/SIDC, layer, colour, heading)'/>";
+if (navigator.onLine) { addmenu += '<br/><a href="https://spatialillusions.com/unitgenerator/" target="_new">MilSymbol SIDC generator</a>'; }
 var rightmenuMap = L.popup({keepInView:true, minWidth:250}).setContent(addmenu);
 
 var rclk = {};
@@ -668,7 +672,7 @@ var addThing = function() {
     var colo = (bits[3] || "#910000").trim();
     var hdg = parseFloat(bits[4] || 0);
     var drag = true;
-    var regi = /^[S,G,E,I,O][A-Z]{4}.*/i;  // if it looks like a SIDC code
+    var regi = /^[S,G,E,I,O][A-Z]{3}.*/i;  // if it looks like a SIDC code
     var d = {action:"point", name:bits[0].trim(), layer:lay, draggable:drag, lat:rclk.lat, lon:rclk.lng, hdg:hdg};
     if (regi.test(icon)) {
         d.SIDC = (icon.toUpperCase()+"------------").substr(0,12);
@@ -929,7 +933,7 @@ var addOverlays = function(overlist) {
         overlays["drawing"] = layers["_drawing"];
         map.options.drawControlTooltips = false;
         var drawCount = 0;
-        var drawControl = new L.Control.Draw({
+        drawControl = new L.Control.Draw({
             draw: {
                 polyline: { shapeOptions: { clickable:true } },
                 marker: false,
@@ -995,7 +999,7 @@ var addOverlays = function(overlist) {
             setTimeout(function() {map.openPopup(rightmenuMarker)},25);
         });
 
-        var sendDrawing = function(n) {
+        sendDrawing = function(n) {
             var thing = document.getElementById('dinput').value;
             map.closePopup();
             shape.m.name = thing;
@@ -1078,7 +1082,7 @@ var addOverlays = function(overlist) {
             return numbers;
         }
 
-        var sendRoute = function(n) {
+        sendRoute = function(n) {
             var p = (polygons[n]._latlngs.map(function(x) {
                 return x.lng+","+x.lat;
             })).join(';');
@@ -1783,8 +1787,9 @@ function setMarker(data) {
         opts.size = opts.size || sz;
         opts.size = opts.size * (opts.scale || 1);
         // escape out any isocodes eg flag symbols
-        var optfields = ["additionalInformation","higherFormation","specialHeadquarters","staffComments","type","uniqueDesignation","speed"];
-        const regex = /\p{Extended_Pictographic}/ug;
+        var optfields = ["additionalInformation","higherFormation","specialHeadquarters","staffComments","type","uniqueDesignation","speed","country"];
+        //const regex = /\p{Extended_Pictographic}/ug;
+        const regex = /(\u00a9|\u00ae|[\u2000-\u3300]|\ud83c[\ud000-\udfff]|\ud83d[\ud000-\udfff]|\ud83e[\ud000-\udfff])/gi;
         optfields.forEach(function (item) {
             if (opts.hasOwnProperty(item) && regex.test(opts[item])) {
                 opts[item] = unescape(encodeURIComponent(opts[item]));

package/worldmap.js

@@ -151,13 +151,11 @@ module.exports = function(RED) {
         var height = config.height;
         if (height == 0) { height = 10; }
         var size = ui.getSizes();
-        var frameWidth = (size.sx +size.cx) * width - size.cx;
-        var frameHeight = (size.sy +size.cy) * height - size.cy;
+        var frameWidth = (size.sx + size.cx) * width - size.cx;
+        var frameHeight = (size.sy + size.cy) * height - size.cy;
         var url = encodeURI(config.path);
         var html = `<style>.nr-dashboard-ui_worldmap{padding:0;}</style><div style="overflow:hidden;">
-<iframe src="${url}" width="${frameWidth}px" height="${frameHeight}px" style="border:none;"></iframe>
-</div>
-`;
+<iframe src="${url}" width="${frameWidth}px" height="${frameHeight}px" style="border:none;"></iframe></div>`;
         return html;
     }
 
@@ -219,7 +217,8 @@ module.exports = function(RED) {
             }
             setImmediate(function() { RED.nodes.registerType("ui_worldmap", UIWorldMap) });
         }
-    }, 250);
+    }, 100);
+
 
     var WorldMapIn = function(n) {
         RED.nodes.createNode(this,n);
@@ -288,6 +287,7 @@ module.exports = function(RED) {
     }
     RED.nodes.registerType("worldmap in",WorldMapIn);
 
+
     var WorldMapTracks = function(n) {
         RED.nodes.createNode(this,n);
         this.depth = parseInt(Number(n.depth) || 20);
@@ -407,6 +407,7 @@ module.exports = function(RED) {
     }
     RED.nodes.registerType("worldmap-tracks",WorldMapTracks);
 
+
     var WorldMapHull = function(n) {
         RED.nodes.createNode(this,n);
         this.prop = n.prop || "layer";