Merge master branch

Customizations/JSON/TagRenderingConfigJson.ts

@@ -1,11 +1,15 @@
 import {AndOrTagConfigJson} from "./TagConfigJson";
 
+/**
+ * A TagRenderingConfigJson is a single piece of code which converts one ore more tags into a HTML-snippet.
+ * If the desired tags are missing and a question is defined, a question will be shown instead.
+ */
 export interface TagRenderingConfigJson {
     /**
      * Renders this value. Note that "{key}"-parts are substituted by the corresponding values of the element.
      * If neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.
      * 
-     * Note that this is a HTML-interpreted value, so you can add links as e.g. <a href='{website}'>{website}</a>
+     * Note that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`
      */
     render?: string | any,
 
@@ -139,4 +143,4 @@ export interface TagRenderingConfigJson {
      * However, it will _only_ be shown if it matches the overpass-tags of the layer it was originally defined in.
      */
     roaming?: boolean
-}
+}

Models/Constants.ts

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

assets/themes/aed/aed.json

@@ -125,7 +125,12 @@
             "nl": "Toegankelijkheid is {access}",
             "de": "Zugang ist {access}"
           },
-          "condition": "indoor=yes",
+          "condition": {
+            "or": [
+              "indoor=yes",
+              "access~*"
+            ]
+          },
           "freeform": {
             "key": "access",
             "addExtraTags": [
@@ -209,7 +214,10 @@
           }
         },
         {
-          "render": "{defibrillator:location}",
+          "render": {
+            "nl": "<i>Meer informatie over de locatie:</i><br/>{defibrillator:location}",
+            "en": "<i>Extra information about the location:</i><br/>{defibrillator:location}"
+          },
           "question": {
             "en": "Please give some explanation on where the defibrillator can be found",
             "ca": "Dóna detalls d'on es pot trobar el desfibril·lador",

assets/themes/fritures/fritures.json

@@ -223,7 +223,9 @@
               }
             }
           ]
-        }
+        },
+        "questions",
+        "reviews"
       ],
       "icon": {
         "render": "./assets/themes/fritures/fries.svg"
@@ -253,4 +255,4 @@
     }
   ],
   "roamingRenderings": []
-}
+}