Merge pull request #1109 from opentripplanner/fix-route-viewer-colors

Fix colors in route viewer
opentripplanner · Jan 12, 2024 · c84714c · c84714c
2 parents 1a70193 + bae49bb
commit c84714c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/__tests__/components/viewers/__snapshots__/stop-viewer.js.snap b/__tests__/components/viewers/__snapshots__/stop-viewer.js.snap
@@ -1437,7 +1437,7 @@ exports[`components > viewers > stop viewer should render countdown times after
                                         title="20"
                                       >
                                         <span
-                                          className="sc-edoYdd ckpxJS"
+                                          className="sc-edoYdd hkZJFG"
                                           color="333333"
                                           style={
                                             Object {
@@ -3691,7 +3691,7 @@ exports[`components > viewers > stop viewer should render countdown times for st
                                         title="20"
                                       >
                                         <span
-                                          className="sc-edoYdd ckpxJS"
+                                          className="sc-edoYdd hkZJFG"
                                           color="333333"
                                           style={
                                             Object {
@@ -5846,7 +5846,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
                                         title="20"
                                       >
                                         <span
-                                          className="sc-edoYdd ckpxJS"
+                                          className="sc-edoYdd hkZJFG"
                                           color="333333"
                                           style={
                                             Object {
@@ -9169,7 +9169,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         title="36"
                                       >
                                         <span
-                                          className="sc-edoYdd ckpxJS"
+                                          className="sc-edoYdd hkZJFG"
                                           color="333333"
                                           style={
                                             Object {
@@ -13547,7 +13547,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                                         title="20"
                                       >
                                         <span
-                                          className="sc-edoYdd ckpxJS"
+                                          className="sc-edoYdd hkZJFG"
                                           color="333333"
                                           style={
                                             Object {

diff --git a/lib/actions/apiV2.js b/lib/actions/apiV2.js
@@ -707,11 +707,11 @@ export const findRoute = (params) =>
               getRouteOperator(
                 {
                   agencyId: newRoute?.agency?.id,
-                  id: newRoute?.route?.id
+                  id: newRoute?.id
                 },
                 getState().otp.config.transitOperators
               ),
-              { color: newRoute?.route?.color, mode: newRoute.mode }
+              { color: newRoute?.color, mode: newRoute.mode }
             ).split('#')?.[1]
 
             newRoute.patterns = routePatterns
@@ -779,12 +779,12 @@ export function findRoutes() {
                 getRouteOperator(
                   {
                     agencyId: route?.agency?.id,
-                    id: route?.route?.id
+                    id: route?.id
                   },
                   config.transitOperators
                 ),
                 {
-                  color: route?.route?.color,
+                  color: route?.color,
                   mode: route.mode
                 }
               ).split('#')?.[1]

diff --git a/lib/components/narrative/metro/default-route-renderer.tsx b/lib/components/narrative/metro/default-route-renderer.tsx
@@ -7,7 +7,6 @@ const Block = styled.span<{ color: string; isOnColoredBackground?: boolean }>`
   border-radius: 5px;
   border-top: 5px solid #${(props) => props.color};
   display: inline-block;
-  margin-top: -2px;
   padding: 3px 7px;
   padding-left: 7px !important; /* TODO: this does not scale well to alternate zoom levels/text sizes */
   padding-right: 7px !important;

diff --git a/lib/util/accessibility-routing.js b/lib/util/accessibility-routing.js
@@ -3,7 +3,8 @@
  */
 export const itineraryHasAccessibilityScore = (itinerary) => {
   return (
-    // If accessibility score is 0, we still want to return true
+    // If accessibility score is 0, we still want to return true so use the -1 to
+    // make sure all scores are returned even if they're 0.
     itinerary.accessibilityScore !== null && itinerary.accessibilityScore > -1
   )
 }