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

Studio: some more tweaks

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-10-30 14:32:31 +01:00
parent 69a7c9efa3
commit d749b5c68f
8 changed files with 577 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/Models/ThemeConfig/Conversion/Validation.ts
View file

@ -186,7 +186,7 @@ export class ValidateTheme extends DesugaringStep<LayoutConfigJson> {
for (const remoteImage of remoteImages) {
context.err(
"Found a remote image: " +
remoteImage +
remoteImage.path +
" in theme " +
json.id +
", please download it."
@ -899,9 +899,6 @@ export class ValidateLayer extends Conversion<
)
}
if (context.hasErrors()) {
return undefined
}
let layerConfig: LayerConfig
try {
layerConfig = new LayerConfig(json, "validation", true)
@ -1105,11 +1102,21 @@ export class ValidateLayer extends Conversion<
).convert(json, context)
}
{
json.pointRendering?.forEach((pointRendering, index) => {
pointRendering?.marker?.forEach((icon, indexM) => {
if (json.pointRendering !== null) {
if (!Array.isArray(json.pointRendering)) {
throw (
"pointRendering in " +
json.id +
" is not iterable, it is: " +
typeof json.pointRendering
)
}
for (const pointRendering of json.pointRendering) {
const index = json.pointRendering.indexOf(pointRendering)
for (const icon of pointRendering?.marker) {
const indexM = pointRendering?.marker.indexOf(icon)
if (!icon.icon) {
return
continue
}
if (icon.icon["condition"]) {
context
@ -1125,8 +1132,8 @@ export class ValidateLayer extends Conversion<
"Don't set a condition in a marker as this will result in an invisible but clickable element. Use extra filters in the source instead."
)
}
})
})
}
}
}
if (json.presets !== undefined) {