Merge pull request #5232 from HSLdevcom/fix-summary-length

DT-5952 - Fix summary length issue with interlining legs

Author: vesameskanen

app/component/itinerary/Itinerary.js

@@ -21,6 +21,7 @@ import {
   getLegBadgeProps,
   isCallAgencyLeg,
   getInterliningLegs,
+  isFirstInterliningLeg,
   getTotalDistance,
   getRouteText,
   legTime,
@@ -361,9 +362,6 @@ const Itinerary = (
     let waitLength;
     const startMs = legTime(leg.start);
     const endMs = legTime(leg.end);
-    const isNextLegLast = i + 1 === compressedLegs.length - 1;
-    const shouldRenderLastLeg =
-      isNextLegLast && lastLegLength < renderBarThreshold;
     const previousLeg = i > 0 ? compressedLegs[i - 1] : null;
     const nextLeg =
       i < compressedLegs.length - 1 ? compressedLegs[i + 1] : null;
@@ -387,24 +385,37 @@ const Itinerary = (
       }
     }
 
-    const [interliningLines, interliningLegs] = getInterliningLegs(
-      compressedLegs,
-      i,
-    );
-
-    const lastLegWithInterline = interliningLegs[interliningLegs.length - 1];
-    if (lastLegWithInterline) {
+    if (isFirstInterliningLeg(compressedLegs, i)) {
+      const [interliningLines, interliningLegs] = getInterliningLegs(
+        compressedLegs,
+        i,
+      );
       interliningWithRoute = interliningLines.join(' / ');
-      legLength =
-        ((legTime(lastLegWithInterline.end) - startMs) / durationWithoutSlack) *
-        100;
+      const lastLegWithInterline = interliningLegs[interliningLegs.length - 1];
+      legLength = relativeLength(legTime(lastLegWithInterline.end) - startMs);
+      if (
+        compressedLegs.length - 2 === i + interliningLegs.length &&
+        lastLegLength < renderBarThreshold
+      ) {
+        // If the last interlining leg is the next to last leg and
+        // if the last leg is too short add its length to the interlining leg.
+        legLength += lastLegLength;
+      }
+    } else if (leg.interlineWithPreviousLeg) {
+      // Interlining legs after the first one should be skipped, this skips to the next index.
+      return;
+    } else if (
+      compressedLegs.length - 2 === i &&
+      lastLegLength < renderBarThreshold
+    ) {
+      // Interlining legs handle this addition differently.
+      // If this leg is the next to last leg and
+      // if the last leg is too short add its length to the leg before it.
+      legLength += lastLegLength;
     }
+
     legLength += addition;
     addition = 0;
-
-    if (shouldRenderLastLeg) {
-      legLength += lastLegLength; // if the last leg is too short add its length to the leg before it
-    }
     if (legLength < renderBarThreshold && isLegOnFoot(leg)) {
       // don't render short legs that are on foot at all
       renderBar = false;
@@ -593,25 +604,23 @@ const Itinerary = (
         legLength > renderRouteNumberThreshold &&
         !longName &&
         transitLegCount < 7;
-      if (!leg.interlineWithPreviousLeg) {
-        legs.push(
-          <RouteLeg
-            key={`${leg.mode}_${startMs}`}
-            leg={leg}
-            fitRouteNumber={
-              (fitAllRouteNumbers && !longName) || renderRouteNumberForALongLeg
-            }
-            interliningWithRoute={interliningWithRoute}
-            intl={intl}
-            legLength={legLength}
-            large={breakpoint === 'large'}
-            withBicycle={withBicycle}
-            withCar={withCar}
-            hasOneTransitLeg={hasOneTransitLeg(itinerary)}
-            shortenLabels={shortenLabels}
-          />,
-        );
-      }
+      legs.push(
+        <RouteLeg
+          key={`${leg.mode}_${startMs}`}
+          leg={leg}
+          fitRouteNumber={
+            (fitAllRouteNumbers && !longName) || renderRouteNumberForALongLeg
+          }
+          interliningWithRoute={interliningWithRoute}
+          intl={intl}
+          legLength={legLength}
+          large={breakpoint === 'large'}
+          withBicycle={withBicycle}
+          withCar={withCar}
+          hasOneTransitLeg={hasOneTransitLeg(itinerary)}
+          shortenLabels={shortenLabels}
+        />,
+      );
       vehicleNames.push(
         formatMessage(
           {

app/util/legUtils.js

@@ -201,7 +201,7 @@ export function getRouteText(route, config, interliningWithRoute) {
 }
 
 /**
- * Returns all legs after a given index in which the user can wait in the vehilce for the next transit leg
+ * Returns all legs after a given index in which the user can wait in the vehicle for the next transit leg
  * to start.
  * @param {*} legs An array of itinerary legs
  * @param {*} index Current index on the array
@@ -220,6 +220,19 @@ export function getInterliningLegs(legs, index) {
   return [uniqueLines, interliningLegs];
 }
 
+/**
+ * Checks if the given index is the first interlining leg in a set of interlining legs.
+ * @param {*} legs An array of itinerary legs
+ * @param {*} index Current index on the array
+ */
+export function isFirstInterliningLeg(legs, i) {
+  return (
+    i + 1 < legs.length &&
+    !legs[i].interlineWithPreviousLeg &&
+    legs[i + 1].interlineWithPreviousLeg
+  );
+}
+
 function bikingEnded(leg1) {
   return leg1.from.vehicleRentalStation && leg1.mode === 'WALK';
 }