From 3cada0b678804f199eca25f0657a47d0fa8f2e1a Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Sun, 5 Dec 2021 21:02:55 +0100 Subject: [PATCH] Layer reformatting/translation generation --- assets/layers/address/address.json | 4 +- assets/layers/entrance/entrance.json | 9 +- .../information_board/information_board.json | 2 +- assets/themes/climbing/climbing.json | 2 +- assets/themes/entrances/entrances.json | 14 +- assets/themes/grb_import/grb.json | 3 +- langs/layers/en.json | 122 ++++++++++++++++++ langs/layers/nl.json | 21 +++ langs/themes/en.json | 5 + 9 files changed, 167 insertions(+), 15 deletions(-) diff --git a/assets/layers/address/address.json b/assets/layers/address/address.json index b4d99a7551..216c5eda4d 100644 --- a/assets/layers/address/address.json +++ b/assets/layers/address/address.json @@ -127,7 +127,6 @@ "iconSize": "50,50,center", "icon": { "render": "./assets/layers/address/housenumber_blank.svg", - "mappings": [ { "if": { @@ -146,7 +145,8 @@ ] }, "location": [ - "point","centroid" + "point", + "centroid" ] }, { diff --git a/assets/layers/entrance/entrance.json b/assets/layers/entrance/entrance.json index cb5e84b96f..f90b730ecb 100644 --- a/assets/layers/entrance/entrance.json +++ b/assets/layers/entrance/entrance.json @@ -215,7 +215,8 @@ "then": { "en": "This door revolves automatically all the time" } - },{ + }, + { "if": "automatic_door=serviced_on_button_press", "then": { "en": "This door will be opened by staff when requested by pressing a buttonLength overview{histogram(_length_hist)}", "fr": "

Résumé de longueur

{histogram(_length_hist)}", - "de": "

Längenübersicht

{histogram(_length_hist)}", + "de": "

Längenübersicht

{histogramm(_length_hist)}", "it": "

Riassunto della lunghezza

{histogram(_length_hist)}" }, "condition": "_length_hist!~\\[\\]", diff --git a/assets/themes/entrances/entrances.json b/assets/themes/entrances/entrances.json index 4b5d9a7946..50d6192246 100644 --- a/assets/themes/entrances/entrances.json +++ b/assets/themes/entrances/entrances.json @@ -1,22 +1,24 @@ { "id": "entrances", "title": { - "en":"Entrances" + "en": "Entrances" }, "icon": "./assets/layers/entrance/door.svg", "description": { - "en":"A map showing all entrances, which surveys for important aspects for wheelchair users" + "en": "A map showing all entrances, which surveys for important aspects for wheelchair users" }, - "shortDescription": {"en": - "Survey entrances to help wheelchair routing" + "shortDescription": { + "en": "Survey entrances to help wheelchair routing" }, - "language": ["en"], + "language": [ + "en" + ], "version": "2021-12-04", "maintainer": "MapComplete", "layers": [ "entrance" ], "startZoom": 15, - "startLat": 51.0490, + "startLat": 51.049, "startLon": 3.7297 } \ No newline at end of file diff --git a/assets/themes/grb_import/grb.json b/assets/themes/grb_import/grb.json index 65d91d1192..5fe50df31f 100644 --- a/assets/themes/grb_import/grb.json +++ b/assets/themes/grb_import/grb.json @@ -51,7 +51,6 @@ "passAllFeatures": true } }, - { "id": "OSM-buildings", "name": "All OSM-buildings", @@ -291,7 +290,7 @@ ], "#": "Pass all the features in order to render the address in the layer below", "passAllFeatures": true - }, + }, "address", { "id": "All OSM objects", diff --git a/langs/layers/en.json b/langs/layers/en.json index 181f64a723..0c6bf383fd 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -238,6 +238,7 @@ } }, "bench": { + "description": "A bench is a wooden, metal, stone, ... surface where a human can sit. This layers visualises them and asks a few questions about them.", "name": "Benches", "presets": { "0": { @@ -328,6 +329,7 @@ } }, "bench_at_pt": { + "description": "A layer showing all public-transport-stops which do have a bench", "name": "Benches at public transport stops", "tagRenderings": { "bench_at_pt-bench_type": { @@ -406,6 +408,7 @@ } }, "bicycle_tube_vending_machine": { + "description": "A layer showing vending machines for bicycle tubes (either purpose-built bicycle tube vending machines or classical vending machines with bicycle tubes and optionally additional bicycle related objects such as lights, gloves, locks, ...)", "name": "Bicycle tube vending machine", "presets": { "0": { @@ -434,6 +437,7 @@ } }, "bike_cafe": { + "description": "A bike café is a café geared towards cyclists, for example with services such as a pump, with lots of bicycle-related decoration, ...", "name": "Bike cafe", "presets": { "0": { @@ -501,6 +505,7 @@ } }, "bike_cleaning": { + "description": "A layer showing facilities where one can clean their bike", "name": "Bike cleaning service", "presets": { "0": { @@ -549,6 +554,7 @@ } }, "bike_parking": { + "description": "A layer showing where you can park your bike", "name": "Bike parking", "presets": { "0": { @@ -660,6 +666,7 @@ } }, "bike_repair_station": { + "description": "A layer showing bicycle pumps and bicycle repair tool stands", "name": "Bike stations (repair, pump or both)", "presets": { "0": { @@ -951,6 +958,7 @@ } }, "bike_themed_object": { + "description": "A layer with bike-themed objects but who don't match any other layer", "name": "Bike related object", "title": { "mappings": { @@ -1001,6 +1009,7 @@ } }, "cafe_pub": { + "description": "A layer showing cafés and pubs where one can gather around a drink. The layer asks for some relevant questions", "filter": { "0": { "options": { @@ -2168,6 +2177,7 @@ } }, "cycleways_and_roads": { + "description": "All infrastructure that someone can cycle over, accompanied with questions about this infrastructure\"", "name": "Cycleways and roads", "tagRenderings": { "Cycleway type for a road": { @@ -2550,6 +2560,7 @@ } }, "defibrillator": { + "description": "A layer showing defibrillators which can be used in case of emergency. This contains public defibrillators, but also defibrillators which might need staff to fetch the actual device", "name": "Defibrillators", "presets": { "0": { @@ -2681,6 +2692,7 @@ "name": "Direction visualization" }, "drinking_water": { + "description": "A layer showing drinking water fountains", "name": "Drinking water", "presets": { "0": { @@ -2722,6 +2734,102 @@ "render": "Drinking water" } }, + "entrance": { + "description": "A layer showing entrances and offering capabilities to survey some advanced data which is important for e.g. wheelchair users (but also bicycle users, people who want to deliver, ...)", + "name": "Entrance", + "tagRenderings": { + "Door_type": { + "mappings": { + "0": { + "then": "The door type is not known" + }, + "1": { + "then": "A classical, hinged door supported by joints" + }, + "2": { + "then": "A revolving door which hangs on a central shaft, rotating within a cylindrical enclosure" + }, + "3": { + "then": "A door which rolls from overhead, typically seen for garages" + }, + "4": { + "then": "This is an entrance without a physical door" + } + }, + "question": "What is the type of this door?
Wether or not the door is automated is asked in the next question" + }, + "Entrance type": { + "mappings": { + "0": { + "then": "No specific entrance type is known" + }, + "1": { + "then": "This is an indoor door, separating a room or a corridor within a single building" + }, + "2": { + "then": "This is the main entrance" + }, + "3": { + "then": "This is a secondary entrance" + }, + "4": { + "then": "This is a service entrance - normally only used for employees, delivery, ..." + }, + "5": { + "then": "This is an exit where one can not enter" + }, + "6": { + "then": "This is an entrance where one can only enter (but not exit)" + }, + "7": { + "then": "This is emergency exit" + }, + "8": { + "then": "This is the entrance to a private home" + } + }, + "question": "What type of entrance is this?" + }, + "automatic_door": { + "mappings": { + "0": { + "then": "This is an automatic door" + }, + "1": { + "then": "This door is not automated" + }, + "2": { + "then": "This door will open automatically when motion is detected" + }, + "3": { + "then": "This door will open automatically when a sensor in the floor is triggered" + }, + "4": { + "then": "This door will open automatically when a button is pressed" + }, + "5": { + "then": "This door revolves automatically all the time, but has a button to slow it down, e.g. for wheelchair users" + }, + "6": { + "then": "This door revolves automatically all the time" + }, + "7": { + "then": "This door will be opened by staff when requested by pressing a button
You can help contribute too!Zoom in enough and all streets will show up. You can click one and a Wikidata-search box will popup. With a few clicks, you can add an etymology link. Note that you need a free OpenStreetMap account to do this.", "layers": {