Merge branch 'develop' into feature/conflation-fix

Logic/Tags/And.ts

@@ -59,7 +59,7 @@ export class And extends TagsFilter {
     }
 
     asHumanString(linkToWiki: boolean, shorten: boolean, properties) {
-        return this.and.map(t => t.asHumanString(linkToWiki, shorten, properties)).join("&");
+        return this.and.map(t => t.asHumanString(linkToWiki, shorten, properties)).filter(x => x !== "").join("&");
     }
 
     isUsableAsAnswer(): boolean {

Logic/Tags/Tag.ts

@@ -48,7 +48,7 @@ export class Tag extends TagsFilter {
         }
         if(v === "" || v === undefined){
             // This tag will be removed if in the properties, so we indicate this with special rendering
-            if(currentProperties !== undefined && (currentProperties[this.key] ?? "") !== ""){
+            if(currentProperties !== undefined && (currentProperties[this.key] ?? "") === ""){
                 // This tag is not present in the current properties, so this tag doesn't change anything
                 return ""
             }

Logic/UIEventSource.ts

@@ -281,10 +281,12 @@ export class UIEventSource<T> {
      * @param f: The transforming function
      * @param extraSources: also trigger the update if one of these sources change
      * @param g: a 'backfunction to let the sync run in two directions. (data of the new UIEVEntSource, currentData) => newData
+     * @param allowUnregister: if set, the update will be halted if no listeners are registered
      */
     public map<J>(f: ((t: T) => J),
                   extraSources: UIEventSource<any>[] = [],
-                  g: ((j: J, t: T) => T) = undefined): UIEventSource<J> {
+                  g: ((j: J, t: T) => T) = undefined,
+                  allowUnregister = false): UIEventSource<J> {
         const self = this;
 
         const stack = new Error().stack.split("\n");
@@ -297,6 +299,7 @@ export class UIEventSource<T> {
 
         const update = function () {
             newSource.setData(f(self.data));
+            return allowUnregister && newSource._callbacks.length === 0
         }
 
         this.addCallback(update);

UI/Input/ValidatedTextField.ts

@@ -406,9 +406,17 @@ export default class ValidatedTextField {
                 if (str === undefined) {
                     return false;
                 }
+                if(str.startsWith("tel:")){
+                    str = str.substring("tel:".length)
+                }
                 return parsePhoneNumberFromString(str, (country())?.toUpperCase() as any)?.isValid() ?? false
             },
-            (str, country: () => string) => parsePhoneNumberFromString(str, (country())?.toUpperCase() as any).formatInternational(),
+            (str, country: () => string) => {
+                if(str.startsWith("tel:")){
+                    str = str.substring("tel:".length)
+                }
+                return parsePhoneNumberFromString(str, (country())?.toUpperCase() as any).formatInternational();
+            },
             undefined,
             "tel"
         ),

UI/ShowDataLayer/ShowDataLayer.ts

@@ -145,7 +145,8 @@ export default class ShowDataLayer {
             pointToLayer: (feature, latLng) => self.pointToLayer(feature, latLng),
             onEachFeature: (feature, leafletLayer) => self.postProcessFeature(feature, leafletLayer)
         });
-
+        
+        const selfLayer = this.geoLayer;
         const allFeats = this._features.features.data;
         for (const feat of allFeats) {
             if (feat === undefined) {
@@ -153,12 +154,11 @@ export default class ShowDataLayer {
             }
             try {
                 if (feat.geometry.type === "LineString") {
-                    const self = this;
                     const coords = L.GeoJSON.coordsToLatLngs(feat.geometry.coordinates)
                     const tagsSource = this.allElements?.addOrGetElement(feat) ?? new UIEventSource<any>(feat.properties);
                     let offsettedLine;
                     tagsSource
-                        .map(tags => this._layerToShow.lineRendering[feat.lineRenderingIndex].GenerateLeafletStyle(tags))
+                        .map(tags => this._layerToShow.lineRendering[feat.lineRenderingIndex].GenerateLeafletStyle(tags), [], undefined, true)
                         .withEqualityStabilized((a, b) => {
                             if (a === b) {
                                 return true
@@ -176,6 +176,9 @@ export default class ShowDataLayer {
                             offsettedLine = L.polyline(coords, lineStyle);
                             this.postProcessFeature(feat, offsettedLine)
                             offsettedLine.addTo(this.geoLayer)
+                            
+                            // If 'self.geoLayer' is not the same as the layer the feature is added to, we can safely remove this callback
+                            return self.geoLayer !== selfLayer
                         })
                 } else {
                     this.geoLayer.addData(feat);
@@ -186,11 +189,13 @@ export default class ShowDataLayer {
         }
 
         if (options.zoomToFeatures ?? false) {
-            try {
+            if(this.geoLayer.getLayers().length > 0){
-                const bounds = this.geoLayer.getBounds()
+                try {
-                mp.fitBounds(bounds, {animate: false})
+                    const bounds = this.geoLayer.getBounds()
-            } catch (e) {
+                    mp.fitBounds(bounds, {animate: false})
-                console.debug("Invalid bounds", e)
+                } catch (e) {
+                    console.debug("Invalid bounds", e)
+                }
             }
         }
 

assets/tagRenderings/questions.json

@@ -71,9 +71,17 @@
       "ca": "Quin és el telèfon de {name}?"
     },
     "render": "<a href='tel:{phone}'>{phone}</a>",
+    "mappings": [
+      {
+        "if": "contact:phone~*",
+        "then": "<a href='tel:{contact:phone}'>{contact:phone}</a>",
+        "hideInAnswer": true
+      }
+    ],
     "freeform": {
       "key": "phone",
-      "type": "phone"
+      "type": "phone",
+      "addExtraTags": ["contact:phone="]
     }
   },
   "osmlink": {
@@ -140,9 +148,17 @@
       "hu": "Mi a(z) {name} e-mail címe?",
       "ca": "Quina és l'adreça de correu electrònic de {name}?"
     },
+    "mappings": [
+      {
+        "if": "contact:email~*",
+        "then": "<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>",
+        "hideInAnswer": true
+      }
+    ],
     "freeform": {
       "key": "email",
-      "type": "email"
+      "type": "email",
+      "addExtraTags": ["contact:email="]
     }
   },
   "website": {
@@ -168,8 +184,16 @@
     "render": "<a href='{website}' target='_blank'>{website}</a>",
     "freeform": {
       "key": "website",
-      "type": "url"
+      "type": "url",
-    }
+      "addExtraTags": ["contact:website="]
+    },
+    "mappings": [
+      {
+        "if": "contact:website~*",
+        "then": "<a href='{contact:website}' target='_blank'>{contact:website}</a>",
+        "hideInAnswer": true
+      }
+    ]
   },
   "wheelchair-access": {
     "question": {