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

Properly render theme icon when using a studio layer as theme

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-06-19 01:56:19 +02:00
parent 5ead6c6e37
commit d38a6c7505
6 changed files with 50 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/Logic/DetermineLayout.ts
View file

@ -162,18 +162,26 @@ export default class DetermineLayout {
return dict
}
private static getSharedTagRenderingOrder(): string[] {
return questions.tagRenderings.map(tr => tr.id)
}
private static prepCustomTheme(json: any, sourceUrl?: string, forceId?: string): LayoutConfig {
if (json.layers === undefined && json.tagRenderings !== undefined) {
// We got fed a layer instead of a theme
const layerConfig = <LayerConfigJson>json
const iconTr: string | TagRenderingConfigJson =
<any>(
layerConfig.pointRendering
.map((mr) => mr?.marker?.find((icon) => icon.icon !== undefined)?.icon)
.find((i) => i !== undefined)
) ?? "bug"
const icon = new TagRenderingConfig(iconTr)?.render?.txt ?? "./assets/svg/bug.svg"
const icon = Utils.NoNull(layerConfig.pointRendering.flatMap(
pr => pr.marker
).map(iconSpec => {
const icon = new TagRenderingConfig(<TagRenderingConfigJson>iconSpec.icon).render.txt
if(iconSpec.color === undefined || icon.startsWith("http:") || icon.startsWith("https:")){
return icon
}
const color = new TagRenderingConfig(<TagRenderingConfigJson>iconSpec.color).render.txt
return icon+":"+color
})).join(";")
json = {
id: json.id,
description: json.description,
@ -193,6 +201,7 @@ export default class DetermineLayout {
}
const convertState: DesugaringContext = {
tagRenderings: DetermineLayout.getSharedTagRenderings(),
tagRenderingOrder: DetermineLayout.getSharedTagRenderingOrder(),
sharedLayers: knownLayersDict,
publicLayers: new Set<string>(),
}
@ -211,7 +220,7 @@ export default class DetermineLayout {
}
{
new ValidateThemeAndLayers(
new DoesImageExist(new Set<string>(), (_) => true),
new DoesImageExist(new Set<string>(), () => true),
"",
false
).convertStrict(json)