Ladda-ikon när händelser laddas

bonny · Jul 1, 2024 · 5533913 · 5533913
1 parent 25af48d
commit 5533913
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 6 deletions.
diff --git a/public/js/events-map.js b/public/js/events-map.js
@@ -64,6 +64,11 @@ const crimeTypesToClass = {
     ordningslagen: "unknown",
     sjölagen: "unknown",
     "sjukdom/olycksfall": "unknown",
+    // missing:
+    // - miljöbrott
+    // bad icons:
+    // - våldtäkt
+    // - misshandel
 };
 
 /**
@@ -264,7 +269,7 @@ class EventsMap {
             markers.push(oneMarker);
         });
 
-        console.log("markers", markers);
+        console.log("markers loaded", markers);
 
         const markerClusterOptions = {
             // Small number to create very small clusters since I don't like when they are big.
@@ -303,6 +308,8 @@ class EventsMap {
         // map.on('spiderfied unspiderfied', function() {
         //     console.log('unspiderfied 2');
         // });
+
+        this.controlLoader.hide();
     }
 
     // expandMap() {
@@ -334,6 +341,9 @@ class EventsMap {
         window.map = this.map;
         console.log("window.map now available", window.map);
 
+        this.controlLoader = L.control.loader().addTo(this.map);
+        this.controlLoader.show();
+
         this.map.on("load", () => {
             this.loadMarkers();
 
@@ -442,10 +452,13 @@ class EventsMap {
 
 document.addEventListener("DOMContentLoaded", function () {
     let mapContainers = document.querySelectorAll(".EventsMap");
+
+    if (!mapContainers.length) {
+        return;
+    }
+
     mapContainers.forEach((element) => {
         new EventsMap(element, {
-            // Todo: This used to be blade template, so rewrite this to use data-attributes.
-            // Get size from data-events-map-size
             size: element.getAttribute("data-events-map-size"),
         });
     });

diff --git a/public/js/leaflet-loader.js b/public/js/leaflet-loader.js
@@ -0,0 +1,35 @@
+// https://github.com/stefanocudini/leaflet-loader/blob/master/leaflet-loader.js
+(function () {
+    L.Control.Loader = L.Control.extend({
+        onAdd: function (map) {
+            this._map = map;
+            this._container = L.DomUtil.create("div", "leaflet-control-loader");
+            this.hide();
+            return this._container;
+        },
+        addTo: function (map) {
+            this._container = this.onAdd(map);
+            map.getContainer().appendChild(this._container);
+            return this;
+        },
+        show: function () {
+            this._container.style.display = "block";
+            return this;
+        },
+        hide: function () {
+            this._container.style.display = "none";
+            return this;
+        },
+    });
+
+    L.Map.addInitHook(function () {
+        if (this.options.loaderControl) {
+            this.loaderControl = L.control.loader(this.options.loaderControl);
+            this.addControl(this.loaderControl);
+        }
+    });
+
+    L.control.loader = function (options) {
+        return new L.Control.Loader(options);
+    };
+}).call(this);
diff --git a/resources/views/components/events-map.blade.php b/resources/views/components/events-map.blade.php
@@ -15,6 +15,7 @@
             type="text/css">
         <script src="https://unpkg.com/[email protected]/dist/leaflet.markercluster.js" charset="utf-8"></script>
 
+        <script src="{{ URL::asset('js/leaflet-loader.js') }}"></script>
         <script src="{{ URL::asset('js/events-map.js') }}"></script>
     @endpush
 
@@ -147,6 +148,23 @@ function setVarsBasedOnAd(adElm) {
 
     @push('styles')
         <style>
+            .leaflet-control-loader {
+                z-index: 2000;
+                position: absolute;
+                top: 50%;
+                left: 50%;
+                margin-top: -40px;
+                margin-left: -50px;
+                height: 80px;
+                width: 100px;
+                border-radius: 10px;
+                /* background: url('images/leaflet-loader.gif') center center no-repeat rgba(255,255,255,0.8); */
+                background-color: rgba(255, 255, 255, .5);
+                background-repeat: no-repeat;
+                background-position: center;
+                background-image: url('data:image/gif;base64,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');
+            }
+
             .EventsMap__container {
                 position: relative;
             }
@@ -285,9 +303,9 @@ function setVarsBasedOnAd(adElm) {
             }
 
             /* .EventsMap-marker-icon--near,
-                                                                                                            .EventsMap-marker-icon--nearer {
-                                                                                                                border: 2px solid rgba(255, 255, 255, .5);
-                                                                                                            } */
+                                                                                                                                                                    .EventsMap-marker-icon--nearer {
+                                                                                                                                                                        border: 2px solid rgba(255, 255, 255, .5);
+                                                                                                                                                                    } */
 
             .EventsMap-marker-content {
                 display: flex;