Fix clearing overlays - to close #48

6 years ago · 68953a1747
parent fb9b44e5be
commit 68953a1747
6 changed files with 11 additions and 9 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,7 @@
 ### Change Log for Node-RED Worldmap

- - v1.4.4 - Add a couple of extra overlay layers, roads, rail, sea
+ - v1.4.5 - fix clearing overlays
+ - v1.4.4 - add a couple of extra overlay layers, roads, rail, sea
 - v1.4.3 - support custom icon for GPX and KML. Better readme for geojson.
 - v1.4.2 - add NVG layer capability
 - v1.4.1 - let `msg.payload.popup` set the popup contents.
--- a/README.md
+++ b/README.md
@ -9,7 +9,8 @@ map web page for plotting "things" on.

 ### Updates

- v1.4.4 - Add a couple of extra overlay layers, roads, rail, sea
+- v1.4.5 - fix clearing overlays
+- v1.4.4 - add a couple of extra overlay layers, roads, rail, sea
 - v1.4.3 - support custom icon for GPX and KML. Better readme for geojson.
 - v1.4.2 - add NVG layer capability
 - v1.4.1 - let `msg.payload.popup` set the popup contents.
--- a/worldmap.html
+++ b/worldmap.html
@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-  Copyright 2015, 2017 IBM Corp.
+  Copyright 2015, 2018 IBM Corp.

  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
--- a/worldmap.js
+++ b/worldmap.js
@ -1,5 +1,5 @@
 /**
- * Copyright 2015, 2017 IBM Corp.
+ * Copyright 2015, 2018 IBM Corp.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/worldmap/index.html
+++ b/worldmap/index.html
@ -326,12 +326,12 @@ function doTidyUp(l) {
                }
                delete markers[m];
            }
-            if (l) {
-                layercontrol.removeLayer(layers[l]);
-                delete overlays[l];
-            }
        }
    }
+    if (l) {
+        if (layers[l]) { map.removeLayer(layers[l]); layercontrol.removeLayer(layers[l]); delete layers[l]; }
+        if (overlays[l]) { map.removeLayer(overlays[l]); layercontrol.removeLayer(overlays[l]); delete overlays[l]; }
+    }
 }

 // move the daylight / nighttime boundary (if enabled) every minute
--- a/worldmap/worldmap.appcache
+++ b/worldmap/worldmap.appcache
@ -1,5 +1,5 @@
 CACHE MANIFEST
-# date: Oct 1st 2018 - v1.4.5
+# date: Oct 2nd 2018 - v1.4.5

 CACHE:
 index.html