node-red-contrib-web-worldmap 4.9.0 → 5.0.1

package/worldmap/worldmap.js

@@ -438,9 +438,9 @@ var Lgrid = L.latlngGraticule({
 // Add small sidc icons around edge of map for things just outside of view
 // This function based heavily on Game Aware code from Måns Beckman
 // Copyright (c) 2013 Måns Beckman, All rights reserved.
-var edgeAware = function() {
+var edgeAware = function () {
+    map.removeLayer(edgeLayer);
     if (!edgeEnabled) { return; }
-    map.removeLayer(edgeLayer)
     edgeLayer = new L.layerGroup();
     var mapBounds = map.getBounds();
     var mapBoundsCenter = mapBounds.getCenter();
@@ -599,6 +599,30 @@ function setCluster(v) {
     showMapCurrentZoom();
 }
 
+var typingTimer;
+document.getElementById('search').addEventListener('keyup', () => {
+    clearTimeout(typingTimer);
+    if (document.getElementById('search').value.length >= 4) {
+        typingTimer = setTimeout(doneTyping, 700);
+    }
+});
+
+function doneTyping () { doSearch(); }
+
+async function readPhoton(url) {
+    const response = await fetch(url);
+    const reader = response.body.getReader();
+    let v = "";
+    while (true) {
+        const { done, value } = await reader.read();
+        if (done) {
+            if (value !== undefined) { v += new TextDecoder().decode(value); }
+            return v;
+        }
+        v += new TextDecoder().decode(value)
+    }
+}
+
 // Search for markers with names of ... or icons of ...
 function doSearch() {
     var value = document.getElementById('search').value;
@@ -615,17 +639,21 @@ function doSearch() {
     moveToMarks();
     if (marks.length === 0) {
         // If no markers found let's try a geolookup...
+
         var protocol = location.protocol;
         if (protocol == "file:") { protocol = "https:"; }
-        var searchUrl = protocol + "//nominatim.openstreetmap.org/search?format=json&limit=1&q=";
+        var searchUrl = protocol + "//nominatim.openstreetmap.org/search?format=json&limit=5&q=";
 
         fetch(searchUrl + value) // Call the fetch function passing the url of the API as a parameter
             .then(function(resp) { return resp.json(); })
             .then(function(data) {
                 if (data.length > 0) {
+                    // var l = data.map((x) => x.display_name);
+                    // console.log("LIST",l)
                     var bb = data[0].boundingbox;
                     map.fitBounds([ [bb[0],bb[2]], [bb[1],bb[3]] ]);
                     map.panTo([data[0].lat, data[0].lon]);
+                    document.getElementById('searchResult').innerHTML = "";
                 }
                 else {
                     document.getElementById('searchResult').innerHTML = "&nbsp;<font color='#ff0'>Not Found</font>";
@@ -636,6 +664,35 @@ function doSearch() {
                     document.getElementById('searchResult').innerHTML = "&nbsp;<font color='#ff0'>Not Found</font>";
                 }
             });
+
+        // var searchUrl = 'https://photon.komoot.io/api?limit=5&q=';
+        // readPhoton(searchUrl + value).then(
+        //     function(value) {
+        //         if (value.length > 0 && typeof value === "string") {
+        //             var s = JSON.parse(value);
+        //             if (s?.features) {
+        //                 var l = s.features.map((x) => x.properties.name +', ' + x.properties.countrycode);
+        //                 console.log("LIST",l)
+        //                 if (s.features.length > 0) {
+        //                     if (s.features[0].properties?.extent) {
+        //                         var bb = s.features[0].properties.extent;
+        //                         map.fitBounds([ [bb[3],bb[0]], [bb[1],bb[2]] ]);
+        //                     }
+        //                     else {
+        //                         map.panTo([s.features[0].geometry.coordinates[1], s.features[0].geometry.coordinates[0]]);
+        //                     }
+        //                     document.getElementById('searchResult').innerHTML = "";
+        //                 }
+        //                 else {
+        //                     document.getElementById('searchResult').innerHTML = "&nbsp;<font color='#ff0'>Not Found</font>";}
+        //             }
+        //         }
+        //     },
+        //     function(error) {
+        //         document.getElementById('searchResult').innerHTML = "&nbsp;<font color='#ff0'>Search Error</font>";
+        //     }
+        // );
+
     }
     else {
         if (lockit) {
@@ -864,30 +921,51 @@ var addThing = function() {
 
 var form = {};
 var addToForm = function(n,v) { form[n] = v; }
-var feedback = function(n,v,a,c) {
+var feedback = function(n = "map",v,a = "feedback",c) {
     if (v === "_form") { v = form; }
-    if (markers[n]) {
-        // console.log("FB1",n,v,a,c)
-        allData[n].action = a || "feedback";
+    // undefined is handled directly in the function declaration, but null/"" also requires explicit handling within the function.
+    n = (n === null || n === "") ? "map" : n;
+    var dataToSend = { "name": n, "action": a, "value": v };
+    //Kept only for backward compatibility, as the context menu should handle the click position values internally.
+    if (n == "map") {
+        dataToSend.lat = rclk.lat;
+        dataToSend.lon = rclk.lng;
+    }
+    ws.send(JSON.stringify(dataToSend));
+
+    //** The following lines left just to verify reasoning and clarifying why it was removed
+
+    //** the reasong to seperate entities uncleare
+    //if (markers[n]) {
+    // console.log("FB1",n,v,a,c)
+    //** Why are we even modifying `allData`?
+    //    allData[n].action = a || "feedback";
         //if (v !== undefined) { allData[n][a||"value"] = v; }
-        if (v !== undefined) { allData[n]["value"] = v; }
-        ws.send(JSON.stringify(allData[n]));
-        setMarker(allData[n]);
-    }
-    else if (polygons[n]) {
+    //    if (v !== undefined) { allData[n]["value"] = v; }
+    //** Why are we sending back the `allData` object at all?
+    //    ws.send(JSON.stringify(allData[n]));
+    ///** Why are we updating the markers array from a feedback function?
+    //    setMarker(allData[n]);
+    //}
+
+    //** what is so sppecial about feedback fomr polygons?
+    //else if (polygons[n]) {
         // console.log("FB2", n, v, a);
-        const polyData = { "name": n, "action": a || "feedback", "value": v || null };
+    //    const polyData = { "name": n, "action": a || "feedback", "value": v || null };
         //sendDrawing(n,v,a)
-        ws.send(JSON.stringify(polyData));
-    }
-    else {
-        if (n === undefined) { n = "map"; }
+    //    ws.send(JSON.stringify(polyData));
+    //}
+    //** If neither a polygon nor a marker is found, assume it's a map and send the same data?
+    //else {
+    //    if (n === undefined) { n = "map"; }
         // console.log("FB3",n,v,a,c)
-        rmenudata = v;
-        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));
+    //** Modifying menu content inside feedback function is a bug!
+    //    rmenudata = v;
+    //    ws.send(JSON.stringify({action:a||"feedback", name:n, value:v, lat:rclk.lat, lon:rclk.lng}));
+    //}
+    //** Sending the same data again is redundant, as it could result in feedback being sent twice (except for the markers where we sent unnecessary data).
+	//const dataToSend = { "name": n, "action": a || "feedback", "value": v || null };
+	//ws.send(JSON.stringify(dataToSend));
     if (c === true) { map.closePopup(); }
 }
 
@@ -1347,18 +1425,18 @@ var addOverlays = function(overlist) {
     }
 
     // Add Air Corridors
-    if (overlist.indexOf("AC")!==-1) {
-        overlays["air corridors"] = L.tileLayer('https://{s}.tile.maps.openaip.net/geowebcache/service/tms/1.0.0/openaip_basemap@EPSG%3A900913@png/{z}/{x}/{y}.{ext}', {
-            attribution: '<a href="https://www.openaip.net/">openAIP Data</a> (<a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-BY-NC-SA</a>)',
-            ext: 'png',
-            minZoom: 4,
-            maxZoom: 15,
-            maxNativeZoom: 14,
-            tms: true,
-            detectRetina: true,
-            subdomains: '12'
-        });
-    }
+    // if (overlist.indexOf("AC")!==-1) {
+    //     overlays["air corridors"] = L.tileLayer('https://api.tiles.openaip.net/api/data/openaip/{z}/{x}/{y}.png', {
+    //         attribution: '<a href="https://www.openaip.net/">openAIP Data</a> (<a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-BY-NC-SA</a>)',
+    //         ext: 'png',
+    //         minZoom: 4,
+    //         maxZoom: 15,
+    //         maxNativeZoom: 14,
+    //         tms: true,
+    //         detectRetina: true,
+    //         subdomains: '12'
+    //     });
+    // }
 
     // Add the OpenSea markers layer
     if (overlist.indexOf("SN")!==-1) {
@@ -2452,8 +2530,10 @@ function doCommand(cmd) {
             document.getElementById("toplink").setAttribute("style", "pointer-events:none");
         }
     }
-    if (cmd.hasOwnProperty("clear")) {
-        doTidyUp(cmd.clear);
+    if (cmd.hasOwnProperty("clearlayer") || cmd.hasOwnProperty("clear")) {
+        var clr = cmd.clearlayer || cmd.clear;
+        if (!Array.isArray(clr)) { clr = [ clr ]; }
+        clr.forEach((el) => doTidyUp(el));
     }
     if (cmd.hasOwnProperty("panit")) {
         if (cmd.panit == true || cmd.panit === "true") { panit = true; }
@@ -3066,6 +3146,13 @@ function doCommand(cmd) {
         document.getElementById("maxage").value = cmd.maxage;
         setMaxAge();
     }
+    if (cmd.hasOwnProperty("sidcEdgeIcon")) {
+        if (typeof cmd.sidcEdgeIcon === 'boolean') {
+            edgeEnabled = cmd.sidcEdgeIcon;
+        } else {
+            console.log("ERR - invalid sidcEdgeIcon command: ", cmd.sidcEdgeIcon);
+        }
+    }
     // Replace heatmap layer with new array (and optionally options)
     if (cmd.hasOwnProperty("heatmap") && heat) {
         if (cmd.hasOwnProperty("options")) { heat.setOptions(cmd.options); }

package/worldmap.html

@@ -345,7 +345,7 @@ If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>c
         { value: "BU", label: "Buildings" },
         { value: "RW", label: "Railways" },
         { value: "SN", label: "Ship Navigation" },
-        { value: "AC", label: "Air Corridors" },
+        // { value: "AC", label: "Air Corridors" },
         { value: "TL", label: "Place Labels" },
         { value: "HM", label: "Heatmap" }
     ]

package/worldmap.js

@@ -493,13 +493,32 @@ module.exports = function(RED) {
                 }
             }
             if (msg?.payload?.command?.clear) {
-                for (let p in node.pointsarray) {
-                    if (node.pointsarray.hasOwnProperty(p)) {
-                        if (node.pointsarray[p][0].layer === msg.payload.command.clear) {
-                            delete node.pointsarray[p];
+                if (!isArray(msg?.payload?.command?.clear)) {
+                    msg.payload.command.clear = [ msg.payload.command.clear ]
+                }
+                msg.payload.command.clear.forEach(function(el) {
+                    for (let p in node.pointsarray) {
+                        if (node.pointsarray.hasOwnProperty(p)) {
+                            if (node.pointsarray[p][0].layer === el) {
+                                delete node.pointsarray[p];
+                            }
                         }
                     }
+                })
+            }
+            if (msg?.payload?.command?.clearlayer) {
+                if (!isArray(msg?.payload?.command?.clearlayer)) {
+                    msg.payload.command.clearlayer = [ msg.payload.command.clearlayer ]
                 }
+                msg.payload.command.clearlayer.forEach(function(el) {
+                    for (let p in node.pointsarray) {
+                        if (node.pointsarray.hasOwnProperty(p)) {
+                            if (node.pointsarray[p][0].layer === el) {
+                                delete node.pointsarray[p];
+                            }
+                        }
+                    }
+                })
             }
         }
 

package/node_modules/@turf/bezier-spline/dist/es/lib/spline.js

@@ -1,158 +0,0 @@
-/**
- * BezierSpline
- * https://github.com/leszekr/bezier-spline-js
- *
- * @private
- * @copyright
- * Copyright (c) 2013 Leszek Rybicki
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-var Spline = /** @class */ (function () {
-    function Spline(options) {
-        this.points = options.points || [];
-        this.duration = options.duration || 10000;
-        this.sharpness = options.sharpness || 0.85;
-        this.centers = [];
-        this.controls = [];
-        this.stepLength = options.stepLength || 60;
-        this.length = this.points.length;
-        this.delay = 0;
-        // this is to ensure compatibility with the 2d version
-        for (var i = 0; i < this.length; i++) {
-            this.points[i].z = this.points[i].z || 0;
-        }
-        for (var i = 0; i < this.length - 1; i++) {
-            var p1 = this.points[i];
-            var p2 = this.points[i + 1];
-            this.centers.push({
-                x: (p1.x + p2.x) / 2,
-                y: (p1.y + p2.y) / 2,
-                z: (p1.z + p2.z) / 2,
-            });
-        }
-        this.controls.push([this.points[0], this.points[0]]);
-        for (var i = 0; i < this.centers.length - 1; i++) {
-            var dx = this.points[i + 1].x - (this.centers[i].x + this.centers[i + 1].x) / 2;
-            var dy = this.points[i + 1].y - (this.centers[i].y + this.centers[i + 1].y) / 2;
-            var dz = this.points[i + 1].z - (this.centers[i].y + this.centers[i + 1].z) / 2;
-            this.controls.push([
-                {
-                    x: (1.0 - this.sharpness) * this.points[i + 1].x +
-                        this.sharpness * (this.centers[i].x + dx),
-                    y: (1.0 - this.sharpness) * this.points[i + 1].y +
-                        this.sharpness * (this.centers[i].y + dy),
-                    z: (1.0 - this.sharpness) * this.points[i + 1].z +
-                        this.sharpness * (this.centers[i].z + dz),
-                },
-                {
-                    x: (1.0 - this.sharpness) * this.points[i + 1].x +
-                        this.sharpness * (this.centers[i + 1].x + dx),
-                    y: (1.0 - this.sharpness) * this.points[i + 1].y +
-                        this.sharpness * (this.centers[i + 1].y + dy),
-                    z: (1.0 - this.sharpness) * this.points[i + 1].z +
-                        this.sharpness * (this.centers[i + 1].z + dz),
-                },
-            ]);
-        }
-        this.controls.push([
-            this.points[this.length - 1],
-            this.points[this.length - 1],
-        ]);
-        this.steps = this.cacheSteps(this.stepLength);
-        return this;
-    }
-    /**
-     * Caches an array of equidistant (more or less) points on the curve.
-     */
-    Spline.prototype.cacheSteps = function (mindist) {
-        var steps = [];
-        var laststep = this.pos(0);
-        steps.push(0);
-        for (var t = 0; t < this.duration; t += 10) {
-            var step = this.pos(t);
-            var dist = Math.sqrt((step.x - laststep.x) * (step.x - laststep.x) +
-                (step.y - laststep.y) * (step.y - laststep.y) +
-                (step.z - laststep.z) * (step.z - laststep.z));
-            if (dist > mindist) {
-                steps.push(t);
-                laststep = step;
-            }
-        }
-        return steps;
-    };
-    /**
-     * returns angle and speed in the given point in the curve
-     */
-    Spline.prototype.vector = function (t) {
-        var p1 = this.pos(t + 10);
-        var p2 = this.pos(t - 10);
-        return {
-            angle: (180 * Math.atan2(p1.y - p2.y, p1.x - p2.x)) / 3.14,
-            speed: Math.sqrt((p2.x - p1.x) * (p2.x - p1.x) +
-                (p2.y - p1.y) * (p2.y - p1.y) +
-                (p2.z - p1.z) * (p2.z - p1.z)),
-        };
-    };
-    /**
-     * Gets the position of the point, given time.
-     *
-     * WARNING: The speed is not constant. The time it takes between control points is constant.
-     *
-     * For constant speed, use Spline.steps[i];
-     */
-    Spline.prototype.pos = function (time) {
-        var t = time - this.delay;
-        if (t < 0) {
-            t = 0;
-        }
-        if (t > this.duration) {
-            t = this.duration - 1;
-        }
-        // t = t-this.delay;
-        var t2 = t / this.duration;
-        if (t2 >= 1) {
-            return this.points[this.length - 1];
-        }
-        var n = Math.floor((this.points.length - 1) * t2);
-        var t1 = (this.length - 1) * t2 - n;
-        return bezier(t1, this.points[n], this.controls[n][1], this.controls[n + 1][0], this.points[n + 1]);
-    };
-    return Spline;
-}());
-export default Spline;
-function bezier(t, p1, c1, c2, p2) {
-    var b = B(t);
-    var pos = {
-        x: p2.x * b[0] + c2.x * b[1] + c1.x * b[2] + p1.x * b[3],
-        y: p2.y * b[0] + c2.y * b[1] + c1.y * b[2] + p1.y * b[3],
-        z: p2.z * b[0] + c2.z * b[1] + c1.z * b[2] + p1.z * b[3],
-    };
-    return pos;
-}
-function B(t) {
-    var t2 = t * t;
-    var t3 = t2 * t;
-    return [
-        t3,
-        3 * t2 * (1 - t),
-        3 * t * (1 - t) * (1 - t),
-        (1 - t) * (1 - t) * (1 - t),
-    ];
-}

package/node_modules/@turf/bezier-spline/dist/es/package.json

@@ -1 +0,0 @@
-{"type":"module"}

package/node_modules/@turf/bezier-spline/dist/js/index.js

@@ -1,65 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var helpers_1 = require("@turf/helpers");
-var invariant_1 = require("@turf/invariant");
-var spline_1 = __importDefault(require("./lib/spline"));
-/**
- * Takes a {@link LineString|line} and returns a curved version
- * by applying a [Bezier spline](http://en.wikipedia.org/wiki/B%C3%A9zier_spline)
- * algorithm.
- *
- * The bezier spline implementation is by [Leszek Rybicki](http://leszek.rybicki.cc/).
- *
- * @name bezierSpline
- * @param {Feature<LineString>} line input LineString
- * @param {Object} [options={}] Optional parameters
- * @param {Object} [options.properties={}] Translate properties to output
- * @param {number} [options.resolution=10000] time in milliseconds between points
- * @param {number} [options.sharpness=0.85] a measure of how curvy the path should be between splines
- * @returns {Feature<LineString>} curved line
- * @example
- * var line = turf.lineString([
- *   [-76.091308, 18.427501],
- *   [-76.695556, 18.729501],
- *   [-76.552734, 19.40443],
- *   [-74.61914, 19.134789],
- *   [-73.652343, 20.07657],
- *   [-73.157958, 20.210656]
- * ]);
- *
- * var curved = turf.bezierSpline(line);
- *
- * //addToMap
- * var addToMap = [line, curved]
- * curved.properties = { stroke: '#0F0' };
- */
-function bezier(line, options) {
-    if (options === void 0) { options = {}; }
-    // Optional params
-    var resolution = options.resolution || 10000;
-    var sharpness = options.sharpness || 0.85;
-    var coords = [];
-    var points = invariant_1.getGeom(line).coordinates.map(function (pt) {
-        return { x: pt[0], y: pt[1] };
-    });
-    var spline = new spline_1.default({
-        duration: resolution,
-        points: points,
-        sharpness: sharpness,
-    });
-    var pushCoord = function (time) {
-        var pos = spline.pos(time);
-        if (Math.floor(time / 100) % 2 === 0) {
-            coords.push([pos.x, pos.y]);
-        }
-    };
-    for (var i = 0; i < spline.duration; i += 10) {
-        pushCoord(i);
-    }
-    pushCoord(spline.duration);
-    return helpers_1.lineString(coords, options.properties);
-}
-exports.default = bezier;

package/node_modules/@turf/bezier-spline/dist/js/lib/spline.d.ts

@@ -1,62 +0,0 @@
-export interface Point {
-    x: number;
-    y: number;
-    z: number;
-}
-/**
- * BezierSpline
- * https://github.com/leszekr/bezier-spline-js
- *
- * @private
- * @copyright
- * Copyright (c) 2013 Leszek Rybicki
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-export default class Spline {
-    duration: number;
-    points: Point[];
-    sharpness: number;
-    centers: Point[];
-    controls: Array<[Point, Point]>;
-    stepLength: number;
-    length: number;
-    delay: number;
-    steps: number[];
-    constructor(options?: any);
-    /**
-     * Caches an array of equidistant (more or less) points on the curve.
-     */
-    cacheSteps(mindist: number): number[];
-    /**
-     * returns angle and speed in the given point in the curve
-     */
-    vector(t: number): {
-        angle: number;
-        speed: number;
-    };
-    /**
-     * Gets the position of the point, given time.
-     *
-     * WARNING: The speed is not constant. The time it takes between control points is constant.
-     *
-     * For constant speed, use Spline.steps[i];
-     */
-    pos(time: number): Point;
-}