Merge branch 'master' of https://github.com/hkbus/hk-bus-eta

hkbus · Aug 14, 2024 · 1369aa8 · 1369aa8
2 parents 3adccf4 + 65c2b8b
commit 1369aa8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/ctb.ts b/src/ctb.ts
@@ -23,7 +23,7 @@ export default function fetchEtas({
     .then((response) => response.json())
     .then(({ data }) =>
       data
-        .filter((eta: any) => eta.eta && bound.includes(eta.dir))
+        .filter((eta: any) => bound.includes(eta.dir))
         // filter the eta by the stop sequence information
         // as the route data may not 100% match
         // use the nearest seq

diff --git a/src/index.ts b/src/index.ts
@@ -89,11 +89,15 @@ export async function fetchEtas({
       }
     }
 
-    return _etas.sort((a, b) => {
-      if (a.eta === "") return 1;
-      else if (b.eta === "") return -1;
-      return a.eta < b.eta ? -1 : 1;
-    });
+    if (_etas.some((e) => e.eta)) {
+      _etas = _etas.filter((e) => e.eta);
+    }
+    return _etas
+      .sort((a, b) => {
+        if (!a.eta || a.eta === "") return 1;
+        else if (!b.eta || b.eta === "") return -1;
+        return a.eta < b.eta ? -1 : 1;
+      });
   } catch (err) {
     console.error(err);
     return [];

diff --git a/src/kmb.ts b/src/kmb.ts
@@ -30,7 +30,7 @@ export default function fetchEtas({
     .then((response) => response.json())
     .then(({ data }) =>
       data
-        .filter((e: any) => e.eta !== null && e.dir === bound)
+        .filter((e: any) => e.dir === bound)
         .sort((a: any, b: any) =>
           Math.abs(a.seq - seq) < Math.abs(b.seq - seq) ? -1 : 1,
         )