From cacb49f6115087208313264d7399a98c33cdcde4 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Mon, 16 Jul 2018 10:19:17 +0100
Subject: [PATCH] bugfix inline satellite icon

---
 CHANGELOG.md               | 1 +
 README.md                  | 1 +
 package.json               | 2 +-
 worldmap/index.html        | 8 ++++----
 worldmap/worldmap.appcache | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d04e15..72655de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ### Change Log for Node-RED Worldmap
 
+ - v1.3.3 - Bugfix for inline satellite icon
  - v1.3.2 - Bugfix for inline svg icons
  - v1.3.1 - Allow `msg.payload.popup = true` to auto open the info popup.
  - v1.3.0 - Add initial 3D page (worldmap/index3d.html), Add ability to add KML, GPX and TOPOJSON overlay layers and optional zoom to fit. Change all http: links to https:
diff --git a/README.md b/README.md
index e8d714d..6b58e45 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@ map web page for plotting "things" on.
 
 ### Updates
 
+- v1.3.3 - Bugfix for inline satellite icon
 - v1.3.2 - Bugfix for inline svg icons
 - v1.3.1 - Allow `msg.payload.popup = true` to auto open the info popup.
 - v1.3.0 - Add initial 3D page (worldmap/index3d.html), Add ability to add KML, GPX and TOPOJSON overlay layers and optional zoom to fit.
diff --git a/package.json b/package.json
index 50f67be..061eeee 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "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/index.html b/worldmap/index.html
index b225b7c..b2cfcce 100644
--- a/worldmap/index.html
+++ b/worldmap/index.html
@@ -890,7 +890,7 @@ function setMarker(data) {
         else if (data.icon === "uav") {
             data.iconColor = data.iconColor || "black";
             if (data.hasOwnProperty("squawk")) { data.iconColor = "red"; }
-            icon = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">';
+            icon = '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 100 100">';
             icon+= '<path d="M62 82h-8V64h36c0-5-4-9-9-9H54v-8c0-3 4-5 4-11.1 0-4.4-3.6-8-8-8-4.4 0-8 3.6-8 8 0 5.1 4 8.1 4 11.1V55h-27c-5 0-9 4-9 9h36v18H38c-2.4 0-5 2.3-5 5L50 92l17-5C67 84.3 64.4 82 62 82z" fill="'+data.iconColor+'"/></svg>';
             var svguav = "data:image/svg+xml;base64," + btoa(icon);
             var dir = data.hdg || data.bearing;
@@ -916,7 +916,7 @@ function setMarker(data) {
         }
         else if (data.icon === "arrow") {
             data.iconColor = data.iconColor || "black";
-            icon = '<svg xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32">';
+            icon = '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32px" height="32px" viewBox="0 0 32 32">';
             icon += '<path d="m16.2 0.6l-10.9 31 10.7-11.1 10.5 11.1 -10.3-31z" fill="'+data.iconColor+'"/></svg>';
             var svgarrow = "data:image/svg+xml;base64," + btoa(icon);
             var dir = data.hdg || data.bearing;
@@ -929,7 +929,7 @@ function setMarker(data) {
         }
         else if (data.icon === "wind") {
             data.iconColor = data.iconColor || "black";
-            icon = '<svg xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32">';
+            icon = '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32px" height="32px" viewBox="0 0 32 32">';
             icon += '<path d="M16.7 31.7l7-6.9c0.4-0.4 0.4-1 0-1.4 -0.4-0.4-1-0.4-1.4 0l-5.3 5.2V17.3l6.7-6.6c0.2-0.2 0.3-0.5 0.3-0.7v-9c0-0.9-1.1-1.3-1.7-0.7l-6.3 6.2L9.7 0.3C9.1-0.3 8 0.1 8 1.1v8.8c0 0.3 0.1 0.6 0.3 0.8l6.7 6.6v11.3l-5.3-5.2c-0.4-0.4-1-0.4-1.4 0 -0.4 0.4-0.4 1 0 1.4l7 6.9c0.2 0.2 0.5 0.3 0.7 0.3C16.2 32 16.5 31.9 16.7 31.7zM10 9.6V3.4l5 4.9v6.2L10 9.6zM17 8.3l5-4.9v6.2l-5 4.9V8.3z" fill="'+data.iconColor+'"/></svg>';
             var svgwind = "data:image/svg+xml;base64," + btoa(icon);
             var dir = data.hdg || data.bearing;
@@ -942,7 +942,7 @@ function setMarker(data) {
         }
         else if (data.icon === "satellite") {
             data.iconColor = data.iconColor || "black";
-            icon = '<svg xmln="http://www.w3.org/2000/svg.org/2000/svg" xmln:xlink="http://www.w3.org/2000/svg.org/1999/xlink" viewBox="0 0 100 100">';
+            icon = '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 100 100">';
             icon += '<polygon points="38.17 39.4 45.24 32.33 43.34 27.92 24.21 8.78 14.59 18.4 33.72 37.53" fill="'+data.iconColor+'"/>';
             icon += '<path d="M69.22 44.57L54.38 29.73c-1.1-1.1-2.91-1.1-4.01 0L35.53 44.57c-1.1 1.1-1.1 2.91 0 4.01l14.84 14.84c1.1 1.1 2.91 1.1 4.01 0l14.84-14.84C70.32 47.47 70.32 45.67 69.22 44.57z" fill="'+data.iconColor+'"/>';
             icon += '<polygon points="71.04 55.61 66.58 53.75 59.52 60.82 61.42 65.23 80.55 84.36 90.17 74.75" fill="'+data.iconColor+'"/>';
diff --git a/worldmap/worldmap.appcache b/worldmap/worldmap.appcache
index 8cd7310..600112c 100644
--- a/worldmap/worldmap.appcache
+++ b/worldmap/worldmap.appcache
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# date: June 30th 2018 - v1.3.2
+# date: June 30th 2018 - v1.3.3
 
 CACHE:
 index.html