node-red-contrib-web-worldmap 4.8.0 → 4.8.1

package/CHANGELOG.md

@@ -1,6 +1,7 @@
 ### Change Log for Node-RED Worldmap
 
- - v4.8.0 - Merged PR for feedback functioanlity cleanup and example. PR #271 and #272
+ - v4.8.1 - Slight tidy of some of the geojson handling
+ - v4.8.0 - Merged PR for feedback functionality cleanup and example. PR #271 and #272
  - v4.7.0 - Update pmtiles library, fix feedback function inconsistency. Issue #270
  - 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.

package/README.md

@@ -13,7 +13,8 @@ Feel free to [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%
 
 ### Updates
 
-- v4.8.0  - Merged PR for feedback functioanlity cleanup and example. PR #271 and #272
+- v4.8.1  - Slight tidy of some of the geojson handling
+- v4.8.0  - Merged PR for feedback functionality cleanup and example. PR #271 and #272
 - v4.7.0  - Update pmtiles library, fix feedback function inconsistency. Issue #270
 - 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.
@@ -397,7 +398,7 @@ Optional properties for **msg.payload.command** include
  - **panit** - auto pan to the latest marker updated.  - `{"command":{"panit":true}}`
  - **zoomlock** - locks the zoom control to the current value and removes zoom control - `{"command":{"zoomlock":true}}`
  - **hiderightclick** - disables the right click that allows adding or deleting points on the map - `{"command":{"hiderightclick":true}}`
- - **coords** - turns on and off a display of the current mouse co-ordinates. Values can be "deg", "dms", or "none" (default). - `{"command":{"coords":"deg"}}`
+ - **coords** - turns on and off a display of the current mouse co-ordinates. Values can be "deg", "dms", "utm", "mgrs", "qth" or "none" (default). - `{"command":{"coords":"deg"}}` , `{"command":{"coords":"deg,dms,utm"}}`
  - **showruler** - turns on and off a display of the ruler control. Values can be "true" or "false". - `{"command": {"ruler": {"showruler": true}}}`
  - **button** - if supplied with a `name` and `icon` property - adds a button to provide user input - sends
  a msg `{"action":"button", "name":"the_button_name"}` to the worldmap in node. If supplied with a `name` property only, it will remove the button. Optional `position` property can be 'bottomright', 'bottomleft', 'topleft' or 'topright' (default). button can also be an array of button objects.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "4.8.0",
+    "version": "4.8.1",
     "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

@@ -868,7 +868,7 @@ var feedback = function(n,v,a,c) {
 /*
 //  suggest to reove all the special handling for simplification, no reason to send information
 //  about entities that the backend generaed, the need is only to get recognizable actions from the frontend
-//   
+//
     if (v === "_form") { v = form; }
     if (markers[n]) {
         console.log("FB1",n,v,a,c)
@@ -891,7 +891,7 @@ var feedback = function(n,v,a,c) {
         ws.send(JSON.stringify({action:a||"feedback", name:n, value:v, lat:rclk.lat, lon:rclk.lng}));
     }
 */
-	
+
 	const dataToSend = { "name": n, "action": a || "feedback", "value": v || null };
 	ws.send(JSON.stringify(dataToSend));
     if (c === true) { map.closePopup(); }
@@ -2558,11 +2558,11 @@ function doCommand(cmd) {
         try { coords.removeFrom(map); }
         catch(e) {}
         var opts = {gps:false, gpsLong:false, utm:false, utmref:false, position:"bottomleft"}
-        if (cmd.coords == "deg") { opts.gps = true; }
-        if (cmd.coords == "dms") { opts.gpsLong = true; }
-        if (cmd.coords == "utm") { opts.utm = true; }
-        if (cmd.coords == "mgrs") { opts.utmref = true; }
-        if (cmd.coords == "qth") { opts.qth = true; }
+        if (cmd.coords.includes("deg")) { opts.gps = true; }
+        if (cmd.coords.includes("dms")) { opts.gpsLong = true; }
+        if (cmd.coords.includes("utm")) { opts.utm = true; }
+        if (cmd.coords.includes("mgrs")) { opts.utmref = true; }
+        if (cmd.coords.includes("qth")) { opts.qth = true; }
         coords.options = opts;
         coords.addTo(map);
     }
@@ -3111,12 +3111,16 @@ function doGeojson(n,g,l,o,i) {  // name, geojson, layer, options, icon
             st.weight = feature.properties["stroke-width"] ?? st.weight;
             st.fillColor = feature.properties["fill-color"] ?? feature.properties["fill"] ?? st.fillColor;
             st.fillOpacity = feature.properties["fill-opacity"] ?? st.fillOpacity;
+            st.fontColor = feature.properties["font-color"] ?? st.fontColor ?? "#000000";
+            st.fontOpacity = feature.properties["font-opacity"] ?? st.fontOpacity;
             delete feature.properties["stroke"];
             delete feature.properties["stroke-width"];
-            delete feature.properties["fill-color"];
+            delete feature.properties["stroke-opacity"];
             delete feature.properties["fill"];
+            delete feature.properties["fill-color"];
             delete feature.properties["fill-opacity"];
-            delete feature.properties["stroke-opacity"];
+            delete feature.properties["font-color"];
+            delete feature.properties["font-opacity"];
         }
         if (feature.hasOwnProperty("style")) {
             //console.log("GSTYLE", feature.style)
@@ -3141,17 +3145,17 @@ function doGeojson(n,g,l,o,i) {  // name, geojson, layer, options, icon
         }
         if (feature.properties.hasOwnProperty("SIDC")) {
             myMarker = new ms.Symbol( feature.properties.SIDC.toUpperCase(), {
-                uniqueDesignation:unescape(encodeURIComponent(feature.properties.title||feature.properties.unit)),
+                uniqueDesignation:unescape(encodeURIComponent(feature.properties.title||feature.properties.unit||'')),
                 country:feature.properties.country,
                 direction:feature.properties.bearing,
                 additionalInformation:feature.properties.modifier,
-                size:25
+                size:20
             });
             var anc = myMarker.getAnchor();
-            if (myMarker.hasOwnProperty("metadata") && myMarker.metadata.hasOwnProperty("echelon")) {
-                var sz = iconSz[myMarker.metadata.echelon];
-                myMarker.setOptions({size:sz});
-            }
+            // 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: [anc.x, anc.y],
@@ -3178,8 +3182,10 @@ function doGeojson(n,g,l,o,i) {  // name, geojson, layer, options, icon
                 iconColor: 'white'
             });
         }
-        if (!feature.properties.hasOwnProperty("title")) {
-            feature.properties.title = feature.properties["marker-symbol"];
+        if (!feature.properties.hasOwnProperty("title") && feature.properties.hasOwnProperty("marker-symbol")) {
+            if (!feature.properties["marker-symbol"].indexOf('fa-') === 0) {
+                feature.properties.title = feature.properties["marker-symbol"];
+            }
         }
         if (feature.properties.hasOwnProperty("url")) {
             feature.properties.url = "<a target='_new' href='"+feature.properties.url+"'>"+feature.properties.url+"</a>";