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

UK-themes: add inspire polygons to detect addresses with, various small fixes

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-11-05 01:19:27 +01:00
parent be3ac93eca
commit 2c46645581
7 changed files with 71 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Models/ThemeConfig/LayerConfig.ts
View file

@ -192,11 +192,11 @@ export default class LayerConfig extends WithContextLoader {
}
this.mapRendering = json.mapRendering
.filter(r => r["icon"] !== undefined || r["label"] !== undefined)
.filter(r => r["location"] !== undefined)
.map((r, i) => new PointRenderingConfig(<PointRenderingConfigJson>r, context + ".mapRendering[" + i + "]"))
this.lineRendering = json.mapRendering
.filter(r => r["icon"] === undefined && r["label"] === undefined)
.filter(r => r["location"] === undefined)
.map((r, i) => new LineRenderingConfig(<LineRenderingConfigJson>r, context + ".mapRendering[" + i + "]"))

4
Models/ThemeConfig/PointRenderingConfig.ts
View file

@ -39,6 +39,10 @@ export default class PointRenderingConfig extends WithContextLoader {
throw `A point rendering has an invalid location: '${l}' is not one of ${Array.from(allowed).join(", ")} (at ${context}.location)`
}
})
if(json.icon === undefined && json.label === undefined){
throw `A point rendering should define at least an icon or a label`
}
if(this.location.size == 0){
throw "A pointRendering should have at least one 'location' to defined where it should be rendered. (At "+context+".location)"