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

Studio: UX work

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-11-05 12:05:00 +01:00
parent bf4f7d3f88
commit 8685ec8ccc
45 changed files with 532 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -733,11 +733,12 @@ class MiscTagRenderingChecks extends DesugaringStep<TagRenderingConfigJson> {
context.enters("mappings", i).err("No `if` is defined")
}
const en = mapping?.then?.["en"]
if (en && en.toLowerCase().match(/(yes|no)([ ,:;.?]|$)/)) {
if (en && this.detectYesOrNo(en)) {
console.log("Found a match with yes or no: ", { en })
context
.enters("mappings", i, "then")
.warn(
"A mapping should not start with 'yes' or 'no'. If the attribute is known, it will only show 'yes' or 'no' <i>without</i> the question, resulting in a weird popup"
"A mapping should not start with 'yes' or 'no'. If the attribute is known, it will only show 'yes' or 'no' <i>without</i> the question, resulting in a weird phrasing in the information box"
)
}
}
@ -854,6 +855,17 @@ class MiscTagRenderingChecks extends DesugaringStep<TagRenderingConfigJson> {
return json
}
/**
* const obj = new MiscTagRenderingChecks()
* obj.detectYesOrNo("Yes, this place has") // => true
* obj.detectYesOrNo("Yes") // => true
* obj.detectYesOrNo("No, this place does not have...") // => true
* obj.detectYesOrNo("This place does not have...") // => false
*/
private detectYesOrNo(en: string): boolean {
return en.toLowerCase().match(/^(yes|no)([,:;.?]|$)/) !== null
}
}
export class ValidateTagRenderings extends Fuse<TagRenderingConfigJson> {
@ -1014,10 +1026,11 @@ export class PrevalidateLayer extends DesugaringStep<LayerConfigJson> {
}
{
// duplicate ids in tagrenderings check
const duplicates = Utils.Dedup(
const duplicates = Utils.NoNull(
Utils.Duplicates(Utils.NoNull((json.tagRenderings ?? []).map((tr) => tr["id"])))
)
if (duplicates.length > 0) {
// It is tempting to add an index to this warning; however, due to labels the indices here might be different from the index in the tagRendering list
context
.enter("tagRenderings")
.err("Some tagrenderings have a duplicate id: " + duplicates.join(", "))

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

@ -89,7 +89,7 @@ export default interface PointRenderingConfigJson {
* For example: `&LT;div style="background: white">{name}&LT;/div>`
*
* If the icon is undefined, then the label is shown in the center of the feature.
* types: Dynamic value | string
* types: Dynamic value based on the attributes ; string
* inline: Always show label <b>{value}</b> beneath the marker
* ifunset: Do not show a label beneath the marker
*/

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

@ -85,7 +85,7 @@ export interface TagRenderingConfigJson {
/**
*
* question: When should this item be shown?
*
* type: tag
* Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.
*
* This is useful to ask a follow-up question.
@ -126,9 +126,8 @@ export interface TagRenderingConfigJson {
* */
condition?: TagConfigJson
/**
*
* question: When should this item be shown (including special conditions)?
/** question: When should this item be shown (including special conditions)?
* type: tag
*
* If set, this tag will be evaluated agains the _usersettings/application state_ table.
* Enable 'show debug info' in user settings to see available options.