refactoring: move a couple of things into utils

Author: karussell

src/Converters.ts

@@ -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/NavBar.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/actions/Actions.ts

@@ -1,9 +1,10 @@
 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 { 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

@@ -17,8 +17,8 @@ import {
 import { LineString } from 'geojson'
 import { getTranslation, tr } from '@/translation/Translation'
 import * as config from 'config'
-import { Coordinate } from '@/stores/QueryStore'
 import { POIQuery } from '@/pois/AddressParseResult'
+import { Coordinate } from '@/utils'
 
 interface ApiProfile {
     name: string
@@ -456,25 +456,4 @@ 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/api/graphhopper.d.ts

@@ -1,5 +1,6 @@
 import { LineString } from 'geojson'
-import { Coordinate, CustomModel } from '@/stores/QueryStore'
+
+import { Coordinate, CustomModel } from '@/utils'
 
 // minLon, minLat, maxLon, maxLat
 export type Bbox = [number, number, number, number]

src/layers/ContextMenu.tsx

@@ -1,10 +1,11 @@
 import { Map, Overlay } from 'ol'
 import { ContextMenuContent } from '@/map/ContextMenuContent'
 import { useEffect, useRef, useState } from 'react'
-import { Coordinate, QueryPoint } from '@/stores/QueryStore'
+import { QueryPoint } from '@/stores/QueryStore'
 import { fromLonLat, toLonLat } from 'ol/proj'
 import styles from '@/layers/ContextMenu.module.css'
 import { RouteStoreState } from '@/stores/RouteStore'
+import { Coordinate } from '@/utils'
 
 interface ContextMenuProps {
     map: Map

src/layers/InstructionPopup.tsx

@@ -2,9 +2,9 @@ import { useEffect } from 'react'
 import styles from '@/layers/DefaultMapPopup.module.css'
 import { Map } from 'ol'
 import MapPopup from '@/layers/MapPopup'
-import { Coordinate } from '@/stores/QueryStore'
 import Dispatcher from '@/stores/Dispatcher'
 import { InstructionClicked } from '@/actions/Actions'
+import { Coordinate } from '@/utils'
 
 interface InstructionPopupProps {
     map: Map

src/layers/MapFeaturePopup.tsx

@@ -2,7 +2,8 @@ import React from 'react'
 import styles from '@/layers/MapFeaturePopup.module.css'
 import MapPopup from '@/layers/MapPopup'
 import { Map } from 'ol'
-import { Coordinate } from '@/stores/QueryStore'
+
+import { Coordinate } from '@/utils'
 
 interface MapFeaturePopupProps {
     map: Map

src/layers/MapPopup.tsx

@@ -1,7 +1,8 @@
 import { Map, Overlay } from 'ol'
 import { useEffect, useRef, useState } from 'react'
 import { fromLonLat } from 'ol/proj'
-import { Coordinate } from '@/stores/QueryStore'
+
+import { Coordinate } from '@/utils'
 
 interface MapPopupProps {
     map: Map

src/layers/UsePathDetailsLayer.tsx

@@ -1,13 +1,13 @@
 import { Map } from 'ol'
 import { useEffect } from 'react'
 import { PathDetailsStoreState } from '@/stores/PathDetailsStore'
-import { Coordinate } from '@/stores/QueryStore'
 import { FeatureCollection } from 'geojson'
 import VectorLayer from 'ol/layer/Vector'
 import VectorSource from 'ol/source/Vector'
 import { Stroke, Style } from 'ol/style'
 import { GeoJSON } from 'ol/format'
 import { fromLonLat } from 'ol/proj'
+import { Coordinate } from '@/utils'
 
 const highlightedPathSegmentLayerKey = 'highlightedPathSegmentLayer'