diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d5c62d..165c9dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ### Change Log for Node-RED Worldmap + - v1.5.18 - Update Leaflet.vector-markers to 0.0.6 (https://github.com/hiasinho/Leaflet.vector-markers) - v1.5.17 - Allow setting maxage to 0 (infinite) correctly - Issue #64 - v1.5.16 - Allow setting panlock, zoomlock and hiderightclick via commands - Issue #60 - v1.5.15 - Allow setting clusterAt to 0 to fully disable it - Issue #61 diff --git a/README.md b/README.md index 66e76e6..5a99766 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ map web page for plotting "things" on. ### Updates +- v1.5.18 - Update Leaflet.vector-markers to 0.0.6 (https://github.com/hiasinho/Leaflet.vector-markers) - v1.5.17 - Allow setting maxage to 0 (infinite) correctly - Issue #64 - v1.5.16 - Allow setting panlock, zoomlock and hiderightclick via commands - Issue #60 - v1.5.15 - Allow setting clusterAt to 0 to fully disable it - Issue #61 diff --git a/package.json b/package.json index 72c4b68..fa233b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-red-contrib-web-worldmap", - "version": "1.5.17", + "version": "1.5.18", "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 26a3174..b75928e 100644 --- a/worldmap/index.html +++ b/worldmap/index.html @@ -22,7 +22,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/worldmap/leaflet/Leaflet.vector-markers.css b/worldmap/leaflet/Leaflet.vector-markers.css deleted file mode 100644 index 3c914d6..0000000 --- a/worldmap/leaflet/Leaflet.vector-markers.css +++ /dev/null @@ -1,63 +0,0 @@ -/* -Author: Mathias Schneider -License: MIT -Version: 1.0 -*/ -/* Marker setup */ -.vector-marker { - width: 35px; - height: 46px; - position: absolute; - left: 0; - top: 0; - display: block; - text-align: center; -} -.vector-marker path { - stroke: black; - stroke-opacity: 0.4; - stroke-width: 1; -} -.vector-marker.not-accepted { - opacity: 0.5; -} - -.vector-marker-shadow { - background: url("assets/shadow.png") no-repeat 0 0; - width: 36px; - height: 16px; -} - -/* Retina displays */ -@media (min--moz-device-pixel-ratio: 1.5), (-o-min-device-pixel-ratio: 3 / 2), (-webkit-min-device-pixel-ratio: 1.5), (min-device-pixel-ratio: 1.5), (min-resolution: 1.5dppx) { - .vector-marker { - background-size: 720px 46px; - } - - .vector-marker-shadow { - background-image: url("assets/shadow@2x.png"); - background-size: 54px 51px; - } -} -.vector-marker i { - position: absolute; - top: 8px; - left: 0; - width: 32px; - color: #333; - margin: auto; - display: inline-block; - font-size: 14px; -} - -.vector-marker i.maki-icon { - width: 24px; - left: 4px; - top: 4px; -} - -.vector-marker .icon-white { - color: #fff; -} - -/*# sourceMappingURL=Leaflet.vector-markers.css.map */ diff --git a/worldmap/leaflet/Leaflet.vector-markers.min.js b/worldmap/leaflet/Leaflet.vector-markers.min.js deleted file mode 100644 index fb2783e..0000000 --- a/worldmap/leaflet/Leaflet.vector-markers.min.js +++ /dev/null @@ -1 +0,0 @@ -/*! Leaflet.vector-markers - v0.0.3 - 2015-01-23 */(function(){!function(a,b){"use strict";return L.VectorMarkers={},L.VectorMarkers.version="1.0.0",L.VectorMarkers.MAP_PIN="M16,1 C7.7146,1 1,7.65636364 1,15.8648485 C1,24.0760606 16,51 16,51 C16,51 31,24.0760606 31,15.8648485 C31,7.65636364 24.2815,1 16,1 L16,1 Z",L.VectorMarkers.Icon=L.Icon.extend({options:{iconSize:[30,50],iconAnchor:[15,50],popupAnchor:[2,-40],shadowAnchor:[7,45],shadowSize:[54,51],className:"vector-marker",prefix:"fa",spinClass:"fa-spin",extraClasses:"",icon:"home",markerColor:"blue",iconColor:"white"},initialize:function(a){return a=L.Util.setOptions(this,a)},createIcon:function(a){var c,d,e,f;return c=a&&"DIV"===a.tagName?a:b.createElement("div"),e=this.options,e.icon&&(d=this._createInner()),f=L.VectorMarkers.MAP_PIN,c.innerHTML=''+d+"",this._setIconStyles(c,"icon"),this._setIconStyles(c,"icon-"+e.markerColor),c},_createInner:function(){var a,b,c,d,e;return a=void 0,d="",b="",c="",e=this.options,a=""===e.prefix||e.icon.slice(0,e.prefix.length+1)===e.prefix+"-"?e.icon:e.prefix+"-"+e.icon,e.spin&&"string"==typeof e.spinClass&&(d=e.spinClass),e.iconColor&&("white"===e.iconColor||"black"===e.iconColor?b="icon-"+e.iconColor:c="style='color: "+e.iconColor+"' "),""},_setIconStyles:function(a,b){var c,d,e;return d=this.options,e=L.point(d["shadow"===b?"shadowSize":"iconSize"]),c=void 0,c=L.point("shadow"===b?d.shadowAnchor||d.iconAnchor:d.iconAnchor),!c&&e&&(c=e.divideBy(2,!0)),a.className="vector-marker-"+b+" "+d.className,c&&(a.style.marginLeft=-c.x+"px",a.style.marginTop=-c.y+"px"),e?(a.style.width=e.x+"px",a.style.height=e.y+"px"):void 0},createShadow:function(){var a;return a=b.createElement("div"),this._setIconStyles(a,"shadow"),a}}),L.VectorMarkers.icon=function(a){return new L.VectorMarkers.Icon(a)}}(this,document)}).call(this); \ No newline at end of file diff --git a/worldmap/leaflet/assets/shadow.png b/worldmap/leaflet/assets/shadow.png deleted file mode 100644 index 7afe9a0..0000000 Binary files a/worldmap/leaflet/assets/shadow.png and /dev/null differ diff --git a/worldmap/leaflet/assets/shadow@2x.png b/worldmap/leaflet/assets/shadow@2x.png deleted file mode 100644 index 6a0a5a6..0000000 Binary files a/worldmap/leaflet/assets/shadow@2x.png and /dev/null differ diff --git a/worldmap/leaflet/leaflet-vector-markers.css b/worldmap/leaflet/leaflet-vector-markers.css new file mode 100644 index 0000000..8c1b857 --- /dev/null +++ b/worldmap/leaflet/leaflet-vector-markers.css @@ -0,0 +1,54 @@ +/* +Author: Mathias Schneider +License: MIT +Version: 0.0.6 +*/ +/* Marker setup */ +.vector-marker { + width: 35px; + height: 46px; + position: absolute; + left: 0; + top: 0; + display: block; + text-align: center; } + .vector-marker path { + stroke: black; + stroke-opacity: 0.4; + stroke-width: 1; } + .vector-marker.not-accepted { + opacity: 0.5; } + +.vector-marker-shadow:before { + bottom: -13px; + box-shadow: 35px -10px 10px rgba(0, 0, 0, 0.4); + content: ""; + height: 40%; + position: absolute; + right: 21px; + -webkit-transform-origin: 50% 50%; + -ms-transform-origin: 50% 50%; + transform-origin: 50% 50%; + -webkit-transform: skew(150deg) rotate(-40deg); + -ms-transform: skew(150deg) rotate(-40deg); + transform: skew(150deg) rotate(-40deg); + width: 60%; + z-index: -1; } + +.vector-marker i { + position: absolute; + top: 8px; + left: 0; + width: 32px; + color: #333; + margin: auto; + display: inline-block; + font-size: 14px; } + +.vector-marker i.maki-icon { + width: 24px; + left: 4px; + top: 4px; } + +.vector-marker .icon-white { + color: #fff; } diff --git a/worldmap/leaflet/leaflet-vector-markers.min.js b/worldmap/leaflet/leaflet-vector-markers.min.js new file mode 100644 index 0000000..c76e82f --- /dev/null +++ b/worldmap/leaflet/leaflet-vector-markers.min.js @@ -0,0 +1 @@ +!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("leaflet")):"function"==typeof define&&define.amd?define(["leaflet"],t):"object"==typeof exports?exports.VectorMarkers=t(require("leaflet")):e.VectorMarkers=t(e.L)}(this,function(e){return function(e){function t(n){if(o[n])return o[n].exports;var r=o[n]={exports:{},id:n,loaded:!1};return e[n].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var o={};return t.m=e,t.c=o,t.p="",t(0)}([function(e,t,o){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0}),t.Icon=t.VectorMarkers=void 0;var r=o(2),i=n(r),s=o(3),a=n(s),c=o(1),l=n(c);t.VectorMarkers=a["default"],t.Icon=l["default"],i["default"].VectorMarkers=a["default"]},function(e,t,o){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function s(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var a=function(){function e(e,t){for(var o=0;o',o.icon&&t.appendChild(this._createInner()),o.className+=o.className.length>0?" "+o.extraDivClasses:o.extraDivClasses,this._setIconStyles(t,"icon"),this._setIconStyles(t,"icon-"+o.markerColor),t}},{key:"createShadow",value:function(){var e=document.createElement("div");return this._setIconStyles(e,"shadow"),e}},{key:"_createInner",value:function(){var e=document.createElement("i"),t=this.options;return e.classList.add(t.prefix),t.extraClasses&&e.classList.add(t.extraClasses),t.icon.slice(0,t.prefix.length+1)===t.prefix+"-"?e.classList.add(t.icon):e.classList.add(t.prefix+"-"+t.icon),t.spin&&"string"==typeof t.spinClass&&e.classList.add(t.spinClass),t.iconColor&&("white"===t.iconColor||"black"===t.iconColor?e.classList.add("icon-"+t.iconColor):e.style.color=t.iconColor),t.iconSize&&(e.style.width=t.iconSize[0]+"px"),e}},{key:"_setIconStyles",value:function(e,t){var o=this.options,n=l["default"].point(o["shadow"===t?"shadowSize":"iconSize"]),r=void 0;r="shadow"===t?l["default"].point(o.shadowAnchor||o.iconAnchor):l["default"].point(o.iconAnchor),!r&&n&&(r=n.divideBy(2,!0)),e.className="vector-marker-"+t+" "+o.className,r&&(e.style.marginLeft=-r.x+"px",e.style.marginTop=-r.y+"px"),n&&(e.style.width=n.x+"px",e.style.height=n.y+"px")}}]),t}(l["default"].Icon);t["default"]=p},function(t,o){t.exports=e},function(e,t,o){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0});var r=o(1),i=n(r);t["default"]={version:"1.0.0",Icon:i["default"],icon:function(e){return new i["default"](e)}}}])}); \ No newline at end of file diff --git a/worldmap/worldmap.appcache b/worldmap/worldmap.appcache index d5c2afb..2065fc9 100644 --- a/worldmap/worldmap.appcache +++ b/worldmap/worldmap.appcache @@ -1,5 +1,5 @@ CACHE MANIFEST -# date: Jan 11th 2019 - v1.5.17 +# date: Jan 15th 2019 - v1.5.18 CACHE: index.html @@ -11,8 +11,8 @@ leaflet/L.Terminator.js leaflet/Leaflet.Dialog.css leaflet/Leaflet.Dialog.js leaflet/Leaflet.fullscreen.min.js -leaflet/Leaflet.vector-markers.css -leaflet/Leaflet.vector-markers.min.js +leaflet/leaflet-vector-markers.css +leaflet/leaflet-vector-markers.min.js leaflet/MarkerCluster.Default.css leaflet/MarkerCluster.css leaflet/TileLayer.Grayscale.js @@ -57,8 +57,6 @@ leaflet/images/measure-control.png leaflet/images/measure-control.svg leaflet/images/spritesheet-2x.png leaflet/images/spritesheet.png -leaflet/assets/shadow.png -leaflet/assets/shadow@2x.png leaflet/font-awesome/fonts/fontawesome-webfont.svg leaflet/font-awesome/fonts/fontawesome-webfont.woff leaflet/font-awesome/fonts/fontawesome-webfont.woff2