Merge branch 'fgl690' into 'main'

https://gitlab.com/pasosdeJesus/sivel2_gen/-/issues/690 arregla mapa en sivel2 See merge request pasosdeJesus/sivel2!55
pasosdeJesus · Aug 31, 2024 · 54634ce · 54634ce
2 parents 65716a8 + ebf662f
commit 54634ce
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -11,6 +11,9 @@
  * file per style scope.
  *
  *= require sivel2_gen/application.css
+ *= require leaflet/dist/leaflet.css
+ *= require leaflet.markercluster/dist/MarkerCluster.css
+ *= require leaflet.markercluster/dist/MarkerCluster.Default.css
  *= require_tree .
  *= require_self
  */
diff --git a/app/javascript/application.js b/app/javascript/application.js
@@ -30,8 +30,15 @@ import 'gridstack'
 
 
 // Leaflet
-var L = require('leaflet');
-var mc= require('leaflet.markercluster');
+import L from 'leaflet';
+import 'leaflet.markercluster';
+
+
+L.Icon.Default.mergeOptions({
+      iconUrl: "marker-icon.png",
+      iconRetinaUrl: "marker-icon-2x.png",
+      shadowUrl: "marker-shadow.png"
+});
 
 import plotly_serietiempo_actos from './plotly_actos'
 

diff --git a/public/images/marker-icon-2x.png b/public/images/marker-icon-2x.png
diff --git a/public/images/marker-icon.png b/public/images/marker-icon.png
diff --git a/public/images/marker-shadow.png b/public/images/marker-shadow.png