Merge branch 'feature/filterOutGateways' into feature/FeedbackChanges

OS2iot · Apr 25, 2024 · eaccd74 · eaccd74
2 parents 828bf7c + 2b0d306
commit eaccd74
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/app/applications/application-detail/application-detail.component.html b/src/app/applications/application-detail/application-detail.component.html
@@ -47,7 +47,7 @@ <h3>{{ "APPLICATION.DETAILS" | translate }}</h3>
                     <div class="col d-flex markerDescriptionDiv">
                         <div class="col d-flex">
                             <img class="marker" src="{{ greyMarker }}" />
-                            <p>: IoT-Device</p>
+                            <p>: IoT-Enhed</p>
                         </div>
                         <div class="col d-flex">
                             <img class="marker" src="{{ redMarker }}" />

diff --git a/src/app/shared/components/map/map.component.ts b/src/app/shared/components/map/map.component.ts
@@ -118,11 +118,19 @@ export class MapComponent implements OnInit, AfterViewInit, OnChanges, OnDestroy
             const clusterGroup = L.markerClusterGroup({
                 maxClusterRadius: 80,
             });
+            const gatewayLayerGroup = [];
 
             this.coordinateList.forEach(coord => {
-                clusterGroup.addLayer(
-                    this.addMarker(coord.latitude, coord.longitude, coord.draggable, coord.markerInfo)
-                );
+                if (!coord.markerInfo.isDevice) {
+                    gatewayLayerGroup.push(
+                        this.addMarker(coord.latitude, coord.longitude, coord.draggable, coord.markerInfo)
+                    );
+                    this.markers = L.layerGroup(gatewayLayerGroup).addTo(this.map);
+                } else {
+                    clusterGroup.addLayer(
+                        this.addMarker(coord.latitude, coord.longitude, coord.draggable, coord.markerInfo)
+                    );
+                }
             });
 
             this.markers = clusterGroup.addTo(this.map);