node-red-contrib-web-worldmap 2.28.0 → 2.28.3

package/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '39 16 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

package/CHANGELOG.md

@@ -1,6 +1,8 @@
 ### Change Log for Node-RED Worldmap
 
- - v2.27.4 - Better Handling of sidc icons in geojson
+ - v2.28.3 - Let button declaration be an array
+ - v2.28.1 - Fix layer command bug for non-core layers. Issue #195
+ - v2.28.0 - Better Handling of sidc icons in geojson
  - v2.27.3 - Try to handle greatcircles crossing antimeridian
  - v2.27.1 - Reload existing markers for late joiners
  - v2.26.1 - Add QTH/Maidenhead option also

package/README.md

@@ -11,7 +11,9 @@ map web page for plotting "things" on.
 
 ### Updates
 
-- v2.27.4 - Better Handling of sidc icons in geojson
+- v2.28.3 - Let button declaration be an array
+- v2.28.1 - Fix layer command bug for non-core layers. Issue #195
+- v2.28.0 - Better Handling of sidc icons in geojson
 - v2.27.3 - Try to handle greatcircles crossing antimeridian
 - v2.27.1 - Reload existing markers for late joiners
 - v2.26.1 - Add QTH/Maidenhead option also
@@ -419,7 +421,7 @@ Optional properties include
  - **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"}}`
  - **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).
+ 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.
  - **contextmenu** - html string to define the right click menu when not on a marker. Defaults to the simple add marker input. Empty string `""` disables this right click.
  - **toptitle** - Words to replace title in title bar (if not in iframe)
  - **toplogo** - URL to logo image for top tile bar (if not in iframe) - ideally 60px by 24px.
@@ -444,6 +446,8 @@ to remove
 
     msg.payload.command = { "button": { "name":"My Fancy Button" } };
 
+Multiple buttons can declared by using an array of button objects.
+
 #### To add a custom popup or contextmenu
 
 You can customise a marker's popup, or context menu (right click), by setting the

package/package.json

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

@@ -733,16 +733,21 @@ map.on('contextmenu', function(e) {
     }
 });
 
+
+// Layer control based on select box rather than radio buttons.
+//var layercontrol = L.control.selectLayers(basemaps, overlays).addTo(map);
+layercontrol = L.control.layers(basemaps, overlays);
+
 // Add all the base layer maps if we are online.
 var addBaseMaps = function(maplist,first) {
     // console.log("MAPS",first,maplist)
-    if (navigator.onLine) {
-        var layerlookup = { OSMG:"OSM grey", OSMC:"OSM", OSMH:"OSM Humanitarian", EsriC:"Esri", EsriS:"Esri Satellite",
-            EsriR:"Esri Relief", EsriT:"Esri Topography", EsriO:"Esri Ocean", EsriDG:"Esri Dark Grey", NatGeo: "National Geographic",
-            UKOS:"UK OS OpenData", OS45:"UK OS 1919-1947", OS00:"UK OS 1900", OpTop:"Open Topo Map",
-            HB:"Hike Bike OSM", ST:"Stamen Topography", SW:"Stamen Watercolor", AN:"AutoNavi (Chinese)"
-        }
+    var layerlookup = { OSMG:"OSM grey", OSMC:"OSM", OSMH:"OSM Humanitarian", EsriC:"Esri", EsriS:"Esri Satellite",
+        EsriR:"Esri Relief", EsriT:"Esri Topography", EsriO:"Esri Ocean", EsriDG:"Esri Dark Grey", NatGeo: "National Geographic",
+        UKOS:"UK OS OpenData", OS45:"UK OS 1919-1947", OS00:"UK OS 1900", OpTop:"Open Topo Map",
+        HB:"Hike Bike OSM", ST:"Stamen Topography", SW:"Stamen Watercolor", AN:"AutoNavi (Chinese)"
+    }
 
+    if (navigator.onLine) {
         // Use this for OSM online maps
         var osmUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
         var osmAttrib='Map data © OpenStreetMap contributors';
@@ -903,18 +908,19 @@ var addBaseMaps = function(maplist,first) {
                 attribution: 'Map tiles by <a href="https://stamen.com">Stamen Design</a>, under <a href="https://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="https://openstreetmap.org">OpenStreetMap</a>, under <a href="https://creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>'
             });
         }
+    }
 
-        if (first) {
-            if (layerlookup[first]) { basemaps[layerlookup[first]].addTo(map); }
-            else { basemaps[first].addTo(map); }
-        }
-        else {
-            basemaps[Object.keys(basemaps)[0]].addTo(map);
-        }
-        if (showLayerMenu) {
-            map.removeControl(layercontrol);
-            layercontrol = L.control.layers(basemaps, overlays).addTo(map);
-        }
+    if (first) {
+        if (layerlookup[first]) { baselayername = layerlookup[first]; }
+        else { basenayername = first; }
+    }
+    else {
+        basenayername = Object.keys(basemaps)[0];
+    }
+    basemaps[baselayername].addTo(map);
+    if (showLayerMenu) {
+        map.removeControl(layercontrol);
+        layercontrol = L.control.layers(basemaps, overlays).addTo(map);
     }
 }
 
@@ -960,7 +966,7 @@ var addOverlays = function(overlist) {
         });
         var changeDrawColour = function(col) {
             drawingColour = col;
-            console.log("COLOR",col)
+            // console.log("COLOR",col)
             drawControl.setDrawingOptions({
                 polyline: { shapeOptions: { color:drawingColour } },
                 circle: { shapeOptions: { color:drawingColour } },
@@ -1111,7 +1117,7 @@ var addOverlays = function(overlist) {
     }
 
     // Add the countries (world-110m) for offline use
-    if (overlist.indexOf("CO")!==-1 || (!navigator.onLine)) {
+    if (overlist.indexOf("CO") !== -1 || !navigator.onLine) {
         var customTopoLayer = L.geoJson(null, {clickable:false, style: {color:"blue", weight:2, fillColor:"#cf6", fillOpacity:0.04}});
         layers["_countries"] = omnivore.topojson('images/world-50m-flat.json',null,customTopoLayer);
         overlays["countries"] = layers["_countries"];
@@ -1196,10 +1202,6 @@ var addOverlays = function(overlist) {
     }
 }
 
-// Layer control based on select box rather than radio buttons.
-//var layercontrol = L.control.selectLayers(basemaps, overlays).addTo(map);
-layercontrol = L.control.layers(basemaps, overlays);
-
 // Add the layers control widget
 if (!inIframe) { layercontrol.addTo(map); }
 else { showLayerMenu = false;}
@@ -2164,19 +2166,22 @@ function doCommand(cmd) {
         }
     }
     if (cmd.hasOwnProperty("button")) {
-        if (cmd.button.icon) {
-            if (!buttons[cmd.button.name]) {
-                buttons[cmd.button.name] = L.easyButton( cmd.button.icon, function() {
-                    ws.send(JSON.stringify({action:"button",name:cmd.button.name}));
-                }, cmd.button.name, { position:cmd.button.position||'topright' }).addTo(map);
+        if (!Array.isArray(cmd.button)) { cmd.button = [cmd.button]; }
+        cmd.button.forEach(function(b) {
+            if (b.icon) {
+                if (!buttons[b.name]) {
+                    buttons[b.name] = L.easyButton( b.icon, function() {
+                        ws.send(JSON.stringify({action:"button", name:b.name}));
+                    }, b.name, { position:b.position||'topright' }).addTo(map);
+                }
             }
-        }
-        else {
-            if (buttons[cmd.button.name]) {
-                buttons[cmd.button.name].removeFrom(map);
-                delete buttons[cmd.button.name];
+            else {
+                if (buttons[b.name]) {
+                    buttons[b.name].removeFrom(map);
+                    delete buttons[b.name];
+                }
             }
-        }
+        })
     }
     if (cmd.hasOwnProperty("contextmenu")) {
         if (typeof cmd.contextmenu === "string") {
@@ -2224,7 +2229,7 @@ function doCommand(cmd) {
     var existsalready = false;
     // Add a new base map layer
     if (cmd.map && cmd.map.hasOwnProperty("name") && cmd.map.name.length>0 && cmd.map.hasOwnProperty("url") && cmd.map.hasOwnProperty("opt")) {
-        console.log("BASE",cmd.map);
+        // console.log("BASE",cmd.map);
         if (basemaps.hasOwnProperty(cmd.map.name)) { existsalready = true; }
         if (cmd.map.hasOwnProperty("wms")) {   // special case for wms
             console.log("New WMS:",cmd.map.name);
@@ -2523,6 +2528,7 @@ function doCommand(cmd) {
         baselayername = cmd.layer;
         basemaps[baselayername].addTo(map);
     }
+    // If set to none then remove the baselayer...
     if (cmd.layer && (cmd.layer === "none")) {
         map.removeLayer(basemaps[baselayername]);
         baselayername = cmd.layer;