node-red-contrib-web-worldmap 2.35.0 → 2.37.0

package/node_modules/vary/package.json

@@ -1,41 +1,15 @@
 {
-  "_args": [
-    [
-      "vary@1.1.2",
-      "/Users/conway/Projects/worldmap"
-    ]
-  ],
-  "_from": "vary@1.1.2",
-  "_id": "vary@1.1.2",
-  "_inBundle": false,
-  "_integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-  "_location": "/vary",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "version",
-    "registry": true,
-    "raw": "vary@1.1.2",
-    "name": "vary",
-    "escapedName": "vary",
-    "rawSpec": "1.1.2",
-    "saveSpec": null,
-    "fetchSpec": "1.1.2"
-  },
-  "_requiredBy": [
-    "/compression",
-    "/express"
-  ],
-  "_resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-  "_spec": "1.1.2",
-  "_where": "/Users/conway/Projects/worldmap",
-  "author": {
-    "name": "Douglas Christopher Wilson",
-    "email": "doug@somethingdoug.com"
-  },
-  "bugs": {
-    "url": "https://github.com/jshttp/vary/issues"
-  },
+  "name": "vary",
   "description": "Manipulate the HTTP Vary header",
+  "version": "1.1.2",
+  "author": "Douglas Christopher Wilson <doug@somethingdoug.com>",
+  "license": "MIT",
+  "keywords": [
+    "http",
+    "res",
+    "vary"
+  ],
+  "repository": "jshttp/vary",
   "devDependencies": {
     "beautify-benchmark": "0.2.4",
     "benchmark": "2.1.4",
@@ -50,26 +24,14 @@
     "mocha": "2.5.3",
     "supertest": "1.1.0"
   },
-  "engines": {
-    "node": ">= 0.8"
-  },
   "files": [
     "HISTORY.md",
     "LICENSE",
     "README.md",
     "index.js"
   ],
-  "homepage": "https://github.com/jshttp/vary#readme",
-  "keywords": [
-    "http",
-    "res",
-    "vary"
-  ],
-  "license": "MIT",
-  "name": "vary",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/jshttp/vary.git"
+  "engines": {
+    "node": ">= 0.8"
   },
   "scripts": {
     "bench": "node benchmark/index.js",
@@ -77,6 +39,5 @@
     "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.1.2"
+  }
 }

package/node_modules/websocket-driver/node_modules/http-parser-js/package.json

@@ -1,75 +1,28 @@
 {
-  "_args": [
-    [
-      "http-parser-js@0.5.2",
-      "/Users/conway/.node-red"
-    ]
-  ],
-  "_from": "http-parser-js@0.5.2",
-  "_id": "http-parser-js@0.5.2",
-  "_inBundle": false,
-  "_integrity": "sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==",
-  "_location": "/node-red-contrib-web-worldmap/websocket-driver/http-parser-js",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "version",
-    "registry": true,
-    "raw": "http-parser-js@0.5.2",
-    "name": "http-parser-js",
-    "escapedName": "http-parser-js",
-    "rawSpec": "0.5.2",
-    "saveSpec": null,
-    "fetchSpec": "0.5.2"
-  },
-  "_requiredBy": [
-    "/node-red-contrib-web-worldmap/websocket-driver"
-  ],
-  "_resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz",
-  "_spec": "0.5.2",
-  "_where": "/Users/conway/.node-red",
-  "author": {
-    "name": "Tim Caswell",
-    "url": "https://github.com/creationix"
+  "name": "http-parser-js",
+  "version": "0.5.2",
+  "description": "A pure JS HTTP parser for node.",
+  "main": "http-parser.js",
+  "scripts": {
+    "test": "python tests/test.py && node tests/iojs/test-http-parser-durability.js",
+    "testv12": "python tests/test.py --node-args=\"--http-parser=legacy\" && node --http-parser=legacy tests/iojs/test-http-parser-durability.js"
   },
-  "bugs": {
-    "url": "https://github.com/creationix/http-parser-js/issues"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/creationix/http-parser-js.git"
   },
-  "contributors": [
-    {
-      "name": "Jimb Esser",
-      "url": "https://github.com/Jimbly"
-    },
-    {
-      "name": "Lawrence Rowe",
-      "url": "https://github.com/lrowe"
-    },
-    {
-      "name": "Jan Schär",
-      "url": "https://github.com/jscissr"
-    },
-    {
-      "name": "Paul Rütter",
-      "url": "https://github.com/paulrutter"
-    }
-  ],
-  "description": "A pure JS HTTP parser for node.",
   "files": [
     "http-parser.js"
   ],
-  "homepage": "https://github.com/creationix/http-parser-js#readme",
   "keywords": [
     "http"
   ],
-  "license": "MIT",
-  "main": "http-parser.js",
-  "name": "http-parser-js",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/creationix/http-parser-js.git"
-  },
-  "scripts": {
-    "test": "python tests/test.py && node tests/iojs/test-http-parser-durability.js",
-    "testv12": "python tests/test.py --node-args=\"--http-parser=legacy\" && node --http-parser=legacy tests/iojs/test-http-parser-durability.js"
-  },
-  "version": "0.5.2"
+  "author": "Tim Caswell (https://github.com/creationix)",
+  "contributors": [
+    "Jimb Esser (https://github.com/Jimbly)",
+    "Lawrence Rowe (https://github.com/lrowe)",
+    "Jan Schär (https://github.com/jscissr)",
+    "Paul Rütter (https://github.com/paulrutter)"
+  ],
+  "license": "MIT"
 }

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.35.0",
+    "version": "2.37.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

@@ -33,7 +33,9 @@ var drawingColour = "#910000";
 var sendDrawing;
 var colorControl;
 var sendRoute;
-var oldBounds = {ne:{lat:0,lng:0},sw:{lat:0,lng:0}};
+var oldBounds = {ne:{lat:0, lng:0}, sw:{lat:0, lng:0}};
+var edgeLayer = new L.layerGroup();
+var edgeEnabled = true;
 
 var iconSz = {
     "Team/Crew": 24,
@@ -371,6 +373,69 @@ 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() {
+    if (!edgeEnabled) { return; }
+	map.removeLayer(edgeLayer)
+	edgeLayer = new L.layerGroup();
+	var mapBounds = map.getBounds();
+	var mapBoundsCenter = mapBounds.getCenter();
+
+	pSW = map.options.crs.latLngToPoint(mapBounds.getSouthWest(), map.getZoom());
+	pNE = map.options.crs.latLngToPoint(mapBounds.getNorthEast(), map.getZoom());
+	pCenter = map.options.crs.latLngToPoint(mapBoundsCenter, map.getZoom());
+
+	var viewBounds = L.latLngBounds(map.options.crs.pointToLatLng(L.point(pSW.x - (pCenter.x - pSW.x ), pSW.y - (pCenter.y - pSW.y )), map.getZoom()) , map.options.crs.pointToLatLng(L.point(pNE.x + (pNE.x - pCenter.x) , pNE.y + (pNE.y - pCenter.y) ), map.getZoom()) );
+	for (var id in markers) {
+        if (allData[id].hasOwnProperty("SIDC")) {
+            markerLatLng = markers[id].getLatLng();
+            if ( viewBounds.contains(markerLatLng) && !mapBounds.contains(markerLatLng) ) {
+                var k = (markerLatLng.lat - mapBoundsCenter.lat) / (markerLatLng.lng - mapBoundsCenter.lng);
+
+                if (markerLatLng.lng > mapBoundsCenter.lng) { x = mapBounds.getEast() - mapBoundsCenter.lng; }
+                else { x = (mapBounds.getWest() - mapBoundsCenter.lng); }
+
+                if (markerLatLng.lat < mapBoundsCenter.lat) { y = mapBounds.getSouth() - mapBoundsCenter.lat; }
+                else { y = mapBounds.getNorth() - mapBoundsCenter.lat; }
+
+                var lat = (mapBoundsCenter.lat + (k * x));
+                var lng = (mapBoundsCenter.lng + (y / k));
+                var iconAnchor = {x:5, y:5}
+
+                if (lng > mapBounds.getEast()) {
+                    lng = mapBounds.getEast();
+                    iconAnchor.x = 20;
+                }
+                if (lng < mapBounds.getWest()) {
+                    lng = mapBounds.getWest();
+                    iconAnchor.x = -5;
+                };
+                if (lat < mapBounds.getSouth()) {
+                    lat = mapBounds.getSouth();
+                    iconAnchor.y = 15;
+                }
+                if (lat > mapBounds.getNorth()) {
+                    lat = mapBounds.getNorth();
+                    iconAnchor.y = -5;
+                };
+
+                var eico = new ms.Symbol(allData[id].SIDC.substr(0,5)+"-------",{size:9});
+                var myicon = L.icon({
+                    iconUrl: eico.toDataURL(),
+                    iconAnchor: new L.Point(iconAnchor.x, iconAnchor.y),
+                    className: "natoicon-s",
+                });
+
+                edgeLayer.addLayer(L.marker([lat,lng],{icon:myicon}))
+            }
+        }
+	}
+	edgeLayer.addTo(map)
+}
+// end of edge function
+
 var panit = false;
 function doPanit(v) {
     if (v !== undefined) { panit = v; }
@@ -672,6 +737,7 @@ map.on('zoomend', function() {
     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() }));
+    edgeAware();
 });
 map.on('moveend', function() {
     window.localStorage.setItem("lastpos",JSON.stringify(map.getCenter()));
@@ -680,6 +746,7 @@ map.on('moveend', function() {
         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}};
     }
+    edgeAware();
 });
 map.on('locationfound', onLocationFound);
 map.on('locationerror', onLocationError);
@@ -1468,7 +1535,9 @@ function setMarker(data) {
         if (!data.hasOwnProperty("opacity")) { opt.opacity = 0.8; }
         var polyln = L.polyline(data.line, opt);
         polygons[data.name] = rightmenu(polyln);
-        if (data.hasOwnProperty("fit") && data.fit === true) {
+        if (data.hasOwnProperty("fly") && data.fly === true) {
+            map.flyToBounds(polygons[data.name].getBounds(),{padding:[50,50]})
+        } else if (data.hasOwnProperty("fit") && data.fit === true) {
             map.fitBounds(polygons[data.name].getBounds(),{padding:[50,50]})
         }
     }
@@ -1477,7 +1546,9 @@ function setMarker(data) {
         if (data.area.length === 2) { polyarea = L.rectangle(data.area, opt); }
         else { polyarea = L.polygon(data.area, opt); }
         polygons[data.name] = rightmenu(polyarea);
-        if (data.hasOwnProperty("fit") && data.fit === true) {
+        if (data.hasOwnProperty("fly") && data.fly === true) {
+            map.flyToBounds(polygons[data.name].getBounds(),{padding:[50,50]})
+        } else if (data.hasOwnProperty("fit") && data.fit === true) {
             map.fitBounds(polygons[data.name].getBounds(),{padding:[50,50]})
         }
     }
@@ -1490,7 +1561,9 @@ function setMarker(data) {
         var aml = new L.Wrapped.Polyline(greatc._latlngs, opt);
 
         polygons[data.name] = rightmenu(aml);
-        if (data.hasOwnProperty("fit") && data.fit === true) {
+        if (data.hasOwnProperty("fly") && data.fly === true) {
+            map.flyToBounds(polygons[data.name].getBounds(),{padding:[50,50]})
+        } else if (data.hasOwnProperty("fit") && data.fit === true) {
             map.fitBounds(polygons[data.name].getBounds(),{padding:[50,50]})
         }
     }
@@ -1871,6 +1944,7 @@ function setMarker(data) {
             className: "natoicon",
         });
         marker =  L.marker(ll, { title:data.name, icon:myicon, draggable:drag });
+        edgeAware();
     }
     else {
         myMarker = L.VectorMarkers.icon({
@@ -2389,7 +2463,8 @@ function doCommand(cmd) {
         if (!cmd.map.hasOwnProperty("visible") || (cmd.map.visible != false)) {
             map.addLayer(overlays[cmd.map.overlay]);
         }
-        if (cmd.map.hasOwnProperty("fit") && (cmd.map.fit === true)) { map.fitBounds(overlays[cmd.map.overlay].getBounds()); }
+        if (cmd.map.hasOwnProperty("fly") && (cmd.map.fly === true)) { map.flyToBounds(overlays[cmd.map.overlay].getBounds()); }
+        else if (cmd.map.hasOwnProperty("fit") && (cmd.map.fit === true)) { map.fitBounds(overlays[cmd.map.overlay].getBounds()); }
     }
     // Add a new NVG XML overlay layer
     if (cmd.map && cmd.map.hasOwnProperty("overlay") && cmd.map.hasOwnProperty("nvg") ) {
@@ -2460,7 +2535,8 @@ function doCommand(cmd) {
         if (!cmd.map.hasOwnProperty("visible") || (cmd.map.visible != false)) {
             map.addLayer(overlays[cmd.map.overlay]);
         }
-        if (cmd.map.hasOwnProperty("fit")) { map.fitBounds(overlays[cmd.map.overlay].getBounds()); }
+        if (cmd.map.hasOwnProperty("fly") && cmd.map.fly === true) { map.flyToBounds(overlays[cmd.map.overlay].getBounds()); }
+        else if (cmd.map.hasOwnProperty("fit") && cmd.map.fit === true) { map.fitBounds(overlays[cmd.map.overlay].getBounds()); }
     }
 
     var custIco = function() {
@@ -2510,7 +2586,8 @@ function doCommand(cmd) {
         if (!cmd.map.hasOwnProperty("visible") || (cmd.map.visible != false)) {
             overlays[cmd.map.overlay].addTo(map);
         }
-        if (cmd.map.hasOwnProperty("fit")) { map.fitBounds(overlays[cmd.map.overlay].getBounds()); }
+        if (cmd.map.hasOwnProperty("fly") && cmd.map.fly === true) { map.flyToBounds(overlays[cmd.map.overlay].getBounds()); }
+        else if (cmd.map.hasOwnProperty("fit") && cmd.map.fit === true) { map.fitBounds(overlays[cmd.map.overlay].getBounds()); }
     }
     // Add a new TOPOJSON overlay layer
     if (cmd.map && cmd.map.hasOwnProperty("overlay") && cmd.map.hasOwnProperty("topojson") ) {
@@ -2525,7 +2602,8 @@ function doCommand(cmd) {
         if (!cmd.map.hasOwnProperty("visible") || (cmd.map.visible != false)) {
             overlays[cmd.map.overlay].addTo(map);
         }
-        if (cmd.map.hasOwnProperty("fit")) { map.fitBounds(overlays[cmd.map.overlay].getBounds()); }
+        if (cmd.map.hasOwnProperty("fly") && cmd.map.fly === true) { map.flyToBounds(overlays[cmd.map.overlay].getBounds()); }
+        else if (cmd.map.hasOwnProperty("fit") && cmd.map.fit === true) { map.fitBounds(overlays[cmd.map.overlay].getBounds()); }
     }
     // Add a new GPX overlay layer
     if (cmd.map && cmd.map.hasOwnProperty("overlay") && cmd.map.hasOwnProperty("gpx") ) {
@@ -2540,7 +2618,8 @@ function doCommand(cmd) {
         if (!cmd.map.hasOwnProperty("visible") || (cmd.map.visible != false)) {
             overlays[cmd.map.overlay].addTo(map);
         }
-        if (cmd.map.hasOwnProperty("fit")) { map.fitBounds(overlays[cmd.map.overlay].getBounds()); }
+        if (cmd.map.hasOwnProperty("fly") && cmd.map.fly === true) { map.flyToBounds(overlays[cmd.map.overlay].getBounds()); }
+        else if (cmd.map.hasOwnProperty("fit") && cmd.map.fit === true) { map.fitBounds(overlays[cmd.map.overlay].getBounds()); }
     }
     // Add a new velocity overlay layer
     if (cmd.map && cmd.map.hasOwnProperty("overlay") && cmd.map.hasOwnProperty("velocity") ) {
@@ -2553,7 +2632,8 @@ function doCommand(cmd) {
         if (!cmd.map.hasOwnProperty("visible") || (cmd.map.visible != false)) {
             overlays[cmd.map.overlay].addTo(map);
         }
-        if (cmd.map.hasOwnProperty("fit")) { map.fitBounds(overlays[cmd.map.overlay].getBounds()); }
+        if (cmd.map.hasOwnProperty("fly") && cmd.map.fly === true) { map.flyToBounds(overlays[cmd.map.overlay].getBounds()); }
+        else if (cmd.map.hasOwnProperty("fit") && cmd.map.fit === true) { map.fitBounds(overlays[cmd.map.overlay].getBounds()); }
     }
     // Add a new overlay layer
     if (cmd.map && cmd.map.hasOwnProperty("overlay") && cmd.map.hasOwnProperty("url") && cmd.map.hasOwnProperty("opt")) {
@@ -2699,7 +2779,11 @@ function doCommand(cmd) {
     }
     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);
+            if (cmd.hasOwnProperty("fly") && cmd.fly === true) {
+                map.flyToBounds(cmd.bounds);
+            } else {
+                map.fitBounds(cmd.bounds);
+            }
         }
     }
 }