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

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-04-07 04:36:41 +02:00
commit bef05481bd
239 changed files with 11612 additions and 1347 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Models/ThemeConfig/Json/LayerConfigJson.ts
View file

@ -290,8 +290,11 @@ export interface LayerConfigJson {
*/
tagRenderings?: (
| string
| { builtin: string | string[]; override: Partial<QuestionableTagRenderingConfigJson> }
| { id: string; builtin: string[]; override: Partial<QuestionableTagRenderingConfigJson> }
| {
id?: string
builtin: string | string[]
override: Partial<QuestionableTagRenderingConfigJson>
}
| QuestionableTagRenderingConfigJson
| (RewritableConfigJson<
(

1
Models/ThemeConfig/PointRenderingConfig.ts
View file

@ -11,7 +11,6 @@ import { FixedUiElement } from "../../UI/Base/FixedUiElement"
import Img from "../../UI/Base/Img"
import Combine from "../../UI/Base/Combine"
import { VariableUiElement } from "../../UI/Base/VariableUIElement"
import { html } from "svelte/types/compiler/utils/namespaces"
export default class PointRenderingConfig extends WithContextLoader {
private static readonly allowed_location_codes = new Set<string>([

4
Models/ThemeConfig/TagRenderingConfig.ts
View file

@ -301,6 +301,10 @@ export default class TagRenderingConfig {
if (allKeys.length > 1 && !allHaveIfNot) {
throw `${context}: A multi-answer is defined, which generates values over multiple keys. Please define ifnot-tags too on every mapping`
}
if (allKeys.length > 1 && this.freeform?.key !== undefined) {
throw `${context}: A multi-answer is defined, which generates values over multiple keys. This is incompatible with having a freeform key`
}
}
}