Use Digitraffic v2 routing API

Author: terolaakso

apigw/src/enduser/mapRoutes.ts

@@ -90,7 +90,7 @@ router.get(
 router.post(
   '/query',
   digitransitApiEnabled
-    ? createDigitransitProxy('/routing/v1/routers/finland/index/graphql')
+    ? createDigitransitProxy('/routing/v2/finland/gtfs/v1')
     : enableDevApi
       ? createProxy({
           getUserHeader: () => undefined,

frontend/src/citizen-frontend/map/api.ts

@@ -68,10 +68,10 @@ type ItineraryResponse = {
   data: Record<
     string,
     {
-      itineraries: {
-        legs: {
-          distance: number
-        }[]
+      edges: {
+        node: {
+          walkDistance: number
+        }
       }[]
     }
   >
@@ -112,25 +112,43 @@ export async function fetchUnitsWithDistances(
   ${unitsToQuery
     .map(
       ({ id, location }) => `
-    ${uuidToKey(id)}: plan(
-      from: {
-        lat: ${startLocation.lat},
-        lon: ${startLocation.lon}
-      },
-      to: {
-        lat: ${location?.lat ?? 0},
-        lon: ${location?.lon ?? 0}
-      },
-      modes: "WALK"
-    ) {
-      itineraries{
-        legs {
-          distance
+  ${uuidToKey(id)}: planConnection(
+    origin: {
+      location: {
+        coordinate: {
+          latitude: ${startLocation.lat}
+          longitude: ${startLocation.lon}
         }
       }
     }
+    destination: {
+      location: {
+        coordinate: {
+          latitude: ${location?.lat ?? 0}
+          longitude: ${location?.lon ?? 0}
+        }
+      }
+    }
+    modes: {
+      direct: WALK
+      directOnly: true
+    }
+    preferences: {
+      street: {
+        walk: {
+          speed: 300
+        }
+      }
+    }
+  ) {
+    edges {
+      node {
+        walkDistance
+      }
+    }
+  }
 
-  `
+`
     )
     .join('')}
 }`
@@ -156,18 +174,14 @@ export async function fetchUnitsWithDistances(
             drivingDistance: null
           }
 
-        const itineraries = plan.itineraries
-        if (itineraries.length === 0)
+        const edges = plan.edges
+        if (edges.length === 0)
           return {
             ...unit,
             drivingDistance: null
           }
 
-        const itinerary = itineraries[0]
-        const drivingDistance = itinerary.legs.reduce(
-          (acc, leg) => acc + leg.distance,
-          0
-        )
+        const drivingDistance = edges[0].node.walkDistance
         return {
           ...unit,
           drivingDistance
@@ -182,23 +196,41 @@ export const fetchDistance = async (
 ): Promise<number> => {
   const query = `
 {
-    plan(
-      from: {
-        lat: ${startLocation.lat},
-        lon: ${startLocation.lon}
-      },
-      to: {
-        lat: ${endLocation.lat},
-        lon: ${endLocation.lon}
-      },
-      modes: "WALK"
-    ) {
-      itineraries{
-        legs {
-          distance
+  planConnection(
+    origin: {
+      location: {
+        coordinate: {
+          latitude: ${startLocation.lat}
+          longitude: ${startLocation.lon}
+        }
+      }
+    }
+    destination: {
+      location: {
+        coordinate: {
+          latitude: ${endLocation.lat}
+          longitude: ${endLocation.lon}
+        }
+      }
+    }
+    modes: {
+      direct: WALK
+      directOnly: true
+    }
+    preferences: {
+      street: {
+        walk: {
+          speed: 300
         }
       }
     }
+  ) {
+    edges {
+      node {
+        walkDistance
+      }
+    }
+  }
 }`
 
   return axios
@@ -214,12 +246,12 @@ export const fetchDistance = async (
       }
     )
     .then((res) => {
-      const plan = res.data.data.plan
-      if (!plan) throw Error('No plan found')
+      const planConnection = res.data.data.planConnection
+      if (!planConnection) throw Error('No planConnection found')
 
-      const itineraries = plan.itineraries
-      if (itineraries.length === 0) throw Error('No itineraries found')
+      const edges = planConnection.edges
+      if (edges.length === 0) throw Error('No edges found')
 
-      return itineraries[0].legs.reduce((acc, leg) => acc + leg.distance, 0)
+      return edges[0].node.walkDistance
     })
 }