node-red-contrib-web-worldmap 2.32.3 → 2.34.0

package/node_modules/unpipe/package.json

@@ -1,64 +1,27 @@
 {
-  "_from": "unpipe@1.0.0",
-  "_id": "unpipe@1.0.0",
-  "_inBundle": false,
-  "_integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-  "_location": "/unpipe",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "version",
-    "registry": true,
-    "raw": "unpipe@1.0.0",
-    "name": "unpipe",
-    "escapedName": "unpipe",
-    "rawSpec": "1.0.0",
-    "saveSpec": null,
-    "fetchSpec": "1.0.0"
-  },
-  "_requiredBy": [
-    "/body-parser",
-    "/finalhandler",
-    "/raw-body"
-  ],
-  "_resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-  "_shasum": "b2bf4ee8514aae6165b4817829d21b2ef49904ec",
-  "_spec": "unpipe@1.0.0",
-  "_where": "/Users/conway/Projects/worldmap/node_modules/body-parser",
-  "author": {
-    "name": "Douglas Christopher Wilson",
-    "email": "doug@somethingdoug.com"
-  },
-  "bugs": {
-    "url": "https://github.com/stream-utils/unpipe/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
+  "name": "unpipe",
   "description": "Unpipe a stream from all destinations",
+  "version": "1.0.0",
+  "author": "Douglas Christopher Wilson <doug@somethingdoug.com>",
+  "license": "MIT",
+  "repository": "stream-utils/unpipe",
   "devDependencies": {
     "istanbul": "0.3.15",
     "mocha": "2.2.5",
     "readable-stream": "1.1.13"
   },
-  "engines": {
-    "node": ">= 0.8"
-  },
   "files": [
     "HISTORY.md",
     "LICENSE",
     "README.md",
     "index.js"
   ],
-  "homepage": "https://github.com/stream-utils/unpipe#readme",
-  "license": "MIT",
-  "name": "unpipe",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/stream-utils/unpipe.git"
+  "engines": {
+    "node": ">= 0.8"
   },
   "scripts": {
     "test": "mocha --reporter spec --bail --check-leaks test/",
     "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/",
     "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/"
-  },
-  "version": "1.0.0"
+  }
 }

package/node_modules/utils-merge/package.json

@@ -1,51 +1,22 @@
 {
-  "_from": "utils-merge@1.0.1",
-  "_id": "utils-merge@1.0.1",
-  "_inBundle": false,
-  "_integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-  "_location": "/utils-merge",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "version",
-    "registry": true,
-    "raw": "utils-merge@1.0.1",
-    "name": "utils-merge",
-    "escapedName": "utils-merge",
-    "rawSpec": "1.0.1",
-    "saveSpec": null,
-    "fetchSpec": "1.0.1"
-  },
-  "_requiredBy": [
-    "/express"
+  "name": "utils-merge",
+  "version": "1.0.1",
+  "description": "merge() utility function",
+  "keywords": [
+    "util"
   ],
-  "_resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-  "_shasum": "9f95710f50a267947b2ccc124741c1028427e713",
-  "_spec": "utils-merge@1.0.1",
-  "_where": "/Users/conway/Projects/worldmap/node_modules/express",
   "author": {
     "name": "Jared Hanson",
     "email": "jaredhanson@gmail.com",
     "url": "http://www.jaredhanson.net/"
   },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/jaredhanson/utils-merge.git"
+  },
   "bugs": {
     "url": "http://github.com/jaredhanson/utils-merge/issues"
   },
-  "bundleDependencies": false,
-  "dependencies": {},
-  "deprecated": false,
-  "description": "merge() utility function",
-  "devDependencies": {
-    "chai": "1.x.x",
-    "make-node": "0.3.x",
-    "mocha": "1.x.x"
-  },
-  "engines": {
-    "node": ">= 0.4.0"
-  },
-  "homepage": "https://github.com/jaredhanson/utils-merge#readme",
-  "keywords": [
-    "util"
-  ],
   "license": "MIT",
   "licenses": [
     {
@@ -54,13 +25,16 @@
     }
   ],
   "main": "./index",
-  "name": "utils-merge",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/jaredhanson/utils-merge.git"
+  "dependencies": {},
+  "devDependencies": {
+    "make-node": "0.3.x",
+    "mocha": "1.x.x",
+    "chai": "1.x.x"
   },
-  "scripts": {
-    "test": "mocha --reporter spec --require test/bootstrap/node test/*.test.js"
+  "engines": {
+    "node": ">= 0.4.0"
   },
-  "version": "1.0.1"
+  "scripts": {
+    "test": "node_modules/.bin/mocha --reporter spec --require test/bootstrap/node test/*.test.js"
+  }
 }

package/node_modules/uuid/package.json

@@ -1,47 +1,49 @@
 {
-  "_from": "uuid@^8.3.2",
-  "_id": "uuid@8.3.2",
-  "_inBundle": false,
-  "_integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-  "_location": "/node-red-contrib-web-worldmap/uuid",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "uuid@^8.3.2",
-    "name": "uuid",
-    "escapedName": "uuid",
-    "rawSpec": "^8.3.2",
-    "saveSpec": null,
-    "fetchSpec": "^8.3.2"
+  "name": "uuid",
+  "version": "8.3.2",
+  "description": "RFC4122 (v1, v4, and v5) UUIDs",
+  "commitlint": {
+    "extends": [
+      "@commitlint/config-conventional"
+    ]
   },
-  "_requiredBy": [
-    "/node-red-contrib-web-worldmap/sockjs"
+  "keywords": [
+    "uuid",
+    "guid",
+    "rfc4122"
   ],
-  "_resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-  "_shasum": "80d5b5ced271bb9af6c445f21a1a04c606cefbe2",
-  "_spec": "uuid@^8.3.2",
-  "_where": "/Users/conway/Projects/worldmap/node_modules/sockjs",
+  "license": "MIT",
   "bin": {
-    "uuid": "dist/bin/uuid"
+    "uuid": "./dist/bin/uuid"
   },
+  "sideEffects": false,
+  "main": "./dist/index.js",
+  "exports": {
+    ".": {
+      "node": {
+        "module": "./dist/esm-node/index.js",
+        "require": "./dist/index.js",
+        "import": "./wrapper.mjs"
+      },
+      "default": "./dist/esm-browser/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "module": "./dist/esm-node/index.js",
   "browser": {
     "./dist/md5.js": "./dist/md5-browser.js",
     "./dist/rng.js": "./dist/rng-browser.js",
     "./dist/sha1.js": "./dist/sha1-browser.js",
     "./dist/esm-node/index.js": "./dist/esm-browser/index.js"
   },
-  "bugs": {
-    "url": "https://github.com/uuidjs/uuid/issues"
-  },
-  "bundleDependencies": false,
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ]
-  },
-  "deprecated": false,
-  "description": "RFC4122 (v1, v4, and v5) UUIDs",
+  "files": [
+    "CHANGELOG.md",
+    "CONTRIBUTING.md",
+    "LICENSE.md",
+    "README.md",
+    "dist",
+    "wrapper.mjs"
+  ],
   "devDependencies": {
     "@babel/cli": "7.11.6",
     "@babel/core": "7.11.6",
@@ -71,49 +73,6 @@
     "runmd": "1.3.2",
     "standard-version": "9.0.0"
   },
-  "exports": {
-    ".": {
-      "node": {
-        "module": "./dist/esm-node/index.js",
-        "require": "./dist/index.js",
-        "import": "./wrapper.mjs"
-      },
-      "default": "./dist/esm-browser/index.js"
-    },
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "CHANGELOG.md",
-    "CONTRIBUTING.md",
-    "LICENSE.md",
-    "README.md",
-    "dist",
-    "wrapper.mjs"
-  ],
-  "homepage": "https://github.com/uuidjs/uuid#readme",
-  "husky": {
-    "hooks": {
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-      "pre-commit": "lint-staged"
-    }
-  },
-  "keywords": [
-    "uuid",
-    "guid",
-    "rfc4122"
-  ],
-  "license": "MIT",
-  "lint-staged": {
-    "*.{js,jsx,json,md}": [
-      "prettier --write"
-    ],
-    "*.{js,jsx}": [
-      "eslint --fix"
-    ]
-  },
-  "main": "./dist/index.js",
-  "module": "./dist/esm-node/index.js",
-  "name": "uuid",
   "optionalDevDependencies": {
     "@wdio/browserstack-service": "6.4.0",
     "@wdio/cli": "6.4.0",
@@ -123,42 +82,54 @@
     "@wdio/static-server-service": "6.4.0",
     "@wdio/sync": "6.4.0"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/uuidjs/uuid.git"
-  },
   "scripts": {
-    "build": "./scripts/build.sh",
-    "bundlewatch": "npm run pretest:browser && bundlewatch --config bundlewatch.config.json",
-    "docs": "( node --version | grep -q 'v12' ) && ( npm run build && runmd --output=README.md README_js.md )",
-    "docs:diff": "npm run docs && git diff --quiet README.md",
-    "eslint:check": "eslint src/ test/ examples/ *.js",
-    "eslint:fix": "eslint --fix src/ test/ examples/ *.js",
-    "examples:browser:rollup:build": "cd examples/browser-rollup && npm install && npm run build",
     "examples:browser:webpack:build": "cd examples/browser-webpack && npm install && npm run build",
+    "examples:browser:rollup:build": "cd examples/browser-rollup && npm install && npm run build",
     "examples:node:commonjs:test": "cd examples/node-commonjs && npm install && npm test",
     "examples:node:esmodules:test": "cd examples/node-esmodules && npm install && npm test",
     "lint": "npm run eslint:check && npm run prettier:check",
-    "md": "runmd --watch --output=README.md README_js.md",
-    "prepack": "npm run build",
+    "eslint:check": "eslint src/ test/ examples/ *.js",
+    "eslint:fix": "eslint --fix src/ test/ examples/ *.js",
     "pretest": "[ -n $CI ] || npm run build",
-    "pretest:benchmark": "npm run build",
+    "test": "BABEL_ENV=commonjs node --throw-deprecation node_modules/.bin/jest test/unit/",
     "pretest:browser": "optional-dev-dependency && npm run build && npm-run-all --parallel examples:browser:**",
+    "test:browser": "wdio run ./wdio.conf.js",
     "pretest:node": "npm run build",
+    "test:node": "npm-run-all --parallel examples:node:**",
+    "test:pack": "./scripts/testpack.sh",
+    "pretest:benchmark": "npm run build",
+    "test:benchmark": "cd examples/benchmark && npm install && npm test",
     "prettier:check": "prettier --ignore-path .prettierignore --check '**/*.{js,jsx,json,md}'",
     "prettier:fix": "prettier --ignore-path .prettierignore --write '**/*.{js,jsx,json,md}'",
-    "release": "standard-version --no-verify",
-    "test": "BABEL_ENV=commonjs node --throw-deprecation node_modules/.bin/jest test/unit/",
-    "test:benchmark": "cd examples/benchmark && npm install && npm test",
-    "test:browser": "wdio run ./wdio.conf.js",
-    "test:node": "npm-run-all --parallel examples:node:**",
-    "test:pack": "./scripts/testpack.sh"
+    "bundlewatch": "npm run pretest:browser && bundlewatch --config bundlewatch.config.json",
+    "md": "runmd --watch --output=README.md README_js.md",
+    "docs": "( node --version | grep -q 'v12' ) && ( npm run build && runmd --output=README.md README_js.md )",
+    "docs:diff": "npm run docs && git diff --quiet README.md",
+    "build": "./scripts/build.sh",
+    "prepack": "npm run build",
+    "release": "standard-version --no-verify"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/uuidjs/uuid.git"
+  },
+  "husky": {
+    "hooks": {
+      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "*.{js,jsx,json,md}": [
+      "prettier --write"
+    ],
+    "*.{js,jsx}": [
+      "eslint --fix"
+    ]
   },
-  "sideEffects": false,
   "standard-version": {
     "scripts": {
       "postchangelog": "prettier --write CHANGELOG.md"
     }
-  },
-  "version": "8.3.2"
+  }
 }

package/node_modules/websocket-driver/package.json

@@ -1,70 +1,35 @@
 {
-  "_args": [
-    [
-      "websocket-driver@0.7.4",
-      "/Users/conway/Projects/worldmap"
-    ]
-  ],
-  "_from": "websocket-driver@0.7.4",
-  "_id": "websocket-driver@0.7.4",
-  "_inBundle": false,
-  "_integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-  "_location": "/websocket-driver",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "version",
-    "registry": true,
-    "raw": "websocket-driver@0.7.4",
-    "name": "websocket-driver",
-    "escapedName": "websocket-driver",
-    "rawSpec": "0.7.4",
-    "saveSpec": null,
-    "fetchSpec": "0.7.4"
-  },
-  "_requiredBy": [
-    "/faye-websocket",
-    "/sockjs"
-  ],
-  "_resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-  "_spec": "0.7.4",
-  "_where": "/Users/conway/Projects/worldmap",
-  "author": {
-    "name": "James Coglan",
-    "email": "jcoglan@gmail.com",
-    "url": "http://jcoglan.com/"
-  },
-  "bugs": {
-    "url": "https://github.com/faye/websocket-driver-node/issues"
-  },
-  "dependencies": {
-    "http-parser-js": ">=0.5.1",
-    "safe-buffer": ">=5.1.0",
-    "websocket-extensions": ">=0.1.1"
-  },
-  "description": "WebSocket protocol handler with pluggable I/O",
-  "devDependencies": {
-    "jstest": "*",
-    "permessage-deflate": "*"
-  },
-  "engines": {
-    "node": ">=0.8.0"
-  },
-  "files": [
-    "lib"
-  ],
-  "homepage": "https://github.com/faye/websocket-driver-node",
-  "keywords": [
-    "websocket"
-  ],
-  "license": "Apache-2.0",
-  "main": "./lib/websocket/driver",
-  "name": "websocket-driver",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/faye/websocket-driver-node.git"
-  },
-  "scripts": {
-    "test": "jstest spec/runner.js"
-  },
-  "version": "0.7.4"
+          "name": "websocket-driver",
+          "description": "WebSocket protocol handler with pluggable I/O",
+          "homepage": "https://github.com/faye/websocket-driver-node",
+          "author": "James Coglan <jcoglan@gmail.com> (http://jcoglan.com/)",
+          "keywords": [
+                    "websocket"
+          ],
+          "license": "Apache-2.0",
+          "version": "0.7.4",
+          "engines": {
+                    "node": ">=0.8.0"
+          },
+          "files": [
+                    "lib"
+          ],
+          "main": "./lib/websocket/driver",
+          "dependencies": {
+                    "http-parser-js": ">=0.5.1",
+                    "safe-buffer": ">=5.1.0",
+                    "websocket-extensions": ">=0.1.1"
+          },
+          "devDependencies": {
+                    "jstest": "*",
+                    "permessage-deflate": "*"
+          },
+          "scripts": {
+                    "test": "jstest spec/runner.js"
+          },
+          "repository": {
+                    "type": "git",
+                    "url": "git://github.com/faye/websocket-driver-node.git"
+          },
+          "bugs": "https://github.com/faye/websocket-driver-node/issues"
 }

package/node_modules/websocket-extensions/package.json

@@ -1,63 +1,29 @@
 {
-  "_args": [
-    [
-      "websocket-extensions@0.1.4",
-      "/Users/conway/Projects/worldmap"
-    ]
-  ],
-  "_from": "websocket-extensions@0.1.4",
-  "_id": "websocket-extensions@0.1.4",
-  "_inBundle": false,
-  "_integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-  "_location": "/websocket-extensions",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "version",
-    "registry": true,
-    "raw": "websocket-extensions@0.1.4",
-    "name": "websocket-extensions",
-    "escapedName": "websocket-extensions",
-    "rawSpec": "0.1.4",
-    "saveSpec": null,
-    "fetchSpec": "0.1.4"
-  },
-  "_requiredBy": [
-    "/websocket-driver"
-  ],
-  "_resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-  "_spec": "0.1.4",
-  "_where": "/Users/conway/Projects/worldmap",
-  "author": {
-    "name": "James Coglan",
-    "email": "jcoglan@gmail.com",
-    "url": "http://jcoglan.com/"
-  },
-  "bugs": {
-    "url": "http://github.com/faye/websocket-extensions-node/issues"
-  },
-  "description": "Generic extension manager for WebSocket connections",
-  "devDependencies": {
-    "jstest": "*"
-  },
-  "engines": {
-    "node": ">=0.8.0"
-  },
-  "files": [
-    "lib"
-  ],
-  "homepage": "http://github.com/faye/websocket-extensions-node",
-  "keywords": [
-    "websocket"
-  ],
-  "license": "Apache-2.0",
-  "main": "./lib/websocket_extensions",
-  "name": "websocket-extensions",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/faye/websocket-extensions-node.git"
-  },
-  "scripts": {
-    "test": "jstest spec/runner.js"
-  },
-  "version": "0.1.4"
+          "name": "websocket-extensions",
+          "description": "Generic extension manager for WebSocket connections",
+          "homepage": "http://github.com/faye/websocket-extensions-node",
+          "author": "James Coglan <jcoglan@gmail.com> (http://jcoglan.com/)",
+          "keywords": [
+                    "websocket"
+          ],
+          "license": "Apache-2.0",
+          "version": "0.1.4",
+          "engines": {
+                    "node": ">=0.8.0"
+          },
+          "files": [
+                    "lib"
+          ],
+          "main": "./lib/websocket_extensions",
+          "devDependencies": {
+                    "jstest": "*"
+          },
+          "scripts": {
+                    "test": "jstest spec/runner.js"
+          },
+          "repository": {
+                    "type": "git",
+                    "url": "git://github.com/faye/websocket-extensions-node.git"
+          },
+          "bugs": "http://github.com/faye/websocket-extensions-node/issues"
 }

package/package.json

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

@@ -1215,7 +1215,7 @@ var addOverlays = function(overlist) {
     }
 
     // Add the heatmap layer (and add delete LatLng function)
-    if (overlist.indexOf("HM")!==-1) {
+    if (overlist.indexOf("HM") !== -1) {
         heat = L.heatLayer([], {radius:60, gradient:{0.2:'blue', 0.4:'lime', 0.6:'red', 0.8:'yellow', 1:'white'}});
         heat.delLatLng = function(ll) {
             heat._latlngs = heat._latlngs.filter(v => { return v != ll; } );
@@ -1281,7 +1281,8 @@ var delMarker = function(dname,note) {
     }
     if (typeof markers[dname] != "undefined") {
         if (heat && markers[dname].hasOwnProperty("_latlng")) {
-            heat.delLatLng(markers[dname]._latlng);
+            try { heat.delLatLng(markers[dname]._latlng); }
+            catch(e) { }
         }
         layers[markers[dname].lay].removeLayer(markers[dname]);
         map.removeLayer(markers[dname]);
@@ -1341,6 +1342,11 @@ var rangerings = function(latlng, options) {
 // the MAIN add something to map function
 function setMarker(data) {
     var rightmenu = function(m) {
+        m.on('click', function(e) {
+            var fb = allData[data.name];
+            fb.action = "click";
+            ws.send(JSON.stringify(fb));
+        });
         // customise right click context menu
         var rightcontext = "";
         //if (polygons[data.name] == undefined) {
@@ -1787,7 +1793,7 @@ function setMarker(data) {
             marker = L.marker(ll, {title:data.name, icon:myMarker, draggable:drag});
             labelOffset = [12,-4];
         }
-        else if (data.icon.match(/^https?:.*$/)) {
+        else if (data.icon.match(/^https?:.*$|^\//)) {
             var sz = data.iconSize ?? 32;
             myMarker = L.icon({
                 iconUrl: data.icon,
@@ -2040,12 +2046,12 @@ function setMarker(data) {
     marker._popup.dname = data.name;
     marker.lay = lay;                       // and the layer it is on
 
-    marker.on('click', function(e) {
-        //ws.send(JSON.stringify({action:"click",name:marker.name,layer:marker.lay,icon:marker.icon,iconColor:marker.iconColor,SIDC:marker.SIDC,draggable:true,lat:parseFloat(marker.getLatLng().lat.toFixed(6)),lon:parseFloat(marker.getLatLng().lng.toFixed(6))}));
-        var fb = allData[marker.name];
-        fb.action = "click";
-        ws.send(JSON.stringify(fb));
-    });
+    // marker.on('click', function(e) {
+    //     //ws.send(JSON.stringify({action:"click",name:marker.name,layer:marker.lay,icon:marker.icon,iconColor:marker.iconColor,SIDC:marker.SIDC,draggable:true,lat:parseFloat(marker.getLatLng().lat.toFixed(6)),lon:parseFloat(marker.getLatLng().lng.toFixed(6))}));
+    //     var fb = allData[marker.name];
+    //     fb.action = "click";
+    //     ws.send(JSON.stringify(fb));
+    // });
     if (heat && ((data.addtoheatmap != false) || (!data.hasOwnProperty("addtoheatmap")))) { // Added to give ability to control if points from active layer contribute to heatmap
         if (heatAll || map.hasLayer(layers[lay])) { heat.addLatLng(lli); }
     }