node-red-contrib-web-worldmap 2.23.0 → 2.23.1

package/CHANGELOG.md

@@ -1,5 +1,6 @@
 ### Change Log for Node-RED Worldmap
 
+ - v2.23.1 - Fix saving of custom map layer
  - v2.23.0 - Give logo and id so it can be overridden by toplogo command. PR #188.
  - v2.22.3 - Don't show empty popup for geojson object. Issue #186. Add wobble to null island.
  - v2.22.2 - Be more tolerant of speed string types

package/README.md

@@ -11,6 +11,7 @@ map web page for plotting "things" on.
 
 ### Updates
 
+- v2.23.1 - Fix saving of custom map layer
 - v2.23.0 - Give logo and id so it can be overridden by toplogo command. PR #188.
 - v2.22.3 - Don't show empty popup for geojson object. Issue #186. Add wobble to null island.
 - v2.22.2 - Be more tolerant of speed string types

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "2.23.0",
+    "version": "2.23.1",
     "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/index3d.html

@@ -6,8 +6,8 @@
     <meta name='viewport' content='initial-scale=1,maximum-scale=1,user-scalable=no'/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <script src="leaflet/sockjs.min.js"></script>
-    <script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.46.0/mapbox-gl.js'></script>
-    <link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.46.0/mapbox-gl.css' rel='stylesheet'/>
+    <script src='https://api.tiles.mapbox.com/mapbox-gl-js/v2.6.1/mapbox-gl.js'></script>
+    <link href='https://api.tiles.mapbox.com/mapbox-gl-js/v2.6.1/mapbox-gl.css' rel='stylesheet'/>
     <style>
         body { margin:0; padding:0; }
         #map { position:absolute; top:0; bottom:0; width:100%; }
@@ -17,11 +17,21 @@
 <div id='map'></div>
 <script>
 
-// If you have a mapbox API key it may be better to use that - uncomment these lines and comment out the mbstyle below.
-// mapboxgl.accessToken = 'insert your key here';
-// var mbstyle = 'mapbox://styles/mapbox/streets-v9';
+// TO MAKE THE MAP APPEAR YOU MUST ADD YOUR ACCESS TOKEN FROM https://account.mapbox.com
+mapboxgl.accessToken = '';
+//mapboxgl.accessToken = 'pk.eyJ1IjoiZGNlZWpheSIsImEiOiJjaml1aDR6ejQwMml0M3dtdGFlbmEyZHVpIn0.3aD-974hxir335vuLjHOSg';
+mapboxgl.accessToken = 'pk.eyJ1Ijoib3NtYnVpbGRpbmdzIiwiYSI6IjNldU0tNDAifQ.c5EU_3V8b87xO24tuWil0w';
+// if (process.env.MAPBOXGL_TOKEN) {
+//     mapboxgl.accessToken = process.env.MAPBOXGL_TOKEN
+// }
 
-var mbstyle = 'https://data.osmbuildings.org/0.2/anonymous/style.json';
+if (mapboxgl.accessToken === "") {
+    alert("To make the map apperar you must add your Access Token from https://account.mapbox.com")
+}
+
+var mbstyle = 'mapbox://styles/mapbox/streets-v10';
+// var mbstyle = 'mapbox://styles/mapbox/light-v10';
+// var mbstyle = 'https://data.osmbuildings.org/0.2/anonymous/style.json';
 
 var map = new mapboxgl.Map({
     container: 'map',
@@ -35,7 +45,6 @@ var map = new mapboxgl.Map({
 
 var people = {};
 
-
 map.on('load', function() {
 
     var layers = map.getStyle().layers;
@@ -65,7 +74,7 @@ map.on('load', function() {
                 "interpolate", ["linear"], ["zoom"],
                 15, 0, 15.05, ["get", "min_height"]
             ],
-            'fill-extrusion-opacity': .3
+            'fill-extrusion-opacity': .4
         }
     }, firstSymbolId);
 
@@ -199,8 +208,8 @@ map.on('load', function() {
         //console.log({p},{t},{fac},{base},{tall});
         var sin = 1;
         var cos = 0;
-        p.hdg = p.hdg || p.heading;
-        if (p.hasOwnProperty("hdg")) {
+        p.hdg = Number(p.hdg || p.heading);
+        if (p.hasOwnProperty("hdg") && !isNaN(p.hdg)) {
             sin = Math.sin((90 - p.hdg) * Math.PI / 180);
             cos = Math.cos((90 - p.hdg) * Math.PI / 180);
         }