Merge branch 'feat.uga-eap-classes' of https://github.com/rodekruis/I…

…BF-system into feat.uga-eap-classes
rodekruis · Jan 22, 2024 · 1f5a65f · 1f5a65f
2 parents e5c5da7 + 2b97eeb
commit 1f5a65f
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/interfaces/IBF-dashboard/src/app/services/map.service.ts b/interfaces/IBF-dashboard/src/app/services/map.service.ts
@@ -1011,21 +1011,26 @@ export class MapService {
         color: triggered ? this.triggeredAreaColor : this.nonTriggeredAreaColor,
         weight: 5,
       };
-    } else if (area.stopped) {
+    }
+    if (area.stopped) {
       return {
         color: this.stoppedTriggerColor,
         weight: 5,
       };
-    } else if (!this.eventState?.event?.thresholdReached) {
+    }
+    if (
+      !area.triggerValue ||
+      area.triggerValue < 1 ||
+      !this.eventState?.event?.thresholdReached
+    ) {
       return {
         color: this.nonTriggeredAreaColor,
         weight: 5,
       };
-    } else {
-      return {
-        color: this.triggeredAreaColor,
-        weight: 5,
-      };
     }
+    return {
+      color: this.triggeredAreaColor,
+      weight: 5,
+    };
   };
 }