node-red-contrib-web-worldmap 2.29.0 → 2.30.2

package/node_modules/statuses/README.md

@@ -1,9 +1,9 @@
-# Statuses
+# statuses
 
-[![NPM Version][npm-image]][npm-url]
-[![NPM Downloads][downloads-image]][downloads-url]
+[![NPM Version][npm-version-image]][npm-url]
+[![NPM Downloads][npm-downloads-image]][npm-url]
 [![Node.js Version][node-version-image]][node-version-url]
-[![Build Status][travis-image]][travis-url]
+[![Build Status][ci-image]][ci-url]
 [![Test Coverage][coveralls-image]][coveralls-url]
 
 HTTP status utility for node.
@@ -34,74 +34,80 @@ $ npm install statuses
 var status = require('statuses')
 ```
 
-### var code = status(Integer || String)
+### status(code)
 
-If `Integer` or `String` is a valid HTTP code or status message, then the
-appropriate `code` will be returned. Otherwise, an error will be thrown.
+Returns the status message string for a known HTTP status code. The code
+may be a number or a string. An error is thrown for an unknown status code.
 
 <!-- eslint-disable no-undef -->
 
 ```js
-status(403) // => 403
-status('403') // => 403
-status('forbidden') // => 403
-status('Forbidden') // => 403
-status(306) // throws, as it's not supported by node.js
+status(403) // => 'Forbidden'
+status('403') // => 'Forbidden'
+status(306) // throws
 ```
 
-### status.STATUS_CODES
+### status(msg)
+
+Returns the numeric status code for a known HTTP status message. The message
+is case-insensitive. An error is thrown for an unknown status message.
+
+<!-- eslint-disable no-undef -->
 
-Returns an object which maps status codes to status messages, in
-the same format as the
-[Node.js http module](https://nodejs.org/dist/latest/docs/api/http.html#http_http_status_codes).
+```js
+status('forbidden') // => 403
+status('Forbidden') // => 403
+status('foo') // throws
+```
 
 ### status.codes
 
 Returns an array of all the status codes as `Integer`s.
 
-### var msg = status[code]
+### status.code[msg]
 
-Map of `code` to `status message`. `undefined` for invalid `code`s.
+Returns the numeric status code for a known status message (in lower-case),
+otherwise `undefined`.
 
 <!-- eslint-disable no-undef, no-unused-expressions -->
 
 ```js
-status[404] // => 'Not Found'
+status['not found'] // => 404
 ```
 
-### var code = status[msg]
+### status.empty[code]
 
-Map of `status message` to `code`. `msg` can either be title-cased or
-lower-cased. `undefined` for invalid `status message`s.
+Returns `true` if a status code expects an empty body.
 
 <!-- eslint-disable no-undef, no-unused-expressions -->
 
 ```js
-status['not found'] // => 404
-status['Not Found'] // => 404
+status.empty[200] // => undefined
+status.empty[204] // => true
+status.empty[304] // => true
 ```
 
-### status.redirect[code]
+### status.message[code]
 
-Returns `true` if a status code is a valid redirect status.
+Returns the string message for a known numeric status code, otherwise
+`undefined`. This object is the same format as the
+[Node.js http module `http.STATUS_CODES`](https://nodejs.org/dist/latest/docs/api/http.html#http_http_status_codes).
 
 <!-- eslint-disable no-undef, no-unused-expressions -->
 
 ```js
-status.redirect[200] // => undefined
-status.redirect[301] // => true
+status.message[404] // => 'Not Found'
 ```
 
-### status.empty[code]
+### status.redirect[code]
 
-Returns `true` if a status code expects an empty body.
+Returns `true` if a status code is a valid redirect status.
 
 <!-- eslint-disable no-undef, no-unused-expressions -->
 
 ```js
-status.empty[200] // => undefined
-status.empty[204] // => true
-status.empty[304] // => true
+status.redirect[200] // => undefined
+status.redirect[301] // => true
 ```
 
 ### status.retry[code]
@@ -115,13 +121,16 @@ status.retry[501] // => undefined
 status.retry[503] // => true
 ```
 
-[npm-image]: https://img.shields.io/npm/v/statuses.svg
-[npm-url]: https://npmjs.org/package/statuses
-[node-version-image]: https://img.shields.io/node/v/statuses.svg
-[node-version-url]: https://nodejs.org/en/download
-[travis-image]: https://img.shields.io/travis/jshttp/statuses.svg
-[travis-url]: https://travis-ci.org/jshttp/statuses
-[coveralls-image]: https://img.shields.io/coveralls/jshttp/statuses.svg
+## License
+
+[MIT](LICENSE)
+
+[ci-image]: https://badgen.net/github/checks/jshttp/statuses/master?label=ci
+[ci-url]: https://github.com/jshttp/statuses/actions?query=workflow%3Aci
+[coveralls-image]: https://badgen.net/coveralls/c/github/jshttp/statuses/master
 [coveralls-url]: https://coveralls.io/r/jshttp/statuses?branch=master
-[downloads-image]: https://img.shields.io/npm/dm/statuses.svg
-[downloads-url]: https://npmjs.org/package/statuses
+[node-version-image]: https://badgen.net/npm/node/statuses
+[node-version-url]: https://nodejs.org/en/download
+[npm-downloads-image]: https://badgen.net/npm/dm/statuses
+[npm-url]: https://npmjs.org/package/statuses
+[npm-version-image]: https://badgen.net/npm/v/statuses

package/node_modules/statuses/codes.json

@@ -19,7 +19,6 @@
   "303": "See Other",
   "304": "Not Modified",
   "305": "Use Proxy",
-  "306": "(Unused)",
   "307": "Temporary Redirect",
   "308": "Permanent Redirect",
   "400": "Bad Request",
@@ -40,12 +39,12 @@
   "415": "Unsupported Media Type",
   "416": "Range Not Satisfiable",
   "417": "Expectation Failed",
-  "418": "I'm a teapot",
+  "418": "I'm a Teapot",
   "421": "Misdirected Request",
   "422": "Unprocessable Entity",
   "423": "Locked",
   "424": "Failed Dependency",
-  "425": "Unordered Collection",
+  "425": "Too Early",
   "426": "Upgrade Required",
   "428": "Precondition Required",
   "429": "Too Many Requests",

package/node_modules/statuses/index.js

@@ -22,10 +22,13 @@ var codes = require('./codes.json')
 module.exports = status
 
 // status code to message map
-status.STATUS_CODES = codes
+status.message = codes
+
+// status message (lower-case) to code map
+status.code = createMessageToStatusCodeMap(codes)
 
 // array of status codes
-status.codes = populateStatusesMap(status, codes)
+status.codes = createStatusCodeList(codes)
 
 // status codes for redirects
 status.redirect = {
@@ -53,27 +56,61 @@ status.retry = {
 }
 
 /**
- * Populate the statuses map for given codes.
+ * Create a map of message to status code.
  * @private
  */
 
-function populateStatusesMap (statuses, codes) {
-  var arr = []
+function createMessageToStatusCodeMap (codes) {
+  var map = {}
 
   Object.keys(codes).forEach(function forEachCode (code) {
     var message = codes[code]
     var status = Number(code)
 
-    // Populate properties
-    statuses[status] = message
-    statuses[message] = status
-    statuses[message.toLowerCase()] = status
+    // populate map
+    map[message.toLowerCase()] = status
+  })
+
+  return map
+}
+
+/**
+ * Create a list of all status codes.
+ * @private
+ */
 
-    // Add to array
-    arr.push(status)
+function createStatusCodeList (codes) {
+  return Object.keys(codes).map(function mapCode (code) {
+    return Number(code)
   })
+}
+
+/**
+ * Get the status code for given message.
+ * @private
+ */
+
+function getStatusCode (message) {
+  var msg = message.toLowerCase()
+
+  if (!Object.prototype.hasOwnProperty.call(status.code, msg)) {
+    throw new Error('invalid status message: "' + message + '"')
+  }
+
+  return status.code[msg]
+}
+
+/**
+ * Get the status message for given code.
+ * @private
+ */
+
+function getStatusMessage (code) {
+  if (!Object.prototype.hasOwnProperty.call(status.message, code)) {
+    throw new Error('invalid status code: ' + code)
+  }
 
-  return arr
+  return status.message[code]
 }
 
 /**
@@ -92,8 +129,7 @@ function populateStatusesMap (statuses, codes) {
 
 function status (code) {
   if (typeof code === 'number') {
-    if (!status[code]) throw new Error('invalid status code: ' + code)
-    return code
+    return getStatusMessage(code)
   }
 
   if (typeof code !== 'string') {
@@ -103,11 +139,8 @@ function status (code) {
   // '403'
   var n = parseInt(code, 10)
   if (!isNaN(n)) {
-    if (!status[n]) throw new Error('invalid status code: ' + n)
-    return n
+    return getStatusMessage(n)
   }
 
-  n = status[code.toLowerCase()]
-  if (!n) throw new Error('invalid status message: "' + code + '"')
-  return n
+  return getStatusCode(code)
 }

package/node_modules/statuses/package.json

@@ -1,25 +1,19 @@
 {
-  "_args": [
-    [
-      "statuses@1.5.0",
-      "/Users/conway/Projects/worldmap"
-    ]
-  ],
-  "_from": "statuses@1.5.0",
-  "_id": "statuses@1.5.0",
+  "_from": "statuses@2.0.1",
+  "_id": "statuses@2.0.1",
   "_inBundle": false,
-  "_integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+  "_integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
   "_location": "/statuses",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "statuses@1.5.0",
+    "raw": "statuses@2.0.1",
     "name": "statuses",
     "escapedName": "statuses",
-    "rawSpec": "1.5.0",
+    "rawSpec": "2.0.1",
     "saveSpec": null,
-    "fetchSpec": "1.5.0"
+    "fetchSpec": "2.0.1"
   },
   "_requiredBy": [
     "/express",
@@ -27,12 +21,14 @@
     "/http-errors",
     "/send"
   ],
-  "_resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-  "_spec": "1.5.0",
-  "_where": "/Users/conway/Projects/worldmap",
+  "_resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+  "_shasum": "55cb000ccf1d48728bd23c685a063998cf1a1b63",
+  "_spec": "statuses@2.0.1",
+  "_where": "/Users/conway/Projects/worldmap/node_modules/express",
   "bugs": {
     "url": "https://github.com/jshttp/statuses/issues"
   },
+  "bundleDependencies": false,
   "contributors": [
     {
       "name": "Douglas Christopher Wilson",
@@ -44,23 +40,24 @@
       "url": "http://jongleberry.com"
     }
   ],
+  "deprecated": false,
   "description": "HTTP status utility",
   "devDependencies": {
-    "csv-parse": "1.2.4",
-    "eslint": "4.19.1",
-    "eslint-config-standard": "11.0.0",
-    "eslint-plugin-import": "2.9.0",
-    "eslint-plugin-markdown": "1.0.0-beta.6",
-    "eslint-plugin-node": "6.0.1",
-    "eslint-plugin-promise": "3.7.0",
-    "eslint-plugin-standard": "3.0.1",
-    "istanbul": "0.4.5",
-    "mocha": "1.21.5",
-    "raw-body": "2.3.2",
+    "csv-parse": "4.14.2",
+    "eslint": "7.17.0",
+    "eslint-config-standard": "14.1.1",
+    "eslint-plugin-import": "2.22.1",
+    "eslint-plugin-markdown": "1.0.2",
+    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-promise": "4.2.1",
+    "eslint-plugin-standard": "4.1.0",
+    "mocha": "8.2.1",
+    "nyc": "15.1.0",
+    "raw-body": "2.4.1",
     "stream-to-array": "2.3.0"
   },
   "engines": {
-    "node": ">= 0.6"
+    "node": ">= 0.8"
   },
   "files": [
     "HISTORY.md",
@@ -85,9 +82,10 @@
     "fetch": "node scripts/fetch-apache.js && node scripts/fetch-iana.js && node scripts/fetch-nginx.js && node scripts/fetch-node.js",
     "lint": "eslint --plugin markdown --ext js,md .",
     "test": "mocha --reporter spec --check-leaks --bail test/",
-    "test-ci": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/",
-    "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/",
-    "update": "npm run fetch && npm run build"
+    "test-ci": "nyc --reporter=lcov --reporter=text npm test",
+    "test-cov": "nyc --reporter=html --reporter=text npm test",
+    "update": "npm run fetch && npm run build",
+    "version": "node scripts/version-history.js && git add HISTORY.md"
   },
-  "version": "1.5.0"
+  "version": "2.0.1"
 }

package/node_modules/unpipe/package.json

@@ -1,14 +1,8 @@
 {
-  "_args": [
-    [
-      "unpipe@1.0.0",
-      "/Users/conway/Projects/worldmap"
-    ]
-  ],
   "_from": "unpipe@1.0.0",
   "_id": "unpipe@1.0.0",
   "_inBundle": false,
-  "_integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+  "_integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
   "_location": "/unpipe",
   "_phantomChildren": {},
   "_requested": {
@@ -22,12 +16,14 @@
     "fetchSpec": "1.0.0"
   },
   "_requiredBy": [
+    "/body-parser",
     "/finalhandler",
     "/raw-body"
   ],
   "_resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-  "_spec": "1.0.0",
-  "_where": "/Users/conway/Projects/worldmap",
+  "_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"
@@ -35,6 +31,8 @@
   "bugs": {
     "url": "https://github.com/stream-utils/unpipe/issues"
   },
+  "bundleDependencies": false,
+  "deprecated": false,
   "description": "Unpipe a stream from all destinations",
   "devDependencies": {
     "istanbul": "0.3.15",

package/node_modules/utils-merge/package.json

@@ -1,14 +1,8 @@
 {
-  "_args": [
-    [
-      "utils-merge@1.0.1",
-      "/Users/conway/Projects/worldmap"
-    ]
-  ],
   "_from": "utils-merge@1.0.1",
   "_id": "utils-merge@1.0.1",
   "_inBundle": false,
-  "_integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+  "_integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
   "_location": "/utils-merge",
   "_phantomChildren": {},
   "_requested": {
@@ -25,8 +19,9 @@
     "/express"
   ],
   "_resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-  "_spec": "1.0.1",
-  "_where": "/Users/conway/Projects/worldmap",
+  "_shasum": "9f95710f50a267947b2ccc124741c1028427e713",
+  "_spec": "utils-merge@1.0.1",
+  "_where": "/Users/conway/Projects/worldmap/node_modules/express",
   "author": {
     "name": "Jared Hanson",
     "email": "jaredhanson@gmail.com",
@@ -35,7 +30,9 @@
   "bugs": {
     "url": "http://github.com/jaredhanson/utils-merge/issues"
   },
+  "bundleDependencies": false,
   "dependencies": {},
+  "deprecated": false,
   "description": "merge() utility function",
   "devDependencies": {
     "chai": "1.x.x",

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "2.29.0",
+    "version": "2.30.2",
     "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.1",
+        "express": "^4.18.2",
         "sockjs": "~0.3.24"
     },
     "bundledDependencies": [

package/worldmap/worldmap.js

@@ -33,6 +33,7 @@ var drawingColour = "#910000";
 var sendDrawing;
 var colorControl;
 var sendRoute;
+var oldBounds = {ne:{lat:0,lng:0},sw:{lat:0,lng:0}};
 
 var iconSz = {
     "Team/Crew": 24,
@@ -337,10 +338,7 @@ else {
     //     map.locate({setView:true, maxZoom:16});
     // }, "Locate me").addTo(map);
 
-    // Add the measure/ruler button
-    rulerButton.addTo(map);
-
-    // Create the clear heatmap button
+     // Create the clear heatmap button
     var clrHeat = L.easyButton( 'fa-eraser', function() {
         console.log("Reset heatmap");
         heat.setLatLngs([]);
@@ -360,6 +358,7 @@ document.getElementById('menu').innerHTML = helpMenu;
 
 // Add graticule
 var showGrid = false;
+var showRuler = false;
 var Lgrid = L.latlngGraticule({
     font: "Verdana",
     fontColor: "#666",
@@ -671,12 +670,16 @@ map.on('zoomend', function() {
     showMapCurrentZoom();
     window.localStorage.setItem("lastzoom", map.getZoom());
     var b = map.getBounds();
+    oldBounds = {sw:{lat:b._southWest.lat,lng:b._southWest.lng},ne:{lat:b._northEast.lat,lng:b._northEast.lng}};
     ws.send(JSON.stringify({action:"bounds", south:b._southWest.lat, west:b._southWest.lng, north:b._northEast.lat, east:b._northEast.lng, zoom:map.getZoom() }));
 });
 map.on('moveend', function() {
     window.localStorage.setItem("lastpos",JSON.stringify(map.getCenter()));
     var b = map.getBounds();
-    ws.send(JSON.stringify({action:"bounds", south:b._southWest.lat, west:b._southWest.lng, north:b._northEast.lat, east:b._northEast.lng, zoom:map.getZoom() }));
+    if (b._southWest.lat !== oldBounds.sw.lat && b._southWest.lng !== oldBounds.sw.lng && b._northEast.lat !== oldBounds.ne.lat && b._northEast.lng !== oldBounds.ne.lng) {
+        ws.send(JSON.stringify({action:"bounds", south:b._southWest.lat, west:b._southWest.lng, north:b._northEast.lat, east:b._northEast.lng, zoom:map.getZoom() }));
+        oldBounds = {sw:{lat:b._southWest.lat,lng:b._southWest.lng},ne:{lat:b._northEast.lat,lng:b._northEast.lng}};
+    }
 });
 map.on('locationfound', onLocationFound);
 map.on('locationerror', onLocationError);
@@ -2170,8 +2173,8 @@ function doCommand(cmd) {
             if ((cmd.grid.showgrid == "false" || cmd.grid.showgrid == false ) && showGrid) { changed = true; }
             if (changed) {
                 showGrid = !showGrid;
-                if (showGrid) { Lgrid.addTo(map); rulerButton.addTo(map); }
-                else { Lgrid.removeFrom(map); rulerButton.remove(); }
+                if (showGrid) { Lgrid.addTo(map);}
+                else { Lgrid.removeFrom(map);}
             }
         }
         if (cmd.grid.hasOwnProperty("opt")) {
@@ -2182,6 +2185,18 @@ function doCommand(cmd) {
             }
         }
     }
+    if (cmd.hasOwnProperty("ruler")) {
+        if (cmd.ruler.hasOwnProperty("showruler")) {
+            var changed = false;
+            if ((cmd.ruler.showruler == "true" || cmd.ruler.showruler == true ) && !showRuler) { changed = true; }
+            if ((cmd.ruler.showruler == "false" || cmd.ruler.showruler == false ) && showRuler) { changed = true; }
+            if (changed) {
+                showRuler = !showRuler;
+                if (showRuler) { rulerButton.addTo(map); }
+                else { rulerButton.remove(); }
+            }
+        }
+    }
     if (cmd.hasOwnProperty("button")) {
         if (!Array.isArray(cmd.button)) { cmd.button = [cmd.button]; }
         cmd.button.forEach(function(b) {

package/worldmap.html

@@ -93,6 +93,13 @@
         <option value="true">Visible</option>
     </select>
 </div>
+<div class="form-row">
+	<label for="node-input-showruler"><i class="fa fa-window-minimize"></i> Ruler</label>
+    <select id="node-input-showruler" style="width:101px;">
+        <option value="false">Not shown</option>
+        <option value="true">Visible</option>
+    </select>
+</div>
 <div class="form-row">
     <label for="node-input-path"><i class="fa fa-globe"></i> Web Path</label>
     <input type="text" id="node-input-path" placeholder="worldmap" style="width:30%;">
@@ -252,6 +259,13 @@ If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>c
         <option value="true">Visible</option>
     </select>
 </div>
+<div class="form-row">
+	<label for="node-input-showruler"><i class="fa fa-window-minimize"></i> Ruler</label>
+    <select id="node-input-showruler" style="width:101px;">
+        <option value="false">Not shown</option>
+        <option value="true">Visible</option>
+    </select>
+</div>
 <div class="form-row">
     <label for="node-input-path"><i class="fa fa-globe"></i> Web Path</label>
     <input type="text" id="node-input-path" placeholder="worldmap" style="width:30%;">
@@ -364,6 +378,7 @@ If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>c
             hiderightclick: {value:"false"},
             coords: {value:"false"},
             showgrid: {value:"false"},
+			showruler: {value:"false"},
             allowFileDrop: {value:"false"},
             path: {value:"/worldmap"},
             overlist: {value:"DR,CO,RA,DN,HM"},
@@ -477,6 +492,7 @@ If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>c
                     hiderightclick: {value:"true"},
                     coords: {value:"false"},
                     showgrid: {value:"false"},
+					showruler: {value:"false"},
                     allowFileDrop: {value:"false"},
                     path: {value:"/worldmap"},
                     overlist: {value:"DR,CO,RA,DN,HM"},
@@ -522,7 +538,7 @@ If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>c
                         options: olist
                     }]});
                     $("#node-input-maplist").on('change', function(event, type, value) {
-                        if (value.indexOf("MB3d") > -1) {
+                        if (value && value.indexOf("MB3d") > -1) {
                             mshort = [{ value:"MB3d", label:"Mapbox 3D" }];
                             $('#node-input-maplist option').prop('selected', false);
                             $("#node-input-maplist").val("MB3d");