avoid unrelated changes

Author: karussell

src/Converters.ts

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

src/NavBar.ts

@@ -3,11 +3,10 @@ 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, { QueryPoint, QueryPointType, QueryStoreState } from '@/stores/QueryStore'
+import QueryStore, { getBBoxFromCoord, QueryPoint, QueryPointType, QueryStoreState } from '@/stores/QueryStore'
 import MapOptionsStore, { MapOptionsStoreState } from './stores/MapOptionsStore'
-import { getApi } from '@/api/Api'
+import { ApiImpl, getApi } from '@/api/Api'
 import { AddressParseResult } from '@/pois/AddressParseResult'
-import { getBBoxFromCoord, getBBoxPoints } from '@/utils'
 
 export default class NavBar {
     private readonly queryStore: QueryStore
@@ -159,7 +158,7 @@ export default class NavBar {
         const bbox =
             initializedPoints.length == 1
                 ? getBBoxFromCoord(initializedPoints[0].coordinate)
-                : getBBoxPoints(initializedPoints.map(p => p.coordinate))
+                : ApiImpl.getBBoxPoints(initializedPoints.map(p => p.coordinate))
         if (bbox) Dispatcher.dispatch(new SetBBox(bbox))
         return Dispatcher.dispatch(new SetQueryPoints(points))
     }

src/actions/Actions.ts

@@ -1,10 +1,9 @@
 import { Action } from '@/stores/Dispatcher'
-import { QueryPoint } from '@/stores/QueryStore'
+import { Coordinate, QueryPoint } from '@/stores/QueryStore'
 import { ApiInfo, Bbox, Path, RoutingArgs, RoutingProfile, RoutingResult } from '@/api/graphhopper'
 import { PathDetailsPoint } from '@/stores/PathDetailsStore'
 import { POI } from '@/stores/POIsStore'
 import { Settings } from '@/stores/SettingsStore'
-import { Coordinate } from '@/utils'
 
 export class InfoReceived implements Action {
     readonly result: ApiInfo

src/api/Api.ts

@@ -18,6 +18,7 @@ import { LineString } from 'geojson'
 import { getTranslation, tr } from '@/translation/Translation'
 import * as config from 'config'
 import { POIQuery } from '@/pois/AddressParseResult'
+import { Coordinate } from '@/stores/QueryStore'
 
 interface ApiProfile {
     name: string
@@ -455,4 +456,25 @@ export class ApiImpl implements Api {
     public static isTruck(profile: string) {
         return profile.includes('truck')
     }
+
+    public static getBBoxPoints(points: Coordinate[]): Bbox | null {
+        const bbox: Bbox = points.reduce(
+            (res: Bbox, c) => [
+                Math.min(res[0], c.lng),
+                Math.min(res[1], c.lat),
+                Math.max(res[2], c.lng),
+                Math.max(res[3], c.lat),
+            ],
+            [180, 90, -180, -90] as Bbox
+        )
+        if (points.length == 1) {
+            bbox[0] = bbox[0] - 0.001
+            bbox[1] = bbox[1] - 0.001
+            bbox[2] = bbox[2] + 0.001
+            bbox[3] = bbox[3] + 0.001
+        }
+
+        // return null if the bbox is not valid, e.g. if no url points were given at all
+        return bbox[0] < bbox[2] && bbox[1] < bbox[3] ? bbox : null
+    }
 }

src/map/findNextWayPoint.ts

@@ -1,4 +1,5 @@
-import { calcDist, Coordinate } from '@/utils'
+import { calcDist } from '@/utils'
+import { Coordinate } from '@/stores/QueryStore'
 
 /**
  * Finds the way-point that follows the part of a route that is closest to a given location

src/pois/AddressParseResult.ts

@@ -4,7 +4,7 @@ import { hitToItem } from '@/Converters'
 import { GeocodingHit, ReverseGeocodingHit } from '@/api/graphhopper'
 import { tr, Translation } from '@/translation/Translation'
 import { POI } from '@/stores/POIsStore'
-import { getBBoxPoints } from '@/utils'
+import { ApiImpl } from '@/api/Api'
 
 export class AddressParseResult {
     location: string
@@ -144,7 +144,7 @@ export class AddressParseResult {
                     address: res.secondText,
                 } as POI
             })
-        const bbox = getBBoxPoints(pois.map(p => p.coordinate))
+        const bbox = ApiImpl.getBBoxPoints(pois.map(p => p.coordinate))
         if (bbox) {
             if (parseResult.location) Dispatcher.dispatch(new SetBBox(bbox))
             Dispatcher.dispatch(new SetPOIs(pois))

src/sidebar/CustomModelExamples.ts

@@ -1,4 +1,4 @@
-import { CustomModel } from '@/utils'
+import { CustomModel } from '@/stores/QueryStore'
 
 export const customModelExamples: { [key: string]: CustomModel } = {
     default_example: {

src/sidebar/SettingsBox.tsx

@@ -8,8 +8,8 @@ import OffIcon from '@/sidebar/toggle_off.svg'
 import { useContext } from 'react'
 import { SettingsContext } from '@/contexts/SettingsContext'
 import { RoutingProfile } from '@/api/graphhopper'
-import { ProfileGroupMap } from '@/stores/QueryStore'
 import * as config from 'config'
+import { ProfileGroupMap } from '@/utils'
 
 export default function SettingsBox({ profile }: { profile: RoutingProfile }) {
     const settings = useContext(SettingsContext)

src/sidebar/search/routingProfiles/RoutingProfiles.tsx

@@ -8,8 +8,8 @@ import Chevron from './chevron.svg'
 import { tr } from '@/translation/Translation'
 import CustomModelBoxSVG from '@/sidebar/open_custom_model.svg'
 import { icons } from '@/sidebar/search/routingProfiles/profileIcons'
-import { ProfileGroupMap } from '@/stores/QueryStore'
 import * as config from 'config'
+import { ProfileGroupMap } from '@/utils'
 
 export default function ({
     routingProfiles,

src/stores/QueryStore.ts

@@ -18,11 +18,20 @@ import {
     SetQueryPoints,
     SetVehicleProfile,
 } from '@/actions/Actions'
-import { RoutingArgs, RoutingProfile } from '@/api/graphhopper'
-import { calcDist, Coordinate, ProfileGroupMap } from '@/utils'
+import { Bbox, RoutingArgs, RoutingProfile } from '@/api/graphhopper'
+import { calcDist, ProfileGroupMap } from '@/utils'
 import config from 'config'
 import { customModel2prettyString, customModelExamples } from '@/sidebar/CustomModelExamples'
 
+export interface Coordinate {
+    lat: number
+    lng: number
+}
+
+export function getBBoxFromCoord(c: Coordinate, offset: number = 0.005): Bbox {
+    return [c.lng - offset, c.lat - offset, c.lng + offset, c.lat + offset]
+}
+
 export interface QueryStoreState {
     readonly profiles: RoutingProfile[]
     readonly lastProfiles: Record<string, string>
@@ -35,6 +44,13 @@ export interface QueryStoreState {
     readonly customModelStr: string
 }
 
+export interface CustomModel {
+    readonly speed?: object[]
+    readonly priority?: object[]
+    readonly distance_influence?: number
+    readonly areas?: object
+}
+
 export interface QueryPoint {
     readonly coordinate: Coordinate
     readonly queryText: string