Fix list of maps to be in sync

to close dceejay#166

Author: Dave Conway-Jones

CHANGELOG.md

@@ -1,5 +1,6 @@
 ### Change Log for Node-RED Worldmap
 
+ - v2.13.4 - Fix list of map choices to be in sync. Fix popup auto sizing.
  - v2.13.3 - Fix unchanged layer propagation.
  - v2.13.2 - Add mayflower icon.
  - v2.13.0 - Tidy velocity layer. Feedback any url parameters.

README.md

@@ -11,6 +11,7 @@ map web page for plotting "things" on.
 
 ### Updates
 
+- v2.13.4 - Fix list of map choices to be in sync. Fix popup auto sizing.
 - v2.13.3 - Fix unchanged layer propagation.
 - v2.13.2 - Add mayflower icon.
 - v2.13.0 - Tidy velocity layer. Feedback any url parameters.
@@ -20,16 +21,6 @@ map web page for plotting "things" on.
 - v2.11.1 - Better handle KML point info - add popup.
 - v2.11.0 - Add option to smooth tracks using bezier curves.
 - v2.10.0 - Save latest position to browser for refresh if in iframe/dashboard. Allow fractional Zoom levels.
-- v2.9.0 - Let weblinks be an array of links. Add more info to readme about Mapservers.
-- v2.8.9 - Only load cgi module if we have a local mapserv file.
-- v2.8.8 - Change length of speed leader to show where you will be in 1 min if speed in m/s.
-- v2.8.7 - Delay start of ui widget.
-- v2.8.6 - Better checking of type property before guessing it's geojson. Issue #153
-- v2.8.4 - Add addToForm(n,v) option and $form - to make contextmenu form submission easier.
-- v2.8.3 - Let feedback include lat lon for context menu on general map.
-- v2.8.2 - Improve direction handling of 3d objects.
-- v2.8.1 - Fix old tracks re-appearing afer hide/show. Issue #135
-- v2.8.0 - Align vector with `track`, prioritise hdg and heading over bearing. Add old location to move action.
 
 - see [CHANGELOG](https://github.com/dceejay/RedMap/blob/master/CHANGELOG.md) for full list of changes.
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "2.13.3",
+    "version": "2.13.4",
     "description": "A Node-RED node to provide a web page of a world map for plotting things on.",
     "dependencies": {
         "cgi": "0.3.1",

worldmap.html

@@ -34,11 +34,11 @@
         <option value="Esri">ESRI Streetmap</option>
         <option value="Esri Satellite">ESRI Satellite</option>
         <option value="Esri Topography">ESRI Topography</option>
-        // <option value="Esri Terrain">ESRI Terrain</option>
-        <option value="Esri Dark Grey">ESRI Dark Grey</option>
         <option value="Esri Ocean">ESRI Ocean</option>
+        <option value="Esri Dark Grey">ESRI Dark Grey</option>
         <option value="Nat Geo">National Geographic</option>
         <option value="UK OS Opendata">UK OS Opendata</option>
+        <option value="Open Topo Map">Open Topo Map</option>
         <option value="Hike Bike">Hike Bike OSM</option>
         <option value="Terrain">Terrain</option>
         <option value="Watercolor">Stamen Watercolor</option>
@@ -185,9 +185,8 @@
         <option value="Esri">ESRI Streetmap</option>
         <option value="Esri Satellite">ESRI Satellite</option>
         <option value="Esri Topography">ESRI Topography</option>
-        // <option value="Esri Terrain">ESRI Terrain</option>
-        <option value="Esri Dark Grey">ESRI Dark Grey</option>
         <option value="Esri Ocean">ESRI Ocean</option>
+        <option value="Esri Dark Grey">ESRI Dark Grey</option>
         <option value="Nat Geo">National Geographic</option>
         <option value="UK OS Opendata">UK OS Opendata</option>
         <option value="Open Topo Map">Open Topo Map</option>

worldmap/worldmap.js

@@ -1855,7 +1855,9 @@ function setMarker(data) {
     if (data.popup) { words = data.popup; }
     else { words = words + marker.getLatLng().toString().replace('LatLng(','lat, lon : ').replace(')',''); }
     words = "<b>"+data.name+"</b><br/>" + words; //"<button style=\"border-radius:4px; float:right; background-color:lightgrey;\" onclick='popped=false;popmark.closePopup();'>X</button><br/>" + words;
-    marker.bindPopup(words, {autoClose:false, closeButton:true, closeOnClick:false, minWidth:200});
+    var wopt = {autoClose:false, closeButton:true, closeOnClick:false, minWidth:200};
+    if (words.indexOf('<video ') >=0 || words.indexOf('<img ') >=0 ) { wopt.maxWidth="auto"; }
+    marker.bindPopup(words, wopt);
     marker._popup.dname = data.name;
     marker.lay = lay;                       // and the layer it is on