Merge branch 'v3' into waltti

HSLdevcom · Dec 27, 2024 · 412fcfe · 412fcfe
2 parents 11387af + e607e53
commit 412fcfe
Show file tree

Hide file tree

Showing 49 changed files with 1,326 additions and 441 deletions.
diff --git a/app/component/RouteNumber.js b/app/component/RouteNumber.js
@@ -12,15 +12,43 @@ const LONG_ROUTE_NUMBER_LENGTH = 6;
 
 function RouteNumber(props, context) {
   const mode = props.mode.toLowerCase();
-  const { alertSeverityLevel, color, withBicycle, text } = props;
+  const { alertSeverityLevel, color, withBicycle, withCar } = props;
   const isScooter = mode === TransportMode.Scooter.toLowerCase();
-  const textIsText = typeof text === 'string'; // can be also react node
+
+  // Perform text-related processing
+  let filteredText = props.text;
+  if (
+    props.shortenLongText &&
+    context.config.disabledLegTextModes?.includes(mode) &&
+    props.className.includes('line')
+  ) {
+    filteredText = '';
+  }
+  const textFieldIsText = typeof filteredText === 'string'; // can be also react node
+  if (
+    props.shortenLongText &&
+    context.config.shortenLongTextThreshold &&
+    filteredText &&
+    textFieldIsText &&
+    filteredText.length > context.config.shortenLongTextThreshold
+  ) {
+    filteredText = `${filteredText.substring(
+      0,
+      context.config.shortenLongTextThreshold - 3,
+    )}...`;
+  }
   const longText =
-    text && textIsText && text.length >= LONG_ROUTE_NUMBER_LENGTH;
+    filteredText &&
+    textFieldIsText &&
+    filteredText.length >= LONG_ROUTE_NUMBER_LENGTH;
   // Checks if route only has letters without identifying numbers and
   // length doesn't fit in the tab view
   const hasNoShortName =
-    text && textIsText && /^([^0-9]*)$/.test(text) && text.length > 3;
+    filteredText &&
+    textFieldIsText &&
+    /^([^0-9]*)$/.test(filteredText) &&
+    filteredText.length > 3;
+
   const getColor = () => color || (props.isTransitLeg ? 'currentColor' : null);
 
   const getIcon = (
@@ -57,6 +85,12 @@ function RouteNumber(props, context) {
               className="itinerary-icon_with-bicycle"
             />
           )}
+          {withCar && (
+            <Icon
+              img="icon-icon_car-withoutBox"
+              className="itinerary-icon_with-car"
+            />
+          )}
         </React.Fragment>
       );
     }
@@ -83,6 +117,12 @@ function RouteNumber(props, context) {
             className="itinerary-icon_with-bicycle"
           />
         )}
+        {withCar && (
+          <Icon
+            img="icon-icon_car-withoutBox"
+            className="itinerary-icon_with-car"
+          />
+        )}
       </React.Fragment>
     );
   };
@@ -128,7 +168,7 @@ function RouteNumber(props, context) {
             )}
           </div>
         )}
-        {text && (
+        {filteredText && (
           <div
             className={cx(
               'vehicle-number-container-v'.concat(props.card ? '-map' : ''),
@@ -146,10 +186,10 @@ function RouteNumber(props, context) {
               )}
               style={{ color: !props.withBar && getColor() }}
             >
-              {props.text}
+              {filteredText}
             </span>
-            {textIsText && (
-              <span className="sr-only">{text?.toLowerCase()}</span>
+            {textFieldIsText && (
+              <span className="sr-only">{filteredText?.toLowerCase()}</span>
             )}
           </div>
         )}
@@ -206,9 +246,11 @@ RouteNumber.propTypes = {
   duration: PropTypes.number,
   isTransitLeg: PropTypes.bool,
   withBicycle: PropTypes.bool,
+  withCar: PropTypes.bool,
   card: PropTypes.bool,
   appendClass: PropTypes.string,
   occupancyStatus: PropTypes.string,
+  shortenLongText: PropTypes.bool,
 };
 
 RouteNumber.defaultProps = {
@@ -228,15 +270,16 @@ RouteNumber.defaultProps = {
   isTransitLeg: false,
   renderModeIcons: false,
   withBicycle: false,
+  withCar: false,
   color: undefined,
   duration: undefined,
   occupancyStatus: undefined,
+  shortenLongText: false,
 };
 
 RouteNumber.contextTypes = {
   intl: intlShape.isRequired,
   config: configShape.isRequired,
 };
 
-RouteNumber.displayName = 'RouteNumber';
 export default RouteNumber;
diff --git a/app/component/RouteNumberContainer.js b/app/component/RouteNumberContainer.js
@@ -1,65 +1,35 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { routeShape, configShape } from '../util/shapes';
-import { getLegText } from '../util/legUtils';
+import { getRouteText } from '../util/legUtils';
 import RouteNumber from './RouteNumber';
 
 const RouteNumberContainer = (
-  {
-    alertSeverityLevel,
-    interliningWithRoute,
-    className,
-    route,
-    isCallAgency,
-    withBicycle,
-    occupancyStatus,
-    mode,
-    ...props
-  },
+  { interliningWithRoute, route, mode, ...props },
   { config },
 ) =>
   route && (
     <RouteNumber
-      alertSeverityLevel={alertSeverityLevel}
-      className={className}
-      isCallAgency={isCallAgency}
       color={route.color ? `#${route.color}` : null}
       mode={mode !== undefined ? mode : route.mode}
-      text={getLegText(route, config, interliningWithRoute)}
-      withBicycle={withBicycle}
-      occupancyStatus={occupancyStatus}
+      text={getRouteText(route, config, interliningWithRoute)}
       {...props}
     />
   );
 
 RouteNumberContainer.propTypes = {
-  alertSeverityLevel: PropTypes.string,
   route: routeShape.isRequired,
   interliningWithRoute: PropTypes.string,
-  isCallAgency: PropTypes.bool,
-  vertical: PropTypes.bool,
-  className: PropTypes.string,
-  fadeLong: PropTypes.bool,
-  withBicycle: PropTypes.bool,
-  occupancyStatus: PropTypes.string,
   mode: PropTypes.string,
 };
 
 RouteNumberContainer.defaultProps = {
   interliningWithRoute: undefined,
-  alertSeverityLevel: undefined,
-  isCallAgency: false,
-  vertical: false,
-  fadeLong: false,
-  className: '',
-  withBicycle: false,
-  occupancyStatus: undefined,
   mode: undefined,
 };
 
 RouteNumberContainer.contextTypes = {
   config: configShape.isRequired,
 };
 
-RouteNumberContainer.displayName = 'RouteNumberContainer';
 export default RouteNumberContainer;
diff --git a/app/component/itinerary/AlternativeItineraryBar.js b/app/component/itinerary/AlternativeItineraryBar.js
@@ -15,6 +15,7 @@ export default function AlternativeItineraryBar(
     bikePlan,
     bikePublicPlan,
     carPlan,
+    carPublicPlan,
     parkRidePlan,
     loading,
   },
@@ -69,6 +70,14 @@ export default function AlternativeItineraryBar(
               onClick={selectStreetMode}
             />
           )}
+          {carPublicPlan?.edges?.length > 0 && (
+            <StreetModeSelectorButton
+              icon="icon-icon_car-withoutBox"
+              name={streetHash.carAndVehicle}
+              plan={carPublicPlan}
+              onClick={selectStreetMode}
+            />
+          )}
           {config.emphasizeOneWayJourney && (
             <div style={{ alignSelf: 'center' }}>
               <FormattedMessage
@@ -90,6 +99,7 @@ AlternativeItineraryBar.propTypes = {
   bikePublicPlan: planShape,
   parkRidePlan: planShape,
   carPlan: planShape,
+  carPublicPlan: planShape,
   weatherData: PropTypes.shape({
     temperature: PropTypes.number,
     windSpeed: PropTypes.number,
@@ -105,6 +115,7 @@ AlternativeItineraryBar.defaultProps = {
   bikePublicPlan: undefined,
   parkRidePlan: undefined,
   carPlan: undefined,
+  carPublicPlan: undefined,
   loading: undefined,
 };