Fix rendering of multianswers without explicit 'render'-field

Customizations/JSON/TagRenderingConfig.ts

@@ -21,7 +21,7 @@ export default class TagRenderingConfig {
         addExtraTags: TagsFilter[];
     };
 
-    multiAnswer: boolean;
+    readonly multiAnswer: boolean;
 
     mappings?: {
         if: TagsFilter,
@@ -111,6 +111,7 @@ export default class TagRenderingConfig {
             }
         }
 
+
         if (this.freeform?.key === undefined) {
             return this.render;
         }

Logic/MetaTagging.ts

@@ -101,6 +101,14 @@ export default class MetaTagging {
                     // AUtomatically triggered on the next change
                     const updateTags = () => {
                         const oldValueIsOpen = tags["_isOpen"];
+                        const oldNextChange =tags["_isOpen:nextTrigger"] ?? 0;
+
+                        if(oldNextChange > (new Date()).getTime() && 
+                        tags["_isOpen:oldvalue"] === tags["opening_hours"]){
+                            // Already calculated and should not yet be triggered
+                            return;
+                        }
+                        
                         tags["_isOpen"] = oh.getState() ? "yes" : "no";
                         const comment = oh.getComment();
                         if (comment) {
@@ -113,9 +121,15 @@ export default class MetaTagging {
 
                         const nextChange = oh.getNextChange();
                         if (nextChange !== undefined) {
+                            const timeout = nextChange.getTime() - (new Date()).getTime();
+                            tags["_isOpen:nextTrigger"] = nextChange.getTime();
+                            tags["_isOpen:oldvalue"] = tags.opening_hours
                             window.setTimeout(
-                                updateTags,
+                                () => {
-                                (nextChange.getTime() - (new Date()).getTime())
+                                    console.log("Updating the _isOpen tag for ", tags.id);
+                                    updateTags();
+                                },
+                                timeout
                            )
                         }
                     }

Logic/Tags.ts

@@ -2,8 +2,11 @@ import {Utils} from "../Utils";
 
 export abstract class TagsFilter {
     abstract matches(tags: { k: string, v: string }[]): boolean
+
     abstract asOverpass(): string[]
+
     abstract substituteValues(tags: any): TagsFilter;
+
     abstract isUsableAsAnswer(): boolean;
 
     abstract isEquivalent(other: TagsFilter): boolean;
@@ -28,13 +31,6 @@ export class RegexTag extends TagsFilter {
         this.invert = invert;
     }
 
-    asOverpass(): string[] {
-        if (typeof this.key === "string") {
-            return [`['${this.key}'${this.invert ? "!" : ""}~'${RegexTag.source(this.value)}']`];
-        }
-        return [`[~'${this.key.source}'${this.invert ? "!" : ""}~'${RegexTag.source(this.value)}']`];
-    }
-
     private static doesMatch(fromTag: string, possibleRegex: string | RegExp): boolean {
         if (typeof possibleRegex === "string") {
             return fromTag === possibleRegex;
@@ -49,6 +45,13 @@ export class RegexTag extends TagsFilter {
         return r.source;
     }
 
+    asOverpass(): string[] {
+        if (typeof this.key === "string") {
+            return [`['${this.key}'${this.invert ? "!" : ""}~'${RegexTag.source(this.value)}']`];
+        }
+        return [`[~'${this.key.source}'${this.invert ? "!" : ""}~'${RegexTag.source(this.value)}']`];
+    }
+
     isUsableAsAnswer(): boolean {
         return false;
     }
@@ -236,6 +239,14 @@ export class And extends TagsFilter {
         this.and = and;
     }
 
+    private static combine(filter: string, choices: string[]): string[] {
+        const values = [];
+        for (const or of choices) {
+            values.push(filter + or);
+        }
+        return values;
+    }
+
     matches(tags: { k: string; v: string }[]): boolean {
         for (const tagsFilter of this.and) {
             if (!tagsFilter.matches(tags)) {
@@ -246,14 +257,6 @@ export class And extends TagsFilter {
         return true;
     }
 
-    private static combine(filter: string, choices: string[]): string[] {
-        const values = [];
-        for (const or of choices) {
-            values.push(filter + or);
-        }
-        return values;
-    }
-
     asOverpass(): string[] {
         let allChoices: string[] = null;
         for (const andElement of this.and) {
@@ -343,7 +346,6 @@ export class And extends TagsFilter {
 }
 
 
-
 export class TagUtils {
     static proprtiesToKV(properties: any): { k: string, v: string }[] {
         const result = [];
@@ -425,6 +427,7 @@ export class TagUtils {
         }
         return keyValues;
     }
+
     /**
      * Given multiple tagsfilters which can be used as answer, will take the tags with the same keys together as set.
      * E.g:
@@ -449,4 +452,21 @@ export class TagUtils {
         return new And(and);
     }
 
+    static MatchesMultiAnswer(tag: TagsFilter, tags: any): boolean {
+        const splitted = TagUtils.SplitKeys([tag]);
+        console.log("Matching multianswer", tag, tags)
+        for (const splitKey in splitted) {
+            const neededValues = splitted[splitKey];
+            const actualValue = tags[splitKey].split(";");
+            for (const neededValue of neededValues) {
+                console.log("needed", neededValue, "have: ", actualValue, actualValue.indexOf(neededValue) )
+                if (actualValue.indexOf(neededValue) < 0) {
+                    console.log("NOT FOUND")
+                    return false;
+                }
+            }
+        }
+        console.log("OK")
+        return true;
+    }
 }

Models/Constants.ts

@@ -1,7 +1,7 @@
 import { Utils } from "../Utils";
 
 export default class Constants {
-    public static vNumber = "0.3.0a";
+    public static vNumber = "0.3.0c";
 
     // The user journey states thresholds when a new feature gets unlocked
     public static userJourney = {

UI/BigComponents/MoreScreen.ts

@@ -40,15 +40,22 @@ export default class MoreScreen extends UIElement {
         }
 
         const currentLocation = State.state.locationControl.data;
+        let path = window.location.pathname;
+        // Path starts with a '/' and contains everything, e.g. '/dir/dir/page.html'
+        path = path.substr(0, path.lastIndexOf("/"));
+        // Path will now contain '/dir/dir', or empty string in case of nothing
+        if(path === ""){
+            path = "."
+        }
         let linkText =
-            `./${layout.id.toLowerCase()}.html?z=${currentLocation.zoom}&lat=${currentLocation.lat}&lon=${currentLocation.lon}`
+            `${path}/${layout.id.toLowerCase()}?z=${currentLocation.zoom}&lat=${currentLocation.lat}&lon=${currentLocation.lon}`
 
         if (location.hostname === "localhost" || location.hostname === "127.0.0.1") {
-            linkText = `./index.html?layout=${layout.id}&z=${currentLocation.zoom}&lat=${currentLocation.lat}&lon=${currentLocation.lon}`
+            linkText = `${path}/index.html?layout=${layout.id}&z=${currentLocation.zoom}&lat=${currentLocation.lat}&lon=${currentLocation.lon}`
         }
 
         if (customThemeDefinition) {
-            linkText = `./index.html?userlayout=${layout.id}&z=${currentLocation.zoom}&lat=${currentLocation.lat}&lon=${currentLocation.lon}#${customThemeDefinition}`
+            linkText = `${path}/?userlayout=${layout.id}&z=${currentLocation.zoom}&lat=${currentLocation.lat}&lon=${currentLocation.lon}#${customThemeDefinition}`
 
         }
 

UI/BigComponents/ShareScreen.ts

@@ -147,13 +147,15 @@ export default class ShareScreen extends UIElement {
         const url = (currentLocation ?? new UIEventSource(undefined)).map(() => {
 
             const host = window.location.host;
-            let literalText = `https://${host}/${layout.id.toLowerCase()}.html`
+            let path = window.location.pathname;
+            path = path.substr(0, path.lastIndexOf("/"));
+            let literalText = `https://${host}${path}/${layout.id.toLowerCase()}`
 
             const parts = Utils.NoEmpty(Utils.NoNull(optionParts.map((eventSource) => eventSource.data)));
 
             let hash = "";
             if (layoutDefinition !== undefined) {
-                literalText = `https://${host}/index.html`
+                literalText = `https://${host}${path}/`
                 if (layout.id.startsWith("wiki:")) {
                     parts.push("userlayout=" + encodeURIComponent(layout.id))
                 } else {

UI/OpeningHours/OhVisualization.ts

@@ -196,7 +196,7 @@ export default class OpeningHoursVisualization extends UIElement {
             // Closed!
             const opensAtDate = oh.getNextChange();
             if(opensAtDate === undefined){
-                const comm = oh.getComment();
+                const comm = oh.getComment() ?? oh.getUnknown();
                 if(comm !== undefined){
                     return new FixedUiElement(comm).SetClass("ohviz-closed").Render();
                 }

UI/Popup/EditableTagRendering.ts

@@ -7,6 +7,7 @@ import Combine from "../Base/Combine";
 import TagRenderingAnswer from "./TagRenderingAnswer";
 import State from "../../State";
 import Svg from "../../Svg";
+import {TagUtils} from "../../Logic/Tags";
 
 export default class EditableTagRendering extends UIElement {
     private readonly _tags: UIEventSource<any>;
@@ -45,6 +46,29 @@ export default class EditableTagRendering extends UIElement {
         }
     }
 
+    InnerRender(): string {
+        if (!this._configuration?.condition?.matchesProperties(this._tags.data)) {
+            return "";
+        }
+        if (this._editMode.data) {
+            return this._question.Render();
+        }
+        if (this._configuration.multiAnswer) {
+            const atLeastOneMatch = this._configuration.mappings.some(mp =>TagUtils.MatchesMultiAnswer(mp.if, this._tags.data));
+            console.log("SOME MATCH?", atLeastOneMatch)
+            if (!atLeastOneMatch) {
+                return "";
+            }
+        } else if (this._configuration.GetRenderValue(this._tags.data) === undefined) {
+            return "";
+        }
+
+        return new Combine([this._answer,
+            (State.state?.osmConnection?.userDetails?.data?.loggedIn ?? true) ? this._editButton : undefined
+        ]).SetClass("answer")
+            .Render();
+    }
+
     private GenerateQuestion() {
         const self = this;
         if (this._configuration.question !== undefined) {
@@ -64,25 +88,4 @@ export default class EditableTagRendering extends UIElement {
         }
     }
 
-
-    InnerRender(): string {
-
-        if (this._editMode.data) {
-            return this._question.Render();
-        }
-        
-        if(this._configuration.GetRenderValue(this._tags.data)=== undefined){
-            return "";
-        }
-        
-        if(!this._configuration?.condition?.matchesProperties(this._tags.data)){
-            return "";
-        }
-
-        return new Combine([this._answer,
-            (State.state?.osmConnection?.userDetails?.data?.loggedIn ?? true) ? this._editButton : undefined
-        ]).SetClass("answer")
-            .Render();
-    }
-
 }

UI/Popup/QuestionBox.ts

@@ -3,6 +3,7 @@ import {UIEventSource} from "../../Logic/UIEventSource";
 import TagRenderingConfig from "../../Customizations/JSON/TagRenderingConfig";
 import TagRenderingQuestion from "./TagRenderingQuestion";
 import Translations from "../i18n/Translations";
+import {TagUtils} from "../../Logic/Tags";
 
 
 /**
@@ -46,20 +47,39 @@ export default class QuestionBox extends UIElement {
             })
     }
 
-    InnerRender(): string {
+    /**
-        for (let i = 0; i < this._tagRenderingQuestions.length; i++) {
+     * Returns true if it is known or not shown, false if the question should be asked
-            let tagRendering = this._tagRenderings[i];
+     * @constructor
+     */
+    IsKnown(tagRendering: TagRenderingConfig): boolean {
         if (tagRendering.condition &&
             !tagRendering.condition.matchesProperties(this._tags.data)) {
             // Filtered away by the condition
-                continue;
+            return true;
+        }
+        if(tagRendering.multiAnswer){
+            for (const m of tagRendering.mappings) {
+                if(TagUtils.MatchesMultiAnswer(m.if, this._tags.data)){
+                    return true;
+                }
+            }
         }
         
         if (tagRendering.GetRenderValue(this._tags.data) !== undefined) {
-                // This value is known
+            // This value is known and can be rendered
-                continue;
+            return true;
         }
         
+        return false;
+    }
+
+    InnerRender(): string {
+        for (let i = 0; i < this._tagRenderingQuestions.length; i++) {
+            let tagRendering = this._tagRenderings[i];
+      
+            if(this.IsKnown(tagRendering)){
+                continue;
+            }
 
             if (this._skippedQuestions.data.indexOf(i) >= 0) {
                 continue;

UI/Popup/TagRenderingAnswer.ts

@@ -2,6 +2,9 @@ import {UIEventSource} from "../../Logic/UIEventSource";
 import TagRenderingConfig from "../../Customizations/JSON/TagRenderingConfig";
 import {UIElement} from "../UIElement";
 import {SubstitutedTranslation} from "../SpecialVisualizations";
+import {Utils} from "../../Utils";
+import Combine from "../Base/Combine";
+import {TagUtils} from "../../Logic/Tags";
 
 /***
  * Displays the correct value for a known tagrendering
@@ -32,12 +35,38 @@ export default class TagRenderingAnswer extends UIElement {
             return "";
         }
         const tr = this._configuration.GetRenderValue(tags);
-        if (tr === undefined) {
+        if (tr !== undefined) {
-            return "";
-        }
-        // Bit of a hack; remember that the fields are updated
             this._content = new SubstitutedTranslation(tr, this._tags);
             return this._content.Render();
         }
 
+        // The render value doesn't work well with multi-answers (checkboxes), so we have to check for them manually
+        if (this._configuration.multiAnswer) {
+            const applicableThens = Utils.NoNull(this._configuration.mappings.map(mapping => {
+                if (mapping.if === undefined) {
+                    return mapping.then;
+                }
+                if (TagUtils.MatchesMultiAnswer(mapping.if, tags)) {
+                    return mapping.then;
+                }
+                return undefined;
+            }))
+            if (applicableThens.length >= 0) {
+                if (applicableThens.length === 1) {
+                    this._content = applicableThens[0];
+                } else {
+                    this._content = new Combine(["<ul>",
+                        ...applicableThens.map(tr => new Combine(["<li>", tr, "</li>"]))
+                        ,
+                        "</ul>"
+                    ])
+
+                }
+                return this._content.Render();
+            }
+        }
+        return "";
+
+    }
+
 }

UI/Popup/TagRenderingQuestion.ts

@@ -53,7 +53,9 @@ export default class TagRenderingQuestion extends UIElement {
         this._inputElement = this.GenerateInputElement()
         const self = this;
         const save = () => {
+            console.log("Save clicked!")
             const selection = self._inputElement.GetValue().data;
+            console.log("Selection is", selection)
             if (selection) {
                 (State.state?.changes ?? new Changes())
                     .addTag(tags.data.id, selection, tags);