hk-bus-eta 1.7.2 → 1.7.5

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/Kmb.js

@@ -5,11 +5,15 @@ module.exports = {
   fetchEtas: ({stopId, route, seq, serviceType, bound}) => (
     fetch(`https://data.etabus.gov.hk/v1/transport/kmb/eta/${stopId}/${route}/${serviceType}`,{ 
       cache: utils.isSafari ? 'default' : 'no-store'
-    }).then( response => response.json() )
-    .then(({data}) => data.filter(e => 
-      e.dir === bound 
-      && e.seq === seq + 1 // api return 1-based seq
-    ).map(e => ({
+    })
+    .then( response => response.json() )
+    .then(({data}) => (
+      data.filter(e => 
+        e.eta !== null
+        && e.dir === bound 
+        && e.seq === seq + 1 // api return 1-based seq
+      )
+      .map(e => ({
         eta: e.eta,
         remark: {
           zh: e.rmk_tc,
@@ -17,7 +21,7 @@ module.exports = {
         },
         co: 'kmb'
       }))
-    )
+    ))
   ),
   fetchStopEtas: ( stopId ) => (
     fetch(`https://data.etabus.gov.hk/v1/transport/kmb/stop-eta/${stopId}`, { 

package/LightRail.js

@@ -12,7 +12,7 @@ module.exports = {
         .reduce((acc, {route_list, platform_id}) => [
           ...acc,
           ...route_list
-            .filter(({route_no, dest_ch, stop}) => route === route_no && dest_ch === dest.zh && stop === 0)
+            .filter(({route_no, dest_ch, stop}) => route === route_no && dest_ch.startsWith(dest.zh) && stop === 0)
             .map( ({time_en}) => {
               let waitTime = 0
               switch ( time_en.toLowerCase() ) {

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

@@ -14,15 +14,15 @@ module.exports = {
     for ( const company_id of co ) {
       if (company_id === 'kmb' && stops.kmb ){
         _etas = _etas.concat( await KmbApi.fetchEtas({
-        route,
-        stopId: stops.kmb[seq], 
-        seq,
-        serviceType, bound: bound[company_id]}) 
-        )
+          route,
+          stopId: stops.kmb[seq], 
+          seq,
+          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.5",
   "description": "Query the ETA (Estimated Time of Arrival) of HK Bus",
   "main": "index.js",
   "scripts": {