re-organise html file to make re-use easier

(more to come)

CHANGELOG.md

@@ -1,5 +1,6 @@
 ### Change Log for Node-RED Worldmap
 
+ - v2.0.8 - Drop beta flag, re-organise index, js and css files. Now using leaflet 1.4
  - v2.0.7-beta - Switch Ruler control to be independent of Draw library.
  - v2.0.6-beta - Re-enable editing of draw layer, add rectangles to lines and areas. Make individual objects editable.
  - v2.0.5-beta - Fix clustering on zoom (update old library)

README.md

@@ -9,6 +9,7 @@ map web page for plotting "things" on.
 
 ### Updates
 
+- v2.0.8 - Drop beta flag, re-organise index, js and css files. Now using leaflet 1.4
 - v2.0.7-beta - Switch Ruler control to be independent of Draw library.
 - v2.0.6-beta - Re-enable editing of draw layer, add rectangles to lines and areas. Make individual objects editable.
 - v2.0.5-beta - Fix clustering on zoom (update old library)

package.json

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

worldmap/css/worldmap.css

@@ -1,5 +1,6 @@
 body {
     width:100%;
+    height:100%;
     left:0px;
     margin:0;
     padding:0;
@@ -21,25 +22,6 @@ a {
     text-decoration:none;
 }
 
-dialog {
-    top: 50px;
-    z-index: 9999;
-    width: 60% !important;
-    border-radius: 4px !important;
-    border-width: 0px !important;
-    line-height: 1.4em !important;
-    box-shadow: 0 1px 5px rgba(0,0,0,0.65) !important;
-}
-dialog > p > b {
-    font-size: unset;
-}
-dialog > button {
-    margin-top: 6px;
-    height: 24px;
-    border-radius: 4px;
-    font-weight: 500;
-}
-
 .topbar {
     font-size:16px;
     vertical-align:middle;
@@ -49,6 +31,11 @@ dialog > button {
     padding: 1px 4px !important;
 }
 
+.leaflet-touch .leaflet-control-layers-toggle {
+    width:35px;
+    height:35px;
+}
+
 #topbar {
     color:#c7c7c7;
     background-color:black;
@@ -82,11 +69,11 @@ dialog > button {
     display:block;
 }
 
-#foot {
+#footer {
     position:absolute;
     bottom:0px;
     left:-1px;
-    z-index:1;
+    z-index:999;
     font-size:9px;
 }
 

worldmap/index3d.html

@@ -17,7 +17,7 @@
 <div id='map'></div>
 <script>
 
-// If you have a mapbox API key it may be better to use that - uncomment these lines and cooment out the mbstyle below.
+// 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';
 

worldmap/worldmaphead.html

@@ -0,0 +1,46 @@
+
+<link rel="stylesheet" type="text/css" href="leaflet/font-awesome/css/font-awesome.min.css"/>
+<link rel="stylesheet" type="text/css" href="leaflet/weather-icons-lite/css/weather-icons-lite.min.css"/>
+<link rel="stylesheet" type="text/css" href="leaflet/leaflet.css"/>
+<link rel="stylesheet" type="text/css" href="leaflet/leaflet-vector-markers.css">
+<link rel="stylesheet" type="text/css" href="leaflet/MarkerCluster.css">
+<link rel="stylesheet" type="text/css" href="leaflet/MarkerCluster.Default.css">
+<link rel="stylesheet" type="text/css" href="leaflet/leaflet.draw.css">
+<link rel="stylesheet" type="text/css" href="leaflet/leaflet-ruler.css">
+<link rel="stylesheet" type="text/css" href="leaflet/easy-button.css">
+<link rel="stylesheet" type="text/css" href="leaflet/leaflet.fullscreen.css">
+<link rel="stylesheet" type="text/css" href="leaflet/Leaflet.Dialog.css">
+<link rel="stylesheet" type="text/css" href="leaflet/leaflet-velocity.min.css">
+<link rel="stylesheet" type="text/css" href="leaflet/Leaflet.Coordinates.css">
+<link rel="stylesheet" type="text/css" href="leaflet/dialog-polyfill.css"/>
+<link rel="stylesheet" type="text/css" href="css/worldmap.css"/>
+
+<script src="leaflet/sockjs.min.js"></script>
+<script src="leaflet/leaflet.js"></script>
+<script src="leaflet/leaflet-vector-markers.min.js"></script>
+<script src="leaflet/leaflet.boatmarker.js"></script>
+<script src="leaflet/leaflet.markercluster.js"></script>
+<script src="leaflet/leaflet.markercluster.freezable.js"></script>
+<script src="leaflet/leaflet.active-layers.min.js"></script>
+<script src="leaflet/leaflet.select-layers.min.js"></script>
+<script src="leaflet/leaflet.draw.js"></script>
+<script src="leaflet/leaflet-ruler.js"></script>
+<script src="leaflet/easy-button.js"></script>
+<script src="leaflet/Leaflet.fullscreen.min.js"></script>
+<script src="leaflet/Leaflet.Dialog.js"></script>
+<script src="leaflet/l.ellipse.min.js"></script>
+<script src="leaflet/milsymbol.js"></script>
+<script src="leaflet/nvg.js"></script>
+<script src="leaflet/leaflet-heat.js"></script>
+<script src="leaflet/TileLayer.Grayscale.js"></script>
+<script src="leaflet/TileLayer.GrayscaleWMS.js"></script>
+<script src="leaflet/L.Terminator.js"></script>
+<script src="leaflet/leaflet-velocity.min.js"></script>
+<script src="leaflet/leaflet-side-by-side.js"></script>
+<script src="leaflet/OSMBuildings-Leaflet.js"></script>
+<script src="leaflet/leaflet-omnivore.min.js"></script>
+<script src="leaflet/Leaflet.Coordinates.js"></script>
+<script src="leaflet/leaflet.latlng-graticule.js"></script>
+<script src="leaflet/dialog-polyfill.js"></script>
+
+<script src="images/emoji.js"></script>