From 6b898e6d3fc7384a495e1d4c2fba1feb835ce95e Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Sat, 29 Jan 2022 17:49:36 +0000
Subject: [PATCH] Add QTH option, and try connect when Ready

---
 CHANGELOG.md         | 1 +
 README.md            | 4 ++++
 package.json         | 2 +-
 worldmap.html        | 2 ++
 worldmap/worldmap.js | 6 ++++--
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 651fdd4..56724dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ### Change Log for Node-RED Worldmap
 
+ - v2.26.1 - Add QTH/Maidenhead option also
  - v2.26.0 - Add UTM and MGRS to coordinate display options.
  - v2.25.0 - Add bounds command to set overall map bounds.
  - v2.24.3 - Fix geojson incorrect fill.
diff --git a/README.md b/README.md
index cf12b8d..6d45891 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@ map web page for plotting "things" on.
 
 ### Updates
 
+- v2.26.1 - Add QTH/Maidenhead option also
 - v2.26.0 - Add UTM and MGRS to coordinate display options.
 - v2.25.0 - Add bounds command to set overall map bounds.
 - v2.24.3 - Fix geojson incorrect fill.
@@ -141,6 +142,8 @@ following the great circle between the two co-ordinates is plotted.
 
     msg.payload = {name:"GC1", color:"#ff00ff", greatcircle:[ [51.464,0], [25.76,-80.18] ] }
 
+Shapes can also have a **popup** property containing html, but you MUST also set a property `clickable:true` in order to allow it to be seen.
+
 There are extra optional properties you can specify - see Options below.
 
 
@@ -255,6 +258,7 @@ Areas, Rectangles, Lines, Circles and Ellipses can also specify more optional pr
 
 Other properties can be found in the leaflet documentation.
 
+Shapes can also have a **popup** property containing html, but you MUST also set a property `clickable:true` in order to allow it to be seen.
 
 ### Drawing
 
diff --git a/package.json b/package.json
index 9bd2fca..c8ece6a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "2.26.0",
+    "version": "2.26.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",
diff --git a/worldmap.html b/worldmap.html
index 2f06882..ccc2b65 100644
--- a/worldmap.html
+++ b/worldmap.html
@@ -85,6 +85,7 @@
         <option value="dms">D.M.S</option>
         <option value="utm">UTM</option>
         <option value="mgrs">MGRS</option>
+        <option value="qth">QTH/Maidenhead</option>
     </select>
     <i class="fa fa-th" style="margin-left:22px;"></i> Graticule
     <select id="node-input-showgrid" style="width:101px;">
@@ -243,6 +244,7 @@ If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>c
         <option value="dms">D.M.S</option>
         <option value="utm">UTM</option>
         <option value="mgrs">MGRS</option>
+        <option value="gth">QTH/Maidenhead</option>
     </select>
     <i class="fa fa-th" style="margin-left:22px;"></i> Graticule
     <select id="node-input-showgrid" style="width:101px;">
diff --git a/worldmap/worldmap.js b/worldmap/worldmap.js
index a7a81ec..632f67e 100644
--- a/worldmap/worldmap.js
+++ b/worldmap/worldmap.js
@@ -170,6 +170,9 @@ if (inIframe === true) {
 
 // Create the Initial Map object.
 map = new L.map('map',{zoomSnap: 0.1}).setView(startpos, startzoom);
+map.whenReady(function() {
+    connect();
+});
 
 var droplatlng;
 var target = document.getElementById("map")
@@ -2190,6 +2193,7 @@ function doCommand(cmd) {
         if (cmd.coords == "dms") { opts.gpsLong = true; }
         if (cmd.coords == "utm") { opts.utm = true; }
         if (cmd.coords == "mgrs") { opts.utmref = true; }
+        if (cmd.coords == "qth") { opts.qth = true; }
         coords.options = opts;
         coords.addTo(map);
     }
@@ -2711,5 +2715,3 @@ function doGeojson(n,g,l,o) {
     layers[lay].addLayer(markers[n]);
     map.addLayer(layers[lay]);
 }
-
-connect();