diff --git a/Docs/BuiltinIndex.md b/Docs/BuiltinIndex.md index 08c75c1dca..655d907834 100644 --- a/Docs/BuiltinIndex.md +++ b/Docs/BuiltinIndex.md @@ -50,6 +50,7 @@ + [export_as_gpx](#export_as_gpx) + [export_as_geojson](#export_as_geojson) + [minimap](#minimap) + + [contact](#contact) + [payment-options-split](#payment-options-split) + [denominations-coins](#denominations-coins) + [denominations-notes](#denominations-notes) @@ -265,7 +266,6 @@ - food - governments - hackerspace - - hospital - hotel - kindergarten_childcare - nature_reserve @@ -304,7 +304,6 @@ - food - governments - hackerspace - - hospital - hotel - kindergarten_childcare - pharmacy @@ -340,7 +339,6 @@ - food - governments - hackerspace - - hospital - hotel - kindergarten_childcare - pharmacy @@ -775,6 +773,17 @@ +### contact + + + + + + - hospital + + + + ### payment-options-split diff --git a/Docs/BuiltinQuestions.md b/Docs/BuiltinQuestions.md index 84c2582374..8e69de421f 100644 --- a/Docs/BuiltinQuestions.md +++ b/Docs/BuiltinQuestions.md @@ -302,6 +302,7 @@ Which methods of payment are accepted here? - Cash is accepted here - Payment cards are accepted here + - Payment by QR-code is possible here @@ -316,6 +317,7 @@ Which methods of payment are accepted here? - Cash is accepted here - Payment cards are accepted here + - Payment by QR-code is possible here - Coins are accepted here - Bank notes are accepted here - Debit cards are accepted here @@ -334,6 +336,7 @@ Which methods of payment are accepted here? - Cash is accepted here - Payment cards are accepted here + - Payment by QR-code is possible here - Payment is done using a dedicated app - Payment is done using a membership card diff --git a/Docs/Layers/bicycle_library.md b/Docs/Layers/bicycle_library.md index a730f40765..acefdaf07d 100644 --- a/Docs/Layers/bicycle_library.md +++ b/Docs/Layers/bicycle_library.md @@ -117,6 +117,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### email @@ -157,6 +161,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### opening_hours diff --git a/Docs/Layers/bicycle_rental.md b/Docs/Layers/bicycle_rental.md index ee38b026e6..d8d55df83f 100644 --- a/Docs/Layers/bicycle_rental.md +++ b/Docs/Layers/bicycle_rental.md @@ -129,6 +129,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### phone @@ -169,6 +173,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### opening_hours @@ -201,6 +207,8 @@ The question is *Which methods of payment are accepted here?* - Unselecting this answer will add payment:cash=no - *Payment cards are accepted here* corresponds with `payment:cards=yes` - Unselecting this answer will add payment:cards=no + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no This tagrendering is only visible in the popup if the following condition is met: `shop~.+` @@ -221,6 +229,8 @@ The question is *Which methods of payment are accepted here?* - Unselecting this answer will add payment:cash=no - *Payment cards are accepted here* corresponds with `payment:cards=yes` - Unselecting this answer will add payment:cards=no + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no - *Payment is done using a dedicated app* corresponds with `payment:app=yes` - Unselecting this answer will add payment:app=no - *Payment is done using a membership card* corresponds with `payment:membership_card=yes` diff --git a/Docs/Layers/bicycle_rental_non_docking.md b/Docs/Layers/bicycle_rental_non_docking.md index 355d963439..9c218261f7 100644 --- a/Docs/Layers/bicycle_rental_non_docking.md +++ b/Docs/Layers/bicycle_rental_non_docking.md @@ -128,6 +128,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### phone @@ -168,6 +172,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### opening_hours @@ -200,6 +206,8 @@ The question is *Which methods of payment are accepted here?* - Unselecting this answer will add payment:cash=no - *Payment cards are accepted here* corresponds with `payment:cards=yes` - Unselecting this answer will add payment:cards=no + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no This tagrendering is only visible in the popup if the following condition is met: `shop~.+` @@ -220,6 +228,8 @@ The question is *Which methods of payment are accepted here?* - Unselecting this answer will add payment:cash=no - *Payment cards are accepted here* corresponds with `payment:cards=yes` - Unselecting this answer will add payment:cards=no + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no - *Payment is done using a dedicated app* corresponds with `payment:app=yes` - Unselecting this answer will add payment:app=no - *Payment is done using a membership card* corresponds with `payment:membership_card=yes` diff --git a/Docs/Layers/bike_cafe.md b/Docs/Layers/bike_cafe.md index bae4a6e6f5..eb469a1a10 100644 --- a/Docs/Layers/bike_cafe.md +++ b/Docs/Layers/bike_cafe.md @@ -165,6 +165,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### email @@ -205,6 +209,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### opening_hours diff --git a/Docs/Layers/bike_shop.md b/Docs/Layers/bike_shop.md index 58c6c04b21..56e96998d0 100644 --- a/Docs/Layers/bike_shop.md +++ b/Docs/Layers/bike_shop.md @@ -149,6 +149,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### email @@ -189,6 +193,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### opening_hours diff --git a/Docs/Layers/bike_themed_object.md b/Docs/Layers/bike_themed_object.md index 2db33554ae..e259285f09 100644 --- a/Docs/Layers/bike_themed_object.md +++ b/Docs/Layers/bike_themed_object.md @@ -113,6 +113,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### phone @@ -153,6 +157,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### opening_hours diff --git a/Docs/Layers/cafe_pub.md b/Docs/Layers/cafe_pub.md index 244084f161..691c3318db 100644 --- a/Docs/Layers/cafe_pub.md +++ b/Docs/Layers/cafe_pub.md @@ -182,6 +182,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### phone @@ -222,6 +226,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### payment-options @@ -238,6 +244,8 @@ The question is *Which methods of payment are accepted here?* - Unselecting this answer will add payment:cash=no - *Payment cards are accepted here* corresponds with `payment:cards=yes` - Unselecting this answer will add payment:cards=no + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no diff --git a/Docs/Layers/car_rental.md b/Docs/Layers/car_rental.md index f509bd7d24..92d83eee42 100644 --- a/Docs/Layers/car_rental.md +++ b/Docs/Layers/car_rental.md @@ -106,6 +106,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### phone @@ -146,6 +150,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### opening_hours diff --git a/Docs/Layers/charging_station.md b/Docs/Layers/charging_station.md index 460d2f84e7..3d1ccb19ff 100644 --- a/Docs/Layers/charging_station.md +++ b/Docs/Layers/charging_station.md @@ -1759,6 +1759,8 @@ The question is *Which methods of payment are accepted here?* - Unselecting this answer will add payment:cash=no - *Payment cards are accepted here* corresponds with `payment:cards=yes` - Unselecting this answer will add payment:cards=no + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no - *Payment is done using a dedicated app* corresponds with `payment:app=yes` - Unselecting this answer will add payment:app=no - *Payment is done using a membership card* corresponds with `payment:membership_card=yes` diff --git a/Docs/Layers/charging_station_ebikes.md b/Docs/Layers/charging_station_ebikes.md index dde3de5536..ee57e42b16 100644 --- a/Docs/Layers/charging_station_ebikes.md +++ b/Docs/Layers/charging_station_ebikes.md @@ -1758,6 +1758,8 @@ The question is *Which methods of payment are accepted here?* - Unselecting this answer will add payment:cash=no - *Payment cards are accepted here* corresponds with `payment:cards=yes` - Unselecting this answer will add payment:cards=no + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no - *Payment is done using a dedicated app* corresponds with `payment:app=yes` - Unselecting this answer will add payment:app=no - *Payment is done using a membership card* corresponds with `payment:membership_card=yes` diff --git a/Docs/Layers/climbing_club.md b/Docs/Layers/climbing_club.md index 72488f16ee..5f18d356fe 100644 --- a/Docs/Layers/climbing_club.md +++ b/Docs/Layers/climbing_club.md @@ -101,6 +101,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### phone @@ -141,6 +145,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### opening_hours diff --git a/Docs/Layers/climbing_gym.md b/Docs/Layers/climbing_gym.md index 8b71bb04e0..66bcb94e3f 100644 --- a/Docs/Layers/climbing_gym.md +++ b/Docs/Layers/climbing_gym.md @@ -125,6 +125,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### email @@ -165,6 +169,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### fee diff --git a/Docs/Layers/dentist.md b/Docs/Layers/dentist.md index f93c21f2f1..78addb66b1 100644 --- a/Docs/Layers/dentist.md +++ b/Docs/Layers/dentist.md @@ -113,6 +113,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### email @@ -133,6 +135,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### website @@ -153,6 +157,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### email @@ -156,6 +158,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### website @@ -176,6 +180,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### phone @@ -229,6 +233,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### payment-options @@ -245,6 +251,8 @@ The question is *Which methods of payment are accepted here?* - Unselecting this answer will add payment:cash=no - *Payment cards are accepted here* corresponds with `payment:cards=yes` - Unselecting this answer will add payment:cards=no + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no diff --git a/Docs/Layers/dogshop.md b/Docs/Layers/dogshop.md index 2eeada8e1f..c38ce6f4c8 100644 --- a/Docs/Layers/dogshop.md +++ b/Docs/Layers/dogshop.md @@ -311,6 +311,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### phone @@ -351,6 +355,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### payment-options @@ -367,6 +373,8 @@ The question is *Which methods of payment are accepted here?* - Unselecting this answer will add payment:cash=no - *Payment cards are accepted here* corresponds with `payment:cards=yes` - Unselecting this answer will add payment:cards=no + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no diff --git a/Docs/Layers/fitness_centre.md b/Docs/Layers/fitness_centre.md index ffc60372c5..26cc98884b 100644 --- a/Docs/Layers/fitness_centre.md +++ b/Docs/Layers/fitness_centre.md @@ -120,6 +120,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### email @@ -140,6 +142,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### website @@ -160,6 +164,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### phone @@ -232,6 +236,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### payment-options @@ -248,6 +254,8 @@ The question is *Which methods of payment are accepted here?* - Unselecting this answer will add payment:cash=no - *Payment cards are accepted here* corresponds with `payment:cards=yes` - Unselecting this answer will add payment:cards=no + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no diff --git a/Docs/Layers/friture.md b/Docs/Layers/friture.md index f49815f3bb..91dc9c9e65 100644 --- a/Docs/Layers/friture.md +++ b/Docs/Layers/friture.md @@ -189,6 +189,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### phone @@ -229,6 +233,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### payment-options @@ -245,6 +251,8 @@ The question is *Which methods of payment are accepted here?* - Unselecting this answer will add payment:cash=no - *Payment cards are accepted here* corresponds with `payment:cards=yes` - Unselecting this answer will add payment:cards=no + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no diff --git a/Docs/Layers/governments.md b/Docs/Layers/governments.md index 75bc5fd09b..202868ad66 100644 --- a/Docs/Layers/governments.md +++ b/Docs/Layers/governments.md @@ -98,6 +98,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### email @@ -118,6 +120,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### website @@ -138,6 +142,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### phone @@ -202,6 +206,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### opening_hours_24_7 diff --git a/Docs/Layers/hospital.md b/Docs/Layers/hospital.md index a8c8829d06..2b226fa17a 100644 --- a/Docs/Layers/hospital.md +++ b/Docs/Layers/hospital.md @@ -66,6 +66,7 @@ attribute | type | values which are supported by this layer [](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | [](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | [](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | +[](https://taginfo.openstreetmap.org/keys/opening_hours:visitors#values) [opening_hours:visitors](https://wiki.openstreetmap.org/wiki/Key:opening_hours:visitors) | [opening_hours](../SpecialInputElements.md#opening_hours) | @@ -118,6 +119,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### email @@ -138,6 +141,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### website @@ -156,6 +161,22 @@ This is rendered with `{contact:website}* corresponds with `contact:website~.+` - This option cannot be chosen as answer + + +This tagrendering has labels `contact` + + + +### oh-visitor + + + +The question is *When are visitors allowed to visit?* + +This rendering asks information about the property [opening_hours:visitors](https://wiki.openstreetmap.org/wiki/Key:opening_hours:visitors) + +This is rendered with `

Opening hours for visitors

Regular visitors are allowed at the following moments: {opening_hours_table(opening_hours:visitors)}

Some wands might have different opening hours. Many hospitals allow visits during emergencies too.

` + This document is autogenerated from [assets/layers/hospital/hospital.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/hospital/hospital.json) diff --git a/Docs/Layers/hotel.md b/Docs/Layers/hotel.md index 40d1da20a0..ce012d6e63 100644 --- a/Docs/Layers/hotel.md +++ b/Docs/Layers/hotel.md @@ -129,6 +129,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### email @@ -149,6 +151,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### website @@ -169,6 +173,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### phone @@ -159,6 +163,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### opening_hours diff --git a/Docs/Layers/medical-shops.md b/Docs/Layers/medical-shops.md index 517f6c31df..f3bb879119 100644 --- a/Docs/Layers/medical-shops.md +++ b/Docs/Layers/medical-shops.md @@ -40,10 +40,11 @@ Elements must have the all of following tags to be shown on this layer: - shop~.+ + - shop!=mall - shop=medical_supply|shop=hearing_aids|shop=optician -[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22shop%22%3D%22medical_supply%22%5D%5B%22shop%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22shop%22%3D%22hearing_aids%22%5D%5B%22shop%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22shop%22%3D%22optician%22%5D%5B%22shop%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) +[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22shop%22%3D%22medical_supply%22%5D%5B%22shop%22%5D%5B%22shop%22!%3D%22mall%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22shop%22%3D%22hearing_aids%22%5D%5B%22shop%22%5D%5B%22shop%22!%3D%22mall%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22shop%22%3D%22optician%22%5D%5B%22shop%22%5D%5B%22shop%22!%3D%22mall%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) @@ -311,6 +312,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### phone @@ -351,6 +356,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### payment-options @@ -367,6 +374,8 @@ The question is *Which methods of payment are accepted here?* - Unselecting this answer will add payment:cash=no - *Payment cards are accepted here* corresponds with `payment:cards=yes` - Unselecting this answer will add payment:cards=no + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no diff --git a/Docs/Layers/nature_reserve.md b/Docs/Layers/nature_reserve.md index 7875de6dd8..1c85e06b92 100644 --- a/Docs/Layers/nature_reserve.md +++ b/Docs/Layers/nature_reserve.md @@ -189,6 +189,8 @@ This is rendered with `payment:cash=no - *Payment cards are accepted here* corresponds with `payment:cards=yes` - Unselecting this answer will add payment:cards=no + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no This tagrendering is only visible in the popup if the following condition is met: `fee=yes|charge~.+` @@ -194,6 +196,8 @@ This is rendered with `payment:qr_code=no - *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` diff --git a/Docs/Layers/pharmacy.md b/Docs/Layers/pharmacy.md index ad8d4d01b7..60849142ed 100644 --- a/Docs/Layers/pharmacy.md +++ b/Docs/Layers/pharmacy.md @@ -130,6 +130,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### email @@ -150,6 +152,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### website @@ -170,6 +174,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### email @@ -154,6 +156,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### website @@ -174,6 +178,8 @@ This is rendered with `{email}` This tagrendering is only visible in the popup if the following condition is met: `recycling_type=centre` +This tagrendering has labels `contact` + ### phone @@ -287,6 +291,8 @@ This is rendered with `{phone}` This tagrendering is only visible in the popup if the following condition is met: `recycling_type=centre` +This tagrendering has labels `contact` + ### opening_hours_24_7 diff --git a/Docs/Layers/school.md b/Docs/Layers/school.md index 8379646344..9b7660c43c 100644 --- a/Docs/Layers/school.md +++ b/Docs/Layers/school.md @@ -191,6 +191,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### email @@ -231,6 +235,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### school-language diff --git a/Docs/Layers/shops.md b/Docs/Layers/shops.md index 48d967206c..035a080fb7 100644 --- a/Docs/Layers/shops.md +++ b/Docs/Layers/shops.md @@ -44,9 +44,10 @@ Elements must have the all of following tags to be shown on this layer: - shop~.+ + - shop!=mall -[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22shop%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) +[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22shop%22%5D%5B%22shop%22!%3D%22mall%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) @@ -314,6 +315,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### phone @@ -354,6 +359,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### payment-options @@ -370,6 +377,8 @@ The question is *Which methods of payment are accepted here?* - Unselecting this answer will add payment:cash=no - *Payment cards are accepted here* corresponds with `payment:cards=yes` - Unselecting this answer will add payment:cards=no + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no diff --git a/Docs/Layers/sport_shops.md b/Docs/Layers/sport_shops.md index 2948ed6294..544ad665c0 100644 --- a/Docs/Layers/sport_shops.md +++ b/Docs/Layers/sport_shops.md @@ -40,6 +40,7 @@ Elements must have the all of following tags to be shown on this layer: - shop=sports + - shop!=mall [Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22shop%22%3D%22sports%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) @@ -310,6 +311,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### phone @@ -350,6 +355,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### payment-options @@ -366,6 +373,8 @@ The question is *Which methods of payment are accepted here?* - Unselecting this answer will add payment:cash=no - *Payment cards are accepted here* corresponds with `payment:cards=yes` - Unselecting this answer will add payment:cards=no + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no diff --git a/Docs/Layers/sports_centre.md b/Docs/Layers/sports_centre.md index f20ebaf79e..6591e6edad 100644 --- a/Docs/Layers/sports_centre.md +++ b/Docs/Layers/sports_centre.md @@ -113,6 +113,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### website @@ -133,6 +135,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### wheelchair-access diff --git a/Docs/Layers/tertiary_education.md b/Docs/Layers/tertiary_education.md index b44e4af6c0..c9dc230b14 100644 --- a/Docs/Layers/tertiary_education.md +++ b/Docs/Layers/tertiary_education.md @@ -156,6 +156,8 @@ This is rendered with `{email}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### phone @@ -194,6 +198,8 @@ This is rendered with `{phone}` - *{contact:phone}* corresponds with `contact:phone~.+` - This option cannot be chosen as answer - + + +This tagrendering has labels `contact` This document is autogenerated from [assets/layers/tertiary_education/tertiary_education.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/tertiary_education/tertiary_education.json) diff --git a/Docs/Layers/ticket_machine.md b/Docs/Layers/ticket_machine.md index 0f1b2d106b..1eb76d910d 100644 --- a/Docs/Layers/ticket_machine.md +++ b/Docs/Layers/ticket_machine.md @@ -129,6 +129,8 @@ The question is *Which methods of payment are accepted here?* - *Payment cards are accepted here* corresponds with `payment:cards=yes` - This option cannot be chosen as answer - Unselecting this answer will add + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no - *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` diff --git a/Docs/Layers/ticket_validator.md b/Docs/Layers/ticket_validator.md index 071f82d440..fc82a9a612 100644 --- a/Docs/Layers/ticket_validator.md +++ b/Docs/Layers/ticket_validator.md @@ -142,6 +142,8 @@ The question is *Which methods of payment are accepted here?* - Unselecting this answer will add payment:cash=no - *Payment cards are accepted here* corresponds with `payment:cards=yes` - Unselecting this answer will add payment:cards=no + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=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 74868582e7..44b6a0a706 100644 --- a/Docs/Layers/toilet.md +++ b/Docs/Layers/toilet.md @@ -188,6 +188,8 @@ The question is *Which methods of payment are accepted here?* - *Payment cards are accepted here* corresponds with `payment:cards=yes` - This option cannot be chosen as answer - Unselecting this answer will add + - *Payment by QR-code is possible here* corresponds with `payment:qr_code=yes` + - Unselecting this answer will add payment:qr_code=no - *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` diff --git a/Docs/Layers/veterinary.md b/Docs/Layers/veterinary.md index 94ef27e48f..c3327b84a6 100644 --- a/Docs/Layers/veterinary.md +++ b/Docs/Layers/veterinary.md @@ -86,6 +86,8 @@ This is rendered with `{phone}` - This option cannot be chosen as answer +This tagrendering has labels `contact` + ### opening_hours diff --git a/Docs/TagInfo/mapcomplete_bicycle_rental.json b/Docs/TagInfo/mapcomplete_bicycle_rental.json index 24738d9c0d..5d60bff58a 100644 --- a/Docs/TagInfo/mapcomplete_bicycle_rental.json +++ b/Docs/TagInfo/mapcomplete_bicycle_rental.json @@ -122,6 +122,11 @@ "description": "Layer 'Bicycle rental' 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 'Bicycle rental') (This is only shown if shop~.+)", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Bicycle rental' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle rental') (This is only shown if shop~.+)", + "value": "yes" + }, { "key": "payment:cash", "description": "Layer 'Bicycle rental' 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 'Bicycle rental')", @@ -132,6 +137,11 @@ "description": "Layer 'Bicycle rental' 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 'Bicycle rental')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Bicycle rental' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle rental')", + "value": "yes" + }, { "key": "payment:app", "description": "Layer 'Bicycle rental' shows payment:app=yes with a fixed text, namely 'Payment is done using a dedicated app' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle rental')", diff --git a/Docs/TagInfo/mapcomplete_cafes_and_pubs.json b/Docs/TagInfo/mapcomplete_cafes_and_pubs.json index a9a72b2b77..3e2d145482 100644 --- a/Docs/TagInfo/mapcomplete_cafes_and_pubs.json +++ b/Docs/TagInfo/mapcomplete_cafes_and_pubs.json @@ -152,6 +152,11 @@ "description": "Layer 'Cafés and pubs' 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 'Cafés and pubs')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Cafés and pubs' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cafés and pubs')", + "value": "yes" + }, { "key": "wheelchair", "description": "Layer 'Cafés and pubs' shows wheelchair=designated with a fixed text, namely 'This place is specially adapted for wheelchair users' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cafés and pubs')", diff --git a/Docs/TagInfo/mapcomplete_charging_stations.json b/Docs/TagInfo/mapcomplete_charging_stations.json index 81cfdb0761..55e853bfcc 100644 --- a/Docs/TagInfo/mapcomplete_charging_stations.json +++ b/Docs/TagInfo/mapcomplete_charging_stations.json @@ -972,6 +972,11 @@ "description": "Layer 'Charging stations' 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 'Charging stations') (This is only shown if fee=yes|charge~.+)", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Charging stations' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') (This is only shown if fee=yes|charge~.+)", + "value": "yes" + }, { "key": "payment:app", "description": "Layer 'Charging stations' shows payment:app=yes with a fixed text, namely 'Payment is done using a dedicated app' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') (This is only shown if fee=yes|charge~.+)", diff --git a/Docs/TagInfo/mapcomplete_cyclofix.json b/Docs/TagInfo/mapcomplete_cyclofix.json index 7ecd89a0fd..3f838fa587 100644 --- a/Docs/TagInfo/mapcomplete_cyclofix.json +++ b/Docs/TagInfo/mapcomplete_cyclofix.json @@ -517,6 +517,11 @@ "description": "Layer 'Bicycle rental' 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 'Cyclofix - an open map for cyclists') (This is only shown if shop~.+)", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Bicycle rental' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible 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 shop~.+)", + "value": "yes" + }, { "key": "payment:cash", "description": "Layer 'Bicycle rental' 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 'Cyclofix - an open map for cyclists')", @@ -527,6 +532,11 @@ "description": "Layer 'Bicycle rental' 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 'Cyclofix - an open map for cyclists')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Bicycle rental' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", + "value": "yes" + }, { "key": "payment:app", "description": "Layer 'Bicycle rental' shows payment:app=yes with a fixed text, namely 'Payment is done using a dedicated app' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')", @@ -2342,6 +2352,11 @@ "description": "Layer 'Charging stations' 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 'Cyclofix - an open map for cyclists') (This is only shown if fee=yes|charge~.+)", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Charging stations' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible 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 fee=yes|charge~.+)", + "value": "yes" + }, { "key": "payment:app", "description": "Layer 'Charging stations' shows payment:app=yes with a fixed text, namely 'Payment is done using a dedicated app' 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 fee=yes|charge~.+)", diff --git a/Docs/TagInfo/mapcomplete_food.json b/Docs/TagInfo/mapcomplete_food.json index 0a10bef4e6..43fb67e079 100644 --- a/Docs/TagInfo/mapcomplete_food.json +++ b/Docs/TagInfo/mapcomplete_food.json @@ -117,6 +117,11 @@ "description": "Layer 'Restaurants and fast food' 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 'Restaurants and fast food')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Restaurants and fast food' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')", + "value": "yes" + }, { "key": "wheelchair", "description": "Layer 'Restaurants and fast food' shows wheelchair=designated with a fixed text, namely 'This place is specially adapted for wheelchair users' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')", diff --git a/Docs/TagInfo/mapcomplete_fritures.json b/Docs/TagInfo/mapcomplete_fritures.json index 1e1bcdfe8f..12a9b48efb 100644 --- a/Docs/TagInfo/mapcomplete_fritures.json +++ b/Docs/TagInfo/mapcomplete_fritures.json @@ -121,6 +121,11 @@ "description": "Layer 'Fries shop' 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 'Fries shops')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Fries shop' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')", + "value": "yes" + }, { "key": "wheelchair", "description": "Layer 'Fries shop' shows wheelchair=designated with a fixed text, namely 'This place is specially adapted for wheelchair users' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')", diff --git a/Docs/TagInfo/mapcomplete_healthcare.json b/Docs/TagInfo/mapcomplete_healthcare.json index 7557e015e3..83b2f69cbf 100644 --- a/Docs/TagInfo/mapcomplete_healthcare.json +++ b/Docs/TagInfo/mapcomplete_healthcare.json @@ -259,6 +259,10 @@ "key": "contact:website", "description": "Layer 'Hospitals' shows contact:website~.+ with a fixed text, namely '{contact:website}' (in the MapComplete.osm.be theme 'Healthcare')" }, + { + "key": "opening_hours:visitors", + "description": "Layer 'Hospitals' shows and asks freeform values for key 'opening_hours:visitors' (in the MapComplete.osm.be theme 'Healthcare')" + }, { "key": "amenity", "description": "The MapComplete theme Healthcare has a layer Pharmacies showing features with this tag", @@ -1208,6 +1212,11 @@ "description": "Layer 'Shop' 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 'Healthcare')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Shop' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "yes" + }, { "key": "level", "description": "Layer 'Shop' shows and asks freeform values for key 'level' (in the MapComplete.osm.be theme 'Healthcare')" @@ -2192,6 +2201,11 @@ "description": "Layer 'Shop' 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 'Healthcare')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Shop' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')", + "value": "yes" + }, { "key": "level", "description": "Layer 'Shop' shows and asks freeform values for key 'level' (in the MapComplete.osm.be theme 'Healthcare')" diff --git a/Docs/TagInfo/mapcomplete_nature.json b/Docs/TagInfo/mapcomplete_nature.json index 8ddc5390fe..5aeca54bd3 100644 --- a/Docs/TagInfo/mapcomplete_nature.json +++ b/Docs/TagInfo/mapcomplete_nature.json @@ -876,6 +876,11 @@ "description": "Layer 'Toilets' shows payment:cards=yes with a fixed text, namely 'Payment cards are accepted here' (in the MapComplete.osm.be theme 'Into nature') (This is only shown if fee=yes)", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Toilets' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature') (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 'Into nature') (This is only shown if fee=yes)", diff --git a/Docs/TagInfo/mapcomplete_observation_towers.json b/Docs/TagInfo/mapcomplete_observation_towers.json index 3cea9a44f8..edeeade8dd 100644 --- a/Docs/TagInfo/mapcomplete_observation_towers.json +++ b/Docs/TagInfo/mapcomplete_observation_towers.json @@ -78,6 +78,11 @@ "description": "Layer 'Observation towers' 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 'Observation towers') (This is only shown if fee=yes|charge~.+)", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Observation towers' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Observation towers') (This is only shown if fee=yes|charge~.+)", + "value": "yes" + }, { "key": "website", "description": "Layer 'Observation towers' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Observation towers')" diff --git a/Docs/TagInfo/mapcomplete_onwheels.json b/Docs/TagInfo/mapcomplete_onwheels.json index 0b6fda1411..6af8afe2de 100644 --- a/Docs/TagInfo/mapcomplete_onwheels.json +++ b/Docs/TagInfo/mapcomplete_onwheels.json @@ -152,6 +152,11 @@ "description": "Layer 'Cafés and pubs' 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 'OnWheels')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Cafés and pubs' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "yes" + }, { "key": "wheelchair", "description": "Layer 'Cafés and pubs' shows wheelchair=designated with a fixed text, namely 'This place is specially adapted for wheelchair users' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", @@ -614,6 +619,11 @@ "description": "Layer 'Restaurants and fast food' 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 'OnWheels')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Restaurants and fast food' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "yes" + }, { "key": "wheelchair", "description": "Layer 'Restaurants and fast food' shows wheelchair=designated with a fixed text, namely 'This place is specially adapted for wheelchair users' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", @@ -2072,6 +2082,11 @@ "description": "Layer 'Shop' 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 'OnWheels')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Shop' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')", + "value": "yes" + }, { "key": "level", "description": "Layer 'Shop' shows and asks freeform values for key 'level' (in the MapComplete.osm.be theme 'OnWheels')" @@ -2293,6 +2308,11 @@ "description": "Layer 'Toilets' shows payment:cards=yes with a fixed text, namely 'Payment cards are accepted here' (in the MapComplete.osm.be theme 'OnWheels') (This is only shown if fee=yes)", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Toilets' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels') (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 'OnWheels') (This is only shown if fee=yes)", @@ -2621,6 +2641,10 @@ "key": "contact:website", "description": "Layer 'Hospitals' shows contact:website~.+ with a fixed text, namely '{contact:website}' (in the MapComplete.osm.be theme 'OnWheels')" }, + { + "key": "opening_hours:visitors", + "description": "Layer 'Hospitals' shows and asks freeform values for key 'opening_hours:visitors' (in the MapComplete.osm.be theme 'OnWheels')" + }, { "key": "amenity", "description": "The MapComplete theme OnWheels has a layer Reception desks showing features with this tag", diff --git a/Docs/TagInfo/mapcomplete_parkings.json b/Docs/TagInfo/mapcomplete_parkings.json index df2fe01ed7..070da12dd7 100644 --- a/Docs/TagInfo/mapcomplete_parkings.json +++ b/Docs/TagInfo/mapcomplete_parkings.json @@ -270,6 +270,11 @@ "description": "Layer 'Parking Ticket Machines' shows payment:cards=yes with a fixed text, namely 'Payment cards are accepted here' (in the MapComplete.osm.be theme 'Parking')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Parking Ticket Machines' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking')", + "value": "yes" + }, { "key": "payment:coins", "description": "Layer 'Parking Ticket Machines' 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 'Parking')", diff --git a/Docs/TagInfo/mapcomplete_personal.json b/Docs/TagInfo/mapcomplete_personal.json index 106d9da338..dc046386bf 100644 --- a/Docs/TagInfo/mapcomplete_personal.json +++ b/Docs/TagInfo/mapcomplete_personal.json @@ -1279,6 +1279,11 @@ "description": "Layer 'Bicycle rental' 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 shop~.+)", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Bicycle rental' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if shop~.+)", + "value": "yes" + }, { "key": "payment:cash", "description": "Layer 'Bicycle rental' 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')", @@ -1289,6 +1294,11 @@ "description": "Layer 'Bicycle rental' 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')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Bicycle rental' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, { "key": "payment:app", "description": "Layer 'Bicycle rental' shows payment:app=yes with a fixed text, namely 'Payment is done using a dedicated app' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", @@ -2672,6 +2682,11 @@ "description": "Layer 'Cafés and pubs' 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')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Cafés and pubs' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, { "key": "wheelchair", "description": "Layer 'Cafés and pubs' shows wheelchair=designated with a fixed text, namely 'This place is specially adapted for wheelchair users' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", @@ -3758,6 +3773,11 @@ "description": "Layer 'Charging stations' 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|charge~.+)", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Charging stations' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible 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|charge~.+)", + "value": "yes" + }, { "key": "payment:app", "description": "Layer 'Charging stations' shows payment:app=yes with a fixed text, namely 'Payment is done using a dedicated app' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if fee=yes|charge~.+)", @@ -6648,6 +6668,11 @@ "description": "Layer 'Restaurants and fast food' 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')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Restaurants and fast food' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, { "key": "wheelchair", "description": "Layer 'Restaurants and fast food' shows wheelchair=designated with a fixed text, namely 'This place is specially adapted for wheelchair users' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", @@ -7326,6 +7351,10 @@ "key": "contact:website", "description": "Layer 'Hospitals' shows contact:website~.+ with a fixed text, namely '{contact:website}' (in the MapComplete.osm.be theme 'Personal theme')" }, + { + "key": "opening_hours:visitors", + "description": "Layer 'Hospitals' shows and asks freeform values for key 'opening_hours:visitors' (in the MapComplete.osm.be theme 'Personal theme')" + }, { "key": "tourism", "description": "The MapComplete theme Personal theme has a layer Hotels showing features with this tag", @@ -8155,6 +8184,11 @@ "description": "Layer 'Observation towers' 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|charge~.+)", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Observation towers' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible 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|charge~.+)", + "value": "yes" + }, { "key": "website", "description": "Layer 'Observation towers' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Personal theme')" @@ -8566,6 +8600,11 @@ "description": "Layer 'Parking Ticket Machines' shows payment:cards=yes with a fixed text, namely 'Payment cards are accepted here' (in the MapComplete.osm.be theme 'Personal theme')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Parking Ticket Machines' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, { "key": "payment:coins", "description": "Layer 'Parking Ticket Machines' 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')", @@ -10756,6 +10795,11 @@ "description": "Layer 'Shop' 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')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Shop' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, { "key": "level", "description": "Layer 'Shop' shows and asks freeform values for key 'level' (in the MapComplete.osm.be theme 'Personal theme')" @@ -11777,6 +11821,11 @@ "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:qr_code", + "description": "Layer 'Toilets' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible 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: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)", diff --git a/Docs/TagInfo/mapcomplete_pets.json b/Docs/TagInfo/mapcomplete_pets.json index cc236be4ca..48778a7533 100644 --- a/Docs/TagInfo/mapcomplete_pets.json +++ b/Docs/TagInfo/mapcomplete_pets.json @@ -187,6 +187,11 @@ "description": "Layer 'Dog friendly eateries' 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 'Veterinarians, dog parks and other pet-amenities')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Dog friendly eateries' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "yes" + }, { "key": "wheelchair", "description": "Layer 'Dog friendly eateries' shows wheelchair=designated with a fixed text, namely 'This place is specially adapted for wheelchair users' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", @@ -1446,6 +1451,11 @@ "description": "Layer 'Dog-friendly shops' 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 'Veterinarians, dog parks and other pet-amenities')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Dog-friendly shops' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "yes" + }, { "key": "level", "description": "Layer 'Dog-friendly shops' shows and asks freeform values for key 'level' (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')" diff --git a/Docs/TagInfo/mapcomplete_shops.json b/Docs/TagInfo/mapcomplete_shops.json index 088f16d1b9..d2f56271a0 100644 --- a/Docs/TagInfo/mapcomplete_shops.json +++ b/Docs/TagInfo/mapcomplete_shops.json @@ -876,6 +876,11 @@ "description": "Layer 'Shop' 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 'Open Shop Map')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Shop' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Shop Map')", + "value": "yes" + }, { "key": "level", "description": "Layer 'Shop' shows and asks freeform values for key 'level' (in the MapComplete.osm.be theme 'Open Shop Map')" diff --git a/Docs/TagInfo/mapcomplete_sports.json b/Docs/TagInfo/mapcomplete_sports.json index b74d530df8..9a527fa8e4 100644 --- a/Docs/TagInfo/mapcomplete_sports.json +++ b/Docs/TagInfo/mapcomplete_sports.json @@ -1367,6 +1367,11 @@ "description": "Layer 'Shop' 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 'Sports')", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Shop' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')", + "value": "yes" + }, { "key": "level", "description": "Layer 'Shop' shows and asks freeform values for key 'level' (in the MapComplete.osm.be theme 'Sports')" diff --git a/Docs/TagInfo/mapcomplete_toilets.json b/Docs/TagInfo/mapcomplete_toilets.json index 3a3f0e3fc2..ab88bf4924 100644 --- a/Docs/TagInfo/mapcomplete_toilets.json +++ b/Docs/TagInfo/mapcomplete_toilets.json @@ -113,6 +113,11 @@ "description": "Layer 'Toilets' shows payment:cards=yes with a fixed text, namely 'Payment cards are accepted here' (in the MapComplete.osm.be theme 'Open Toilet Map') (This is only shown if fee=yes)", "value": "yes" }, + { + "key": "payment:qr_code", + "description": "Layer 'Toilets' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Toilet Map') (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 'Open Toilet Map') (This is only shown if fee=yes)", diff --git a/assets/contributors.json b/assets/contributors.json index bd25538477..e71910bde5 100644 --- a/assets/contributors.json +++ b/assets/contributors.json @@ -1,11 +1,11 @@ { "contributors": [ { - "commits": 5317, + "commits": 5335, "contributor": "Pieter Vander Vennet" }, { - "commits": 360, + "commits": 361, "contributor": "Robin van der Linde" }, { @@ -33,7 +33,7 @@ "contributor": "paunofu" }, { - "commits": 26, + "commits": 27, "contributor": "riQQ" }, { @@ -228,6 +228,10 @@ "commits": 1, "contributor": "galder158@hotmail.com" }, + { + "commits": 1, + "contributor": "Bart Hanssens" + }, { "commits": 1, "contributor": "brunnerpaul" diff --git a/assets/layers/cafe_pub/cafe_pub.json b/assets/layers/cafe_pub/cafe_pub.json index d2f5dd6d03..ed6f4af781 100644 --- a/assets/layers/cafe_pub/cafe_pub.json +++ b/assets/layers/cafe_pub/cafe_pub.json @@ -233,7 +233,7 @@ { "if": "amenity=cafe", "then": { - "en": "A cafe to drink tea, coffee or an alcoholic beverage in a quiet environment", + "en": "A cafe to drink tea, coffee or an alcoholical bevarage in a quiet environment", "nl": "Dit is een cafe - een plaats waar men rustig kan zitten om een thee, koffie of alcoholische drank te nuttigen.", "de": "Ein Café, um in ruhiger Umgebung Tee, Kaffee oder ein alkoholisches Getränk zu trinken", "da": "En café til at drikke te, kaffe eller en alkoholisk drik i rolige omgivelser", @@ -369,4 +369,4 @@ "fr": "Une couche montrants les cafés et pubs où l’on peut prendre un verre. Cette couche pose des questions y afférentes.", "ca": "Una capa que mostra cafeteries i bars on un es pot reunir amb una beguda. La capa demana algunes preguntes rellevants" } -} +} \ No newline at end of file diff --git a/assets/layers/climbing_opportunity/climbing_opportunity.json b/assets/layers/climbing_opportunity/climbing_opportunity.json index ecdba430b6..5f775f1926 100644 --- a/assets/layers/climbing_opportunity/climbing_opportunity.json +++ b/assets/layers/climbing_opportunity/climbing_opportunity.json @@ -11,7 +11,8 @@ }, "description": { "en": "Fallback layer with items on which climbing _might_ be possible. It is loaded when zoomed in a lot, to prevent duplicate items to be added", - "de": "Rückfallebene mit Orten, auf denen Klettern eventuell möglich ist. Sie wird erst angezeigt, wenn man stark hineinzoomt, um zu verhindern, dass Elemente doppelt hinzugefügt werden" + "de": "Rückfallebene mit Orten, auf denen Klettern eventuell möglich ist. Sie wird erst angezeigt, wenn man stark hineinzoomt, um zu verhindern, dass Elemente doppelt hinzugefügt werden", + "nl": "Laag met plaatsen waar klimmen _misschien_ mogelijk is. Deze wordt geladen als je ver inzoomt, om te voorkomen dat je per ongeluk dubbels maakt" }, "minzoom": 19, "source": { diff --git a/assets/layers/dentist/dentist.json b/assets/layers/dentist/dentist.json index 0cd0fd9f77..0ee28b471d 100644 --- a/assets/layers/dentist/dentist.json +++ b/assets/layers/dentist/dentist.json @@ -19,7 +19,7 @@ "render": { "en": "Dentist Office {name}", "de": "Arztpraxis {name}", - "nl": "Dokterspraktijk {name}", + "nl": "Tandartspraktijk {name}", "fr": "Cabinet medical {name}" } }, diff --git a/assets/layers/fitness_centre/fitness_centre.json b/assets/layers/fitness_centre/fitness_centre.json index d029ab229d..efc46d9748 100644 --- a/assets/layers/fitness_centre/fitness_centre.json +++ b/assets/layers/fitness_centre/fitness_centre.json @@ -3,12 +3,14 @@ "name": { "en": "Fitness Centres", "de": "Fitnessstudios", - "ca": "Centre de fitnes o gimnàs" + "ca": "Centre de fitnes o gimnàs", + "nl": "Fitnesscentra" }, "description": { "en": "Layer showing fitness centres", "de": "Ebene mit Fitnessstudios", - "ca": "Capa que mostra centres de fitnes o gimnasos" + "ca": "Capa que mostra centres de fitnes o gimnasos", + "nl": "Laag die fitnesscentra toon" }, "source": { "osmTags": "leisure=fitness_centre" diff --git a/assets/layers/hospital/hospital.json b/assets/layers/hospital/hospital.json index f9d64d98fb..923e56433f 100644 --- a/assets/layers/hospital/hospital.json +++ b/assets/layers/hospital/hospital.json @@ -123,4 +123,4 @@ "width": 1 } ] -} +} \ No newline at end of file diff --git a/assets/layers/note/note.json b/assets/layers/note/note.json index 5bb7f2d1da..40339d4723 100644 --- a/assets/layers/note/note.json +++ b/assets/layers/note/note.json @@ -83,7 +83,7 @@ "render": { "en": "Report {_first_user} for spam or inappropriate messages", "nl": "{_first_user} melden voor spam of ongepaste opmerkingen", - "de": "{_first_user} als Spam melden", + "de": "", "es": "Reportar {_first_user}" }, "condition": "_opened_by_anonymous_user=false" diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json index 6fb292a4a9..ac76698925 100644 --- a/assets/layers/shops/shops.json +++ b/assets/layers/shops/shops.json @@ -413,4 +413,4 @@ "accepts_cards", "has_organic" ] -} +} \ No newline at end of file diff --git a/assets/layers/usersettings/usersettings.json b/assets/layers/usersettings/usersettings.json index 8b4706c60e..ba4b9ac453 100644 --- a/assets/layers/usersettings/usersettings.json +++ b/assets/layers/usersettings/usersettings.json @@ -105,7 +105,8 @@ "de": "Fragen der Reihe nach anzeigen", "ca": "Mostra les preguntes una per una", "fr": "Afficher les questions une à une", - "pt": "Mostrar perguntas uma a uma" + "pt": "Mostrar perguntas uma a uma", + "nl": "Toon de vragen één per één" } } ] @@ -278,7 +279,8 @@ "de": "Sie haben bei {_csCount} verschiedenen Gelegenheiten Änderungen vorgenommen! Das ist großartig!", "ca": "Has fet {_csCount} en diferents ocasions! Això és sorprenent!", "fr": "Vous avez fait {_csCount} modifications ! C'est génial !", - "pt": "Você fez alterações em {_csCount} ocasiões diferentes! Isso é incrível!" + "pt": "Você fez alterações em {_csCount} ocasiões diferentes! Isso é incrível!", + "nl": "Je hebt {_csCount} verschillende keren bijgedragen! Dat is indrukwekkend!" }, "icon": "party" } diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json index bf9ccaab47..752934bee8 100644 --- a/assets/tagRenderings/questions.json +++ b/assets/tagRenderings/questions.json @@ -113,7 +113,9 @@ "render": "{minimap(18, id): width:100%; height:8rem; border-radius:2rem; overflow: hidden; pointer-events: none;}" }, "phone": { - "labels": ["contact"], + "labels": [ + "contact" + ], "question": { "en": "What is the phone number of {title()}?", "nl": "Wat is het telefoonnummer van {title()}?", @@ -165,7 +167,9 @@ ] }, "email": { - "labels": ["contact"], + "labels": [ + "contact" + ], "render": "{email}", "question": { "nl": "Wat is het e-mailadres van {title()}?", @@ -208,7 +212,9 @@ } }, "website": { - "labels": ["contact"], + "labels": [ + "contact" + ], "question": { "en": "What is the website of {title()}?", "nl": "Wat is de website van {title()}?", @@ -2034,4 +2040,4 @@ } ] } -} +} \ No newline at end of file diff --git a/assets/translators.json b/assets/translators.json index ea950809ef..906b1416f1 100644 --- a/assets/translators.json +++ b/assets/translators.json @@ -1,11 +1,11 @@ { "contributors": [ { - "commits": 273, + "commits": 274, "contributor": "kjon" }, { - "commits": 269, + "commits": 270, "contributor": "Pieter Vander Vennet" }, { @@ -132,13 +132,17 @@ "commits": 9, "contributor": "Jacque Fresco" }, + { + "commits": 8, + "contributor": "Ettore Atalan" + }, { "commits": 8, "contributor": "Vinicius" }, { "commits": 7, - "contributor": "Ettore Atalan" + "contributor": "Joost Schouppe" }, { "commits": 7, @@ -172,10 +176,6 @@ "commits": 6, "contributor": "ⵣⵓⵀⵉⵔ ⴰⵎⴰⵣⵉⵖ زهير أمازيغ" }, - { - "commits": 6, - "contributor": "Joost Schouppe" - }, { "commits": 6, "contributor": "Štefan Baebler" @@ -196,6 +196,10 @@ "commits": 6, "contributor": "lvgx" }, + { + "commits": 5, + "contributor": "Piotr Strebski" + }, { "commits": 5, "contributor": "gallegonovato" @@ -260,10 +264,6 @@ "commits": 4, "contributor": "Jan Zabel" }, - { - "commits": 3, - "contributor": "Piotr Strebski" - }, { "commits": 3, "contributor": "Alexey Lutskyi" diff --git a/langs/layers/de.json b/langs/layers/de.json index da853a1d00..ff63f5f68b 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -35,16 +35,6 @@ "1": { "title": "eine freistehende Posterbox" }, - "10": { - "description": "Verwendet für Werbeschilder, Leuchtreklamen, Logos und institutionelle Eingangsschilder", - "title": "ein Schild" - }, - "11": { - "title": "eine Skulptur" - }, - "12": { - "title": "eine Wandmalerei" - }, "2": { "title": "eine wandmontierte Posterbox" }, @@ -71,6 +61,16 @@ }, "9": { "title": "ein Totem" + }, + "10": { + "description": "Verwendet für Werbeschilder, Leuchtreklamen, Logos und institutionelle Eingangsschilder", + "title": "ein Schild" + }, + "11": { + "title": "eine Skulptur" + }, + "12": { + "title": "eine Wandmalerei" } }, "tagRenderings": { @@ -165,9 +165,6 @@ "1": { "then": "Dies ist ein Brett" }, - "10": { - "then": "Dies ist eine Wandmalerei" - }, "2": { "then": "Dies ist eine Litfaßsäule" }, @@ -191,6 +188,9 @@ }, "9": { "then": "Dies ist ein Totem" + }, + "10": { + "then": "Dies ist eine Wandmalerei" } }, "question": "Welche Art von Werbung ist das?", @@ -205,9 +205,6 @@ "1": { "then": "Brett" }, - "10": { - "then": "Wandmalerei" - }, "2": { "then": "Posterbox" }, @@ -231,6 +228,9 @@ }, "9": { "then": "Totem" + }, + "10": { + "then": "Wandmalerei" } } } @@ -312,15 +312,6 @@ "1": { "then": "Wandbild" }, - "10": { - "then": "Azulejo (spanische dekorative Fliesenarbeit)" - }, - "11": { - "then": "Fliesenarbeit" - }, - "12": { - "then": "Holzschnitzerei" - }, "2": { "then": "Malerei" }, @@ -344,6 +335,15 @@ }, "9": { "then": "Relief" + }, + "10": { + "then": "Azulejo (spanische dekorative Fliesenarbeit)" + }, + "11": { + "then": "Fliesenarbeit" + }, + "12": { + "then": "Holzschnitzerei" } }, "question": "Um welche Art Kunstwerk handelt es sich?", @@ -1804,27 +1804,6 @@ "1": { "question": "Verfügt über einen
Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)
" }, - "10": { - "question": "Hat einen
Typ 2 (Mennekes)
Anschluss mit Kabel" - }, - "11": { - "question": "Hat einen
Tesla Supercharger CCS (Typ 2 CSS vonTesla)
Anschluss" - }, - "12": { - "question": "Hat einen
Tesla Supercharger (Destination)
Anschluss" - }, - "13": { - "question": "Hat einen
Tesla Supercharger (Destination) (Typ 2 von Tesla)
Anschluss mit Kabel" - }, - "14": { - "question": "Hat einen
USB-Anschluss zum Aufladen von Telefonen und kleinen Elektrogeräten
" - }, - "15": { - "question": "Hat einen
Bosch Active Connect Anschluss mit 3 Pins
und Kabel" - }, - "16": { - "question": "Hat einen
Bosch Active Connect Anschluss mit 5 Pins
und Kabel" - }, "2": { "question": "Verfügt über einen
europäischen Netzstecker mit Erdungsstift (CEE7/4 Typ E)
Anschluss" }, @@ -1848,6 +1827,27 @@ }, "9": { "question": "Hat einen
Typ 2 CCS (Mennekes)
Anschluss" + }, + "10": { + "question": "Hat einen
Typ 2 (Mennekes)
Anschluss mit Kabel" + }, + "11": { + "question": "Hat einen
Tesla Supercharger CCS (Typ 2 CSS vonTesla)
Anschluss" + }, + "12": { + "question": "Hat einen
Tesla Supercharger (Destination)
Anschluss" + }, + "13": { + "question": "Hat einen
Tesla Supercharger (Destination) (Typ 2 von Tesla)
Anschluss mit Kabel" + }, + "14": { + "question": "Hat einen
USB-Anschluss zum Aufladen von Telefonen und kleinen Elektrogeräten
" + }, + "15": { + "question": "Hat einen
Bosch Active Connect Anschluss mit 3 Pins
und Kabel" + }, + "16": { + "question": "Hat einen
Bosch Active Connect Anschluss mit 5 Pins
und Kabel" } } } @@ -1903,6 +1903,30 @@ "1": { "then": "Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)" }, + "2": { + "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" + }, + "3": { + "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" + }, + "4": { + "then": "Chademo-Anschluss" + }, + "5": { + "then": "Chademo-Anschluss" + }, + "6": { + "then": "Typ 1 mit Kabel (J1772)" + }, + "7": { + "then": "Typ 1 mit Kabel (J1772)" + }, + "8": { + "then": "Typ 1 ohne Kabel (J1772)" + }, + "9": { + "then": " Typ 1 ohne Kabel (J1772)" + }, "10": { "then": "Typ 1 CCS (Typ 1 Combo)" }, @@ -1933,9 +1957,6 @@ "19": { "then": "Typ 2 mit Kabel (mennekes)" }, - "2": { - "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" - }, "20": { "then": "Tesla Supercharger CCS (Typ 2 CSS von Tesla)" }, @@ -1966,32 +1987,11 @@ "29": { "then": " Bosch Active Connect mit 3 Pins und Kabel" }, - "3": { - "then": "Europäischer Netzstecker mit Erdungsstift (CEE7/4 Typ E)" - }, "30": { "then": "Bosch Active Connect mit 5 Pins und Kabel" }, "31": { "then": " Bosch Active Connect mit 5 Pins und Kabel" - }, - "4": { - "then": "Chademo-Anschluss" - }, - "5": { - "then": "Chademo-Anschluss" - }, - "6": { - "then": "Typ 1 mit Kabel (J1772)" - }, - "7": { - "then": "Typ 1 mit Kabel (J1772)" - }, - "8": { - "then": "Typ 1 ohne Kabel (J1772)" - }, - "9": { - "then": " Typ 1 ohne Kabel (J1772)" } }, "question": "Welche Ladeanschlüsse gibt es hier?" @@ -3477,15 +3477,6 @@ "1": { "then": "Dieser Radweg hat einen festen Belag" }, - "10": { - "then": "Dieser Radweg besteht aus feinem Schotter" - }, - "11": { - "then": "Der Radweg ist aus Kies" - }, - "12": { - "then": "Dieser Radweg besteht aus Rohboden" - }, "2": { "then": "Der Radweg ist aus Asphalt" }, @@ -3509,6 +3500,15 @@ }, "9": { "then": "Der Radweg ist aus Schotter" + }, + "10": { + "then": "Dieser Radweg besteht aus feinem Schotter" + }, + "11": { + "then": "Der Radweg ist aus Kies" + }, + "12": { + "then": "Dieser Radweg besteht aus Rohboden" } }, "question": "Was ist der Belag dieses Radwegs?", @@ -3557,15 +3557,6 @@ "1": { "then": "Dieser Radweg hat einen festen Belag" }, - "10": { - "then": "Dieser Radweg besteht aus feinem Schotter" - }, - "11": { - "then": "Der Radweg ist aus Kies" - }, - "12": { - "then": "Dieser Radweg besteht aus Rohboden" - }, "2": { "then": "Der Radweg ist aus Asphalt" }, @@ -3589,6 +3580,15 @@ }, "9": { "then": "Der Radweg ist aus Schotter" + }, + "10": { + "then": "Dieser Radweg besteht aus feinem Schotter" + }, + "11": { + "then": "Der Radweg ist aus Kies" + }, + "12": { + "then": "Dieser Radweg besteht aus Rohboden" } }, "question": "Was ist der Belag dieser Straße?", @@ -4521,6 +4521,30 @@ "1": { "then": "Die Fitness-Station hat ein Schild mit Anweisungen für eine bestimmte Übung." }, + "2": { + "then": "Die Fitness-Station hat eine Einrichtung für Sit-ups." + }, + "3": { + "then": "Die Fitness-Station hat eine Vorrichtung für Liegestütze. In der Regel eine oder mehrere niedrige Reckstangen." + }, + "4": { + "then": "Die Fitness-Station hat Stangen zum Dehnen." + }, + "5": { + "then": "Die Fitness-Station hat eine Vorrichtung für Rückenstrecker (Hyperextensions)." + }, + "6": { + "then": "Die Fitness-Station hat Ringe für Gymnastikübungen." + }, + "7": { + "then": "Die Fitness-Station hat eine horizontale Leiter (Monkey Bars)." + }, + "8": { + "then": "Die Fitness-Station hat eine Sprossenwand zum Klettern." + }, + "9": { + "then": "Die Fitness-Station hat Pfosten für Slalomübungen." + }, "10": { "then": "Die Fitness-Station hat Trittsteine." }, @@ -4551,9 +4575,6 @@ "19": { "then": "Die Fitness-Station hat Kampfseile (battle ropes)." }, - "2": { - "then": "Die Fitness-Station hat eine Einrichtung für Sit-ups." - }, "20": { "then": "Die Fitness-Station hat ein Fahrradergometer." }, @@ -4568,27 +4589,6 @@ }, "24": { "then": "Die Fitness-Station hat eine Slackline." - }, - "3": { - "then": "Die Fitness-Station hat eine Vorrichtung für Liegestütze. In der Regel eine oder mehrere niedrige Reckstangen." - }, - "4": { - "then": "Die Fitness-Station hat Stangen zum Dehnen." - }, - "5": { - "then": "Die Fitness-Station hat eine Vorrichtung für Rückenstrecker (Hyperextensions)." - }, - "6": { - "then": "Die Fitness-Station hat Ringe für Gymnastikübungen." - }, - "7": { - "then": "Die Fitness-Station hat eine horizontale Leiter (Monkey Bars)." - }, - "8": { - "then": "Die Fitness-Station hat eine Sprossenwand zum Klettern." - }, - "9": { - "then": "Die Fitness-Station hat Pfosten für Slalomübungen." } }, "question": "Welche Übungsgeräte gibt es an dieser Fitness-Station?" @@ -4689,21 +4689,6 @@ "1": { "then": "Dies ist eine Pommesbude" }, - "10": { - "then": "Hier werden chinesische Gerichte serviert" - }, - "11": { - "then": "Hier werden griechische Gerichte serviert" - }, - "12": { - "then": "Hier werden indische Gerichte serviert" - }, - "13": { - "then": "Hier werden türkische Gerichte serviert" - }, - "14": { - "then": "Hier werden thailändische Gerichte serviert" - }, "2": { "then": "Bietet vorwiegend Pastagerichte an" }, @@ -4727,6 +4712,21 @@ }, "9": { "then": "Hier werden französische Gerichte serviert" + }, + "10": { + "then": "Hier werden chinesische Gerichte serviert" + }, + "11": { + "then": "Hier werden griechische Gerichte serviert" + }, + "12": { + "then": "Hier werden indische Gerichte serviert" + }, + "13": { + "then": "Hier werden türkische Gerichte serviert" + }, + "14": { + "then": "Hier werden thailändische Gerichte serviert" } }, "question": "Was für Essen gibt es hier?", @@ -5859,19 +5859,6 @@ } } }, - "10": { - "options": { - "0": { - "question": "Alle Notizen" - }, - "1": { - "question": "Importnotizen ausblenden" - }, - "2": { - "question": "Nur Importnotizen anzeigen" - } - } - }, "2": { "options": { "0": { @@ -5927,6 +5914,19 @@ "question": "Nur offene Notizen anzeigen" } } + }, + "10": { + "options": { + "0": { + "question": "Alle Notizen" + }, + "1": { + "question": "Importnotizen ausblenden" + }, + "2": { + "question": "Nur Importnotizen anzeigen" + } + } } }, "name": "OpenStreetMap-Hinweise", @@ -6255,21 +6255,6 @@ "1": { "then": "Dies ist ein normaler Stellplatz." }, - "10": { - "then": "Dies ist ein Stellplatz, der für Eltern mit Kindern reserviert ist." - }, - "11": { - "then": "Dies ist ein Stellplatz, der für das Personal reserviert ist." - }, - "12": { - "then": "Dies ist ein Stellplatz, der für Taxis reserviert ist." - }, - "13": { - "then": "Dies ist ein Stellplatz, der für Fahrzeuge mit Anhänger reserviert ist." - }, - "14": { - "then": "Dies ist ein Stellplatz, der für Carsharing reserviert ist." - }, "2": { "then": "Dies ist ein Behindertenstellplatz." }, @@ -6293,6 +6278,21 @@ }, "9": { "then": "Dies ist ein Stellplatz, der für Motorräder reserviert ist." + }, + "10": { + "then": "Dies ist ein Stellplatz, der für Eltern mit Kindern reserviert ist." + }, + "11": { + "then": "Dies ist ein Stellplatz, der für das Personal reserviert ist." + }, + "12": { + "then": "Dies ist ein Stellplatz, der für Taxis reserviert ist." + }, + "13": { + "then": "Dies ist ein Stellplatz, der für Fahrzeuge mit Anhänger reserviert ist." + }, + "14": { + "then": "Dies ist ein Stellplatz, der für Carsharing reserviert ist." } }, "question": "Welche Art von Stellplatz ist dies?" @@ -6919,6 +6919,30 @@ "1": { "question": "Recycling von Batterien" }, + "2": { + "question": "Recycling von Getränkekartons" + }, + "3": { + "question": "Recycling von Dosen" + }, + "4": { + "question": "Recycling von Kleidung" + }, + "5": { + "question": "Recycling von Speiseöl" + }, + "6": { + "question": "Recycling von Motoröl" + }, + "7": { + "question": "Recycling von Leuchtstoffröhren" + }, + "8": { + "question": "Recycling von Grünabfällen" + }, + "9": { + "question": "Recycling von Glasflaschen" + }, "10": { "question": "Recycling von Glas" }, @@ -6949,35 +6973,11 @@ "19": { "question": "Recycling von Restabfällen" }, - "2": { - "question": "Recycling von Getränkekartons" - }, "20": { "question": "Recycling von Druckerpatronen" }, "21": { "question": "Recycling von Fahrrädern" - }, - "3": { - "question": "Recycling von Dosen" - }, - "4": { - "question": "Recycling von Kleidung" - }, - "5": { - "question": "Recycling von Speiseöl" - }, - "6": { - "question": "Recycling von Motoröl" - }, - "7": { - "question": "Recycling von Leuchtstoffröhren" - }, - "8": { - "question": "Recycling von Grünabfällen" - }, - "9": { - "question": "Recycling von Glasflaschen" } } }, @@ -7045,6 +7045,30 @@ "1": { "then": "Getränkekartons können hier recycelt werden" }, + "2": { + "then": "Dosen können hier recycelt werden" + }, + "3": { + "then": "Kleidung kann hier recycelt werden" + }, + "4": { + "then": "Speiseöl kann hier recycelt werden" + }, + "5": { + "then": "Motoröl kann hier recycelt werden" + }, + "6": { + "then": "Hier können Leuchtstoffröhren recycelt werden" + }, + "7": { + "then": "Grünabfälle können hier recycelt werden" + }, + "8": { + "then": "Bio-Abfall kann hier recycelt werden" + }, + "9": { + "then": "Glasflaschen können hier recycelt werden" + }, "10": { "then": "Glas kann hier recycelt werden" }, @@ -7075,9 +7099,6 @@ "19": { "then": "Schuhe können hier recycelt werden" }, - "2": { - "then": "Dosen können hier recycelt werden" - }, "20": { "then": "Elektrokleingeräte können hier recycelt werden" }, @@ -7092,27 +7113,6 @@ }, "24": { "then": "Fahrräder können hier recycelt werden" - }, - "3": { - "then": "Kleidung kann hier recycelt werden" - }, - "4": { - "then": "Speiseöl kann hier recycelt werden" - }, - "5": { - "then": "Motoröl kann hier recycelt werden" - }, - "6": { - "then": "Hier können Leuchtstoffröhren recycelt werden" - }, - "7": { - "then": "Grünabfälle können hier recycelt werden" - }, - "8": { - "then": "Bio-Abfall kann hier recycelt werden" - }, - "9": { - "then": "Glasflaschen können hier recycelt werden" } }, "question": "Was kann hier recycelt werden?" @@ -7694,12 +7694,6 @@ }, "question": "Hat die Treppe einen Handlauf?" }, - "multilevels": { - "override": { - "question": "Zwischen welchen Stockwerken befinden sich diese Treppen?", - "render": "Diese Stufen befinden sich zwischen den Stockwerken {level}" - } - }, "ramp": { "mappings": { "0": { @@ -7826,12 +7820,6 @@ "1": { "then": "Diese Straßenlaterne verwendet LEDs" }, - "10": { - "then": "Diese Straßenlaterne verwendet Hochdruck-Natriumdampflampen (orange mit weiß)" - }, - "11": { - "then": "Diese Straßenlaterne wird mit Gas beleuchtet" - }, "2": { "then": "Diese Straßenlaterne verwendet Glühlampenlicht" }, @@ -7855,6 +7843,12 @@ }, "9": { "then": "Diese Straßenlaterne verwendet Niederdruck-Natriumdampflampen (einfarbig orange)" + }, + "10": { + "then": "Diese Straßenlaterne verwendet Hochdruck-Natriumdampflampen (orange mit weiß)" + }, + "11": { + "then": "Diese Straßenlaterne wird mit Gas beleuchtet" } }, "question": "Mit welcher Art von Beleuchtung arbeitet diese Straßenlaterne?" @@ -8113,18 +8107,6 @@ }, "render": "Dieser Fahrkartenentwerter ist Teil einer Zugangsbarriere vom Typ {barrier}" }, - "payment-options": { - "override": { - "mappings+": { - "0": { - "then": "Dieser Fahrkartenentwerter akzeptiert die OV-Chipkaart" - }, - "1": { - "then": "Dieser Fahrkartenentwerter akzeptiert die OV-Chipkaart" - } - } - } - }, "validator-operator": { "freeform": { "placeholder": "Name des Betreibers" @@ -8342,11 +8324,6 @@ }, "name": "Toiletten in anderen Einrichtungen", "tagRenderings": { - "opening_hours": { - "override": { - "question": "Wann ist die Einrichtung, in der sich diese Toiletten befinden, geöffnet?" - } - }, "toilet-access": { "mappings": { "0": { @@ -9187,4 +9164,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/layers/en.json b/langs/layers/en.json index 4ffefd46e8..6869b96cb0 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -5119,6 +5119,11 @@ "name": { "question": "What is the name of this hospital?", "render": "This hospital is called {name}" + }, + "oh-visitor": { + "question": "When are visitors allowed to visit?", + "questionHint": "These are the regular visitor hours. Some wands have different visitor hours or might allow visitors in emergencies", + "render": "

Opening hours for visitors

Regular visitors are allowed at the following moments: {opening_hours_table(opening_hours:visitors)}

Some wands might have different opening hours. Many hospitals allow visits during emergencies too.

" } }, "title": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 1a27fc648e..811a919b9c 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -98,9 +98,6 @@ }, "title": { "mappings": { - "10": { - "then": "Muurschildering" - }, "3": { "then": "Aanplakzuil" }, @@ -118,6 +115,9 @@ }, "9": { "then": "Aanplakzuil" + }, + "10": { + "then": "Muurschildering" } } } @@ -199,15 +199,6 @@ "1": { "then": "Muurschildering" }, - "10": { - "then": "Azulejo (Spaanse siertegels)" - }, - "11": { - "then": "Tegelwerk" - }, - "12": { - "then": "Houtsculptuur" - }, "2": { "then": "Schilderij" }, @@ -231,6 +222,15 @@ }, "9": { "then": "Reliëf" + }, + "10": { + "then": "Azulejo (Spaanse siertegels)" + }, + "11": { + "then": "Tegelwerk" + }, + "12": { + "then": "Houtsculptuur" } }, "question": "Wat voor soort kunstwerk is dit?", @@ -1694,27 +1694,6 @@ "1": { "question": "Heeft een
Schuko stekker zonder aardingspin (CEE7/4 type F)
" }, - "10": { - "question": "Heeft een
Type 2 met kabel (J1772)
" - }, - "11": { - "question": "Heeft een
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
" - }, - "12": { - "question": "Heeft een
Tesla Supercharger (destination)
" - }, - "13": { - "question": "Heeft een
Tesla supercharger (destination) (Een Type 2 met kabel en Tesla-logo)
" - }, - "14": { - "question": "Heeft een
USB om GSMs en kleine electronica op te laden
" - }, - "15": { - "question": "Heeft een
Bosch Active Connect met 3 pinnen aan een kabel
" - }, - "16": { - "question": "Heeft een
Bosch Active Connect met 5 pinnen aan een kabel
" - }, "2": { "question": "Heeft een
Europese stekker met aardingspin (CEE7/4 type E)
" }, @@ -1738,6 +1717,27 @@ }, "9": { "question": "Heeft een
Type 2 CCS (mennekes)
" + }, + "10": { + "question": "Heeft een
Type 2 met kabel (J1772)
" + }, + "11": { + "question": "Heeft een
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
" + }, + "12": { + "question": "Heeft een
Tesla Supercharger (destination)
" + }, + "13": { + "question": "Heeft een
Tesla supercharger (destination) (Een Type 2 met kabel en Tesla-logo)
" + }, + "14": { + "question": "Heeft een
USB om GSMs en kleine electronica op te laden
" + }, + "15": { + "question": "Heeft een
Bosch Active Connect met 3 pinnen aan een kabel
" + }, + "16": { + "question": "Heeft een
Bosch Active Connect met 5 pinnen aan een kabel
" } } } @@ -1793,6 +1793,30 @@ "1": { "then": "Schuko stekker zonder aardingspin (CEE7/4 type F)" }, + "2": { + "then": "Europese stekker met aardingspin (CEE7/4 type E)" + }, + "3": { + "then": "Europese stekker met aardingspin (CEE7/4 type E)" + }, + "4": { + "then": "Chademo" + }, + "5": { + "then": "Chademo" + }, + "6": { + "then": "Type 1 met kabel (J1772)" + }, + "7": { + "then": "Type 1 met kabel (J1772)" + }, + "8": { + "then": "Type 1 zonder kabel (J1772)" + }, + "9": { + "then": "Type 1 zonder kabel (J1772)" + }, "10": { "then": "Type 1 CCS (ook gekend als Type 1 Combo)" }, @@ -1823,9 +1847,6 @@ "19": { "then": "Type 2 met kabel (J1772)" }, - "2": { - "then": "Europese stekker met aardingspin (CEE7/4 type E)" - }, "20": { "then": "Tesla Supercharger CCS (een type2 CCS met Tesla-logo)" }, @@ -1856,32 +1877,11 @@ "29": { "then": "Bosch Active Connect met 3 pinnen aan een kabel" }, - "3": { - "then": "Europese stekker met aardingspin (CEE7/4 type E)" - }, "30": { "then": "Bosch Active Connect met 5 pinnen aan een kabel" }, "31": { "then": "Bosch Active Connect met 5 pinnen aan een kabel" - }, - "4": { - "then": "Chademo" - }, - "5": { - "then": "Chademo" - }, - "6": { - "then": "Type 1 met kabel (J1772)" - }, - "7": { - "then": "Type 1 met kabel (J1772)" - }, - "8": { - "then": "Type 1 zonder kabel (J1772)" - }, - "9": { - "then": "Type 1 zonder kabel (J1772)" } }, "question": "Welke laadaansluitingen zijn hier beschikbaar?" @@ -3362,15 +3362,6 @@ "1": { "then": "Dit fietspad is geplaveid" }, - "10": { - "then": "Dit fietspad is gemaakt van fijn grind" - }, - "11": { - "then": "Dit fietspad is gemaakt van kiezelsteentjes" - }, - "12": { - "then": "Dit fietspad is gemaakt van aarde" - }, "2": { "then": "Dit fietspad is gemaakt van asfalt" }, @@ -3394,6 +3385,15 @@ }, "9": { "then": "Dit fietspad is gemaakt van grind" + }, + "10": { + "then": "Dit fietspad is gemaakt van fijn grind" + }, + "11": { + "then": "Dit fietspad is gemaakt van kiezelsteentjes" + }, + "12": { + "then": "Dit fietspad is gemaakt van aarde" } }, "question": "Waaruit is het oppervlak van het fietspad van gemaakt?", @@ -3442,15 +3442,6 @@ "1": { "then": "Dit fietspad is geplaveid" }, - "10": { - "then": "Dit fietspad is gemaakt van fijn grind" - }, - "11": { - "then": "Dit fietspad is gemaakt van kiezelsteentjes" - }, - "12": { - "then": "Dit fietspad is gemaakt van aarde" - }, "2": { "then": "Dit fietspad is gemaakt van asfalt" }, @@ -3474,6 +3465,15 @@ }, "9": { "then": "Dit fietspad is gemaakt van grind" + }, + "10": { + "then": "Dit fietspad is gemaakt van fijn grind" + }, + "11": { + "then": "Dit fietspad is gemaakt van kiezelsteentjes" + }, + "12": { + "then": "Dit fietspad is gemaakt van aarde" } }, "question": "Waaruit is het oppervlak van de straat gemaakt?", @@ -4471,21 +4471,6 @@ "1": { "then": "Dit is een frituur" }, - "10": { - "then": "Dit is een Chinees restaurant" - }, - "11": { - "then": "Dit is een Grieks restaurant" - }, - "12": { - "then": "Dit is een Indisch restaurant" - }, - "13": { - "then": "Dit is een Turks restaurant (dat meer dan enkel kebab verkoopt)" - }, - "14": { - "then": "Dit is een Thaïs restaurant" - }, "2": { "then": "Dit is een pastazaak" }, @@ -4509,6 +4494,21 @@ }, "9": { "then": "Dit is een Frans restaurant" + }, + "10": { + "then": "Dit is een Chinees restaurant" + }, + "11": { + "then": "Dit is een Grieks restaurant" + }, + "12": { + "then": "Dit is een Indisch restaurant" + }, + "13": { + "then": "Dit is een Turks restaurant (dat meer dan enkel kebab verkoopt)" + }, + "14": { + "then": "Dit is een Thaïs restaurant" } }, "question": "Welk soort gerechten worden hier geserveerd?", @@ -5619,19 +5619,6 @@ } } }, - "10": { - "options": { - "0": { - "question": "Alle Notes" - }, - "1": { - "question": "Verberg import Notes" - }, - "2": { - "question": "Toon enkel import Notes" - } - } - }, "2": { "options": { "0": { @@ -5687,6 +5674,19 @@ "question": "Toon enkel open Notes" } } + }, + "10": { + "options": { + "0": { + "question": "Alle Notes" + }, + "1": { + "question": "Verberg import Notes" + }, + "2": { + "question": "Toon enkel import Notes" + } + } } }, "name": "OpenStreetMap Notes", @@ -5982,21 +5982,6 @@ "1": { "then": "Dit is een normale parkeerplek." }, - "10": { - "then": "Deze parkeerplek is gereserveerd voor ouders met kinderen." - }, - "11": { - "then": "Deze parkeerplek is gereserveerd voor personeel." - }, - "12": { - "then": "Deze parkeerplek is gereserveerd voor taxis." - }, - "13": { - "then": "Deze parkeerplek is gereserveerd voor voertuigen met een aanhanger." - }, - "14": { - "then": "Deze parkeerplek is gereserveerd voor autodelen." - }, "2": { "then": "Dit is een gehandicaptenparkeerplaats." }, @@ -6020,6 +6005,21 @@ }, "9": { "then": "Deze parkeerplek is gereserveerd voor motoren." + }, + "10": { + "then": "Deze parkeerplek is gereserveerd voor ouders met kinderen." + }, + "11": { + "then": "Deze parkeerplek is gereserveerd voor personeel." + }, + "12": { + "then": "Deze parkeerplek is gereserveerd voor taxis." + }, + "13": { + "then": "Deze parkeerplek is gereserveerd voor voertuigen met een aanhanger." + }, + "14": { + "then": "Deze parkeerplek is gereserveerd voor autodelen." } }, "question": "Wat voor parkeerplek is dit?" @@ -6580,6 +6580,30 @@ "1": { "question": "Recycling van batterijen" }, + "2": { + "question": "Recycling van drankpakken" + }, + "3": { + "question": "Recycling van blikken" + }, + "4": { + "question": "Recycling van kleding" + }, + "5": { + "question": "Recycling van frituurvet" + }, + "6": { + "question": "Recycling van motorolie" + }, + "7": { + "question": "Recycling van tl-buizen" + }, + "8": { + "question": "Recycling van groen afval" + }, + "9": { + "question": "Recycling van glazen flessen" + }, "10": { "question": "Recycling van glas" }, @@ -6610,35 +6634,11 @@ "19": { "question": "Recycling van restafval" }, - "2": { - "question": "Recycling van drankpakken" - }, "20": { "question": "Recycling van inktpatronen" }, "21": { "question": "Recycling van fietsen" - }, - "3": { - "question": "Recycling van blikken" - }, - "4": { - "question": "Recycling van kleding" - }, - "5": { - "question": "Recycling van frituurvet" - }, - "6": { - "question": "Recycling van motorolie" - }, - "7": { - "question": "Recycling van tl-buizen" - }, - "8": { - "question": "Recycling van groen afval" - }, - "9": { - "question": "Recycling van glazen flessen" } } }, @@ -6706,6 +6706,30 @@ "1": { "then": "Drankpakken kunnen hier gerecycled worden" }, + "2": { + "then": "Blikken kunnen hier gerecycled worden" + }, + "3": { + "then": "Kleren kunnen hier gerecycled worden" + }, + "4": { + "then": "Frituurvet kan hier gerecycled worden" + }, + "5": { + "then": "Motorolie kan hier gerecycled worden" + }, + "6": { + "then": "TL-buizen kunnen hier gerecycled worden" + }, + "7": { + "then": "Groen afval kan hier gerecycled worden" + }, + "8": { + "then": "Organisch afval kan hier gerecycled worden" + }, + "9": { + "then": "Glazen flessen kunnen hier gerecycled worden" + }, "10": { "then": "Glas kan hier gerecycled worden" }, @@ -6736,9 +6760,6 @@ "19": { "then": "Schoenen kunnen hier gerecycled worden" }, - "2": { - "then": "Blikken kunnen hier gerecycled worden" - }, "20": { "then": "Kleine elektrische apparaten kunnen hier gerecycled worden" }, @@ -6753,27 +6774,6 @@ }, "24": { "then": "Fietsen (en fietswrakken) kunnen hier gerecycled worden" - }, - "3": { - "then": "Kleren kunnen hier gerecycled worden" - }, - "4": { - "then": "Frituurvet kan hier gerecycled worden" - }, - "5": { - "then": "Motorolie kan hier gerecycled worden" - }, - "6": { - "then": "TL-buizen kunnen hier gerecycled worden" - }, - "7": { - "then": "Groen afval kan hier gerecycled worden" - }, - "8": { - "then": "Organisch afval kan hier gerecycled worden" - }, - "9": { - "then": "Glazen flessen kunnen hier gerecycled worden" } }, "question": "Wat kan hier gerecycled worden?" @@ -7497,12 +7497,6 @@ "1": { "then": "Deze lantaarn gebruikt LEDs" }, - "10": { - "then": "Deze lantaarn gebruikt hogedruknatriumlampen (oranje met wit)" - }, - "11": { - "then": "Deze lantaarn wordt verlicht met gas" - }, "2": { "then": "Deze lantaarn gebruikt gloeilampen" }, @@ -7526,6 +7520,12 @@ }, "9": { "then": "Deze lantaarn gebruikt lagedruknatriumlampen (monochroom oranje)" + }, + "10": { + "then": "Deze lantaarn gebruikt hogedruknatriumlampen (oranje met wit)" + }, + "11": { + "then": "Deze lantaarn wordt verlicht met gas" } }, "question": "Wat voor verlichting gebruikt deze lantaarn?" @@ -8783,4 +8783,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/shared-questions/en.json b/langs/shared-questions/en.json index dadb187b95..9bd57a8001 100644 --- a/langs/shared-questions/en.json +++ b/langs/shared-questions/en.json @@ -207,6 +207,9 @@ }, "1": { "then": "Payment cards are accepted here" + }, + "2": { + "then": "Payment by QR-code is possible here" } }, "question": "Which methods of payment are accepted here?" diff --git a/langs/shared-questions/nl.json b/langs/shared-questions/nl.json index ac5434b2d7..cbf1dbce2d 100644 --- a/langs/shared-questions/nl.json +++ b/langs/shared-questions/nl.json @@ -190,6 +190,9 @@ }, "1": { "then": "Betalen met bankkaarten kan hier" + }, + "2": { + "then": "Betalen via een QR-code is hier mogelijk" } }, "question": "Welke betaalmiddelen worden hier geaccepteerd?" diff --git a/scripts/ScriptUtils.ts b/scripts/ScriptUtils.ts index 617f6c1531..af36d962f7 100644 --- a/scripts/ScriptUtils.ts +++ b/scripts/ScriptUtils.ts @@ -1,9 +1,9 @@ import * as fs from "fs" -import {existsSync, lstatSync, readdirSync, readFileSync} from "fs" -import {Utils} from "../Utils" +import { existsSync, lstatSync, readdirSync, readFileSync } from "fs" +import { Utils } from "../Utils" import * as https from "https" -import {LayoutConfigJson} from "../Models/ThemeConfig/Json/LayoutConfigJson" -import {LayerConfigJson} from "../Models/ThemeConfig/Json/LayerConfigJson" +import { LayoutConfigJson } from "../Models/ThemeConfig/Json/LayoutConfigJson" +import { LayerConfigJson } from "../Models/ThemeConfig/Json/LayerConfigJson" import xml2js from "xml2js" export default class ScriptUtils { @@ -80,13 +80,13 @@ export default class ScriptUtils { .filter((path) => path.indexOf("license_info.json") < 0) .map((path) => { try { - const contents = readFileSync(path, {encoding: "utf8"}) + const contents = readFileSync(path, { encoding: "utf8" }) if (contents === "") { throw "The file " + path + " is empty, did you properly save?" } const parsed = JSON.parse(contents) - return {parsed, path} + return { parsed, path } } catch (e) { console.error("Could not parse file ", "./assets/layers/" + path, "due to ", e) throw e @@ -103,12 +103,12 @@ export default class ScriptUtils { public static getThemeFiles(): { parsed: LayoutConfigJson; path: string }[] { return this.getThemePaths().map((path) => { try { - const contents = readFileSync(path, {encoding: "utf8"}) + const contents = readFileSync(path, { encoding: "utf8" }) if (contents === "") { throw "The file " + path + " is empty, did you properly save?" } const parsed = JSON.parse(contents) - return {parsed: parsed, path: path} + return { parsed: parsed, path: path } } catch (e) { console.error("Could not read file ", path, "due to ", e) throw e @@ -127,14 +127,14 @@ export default class ScriptUtils { if (!existsSync(path)) { throw "File not found: " + path } - const root = await xml2js.parseStringPromise(readFileSync(path, {encoding: "utf8"})) + const root = await xml2js.parseStringPromise(readFileSync(path, { encoding: "utf8" })) return root.svg } public static ReadSvgSync(path: string, callback: (svg: any) => void): any { xml2js.parseString( - readFileSync(path, {encoding: "utf8"}), - {async: false}, + readFileSync(path, { encoding: "utf8" }), + { async: false }, (err, root) => { if (err) { throw err @@ -173,7 +173,7 @@ export default class ScriptUtils { }) res.addListener("end", function () { - resolve({content: parts.join("")}) + resolve({ content: parts.join("") }) }) } ) diff --git a/scripts/generateImageAnalysis.ts b/scripts/generateImageAnalysis.ts index be6d83eefb..fec8540906 100644 --- a/scripts/generateImageAnalysis.ts +++ b/scripts/generateImageAnalysis.ts @@ -1,15 +1,15 @@ import Script from "./Script" -import {Overpass} from "../Logic/Osm/Overpass" -import {RegexTag} from "../Logic/Tags/RegexTag" -import {ImmutableStore} from "../Logic/UIEventSource" -import {BBox} from "../Logic/BBox" +import { Overpass } from "../Logic/Osm/Overpass" +import { RegexTag } from "../Logic/Tags/RegexTag" +import { ImmutableStore } from "../Logic/UIEventSource" +import { BBox } from "../Logic/BBox" import * as fs from "fs" -import {Feature} from "geojson" +import { Feature } from "geojson" import ScriptUtils from "./ScriptUtils" -import {Imgur} from "../Logic/ImageProviders/Imgur" -import {LicenseInfo} from "../Logic/ImageProviders/LicenseInfo" -import {Utils} from "../Utils" -import Constants from "../Models/Constants"; +import { Imgur } from "../Logic/ImageProviders/Imgur" +import { LicenseInfo } from "../Logic/ImageProviders/LicenseInfo" +import { Utils } from "../Utils" +import Constants from "../Models/Constants" export default class GenerateImageAnalysis extends Script { constructor() { @@ -35,7 +35,12 @@ export default class GenerateImageAnalysis extends Script { ) console.log("Starting query...") const data = await overpass.queryGeoJson(BBox.global) - console.log("Got data:", data[0].features.length, "items; timestamp:", data[1].toISOString()) + console.log( + "Got data:", + data[0].features.length, + "items; timestamp:", + data[1].toISOString() + ) fs.writeFileSync(targetPath, JSON.stringify(data[0]), "utf8") console.log("Written", targetPath) } @@ -97,7 +102,7 @@ export default class GenerateImageAnalysis extends Script { return true } - loadImageUrls(datapath: string): { allImages: Set, imageSource: Map } { + loadImageUrls(datapath: string): { allImages: Set; imageSource: Map } { let allImages = new Set() const features = this.loadData(datapath) let imageSource: Map = new Map() @@ -106,22 +111,25 @@ export default class GenerateImageAnalysis extends Script { allImages.add(feature.properties["image"]) imageSource[feature.properties["image"]] = feature.properties.id allImages.add(feature.properties["image:streetsign"]) - imageSource[feature.properties["image:streetsign"]] = feature.properties.id + " (streetsign)" + imageSource[feature.properties["image:streetsign"]] = + feature.properties.id + " (streetsign)" for (let i = 0; i < 10; i++) { allImages.add(feature.properties["image:" + i]) - imageSource[feature.properties["image:" + i]] = `${feature.properties.id} (image:${i})` + imageSource[ + feature.properties["image:" + i] + ] = `${feature.properties.id} (image:${i})` } } allImages.delete(undefined) allImages.delete(null) imageSource.delete(undefined) imageSource.delete(null) - return {allImages, imageSource} + return { allImages, imageSource } } async downloadMetadata(datapath: string): Promise { - const {allImages, imageSource} = this.loadImageUrls(datapath) + const { allImages, imageSource } = this.loadImageUrls(datapath) console.log("Detected", allImages.size, "images") let i = 0 let d = 0 @@ -143,7 +151,7 @@ export default class GenerateImageAnalysis extends Script { } downloaded: ${d},skipped: ${s}, failed: ${f}, running: ${Math.floor( runningSecs )}sec, ETA: ${estimatedActualMinutes}:${estimatedActualSeconds % 60}` - if (d + f % 1000 === 1 || downloaded) { + if (d + (f % 1000) === 1 || downloaded) { ScriptUtils.erasableLog(msg) } if (downloaded) { @@ -157,7 +165,11 @@ export default class GenerateImageAnalysis extends Script { } } catch (e) { // console.log(e) - console.log("Offending image hash is", image, "from https://openstreetmap.org/" + imageSource[image]) + console.log( + "Offending image hash is", + image, + "from https://openstreetmap.org/" + imageSource[image] + ) f++ } } @@ -187,23 +199,23 @@ export default class GenerateImageAnalysis extends Script { } async downloadAllImages(datapath: string, imagePath: string): Promise { - const {allImages} = this.loadImageUrls(datapath) + const { allImages } = this.loadImageUrls(datapath) let skipped = 0 let failed = 0 let downloaded = 0 let invalid = 0 const startTime = Date.now() - const urls = Array.from(allImages).filter(url => url.startsWith("https://i.imgur.com")) + const urls = Array.from(allImages).filter((url) => url.startsWith("https://i.imgur.com")) for (const url of urls) { - const runningTime = ((Date.now()) - startTime) / 1000 + const runningTime = (Date.now() - startTime) / 1000 const handled = skipped + downloaded + failed const itemsLeft = allImages.size - handled const speed = handled / runningTime const timeLeft = Math.round(itemsLeft * speed) try { - const downloadedStatus = await Promise.all(url.split(";").map(url => - this.downloadImage(url.trim(), imagePath), - )) + const downloadedStatus = await Promise.all( + url.split(";").map((url) => this.downloadImage(url.trim(), imagePath)) + ) for (const b of downloadedStatus) { if (b) { @@ -213,16 +225,19 @@ export default class GenerateImageAnalysis extends Script { } } - if (downloadedStatus.some(i => i) || skipped % 10000 === 0) { - - console.log("Handled", url, JSON.stringify({ - skipped, - failed, - downloaded, - invalid, - total: allImages.size, - eta: timeLeft + "s" - })) + if (downloadedStatus.some((i) => i) || skipped % 10000 === 0) { + console.log( + "Handled", + url, + JSON.stringify({ + skipped, + failed, + downloaded, + invalid, + total: allImages.size, + eta: timeLeft + "s", + }) + ) } } catch (e) { console.log(e) @@ -240,7 +255,7 @@ export default class GenerateImageAnalysis extends Script { if (!file.endsWith(".json")) { continue } - const attr = JSON.parse(fs.readFileSync(file, {encoding: "utf8"})) + const attr = JSON.parse(fs.readFileSync(file, { encoding: "utf8" })) const license = attr.licenseShortName if (license === undefined || attr.artist === undefined) { @@ -319,7 +334,13 @@ export default class GenerateImageAnalysis extends Script { ...Array.from(licenseByAuthor.get("CC-BY-SA 4.0").values()), ] - console.log("Total number of correctly licenses pictures: ", totalLicensedImages, "(out of ", files.length, " images)") + console.log( + "Total number of correctly licenses pictures: ", + totalLicensedImages, + "(out of ", + files.length, + " images)" + ) console.log("Total number of authors:", byAuthor.size) console.log( "Total number of authors which used a valid, non CC0 license at one point in time", @@ -332,7 +353,7 @@ export default class GenerateImageAnalysis extends Script { console.log("Usage: [--cached] to use the cached osm data") console.log("Args are", args) const cached = args.indexOf("--cached") < 0 - args = args.filter(a => a !== "--cached") + args = args.filter((a) => a !== "--cached") const datapath = args[0] ?? "../../git/MapComplete-data/ImageLicenseInfo" await this.downloadData(datapath, cached) diff --git a/test/CodeQuality.spec.ts b/test/CodeQuality.spec.ts index dbe177efa6..bec5ffd74f 100644 --- a/test/CodeQuality.spec.ts +++ b/test/CodeQuality.spec.ts @@ -54,13 +54,13 @@ function detectInCode(forbidden: string, reason: string): Promise { }) } -function wrap(promise: Promise): ((done: () => void) => void) { - return (done => { +function wrap(promise: Promise): (done: () => void) => void { + return (done) => { promise.then(done) - }) + } } -function itAsync(name: string, promise: Promise){ +function itAsync(name: string, promise: Promise) { it(name, wrap(promise)) }