diff --git a/src/lib/components/ui/command/command-link-item.svelte b/src/lib/components/ui/command/command-link-item.svelte
index 944c22d..b43992e 100644
--- a/src/lib/components/ui/command/command-link-item.svelte
+++ b/src/lib/components/ui/command/command-link-item.svelte
@@ -14,7 +14,7 @@
data-slot="command-item"
class={cn(
"aria-selected:bg-accent aria-selected:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground outline-hidden relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
- className
+ className,
)}
{...restProps}
/>
diff --git a/src/lib/components/ui/command/command-list.svelte b/src/lib/components/ui/command/command-list.svelte
index 569f595..5948194 100644
--- a/src/lib/components/ui/command/command-list.svelte
+++ b/src/lib/components/ui/command/command-list.svelte
@@ -12,6 +12,9 @@
diff --git a/src/lib/components/ui/command/command.svelte b/src/lib/components/ui/command/command.svelte
index c64a77e..b0e1b38 100644
--- a/src/lib/components/ui/command/command.svelte
+++ b/src/lib/components/ui/command/command.svelte
@@ -16,7 +16,7 @@
data-slot="command"
class={cn(
"bg-popover text-popover-foreground flex h-full w-full flex-col overflow-hidden rounded-md",
- className
+ className,
)}
{...restProps}
/>
diff --git a/src/lib/components/ui/dialog/dialog-close.svelte b/src/lib/components/ui/dialog/dialog-close.svelte
index 840b2f6..6da538e 100644
--- a/src/lib/components/ui/dialog/dialog-close.svelte
+++ b/src/lib/components/ui/dialog/dialog-close.svelte
@@ -1,7 +1,8 @@
diff --git a/src/lib/components/ui/dialog/dialog-content.svelte b/src/lib/components/ui/dialog/dialog-content.svelte
index 06a98f7..465cab6 100644
--- a/src/lib/components/ui/dialog/dialog-content.svelte
+++ b/src/lib/components/ui/dialog/dialog-content.svelte
@@ -24,7 +24,7 @@
data-slot="dialog-content"
class={cn(
"bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed left-[50%] top-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg",
- className
+ className,
)}
{...restProps}
>
diff --git a/src/lib/components/ui/dialog/dialog-footer.svelte b/src/lib/components/ui/dialog/dialog-footer.svelte
index e7ff446..1450725 100644
--- a/src/lib/components/ui/dialog/dialog-footer.svelte
+++ b/src/lib/components/ui/dialog/dialog-footer.svelte
@@ -13,7 +13,10 @@
{@render children?.()}
diff --git a/src/lib/components/ui/dialog/dialog-overlay.svelte b/src/lib/components/ui/dialog/dialog-overlay.svelte
index f81ad83..b4ff9a9 100644
--- a/src/lib/components/ui/dialog/dialog-overlay.svelte
+++ b/src/lib/components/ui/dialog/dialog-overlay.svelte
@@ -14,7 +14,7 @@
data-slot="dialog-overlay"
class={cn(
"data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",
- className
+ className,
)}
{...restProps}
/>
diff --git a/src/lib/components/ui/dialog/dialog-trigger.svelte b/src/lib/components/ui/dialog/dialog-trigger.svelte
index 9d1e801..2525c97 100644
--- a/src/lib/components/ui/dialog/dialog-trigger.svelte
+++ b/src/lib/components/ui/dialog/dialog-trigger.svelte
@@ -1,7 +1,8 @@
diff --git a/src/lib/components/ui/drawer/drawer-close.svelte b/src/lib/components/ui/drawer/drawer-close.svelte
index 95c2479..a182261 100644
--- a/src/lib/components/ui/drawer/drawer-close.svelte
+++ b/src/lib/components/ui/drawer/drawer-close.svelte
@@ -1,7 +1,8 @@
diff --git a/src/lib/components/ui/drawer/drawer-content.svelte b/src/lib/components/ui/drawer/drawer-content.svelte
index f20e9ff..62c25fa 100644
--- a/src/lib/components/ui/drawer/drawer-content.svelte
+++ b/src/lib/components/ui/drawer/drawer-content.svelte
@@ -25,7 +25,7 @@
"data-[vaul-drawer-direction=bottom]:inset-x-0 data-[vaul-drawer-direction=bottom]:bottom-0 data-[vaul-drawer-direction=bottom]:mt-24 data-[vaul-drawer-direction=bottom]:max-h-[80vh] data-[vaul-drawer-direction=bottom]:rounded-t-lg data-[vaul-drawer-direction=bottom]:border-t",
"data-[vaul-drawer-direction=right]:inset-y-0 data-[vaul-drawer-direction=right]:right-0 data-[vaul-drawer-direction=right]:w-3/4 data-[vaul-drawer-direction=right]:border-l data-[vaul-drawer-direction=right]:sm:max-w-sm",
"data-[vaul-drawer-direction=left]:inset-y-0 data-[vaul-drawer-direction=left]:left-0 data-[vaul-drawer-direction=left]:w-3/4 data-[vaul-drawer-direction=left]:border-r data-[vaul-drawer-direction=left]:sm:max-w-sm",
- className
+ className,
)}
{...restProps}
>
diff --git a/src/lib/components/ui/drawer/drawer-nested.svelte b/src/lib/components/ui/drawer/drawer-nested.svelte
index 834af94..9f6be6d 100644
--- a/src/lib/components/ui/drawer/drawer-nested.svelte
+++ b/src/lib/components/ui/drawer/drawer-nested.svelte
@@ -9,4 +9,9 @@
}: DrawerPrimitive.RootProps = $props();
-
+
diff --git a/src/lib/components/ui/drawer/drawer-overlay.svelte b/src/lib/components/ui/drawer/drawer-overlay.svelte
index 53f78a2..fd0711c 100644
--- a/src/lib/components/ui/drawer/drawer-overlay.svelte
+++ b/src/lib/components/ui/drawer/drawer-overlay.svelte
@@ -14,7 +14,7 @@
data-slot="drawer-overlay"
class={cn(
"data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",
- className
+ className,
)}
{...restProps}
/>
diff --git a/src/lib/components/ui/drawer/drawer-trigger.svelte b/src/lib/components/ui/drawer/drawer-trigger.svelte
index f1877d8..d63952d 100644
--- a/src/lib/components/ui/drawer/drawer-trigger.svelte
+++ b/src/lib/components/ui/drawer/drawer-trigger.svelte
@@ -1,7 +1,8 @@
diff --git a/src/lib/components/ui/drawer/drawer.svelte b/src/lib/components/ui/drawer/drawer.svelte
index 0cb57ff..45b8cf4 100644
--- a/src/lib/components/ui/drawer/drawer.svelte
+++ b/src/lib/components/ui/drawer/drawer.svelte
@@ -9,4 +9,9 @@
}: DrawerPrimitive.RootProps = $props();
-
+
diff --git a/src/lib/components/ui/input/input.svelte b/src/lib/components/ui/input/input.svelte
index 1eae616..815c4d4 100644
--- a/src/lib/components/ui/input/input.svelte
+++ b/src/lib/components/ui/input/input.svelte
@@ -1,12 +1,18 @@
diff --git a/src/lib/components/ui/select/select-item.svelte b/src/lib/components/ui/select/select-item.svelte
index 49dbbd7..9d23e8e 100644
--- a/src/lib/components/ui/select/select-item.svelte
+++ b/src/lib/components/ui/select/select-item.svelte
@@ -19,7 +19,7 @@
data-slot="select-item"
class={cn(
"data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground outline-hidden *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2 relative flex w-full cursor-default select-none items-center gap-2 rounded-sm py-1.5 pl-2 pr-8 text-sm data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
- className
+ className,
)}
{...restProps}
>
diff --git a/src/lib/components/ui/select/select-trigger.svelte b/src/lib/components/ui/select/select-trigger.svelte
index d405187..5e63503 100644
--- a/src/lib/components/ui/select/select-trigger.svelte
+++ b/src/lib/components/ui/select/select-trigger.svelte
@@ -20,7 +20,7 @@
data-size={size}
class={cn(
"border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 shadow-xs flex w-fit select-none items-center justify-between gap-2 whitespace-nowrap rounded-md border bg-transparent px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
- className
+ className,
)}
{...restProps}
>
diff --git a/src/lib/components/ui/separator/separator.svelte b/src/lib/components/ui/separator/separator.svelte
index 09d88f4..6f1c5ba 100644
--- a/src/lib/components/ui/separator/separator.svelte
+++ b/src/lib/components/ui/separator/separator.svelte
@@ -14,7 +14,7 @@
data-slot="separator"
class={cn(
"bg-border shrink-0 data-[orientation=horizontal]:h-px data-[orientation=vertical]:h-full data-[orientation=horizontal]:w-full data-[orientation=vertical]:w-px",
- className
+ className,
)}
{...restProps}
/>
diff --git a/src/lib/services/MTSK.ts b/src/lib/services/MTSK.ts
index 82f7c08..f7a06bc 100644
--- a/src/lib/services/MTSK.ts
+++ b/src/lib/services/MTSK.ts
@@ -1,7 +1,7 @@
import { LNV_SERVER } from "./hosts";
import { hasCapability } from "./lnv";
-type Station = {
+interface Station {
id: string;
name: string;
brand: string;
@@ -18,13 +18,13 @@ type Station = {
postCode: number;
}
-type StationsResponse = {
+interface StationsResponse {
ok: boolean;
- license: "CC BY 4.0 - https:\/\/creativecommons.tankerkoenig.de";
+ license: "CC BY 4.0 - https://creativecommons.tankerkoenig.de";
data: "MTS-K";
status: string;
stations: Station[];
-};
+}
type StationDetails = {
openingTimes: StationOpeningTime[];
@@ -32,37 +32,49 @@ type StationDetails = {
wholeDay: boolean;
} & Station;
-type StationOpeningTime = {
+interface StationOpeningTime {
text: string;
start: string;
end: string;
-};
+}
-type StationDetailsResponse = {
+interface StationDetailsResponse {
ok: boolean;
- license: "CC BY 4.0 - https:\/\/creativecommons.tankerkoenig.de";
+ license: "CC BY 4.0 - https://creativecommons.tankerkoenig.de";
data: "MTS-K";
status: string;
station: StationDetails;
-};
-
-export async function getStations(lat: number, lon: number): Promise
{
- if(!await hasCapability("fuel")) {
- throw new Error("Fuel capability is not available");
- }
- return await fetch(`${LNV_SERVER}/fuel/list?lat=${lat}&lng=${lon}&rad=1&sort=dist&type=all`).then(res => res.json());
}
-export async function getPrices(id: string) { // TODO: add type
- if(!await hasCapability("fuel")) {
+export async function getStations(
+ lat: number,
+ lon: number,
+): Promise {
+ if (!(await hasCapability("fuel"))) {
throw new Error("Fuel capability is not available");
}
- return await fetch(`${LNV_SERVER}/fuel/prices?ids=${id}`).then(res => res.json());
+ return await fetch(
+ `${LNV_SERVER}/fuel/list?lat=${lat}&lng=${lon}&rad=1&sort=dist&type=all`,
+ ).then((res) => res.json());
}
-export async function getStationDetails(id: string): Promise {
- if(!await hasCapability("fuel")) {
+export async function getPrices(id: string) {
+ // TODO: add type
+ if (!(await hasCapability("fuel"))) {
throw new Error("Fuel capability is not available");
}
- return await fetch(`${LNV_SERVER}/fuel/detail?id=${id}`).then(res => res.json());
+ return await fetch(`${LNV_SERVER}/fuel/prices?ids=${id}`).then((res) =>
+ res.json(),
+ );
+}
+
+export async function getStationDetails(
+ id: string,
+): Promise {
+ if (!(await hasCapability("fuel"))) {
+ throw new Error("Fuel capability is not available");
+ }
+ return await fetch(`${LNV_SERVER}/fuel/detail?id=${id}`).then((res) =>
+ res.json(),
+ );
}
diff --git a/src/lib/services/Overpass.ts b/src/lib/services/Overpass.ts
index 8472d93..3b88c96 100644
--- a/src/lib/services/Overpass.ts
+++ b/src/lib/services/Overpass.ts
@@ -1,10 +1,10 @@
import { OVERPASS_SERVER } from "./hosts";
-export type OverpassResult = {
+export interface OverpassResult {
elements: OverpassElement[];
-};
+}
-export type OverpassElement = {
+export interface OverpassElement {
type: "node" | "way" | "relation";
id: number;
tags: Record;
@@ -15,7 +15,7 @@ export type OverpassElement = {
lat: number; // Only for relations
lon: number; // Only for relations
};
-};
+}
/**
[out:json];
@@ -40,11 +40,7 @@ out geom;
out geom;
*/
-export async function fetchPOI(
- lat: number,
- lon: number,
- radius: number,
-) {
+export async function fetchPOI(lat: number, lon: number, radius: number) {
return await fetch(OVERPASS_SERVER, {
method: "POST",
body: `[out:json];
@@ -60,6 +56,6 @@ export async function fetchPOI(
node(around:${radius}, ${lat}, ${lon})["amenity"="parking"];
way(around:${radius}, ${lat}, ${lon})["amenity"="parking"];
);
-out center tags;`
- }).then(res => res.json() as Promise);
-}
\ No newline at end of file
+out center tags;`,
+ }).then((res) => res.json() as Promise);
+}
diff --git a/src/lib/services/Search.ts b/src/lib/services/Search.ts
index 9370add..4875dd9 100644
--- a/src/lib/services/Search.ts
+++ b/src/lib/services/Search.ts
@@ -2,38 +2,50 @@
import { SEARCH_SERVER } from "./hosts";
// import { Capacitor } from "@capacitor/core";
-export type Feature = {
- type: "Feature",
+export interface Feature {
+ type: "Feature";
geometry: {
- coordinates: [number, number],
- type: "Point"
- },
+ coordinates: [number, number];
+ type: "Point";
+ };
properties: {
osm_key: string;
osm_value: string;
- osm_id: number,
- city: string,
- country: string,
- name: string,
- street: string,
- housenumber: string,
- type: string,
+ osm_id: number;
+ city: string;
+ country: string;
+ name: string;
+ street: string;
+ housenumber: string;
+ type: string;
// There is more, but not needed atm
- }
+ };
}
-export async function searchPlaces(query: string, lat: number, lon: number): Promise {
- const res = await fetch(SEARCH_SERVER + "/api/?q=" + query + "&lat=" + lat + "&lon=" + lon).then((res) => res.json());
+export async function searchPlaces(
+ query: string,
+ lat: number,
+ lon: number,
+): Promise {
+ const res = await fetch(
+ SEARCH_SERVER + "/api/?q=" + query + "&lat=" + lat + "&lon=" + lon,
+ ).then((res) => res.json());
return res.features;
}
export async function reverseGeocode(coord: WorldLocation): Promise {
- const res = await fetch(SEARCH_SERVER + "/reverse?lat=" + coord.lat + "&lon=" + coord.lon).then((res) => res.json());
+ const res = await fetch(
+ SEARCH_SERVER + "/reverse?lat=" + coord.lat + "&lon=" + coord.lon,
+ ).then((res) => res.json());
return res.features;
}
-export async function search(query: string, lat: number, lon: number): Promise {
- if(query.startsWith("@")) {
+export async function search(
+ query: string,
+ lat: number,
+ lon: number,
+): Promise {
+ if (query.startsWith("@")) {
// if(Capacitor.isNativePlatform()) {
// return await searchContacts(query, lat, lon);
// }
diff --git a/src/lib/services/hosts.ts b/src/lib/services/hosts.ts
index b67c659..9f6d429 100644
--- a/src/lib/services/hosts.ts
+++ b/src/lib/services/hosts.ts
@@ -4,4 +4,7 @@ export const ROUTING_SERVER = "https://valhalla1.openstreetmap.de/";
// export const ROUTING_SERVER = "https://routing.map.picoscratch.de";
export const SEARCH_SERVER = "https://photon.komoot.io/";
export const OVERPASS_SERVER = "https://overpass-api.de/api/interpreter";
-export const LNV_SERVER = location.hostname == "localhost" ? "http://localhost:3000/api" : "https://trafficcue-api.picoscratch.de/api";
\ No newline at end of file
+export const LNV_SERVER =
+ location.hostname == "localhost"
+ ? "http://localhost:3000/api"
+ : "https://trafficcue-api.picoscratch.de/api";
diff --git a/src/lib/services/lnv.ts b/src/lib/services/lnv.ts
index 166d653..f6f960f 100644
--- a/src/lib/services/lnv.ts
+++ b/src/lib/services/lnv.ts
@@ -2,7 +2,11 @@ import { LNV_SERVER } from "./hosts";
export type Capabilities = ("auth" | "reviews" | "ai" | "fuel" | "post")[];
export let capabilities: Capabilities = [];
-export let oidcConfig: { AUTH_URL: string; CLIENT_ID: string; TOKEN_URL: string } | null = null;
+export let oidcConfig: {
+ AUTH_URL: string;
+ CLIENT_ID: string;
+ TOKEN_URL: string;
+} | null = null;
export async function fetchConfig() {
const res = await fetch(LNV_SERVER + "/config");
@@ -10,7 +14,12 @@ export async function fetchConfig() {
throw new Error(`Failed to fetch capabilities: ${res.statusText}`);
}
const data = await res.json();
- return data as { name: string; version: string; capabilities: Capabilities; oidc?: { AUTH_URL: string; CLIENT_ID: string; TOKEN_URL: string } };
+ return data as {
+ name: string;
+ version: string;
+ capabilities: Capabilities;
+ oidc?: { AUTH_URL: string; CLIENT_ID: string; TOKEN_URL: string };
+ };
}
export async function getCapabilities() {
@@ -30,28 +39,32 @@ export async function getOIDCConfig() {
oidcConfig = {
AUTH_URL: config.oidc.AUTH_URL,
CLIENT_ID: config.oidc.CLIENT_ID,
- TOKEN_URL: config.oidc.TOKEN_URL
+ TOKEN_URL: config.oidc.TOKEN_URL,
};
}
return oidcConfig;
}
-export async function hasCapability(capability: Capabilities[number]): Promise {
+export async function hasCapability(
+ capability: Capabilities[number],
+): Promise {
const caps = await getCapabilities();
return caps.includes(capability);
}
-export type Review = {
+export interface Review {
user_id: string;
username: string;
rating: number;
comment: string;
}
export async function getReviews(location: WorldLocation) {
- if(!await hasCapability("reviews")) {
+ if (!(await hasCapability("reviews"))) {
throw new Error("Reviews capability is not available");
}
- const res = await fetch(LNV_SERVER + `/reviews?lat=${location.lat}&lon=${location.lon}`);
+ const res = await fetch(
+ LNV_SERVER + `/reviews?lat=${location.lat}&lon=${location.lon}`,
+ );
if (!res.ok) {
throw new Error(`Failed to fetch reviews: ${res.statusText}`);
}
@@ -59,8 +72,11 @@ export async function getReviews(location: WorldLocation) {
return data as Review[];
}
-export async function postReview(location: WorldLocation, review: Omit) {
- if(!await hasCapability("reviews")) {
+export async function postReview(
+ location: WorldLocation,
+ review: Omit,
+) {
+ if (!(await hasCapability("reviews"))) {
throw new Error("Reviews capability is not available");
}
const token = localStorage.getItem("lnv-token");
@@ -71,13 +87,13 @@ export async function postReview(location: WorldLocation, review: Omit res.text());
- } else {
- return `${bit}`;
- }
- }
+ async function fetchImage(bit: number) {
+ if (knownDirections.includes(bit)) {
+ return await fetch(`/img/lanes/${bit}.svg`).then((res) => res.text());
+ } else {
+ return `${bit}`;
+ }
+ }
- function loadImage(node: HTMLElement, bit: number) {
- fetchImage(bit).then(img => {
- node.innerHTML = img;
- });
- }
+ function loadImage(node: HTMLElement, bit: number) {
+ fetchImage(bit).then((img) => {
+ node.innerHTML = img;
+ });
+ }
- {#each Array(10).fill(0).map((_, i) => 1 << i) as bit}
+ {#each Array(10)
+ .fill(0)
+ .map((_, i) => 1 << i) as bit (bit)}
{#if lane.directions & bit}
{/if}
@@ -67,4 +71,4 @@
font-weight: bold;
color: #cc2c2c;
}
-
\ No newline at end of file
+
diff --git a/src/lib/services/navigation/LaneDisplay.ts b/src/lib/services/navigation/LaneDisplay.ts
index b4e0961..3076410 100644
--- a/src/lib/services/navigation/LaneDisplay.ts
+++ b/src/lib/services/navigation/LaneDisplay.ts
@@ -10,7 +10,7 @@ export async function displayLane(lane: Lane) {
// Check if the bit is in the known directions
let img = "";
if (knownDirections.includes(bit)) {
- img = await fetch(`/img/lanes/${bit}.svg`).then(res => res.text());
+ img = await fetch(`/img/lanes/${bit}.svg`).then((res) => res.text());
} else {
img = `
${bit}`;
}
@@ -32,4 +32,4 @@ export async function displayLane(lane: Lane) {
}
}
return laneDiv;
-}
\ No newline at end of file
+}
diff --git a/src/lib/services/navigation/LanesDisplay.svelte b/src/lib/services/navigation/LanesDisplay.svelte
index ebb66f4..46f2339 100644
--- a/src/lib/services/navigation/LanesDisplay.svelte
+++ b/src/lib/services/navigation/LanesDisplay.svelte
@@ -6,7 +6,7 @@
{#if lanes}
- {#each lanes as lane}
+ {#each lanes as lane (lane)}
{/each}
@@ -19,4 +19,4 @@
display: flex;
justify-content: space-around;
}
-
\ No newline at end of file
+
diff --git a/src/lib/services/navigation/Maneuver.ts b/src/lib/services/navigation/Maneuver.ts
index 780bd41..eb59992 100644
--- a/src/lib/services/navigation/Maneuver.ts
+++ b/src/lib/services/navigation/Maneuver.ts
@@ -43,4 +43,4 @@ export const maneuverTypes = [
"escalatorEnter", // ???
"buildingEnter", // ???
"buildingExit", // ???
-];
\ No newline at end of file
+];
diff --git a/src/lib/services/navigation/Valhalla.old.ts b/src/lib/services/navigation/Valhalla.old.ts
index 94b86c8..49d4759 100644
--- a/src/lib/services/navigation/Valhalla.old.ts
+++ b/src/lib/services/navigation/Valhalla.old.ts
@@ -1,19 +1,38 @@
+/* eslint-disable no-empty */
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable @typescript-eslint/prefer-for-of */
+/* eslint-disable prefer-const */
+/* eslint-disable @typescript-eslint/ban-ts-comment */
// @ts-nocheck
import maplibregl from "maplibre-gl";
// import { maneuverTypes } from "./Maneuver";
-import { hideRouteStatus, updateRouteStatus } from "../../components/routestatus";
-import { NavigationLayer, removeAllNavigationLayers, updateNavigationLayer } from "./NavigationLayers";
+import {
+ hideRouteStatus,
+ updateRouteStatus,
+} from "../../components/routestatus";
+import {
+ NavigationLayer,
+ removeAllNavigationLayers,
+ updateNavigationLayer,
+} from "./NavigationLayers";
import { updateMapPadding } from "../../main";
import say from "../TTS";
import { ROUTING_SERVER } from "../servers";
import { createValhallaRequest } from "./ValhallaRequest";
import { Vehicle } from "../../components/vehicles";
import { KeepAwake } from "@capacitor-community/keep-awake";
-import { getCurrentViewName, getSidebarView } from "../../components/sidebar/SidebarRegistry";
+import {
+ getCurrentViewName,
+ getSidebarView,
+} from "../../components/sidebar/SidebarRegistry";
// import { displayLane } from "./LaneDisplay";
-export async function fetchRoute(vehicle: Vehicle, from: WorldLocation, to: WorldLocation): Promise
{
+export async function fetchRoute(
+ vehicle: Vehicle,
+ from: WorldLocation,
+ to: WorldLocation,
+): Promise {
// const req = {
// locations: [
// from,
@@ -35,7 +54,7 @@ export async function fetchRoute(vehicle: Vehicle, from: WorldLocation, to: Worl
const res = await fetch(
ROUTING_SERVER + "/route?json=" + JSON.stringify(req),
).then((res) => res.json());
-
+
console.log(res);
return res;
} catch (e) {
@@ -65,7 +84,11 @@ function drawRoute(trip: Trip, name: NavigationLayer) {
updateNavigationLayer(name, geometry);
}
-export async function findRoute(vehicle: Vehicle, from: WorldLocation, to: WorldLocation): Promise {
+export async function findRoute(
+ vehicle: Vehicle,
+ from: WorldLocation,
+ to: WorldLocation,
+): Promise {
fromMarker = new maplibregl.Marker()
.setLngLat([from.lon, from.lat])
.addTo(window.glmap);
@@ -75,10 +98,10 @@ export async function findRoute(vehicle: Vehicle, from: WorldLocation, to: World
const route = await fetchRoute(vehicle, from, to);
let routes = [route.trip];
- if(route.alternates) {
- for(let i = 0; i < route.alternates.length; i++) {
+ if (route.alternates) {
+ for (let i = 0; i < route.alternates.length; i++) {
routes.push(route.alternates[i].trip);
- }
+ }
}
drawAllRoutes(routes);
@@ -117,7 +140,11 @@ function getUserLocation(): WorldLocation {
let pastRoute: WorldLocation[] = [];
// Check if the location is on the line between from and to (3 meter tolerance)
-function isOnLine(location: WorldLocation, from: WorldLocation, to: WorldLocation) {
+function isOnLine(
+ location: WorldLocation,
+ from: WorldLocation,
+ to: WorldLocation,
+) {
// Convert the 6-meter tolerance to degrees (approximation)
const tolerance = 6 / 111320; // 1 degree latitude ≈ 111.32 km
@@ -126,7 +153,9 @@ function isOnLine(location: WorldLocation, from: WorldLocation, to: WorldLocatio
const dy = to.lat - from.lat;
// Calculate the projection of the location onto the line segment
- const t = ((location.lon - from.lon) * dx + (location.lat - from.lat) * dy) / (dx * dx + dy * dy);
+ const t =
+ ((location.lon - from.lon) * dx + (location.lat - from.lat) * dy) /
+ (dx * dx + dy * dy);
// Clamp t to the range [0, 1] to ensure the projection is on the segment
const clampedT = Math.max(0, Math.min(1, t));
@@ -139,7 +168,8 @@ function isOnLine(location: WorldLocation, from: WorldLocation, to: WorldLocatio
// Calculate the distance from the location to the closest point
const distance = Math.sqrt(
- Math.pow(location.lon - closestPoint.lon, 2) + Math.pow(location.lat - closestPoint.lat, 2)
+ Math.pow(location.lon - closestPoint.lon, 2) +
+ Math.pow(location.lat - closestPoint.lat, 2),
);
// Check if the distance is within the tolerance
@@ -175,9 +205,9 @@ export async function startNavigation(trip: Trip) {
// @ts-ignore The types are not correct
int = setInterval(() => {
- if(instructionIdx != 0) {
+ if (instructionIdx != 0) {
// Only continue if the user location is at the end shape index of the current maneuver
- if(currentManeuver == null) {
+ if (currentManeuver == null) {
return;
}
const bgi = currentManeuver.begin_shape_index;
@@ -212,7 +242,7 @@ export async function startNavigation(trip: Trip) {
updateRouteStatus({
time: trip.summary.time,
distance: trip.summary.length,
- currentManeuver
+ currentManeuver,
});
}
@@ -228,7 +258,7 @@ export async function startNavigation(trip: Trip) {
// pastRoute.push(...polyline.slice(0, bgi + 1));
pastRoute = polyline.slice(0, bgi + 1);
- updateNavigationLayer("route-past", pastRoute.flat())
+ updateNavigationLayer("route-past", pastRoute.flat());
// Remove from shape begin to end from the route line
const newShape = polyline.slice(bgi);
@@ -242,11 +272,14 @@ export async function startNavigation(trip: Trip) {
return;
}
const maneuver = trip.legs[0].maneuvers[instructionIdx];
- updateRouteStatus({
- time: trip.summary.time,
- distance: trip.summary.length,
- currentManeuver: trip.legs[0].maneuvers[instructionIdx],
- }, maneuver.lanes);
+ updateRouteStatus(
+ {
+ time: trip.summary.time,
+ distance: trip.summary.length,
+ currentManeuver: trip.legs[0].maneuvers[instructionIdx],
+ },
+ maneuver.lanes,
+ );
currentManeuver = maneuver;
// document.querySelector("#lanes")!.innerHTML = "";
@@ -266,22 +299,27 @@ export async function startNavigation(trip: Trip) {
if (instructionIdx > 0) {
const prevManeuver = trip.legs[0].maneuvers[instructionIdx - 1];
if (prevManeuver.verbal_post_transition_instruction) {
- console.log("Saying: " + prevManeuver.verbal_post_transition_instruction);
+ console.log(
+ "Saying: " + prevManeuver.verbal_post_transition_instruction,
+ );
say(prevManeuver.verbal_post_transition_instruction);
}
}
}, 1000);
- updateRouteStatus({
- time: trip.summary.time,
- distance: trip.summary.length,
- currentManeuver: trip.legs[0].maneuvers[0],
- }, trip.legs[0].maneuvers[0].lanes);
+ updateRouteStatus(
+ {
+ time: trip.summary.time,
+ distance: trip.summary.length,
+ currentManeuver: trip.legs[0].maneuvers[0],
+ },
+ trip.legs[0].maneuvers[0].lanes,
+ );
currentTrip = trip;
}
export async function stopNavigation() {
- if(int) clearInterval(int);
+ if (int) clearInterval(int);
await KeepAwake.allowSleep();
hideRouteStatus();
document.querySelector("body")!.classList.remove("isInTrip");
@@ -320,7 +358,7 @@ export function decodePolyline(encoded: string): WorldLocation[] {
shift += 5;
} while (byte >= 0x20);
- let deltaLat = (result & 1) ? ~(result >> 1) : (result >> 1);
+ let deltaLat = result & 1 ? ~(result >> 1) : result >> 1;
lat += deltaLat;
shift = 0;
@@ -331,7 +369,7 @@ export function decodePolyline(encoded: string): WorldLocation[] {
shift += 5;
} while (byte >= 0x20);
- let deltaLng = (result & 1) ? ~(result >> 1) : (result >> 1);
+ let deltaLng = result & 1 ? ~(result >> 1) : result >> 1;
lng += deltaLng;
// Convert the latitude and longitude to decimal format with six digits of precision
diff --git a/src/lib/services/navigation/ValhallaRequest.ts b/src/lib/services/navigation/ValhallaRequest.ts
index 4286d81..d09af2e 100644
--- a/src/lib/services/navigation/ValhallaRequest.ts
+++ b/src/lib/services/navigation/ValhallaRequest.ts
@@ -8,7 +8,7 @@ export type ValhallaCosting =
| "motor_scooter"
| "multimodal"
| "pedestrian";
-export type ValhallaRequest = {
+export interface ValhallaRequest {
locations: WorldLocation[];
costing: ValhallaCosting;
units: "miles" | "kilometers";
@@ -16,8 +16,8 @@ export type ValhallaRequest = {
alternates: number;
costing_options: ValhallaCostingOptions;
turn_lanes: boolean;
-};
-export type GeneralCostingOptions = {
+}
+export interface GeneralCostingOptions {
/**
* A penalty applied when transitioning between roads that do not have consistent
* naming - in other words, no road names in common. This penalty can be used to
@@ -59,7 +59,7 @@ export type GeneralCostingOptions = {
* @default 0 for trucks, 15 for cars, buses, motor scooters and motorcycles
*/
service_penalty?: number;
-};
+}
export type AutomobileCostingOptions = {
/**
* A penalty applied when a gate or bollard with access=private is encountered.
@@ -226,7 +226,7 @@ export type AutomobileCostingOptions = {
*/
hierarchy_limits?: void;
} & GeneralCostingOptions;
-export type OtherCostingOptions = {
+export interface OtherCostingOptions {
/**
* The height of the vehicle (in meters).
* @default 1.9 for car, bus, taxi and 4.11 for truck
@@ -267,7 +267,7 @@ export type OtherCostingOptions = {
* @default false
*/
include_hot?: boolean;
-};
+}
/**
* The type of the bicycle.
* Road: a road-style bicycle with narrow tires that is generally lightweight and designed for speed on paved surfaces.
@@ -276,7 +276,7 @@ export type OtherCostingOptions = {
* Mountain: a mountain bicycle suitable for most surfaces but generally heavier and slower on paved surfaces.
*/
export type BicycleType = "Road" | "Hybrid" | "City" | "Mountain";
-export type BicycleCostingOptions = {
+export interface BicycleCostingOptions {
/**
* @default "Hybrid"
*/
@@ -367,9 +367,8 @@ export type BicycleCostingOptions = {
* @default false
*/
shortest?: boolean;
-
-};
-export type BikeshareCostingOptions = {}; // TODO
+}
+export type BikeshareCostingOptions = unknown; // TODO
export type MotorScooterCostingOptions = {
/**
* A rider's propensity to use primary roads.
@@ -398,9 +397,9 @@ export type MotorScooterCostingOptions = {
*/
use_hills?: boolean;
} & AutomobileCostingOptions;
-export type MultimodalCostingOptions = {}; // TODO
-export type PedestrianCostingOptions = {}; // TODO
-export type TruckCostingOptions = {
+export type MultimodalCostingOptions = unknown; // TODO
+export type PedestrianCostingOptions = unknown; // TODO
+export interface TruckCostingOptions {
/**
* The length of the truck (in meters).
* @default 21.64
@@ -448,8 +447,8 @@ export type TruckCostingOptions = {
* @default 0
*/
use_truck_route?: boolean;
-};
-export type ValhallaCostingOptions = {
+}
+export interface ValhallaCostingOptions {
auto?: AutomobileCostingOptions & OtherCostingOptions;
bicycle?: BicycleCostingOptions;
bus?: AutomobileCostingOptions & OtherCostingOptions;
@@ -459,4 +458,4 @@ export type ValhallaCostingOptions = {
motor_scooter?: MotorScooterCostingOptions;
multimodal?: MultimodalCostingOptions;
pedestrian?: PedestrianCostingOptions;
-};
+}
diff --git a/src/lib/services/navigation/navigation.d.ts b/src/lib/services/navigation/navigation.d.ts
index 085316c..a30b6ab 100644
--- a/src/lib/services/navigation/navigation.d.ts
+++ b/src/lib/services/navigation/navigation.d.ts
@@ -1,15 +1,18 @@
type Language = "de-DE" | "en-US";
-type WorldLocation = { lat: number; lon: number };
+interface WorldLocation {
+ lat: number;
+ lon: number;
+}
type Units = "kilometers" | "miles";
-type RouteResult = {
+interface RouteResult {
alternates?: {
trip: Trip;
}[];
trip: Trip;
}
-type Trip = {
+interface Trip {
language: Language;
legs: Leg[];
status: number;
@@ -17,16 +20,16 @@ type Trip = {
summary: Summary;
units: Units;
locations: WorldLocation[];
-};
+}
-type Leg = {
+interface Leg {
maneuvers: Maneuver[];
shape: string;
summary: Summary;
locations: WorldLocation[];
}
-type Summary = {
+interface Summary {
cost: number;
has_ferry: boolean;
has_highway: boolean;
@@ -55,13 +58,13 @@ type Summary = {
* 512 = MergeToLeft
* 1024 = MergeToRight
*/
-type Lane = {
+interface Lane {
directions: number;
valid: number;
active: number;
-};
+}
-type Maneuver = {
+interface Maneuver {
bearing_after: number;
begin_shape_index: number;
cost: number;
@@ -78,4 +81,4 @@ type Maneuver = {
verbal_pre_transition_instruction: string;
verbal_succinct_transition_instruction: string;
lanes?: Lane[];
-};
\ No newline at end of file
+}
diff --git a/src/lib/services/navigation/routing.svelte.ts b/src/lib/services/navigation/routing.svelte.ts
index 8b5540f..91c6be5 100644
--- a/src/lib/services/navigation/routing.svelte.ts
+++ b/src/lib/services/navigation/routing.svelte.ts
@@ -18,8 +18,8 @@ export const routing = $state({
int: null as NodeJS.Timeout | null,
isOffRoute: false,
currentManeuver: null as Maneuver | null,
- }
-})
+ },
+});
export function resetRouting() {
routing.geojson.route = null;
@@ -30,9 +30,10 @@ export function resetRouting() {
export async function fetchRoute(server: string, request: ValhallaRequest) {
try {
- const res = await fetch(server + "/route?json=" + JSON.stringify(request))
- .then((res) => res.json());
-
+ const res = await fetch(
+ server + "/route?json=" + JSON.stringify(request),
+ ).then((res) => res.json());
+
console.log(res);
return res;
} catch (error) {
@@ -65,9 +66,9 @@ function geometryToGeoJSON(polyline: WorldLocation[]): GeoJSON.Feature {
}
export function decodePolyline(encoded: string): WorldLocation[] {
- let points = [];
+ const points = [];
let index = 0;
- let len = encoded.length;
+ const len = encoded.length;
let lat = 0;
let lng = 0;
@@ -81,7 +82,7 @@ export function decodePolyline(encoded: string): WorldLocation[] {
shift += 5;
} while (byte >= 0x20);
- let deltaLat = (result & 1) ? ~(result >> 1) : (result >> 1);
+ const deltaLat = result & 1 ? ~(result >> 1) : result >> 1;
lat += deltaLat;
shift = 0;
@@ -92,7 +93,7 @@ export function decodePolyline(encoded: string): WorldLocation[] {
shift += 5;
} while (byte >= 0x20);
- let deltaLng = (result & 1) ? ~(result >> 1) : (result >> 1);
+ const deltaLng = result & 1 ? ~(result >> 1) : result >> 1;
lng += deltaLng;
// Convert the latitude and longitude to decimal format with six digits of precision
@@ -108,8 +109,8 @@ export function decodePolyline(encoded: string): WorldLocation[] {
export function drawAllRoutes(trips: Trip[]) {
routing.geojson.routePast = null;
routing.geojson.route = tripToGeoJSON(trips[0]);
- if(trips[1]) routing.geojson.al0 = tripToGeoJSON(trips[1]);
- if(trips[2]) routing.geojson.al1 = tripToGeoJSON(trips[2]);
+ if (trips[1]) routing.geojson.al0 = tripToGeoJSON(trips[1]);
+ if (trips[2]) routing.geojson.al1 = tripToGeoJSON(trips[2]);
}
export function drawRoute(trip: Trip) {
@@ -119,7 +120,9 @@ export function drawRoute(trip: Trip) {
function drawCurrentTrip() {
if (!routing.currentTrip) return;
routing.geojson.route = geometryToGeoJSON(routing.currentTripInfo.route);
- routing.geojson.routePast = geometryToGeoJSON(routing.currentTripInfo.past.flat());
+ routing.geojson.routePast = geometryToGeoJSON(
+ routing.currentTripInfo.past.flat(),
+ );
}
export async function startRoute(trip: Trip) {
@@ -131,7 +134,8 @@ export async function startRoute(trip: Trip) {
routing.currentTripInfo.isOffRoute = false;
drawRoute(trip);
- routing.currentTripInfo.currentManeuver = routing.currentTrip.legs[0].maneuvers[0];
+ routing.currentTripInfo.currentManeuver =
+ routing.currentTrip.legs[0].maneuvers[0];
routing.currentTripInfo.int = setInterval(tickRoute, 500);
}
@@ -143,7 +147,8 @@ async function tickRoute() {
const info = routing.currentTripInfo;
if (!trip) return;
- const currentManeuver = trip.legs[0].maneuvers[routing.currentTripInfo.maneuverIdx];
+ const currentManeuver =
+ trip.legs[0].maneuvers[routing.currentTripInfo.maneuverIdx];
if (!currentManeuver) {
// No more maneuvers, stop navigation
stopNavigation();
@@ -155,14 +160,14 @@ async function tickRoute() {
const polyline = decodePolyline(trip.legs[0].shape);
// Check if the user location is on the last point of the entire route
- if(isOnPoint(location, polyline[polyline.length - 1])) {
+ if (isOnPoint(location, polyline[polyline.length - 1])) {
console.log("Reached destination!");
stopNavigation();
return;
}
// Check if the user is on the route
- if(!isOnShape(location, polyline)) {
+ if (!isOnShape(location, polyline)) {
console.log("Off route!");
info.isOffRoute = true;
// TODO: Implement re-routing logic
@@ -171,18 +176,24 @@ async function tickRoute() {
info.isOffRoute = false;
}
- if (currentManeuver.verbal_pre_transition_instruction && !hasAnnouncedPreInstruction) {
+ if (
+ currentManeuver.verbal_pre_transition_instruction &&
+ !hasAnnouncedPreInstruction
+ ) {
const distanceToEnd = calculateDistance(location, polyline[bgi]);
// console.log("Distance to end of current maneuver: ", distanceToEnd, " meters");
if (distanceToEnd <= 100) {
hasAnnouncedPreInstruction = true;
- console.log("[Verbal instruction] ", currentManeuver.verbal_pre_transition_instruction);
+ console.log(
+ "[Verbal instruction] ",
+ currentManeuver.verbal_pre_transition_instruction,
+ );
}
}
// Check if the user is past the current maneuver
// Checks if the user is still on the current maneuver's polyline
- if(!isOnShape(location, polyline.slice(bgi))) {
+ if (!isOnShape(location, polyline.slice(bgi))) {
return; // User is not on the current maneuver's polyline, do not update
}
@@ -196,15 +207,25 @@ async function tickRoute() {
// announce the "verbal_post_transition_instruction"
if (currentManeuver.verbal_post_transition_instruction) {
hasAnnouncedPreInstruction = false;
- const distanceToEnd = calculateDistance(location, polyline[trip.legs[0].maneuvers[routing.currentTripInfo.maneuverIdx + 1].begin_shape_index]);
+ const distanceToEnd = calculateDistance(
+ location,
+ polyline[
+ trip.legs[0].maneuvers[routing.currentTripInfo.maneuverIdx + 1]
+ .begin_shape_index
+ ],
+ );
if (distanceToEnd >= 200) {
- console.log("[Verbal instruction] ", currentManeuver.verbal_post_transition_instruction);
+ console.log(
+ "[Verbal instruction] ",
+ currentManeuver.verbal_post_transition_instruction,
+ );
}
}
// Advance to the next maneuver
info.maneuverIdx++;
- if(info.maneuverIdx >= trip.legs[0].maneuvers.length) { // No more maneuvers
+ if (info.maneuverIdx >= trip.legs[0].maneuvers.length) {
+ // No more maneuvers
stopNavigation();
return;
}
@@ -228,8 +249,8 @@ function getUserLocation(): WorldLocation {
// return geolocate.currentLocation!;
return {
lat: location.lat,
- lon: location.lng
- }
+ lon: location.lng,
+ };
// const lnglat = window.geolocate._userLocationDotMarker.getLngLat();
// return { lat: lnglat.lat, lon: lnglat.lng };
// console.log(map.value!)
@@ -239,7 +260,11 @@ function getUserLocation(): WorldLocation {
// }
}
-function isOnLine(location: WorldLocation, from: WorldLocation, to: WorldLocation) {
+function isOnLine(
+ location: WorldLocation,
+ from: WorldLocation,
+ to: WorldLocation,
+) {
// Convert the 12-meter tolerance to degrees (approximation)
const tolerance = 12 / 111320; // 1 degree latitude ≈ 111.32 km
@@ -248,7 +273,9 @@ function isOnLine(location: WorldLocation, from: WorldLocation, to: WorldLocatio
const dy = to.lat - from.lat;
// Calculate the projection of the location onto the line segment
- const t = ((location.lon - from.lon) * dx + (location.lat - from.lat) * dy) / (dx * dx + dy * dy);
+ const t =
+ ((location.lon - from.lon) * dx + (location.lat - from.lat) * dy) /
+ (dx * dx + dy * dy);
// Clamp t to the range [0, 1] to ensure the projection is on the segment
const clampedT = Math.max(0, Math.min(1, t));
@@ -261,7 +288,8 @@ function isOnLine(location: WorldLocation, from: WorldLocation, to: WorldLocatio
// Calculate the distance from the location to the closest point
const distance = Math.sqrt(
- Math.pow(location.lon - closestPoint.lon, 2) + Math.pow(location.lat - closestPoint.lat, 2)
+ Math.pow(location.lon - closestPoint.lon, 2) +
+ Math.pow(location.lat - closestPoint.lat, 2),
);
// Check if the distance is within the tolerance
@@ -273,7 +301,8 @@ function isOnPoint(location: WorldLocation, point: WorldLocation) {
const tolerance = 6 / 111320; // 1 degree latitude ≈ 111.32 km
// Calculate the distance from the location to the point
const distance = Math.sqrt(
- Math.pow(location.lon - point.lon, 2) + Math.pow(location.lat - point.lat, 2)
+ Math.pow(location.lon - point.lon, 2) +
+ Math.pow(location.lat - point.lat, 2),
);
// Check if the distance is within the tolerance
return distance <= tolerance;
@@ -289,34 +318,47 @@ function isOnShape(location: WorldLocation, shape: WorldLocation[]) {
return false;
}
-function calculateDistance(point1: WorldLocation, point2: WorldLocation): number {
+function calculateDistance(
+ point1: WorldLocation,
+ point2: WorldLocation,
+): number {
const R = 6371000; // Earth's radius in meters
const lat1 = point1.lat * (Math.PI / 180);
const lat2 = point2.lat * (Math.PI / 180);
const deltaLat = (point2.lat - point1.lat) * (Math.PI / 180);
const deltaLon = (point2.lon - point1.lon) * (Math.PI / 180);
- const a = Math.sin(deltaLat / 2) * Math.sin(deltaLat / 2) +
- Math.cos(lat1) * Math.cos(lat2) *
- Math.sin(deltaLon / 2) * Math.sin(deltaLon / 2);
+ const a =
+ Math.sin(deltaLat / 2) * Math.sin(deltaLat / 2) +
+ Math.cos(lat1) *
+ Math.cos(lat2) *
+ Math.sin(deltaLon / 2) *
+ Math.sin(deltaLon / 2);
const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
return R * c; // Distance in meters
}
-export function zoomToPoints(from: WorldLocation, to: WorldLocation, map: maplibregl.Map) {
- const getBoundingBox = (point1: [number, number], point2: [number, number]): LngLatBoundsLike => {
+export function zoomToPoints(
+ from: WorldLocation,
+ to: WorldLocation,
+ map: maplibregl.Map,
+) {
+ const getBoundingBox = (
+ point1: [number, number],
+ point2: [number, number],
+ ): LngLatBoundsLike => {
const [lng1, lat1] = point1;
const [lng2, lat2] = point2;
-
+
const sw = [Math.min(lng1, lng2), Math.min(lat1, lat2)] as [number, number];
const ne = [Math.max(lng1, lng2), Math.max(lat1, lat2)] as [number, number];
-
+
return [sw, ne];
};
- map.fitBounds(getBoundingBox([from.lon, from.lat], [to.lon, to.lat]), {
- padding: 40
+ map.fitBounds(getBoundingBox([from.lon, from.lat], [to.lon, to.lat]), {
+ padding: 40,
});
}
diff --git a/src/lib/services/oidc.ts b/src/lib/services/oidc.ts
index 3d03d59..cc6adcf 100644
--- a/src/lib/services/oidc.ts
+++ b/src/lib/services/oidc.ts
@@ -3,7 +3,7 @@
import { getOIDCConfig, hasCapability } from "./lnv";
export async function getAuthURL() {
- if(!await hasCapability("auth")) {
+ if (!(await hasCapability("auth"))) {
throw new Error("Server does not support OIDC authentication");
}
const oidcConfig = await getOIDCConfig();
@@ -17,8 +17,7 @@ export async function getAuthURL() {
const state = generateRandomString(16);
return {
- url:
- `${AUTH_URL}?client_id=${CLIENT_ID}&response_type=code&redirect_uri=${window.location.origin}/login/callback&scope=openid%20profile&code_challenge=${pkce.codeChallenge}&code_challenge_method=S256&state=${state}`,
+ url: `${AUTH_URL}?client_id=${CLIENT_ID}&response_type=code&redirect_uri=${window.location.origin}/login/callback&scope=openid%20profile&code_challenge=${pkce.codeChallenge}&code_challenge_method=S256&state=${state}`,
codeVerifier: pkce.codeVerifier,
state,
};
@@ -41,7 +40,9 @@ function generateRandomString(length: number) {
window.crypto.getRandomValues(array);
- return Array.from(array, (dec) => ("0" + dec.toString(16)).substr(-2)).join("");
+ return Array.from(array, (dec) => ("0" + dec.toString(16)).substr(-2)).join(
+ "",
+ );
}
// Encodes a string to base64url (no padding)
@@ -60,7 +61,7 @@ async function sha256(input: string | undefined): Promise {
}
export async function getOIDCUser(code: string, codeVerifier: string) {
- if(!await hasCapability("auth")) {
+ if (!(await hasCapability("auth"))) {
throw new Error("Server does not support OIDC authentication");
}
const oidcConfig = await getOIDCConfig();
@@ -81,8 +82,8 @@ export async function getOIDCUser(code: string, codeVerifier: string) {
headers: {
"Content-Type": "application/x-www-form-urlencoded",
},
- body: params
- }).then(res => res.json());
+ body: params,
+ }).then((res) => res.json());
return res;
// return JSON.parse(atob(id_token.split(".")[1]));
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 55b3a91..2ac54e5 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -8,6 +8,10 @@ export function cn(...inputs: ClassValue[]) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export type WithoutChild = T extends { child?: any } ? Omit : T;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type WithoutChildren = T extends { children?: any } ? Omit : T;
+export type WithoutChildren = T extends { children?: any }
+ ? Omit
+ : T;
export type WithoutChildrenOrChild = WithoutChildren>;
-export type WithElementRef = T & { ref?: U | null };
+export type WithElementRef = T & {
+ ref?: U | null;
+};
diff --git a/src/lib/vehicles/ValhallaVehicles.ts b/src/lib/vehicles/ValhallaVehicles.ts
index 0bb7188..40cc2bc 100644
--- a/src/lib/vehicles/ValhallaVehicles.ts
+++ b/src/lib/vehicles/ValhallaVehicles.ts
@@ -1,4 +1,8 @@
-import type { ValhallaCosting, ValhallaCostingOptions, ValhallaRequest } from "$lib/services/navigation/ValhallaRequest";
+import type {
+ ValhallaCosting,
+ ValhallaCostingOptions,
+ ValhallaRequest,
+} from "$lib/services/navigation/ValhallaRequest";
import type { Vehicle } from "./vehicles.svelte";
function getVehicleCosting(vehicle: Vehicle): ValhallaCosting {
@@ -17,31 +21,43 @@ function getVehicleCosting(vehicle: Vehicle): ValhallaCosting {
}
}
-export function createValhallaRequest(vehicle: Vehicle, locations: WorldLocation[]): ValhallaRequest {
+export function createValhallaRequest(
+ vehicle: Vehicle,
+ locations: WorldLocation[],
+): ValhallaRequest {
const costing = getVehicleCosting(vehicle);
- let costingOptions: ValhallaCostingOptions = costing == "auto" ? {
- auto: {
- top_speed: vehicle.legalMaxSpeed,
- fixed_speed: vehicle.actualMaxSpeed
- }
- } : costing == "motor_scooter" ? {
- motor_scooter: {
- top_speed: vehicle.legalMaxSpeed,
- fixed_speed: vehicle.actualMaxSpeed
- }
- } : costing == "truck" ? {
- truck: {
- top_speed: vehicle.legalMaxSpeed,
- fixed_speed: vehicle.actualMaxSpeed,
- length: vehicle.length,
- weight: vehicle.weight,
- axle_load: vehicle.axisLoad
- }
- } : costing == "bicycle" ? {
- bicycle: {
- cycling_speed: vehicle.actualMaxSpeed
- }
- } : {};
+ const costingOptions: ValhallaCostingOptions =
+ costing == "auto"
+ ? {
+ auto: {
+ top_speed: vehicle.legalMaxSpeed,
+ fixed_speed: vehicle.actualMaxSpeed,
+ },
+ }
+ : costing == "motor_scooter"
+ ? {
+ motor_scooter: {
+ top_speed: vehicle.legalMaxSpeed,
+ fixed_speed: vehicle.actualMaxSpeed,
+ },
+ }
+ : costing == "truck"
+ ? {
+ truck: {
+ top_speed: vehicle.legalMaxSpeed,
+ fixed_speed: vehicle.actualMaxSpeed,
+ length: vehicle.length,
+ weight: vehicle.weight,
+ axle_load: vehicle.axisLoad,
+ },
+ }
+ : costing == "bicycle"
+ ? {
+ bicycle: {
+ cycling_speed: vehicle.actualMaxSpeed,
+ },
+ }
+ : {};
return {
locations,
costing,
@@ -49,6 +65,6 @@ export function createValhallaRequest(vehicle: Vehicle, locations: WorldLocation
alternates: 2,
language: "de-DE",
costing_options: costingOptions,
- turn_lanes: true
- }
+ turn_lanes: true,
+ };
}
diff --git a/src/lib/vehicles/vehicles.svelte.ts b/src/lib/vehicles/vehicles.svelte.ts
index 61452ff..513d92c 100644
--- a/src/lib/vehicles/vehicles.svelte.ts
+++ b/src/lib/vehicles/vehicles.svelte.ts
@@ -6,19 +6,42 @@ bicycle, prefer cycleways and bicycle lanes = bicycle
truck, prioritizes truck routes = truck
motor_scooter = motor scooter, moped, lkfz
*/
-export const VehicleTypes = ["car", "truck", "motorcycle", "bicycle", "motor_scooter"] as const;
-export type VehicleType = typeof VehicleTypes[number];
-export const FuelTypes = ["petrol", "diesel", "electric"] as const;
-export type FuelType = typeof FuelTypes[number];
-export const EVConnectors = [
- "Type 2", "CCS", "CHAdeMO", "Tesla Supercharger", "Type 1", "Type 3",
- "SEV 1011 (Type 13)", "SEV 1011 (Type 15)", "SEV 1011 (Type 23)", "SEV 1011 (Type 25)",
- "CEE (red)", "CEE (blue)", "Schuko", "CCS Type 2", "Other"
+export const VehicleTypes = [
+ "car",
+ "truck",
+ "motorcycle",
+ "bicycle",
+ "motor_scooter",
] as const;
-export type EVConnector = typeof EVConnectors[number];
-export const PreferredFuels = ["Super", "Super E10", "Diesel", ...EVConnectors] as const;
-export type PreferredFuel = typeof PreferredFuels[number];
-export type Vehicle = {
+export type VehicleType = (typeof VehicleTypes)[number];
+export const FuelTypes = ["petrol", "diesel", "electric"] as const;
+export type FuelType = (typeof FuelTypes)[number];
+export const EVConnectors = [
+ "Type 2",
+ "CCS",
+ "CHAdeMO",
+ "Tesla Supercharger",
+ "Type 1",
+ "Type 3",
+ "SEV 1011 (Type 13)",
+ "SEV 1011 (Type 15)",
+ "SEV 1011 (Type 23)",
+ "SEV 1011 (Type 25)",
+ "CEE (red)",
+ "CEE (blue)",
+ "Schuko",
+ "CCS Type 2",
+ "Other",
+] as const;
+export type EVConnector = (typeof EVConnectors)[number];
+export const PreferredFuels = [
+ "Super",
+ "Super E10",
+ "Diesel",
+ ...EVConnectors,
+] as const;
+export type PreferredFuel = (typeof PreferredFuels)[number];
+export interface Vehicle {
name: string;
legalMaxSpeed: number;
actualMaxSpeed: number;
@@ -31,7 +54,7 @@ export type Vehicle = {
emissionClass: string;
fuelType: FuelType;
preferredFuel: PreferredFuel;
-};
+}
export const DefaultVehicle: Vehicle = {
name: "Default Vehicle",
@@ -40,49 +63,64 @@ export const DefaultVehicle: Vehicle = {
type: "motor_scooter",
emissionClass: "Euro 4",
fuelType: "diesel",
- preferredFuel: "Diesel"
-}
+ preferredFuel: "Diesel",
+};
-type StateValue = {v: T};
-export const vehicles: Vehicle[] = $state(localStorage.getItem("vehicles") ? JSON.parse(localStorage.getItem("vehicles")!) : []);
+interface StateValue {
+ v: T;
+}
+export const vehicles: Vehicle[] = $state(
+ localStorage.getItem("vehicles")
+ ? JSON.parse(localStorage.getItem("vehicles")!)
+ : [],
+);
export const selectedVehicleIdx: StateValue = $state({
- v: localStorage.getItem("selectedVehicle") ? parseInt(localStorage.getItem("selectedVehicle")!) : null
+ v: localStorage.getItem("selectedVehicle")
+ ? parseInt(localStorage.getItem("selectedVehicle")!)
+ : null,
});
export const selectedVehicle: () => Vehicle | null = () => {
- return vehicles[selectedVehicleIdx.v !== null ? selectedVehicleIdx.v : 0] || null
+ return (
+ vehicles[selectedVehicleIdx.v !== null ? selectedVehicleIdx.v : 0] || null
+ );
};
export function setVehicles(_vehicles: Vehicle[]) {
// vehicles = _vehicles;
// Hack to update without reassigning the array
vehicles.length = 0;
- _vehicles.forEach(vehicle => vehicles.push(vehicle));
+ _vehicles.forEach((vehicle) => vehicles.push(vehicle));
localStorage.setItem("vehicles", JSON.stringify(vehicles));
}
export function selectVehicle(vehicle: Vehicle | null) {
- if(vehicle == null) {
+ if (vehicle == null) {
selectedVehicleIdx.v = null;
} else {
- selectedVehicleIdx.v = vehicles.findIndex(v => v.name === vehicle.name);
- if(selectedVehicleIdx.v === -1) {
+ selectedVehicleIdx.v = vehicles.findIndex((v) => v.name === vehicle.name);
+ if (selectedVehicleIdx.v === -1) {
selectedVehicleIdx.v = null;
}
}
- localStorage.setItem("selectedVehicle", selectedVehicleIdx.v !== null ? selectedVehicleIdx.v.toString() : "");
+ localStorage.setItem(
+ "selectedVehicle",
+ selectedVehicleIdx.v !== null ? selectedVehicleIdx.v.toString() : "",
+ );
}
/**
* Check if the vehicle uses the correct preferred fuel type
*/
export function isValidFuel(vehicle: Vehicle): boolean {
- if(vehicle.fuelType == "petrol") {
- return vehicle.preferredFuel == "Super" || vehicle.preferredFuel == "Super E10";
+ if (vehicle.fuelType == "petrol") {
+ return (
+ vehicle.preferredFuel == "Super" || vehicle.preferredFuel == "Super E10"
+ );
}
- if(vehicle.fuelType == "diesel") {
+ if (vehicle.fuelType == "diesel") {
return vehicle.preferredFuel == "Diesel";
}
- if(vehicle.fuelType == "electric") {
+ if (vehicle.fuelType == "electric") {
return EVConnectors.includes(vehicle.preferredFuel as EVConnector);
}
return false;
diff --git a/src/lib/webgl.ts b/src/lib/webgl.ts
index 82f64d8..e8e45d7 100644
--- a/src/lib/webgl.ts
+++ b/src/lib/webgl.ts
@@ -1,18 +1,22 @@
export function checkWebGL() {
- if(window.WebGLRenderingContext) {
+ if (window.WebGLRenderingContext) {
const canvas = document.createElement("canvas");
try {
const ctx = canvas.getContext("webgl2") || canvas.getContext("webgl");
- if(ctx && typeof ctx.getParameter == "function") {
+ if (ctx && typeof ctx.getParameter == "function") {
return true;
}
- } catch(e) {
+ } catch (_e) {
// Supported, but disabled
- alert("WebGL is supported but disabled in your browser. Please enable it in your settings.")
+ alert(
+ "WebGL is supported but disabled in your browser. Please enable it in your settings.",
+ );
}
return false;
}
// WebGL is not supported
- alert("WebGL is not supported in your browser. Please try a different browser.");
+ alert(
+ "WebGL is not supported in your browser. Please try a different browser.",
+ );
return false;
-}
\ No newline at end of file
+}
diff --git a/src/main.ts b/src/main.ts
index afc6a7f..aef5dee 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,21 +1,25 @@
-import { mount } from 'svelte'
-import './app.css'
-import App from './App.svelte'
+import { mount } from "svelte";
+import "./app.css";
+import App from "./App.svelte";
-if(location.href.includes("/login/callback")) {
+if (location.href.includes("/login/callback")) {
const url = new URL(location.href);
const code = url.searchParams.get("code");
const state = url.searchParams.get("state");
- if(code && state) {
- window.opener.postMessage({
- code, state
- }, window.location.origin);
+ if (code && state) {
+ window.opener.postMessage(
+ {
+ code,
+ state,
+ },
+ window.location.origin,
+ );
window.close();
}
}
const app = mount(App, {
- target: document.getElementById('app')!,
-})
+ target: document.getElementById("app")!,
+});
-export default app
+export default app;
diff --git a/svelte.config.js b/svelte.config.js
index 291d712..add84d8 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -1,10 +1,10 @@
-import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'
+import { vitePreprocess } from "@sveltejs/vite-plugin-svelte";
export default {
- // Consult https://svelte.dev/docs#compile-time-svelte-preprocess
- // for more information about preprocessors
- preprocess: vitePreprocess(),
+ // Consult https://svelte.dev/docs#compile-time-svelte-preprocess
+ // for more information about preprocessors
+ preprocess: vitePreprocess(),
compilerOptions: {
- runes: true
- }
-}
+ runes: true,
+ },
+};
diff --git a/tsconfig.app.json b/tsconfig.app.json
index bb54993..96775a8 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -1,25 +1,25 @@
{
- "extends": "@tsconfig/svelte/tsconfig.json",
- "compilerOptions": {
- "target": "ESNext",
- "useDefineForClassFields": true,
- "module": "ESNext",
- "resolveJsonModule": true,
- /**
- * Typecheck JS in `.svelte` and `.js` files by default.
- * Disable checkJs if you'd like to use dynamic types in JS.
- * Note that setting allowJs false does not prevent the use
- * of JS in `.svelte` files.
- */
- "allowJs": true,
- "checkJs": true,
- "isolatedModules": true,
- "moduleDetection": "force",
- "baseUrl": ".",
- "paths": {
- "$lib": ["./src/lib"],
- "$lib/*": ["./src/lib/*"]
- }
- },
- "include": ["src/**/*.ts", "src/**/*.js", "src/**/*.svelte"]
+ "extends": "@tsconfig/svelte/tsconfig.json",
+ "compilerOptions": {
+ "target": "ESNext",
+ "useDefineForClassFields": true,
+ "module": "ESNext",
+ "resolveJsonModule": true,
+ /**
+ * Typecheck JS in `.svelte` and `.js` files by default.
+ * Disable checkJs if you'd like to use dynamic types in JS.
+ * Note that setting allowJs false does not prevent the use
+ * of JS in `.svelte` files.
+ */
+ "allowJs": true,
+ "checkJs": true,
+ "isolatedModules": true,
+ "moduleDetection": "force",
+ "baseUrl": ".",
+ "paths": {
+ "$lib": ["./src/lib"],
+ "$lib/*": ["./src/lib/*"]
+ }
+ },
+ "include": ["src/**/*.ts", "src/**/*.js", "src/**/*.svelte"]
}
diff --git a/tsconfig.json b/tsconfig.json
index c2baf42..44af460 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,14 +1,14 @@
{
- "files": [],
- "references": [
- { "path": "./tsconfig.app.json" },
- { "path": "./tsconfig.node.json" }
- ],
- "compilerOptions": {
- "baseUrl": ".",
- "paths": {
- "$lib": ["./src/lib"],
- "$lib/*": ["./src/lib/*"]
- }
- }
+ "files": [],
+ "references": [
+ { "path": "./tsconfig.app.json" },
+ { "path": "./tsconfig.node.json" }
+ ],
+ "compilerOptions": {
+ "baseUrl": ".",
+ "paths": {
+ "$lib": ["./src/lib"],
+ "$lib/*": ["./src/lib/*"]
+ }
+ }
}
diff --git a/tsconfig.node.json b/tsconfig.node.json
index 9728af2..9feb654 100644
--- a/tsconfig.node.json
+++ b/tsconfig.node.json
@@ -1,25 +1,25 @@
{
- "compilerOptions": {
- "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
- "target": "ES2022",
- "lib": ["ES2023"],
- "module": "ESNext",
- "skipLibCheck": true,
+ "compilerOptions": {
+ "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+ "target": "ES2022",
+ "lib": ["ES2023"],
+ "module": "ESNext",
+ "skipLibCheck": true,
- /* Bundler mode */
- "moduleResolution": "bundler",
- "allowImportingTsExtensions": true,
- "verbatimModuleSyntax": true,
- "moduleDetection": "force",
- "noEmit": true,
+ /* Bundler mode */
+ "moduleResolution": "bundler",
+ "allowImportingTsExtensions": true,
+ "verbatimModuleSyntax": true,
+ "moduleDetection": "force",
+ "noEmit": true,
- /* Linting */
- "strict": true,
- "noUnusedLocals": true,
- "noUnusedParameters": true,
- "erasableSyntaxOnly": true,
- "noFallthroughCasesInSwitch": true,
- "noUncheckedSideEffectImports": true
- },
- "include": ["vite.config.ts"]
+ /* Linting */
+ "strict": true,
+ "noUnusedLocals": true,
+ "noUnusedParameters": true,
+ "erasableSyntaxOnly": true,
+ "noFallthroughCasesInSwitch": true,
+ "noUncheckedSideEffectImports": true
+ },
+ "include": ["vite.config.ts"]
}
diff --git a/vite.config.ts b/vite.config.ts
index 640d4f4..4e53733 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,13 +1,13 @@
-import tailwindcss from '@tailwindcss/vite';
-import { defineConfig } from 'vite';
-import { svelte } from '@sveltejs/vite-plugin-svelte';
+import tailwindcss from "@tailwindcss/vite";
+import { defineConfig } from "vite";
+import { svelte } from "@sveltejs/vite-plugin-svelte";
import path from "path";
export default defineConfig({
plugins: [tailwindcss(), svelte()],
- resolve: {
- alias: {
- $lib: path.resolve("./src/lib"),
- },
- },
+ resolve: {
+ alias: {
+ $lib: path.resolve("./src/lib"),
+ },
+ },
});
+