Skip to content

Commit

Permalink
Merge branch 'dev' into itin-summary-overlay
Browse files Browse the repository at this point in the history
  • Loading branch information
@miles-grant-ibigroup
miles-grant-ibigroup committed Jan 5, 2024
2 parents 37d5c1e + eb0d454 commit aa3c220
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 2 deletions.
11 changes: 11 additions & 0 deletions __tests__/components/viewers/__snapshots__/stop-viewer.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1449,6 +1449,7 @@ exports[`components > viewers > stop viewer should render countdown times after
"agencyName": "TriMet",
"mode": "BUS",
"onColoredBackground": true,
"origColor": undefined,
"routeColor": undefined,
"routeLongName": "Burnside/Stark",
"routeShortName": "20",
Expand Down Expand Up @@ -4009,6 +4010,7 @@ exports[`components > viewers > stop viewer should render countdown times for st
"agencyName": "TriMet",
"mode": "BUS",
"onColoredBackground": true,
"origColor": undefined,
"routeColor": undefined,
"routeLongName": "Burnside/Stark",
"routeShortName": "20",
Expand Down Expand Up @@ -6170,6 +6172,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
"agencyName": "TriMet",
"mode": "BUS",
"onColoredBackground": true,
"origColor": undefined,
"routeColor": undefined,
"routeLongName": "Burnside/Stark",
"routeShortName": "20",
Expand Down Expand Up @@ -9864,6 +9867,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
"agencyName": "TriMet",
"mode": "BUS",
"onColoredBackground": true,
"origColor": undefined,
"routeColor": undefined,
"routeLongName": "Burnside/Stark",
"routeShortName": "20",
Expand Down Expand Up @@ -10537,6 +10541,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
"agencyName": "TriMet",
"mode": "BUS",
"onColoredBackground": true,
"origColor": undefined,
"routeColor": undefined,
"routeLongName": "Pacific Hwy/Sherwood",
"routeShortName": "94",
Expand Down Expand Up @@ -11160,6 +11165,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
"agencyName": "TriMet",
"mode": "BUS",
"onColoredBackground": true,
"origColor": undefined,
"routeColor": undefined,
"routeLongName": "Pacific Hwy/Sherwood",
"routeShortName": "94",
Expand Down Expand Up @@ -11465,6 +11471,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
"agencyName": "TriMet",
"mode": "BUS",
"onColoredBackground": true,
"origColor": undefined,
"routeColor": undefined,
"routeLongName": "South Shore",
"routeShortName": "36",
Expand Down Expand Up @@ -11934,6 +11941,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
"agencyName": "TriMet",
"mode": "BUS",
"onColoredBackground": true,
"origColor": undefined,
"routeColor": undefined,
"routeLongName": "Pacific Hwy/Sherwood",
"routeShortName": "94",
Expand Down Expand Up @@ -12221,6 +12229,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
"agencyName": "TriMet",
"mode": "BUS",
"onColoredBackground": true,
"origColor": undefined,
"routeColor": undefined,
"routeLongName": "South Shore",
"routeShortName": "36",
Expand Down Expand Up @@ -12522,6 +12531,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
"agencyName": "TriMet",
"mode": "BUS",
"onColoredBackground": true,
"origColor": undefined,
"routeColor": undefined,
"routeLongName": "Pacific Hwy/Sherwood",
"routeShortName": "94",
Expand Down Expand Up @@ -16899,6 +16909,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
"agencyName": "TriMet",
"mode": "BUS",
"onColoredBackground": true,
"origColor": undefined,
"routeColor": undefined,
"routeLongName": "Burnside/Stark",
"routeShortName": "20",
Expand Down
40 changes: 38 additions & 2 deletions lib/actions/apiV2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -702,6 +702,18 @@ export const findRoute = (params) =>
stops: patternStops
}
})
newRoute.origColor = newRoute.color
newRoute.color = getRouteColorBasedOnSettings(
getRouteOperator(
{
agencyId: newRoute?.agency?.id,
id: newRoute?.route?.id
},
getState().otp.config.transitOperators
),
{ color: newRoute?.route?.color, mode: newRoute.mode }
).split('#')?.[1]

newRoute.patterns = routePatterns
// TODO: avoid explicit behavior shift like this
newRoute.v2 = true
Expand Down Expand Up @@ -753,8 +765,30 @@ export function findRoutes() {
// To initialize the route viewer,
// convert the routes array to a dictionary indexed by route ids.
return routes.reduce((result, route) => {
const { agency, color, id, longName, mode, shortName, type } =
route
const {
agency,
color: origColor,
id,
longName,
mode,
shortName,
type
} = route
// Set color overrides if present
const color = getRouteColorBasedOnSettings(
getRouteOperator(
{
agencyId: route?.agency?.id,
id: route?.route?.id
},
config.transitOperators
),
{
color: route?.route?.color,
mode: route.mode
}
).split('#')?.[1]

result[id] = {
agencyId: agency.id,
agencyName: agency.name,
Expand All @@ -765,6 +799,7 @@ export function findRoutes() {
{ id, mode },
config?.routeModeOverrides
),
origColor,
shortName,
type,
v2: true
Expand Down Expand Up @@ -978,6 +1013,7 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
?.map((leg) => {
return {
...leg,
origColor: leg?.route?.color,
route: {
...leg.route,
color: getRouteColorBasedOnSettings(
Expand Down
1 change: 1 addition & 0 deletions lib/util/viewer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,7 @@ export function generateFakeLegForRouteRenderer(
mode: getModeFromRoute(route),
// Don't render top border when colors are mismatched
onColoredBackground,
origColor: route.origColor,
routeColor: route.color,
routeLongName: route.longName,
routeShortName: route.shortName,
Expand Down

0 comments on commit aa3c220

Please sign in to comment.