fixed more small things

assets/layers/cafe_pub/cafe_pub.json

@@ -156,6 +156,7 @@
   },
   "tagRenderings": [
     "images",
+    "level",
     {
       "question": {
         "nl": "Wat is de naam van dit café?",

assets/layers/drinking_water/drinking_water.json

@@ -32,10 +32,10 @@
     "osmTags": {
       "and": [
         {
-		    "or": [
+          "or": [
-			    "amenity=drinking_water",
+            "amenity=drinking_water",
-			    "drinking_water=yes"
+            "drinking_water=yes"
-		      ]
+          ]
         },
         "man_made!=reservoir_covered",
         "access!=permissive",
@@ -258,4 +258,4 @@
     "es": "Una capa que muestra fuentes de agua potable",
     "fr": "Une couche montrant les fontaines d'eau potable"
   }
-}
+}

assets/layers/elevator/elevator.json

@@ -15,6 +15,7 @@
   },
   "tagRenderings": [
     "images",
+    "multilevels",
     {
       "id": "operational_status",
       "question": {
@@ -156,4 +157,4 @@
       ]
     }
   ]
-}
+}

assets/layers/entrance/entrance.json

@@ -34,6 +34,7 @@
   },
   "tagRenderings": [
     "images",
+    "level",
     {
       "id": "Entrance type",
       "question": {

assets/layers/food/food.json

@@ -137,6 +137,7 @@
   },
   "tagRenderings": [
     "images",
+    "level",
     {
       "question": {
         "nl": "Wat is de naam van deze eetgelegenheid?",

assets/layers/id_presets/id_presets.json

@@ -1,7 +1,7 @@
 {
   "id": "id_presets",
   "description": {
-    "en":    "Layer containing various presets and questions generated by ID. These are meant to be reused in other layers by importing the tagRenderings with `id_preset.<tagrendering>"
+    "en": "Layer containing various presets and questions generated by ID. These are meant to be reused in other layers by importing the tagRenderings with `id_preset.<tagrendering>"
   },
   "#dont-translate": "*",
   "source": {

assets/layers/parking/parking.json

@@ -27,6 +27,7 @@
   },
   "tagRenderings": [
     "images",
+    "level",
     {
       "id": "parking-type",
       "mappings": [

assets/layers/picnic_table/picnic_table.json

@@ -37,6 +37,7 @@
   },
   "tagRenderings": [
     "images",
+    "level",
     {
       "question": {
         "en": "What material is this picnic table made of?",

assets/layers/reception_desk/reception_desk.json

@@ -26,6 +26,7 @@
   ],
   "tagRenderings": [
     "images",
+    "level",
     {
       "id": "desk-height",
       "question": {

assets/layers/shops/shops.json

@@ -83,6 +83,7 @@
   },
   "tagRenderings": [
     "images",
+    "level",
     {
       "question": {
         "en": "What is the name of this shop?",
@@ -97,7 +98,14 @@
       "freeform": {
         "key": "name"
       },
-      "id": "shops-name"
+      "id": "shops-name",
+      "en": {
+        "question": "What kind of shop is this?",
+        "render": "This is a {shop}"
+      },
+      "nl": {
+        "question": "Wat voor soort winkel is dit?"
+      }
     },
     {
       "builtin": "id_presets.shop_types",

assets/layers/toilet/toilet.json

@@ -65,6 +65,7 @@
   ],
   "tagRenderings": [
     "images",
+    "level",
     {
       "question": {
         "en": "Are these toilets publicly accessible?",
@@ -526,7 +527,6 @@
         ]
       }
     },
-    "level",
     "description"
   ],
   "filter": [
@@ -541,7 +541,10 @@
             "es": "Accesible con sillas de ruedas"
           },
           "osmTags": {
-            "or": ["wheelchair=yes", "wheelchair=designated"]
+            "or": [
+              "wheelchair=yes",
+              "wheelchair=designated"
+            ]
           }
         }
       ]
@@ -619,7 +622,10 @@
         "mappings": [
           {
             "if": {
-              "or": ["wheelchair=yes", "wheelchair=designated"]
+              "or": [
+                "wheelchair=yes",
+                "wheelchair=designated"
+              ]
             },
             "then": "circle:white;./assets/layers/toilet/wheelchair.svg"
           },
@@ -634,7 +640,6 @@
           }
         ]
       },
-      
       "iconBadges": [
         {
           "if": "opening_hours~*",

assets/tagRenderings/questions.json

@@ -100,7 +100,6 @@
   },
   "reviews": {
     "description": "Shows the reviews module (including the possibility to leave a review)",
-
     "render": "{reviews()}"
   },
   "minimap": {
@@ -867,6 +866,22 @@
     "description": "Shows a table with all the tags of the feature",
     "render": "{all_tags()}"
   },
+  "multilevels": {
+    "builtin": "level",
+    "override": {
+      "question": {
+        "en": "What levels does this elevator go to?"
+      },
+      "render": {
+        "en": "This elevator goes to floors {multilevels}"
+      },
+      "freeform": {
+        "key": "level",
+        "type": "string"
+      },
+      "multiAnswer" : true
+    }
+  },
   "level": {
     "question": {
       "nl": "Op welke verdieping bevindt dit punt zich?",

assets/themes/governments/governments.json

@@ -1,20 +1,20 @@
 {
-    "id": "governments",
+  "id": "governments",
-    "title": {
+  "title": {
-        "en": "Governmental Offices"
+    "en": "Governmental Offices"
-    },
+  },
-    "description": {
+  "description": {
-        "en": "On this map, Governmental offices are shown and can be easily added"
+    "en": "On this map, Governmental offices are shown and can be easily added"
-    },
+  },
-    "maintainer": "MapComplete",
+  "maintainer": "MapComplete",
-    "icon": "./assets/themes/onwheels/crest.svg",
+  "icon": "./assets/themes/onwheels/crest.svg",
-    "version": "0",
+  "version": "0",
-    "startLat": 50.8465573,
+  "startLat": 50.8465573,
-    "defaultBackgroundId": "CartoDB.Voyager",
+  "defaultBackgroundId": "CartoDB.Voyager",
-    "startLon": 4.351697,
+  "startLon": 4.351697,
-    "startZoom": 16,
+  "startZoom": 16,
-    "widenFactor": 2,
+  "widenFactor": 2,
-    "layers": [
+  "layers": [
-        "governments"
+    "governments"
-    ]
+  ]
 }

assets/themes/onwheels/onwheels.json

@@ -4,7 +4,7 @@
     "en": "OnWheels"
   },
   "description": {
-    "en": "On this map, publicly wheelchair accessible places are shown and can be easily added"
+    "en": "On this map, publicly weelchair accessible places are shown and can be easily added"
   },
   "maintainer": "MapComplete",
   "icon": "./assets/themes/onwheels/crest.svg",
@@ -14,7 +14,7 @@
   "startLon": 4.351697,
   "startZoom": 16,
   "widenFactor": 2,
-  "hideFromOverview": true,
+  "hideFromOverview": false,
   "layers": [
     {
       "builtin": "bike_repair_station",
@@ -226,10 +226,10 @@
           ]
         },
         "render": {
-          "en": "<a href='#{_poi_entrance:id}'>This door has a width of {canonical(_poi_entrance:width)} meters</a>",
+          "en": "This door has a width of {canonical(_poi_entrance:width)} meter",
-          "nl": "<a href='#{_poi_entrance:id}'>Deze deur heeft een breedte van {canonical(_poi_entrance:width)} meter</a>",
+          "nl": "Deze deur heeft een breedte van {canonical(_poi_entrance:width)} meter",
-          "de": "<a href='#{_poi_entrance:id}'>Diese Tür hat eine Durchgangsbreite von {canonical(_poi_entrance:width)} Meter</a>",
+          "de": "Diese Tür hat eine Durchgangsbreite von {canonical(_poi_entrance:width)} Meter",
-          "es": "<a href='#{_poi_entrance:id}'>Esta puerta tiene una ancho de {canonical(_poi_entrance:width)} metros</a>"
+          "es": "Esta puerta tiene una ancho de {canonical(_poi_entrance:width)} metros"
         },
         "freeform": {
           "key": "_poi_entrance:width",

assets/themes/sidewalks/sidewalks.json

@@ -228,4 +228,4 @@
       "allowSplit": true
     }
   ]
-}
+}