From ca66f47be03eab55ccf61fb2e68e9bf4f71497b9 Mon Sep 17 00:00:00 2001 From: HarelM Date: Sun, 12 Jul 2026 09:15:23 +0300 Subject: [PATCH] fix build --- src/libs/store/apistore.ts | 12 ++++++------ src/libs/store/stylestore.ts | 4 ++-- src/libs/urlopen.ts | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/libs/store/apistore.ts b/src/libs/store/apistore.ts index 8bd4045c..5c2c996f 100644 --- a/src/libs/store/apistore.ts +++ b/src/libs/store/apistore.ts @@ -1,4 +1,4 @@ -import style from "../style"; +import {emptyStyle, ensureStyleValidity, replaceAccessTokens, stripAccessTokens} from "../style"; import {format} from "@maplibre/maplibre-gl-style-spec"; import ReconnectingWebSocket from "reconnecting-websocket"; import type {IStyleStore, OnStyleChangedCallback, StyleSpecificationWithId} from "../definitions"; @@ -40,13 +40,13 @@ export class ApiStyleStore implements IStyleStore { connection.onmessage = e => { if(!e.data) return; console.log("Received style update from API"); - let parsedStyle = style.emptyStyle; + let parsedStyle = emptyStyle; try { parsedStyle = JSON.parse(e.data); } catch(err) { console.error(err); } - const updatedStyle = style.ensureStyleValidity(parsedStyle); + const updatedStyle = ensureStyleValidity(parsedStyle); this.onLocalStyleChange(updatedStyle); }; } @@ -57,7 +57,7 @@ export class ApiStyleStore implements IStyleStore { mode: "cors", }); const body = await response.json(); - return style.ensureStyleValidity(body); + return ensureStyleValidity(body); } else { throw new Error("No latest style available. You need to init the api backend first."); } @@ -66,8 +66,8 @@ export class ApiStyleStore implements IStyleStore { // Save current style replacing previous version save(mapStyle: StyleSpecificationWithId) { const styleJSON = format( - style.stripAccessTokens( - style.replaceAccessTokens(mapStyle) + stripAccessTokens( + replaceAccessTokens(mapStyle) ) ); diff --git a/src/libs/store/stylestore.ts b/src/libs/store/stylestore.ts index b7629803..4564bb36 100644 --- a/src/libs/store/stylestore.ts +++ b/src/libs/store/stylestore.ts @@ -1,4 +1,4 @@ -import style from "../style"; +import { ensureStyleValidity } from "../style"; import {loadStyleUrl} from "../urlopen"; import publicSources from "../../config/styles.json"; import type {IStyleStore, StyleSpecificationWithId} from "../definitions"; @@ -89,7 +89,7 @@ export class StyleStore implements IStyleStore { // Save current style replacing previous version save(mapStyle: StyleSpecificationWithId) { - mapStyle = style.ensureStyleValidity(mapStyle); + mapStyle = ensureStyleValidity(mapStyle); const key = styleKey(mapStyle.id); const saveFn = () => { diff --git a/src/libs/urlopen.ts b/src/libs/urlopen.ts index e7aa5bec..7459b578 100644 --- a/src/libs/urlopen.ts +++ b/src/libs/urlopen.ts @@ -1,4 +1,4 @@ -import style from "./style"; +import { emptyStyle, ensureStyleValidity } from "./style"; import { type StyleSpecificationWithId } from "./definitions"; export function getStyleUrlFromAddressbarAndRemoveItIfNeeded(): string | null { @@ -19,10 +19,10 @@ export async function loadStyleUrl(styleUrl: string): Promise