Osmwithspace/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Themes: move generated themes into assets, remove known_themes, support pruning of borrowed icons

Browse source
This commit is contained in:
Pieter Vander Vennet 2025-01-11 01:18:56 +01:00
parent 310b973846
commit ee64d84d27
18 changed files with 431 additions and 400 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/Logic/Actors/Actors.spec.ts
View file

@ -1,7 +1,7 @@
import { Utils } from "../../../src/Utils"
import ThemeConfig from "../../../src/Models/ThemeConfig/ThemeConfig"
import * as bookcaseJson from "../../../src/assets/generated/themes/bookcases.json"
import * as bookcaseJson from "../../../public/assets/generated/themes/bookcases.json"
import { OsmTags } from "../../../src/Models/OsmFeature"
import { Feature, Geometry } from "geojson"
import { expect, it } from "vitest"

6
test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts
View file

@ -5,7 +5,7 @@ import ThemeConfig from "../../../../src/Models/ThemeConfig/ThemeConfig"
import bookcaseLayer from "../../../../src/assets/generated/layers/public_bookcase.json"
import LayerConfig from "../../../../src/Models/ThemeConfig/LayerConfig"
import { ExtractImages } from "../../../../src/Models/ThemeConfig/Conversion/FixImages"
import cyclofix from "../../../../src/assets/generated/themes/cyclofix.json"
import cyclofix from "../../../../public/assets/generated/themes/cyclofix.json"
import { Tag } from "../../../../src/Logic/Tags/Tag"
import { DesugaringContext } from "../../../../src/Models/ThemeConfig/Conversion/Conversion"
import { And } from "../../../../src/Logic/Tags/And"
@ -68,6 +68,7 @@ describe("PrepareTheme", () => {
tagRenderings: new Map<string, QuestionableTagRenderingConfigJson>(),
sharedLayers,
publicLayers: new Set<string>(),
tagRenderingOrder: []
})
let themeConfigJsonPrepared = prepareStep.convertStrict(theme, ConversionContext.test())
const themeConfig = new ThemeConfig(themeConfigJsonPrepared)
@ -86,6 +87,7 @@ describe("PrepareTheme", () => {
tagRenderings: new Map<string, QuestionableTagRenderingConfigJson>(),
sharedLayers,
publicLayers: new Set<string>(),
tagRenderingOrder: [],
}).convertStrict(themeConfigJson, ConversionContext.test())
const themeConfig = new ThemeConfig(themeConfigJsonPrepared)
const layerUnderTest = <LayerConfig>(
@ -101,6 +103,7 @@ describe("PrepareTheme", () => {
tagRenderings: new Map<string, QuestionableTagRenderingConfigJson>(),
sharedLayers,
publicLayers: new Set<string>(),
tagRenderingOrder: [],
}).convertStrict(
{
...themeConfigJson,
@ -148,6 +151,7 @@ describe("PrepareTheme", () => {
sharedLayers,
tagRenderings: new Map<string, QuestionableTagRenderingConfigJson>(),
publicLayers: new Set<string>(),
tagRenderingOrder: []
}
const layout: ThemeConfigJson = {
description: "A testing theme",