From 2ea9236d37852e20b31f1ffdc0dc4938863e07da Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 22 Apr 2025 01:45:34 +0200 Subject: [PATCH] Chore: fix tests, remove obsolete imports --- scripts/generateLayerOverview.ts | 4 +++- src/Logic/Osm/Actions/CreateNewNodeAction.ts | 1 - src/UI/Popup/AddNewPoint/AddNewPoint.svelte | 2 -- src/UI/Search/ActiveFilters.svelte | 3 +-- test/Models/ThemeConfig/Conversion/PrepareLayer.spec.ts | 9 ++++----- test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts | 8 +++++--- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/scripts/generateLayerOverview.ts b/scripts/generateLayerOverview.ts index 93e83d907c..a702c99f13 100644 --- a/scripts/generateLayerOverview.ts +++ b/scripts/generateLayerOverview.ts @@ -868,7 +868,9 @@ class LayerOverviewUtils extends Script { id + "(feat: Feature, helperFunctions: Record Function>) {" ) - allCode.push(" const {" + ExtraFunctions.types.join(", ") + "} = helperFunctions") + if (code?.length > 0) { + allCode.push(" const {" + ExtraFunctions.types.join(", ") + "} = helperFunctions") + } for (const line of code) { const firstEq = line.indexOf("=") let attributeName = line.substring(0, firstEq).trim() diff --git a/src/Logic/Osm/Actions/CreateNewNodeAction.ts b/src/Logic/Osm/Actions/CreateNewNodeAction.ts index eadabcd2fa..b9bbbe3e60 100644 --- a/src/Logic/Osm/Actions/CreateNewNodeAction.ts +++ b/src/Logic/Osm/Actions/CreateNewNodeAction.ts @@ -4,7 +4,6 @@ import { Changes } from "../Changes" import { ChangeDescription } from "./ChangeDescription" import { And } from "../../Tags/And" import { OsmWay } from "../OsmObject" -import { GeoOperations } from "../../GeoOperations" import InsertPointIntoWayAction from "./InsertPointIntoWayAction" export default class CreateNewNodeAction extends OsmCreateAction { diff --git a/src/UI/Popup/AddNewPoint/AddNewPoint.svelte b/src/UI/Popup/AddNewPoint/AddNewPoint.svelte index 34270e4010..091b272209 100644 --- a/src/UI/Popup/AddNewPoint/AddNewPoint.svelte +++ b/src/UI/Popup/AddNewPoint/AddNewPoint.svelte @@ -10,7 +10,6 @@ import SubtleButton from "../../Base/SubtleButton.svelte" import Translations from "../../i18n/Translations.js" import TagHint from "../TagHint.svelte" - import { And } from "../../../Logic/Tags/And.js" import LoginToggle from "../../Base/LoginToggle.svelte" import Constants from "../../../Models/Constants.js" import FilteredLayer from "../../../Models/FilteredLayer" @@ -37,7 +36,6 @@ import BaseUIElement from "../../BaseUIElement" import TitledPanel from "../../Base/TitledPanel.svelte" import ThemeViewState from "../../../Models/ThemeViewState" - import SpecialTranslation from "../TagRendering/SpecialTranslation.svelte" export let coordinate: { lon: number; lat: number } export let state: ThemeViewState diff --git a/src/UI/Search/ActiveFilters.svelte b/src/UI/Search/ActiveFilters.svelte index 69c0c2b05f..bd6c6b4a60 100644 --- a/src/UI/Search/ActiveFilters.svelte +++ b/src/UI/Search/ActiveFilters.svelte @@ -6,9 +6,8 @@ import type { SpecialVisualizationState } from "../SpecialVisualization" import FilteredLayer from "../../Models/FilteredLayer" import FilterToggle from "./FilterToggle.svelte" - import ToSvelte from "../Base/ToSvelte.svelte" import Tr from "../Base/Tr.svelte" - import { Store, UIEventSource } from "../../Logic/UIEventSource" + import { Store } from "../../Logic/UIEventSource" import Translations from "../i18n/Translations" import type { FilterSearchResult } from "../../Logic/Search/FilterSearch" import FilterSearch from "../../Logic/Search/FilterSearch" diff --git a/test/Models/ThemeConfig/Conversion/PrepareLayer.spec.ts b/test/Models/ThemeConfig/Conversion/PrepareLayer.spec.ts index 26f168f875..5753c06a6c 100644 --- a/test/Models/ThemeConfig/Conversion/PrepareLayer.spec.ts +++ b/test/Models/ThemeConfig/Conversion/PrepareLayer.spec.ts @@ -1,10 +1,9 @@ import { LayerConfigJson } from "../../../../src/Models/ThemeConfig/Json/LayerConfigJson" import LineRenderingConfigJson from "../../../../src/Models/ThemeConfig/Json/LineRenderingConfigJson" +import { PrepareLayer, RewriteSpecial } from "../../../../src/Models/ThemeConfig/Conversion/PrepareLayer" import { - PrepareLayer, - RewriteSpecial, -} from "../../../../src/Models/ThemeConfig/Conversion/PrepareLayer" -import { QuestionableTagRenderingConfigJson } from "../../../../src/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson" + QuestionableTagRenderingConfigJson +} from "../../../../src/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson" import RewritableConfigJson from "../../../../src/Models/ThemeConfig/Json/RewritableConfigJson" import { describe, expect, it } from "vitest" @@ -68,7 +67,7 @@ describe("PrepareLayer", () => { const expected = { id: "testlayer", - source: { osmTags: "key=value" }, + source: { osmTags: { "and": ["key=value"] } }, lineRendering: [ { color: { diff --git a/test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts b/test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts index fcb80f891d..0d093ab5d0 100644 --- a/test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts +++ b/test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts @@ -2,7 +2,7 @@ import { ThemeConfigJson } from "../../../../src/Models/ThemeConfig/Json/ThemeCo import { LayerConfigJson } from "../../../../src/Models/ThemeConfig/Json/LayerConfigJson" import { PrepareTheme } from "../../../../src/Models/ThemeConfig/Conversion/PrepareTheme" import ThemeConfig from "../../../../src/Models/ThemeConfig/ThemeConfig" -import bookcaseLayer from "../../../../src/assets/generated/layers/public_bookcase.json" +import bookcaseLayer from "../../../../public/assets/generated/layers/public_bookcase.json" import LayerConfig from "../../../../src/Models/ThemeConfig/LayerConfig" import { ExtractImages } from "../../../../src/Models/ThemeConfig/Conversion/FixImages" import cyclofix from "../../../../public/assets/generated/themes/cyclofix.json" @@ -10,7 +10,9 @@ import { Tag } from "../../../../src/Logic/Tags/Tag" import { DesugaringContext } from "../../../../src/Models/ThemeConfig/Conversion/Conversion" import { And } from "../../../../src/Logic/Tags/And" import { describe, expect, it } from "vitest" -import { QuestionableTagRenderingConfigJson } from "../../../../src/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson" +import { + QuestionableTagRenderingConfigJson +} from "../../../../src/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson" import Constants from "../../../../src/Models/Constants" import { ConversionContext } from "../../../../src/Models/ThemeConfig/Conversion/ConversionContext" import { MinimalTagRenderingConfigJson } from "../../../../src/Models/ThemeConfig/Json/TagRenderingConfigJson" @@ -188,7 +190,7 @@ describe("PrepareTheme", () => { expect(rewritten.layers[1]).toEqual({ _basedOn: "layer-example", source: { - osmTags: "x=y", + osmTags: { "and": ["x=y"] } }, id: "layer-example", name: null,