From 5c065627c25284e72cba907cffa84f53612f9456 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Sun, 21 Feb 2021 12:41:22 +0000
Subject: [PATCH] better check of type property before assuming geojson

to close #153
---
 CHANGELOG.md         | 1 +
 README.md            | 7 ++++---
 package.json         | 2 +-
 worldmap/worldmap.js | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 775ce70..f4861b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ### Change Log for Node-RED Worldmap
 
+ - 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.
diff --git a/README.md b/README.md
index 9b9728e..f582b79 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@ map web page for plotting "things" on.
 
 ### Updates
 
+- 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.
@@ -618,15 +619,15 @@ You can then add a new WMS Base layer by injecting a message like
         "name": "Local WMS",
         "url": "/cgi-bin/mapserv",   // we will serve the tiles from this node locally.
         "opt": {
-            "layers": "gb",                         // specifies a layer in your map file
+            "layers": "gb",          // specifies a layer in your map file
             "format": "image/png",
             "transparent": true,
             "attribution": "© Ordnance Survey, UK"
         },
-        "wms": true                                 // set to true for WMS type mapserver
+        "wms": true                  // set to true for WMS type mapserver
     }}}
 
-Optionally set `"wms":"grey"` to make the layer to greyscale which may make your markers more visible.
+Optionally set `"wms":"grey"` to set the layer to greyscale which may make your markers more visible.
 
 
 ## Examples and Demo Flow
diff --git a/package.json b/package.json
index 0cd4abd..8292697 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "2.8.5",
+    "version": "2.8.6",
     "description": "A Node-RED node to provide a web page of a world map for plotting things on.",
     "dependencies": {
         "cgi": "0.3.1",
diff --git a/worldmap/worldmap.js b/worldmap/worldmap.js
index eb5c67d..45b2783 100644
--- a/worldmap/worldmap.js
+++ b/worldmap/worldmap.js
@@ -129,7 +129,7 @@ var handleData = function(data) {
             }
         }
         if (data.command) { doCommand(data.command); delete data.command; }
-        if (data.hasOwnProperty("type")) { doGeojson("geojson",data); }
+        if (data.hasOwnProperty("type") && data.type.indexOf("Feature") === 0) { doGeojson("geojson",data); }
         else if (data.hasOwnProperty("name")) { setMarker(data); }
         else {
             console.log("SKIP",data);