Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix(studio): add check for incorrect suggestions, fix incorrect suggestion which breaks setting a 'marker'

Browse source
This commit is contained in:
Pieter Vander Vennet 2025-01-19 22:45:03 +01:00
parent 3bfdc1838c
commit 143dd70973
2 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scripts/fixSchemas.ts
View file

@ -208,13 +208,27 @@ function extractHintsFrom(
validators: Validators,
Constants: Constants,
})
if (hints["suggestions"]?.indexOf(null) >= 0) {
const evaluatedSuggestions = hints["suggestions"]
if (evaluatedSuggestions?.indexOf(null) >= 0) {
throw (
"A suggestion generated 'null' for " +
path.join(".") +
". Check the docstring, specifically 'suggestions'. Pay attention to double commas"
)
}
console.log(evaluatedSuggestions)
for (const hintElement of evaluatedSuggestions ?? []) {
if (typeof hintElement === "string") {
throw (
"A suggestion generated a string for " +
path.join(".") +
". Remember that you should use {'if': 'value=[actual_value]', 'then': '[some explanation]'}"
)
}
}
}
return hints
}

7
src/Models/ThemeConfig/Json/PointRenderingConfigJson.ts
View file

@ -13,14 +13,15 @@ export interface IconConfigJson {
*
*
* types: <span class="text-lg font-bold">Use a different icon depending on the value of some attributes</span> ; icon
* suggestions: return [ "nsi_brand.icon", "nsi_operator.icon", "id_presets.shop_rendering", ...Constants.defaultPinIcons.map(i => ({if: "value="+i, then: i, icon: i}))]
* suggestions: return [ {"if":"value=nsi_brand.icon", "then": "Use icons for brand from the Name Suggestion Index"}, {"if":"value=nsi_operator.icon", "then": "Use icons for operator from the Name Suggestion Index"}, {"if":"value=id_presets.shop_rendering", "then": "Use shop preset icons from iD"}, ...Constants.defaultPinIcons.map(i => ({if: "value="+i, then: i, icon: i}))]
*/
icon: string | MinimalTagRenderingConfigJson | { builtin: string; override: any }
/**
* question: What colour should the icon be?
* This will only work for the default icons such as `pin`,`circle`,...
* types: <span class="text-lg font-bold">Use a different color depending on the value of some attributes</span> ; color
*
* This will only work for the default icons such as `pin`,`circle`,...
*
* types: <span class="text-lg font-bold">Use a different color depending on the value of some attributes</span> ; color
*/
color?: string | MinimalTagRenderingConfigJson | { builtin: string; override: any }
}