better handling of unpacked kmz files

CHANGELOG.md

@@ -1,5 +1,6 @@
 ### Change Log for Node-RED Worldmap
 
+ - v2.16.2 - better handling of unpacked gpz objects.
  - v2.16.0 - Allow specifying custom base map server.
  - v2.15.8 - Adjust ui check timing for UI worldmap.
  - v2.15.7 - Tidy up geoJson handling a bit more.

README.md

@@ -11,6 +11,7 @@ map web page for plotting "things" on.
 
 ### Updates
 
+- v2.16.2 - better handling of unpacked gpz objects.
 - v2.16.0 - Allow specifying custom base map server.
 - v2.15.8 - Adjust ui check timing for UI worldmap.
 - v2.15.7 - Tidy up geoJson handling a bit more.

package.json

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

worldmap/worldmap.js

@@ -111,6 +111,10 @@ var handleData = function(data) {
                 setMarker(data[prop]);
                 // bnds.extend(markers[data[prop].name].getLatLng());
             }
+            else if (data[prop].hasOwnProperty("filename") && data[prop].filename === "doc.kml") {
+                data = {command:{map:{overlay:"KML", kml:data[prop].payload}}};
+                doCommand(data.command); return;
+            }
             else { console.log("SKIP A",data[prop]); }
         }
         // map.fitBounds(bnds.pad(0.25));
@@ -124,7 +128,6 @@ var handleData = function(data) {
                 data = {command:{map:{overlay:"KML", kml:data}}};
             }
             else if (data.indexOf("<gpx") != -1) {
-                console.log("GPX")
                 data = {command:{map:{overlay:"GPX", gpx:data}}};
             }
         }
@@ -203,11 +206,12 @@ var readFile = function(file) {
     if (file.type &&
         file.type.indexOf('text') === -1 &&
         file.type.indexOf('kml') === -1 &&
+        file.type.indexOf('kmz') === -1 &&
         file.type.indexOf('json') === -1 &&
         file.type.indexOf('image/jpeg') === -1 &&
         file.type.indexOf('image/png') === -1 &&
         file.type.indexOf('image/tiff') === -1) {
-        console.log('File is not text, kml, jpeg, png, or json', file.type, file);
+        console.log('File is not text, kml, kmz, jpeg, png, or json', file.type, file);
         return;
     }
 
@@ -229,6 +233,9 @@ var readFile = function(file) {
                         doCommand({map:{overlay:file.name, nvg:data}});
                     }
                 }
+                else if (data.indexOf('PK') === 0) {
+                    console.log("ZIP FILE");
+                }
                 else {
                     try {
                         data = JSON.parse(data);