hk-bus-eta 1.7.2 → 1.7.3

package/Ctb.js

@@ -2,20 +2,28 @@ const utils = require('./utils');
 
 module.exports = {
   co: 'ctb',
-  fetchEtas: ({stopId, route, bound }) => (
+  fetchEtas: ({stopId, route, bound, seq }) => (
     fetch(`https://rt.data.gov.hk//v1/transport/citybus-nwfb/eta/CTB/${stopId}/${route}`, {
       cache: utils.isSafari ? 'default' : 'no-store'
     }).then(
       response => response.json()
-    ).then(({data}) => data.filter(eta => eta.eta && eta.dir === bound).map(e => ({
-        eta: e.eta,
-        remark: {
-          zh: e.rmk_tc,
-          en: e.rmk_en
-        },
-        co: 'ctb'
-      }))
-    )
+    ).then(({data}) => (
+      data
+        .filter(eta => eta.eta && eta.dir === bound)
+        // filter the eta by the stop sequence information 
+        // as the route data may not 100% match
+        // use the nearest seq
+        .sort((a,b) => Math.abs(a.seq - seq) < Math.abs(b.seq - seq) ? -1 : 1 )
+        .filter((eta, idx, self) => eta.seq === self[0].seq)
+        .map(e => ({
+          eta: e.eta,
+          remark: {
+            zh: e.rmk_tc,
+            en: e.rmk_en
+          },
+          co: 'ctb'
+        }))
+    ))
   ),
   fetchStopEtas: ( stopId ) => (
     fetch(`https://rt.data.gov.hk/v1/transport/batch/stop-eta/CTB/${stopId}`, { 

package/Nwfb.js

@@ -2,20 +2,28 @@ const utils = require('./utils');
 
 module.exports = {
   co: 'nwfb',
-  fetchEtas: ({stopId, route, bound }) => (
+  fetchEtas: ({stopId, route, bound, seq }) => (
     fetch(`https://rt.data.gov.hk//v1/transport/citybus-nwfb/eta/NWFB/${stopId}/${route}`, {
       cache: utils.isSafari ? 'default' : 'no-store'
     }).then(
       response => response.json()
-    ).then(({data}) => data.filter(eta => eta.eta && eta.dir === bound).map(e => ({
-        eta: e.eta,
-        remark: {
-          zh: e.rmk_tc,
-          en: e.rmk_en
-        },
-        co: 'nwfb'
-      }))
-    )
+    ).then(({data}) => (
+      data
+        .filter(eta => eta.eta && eta.dir === bound)
+        // filter the eta by the stop sequence information 
+        // as the route data may not 100% match
+        // use the nearest seq
+        .sort((a,b) => Math.abs(a.seq - seq) < Math.abs(b.seq - seq) ? -1 : 1 )
+        .filter((eta, idx, self) => eta.seq === self[0].seq)
+        .map(e => ({
+          eta: e.eta,
+          remark: {
+            zh: e.rmk_tc,
+            en: e.rmk_en
+          },
+          co: 'nwfb'
+        }))
+    ))
   ),
   fetchStopEtas: ( stopId ) => (
     fetch(`https://rt.data.gov.hk/v1/transport/batch/stop-eta/NWFB/${stopId}`, { 

package/index.js

@@ -20,9 +20,9 @@ module.exports = {
         serviceType, bound: bound[company_id]}) 
         )
       } else if ( company_id === 'ctb' && stops.ctb ) {
-        _etas = _etas.concat( await CtbApi.fetchEtas({stopId: stops.ctb[seq], route, bound: bound[company_id] }))
+        _etas = _etas.concat( await CtbApi.fetchEtas({stopId: stops.ctb[seq], route, bound: bound[company_id], seq }))
       } else if ( company_id === 'nwfb' && stops.nwfb ) {
-        _etas = _etas.concat( await NwfbApi.fetchEtas({stopId: stops.nwfb[seq], route, bound: bound[company_id] }))
+        _etas = _etas.concat( await NwfbApi.fetchEtas({stopId: stops.nwfb[seq], route, bound: bound[company_id], seq }))
       } else if ( company_id === 'nlb' && stops.nlb ) {
         _etas = _etas.concat( await NlbApi.fetchEtas({stopId: stops.nlb[seq], nlbId}) )
       } else if ( company_id === 'lrtfeeder' && stops.lrtfeeder ) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hk-bus-eta",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "description": "Query the ETA (Estimated Time of Arrival) of HK Bus",
   "main": "index.js",
   "scripts": {