Merge pull request #5268 from HSLdevcom/DT-6729

DT-6729 Broken route names in stop view
HSLdevcom · Feb 15, 2025 · 82f37da · 82f37da
2 parents 4da2f8f + e6cce45
commit 82f37da
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/app/component/itinerary/navigator/navigator.scss b/app/component/itinerary/navigator/navigator.scss
@@ -84,7 +84,7 @@
     display: flex;
     flex-direction: row;
     height: 18px;
-    
+
     .arrow-center {
       padding-top: 4px;
     }
@@ -95,7 +95,7 @@
 
       .vcenter-children {
         display: flex;
-        
+
         .vehicle-number {
           color: white;
           padding: 0 8px 0 2px;

diff --git a/app/component/routepage/RoutePatternSelect.js b/app/component/routepage/RoutePatternSelect.js
@@ -96,6 +96,7 @@ function renderPatternSelectSuggestion(item, currentPattern) {
           <Icon
             className={item.mode.toLowerCase()}
             img={`icon-icon_${item.mode.toLowerCase()}`}
+            color={item.color ? `#${item.color}` : null}
           />
           <div className="similar-route-text">
             <span className="similar-route-name">{item.shortName}</span>
@@ -169,6 +170,7 @@ class RoutePatternSelect extends Component {
             shortName
             longName
             mode
+            color
           }
         }
       `;

diff --git a/app/component/routepage/ScheduleContainer.js b/app/component/routepage/ScheduleContainer.js
@@ -900,13 +900,16 @@ class ScheduleContainer extends PureComponent {
         this.context.config.timetables[routeIdSplitted[0]]
       : undefined;
 
+    const timetableDay =
+      (wantedDay && wantedDay.format(DATE_FORMAT)) || newServiceDay;
     const routeTimetableUrl =
       routeTimetableHandler &&
+      timetableDay &&
       this.context.config.URL.ROUTE_TIMETABLES[routeIdSplitted[0]] &&
       routeTimetableHandler.routeTimetableUrlResolver(
         this.context.config.URL.ROUTE_TIMETABLES[routeIdSplitted[0]],
         this.props.route,
-        newServiceDay,
+        timetableDay,
         this.props.lang,
       );
 

diff --git a/app/component/routepage/route.scss b/app/component/routepage/route.scss
@@ -1229,7 +1229,6 @@ $margin-left-right: 21.3px;
   }
 
   .icon {
-    color: $primary-color;
     position: absolute;
     right: 1rem;
     top: 15px;
@@ -1241,6 +1240,11 @@ $margin-left-right: 21.3px;
     }
   }
 
+  .dropdown-arrow,
+  .in-text-arrow {
+    color: $primary-color;
+  }
+
   .in-text-arrow {
     position: relative;
     float: none;

diff --git a/app/configurations/images/default/default-favicon.png b/app/configurations/images/default/default-favicon.png
diff --git a/app/util/legUtils.js b/app/util/legUtils.js
@@ -718,6 +718,9 @@ export function getHeadsignFromRouteLongName(route) {
   if (
     longName &&
     shortName &&
+    // Sometimes a "normal" shortname is included in longName, but sometimes
+    // shortName is just a shortened version of longName.
+    shortName.length < 7 &&
     longName.substring(0, shortName.length) === shortName &&
     longName.length > shortName.length
   ) {