Merge pull request #35631 from dimagi/jls/ucr-maps

Added logic to reset leaflet images
dimagi · Jan 18, 2025 · bebe117 · bebe117
2 parents 40e09ec + 20aedd7
commit bebe117
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports_core/js/maps.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports_core/js/maps.js.diff.txt
@@ -7,6 +7,6 @@
      'underscore',
 -    'reports/js/bootstrap3/maps_utils',
 +    'reports/js/bootstrap5/maps_utils',
+     'leaflet',
  ], function (
      $,
-     _,
diff --git a/corehq/apps/reports_core/static/reports_core/js/bootstrap3/maps.js b/corehq/apps/reports_core/static/reports_core/js/bootstrap3/maps.js
@@ -2,11 +2,22 @@ hqDefine('reports_core/js/bootstrap3/maps', [
     'jquery',
     'underscore',
     'reports/js/bootstrap3/maps_utils',
+    'leaflet',
 ], function (
     $,
     _,
-    mapsUtils
+    mapsUtils,
+    L
 ) {
+    // Reset images needed for map markers, which don't play well with webpack.
+    // See https://github.com/Leaflet/Leaflet/issues/4968#issuecomment-483402699
+    delete L.Icon.Default.prototype._getIconUrl;
+    L.Icon.Default.mergeOptions({
+        iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+        iconUrl: require('leaflet/dist/images/marker-icon.png'),
+        shadowUrl: require('leaflet/dist/images/marker-shadow.png'),
+    });
+
     var module = {},
         privates = {};
 

diff --git a/corehq/apps/reports_core/static/reports_core/js/bootstrap5/maps.js b/corehq/apps/reports_core/static/reports_core/js/bootstrap5/maps.js
@@ -2,11 +2,22 @@ hqDefine('reports_core/js/bootstrap5/maps', [
     'jquery',
     'underscore',
     'reports/js/bootstrap5/maps_utils',
+    'leaflet',
 ], function (
     $,
     _,
-    mapsUtils
+    mapsUtils,
+    L
 ) {
+    // Reset images needed for map markers, which don't play well with webpack.
+    // See https://github.com/Leaflet/Leaflet/issues/4968#issuecomment-483402699
+    delete L.Icon.Default.prototype._getIconUrl;
+    L.Icon.Default.mergeOptions({
+        iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+        iconUrl: require('leaflet/dist/images/marker-icon.png'),
+        shadowUrl: require('leaflet/dist/images/marker-shadow.png'),
+    });
+
     var module = {},
         privates = {};
 

diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js
@@ -38,6 +38,10 @@ module.exports = {
                 loader: 'babel-loader',
                 exclude: /node_modules/,
             },
+            {
+                test: /\.png/,
+                type: 'asset/resource',
+            },
 
             // this rule ensures that hqDefine is renamed to define AMD module
             // definition syntax that webpack understands