diff --git a/assets/layers/cafe_pub/cafe_pub.json b/assets/layers/cafe_pub/cafe_pub.json index 5a5ff2c9f..81d4e389b 100644 --- a/assets/layers/cafe_pub/cafe_pub.json +++ b/assets/layers/cafe_pub/cafe_pub.json @@ -156,6 +156,7 @@ }, "tagRenderings": [ "images", + "level", { "question": { "nl": "Wat is de naam van dit café?", diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json index b31655b9b..795e06d65 100644 --- a/assets/layers/drinking_water/drinking_water.json +++ b/assets/layers/drinking_water/drinking_water.json @@ -32,10 +32,10 @@ "osmTags": { "and": [ { - "or": [ - "amenity=drinking_water", - "drinking_water=yes" - ] + "or": [ + "amenity=drinking_water", + "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" } -} +} \ No newline at end of file diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index 1fd53a87f..dc8f6a069 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -15,6 +15,7 @@ }, "tagRenderings": [ "images", + "multilevels", { "id": "operational_status", "question": { @@ -156,4 +157,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/assets/layers/entrance/entrance.json b/assets/layers/entrance/entrance.json index 207279ad6..c67484449 100644 --- a/assets/layers/entrance/entrance.json +++ b/assets/layers/entrance/entrance.json @@ -34,6 +34,7 @@ }, "tagRenderings": [ "images", + "level", { "id": "Entrance type", "question": { diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index 107503c96..2c140544a 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -137,6 +137,7 @@ }, "tagRenderings": [ "images", + "level", { "question": { "nl": "Wat is de naam van deze eetgelegenheid?", diff --git a/assets/layers/id_presets/id_presets.json b/assets/layers/id_presets/id_presets.json index acff2db91..caf39d97a 100644 --- a/assets/layers/id_presets/id_presets.json +++ b/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." + "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." }, "#dont-translate": "*", "source": { diff --git a/assets/layers/parking/parking.json b/assets/layers/parking/parking.json index 86e254224..5591d03dd 100644 --- a/assets/layers/parking/parking.json +++ b/assets/layers/parking/parking.json @@ -27,6 +27,7 @@ }, "tagRenderings": [ "images", + "level", { "id": "parking-type", "mappings": [ diff --git a/assets/layers/picnic_table/picnic_table.json b/assets/layers/picnic_table/picnic_table.json index e5199956d..a38221f38 100644 --- a/assets/layers/picnic_table/picnic_table.json +++ b/assets/layers/picnic_table/picnic_table.json @@ -37,6 +37,7 @@ }, "tagRenderings": [ "images", + "level", { "question": { "en": "What material is this picnic table made of?", diff --git a/assets/layers/reception_desk/reception_desk.json b/assets/layers/reception_desk/reception_desk.json index 7139bce67..1f1e7b3e7 100644 --- a/assets/layers/reception_desk/reception_desk.json +++ b/assets/layers/reception_desk/reception_desk.json @@ -26,6 +26,7 @@ ], "tagRenderings": [ "images", + "level", { "id": "desk-height", "question": { diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json index 341fd4c0d..161e13435 100644 --- a/assets/layers/shops/shops.json +++ b/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", diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json index 28b42e3b8..7149ba143 100644 --- a/assets/layers/toilet/toilet.json +++ b/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~*", diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json index 883448921..a8a15fd85 100644 --- a/assets/tagRenderings/questions.json +++ b/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?", diff --git a/assets/themes/governments/governments.json b/assets/themes/governments/governments.json index 405aea0c1..0ba98a85f 100644 --- a/assets/themes/governments/governments.json +++ b/assets/themes/governments/governments.json @@ -1,20 +1,20 @@ { - "id": "governments", - "title": { - "en": "Governmental Offices" - }, - "description": { - "en": "On this map, Governmental offices are shown and can be easily added" - }, - "maintainer": "MapComplete", - "icon": "./assets/themes/onwheels/crest.svg", - "version": "0", - "startLat": 50.8465573, - "defaultBackgroundId": "CartoDB.Voyager", - "startLon": 4.351697, - "startZoom": 16, - "widenFactor": 2, - "layers": [ - "governments" - ] + "id": "governments", + "title": { + "en": "Governmental Offices" + }, + "description": { + "en": "On this map, Governmental offices are shown and can be easily added" + }, + "maintainer": "MapComplete", + "icon": "./assets/themes/onwheels/crest.svg", + "version": "0", + "startLat": 50.8465573, + "defaultBackgroundId": "CartoDB.Voyager", + "startLon": 4.351697, + "startZoom": 16, + "widenFactor": 2, + "layers": [ + "governments" + ] } \ No newline at end of file diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json index e656cff77..a878c3362 100644 --- a/assets/themes/onwheels/onwheels.json +++ b/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": "This door has a width of {canonical(_poi_entrance:width)} meters", - "nl": "Deze deur heeft een breedte van {canonical(_poi_entrance:width)} meter", - "de": "Diese Tür hat eine Durchgangsbreite von {canonical(_poi_entrance:width)} Meter", - "es": "Esta puerta tiene una ancho de {canonical(_poi_entrance:width)} metros" + "en": "This door has a width of {canonical(_poi_entrance:width)} meter", + "nl": "Deze deur heeft een breedte van {canonical(_poi_entrance:width)} meter", + "de": "Diese Tür hat eine Durchgangsbreite von {canonical(_poi_entrance:width)} Meter", + "es": "Esta puerta tiene una ancho de {canonical(_poi_entrance:width)} metros" }, "freeform": { "key": "_poi_entrance:width", diff --git a/assets/themes/sidewalks/sidewalks.json b/assets/themes/sidewalks/sidewalks.json index 4658be54f..fcdf9349a 100644 --- a/assets/themes/sidewalks/sidewalks.json +++ b/assets/themes/sidewalks/sidewalks.json @@ -228,4 +228,4 @@ "allowSplit": true } ] -} +} \ No newline at end of file