-
+
-
+
About
{#if dev.current == "true"}
-
+
{/if}
@@ -44,4 +52,4 @@
flex-direction: column;
gap: 1rem;
}
-
\ No newline at end of file
+
diff --git a/src/lib/components/lnv/sidebar/settings/developer.svelte.ts b/src/lib/components/lnv/sidebar/settings/developer.svelte.ts
index 2366f29..3a7a0fa 100644
--- a/src/lib/components/lnv/sidebar/settings/developer.svelte.ts
+++ b/src/lib/components/lnv/sidebar/settings/developer.svelte.ts
@@ -1,7 +1,7 @@
export function getDeveloperToggle() {
- const value = localStorage.getItem("developer")
+ const value = localStorage.getItem("developer");
const state = $state({
- current: value == null ? "false" : value
+ current: value == null ? "false" : value,
});
$effect(() => {
@@ -9,4 +9,4 @@ export function getDeveloperToggle() {
});
return state;
-}
\ No newline at end of file
+}
diff --git a/src/lib/components/ui/progress/progress.svelte b/src/lib/components/ui/progress/progress.svelte
index 6833013..0bbc83a 100644
--- a/src/lib/components/ui/progress/progress.svelte
+++ b/src/lib/components/ui/progress/progress.svelte
@@ -14,7 +14,10 @@
=", ["get", "admin_level"], 3],
["<=", ["get", "admin_level"], 6],
@@ -2161,64 +2161,64 @@ export const layers = [
["!=", ["get", "disputed"], 1],
["!", ["has", "claimed_by"]],
],
- "paint": {
+ paint: {
"line-color": "hsl(0,0%,70%)",
"line-dasharray": [1, 1],
"line-width": ["interpolate", ["linear", 1], ["zoom"], 7, 1, 11, 2],
},
},
{
- "id": "boundary_2",
- "type": "line",
- "source": "openmaptiles",
+ id: "boundary_2",
+ type: "line",
+ source: "openmaptiles",
"source-layer": "boundary",
- "filter": [
+ filter: [
"all",
["==", ["get", "admin_level"], 2],
["!=", ["get", "maritime"], 1],
["!=", ["get", "disputed"], 1],
["!", ["has", "claimed_by"]],
],
- "layout": {
+ layout: {
"line-cap": "round",
"line-join": "round",
},
- "paint": {
+ paint: {
"line-color": "hsl(248,1%,41%)",
"line-opacity": ["interpolate", ["linear"], ["zoom"], 0, 0.4, 4, 1],
"line-width": ["interpolate", ["linear"], ["zoom"], 3, 1, 5, 1.2, 12, 3],
},
},
{
- "id": "boundary_disputed",
- "type": "line",
- "source": "openmaptiles",
+ id: "boundary_disputed",
+ type: "line",
+ source: "openmaptiles",
"source-layer": "boundary",
- "filter": [
+ filter: [
"all",
["!=", ["get", "maritime"], 1],
["==", ["get", "disputed"], 1],
],
- "paint": {
+ paint: {
"line-color": "hsl(248,1%,41%)",
"line-dasharray": [1, 2],
"line-width": ["interpolate", ["linear"], ["zoom"], 3, 1, 5, 1.2, 12, 3],
},
},
{
- "id": "waterway_line_label",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "waterway_line_label",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "waterway",
- "minzoom": 10,
- "filter": [
+ minzoom: 10,
+ filter: [
"match",
["geometry-type"],
["LineString", "MultiLineString"],
true,
false,
],
- "layout": {
+ layout: {
"symbol-placement": "line",
"symbol-spacing": 350,
"text-field": [
@@ -2232,25 +2232,19 @@ export const layers = [
"text-max-width": 5,
"text-size": 14,
},
- "paint": {
+ paint: {
"text-color": "#74aee9",
"text-halo-color": "rgba(255,255,255,0.7)",
"text-halo-width": 1.5,
},
},
{
- "id": "water_name_point_label",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "water_name_point_label",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "water_name",
- "filter": [
- "match",
- ["geometry-type"],
- ["MultiPoint", "Point"],
- true,
- false,
- ],
- "layout": {
+ filter: ["match", ["geometry-type"], ["MultiPoint", "Point"], true, false],
+ layout: {
"text-field": [
"case",
["has", "name:nonlatin"],
@@ -2262,25 +2256,25 @@ export const layers = [
"text-max-width": 5,
"text-size": ["interpolate", ["linear"], ["zoom"], 0, 10, 8, 14],
},
- "paint": {
+ paint: {
"text-color": "#495e91",
"text-halo-color": "rgba(255,255,255,0.7)",
"text-halo-width": 1.5,
},
},
{
- "id": "water_name_line_label",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "water_name_line_label",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "water_name",
- "filter": [
+ filter: [
"match",
["geometry-type"],
["LineString", "MultiLineString"],
true,
false,
],
- "layout": {
+ layout: {
"symbol-placement": "line",
"symbol-spacing": 350,
"text-field": [
@@ -2294,24 +2288,24 @@ export const layers = [
"text-max-width": 5,
"text-size": 14,
},
- "paint": {
+ paint: {
"text-color": "#495e91",
"text-halo-color": "rgba(255,255,255,0.7)",
"text-halo-width": 1.5,
},
},
{
- "id": "poi_r20",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "poi_r20",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "poi",
- "minzoom": 17,
- "filter": [
+ minzoom: 17,
+ filter: [
"all",
["match", ["geometry-type"], ["MultiPoint", "Point"], true, false],
[">=", ["get", "rank"], 20],
],
- "layout": {
+ layout: {
"icon-image": [
"match",
["get", "subclass"],
@@ -2331,7 +2325,7 @@ export const layers = [
"text-offset": [0, 0.6],
"text-size": 12,
},
- "paint": {
+ paint: {
"text-color": "#666",
"text-halo-blur": 0.5,
"text-halo-color": "#ffffff",
@@ -2339,18 +2333,18 @@ export const layers = [
},
},
{
- "id": "poi_r7",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "poi_r7",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "poi",
- "minzoom": 16,
- "filter": [
+ minzoom: 16,
+ filter: [
"all",
["match", ["geometry-type"], ["MultiPoint", "Point"], true, false],
[">=", ["get", "rank"], 7],
["<", ["get", "rank"], 20],
],
- "layout": {
+ layout: {
"icon-image": [
"match",
["get", "subclass"],
@@ -2370,7 +2364,7 @@ export const layers = [
"text-offset": [0, 0.6],
"text-size": 12,
},
- "paint": {
+ paint: {
"text-color": "#666",
"text-halo-blur": 0.5,
"text-halo-color": "#ffffff",
@@ -2378,18 +2372,18 @@ export const layers = [
},
},
{
- "id": "poi_r1",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "poi_r1",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "poi",
- "minzoom": 15,
- "filter": [
+ minzoom: 15,
+ filter: [
"all",
["match", ["geometry-type"], ["MultiPoint", "Point"], true, false],
[">=", ["get", "rank"], 1],
["<", ["get", "rank"], 7],
],
- "layout": {
+ layout: {
"icon-image": [
"match",
["get", "subclass"],
@@ -2409,7 +2403,7 @@ export const layers = [
"text-offset": [0, 0.6],
"text-size": 12,
},
- "paint": {
+ paint: {
"text-color": "#666",
"text-halo-blur": 0.5,
"text-halo-color": "#ffffff",
@@ -2417,18 +2411,18 @@ export const layers = [
},
},
{
- "id": "poi_transit",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "poi_transit",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "poi",
- "filter": [
+ filter: [
"match",
["get", "class"],
["airport", "bus", "rail"],
true,
false,
],
- "layout": {
+ layout: {
"icon-image": ["to-string", ["get", "class"]],
"icon-size": 0.7,
"text-anchor": "left",
@@ -2443,7 +2437,7 @@ export const layers = [
"text-offset": [0.9, 0],
"text-size": 12,
},
- "paint": {
+ paint: {
"text-color": "#2e5a80",
"text-halo-blur": 0.5,
"text-halo-color": "#ffffff",
@@ -2451,13 +2445,13 @@ export const layers = [
},
},
{
- "id": "highway-name-path",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "highway-name-path",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "transportation_name",
- "minzoom": 15.5,
- "filter": ["==", ["get", "class"], "path"],
- "layout": {
+ minzoom: 15.5,
+ filter: ["==", ["get", "class"], "path"],
+ layout: {
"symbol-placement": "line",
"text-field": [
"case",
@@ -2469,19 +2463,19 @@ export const layers = [
"text-rotation-alignment": "map",
"text-size": ["interpolate", ["linear"], ["zoom"], 13, 12, 14, 13],
},
- "paint": {
+ paint: {
"text-color": "hsl(30,23%,62%)",
"text-halo-color": "#f8f4f0",
"text-halo-width": 0.5,
},
},
{
- "id": "highway-name-minor",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "highway-name-minor",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "transportation_name",
- "minzoom": 15,
- "filter": [
+ minzoom: 15,
+ filter: [
"all",
[
"match",
@@ -2492,7 +2486,7 @@ export const layers = [
],
["match", ["get", "class"], ["minor", "service", "track"], true, false],
],
- "layout": {
+ layout: {
"symbol-placement": "line",
"text-field": [
"case",
@@ -2504,26 +2498,26 @@ export const layers = [
"text-rotation-alignment": "map",
"text-size": ["interpolate", ["linear"], ["zoom"], 13, 12, 14, 13],
},
- "paint": {
+ paint: {
"text-color": "#666",
"text-halo-blur": 0.5,
"text-halo-width": 1,
},
},
{
- "id": "highway-name-major",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "highway-name-major",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "transportation_name",
- "minzoom": 12.2,
- "filter": [
+ minzoom: 12.2,
+ filter: [
"match",
["get", "class"],
["primary", "secondary", "tertiary", "trunk"],
true,
false,
],
- "layout": {
+ layout: {
"symbol-placement": "line",
"text-field": [
"case",
@@ -2535,19 +2529,19 @@ export const layers = [
"text-rotation-alignment": "map",
"text-size": ["interpolate", ["linear"], ["zoom"], 13, 12, 14, 13],
},
- "paint": {
+ paint: {
"text-color": "#666",
"text-halo-blur": 0.5,
"text-halo-width": 1,
},
},
{
- "id": "highway-shield-non-us",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "highway-shield-non-us",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "transportation_name",
- "minzoom": 8,
- "filter": [
+ minzoom: 8,
+ filter: [
"all",
["<=", ["get", "ref_length"], 6],
[
@@ -2565,7 +2559,7 @@ export const layers = [
true,
],
],
- "layout": {
+ layout: {
"icon-image": ["concat", "road_", ["get", "ref_length"]],
"icon-rotation-alignment": "viewport",
"icon-size": 1,
@@ -2578,12 +2572,12 @@ export const layers = [
},
},
{
- "id": "highway-shield-us-interstate",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "highway-shield-us-interstate",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "transportation_name",
- "minzoom": 7,
- "filter": [
+ minzoom: 7,
+ filter: [
"all",
["<=", ["get", "ref_length"], 6],
[
@@ -2595,13 +2589,8 @@ export const layers = [
],
["match", ["get", "network"], ["us-interstate"], true, false],
],
- "layout": {
- "icon-image": [
- "concat",
- ["get", "network"],
- "_",
- ["get", "ref_length"],
- ],
+ layout: {
+ "icon-image": ["concat", ["get", "network"], "_", ["get", "ref_length"]],
"icon-rotation-alignment": "viewport",
"icon-size": 1,
"symbol-placement": ["step", ["zoom"], "point", 7, "line", 8, "line"],
@@ -2613,12 +2602,12 @@ export const layers = [
},
},
{
- "id": "road_shield_us",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "road_shield_us",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "transportation_name",
- "minzoom": 9,
- "filter": [
+ minzoom: 9,
+ filter: [
"all",
["<=", ["get", "ref_length"], 6],
[
@@ -2630,13 +2619,8 @@ export const layers = [
],
["match", ["get", "network"], ["us-highway", "us-state"], true, false],
],
- "layout": {
- "icon-image": [
- "concat",
- ["get", "network"],
- "_",
- ["get", "ref_length"],
- ],
+ layout: {
+ "icon-image": ["concat", ["get", "network"], "_", ["get", "ref_length"]],
"icon-rotation-alignment": "viewport",
"icon-size": 1,
"symbol-placement": ["step", ["zoom"], "point", 11, "line"],
@@ -2648,13 +2632,13 @@ export const layers = [
},
},
{
- "id": "airport",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "airport",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "aerodrome_label",
- "minzoom": 10,
- "filter": ["all", ["has", "iata"]],
- "layout": {
+ minzoom: 10,
+ filter: ["all", ["has", "iata"]],
+ layout: {
"icon-image": "airport_11",
"icon-size": 1,
"text-anchor": "top",
@@ -2671,7 +2655,7 @@ export const layers = [
"text-padding": 2,
"text-size": 12,
},
- "paint": {
+ paint: {
"text-color": "#666",
"text-halo-blur": 0.5,
"text-halo-color": "#ffffff",
@@ -2679,19 +2663,19 @@ export const layers = [
},
},
{
- "id": "label_other",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "label_other",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "place",
- "minzoom": 8,
- "filter": [
+ minzoom: 8,
+ filter: [
"match",
["get", "class"],
["city", "continent", "country", "state", "town", "village"],
false,
true,
],
- "layout": {
+ layout: {
"text-field": [
"case",
["has", "name:nonlatin"],
@@ -2704,7 +2688,7 @@ export const layers = [
"text-size": ["interpolate", ["linear"], ["zoom"], 8, 9, 12, 10],
"text-transform": "uppercase",
},
- "paint": {
+ paint: {
"text-color": "#333",
"text-halo-blur": 1,
"text-halo-color": "#fff",
@@ -2712,13 +2696,13 @@ export const layers = [
},
},
{
- "id": "label_village",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "label_village",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "place",
- "minzoom": 9,
- "filter": ["==", ["get", "class"], "village"],
- "layout": {
+ minzoom: 9,
+ filter: ["==", ["get", "class"], "village"],
+ layout: {
"icon-allow-overlap": true,
"icon-image": ["step", ["zoom"], "circle_11_black", 10, ""],
"icon-optional": false,
@@ -2742,7 +2726,7 @@ export const layers = [
12,
],
},
- "paint": {
+ paint: {
"text-color": "#000",
"text-halo-blur": 1,
"text-halo-color": "#fff",
@@ -2750,13 +2734,13 @@ export const layers = [
},
},
{
- "id": "label_town",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "label_town",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "place",
- "minzoom": 6,
- "filter": ["==", ["get", "class"], "town"],
- "layout": {
+ minzoom: 6,
+ filter: ["==", ["get", "class"], "town"],
+ layout: {
"icon-allow-overlap": true,
"icon-image": ["step", ["zoom"], "circle_11_black", 10, ""],
"icon-optional": false,
@@ -2780,7 +2764,7 @@ export const layers = [
14,
],
},
- "paint": {
+ paint: {
"text-color": "#000",
"text-halo-blur": 1,
"text-halo-color": "#fff",
@@ -2788,14 +2772,14 @@ export const layers = [
},
},
{
- "id": "label_state",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "label_state",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "place",
- "minzoom": 5,
- "maxzoom": 8,
- "filter": ["==", ["get", "class"], "state"],
- "layout": {
+ minzoom: 5,
+ maxzoom: 8,
+ filter: ["==", ["get", "class"], "state"],
+ layout: {
"text-field": [
"case",
["has", "name:nonlatin"],
@@ -2808,7 +2792,7 @@ export const layers = [
"text-size": ["interpolate", ["linear"], ["zoom"], 5, 10, 8, 14],
"text-transform": "uppercase",
},
- "paint": {
+ paint: {
"text-color": "#333",
"text-halo-blur": 1,
"text-halo-color": "#fff",
@@ -2816,17 +2800,17 @@ export const layers = [
},
},
{
- "id": "label_city",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "label_city",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "place",
- "minzoom": 3,
- "filter": [
+ minzoom: 3,
+ filter: [
"all",
["==", ["get", "class"], "city"],
["!=", ["get", "capital"], 2],
],
- "layout": {
+ layout: {
"icon-allow-overlap": true,
"icon-image": ["step", ["zoom"], "circle_11_black", 9, ""],
"icon-optional": false,
@@ -2853,7 +2837,7 @@ export const layers = [
18,
],
},
- "paint": {
+ paint: {
"text-color": "#000",
"text-halo-blur": 1,
"text-halo-color": "#fff",
@@ -2861,17 +2845,17 @@ export const layers = [
},
},
{
- "id": "label_city_capital",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "label_city_capital",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "place",
- "minzoom": 3,
- "filter": [
+ minzoom: 3,
+ filter: [
"all",
["==", ["get", "class"], "city"],
["==", ["get", "capital"], 2],
],
- "layout": {
+ layout: {
"icon-allow-overlap": true,
"icon-image": ["step", ["zoom"], "circle_11_black", 9, ""],
"icon-optional": false,
@@ -2898,7 +2882,7 @@ export const layers = [
20,
],
},
- "paint": {
+ paint: {
"text-color": "#000",
"text-halo-blur": 1,
"text-halo-color": "#fff",
@@ -2906,18 +2890,18 @@ export const layers = [
},
},
{
- "id": "label_country_3",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "label_country_3",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "place",
- "minzoom": 2,
- "maxzoom": 9,
- "filter": [
+ minzoom: 2,
+ maxzoom: 9,
+ filter: [
"all",
["==", ["get", "class"], "country"],
[">=", ["get", "rank"], 3],
],
- "layout": {
+ layout: {
"text-field": [
"case",
["has", "name:nonlatin"],
@@ -2928,7 +2912,7 @@ export const layers = [
"text-max-width": 6.25,
"text-size": ["interpolate", ["linear"], ["zoom"], 3, 9, 7, 17],
},
- "paint": {
+ paint: {
"text-color": "#000",
"text-halo-blur": 1,
"text-halo-color": "#fff",
@@ -2936,17 +2920,17 @@ export const layers = [
},
},
{
- "id": "label_country_2",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "label_country_2",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "place",
- "maxzoom": 9,
- "filter": [
+ maxzoom: 9,
+ filter: [
"all",
["==", ["get", "class"], "country"],
["==", ["get", "rank"], 2],
],
- "layout": {
+ layout: {
"text-field": [
"case",
["has", "name:nonlatin"],
@@ -2957,7 +2941,7 @@ export const layers = [
"text-max-width": 6.25,
"text-size": ["interpolate", ["linear"], ["zoom"], 2, 9, 5, 17],
},
- "paint": {
+ paint: {
"text-color": "#000",
"text-halo-blur": 1,
"text-halo-color": "#fff",
@@ -2965,17 +2949,17 @@ export const layers = [
},
},
{
- "id": "label_country_1",
- "type": "symbol",
- "source": "openmaptiles",
+ id: "label_country_1",
+ type: "symbol",
+ source: "openmaptiles",
"source-layer": "place",
- "maxzoom": 9,
- "filter": [
+ maxzoom: 9,
+ filter: [
"all",
["==", ["get", "class"], "country"],
["==", ["get", "rank"], 1],
],
- "layout": {
+ layout: {
"text-field": [
"case",
["has", "name:nonlatin"],
@@ -2986,7 +2970,7 @@ export const layers = [
"text-max-width": 6.25,
"text-size": ["interpolate", ["linear"], ["zoom"], 1, 9, 4, 17],
},
- "paint": {
+ paint: {
"text-color": "#000",
"text-halo-blur": 1,
"text-halo-color": "#fff",
diff --git a/src/lib/services/OfflineTiles.ts b/src/lib/services/OfflineTiles.ts
index ab43dc6..1697da2 100644
--- a/src/lib/services/OfflineTiles.ts
+++ b/src/lib/services/OfflineTiles.ts
@@ -1,22 +1,33 @@
import { appDataDir, join } from "@tauri-apps/api/path";
-import { BaseDirectory, exists, mkdir, open, remove, SeekMode } from "@tauri-apps/plugin-fs";
+import {
+ BaseDirectory,
+ exists,
+ mkdir,
+ open,
+ remove,
+ SeekMode,
+} from "@tauri-apps/plugin-fs";
import { download } from "@tauri-apps/plugin-upload";
import { PMTiles, TileType, type Source } from "pmtiles";
-export async function downloadPMTiles(url: string, name: string, onprogress?: (progress: number, total: number) => any): Promise {
-// if(!window.__TAURI__) {
-// throw new Error("Tauri environment is not available.");
-// }
+export async function downloadPMTiles(
+ url: string,
+ name: string,
+ onprogress?: (progress: number, total: number) => void,
+): Promise {
+ // if(!window.__TAURI__) {
+ // throw new Error("Tauri environment is not available.");
+ // }
const filename = name + ".pmtiles";
const baseDir = BaseDirectory.AppData;
const appDataDirPath = await appDataDir();
- if(!await exists(appDataDirPath)) {
+ if (!(await exists(appDataDirPath))) {
await mkdir(appDataDirPath, { recursive: true });
}
- if(await exists(filename, { baseDir })) {
+ if (await exists(filename, { baseDir })) {
console.log(`File ${filename} already exists, deleting it.`);
await remove(filename, { baseDir });
}
@@ -30,30 +41,36 @@ export async function downloadPMTiles(url: string, name: string, onprogress?: (p
const path = await join(appDataDirPath, filename);
- let totalProgress = 0;
+ let totalProgress = 0;
await download(url, path, ({ progress, total }) => {
- totalProgress += progress;
- console.log(`Download progress: ${Math.round((totalProgress / total) * 100)}% (${totalProgress}\tof ${total} bytes)`);
- if(onprogress) onprogress(totalProgress, total);
+ totalProgress += progress;
+ console.log(
+ `Download progress: ${Math.round((totalProgress / total) * 100)}% (${totalProgress}\tof ${total} bytes)`,
+ );
+ if (onprogress) onprogress(totalProgress, total);
});
console.log(`Download completed: ${path}`);
}
-export async function getRemoteList(): Promise<{ name: string, file: string }[]> {
- return await fetch("https://trafficcue-tiles.picoscratch.de/index.json").then(res => res.json());
+export async function getRemoteList(): Promise<
+ { name: string; file: string }[]
+> {
+ return await fetch("https://trafficcue-tiles.picoscratch.de/index.json").then(
+ (res) => res.json(),
+ );
}
export async function hasPMTiles(name: string): Promise {
- if(!window.__TAURI__) {
+ if (!window.__TAURI__) {
return false; // Tauri environment is not available
}
-
+
const filename = name + ".pmtiles";
const baseDir = BaseDirectory.AppData;
const appDataDirPath = await appDataDir();
- if(!await exists(appDataDirPath)) {
+ if (!(await exists(appDataDirPath))) {
return false;
}
@@ -62,21 +79,21 @@ export async function hasPMTiles(name: string): Promise {
}
export async function getPMTilesURL(name: string) {
- if(!window.__TAURI__) {
+ if (!window.__TAURI__) {
return `pmtiles://https://trafficcue-tiles.picoscratch.de/${name}.pmtiles`;
}
const filename = name + ".pmtiles";
const baseDir = BaseDirectory.AppData;
const appDataDirPath = await appDataDir();
- if(!await exists(appDataDirPath)) {
+ if (!(await exists(appDataDirPath))) {
return `pmtiles://https://trafficcue-tiles.picoscratch.de/${name}.pmtiles`;
// throw new Error("App data directory does not exist.");
}
const filePath = await join(appDataDirPath, filename);
- if(!await exists(filePath, { baseDir })) {
+ if (!(await exists(filePath, { baseDir }))) {
return `pmtiles://https://trafficcue-tiles.picoscratch.de/${name}.pmtiles`;
// throw new Error(`PMTiles file not found: ${filePath}`);
}
@@ -84,8 +101,15 @@ export async function getPMTilesURL(name: string) {
return `tiles://${name}`;
}
-async function readBytes(name: string, offset: number, length: number): Promise {
- const file = await open(name + ".pmtiles", { read: true, baseDir: BaseDirectory.AppData });
+async function readBytes(
+ name: string,
+ offset: number,
+ length: number,
+): Promise {
+ const file = await open(name + ".pmtiles", {
+ read: true,
+ baseDir: BaseDirectory.AppData,
+ });
const buffer = new Uint8Array(length);
await file.seek(offset, SeekMode.Start);
await file.read(buffer);
@@ -100,135 +124,142 @@ export class FSSource implements Source {
this.name = name;
}
- async getBytes(offset: number, length: number, _signal?: AbortSignal, _etag?: string) { // TODO: abort signal
+ async getBytes(
+ offset: number,
+ length: number,
+ _signal?: AbortSignal,
+ _etag?: string,
+ ) {
+ // TODO: abort signal
const data = await readBytes(this.name, offset, length);
return {
data: data.buffer as ArrayBuffer,
etag: undefined,
cacheControl: undefined,
- expires: undefined
- }
+ expires: undefined,
+ };
}
getKey = () => this.name;
}
interface RequestParameters {
- url: string;
- headers?: unknown;
- method?: "GET" | "POST" | "PUT";
- body?: string;
- type?: "string" | "json" | "arrayBuffer" | "image";
- credentials?: "same-origin" | "include";
- collectResourceTiming?: boolean;
-};
+ url: string;
+ headers?: unknown;
+ method?: "GET" | "POST" | "PUT";
+ body?: string;
+ type?: "string" | "json" | "arrayBuffer" | "image";
+ credentials?: "same-origin" | "include";
+ collectResourceTiming?: boolean;
+}
export class Protocol {
- /** @hidden */
- tiles: Map;
- metadata: boolean; errorOnMissingTile: boolean;
+ /** @hidden */
+ tiles: Map;
+ metadata: boolean;
+ errorOnMissingTile: boolean;
- /**
- * Initialize the MapLibre PMTiles protocol.
- *
- * * metadata: also load the metadata section of the PMTiles. required for some "inspect" functionality
- * and to automatically populate the map attribution. Requires an extra HTTP request.
- * * errorOnMissingTile: When a vector MVT tile is missing from the archive, raise an error instead of
- * returning the empty array. Not recommended. This is only to reproduce the behavior of ZXY tile APIs
- * which some applications depend on when overzooming.
- */
- constructor(options?: { metadata?: boolean; errorOnMissingTile?: boolean }) {
- this.tiles = new Map();
- this.metadata = options?.metadata || false;
- this.errorOnMissingTile = options?.errorOnMissingTile || false;
- }
+ /**
+ * Initialize the MapLibre PMTiles protocol.
+ *
+ * * metadata: also load the metadata section of the PMTiles. required for some "inspect" functionality
+ * and to automatically populate the map attribution. Requires an extra HTTP request.
+ * * errorOnMissingTile: When a vector MVT tile is missing from the archive, raise an error instead of
+ * returning the empty array. Not recommended. This is only to reproduce the behavior of ZXY tile APIs
+ * which some applications depend on when overzooming.
+ */
+ constructor(options?: { metadata?: boolean; errorOnMissingTile?: boolean }) {
+ this.tiles = new Map();
+ this.metadata = options?.metadata || false;
+ this.errorOnMissingTile = options?.errorOnMissingTile || false;
+ }
- /**
- * Add a {@link PMTiles} instance to the global protocol instance.
- *
- * For remote fetch sources, references in MapLibre styles like pmtiles://http://...
- * will resolve to the same instance if the URLs match.
- */
- add(p: PMTiles) {
- this.tiles.set(p.source.getKey(), p);
- }
+ /**
+ * Add a {@link PMTiles} instance to the global protocol instance.
+ *
+ * For remote fetch sources, references in MapLibre styles like pmtiles://http://...
+ * will resolve to the same instance if the URLs match.
+ */
+ add(p: PMTiles) {
+ this.tiles.set(p.source.getKey(), p);
+ }
- /**
- * Fetch a {@link PMTiles} instance by URL, for remote PMTiles instances.
- */
- get(url: string) {
- return this.tiles.get(url);
- }
+ /**
+ * Fetch a {@link PMTiles} instance by URL, for remote PMTiles instances.
+ */
+ get(url: string) {
+ return this.tiles.get(url);
+ }
- /** @hidden */
- tilev4 = async (
- params: RequestParameters,
- abortController: AbortController
- ) => {
- if (params.type === "json") {
- const pmtilesUrl = params.url.substr(8);
- let instance = this.tiles.get(pmtilesUrl);
- if (!instance) {
- instance = new PMTiles(new FSSource(pmtilesUrl));
- this.tiles.set(pmtilesUrl, instance);
- }
+ /** @hidden */
+ tilev4 = async (
+ params: RequestParameters,
+ abortController: AbortController,
+ ) => {
+ if (params.type === "json") {
+ const pmtilesUrl = params.url.substr(8);
+ let instance = this.tiles.get(pmtilesUrl);
+ if (!instance) {
+ instance = new PMTiles(new FSSource(pmtilesUrl));
+ this.tiles.set(pmtilesUrl, instance);
+ }
- if (this.metadata) {
- return {
- data: await instance.getTileJson(params.url),
- };
- }
+ if (this.metadata) {
+ return {
+ data: await instance.getTileJson(params.url),
+ };
+ }
- const h = await instance.getHeader();
+ const h = await instance.getHeader();
- if (h.minLon >= h.maxLon || h.minLat >= h.maxLat) {
- console.error(
- `Bounds of PMTiles archive ${h.minLon},${h.minLat},${h.maxLon},${h.maxLat} are not valid.`
- );
- }
+ if (h.minLon >= h.maxLon || h.minLat >= h.maxLat) {
+ console.error(
+ `Bounds of PMTiles archive ${h.minLon},${h.minLat},${h.maxLon},${h.maxLat} are not valid.`,
+ );
+ }
- return {
- data: {
- tiles: [`${params.url}/{z}/{x}/{y}`],
- minzoom: h.minZoom,
- maxzoom: h.maxZoom,
- bounds: [h.minLon, h.minLat, h.maxLon, h.maxLat],
- },
- };
- }
- const re = new RegExp(/tiles:\/\/(.+)\/(\d+)\/(\d+)\/(\d+)/);
- const result = params.url.match(re);
- if (!result) {
- throw new Error("Invalid Tiles protocol URL");
- }
- const pmtilesUrl = result[1];
+ return {
+ data: {
+ tiles: [`${params.url}/{z}/{x}/{y}`],
+ minzoom: h.minZoom,
+ maxzoom: h.maxZoom,
+ bounds: [h.minLon, h.minLat, h.maxLon, h.maxLat],
+ },
+ };
+ }
+ const re = new RegExp(/tiles:\/\/(.+)\/(\d+)\/(\d+)\/(\d+)/);
+ const result = params.url.match(re);
+ if (!result) {
+ throw new Error("Invalid Tiles protocol URL");
+ }
+ const pmtilesUrl = result[1];
- let instance = this.tiles.get(pmtilesUrl);
- if (!instance) {
- instance = new PMTiles(new FSSource(pmtilesUrl));
- this.tiles.set(pmtilesUrl, instance);
- }
- const z = result[2];
- const x = result[3];
- const y = result[4];
+ let instance = this.tiles.get(pmtilesUrl);
+ if (!instance) {
+ instance = new PMTiles(new FSSource(pmtilesUrl));
+ this.tiles.set(pmtilesUrl, instance);
+ }
+ const z = result[2];
+ const x = result[3];
+ const y = result[4];
- const header = await instance.getHeader();
- const resp = await instance?.getZxy(+z, +x, +y, abortController.signal);
- if (resp) {
- return {
- data: new Uint8Array(resp.data),
- cacheControl: resp.cacheControl,
- expires: resp.expires,
- };
- }
- if (header.tileType === TileType.Mvt) {
- if (this.errorOnMissingTile) {
- throw new Error("Tile not found.");
- }
- return { data: new Uint8Array() };
- }
- return { data: null };
- };
+ const header = await instance.getHeader();
+ const resp = await instance?.getZxy(+z, +x, +y, abortController.signal);
+ if (resp) {
+ return {
+ data: new Uint8Array(resp.data),
+ cacheControl: resp.cacheControl,
+ expires: resp.expires,
+ };
+ }
+ if (header.tileType === TileType.Mvt) {
+ if (this.errorOnMissingTile) {
+ throw new Error("Tile not found.");
+ }
+ return { data: new Uint8Array() };
+ }
+ return { data: null };
+ };
}
export const protocol = new Protocol({
diff --git a/src/lib/services/Overpass.ts b/src/lib/services/Overpass.ts
index 17fc048..ee6b0cb 100644
--- a/src/lib/services/Overpass.ts
+++ b/src/lib/services/Overpass.ts
@@ -60,7 +60,12 @@ out center tags;`,
}).then((res) => res.json() as Promise);
}
-export async function fetchNearbyPOI(lat: number, lon: number, tags: string[], radius: number) {
+export async function fetchNearbyPOI(
+ lat: number,
+ lon: number,
+ tags: string[],
+ radius: number,
+) {
return await fetch(OVERPASS_SERVER, {
method: "POST",
body: `[out:json];
diff --git a/src/lib/services/navigation/TTS.ts b/src/lib/services/navigation/TTS.ts
index 03d9940..4ee9229 100644
--- a/src/lib/services/navigation/TTS.ts
+++ b/src/lib/services/navigation/TTS.ts
@@ -23,7 +23,7 @@ export default async function say(text: string) {
duck();
if (tts !== "web") {
try {
- await invoke("plugin:tts|speak", { text })
+ await invoke("plugin:tts|speak", { text });
} catch (e) {
console.error("Error speaking text", e);
alert(e);
diff --git a/src/lib/services/navigation/routing.svelte.ts b/src/lib/services/navigation/routing.svelte.ts
index 3bbd9b0..0158d51 100644
--- a/src/lib/services/navigation/routing.svelte.ts
+++ b/src/lib/services/navigation/routing.svelte.ts
@@ -129,7 +129,7 @@ function drawCurrentTrip() {
}
export async function startRoute(trip: Trip) {
- if(window.__TAURI__) {
+ if (window.__TAURI__) {
await keepScreenOn(true);
}
routing.currentTrip = trip;
@@ -270,7 +270,7 @@ export function stopNavigation() {
routing.currentTrip = null;
map.updateMapPadding(); // TODO: REMOVE
removeAllRoutes();
- if(window.__TAURI__) {
+ if (window.__TAURI__) {
keepScreenOn(false);
}
}
diff --git a/vite.config.ts b/vite.config.ts
index 006c3a0..40bd0c8 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -12,22 +12,23 @@ export default defineConfig({
port: 5173,
strictPort: true,
host: host || false,
- hmr: host ? {
- protocol: "ws",
- host,
- port: 1421
- } : undefined,
+ hmr: host
+ ? {
+ protocol: "ws",
+ host,
+ port: 1421,
+ }
+ : undefined,
watch: {
- ignored: ["**/src-tauri/**"]
- }
+ ignored: ["**/src-tauri/**"],
+ },
},
envPrefix: ["VITE_", "TAURI_ENV_*"],
build: {
- target: process.env.TAURI_ENV_PLATFORM == "windows"
- ? "chrome105"
- : "safari13",
+ target:
+ process.env.TAURI_ENV_PLATFORM == "windows" ? "chrome105" : "safari13",
minify: !process.env.TAURI_ENV_DEBUG ? "esbuild" : false,
- sourcemap: !!process.env.TAURI_ENV_DEBUG
+ sourcemap: !!process.env.TAURI_ENV_DEBUG,
},
resolve: {
alias: {