Correctly display SHS marker on maps (#367)

EnAccess · Nov 20, 2024 · f9c4e4d · f9c4e4d
1 parent 17de2e7
commit f9c4e4d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/frontend/src/mixins/mapSharing.js b/src/frontend/src/mixins/mapSharing.js
@@ -123,7 +123,7 @@ export const sharedMap = {
       }
       this.markersLayer = new L.markerClusterGroup({
         chunkedLoading: true,
-        spiderfyOnMaxZoom: false,
+        spiderfyOnMaxZoom: true,
       })
       const drawControl = new L.Control.Draw(drawingOptions)
       this.map.addLayer(drawingOptions.edit.featureGroup)

diff --git a/src/frontend/src/modules/Client/Client.vue b/src/frontend/src/modules/Client/Client.vue
@@ -146,7 +146,7 @@ export default {
           case "e_bike":
             markerType = MARKER_TYPE.E_BIKE
             break
-          case "shs":
+          case "solar_home_system":
             markerType = MARKER_TYPE.SHS
             break
           default:

diff --git a/src/frontend/src/modules/Map/MiniGridMap.vue b/src/frontend/src/modules/Map/MiniGridMap.vue
@@ -247,7 +247,11 @@ export default {
             icon: deviceMarkerIcon,
           })
           deviceMarker.bindTooltip(
-            "<strong>Device:</strong> " + markingInfo.serialNumber,
+            "<strong>Device:</strong> " +
+              markingInfo.serialNumber +
+              "<br>" +
+              "<strong>Type:</strong> " +
+              markingInfo.deviceType,
             { sticky: true, offset: [10, 10] },
           )
 
@@ -343,12 +347,13 @@ export default {
         }
         const lat = parseFloat(points[0])
         const lon = parseFloat(points[1])
+
         let markerType = ""
         switch (device.device_type) {
           case "e_bike":
             markerType = MARKER_TYPE.E_BIKE
             break
-          case "shs":
+          case "solar_home_system":
             markerType = MARKER_TYPE.SHS
             break
           default: