limit time spend on server side for 2nd alternative request and if cu…

…stom model request; but allow longer custom model routes
graphhopper · Feb 16, 2025 · c1a5f56 · c1a5f56
1 parent ce85de7
commit c1a5f56
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/src/api/Api.ts b/src/api/Api.ts
@@ -292,6 +292,7 @@ export class ApiImpl implements Api {
         if (args.customModel) {
             request.custom_model = args.customModel
             request['ch.disable'] = true
+            request['timeout_ms'] = 10000
         }
 
         if (
@@ -302,6 +303,7 @@ export class ApiImpl implements Api {
         ) {
             return {
                 ...request,
+                timeout_ms: 10000,
                 'alternative_route.max_paths': args.maxAlternativeRoutes,
                 algorithm: 'alternative_route',
             }

diff --git a/src/api/graphhopper.d.ts b/src/api/graphhopper.d.ts
@@ -22,6 +22,7 @@ export interface RoutingRequest {
     'alternative_route.max_paths'?: number
     'alternative_route.max_weight_factor'?: number
     'ch.disable'?: boolean
+    timeout_ms?: number
     algorithm?: 'alternative_route' | 'round_trip'
     snap_preventions?: string[]
     details?: string[]

diff --git a/src/stores/QueryStore.ts b/src/stores/QueryStore.ts
@@ -310,7 +310,7 @@ export default class QueryStore extends Store<QueryStoreState> {
                 if (maxDistance < 200_000) {
                     // Use a single request, possibly including alternatives when custom models are enabled.
                     requests = [QueryStore.buildRouteRequest(state)]
-                } else if (maxDistance < 500_000) {
+                } else if (maxDistance < 700_000) {
                     // Force no alternatives for longer custom model routes.
                     requests = [
                         QueryStore.buildRouteRequest({
@@ -326,7 +326,7 @@ export default class QueryStore extends Store<QueryStoreState> {
                             'Using the custom model feature is unfortunately not ' +
                                 'possible when the request points are further than ' +
                                 // todo: use settings#showDistanceInMiles, but not sure how to use state from another store here
-                                metersToText(500_000, false) +
+                                metersToText(700_000, false) +
                                 ' apart.'
                         )
                     )

diff --git a/test/routing/Api.test.ts b/test/routing/Api.test.ts
@@ -165,6 +165,7 @@ describe('route', () => {
                 'track_type',
                 'country',
             ],
+            timeout_ms: 10000,
             'alternative_route.max_paths': args.maxAlternativeRoutes,
             algorithm: 'alternative_route',
         }
@@ -218,6 +219,7 @@ describe('route', () => {
             ],
             custom_model: args.customModel!,
             'ch.disable': true,
+            timeout_ms: 10000,
         }
 
         const mockedDispatcher = jest.spyOn(Dispatcher, 'dispatch')