From a3ee1beba9936b69413fcf44baec58ba22540d5b Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Wed, 12 Jul 2017 17:59:56 +0100
Subject: [PATCH] add raw fa-icons
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

un-“fix” web socket
---
 README.md                  |  7 ++++++-
 package.json               |  4 ++--
 worldmap.html              |  1 +
 worldmap.js                |  9 ++++++---
 worldmap/index.html        | 10 ++++++++++
 worldmap/worldmap.appcache |  2 +-
 6 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 9bb4233..68c727c 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@ map web page for plotting "things" on.
 ![Map Image](https://dceejay.github.io/pages/images/redmap.png)
 
 ### Changes
+- v1.0.33 - Add fa-icon without marker
 - v1.0.32 - Add uav icon, update README
 - v1.0.31 - Add arrow and wind icons
 - v1.0.32 - Add uav icon
@@ -63,7 +64,9 @@ Optional properties include
 Any other `msg.payload` properties will be added to the icon popup text box.
 
 You may select any of the Font Awesome set of [icons](http://fortawesome.github.io/Font-Awesome/icons/).
-However there are several specials...
+If you use the name without the fa- prefix (eg male) you will get the icon inside a generic marker shape. If you use the fa- prefix (eg fa-male) you will get the icon on it's own.
+
+There are also several special icons...
 
  - **plane** : a plane icon that aligns with the bearing of travel.
  - **ship** : a ship icon that aligns with the bearing of travel.
@@ -176,7 +179,9 @@ To add a new base layer
         };
 
 To add an Image Overlay
+
         var imageBounds = [[40.712216, -74.22655], [40.773941, -74.12544]];
+        msg.payload = { command : {lat:40.74, lon:-74.175, zoom:13 } };
         msg.payload.command.map = {
             overlay:"New York Historical",
             url:'http://www.lib.utexas.edu/maps/historical/newark_nj_1922.jpg',
diff --git a/package.json b/package.json
index ee9c4e3..a0e9507 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
     "name"          : "node-red-contrib-web-worldmap",
-    "version"       : "1.0.32",
+    "version"       : "1.0.33",
     "description"   : "A Node-RED node to provide a web page of a world map for plotting things on.",
     "dependencies"  : {
         "express": "^4.15.0",
-        "socket.io": "^1.7.3",
+        "socket.io": "^1.7.4",
         "cgi": "0.3.1"
     },
     "repository" : {
diff --git a/worldmap.html b/worldmap.html
index cbd8596..9b0a5ec 100644
--- a/worldmap.html
+++ b/worldmap.html
@@ -64,6 +64,7 @@
     <label for="node-input-name"><i class="fa fa-file"></i> Name</label>
     <input type="text" id="node-input-name" placeholder="name">
 </div>
+<div class="form-tips">Tip: By default <code>ctrl-shift-m</code> will load the map in a new tab.</div>
 </script>
 
 <script type="text/x-red" data-help-name="worldmap">
diff --git a/worldmap.js b/worldmap.js
index a4c5112..2e99123 100644
--- a/worldmap.js
+++ b/worldmap.js
@@ -72,8 +72,8 @@ module.exports = function(RED) {
             });
         }
         node.on("close", function() {
-            socket.close();
-            socket = null;
+            // socket.close();
+            // socket = null;
         });
         node.status({});
         socket.on('connection', callback);
@@ -83,7 +83,10 @@ module.exports = function(RED) {
 
     var WorldMapIn = function(n) {
         RED.nodes.createNode(this,n);
-        if (!socket) { socket = io.listen(RED.server); }
+        if (!socket) {
+            var fullPath = path.posix.join(RED.settings.httpNodeRoot, 'worldmap', 'socket.io');
+            socket = io.listen(RED.server, {path:fullPath});
+        }
         var node = this;
 
         var callback = function(client) {
diff --git a/worldmap/index.html b/worldmap/index.html
index 06464b2..9ddd29a 100644
--- a/worldmap/index.html
+++ b/worldmap/index.html
@@ -829,6 +829,7 @@ function setMarker(data) {
         // Create the icons... handle plane, car, ship, wind, earthquake as specials
         var marker, mymarker;
         var icon, q;
+        //console.log("ICON",data.icon);
         if (data.icon === "ship") {
             marker = L.boatMarker(ll, {
                 title: data.name,
@@ -960,6 +961,15 @@ function setMarker(data) {
         else if (data.icon === "earthquake") {
             marker = L.marker(ll, { icon: L.divIcon({ className: 'circle e', iconSize: [data.mag*5, data.mag*5] }), title: data.name });
         }
+        else if (data.icon.substr(0,3) === "fa-") {
+            var col = data.iconColor || "#910000";
+            myMarker = L.divIcon({
+                className: data.icon,
+                html: '<i class="fa fa-2x '+data.icon+'" style="color:'+col+'"></i>',
+                iconSize: [32, 32]
+            });
+            marker = L.marker(ll, {title:data.name, icon:myMarker});
+        }
         else {
             myMarker = L.VectorMarkers.icon({
                 icon: data.icon || "circle",
diff --git a/worldmap/worldmap.appcache b/worldmap/worldmap.appcache
index 770e674..ffe544f 100644
--- a/worldmap/worldmap.appcache
+++ b/worldmap/worldmap.appcache
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# date: Jun 27th 2017 - v1.0.32
+# date: Jul 12th 2017 - v1.0.33
 
 CACHE:
 index.html