Fixes for no shape_dist_traveled

BlinkTagInc · Aug 17, 2021 · 253bb78 · 253bb78
1 parent df7781a
commit 253bb78
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/lib/formatters.js b/lib/formatters.js
@@ -2,7 +2,7 @@
  * Format a route name.
  */
 export function formatRouteName(route) {
-  if (route.route_short_name !== '' && route.route_short_name !== undefined) {
+  if (route.route_short_name !== '' && route.route_short_name !== null) {
     return route.route_short_name;
   }
 

diff --git a/lib/utils.js b/lib/utils.js
@@ -78,7 +78,7 @@ const getStationsFromTrip = async trip => {
   let previousStationCoordinates;
   return trip.stoptimes.map((stoptime, index) => {
     const stop = stops[index];
-    const hasShapeDistance = every(trip.stoptimes, stoptime => stoptime.shape_dist_traveled !== undefined);
+    const hasShapeDistance = every(trip.stoptimes, stoptime => stoptime.shape_dist_traveled !== null);
 
     if (!hasShapeDistance) {
       if (index === 0) {
@@ -171,8 +171,7 @@ const getDataforChart = async (config, routeId) => {
 
     stations = [...stations, ...stationsOppositeDirection];
   }
-
-  const hasShapeDistance = every(longestTrip.stoptimes, stoptime => stoptime.shape_dist_traveled !== undefined);
+  const hasShapeDistance = every(longestTrip.stoptimes, stoptime => stoptime.shape_dist_traveled !== null);
   if (!hasShapeDistance) {
     notes.push('Distance between stops calculated assuming a straight line.');
   }

diff --git a/views/chart/formatting_functions.pug b/views/chart/formatting_functions.pug
@@ -6,15 +6,15 @@
     } = route;
     let routeName = '';
 
-    if (shortName !== '' && shortName !== undefined) {
+    if (shortName !== '' && shortName !== null) {
       routeName += shortName;
     }
 
-    if (shortName !== '' && shortName !== undefined && longName !== '' && longName !== undefined) {
+    if (shortName !== '' && shortName !== null && longName !== '' && longName !== null) {
       routeName += ' - ';
     }
 
-    if (longName !== '' && longName !== undefined) {
+    if (longName !== '' && longName !== null) {
       routeName += longName;
     }