From 3eea54d1d834f0d36af19e5c73e74437b4c83537 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 28 Dec 2022 00:48:47 +0100 Subject: [PATCH] Housekeeping... --- Docs/BuiltinIndex.md | 4 +- Docs/BuiltinLayers.md | 1 - Docs/BuiltinQuestions.md | 2 +- Docs/Layers/atm.md | 89 ++- Docs/Layers/bike_shop.md | 16 +- Docs/Layers/parking_spaces.md | 13 + Docs/Layers/recycling.md | 28 +- Docs/Layers/ticket_machine.md | 2 +- Docs/Layers/ticket_validator.md | 2 +- Docs/Layers/toilet.md | 16 +- Docs/TagInfo/mapcomplete_cyclofix.json | 574 +++++++++--------- Docs/TagInfo/mapcomplete_onwheels.json | 21 + Docs/TagInfo/mapcomplete_parkings.json | 16 + Docs/TagInfo/mapcomplete_personal.json | 122 +++- Docs/TagInfo/mapcomplete_waste.json | 10 + Docs/Themes/bag.md | 1 + Docs/Themes/blind_osm.md | 1 + Docs/Themes/cyclofix.md | 2 +- Docs/Themes/natuurpunt.md | 1 - Docs/Themes/onwheels.md | 1 + Docs/wikiIndex.txt | 2 +- assets/contributors.json | 20 +- assets/layers/address/address.json | 12 +- assets/layers/artwork/artwork.json | 3 +- assets/layers/atm/atm.json | 7 +- .../layers/bicycle_rental/bicycle_rental.json | 8 +- assets/layers/bike_shop/bike_shop.json | 8 +- .../surveillance_camera.json | 8 +- .../ticket_validator/ticket_validator.json | 2 +- assets/layers/waste_basket/waste_basket.json | 4 +- assets/tagRenderings/questions.json | 28 +- assets/themes/bag/bag.json | 3 +- assets/themes/blind_osm/blind_osm.json | 3 +- assets/themes/cyclofix/cyclofix.json | 2 +- assets/themes/natuurpunt/natuurpunt.json | 2 +- assets/themes/transit/transit.json | 3 +- assets/translators.json | 18 +- langs/layers/da.json | 3 - langs/layers/de.json | 31 +- langs/layers/en.json | 2 +- langs/layers/fr.json | 3 - langs/layers/id.json | 3 - langs/layers/nb_NO.json | 16 +- langs/layers/ru.json | 3 - langs/nb_NO.json | 236 +++---- langs/shared-questions/de.json | 2 +- langs/shared-questions/en.json | 2 +- langs/shared-questions/nb_NO.json | 58 +- langs/themes/nb_NO.json | 18 +- 49 files changed, 839 insertions(+), 593 deletions(-) diff --git a/Docs/BuiltinIndex.md b/Docs/BuiltinIndex.md index 52e764986e..8b46f5d17f 100644 --- a/Docs/BuiltinIndex.md +++ b/Docs/BuiltinIndex.md @@ -127,6 +127,7 @@ - observation_tower - parcel_lockers - parking + - parking_spaces - pharmacy - physiotherapist - picnic_table @@ -155,7 +156,6 @@ - viewpoint - village_green - waste_basket - - watermill - windturbine @@ -365,7 +365,6 @@ - observation_tower - shops - ticket_validator - - toilet @@ -807,6 +806,7 @@ - ticket_machine + - toilet diff --git a/Docs/BuiltinLayers.md b/Docs/BuiltinLayers.md index 9a27bdbf3c..ac9e202014 100644 --- a/Docs/BuiltinLayers.md +++ b/Docs/BuiltinLayers.md @@ -1040,7 +1040,6 @@ The following layers are included in MapComplete: - [walls_and_buildings](./Layers/walls_and_buildings.md) - [waste_basket](./Layers/waste_basket.md) - [waste_disposal](./Layers/waste_disposal.md) - - [watermill](./Layers/watermill.md) - [windturbine](./Layers/windturbine.md) diff --git a/Docs/BuiltinQuestions.md b/Docs/BuiltinQuestions.md index cd54d7d1e5..3307b18369 100644 --- a/Docs/BuiltinQuestions.md +++ b/Docs/BuiltinQuestions.md @@ -366,7 +366,7 @@ Which methods of payment are accepted here? -With what coins can you pay here? +What coins can you use to pay here? diff --git a/Docs/Layers/atm.md b/Docs/Layers/atm.md index 80e5f2e7ff..67ab2a20c6 100644 --- a/Docs/Layers/atm.md +++ b/Docs/Layers/atm.md @@ -7,7 +7,7 @@ -ATMS to withdraw money +ATMs to withdraw money @@ -63,6 +63,9 @@ 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) | [](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/cash_out#values) [cash_out](https://wiki.openstreetmap.org/wiki/Key:cash_out) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:cash_out%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:cash_out%3Dno) +[](https://taginfo.openstreetmap.org/keys/cash_in#values) [cash_in](https://wiki.openstreetmap.org/wiki/Key:cash_in) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:cash_in%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:cash_in%3Dno) +[](https://taginfo.openstreetmap.org/keys/speech_output#values) [speech_output](https://wiki.openstreetmap.org/wiki/Key:speech_output) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:speech_output%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:speech_output%3Dno) @@ -153,6 +156,90 @@ This rendering asks information about the property [opening_hours](https://wiki This is rendered with `

Opening hours

{opening_hours_table(opening_hours)}` + + + + +### cash_out + + + +The question is *Can you withdraw cash from this ATM?* + + + + + + - *You can withdraw cash from this ATM* corresponds with `` + - This option cannot be chosen as answer + - *You can withdraw cash from this ATM* corresponds with `cash_out=yes` + - *You cannot withdraw cash from this ATM* corresponds with `cash_out=no` + + + + +### cash_in + + + +The question is *Can you deposit cash into this ATM?* + + + + + + - *You probably cannot deposit cash into this ATM* corresponds with `` + - This option cannot be chosen as answer + - *You can deposit cash into this ATM* corresponds with `cash_in=yes` + - *You cannot deposit cash into this ATM* corresponds with `cash_in=no` + + + + +### speech_output + + + +The question is *Does this ATM have speech output for visually impaired users?* + + + + + + - *This ATM has speech output, usually available through a headphone jack* corresponds with `speech_output=yes` + - *This ATM does not have speech output* corresponds with `speech_output=no` + + + + +### speech_output_language + + + +This tagrendering has no question and is thus read-only + + + +This tagrendering is only visible in the popup if the following condition is met: `speech_output=yes` + + + +#### Filters + + + + + +id | question | osmTags +---- | ---------- | --------- +open_now.0 | Opened now | _isOpen=yes + + + + +id | question | osmTags +---- | ---------- | --------- +speech_output.0 | With speech output | speech_output=yes This document is autogenerated from [assets/layers/atm/atm.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/atm/atm.json) \ No newline at end of file diff --git a/Docs/Layers/bike_shop.md b/Docs/Layers/bike_shop.md index a9f8498016..381fe224fb 100644 --- a/Docs/Layers/bike_shop.md +++ b/Docs/Layers/bike_shop.md @@ -293,6 +293,8 @@ This is rendered with `{rental} is rented here` - *Bike helmets can be rented here* corresponds with `rental=bike_helmet` +This tagrendering is only visible in the popup if the following condition is met: `service:bicycle:rental=yes` + This tagrendering has labels `bicycle_rental` @@ -309,7 +311,7 @@ This is rendered with `{capacity:city_bike} city bikes can be rented here` -This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*city_bike.*)$` +This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*city_bike.*)$&service:bicycle:rental=yes` This tagrendering has labels `bicycle_rental` @@ -327,7 +329,7 @@ This is rendered with `{capacity:ebike} electrical bikes can be rented here` -This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*ebike.*)$` +This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*ebike.*)$&service:bicycle:rental=yes` This tagrendering has labels `bicycle_rental` @@ -345,7 +347,7 @@ This is rendered with `{capacity:kid_bike} bikes for children can be rented her -This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*kid_bike.*)$` +This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*kid_bike.*)$&service:bicycle:rental=yes` This tagrendering has labels `bicycle_rental` @@ -363,7 +365,7 @@ This is rendered with `{capacity:bmx} BMX bikes can be rented here` -This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bmx.*)$` +This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bmx.*)$&service:bicycle:rental=yes` This tagrendering has labels `bicycle_rental` @@ -381,7 +383,7 @@ This is rendered with `{capacity:mtb} mountainbike can be rented here` -This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*mtb.*)$` +This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*mtb.*)$&service:bicycle:rental=yes` This tagrendering has labels `bicycle_rental` @@ -399,7 +401,7 @@ This is rendered with `{capacity:bicycle_pannier} bicycle panniers can be rente -This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bicycle_pannier.*)$` +This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bicycle_pannier.*)$&service:bicycle:rental=yes` This tagrendering has labels `bicycle_rental` @@ -417,7 +419,7 @@ This is rendered with `{capacity:tandem_bicycle} tandem can be rented here` -This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*tandem_bicycle.*)$` +This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*tandem_bicycle.*)$&service:bicycle:rental=yes` This tagrendering has labels `bicycle_rental` diff --git a/Docs/Layers/parking_spaces.md b/Docs/Layers/parking_spaces.md index b6a1c4186f..bfc42eb085 100644 --- a/Docs/Layers/parking_spaces.md +++ b/Docs/Layers/parking_spaces.md @@ -25,6 +25,7 @@ Layer showing individual parking spaces. + - [onwheels](https://mapcomplete.osm.be/onwheels) - [parkings](https://mapcomplete.osm.be/parkings) - [personal](https://mapcomplete.osm.be/personal) @@ -66,6 +67,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 + + + + + ### type diff --git a/Docs/Layers/recycling.md b/Docs/Layers/recycling.md index 6a0913eef2..4183ed3498 100644 --- a/Docs/Layers/recycling.md +++ b/Docs/Layers/recycling.md @@ -162,6 +162,8 @@ The question is *What can be recycled here?* - Unselecting this answer will add - *Engine oil can be recycled here* corresponds with `recycling:engine_oil=yes` - Unselecting this answer will add + - *Fluorescent tubes can be recycled here* corresponds with `recycling:fluorescent_tubes=yes` + - Unselecting this answer will add - *Green waste can be recycled here* corresponds with `recycling:green_waste=yes` - Unselecting this answer will add - *Organic waste can be recycled here* corresponds with `recycling:organic=yes` @@ -171,6 +173,8 @@ The question is *What can be recycled here?* - Unselecting this answer will add - *Glass can be recycled here* corresponds with `recycling:glass=yes` - Unselecting this answer will add + - *Light bulbs can be recycled here* corresponds with `recycling:light_bulbs=yes` + - Unselecting this answer will add - *Newspapers can be recycled here* corresponds with `recycling:newspaper=yes` - Unselecting this answer will add - *Paper can be recycled here* corresponds with `recycling:paper=yes` @@ -319,17 +323,19 @@ recyclingType.3 | Recycling of cans | recycling:cans=yes recyclingType.4 | Recycling of clothes | recycling:clothes=yes recyclingType.5 | Recycling of cooking oil | recycling:cooking_oil=yes recyclingType.6 | Recycling of engine oil | recycling:engine_oil=yes -recyclingType.7 | Recycling of green waste | recycling:green_waste=yes\|recycling:organic=yes -recyclingType.8 | Recycling of glass bottles | recycling:glass_bottles=yes -recyclingType.9 | Recycling of glass | recycling:glass=yes -recyclingType.10 | Recycling of newspapers | recycling:newspaper=yes -recyclingType.11 | Recycling of paper | recycling:paper=yes -recyclingType.12 | Recycling of plastic bottles | recycling:plastic_bottles=yes -recyclingType.13 | Recycling of plastic packaging | recycling:plastic_packaging=yes -recyclingType.14 | Recycling of plastic | recycling:plastic=yes -recyclingType.15 | Recycling of scrap metal | recycling:scrap_metal=yes -recyclingType.16 | Recycling of small electrical appliances | recycling:small_appliances=yes\|recycling:small_electrical_appliances=yes -recyclingType.17 | Recycling of residual waste | recycling:waste=yes +recyclingType.7 | Recycling of fluorescent tubes | recycling:fluorescent_tubes=yes +recyclingType.8 | Recycling of green waste | recycling:green_waste=yes\|recycling:organic=yes +recyclingType.9 | Recycling of glass bottles | recycling:glass_bottles=yes +recyclingType.10 | Recycling of glass | recycling:glass=yes +recyclingType.11 | Recycling of light bulbs | recycling:light_bulbs=yes +recyclingType.12 | Recycling of newspapers | recycling:newspaper=yes +recyclingType.13 | Recycling of paper | recycling:paper=yes +recyclingType.14 | Recycling of plastic bottles | recycling:plastic_bottles=yes +recyclingType.15 | Recycling of plastic packaging | recycling:plastic_packaging=yes +recyclingType.16 | Recycling of plastic | recycling:plastic=yes +recyclingType.17 | Recycling of scrap metal | recycling:scrap_metal=yes +recyclingType.18 | Recycling of small electrical appliances | recycling:small_appliances=yes\|recycling:small_electrical_appliances=yes +recyclingType.19 | Recycling of residual waste | recycling:waste=yes 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/ticket_machine.md b/Docs/Layers/ticket_machine.md index d57e566f9b..56e31abbcf 100644 --- a/Docs/Layers/ticket_machine.md +++ b/Docs/Layers/ticket_machine.md @@ -144,7 +144,7 @@ The question is *Which methods of payment are accepted here?* -The question is *With what coins can you pay here?* +The question is *What coins can you use to pay here?* diff --git a/Docs/Layers/ticket_validator.md b/Docs/Layers/ticket_validator.md index 9f5255be1a..ef86f6fcd6 100644 --- a/Docs/Layers/ticket_validator.md +++ b/Docs/Layers/ticket_validator.md @@ -138,9 +138,9 @@ The question is *Which methods of payment are accepted here?* - *Payment cards are accepted here* corresponds with `payment:cards=yes` - Unselecting this answer will add payment:cards=no - *This ticket validator accepts OV-Chipkaart* corresponds with `payment:OV-Chipkaart=yes` + - This option cannot be chosen as answer - Unselecting this answer will add payment:OV-Chipkaart=no - *This ticket validator accepts OV-Chipkaart* corresponds with `payment:ov-chipkaart=yes` - - This option cannot be chosen as answer - Unselecting this answer will add payment:ov-chipkaart=no diff --git a/Docs/Layers/toilet.md b/Docs/Layers/toilet.md index e73fa5c91a..ec72a6ef45 100644 --- a/Docs/Layers/toilet.md +++ b/Docs/Layers/toilet.md @@ -172,7 +172,7 @@ This tagrendering is only visible in the popup if the following condition is met -### payment-options +### payment-options-split @@ -183,9 +183,19 @@ The question is *Which methods of payment are accepted here?* - *Cash is accepted here* corresponds with `payment:cash=yes` - - Unselecting this answer will add payment:cash=no + - This option cannot be chosen as answer + - Unselecting this answer will add - *Payment cards are accepted here* corresponds with `payment:cards=yes` - - Unselecting this answer will add payment:cards=no + - This option cannot be chosen as answer + - Unselecting this answer will add + - *Coins are accepted here* corresponds with `payment:coins=yes` + - Unselecting this answer will add payment:coins=no + - *Bank notes are accepted here* corresponds with `payment:notes=yes` + - Unselecting this answer will add payment:notes=no + - *Debit cards are accepted here* corresponds with `payment:debit_cards=yes` + - Unselecting this answer will add payment_debit_cards=no + - *Credit cards are accepted here* corresponds with `payment:credit_cards=yes` + - Unselecting this answer will add payment:credit_cards=no This tagrendering is only visible in the popup if the following condition is met: `fee=yes` diff --git a/Docs/TagInfo/mapcomplete_cyclofix.json b/Docs/TagInfo/mapcomplete_cyclofix.json index f12df8e59a..37bf9d1d17 100644 --- a/Docs/TagInfo/mapcomplete_cyclofix.json +++ b/Docs/TagInfo/mapcomplete_cyclofix.json @@ -128,6 +128,293 @@ "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')" }, + { + "key": "shop", + "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bike repair/shop showing features with this tag", + "value": "bicycle" + }, + { + "key": "amenity", + "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bike repair/shop showing features with this tag", + "value": "bicycle_rental" + }, + { + "key": "network", + "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bike repair/shop showing features with this tag", + "value": "" + }, + { + "key": "shop", + "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bike repair/shop showing features with this tag", + "value": "sports" + }, + { + "key": "sport", + "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bike repair/shop showing features with this tag", + "value": "bicycle" + }, + { + "key": "sport", + "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bike repair/shop showing features with this tag", + "value": "cycling" + }, + { + "key": "sport", + "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bike repair/shop showing features with this tag", + "value": "" + }, + { + "key": "image", + "description": "The layer 'Bike repair/shop 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 'Bike repair/shop 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 'Bike repair/shop 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 'Bike repair/shop 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": "shop", + "description": "Layer 'Bike repair/shop' shows shop=rental with a fixed text, namely 'This business focuses on rental' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if shop~.+&shop!~^(bicycle)$&shop!~^(sports)$)", + "value": "rental" + }, + { + "key": "name", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')" + }, + { + "key": "website", + "description": "Layer 'Bike repair/shop' 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 repair/shop' 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 repair/shop' 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 repair/shop' 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 repair/shop' 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 repair/shop' 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 repair/shop' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')" + }, + { + "key": "access", + "description": "Layer 'Bike repair/shop' shows values with key 'access' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')" + }, + { + "key": "service:bicycle:retail", + "description": "Layer 'Bike repair/shop' shows service:bicycle:retail=yes with a fixed text, namely 'This shop sells bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "yes" + }, + { + "key": "service:bicycle:retail", + "description": "Layer 'Bike repair/shop' shows service:bicycle:retail=no with a fixed text, namely 'This shop doesn't sell bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "no" + }, + { + "key": "service:bicycle:repair", + "description": "Layer 'Bike repair/shop' shows service:bicycle:repair=yes with a fixed text, namely 'This shop repairs bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "yes" + }, + { + "key": "service:bicycle:repair", + "description": "Layer 'Bike repair/shop' shows service:bicycle:repair=no with a fixed text, namely 'This shop doesn't repair bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "no" + }, + { + "key": "service:bicycle:repair", + "description": "Layer 'Bike repair/shop' shows service:bicycle:repair=only_sold with a fixed text, namely 'This shop only repairs bikes bought here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "only_sold" + }, + { + "key": "service:bicycle:repair", + "description": "Layer 'Bike repair/shop' shows service:bicycle:repair=brand with a fixed text, namely 'This shop only repairs bikes of a certain brand' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "brand" + }, + { + "key": "service:bicycle:rental", + "description": "Layer 'Bike repair/shop' shows service:bicycle:rental=yes with a fixed text, namely 'This shop rents out bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "yes" + }, + { + "key": "service:bicycle:rental", + "description": "Layer 'Bike repair/shop' shows service:bicycle:rental=no with a fixed text, namely 'This shop doesn't rent out bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "no" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'rental' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if service:bicycle:rental=yes)" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=city_bike with a fixed text, namely 'Normal city bikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if service:bicycle:rental=yes)", + "value": "city_bike" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=ebike with a fixed text, namely 'Electrical bikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if service:bicycle:rental=yes)", + "value": "ebike" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=bmx with a fixed text, namely 'BMX bikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if service:bicycle:rental=yes)", + "value": "bmx" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=mtb with a fixed text, namely 'Mountainbikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if service:bicycle:rental=yes)", + "value": "mtb" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=kid_bike with a fixed text, namely 'Bikes for children can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if service:bicycle:rental=yes)", + "value": "kid_bike" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=tandem with a fixed text, namely 'Tandem bicycles can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if service:bicycle:rental=yes)", + "value": "tandem" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=racebike with a fixed text, namely 'Race bicycles can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if service:bicycle:rental=yes)", + "value": "racebike" + }, + { + "key": "rental", + "description": "Layer 'Bike repair/shop' shows rental=bike_helmet with a fixed text, namely 'Bike helmets can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if service:bicycle:rental=yes)", + "value": "bike_helmet" + }, + { + "key": "capacity:city_bike", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:city_bike' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if rental~^(.*city_bike.*)$&service:bicycle:rental=yes)" + }, + { + "key": "capacity:ebike", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:ebike' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if rental~^(.*ebike.*)$&service:bicycle:rental=yes)" + }, + { + "key": "capacity:kid_bike", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:kid_bike' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if rental~^(.*kid_bike.*)$&service:bicycle:rental=yes)" + }, + { + "key": "capacity:bmx", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bmx' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if rental~^(.*bmx.*)$&service:bicycle:rental=yes)" + }, + { + "key": "capacity:mtb", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:mtb' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if rental~^(.*mtb.*)$&service:bicycle:rental=yes)" + }, + { + "key": "capacity:bicycle_pannier", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if rental~^(.*bicycle_pannier.*)$&service:bicycle:rental=yes)" + }, + { + "key": "capacity:tandem_bicycle", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if rental~^(.*tandem_bicycle.*)$&service:bicycle:rental=yes)" + }, + { + "key": "service:bicycle:second_hand", + "description": "Layer 'Bike repair/shop' shows service:bicycle:second_hand=yes with a fixed text, namely 'This shop sells second-hand bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "yes" + }, + { + "key": "service:bicycle:second_hand", + "description": "Layer 'Bike repair/shop' shows service:bicycle:second_hand=no with a fixed text, namely 'This shop doesn't sell second-hand bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "no" + }, + { + "key": "service:bicycle:second_hand", + "description": "Layer 'Bike repair/shop' shows service:bicycle:second_hand=only with a fixed text, namely 'This shop only sells second-hand bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "only" + }, + { + "key": "service:bicycle:pump", + "description": "Layer 'Bike repair/shop' shows service:bicycle:pump=yes with a fixed text, namely 'This shop offers a bike pump for anyone' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "yes" + }, + { + "key": "service:bicycle:pump", + "description": "Layer 'Bike repair/shop' shows service:bicycle:pump=no with a fixed text, namely 'This shop doesn't offer a bike pump for anyone' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "no" + }, + { + "key": "service:bicycle:pump", + "description": "Layer 'Bike repair/shop' shows service:bicycle:pump=separate with a fixed text, namely 'There is bicycle pump, it is shown as a separate point' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "separate" + }, + { + "key": "service:bicycle:diy", + "description": "Layer 'Bike repair/shop' shows service:bicycle:diy=yes with a fixed text, namely 'This shop offers tools for DIY repair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "yes" + }, + { + "key": "service:bicycle:diy", + "description": "Layer 'Bike repair/shop' shows service:bicycle:diy=no with a fixed text, namely 'This shop doesn't offer tools for DIY repair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "no" + }, + { + "key": "service:bicycle:diy", + "description": "Layer 'Bike repair/shop' shows service:bicycle:diy=only_sold with a fixed text, namely 'Tools for DIY repair are only available if you bought/hire the bike in the shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "only_sold" + }, + { + "key": "service:bicycle:cleaning", + "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning=yes with a fixed text, namely 'This shop cleans bicycles' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "yes" + }, + { + "key": "service:bicycle:cleaning", + "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning=diy with a fixed text, namely 'This shop has an installation where one can clean bicycles themselves' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "diy" + }, + { + "key": "service:bicycle:cleaning", + "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning=no with a fixed text, namely 'This shop doesn't offer bicycle cleaning' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "no" + }, + { + "key": "service:bicycle:cleaning:charge", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'service:bicycle:cleaning:charge' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)" + }, + { + "key": "service:bicycle:cleaning:fee", + "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=no with a fixed text, namely 'The cleaning service is free to use' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)", + "value": "no" + }, + { + "key": "service:bicycle:cleaning:fee", + "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes with a fixed text, namely 'Free to use' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)", + "value": "yes" + }, + { + "key": "service:bicycle:cleaning:charge", + "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes with a fixed text, namely 'Free to use' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') Picking this answer will delete the key service:bicycle:cleaning:charge. (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)", + "value": "" + }, + { + "key": "description", + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'description' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')" + }, { "key": "amenity", "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bicycle rental showing features with this tag", @@ -332,293 +619,6 @@ "key": "capacity:tandem_bicycle", "description": "Layer 'Bicycle rental' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if rental~^(.*tandem_bicycle.*)$)" }, - { - "key": "shop", - "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bike repair/shop showing features with this tag", - "value": "bicycle" - }, - { - "key": "amenity", - "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bike repair/shop showing features with this tag", - "value": "bicycle_rental" - }, - { - "key": "network", - "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bike repair/shop showing features with this tag", - "value": "" - }, - { - "key": "shop", - "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bike repair/shop showing features with this tag", - "value": "sports" - }, - { - "key": "sport", - "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bike repair/shop showing features with this tag", - "value": "bicycle" - }, - { - "key": "sport", - "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bike repair/shop showing features with this tag", - "value": "cycling" - }, - { - "key": "sport", - "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bike repair/shop showing features with this tag", - "value": "" - }, - { - "key": "image", - "description": "The layer 'Bike repair/shop 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 'Bike repair/shop 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 'Bike repair/shop 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 'Bike repair/shop 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": "shop", - "description": "Layer 'Bike repair/shop' shows shop=rental with a fixed text, namely 'This business focuses on rental' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if shop~.+&shop!~^(bicycle)$&shop!~^(sports)$)", - "value": "rental" - }, - { - "key": "name", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')" - }, - { - "key": "website", - "description": "Layer 'Bike repair/shop' 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 repair/shop' 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 repair/shop' 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 repair/shop' 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 repair/shop' 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 repair/shop' 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 repair/shop' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')" - }, - { - "key": "access", - "description": "Layer 'Bike repair/shop' shows values with key 'access' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')" - }, - { - "key": "service:bicycle:retail", - "description": "Layer 'Bike repair/shop' shows service:bicycle:retail=yes with a fixed text, namely 'This shop sells bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "yes" - }, - { - "key": "service:bicycle:retail", - "description": "Layer 'Bike repair/shop' shows service:bicycle:retail=no with a fixed text, namely 'This shop doesn't sell bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "no" - }, - { - "key": "service:bicycle:repair", - "description": "Layer 'Bike repair/shop' shows service:bicycle:repair=yes with a fixed text, namely 'This shop repairs bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "yes" - }, - { - "key": "service:bicycle:repair", - "description": "Layer 'Bike repair/shop' shows service:bicycle:repair=no with a fixed text, namely 'This shop doesn't repair bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "no" - }, - { - "key": "service:bicycle:repair", - "description": "Layer 'Bike repair/shop' shows service:bicycle:repair=only_sold with a fixed text, namely 'This shop only repairs bikes bought here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "only_sold" - }, - { - "key": "service:bicycle:repair", - "description": "Layer 'Bike repair/shop' shows service:bicycle:repair=brand with a fixed text, namely 'This shop only repairs bikes of a certain brand' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "brand" - }, - { - "key": "service:bicycle:rental", - "description": "Layer 'Bike repair/shop' shows service:bicycle:rental=yes with a fixed text, namely 'This shop rents out bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "yes" - }, - { - "key": "service:bicycle:rental", - "description": "Layer 'Bike repair/shop' shows service:bicycle:rental=no with a fixed text, namely 'This shop doesn't rent out bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "no" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'rental' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=city_bike with a fixed text, namely 'Normal city bikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "city_bike" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=ebike with a fixed text, namely 'Electrical bikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "ebike" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=bmx with a fixed text, namely 'BMX bikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "bmx" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=mtb with a fixed text, namely 'Mountainbikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "mtb" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=kid_bike with a fixed text, namely 'Bikes for children can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "kid_bike" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=tandem with a fixed text, namely 'Tandem bicycles can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "tandem" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=racebike with a fixed text, namely 'Race bicycles can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "racebike" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=bike_helmet with a fixed text, namely 'Bike helmets can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "bike_helmet" - }, - { - "key": "capacity:city_bike", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:city_bike' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if rental~^(.*city_bike.*)$)" - }, - { - "key": "capacity:ebike", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:ebike' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if rental~^(.*ebike.*)$)" - }, - { - "key": "capacity:kid_bike", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:kid_bike' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if rental~^(.*kid_bike.*)$)" - }, - { - "key": "capacity:bmx", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bmx' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if rental~^(.*bmx.*)$)" - }, - { - "key": "capacity:mtb", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:mtb' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if rental~^(.*mtb.*)$)" - }, - { - "key": "capacity:bicycle_pannier", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if rental~^(.*bicycle_pannier.*)$)" - }, - { - "key": "capacity:tandem_bicycle", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if rental~^(.*tandem_bicycle.*)$)" - }, - { - "key": "service:bicycle:second_hand", - "description": "Layer 'Bike repair/shop' shows service:bicycle:second_hand=yes with a fixed text, namely 'This shop sells second-hand bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "yes" - }, - { - "key": "service:bicycle:second_hand", - "description": "Layer 'Bike repair/shop' shows service:bicycle:second_hand=no with a fixed text, namely 'This shop doesn't sell second-hand bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "no" - }, - { - "key": "service:bicycle:second_hand", - "description": "Layer 'Bike repair/shop' shows service:bicycle:second_hand=only with a fixed text, namely 'This shop only sells second-hand bikes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "only" - }, - { - "key": "service:bicycle:pump", - "description": "Layer 'Bike repair/shop' shows service:bicycle:pump=yes with a fixed text, namely 'This shop offers a bike pump for anyone' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "yes" - }, - { - "key": "service:bicycle:pump", - "description": "Layer 'Bike repair/shop' shows service:bicycle:pump=no with a fixed text, namely 'This shop doesn't offer a bike pump for anyone' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "no" - }, - { - "key": "service:bicycle:pump", - "description": "Layer 'Bike repair/shop' shows service:bicycle:pump=separate with a fixed text, namely 'There is bicycle pump, it is shown as a separate point' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "separate" - }, - { - "key": "service:bicycle:diy", - "description": "Layer 'Bike repair/shop' shows service:bicycle:diy=yes with a fixed text, namely 'This shop offers tools for DIY repair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "yes" - }, - { - "key": "service:bicycle:diy", - "description": "Layer 'Bike repair/shop' shows service:bicycle:diy=no with a fixed text, namely 'This shop doesn't offer tools for DIY repair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "no" - }, - { - "key": "service:bicycle:diy", - "description": "Layer 'Bike repair/shop' shows service:bicycle:diy=only_sold with a fixed text, namely 'Tools for DIY repair are only available if you bought/hire the bike in the shop' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "only_sold" - }, - { - "key": "service:bicycle:cleaning", - "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning=yes with a fixed text, namely 'This shop cleans bicycles' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "yes" - }, - { - "key": "service:bicycle:cleaning", - "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning=diy with a fixed text, namely 'This shop has an installation where one can clean bicycles themselves' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "diy" - }, - { - "key": "service:bicycle:cleaning", - "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning=no with a fixed text, namely 'This shop doesn't offer bicycle cleaning' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", - "value": "no" - }, - { - "key": "service:bicycle:cleaning:charge", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'service:bicycle:cleaning:charge' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)" - }, - { - "key": "service:bicycle:cleaning:fee", - "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=no with a fixed text, namely 'The cleaning service is free to use' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)", - "value": "no" - }, - { - "key": "service:bicycle:cleaning:fee", - "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes with a fixed text, namely 'Free to use' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)", - "value": "yes" - }, - { - "key": "service:bicycle:cleaning:charge", - "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes with a fixed text, namely 'Free to use' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') Picking this answer will delete the key service:bicycle:cleaning:charge. (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)", - "value": "" - }, - { - "key": "description", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'description' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')" - }, { "key": "amenity", "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bicycle library showing features with this tag", diff --git a/Docs/TagInfo/mapcomplete_onwheels.json b/Docs/TagInfo/mapcomplete_onwheels.json index 23ac6e2b6c..97585eec02 100644 --- a/Docs/TagInfo/mapcomplete_onwheels.json +++ b/Docs/TagInfo/mapcomplete_onwheels.json @@ -1165,6 +1165,27 @@ "key": "capacity", "description": "Layer 'Parking' shows and asks freeform values for key 'capacity' (in the MapComplete.osm.be theme 'OnWheels')" }, + { + "key": "parking_space", + "description": "The MapComplete theme OnWheels has a layer Parking Spaces showing features with this tag", + "value": "disabled" + }, + { + "key": "image", + "description": "The layer 'Parking Spaces 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 'Parking Spaces 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 'Parking Spaces 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 'Parking Spaces 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": "shop", "description": "The MapComplete theme OnWheels has a layer Shop showing features with this tag" diff --git a/Docs/TagInfo/mapcomplete_parkings.json b/Docs/TagInfo/mapcomplete_parkings.json index 2f28b37934..c0f772d1f8 100644 --- a/Docs/TagInfo/mapcomplete_parkings.json +++ b/Docs/TagInfo/mapcomplete_parkings.json @@ -138,6 +138,22 @@ "description": "The MapComplete theme Parking has a layer Parking Spaces showing features with this tag", "value": "parking_space" }, + { + "key": "image", + "description": "The layer 'Parking Spaces 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 'Parking Spaces 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 'Parking Spaces 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 'Parking Spaces 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": "parking_space", "description": "Layer 'Parking Spaces' shows with a fixed text, namely 'This is a normal parking space.' (in the MapComplete.osm.be theme 'Parking') Picking this answer will delete the key parking_space.", diff --git a/Docs/TagInfo/mapcomplete_personal.json b/Docs/TagInfo/mapcomplete_personal.json index b5e27ff591..e5f4e66bdb 100644 --- a/Docs/TagInfo/mapcomplete_personal.json +++ b/Docs/TagInfo/mapcomplete_personal.json @@ -398,6 +398,46 @@ "key": "opening_hours", "description": "Layer 'ATMs' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if amenity!=bank)" }, + { + "key": "cash_out", + "description": "Layer 'ATMs' shows with a fixed text, namely 'You can withdraw cash from this ATM' (in the MapComplete.osm.be theme 'Personal theme') Picking this answer will delete the key cash_out.", + "value": "" + }, + { + "key": "cash_out", + "description": "Layer 'ATMs' shows cash_out=yes with a fixed text, namely 'You can withdraw cash from this ATM' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "cash_out", + "description": "Layer 'ATMs' shows cash_out=no with a fixed text, namely 'You cannot withdraw cash from this ATM' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "no" + }, + { + "key": "cash_in", + "description": "Layer 'ATMs' shows with a fixed text, namely 'You probably cannot deposit cash into this ATM' (in the MapComplete.osm.be theme 'Personal theme') Picking this answer will delete the key cash_in.", + "value": "" + }, + { + "key": "cash_in", + "description": "Layer 'ATMs' shows cash_in=yes with a fixed text, namely 'You can deposit cash into this ATM' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "cash_in", + "description": "Layer 'ATMs' shows cash_in=no with a fixed text, namely 'You cannot deposit cash into this ATM' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "no" + }, + { + "key": "speech_output", + "description": "Layer 'ATMs' shows speech_output=yes with a fixed text, namely 'This ATM has speech output, usually available through a headphone jack' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "speech_output", + "description": "Layer 'ATMs' shows speech_output=no with a fixed text, namely 'This ATM does not have speech output' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "no" + }, { "key": "barrier", "description": "The MapComplete theme Personal theme has a layer Barriers showing features with this tag", @@ -1884,75 +1924,75 @@ }, { "key": "rental", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'rental' (in the MapComplete.osm.be theme 'Personal theme')" + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'rental' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if service:bicycle:rental=yes)" }, { "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=city_bike with a fixed text, namely 'Normal city bikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "description": "Layer 'Bike repair/shop' shows rental=city_bike with a fixed text, namely 'Normal city bikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if service:bicycle:rental=yes)", "value": "city_bike" }, { "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=ebike with a fixed text, namely 'Electrical bikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "description": "Layer 'Bike repair/shop' shows rental=ebike with a fixed text, namely 'Electrical bikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if service:bicycle:rental=yes)", "value": "ebike" }, { "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=bmx with a fixed text, namely 'BMX bikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "description": "Layer 'Bike repair/shop' shows rental=bmx with a fixed text, namely 'BMX bikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if service:bicycle:rental=yes)", "value": "bmx" }, { "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=mtb with a fixed text, namely 'Mountainbikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "description": "Layer 'Bike repair/shop' shows rental=mtb with a fixed text, namely 'Mountainbikes can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if service:bicycle:rental=yes)", "value": "mtb" }, { "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=kid_bike with a fixed text, namely 'Bikes for children can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "description": "Layer 'Bike repair/shop' shows rental=kid_bike with a fixed text, namely 'Bikes for children can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if service:bicycle:rental=yes)", "value": "kid_bike" }, { "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=tandem with a fixed text, namely 'Tandem bicycles can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "description": "Layer 'Bike repair/shop' shows rental=tandem with a fixed text, namely 'Tandem bicycles can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if service:bicycle:rental=yes)", "value": "tandem" }, { "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=racebike with a fixed text, namely 'Race bicycles can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "description": "Layer 'Bike repair/shop' shows rental=racebike with a fixed text, namely 'Race bicycles can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if service:bicycle:rental=yes)", "value": "racebike" }, { "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=bike_helmet with a fixed text, namely 'Bike helmets can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "description": "Layer 'Bike repair/shop' shows rental=bike_helmet with a fixed text, namely 'Bike helmets can be rented here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if service:bicycle:rental=yes)", "value": "bike_helmet" }, { "key": "capacity:city_bike", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:city_bike' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*city_bike.*)$)" + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:city_bike' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*city_bike.*)$&service:bicycle:rental=yes)" }, { "key": "capacity:ebike", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:ebike' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*ebike.*)$)" + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:ebike' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*ebike.*)$&service:bicycle:rental=yes)" }, { "key": "capacity:kid_bike", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:kid_bike' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*kid_bike.*)$)" + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:kid_bike' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*kid_bike.*)$&service:bicycle:rental=yes)" }, { "key": "capacity:bmx", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bmx' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*bmx.*)$)" + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bmx' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*bmx.*)$&service:bicycle:rental=yes)" }, { "key": "capacity:mtb", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:mtb' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*mtb.*)$)" + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:mtb' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*mtb.*)$&service:bicycle:rental=yes)" }, { "key": "capacity:bicycle_pannier", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*bicycle_pannier.*)$)" + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*bicycle_pannier.*)$&service:bicycle:rental=yes)" }, { "key": "capacity:tandem_bicycle", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*tandem_bicycle.*)$)" + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if rental~^(.*tandem_bicycle.*)$&service:bicycle:rental=yes)" }, { "key": "service:bicycle:second_hand", @@ -7926,6 +7966,22 @@ "description": "The MapComplete theme Personal theme has a layer Parking Spaces showing features with this tag", "value": "parking_space" }, + { + "key": "image", + "description": "The layer 'Parking Spaces 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 'Parking Spaces 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 'Parking Spaces 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 'Parking Spaces 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": "parking_space", "description": "Layer 'Parking Spaces' shows with a fixed text, namely 'This is a normal parking space.' (in the MapComplete.osm.be theme 'Personal theme') Picking this answer will delete the key parking_space.", @@ -8880,6 +8936,11 @@ "description": "Layer 'Recycling' shows recycling:engine_oil=yes with a fixed text, namely 'Engine oil can be recycled here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", "value": "yes" }, + { + "key": "recycling:fluorescent_tubes", + "description": "Layer 'Recycling' shows recycling:fluorescent_tubes=yes with a fixed text, namely 'Fluorescent tubes can be recycled here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, { "key": "recycling:green_waste", "description": "Layer 'Recycling' shows recycling:green_waste=yes with a fixed text, namely 'Green waste can be recycled here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", @@ -8900,6 +8961,11 @@ "description": "Layer 'Recycling' shows recycling:glass=yes with a fixed text, namely 'Glass can be recycled here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", "value": "yes" }, + { + "key": "recycling:light_bulbs", + "description": "Layer 'Recycling' shows recycling:light_bulbs=yes with a fixed text, namely 'Light bulbs can be recycled here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, { "key": "recycling:newspaper", "description": "Layer 'Recycling' shows recycling:newspaper=yes with a fixed text, namely 'Newspapers can be recycled here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", @@ -11056,12 +11122,32 @@ }, { "key": "payment:cash", - "description": "Layer 'Toilets' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if fee=yes)", + "description": "Layer 'Toilets' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if fee=yes)", "value": "yes" }, { "key": "payment:cards", - "description": "Layer 'Toilets' shows payment:cards=yes with a fixed text, namely 'Payment cards are accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if fee=yes)", + "description": "Layer 'Toilets' shows payment:cards=yes with a fixed text, namely 'Payment cards are accepted here' (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if fee=yes)", + "value": "yes" + }, + { + "key": "payment:coins", + "description": "Layer 'Toilets' shows payment:coins=yes with a fixed text, namely 'Coins are accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if fee=yes)", + "value": "yes" + }, + { + "key": "payment:notes", + "description": "Layer 'Toilets' shows payment:notes=yes with a fixed text, namely 'Bank notes are accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if fee=yes)", + "value": "yes" + }, + { + "key": "payment:debit_cards", + "description": "Layer 'Toilets' shows payment:debit_cards=yes with a fixed text, namely 'Debit cards are accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if fee=yes)", + "value": "yes" + }, + { + "key": "payment:credit_cards", + "description": "Layer 'Toilets' shows payment:credit_cards=yes with a fixed text, namely 'Credit cards are accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if fee=yes)", "value": "yes" }, { diff --git a/Docs/TagInfo/mapcomplete_waste.json b/Docs/TagInfo/mapcomplete_waste.json index fa25a1ad81..8a88c47fce 100644 --- a/Docs/TagInfo/mapcomplete_waste.json +++ b/Docs/TagInfo/mapcomplete_waste.json @@ -181,6 +181,11 @@ "description": "Layer 'Recycling' shows recycling:engine_oil=yes with a fixed text, namely 'Engine oil can be recycled here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", "value": "yes" }, + { + "key": "recycling:fluorescent_tubes", + "description": "Layer 'Recycling' shows recycling:fluorescent_tubes=yes with a fixed text, namely 'Fluorescent tubes can be recycled here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", + "value": "yes" + }, { "key": "recycling:green_waste", "description": "Layer 'Recycling' shows recycling:green_waste=yes with a fixed text, namely 'Green waste can be recycled here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", @@ -201,6 +206,11 @@ "description": "Layer 'Recycling' shows recycling:glass=yes with a fixed text, namely 'Glass can be recycled here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", "value": "yes" }, + { + "key": "recycling:light_bulbs", + "description": "Layer 'Recycling' shows recycling:light_bulbs=yes with a fixed text, namely 'Light bulbs can be recycled here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", + "value": "yes" + }, { "key": "recycling:newspaper", "description": "Layer 'Recycling' shows recycling:newspaper=yes with a fixed text, namely 'Newspapers can be recycled here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", diff --git a/Docs/Themes/bag.md b/Docs/Themes/bag.md index a0a0fdfeaf..0056298bb7 100644 --- a/Docs/Themes/bag.md +++ b/Docs/Themes/bag.md @@ -31,6 +31,7 @@ Available languages: - en - de - fr + - nb_NO This document is autogenerated from [assets/themes/bag/bag.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/bag/bag.json) \ No newline at end of file diff --git a/Docs/Themes/blind_osm.md b/Docs/Themes/blind_osm.md index d8f58f68dd..ce284a19c8 100644 --- a/Docs/Themes/blind_osm.md +++ b/Docs/Themes/blind_osm.md @@ -32,6 +32,7 @@ Available languages: - de - nl - fr + - nb_NO This document is autogenerated from [assets/themes/blind_osm/blind_osm.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/blind_osm/blind_osm.json) \ No newline at end of file diff --git a/Docs/Themes/cyclofix.md b/Docs/Themes/cyclofix.md index d0ce89e35b..cf7c0ebf05 100644 --- a/Docs/Themes/cyclofix.md +++ b/Docs/Themes/cyclofix.md @@ -12,9 +12,9 @@ This theme contains the following layers: - [bike_cafe](../Layers/bike_cafe.md) + - [bike_shop](../Layers/bike_shop.md) - [bicycle_rental_non_docking](../Layers/bicycle_rental_non_docking.md) - [bicycle_rental](../Layers/bicycle_rental.md) - - [bike_shop](../Layers/bike_shop.md) - [bicycle_library](../Layers/bicycle_library.md) - [bike_repair_station](../Layers/bike_repair_station.md) - [bicycle_tube_vending_machine](../Layers/bicycle_tube_vending_machine.md) diff --git a/Docs/Themes/natuurpunt.md b/Docs/Themes/natuurpunt.md index 0eb2b44124..76849239b4 100644 --- a/Docs/Themes/natuurpunt.md +++ b/Docs/Themes/natuurpunt.md @@ -22,7 +22,6 @@ This theme contains the following layers: - [parking](../Layers/parking.md) - [information_board](../Layers/information_board.md) - [bench](../Layers/bench.md) - - [watermill](../Layers/watermill.md) - [gps_track](../Layers/gps_track.md) - [selected_element](../Layers/selected_element.md) - [gps_location](../Layers/gps_location.md) diff --git a/Docs/Themes/onwheels.md b/Docs/Themes/onwheels.md index c0a14a6b5c..3388996bff 100644 --- a/Docs/Themes/onwheels.md +++ b/Docs/Themes/onwheels.md @@ -19,6 +19,7 @@ This theme contains the following layers: - [food](../Layers/food.md) - [kerbs](../Layers/kerbs.md) - [parking](../Layers/parking.md) + - [parking_spaces](../Layers/parking_spaces.md) - [shops](../Layers/shops.md) - [toilet](../Layers/toilet.md) - [pharmacy](../Layers/pharmacy.md) diff --git a/Docs/wikiIndex.txt b/Docs/wikiIndex.txt index a6a334bdb6..c6c0ef3c82 100644 --- a/Docs/wikiIndex.txt +++ b/Docs/wikiIndex.txt @@ -454,7 +454,7 @@ {{service_item |name= [https://mapcomplete.osm.be/transit transit] |region= Worldwide -|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:fr|en}}, {{#language:da|en}}, {{#language:nl|en}}, {{#language:_context|en}} +|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:fr|en}}, {{#language:da|en}}, {{#language:nl|en}}, {{#language:nb_NO|en}}, {{#language:_context|en}} |descr= A MapComplete theme: Plan your trip with the help of the public transport system |material= {{yes|[https://mapcomplete.osm.be/ Yes]}} |image= MapComplete_Screenshot.png diff --git a/assets/contributors.json b/assets/contributors.json index 264d23cfdf..966794705a 100644 --- a/assets/contributors.json +++ b/assets/contributors.json @@ -1,11 +1,11 @@ { "contributors": [ { - "commits": 4755, + "commits": 4790, "contributor": "Pieter Vander Vennet" }, { - "commits": 302, + "commits": 311, "contributor": "Robin van der Linde" }, { @@ -13,7 +13,7 @@ "contributor": "Tobias" }, { - "commits": 33, + "commits": 34, "contributor": "Win Olario" }, { @@ -38,11 +38,11 @@ }, { "commits": 24, - "contributor": "Ward" + "contributor": "riQQ" }, { - "commits": 23, - "contributor": "riQQ" + "commits": 24, + "contributor": "Ward" }, { "commits": 21, @@ -72,6 +72,10 @@ "commits": 17, "contributor": "pgm-chardelv1" }, + { + "commits": 16, + "contributor": "dependabot[bot]" + }, { "commits": 15, "contributor": "Brice Maron" @@ -80,10 +84,6 @@ "commits": 15, "contributor": "ToastHawaii" }, - { - "commits": 14, - "contributor": "dependabot[bot]" - }, { "commits": 13, "contributor": "Nicole" diff --git a/assets/layers/address/address.json b/assets/layers/address/address.json index d8ec2a7aed..3d6068cbdd 100644 --- a/assets/layers/address/address.json +++ b/assets/layers/address/address.json @@ -86,7 +86,8 @@ "es": "El número de puerta es {addr:housenumber}", "da": "Husnummeret er {addr:housenumber}", "cs": "Číslo domu je {addr:housenumber}", - "pt": "The house number is {addr:housenumber}" + "pt": "The house number is {addr:housenumber}", + "nb_NO": "Husnummeret er {addr:housenumber}" }, "question": { "en": "What is the number of this house?", @@ -101,7 +102,8 @@ "id": "Berapa nomor rumah ini?", "da": "Hvad er nummeret på dette hus?", "cs": "Jaké je číslo tohoto domu?", - "pt": "Qual é o número desta casa?" + "pt": "Qual é o número desta casa?", + "nb_NO": "Hvilket husnummer har dette huset?" }, "freeform": { "key": "addr:housenumber", @@ -130,7 +132,8 @@ "da": "Denne bygning har intet husnummer", "zh_Hant": "這棟建築沒有門牌", "cs": "Tato budova nemá číslo domu", - "pt": "Este prédio não tem número" + "pt": "Este prédio não tem número", + "nb_NO": "Denne bygningen har ikke noe husnummer" } } ] @@ -206,7 +209,8 @@ "zh_Hans": "这里应被如何修复？请做出解释", "da": "Hvad skal rettes her? Forklar venligst", "cs": "Co by se zde mělo opravit? Vysvětlete to, prosím", - "pt": "O que deve ser corrigido aqui? Explique" + "pt": "O que deve ser corrigido aqui? Explique", + "nb_NO": "Hva bør fikses her? Forklar." }, "freeform": { "key": "fixme" diff --git a/assets/layers/artwork/artwork.json b/assets/layers/artwork/artwork.json index 1c2f311d36..61ab288a51 100644 --- a/assets/layers/artwork/artwork.json +++ b/assets/layers/artwork/artwork.json @@ -444,7 +444,8 @@ "de": "Holzschnitzerei", "cs": "Dřevořezba", "pt": "Entalhe em madeira", - "fr": "Sculpture sur bois" + "fr": "Sculpture sur bois", + "nb_NO": "Treskjæring" } } ], diff --git a/assets/layers/atm/atm.json b/assets/layers/atm/atm.json index 62d9ad04c6..5ea8821a0a 100644 --- a/assets/layers/atm/atm.json +++ b/assets/layers/atm/atm.json @@ -7,7 +7,7 @@ "nl": "Geldautomaten" }, "description": { - "en": "ATMS to withdraw money", + "en": "ATMs to withdraw money", "de": "Geldautomaten zum Geld abheben", "fr": "DAB pour retirer de l'argent", "nl": "Geldautomaten om geld op te nemen" @@ -74,7 +74,8 @@ "id": "atm-in-bank-notice", "condition": "amenity=bank", "render": { - "en": "This ATM is located in or near a bank" + "en": "This ATM is located in or near a bank", + "de": "Dieser Geldautomat befindet sich in oder in der Nähe einer Bank" } }, { @@ -261,4 +262,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/assets/layers/bicycle_rental/bicycle_rental.json b/assets/layers/bicycle_rental/bicycle_rental.json index fc6f5e02d1..636178c151 100644 --- a/assets/layers/bicycle_rental/bicycle_rental.json +++ b/assets/layers/bicycle_rental/bicycle_rental.json @@ -446,8 +446,10 @@ "key": "capacity:bicycle_type", "type": "pnat" }, - "condition": {"and": - ["rental~.*bicycle_type.*"] + "condition": { + "and": [ + "rental~.*bicycle_type.*" + ] } } ] @@ -559,4 +561,4 @@ } ] } -} +} \ No newline at end of file diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json index 3246859f43..b325772ad5 100644 --- a/assets/layers/bike_shop/bike_shop.json +++ b/assets/layers/bike_shop/bike_shop.json @@ -488,10 +488,12 @@ ] }, { - "builtin": "bicycle_rental.*bicycle_rental", + "builtin": "bicycle_rental.*bicycle_rental", "override": { "condition": { - "and+": ["service:bicycle:rental=yes"] + "and+": [ + "service:bicycle:rental=yes" + ] } } }, @@ -790,4 +792,4 @@ } } ] -} +} \ No newline at end of file diff --git a/assets/layers/surveillance_camera/surveillance_camera.json b/assets/layers/surveillance_camera/surveillance_camera.json index 9b1684824d..19d65341d6 100644 --- a/assets/layers/surveillance_camera/surveillance_camera.json +++ b/assets/layers/surveillance_camera/surveillance_camera.json @@ -529,7 +529,11 @@ }, "preciseInput": { "snapToLayer": "walls_and_buildings", - "preferredBackground": ["photo", "osmbasedmap","map"] + "preferredBackground": [ + "photo", + "osmbasedmap", + "map" + ] } } ], @@ -598,4 +602,4 @@ "nl": "Deze laag toont bewakingscamera's en laat toe om de informatie te verrijken en om nieuwe camera\"s toe te voegen", "de": "Diese Ebene zeigt die Überwachungskameras an und ermöglicht es, Informationen zu aktualisieren und neue Kameras hinzuzufügen" } -} +} \ No newline at end of file diff --git a/assets/layers/ticket_validator/ticket_validator.json b/assets/layers/ticket_validator/ticket_validator.json index 78be4c663f..3bccdc319e 100644 --- a/assets/layers/ticket_validator/ticket_validator.json +++ b/assets/layers/ticket_validator/ticket_validator.json @@ -106,4 +106,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/assets/layers/waste_basket/waste_basket.json b/assets/layers/waste_basket/waste_basket.json index 72773e1563..1a8dc39e77 100644 --- a/assets/layers/waste_basket/waste_basket.json +++ b/assets/layers/waste_basket/waste_basket.json @@ -32,7 +32,7 @@ } }, "description": { - "en": "This is a public waste basket, trash can, where you can throw away your trash.", + "en": "This is a public waste basket, thrash can, where you can throw away your thrash.", "nl": "Dit is een publieke vuilnisbak waar je je afval kan weggooien.", "de": "Dies ist ein öffentlicher Abfalleimer, in den Sie Ihren Müll entsorgen können.", "hu": "Ez egy nyilvános szemétkosár vagy kuka, ahová kidobhatod a szemetedet.", @@ -369,4 +369,4 @@ } } ] -} +} \ No newline at end of file diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json index 29a9b09851..2d84385d1a 100644 --- a/assets/tagRenderings/questions.json +++ b/assets/tagRenderings/questions.json @@ -1046,7 +1046,7 @@ ] }, "question": { - "en": "With what coins can you pay here?", + "en": "What coins can you use to pay here?", "de": "Mit welchen Münzen kann man hier bezahlen?", "nl": "Met welke munten kan je hier betalen?" }, @@ -1058,7 +1058,8 @@ "then": { "en": "1 cent coins are accepted", "de": "1-Cent-Münzen werden akzeptiert", - "nl": "Munten van 1 cent worden geaccepteerd" + "nl": "Munten van 1 cent worden geaccepteerd", + "nb_NO": "1-cent mynter aksepteres" } }, { @@ -1067,7 +1068,8 @@ "then": { "en": "2 cent coins are accepted", "de": "2-Cent-Münzen werden akzeptiert", - "nl": "Munten van 2 cent worden geaccepteerd" + "nl": "Munten van 2 cent worden geaccepteerd", + "nb_NO": "2-cent mynter aksepteres" } }, { @@ -1076,7 +1078,8 @@ "then": { "en": "5 cent coins are accepted", "de": "5-Cent-Münzen werden akzeptiert", - "nl": "Munten van 5 cent worden geaccepteerd" + "nl": "Munten van 5 cent worden geaccepteerd", + "nb_NO": "5-cent mynter aksepteres" } }, { @@ -1085,7 +1088,8 @@ "then": { "en": "10 cent coins are accepted", "de": "10-Cent-Münzen werden akzeptiert", - "nl": "Munten van 10 cent worden geaccepteerd" + "nl": "Munten van 10 cent worden geaccepteerd", + "nb_NO": "10-cent mynter aksepteres" } }, { @@ -1094,7 +1098,8 @@ "then": { "en": "20 cent coins are accepted", "de": "20-Cent-Münzen werden akzeptiert", - "nl": "Munten van 20 cent worden geaccepteerd" + "nl": "Munten van 20 cent worden geaccepteerd", + "nb_NO": "20-cent mynter aksepteres" } }, { @@ -1103,7 +1108,8 @@ "then": { "en": "50 cent coins are accepted", "de": "50-Cent-Münzen werden akzeptiert", - "nl": "Munten van 50 cent worden geaccepteerd" + "nl": "Munten van 50 cent worden geaccepteerd", + "nb_NO": "50-cent mynter aksepteres" } }, { @@ -1112,7 +1118,8 @@ "then": { "en": "1 euro coins are accepted", "de": "1-Euro-Münzen werden akzeptiert", - "nl": "Munten van 1 euro worden geaccepteerd" + "nl": "Munten van 1 euro worden geaccepteerd", + "nb_NO": "1-euro mynter aksepteres" } }, { @@ -1121,7 +1128,8 @@ "then": { "en": "2 euro coins are accepted", "de": "2-Euro-Münzen werden akzeptiert", - "nl": "Munten van 2 euro worden geaccepteerd" + "nl": "Munten van 2 euro worden geaccepteerd", + "nb_NO": "2-euro mynter aksepteres" } } ] @@ -1668,4 +1676,4 @@ "es": "El nombre de red es {internet_access:ssid}" } } -} +} \ No newline at end of file diff --git a/assets/themes/bag/bag.json b/assets/themes/bag/bag.json index 1b698aa175..a2d0170e19 100644 --- a/assets/themes/bag/bag.json +++ b/assets/themes/bag/bag.json @@ -4,7 +4,8 @@ "nl": "BAG import helper", "en": "BAG import helper", "de": "BAG-Importhilfe", - "fr": "Facilitateur d'import BAG" + "fr": "Facilitateur d'import BAG", + "nb_NO": "BAG-importhjelper" }, "shortDescription": { "nl": "BAG import helper tool", diff --git a/assets/themes/blind_osm/blind_osm.json b/assets/themes/blind_osm/blind_osm.json index 1215be7853..56593d2b36 100644 --- a/assets/themes/blind_osm/blind_osm.json +++ b/assets/themes/blind_osm/blind_osm.json @@ -4,7 +4,8 @@ "en": "OSM for the blind", "de": "OSM für Blinde", "nl": "OSM voor blinden", - "fr": "OSM pour les malvoyants" + "fr": "OSM pour les malvoyants", + "nb_NO": "OSM for blinde" }, "description": { "en": "Help to map features relevant for the blind", diff --git a/assets/themes/cyclofix/cyclofix.json b/assets/themes/cyclofix/cyclofix.json index c5408946fc..647a304733 100644 --- a/assets/themes/cyclofix/cyclofix.json +++ b/assets/themes/cyclofix/cyclofix.json @@ -130,4 +130,4 @@ } } ] -} +} \ No newline at end of file diff --git a/assets/themes/natuurpunt/natuurpunt.json b/assets/themes/natuurpunt/natuurpunt.json index 205563aa2d..b3e7176165 100644 --- a/assets/themes/natuurpunt/natuurpunt.json +++ b/assets/themes/natuurpunt/natuurpunt.json @@ -335,4 +335,4 @@ "enableIframePopout": false, "enableBackgroundLayerSelection": false, "enableNoteImports": false -} +} \ No newline at end of file diff --git a/assets/themes/transit/transit.json b/assets/themes/transit/transit.json index 207cf2ad45..04ce14c16a 100644 --- a/assets/themes/transit/transit.json +++ b/assets/themes/transit/transit.json @@ -15,7 +15,8 @@ "de": "Planen Sie Ihre Reise mit Hilfe von öffentlichen Verkehrsmitteln.", "fr": "Planifier votre itinéraire avec le système de transports en commun.", "da": "Planlæg din rejse ved hjælp af det offentlige transportsystem.", - "nl": "Plan je trip met behulp van het openbaar vervoer." + "nl": "Plan je trip met behulp van het openbaar vervoer.", + "nb_NO": "Planlegg turen din med offentlig transport" }, "icon": "./assets/layers/transit_stops/bus_stop.svg", "startZoom": 20, diff --git a/assets/translators.json b/assets/translators.json index 05d2453f9e..4d89d6f216 100644 --- a/assets/translators.json +++ b/assets/translators.json @@ -1,15 +1,15 @@ { "contributors": [ { - "commits": 216, + "commits": 217, "contributor": "Pieter Vander Vennet" }, { - "commits": 195, + "commits": 196, "contributor": "kjon" }, { - "commits": 66, + "commits": 73, "contributor": "Allan Nordhøy" }, { @@ -128,6 +128,10 @@ "commits": 7, "contributor": "Niels Elgaard Larsen" }, + { + "commits": 6, + "contributor": "mcliquid" + }, { "commits": 6, "contributor": "Joost Schouppe" @@ -184,10 +188,6 @@ "commits": 5, "contributor": "Alexey Shabanov" }, - { - "commits": 4, - "contributor": "mcliquid" - }, { "commits": 4, "contributor": "Hiroshi Miura" @@ -332,6 +332,10 @@ "commits": 2, "contributor": "Leo Alcaraz" }, + { + "commits": 1, + "contributor": "Ettore Atalan" + }, { "commits": 1, "contributor": "Lucas" diff --git a/langs/layers/da.json b/langs/layers/da.json index 7a2d3c7191..4d5cdc4998 100644 --- a/langs/layers/da.json +++ b/langs/layers/da.json @@ -2959,9 +2959,6 @@ "render": "Bortskaffelse af affald" } }, - "watermill": { - "name": "Vandmølle" - }, "windturbine": { "description": "Moderne vindmøller til produktion af elektricitet", "name": "vindmølle", diff --git a/langs/layers/de.json b/langs/layers/de.json index 2fec3b4f4a..7aa760c03a 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -176,6 +176,9 @@ } }, "tagRenderings": { + "atm-in-bank-notice": { + "render": "Dieser Geldautomat befindet sich in oder in der Nähe einer Bank" + }, "brand": { "freeform": { "placeholder": "Markenname" @@ -192,9 +195,6 @@ }, "question": "Welches Unternehmen betreibt den Geldautomaten?", "render": "Der Geldautomat wird von {operator} betrieben" - }, - "atm-in-bank-notice": { - "render": "Dieser Geldautomat befindet sich in oder in der Nähe einer Bank" } }, "title": { @@ -7040,12 +7040,6 @@ "render_single_language": "Die Treppe hat taktile Schrift in {language():font-bold}" } } - }, - "multilevels": { - "override": { - "question": "Zwischen welchen Stockwerken befindet sich diese Treppe?", - "render": "Diese Treppe befindet sich zwischen den Stockwerken {level}" - } } }, "title": { @@ -7425,18 +7419,6 @@ }, "question": "Wer ist der Betreiber dieses Fahrkartenentwerters?", "render": "Dieser Fahrkartenentwerter wird betrieben von {operator}" - }, - "payment-options": { - "override": { - "mappings+": { - "1": { - "then": "Dieser Fahrkartenentwerter akzeptiert OV-Chipkaart" - }, - "0": { - "then": "Dieser Fahrkartenentwerter akzeptiert OV-Chipkaart" - } - } - } } }, "title": { @@ -7703,11 +7685,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 diese Toiletten befinden, geöffnet?" - } } }, "title": { @@ -8372,4 +8349,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/layers/en.json b/langs/layers/en.json index 663083d416..e9501f836e 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -8442,4 +8442,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 1bed0bb954..9267f020c5 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -4708,9 +4708,6 @@ } } }, - "watermill": { - "name": "Moulin à eau" - }, "windturbine": { "name": "Éolienne", "presets": { diff --git a/langs/layers/id.json b/langs/layers/id.json index 13b48c1ddb..f67cc78e23 100644 --- a/langs/layers/id.json +++ b/langs/layers/id.json @@ -606,9 +606,6 @@ "render": "Pembuangan Limbah" } }, - "watermill": { - "name": "Kincir Air" - }, "windturbine": { "tagRenderings": { "turbine-operator": { diff --git a/langs/layers/nb_NO.json b/langs/layers/nb_NO.json index a328d7e7c4..6f74fea6b3 100644 --- a/langs/layers/nb_NO.json +++ b/langs/layers/nb_NO.json @@ -2,22 +2,22 @@ "address": { "description": "Adresser", "name": "Kjente adresser i OSM", - "title": { - "render": "Kjent adresse" - }, "tagRenderings": { + "fixme": { + "question": "Hva bør fikses her? Forklar." + }, "housenumber": { - "question": "Hvilket husnummer har dette huset?", "mappings": { "0": { "then": "Denne bygningen har ikke noe husnummer" } }, + "question": "Hvilket husnummer har dette huset?", "render": "Husnummeret er {addr:housenumber}" - }, - "fixme": { - "question": "Hva bør fikses her? Forklar." } + }, + "title": { + "render": "Kjent adresse" } }, "ambulancestation": { @@ -383,4 +383,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/layers/ru.json b/langs/layers/ru.json index c3d314ae22..6be21eea77 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -1689,9 +1689,6 @@ "render": "Контейнер для мусора" } }, - "watermill": { - "name": "Водяная мельница" - }, "windturbine": { "title": { "mappings": { diff --git a/langs/nb_NO.json b/langs/nb_NO.json index 34f86119a2..bc2bae49ad 100644 --- a/langs/nb_NO.json +++ b/langs/nb_NO.json @@ -37,12 +37,28 @@ "panelIntro": "

Ditt personlige tema

Aktiver dine favorittlag fra de offisielle", "reload": "Last inn dataen igjen" }, + "flyer": { + "cyclofix": "Sykkelpumper, reperasjonsstasjoner, drikkevann og sykkelbutikker finner du på cyclofix.", + "fakeui": { + "add_images": "Legg til bilder med få klikk", + "see_images": "Viser bilder fra tidligere bidragsytere, Wikipedia, Mapillary, … ", + "wikipedia": "Lenkede Wikipedia-artikler vises" + }, + "mapcomplete": { + "intro": "MapComplete er en nettside som har {mapCount} interaktive kart. Hvert enkelt kart tillater å legge til eller oppdatere info. Det har mange funksjoner:", + "li0": "Vis hvor det finnes interessepunkter", + "li1": "Legg til nye punkter og oppdater info om eksisterende", + "title": "Hva er MapComplete?" + }, + "onwheels": "Innendørskart for rullestolsbrukere er også tilgjengelig." + }, "general": { "about": "Rediger og legg til OpenStreetMap for et gitt tema", "aboutMapcomplete": "

Om

Bruk MapComplete til å legge til OpenStreetMap-info i ett tema. Besvar spørsmål og få endringene vist i løpet av minutter. I de fleste temaene kan du legge inn bilder eller legge igjen en vurdering. Temavedlikeholderen definerer elementer, spørsmål og språk for det.

Finn ut mer

MapComplete tilbyr alltid neste steg for å lære mer om OpenStreetMap.


Har du oppdaget et problem? Har du en funksjonsforespørsel? Vil du bistå oversettelsen? Gå til kildekoden eller problemsporeren.

Vil du se din framdrift? Følg redigeringsantallet på OsmCha.

", "add": { "addNew": "Legg til {category} her", "addNewMapLabel": "Legg til nytt element", + "backToSelect": "Velg en annen kategori", "confirmButton": "Legg til en {category} her.
Din endring er synlig for alle
", "confirmIntro": "

Legg til {title} her?

Punktet du oppretter her vil være synlig for alle. Kun legg til ting på kartet hvis de virkelig finnes. Mange programmer bruker denne dataen.", "disableFilters": "Skru av alle filtre", @@ -67,8 +83,7 @@ "warnVisibleForEveryone": "Din endring vil være synlig for alle", "wrongType": "Dette er ikke et punkt eller en vei og kan ikke importeres", "zoomInFurther": "Forstørr mer for å legge til et punkt.", - "zoomInMore": "Forstørr mer for å importere denne funksjonen", - "backToSelect": "Velg en annen kategori" + "zoomInMore": "Forstørr mer for å importere denne funksjonen" }, "apply_button": { "appliedOnAnotherObject": "{id}-objektet vil motta {tags}", @@ -225,6 +240,16 @@ "skip": "Hopp over dette spørsmålet", "skippedQuestions": "Noen spørsmål ble hoppet over", "testing": "Testing. ingen endringer vil bli lagret.", + "uploadGpx": { + "modes": { + "public": { + "name": "Offentlig" + } + }, + "title": "Last opp sporet ditt til OpenStreetMap.org", + "uploadFinished": "Sporet ditt har blitt opplastet.", + "uploading": "Laster opp sporet ditt …" + }, "weekdays": { "abbreviations": { "friday": "Fre", @@ -257,16 +282,6 @@ }, "searchWikidata": "Søk på Wikipedia", "wikipediaboxTitle": "Wikipedia" - }, - "uploadGpx": { - "modes": { - "public": { - "name": "Offentlig" - } - }, - "uploadFinished": "Sporet ditt har blitt opplastet.", - "uploading": "Laster opp sporet ditt …", - "title": "Last opp sporet ditt til OpenStreetMap.org" } }, "image": { @@ -277,12 +292,12 @@ "dontDelete": "Avbryt", "isDeleted": "Slettet", "nearbyPictures": { + "loadMore": "Last inn flere bilder", "loading": "Laster inn bilder i nærheten …", "noImageSelected": "Velg et bilde for å knytte det til objektet", "nothingFound": "Fant ingen bilder i nærheten …", "removeFilters": "Klikk her for å fjerne filterne", - "title": "Bilder i nærheten", - "loadMore": "Last inn flere bilder" + "title": "Bilder i nærheten" }, "pleaseLogin": "Logg inn for å legge til et bilde", "respectPrivacy": "Ikke ta bilder av folk eller bilskilt. Ikke last opp Google Maps, Google Streetview eller andre opphavsrettsbeskyttede kilder.", @@ -304,10 +319,10 @@ "title": "Sett metadata" }, "compareToAlreadyExistingNotes": { - "noPreviousNotesFound": "Ingen tidligere importnotater ble funnet", - "title": "Sammenlign med eksisterende noder", + "loading": "Henter notater fra OSM …", "loadingFailed": "Kunne ikke laste inn notater fordi {error}", - "loading": "Henter notater fra OSM …" + "noPreviousNotesFound": "Ingen tidligere importnotater ble funnet", + "title": "Sammenlign med eksisterende noder" }, "confirmProcess": { "contactedCommunity": "Jeg kontatet (local)-gemenskapen om denne importen", @@ -388,6 +403,58 @@ "pickTheme": "Begynn ved å velge et av temaene nedenfor.", "title": "Velkommen til MapComplete" }, + "matrixbot": { + "commands": { + "dm": { + "selectValidCommand": "Angi en gyldig kommando", + "selectValidUser": "Angi en gyldig målbruker" + }, + "documentation": { + "didYouMean": "Mente du", + "file": { + "plural": "filer", + "singular": "fil" + }, + "inputElement": { + "plural": "inndataelementer", + "singular": "inndataelement" + }, + "layer": { + "plural": "lag", + "singular": "lag" + }, + "urlParam": "Nettadresse-parameter {id}", + "visualisation": { + "plural": "visualiseringer", + "singular": "visualisering" + } + }, + "dream": { + "docs": "Sender en datamaskinsgenerert tekst" + }, + "info": { + "closed": "Stengt", + "closedTodayAndTomorrow": "Stengt i dag og i morgen", + "couldNotDownload": "Kunne ikke laste ned {id}", + "editWith": "Rediger dette elementet med {title}", + "fetchingInfoAbout": "Henter data om {id} …", + "noInfo": "Ingen relevant info enda" + }, + "language": { + "arglang": "Språket å bruke fra nå av", + "helpTranslating": "Bistå oversettelsen av svarene mine på Weblate.", + "knownLanguages": "Du kan velge ett av følgende språk:" + }, + "role": { + "docs": "Endre hva en bruker kan og ikke kan gjøre", + "noPreviousRoles": "{user} har ingen tidligere roller" + }, + "scheme": { + "argkey": "Navnet på nøkkelen", + "notype": "ingen type angitt" + } + } + }, "move": { "cancel": "Avbryt flytting", "cannotBeMoved": "Denne funksjonen kan ikke flyttes.", @@ -417,36 +484,46 @@ "autoApply": "Ved endring av attributteene {attr_names}, legges de automatisk til for {count} andre objekter også" }, "notes": { + "addCommentAndClose": "Legg til kommentar og lukk", "addCommentPlaceholder": "Legg til en kommentar …", "anonymous": "Anonym bruker", + "closeNote": "Lukk notat", + "createNote": "Opprett nytt notat", "createNoteTitle": "Opprett et nytt notat her", + "disableAllNoteFilters": "Skru av alle filtre", "isClosed": "Dette notatet har blitt løst", + "loginToAddComment": "Logg inn for å legge til en kommentar", "loginToAddPicture": "Logg inn for å legge til et bilde", "noteIsPublic": "Dette vil vises for alle", "reopenNote": "Gjenåpne notat", "reopenNoteAndComment": "Gjenåpne notat og kommenter", "textNeeded": "Skriv inn beskrivende tekst for å opprettet et notat", - "typeText": "Skriv inn tekst for å legge til en kommentar", - "addCommentAndClose": "Legg til kommentar og lukk", - "disableAllNoteFilters": "Skru av alle filtre", - "closeNote": "Lukk notat", - "createNote": "Opprett nytt notat", - "loginToAddComment": "Logg inn for å legge til en kommentar" + "typeText": "Skriv inn tekst for å legge til en kommentar" + }, + "plantDetection": { + "howTo": { + "li3": "ta et bilde av blomstene" + }, + "loadingWikidata": "Laster inn info om {species} …", + "matchPercentage": "{match}% treff", + "overviewTitle": "Automatisk oppdagede arter", + "poweredByPlantnet": "Drevet av plantnet.org", + "seeInfo": "Finn mer info om artene" }, "privacy": { - "whileYoureHere": "Bryr du deg om personvern?", "title": "Personvernspraksis", - "trackingTitle": "Statistisk data" + "trackingTitle": "Statistisk data", + "whileYoureHere": "Bryr du deg om personvern?" }, "professional": { "aboutMc": { + "internalUse": { + "title": "Bruk av data i interne prosesser" + }, "survey": { "title": "Undersøkelsesmuligheter" }, - "title": "Bruk av MapComplete i din organisasjon", - "internalUse": { - "title": "Bruk av data i interne prosesser" - } + "title": "Bruk av MapComplete i din organisasjon" }, "aboutOsm": { "aboutOsm": { @@ -512,13 +589,23 @@ "missing": "{count} uoversatte strenger", "notImmediate": "Oversettelser oppdateres ikke direkte. Dette tar typisk et par dager." }, + "userinfo": { + "noDescriptionCallToAction": "Legg til profilbeskrivelse", + "welcome": "Velkommen {user}" + }, "validation": { + "color": { + "description": "En farge eller heksadesimal kode" + }, "date": { "description": "En dato, som starter med året" }, "direction": { "description": "En retning" }, + "distance": { + "description": "En avstand i meter" + }, "email": { "feedback": "Dette er ikke en gyldig e-postadresse" }, @@ -530,9 +617,9 @@ "description": "et heltall" }, "nat": { + "mustBePositive": "Dette tallet skal være positivt", "mustBeWhole": "Kun heltall tillates", - "notANumber": "Skriv inn et tall", - "mustBePositive": "Dette tallet skal være positivt" + "notANumber": "Skriv inn et tall" }, "opening_hours": { "description": "Åpningstider" @@ -560,93 +647,6 @@ }, "wikidata": { "description": "En Wikidata-identifikator" - }, - "distance": { - "description": "En avstand i meter" - }, - "color": { - "description": "En farge eller heksadesimal kode" } - }, - "plantDetection": { - "seeInfo": "Finn mer info om artene", - "poweredByPlantnet": "Drevet av plantnet.org", - "howTo": { - "li3": "ta et bilde av blomstene" - }, - "matchPercentage": "{match}% treff", - "loadingWikidata": "Laster inn info om {species} …", - "overviewTitle": "Automatisk oppdagede arter" - }, - "matrixbot": { - "commands": { - "scheme": { - "notype": "ingen type angitt", - "argkey": "Navnet på nøkkelen" - }, - "documentation": { - "layer": { - "singular": "lag", - "plural": "lag" - }, - "file": { - "plural": "filer", - "singular": "fil" - }, - "didYouMean": "Mente du", - "inputElement": { - "plural": "inndataelementer", - "singular": "inndataelement" - }, - "visualisation": { - "plural": "visualiseringer", - "singular": "visualisering" - }, - "urlParam": "Nettadresse-parameter {id}" - }, - "language": { - "arglang": "Språket å bruke fra nå av", - "helpTranslating": "Bistå oversettelsen av svarene mine på Weblate.", - "knownLanguages": "Du kan velge ett av følgende språk:" - }, - "info": { - "closedTodayAndTomorrow": "Stengt i dag og i morgen", - "couldNotDownload": "Kunne ikke laste ned {id}", - "editWith": "Rediger dette elementet med {title}", - "fetchingInfoAbout": "Henter data om {id} …", - "noInfo": "Ingen relevant info enda", - "closed": "Stengt" - }, - "dm": { - "selectValidCommand": "Angi en gyldig kommando", - "selectValidUser": "Angi en gyldig målbruker" - }, - "role": { - "noPreviousRoles": "{user} har ingen tidligere roller", - "docs": "Endre hva en bruker kan og ikke kan gjøre" - }, - "dream": { - "docs": "Sender en datamaskinsgenerert tekst" - } - } - }, - "flyer": { - "fakeui": { - "wikipedia": "Lenkede Wikipedia-artikler vises", - "add_images": "Legg til bilder med få klikk", - "see_images": "Viser bilder fra tidligere bidragsytere, Wikipedia, Mapillary, … " - }, - "mapcomplete": { - "li0": "Vis hvor det finnes interessepunkter", - "title": "Hva er MapComplete?", - "intro": "MapComplete er en nettside som har {mapCount} interaktive kart. Hvert enkelt kart tillater å legge til eller oppdatere info. Det har mange funksjoner:", - "li1": "Legg til nye punkter og oppdater info om eksisterende" - }, - "onwheels": "Innendørskart for rullestolsbrukere er også tilgjengelig.", - "cyclofix": "Sykkelpumper, reperasjonsstasjoner, drikkevann og sykkelbutikker finner du på cyclofix." - }, - "userinfo": { - "noDescriptionCallToAction": "Legg til profilbeskrivelse", - "welcome": "Velkommen {user}" } } diff --git a/langs/shared-questions/de.json b/langs/shared-questions/de.json index 1ee9103dc2..b26ba5fcd2 100644 --- a/langs/shared-questions/de.json +++ b/langs/shared-questions/de.json @@ -271,4 +271,4 @@ "question": "Wie lautet der zugehörige Wikipedia Artikel?" } } -} +} \ No newline at end of file diff --git a/langs/shared-questions/en.json b/langs/shared-questions/en.json index 566664d79a..25168f6f55 100644 --- a/langs/shared-questions/en.json +++ b/langs/shared-questions/en.json @@ -271,4 +271,4 @@ "question": "What is the corresponding item on Wikipedia?" } } -} +} \ No newline at end of file diff --git a/langs/shared-questions/nb_NO.json b/langs/shared-questions/nb_NO.json index 522b944d4e..3b4e683612 100644 --- a/langs/shared-questions/nb_NO.json +++ b/langs/shared-questions/nb_NO.json @@ -1,5 +1,33 @@ { "shared_questions": { + "denominations-coins": { + "mappings": { + "0": { + "then": "1-cent mynter aksepteres" + }, + "1": { + "then": "2-cent mynter aksepteres" + }, + "2": { + "then": "5-cent mynter aksepteres" + }, + "3": { + "then": "10-cent mynter aksepteres" + }, + "4": { + "then": "20-cent mynter aksepteres" + }, + "5": { + "then": "50-cent mynter aksepteres" + }, + "6": { + "then": "1-euro mynter aksepteres" + }, + "7": { + "then": "2-euro mynter aksepteres" + } + } + }, "description": { "question": "Er det noe mer som er relevant du ikke kunne opplyse om i tidligere svar? Legg det til her.
Ikke gjenta fakta som allerede er nevnt" }, @@ -210,34 +238,6 @@ } }, "question": "Hva er respektivt element på Wikipedia?" - }, - "denominations-coins": { - "mappings": { - "0": { - "then": "1-cent mynter aksepteres" - }, - "5": { - "then": "50-cent mynter aksepteres" - }, - "6": { - "then": "1-euro mynter aksepteres" - }, - "7": { - "then": "2-euro mynter aksepteres" - }, - "2": { - "then": "5-cent mynter aksepteres" - }, - "3": { - "then": "10-cent mynter aksepteres" - }, - "1": { - "then": "2-cent mynter aksepteres" - }, - "4": { - "then": "20-cent mynter aksepteres" - } - } } } -} +} \ No newline at end of file diff --git a/langs/themes/nb_NO.json b/langs/themes/nb_NO.json index 379d4bdf36..7e5e020f39 100644 --- a/langs/themes/nb_NO.json +++ b/langs/themes/nb_NO.json @@ -7,6 +7,9 @@ "description": "Velkommen til det åpne kunstverkskartet, et kart over statuer, byster, grafitti, og andre kunstverk i verden", "title": "Kunstkort" }, + "bag": { + "title": "BAG-importhjelper" + }, "benches": { "description": "Viser alle benker som er registrert i OpenStreetMap: Individuelle benker, og benker som tilhører offentlig transport eller -skur. Med en OpenStreetMap-konto kan du kartlegge nye benker eller redigere eksisterende.", "shortDescription": "Et benkekart", @@ -26,6 +29,9 @@ "shortDescription": "Et kart over fastmonterte kikkerter", "title": "Kikkerter" }, + "blind_osm": { + "title": "OSM for blinde" + }, "bookcases": { "title": "Kart over åpne bokhyller" }, @@ -622,8 +628,8 @@ "title": "Åpent toalettkart" }, "transit": { - "title": "Bussruter", - "description": "Planlegg turen din med offentlig transport" + "description": "Planlegg turen din med offentlig transport", + "title": "Bussruter" }, "trees": { "description": "Kartlegg trærne.", @@ -639,11 +645,5 @@ "waste_basket": { "shortDescription": "Oversikt over søppelkurver", "title": "Søppelkurv" - }, - "bag": { - "title": "BAG-importhjelper" - }, - "blind_osm": { - "title": "OSM for blinde" } -} +} \ No newline at end of file