diff --git a/.gitignore b/.gitignore index a9dcf16ad..c5a6e0be2 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ service-worker.js *.vsix public/*.webmanifest public/assets/generated/ +public/assets/langs/* diff --git a/Docs/BuiltinIndex.md b/Docs/BuiltinIndex.md index 85e91176e..1a6ad5306 100644 --- a/Docs/BuiltinIndex.md +++ b/Docs/BuiltinIndex.md @@ -90,7 +90,6 @@ - ambulancestation - artwork - atm - - atm - barrier - bench - bench_at_pt @@ -219,7 +218,6 @@ - - atm - atm - bicycle_library - bicycle_rental @@ -292,6 +290,7 @@ - shops - sports_centre - tertiary_education + - vending_machine - veterinary @@ -614,6 +613,7 @@ - food - hackerspace - hotel + - pharmacy - shops - veterinary diff --git a/Docs/Layers/all_vending_machine.md b/Docs/Layers/all_vending_machine.md index 66ae52dd7..bf7e6ce66 100644 --- a/Docs/Layers/all_vending_machine.md +++ b/Docs/Layers/all_vending_machine.md @@ -47,7 +47,7 @@ this quick overview is incomplete attribute | type | values which are supported by this layer ----------- | ------ | ------------------------------------------ [](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | -[](https://taginfo.openstreetmap.org/keys/vending#values) [vending](https://wiki.openstreetmap.org/wiki/Key:vending) | [string](../SpecialInputElements.md#string) | [drinks](https://wiki.openstreetmap.org/wiki/Tag:vending%3Ddrinks) [sweets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dsweets) [food](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dfood) [cigarettes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcigarettes) [condoms](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcondoms) [coffee](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcoffee) [water](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dwater) [newspapers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dnewspapers) [bicycle_tube](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_tube) [milk](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dmilk) [bread](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbread) [eggs](https://wiki.openstreetmap.org/wiki/Tag:vending%3Deggs) [cheese](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcheese) [honey](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dhoney) [potatoes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpotatoes) [meat](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dmeat) [flowers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dflowers) [parking_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dparking_tickets) [elongated_coin](https://wiki.openstreetmap.org/wiki/Tag:vending%3Delongated_coin) [public_transport_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpublic_transport_tickets) [bicycle_light](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_light) [gloves](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dgloves) [bicycle_repair_kit](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_repair_kit) [bicycle_pump](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_pump) [bicycle_lock](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_lock) +[](https://taginfo.openstreetmap.org/keys/vending#values) [vending](https://wiki.openstreetmap.org/wiki/Key:vending) | [string](../SpecialInputElements.md#string) | [drinks](https://wiki.openstreetmap.org/wiki/Tag:vending%3Ddrinks) [sweets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dsweets) [food](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dfood) [cigarettes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcigarettes) [condoms](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcondoms) [coffee](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcoffee) [water](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dwater) [newspapers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dnewspapers) [bicycle_tube](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_tube) [milk](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dmilk) [bread](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbread) [eggs](https://wiki.openstreetmap.org/wiki/Tag:vending%3Deggs) [cheese](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcheese) [honey](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dhoney) [potatoes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpotatoes) [meat](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dmeat) [fruit](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dfruit) [strawberries](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dstrawberries) [flowers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dflowers) [parking_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dparking_tickets) [elongated_coin](https://wiki.openstreetmap.org/wiki/Tag:vending%3Delongated_coin) [public_transport_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpublic_transport_tickets) [bicycle_light](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_light) [gloves](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dgloves) [bicycle_repair_kit](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_repair_kit) [bicycle_pump](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_pump) [bicycle_lock](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_lock) [](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [24/7](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D24/7) [](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR) [0.05 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 CHF) [0.10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 CHF) [0.20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 CHF) [0.50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 CHF) [1 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 CHF) [2 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 CHF) [5 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D5 CHF) [](https://taginfo.openstreetmap.org/keys/payment:notes:denominations#values) [payment:notes:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:notes:denominations) | Multiple choice | [5 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D5 EUR) [10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 EUR) [20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 EUR) [50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 EUR) [100 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 EUR) [200 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 EUR) [500 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D500 EUR) [10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 CHF) [20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 CHF) [50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 CHF) [100 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 CHF) [200 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 CHF) [1000 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D1000 CHF) @@ -55,6 +55,7 @@ attribute | type | values which are supported by this layer [](https://taginfo.openstreetmap.org/keys/indoor#values) [indoor](https://wiki.openstreetmap.org/wiki/Key:indoor) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dno) [](https://taginfo.openstreetmap.org/keys/level#values) [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) [](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | +[](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | @@ -120,6 +121,8 @@ This is rendered with `This vending machine sells {vending}` - *Honey is sold* corresponds with `vending=honey` - *Potatoes are sold* corresponds with `vending=potatoes` - *Meat is sold* corresponds with `vending=meat` + - *Fruit is sold* corresponds with `vending=fruit` + - *Strawberries are sold* corresponds with `vending=strawberries` - *Flowers are sold* corresponds with `vending=flowers` - *Parking tickets are sold* corresponds with `vending=parking_tickets` - *Pressed pennies are sold* corresponds with `vending=elongated_coin` @@ -337,6 +340,28 @@ This tagrendering has labels `contact` +### website + + + +The question is *What is the website of {title()}?* + +This rendering asks information about the property [website](https://wiki.openstreetmap.org/wiki/Key:website) + +This is rendered with `{website}` + + + + + + - *{contact:website}* corresponds with `contact:website~.+` + - This option cannot be chosen as answer + + +This tagrendering has labels `contact` + + + ### leftover-questions @@ -435,15 +460,17 @@ vending.13 | Sale of cheese | vending~^(.*cheese.*)$ vending.14 | Sale of honey | vending~^(.*honey.*)$ vending.15 | Sale of potatoes | vending~^(.*potatoes.*)$ vending.16 | Sale of meat | vending~^(.*meat.*)$ -vending.17 | Sale of flowers | vending~^(.*flowers.*)$ -vending.18 | Sale of parking tickets | vending~^(.*parking_tickets.*)$ -vending.19 | Sale of pressed pennies | vending=elongated_coin -vending.20 | Sale of public transport tickets | vending~^(.*public_transport_tickets.*)$ -vending.21 | Sale of bicycle lights | vending=bicycle_light -vending.22 | Sale of gloves | vending=gloves -vending.23 | Sale of bicycle repair kits | vending=bicycle_repair_kit -vending.24 | Sale of bicycle pumps | vending=bicycle_pump -vending.25 | Sale of bicycle locks | vending=bicycle_lock +vending.17 | Sale of fruit | vending~^(.*fruit.*)$ +vending.18 | Sale of strawberries | vending~^(.*strawberries.*)$ +vending.19 | Sale of flowers | vending~^(.*flowers.*)$ +vending.20 | Sale of parking tickets | vending~^(.*parking_tickets.*)$ +vending.21 | Sale of pressed pennies | vending=elongated_coin +vending.22 | Sale of public transport tickets | vending~^(.*public_transport_tickets.*)$ +vending.23 | Sale of bicycle lights | vending=bicycle_light +vending.24 | Sale of gloves | vending=gloves +vending.25 | Sale of bicycle repair kits | vending=bicycle_repair_kit +vending.26 | Sale of bicycle pumps | vending=bicycle_pump +vending.27 | Sale of bicycle locks | vending=bicycle_lock This document is autogenerated from [assets/themes/vending_machine/vending_machine.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/vending_machine/vending_machine.json) diff --git a/Docs/Layers/cafe_pub.md b/Docs/Layers/cafe_pub.md index 806fea93d..a82a76ab4 100644 --- a/Docs/Layers/cafe_pub.md +++ b/Docs/Layers/cafe_pub.md @@ -14,7 +14,7 @@ A layer showing cafés and pubs where one can gather around a drink. The layer a - - This layer is shown at zoomlevel **0** and higher + - This layer is shown at zoomlevel **12** and higher @@ -504,6 +504,20 @@ accepts_cash.0 | Accepts cash | payment:cash=yes id | question | osmTags ---- | ---------- | --------- accepts_cards.0 | Accepts payment cards | payment:cards=yes + + + + +id | question | osmTags +---- | ---------- | --------- +has_internet.0 | Offers internet | internet_access=wlan\|internet_access=yes\|internet_access=wired + + + + +id | question | osmTags +---- | ---------- | --------- +has_electricity.0 | Offers electricity | service:electricity=yes This document is autogenerated from [assets/layers/cafe_pub/cafe_pub.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/cafe_pub/cafe_pub.json) diff --git a/Docs/Layers/dogfoodb.md b/Docs/Layers/dogfoodb.md index 37f750a7b..cbf54b87b 100644 --- a/Docs/Layers/dogfoodb.md +++ b/Docs/Layers/dogfoodb.md @@ -131,7 +131,7 @@ The question is *What type of business is this?* - - *This is a fastfood-business, focused on fast service. If seating is available, these are rather limited and functional.* corresponds with `amenity=fast_food` + - *This is a fast-food business, focused on fast service. If seating is available, it is rather limited and functional.* corresponds with `amenity=fast_food` - *A restaurant, focused on creating a nice experience where one is served at the table* corresponds with `amenity=restaurant` @@ -300,7 +300,7 @@ The question is *Is this place accessible with a wheelchair?* -The question is *Which food is served here?* +The question is *What kind of food is served here?* This rendering asks information about the property [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) @@ -314,11 +314,11 @@ This is rendered with `This place mostly serves {cuisine}` - *This is a friture* corresponds with `cuisine=friture` - *Mainly serves pasta* corresponds with `cuisine=pasta` - *This is kebab shop* corresponds with `cuisine=kebab` - - *This is a sandwichbar* corresponds with `cuisine=sandwich` + - *This is a sandwich shop* corresponds with `cuisine=sandwich` - *Burgers are served here* corresponds with `cuisine=burger` - *Sushi is served here* corresponds with `cuisine=sushi` - *Coffee is served here* corresponds with `cuisine=coffee` - - *This is an italian restaurant (which serves more then pasta and pizza)* corresponds with `cuisine=italian` + - *This is an Italian restaurant (which serves more than pasta and pizza)* corresponds with `cuisine=italian` - *French dishes are served here* corresponds with `cuisine=french` - *Chinese dishes are served here* corresponds with `cuisine=chinese` - *Greek dishes are served here* corresponds with `cuisine=greek` @@ -370,7 +370,7 @@ The question is *Does this place offer take-away?* -The question is *Delivers {title()} their food at home?* +The question is *Does {title()} deliver food to your home?* diff --git a/Docs/Layers/food.md b/Docs/Layers/food.md index dc5f7650d..e9c1895a4 100644 --- a/Docs/Layers/food.md +++ b/Docs/Layers/food.md @@ -135,7 +135,7 @@ The question is *What type of business is this?* - - *This is a fastfood-business, focused on fast service. If seating is available, these are rather limited and functional.* corresponds with `amenity=fast_food` + - *This is a fast-food business, focused on fast service. If seating is available, it is rather limited and functional.* corresponds with `amenity=fast_food` - *A restaurant, focused on creating a nice experience where one is served at the table* corresponds with `amenity=restaurant` @@ -304,7 +304,7 @@ The question is *Is this place accessible with a wheelchair?* -The question is *Which food is served here?* +The question is *What kind of food is served here?* This rendering asks information about the property [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) @@ -318,11 +318,11 @@ This is rendered with `This place mostly serves {cuisine}` - *This is a friture* corresponds with `cuisine=friture` - *Mainly serves pasta* corresponds with `cuisine=pasta` - *This is kebab shop* corresponds with `cuisine=kebab` - - *This is a sandwichbar* corresponds with `cuisine=sandwich` + - *This is a sandwich shop* corresponds with `cuisine=sandwich` - *Burgers are served here* corresponds with `cuisine=burger` - *Sushi is served here* corresponds with `cuisine=sushi` - *Coffee is served here* corresponds with `cuisine=coffee` - - *This is an italian restaurant (which serves more then pasta and pizza)* corresponds with `cuisine=italian` + - *This is an Italian restaurant (which serves more than pasta and pizza)* corresponds with `cuisine=italian` - *French dishes are served here* corresponds with `cuisine=french` - *Chinese dishes are served here* corresponds with `cuisine=chinese` - *Greek dishes are served here* corresponds with `cuisine=greek` @@ -374,7 +374,7 @@ The question is *Does this place offer take-away?* -The question is *Delivers {title()} their food at home?* +The question is *Does {title()} deliver food to your home?* diff --git a/Docs/Layers/friture.md b/Docs/Layers/friture.md index 09d2218f8..295c4a6f2 100644 --- a/Docs/Layers/friture.md +++ b/Docs/Layers/friture.md @@ -131,7 +131,7 @@ The question is *What type of business is this?* - - *This is a fastfood-business, focused on fast service. If seating is available, these are rather limited and functional.* corresponds with `amenity=fast_food` + - *This is a fast-food business, focused on fast service. If seating is available, it is rather limited and functional.* corresponds with `amenity=fast_food` - *A restaurant, focused on creating a nice experience where one is served at the table* corresponds with `amenity=restaurant` @@ -300,7 +300,7 @@ The question is *Is this place accessible with a wheelchair?* -The question is *Which food is served here?* +The question is *What kind of food is served here?* This rendering asks information about the property [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) @@ -314,11 +314,11 @@ This is rendered with `This place mostly serves {cuisine}` - *This is a friture* corresponds with `cuisine=friture` - *Mainly serves pasta* corresponds with `cuisine=pasta` - *This is kebab shop* corresponds with `cuisine=kebab` - - *This is a sandwichbar* corresponds with `cuisine=sandwich` + - *This is a sandwich shop* corresponds with `cuisine=sandwich` - *Burgers are served here* corresponds with `cuisine=burger` - *Sushi is served here* corresponds with `cuisine=sushi` - *Coffee is served here* corresponds with `cuisine=coffee` - - *This is an italian restaurant (which serves more then pasta and pizza)* corresponds with `cuisine=italian` + - *This is an Italian restaurant (which serves more than pasta and pizza)* corresponds with `cuisine=italian` - *French dishes are served here* corresponds with `cuisine=french` - *Chinese dishes are served here* corresponds with `cuisine=chinese` - *Greek dishes are served here* corresponds with `cuisine=greek` @@ -370,7 +370,7 @@ The question is *Does this place offer take-away?* -The question is *Delivers {title()} their food at home?* +The question is *Does {title()} deliver food to your home?* diff --git a/Docs/Layers/guidepost.md b/Docs/Layers/guidepost.md index a450c2f08..20b084c30 100644 --- a/Docs/Layers/guidepost.md +++ b/Docs/Layers/guidepost.md @@ -15,6 +15,18 @@ Guideposts (also known as fingerposts or finger posts) are often found along off - This layer is shown at zoomlevel **14** and higher + - Not visible in the layer selection by default. If you want to make this layer toggable, override `name` + + + + +#### Themes using this layer + + + + + + - [climbing](https://mapcomplete.org/climbing) This is a special layer - data is not sourced from OpenStreetMap diff --git a/Docs/Layers/pharmacy.md b/Docs/Layers/pharmacy.md index de3354f42..9c91a38b6 100644 --- a/Docs/Layers/pharmacy.md +++ b/Docs/Layers/pharmacy.md @@ -90,6 +90,18 @@ This tagrendering has no question and is thus read-only +### reviews + + + +Shows the reviews module (including the possibility to leave a review) + +This tagrendering has no question and is thus read-only + + + + + ### name diff --git a/Docs/Layers/toilet.md b/Docs/Layers/toilet.md index 74daf39b6..31f03134f 100644 --- a/Docs/Layers/toilet.md +++ b/Docs/Layers/toilet.md @@ -297,7 +297,7 @@ This tagrendering has labels `relevant-questions` -The question is *Which kind of toilets are this?* +The question is *Which kind of toilets are these?* @@ -367,8 +367,8 @@ The question is *Do these toilets have a sink to wash your hands?* - - *This toilets have a sink to wash your hands* corresponds with `toilets:handwashing=yes` - - *This toilets don't have a sink to wash your hands* corresponds with `toilets:handwashing=no` + - *These toilets have a sink to wash your hands* corresponds with `toilets:handwashing=yes` + - *These toilets don't have a sink to wash your hands* corresponds with `toilets:handwashing=no` This tagrendering has labels `relevant-questions` diff --git a/Docs/Layers/vending_machine.md b/Docs/Layers/vending_machine.md index d31dbf0d9..4deeef5e7 100644 --- a/Docs/Layers/vending_machine.md +++ b/Docs/Layers/vending_machine.md @@ -47,7 +47,7 @@ this quick overview is incomplete attribute | type | values which are supported by this layer ----------- | ------ | ------------------------------------------ [](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | -[](https://taginfo.openstreetmap.org/keys/vending#values) [vending](https://wiki.openstreetmap.org/wiki/Key:vending) | [string](../SpecialInputElements.md#string) | [drinks](https://wiki.openstreetmap.org/wiki/Tag:vending%3Ddrinks) [sweets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dsweets) [food](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dfood) [cigarettes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcigarettes) [condoms](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcondoms) [coffee](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcoffee) [water](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dwater) [newspapers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dnewspapers) [bicycle_tube](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_tube) [milk](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dmilk) [bread](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbread) [eggs](https://wiki.openstreetmap.org/wiki/Tag:vending%3Deggs) [cheese](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcheese) [honey](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dhoney) [potatoes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpotatoes) [meat](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dmeat) [flowers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dflowers) [parking_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dparking_tickets) [elongated_coin](https://wiki.openstreetmap.org/wiki/Tag:vending%3Delongated_coin) [public_transport_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpublic_transport_tickets) [bicycle_light](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_light) [gloves](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dgloves) [bicycle_repair_kit](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_repair_kit) [bicycle_pump](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_pump) [bicycle_lock](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_lock) +[](https://taginfo.openstreetmap.org/keys/vending#values) [vending](https://wiki.openstreetmap.org/wiki/Key:vending) | [string](../SpecialInputElements.md#string) | [drinks](https://wiki.openstreetmap.org/wiki/Tag:vending%3Ddrinks) [sweets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dsweets) [food](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dfood) [cigarettes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcigarettes) [condoms](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcondoms) [coffee](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcoffee) [water](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dwater) [newspapers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dnewspapers) [bicycle_tube](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_tube) [milk](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dmilk) [bread](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbread) [eggs](https://wiki.openstreetmap.org/wiki/Tag:vending%3Deggs) [cheese](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcheese) [honey](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dhoney) [potatoes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpotatoes) [meat](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dmeat) [fruit](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dfruit) [strawberries](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dstrawberries) [flowers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dflowers) [parking_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dparking_tickets) [elongated_coin](https://wiki.openstreetmap.org/wiki/Tag:vending%3Delongated_coin) [public_transport_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpublic_transport_tickets) [bicycle_light](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_light) [gloves](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dgloves) [bicycle_repair_kit](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_repair_kit) [bicycle_pump](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_pump) [bicycle_lock](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_lock) [](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [24/7](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D24/7) [](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR) [0.05 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 CHF) [0.10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 CHF) [0.20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 CHF) [0.50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 CHF) [1 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 CHF) [2 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 CHF) [5 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D5 CHF) [](https://taginfo.openstreetmap.org/keys/payment:notes:denominations#values) [payment:notes:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:notes:denominations) | Multiple choice | [5 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D5 EUR) [10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 EUR) [20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 EUR) [50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 EUR) [100 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 EUR) [200 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 EUR) [500 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D500 EUR) [10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 CHF) [20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 CHF) [50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 CHF) [100 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 CHF) [200 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 CHF) [1000 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D1000 CHF) @@ -55,6 +55,7 @@ attribute | type | values which are supported by this layer [](https://taginfo.openstreetmap.org/keys/indoor#values) [indoor](https://wiki.openstreetmap.org/wiki/Key:indoor) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dno) [](https://taginfo.openstreetmap.org/keys/level#values) [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) [](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | +[](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | @@ -120,6 +121,8 @@ This is rendered with `This vending machine sells {vending}` - *Honey is sold* corresponds with `vending=honey` - *Potatoes are sold* corresponds with `vending=potatoes` - *Meat is sold* corresponds with `vending=meat` + - *Fruit is sold* corresponds with `vending=fruit` + - *Strawberries are sold* corresponds with `vending=strawberries` - *Flowers are sold* corresponds with `vending=flowers` - *Parking tickets are sold* corresponds with `vending=parking_tickets` - *Pressed pennies are sold* corresponds with `vending=elongated_coin` @@ -337,6 +340,28 @@ This tagrendering has labels `contact` +### website + + + +The question is *What is the website of {title()}?* + +This rendering asks information about the property [website](https://wiki.openstreetmap.org/wiki/Key:website) + +This is rendered with `{website}` + + + + + + - *{contact:website}* corresponds with `contact:website~.+` + - This option cannot be chosen as answer + + +This tagrendering has labels `contact` + + + ### leftover-questions @@ -435,15 +460,17 @@ vending.13 | Sale of cheese | vending~^(.*cheese.*)$ vending.14 | Sale of honey | vending~^(.*honey.*)$ vending.15 | Sale of potatoes | vending~^(.*potatoes.*)$ vending.16 | Sale of meat | vending~^(.*meat.*)$ -vending.17 | Sale of flowers | vending~^(.*flowers.*)$ -vending.18 | Sale of parking tickets | vending~^(.*parking_tickets.*)$ -vending.19 | Sale of pressed pennies | vending=elongated_coin -vending.20 | Sale of public transport tickets | vending~^(.*public_transport_tickets.*)$ -vending.21 | Sale of bicycle lights | vending=bicycle_light -vending.22 | Sale of gloves | vending=gloves -vending.23 | Sale of bicycle repair kits | vending=bicycle_repair_kit -vending.24 | Sale of bicycle pumps | vending=bicycle_pump -vending.25 | Sale of bicycle locks | vending=bicycle_lock +vending.17 | Sale of fruit | vending~^(.*fruit.*)$ +vending.18 | Sale of strawberries | vending~^(.*strawberries.*)$ +vending.19 | Sale of flowers | vending~^(.*flowers.*)$ +vending.20 | Sale of parking tickets | vending~^(.*parking_tickets.*)$ +vending.21 | Sale of pressed pennies | vending=elongated_coin +vending.22 | Sale of public transport tickets | vending~^(.*public_transport_tickets.*)$ +vending.23 | Sale of bicycle lights | vending=bicycle_light +vending.24 | Sale of gloves | vending=gloves +vending.25 | Sale of bicycle repair kits | vending=bicycle_repair_kit +vending.26 | Sale of bicycle pumps | vending=bicycle_pump +vending.27 | Sale of bicycle locks | vending=bicycle_lock This document is autogenerated from [assets/layers/vending_machine/vending_machine.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/vending_machine/vending_machine.json) diff --git a/Docs/SpecialRenderings.md b/Docs/SpecialRenderings.md index df0fca5c9..7ea2310e2 100644 --- a/Docs/SpecialRenderings.md +++ b/Docs/SpecialRenderings.md @@ -118,8 +118,6 @@ In other words: use `{ "before": ..., "after": ..., "special": {"type": ..., "ar * [Example usage of list_reviews](#example-usage-of-list_reviews) + [opening_hours_table](#opening_hours_table) * [Example usage of opening_hours_table](#example-usage-of-opening_hours_table) - + [live](#live) - * [Example usage of live](#example-usage-of-live) + [canonical](#canonical) * [Example usage of canonical](#example-usage-of-canonical) + [export_as_geojson](#export_as_geojson) @@ -825,23 +823,6 @@ postfix | _empty string_ | Remove this string from the end of the value before p -### live - - Downloads a JSON from the given URL, e.g. '{live(example.org/data.json, shorthand:x.y.z, other:a.b.c, shorthand)}' will download the given file, will create an object {shorthand: json[x][y][z], other: json[a][b][c] out of it and will return 'other' or 'json[a][b][c]. This is made to use in combination with tags, e.g. {live({url}, {url:format}, needed_value)} - -name | default | description ------- | --------- | ------------- -Url | _undefined_ | The URL to load -Shorthands | _undefined_ | A list of shorthands, of the format 'shorthandname:path.path.path'. separated by ; -path | _undefined_ | The path (or shorthand) that should be returned - - -#### Example usage of live - - {live({url},{url:format},hour)} {live(https://data.mobility.brussels/bike/api/counts/?request=live&featureID=CB2105,hour:data.hour_cnt;day:data.day_cnt;year:data.year_cnt,hour)} - - - ### canonical Converts a short, canonical value into the long, translated text including the unit. This only works if a `unit` is defined for the corresponding value. The unit specification will be included in the text. diff --git a/Docs/TagInfo/mapcomplete_climbing.json b/Docs/TagInfo/mapcomplete_climbing.json index fea40f171..83afbdf82 100644 --- a/Docs/TagInfo/mapcomplete_climbing.json +++ b/Docs/TagInfo/mapcomplete_climbing.json @@ -2838,65 +2838,6 @@ "description": "Layer 'Shop' shows organic=no with a fixed text, namely 'This shop does not offer organic products' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if shop=supermarket|shop=convenience|shop=farm|shop=greengrocer|shop=health_food|shop=clothes|shop=shoes|shop=butcher|shop=cosmetics|shop=deli|shop=bakery|shop=alcohol|shop=seafood|shop=beverages|shop=florist)", "value": "no" }, - { - "key": "amenity", - "description": "The MapComplete theme Climbing gyms, clubs and spots has a layer Drinking water showing features with this tag", - "value": "drinking_water" - }, - { - "key": "drinking_water", - "description": "The MapComplete theme Climbing gyms, clubs and spots has a layer Drinking water showing features with this tag", - "value": "yes" - }, - { - "key": "id", - "description": "Layer 'Drinking water' shows id~.+ with a fixed text, namely 'You just created this element! Thanks for sharing this info with the world and helping people worldwide.' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if _backend~.+&_last_edit:passed_time<300&|_version_number=1)" - }, - { - "key": "image", - "description": "The layer 'Drinking water allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" - }, - { - "key": "mapillary", - "description": "The layer 'Drinking water allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" - }, - { - "key": "wikidata", - "description": "The layer 'Drinking water allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" - }, - { - "key": "wikipedia", - "description": "The layer 'Drinking water allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" - }, - { - "key": "operational_status", - "description": "Layer 'Drinking water' shows and asks freeform values for key 'operational_status' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')" - }, - { - "key": "operational_status", - "description": "Layer 'Drinking water' shows with a fixed text, namely 'This drinking water works' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') Picking this answer will delete the key operational_status.", - "value": "" - }, - { - "key": "operational_status", - "description": "Layer 'Drinking water' shows operational_status=broken with a fixed text, namely 'This drinking water is broken' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')", - "value": "broken" - }, - { - "key": "operational_status", - "description": "Layer 'Drinking water' shows operational_status=closed with a fixed text, namely 'This drinking water is closed' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')", - "value": "closed" - }, - { - "key": "bottle", - "description": "Layer 'Drinking water' shows bottle=yes with a fixed text, namely 'It is easy to refill water bottles' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')", - "value": "yes" - }, - { - "key": "bottle", - "description": "Layer 'Drinking water' shows bottle=no with a fixed text, namely 'Water bottles may not fit' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')", - "value": "no" - }, { "key": "amenity", "description": "The MapComplete theme Climbing gyms, clubs and spots has a layer Toilets showing features with this tag", @@ -3113,12 +3054,12 @@ }, { "key": "toilets:handwashing", - "description": "Layer 'Toilets' shows toilets:handwashing=yes with a fixed text, namely 'This toilets have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')", + "description": "Layer 'Toilets' shows toilets:handwashing=yes with a fixed text, namely 'These toilets have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')", "value": "yes" }, { "key": "toilets:handwashing", - "description": "Layer 'Toilets' shows toilets:handwashing=no with a fixed text, namely 'This toilets don't have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')", + "description": "Layer 'Toilets' shows toilets:handwashing=no with a fixed text, namely 'These toilets don't have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')", "value": "no" }, { @@ -3134,6 +3075,65 @@ { "key": "description", "description": "Layer 'Toilets' shows and asks freeform values for key 'description' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')" + }, + { + "key": "amenity", + "description": "The MapComplete theme Climbing gyms, clubs and spots has a layer Drinking water showing features with this tag", + "value": "drinking_water" + }, + { + "key": "drinking_water", + "description": "The MapComplete theme Climbing gyms, clubs and spots has a layer Drinking water showing features with this tag", + "value": "yes" + }, + { + "key": "id", + "description": "Layer 'Drinking water' shows id~.+ with a fixed text, namely 'You just created this element! Thanks for sharing this info with the world and helping people worldwide.' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if _backend~.+&_last_edit:passed_time<300&|_version_number=1)" + }, + { + "key": "image", + "description": "The layer 'Drinking water allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "mapillary", + "description": "The layer 'Drinking water allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikidata", + "description": "The layer 'Drinking water allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikipedia", + "description": "The layer 'Drinking water allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "operational_status", + "description": "Layer 'Drinking water' shows and asks freeform values for key 'operational_status' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')" + }, + { + "key": "operational_status", + "description": "Layer 'Drinking water' shows with a fixed text, namely 'This drinking water works' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') Picking this answer will delete the key operational_status.", + "value": "" + }, + { + "key": "operational_status", + "description": "Layer 'Drinking water' shows operational_status=broken with a fixed text, namely 'This drinking water is broken' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')", + "value": "broken" + }, + { + "key": "operational_status", + "description": "Layer 'Drinking water' shows operational_status=closed with a fixed text, namely 'This drinking water is closed' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')", + "value": "closed" + }, + { + "key": "bottle", + "description": "Layer 'Drinking water' shows bottle=yes with a fixed text, namely 'It is easy to refill water bottles' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')", + "value": "yes" + }, + { + "key": "bottle", + "description": "Layer 'Drinking water' shows bottle=no with a fixed text, namely 'Water bottles may not fit' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')", + "value": "no" } ] } \ No newline at end of file diff --git a/Docs/TagInfo/mapcomplete_food.json b/Docs/TagInfo/mapcomplete_food.json index 16e351db3..61393ab1b 100644 --- a/Docs/TagInfo/mapcomplete_food.json +++ b/Docs/TagInfo/mapcomplete_food.json @@ -46,7 +46,7 @@ }, { "key": "amenity", - "description": "Layer 'Restaurants and fast food' shows amenity=fast_food with a fixed text, namely 'This is a fastfood-business, focused on fast service. If seating is available, these are rather limited and functional.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')", + "description": "Layer 'Restaurants and fast food' shows amenity=fast_food with a fixed text, namely 'This is a fast-food business, focused on fast service. If seating is available, it is rather limited and functional.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')", "value": "fast_food" }, { @@ -172,7 +172,7 @@ }, { "key": "cuisine", - "description": "Layer 'Restaurants and fast food' shows cuisine=sandwich with a fixed text, namely 'This is a sandwichbar' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')", + "description": "Layer 'Restaurants and fast food' shows cuisine=sandwich with a fixed text, namely 'This is a sandwich shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')", "value": "sandwich" }, { @@ -192,7 +192,7 @@ }, { "key": "cuisine", - "description": "Layer 'Restaurants and fast food' shows cuisine=italian with a fixed text, namely 'This is an italian restaurant (which serves more then pasta and pizza)' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')", + "description": "Layer 'Restaurants and fast food' shows cuisine=italian with a fixed text, namely 'This is an Italian restaurant (which serves more than pasta and pizza)' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')", "value": "italian" }, { diff --git a/Docs/TagInfo/mapcomplete_fritures.json b/Docs/TagInfo/mapcomplete_fritures.json index c3de637cd..9d245b2d5 100644 --- a/Docs/TagInfo/mapcomplete_fritures.json +++ b/Docs/TagInfo/mapcomplete_fritures.json @@ -50,7 +50,7 @@ }, { "key": "amenity", - "description": "Layer 'Fries shop' shows amenity=fast_food with a fixed text, namely 'This is a fastfood-business, focused on fast service. If seating is available, these are rather limited and functional.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')", + "description": "Layer 'Fries shop' shows amenity=fast_food with a fixed text, namely 'This is a fast-food business, focused on fast service. If seating is available, it is rather limited and functional.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')", "value": "fast_food" }, { @@ -176,7 +176,7 @@ }, { "key": "cuisine", - "description": "Layer 'Fries shop' shows cuisine=sandwich with a fixed text, namely 'This is a sandwichbar' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')", + "description": "Layer 'Fries shop' shows cuisine=sandwich with a fixed text, namely 'This is a sandwich shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')", "value": "sandwich" }, { @@ -196,7 +196,7 @@ }, { "key": "cuisine", - "description": "Layer 'Fries shop' shows cuisine=italian with a fixed text, namely 'This is an italian restaurant (which serves more then pasta and pizza)' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')", + "description": "Layer 'Fries shop' shows cuisine=italian with a fixed text, namely 'This is an Italian restaurant (which serves more than pasta and pizza)' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')", "value": "italian" }, { diff --git a/Docs/TagInfo/mapcomplete_nature.json b/Docs/TagInfo/mapcomplete_nature.json index d6a050921..c18dadfa7 100644 --- a/Docs/TagInfo/mapcomplete_nature.json +++ b/Docs/TagInfo/mapcomplete_nature.json @@ -1067,12 +1067,12 @@ }, { "key": "toilets:handwashing", - "description": "Layer 'Toilets' shows toilets:handwashing=yes with a fixed text, namely 'This toilets have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')", + "description": "Layer 'Toilets' shows toilets:handwashing=yes with a fixed text, namely 'These toilets have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')", "value": "yes" }, { "key": "toilets:handwashing", - "description": "Layer 'Toilets' shows toilets:handwashing=no with a fixed text, namely 'This toilets don't have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')", + "description": "Layer 'Toilets' shows toilets:handwashing=no with a fixed text, namely 'These toilets don't have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')", "value": "no" }, { diff --git a/Docs/TagInfo/mapcomplete_onwheels.json b/Docs/TagInfo/mapcomplete_onwheels.json index 6a66894ad..0ee4b5b13 100644 --- a/Docs/TagInfo/mapcomplete_onwheels.json +++ b/Docs/TagInfo/mapcomplete_onwheels.json @@ -556,7 +556,7 @@ }, { "key": "amenity", - "description": "Layer 'Restaurants and fast food' shows amenity=fast_food with a fixed text, namely 'This is a fastfood-business, focused on fast service. If seating is available, these are rather limited and functional.' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')", + "description": "Layer 'Restaurants and fast food' shows amenity=fast_food with a fixed text, namely 'This is a fast-food business, focused on fast service. If seating is available, it is rather limited and functional.' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')", "value": "fast_food" }, { @@ -682,7 +682,7 @@ }, { "key": "cuisine", - "description": "Layer 'Restaurants and fast food' shows cuisine=sandwich with a fixed text, namely 'This is a sandwichbar' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')", + "description": "Layer 'Restaurants and fast food' shows cuisine=sandwich with a fixed text, namely 'This is a sandwich shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')", "value": "sandwich" }, { @@ -702,7 +702,7 @@ }, { "key": "cuisine", - "description": "Layer 'Restaurants and fast food' shows cuisine=italian with a fixed text, namely 'This is an italian restaurant (which serves more then pasta and pizza)' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')", + "description": "Layer 'Restaurants and fast food' shows cuisine=italian with a fixed text, namely 'This is an Italian restaurant (which serves more than pasta and pizza)' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')", "value": "italian" }, { @@ -2479,12 +2479,12 @@ }, { "key": "toilets:handwashing", - "description": "Layer 'Toilets' shows toilets:handwashing=yes with a fixed text, namely 'This toilets have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')", + "description": "Layer 'Toilets' shows toilets:handwashing=yes with a fixed text, namely 'These toilets have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')", "value": "yes" }, { "key": "toilets:handwashing", - "description": "Layer 'Toilets' shows toilets:handwashing=no with a fixed text, namely 'This toilets don't have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')", + "description": "Layer 'Toilets' shows toilets:handwashing=no with a fixed text, namely 'These toilets don't have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')", "value": "no" }, { diff --git a/Docs/TagInfo/mapcomplete_pets.json b/Docs/TagInfo/mapcomplete_pets.json index e45385925..3d0796117 100644 --- a/Docs/TagInfo/mapcomplete_pets.json +++ b/Docs/TagInfo/mapcomplete_pets.json @@ -120,7 +120,7 @@ }, { "key": "amenity", - "description": "Layer 'Dog friendly eateries' shows amenity=fast_food with a fixed text, namely 'This is a fastfood-business, focused on fast service. If seating is available, these are rather limited and functional.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')", + "description": "Layer 'Dog friendly eateries' shows amenity=fast_food with a fixed text, namely 'This is a fast-food business, focused on fast service. If seating is available, it is rather limited and functional.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')", "value": "fast_food" }, { @@ -246,7 +246,7 @@ }, { "key": "cuisine", - "description": "Layer 'Dog friendly eateries' shows cuisine=sandwich with a fixed text, namely 'This is a sandwichbar' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')", + "description": "Layer 'Dog friendly eateries' shows cuisine=sandwich with a fixed text, namely 'This is a sandwich shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')", "value": "sandwich" }, { @@ -266,7 +266,7 @@ }, { "key": "cuisine", - "description": "Layer 'Dog friendly eateries' shows cuisine=italian with a fixed text, namely 'This is an italian restaurant (which serves more then pasta and pizza)' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')", + "description": "Layer 'Dog friendly eateries' shows cuisine=italian with a fixed text, namely 'This is an Italian restaurant (which serves more than pasta and pizza)' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')", "value": "italian" }, { diff --git a/Docs/TagInfo/mapcomplete_toilets.json b/Docs/TagInfo/mapcomplete_toilets.json index e0f513297..6054927a7 100644 --- a/Docs/TagInfo/mapcomplete_toilets.json +++ b/Docs/TagInfo/mapcomplete_toilets.json @@ -226,12 +226,12 @@ }, { "key": "toilets:handwashing", - "description": "Layer 'Toilets' shows toilets:handwashing=yes with a fixed text, namely 'This toilets have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Public toilets')", + "description": "Layer 'Toilets' shows toilets:handwashing=yes with a fixed text, namely 'These toilets have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Public toilets')", "value": "yes" }, { "key": "toilets:handwashing", - "description": "Layer 'Toilets' shows toilets:handwashing=no with a fixed text, namely 'This toilets don't have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Public toilets')", + "description": "Layer 'Toilets' shows toilets:handwashing=no with a fixed text, namely 'These toilets don't have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Public toilets')", "value": "no" }, { diff --git a/Docs/TagInfo/mapcomplete_vending_machine.json b/Docs/TagInfo/mapcomplete_vending_machine.json index f71c8e6db..12eedf701 100644 --- a/Docs/TagInfo/mapcomplete_vending_machine.json +++ b/Docs/TagInfo/mapcomplete_vending_machine.json @@ -119,6 +119,16 @@ "description": "Layer 'Vending Machines' shows vending=meat with a fixed text, namely 'Meat is sold' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines')", "value": "meat" }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=fruit with a fixed text, namely 'Fruit is sold' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines')", + "value": "fruit" + }, + { + "key": "vending", + "description": "Layer 'Vending Machines' shows vending=strawberries with a fixed text, namely 'Strawberries are sold' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines')", + "value": "strawberries" + }, { "key": "vending", "description": "Layer 'Vending Machines' shows vending=flowers with a fixed text, namely 'Flowers are sold' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines')", @@ -403,6 +413,14 @@ { "key": "contact:phone", "description": "Layer 'Vending Machines' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Vending Machines')" + }, + { + "key": "website", + "description": "Layer 'Vending Machines' shows and asks freeform values for key 'website' (in the mapcomplete.org theme 'Vending Machines')" + }, + { + "key": "contact:website", + "description": "Layer 'Vending Machines' shows contact:website~.+ with a fixed text, namely '{contact:website}' (in the mapcomplete.org theme 'Vending Machines')" } ] } \ No newline at end of file diff --git a/Docs/Themes/climbing.md b/Docs/Themes/climbing.md index 32f4a6379..97a8cba0b 100644 --- a/Docs/Themes/climbing.md +++ b/Docs/Themes/climbing.md @@ -18,8 +18,9 @@ This theme contains the following layers: - [climbing_opportunity](../Layers/climbing_opportunity.md) - [shops_with_climbing_shoe_repair](../Layers/shops_with_climbing_shoe_repair.md) - [shops](../Layers/shops.md) - - [drinking_water](../Layers/drinking_water.md) - [toilet](../Layers/toilet.md) + - [drinking_water](../Layers/drinking_water.md) + - [guidepost](../Layers/guidepost.md) - [selected_element](../Layers/selected_element.md) - [gps_location](../Layers/gps_location.md) - [gps_location_history](../Layers/gps_location_history.md) diff --git a/Docs/URL_Parameters.md b/Docs/URL_Parameters.md index 277293bfc..be2086659 100644 --- a/Docs/URL_Parameters.md +++ b/Docs/URL_Parameters.md @@ -11,7 +11,6 @@ - [What is a URL parameter?](#what-is-a-url-parameter) - [language](#language) - [fs-translation-mode](#fs-translation-mode) - - [backend](#backend) - [fake-user](#fake-user) - [fs-enable-login](#fs-enable-login) - [fs-search](#fs-search) @@ -119,23 +118,12 @@ This documentation is defined in the source code at [Locale.ts](/src/UI/i18n/Loc - backend ---------- - - The OSM backend to use - can be used to redirect mapcomplete to the testing backend when using 'osm-test' - -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L34) - - The default value is _osm_ - - - fake-user ----------- If true, 'dryrun' mode is activated and a fake user account is loaded -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L40) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L33) The default value is _false_ @@ -146,7 +134,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src Disables/Enables logging in and thus disables editing all together. This effectively puts MapComplete into read-only mode. -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L80) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L73) The default value is _true_ @@ -157,7 +145,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src Disables/Enables the search bar -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L85) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L78) The default value is _true_ @@ -168,7 +156,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src Disables/Enables the background layer control -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L90) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L83) The default value is _true_ @@ -179,7 +167,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src Disables/Enables the filter view -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L96) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L89) The default value is _true_ @@ -190,7 +178,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src Disables/enables the help menu or welcome message -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L102) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L95) The default value is _true_ @@ -201,7 +189,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src Disables/enables the button to get in touch with the community -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L107) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L100) The default value is _true_ @@ -212,7 +200,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src Disables/Enables the extraLink button. By default, if in iframe mode and the welcome message is hidden, a popout button to the full mapcomplete instance is shown instead (unless disabled with this switch or another extraLink button is enabled) -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L112) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L105) The default value is _true_ @@ -223,7 +211,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src Disables/Enables the 'More Quests'-tab in the welcome message -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L117) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L110) The default value is _true_ @@ -234,7 +222,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src Disables/Enables the 'Share-screen'-tab in the welcome message -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L122) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L115) The default value is _true_ @@ -245,7 +233,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src Disables/Enables the geolocation button -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L127) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L120) The default value is _true_ @@ -256,7 +244,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src Always show all questions -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L132) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L125) The default value is _false_ @@ -267,7 +255,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src Enable the export as GeoJSON and CSV button -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L138) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L131) The default value is _true_ @@ -278,7 +266,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src If true, 'dryrun' mode is activated. The app will behave as normal, except that changes to OSM will be printed onto the console instead of actually uploaded to osm.org -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L153) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L145) The default value is _false_ @@ -289,7 +277,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src If true, shows some extra debugging help such as all the available tags on every object -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L159) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L151) The default value is _false_ @@ -300,7 +288,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src Point mapcomplete to a different overpass-instance. Example: https://overpass-api.de/api/interpreter -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L165) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L157) The default value is _https://overpass-api.de/api/interpreter,https://overpass.kumi.systems/api/interpreter,https://overpass.openstreetmap.ru/cgi/interpreter_ @@ -311,7 +299,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src Set a different timeout (in seconds) for queries in overpass -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L176) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L168) The default value is _30_ @@ -322,7 +310,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src point to switch between OSM-api and overpass -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L184) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L176) The default value is _16_ @@ -333,7 +321,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src Tilesize when the OSM-API is used to fetch data within a BBOX -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L192) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L184) The default value is _17_ @@ -344,7 +332,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src The id of the background layer to start with -This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L199) +This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L191) No default value set diff --git a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json index 1f629e4e9..35b863823 100644 --- a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json +++ b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json @@ -33,7 +33,9 @@ { "if": "name~*", "then": { - "en": "Bicycle tube vending machine {name}" + "en": "Bicycle tube vending machine {name}", + "ca": "Màquina expenedora de cambres d'aire de bicicletes {name}", + "de": "{name} Fahrradschlauch-Automat" } } ] @@ -178,10 +180,14 @@ }, { "question": { - "en": "How much does a bicycle tube cost?" + "en": "How much does a bicycle tube cost?", + "ca": "Quant costa una cambra d'aire de bicicleta?", + "de": "Wie viel kostet ein Fahrradschlauch?" }, "render": { - "en": "A bicycle tube costs {charge}" + "en": "A bicycle tube costs {charge}", + "ca": "Una cambra d'aire de bicicleta costa {charge}", + "de": "Ein Fahrradschlauch kostet {charge}" }, "freeform": { "key": "charge" @@ -191,25 +197,33 @@ "payment-options-split", { "question": { - "en": "Which brand of tubes are sold here?" + "en": "Which brand of tubes are sold here?", + "ca": "Quines marques de cambres d'aire es venen aquí?", + "de": "Welche Fahrradschläuche werden hier verkauft?" }, "freeform": { "key": "brand" }, "render": { - "en": "{brand} tubes are sold here" + "en": "{brand} tubes are sold here", + "ca": "Aquí es venen cambres d'aire {brand}", + "de": "Hier werden Fahrradschläuche von {brand} verkauft" }, "mappings": [ { "if": "brand=Continental", "then": { - "en": "Continental tubes are sold here" + "en": "Continental tubes are sold here", + "ca": "Aquí es venen cambres d'aire Continental", + "de": "Hier werden Fahrradschläuche von Continental verkauft" } }, { "if": "brand=Schwalbe", "then": { - "en": "Schwalbe tubes are sold here" + "en": "Schwalbe tubes are sold here", + "ca": "Aquí es venen cambres d'aire Schwalbe", + "de": "Hier werden Fahrradschläuche von Schwalbe verkauft" } } ], @@ -218,20 +232,26 @@ }, { "question": { - "en": "Who maintains this vending machine?" + "en": "Who maintains this vending machine?", + "ca": "Qui manté aquesta màquina expenedora?", + "de": "Wer betreibt den Automaten?" }, "render": "This vending machine is maintained by {operator}", "mappings": [ { "if": "operator=Schwalbe", "then": { - "en": "Maintained by Schwalbe" + "en": "Maintained by Schwalbe", + "ca": "Mantés per Schwalbe", + "de": "Betrieben von Schwalbe" } }, { "if": "operator=Continental", "then": { - "en": "Maintained by Continental" + "en": "Maintained by Continental", + "ca": "Mantés per Continental", + "de": "Betrieben von Continental" } } ], @@ -243,49 +263,63 @@ { "id": "other-items-vending", "question": { - "en": "Are other biycle accessories sold here?" + "en": "Are other biycle accessories sold here?", + "ca": "Es venen altres accessoris per a bicicletes aquí?", + "de": "Wird weiteres Fahrradzubehör verkauft?" }, "mappings": [ { "if": "vending=bicycle_tube", "then": { "en": "Bicycle inner tubes are sold here", - "nl": "Fietsbinnenbanden worden hier verkocht" + "nl": "Fietsbinnenbanden worden hier verkocht", + "ca": "Aquí es venen cambres d'aire de bicicletes", + "de": "Hier werden Fahrradschläuche verkauft" } }, { "if": "vending=bicycle_light", "then": { "en": "Bicycle lights are sold here", - "nl": "Fietslampjes worden hier verkocht" + "nl": "Fietslampjes worden hier verkocht", + "ca": "Aquí es venen llums per a bicicletes", + "de": "Hier werden Fahrradlampen verkauft" } }, { "if": "vending=gloves", "then": { "en": "Gloves are sold here", - "nl": "Handschoenen worden hier verkocht" + "nl": "Handschoenen worden hier verkocht", + "ca": "Aquí es venen guants", + "de": "Hier werden Fahrradhandschuhe verkauft" } }, { "if": "vending=bicycle_repair_kit", "then": { "en": "Bicycle repair kits are sold here", - "nl": "Fietsreparatiesets worden hier verkocht" + "nl": "Fietsreparatiesets worden hier verkocht", + "ca": "Aquí es venen kits de reparació de bicicletes", + "de": "Hier werden Fahrrad-Reparatursets verkauft" } }, { "if": "vending=bicycle_pump", "then": { "en": "Bicycle pumps are sold here", - "nl": "Fietspompen worden hier verkocht" + "nl": "Fietspompen worden hier verkocht", + "ca": "Aquí es venen bombes de bicicletes", + "de": "Hier werden Fahrradpumpen verkauft" } }, { "if": "vending=bicycle_lock", "then": { "en": "Bicycle locks are sold here", - "nl": "Fietssloten worden hier verkocht" + "nl": "Fietssloten worden hier verkocht", + "ca": "Aquí es venen cadenats per a bicicletes", + "de": "Hier werden Fahrradschlösser verkauft" } } ], diff --git a/assets/layers/cafe_pub/cafe_pub.json b/assets/layers/cafe_pub/cafe_pub.json index 32d2fe11d..7f1ca5141 100644 --- a/assets/layers/cafe_pub/cafe_pub.json +++ b/assets/layers/cafe_pub/cafe_pub.json @@ -293,10 +293,13 @@ "internet-ssid", "reviews" ], + "minzoom": 12, "filter": [ "open_now", "accepts_cash", - "accepts_cards" + "accepts_cards", + "has_internet", + "has_electricity" ], "deletion": { "softDeletionTags": { diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index a9c448a47..6246457f4 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -889,7 +889,7 @@ "then": { "en": "Tesla Supercharger CCS (a branded type2_css)", "nl": "Tesla Supercharger CCS (een type2 CCS met Tesla-logo)", - "ca": "CSS Supercarregador Tesla (un tipus2_css de la marca)", + "ca": "CCS Supercarregador Tesla (un cable de la marca Tesla Tipus2_css)", "da": "Tesla Supercharger CCS (en mærkevare type2_css)", "de": "Tesla Supercharger CCS (Typ 2 CSS von Tesla)", "es": "CCS Supercargador Tesla (un tipo2_css con marca)" @@ -935,7 +935,7 @@ "then": { "en": "Tesla Supercharger CCS (a branded type2_css)", "nl": "Tesla Supercharger CCS (een type2 CCS met Tesla-logo)", - "ca": "CSS Supercarregador Tesla (un tipus2_css de la marca)", + "ca": "CCS Supercarregador Tesla (un cable de la marca Tesla Tipus2_css)", "da": "Tesla Supercharger CCS (en mærkevare type2_css)", "de": "Tesla Supercharger CCS (ein Markenzeichen von type2_css)", "es": "CCS Supercargador Tesla (un tipo2_css con marca)" @@ -1244,12 +1244,14 @@ "question": { "en": "How much plugs of type
Schuko wall plug without ground pin (CEE7/4 type F)
are available here?", "nl": "Hoeveel stekkers van type
Schuko stekker zonder aardingspin (CEE7/4 type F)
heeft dit oplaadpunt?", + "ca": "Quants connectors del tipus
Endoll de paret Schuko sense pin de terra (CEE7/4 tipus F)
hi han disponibles aquí?", "da": "Hvor mange stik af typen
Schuko vægstik uden jordstift (CEE7/4 type F)
er tilgængelige her?", "de": "Wie viele Stecker vom Typ
Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)
sind hier vorhanden?" }, "render": { "en": "There are {socket:schuko} plugs of type
Schuko wall plug without ground pin (CEE7/4 type F)
available here", "nl": "Hier zijn {socket:schuko} stekkers van het type
Schuko stekker zonder aardingspin (CEE7/4 type F)
", + "ca": "Hi ha {socket:schuko} connectors del tipus
Endoll de paret Schuko sense pin de terra (CEE7/4 tipus F)
disponibles aquí", "da": "Der findes {socket:schuko} stik af typen
Schuko-vægstik uden jord (CEE7/4 type F)
her", "de": "Hier sind {socket:schuko} Stecker des Typs
Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)
vorhanden" }, @@ -1269,12 +1271,14 @@ "question": { "en": "How much plugs of type
European wall plug with ground pin (CEE7/4 type E)
are available here?", "nl": "Hoeveel stekkers van type
Europese stekker met aardingspin (CEE7/4 type E)
heeft dit oplaadpunt?", + "ca": "Quants connectors del tipus
Endoll de paret Europeu amb pin de terra (CEE7/4 tipus E)
hi han disponibles aquí?", "da": "Hvor mange stik af typen
Europæisk vægstik med jord (CEE7/4 type E)
er tilgængelige her?", "de": "Wie viele Stecker des Typs
Europäischer Wandstecker mit Erdungsstift (CEE7/4 Typ E)
sind hier vorhanden?" }, "render": { "en": "There are {socket:typee} plugs of type
European wall plug with ground pin (CEE7/4 type E)
available here", "nl": "Hier zijn {socket:typee} stekkers van het type
Europese stekker met aardingspin (CEE7/4 type E)
", + "ca": "Hi ha {socket:typee} connectors del tipus
Endoll de paret europeu amb pin de terra (CEE7/4 tipus E)
disponibles aquí", "da": "Der findes {socket:typee} stik af typen
Europæisk vægstik med jord (CEE7/4 type E)
her", "de": "Hier sind {socket:typee} Stecker des Typs
Europäischer Wandstecker mit Erdungsstift (CEE7/4 Typ E)
vorhanden" }, @@ -1488,12 +1492,14 @@ "question": { "en": "How much plugs of type
Tesla Supercharger CCS (a branded type2_css)
are available here?", "nl": "Hoeveel stekkers van type
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
heeft dit oplaadpunt?", + "ca": "Quants connectors del tipus
CCS Supercarregador Tesla (un cable de la marca Tesla Tipus2_css)
hi han disponibles aquí?", "da": "Hvor mange stik af typen
Tesla Supercharger CCS (en mærkevare type2_css)
er tilgængelige her?", "de": "Wie viele Stecker des Typs
Tesla Supercharger CCS (Typ 2 CSS von Tesla)
sind hier vorhanden?" }, "render": { "en": "There are {socket:tesla_supercharger_ccs} plugs of type
Tesla Supercharger CCS (a branded type2_css)
available here", "nl": "Hier zijn {socket:tesla_supercharger_ccs} stekkers van het type
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
", + "ca": "Hi ha {socket:tesla_supercharger_ccs} connectors
Supercarregadro Tesla CCS (un cable de la marca Tesla Tipus2_css)
disponibles aquí", "de": "Hier sind {socket:tesla_supercharger_ccs} Stecker des Typs
Tesla Supercharger CCS (Typ2 CSS von Tesla)
vorhanden" }, "freeform": { @@ -1676,13 +1682,14 @@ "question": { "en": "What current do the plugs with
Schuko wall plug without ground pin (CEE7/4 type F)
offer?", "nl": "Welke stroom levert de stekker van type
Schuko stekker zonder aardingspin (CEE7/4 type F)
?", - "ca": "Quina intensitat ofereixen els endolls amb
de paret Shuko sense pin de terra (CEE7/4 tipus F)
?", + "ca": "Quina intensitat ofereixen els connectors amb
endolls de paret Schuko sense pin de terra (CEE7/4 tipus F)
?", "da": "Hvilken strømstyrke har stikkene med
Schuko-vægstik uden jordstift (CEE7/4 type F)
?", "de": "Welche Stromstärke liefern die Anschlüsse mit
Schuko-Stecker ohne Schutzkontakt (CEE7/4 Typ F)
?" }, "render": { "en": "
Schuko wall plug without ground pin (CEE7/4 type F)
outputs at most {socket:schuko:current}A", "nl": "
Schuko stekker zonder aardingspin (CEE7/4 type F)
levert een stroom van maximaal {socket:schuko:current}A", + "ca": "
L'endoll de paret Schuko sense pin de terra (CEE7/4 tipus F)
surt com a màxim a {socket:schuko:current}A", "da": "
Schuko vægstik uden jord (CEE7/4 type F)
udgange højst {socket:schuko:current}A", "de": "
Schuko-Stecker ohne Erdungsstift (CEE7/4 Typ F)
liefert maximal {socket:schuko:current} A" }, @@ -1804,12 +1811,14 @@ "question": { "en": "What current do the plugs with
European wall plug with ground pin (CEE7/4 type E)
offer?", "nl": "Welke stroom levert de stekker van type
Europese stekker met aardingspin (CEE7/4 type E)
?", + "ca": "Quina intensitat ofereixen els connectors amb
endolls de paret europeu amb pin de terra (CEE7/4 tipus F)
?", "da": "Hvilken strømstyrke har stikkene med
Europæisk vægstik med jord (CEE7/4 type E)
?", "de": "Welche Stromstärke bieten die Anschlüsse mit
europäischem Stecker mit Schutzkontakt (CEE7/4 Typ E)
?" }, "render": { "en": "
European wall plug with ground pin (CEE7/4 type E)
outputs at most {socket:typee:current}A", "nl": "
Europese stekker met aardingspin (CEE7/4 type E)
levert een stroom van maximaal {socket:typee:current}A", + "ca": "
L'endoll de paret europeu amb pin de terra (CEE7/4 tipus F)
surt com a màxim a {socket:typee:current}A", "da": "
Europæisk vægstik med jord (CEE7/4 type E)
udgange på højst {socket:typee:current}A", "de": "
Europäischer Wandstecker mit Erdungsstift (CEE7/4 Typ E)
liefert maximal {socket:typee:current} A" }, @@ -1823,6 +1832,7 @@ "then": { "en": "European wall plug with ground pin (CEE7/4 type E) outputs at most 16 A", "nl": "Europese stekker met aardingspin (CEE7/4 type E) levert een stroom van maximaal 16 A", + "ca": "Endoll de paret europeu amb pin de terra (CEE7/4 type E) surt com a màxim a 16A", "da": "Europæisk vægstik med jord (CEE7/4 type E) yder højst 16 A", "de": "Europäischer Wandstecker mit Erdungsstift (CEE7/4 Typ E) liefert maximal 16 A" }, @@ -1951,6 +1961,7 @@ "render": { "en": "
Chademo
outputs at most {socket:chademo:current}A", "nl": "
Chademo
levert een stroom van maximaal {socket:chademo:current}A", + "ca": "
Chademo
surt com a màxim a {socket:chademo:current}A", "de": "
Chademo
liefert maximal {socket:chademo:current} A" }, "freeform": { @@ -2081,12 +2092,14 @@ "question": { "en": "What current do the plugs with
Type 1 with cable (J1772)
offer?", "nl": "Welke stroom levert de stekker van type
Type 1 met kabel (J1772)
?", + "ca": "Quina corrent ofereixen els connectors
Tipus 1 amb cable (J1772)
?", "da": "Hvilken strømstyrke har stikkene med
Type 1 med kabel (J1772)
(J1772)?", "de": "Welche Stromstärke liefern die Stecker mit
Typ 1 mit Kabel (J1772)
?" }, "render": { "en": "
Type 1 with cable (J1772)
outputs at most {socket:type1_cable:current}A", "nl": "
Type 1 met kabel (J1772)
levert een stroom van maximaal {socket:type1_cable:current}A", + "ca": "
Tipus 1 amb cable (J1772)
surt com a màxim a {socket:type1_cable:current}A", "da": "
Type 1 med kabel (J1772)
udgange på højst {socket:type1_cable:current}A", "de": "
Typ 1 mit Kabel (J1772)
liefert maximal {socket:type1_cable:current} A" }, @@ -2100,6 +2113,7 @@ "then": { "en": "Type 1 with cable (J1772) outputs at most 32 A", "nl": "Type 1 met kabel (J1772) levert een stroom van maximaal 32 A", + "ca": "Tipus 1 amb cable (J1772) surt com a màxim a 32A", "da": "Type 1 med kabel (J1772) yder højst 32 A", "de": "Typ 1 mit Kabel (J1772) liefert maximal 32 A" }, @@ -2228,12 +2242,14 @@ "question": { "en": "What current do the plugs with
Type 1 without cable (J1772)
offer?", "nl": "Welke stroom levert de stekker van type
Type 1 zonder kabel (J1772)
?", + "ca": "Quina corrent ofereixen els connectors
Tipus 1 sense cable (J1772)
?", "da": "Hvilken strømstyrke har stikkene med
Type 1 uden kabel (J1772)
?", "de": "Welche Stromstärke liefern die Stecker mit
Typ 1 ohne Kabel (J1772)
?" }, "render": { "en": "
Type 1 without cable (J1772)
outputs at most {socket:type1:current}A", "nl": "
Type 1 zonder kabel (J1772)
levert een stroom van maximaal {socket:type1:current}A", + "ca": "
Tipus 1 sense cable(J1772)
surt com a màxim a {socket:type1:current}A", "da": "
Type 1 uden kabel (J1772)
udgange højst {socket:type1:current}A", "de": "
Typ 1 ohne Kabel (J1772)
liefert maximal {socket:type1:current} A" }, @@ -2247,6 +2263,7 @@ "then": { "en": "Type 1 without cable (J1772) outputs at most 32 A", "nl": "Type 1 zonder kabel (J1772) levert een stroom van maximaal 32 A", + "ca": "Tipus 1 sense cable (J1772) surt com a màxim a 32A", "da": " Type 1 uden-kabel (J1772)-udgange højst 32 A", "de": "Typ 1 ohne Kabel (J1772) liefert maximal 32 A" }, @@ -2399,12 +2416,14 @@ "question": { "en": "What current do the plugs with
Type 1 CCS (aka Type 1 Combo)
offer?", "nl": "Welke stroom levert de stekker van type
Type 1 CCS (ook gekend als Type 1 Combo)
?", + "ca": "Quina intensitat ofereixen els connectors
Tipus 1 CCS (també Tipus 1 Combo)
?", "da": "Hvilken strømstyrke giver stikkene med
Type 1 CCS (også kendt som Type 1 Combo)
?", "de": "Welche Stromstärke liefern die Stecker mit
Typ 1 CCS (Typ 1 Combo)
?" }, "render": { "en": "
Type 1 CCS (aka Type 1 Combo)
outputs at most {socket:type1_combo:current}A", "nl": "
Type 1 CCS (ook gekend als Type 1 Combo)
levert een stroom van maximaal {socket:type1_combo:current}A", + "ca": "
Tipus 1 CCS (també Tipus 1 Combo)
surt com a màxim a {socket:type1_combo:current}A", "da": "
Type 1 CCS (alias Type 1 Combo)
udgange højst {socket:type1_combo:current}A", "de": "
Typ 1 CCS (Typ 1 Combo)
liefert maximal {socket:type1_combo:current} A" }, @@ -2418,6 +2437,7 @@ "then": { "en": "Type 1 CCS (aka Type 1 Combo) outputs at most 50 A", "nl": "Type 1 CCS (ook gekend als Type 1 Combo) levert een stroom van maximaal 50 A", + "ca": "Tipus 1 CCS (també Tipus 1 Combo) surt com a màxim a 50A", "da": " Type 1 CCS (også kaldet Type 1 Combo) udgange højst 50 A", "de": "Typ 1 CCS (Typ 1 Combo) liefert maximal 50 A" }, @@ -2431,6 +2451,7 @@ "then": { "en": "Type 1 CCS (aka Type 1 Combo) outputs at most 125 A", "nl": "Type 1 CCS (ook gekend als Type 1 Combo) levert een stroom van maximaal 125 A", + "ca": "Tipus 1 CCS (també Tipus 1 Combo) surt com a màxim a 125A", "da": "Type 1 CCS (også kendt som Type 1 Combo) udsender højst 125 A", "de": "Typ 1 CCS (Typ 1 Combo) liefert maximal 125 A" }, @@ -2571,12 +2592,14 @@ "question": { "en": "What current do the plugs with
Tesla Supercharger
offer?", "nl": "Welke stroom levert de stekker van type
Tesla Supercharger
?", + "ca": "Quina intensitat ofereixen els connectors
Supercarregador Tesla
?", "da": "Hvilken strømstyrke giver stikkene med
Tesla Supercharger
?", "de": "Welche Stromstärke liefern die Stecker mit
Tesla Supercharger
?" }, "render": { "en": "
Tesla Supercharger
outputs at most {socket:tesla_supercharger:current}A", "nl": "
Tesla Supercharger
levert een stroom van maximaal {socket:tesla_supercharger:current}A", + "ca": "
Supercarregador Tesla
surt com a màxim a {socket:tesla_supercharger:current}A", "da": "
Tesla Supercharger
udgange højst {socket:tesla_supercharger:current}A", "de": "
Tesla Supercharger
liefert maximal {socket:tesla_supercharger:current} A" }, @@ -2590,6 +2613,7 @@ "then": { "en": "Tesla Supercharger outputs at most 125 A", "nl": "Tesla Supercharger levert een stroom van maximaal 125 A", + "ca": "Supercarregador Tesla surt com a màxim a 125A", "da": " Tesla Supercharger yder højst 125 A", "de": "Tesla Supercharger liefert maximal 125 A" }, @@ -2603,6 +2627,7 @@ "then": { "en": "Tesla Supercharger outputs at most 350 A", "nl": "Tesla Supercharger levert een stroom van maximaal 350 A", + "ca": "Supercarregador Tesla surt com a màxim a 350A", "da": "Tesla Supercharger yder højst 350 A", "de": "Tesla Supercharger liefert maximal 350 A" }, @@ -2743,12 +2768,14 @@ "question": { "en": "What current do the plugs with
Type 2 (mennekes)
offer?", "nl": "Welke stroom levert de stekker van type
Type 2 (mennekes)
?", + "ca": "Quina intensitat ofereixen els connectors
Tipus 2 (mennekes)
?", "da": "Hvilken strømstyrke har stik med
Type 2 (mennekes)
?", "de": "Welche Stromstärke liefern die Stecker mit
Typ 2 (Mennekes)
?" }, "render": { "en": "
Type 2 (mennekes)
outputs at most {socket:type2:current}A", "nl": "
Type 2 (mennekes)
levert een stroom van maximaal {socket:type2:current}A", + "ca": "
Tipus 2 (mennekes)
surt com a màxim a {socket:type2:current}A", "da": "
Type 2 (mennekes)
udgange højst {socket:type2:current}A", "de": "
Typ 2 (Mennekes)
liefert maximal {socket:type2:current} A" }, @@ -2908,13 +2935,14 @@ "question": { "en": "What current do the plugs with
Type 2 CCS (mennekes)
offer?", "nl": "Welke stroom levert de stekker van type
Type 2 CCS (mennekes)
?", - "ca": "Quin corrent ofereixen els endolls amb
Tipus 2 CCS (mennekes)
?", + "ca": "Quina intensitat ofereixen els connectors
Tipus 2 CCS (mennekes)
?", "da": "Hvilken strømstyrke giver stikkene med
Type 2 CCS (mennekes)
?", "de": "Welche Stromstärke liefern die Stecker mit
Typ 2 CCS (Mennekes)
?" }, "render": { "en": "
Type 2 CCS (mennekes)
outputs at most {socket:type2_combo:current}A", "nl": "
Type 2 CCS (mennekes)
levert een stroom van maximaal {socket:type2_combo:current}A", + "ca": "
Tipus 2 CSS (mennekes)
surt com a màxim a {socket:type2_combo:current}", "da": "
Type 2 CCS (mennekes)
udgange højst {socket:type2_combo:current}A", "de": "
Typ 2 CCS (Mennekes)
liefern maximal {socket:type2_combo:current} A" }, @@ -3060,12 +3088,14 @@ "question": { "en": "What current do the plugs with
Type 2 with cable (mennekes)
offer?", "nl": "Welke stroom levert de stekker van type
Type 2 met kabel (J1772)
?", + "ca": "Quina intensitat ofereixen els connectors
Tipus 2 amb cable (mennekes)
?", "da": "Hvilken strømstyrke har stikkene med
Type 2 med kabel (mennekes)
?", "de": "Welche Stromstärke liefern die Stecker mit
Typ 2 mit Kabel (Mennekes)
?" }, "render": { "en": "
Type 2 with cable (mennekes)
outputs at most {socket:type2_cable:current}A", "nl": "
Type 2 met kabel (J1772)
levert een stroom van maximaal {socket:type2_cable:current}A", + "ca": "
Tipus 2 amb cable (mennekes)
surt com a màxim a {socket:type2_cable:current}A", "de": "
Typ 2 mit Kabel (Mennekes)
liefert maximal {socket:type2_cable:current} A" }, "freeform": { @@ -3078,6 +3108,7 @@ "then": { "en": "Type 2 with cable (mennekes) outputs at most 16 A", "nl": "Type 2 met kabel (J1772) levert een stroom van maximaal 16 A", + "ca": "Tipus 2 amb cable (mennekes) surt com a màxim a 16A", "da": "Type 2 med kabel (mennekes) udgange på højst 16 A", "de": "Typ 2 mit Kabel (Mennekes) liefert maximal 16 A" }, @@ -3091,6 +3122,7 @@ "then": { "en": "Type 2 with cable (mennekes) outputs at most 32 A", "nl": "Type 2 met kabel (J1772) levert een stroom van maximaal 32 A", + "ca": "Tipus 2 amb cable (mennekes) surt com a màxim a 32A", "da": "Type 2 med kabel (mennekes) udgange på højst 32 A", "de": "Typ 2 mit Kabel (Mennekes) liefert maximal 32 A" }, @@ -3219,12 +3251,14 @@ "question": { "en": "What current do the plugs with
Tesla Supercharger CCS (a branded type2_css)
offer?", "nl": "Welke stroom levert de stekker van type
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
?", + "ca": "Quina corrent ofereixen els connectors
CCS Supercarregador Tesla (un cable de la marca Tesla Tipus2_css)
?", "da": "Hvilken strømstyrke har stikkene med
Tesla Supercharger CCS (en type2_css af mærketype2_css)
?", "de": "Welche Stromstärke bieten die Anschlüsse mit
Tesla Supercharger CCS (Typ2 CSS von Tesla)
?" }, "render": { "en": "
Tesla Supercharger CCS (a branded type2_css)
outputs at most {socket:tesla_supercharger_ccs:current}A", "nl": "
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
levert een stroom van maximaal {socket:tesla_supercharger_ccs:current}A", + "ca": "
CCS Supercarregador Tesla (un cable de la marca Tesla Tipus2_css)
surt com a màxim a {socket:tesla_supercharger_ccs:current}A", "da": "
Tesla Supercharger CCS (en mærkevare type2_css)
udgange højst {socket:tesla_supercharger_ccs:current}A", "de": "
Tesla Supercharger CCS (Typ 2 CSS)
liefert maximal {socket:tesla_supercharger_ccs:current} A" }, @@ -3238,6 +3272,7 @@ "then": { "en": "Tesla Supercharger CCS (a branded type2_css) outputs at most 125 A", "nl": "Tesla Supercharger CCS (een type2 CCS met Tesla-logo) levert een stroom van maximaal 125 A", + "ca": "CCS Supercarregador Tesla (un cable de la marca Tesla Tipus2_css) surt com a màxim a 125A", "da": "Tesla Supercharger CCS (en mærkevare type2_css) yder højst 125 A", "de": "Tesla Supercharger CCS (Typ 2 CSS) liefert maximal 125 A" }, @@ -3251,6 +3286,7 @@ "then": { "en": "Tesla Supercharger CCS (a branded type2_css) outputs at most 350 A", "nl": "Tesla Supercharger CCS (een type2 CCS met Tesla-logo) levert een stroom van maximaal 350 A", + "ca": "CCS Supercarregador Tesla (un cable de la marca Tesla Tipus2_css) surt com a màxim a 350A", "da": "Tesla Supercharger CCS (en mærkevare type2_css) yder højst 350 A", "de": "Tesla Supercharger CCS (Typ 2 CSS) liefert maximal 350 A" }, @@ -3355,14 +3391,14 @@ "question": { "en": "What current do the plugs with
Tesla Supercharger (Destination)
offer?", "nl": "Welke stroom levert de stekker van type
Tesla Supercharger (Destination)
?", - "ca": "Quin corrent fan els endolls amb
Tesla Supercharger (Destination)
offer?", + "ca": "Quina intensitat ofereixen els connectors
Supercarregador Tesla (Destí)
?", "da": "Hvilken strømstyrke har stikkene med
Tesla Supercharger (Destination)
med Tesla Supercharger (Destination) ?", "de": "Welche Stromstärke liefern die Anschlüsse mit
Tesla Supercharger (Destination)
?" }, "render": { "en": "
Tesla Supercharger (Destination)
outputs at most {socket:tesla_destination:current}A", "nl": "
Tesla Supercharger (Destination)
levert een stroom van maximaal {socket:tesla_destination:current}A", - "ca": "
Tesla Supercharger (Destinació)
sortida com a màxim {socket:tesla_destination:current}A", + "ca": "
Supercarregador Tesla (Destí)
surt com a màxim a {socket:tesla_destination:current}A", "da": "
Tesla Supercharger (destination)
udgange højst {socket:tesla_destination:current}A", "de": "
Tesla Supercharger (Destination)
liefert maximal {socket:tesla_destination:current} A" }, @@ -3376,7 +3412,7 @@ "then": { "en": "Tesla Supercharger (Destination) outputs at most 125 A", "nl": "Tesla Supercharger (destination) levert een stroom van maximaal 125 A", - "ca": "Tesla Supercharger (Destinació) emet com a màxim 125 A", + "ca": "Supercarregador Tesla (Destí) surt com a màxim a 125 A", "de": "Tesla Supercharger (Destination) liefert maximal 125 A" }, "icon": { @@ -3389,7 +3425,7 @@ "then": { "en": "Tesla Supercharger (Destination) outputs at most 350 A", "nl": "Tesla Supercharger (destination) levert een stroom van maximaal 350 A", - "ca": "Tesla Supercharger (Destinació) emet com a màxim 350 A", + "ca": "Supercarregdor Tesla (Destinació) surt com a màxim a 350 A", "de": "Tesla Supercharger (Destination) liefert maximal 350 A" }, "icon": { @@ -3529,13 +3565,14 @@ "question": { "en": "What current do the plugs with
Tesla Supercharger (Destination) (A Type 2 with cable branded as Tesla)
offer?", "nl": "Welke stroom levert de stekker van type
Tesla Supercharger (Destination) (Een Type 2 met kabel en Tesla-logo)
?", - "ca": "Quin corrent donen els endolls amb
Tesla Supercharger (destinació) (un tipus 2 amb cable amb la marca Tesla)
oferta?", + "ca": "Quina intensitat ofereixen els connectors
Supercarregador Tesla (Destí) (un tipus 2 amb cable amb la marca Tesla)
?", "da": "Hvilken strømstyrke har stikkene med
Tesla Supercharger (Destination) (A Type 2 med kabel med Tesla-mærket)
?", "de": "Welche Stromstärke liefern die Stecker mit
Tesla Supercharger (Destination) (Typ 2 mit Kabel von Tesla)
?" }, "render": { "en": "
Tesla Supercharger (Destination) (A Type 2 with cable branded as Tesla)
outputs at most {socket:tesla_destination:current}A", "nl": "
Tesla Supercharger (Destination) (Een Type 2 met kabel en Tesla-logo)
levert een stroom van maximaal {socket:tesla_destination:current}A", + "ca": "
Supercarregador Tesla (Destí) (un tipus 2 amb cable amb la marca Tesla)
surt com a màxim a {socket:tesla_destination:current}A", "de": "
Tesla Supercharger (Destination) (Typ 2 mit Kabel von Tesla)
liefert maximal {socket:tesla_destination:current} A" }, "freeform": { @@ -3548,7 +3585,7 @@ "then": { "en": "Tesla Supercharger (Destination) (A Type 2 with cable branded as tesla) outputs at most 16 A", "nl": "Tesla supercharger (Destination (Een Type 2 met kabel en Tesla-logo) levert een stroom van maximaal 16 A", - "ca": "Supercarregador Tesla (destinació) (Un Tipus 2 amb un cable de marca Tesla) surt com a màxim a 16 A", + "ca": "Supercarregador Tesla (Destí) (Un Tipus 2 amb un cable de marca Tesla) surt com a màxim a 16 A", "da": "Tesla Supercharger (Destination) (A Type 2 med kabel mærket som tesla) yder højst 16 A", "de": "Tesla Supercharger (Destination) (Typ 2 mit Kabel) liefert maximal 16 A" }, @@ -3562,7 +3599,7 @@ "then": { "en": "Tesla Supercharger (Destination) (A Type 2 with cable branded as Tesla) outputs at most 32 A", "nl": "Tesla Supercharger (Destination (Een Type 2 met kabel en Tesla-logo) levert een stroom van maximaal 32 A", - "ca": "Supercarregador Tesla (destinació) (Un Tipus 2 amb un cable de marca Tesla) surt com a màxim a 32 A", + "ca": "Supercarregador Tesla (Destí) (Un Tipus 2 amb un cable de marca Tesla) surt com a màxim a 32 A", "da": "Tesla Supercharger (Destination) (A Type 2 med kabel af Tesla-mærket) yder højst 32 A", "de": "Tesla Supercharger (Destination) (Typ 2 mit Kabel von Tesla) liefert maximal 32 A" }, @@ -3679,7 +3716,7 @@ "question": { "en": "What current do the plugs with
USB to charge phones and small electronics
offer?", "nl": "Welke stroom levert de stekker van type
USB om GSMs en kleine electronica op te laden
?", - "ca": "Quina corrent ofereixen els connectors amb
USBper a carrega telèfons i dispositius electrònics petits
?", + "ca": "Quina intensitat ofereixen els connectors amb
USBper a carrega telèfons i dispositius electrònics petits
?", "da": "Hvilken strømstyrke har stikkene med
USB til opladning af telefoner og småt elektronikudstyr
?", "de": "Welche Stromstärke liefern die Stecker mit
USB zum Laden von Handys und kleinen Elektrogeräten
?", "es": "¿Qué corriente ofrecen los conectores con
USB para cargar teléfonos y dispositivos electrónicos pequeños
?" @@ -3687,7 +3724,7 @@ "render": { "en": "
USB to charge phones and small electronics
outputs at most {socket:USB-A:current}A", "nl": "
USB om GSMs en kleine electronica op te laden
levert een stroom van maximaal {socket:USB-A:current}A", - "ca": "
USBper a carregar telèfons i petits dispositius electrònics
com a màxim a {socket:USB-A:current}A", + "ca": "
USBper a carregar telèfons i petits dispositius electrònics
com a màxim a {socket:USB-A:current}A", "da": "
USB til opladning af telefoner og småt elektronikudstyr
udsender højst {socket:USB-A:current}A", "de": "
USB zum Aufladen von Telefonen und kleinen Elektrogeräten
liefert maximal {socket:USB-A:current} A", "es": "
USB para carga teléfonos y dispositivos electrónicos pequeños
salida de hasta {socket:USB-A:current}A" @@ -3822,12 +3859,14 @@ "question": { "en": "What current do the plugs with
Bosch Active Connect with 3 pins and cable
offer?", "nl": "Welke stroom levert de stekker van type
Bosch Active Connect met 3 pinnen aan een kabel
?", + "ca": "Quina intensitat ofereixen els connectors
Bosch Active Connect amb 3 pins i cable
?", "da": "Hvilken strøm har stikkene med
Bosch Active Connect med 3 ben og kabel
?", "de": "Welche Stromstärke liefern die Stecker mit
Bosch Active Connect mit 3 Pins und Kabel
?" }, "render": { "en": "
Bosch Active Connect with 3 pins and cable
outputs at most {socket:bosch_3pin:current}A", "nl": "
Bosch Active Connect met 3 pinnen aan een kabel
levert een stroom van maximaal {socket:bosch_3pin:current}A", + "ca": "
Bosch Active Connect amb 3 pins i cable
surt com a màxim a {socket:bosch_3pin:current}A", "da": "
Bosch Active Connect med 3 ben og kabel
udgange højst {socket:bosch_3pin:current}A", "de": "
Bosch Active Connect mit 3 Pins und Kabel
liefern maximal {socket:bosch_3pin:current} A" }, @@ -3905,12 +3944,14 @@ "question": { "en": "What current do the plugs with
Bosch Active Connect with 5 pins and cable
offer?", "nl": "Welke stroom levert de stekker van type
Bosch Active Connect met 5 pinnen aan een kabel
?", + "ca": "Quina corrent ofereixen els connectors
Bosch Active Connect amb 5 pins i cable
?", "da": "Hvilken strømstyrke har stikkene med
Bosch Active Connect med 5 ben og kabel
med Bosch Active Connect med 5 ben og kabel ?", "de": "Welche Stromstärke liefern die Stecker mit
Bosch Active Connect mit 5 Pins und Kabel
?" }, "render": { "en": "
Bosch Active Connect with 5 pins and cable
outputs at most {socket:bosch_5pin:current}A", "nl": "
Bosch Active Connect met 5 pinnen aan een kabel
levert een stroom van maximaal {socket:bosch_5pin:current}A", + "ca": "
Bosch Active Connect amb 5 pins i cable
surt com a màxim a {socket:bosch_5pin:current}A", "da": "
Bosch Active Connect med 5 ben og kabel
udgange højst {socket:bosch_5pin:current}A", "de": "
Bosch Active Connect mit 5 Pins und Kabel
liefern maximal {socket:bosch_5pin:current} A" }, @@ -4915,7 +4956,7 @@ "question": { "en": "Has a
Tesla Supercharger CCS (a branded type2_css)
connector", "nl": "Heeft een
Tesla Supercharger CCS (een type2 CCS met Tesla-logo)
", - "ca": "Té un connector
CCS Tesla Supercharger (un tipus2_css de marca)
", + "ca": "Té un connector
CCS Tesla Supercharger (un cable de la marca Tesla Tipus2_css)
", "da": "Har et
Tesla Supercharger CCS-stik (et mærkevarer type2_css)
stik", "de": "Hat einen
Tesla Supercharger CCS (Typ 2 CSS vonTesla)
Anschluss", "es": "Tiene un conector
Tesla Supercharger CCS (un tipo2_css de marca)
" diff --git a/assets/layers/climbing/climbing.json b/assets/layers/climbing/climbing.json index 5e8ef15e3..b1c66d5ed 100644 --- a/assets/layers/climbing/climbing.json +++ b/assets/layers/climbing/climbing.json @@ -180,7 +180,7 @@ "ja": "{climbing:boulder} ボルダールートがある", "fr": "Il y a {climbing:boulder} problèmes de bloc", "it": "Sono presenti {climbing:boulder} vie di arrampicata su massi", - "ca": "Hi han {climbing:boulder} rutes d'escalada en bloc" + "ca": "Hi han {climbing:boulder} problemes d'escalada en bloc" }, "hideInAnswer": true } diff --git a/assets/layers/climbing_area/climbing_area.json b/assets/layers/climbing_area/climbing_area.json index 857f3eb97..b36d52eb4 100644 --- a/assets/layers/climbing_area/climbing_area.json +++ b/assets/layers/climbing_area/climbing_area.json @@ -147,7 +147,8 @@ "fr": "

Contient {_contained_climbing_routes_count} voies

", "it": "

Contiene {_contained_climbing_routes_count} vie

", "de": "

Enthält {_contained_climbing_routes_count} Routen

", - "nl": "

Bevat {_contained_climbing_routes_count} routes

" + "nl": "

Bevat {_contained_climbing_routes_count} routes

", + "ca": "

Conté {_contained_climbing_routes_count} rutes

" }, "condition": "_contained_climbing_routes~*", "id": "Contained_climbing_routes" @@ -206,7 +207,8 @@ "fr": "Rocher d’escalade, rocher avec une ou peu de voie permettant d’escalader sans corde", "de": "Ein Kletterfelsen - ein einzelner Felsen oder eine Klippe mit einer oder wenigen Kletterrouten, die ohne Seil sicher bestiegen werden können", "it": "Un masso per arrampicata (una singola roccia o falesia con una o poche vie di arrampicata che possono essere scalate in sicurezza senza una corda)", - "nl": "Een klimboulder - een enkele rots of klif met één of enkele klimroutes die veilig zonder touw kunnen worden beklommen" + "nl": "Een klimboulder - een enkele rots of klif met één of enkele klimroutes die veilig zonder touw kunnen worden beklommen", + "ca": "Una roca d'escalada: una única roca o penya-segat amb una o unes quantes vies d'escalada que es poden escalar amb seguretat sense corda" } }, { @@ -256,7 +258,8 @@ "de": "Kalkstein", "it": "Calcare", "pa_PK": "چونہ پتھر", - "eu": "Kareharria" + "eu": "Kareharria", + "ca": "Calcària" } } ], diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index c54cee0e3..3fa8cb805 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -166,21 +166,24 @@ "id": "tactile_writing_available", "question": { "en": "Has this elevator tactile writing?", - "ca": "Aquest ascensor té escriptura tàctil?" + "ca": "Aquest ascensor té escriptura tàctil?", + "de": "Hat dieser Aufzug taktile Schrift?" }, "mappings": [ { "if": "tactile_writing:braille=yes", "then": { "en": "This elevator has tactile writing in Braille", - "ca": "L'ascensor té escriptura tàctil en Braille" + "ca": "L'ascensor té escriptura tàctil en Braille", + "de": "Dieser Aufzug hat eine taktile Schrift in Brailleschrift" } }, { "if": "tactile_writing:braille=no", "then": { "en": "This elevator does not have tactile writing", - "ca": "Aquest ascensor no té escriptura tàctil" + "ca": "Aquest ascensor no té escriptura tàctil", + "de": "Dieser Aufzug hat keine taktile Schrift" } } ] diff --git a/assets/layers/elongated_coin/elongated_coin.json b/assets/layers/elongated_coin/elongated_coin.json index ef8d661ae..b0b16f2b9 100644 --- a/assets/layers/elongated_coin/elongated_coin.json +++ b/assets/layers/elongated_coin/elongated_coin.json @@ -217,7 +217,7 @@ "en": "This penny press uses a 25 cent coin for pressing.", "de": "Der Automat prägt 25 Cent Münzen.", "es": "Esta prensa de centavo utiliza una moneda de 25 centavos para prensar.", - "ca": "Esta premsa de cèntims utilitza una moneda de 20 cèntims per a premsar." + "ca": "Esta premsa de cèntims utilitza una moneda de 25 cèntims per a premsar." }, "hideInAnswer": "_currency!~.*USD.*" }, diff --git a/assets/layers/filters/filters.json b/assets/layers/filters/filters.json index e89137e23..789151ea3 100644 --- a/assets/layers/filters/filters.json +++ b/assets/layers/filters/filters.json @@ -252,12 +252,14 @@ "options": [ { "question": { - "en": "No preference towards dogs" + "en": "No preference towards dogs", + "de": "Keine Bevorzugung von Hunden" } }, { "question": { - "en": "Dogs allowed" + "en": "Dogs allowed", + "de": "Hunde erlaubt" }, "osmTags": { "or": [ @@ -268,11 +270,40 @@ }, { "question": { - "en": "No dogs allowed" + "en": "No dogs allowed", + "de": "Keine Hunde erlaubt" }, "osmTags": "dog=no" } ] + }, + { + "id": "has_internet", + "options": [ + { + "question": { + "en": "Offers internet" + }, + "osmTags": { + "or": [ + "internet_access=wlan", + "internet_access=yes", + "internet_access=wired" + ] + } + } + ] + }, + { + "id": "has_electricity", + "options": [ + { + "question": { + "en": "Offers electricity" + }, + "osmTags": "service:electricity=yes" + } + ] } ] } diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index 6f73c30cf..283dead87 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -77,7 +77,7 @@ "cuisine=friture" ], "description": { - "en": "A fastfood-business focused on french fries", + "en": "A fast-food business focused on french fries", "nl": "Een fastfood-zaak waar je frieten koopt", "de": "Eine Pommesbude", "fr": "Une restauration rapide centré sur la vente de frites", @@ -184,7 +184,7 @@ { "if": "amenity=fast_food", "then": { - "en": "This is a fastfood-business, focused on fast service. If seating is available, these are rather limited and functional.", + "en": "This is a fast-food business, focused on fast service. If seating is available, it is rather limited and functional.", "nl": "Dit is een fastfood-zaak. De focus ligt op snelle bediening, zitplaatsen zijn vaak beperkt en functioneel.", "de": "Es handelt sich um einen Schnellimbiss, mit Fokus auf schnelle Bedienung am Tresen. Sitzmöglichkeiten sind begrenzt und funktional.", "es": "Este es un negocio de comida rápida, centrado en servicio rápido. Si hay asientos disponibles, son más bien limitados y funcionales.", @@ -217,7 +217,7 @@ { "question": { "nl": "Welk soort gerechten worden hier geserveerd?", - "en": "Which food is served here?", + "en": "What kind of food is served here?", "de": "Was für Essen gibt es hier?", "es": "¿Qué comida se sirve aquí?", "fr": "Quelle type de nourriture est servie ici ?", @@ -287,7 +287,7 @@ { "if": "cuisine=sandwich", "then": { - "en": "This is a sandwichbar", + "en": "This is a sandwich shop", "nl": "Dit is een broodjeszaak", "de": "Dies ist ein Sandwichladen", "fr": "C'est une sandwicherie", @@ -331,7 +331,7 @@ { "if": "cuisine=italian", "then": { - "en": "This is an italian restaurant (which serves more then pasta and pizza)", + "en": "This is an Italian restaurant (which serves more than pasta and pizza)", "nl": "Dit is een Italiaans restaurant (dat meer dan enkel pasta of pizza verkoopt)", "de": "Dies ist ein italienisches Restaurant (das mehr als nur Pasta und Pizza serviert)", "es": "Este es un restaurante italiano (que sirve más que pasta y pizza)", @@ -512,7 +512,7 @@ { "id": "delivery", "question": { - "en": "Delivers {title()} their food at home?", + "en": "Does {title()} deliver food to your home?", "de": "Liefert {title()} Essen nach Hause?", "nl": "Levert {title()} aan huis?", "fr": "Est-ce que {title()} livre sa nourriture à domicile ?", @@ -1013,7 +1013,8 @@ { "question": { "en": "Restaurants and fast food businesses", - "ca": "Restaurants i negocis de menjar ràpid" + "ca": "Restaurants i negocis de menjar ràpid", + "de": "Restaurants und Schnellimbissbetriebe" } }, { @@ -1045,7 +1046,8 @@ "question": { "en": "Has a vegetarian menu", "nl": "Heeft een vegetarisch menu", - "ca": "Té menú vegetarià" + "ca": "Té menú vegetarià", + "de": "Hat ein vegetarisches Menü" }, "osmTags": { "or": [ diff --git a/assets/layers/ghost_bike/ghost_bike.json b/assets/layers/ghost_bike/ghost_bike.json index aaee97ba5..76b285976 100644 --- a/assets/layers/ghost_bike/ghost_bike.json +++ b/assets/layers/ghost_bike/ghost_bike.json @@ -250,7 +250,8 @@ "it": "Piazzata in data {start_date}", "fr": "Placé le {start_date}", "ru": "Установлен {start_date}", - "de": "Aufgestellt am {start_date}" + "de": "Aufgestellt am {start_date}", + "ca": "Col·locat el {start_date}" }, "freeform": { "key": "start_date", diff --git a/assets/layers/guidepost/guidepost.json b/assets/layers/guidepost/guidepost.json index 28e2d80b6..0c656080b 100644 --- a/assets/layers/guidepost/guidepost.json +++ b/assets/layers/guidepost/guidepost.json @@ -1,6 +1,6 @@ { "id": "guidepost", - "name": { + "title": { "en": "Guideposts" }, "description": { @@ -32,7 +32,6 @@ "enableImproveAccuracy": "true", "enableRelocation": "false" }, - "title": {}, "pointRendering": [ { "location": [ diff --git a/assets/layers/guidepost/signpost_example.jpg b/assets/layers/guidepost/guidepost_example.jpg similarity index 100% rename from assets/layers/guidepost/signpost_example.jpg rename to assets/layers/guidepost/guidepost_example.jpg diff --git a/assets/layers/guidepost/signpost_example.jpg.license b/assets/layers/guidepost/guidepost_example.jpg.license similarity index 52% rename from assets/layers/guidepost/signpost_example.jpg.license rename to assets/layers/guidepost/guidepost_example.jpg.license index c4fea401e..cd1b48769 100644 --- a/assets/layers/guidepost/signpost_example.jpg.license +++ b/assets/layers/guidepost/guidepost_example.jpg.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Mschaeuble -SPDX-License-Identifier: CC0 \ No newline at end of file +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/guidepost/license_info.json b/assets/layers/guidepost/license_info.json index 851b7188a..da92f4adf 100644 --- a/assets/layers/guidepost/license_info.json +++ b/assets/layers/guidepost/license_info.json @@ -10,7 +10,7 @@ ] }, { - "path": "signpost_example.jpg", + "path": "guidepost_example.jpg", "license": "CC0-1.0", "authors": [ "Mschaeuble" @@ -19,4 +19,4 @@ "https://wiki.openstreetmap.org/wiki/File:Signpost.jpg" ] } -] \ No newline at end of file +] diff --git a/assets/layers/indoors/indoors.json b/assets/layers/indoors/indoors.json index 285b896b1..ba7aaa0f0 100644 --- a/assets/layers/indoors/indoors.json +++ b/assets/layers/indoors/indoors.json @@ -185,48 +185,61 @@ { "id": "room-type", "question": { - "en": "What type of room is this?" + "en": "What type of room is this?", + "ca": "Quin tipus d'habitació és aquesta?", + "de": "Wie wird dieser Raum genutzt?" }, "mappings": [ { "if": "room=administration", "then": { - "en": "This is a administrative room" + "en": "This is a administrative room", + "de": "Dies ist ein Verwaltungsraum" }, "icon": "./assets/layers/indoors/room_administration.svg" }, { "if": "room=auditorium", "then": { - "en": "This is a auditorium" + "en": "This is a auditorium", + "de": "Dies ist ein Auditorium", + "ca": "Açò és un auditori" }, "icon": "./assets/layers/indoors/room_auditorium.svg" }, { "if": "room=bedroom", "then": { - "en": "This is a bedroom" + "en": "This is a bedroom", + "de": "Dies ist ein Schlafzimmer", + "ca": "Açò és un dormitori" }, "icon": "./assets/layers/indoors/room_bedroom.svg" }, { "if": "room=chapel", "then": { - "en": "This is a chapel" + "en": "This is a chapel", + "de": "Dies ist eine Kapelle", + "ca": "Açò és una capella" }, "icon": "./assets/layers/indoors/room_chapel.svg" }, { "if": "room=class", "then": { - "en": "This is a classroom" + "en": "This is a classroom", + "de": "Dies ist ein Klassenzimmer", + "ca": "Açò és una aula" }, "icon": "./assets/layers/indoors/room_class.svg" }, { "if": "room=classroom", "then": { - "en": "This is a classroom" + "en": "This is a classroom", + "de": "Dies ist ein Klassenzimmer", + "ca": "Açò és una aula" }, "icon": "./assets/layers/indoors/room_class.svg", "hideInAnswer": true @@ -234,112 +247,135 @@ { "if": "room=computer", "then": { - "en": "This is a computer room" + "en": "This is a computer room", + "de": "Dies ist ein Computerraum" }, "icon": "./assets/layers/indoors/room_computer.svg" }, { "if": "room=conference", "then": { - "en": "This is a conference room" + "en": "This is a conference room", + "de": "Dies ist ein Konferenzraum", + "ca": "Açò és una sala de conferències" }, "icon": "./assets/layers/indoors/room_conference.svg" }, { "if": "room=crypt", "then": { - "en": "This is a crypt" + "en": "This is a crypt", + "de": "Dies ist eine Krypta", + "ca": "Açò és una cripta" }, "icon": "./assets/layers/indoors/room_crypt.svg" }, { "if": "room=kitchen", "then": { - "en": "This is a kitchen" + "en": "This is a kitchen", + "de": "Dies ist eine Küche", + "ca": "Açò és una cuina" }, "icon": "./assets/layers/indoors/room_kitchen.svg" }, { "if": "room=laboratory", "then": { - "en": "This is a laboratory" + "en": "This is a laboratory", + "de": "Dies ist ein Labor", + "ca": "Açò és un laboratori" }, "icon": "./assets/layers/indoors/room_laboratory.svg" }, { "if": "room=library", "then": { - "en": "This is a library" + "en": "This is a library", + "de": "Dies ist eine Bibliothek" }, "icon": "./assets/layers/indoors/room_library.svg" }, { "if": "room=locker", "then": { - "en": "This is a locker room" + "en": "This is a locker room", + "de": "Dies ist ein Umkleideraum" }, "icon": "./assets/layers/indoors/room_locker.svg" }, { "if": "room=nursery", "then": { - "en": "This is a nursery" + "en": "This is a nursery", + "de": "Dies ist ein Kinderzimmer" }, "icon": "./assets/layers/indoors/room_nursery.svg" }, { "if": "room=office", "then": { - "en": "This is an office" + "en": "This is an office", + "de": "Dies ist ein Büro", + "ca": "Açò és una oficina" }, "icon": "./assets/layers/indoors/room_office.svg" }, { "if": "room=prison_cell", "then": { - "en": "This is a prison_cell" + "en": "This is a prison_cell", + "de": "Dies ist eine Gefängniszelle" }, "icon": "./assets/layers/indoors/room_prison_cell.svg" }, { "if": "room=restaurant", "then": { - "en": "This is a restaurant" + "en": "This is a restaurant", + "de": "Dies ist ein Restaurant", + "ca": "Açò és un restaurant" }, "icon": "./assets/layers/indoors/room_restaurant.svg" }, { "if": "room=security_check", "then": { - "en": "This is a room to perform security checks" + "en": "This is a room to perform security checks", + "de": "Dies ist ein Raum für Sicherheitskontrollen" }, "icon": "./assets/layers/indoors/room_security_check.svg" }, { "if": "room=sport", "then": { - "en": "This is a sport room" + "en": "This is a sport room", + "de": "Dies ist ein Raum um Sport zu treiben" }, "icon": "./assets/layers/indoors/room_sport.svg" }, { "if": "room=storage", "then": { - "en": "This is a storage room" + "en": "This is a storage room", + "ca": "Açò és un magatzem", + "de": "Dies ist ein Lagerraum" }, "icon": "./assets/layers/indoors/room_storage.svg" }, { "if": "room=technical", "then": { - "en": "This is a technical room" + "en": "This is a technical room", + "de": "Dies ist ein Technikraum" }, "icon": "./assets/layers/indoors/room_technical.svg" }, { "if": "room=toilets", "then": { - "en": "These are toilets" + "en": "These are toilets", + "de": "Dies ist ein WC-Raum" }, "icon": "./assets/layers/indoors/room_toilets.svg", "addExtraTags": [ @@ -349,7 +385,9 @@ { "if": "room=waiting", "then": { - "en": "This is a waiting room" + "en": "This is a waiting room", + "ca": "Açò és una sala d'espera", + "de": "Dies ist ein Wartezimmer" }, "icon": "./assets/layers/indoors/room_waiting.svg" } @@ -358,7 +396,8 @@ { "id": "room-capacity", "question": { - "en": "How much people can at most fit in this room?" + "en": "How much people can at most fit in this room?", + "de": "Wie viele Personen passen höchstens in diesen Raum?" }, "condition": { "or": [ @@ -374,7 +413,8 @@ ] }, "render": { - "en": "At most {capacity} people fit this room" + "en": "At most {capacity} people fit this room", + "de": "Kapazität für höchstens {capacity} Personen" }, "freeform": { "key": "capacity", diff --git a/assets/layers/maproulette/maproulette.json b/assets/layers/maproulette/maproulette.json index 6d4ae2e6b..2dca74533 100644 --- a/assets/layers/maproulette/maproulette.json +++ b/assets/layers/maproulette/maproulette.json @@ -52,7 +52,8 @@ "en": "Task is skipped", "de": "Aufgabe wurde übersprungen", "nl": "Taak werd overgeslagen", - "pl": "Zadanie jest pominięte" + "pl": "Zadanie jest pominięte", + "ca": "La tasca s'ha botat" } }, { @@ -61,7 +62,8 @@ "en": "Task is deleted", "de": "Aufgabe wurde gelöscht", "nl": "Taak werd verwijderd", - "pl": "Zadania jest usunięte" + "pl": "Zadania jest usunięte", + "ca": "La tasca s'ha eliminat" } }, { @@ -70,7 +72,8 @@ "en": "Task is already fixed", "de": "Aufgabe wurde bereits erledigt", "nl": "Taak was al opgelost", - "pl": "Zadania jest już wykonane" + "pl": "Zadania jest już wykonane", + "ca": "La tasca ja està arreglada" } }, { @@ -79,7 +82,8 @@ "en": "Task is marked as too hard", "de": "Aufgabe wurde als zu schwer markiert", "nl": "Taak werd als te moeilijk ervaren", - "pl": "Zadanie jest oznaczone jako zbyt trudne" + "pl": "Zadanie jest oznaczone jako zbyt trudne", + "ca": "La tasca s'ha marcat com a molt difícil" } }, { @@ -88,7 +92,8 @@ "en": "Task is disabled", "de": "Aufgabe wurde deaktiviert", "nl": "Taak is uitgeschakeld", - "pl": "Zadanie jest wyłączone" + "pl": "Zadanie jest wyłączone", + "ca": "La tasca està deshabilitada" } } ] diff --git a/assets/layers/maproulette_challenge/maproulette_challenge.json b/assets/layers/maproulette_challenge/maproulette_challenge.json index 93482c1d5..ff731d60e 100644 --- a/assets/layers/maproulette_challenge/maproulette_challenge.json +++ b/assets/layers/maproulette_challenge/maproulette_challenge.json @@ -39,7 +39,8 @@ "then": { "en": "Task is created", "de": "Aufgabe wurde erstellt", - "nl": "Taak is aangemaakt" + "nl": "Taak is aangemaakt", + "ca": "La tasca s'ha creat" } }, { diff --git a/assets/layers/note/note.json b/assets/layers/note/note.json index ee848f297..85657dcc1 100644 --- a/assets/layers/note/note.json +++ b/assets/layers/note/note.json @@ -140,7 +140,8 @@ "en": "Should not mention {search} in the first comment", "nl": "Mag in de eerste opmerking niet \"{search}\" bevatten", "de": "Sollte nicht {search} im ersten Kommentar erwähnen", - "es": "No debe mencionar {search} en el primer comentario" + "es": "No debe mencionar {search} en el primer comentario", + "ca": "No s'ha de mencionar {search} al primer comentari" } } ] diff --git a/assets/layers/parking_spaces/parking_spaces.json b/assets/layers/parking_spaces/parking_spaces.json index e6625ae0e..d3bce0cce 100644 --- a/assets/layers/parking_spaces/parking_spaces.json +++ b/assets/layers/parking_spaces/parking_spaces.json @@ -25,7 +25,8 @@ "question": { "en": "What kind of parking space is this?", "de": "Welche Art von Stellplatz ist dies?", - "nl": "Wat voor parkeerplek is dit?" + "nl": "Wat voor parkeerplek is dit?", + "ca": "Quin tipus d'espai d'aparcament és aquest?" }, "mappings": [ { @@ -151,7 +152,8 @@ "en": "This is a parking space reserved for taxis.", "de": "Dies ist ein Stellplatz, der für Taxis reserviert ist.", "nl": "Deze parkeerplek is gereserveerd voor taxis.", - "pl": "To miejsce parkingowe jest przeznaczone dla taksówek." + "pl": "To miejsce parkingowe jest przeznaczone dla taksówek.", + "ca": "Aquest espai d'aparcament està reservat per a taxi." } }, { @@ -197,7 +199,8 @@ "render": { "en": "Parking Space", "de": "Stellplatz", - "nl": "Parkeerplek" + "nl": "Parkeerplek", + "ca": "Espai d'aparcament" }, "mappings": [ { diff --git a/assets/layers/parking_ticket_machine/parking_ticket_machine.json b/assets/layers/parking_ticket_machine/parking_ticket_machine.json index 9ffd43854..bbf35af8c 100644 --- a/assets/layers/parking_ticket_machine/parking_ticket_machine.json +++ b/assets/layers/parking_ticket_machine/parking_ticket_machine.json @@ -9,7 +9,8 @@ "en": "Layer with parking ticket machines to pay for parking.", "nl": "Laag met parkeerkaartautomaten om voor parkeren te betalen.", "de": "Ebene mit Parkscheinautomaten zum Bezahlen des Parkens.", - "fr": "Couche avec les distributeurs de tickets pour payer le parking." + "fr": "Couche avec les distributeurs de tickets pour payer le parking.", + "ca": "Capa amb màquines de bitllets d'aparcament per pagar l'aparcament." }, "title": { "render": { diff --git a/assets/layers/pharmacy/pharmacy.json b/assets/layers/pharmacy/pharmacy.json index 5c22077f4..7d2cde86d 100644 --- a/assets/layers/pharmacy/pharmacy.json +++ b/assets/layers/pharmacy/pharmacy.json @@ -47,6 +47,7 @@ "minzoom": 13, "tagRenderings": [ "images", + "reviews", { "id": "name", "freeform": { diff --git a/assets/layers/playground/playground.json b/assets/layers/playground/playground.json index 7c088e7d3..613245b96 100644 --- a/assets/layers/playground/playground.json +++ b/assets/layers/playground/playground.json @@ -249,7 +249,8 @@ "ru": "Доступно для детей старше {min_age} лет", "fr": "Accessible aux enfants de plus de {min_age} ans", "de": "Zugang nur für Kinder ab {min_age} Jahren", - "es": "Accesible a niños menores de {min_age} años" + "es": "Accesible a niños menores de {min_age} años", + "ca": "Accessible a nens menors de {min_age} anys" }, "question": { "nl": "Wat is de minimale leeftijd om op deze speeltuin te mogen?", diff --git a/assets/layers/postoffices/postoffices.json b/assets/layers/postoffices/postoffices.json index 19cfe957f..86ddddd84 100644 --- a/assets/layers/postoffices/postoffices.json +++ b/assets/layers/postoffices/postoffices.json @@ -94,7 +94,8 @@ "de": "Wie sind die Öffnungszeiten dieser Poststelle?", "es": "¿Cuáles son las horas de apertura para esta oficina postal?", "nl": "Wat zijn de openingsuren voor dit postkantoor?", - "fr": "Quelles sont les heures d’ouverture de ce bureau de poste ?" + "fr": "Quelles sont les heures d’ouverture de ce bureau de poste ?", + "ca": "Quines son els horaris d'apertura per a aquesta oficina postal?" } } }, diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json index 7da3fe0bd..065f05e0b 100644 --- a/assets/layers/questions/questions.json +++ b/assets/layers/questions/questions.json @@ -1291,7 +1291,8 @@ "then": { "en": "5 centimes coins are accepted", "nl": "Munten van 5 rappen worden geaccepteerd", - "ca": "S'accepten monedes de 5 cèntims" + "ca": "S'accepten monedes de 5 cèntims", + "de": "5-Centime-Münzen werden akzeptiert" }, "hideInAnswer": "_currency!~.*CHF.*" }, @@ -1301,7 +1302,8 @@ "then": { "en": "10 centimes coins are accepted", "nl": "Munten van 10 rappen worden geaccepteerd", - "ca": "S'accepten monedes de 10 cèntims" + "ca": "S'accepten monedes de 10 cèntims", + "de": "10-Centime-Münzen werden akzeptiert" }, "hideInAnswer": "_currency!~.*CHF.*" }, @@ -1311,7 +1313,8 @@ "then": { "en": "20 centimes coins are accepted", "nl": "Munten van 20 rappen worden geaccepteerd", - "ca": "S'accepten monedes de 20 cèntims" + "ca": "S'accepten monedes de 20 cèntims", + "de": "20-Centime-Münzen werden akzeptiert" }, "hideInAnswer": "_currency!~.*CHF.*" }, @@ -1320,7 +1323,9 @@ "icon": "./assets/layers/questions/denominations/chf/50rp-2019-800px.png", "then": { "en": "½ franc coins are accepted", - "nl": "Munten van ½ frank worden geaccepteerd" + "nl": "Munten van ½ frank worden geaccepteerd", + "ca": "S'accepten monedes de ½ franc", + "de": "½-Schweizer Franken-Münzen werden akzeptiert" }, "hideInAnswer": "_currency!~.*CHF.*" }, @@ -1330,7 +1335,8 @@ "then": { "en": "1 franc coins are accepted", "nl": "Munten van 1 frank worden geaccepteerd", - "ca": "S'accepten monedes d'1 franc" + "ca": "S'accepten monedes d'1 franc", + "de": "1-Schweizer Franken-Münzen werden akzeptiert" }, "hideInAnswer": "_currency!~.*CHF.*" }, @@ -1340,7 +1346,8 @@ "then": { "en": "2 francs coins are accepted", "nl": "Munten van 2 frank worden geaccepteerd", - "ca": "S'accepten monedes de 2 francs" + "ca": "S'accepten monedes de 2 francs", + "de": "2-Schweizer Franken-Münzen werden akzeptiert" }, "hideInAnswer": "_currency!~.*CHF.*" }, @@ -1350,7 +1357,8 @@ "then": { "en": "5 francs coins are accepted", "nl": "Munten van 5 frank worden geaccepteerd", - "ca": "S'accepten monedes de 5 francs" + "ca": "S'accepten monedes de 5 francs", + "de": "5-Schweizer Franken-Münzen werden akzeptiert" }, "hideInAnswer": "_currency!~.*CHF.*" } @@ -1497,7 +1505,8 @@ "then": { "en": "10 francs notes are accepted", "nl": "Biljetten van 10 frank worden geaccepteerd", - "ca": "S'accepten bitllets de 10 francs" + "ca": "S'accepten bitllets de 10 francs", + "de": "10-Schweizer Franken-Scheine werden akzeptiert" }, "hideInAnswer": "_currency!~.*CHF.*" }, @@ -1507,7 +1516,8 @@ "then": { "en": "20 francs notes are accepted", "nl": "Biljetten van 20 frank worden geaccepteerd", - "ca": "S'accepten bitllets de 20 francs" + "ca": "S'accepten bitllets de 20 francs", + "de": "20-Schweizer Franken-Scheine werden akzeptiert" }, "hideInAnswer": "_currency!~.*CHF.*" }, @@ -1517,7 +1527,8 @@ "then": { "en": "50 francs notes are accepted", "nl": "Biljetten van 50 frank worden geaccepteerd", - "ca": "S'accepten bitllets de 50 francs" + "ca": "S'accepten bitllets de 50 francs", + "de": "50-Schweizer Franken-Scheine werden akzeptiert" }, "hideInAnswer": "_currency!~.*CHF.*" }, @@ -1527,7 +1538,8 @@ "then": { "en": "100 francs notes are accepted", "nl": "Biljetten van 100 frank worden geaccepteerd", - "ca": "S'accepten bitllets de 100 francs" + "ca": "S'accepten bitllets de 100 francs", + "de": "100-Schweizer Franken-Scheine werden akzeptiert" }, "hideInAnswer": "_currency!~.*CHF.*" }, @@ -1537,7 +1549,8 @@ "then": { "en": "200 francs notes are accepted", "nl": "Biljetten van 200 frank worden geaccepteerd", - "ca": "S'accepten bitllets de 200 francs" + "ca": "S'accepten bitllets de 200 francs", + "de": "200-Schweizer Franken-Scheine werden akzeptiert" }, "hideInAnswer": "_currency!~.*CHF.*" }, @@ -1547,7 +1560,8 @@ "then": { "en": "1000 francs notes are accepted", "nl": "Biljetten van 1000 frank worden geaccepteerd", - "ca": "S'accepten bitllets de 1000 francs" + "ca": "S'accepten bitllets de 1000 francs", + "de": "1000-Schweizer Franken-Scheine werden akzeptiert" }, "hideInAnswer": "_currency!~.*CHF.*" } @@ -1680,7 +1694,8 @@ "condition": "repeat_on~*", "render": { "en": "Multiple, identical objects can be found on floors {repeat_on}.", - "nl": "Er zijn verschillende, identieke objecten op verdiepingen {repeat_on}." + "nl": "Er zijn verschillende, identieke objecten op verdiepingen {repeat_on}.", + "de": "Mehrere identische Objekte können in Geschossen {repeat_on} gefunden werden." } }, { diff --git a/assets/layers/slow_roads/slow_roads.json b/assets/layers/slow_roads/slow_roads.json index 45511fcda..60813b096 100644 --- a/assets/layers/slow_roads/slow_roads.json +++ b/assets/layers/slow_roads/slow_roads.json @@ -122,7 +122,8 @@ "it": "La superficie è {surface}", "de": "Die Oberfläche ist {surface}", "eo": "La surfaco estas {surface}", - "es": "La superficie es {surface}" + "es": "La superficie es {surface}", + "ca": "La superfícies és {surface}" }, "freeform": { "key": "surface" @@ -202,7 +203,8 @@ "it": "La superficie è asfalto", "fr": "La surface est en bitume", "de": "Die Oberfläche ist Asphalt", - "es": "La superficie es asfalto" + "es": "La superficie es asfalto", + "ca": "La superfícies és asfalt" } }, { @@ -215,7 +217,8 @@ "it": "La superficie è calcestruzzo", "de": "Die Oberfläche ist Beton", "eo": "La surfaco estas betona", - "es": "La superficie es hormigón" + "es": "La superficie es hormigón", + "ca": "La superfície es formigó" } }, { @@ -226,7 +229,8 @@ "fr": "La surface est pavée", "it": "La superficie è pavimentata", "de": "Die Oberfläche ist gepflastert", - "es": "La superficie está pavimentada" + "es": "La superficie está pavimentada", + "ca": "La superfície està pavimentada" }, "hideInAnswer": true } diff --git a/assets/layers/sport_pitch/sport_pitch.json b/assets/layers/sport_pitch/sport_pitch.json index 858078195..743e120ee 100644 --- a/assets/layers/sport_pitch/sport_pitch.json +++ b/assets/layers/sport_pitch/sport_pitch.json @@ -51,7 +51,8 @@ "en": "{sport} is played here", "it": "Qui si gioca a {sport}", "de": "Hier wird {sport} gespielt", - "es": "Aquí se juega al {sport}" + "es": "Aquí se juega al {sport}", + "ca": "{sport} es juga aquí" }, "freeform": { "key": "sport" @@ -62,7 +63,8 @@ "en": "Which sport can be played here?", "it": "Quale sport si gioca qui?", "de": "Welche Sportarten können hier gespielt werden?", - "es": "¿Qué deporte se practica aquí?" + "es": "¿Qué deporte se puede practicar aquí?", + "ca": "Quin esport es pot practicar aquí?" }, "multiAnswer": true, "mappings": [ @@ -172,7 +174,8 @@ "then": { "en": "This is a skatepark", "nl": "Dit is een skatepark", - "de": "Dies ist ein Skatepark" + "de": "Dies ist ein Skatepark", + "ca": "Açò és un skatepark" } } ], @@ -235,7 +238,8 @@ "ru": "Поверхность - {surface}", "it": "La superficie è {surface}", "de": "Der Belag ist {surface}", - "es": "La superficie es {surface}" + "es": "La superficie es {surface}", + "ca": "La superfícies és {surface}" }, "freeform": { "key": "surface" diff --git a/assets/layers/sports_centre/sports_centre.json b/assets/layers/sports_centre/sports_centre.json index db7cc8a9b..470ac8039 100644 --- a/assets/layers/sports_centre/sports_centre.json +++ b/assets/layers/sports_centre/sports_centre.json @@ -2,11 +2,13 @@ "id": "sports_centre", "name": { "en": "Sports centres", - "de": "Sportzentren" + "de": "Sportzentren", + "ca": "Centres esportius" }, "description": { "en": "Indoor and outdoor sports centres can be found on this layer", - "de": "Hallen- und Freiluftsportzentren sind auf dieser Ebene zu finden" + "de": "Hallen- und Freiluftsportzentren sind auf dieser Ebene zu finden", + "ca": "En aquesta capa es poden trobar centres esportius interiors i exteriors" }, "minzoom": 12, "source": { @@ -15,7 +17,8 @@ "title": { "render": { "en": "Sports centre", - "de": "Sportzentrum" + "de": "Sportzentrum", + "ca": "Centre esportiu" }, "mappings": [ { @@ -36,7 +39,8 @@ { "title": { "en": "a sports centre", - "de": "ein Sportzentrum" + "de": "ein Sportzentrum", + "ca": "un centre esportiu" }, "tags": [ "leisure=sports_centre" diff --git a/assets/layers/stairs/stairs.json b/assets/layers/stairs/stairs.json index fda912434..a7634269c 100644 --- a/assets/layers/stairs/stairs.json +++ b/assets/layers/stairs/stairs.json @@ -9,7 +9,8 @@ "description": { "en": "Layer showing stairs and escalators", "de": "Ebene mit Treppen und Rolltreppen", - "nl": "Laag met trappen en roltrappen" + "nl": "Laag met trappen en roltrappen", + "ca": "Capa que mostra escales i escales mecàniques" }, "title": { "render": { diff --git a/assets/layers/surveillance_camera/surveillance_camera.json b/assets/layers/surveillance_camera/surveillance_camera.json index 935abdf9f..45f21da2c 100644 --- a/assets/layers/surveillance_camera/surveillance_camera.json +++ b/assets/layers/surveillance_camera/surveillance_camera.json @@ -44,25 +44,29 @@ "id": "has_alpr", "question": { "en": "Can this camera automatically detect license plates?", - "ca": "Aquesta càmera pot detectar matrícules automàticament?" + "ca": "Aquesta càmera pot detectar matrícules automàticament?", + "de": "Dient diese Kamera der Nummernschilderkennung?" }, "questionHint": { "en": "An ALPR (Automatic License Plate Reader) typically has two lenses and an array of infrared LEDS in between.", - "ca": "Un ALPR (lector automàtic de matrícules, per les seves sigles en anglès) normalment té dues lents i una sèrie de LEDs infrarojos entremig." + "ca": "Un ALPR (lector automàtic de matrícules, per les seves sigles en anglès) normalment té dues lents i una sèrie de LEDs infrarojos entremig.", + "de": "Eine Kamera zur Nummernschilderkennung hat üblicherweise zwei Linsen mit dazwischenliegenden Infrarot-LEDs." }, "mappings": [ { "if": "surveillance:type=camera", "then": { "en": "This is a camera without number plate recognition.", - "ca": "Es tracta d'una càmera sense reconeixement de matrícules." + "ca": "Es tracta d'una càmera sense reconeixement de matrícules.", + "de": "Dies ist eine Kamera ohne Nummernschilderkennung." } }, { "if": "surveillance:type=ALPR", "then": { "en": "This is an ALPR (Automatic License Plate Reader)", - "ca": "Açò és un ALPR (lector automàtic de matrícules, per les seves sigles en anglès)" + "ca": "Açò és un ALPR (lector automàtic de matrícules, per les seves sigles en anglès)", + "de": "Dies ist eine Kamera mit Nummernschilderkennung" }, "icon": { "path": "./assets/layers/surveillance_camera/ALPR.svg" @@ -349,7 +353,8 @@ "fr": "À quel niveau se trouve cette caméra ?", "it": "A che piano si trova questa videocamera?", "de": "Auf welcher Ebene befindet sich diese Kamera?", - "es": "¿A qué nivel está colocada esta cámara?" + "es": "¿A qué nivel está colocada esta cámara?", + "ca": "A quina planta es troba aquesta càmera?" }, "render": { "en": "Located on level {level}", @@ -637,11 +642,13 @@ ], "title": { "en": "an ALPR camera (Automatic Number Plate Reader)", - "ca": "una càmera ALPR (lector automàtic de matrícules, per les seves sigles en anglès)" + "ca": "una càmera ALPR (lector automàtic de matrícules, per les seves sigles en anglès)", + "de": "Eine Kamera zur automatischen Nummernschilderkennung" }, "description": { "en": "An ALPR typically has two lenses and an array of infrared lights.", - "ca": "Un ALPR normalment té dues lents i una sèrie de llums infrarojes." + "ca": "Un ALPR normalment té dues lents i una sèrie de llums infrarojes.", + "de": "Eine automatische Nummernschilderkennung hat üblicherweise zwei Linsen und ein Reihe aus Infrarotlichtern." }, "exampleImages": [ "./assets/layers/surveillance_camera/ALPR_Example.jpg", @@ -656,11 +663,13 @@ ], "title": { "en": "an ALPR camera (Automatic Number Plate Reader) mounted on a wall", - "ca": "una càmera ALPR (lector automàtic de matrícules) muntada a la paret" + "ca": "una càmera ALPR (lector automàtic de matrícules) muntada a la paret", + "de": "eine Kamera zur Nummernschilderkennung, die an einer Wand befestigt ist" }, "description": { "en": "An ALPR typically has two lenses and an array of infrared lights.", - "ca": "Un ALPR normalment té dues lents i una sèrie de llums infrarojes." + "ca": "Un ALPR normalment té dues lents i una sèrie de llums infrarojes.", + "de": "Eine automatische Nummernschilderkennung hat üblicherweise zwei Linsen und ein Reihe aus Infrarotlichtern." }, "exampleImages": [ "./assets/layers/surveillance_camera/ALPR_Example.jpg", diff --git a/assets/layers/tertiary_education/tertiary_education.json b/assets/layers/tertiary_education/tertiary_education.json index d7b3f08f8..7291062c7 100644 --- a/assets/layers/tertiary_education/tertiary_education.json +++ b/assets/layers/tertiary_education/tertiary_education.json @@ -5,7 +5,8 @@ "nl": "Universiteiten en hogescholen", "de": "Hochschulen und Universitäten", "fr": "Collèges et universités", - "da": "Gymnasier og universiteter" + "da": "Gymnasier og universiteter", + "ca": "Instituts superiors i universitats" }, "description": "Layer with all tertiary education institutes (ISCED:2011 levels 6,7 and 8)", "source": { @@ -42,7 +43,8 @@ "nl": "Hogeschool", "de": "(Fach)hochschule", "fr": "Établissement d'enseignement supérieur non universitaire", - "pa_PK": "کالج" + "pa_PK": "کالج", + "ca": "Institut superior" } }, { @@ -64,7 +66,8 @@ "nl": "Onderwijsinstelling die tertiair onderwijs geeft", "de": "Schule mit tertiärem Bildungsangebot", "fr": "École dispensant un enseignement supérieur", - "da": "Skole, der udbyder videregående uddannelser" + "da": "Skole, der udbyder videregående uddannelser", + "ca": "Escola que imparteix educació terciària" } } ] @@ -88,7 +91,8 @@ "nl": "Dit is een onderwijsinstelling waar post-secundair, niet-tertiair onderwijs wordt gegeven. Om dit onderwijs te volgen, moet je je secundair onderwijs afgewerkt hebben maar de opleiding behaalt niet het niveau van van een bachelor.", "de": "Es handelt sich um eine postsekundäre, nicht-tertiäre Bildungseinrichtung. Man muss die Sekundarstufe abgeschlossen haben, um sich hier einzuschreiben, aber es werden keine Bachelor-Abschlüsse (oder höhere Abschlüsse) verliehen", "fr": "C'est un établissement d'enseignement post-secondaire, non tertiaire. Il faut avoir terminé l'enseignement secondaire pour s'inscrire ici, mais aucun baccalauréat (ou diplôme supérieur) n'est délivré ici", - "da": "Dette er en institution for post-gymnasial, ikke-tertiær uddannelse. Man skal have gennemført en ungdomsuddannelse for at tilmelde sig her, men her uddeles ingen bachelor (eller højere) grader" + "da": "Dette er en institution for post-gymnasial, ikke-tertiær uddannelse. Man skal have gennemført en ungdomsuddannelse for at tilmelde sig her, men her uddeles ingen bachelor (eller højere) grader", + "ca": "Aquesta és una institució d'educació postsecundària i no terciària. S'ha d'haver completat l'educació secundària per matricular-se aquí, però aquí no s'obtenen títols de batxillerat (o superiors)" } }, { @@ -179,7 +183,8 @@ "en": "An institute where tertiary education is given (at the level equivalent of a bachelors degree or higher). A single point per campus is enough - buildings and faculties should not be mapped with different university points.", "nl": "Een onderwijsinstelling waar tertiair onderwijs wordt gegeven - dit is onderwijs waarvan het niveau overeenkomt met een bachelor of hoger is. Eén enkel punt per campus is genoeg - gebouwen en faculteiten worden hier niet op aangeduid.", "de": "Eine Einrichtung, an der tertiäre Bildung vermittelt wird (auf dem Niveau eines Bachelor-Abschlusses oder höher). Ein einziger Punkt pro Campus ist ausreichend - Gebäude und Fakultäten sollten nicht mit Universitätspunkten gekennzeichnet werden.", - "fr": "Un institut où l'on dispense un enseignement supérieur (au niveau équivalent à un bachelor ou plus). Un simple point par campus est suffisant - les bâtiments et les facultés ne doivent pas être cartographiés avec différents points d'université." + "fr": "Un institut où l'on dispense un enseignement supérieur (au niveau équivalent à un bachelor ou plus). Un simple point par campus est suffisant - les bâtiments et les facultés ne doivent pas être cartographiés avec différents points d'université.", + "ca": "Un institut on s'imparteix ensenyament terciari (al nivell equivalent de batxillerat o superior). N'hi ha prou amb un únic punt per campus: els edificis i les facultats no s'han de cartografiar amb diferents punts universitaris." }, "tags": [ "amenity=university", diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json index 192ccd226..07ffd42a5 100644 --- a/assets/layers/toilet/toilet.json +++ b/assets/layers/toilet/toilet.json @@ -400,7 +400,7 @@ "relevant-questions" ], "question": { - "en": "Which kind of toilets are this?", + "en": "Which kind of toilets are these?", "de": "Welche Toiletten gibt es hier?", "fr": "De quel type sont ces toilettes ?", "nl": "Welke toiletten zijn dit?", @@ -608,7 +608,7 @@ { "if": "toilets:handwashing=yes", "then": { - "en": "This toilets have a sink to wash your hands", + "en": "These toilets have a sink to wash your hands", "nl": "Deze toiletten hebben een lavabo waar men de handen kan wassen", "de": "Die Toilette hat ein Handwaschbecken", "es": "Estos baños tienen una pileta para lavarse las manos", @@ -620,7 +620,7 @@ { "if": "toilets:handwashing=no", "then": { - "en": "This toilets don't have a sink to wash your hands", + "en": "These toilets don't have a sink to wash your hands", "nl": "Deze toiletten hebben geen lavabo waar men de handen kan wassen", "de": "Die Toilette hat kein Handwaschbecken", "es": "Estos baños no tienen una pileta para lavarse las manos", diff --git a/assets/layers/toilet_at_amenity/toilet_at_amenity.json b/assets/layers/toilet_at_amenity/toilet_at_amenity.json index 4b90c6a54..d1899e96c 100644 --- a/assets/layers/toilet_at_amenity/toilet_at_amenity.json +++ b/assets/layers/toilet_at_amenity/toilet_at_amenity.json @@ -14,7 +14,8 @@ "render": { "en": "Toilet at amenity", "de": "Toilette in Einrichtung", - "nl": "Toilet in een voorziening" + "nl": "Toilet in een voorziening", + "ca": "Lavabo a la instal·lació" }, "mappings": [ { @@ -22,7 +23,8 @@ "then": { "en": "Toilet at {name}", "de": "Toilette in {name}", - "nl": "Toilet bij {name}" + "nl": "Toilet bij {name}", + "ca": "Bany a {name}" } } ] @@ -197,7 +199,8 @@ "condition": "toilets:access!=no", "question": { "en": "When is the amenity where these toilets are located open?", - "de": "Wann ist der Ort, an dem sich diese Toiletten befinden, geöffnet?" + "de": "Wann ist der Ort, an dem sich diese Toiletten befinden, geöffnet?", + "ca": "Quan està oberta la instal·lació on es troben aquests lavabos?" } } }, @@ -273,7 +276,8 @@ "nl": "De deur naar de rolstoeltoegankelijke toilet is {canonical(toilets:door:width)} wide", "fr": "La porte des toilettes accessibles aux fauteuils roulants a une large de {canonical(toilets:door:width)}", "de": "Die Tür zur rollstuhlgerechten Toilette ist {canonical(toilets:door:width)} breit", - "da": "Døren til det kørestolsvenlige toilet er {canonical(toilets:door:width)} bred" + "da": "Døren til det kørestolsvenlige toilet er {canonical(toilets:door:width)} bred", + "ca": "La porta del vàter accessible amb cadira de rodes és {canonical(toilets:door:width)} d'ample" }, "freeform": { "key": "toilets:door:width", @@ -329,7 +333,8 @@ "nl": "Gratis toegankelijk", "de": "Nutzung kostenlos", "fr": "Utilisation gratuite", - "da": "Gratis at bruge" + "da": "Gratis at bruge", + "ca": "Ús gratuït" }, "osmTags": { "or": [ diff --git a/assets/layers/transit_routes/license_info.json b/assets/layers/transit_routes/license_info.json new file mode 100644 index 000000000..2af5aeef8 --- /dev/null +++ b/assets/layers/transit_routes/license_info.json @@ -0,0 +1,12 @@ +[ + { + "path": "relatify.png", + "license": "AGPLv3", + "authors": [ + "Kamil Monicz" + ], + "sources": [ + "https://github.com/Zaczero/osm-relatify/blob/main/web/static/img/icon.png" + ] + } +] \ No newline at end of file diff --git a/assets/layers/transit_routes/relatify.png b/assets/layers/transit_routes/relatify.png new file mode 100644 index 000000000..39b23abde Binary files /dev/null and b/assets/layers/transit_routes/relatify.png differ diff --git a/assets/layers/transit_routes/relatify.png.license b/assets/layers/transit_routes/relatify.png.license new file mode 100644 index 000000000..b35ebf9ef --- /dev/null +++ b/assets/layers/transit_routes/relatify.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Kamil Monicz +SPDX-License-Identifier: AGPLv3 \ No newline at end of file diff --git a/assets/layers/transit_routes/transit_routes.json b/assets/layers/transit_routes/transit_routes.json index feda44f59..f3c69d03a 100644 --- a/assets/layers/transit_routes/transit_routes.json +++ b/assets/layers/transit_routes/transit_routes.json @@ -204,5 +204,20 @@ ] } } + ], + "titleIcons": [ + { + "condition": { + "and": [ + "id~relation/[0-9]+", + "_numeric_id~*" + ] + }, + "render": "on relatify" + }, + "icons.defaults" + ], + "calculatedTags": [ + "_numeric_id=feat.properties.id.split('/')[1]" ] } diff --git a/assets/layers/transit_stops/transit_stops.json b/assets/layers/transit_stops/transit_stops.json index b4c59b434..7c1b1beb9 100644 --- a/assets/layers/transit_stops/transit_stops.json +++ b/assets/layers/transit_stops/transit_stops.json @@ -10,7 +10,8 @@ "description": { "en": "Layer showing different types of transit stops.", "de": "Ebene mit verschiedenen Arten von Haltestellen.", - "da": "Lag, der viser forskellige typer transitstop." + "da": "Lag, der viser forskellige typer transitstop.", + "ca": "Capa que mostra diferents tipus de parades de transport públic." }, "source": { "osmTags": { @@ -25,7 +26,8 @@ "en": "Transit Stop", "de": "Haltestelle", "da": "Transit Stop", - "nl": "Bushalte" + "nl": "Bushalte", + "ca": "Parada de transport públic" }, "mappings": [ { @@ -40,12 +42,18 @@ } ] }, - "calculatedTags": [ - "_routes=feat.memberships()", - "_contained_routes_properties=feat.memberships().map(p => {return {id: p.relation.id, name: p.relation.properties.name} }).filter((v,i,a)=>a.findIndex(t=>(JSON.stringify(t) === JSON.stringify(v)))===i)", - "_contained_route_ids=JSON.parse(feat.properties._contained_routes_properties ?? '[]').map(p => p.id)", - "_contained_routes=JSON.parse(feat.properties._contained_routes_properties ?? '[]').map(p => `
  • ${p.name ?? 'bus route'}
    • `).join('')", - "_contained_routes_count=JSON.parse(feat.properties._contained_routes_properties ?? '[]').length" + "mapRendering": [ + { + "location": [ + "point", + "centroid" + ], + "icon": { + "render": "./assets/layers/transit_stops/bus_stop.svg", + "mappings": [] + }, + "label": "
    {name}
    " + } ], "tagRenderings": [ { diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json index 1ae5c68a2..b8af222fa 100644 --- a/assets/layers/tree_node/tree_node.json +++ b/assets/layers/tree_node/tree_node.json @@ -88,7 +88,7 @@ "da": "Hvilken art er dette træ?", "pt": "Que espécie é esta árvore?", "pt_BR": "Que espécie é esta árvore?", - "ca": "Quina espècie és aquest arbre?" + "ca": "De quina espècie és aquest arbre?" }, "render": { "*": "{wikipedia(species:wikidata):max-height: 25rem}" diff --git a/assets/layers/usersettings/usersettings.json b/assets/layers/usersettings/usersettings.json index c0af1b2d5..addd7d935 100644 --- a/assets/layers/usersettings/usersettings.json +++ b/assets/layers/usersettings/usersettings.json @@ -115,14 +115,16 @@ }, "render": { "en": "This thematic map has a predefined background layer set. Your default theme setting does not apply", - "ca": "Aquest mapa temàtic té un conjunt de capes de fons predefinides. La configuració predeterminada del tema no s'aplica" + "ca": "Aquest mapa temàtic té un conjunt de capes de fons predefinides. La configuració predeterminada del tema no s'aplica", + "de": "Diese thematische Karte hat einen vordefinierten Hintergrund. Ihr Standardhintergrund wird nicht angewendet" } }, { "id": "background-layer", "question": { "en": "What background layer should be shown by default?", - "ca": "Quina capa de fons s'ha de mostrar per defecte?" + "ca": "Quina capa de fons s'ha de mostrar per defecte?", + "de": "Welche Hintergrundebene soll als Standard verwendet werden?" }, "condition": "_theme:backgroundLayer=", "mappings": [ @@ -130,35 +132,40 @@ "if": "mapcomplete-preferred-background-layer=", "then": { "en": "Use the default background layer", - "ca": "Utilitzeu la capa de fons predeterminada" + "ca": "Utilitzeu la capa de fons predeterminada", + "de": "Standardhintergrund verwenden" } }, { "if": "mapcomplete-preferred-background-layer=osm", "then": { "en": "Use OpenStreetMap-carto as default layer", - "ca": "Utilitzeu OpenStreetMap-carto com a capa predeterminada" + "ca": "Utilitzeu OpenStreetMap-carto com a capa predeterminada", + "de": "OpenStreetMap-carto als Standardhintergrund verwenden" } }, { "if": "mapcomplete-preferred-background-layer=photo", "then": { "en": "Use aerial imagery as default background", - "ca": "Utilitzeu imatges aèries com a fons predeterminat" + "ca": "Utilitzeu imatges aèries com a fons predeterminat", + "de": "Satellitenbilder als Standardhintergrund verwenden" } }, { "if": "mapcomplete-preferred-background-layer=map", "then": { "en": "Use a non-openstreetmap based map as default background", - "ca": "Utilitzeu un mapa que no sigui openstreetmap com a fons predeterminat" + "ca": "Utilitzeu un mapa que no sigui openstreetmap com a fons predeterminat", + "de": "Eine eigene Karte als Standardhintergrund verwenden" } }, { "if": "mapcomplete-preferred-background-layer:={__current_background}", "then": { "en": "Use the current background layer ({__current_background}) as default background", - "ca": "Utilitzeu la capa de fons actual ({__current_background}) com a fons predeterminat" + "ca": "Utilitzeu la capa de fons actual ({__current_background}) com a fons predeterminat", + "de": "Aktuelle Hintergrundebene ({__current_background}) als Standardhintergrund verwenden" }, "hideInAnswer": { "or": [ @@ -172,7 +179,8 @@ "if": "mapcomplete-preferred-background-layer~*", "then": { "en": "Use background layer {mapcomplete-preferred-background-layer} as default background", - "ca": "Utilitza la capa de fons {mapcomplete-preferred-background-layer} com a fons predeterminat" + "ca": "Utilitza la capa de fons {mapcomplete-preferred-background-layer} com a fons predeterminat", + "de": "Hintergrundebene {mapcomplete-preferred-background-layer} als Standardhintergrund verwenden" }, "hideInAnswer": true } @@ -559,7 +567,8 @@ "fr": "Vous avez fait {_csCount} modifications ! C'est génial !", "pt": "Você fez alterações em {_csCount} ocasiões diferentes! Isso é incrível!", "nl": "Je hebt {_csCount} verschillende keren bijgedragen! Dat is indrukwekkend!", - "da": "Du har lavet ændringer ved {_csCount} forskellige begivenheder! Det er fantastisk!" + "da": "Du har lavet ændringer ved {_csCount} forskellige begivenheder! Det er fantastisk!", + "es": "Has hecho cambios en {_csCount} ocasiones diferentes. ¡Es alucinante!" }, "icon": "party" } diff --git a/assets/layers/vending_machine/fruits.svg b/assets/layers/vending_machine/fruits.svg new file mode 100644 index 000000000..48478b6c4 --- /dev/null +++ b/assets/layers/vending_machine/fruits.svg @@ -0,0 +1,1034 @@ + + + + fruits - coloured + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + fruits - coloured + + 2016-03-28 + + + Frank Tremmel + + + + + früchte + apfel + banane + pfirsich + birne + fruits + apple + banana + peach + pear + fruit + fucht + line art + education + school + unterricht + schule + + + coloured line art fruits + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Below
    + + + + - - - - - - - +