Extracted leaflet monkey patching #3

McBen@1158ade McBen@a3d34ce
IITC-CE · Jan 18, 2019 · 551f4c9 · 551f4c9
1 parent 953519d
commit 551f4c9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/code/boot.js b/code/boot.js
@@ -589,6 +589,24 @@ window.setupLayerChooserApi = function() {
   }
 }
 
+function MonkeyPatching_Leaflet() {
+  var iconDefImage = '@@INCLUDEIMAGE:images/marker-icon.png@@';
+  var iconDefRetImage = '@@INCLUDEIMAGE:images/marker-icon-2x.png@@';
+
+  L.Icon.Default = L.Icon.extend({
+    options: {
+      iconUrl      : iconDefImage,
+      iconRetinaUrl: iconDefRetImage,
+      iconSize     : new L.Point(25, 41),
+      iconAnchor   : new L.Point(12, 41),
+      popupAnchor  : new L.Point(1, -34)
+    },
+    _getIconUrl: function (name) {
+      return L.Icon.prototype._getIconUrl.call(this, name);
+    }
+  });
+}
+
 // BOOTING ///////////////////////////////////////////////////////////
 
 function boot() {
@@ -599,16 +617,7 @@ function boot() {
   if(window.deviceID) console.log('Your device ID: ' + window.deviceID);
   window.runOnSmartphonesBeforeBoot();
 
-  var iconDefImage = '@@INCLUDEIMAGE:images/marker-icon.png@@';
-  var iconDefRetImage = '@@INCLUDEIMAGE:images/marker-icon-2x.png@@';
-
-  L.Icon.Default = L.Icon.extend({options: {
-    iconUrl: iconDefImage,
-    iconRetinaUrl: iconDefRetImage,
-    iconSize: new L.Point(25, 41),
-    iconAnchor: new L.Point(12, 41),
-    popupAnchor: new L.Point(1, -34),
-  }});
+  MonkeyPatching_Leaflet();
 
   window.extractFromStock();
   window.setupIdle();

diff --git a/external/leaflet.css b/external/leaflet.css
@@ -464,7 +464,7 @@
 
 /* Default icon URLs */
 .leaflet-default-icon-path {
-    background-image: url(@@INCLUDEIMAGE:images/marker-icon.png@@);
+    background-image: url(""); /* requires Path: not URL! Patched in Boot */
 }
 
 /* attribution and scale controls */