Merge pull request #346 from headwaymaps/mkirk/www-tweak-route-colors

[www] tweak route colors
headwaymaps · Apr 18, 2024 · 0a872c6 · 0a872c6
2 parents 3545657 + ff79bfc
commit 0a872c6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/services/frontend/www-app/src/models/Trip.ts b/services/frontend/www-app/src/models/Trip.ts
@@ -99,8 +99,10 @@ export class TripLeg {
       if (this.mode == TravelMode.Walk || this.mode == TravelMode.Bike) {
         return LineStyles.walkingActive;
       } else {
-        if (this.raw.routeColor) {
-          return LineStyles.activeColored(`#${this.raw.routeColor}`);
+        if (this.raw.transitLeg?.routeColor) {
+          return LineStyles.activeColored(
+            `#${this.raw.transitLeg?.routeColor}`,
+          );
         } else {
           return LineStyles.active;
         }
@@ -201,20 +203,20 @@ export const LineStyles = {
     };
   },
   active: {
-    'line-color': '#1976D2',
+    'line-color': '#1296FF',
     'line-width': 6,
   },
   inactive: {
-    'line-color': '#777',
+    'line-color': '#6FC1EE',
     'line-width': 4,
   },
   walkingActive: {
-    'line-color': '#1976D2',
+    'line-color': '#1296FF',
     'line-dasharray': [0, 1.5],
     'line-width': 8,
   },
   walkingInactive: {
-    'line-color': '#777',
+    'line-color': '#6FC1EE',
     'line-dasharray': [0, 1.5],
     'line-width': 8,
   },

diff --git a/services/frontend/www-app/src/services/TravelmuxClient.ts b/services/frontend/www-app/src/services/TravelmuxClient.ts
@@ -2,7 +2,11 @@ import { LngLat } from 'maplibre-gl';
 import { DistanceUnits, TravelMode } from 'src/utils/models';
 import { Ok, Err, Result } from 'src/utils/Result';
 import Trip, { TripFetchError } from 'src/models/Trip';
-import { OTPPlanResponse, OTPItinerary } from './OpenTripPlannerAPI';
+import {
+  OTPPlanResponse,
+  OTPItinerary,
+  OTPItineraryLeg,
+} from './OpenTripPlannerAPI';
 import {
   ValhallaRouteResponse,
   ValhallaRoute,
@@ -27,7 +31,7 @@ export interface TravelmuxLeg {
   distanceMeters: number;
   duration: number;
   geometry: string;
-  routeColor?: string;
+  transitLeg?: OTPItineraryLeg;
 }
 
 export interface TravelmuxItinerary {