From 99ba26e3a273968fb00f2f0a2da73abf53fffc4f Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 8 Nov 2022 14:37:31 +0100 Subject: [PATCH] Housekeeping... --- Docs/BuiltinIndex.md | 36 ++-- Docs/Layers/bike_cafe.md | 36 +++- Docs/Layers/bike_repair_station.md | 6 +- Docs/Layers/charging_station.md | 4 +- Docs/Layers/charging_station_ebikes.md | 4 +- Docs/Layers/defibrillator.md | 4 +- Docs/Layers/hackerspace.md | 6 +- Docs/Layers/parcel_lockers.md | 9 +- Docs/Layers/recycling.md | 6 +- Docs/Layers/stairs.md | 14 +- Docs/TagInfo/mapcomplete_blind_osm.json | 16 ++ Docs/TagInfo/mapcomplete_cyclofix.json | 14 +- Docs/TagInfo/mapcomplete_hackerspaces.json | 2 +- Docs/TagInfo/mapcomplete_personal.json | 39 +++- Docs/TagInfo/mapcomplete_postboxes.json | 5 + Docs/TagInfo/mapcomplete_waste.json | 2 +- Logic/ElementStorage.ts | 6 +- Logic/GeoOperations.ts | 4 +- assets/contributors.json | 12 +- .../layers/bicycle_rental/bicycle_rental.json | 18 +- assets/layers/bike_cafe/bike_cafe.json | 3 +- .../bike_repair_station.json | 50 +++-- .../charging_station/charging_station.json | 7 +- assets/layers/crossings/crossings.json | 2 +- .../layers/defibrillator/defibrillator.json | 2 +- assets/layers/elevator/elevator.json | 11 +- assets/layers/hackerspace/hackerspace.json | 2 +- .../osm_community_index.json | 9 +- .../layers/parcel_lockers/parcel_lockers.json | 2 +- assets/layers/pharmacy/pharmacy.json | 2 +- assets/layers/recycling/recycling.json | 2 +- assets/layers/school/school.json | 6 +- assets/layers/stairs/stairs.json | 23 ++- .../walls_and_buildings.json | 3 +- assets/translators.json | 16 +- langs/cs.json | 68 +++---- langs/layers/ca.json | 9 +- langs/layers/cs.json | 174 ++++++++---------- langs/layers/da.json | 12 +- langs/layers/de.json | 58 ++++-- langs/layers/en.json | 37 +++- langs/layers/es.json | 22 ++- langs/layers/fr.json | 17 +- langs/layers/gl.json | 2 +- langs/layers/it.json | 22 ++- langs/layers/nl.json | 94 +++++++--- langs/layers/pt.json | 7 +- langs/layers/pt_BR.json | 7 +- langs/layers/ru.json | 17 +- langs/layers/sl.json | 7 +- langs/layers/zh_Hans.json | 7 +- langs/layers/zh_Hant.json | 12 +- langs/pt_BR.json | 4 +- 53 files changed, 638 insertions(+), 321 deletions(-) diff --git a/Docs/BuiltinIndex.md b/Docs/BuiltinIndex.md index 126d5c980..1937b344b 100644 --- a/Docs/BuiltinIndex.md +++ b/Docs/BuiltinIndex.md @@ -18,6 +18,7 @@ + [description](#description) + [payment-options](#payment-options) + [payment-options-advanced](#payment-options-advanced) + + [opening_hours_24_7](#opening_hours_24_7) + [level](#level) + [bicycle_rental.*bicycle_rental](#bicycle_rental*bicycle_rental) + [bike_cleaning.bike_cleaning-service:bicycle:cleaning:charge](#bike_cleaningbike_cleaning-service:bicycle:cleaning:charge) @@ -48,7 +49,6 @@ + [id_presets.shop_types](#id_presetsshop_types) + [school.capacity](#schoolcapacity) + [school.gender](#schoolgender) - + [opening_hours_24_7](#opening_hours_24_7) + [toilet.toilets-type](#toilettoilets-type) + [toilet.toilets-changing-table](#toilettoilets-changing-table) + [toilet.toilet-changing_table:location](#toilettoilet-changing_table:location) @@ -132,6 +132,7 @@ - slow_roads - sport_pitch - sports_centre + - stairs - street_lamps - surveillance_camera - toilet @@ -169,6 +170,7 @@ - bicycle_library - bicycle_rental + - bike_cafe - bike_shop - bike_themed_object - cafe_pub @@ -204,6 +206,7 @@ - bicycle_library - bicycle_rental + - bike_cafe - bike_shop - bike_themed_object - cafe_pub @@ -236,6 +239,7 @@ - bicycle_library - bicycle_rental + - bike_cafe - bike_shop - bike_themed_object - cafe_pub @@ -267,6 +271,7 @@ - bicycle_library - bicycle_rental + - bike_cafe - bike_shop - bike_themed_object - cafe_pub @@ -277,7 +282,6 @@ - fitness_station - food - kindergarten_childcare - - parcel_lockers - pharmacy - postoffices - shops @@ -332,6 +336,23 @@ +### opening_hours_24_7 + + + + + + - bike_repair_station + - charging_station + - defibrillator + - hackerspace + - parcel_lockers + - recycling + - toilet + + + + ### level @@ -706,17 +727,6 @@ -### opening_hours_24_7 - - - - - - - toilet - - - - ### toilet.toilets-type diff --git a/Docs/Layers/bike_cafe.md b/Docs/Layers/bike_cafe.md index 2a4cee15d..f6720174b 100644 --- a/Docs/Layers/bike_cafe.md +++ b/Docs/Layers/bike_cafe.md @@ -65,7 +65,7 @@ attribute | type | values which are supported by this layer [](https://taginfo.openstreetmap.org/keys/service:bicycle:pump#values) [service:bicycle:pump](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:pump) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dno) [](https://taginfo.openstreetmap.org/keys/service:bicycle:diy#values) [service:bicycle:diy](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:diy) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Dno) [](https://taginfo.openstreetmap.org/keys/service:bicycle:repair#values) [service:bicycle:repair](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:repair) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dno) -[](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [string](../SpecialInputElements.md#string) | +[](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | [](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | [](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | [](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | @@ -147,11 +147,11 @@ The question is Does this bike cafe repair bikes? -### bike_cafe-website +### website -The question is What is the website of {name}? +The question is What is the website of {title()}? This rendering asks information about the property [website](https://wiki.openstreetmap.org/wiki/Key:website) @@ -161,11 +161,17 @@ This is rendered with {website} -### bike_cafe-phone + - {contact:website} corresponds with `contact:website~.+` + - This option cannot be chosen as answer -The question is What is the phone number of {name}? + +### phone + + + +The question is What is the phone number of {title()}? This rendering asks information about the property [phone](https://wiki.openstreetmap.org/wiki/Key:phone) @@ -175,11 +181,17 @@ This is rendered with {phone} -### bike_cafe-email + - {contact:phone} corresponds with `contact:phone~.+` + - This option cannot be chosen as answer -The question is What is the email address of {name}? + +### email + + + +The question is What is the email address of {title()}? This rendering asks information about the property [email](https://wiki.openstreetmap.org/wiki/Key:email) @@ -189,7 +201,13 @@ This is rendered with {email} -### bike_cafe-opening_hours + - {contact:email} corresponds with `contact:email~.+` + - This option cannot be chosen as answer + + + + +### opening_hours @@ -197,7 +215,7 @@ The question is When it this bike café opened? This rendering asks information about the property [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) -This is rendered with {opening_hours_table(opening_hours)} +This is rendered with

Opening hours

{opening_hours_table(opening_hours)} diff --git a/Docs/Layers/bike_repair_station.md b/Docs/Layers/bike_repair_station.md index ad209255f..4cbe8cfa5 100644 --- a/Docs/Layers/bike_repair_station.md +++ b/Docs/Layers/bike_repair_station.md @@ -124,7 +124,7 @@ Only visible if `service:bicycle:pump=yes` is shown -### bike_repair_station-opening_hours +### opening_hours_24_7 @@ -132,13 +132,13 @@ The question is When is this bicycle repair point open? This rendering asks information about the property [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) -This is rendered with {opening_hours_table()} +This is rendered with

Opening hours

{opening_hours_table(opening_hours)} - - Always open corresponds with `opening_hours=24/7` + - 24/7 opened (including holidays) corresponds with `opening_hours=24/7` diff --git a/Docs/Layers/charging_station.md b/Docs/Layers/charging_station.md index 0ed7013ce..1ff47b5e8 100644 --- a/Docs/Layers/charging_station.md +++ b/Docs/Layers/charging_station.md @@ -1690,7 +1690,7 @@ This tagrendering is part of group `technical` -### OH +### opening_hours_24_7 @@ -1698,7 +1698,7 @@ The question is When is this charging station opened? This rendering asks information about the property [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) -This is rendered with {opening_hours_table(opening_hours)} +This is rendered with

Opening hours

{opening_hours_table(opening_hours)} diff --git a/Docs/Layers/charging_station_ebikes.md b/Docs/Layers/charging_station_ebikes.md index 8f66c8d8c..e2cc0a5bc 100644 --- a/Docs/Layers/charging_station_ebikes.md +++ b/Docs/Layers/charging_station_ebikes.md @@ -1689,7 +1689,7 @@ This tagrendering is part of group `technical` -### OH +### opening_hours_24_7 @@ -1697,7 +1697,7 @@ The question is When is this charging station opened? This rendering asks information about the property [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) -This is rendered with {opening_hours_table(opening_hours)} +This is rendered with

Opening hours

{opening_hours_table(opening_hours)} diff --git a/Docs/Layers/defibrillator.md b/Docs/Layers/defibrillator.md index 69da616ab..1a99e1fa7 100644 --- a/Docs/Layers/defibrillator.md +++ b/Docs/Layers/defibrillator.md @@ -278,7 +278,7 @@ This is rendered with Telephone for questions about this defibrillator: Opening hours{opening_hours_table(opening_hours)} diff --git a/Docs/Layers/hackerspace.md b/Docs/Layers/hackerspace.md index 268813eb1..cb94f19e7 100644 --- a/Docs/Layers/hackerspace.md +++ b/Docs/Layers/hackerspace.md @@ -178,7 +178,7 @@ This is rendered with {phone} -### hackerspaces-opening_hours +### opening_hours_24_7 @@ -186,13 +186,13 @@ The question is When is this hackerspace opened? This rendering asks information about the property [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) -This is rendered with {opening_hours_table()} +This is rendered with

Opening hours

{opening_hours_table(opening_hours)} - - Opened 24/7 corresponds with `opening_hours=24/7` + - 24/7 opened (including holidays) corresponds with `opening_hours=24/7` diff --git a/Docs/Layers/parcel_lockers.md b/Docs/Layers/parcel_lockers.md index 6903717bc..2aeda32ae 100644 --- a/Docs/Layers/parcel_lockers.md +++ b/Docs/Layers/parcel_lockers.md @@ -62,7 +62,7 @@ attribute | type | values which are supported by this layer ----------- | ------ | ------------------------------------------ [](https://taginfo.openstreetmap.org/keys/brand#values) [brand](https://wiki.openstreetmap.org/wiki/Key:brand) | [string](../SpecialInputElements.md#string) | [Amazon Locker](https://wiki.openstreetmap.org/wiki/Tag:brand%3DAmazon Locker) [DHL Packstation](https://wiki.openstreetmap.org/wiki/Tag:brand%3DDHL Packstation) [Pickup Station](https://wiki.openstreetmap.org/wiki/Tag:brand%3DPickup Station) [PostNL](https://wiki.openstreetmap.org/wiki/Tag:brand%3DPostNL) [](https://taginfo.openstreetmap.org/keys/operator#values) [operator](https://wiki.openstreetmap.org/wiki/Key:operator) | [string](../SpecialInputElements.md#string) | -[](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | +[](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [24/7](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D24/7) [](https://taginfo.openstreetmap.org/keys/ref#values) [ref](https://wiki.openstreetmap.org/wiki/Key:ref) | [string](../SpecialInputElements.md#string) | [](https://taginfo.openstreetmap.org/keys/parcel_mail_in#values) [parcel_mail_in](https://wiki.openstreetmap.org/wiki/Key:parcel_mail_in) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:parcel_mail_in%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:parcel_mail_in%3Dno) [](https://taginfo.openstreetmap.org/keys/parcel_pickup#values) [parcel_pickup](https://wiki.openstreetmap.org/wiki/Key:parcel_pickup) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:parcel_pickup%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:parcel_pickup%3Dno) @@ -118,7 +118,7 @@ This is rendered with This parcel locker is operated by {operator} -### opening_hours +### opening_hours_24_7 @@ -132,6 +132,11 @@ This is rendered with

Opening hours

{opening_hours_table(opening_hours) + - 24/7 opened (including holidays) corresponds with `opening_hours=24/7` + + + + ### ref diff --git a/Docs/Layers/recycling.md b/Docs/Layers/recycling.md index 1c65674e7..6722a51c3 100644 --- a/Docs/Layers/recycling.md +++ b/Docs/Layers/recycling.md @@ -278,7 +278,7 @@ Only visible if `recycling_type=centre` is shown -### opening_hours +### opening_hours_24_7 @@ -286,13 +286,13 @@ The question is What are the opening hours of this recycling facility? This rendering asks information about the property [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) -This is rendered with {opening_hours_table()} +This is rendered with

Opening hours

{opening_hours_table(opening_hours)} - - 24/7 corresponds with `opening_hours=24/7` + - 24/7 opened (including holidays) corresponds with `opening_hours=24/7` This document is autogenerated from [assets/layers/recycling/recycling.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/recycling/recycling.json) \ No newline at end of file diff --git a/Docs/Layers/stairs.md b/Docs/Layers/stairs.md index bf8a54c9a..c3fdf4756 100644 --- a/Docs/Layers/stairs.md +++ b/Docs/Layers/stairs.md @@ -68,6 +68,18 @@ attribute | type | values which are supported by this layer +### images + + + +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` + +This tagrendering has no question and is thus read-only + + + + + ### handrail @@ -110,7 +122,7 @@ This tagrendering has no question and is thus read-only -Only visible if `tactile_writing:braille:language=yes` is shown +Only visible if `tactile_writing=yes` is shown diff --git a/Docs/TagInfo/mapcomplete_blind_osm.json b/Docs/TagInfo/mapcomplete_blind_osm.json index 1f5e23421..2abfbb7e7 100644 --- a/Docs/TagInfo/mapcomplete_blind_osm.json +++ b/Docs/TagInfo/mapcomplete_blind_osm.json @@ -1051,6 +1051,22 @@ "description": "The MapComplete theme OSM for the blind has a layer Stairs showing features with this tag", "value": "steps" }, + { + "key": "image", + "description": "The layer 'Stairs allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "mapillary", + "description": "The layer 'Stairs allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikidata", + "description": "The layer 'Stairs allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikipedia", + "description": "The layer 'Stairs allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, { "key": "handrail", "description": "Layer 'Stairs' shows handrail=yes with a fixed text, namely 'These stairs have a handrail' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OSM for the blind')", diff --git a/Docs/TagInfo/mapcomplete_cyclofix.json b/Docs/TagInfo/mapcomplete_cyclofix.json index 3f95f9d96..733fd8cd3 100644 --- a/Docs/TagInfo/mapcomplete_cyclofix.json +++ b/Docs/TagInfo/mapcomplete_cyclofix.json @@ -104,14 +104,26 @@ "key": "website", "description": "Layer 'Bike cafe' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')" }, + { + "key": "contact:website", + "description": "Layer 'Bike cafe' shows contact:website~.+ with a fixed text, namely '{contact:website}' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')" + }, { "key": "phone", "description": "Layer 'Bike cafe' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')" }, + { + "key": "contact:phone", + "description": "Layer 'Bike cafe' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')" + }, { "key": "email", "description": "Layer 'Bike cafe' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')" }, + { + "key": "contact:email", + "description": "Layer 'Bike cafe' shows contact:email~.+ with a fixed text, namely '{contact:email}' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')" + }, { "key": "opening_hours", "description": "Layer 'Bike cafe' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')" @@ -770,7 +782,7 @@ }, { "key": "opening_hours", - "description": "Layer 'Bicycle pump and repair' shows opening_hours=24/7 with a fixed text, namely 'Always open' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "description": "Layer 'Bicycle pump and repair' shows opening_hours=24/7 with a fixed text, namely '24/7 opened (including holidays)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", "value": "24/7" }, { diff --git a/Docs/TagInfo/mapcomplete_hackerspaces.json b/Docs/TagInfo/mapcomplete_hackerspaces.json index 49f45709f..69e55ca10 100644 --- a/Docs/TagInfo/mapcomplete_hackerspaces.json +++ b/Docs/TagInfo/mapcomplete_hackerspaces.json @@ -75,7 +75,7 @@ }, { "key": "opening_hours", - "description": "Layer 'Hackerspace' shows opening_hours=24/7 with a fixed text, namely 'Opened 24/7' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Hackerspaces')", + "description": "Layer 'Hackerspace' shows opening_hours=24/7 with a fixed text, namely '24/7 opened (including holidays)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Hackerspaces')", "value": "24/7" }, { diff --git a/Docs/TagInfo/mapcomplete_personal.json b/Docs/TagInfo/mapcomplete_personal.json index b28d60556..0ea23825d 100644 --- a/Docs/TagInfo/mapcomplete_personal.json +++ b/Docs/TagInfo/mapcomplete_personal.json @@ -978,14 +978,26 @@ "key": "website", "description": "Layer 'Bike cafe' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Personal theme')" }, + { + "key": "contact:website", + "description": "Layer 'Bike cafe' shows contact:website~.+ with a fixed text, namely '{contact:website}' (in the MapComplete.osm.be theme 'Personal theme')" + }, { "key": "phone", "description": "Layer 'Bike cafe' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Personal theme')" }, + { + "key": "contact:phone", + "description": "Layer 'Bike cafe' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the MapComplete.osm.be theme 'Personal theme')" + }, { "key": "email", "description": "Layer 'Bike cafe' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Personal theme')" }, + { + "key": "contact:email", + "description": "Layer 'Bike cafe' shows contact:email~.+ with a fixed text, namely '{contact:email}' (in the MapComplete.osm.be theme 'Personal theme')" + }, { "key": "opening_hours", "description": "Layer 'Bike cafe' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Personal theme')" @@ -1263,7 +1275,7 @@ }, { "key": "opening_hours", - "description": "Layer 'Bicycle pump and repair' shows opening_hours=24/7 with a fixed text, namely 'Always open' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "description": "Layer 'Bicycle pump and repair' shows opening_hours=24/7 with a fixed text, namely '24/7 opened (including holidays)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", "value": "24/7" }, { @@ -6262,7 +6274,7 @@ }, { "key": "opening_hours", - "description": "Layer 'Hackerspace' shows opening_hours=24/7 with a fixed text, namely 'Opened 24/7' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "description": "Layer 'Hackerspace' shows opening_hours=24/7 with a fixed text, namely '24/7 opened (including holidays)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", "value": "24/7" }, { @@ -7319,6 +7331,11 @@ "key": "opening_hours", "description": "Layer 'Parcel Lockers' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Personal theme')" }, + { + "key": "opening_hours", + "description": "Layer 'Parcel Lockers' shows opening_hours=24/7 with a fixed text, namely '24/7 opened (including holidays)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "24/7" + }, { "key": "ref", "description": "Layer 'Parcel Lockers' shows and asks freeform values for key 'ref' (in the MapComplete.osm.be theme 'Personal theme')" @@ -8472,7 +8489,7 @@ }, { "key": "opening_hours", - "description": "Layer 'Recycling' shows opening_hours=24/7 with a fixed text, namely '24/7' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "description": "Layer 'Recycling' shows opening_hours=24/7 with a fixed text, namely '24/7 opened (including holidays)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", "value": "24/7" }, { @@ -9876,6 +9893,22 @@ "description": "The MapComplete theme Personal theme has a layer Stairs showing features with this tag", "value": "steps" }, + { + "key": "image", + "description": "The layer 'Stairs allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "mapillary", + "description": "The layer 'Stairs allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikidata", + "description": "The layer 'Stairs allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikipedia", + "description": "The layer 'Stairs allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, { "key": "handrail", "description": "Layer 'Stairs' shows handrail=yes with a fixed text, namely 'These stairs have a handrail' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", diff --git a/Docs/TagInfo/mapcomplete_postboxes.json b/Docs/TagInfo/mapcomplete_postboxes.json index bf3cc89ff..b73b5a146 100644 --- a/Docs/TagInfo/mapcomplete_postboxes.json +++ b/Docs/TagInfo/mapcomplete_postboxes.json @@ -248,6 +248,11 @@ "key": "opening_hours", "description": "Layer 'Parcel Lockers' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Postbox and Post Office Map')" }, + { + "key": "opening_hours", + "description": "Layer 'Parcel Lockers' shows opening_hours=24/7 with a fixed text, namely '24/7 opened (including holidays)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Postbox and Post Office Map')", + "value": "24/7" + }, { "key": "ref", "description": "Layer 'Parcel Lockers' shows and asks freeform values for key 'ref' (in the MapComplete.osm.be theme 'Postbox and Post Office Map')" diff --git a/Docs/TagInfo/mapcomplete_waste.json b/Docs/TagInfo/mapcomplete_waste.json index 2e4ce2090..057b67b14 100644 --- a/Docs/TagInfo/mapcomplete_waste.json +++ b/Docs/TagInfo/mapcomplete_waste.json @@ -290,7 +290,7 @@ }, { "key": "opening_hours", - "description": "Layer 'Recycling' shows opening_hours=24/7 with a fixed text, namely '24/7' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", + "description": "Layer 'Recycling' shows opening_hours=24/7 with a fixed text, namely '24/7 opened (including holidays)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", "value": "24/7" }, { diff --git a/Logic/ElementStorage.ts b/Logic/ElementStorage.ts index 2d35b05bd..1f942e3f4 100644 --- a/Logic/ElementStorage.ts +++ b/Logic/ElementStorage.ts @@ -3,11 +3,11 @@ */ import { UIEventSource } from "./UIEventSource" import { GeoJSONObject } from "@turf/turf" -import {Feature, Geometry, Point} from "geojson"; -import {OsmTags} from "../Models/OsmFeature"; +import { Feature, Geometry, Point } from "geojson" +import { OsmTags } from "../Models/OsmFeature" export class ElementStorage { - public ContainingFeatures = new Map>() + public ContainingFeatures = new Map>() private _elements = new Map>() constructor() {} diff --git a/Logic/GeoOperations.ts b/Logic/GeoOperations.ts index 4aba7ce7b..d64550620 100644 --- a/Logic/GeoOperations.ts +++ b/Logic/GeoOperations.ts @@ -10,7 +10,7 @@ import { MultiPolygon, Polygon, } from "@turf/turf" -import {GeoJSON, LineString, Point} from "geojson" +import { GeoJSON, LineString, Point } from "geojson" import togpx from "togpx" import Constants from "../Models/Constants" @@ -38,7 +38,7 @@ export class GeoOperations { * @param feature */ static centerpointCoordinates(feature: AllGeoJSON | GeoJSON): [number, number] { - return <[number, number]>turf.center( feature).geometry.coordinates + return <[number, number]>turf.center(feature).geometry.coordinates } /** diff --git a/assets/contributors.json b/assets/contributors.json index 5fd2b8ff9..55d836bfe 100644 --- a/assets/contributors.json +++ b/assets/contributors.json @@ -1,11 +1,11 @@ { "contributors": [ { - "commits": 4630, + "commits": 4645, "contributor": "Pieter Vander Vennet" }, { - "commits": 245, + "commits": 255, "contributor": "Robin van der Linde" }, { @@ -84,6 +84,10 @@ "commits": 13, "contributor": "Nicole" }, + { + "commits": 12, + "contributor": "dependabot[bot]" + }, { "commits": 12, "contributor": "Tobias Jordans" @@ -92,10 +96,6 @@ "commits": 12, "contributor": "Bavo Vanderghote" }, - { - "commits": 11, - "contributor": "dependabot[bot]" - }, { "commits": 10, "contributor": "LiamSimons" diff --git a/assets/layers/bicycle_rental/bicycle_rental.json b/assets/layers/bicycle_rental/bicycle_rental.json index dff3b67fa..316d106b8 100644 --- a/assets/layers/bicycle_rental/bicycle_rental.json +++ b/assets/layers/bicycle_rental/bicycle_rental.json @@ -210,7 +210,7 @@ "es": "{rental} se alquilan aquí", "da": "{rental} udlejes her", "fr": "{rental} est louable ici", - "cs": "{rental} se pronajímá zde" + "cs": "Zde si můžete půjčit {rental}" }, "freeform": { "key": "rental", @@ -227,7 +227,7 @@ "es": "Aquí se pueden alquilar bicis normales", "da": "Her kan man leje almindelige bycykler", "fr": "Des vélos de ville peuvent être loués ici", - "cs": "Běžná městská kola si můžete půjčit zde" + "cs": "Zde si můžete půjčit běžná městská kola" } }, { @@ -239,7 +239,7 @@ "es": "Aquí se pueden alquilar bicis eléctricas", "da": "El-cykler kan lejes her", "fr": "Des vélos électriques peuvent être loués ici", - "cs": "Elektrická kola si můžete půjčit zde" + "cs": "Zde si můžete půjčit elektrokola" } }, { @@ -251,7 +251,7 @@ "es": "Aquí se pueden alquilar bicis BMX", "da": "BMX cykler kan lejes her", "fr": "Des BMX peuvent être loués ici", - "cs": "Kola BMX si můžete půjčit zde" + "cs": "Zde si můžete půjčit BMX kola" } }, { @@ -263,7 +263,7 @@ "es": "Aquí se pueden alquilar bicis de montaña", "da": "Mountainbikes kan lejes her", "fr": "Des vélos de montagne peuvent être loués ici", - "cs": "Horská kola si můžete půjčit zde" + "cs": "Zde si můžete půjčit horská kola" } }, { @@ -275,7 +275,7 @@ "es": "Aquí se pueden alquilar bicis infantiles", "da": "Børnecykler kan lejes her", "fr": "Des vélos d'enfants peuvent être loués ici", - "cs": "Dětská kola si můžete půjčit zde" + "cs": "Zde si můžete půjčit dětská kola" } }, { @@ -287,7 +287,7 @@ "da": "Tandemcykler kan lejes her", "fr": "Des tandems peuvent être loués ici", "es": "Aquí se pueden alquilar tándems", - "cs": "Tandemová kola si můžete půjčit zde" + "cs": "Zde si můžete půjčit tandemová kola" } }, { @@ -299,7 +299,7 @@ "es": "Aquí se pueden alquilar bicicletas de carreras", "da": "Racercykler kan lejes her", "fr": "Des vélos de course peuvent être loués ici", - "cs": "Závodní kola si můžete půjčit zde" + "cs": "Zde si můžete půjčit závodní kola" } }, { @@ -311,7 +311,7 @@ "de": "Fahrradhelme können hier gemietet werden", "fr": "Des casques de vélos peuvent être loués ici", "da": "Cykelhjelme kan lejes her", - "cs": "Cyklistické přilby si můžete půjčit zde" + "cs": "Zde si můžete půjčit cyklistické přilby" } } ] diff --git a/assets/layers/bike_cafe/bike_cafe.json b/assets/layers/bike_cafe/bike_cafe.json index e3ff3f087..c56d7caff 100644 --- a/assets/layers/bike_cafe/bike_cafe.json +++ b/assets/layers/bike_cafe/bike_cafe.json @@ -300,7 +300,6 @@ "da": "Hvornår er denne cykelcafé åbent?" } } - } ], "presets": [ @@ -356,4 +355,4 @@ "fr": "Un vélo café est un café à destination des cyclistes avec, par exemple, des services tels qu’une pompe, et de nombreuses décorations liées aux vélos, etc.", "cs": "Cyklokavárna je kavárna zaměřená na cyklisty, například se službami, jako je pumpa, se spoustou výzdoby související s jízdními koly, …" } -} +} \ No newline at end of file diff --git a/assets/layers/bike_repair_station/bike_repair_station.json b/assets/layers/bike_repair_station/bike_repair_station.json index 634b1228a..0c279bda9 100644 --- a/assets/layers/bike_repair_station/bike_repair_station.json +++ b/assets/layers/bike_repair_station/bike_repair_station.json @@ -53,7 +53,8 @@ "pt": "Estação de reparo de bicicletas", "ru": "Станция обслуживания велосипедов", "es": "Estación de reparación de bicis", - "da": "Cykelreparationsstation" + "da": "Cykelreparationsstation", + "cs": "Stanice na opravu kol" } }, { @@ -74,7 +75,8 @@ "pt": "Estação de reparo de bicicletas", "ru": "Станция обслуживания велосипедов", "es": "Estación de reparación de bicis", - "da": "Cykelreparationsstation" + "da": "Cykelreparationsstation", + "cs": "Stanice na opravu kol" } }, { @@ -100,7 +102,8 @@ "pt_BR": "Bomba quebrada", "ca": "Bomba trencada", "es": "Bomba rota", - "da": "Defekt pumpe" + "da": "Defekt pumpe", + "cs": "Rozbitý vzduchový kompresor" } }, { @@ -121,7 +124,8 @@ "ru": "Велосипедный насос {name}", "pt_BR": "Bomba de bicicleta {name}", "es": "Bomba de bicicletas {name}", - "da": "Cykelpumpe {name}" + "da": "Cykelpumpe {name}", + "cs": "Vzduchový kompresor {name}" } }, { @@ -142,7 +146,8 @@ "pt_BR": "Bomba de bicicleta", "ca": "Bomba de bicicleta", "es": "Bomba para bicicletas", - "da": "Cykelpumpe" + "da": "Cykelpumpe", + "cs": "Vzduchový kompresor" } } ] @@ -395,7 +400,8 @@ "pt_BR": "Quem faz a manutenção desta bomba de ciclo?", "pt": "Quem faz a manutenção desta bomba de ciclo?", "es": "¿Quién mantiene esta bomba para bicicletas?", - "da": "Hvem vedligeholder denne cykluspumpe?" + "da": "Hvem vedligeholder denne cykluspumpe?", + "cs": "Kdo udržuje tento vzduchový kompresor?" }, "render": { "nl": "Beheer door {operator}", @@ -406,7 +412,8 @@ "pt_BR": "Mantida por {operator}", "pt": "Mantida por {operator}", "es": "Mantenido por {operator}", - "da": "Vedligeholdt af {operator}" + "da": "Vedligeholdt af {operator}", + "cs": "Udržováno od {operator}" }, "freeform": { "key": "operator" @@ -443,7 +450,8 @@ "de": "Wie lautet die Telefonnummer des Betreibers?", "fr": "Quel est le numéro de téléphone du service de maintenance ?", "es": "¿Cual es el número de teléfono del mantenedor?", - "da": "Hvad er telefonnummeret på vedligeholderen?" + "da": "Hvad er telefonnummeret på vedligeholderen?", + "cs": "Jaké je telefonní číslo správce?" }, "freeform": { "key": "phone", @@ -567,7 +575,8 @@ "de": "Fahrradpumpe kaputt", "es": "Bomba para bicicletas rota", "fr": "Pompe à vélo cassée", - "da": "Cykelpumpe i stykker" + "da": "Cykelpumpe i stykker", + "cs": "Rozbitý vzduchový kompresor" }, "body": { "en": "Hello,\n\nWith this email, I'd like to inform you that the bicycle pump located at https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id} is broken.\n\n Kind regards", @@ -575,7 +584,8 @@ "de": "Hallo,\n\nMit dieser E-Mail möchte ich Ihnen mitteilen, dass die Fahrradpumpe, die sich unter https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id} befindet, kaputt ist.\n\nMit freundlichen Grüßen", "da": "Hej,\n\nMed denne e-mail vil jeg gerne oplyse, at cykelpumpen, der befinder sig på https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id} er i stykker.\n\n Med venlig hilse", "es": "Hola,\n\nCon este correo, me gustaría informar de que esta bomba para bicicletas situada en https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id} está rota.\n\nUn saludo", - "fr": "Bonjour,\n\nCe mail pour vous informer que la pompe à vélo située à https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id} est cassée.\n\nBien à vous." + "fr": "Bonjour,\n\nCe mail pour vous informer que la pompe à vélo située à https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id} est cassée.\n\nBien à vous.", + "cs": "Dobrý den,\n\ntímto e-mailem bych Vás chtěl informovat, že vzduchový kompresor na kolo umístěný na adrese https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id} je rozbitý.\n\n S pozdravem" }, "button_text": { "en": "Report this bicycle pump as broken", @@ -583,7 +593,8 @@ "fr": "Signaler cette pompe à vélo cassée", "de": "Melde diese Fahrradpumpe als kaputt", "da": "Anmeld denne cykelpumpe som værende i stykker", - "es": "Reportar esta bomba para bicicletas como rota" + "es": "Reportar esta bomba para bicicletas como rota", + "cs": "Nahlásit tento vzduchový kompresor na kolo jako rozbitý" } } }, @@ -599,7 +610,8 @@ "it": "Quali valvole sono supportate?", "pl": "Jakie zawory są obsługiwane?", "es": "¿Que válvulas se soportan?", - "da": "Hvilke ventiler understøttes?" + "da": "Hvilke ventiler understøttes?", + "cs": "Jaké ventily jsou podporovány?" }, "render": { "en": "This pump supports the following valves: {valves}", @@ -611,7 +623,8 @@ "ru": "Этот насос поддерживает следующие клапаны: {valves}", "pl": "Ta pompka obsługuje następujące zawory: {valves}", "es": "Esta bomba soporta las siguiente válvulas: {valves}", - "da": "Denne pumpe understøtter følgende ventiler: {valves}" + "da": "Denne pumpe understøtter følgende ventiler: {valves}", + "cs": "Tento vzduchový kompresor podporuje následující ventily: {valves}" }, "freeform": { "#addExtraTags": [ @@ -632,7 +645,8 @@ "it": "Sclaverand (detta anche Presta)", "ru": "Клапан Presta (также известный как французский клапан)", "da": "Sclaverand/Presta (cykeldæk med smal bredde)", - "es": "Sclaverand/Presata (ruedas de bicicleta estrechas)" + "es": "Sclaverand/Presata (ruedas de bicicleta estrechas)", + "cs": "Sclaverand/Presta (úzké cyklistické pláště)" } }, { @@ -646,7 +660,8 @@ "it": "Dunlop", "ru": "Клапан Dunlop", "da": "Dunlop", - "es": "Dunlop" + "es": "Dunlop", + "cs": "Dunlop" } }, { @@ -659,7 +674,8 @@ "de": "Schrader-Ventile (für Autos und Mountainbikes)", "it": "Schrader (valvola delle auto)", "da": "Schrader (biler og mountainbikes)", - "es": "Schrader (coches y bicicletas de montaña)" + "es": "Schrader (coches y bicicletas de montaña)", + "cs": "Schrader (automobily a horská kola)" } } ], @@ -994,4 +1010,4 @@ "fr": "Une couche montrant les pompes à vélo et les centres de réparation", "cs": "Vrstva zobrazující vzduchové kompresory na jízdní kola a stojany na nářadí pro opravu jízdních kol" } -} +} \ No newline at end of file diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index 6999be9a8..d4bfc9649 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -3771,10 +3771,7 @@ "override": { "question": { "en": "When is this charging station opened?", - "nl": "Wanneer is dit oplaadpunt beschikbaar??", - "da": "Hvornår er denne ladestation åben?", - "de": "Wann ist diese Ladestation geöffnet?", - "es": "¿Cuándo abre esta estación de carga?" + "nl": "Wanneer is dit oplaadpunt beschikbaar??" } }, "id": "OH" @@ -5019,4 +5016,4 @@ }, "neededChangesets": 10 } -} +} \ No newline at end of file diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json index eadd06cdf..1afbd161f 100644 --- a/assets/layers/crossings/crossings.json +++ b/assets/layers/crossings/crossings.json @@ -54,7 +54,7 @@ "if": "crossing=traffic_signals", "then": { "en": "Crossing with traffic signals", - "nl": "Oversteektplaats met verkeerslichten", + "nl": "Oversteekplaats met verkeerslichten", "de": "Kreuzung mit Ampeln", "fr": "Traversée avec feu de signalisation", "es": "Cruce con señales de tráfico" diff --git a/assets/layers/defibrillator/defibrillator.json b/assets/layers/defibrillator/defibrillator.json index 64688c0c3..c5b1e35d7 100644 --- a/assets/layers/defibrillator/defibrillator.json +++ b/assets/layers/defibrillator/defibrillator.json @@ -651,4 +651,4 @@ "has_image", "open_now" ] -} +} \ No newline at end of file diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index 452c2a85c..29515e0eb 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -144,13 +144,16 @@ "type": "language_chooser", "key": "tactile_writing:braille", "question": { - "en": "In which languages does this elevator have tactile writing (braille)?" + "en": "In which languages does this elevator have tactile writing (braille)?", + "de": "In welchen Sprachen hat der Aufzug taktile Schrift (Braille)?" }, "render_list_item": { - "en": "This elevator has tactile writing in {language():font-bold}" + "en": "This elevator has tactile writing in {language():font-bold}", + "de": "Der Aufzug hat taktile Schrift in {language():font-bold}" }, "render_single_language": { - "en": "This elevator has tactile writing in {language():font-bold}" + "en": "This elevator has tactile writing in {language():font-bold}", + "de": "Der Aufzug hat taktile Schrift in {language():font-bold}" } } } @@ -232,4 +235,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/assets/layers/hackerspace/hackerspace.json b/assets/layers/hackerspace/hackerspace.json index 81dbfdbc8..d187431b9 100644 --- a/assets/layers/hackerspace/hackerspace.json +++ b/assets/layers/hackerspace/hackerspace.json @@ -348,4 +348,4 @@ } } ] -} +} \ No newline at end of file diff --git a/assets/layers/osm_community_index/osm_community_index.json b/assets/layers/osm_community_index/osm_community_index.json index 237a9b739..dcdeba417 100644 --- a/assets/layers/osm_community_index/osm_community_index.json +++ b/assets/layers/osm_community_index/osm_community_index.json @@ -56,7 +56,8 @@ { "question": { "en": "Country", - "de": "Land" + "de": "Land", + "nl": "Land" }, "osmTags": "level=country" } @@ -80,7 +81,8 @@ { "question": { "en": "Region", - "de": "Region" + "de": "Region", + "nl": "Regio" }, "osmTags": "level=region" } @@ -116,7 +118,8 @@ { "question": { "en": "World", - "de": "Welt" + "de": "Welt", + "nl": "Wereld" }, "osmTags": "level=world" } diff --git a/assets/layers/parcel_lockers/parcel_lockers.json b/assets/layers/parcel_lockers/parcel_lockers.json index 6594c9833..c7ece036a 100644 --- a/assets/layers/parcel_lockers/parcel_lockers.json +++ b/assets/layers/parcel_lockers/parcel_lockers.json @@ -257,4 +257,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/assets/layers/pharmacy/pharmacy.json b/assets/layers/pharmacy/pharmacy.json index a2e5e9370..655ac4035 100644 --- a/assets/layers/pharmacy/pharmacy.json +++ b/assets/layers/pharmacy/pharmacy.json @@ -167,4 +167,4 @@ } } ] -} +} \ No newline at end of file diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json index 808decd18..0a6a86185 100644 --- a/assets/layers/recycling/recycling.json +++ b/assets/layers/recycling/recycling.json @@ -1174,4 +1174,4 @@ "enableRelocation": false, "enableImproveAccuracy": true } -} +} \ No newline at end of file diff --git a/assets/layers/school/school.json b/assets/layers/school/school.json index 2d7286971..f5db702e1 100644 --- a/assets/layers/school/school.json +++ b/assets/layers/school/school.json @@ -302,10 +302,12 @@ "type": "language_chooser", "key": "language", "render_all": { - "en": "The following languages are used in this school:{list()}" + "en": "The following languages are used in this school:{list()}", + "de": "Folgende Sprachen werden in der Schule verwendet:{list()}" }, "render_single_language": { - "en": "{language():font-bold} is the main language of this school" + "en": "{language():font-bold} is the main language of this school", + "de": "{language():font-bold} ist die Hauptsprache der Schule" }, "question": { "en": "What is the main language of this school?
What language is spoken with the students in non-language related courses and with the administration?
", diff --git a/assets/layers/stairs/stairs.json b/assets/layers/stairs/stairs.json index 4f68c0eba..8050d0879 100644 --- a/assets/layers/stairs/stairs.json +++ b/assets/layers/stairs/stairs.json @@ -62,19 +62,22 @@ "id": "tactile_writing", "condition": "handrail=yes", "question": { - "en": "Do these stairs have tactile writing on the handrail?" + "en": "Do these stairs have tactile writing on the handrail?", + "de": "Hat die Treppe eine taktile Schrift am Handlauf?" }, "mappings": [ { "if": "tactile_writing=yes", "then": { - "en": "There is tactile writing on the handrail" + "en": "There is tactile writing on the handrail", + "de": "Am Handlauf gibt es taktile Schrift" } }, { "if": "tactile_writing=no", "then": { - "en": "There is no tactile writing on the handrail" + "en": "There is no tactile writing on the handrail", + "de": "Am Handlauf gibt es keine taktile Schrift" } } ] @@ -87,13 +90,16 @@ "type": "language_chooser", "key": "tactile_writing:braille", "question": { - "en": "In which languages is there tactile writing (braille) for navigation? " + "en": "In which languages is there tactile writing (braille) for navigation? ", + "de": "In welchen Sprachen gibt es taktile Schrift (Braille) für die Navigation? " }, "render_list_item": { - "en": "These stairs have tactile writing in {language():font-bold}" + "en": "These stairs have tactile writing in {language():font-bold}", + "de": "Die Treppe hat taktile Schrift in {language():font-bold}" }, "render_single_language": { - "en": "These stairs have tactile writing in {language():font-bold}" + "en": "These stairs have tactile writing in {language():font-bold}", + "de": "Die Treppe hat taktile Schrift in {language():font-bold}" } } } @@ -121,7 +127,8 @@ "if": "conveying=", "then": { "en": "This is not an escalator", - "nl": "Dit is geen roltrap" + "nl": "Dit is geen roltrap", + "de": "Das ist keine Rolltreppe" }, "hideInAnswer": true } @@ -185,4 +192,4 @@ "dashArray": "2 2" } ] -} +} \ No newline at end of file diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json index 04a83cf2b..7ffbd8edb 100644 --- a/assets/layers/walls_and_buildings/walls_and_buildings.json +++ b/assets/layers/walls_and_buildings/walls_and_buildings.json @@ -114,7 +114,8 @@ "tagrendering": { "en": "An entrance of {canonical(width)}", "de": "Ein Eingang von {canonical(width)}", - "da": "En indgang på {canonical(width)}" + "da": "En indgang på {canonical(width)}", + "nl": "Een ingang van {canonical(width)}" } } }, diff --git a/assets/translators.json b/assets/translators.json index 26e989f7f..97e47efa8 100644 --- a/assets/translators.json +++ b/assets/translators.json @@ -5,7 +5,7 @@ "contributor": "Pieter Vander Vennet" }, { - "commits": 179, + "commits": 180, "contributor": "kjon" }, { @@ -21,7 +21,7 @@ "contributor": "Anonymous" }, { - "commits": 37, + "commits": 38, "contributor": "Robin van der Linde" }, { @@ -84,6 +84,10 @@ "commits": 11, "contributor": "Olivier" }, + { + "commits": 10, + "contributor": "Jiří Podhorecký" + }, { "commits": 10, "contributor": "bgo-eiu" @@ -105,8 +109,8 @@ "contributor": "Jacque Fresco" }, { - "commits": 8, - "contributor": "Jiří Podhorecký" + "commits": 7, + "contributor": "Vinicius" }, { "commits": 7, @@ -124,10 +128,6 @@ "commits": 6, "contributor": "Joost Schouppe" }, - { - "commits": 6, - "contributor": "Vinicius" - }, { "commits": 6, "contributor": "pdassori" diff --git a/langs/cs.json b/langs/cs.json index 4d08bbfb5..d0b5de1ab 100644 --- a/langs/cs.json +++ b/langs/cs.json @@ -28,13 +28,27 @@ }, "useSomethingElse": "Místo toho použijte jiný editor OpenStreetMap a odstraňte jej" }, + "favourite": { + "loginNeeded": "

Přihlášení

Osobní rozvržení je k dispozici pouze pro uživatele OpenStreetMap", + "reload": "Znovu načíst data" + }, + "flyer": { + "description": "Leták formátu A4 na propagaci MapComplete", + "editing": { + "title": "Jak vypadá uživatelské rozhraní?" + }, + "examples": "K dispozici je mnoho tematických map, z nichž některé jsou zde otištěny.\n\nNa internetu je k dispozici mnoho dalších tematických map: o zdravotnictví, navigaci v interiéru, bezbariérovosti, odpadových zařízeních, veřejných knihovnách, přechodech pro chodce s duhovým nátěrem,... Objevte je všechny na mapcomplete.osm.be", + "fakeui": { + "add_images": "Přidání obrázků několika kliknutími", + "edit": "Špatné nebo zastaralé informace? Tlačítko pro úpravu je přímo zde" + } + }, "general": { "about": "Snadné úpravy a přidávání OpenStreetMap pro určité téma", + "aboutMapcomplete": "

O programu

Pomocí MapComplete přidejte informace OpenStreetMap na jedno téma. Odpovězte na otázky a během několika minut budou vaše příspěvky všude dostupné. Ve většině témat můžete přidat obrázky nebo dokonce zanechat recenzi. Správce motivu pro něj definuje prvky, otázky a jazyky.

Další informace

MapComplete vždy nabízí další krok k zjištění více o OpenStreetMap.

  • Pokud je prvek iframe vložen do webové stránky, odkazuje na celoobrazovkový MapComplete.
  • Verze na celou obrazovku nabízí informace o OpenStreetMap.
  • Prohlížení funguje bez přihlášení, ale úpravy vyžadují účet OSM.
  • Pokud nejste přihlášeni, budete o to požádáni
  • Jakmile odpovíte na jedinou otázku, můžete přidat nové funkce na mapu
  • Po chvíli se zobrazí skutečné značky OSM, později odkaz na wiki


Všimli jste si problému? Máte požadavek na funkci? Chcete pomoci s překladem? Přejděte na zdrojový kód nebo sledovač problémů.

Chcete vidět svůj pokrok? Sledujte počet úprav na OsmCha.

", "add": { - "addNewMapLabel": "Klikněte zde pro přidání nové položky", "addNew": "Přidat {category}", - "title": "Přidat novou funkci?", - "importTags": "Prvek dostane {tags}", + "addNewMapLabel": "Klikněte zde pro přidání nové položky", "confirmButton": "Přidat kategorii {category}
Váš příspěvek je viditelný pro všechny
", "disableFilters": "Vypnout všechny filtry", "import": { @@ -42,56 +56,42 @@ "importTags": "Prvek dostane {tags}", "officialThemesOnly": "Tlačítko importovat je pro neoficiální motivy zakázáno, aby se předešlo nehodám" }, + "importTags": "Prvek dostane {tags}", "intro": "Klikli jste někam, kde zatím nejsou známy žádné údaje.
", "layerNotEnabled": "Vrstva {layer} není povolena. Chcete-li přidat funkci, povolte tuto vrstvu", "openLayerControl": "Otevřete ovládací okno vrstvy", "pleaseLogin": "Chcete-li přidat novou funkci, přihlaste se", "presetInfo": "Nový bod zájmu bude mít {tags}", "stillLoading": "Data se stále načítají. Před přidáním nové funkce prosím chvíli počkejte.", + "title": "Přidat novou funkci?", "warnVisibleForEveryone": "Váš příspěvek bude viditelný pro všechny" }, + "apply_button": { + "appliedOnAnotherObject": "Objekt {id} dostane {tags}", + "isApplied": "Změny jsou aplikovány" + }, "attribution": { - "openOsmcha": "Zobrazit poslední úpravy provedené pomocí {theme}", - "openMapillary": "Zde otevřete Mapillary", + "attributionContent": "

Všechna data poskytuje OpenStreetMap, volně opakovaně použitelná pod licencí Open DataBase.

", "attributionTitle": "Oznámení o připsání autorství", + "codeContributionsBy": "MapComplete vytvořili {contributors} a {hiddenCount} dalších přispěvatelů", "donate": "Podpořte MapComplete finančně", - "followOnTwitter": "Sledujte MapComplete na Twitteru", - "followBridge": "Účty Mastodon a Twitter jsou propojeny", - "followOnMastodon": "Sledujte MapComplete na Mastodonu", "editId": "Zde otevřete online editor OpenStreetMap", "editJosm": "Upravit zde pomocí JOSM", + "followBridge": "Účty Mastodon a Twitter jsou propojeny", + "followOnMastodon": "Sledujte MapComplete na Mastodonu", + "followOnTwitter": "Sledujte MapComplete na Twitteru", "iconAttribution": { "title": "Použité ikony" }, - "mapContributionsByAndHidden": "Aktuální viditelná data obsahují úpravy provedené {contributors} a {hiddenCount} dalšími přispěvateli", - "codeContributionsBy": "MapComplete vytvořili {contributors} a {hiddenCount} dalších přispěvatelů", "josmNotOpened": "JOSM se nepodařilo propojit. Ujistěte se, že je otevřený a že je povoleno dálkové ovládání", "josmOpened": "JOSM je otevřen", "mapContributionsBy": "Aktuální viditelná data obsahují úpravy provedené {contributors}", - "themeBy": "Téma spravuje {author}", - "attributionContent": "

Všechna data poskytuje OpenStreetMap, volně opakovaně použitelná pod licencí Open DataBase.

", + "mapContributionsByAndHidden": "Aktuální viditelná data obsahují úpravy provedené {contributors} a {hiddenCount} dalšími přispěvateli", "mapillaryHelp": "Mapillary je online služba, která shromažďuje snímky na úrovni ulic a nabízí je pod bezplatnou licencí. Přispěvatelé mohou tyto obrázky používat ke zlepšení OpenStreetMap", - "openIssueTracker": "Podání chyby" - }, - "apply_button": { - "isApplied": "Změny jsou aplikovány", - "appliedOnAnotherObject": "Objekt {id} dostane {tags}" - }, - "aboutMapcomplete": "

O programu

Pomocí MapComplete přidejte informace OpenStreetMap na jedno téma. Odpovězte na otázky a během několika minut budou vaše příspěvky všude dostupné. Ve většině témat můžete přidat obrázky nebo dokonce zanechat recenzi. Správce motivu pro něj definuje prvky, otázky a jazyky.

Další informace

MapComplete vždy nabízí další krok k zjištění více o OpenStreetMap.

  • Pokud je prvek iframe vložen do webové stránky, odkazuje na celoobrazovkový MapComplete.
  • Verze na celou obrazovku nabízí informace o OpenStreetMap.
  • Prohlížení funguje bez přihlášení, ale úpravy vyžadují účet OSM.
  • Pokud nejste přihlášeni, budete o to požádáni
  • Jakmile odpovíte na jedinou otázku, můžete přidat nové funkce na mapu
  • Po chvíli se zobrazí skutečné značky OSM, později odkaz na wiki


Všimli jste si problému? Máte požadavek na funkci? Chcete pomoci s překladem? Přejděte na zdrojový kód nebo sledovač problémů.

Chcete vidět svůj pokrok? Sledujte počet úprav na OsmCha.

" - }, - "favourite": { - "reload": "Znovu načíst data", - "loginNeeded": "

Přihlášení

Osobní rozvržení je k dispozici pouze pro uživatele OpenStreetMap" - }, - "flyer": { - "fakeui": { - "edit": "Špatné nebo zastaralé informace? Tlačítko pro úpravu je přímo zde", - "add_images": "Přidání obrázků několika kliknutími" - }, - "description": "Leták formátu A4 na propagaci MapComplete", - "editing": { - "title": "Jak vypadá uživatelské rozhraní?" - }, - "examples": "K dispozici je mnoho tematických map, z nichž některé jsou zde otištěny.\n\nNa internetu je k dispozici mnoho dalších tematických map: o zdravotnictví, navigaci v interiéru, bezbariérovosti, odpadových zařízeních, veřejných knihovnách, přechodech pro chodce s duhovým nátěrem,... Objevte je všechny na mapcomplete.osm.be" + "openIssueTracker": "Podání chyby", + "openMapillary": "Zde otevřete Mapillary", + "openOsmcha": "Zobrazit poslední úpravy provedené pomocí {theme}", + "themeBy": "Téma spravuje {author}" + } } } diff --git a/langs/layers/ca.json b/langs/layers/ca.json index 59a516574..d5edd66db 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -870,13 +870,6 @@ } } }, - "opening_hours": { - "mappings": { - "0": { - "then": "24/7" - } - } - }, "operator": { "render": "Aquesta infraestuctura de reciclatge està operada per {operator}" }, @@ -1096,4 +1089,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/layers/cs.json b/langs/layers/cs.json index 46f12d267..599708810 100644 --- a/langs/layers/cs.json +++ b/langs/layers/cs.json @@ -448,33 +448,33 @@ "tagRenderings": { "bicycle-types": { "mappings": { - "7": { - "then": "Zde si můžete půjčit cyklistické přilby" - }, "0": { "then": "Zde si můžete půjčit běžná městská kola" }, - "4": { - "then": "Zde si můžete půjčit dětská kola" - }, "1": { "then": "Zde si můžete půjčit elektrokola" }, "2": { "then": "Zde si můžete půjčit BMX kola" }, - "6": { - "then": "Zde si můžete půjčit závodní kola" - }, "3": { "then": "Zde si můžete půjčit horská kola" }, - "5": { - "then": "Zde si můžete půjčit tandemová kola" - } - }, - "render": "Zde si můžete půjčit {rental}", - "question": "Jaká jízdní kola a příslušenství se zde půjčují?" + "4": { + "then": "Zde si můžete půjčit dětská kola" + }, + "5": { + "then": "Zde si můžete půjčit tandemová kola" + }, + "6": { + "then": "Zde si můžete půjčit závodní kola" + }, + "7": { + "then": "Zde si můžete půjčit cyklistické přilby" + } + }, + "question": "Jaká jízdní kola a příslušenství se zde půjčují?", + "render": "Zde si můžete půjčit {rental}" }, "bicycle_rental_type": { "mappings": { @@ -591,19 +591,10 @@ }, "question": "Nabízí tato cyklistická kavárna vzduchový kompresor na kolo k použití pro kohokoli?" }, - "bike_cafe-email": { - "question": "Jaká je e-mailová adresa {name}?" - }, "bike_cafe-name": { "question": "Jak se jmenuje tato cyklokavárna?", "render": "Tato cyklokavárna se jmenuje {name}" }, - "bike_cafe-opening_hours": { - "question": "Kdy byla tato cyklokavárna otevřena?" - }, - "bike_cafe-phone": { - "question": "Jaké je telefonní číslo na {name}?" - }, "bike_cafe-repair-service": { "mappings": { "0": { @@ -625,9 +616,6 @@ } }, "question": "Jsou zde nástroje na opravu vlastního kola?" - }, - "bike_cafe-website": { - "question": "Jaká je webová stránka {name}?" } }, "title": { @@ -808,28 +796,8 @@ "title": "opravna kol bez vzduchového kompresoru" } }, - "title": { - "mappings": { - "3": { - "then": "Vzduchový kompresor {name}" - }, - "4": { - "then": "Vzduchový kompresor" - }, - "0": { - "then": "Stanice na opravu kol" - }, - "1": { - "then": "Stanice na opravu kol" - }, - "2": { - "then": "Rozbitý vzduchový kompresor" - } - } - }, "tagRenderings": { "Operational status": { - "question": "Je vzduchový kompresor na kolo stále funkční?", "mappings": { "0": { "then": "Vzduchový kompresor na kolo je rozbitý" @@ -837,36 +805,37 @@ "1": { "then": "Vzduchový kompresor na kolo je v provozu" } - } + }, + "question": "Je vzduchový kompresor na kolo stále funkční?" }, "access": { "mappings": { - "4": { - "then": "Nepřístupné pro veřejnost" - }, "0": { "then": "Veřejně přístupné" }, + "1": { + "then": "Veřejně přístupné" + }, "2": { "then": "Pouze pro zákazníky" }, "3": { "then": "Nepřístupné pro veřejnost" }, - "1": { - "then": "Veřejně přístupné" + "4": { + "then": "Nepřístupné pro veřejnost" } }, "question": "Kdo smí tuto opravnu používat?" }, "bike_repair_station-available-services": { "mappings": { - "1": { - "then": "K dispozici je pouze nářadí (šroubováky, kleště, ...)." - }, "0": { "then": "K dispozici je pouze vzduchový kompresor" }, + "1": { + "then": "K dispozici je pouze nářadí (šroubováky, kleště, ...)." + }, "2": { "then": "K dispozici jsou nástroje i vzduchový kompresor" } @@ -875,17 +844,16 @@ }, "bike_repair_station-bike-chain-tool": { "mappings": { - "1": { - "then": "Není k dispozici žádný nástroj na řetěz" - }, "0": { "then": "K dispozici je nástroj na řetěz" + }, + "1": { + "then": "Není k dispozici žádný nástroj na řetěz" } }, "question": "Má tato opravna kol speciální nástroj na opravu řetězu?" }, "bike_repair_station-bike-stand": { - "question": "Má tato cyklistická stanice hák na zavěšení kola nebo stojan na jeho zvednutí?", "mappings": { "0": { "then": "K dispozici je závěsný hák nebo stojan" @@ -893,32 +861,8 @@ "1": { "then": "Není zde žádný závěsný hák ani stojan" } - } - }, - "bike_repair_station-manometer": { - "mappings": { - "2": { - "then": "Je zde manometr, ale je rozbitý" - }, - "0": { - "then": "K dispozici je manometr" - }, - "1": { - "then": "Není zde žádný manometr" - } }, - "question": "Má vzduchový kompresor ukazatel tlaku nebo manometr?" - }, - "bike_repair_station-email": { - "question": "Jaká je e-mailová adresa správce?" - }, - "bike_repair_station-opening_hours": { - "mappings": { - "0": { - "then": "Vždy otevřeno" - } - }, - "question": "Kdy je toto místo pro opravu jízdních kol otevřeno?" + "question": "Má tato cyklistická stanice hák na zavěšení kola nebo stojan na jeho zvednutí?" }, "bike_repair_station-electrical_pump": { "mappings": { @@ -931,20 +875,22 @@ }, "question": "Je to elektrická pumpa na kolo?" }, - "bike_repair_station-valves": { + "bike_repair_station-email": { + "question": "Jaká je e-mailová adresa správce?" + }, + "bike_repair_station-manometer": { "mappings": { - "2": { - "then": "Schrader (automobily a horská kola)" + "0": { + "then": "K dispozici je manometr" }, "1": { - "then": "Dunlop" + "then": "Není zde žádný manometr" }, - "0": { - "then": "Sclaverand/Presta (úzké cyklistické pláště)" + "2": { + "then": "Je zde manometr, ale je rozbitý" } }, - "question": "Jaké ventily jsou podporovány?", - "render": "Tento vzduchový kompresor podporuje následující ventily: {valves}" + "question": "Má vzduchový kompresor ukazatel tlaku nebo manometr?" }, "bike_repair_station-operator": { "question": "Kdo udržuje tento vzduchový kompresor?", @@ -953,6 +899,26 @@ "bike_repair_station-phone": { "question": "Jaké je telefonní číslo správce?" }, + "bike_repair_station-valves": { + "mappings": { + "0": { + "then": "Sclaverand/Presta (úzké cyklistické pláště)" + }, + "1": { + "then": "Dunlop" + }, + "2": { + "then": "Schrader (automobily a horská kola)" + } + }, + "question": "Jaké ventily jsou podporovány?", + "render": "Tento vzduchový kompresor podporuje následující ventily: {valves}" + }, + "opening_hours_24_7": { + "override": { + "question": "Kdy je toto místo pro opravu jízdních kol otevřeno?" + } + }, "send_email_about_broken_pump": { "render": { "special": { @@ -962,7 +928,25 @@ } } } - + }, + "title": { + "mappings": { + "0": { + "then": "Stanice na opravu kol" + }, + "1": { + "then": "Stanice na opravu kol" + }, + "2": { + "then": "Rozbitý vzduchový kompresor" + }, + "3": { + "then": "Vzduchový kompresor {name}" + }, + "4": { + "then": "Vzduchový kompresor" + } + } } } -} +} \ No newline at end of file diff --git a/langs/layers/da.json b/langs/layers/da.json index 2fdff8bec..f35267d90 100644 --- a/langs/layers/da.json +++ b/langs/layers/da.json @@ -602,6 +602,11 @@ } }, "question": "Er der værktøj her til at reparere din egen cykel?" + }, + "opening_hours": { + "override": { + "question": "Hvornår er denne cykelcafé åbent?" + } } }, "title": { @@ -900,6 +905,11 @@ "question": "Hvilke ventiler understøttes?", "render": "Denne pumpe understøtter følgende ventiler: {valves}" }, + "opening_hours_24_7": { + "override": { + "question": "Hvornår er dette cykelreparationssted åbent?" + } + }, "send_email_about_broken_pump": { "render": { "special": { @@ -3024,4 +3034,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/layers/de.json b/langs/layers/de.json index 7a51635f5..e21d2558e 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -619,6 +619,11 @@ } }, "question": "Gibt es hier Werkzeug, um das eigene Fahrrad zu reparieren?" + }, + "opening_hours": { + "override": { + "question": "Wann ist dieses Fahrradcafé geöffnet?" + } } }, "title": { @@ -917,6 +922,11 @@ "question": "Welche Ventile werden unterstützt?", "render": "Diese Pumpe unterstützt die folgenden Ventile: {valves}" }, + "opening_hours_24_7": { + "override": { + "question": "Wann ist die Fahrradreparaturstation geöffnet?" + } + }, "send_email_about_broken_pump": { "render": { "special": { @@ -3247,6 +3257,11 @@ }, "question": "Wann wurde der Defibrillator zuletzt überprüft?", "render": "Dieser Defibrillator wurde zuletzt am {survey:date} überprüft" + }, + "opening_hours_24_7": { + "override": { + "question": "Zu welchen Zeiten ist der Defibrillator verfügbar?" + } } }, "title": { @@ -3436,8 +3451,8 @@ "tactile_writing_language": { "render": { "special": { - "render_list_item": "Der Aufzug hat taktile Schrift in {language():font-bold}", "question": "In welchen Sprachen hat der Aufzug taktile Schrift (Braille)?", + "render_list_item": "Der Aufzug hat taktile Schrift in {language():font-bold}", "render_single_language": "Der Aufzug hat taktile Schrift in {language():font-bold}" } } @@ -4317,6 +4332,11 @@ } }, "question": "Ist dies ein Hackerspace oder ein Makerspace?" + }, + "opening_hours_24_7": { + "override": { + "question": "Wann hat dieser Hackerspace geöffnet?" + } } }, "title": { @@ -6105,6 +6125,11 @@ }, "question": "Wo befindet sich dieser Container?" }, + "opening_hours_24_7": { + "override": { + "question": "Wie sind die Öffnungszeiten dieser Recyclinganlage?" + } + }, "operator": { "question": "Welches Unternehmen betreibt diese Recyclinganlage?", "render": "Diese Recyclinganlage wird betrieben von {operator}" @@ -6276,8 +6301,8 @@ "special": { "no_known_languages": "Die Unterrichtssprache der Schule ist unbekannt", "question": "Was ist die Hauptsprache dieser Schule?
Welche Sprache wird mit den Schülern in den nicht sprachbezogenen Kursen und mit der Verwaltung gesprochen?
", - "render_single_language": "{language():font-bold} ist die Hauptsprache der Schule", - "render_all": "Folgende Sprachen werden in der Schule verwendet:{list()}" + "render_all": "Folgende Sprachen werden in der Schule verwendet:{list()}", + "render_single_language": "{language():font-bold} ist die Hauptsprache der Schule" } } }, @@ -6722,17 +6747,7 @@ }, "question": "Gibt es eine Rampe an dieser Treppe?" }, - "tactile_writing_language": { - "render": { - "special": { - "render_single_language": "Die Treppe hat taktile Schrift in {language():font-bold}", - "question": "In welchen Sprachen gibt es taktile Schrift (Braille) für die Navigation? ", - "render_list_item": "Die Treppe hat taktile Schrift in {language():font-bold}" - } - } - }, "tactile_writing": { - "question": "Hat die Treppe eine taktile Schrift am Handlauf?", "mappings": { "0": { "then": "Am Handlauf gibt es taktile Schrift" @@ -6740,6 +6755,16 @@ "1": { "then": "Am Handlauf gibt es keine taktile Schrift" } + }, + "question": "Hat die Treppe eine taktile Schrift am Handlauf?" + }, + "tactile_writing_language": { + "render": { + "special": { + "question": "In welchen Sprachen gibt es taktile Schrift (Braille) für die Navigation? ", + "render_list_item": "Die Treppe hat taktile Schrift in {language():font-bold}", + "render_single_language": "Die Treppe hat taktile Schrift in {language():font-bold}" + } } } }, @@ -7331,11 +7356,6 @@ "wheelchair-door-width": { "question": "Wie breit ist die Tür zur rollstuhlgerechten Toilette?", "render": "Die Tür zur rollstuhlgerechten Toilette ist {canonical(toilets:door:width)} breit" - }, - "opening_hours": { - "override": { - "question": "Wann ist die Einrichtung, in der sich die Toilette befindet, geöffnet?" - } } }, "title": { @@ -8003,4 +8023,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/layers/en.json b/langs/layers/en.json index b8de71c36..24956f5d6 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -619,6 +619,11 @@ } }, "question": "Are there tools here to repair your own bike?" + }, + "opening_hours": { + "override": { + "question": "When it this bike café opened?" + } } }, "title": { @@ -917,6 +922,11 @@ "question": "What valves are supported?", "render": "This pump supports the following valves: {valves}" }, + "opening_hours_24_7": { + "override": { + "question": "When is this bicycle repair point open?" + } + }, "send_email_about_broken_pump": { "render": { "special": { @@ -1522,6 +1532,11 @@ "question": "Is this charging station part of a network?", "render": "Part of the network {network}" }, + "OH": { + "override": { + "question": "When is this charging station opened?" + } + }, "Operational status": { "mappings": { "0": { @@ -3247,6 +3262,11 @@ }, "question": "When was this defibrillator last surveyed?", "render": "This defibrillator was last surveyed on {survey:date}" + }, + "opening_hours_24_7": { + "override": { + "question": "At what times is this defibrillator available?" + } } }, "title": { @@ -4317,6 +4337,11 @@ } }, "question": "Is this a hackerspace or a makerspace?" + }, + "opening_hours_24_7": { + "override": { + "question": "When is this hackerspace opened?" + } } }, "title": { @@ -5513,6 +5538,11 @@ } }, "name": "pharmacy", + "presets": { + "0": { + "title": "a pharmacy" + } + }, "tagRenderings": { "name": { "freeform": { @@ -6105,6 +6135,11 @@ }, "question": "Where is this container located?" }, + "opening_hours_24_7": { + "override": { + "question": "What are the opening hours of this recycling facility?" + } + }, "operator": { "question": "What company operates this recycling facility?", "render": "This recycling facility is operated by {operator}" @@ -8003,4 +8038,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/layers/es.json b/langs/layers/es.json index 27b2caff5..b92a72156 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -826,6 +826,11 @@ "question": "¿Que válvulas se soportan?", "render": "Esta bomba soporta las siguiente válvulas: {valves}" }, + "opening_hours_24_7": { + "override": { + "question": "¿Cuándo está abierto este punto de reparación de bicicletas?" + } + }, "send_email_about_broken_pump": { "render": { "special": { @@ -2035,6 +2040,11 @@ }, "question": "¿Cuándo se sondeó por última vez este desfibrilador?", "render": "Este desfibrilador se sondeó por última vez el {survey:date}" + }, + "opening_hours_24_7": { + "override": { + "question": "¿A qué horas está disponible este desfibrilador?" + } } }, "title": { @@ -2541,6 +2551,11 @@ } }, "question": "¿Esto es un espacio hacker o un espacio maker?" + }, + "opening_hours_24_7": { + "override": { + "question": "¿Cuándo está abierto este espacio hacker?" + } } }, "title": { @@ -3211,6 +3226,11 @@ }, "question": "¿Dónde se sitúa este contenedor?" }, + "opening_hours_24_7": { + "override": { + "question": "¿A qué horas abre esta facilidad de reciclado?" + } + }, "operator": { "question": "¿Que empresa opera esta facilidad de reciclado?", "render": "Esta infraestructura de reciclado la opera {operator}" @@ -4044,4 +4064,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 522525e6a..0b466e83f 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -608,6 +608,11 @@ } }, "question": "Est-ce qu'il y a des outils pour réparer soi-même son vélo ?" + }, + "opening_hours": { + "override": { + "question": "Quand ce Café vélo est-t-il ouvert ?" + } } }, "title": { @@ -906,6 +911,11 @@ "question": "Quelles valves sont compatibles ?", "render": "Cette pompe est compatible avec les valves suivantes : {valves}" }, + "opening_hours_24_7": { + "override": { + "question": "Quand ce point de réparation de vélo est-il ouvert ?" + } + }, "send_email_about_broken_pump": { "render": { "special": { @@ -2102,6 +2112,11 @@ }, "question": "Quand le défibrillateur a-t-il été vérifié pour la dernière fois ?", "render": "Ce défibrillateur a été vérifié pour la dernière fois le {survey:date}" + }, + "opening_hours_24_7": { + "override": { + "question": "À quels horaires ce défibrillateur est-il accessible ?" + } } }, "title": { @@ -4507,4 +4522,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/layers/gl.json b/langs/layers/gl.json index 920efe0be..fd39abfaa 100644 --- a/langs/layers/gl.json +++ b/langs/layers/gl.json @@ -387,4 +387,4 @@ "render": "Bicicleta pantasma" } } -} +} \ No newline at end of file diff --git a/langs/layers/it.json b/langs/layers/it.json index e6f096416..5bb2a1722 100644 --- a/langs/layers/it.json +++ b/langs/layers/it.json @@ -350,6 +350,11 @@ } }, "question": "Ci sono degli strumenti per riparare la propria bicicletta?" + }, + "opening_hours": { + "override": { + "question": "Quando è aperto questo caffè in bici?" + } } }, "title": { @@ -591,6 +596,11 @@ }, "question": "Quali valvole sono supportate?", "render": "Questa pompa è compatibile con le seguenti valvole: {valves}" + }, + "opening_hours_24_7": { + "override": { + "question": "Quando è aperto questo punto riparazione bici?" + } } }, "title": { @@ -1138,6 +1148,11 @@ }, "question": "Quando è stato verificato per l’ultima volta questo defibrillatore?", "render": "Questo defibrillatore è stato verificato per l‘ultima volta in data {survey:date}" + }, + "opening_hours_24_7": { + "override": { + "question": "In quali orari è disponibile questo defibrillatore?" + } } }, "title": { @@ -1811,6 +1826,11 @@ }, "question": "Dove si trova questo contenitore?" }, + "opening_hours_24_7": { + "override": { + "question": "Quali sono gli orari di apertura di questo impianto di raccolta e riciclo?" + } + }, "operator": { "question": "Quale azienda gestisce questo impianto di raccolta e riciclo?", "render": "Questa struttura di raccola e riciclo è gestita da {operator}" @@ -2687,4 +2707,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/layers/nl.json b/langs/layers/nl.json index db1e6f44d..1f996ea53 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -619,6 +619,11 @@ } }, "question": "Biedt dit fietscafé gereedschap aan om je fiets zelf te herstellen?" + }, + "opening_hours": { + "override": { + "question": "Wanneer is dit fietscafé geopend?" + } } }, "title": { @@ -917,6 +922,11 @@ "question": "Welke ventielen werken er met de pomp?", "render": "Deze pomp werkt met de volgende ventielen: {valves}" }, + "opening_hours_24_7": { + "override": { + "question": "Wanneer is dit fietsherstelpunt open?" + } + }, "send_email_about_broken_pump": { "render": { "special": { @@ -1531,6 +1541,11 @@ "question": "Is dit oplaadpunt deel van een groter netwerk?", "render": "Maakt deel uit van het {network}-netwerk" }, + "OH": { + "override": { + "question": "Wanneer is dit oplaadpunt beschikbaar??" + } + }, "Operational status": { "mappings": { "0": { @@ -2430,6 +2445,7 @@ }, "title": { "mappings": { + "0": {}, "1": { "then": "Klimsite {name}" }, @@ -3193,6 +3209,11 @@ }, "question": "Wanneer is deze defibrillator het laatst gecontroleerd in OpenStreetMap?", "render": "Deze defibrillator is nagekeken in OSM op {survey:date}" + }, + "opening_hours_24_7": { + "override": { + "question": "Wanneer is deze defibrillator beschikbaar?" + } } }, "title": { @@ -4119,6 +4140,11 @@ } }, "question": "Is dit een hackerspace of een makerspace?" + }, + "opening_hours_24_7": { + "override": { + "question": "Wanneer is deze hackerspace geopend?" + } } }, "title": { @@ -5017,6 +5043,31 @@ } } }, + "osm_community_index": { + "filter": { + "0": { + "options": { + "0": { + "question": "Land" + } + } + }, + "2": { + "options": { + "0": { + "question": "Regio" + } + } + }, + "5": { + "options": { + "0": { + "question": "Wereld" + } + } + } + } + }, "parcel_lockers": { "description": "Laag met pakketautomaten voor het ophalen en verzenden van paketten.", "name": "Pakketautomaten", @@ -5257,6 +5308,11 @@ } }, "name": "apotheek", + "presets": { + "0": { + "title": "een apotheek" + } + }, "tagRenderings": { "name": { "freeform": { @@ -5726,6 +5782,11 @@ }, "question": "Waar bevindt deze container zich?" }, + "opening_hours_24_7": { + "override": { + "question": "Wat zijn de openingstijden van deze recyclingfaciliteit?" + } + }, "operator": { "question": "Wat is de beheerder van deze recyclingfaciliteit?", "render": "Deze recyclingfaciliteit wordt beheerd door {operator}" @@ -7211,9 +7272,6 @@ }, "walls_and_buildings": { "description": "Speciale laag met alle muren en gebouwen. Deze laag is nuttig om objecten toe te voegen die met een muur verbonden zijn (zoals AEDs, brievenbussen, adressen, bewakingscamera's,…). Deze laag is standaard onzichtbaar en kan niet aangezet worden door de gebruiker.", - "title": { - "render": "Muur of gebouw" - }, "tagRenderings": { "entrance_info": { "render": { @@ -7222,6 +7280,9 @@ } } } + }, + "title": { + "render": "Muur of gebouw" } }, "waste_basket": { @@ -7488,30 +7549,5 @@ } } } - }, - "osm_community_index": { - "filter": { - "2": { - "options": { - "0": { - "question": "Regio" - } - } - }, - "0": { - "options": { - "0": { - "question": "Land" - } - } - }, - "5": { - "options": { - "0": { - "question": "Wereld" - } - } - } - } } -} +} \ No newline at end of file diff --git a/langs/layers/pt.json b/langs/layers/pt.json index c00ac3940..416879e83 100644 --- a/langs/layers/pt.json +++ b/langs/layers/pt.json @@ -286,6 +286,11 @@ } }, "question": "Há ferramentas aqui para consertar a sua própria bicicleta?" + }, + "opening_hours": { + "override": { + "question": "Quando este café de bicicleta abre?" + } } }, "title": { @@ -557,4 +562,4 @@ "render": "Bicicleta fantasma" } } -} +} \ No newline at end of file diff --git a/langs/layers/pt_BR.json b/langs/layers/pt_BR.json index 478c37cb8..01462001c 100644 --- a/langs/layers/pt_BR.json +++ b/langs/layers/pt_BR.json @@ -228,6 +228,11 @@ } }, "question": "Há ferramentas aqui para consertar sua bicicleta?" + }, + "opening_hours": { + "override": { + "question": "Quando este café de bicicleta abre?" + } } }, "title": { @@ -511,4 +516,4 @@ "render": "Bicicleta fantasma" } } -} +} \ No newline at end of file diff --git a/langs/layers/ru.json b/langs/layers/ru.json index 5438d6ba4..24eb173d7 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -378,6 +378,11 @@ } }, "question": "Есть ли здесь инструменты для починки вашего велосипеда?" + }, + "opening_hours": { + "override": { + "question": "Каков режим работы этого велосипедного кафе?" + } } }, "title": { @@ -514,6 +519,11 @@ } }, "render": "Этот насос поддерживает следующие клапаны: {valves}" + }, + "opening_hours_24_7": { + "override": { + "question": "Когда работает эта точка обслуживания велосипедов?" + } } }, "title": { @@ -855,6 +865,11 @@ "then": "Проверено сегодня!" } } + }, + "opening_hours_24_7": { + "override": { + "question": "В какое время доступен этот дефибриллятор?" + } } }, "title": { @@ -1719,4 +1734,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/layers/sl.json b/langs/layers/sl.json index b0d755a9e..078809f9a 100644 --- a/langs/layers/sl.json +++ b/langs/layers/sl.json @@ -112,10 +112,15 @@ }, "question": "Kdaj je bil ta defibrilator nazadnje opažen?", "render": "Ta defibrilator je bil nazadnje opažen {survey:date}" + }, + "opening_hours_24_7": { + "override": { + "question": "Ob katerih urah je ta defibrilator na voljo?" + } } }, "title": { "render": "Defibrilator" } } -} +} \ No newline at end of file diff --git a/langs/layers/zh_Hans.json b/langs/layers/zh_Hans.json index f1e2f8da4..92595fa0a 100644 --- a/langs/layers/zh_Hans.json +++ b/langs/layers/zh_Hans.json @@ -216,6 +216,11 @@ } }, "question": "这里有供你修车用的工具吗？" + }, + "opening_hours": { + "override": { + "question": "这家自行车咖啡什么时候开门营业？" + } } }, "title": { @@ -227,4 +232,4 @@ "render": "自行车咖啡" } } -} +} \ No newline at end of file diff --git a/langs/layers/zh_Hant.json b/langs/layers/zh_Hant.json index 0f308f070..d47a79da9 100644 --- a/langs/layers/zh_Hant.json +++ b/langs/layers/zh_Hant.json @@ -317,6 +317,11 @@ } }, "question": "這裡是否有工具修理你的單車嗎？" + }, + "opening_hours": { + "override": { + "question": "何時這個單車咖啡廳營運？" + } } }, "title": { @@ -533,6 +538,11 @@ } }, "question": "這邊是駭客空間還是創客空間？" + }, + "opening_hours_24_7": { + "override": { + "question": "這個駭客空間的營業時間？" + } } }, "title": { @@ -642,4 +652,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/pt_BR.json b/langs/pt_BR.json index cea10c926..901989fbe 100644 --- a/langs/pt_BR.json +++ b/langs/pt_BR.json @@ -11,9 +11,9 @@ "delete": "Excluir", "explanations": { "hardDelete": "Este ponto será excluído no OpenStreetMap. Pode ser recuperado por um colaborador experiente", - "selectReason": "Por favor, selecione por que este recurso deve ser excluído", "retagNoOtherThemes": "Este recurso será reclassificado e ocultado deste aplicativo", - "retagOtherThemes": "Este recurso será remarcado e ficará visível em {otherThemes}" + "retagOtherThemes": "Este recurso será remarcado e ficará visível em {otherThemes}", + "selectReason": "Por favor, selecione por que este recurso deve ser excluído" } }, "favourite": {