Allow generic overrides for geojson

using .icon and .layer
dceejay · Apr 2, 2024 · 246f209 · 246f209
1 parent d1def61
commit 246f209
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ### Change Log for Node-RED Worldmap
 
+ - v4.6.5 - Let geojson allow for generic overrides with .icon and .layer.
  - v4.6.4 - Fix deletion of layers logic to actually fully remove points.
  - v4.6.3 - Fix sending of layer events when not wanted. Issue #262
  - v4.6.2 - Fix multiple use of contextmenu feedback. Issue #259

diff --git a/README.md b/README.md
@@ -13,6 +13,7 @@ Feel free to [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%
 
 ### Updates
 
+- v4.6.5  - Let geojson allow for generic overrides with .icon and .layer.
 - v4.6.4  - Fix deletion of layers logic to actually fully remove points.
 - v4.6.3  - Fix sending of layer events when not wanted. Issue #262
 - v4.6.2  - Fix multiple use of contextmenu feedback. Issue #259

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,12 +1,12 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "4.6.4",
+    "version": "4.6.5",
     "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",
         "cgi": "0.3.1",
         "compression": "^1.7.4",
-        "express": "^4.18.2",
+        "express": "^4.19.2",
         "sockjs": "~0.3.24"
     },
     "bundledDependencies": [

diff --git a/worldmap.js b/worldmap.js
@@ -129,7 +129,7 @@ module.exports = function(RED) {
                     if (node.name) { c.toptitle = node.name; }
                     //console.log("INIT",c)
                     client.write(JSON.stringify({command:c}));
-                    for (var p=0; p<pmtiles.length; p++) {
+                    for (var p=0; p < pmtiles.length; p++) {
                         fs.symlink(RED.settings.userDir+'/'+pmtiles[p], __dirname+'/worldmap/'+pmtiles[p], 'file', (err) => {
                             if (err) {
                                 if (err.code !== "EEXIST") { console.log(err); }
@@ -200,7 +200,6 @@ module.exports = function(RED) {
                 if (msg.payload.ttl && msg.payload.ttl < t) { t = msg.payload.ttl; }
                 allPoints[msg.payload.name].tout = setTimeout( function() { delete allPoints[msg.payload.name] }, t * 1000 );
             }
-
             if (msg?.payload?.command?.map?.delete) {
                 var ddd = msg.payload.command.map.delete;
                 if (!Array.isArray(ddd)) { ddd = [cmd.map.delete]; }
@@ -214,8 +213,8 @@ module.exports = function(RED) {
                     }
                 }
             }
-
         });
+
         node.on("close", function() {
             for (var c in clients) {
                 if (clients.hasOwnProperty(c)) {
@@ -232,6 +231,7 @@ module.exports = function(RED) {
             }
             node.status({});
         });
+
         sockets[node.path].on('connection', callback);
     }
     var WorldMap = function(n) {

diff --git a/worldmap/worldmap.js b/worldmap/worldmap.js
@@ -150,10 +150,10 @@ var handleData = function(data) {
 
         // handle raw geojson type msg
         if (data.hasOwnProperty("type") && data.type.indexOf("Feature") === 0) {
-            if (data.hasOwnProperty('properties') && data.properties.hasOwnProperty('title')) {
-                doGeojson(data.properties.title,data)
+            if (data?.properties?.title) {
+                doGeojson(data.properties.title,data,data?.layer,data?.options,data?.icon) // name, geojson, layer, options, icon
             }
-            else { doGeojson("geojson",data); }
+            else { doGeojson("geojson",data,data?.layer,data?.options,data?.icon); }
         }
         // handle TAK json (from tak-ingest node or fastxml node)
         else if (data.hasOwnProperty("event") && data.event.hasOwnProperty("point")) {
@@ -3084,7 +3084,7 @@ function doCommand(cmd) {
 }
 
 // handle any incoming GEOJSON directly - may style badly
-function doGeojson(n,g,l,o) {  // name, geojson, layer, options
+function doGeojson(n,g,l,o,i) {  // name, geojson, layer, options, icon
     var lay = l ?? g.name ?? "unknown";
     // if (!basemaps[lay]) {
     var opt = { style: function(feature) {
@@ -3132,13 +3132,14 @@ function doGeojson(n,g,l,o) {  // name, geojson, layer, options
                 additionalInformation:feature.properties.modifier,
                 size:25
             });
+            var anc = myMarker.getAnchor();
             if (myMarker.hasOwnProperty("metadata") && myMarker.metadata.hasOwnProperty("echelon")) {
                 var sz = iconSz[myMarker.metadata.echelon];
                 myMarker.setOptions({size:sz});
             }
             myMarker = L.icon({
                 iconUrl: myMarker.toDataURL(),
-                iconAnchor: [myMarker.getAnchor().x, myMarker.getAnchor().y],
+                iconAnchor: [anc.x, anc.y],
                 className: "natoicon",
             });
         }
@@ -3156,7 +3157,7 @@ function doGeojson(n,g,l,o) {  // name, geojson, layer, options
         }
         else {
             myMarker = L.VectorMarkers.icon({
-                icon: feature.properties["marker-symbol"] ?? "circle",
+                icon: feature.properties["marker-symbol"] ?? i ?? "circle",
                 markerColor: (feature.properties["marker-color"] ?? "#910000"),
                 prefix: 'fa',
                 iconColor: 'white'