jekyll-leaflet-mze 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 329c869674ecb93513a682f9b61844338364530964a4dc132c97fcbef645f0f9
-  data.tar.gz: daf96cdb063289bf366c92909867df3f6a1549478044bb4e79f216e8bfd60f5d
+  metadata.gz: 7ea4f3a41cdee4eb9ea02169323a51b1cda5fcf014e1dd6973f41d1e8d51cb59
+  data.tar.gz: 2431d27347eb0a91958e60b40605abdee53abf2aa9e1dad8fb350a0bfc73bb7e
 SHA512:
-  metadata.gz: f1dd3dc3b2a3fb05aa19a2577c8edfd1ca95e215e32fad862817a54e1ca86ca88434c751f7bc41de2f07c4088a424cd7fc3ef09aa7dfbaa6c49efc9c2128d310
-  data.tar.gz: bdd36f327ba2670bee5cd974db251ea1560b034e621a816ed7a5773ad01545fa11c94e4c0d9ad09fc2d9714afd51724420ec07ed03afba573cdd64d0bb63c6c6
+  metadata.gz: fd7f667928c83a7a5c8c4082c3e6bd3e82eb5a51f2c08bf955cde2e9eca2549186f5151051b1372545234854d99cfe6c6b98af74bcd0071ab3e3972677b53502
+  data.tar.gz: c098fb760ad6d0fdcbfa2ade102aa2f5afa520c9c74467d2bb043a9257d3c5eae212c6eab6eba4f0cf6ae125ee88bfbcfe503e7304b591176375e613c9f6f199

data/lib/jekyll-leaflet-mze/leaflet-map.js

@@ -21,8 +21,6 @@
     document.head.appendChild(defaultMapCssEl);
 
     var newWindowImgSrcBase64 = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAB3RJTUUH4wUVFzAHq2j99AAAAV9JREFUSMdjYKAxYCRHk5ubG9+1a9fm/v//H6cadnb2G/fu3atlIceC379/c3z9+jUEn5q/f/8eYWBgYECxQE5OroqA2Y8ePXq0hJWV9Qc3N/caZB8wMjJKff361QpvEAkKCv4nYMGh9+/f26MLamhoyLx9+3b/nz9/VJCC6MiLFy9sWXCE3xlGRsZvWKQu4DOciYnpCzc396HPnz97weRxWRD/8OHDa4TiAt1wfn5+z79//zoxMDDALWAiN/lhM/zevXtH0NUx0dJwsiwgxXCccUCJ4dzc3DP+//+/gZ2d/duLFy9Is+Djx4+rCbn82rVrrxgYGF6RFUR8fHyZbGxsD7AZLiEhUSAiIrJSUlIyjOw4uHnz5gVHR0d1bC7/8+eP5d+/f8P+/PmjS1Ekr1ix4hcp6ploXVwPfQuwJlMmJiYBLS0tIVIMev36NRvRFnz48OHohw8fhkYQjQKCAAChiL6Pj/LM2QAAAABJRU5ErkJggg==";
-    var iconUrl = "/assets/images/music-map/music-icon.png"
-    var iconSizePixels = [48, 48]
 
     // Actual mapping section; Specify a function to be called later that 
     // assembles the correct JS components based on what the user specified in the 
@@ -47,6 +45,24 @@
         }
     }
 
+    function _getIcon() {
+        // NOTE: retrieved from server, not present in the resources of this plugin
+        // var iconUrl = "/assets/images/music-map/music-icon.png"
+        var defaultIconSize = [48,48];
+        if("iconPath" in tagInputArg) {
+            var iconSizePixels = defaultIconSize;
+            if("iconSize" in tagInputArg) {
+                iconSizePixels = tagInputArg.iconSize;
+            }
+            return L.icon({
+                iconUrl: tagInputArg.iconPath,
+                iconSize: iconSizePixels
+            });
+        } else {
+            return null;
+        }
+    }
+
     function _getProviderBasemap(){
         var defaultProviderBasemap = "OpenStreetMap.Mapnik";
         if("providerBasemap" in tagInputArg){
@@ -56,34 +72,57 @@
         }
     }
 
-
-    function _addMarkerToMap(leafletItem, map, markersLayer){
-        var m = leafletItem.value;
-        var musicIcon = L.icon({
-            iconUrl: iconUrl,
-            iconSize: iconSizePixels
-        });
-        var marker = L.marker(
-            [m.latitude, m.longitude],
-            {icon: musicIcon, title: m.city + ":" + m.popupContent}
-        );
-        markersLayer.addLayer(marker);
-
+    function _mapMarkerPopup(leafletItem) {
         var potentialPopup = "";
-        if('popupContent' in m){                
-                potentialPopup += `<b>${m.city}</b><ul>`;
-                m.popupContent.forEach(item => {
+        if('city' in leafletItem) {
+            potentialPopup += `<b>${leafletItem.city}</b>`;
+        }
+        if('popupContent' in leafletItem){
+            if(leafletItem.popupContent.length == 1)  {
+                potentialPopup += '<br/>';
+                potentialPopup += leafletItem.popupContent[0];
+            } else {
+                potentialPopup += '<ul>';
+                leafletItem.popupContent.forEach(item => {
                     potentialPopup += '<li>'
                     potentialPopup += item.trim();
                     potentialPopup += '</li>';
                   });
                 potentialPopup += '</ul>';
+            }
         }
-        if('href' in m){
-            potentialPopup += '<a href="' + m.href + '">' + 
+        if('href' in leafletItem){
+            potentialPopup += '<a href="' + leafletItem.href + '">' + 
                 '<img src="' + newWindowImgSrcBase64 + '"></img></a>';}
-        if(potentialPopup){
-            marker.bindPopup(potentialPopup);}
+        return potentialPopup;
+    }
+
+    function _markerProps(icon, leafletValue) {
+        var props = {};
+        if(icon) {
+            props.icon = icon;
+        }
+        props.title = "";
+        if('city' in leafletValue) {
+            props.title = leafletValue.city;
+        }
+        if('popupContent' in leafletValue) {
+            props.title = leafletValue.popupContent; 
+        }
+        return props;
+    }
+
+
+    function _mapMarker(leafletItem, map){
+        var m = leafletItem.value;
+        var icon = _getIcon();
+        var markerProps = _markerProps(icon, m);
+        var marker = L.marker([m.latitude, m.longitude], markerProps);
+        var popup = _mapMarkerPopup(m);
+
+        if(popup){
+            marker.bindPopup(popup);
+        }
         if(!('center' in tagInputArg)){
             // If the user didn't specify a center, infer from marker
             map.panTo(new L.LatLng(m.latitude, m.longitude));
@@ -95,6 +134,7 @@
                 opacity: '0.95'
             })
         }
+        return marker;
     }
 
     function _onEachFeature(feature, layer){
@@ -152,7 +192,8 @@
     function _processLeafletItem(leafletItem, map, markersLayer){
         switch(leafletItem.type){
             case "LeafletMarker":
-                _addMarkerToMap(leafletItem, map, markersLayer);
+                var marker = _mapMarker(leafletItem, map);
+                markersLayer.addLayer(marker);
                 break;
             case "LeafletGeoJSON":
                 _addGeoJSONToMap(leafletItem, map);
@@ -218,6 +259,16 @@
         }
     }
 
+    function _addCssStylesheetToDom(elementId, stylesheetPath) {
+        var leafletCssEl = document.createElement("link");
+        leafletCssEl.id = elementId;
+        leafletCssEl.rel = "stylesheet";
+        leafletCssEl.href = stylesheetPath;
+        if(!document.getElementById(leafletCssEl.id)){
+            document.head.appendChild(leafletCssEl);
+        }
+    }
+
     var leafletCssId = "leaflet-css-head";
     var leafletJsId = "leaflet-js-head";
     var leafletSearchCssId = "leaflet-search-css-head";
@@ -225,22 +276,8 @@
     var esriLeafletJsId = "esri-leaflet-js-head";
     var leafletProvidersJsId = "leaflet-providers-js-head";
 
-    // Add the leaflet CSS first, don't worry about when it loads
-    var leafletCssEl = document.createElement("link");
-    leafletCssEl.id = leafletCssId;
-    leafletCssEl.rel = "stylesheet";
-    leafletCssEl.href = leafletCdn + "leaflet.css";
-    if(!document.getElementById(leafletCssEl.id)){
-        document.head.appendChild(leafletCssEl);
-    }
-
-    var leafletSearchCssEl = document.createElement("link");
-    leafletSearchCssEl.id = leafletSearchCssId;
-    leafletSearchCssEl.rel = "stylesheet";
-    leafletSearchCssEl.href = leafletSearchCdn + "leaflet-search.min.css";
-    if(!document.getElementById(leafletSearchCssEl.id)){
-        document.head.appendChild(leafletSearchCssEl);
-    }
+    _addCssStylesheetToDom(leafletCssId, leafletCdn + "leaflet.css");
+    _addCssStylesheetToDom(leafletSearchCssId, leafletSearchCdn + "leaflet-search.min.css");
 
     function addToHeadIfNotLoaded(el) {
         //Add the el to the head if it doesn't exist already. If it does,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-leaflet-mze
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - David Vitale