node-red-contrib-web-worldmap 2.24.0 → 2.25.0

package/worldmap/worldmap.js

@@ -565,8 +565,8 @@ map.on('overlayadd', function(e) {
     }
     if (e.name == "drawing") {
         overlays["drawing"].bringToFront();
-        map.addControl(drawControl);
         map.addControl(colorControl);
+        map.addControl(drawControl);
     }
     ws.send(JSON.stringify({action:"addlayer", name:e.name}));
 });
@@ -579,8 +579,8 @@ map.on('overlayremove', function(e) {
         layers["_daynight"].clearLayers();
     }
     if (e.name == "drawing") {
-        map.removeControl(colorControl);
         map.removeControl(drawControl);
+        map.removeControl(colorControl);
     }
     ws.send(JSON.stringify({action:"dellayer", name:e.name}));
 });
@@ -922,13 +922,15 @@ var addOverlays = function(overlist) {
     // Add the drawing layer...
     if (overlist.indexOf("DR")!==-1) {
         //var colorPickButton = L.easyButton({states:[{icon:'fa-tint fa-lg', onClick:function() { console.log("PICK"); }, title:'Pick Colour'}]});
-        var redButton = L.easyButton('fa-square wm-red', function(btn) { changeDrawColour("#E7827F"); })
-        var blueButton = L.easyButton('fa-square wm-blue', function(btn) { changeDrawColour("#94CCE2"); })
-        var greenButton = L.easyButton('fa-square wm-green', function(btn) { changeDrawColour("#ACD6A4"); })
-        var yellowButton = L.easyButton('fa-square wm-yellow', function(btn) { changeDrawColour("#F5F08B"); })
-        var blackButton = L.easyButton('fa-square wm-black', function(btn) { changeDrawColour("#444444"); })
+        var redButton = L.easyButton('fa-square wm-red', function(btn) { changeDrawColour("#FF4040"); })
+        var blueButton = L.easyButton('fa-square wm-blue', function(btn) { changeDrawColour("#4040F0"); })
+        var greenButton = L.easyButton('fa-square wm-green', function(btn) { changeDrawColour("#40D040"); })
+        var yellowButton = L.easyButton('fa-square wm-yellow', function(btn) { changeDrawColour("#FFFF40"); })
+        var cyanButton = L.easyButton('fa-square wm-cyan', function(btn) { changeDrawColour("#40F0F0"); })
+        var magentaButton = L.easyButton('fa-square wm-magenta', function(btn) { changeDrawColour("#F040F0"); })
+        var blackButton = L.easyButton('fa-square wm-black', function(btn) { changeDrawColour("#000000"); })
         var whiteButton = L.easyButton('fa-square wm-white', function(btn) { changeDrawColour("#EEEEEE"); })
-        colorControl = L.easyBar([redButton,blueButton,greenButton,yellowButton,blackButton,whiteButton]);
+        colorControl = L.easyBar([redButton,blueButton,greenButton,yellowButton,cyanButton,magentaButton,blackButton,whiteButton]);
 
         layers["_drawing"] = new L.FeatureGroup();
         overlays["drawing"] = layers["_drawing"];
@@ -953,7 +955,7 @@ var addOverlays = function(overlist) {
         });
         var changeDrawColour = function(col) {
             drawingColour = col;
-            console.log("COL",col)
+            console.log("COLOR",col)
             drawControl.setDrawingOptions({
                 polyline: { shapeOptions: { color:drawingColour } },
                 circle: { shapeOptions: { color:drawingColour } },
@@ -1446,7 +1448,7 @@ function setMarker(data) {
     }
     if (data.hasOwnProperty("greatcircle") && Array.isArray(data.greatcircle) && data.greatcircle.length === 2) {
         delete opt.fill;
-        opt.vertices = 500;
+        opt.vertices = opt.vertices || 100;
         if (!data.hasOwnProperty("weight")) { opt.weight = 3; }    //Standard settings different for lines
         if (!data.hasOwnProperty("opacity")) { opt.opacity = 0.8; }
         var greatc = L.Polyline.Arc(data.greatcircle[0], data.greatcircle[1], opt);
@@ -1465,7 +1467,8 @@ function setMarker(data) {
         if (data.hasOwnProperty("lat") && data.hasOwnProperty("lon")) {
             var polycirc;
             if (Array.isArray(data.radius)) {
-                polycirc = L.ellipse(new L.LatLng((data.lat*1), (data.lon*1)), [data.radius[0]*Math.cos(data.lat*Math.PI/180), data.radius[1]], data.tilt || 0, opt);
+                //polycirc = L.ellipse(new L.LatLng((data.lat*1), (data.lon*1)), [data.radius[0]*Math.cos(data.lat*Math.PI/180), data.radius[1]], data.tilt || 0, opt);
+                polycirc = L.ellipse(new L.LatLng((data.lat*1), (data.lon*1)), [data.radius[0], data.radius[1]], data.tilt || 0, opt);
             }
             else {
                 polycirc = L.circle(new L.LatLng((data.lat*1), (data.lon*1)), data.radius*1, opt);
@@ -2084,7 +2087,7 @@ function setMarker(data) {
 function doCommand(cmd) {
     // console.log("COMMAND",cmd);
     if (cmd.init && cmd.hasOwnProperty("maplist")) {
-        basemaps = [];
+        //basemaps = {};
         addBaseMaps(cmd.maplist,cmd.layer);
     }
     if (cmd.init && cmd.hasOwnProperty("overlist")) {
@@ -2619,6 +2622,11 @@ function doCommand(cmd) {
             map.touchZoom.enable();
         }
     }
+    if (cmd.hasOwnProperty("bounds")) {            // Move/Zoom map to new bounds
+        if (cmd.bounds.length === 2 && cmd.bounds[0].length === 2 && cmd.bounds[1].length === 2) {
+            map.fitBounds(cmd.bounds);
+        }
+    }
 }
 
 // handle any incoming GEOJSON directly - may style badly
@@ -2649,7 +2657,7 @@ function doGeojson(n,g,l,o) {
             st.fillColor = feature.style["fill-color"] || feature.style["fill"] || st.fillColor;
             st.fillOpacity = feature.style["fill-opacity"] || st.fillOpacity;
         }
-        if (feature.hasOwnProperty("geometry") && feature.geometry.hasOwnProperty("type") && feature.geometry.type === "LineString") {
+        if (feature.hasOwnProperty("geometry") && feature.geometry.hasOwnProperty("type") && (feature.geometry.type === "LineString" || feature.geometry.type === "MultiLineString")  ) {
             st.fill = false;
         }
         return st;

package/node_modules/http-parser-js/README.md

@@ -1,39 +0,0 @@
-![Node](https://github.com/creationix/http-parser-js/workflows/Node/badge.svg)
-![Node-v12](https://github.com/creationix/http-parser-js/workflows/Node-v12/badge.svg)
-
-# HTTP Parser
-
-This library parses HTTP protocol for requests and responses.
-It was created to replace `http_parser.c` since calling C++ functions from JS is really slow in V8.
-However, it is now primarily useful in having a more flexible/tolerant HTTP parser when dealing with legacy services that do not meet the strict HTTP parsing rules Node's parser follows.
-
-This is packaged as a standalone npm module.
-To use in node, monkeypatch HTTPParser.
-
-```js
-// Monkey patch before you require http for the first time.
-process.binding('http_parser').HTTPParser = require('http-parser-js').HTTPParser;
-
-var http = require('http');
-// ...
-```
-
-## Testing
-
-Simply run `npm test`.
-The tests are copied from node and mscedex/io.js, with some modifcations.
-
-## Status
-
-This should now be usable in any node application, it now supports (nearly) everything `http_parser.c` does while still being tolerant with corrupted headers, and other kinds of malformed data.
-
-### Node versions
-
-`http-parser-js` should work via monkey-patching on Node v6-v11, and v13-14.
-
-Node v12.x renamed the internal http parser, and did not expose it for monkey-patching, so to be able to monkey-patch on Node v12, you must run `node --http-parser=legacy file.js` to opt in to the old, monkey-patchable http_parser binding.
-
-## License
-
-MIT.
-See [LICENSE.md](LICENSE.md)

package/node_modules/http-parser-js/http-parser.d.ts

@@ -1,175 +0,0 @@
-type ParserType =
-  | 'REQUEST'
-  | 'RESPONSE'
-
-type RequestMethod =
-  | 'DELETE'
-  | 'GET'
-  | 'HEAD'
-  | 'POST'
-  | 'PUT'
-  | 'CONNECT'
-  | 'OPTIONS'
-  | 'TRACE'
-  | 'COPY'
-  | 'LOCK'
-  | 'MKCOL'
-  | 'MOVE'
-  | 'PROPFIND'
-  | 'PROPPATCH'
-  | 'SEARCH'
-  | 'UNLOCK'
-  | 'BIND'
-  | 'REBIND'
-  | 'UNBIND'
-  | 'ACL'
-  | 'REPORT'
-  | 'MKACTIVITY'
-  | 'CHECKOUT'
-  | 'MERGE'
-  | 'M-SEARCH'
-  | 'NOTIFY'
-  | 'SUBSCRIBE'
-  | 'UNSUBSCRIBE'
-  | 'PATCH'
-  | 'PURGE'
-  | 'MKCALENDAR'
-  | 'LINK'
-  | 'UNLINK'
-  | string
-
-type StateHeaderKey =
-  | 'REQUEST_LINE'
-  | 'RESPONSE_LINE'
-  | 'HEADER'
-
-type StateFinishAllowedKey =
-  | 'REQUEST_LINE'
-  | 'RESPONSE_LINE'
-  | 'BODY_RAW'
-
-type HeaderObject = Record<string, string>
-type noop<T = void> = ()=> T
-
-type HeaderInfo<HEADER = HeaderObject> = {
-  versionMajor: number
-  versionMinor: number
-  headers: HEADER
-  method: RequestMethod
-  url: string
-  statusCode: number
-  statusMessage: string
-  upgrade: boolean
-  shouldKeepAlive: boolean
-}
-export type OnHeadersCompleteParser<HEADER = HeaderObject, Mode_0_12 extends boolean = true> = Mode_0_12 extends true
-  ? (info: HeaderInfo<HEADER>)=> number
-  : (
-    versionMajor: number,
-    versionMinor: number,
-    headers: HEADER,
-    method: RequestMethod,
-    url: string,
-    statusCode: number,
-    statusMessage: string,
-    upgrade: boolean,
-    shouldKeepAlive: boolean,
-  )=> number
-export type OnBodyParser = (chunk: Buffer, offset: number, length: number)=> void
-// Only called in the slow case where slow means
-// that the request headers were either fragmented
-// across multiple TCP packets or too large to be
-// processed in a single run. This method is also
-// called to process trailing HTTP headers.
-export type OnHeadersParser = (headers: string[], url: string)=> void
-
-declare class HTTPParserJS {
-  initialize(type: ParserType, async_resource?: unknown): void
-
-  // Some handler stubs, needed for compatibility
-  [HTTPParser.kOnHeaders]: OnHeadersParser
-  [HTTPParser.kOnHeadersComplete]: OnHeadersCompleteParser
-  [HTTPParser.kOnBody]: OnBodyParser
-  [HTTPParser.kOnMessageComplete]: noop
-
-  reinitialize: HTTPParserConstructor
-  close: noop
-  pause: noop
-  resume: noop
-  free: noop
-  private _compatMode0_11: false | boolean
-  getAsyncId: noop<0>
-
-  execute(chunk: Buffer, start?: number, length?: number): number | Error
-  finish(): void | Error
-
-  // These three methods are used for an internal speed optimization, and it also
-  // works if theses are noops. Basically consume() asks us to read the bytes
-  // ourselves, but if we don't do it we get them through execute().
-  consume: noop
-  unconsume: noop
-  getCurrentBuffer: noop
-
-  /**
-   * For correct error handling - see HTTPParser#execute
-   * @example this.userCall()(userFunction('arg'));
-   */
-  userCall<T = unknown>(): (ret?: T)=> T
-  private nextRequest: noop
-  private consumeLine: noop<string|void>
-  parseHeader(line: string, headers: string[]): void
-  private REQUEST_LINE: noop
-  private RESPONSE_LINE: noop
-  shouldKeepAlive(): boolean
-  /**
-   * For older versions of node (v6.x and older?), that return `skipBody=1` or `skipBody=true`, need this `return true;` if it's an upgrade request.
-   */
-  private HEADER(): void | boolean
-  private BODY_CHUNKHEAD(): void
-  private BODY_CHUNK(): void
-  private BODY_CHUNKEMPTYLINE(): void
-  private BODY_CHUNKTRAILERS(): void
-  private BODY_RAW(): void
-  private BODY_SIZED(): void
-
-  get onHeaders(): OnHeadersParser
-  set onHeaders(to: OnHeadersParser)
-
-  get onHeadersComplete(): OnHeadersCompleteParser
-  set onHeadersComplete(to: OnHeadersCompleteParser)
-
-  get onBody(): OnBodyParser
-  set onBody(to: OnBodyParser)
-
-  get onMessageComplete(): noop
-  set onMessageComplete(to: noop)
-}
-
-interface HTTPParserConstructor extends Function {
-  new(type?: ParserType): HTTPParserJS
-  (type?: ParserType): void
-
-  readonly prototype: HTTPParserJS
-
-  readonly REQUEST: 'REQUEST'
-  readonly RESPONSE: 'RESPONSE'
-  readonly methods: RequestMethod[]
-
-  encoding: 'ascii'|string
-  /**
-   * maxHeaderSize (in bytes) is configurable, but 80kb by default;
-   * @default 80 * 1024 = 80kb
-   */
-  maxHeaderSize: 81920|number
-
-  // Note: *not* starting with kOnHeaders=0 line the Node parser, because any
-  // newly added constants (kOnTimeout in Node v12.19.0) will overwrite 0!
-  readonly kOnHeaders: 1
-  readonly kOnHeadersComplete: 2
-  readonly kOnBody: 3
-  readonly kOnMessageComplete: 4
-
-  kOnExecute(): void
-}
-export const HTTPParser: HTTPParserConstructor
-export const methods: RequestMethod[]