diff --git a/CHANGELOG.md b/CHANGELOG.md index 72655de..a040250 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ### Change Log for Node-RED Worldmap + - v1.3.4 - Add ISS icon - 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. diff --git a/README.md b/README.md index 6b58e45..d7d38f8 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ map web page for plotting "things" on. ### Updates +- v1.3.4 - Add ISS icon - 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. @@ -77,6 +78,7 @@ There are also several special icons... - **arrow** : a map GPS arrow type pointer that aligns with the bearing of travel. - **wind** : a wind arrow that points in the direction the wind is coming FROM. - **satellite** : a small satellite icon. + - **iss** : a slightly larger icon for the ISS. - **locate** : a 4 corner outline to locate a point without obscuring it. - **friend** : pseudo NATO style blue rectangle. - **hostile** : pseudo NATO style red circle. diff --git a/package.json b/package.json index 061eeee..17578b6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-red-contrib-web-worldmap", - "version": "1.3.3", + "version": "1.3.4", "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 b2cfcce..9c52394 100644 --- a/worldmap/index.html +++ b/worldmap/index.html @@ -949,11 +949,27 @@ function setMarker(data) { icon += ''; icon += ''; icon += ''; - var svglocate = "data:image/svg+xml;base64," + btoa(icon); + var svgsat = "data:image/svg+xml;base64," + btoa(icon); myMarker = L.divIcon({ className:"satelliteicon", iconAnchor: [16, 16], - html:'', + html:'', + }); + marker = L.marker(ll, {title:data.name, icon:myMarker}); + } + else if ((data.icon === "iss") || (data.icon === "ISS")) { + data.iconColor = data.iconColor || "black"; + icon = ''; + icon += ''; + icon += ''; + var svgiss = "data:image/svg+xml;base64," + btoa(icon); + myMarker = L.divIcon({ + className:"issicon", + iconAnchor: [25, 25], + html:'', }); marker = L.marker(ll, {title:data.name, icon:myMarker}); } diff --git a/worldmap/worldmap.appcache b/worldmap/worldmap.appcache index 600112c..4a8d88f 100644 --- a/worldmap/worldmap.appcache +++ b/worldmap/worldmap.appcache @@ -1,5 +1,5 @@ CACHE MANIFEST -# date: June 30th 2018 - v1.3.3 +# date: June 30th 2018 - v1.3.4 CACHE: index.html