Merge pull request HSLdevcom#3182 from HSLdevcom/dt-3417

chore: fix gtfsId on test data
opentransportro · Apr 1, 2020 · ce4713c · ce4713c
2 parents 12aa7d6 + 262bdf2
commit ce4713c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/app/component/BusLeg.js b/app/component/BusLeg.js
@@ -30,8 +30,12 @@ const exampleLeg = t1 => ({
   duration: 120,
   rentedBike: false,
   intermediatePlaces: [],
-  route: { gtfsId: '123', shortName: '57', mode: 'BUS' },
-  trip: { gtfsId: '123', tripHeadsign: 'Kontula', pattern: { code: '1057' } },
+  route: { gtfsId: 'HSL:123', shortName: '57', mode: 'BUS' },
+  trip: {
+    gtfsId: 'HSL:123',
+    tripHeadsign: 'Kontula',
+    pattern: { code: '1057' },
+  },
   from: { name: 'Ilmattarentie', stop: { code: '2194' } },
   to: { name: 'Helsinki', stop: { code: '0072 ' } },
 });
@@ -47,8 +51,12 @@ const exampleLegRealtime = t1 => ({
   duration: 120,
   rentedBike: false,
   intermediatePlaces: [],
-  route: { gtfsId: '123', shortName: '57', mode: 'BUS' },
-  trip: { gtfsId: '123', tripHeadsign: 'Kontula', pattern: { code: '1057' } },
+  route: { gtfsId: 'HSL:123', shortName: '57', mode: 'BUS' },
+  trip: {
+    gtfsId: 'HSL:123',
+    tripHeadsign: 'Kontula',
+    pattern: { code: '1057' },
+  },
   from: { name: 'Ilmattarentie', stop: { code: '2194' } },
   to: { name: 'Helsinki', stop: { code: '0072 ' } },
 });

diff --git a/app/component/DepartureRowContainer.js b/app/component/DepartureRowContainer.js
@@ -127,7 +127,7 @@ const exampleDeparture1 = {
     code: '28',
     headSign: 'Tampere',
     route: {
-      gtfsId: '123',
+      gtfsId: 'FOO:123',
       mode: 'RAIL',
       shortName: 'IC28',
     },
@@ -151,7 +151,7 @@ const exampleDeparture2 = {
     code: '154',
     headSign: 'Kamppi',
     route: {
-      gtfsId: '123',
+      gtfsId: 'HSL:123',
       mode: 'BUS',
       shortName: '154',
     },

diff --git a/app/configurations/config.hsl.js b/app/configurations/config.hsl.js
@@ -539,7 +539,7 @@ export default {
   /* Function that can be used to configure route names before displaying them
      Takes routes gtfsId as input */
   getRoutePrefix: function routePrefix(routeId) {
-    if (!routeId || !routeId.includes(':')) {
+    if (!routeId) {
       return '';
     }
     return routeId.split(':')[1].substring(0, 1) === '7' ? 'U' : '';