merged master

Author: karussell

config.js

@@ -45,6 +45,28 @@ const config = {
     //
     // E.g. the 'bike' entry will add a "bike" profile for which we send a request with the specified 'details' parameter. You can even change the profile itself when you specify
     // bike: { profile: 'raw_bike', ... }
+
+    // You can 'collapse' or group certain profiles to reduce the number of profiles in the panel. Instead they're listed in the settings but still a profile icon is shown.
+    // Note: the name of the group must be the default option for this group.
+    profile_group_mapping: {},
+    // profile_group_mapping: {
+    //  car: {
+    //    options: [
+    //      { profile: 'car' },
+    //      { profile: 'car_avoid_motorway' },
+    //      { profile: 'car_avoid_ferry' },
+    //      { profile: 'car_avoid_toll' }
+    //    ]
+    //  },
+    //  bike: {
+    //    options: [
+    //      { profile: 'bike' },
+    //      { profile: 'mtb' },
+    //      { profile: 'racingbike' },
+    //      { profile: 'ecargobike' }
+    //    ]
+    //  }
+    // }
 }
 
 // this is needed for jest (with our current setup at least)

package-lock.json

@@ -17,15 +17,14 @@
     },
     "dependencies": {
         "maplibre-gl": "^3.1.0",
-
-        "custom-model-editor": "github:graphhopper/custom-model-editor#3a46b6981d170b7eb70d621bbb92caed149e5a97",
+        "custom-model-editor": "github:graphhopper/custom-model-editor#5ebd80570329f7abfc95c39624be1f1a379cf392",
         "geojson": "^0.5.0",
         "heightgraph": "github:easbar/Leaflet.Heightgraph#5f4f0b1fff3646aa071981381f5955c9e6f111f0",
-        "ol": "10.2.1",
-        "ol-mapbox-style": "12.3.5",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0",
-        "react-responsive": "^9.0.0"
+        "ol": "10.4.0",
+        "ol-mapbox-style": "12.5.0",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
+        "react-responsive": "^10.0.1"
     },
     "devDependencies": {
         "@svgr/webpack": "^8.0.1",

package.json

@@ -222,7 +222,12 @@ function LargeScreenLayout({
                                 drawAreas={drawAreas}
                             />
                         )}
-                        <Search points={query.queryPoints} map={map} turnNavigationSettings={turnNavigation.settings} />
+                        <Search
+                            points={query.queryPoints}
+                            profile={query.routingProfile}
+                            map={map}
+                            turnNavigationSettings={turnNavigation.settings}
+                        />
                         <div>{!error.isDismissed && <ErrorMessage error={error} />}</div>
                         <RoutingResults
                             info={route.routingResult.info}

src/App.tsx

@@ -1,6 +1,6 @@
 import { GeocodingHit } from '@/api/graphhopper'
 
-import { Coordinate } from '@/stores/QueryStore'
+import { Coordinate } from '@/utils'
 
 export function milliSecondsToText(ms: number) {
     const hours = Math.floor(ms / 3600000)

src/Converters.ts

@@ -3,11 +3,12 @@ import Dispatcher from '@/stores/Dispatcher'
 import { ClearPoints, SelectMapLayer, SetBBox, SetQueryPoints, SetVehicleProfile } from '@/actions/Actions'
 // import the window like this so that it can be mocked during testing
 import { window } from '@/Window'
-import QueryStore, { getBBoxFromCoord, QueryPoint, QueryPointType, QueryStoreState } from '@/stores/QueryStore'
+import QueryStore, { QueryPoint, QueryPointType, QueryStoreState } from '@/stores/QueryStore'
 import MapOptionsStore, { MapOptionsStoreState } from './stores/MapOptionsStore'
 import { ApiImpl, getApi } from '@/api/Api'
 import { AddressParseResult } from '@/pois/AddressParseResult'
 import { getQueryStore } from '@/stores/Stores'
+import { getBBoxFromCoord, getBBoxPoints } from '@/utils'
 
 export default class NavBar {
     private readonly queryStore: QueryStore
@@ -159,7 +160,7 @@ export default class NavBar {
         const bbox =
             initializedPoints.length == 1
                 ? getBBoxFromCoord(initializedPoints[0].coordinate)
-                : ApiImpl.getBBoxPoints(initializedPoints.map(p => p.coordinate))
+                : getBBoxPoints(initializedPoints.map(p => p.coordinate))
         if (bbox) Dispatcher.dispatch(new SetBBox(bbox))
         return Dispatcher.dispatch(new SetQueryPoints(points))
     }

src/NavBar.ts

@@ -1,10 +1,11 @@
 import { Action } from '@/stores/Dispatcher'
-import { Coordinate, QueryPoint } from '@/stores/QueryStore'
+import { QueryPoint } from '@/stores/QueryStore'
 import { ApiInfo, Bbox, Path, RoutingArgs, RoutingProfile, RoutingResult } from '@/api/graphhopper'
 import { PathDetailsPoint } from '@/stores/PathDetailsStore'
 import { TNSettingsState } from '@/stores/TurnNavigationStore'
 import { POI } from '@/stores/POIsStore'
 import { Settings } from '@/stores/SettingsStore'
+import { Coordinate } from '@/utils'
 
 export class InfoReceived implements Action {
     readonly result: ApiInfo
@@ -82,6 +83,14 @@ export class SetVehicleProfile implements Action {
     }
 }
 
+export class SetVehicleProfileGroup implements Action {
+    readonly group: string
+
+    constructor(group: string) {
+        this.group = group
+    }
+}
+
 export class AddPoint implements Action {
     readonly atIndex: number
     readonly coordinate: Coordinate