midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change to groups and exposure of groups, add sticky header to first group item, fix shared questions

Browse source
This commit is contained in:
pietervdvn 2021-10-23 00:31:41 +02:00
parent ff0ee35ec1
commit 688b991677
8 changed files with 101 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -196,9 +196,15 @@ export interface LayerConfigJson {
*
* A special value is 'questions', which indicates the location of the questions box. If not specified, it'll be appended to the bottom of the featureInfobox.
*
* At last, one can define a group of renderings where parts of all strings will be replaced by multiple other strings.
* This is mainly create questions for a 'left' and a 'right' side of the road.
* These will be grouped and questions will be asked together
*/
tagRenderings?: (string | {builtin: string, override: any} | TagRenderingConfigJson | {
leftRightKeys: string[],
rewrite: {
sourceString: string,
into: string[]
}[],
renderings: (string | {builtin: string, override: any} | TagRenderingConfigJson)[]
}) [],

6
Models/ThemeConfig/Json/TagRenderingConfigJson.ts
View file

@ -13,8 +13,8 @@ export interface TagRenderingConfigJson {
id?: string,
/**
* Optional: this can group questions together in one question box.
* Written by 'left-right'-keys automatically
* If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.
* The first tagRendering of a group will always be a sticky element.
*/
group?: string
@ -173,7 +173,5 @@ export interface TagRenderingConfigJson {
* If this is important to your usecase, consider using multiple radiobutton-fields without `multiAnswer`
*/
ifnot?: AndOrTagConfigJson | string
}[]
}

69
Models/ThemeConfig/LayerConfig.ts
View file

@ -207,7 +207,7 @@ export default class LayerConfig extends WithContextLoader {
this.tagRenderings = this.ExtractLayerTagRenderings(json)
const missingIds = json.tagRenderings?.filter(tr => typeof tr !== "string" && tr["builtin"] === undefined && tr["id"] === undefined && tr["leftRightKeys"] === undefined) ?? [];
const missingIds = json.tagRenderings?.filter(tr => typeof tr !== "string" && tr["builtin"] === undefined && tr["id"] === undefined && tr["rewrite"] === undefined) ?? [];
if (missingIds.length > 0 && official) {
console.error("Some tagRenderings of", this.id, "are missing an id:", missingIds)
@ -277,39 +277,41 @@ export default class LayerConfig extends WithContextLoader {
}
const normalTagRenderings: (string | { builtin: string, override: any } | TagRenderingConfigJson)[] = []
const leftRightRenderings: ({ leftRightKeys: string[], renderings: (string | { builtin: string, override: any } | TagRenderingConfigJson)[] })[] = []
const renderingsToRewrite: ({ rewrite:{
sourceString: string,
into: string[]
}, renderings: (string | { builtin: string, override: any } | TagRenderingConfigJson)[] })[] = []
for (let i = 0; i < json.tagRenderings.length; i++) {
const tr = json.tagRenderings[i];
const lrkDefined = tr["leftRightKeys"] !== undefined
const rewriteDefined = tr["rewrite"] !== undefined
const renderingsDefined = tr["renderings"]
if (!lrkDefined && !renderingsDefined) {
if (!rewriteDefined && !renderingsDefined) {
// @ts-ignore
normalTagRenderings.push(tr)
continue
}
if (lrkDefined && renderingsDefined) {
if (rewriteDefined && renderingsDefined) {
// @ts-ignore
leftRightRenderings.push(tr)
renderingsToRewrite.push(tr)
continue
}
throw `Error in ${this._context}.tagrenderings[${i}]: got a value which defines either \`leftRightKeys\` or \`renderings\`, but not both. Either define both or move the \`renderings\` out of this scope`
throw `Error in ${this._context}.tagrenderings[${i}]: got a value which defines either \`rewrite\` or \`renderings\`, but not both. Either define both or move the \`renderings\` out of this scope`
}
const allRenderings = this.ParseTagRenderings(normalTagRenderings, false);
if(leftRightRenderings.length === 0){
if(renderingsToRewrite.length === 0){
return allRenderings
}
const leftRenderings : TagRenderingConfig[] = []
const rightRenderings : TagRenderingConfig[] = []
function prepConfig(target:string, tr: TagRenderingConfigJson){
function prepConfig(keyToRewrite: string, target:string, tr: TagRenderingConfigJson){
function replaceRecursive(transl: string | any){
if(typeof transl === "string"){
return transl.replace("left|right", target)
return transl.replace(keyToRewrite, target)
}
if(transl.map !== undefined){
return transl.map(o => replaceRecursive(o))
@ -329,32 +331,33 @@ export default class LayerConfig extends WithContextLoader {
return tr
}
const rewriteGroups: Map<string, TagRenderingConfig[]> = new Map<string, TagRenderingConfig[]>()
for (const rewriteGroup of renderingsToRewrite) {
for (const leftRightRendering of leftRightRenderings) {
const keysToRewrite = leftRightRendering.leftRightKeys
const tagRenderings = leftRightRendering.renderings
const left = this.ParseTagRenderings(tagRenderings, false, tr => prepConfig("left", tr))
const right = this.ParseTagRenderings(tagRenderings, false, tr => prepConfig("right", tr))
leftRenderings.push(...left)
rightRenderings.push(...right)
const tagRenderings = rewriteGroup.renderings
const textToReplace = rewriteGroup.rewrite.sourceString
const targets = rewriteGroup.rewrite.into
for (const target of targets) {
const parsedRenderings = this.ParseTagRenderings(tagRenderings, false, tr => prepConfig(textToReplace, target, tr))
if(!rewriteGroups.has(target)){
rewriteGroups.set(target, [])
}
rewriteGroups.get(target).push(... parsedRenderings)
}
}
leftRenderings.push(new TagRenderingConfig(<TagRenderingConfigJson>{
id: "questions",
group:"left",
}, "layerConfig.ts.leftQuestionBox"))
rightRenderings.push(new TagRenderingConfig(<TagRenderingConfigJson>{
id: "questions",
group:"right",
}, "layerConfig.ts.rightQuestionBox"))
rewriteGroups.forEach((group, groupName) => {
group.push(new TagRenderingConfig({
id:"questions",
group:groupName
}))
})
allRenderings.push(...leftRenderings)
allRenderings.push(...rightRenderings)
rewriteGroups.forEach(group => {
allRenderings.push(...group)
})
return allRenderings;

9
Models/ThemeConfig/WithContextLoader.ts
View file

@ -47,7 +47,7 @@ export default class WithContextLoader {
tagRenderings?: (string | { builtin: string, override: any } | TagRenderingConfigJson)[],
readOnly = false,
prepConfig: ((config: TagRenderingConfigJson) => TagRenderingConfigJson) = undefined
) {
) : TagRenderingConfig[]{
if (tagRenderings === undefined) {
return [];
}
@ -77,18 +77,17 @@ export default class WithContextLoader {
continue;
}
if (renderingJson["override"] !== undefined) {
let sharedJson = SharedTagRenderings.SharedTagRenderingJson.get(renderingId)
if (sharedJson === undefined) {
const keys = Array.from(SharedTagRenderings.SharedTagRenderingJson.keys());
throw `Predefined tagRendering ${renderingId} not found in ${context}.\n Try one of ${keys.join(
", "
)}\n If you intent to output this text literally, use {\"render\": <your text>} instead"}`;
}
renderingJson = Utils.Merge(renderingJson["override"], sharedJson)
if (renderingJson["override"] !== undefined) {
sharedJson = Utils.Merge(renderingJson["override"], sharedJson)
}
renderingJson = sharedJson
}

1
UI/Input/LengthInput.ts
View file

@ -45,6 +45,7 @@ export default class LengthInput extends InputElement<string> {
background: this.background,
allowMoving: false,
location: this._location,
attribution:true,
leafletOptions: {
tap: true
}

1
UI/Popup/EditableTagRendering.ts
View file

@ -71,7 +71,6 @@ export default class EditableTagRendering extends Toggle {
editMode
)
}
rendering.SetClass("block w-full break-word text-default m-1 p-1 border-b border-gray-200 mb-2 pb-2")
return rendering;
}

44
UI/Popup/FeatureInfoBox.ts
View file

@ -5,7 +5,6 @@ import Combine from "../Base/Combine";
import TagRenderingAnswer from "./TagRenderingAnswer";
import State from "../../State";
import ScrollableFullScreen from "../Base/ScrollableFullScreen";
import {Tag} from "../../Logic/Tags/Tag";
import Constants from "../../Models/Constants";
import SharedTagRenderings from "../../Customizations/SharedTagRenderings";
import BaseUIElement from "../BaseUIElement";
@ -18,7 +17,6 @@ import {Translation} from "../i18n/Translation";
import {Utils} from "../../Utils";
import {SubstitutedTranslation} from "../SubstitutedTranslation";
import MoveWizard from "./MoveWizard";
import {FixedUiElement} from "../Base/FixedUiElement";
export default class FeatureInfoBox extends ScrollableFullScreen {
@ -55,8 +53,8 @@ export default class FeatureInfoBox extends ScrollableFullScreen {
layerConfig: LayerConfig): BaseUIElement {
let questionBoxes: Map<string, BaseUIElement> = new Map<string, BaseUIElement>();
if (State.state.featureSwitchUserbadge.data) {
const allGroupNames = Utils.Dedup(layerConfig.tagRenderings.map(tr => tr.group))
if (State.state.featureSwitchUserbadge.data) {
for (const groupName of allGroupNames) {
const questions = layerConfig.tagRenderings.filter(tr => tr.group === groupName)
const questionBox = new QuestionBox(tags, questions, layerConfig.units);
@ -65,23 +63,45 @@ export default class FeatureInfoBox extends ScrollableFullScreen {
}
}
const renderings: BaseUIElement[] = layerConfig.tagRenderings.map(tr => {
const allRenderings = []
for (let i = 0; i < allGroupNames.length; i++) {
const groupName = allGroupNames[i];
const trs = layerConfig.tagRenderings.filter(tr => tr.group === groupName)
const renderingsForGroup: BaseUIElement[] = []
for (const tr of trs) {
if (tr.question === null || tr.id === "questions") {
console.log("Rendering is", tr)
// This is a question box!
const questionBox = questionBoxes.get(tr.group)
questionBoxes.delete(tr.group)
return questionBox;
renderingsForGroup.push(questionBox)
} else {
const etr = new EditableTagRendering(tags, tr, layerConfig.units).SetClass("editable-tag-rendering")
renderingsForGroup.push(etr)
}
return new EditableTagRendering(tags, tr, layerConfig.units);
});
}
let j = 0
if (i !== 0) {
renderingsForGroup[0]?.SetStyle("position: sticky; top: -5px")
j = 1
}
for (/* j = 0 or 1 */; j < renderingsForGroup.length; j++) {
renderingsForGroup[j].SetClass("block w-full break-word text-default m-1 p-1 border-b border-gray-200 mb-2 pb-2")
}
allRenderings.push(...renderingsForGroup)
}
let editElements: BaseUIElement[] = []
questionBoxes.forEach(questionBox => {
editElements.push(questionBox);
})
if(layerConfig.allowMove) {
if (layerConfig.allowMove) {
editElements.push(
new VariableUiElement(tags.map(tags => tags.id).map(id => {
const feature = State.state.allElements.ContainingFeatures.get(id)
@ -115,7 +135,7 @@ export default class FeatureInfoBox extends ScrollableFullScreen {
const hasMinimap = layerConfig.tagRenderings.some(tr => FeatureInfoBox.hasMinimap(tr))
if (!hasMinimap) {
renderings.push(new TagRenderingAnswer(tags, SharedTagRenderings.SharedTagRendering.get("minimap")))
allRenderings.push(new TagRenderingAnswer(tags, SharedTagRenderings.SharedTagRendering.get("minimap")))
}
editElements.push(
@ -155,9 +175,9 @@ export default class FeatureInfoBox extends ScrollableFullScreen {
return new Combine(editElements).SetClass("flex flex-col")
}
))
renderings.push(editors)
allRenderings.push(editors)
return new Combine(renderings).SetClass("block")
return new Combine(allRenderings).SetClass("block")
}

5
assets/themes/sidewalks/sidewalks.json
View file

@ -54,7 +54,10 @@
},
{
"leftRightKeys": "sidewalk:left|right",
"rewrite": {
"sourceString": "left|right",
"into": ["left","right"]
},
"renderings": [
{
"id": "sidewalk_minimap",