Merge pull request #1283 from opentripplanner/respect-mode-text-color

respect mode text color
opentripplanner · Nov 5, 2024 · 17eee37 · 17eee37
2 parents ea5c106 + d471628
commit 17eee37
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/lib/actions/apiV2.js b/lib/actions/apiV2.js
@@ -26,6 +26,7 @@ import {
 import {
   getRouteColorBasedOnSettings,
   getRouteIdForPattern,
+  getRouteTextColorBasedOnSettings,
   routeIsValid
 } from '../util/viewer'
 import { isLastStop } from '../util/stop-times'
@@ -1130,20 +1131,30 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
                   ...itin,
                   legs: itin.legs
                     ?.map((leg) => {
+                      const routeOperator = getRouteOperator(
+                        {
+                          agencyId: leg?.agency?.id,
+                          id: leg?.route?.id
+                        },
+                        config.transitOperators
+                      )
+                      const routeProperties = {
+                        color: leg?.route?.color,
+                        mode: leg.mode
+                      }
+
                       return {
                         ...leg,
                         origColor: leg?.route?.color,
                         route: {
                           ...leg.route,
                           color: getRouteColorBasedOnSettings(
-                            getRouteOperator(
-                              {
-                                agencyId: leg?.agency?.id,
-                                id: leg?.route?.id
-                              },
-                              config.transitOperators
-                            ),
-                            { color: leg?.route?.color, mode: leg.mode }
+                            routeOperator,
+                            routeProperties
+                          ).split('#')?.[1],
+                          textColor: getRouteTextColorBasedOnSettings(
+                            routeOperator,
+                            routeProperties
                           ).split('#')?.[1]
                         }
                       }

diff --git a/lib/util/viewer.js b/lib/util/viewer.js
@@ -355,6 +355,10 @@ export function getRouteColorBasedOnSettings(operator = {}, route = {}) {
       return backgroundColor
   }
 }
+export function getRouteTextColorBasedOnSettings(operator = {}, route = {}) {
+  const { color } = getColorAndNameFromRoute(operator, route)
+  return color
+}
 
 /**
  * Helper method to determine if a stop being viewed is a flex stop. This is not marked by