Merge pull request #75 from Fonger/fix/site-effect

fix: eew intensity site effect
ExpTechTW · May 9, 2024 · 28a43b1 · 28a43b1
2 parents d112f60 + 009c666
commit 28a43b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -28,10 +28,8 @@ import PostalCode from "./assets/json/code.json";
 import {
   calculateEpicenterDistance,
   calculateExpectedIntensity,
-  calculateIntensity,
   calculateLocalExpectedWaveTime,
   calculateWaveRadius,
-  roundIntensity,
 } from "./scripts/helper/utils";
 import { getAudio } from "./scripts/helper/audio";
 import JSZip from "jszip";
@@ -253,16 +251,10 @@ api.on(WebSocketEvent.Eew, (e) => {
       lat: e.eq.lat,
       lng: e.eq.lon,
     })({ lng: area.lng, lat: area.lat })(e.eq.depth);
-    const localExpectedIntensity = calculateIntensity(
-      surfaceDistance,
-      distance,
-      e.eq.mag,
-      e.eq.depth
-    );
 
     data.surface = surfaceDistance;
     data.distance = distance;
-    data.i = roundIntensity(localExpectedIntensity);
+    data.i = intensity[config.cache.location.area];
 
     let { p, s } = calculateLocalExpectedWaveTime(
       data.distance,

diff --git a/src/scripts/helper/utils.ts b/src/scripts/helper/utils.ts
@@ -262,7 +262,8 @@ export const calculateExpectedIntensity = (
         surfaceDistance,
         distance,
         magnitude,
-        depth
+        depth,
+        town.site
       );
 
       if (int > maxIntensity) {