allow fa-icon midifers to affect size more usefully

to close #49

CHANGELOG.md

@@ -1,5 +1,6 @@
 ### Change Log for Node-RED Worldmap
 
+ - v1.4.6 - allow more variation in fa-icon modifiers
  - v1.4.5 - fix clearing overlays
  - v1.4.4 - add a couple of extra overlay layers, roads, rail, sea
  - v1.4.3 - support custom icon for GPX and KML. Better readme for geojson.

README.md

@@ -9,6 +9,7 @@ map web page for plotting "things" on.
 
 ### Updates
 
+- v1.4.6 - allow more variation in fa-icon modifiers
 - v1.4.5 - fix clearing overlays
 - v1.4.4 - add a couple of extra overlay layers, roads, rail, sea
 - v1.4.3 - support custom icon for GPX and KML. Better readme for geojson.

package.json

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

worldmap/index.html

@@ -1049,9 +1049,11 @@ function setMarker(data) {
         }
         else if (data.icon && (data.icon.substr(0,3) === "fa-")) {
             var col = data.iconColor || "#910000";
+            var imod = "";
+            if (data.icon.indexOf(" ") === -1) { imod = "fa-2x "; }
             myMarker = L.divIcon({
                 className:"faicon",
-                html: '<center><i class="fa fa-fw fa-2x '+data.icon+'" style="color:'+col+'"></i></center>',
+                html: '<center><i class="fa fa-fw '+imod+data.icon+'" style="color:'+col+'"></i></center>',
                 iconSize: [30, 30]
             });
             marker = L.marker(ll, {title:data.name, icon:myMarker, draggable:drag});

worldmap/worldmap.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# date: Oct 3rd 2018 - v1.4.5
+# date: Oct 3rd 2018 - v1.4.6
 
 CACHE:
 index.html