[travelmux] plan/v4 api returns transit plan

Note 1: though the frontend is "using" the /v4 API, it's still peaking into the raw _otp response. Note 2: I removed OtpTravelMode.Train - it seems like it never existed. Was I hallucinating?
headwaymaps · Apr 6, 2024 · 0df5b4a · 0df5b4a
1 parent 6f9ac7f
commit 0df5b4a
Show file tree

Hide file tree

Showing 9 changed files with 330 additions and 63 deletions.
diff --git a/services/frontend/www-app/src/services/OpenTripPlannerAPI.ts b/services/frontend/www-app/src/services/OpenTripPlannerAPI.ts
@@ -13,7 +13,6 @@ export enum OTPMode {
   Gondola = 'GONDOLA',
   Rail = 'RAIL',
   Subway = 'SUBWAY',
-  Train = 'TRAIN',
   Tram = 'TRAM',
   Transit = 'TRANSIT',
   Walk = 'WALK',

diff --git a/services/frontend/www-app/src/services/TravelmuxClient.ts b/services/frontend/www-app/src/services/TravelmuxClient.ts
@@ -116,7 +116,7 @@ export class TravelmuxClient {
 
     const query = new URLSearchParams(params).toString();
 
-    const response = await fetch('/travelmux/v3/plan?' + query);
+    const response = await fetch('/travelmux/v4/plan?' + query);
 
     if (response.ok) {
       const travelmuxResponseJson: TravelmuxPlanResponse =

diff --git a/services/travelmux/Cargo.lock b/services/travelmux/Cargo.lock
diff --git a/services/travelmux/Cargo.toml b/services/travelmux/Cargo.toml
@@ -19,6 +19,7 @@ polyline = "0.10.1"
 reqwest = { version = "0.11.13", features = ["json", "stream"] }
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.91"
+serde_repr = "0.1.18"
 url = "2.4.0"
 wkt = "0.10.3"
 

diff --git a/services/travelmux/src/api/v2/plan.rs b/services/travelmux/src/api/v2/plan.rs
@@ -218,6 +218,8 @@ struct Leg {
     maneuvers: Option<Vec<Maneuver>>,
 }
 
+pub type ManeuverType = valhalla_api::ManeuverType;
+
 // Eventually we might want to coalesce this into something not valhalla specific
 // but for now we only use it for valhalla trips
 #[derive(Debug, Deserialize, Serialize, Clone, PartialEq)]
@@ -233,7 +235,7 @@ pub struct Maneuver {
     pub time: f64,
     pub travel_mode: String,
     pub travel_type: String,
-    pub r#type: u64,
+    pub r#type: ManeuverType,
     pub verbal_post_transition_instruction: Option<String>,
     pub verbal_pre_transition_instruction: Option<String>,
     pub verbal_succinct_transition_instruction: Option<String>,
@@ -548,7 +550,7 @@ mod tests {
         }"#;
 
         let valhalla_maneuver: valhalla_api::Maneuver = serde_json::from_str(json).unwrap();
-        assert_eq!(valhalla_maneuver.r#type, 2);
+        assert_eq!(valhalla_maneuver.r#type, ManeuverType::StartRight);
         assert_eq!(
             valhalla_maneuver.instruction,
             "Drive northeast on Fauntleroy Way Southwest."

diff --git a/services/travelmux/src/api/v3/plan.rs b/services/travelmux/src/api/v3/plan.rs
@@ -33,6 +33,7 @@ pub struct PlanQuery {
 }
 
 use crate::error::ErrorType;
+use crate::valhalla::valhalla_api::ManeuverType;
 use error::PlanResponseErr;
 
 #[derive(Debug, Deserialize, Serialize, Clone, PartialEq)]
@@ -340,7 +341,7 @@ pub struct Maneuver {
     pub time: f64,
     pub travel_mode: String,
     pub travel_type: String,
-    pub r#type: u64,
+    pub r#type: ManeuverType,
     pub verbal_post_transition_instruction: Option<String>,
     pub verbal_pre_transition_instruction: Option<String>,
     pub verbal_succinct_transition_instruction: Option<String>,
@@ -685,7 +686,7 @@ mod tests {
         }"#;
 
         let valhalla_maneuver: valhalla_api::Maneuver = serde_json::from_str(json).unwrap();
-        assert_eq!(valhalla_maneuver.r#type, 2);
+        assert_eq!(valhalla_maneuver.r#type, ManeuverType::StartRight);
         assert_eq!(
             valhalla_maneuver.instruction,
             "Drive northeast on Fauntleroy Way Southwest."