diff --git a/Docs/BuiltinIndex.md b/Docs/BuiltinIndex.md index 75fc2a410..680260c76 100644 --- a/Docs/BuiltinIndex.md +++ b/Docs/BuiltinIndex.md @@ -21,6 +21,7 @@ + [bicycle_rental.*bicycle_rental](#bicycle_rental*bicycle_rental) + [bike_cleaning.bike_cleaning-service:bicycle:cleaning:charge](#bike_cleaningbike_cleaning-service:bicycle:cleaning:charge) + [wheelchair-access](#wheelchair-access) + + [smoking](#smoking) + [service:electricity](#serviceelectricity) + [dog-access](#dog-access) + [climbing.website](#climbingwebsite) @@ -287,6 +288,17 @@ +### smoking + + + + + + - cafe_pub + + + + ### service:electricity diff --git a/Docs/BuiltinQuestions.md b/Docs/BuiltinQuestions.md index b75eea879..95ba3a491 100644 --- a/Docs/BuiltinQuestions.md +++ b/Docs/BuiltinQuestions.md @@ -33,11 +33,13 @@ The following items can be easily reused in your layers + [last_edit](#last_edit) + [all_tags](#all_tags) + [level](#level) + + [smoking](#smoking) + [default](#default) + [defaults](#defaults) + [isOpen](#isopen) + [phonelink](#phonelink) + [emaillink](#emaillink) + + [smokingicon](#smokingicon) + [sharelink](#sharelink) @@ -341,6 +343,21 @@ On what level is this feature located? +### smoking + + + +Is smoking allowed at {title()}? + + + + - Smoking is allowed + - Smoking is not allowed + - Smoking is allowed outside. + + + + ### default @@ -377,7 +394,7 @@ Read-only tagrendering -phone +phone Read-only tagrendering @@ -387,12 +404,26 @@ Read-only tagrendering -email +email Read-only tagrendering +### smokingicon + + + +Read-only tagrendering + + + + - no-smoking + - smoking-allowed + + + + ### sharelink diff --git a/Docs/Layers/cafe_pub.md b/Docs/Layers/cafe_pub.md index 00b04ef59..52de985fd 100644 --- a/Docs/Layers/cafe_pub.md +++ b/Docs/Layers/cafe_pub.md @@ -40,10 +40,10 @@ Elements must have the all of following tags to be shown on this layer: - - amenity=bar|amenity=pub|amenity=cafe|amenity=biergarten + - amenity=bar|amenity=pub|amenity=cafe|amenity=biergarten|amenity=nightclub -[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22bar%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22pub%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22cafe%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22biergarten%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) +[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22bar%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22pub%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22cafe%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22biergarten%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22nightclub%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) @@ -61,12 +61,13 @@ this quick overview is incomplete attribute | type | values which are supported by this layer ----------- | ------ | ------------------------------------------ [](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | -[](https://taginfo.openstreetmap.org/keys/amenity#values) [amenity](https://wiki.openstreetmap.org/wiki/Key:amenity) | Multiple choice | [pub](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpub) [bar](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbar) [cafe](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcafe) [restaurant](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant) [biergarten](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbiergarten) +[](https://taginfo.openstreetmap.org/keys/amenity#values) [amenity](https://wiki.openstreetmap.org/wiki/Key:amenity) | Multiple choice | [pub](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpub) [bar](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbar) [cafe](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcafe) [restaurant](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant) [biergarten](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbiergarten) [nightclub](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dnightclub) [](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | [](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | [](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | [](https://taginfo.openstreetmap.org/keys/wheelchair#values) [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated) [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) +[](https://taginfo.openstreetmap.org/keys/smoking#values) [smoking](https://wiki.openstreetmap.org/wiki/Key:smoking) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:smoking%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:smoking%3Dno) [outside](https://wiki.openstreetmap.org/wiki/Tag:smoking%3Doutside) [](https://taginfo.openstreetmap.org/keys/service:electricity#values) [service:electricity](https://wiki.openstreetmap.org/wiki/Key:service:electricity) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dlimited) [ask](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask) [no](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno) [](https://taginfo.openstreetmap.org/keys/dog#values) [dog](https://wiki.openstreetmap.org/wiki/Key:dog) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dno) [leashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dleashed) [unleashed](https://wiki.openstreetmap.org/wiki/Tag:dog%3Dunleashed) @@ -112,6 +113,7 @@ The question is What kind of cafe is this? - A cafe to drink tea, coffee or an alcoholical bevarage in a quiet environment corresponds with amenity=cafe - A restuarant where one can get a proper meal corresponds with amenity=restaurant - An open space where beer is served, typically seen in Germany corresponds with amenity=biergarten + - This is a nightclub or disco with a focus on dancing, music by a DJ with accompanying light show and a bar to get (alcoholic) drinks corresponds with amenity=nightclub @@ -226,6 +228,23 @@ The question is Is this place accessible with a wheelchair? +### smoking + + + +The question is Is smoking allowed at {title()}? + + + + + + - Smoking is allowed corresponds with smoking=yes + - Smoking is not allowed corresponds with smoking=no + - Smoking is allowed outside. corresponds with smoking=outside + + + + ### service:electricity diff --git a/Docs/TagInfo/mapcomplete_cafes_and_pubs.json b/Docs/TagInfo/mapcomplete_cafes_and_pubs.json index 26d78bf69..7f889ce4d 100644 --- a/Docs/TagInfo/mapcomplete_cafes_and_pubs.json +++ b/Docs/TagInfo/mapcomplete_cafes_and_pubs.json @@ -30,6 +30,11 @@ "description": "The MapComplete theme CafĂ©s and pubs has a layer CafĂ©s and pubs showing features with this tag", "value": "biergarten" }, + { + "key": "amenity", + "description": "The MapComplete theme CafĂ©s and pubs has a layer CafĂ©s and pubs showing features with this tag", + "value": "nightclub" + }, { "key": "image", "description": "The layer 'CafĂ©s and pubs 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" @@ -75,6 +80,11 @@ "description": "Layer 'CafĂ©s and pubs' shows amenity=biergarten with a fixed text, namely 'An open space where beer is served, typically seen in Germany' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'CafĂ©s and pubs')", "value": "biergarten" }, + { + "key": "amenity", + "description": "Layer 'CafĂ©s and pubs' shows amenity=nightclub with a fixed text, namely 'This is a nightclub or disco with a focus on dancing, music by a DJ with accompanying light show and a bar to get (alcoholic) drinks' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'CafĂ©s and pubs')", + "value": "nightclub" + }, { "key": "opening_hours", "description": "Layer 'CafĂ©s and pubs' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'CafĂ©s and pubs')" @@ -133,6 +143,21 @@ "description": "Layer 'CafĂ©s and pubs' shows wheelchair=no with a fixed text, namely 'This place is not reachable with a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'CafĂ©s and pubs')", "value": "no" }, + { + "key": "smoking", + "description": "Layer 'CafĂ©s and pubs' shows smoking=yes with a fixed text, namely 'Smoking is allowed' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'CafĂ©s and pubs')", + "value": "yes" + }, + { + "key": "smoking", + "description": "Layer 'CafĂ©s and pubs' shows smoking=no with a fixed text, namely 'Smoking is not allowed' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'CafĂ©s and pubs')", + "value": "no" + }, + { + "key": "smoking", + "description": "Layer 'CafĂ©s and pubs' shows smoking=outside with a fixed text, namely 'Smoking is allowed outside.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'CafĂ©s and pubs')", + "value": "outside" + }, { "key": "service:electricity", "description": "Layer 'CafĂ©s and pubs' shows service:electricity=yes with a fixed text, namely 'There are plenty of domestic sockets available to customers seated indoors, where they can charge their electronics' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'CafĂ©s and pubs')", diff --git a/Docs/TagInfo/mapcomplete_personal.json b/Docs/TagInfo/mapcomplete_personal.json index a5216ce22..146b21685 100644 --- a/Docs/TagInfo/mapcomplete_personal.json +++ b/Docs/TagInfo/mapcomplete_personal.json @@ -1920,6 +1920,11 @@ "description": "The MapComplete theme Personal theme has a layer CafĂ©s and pubs showing features with this tag", "value": "biergarten" }, + { + "key": "amenity", + "description": "The MapComplete theme Personal theme has a layer CafĂ©s and pubs showing features with this tag", + "value": "nightclub" + }, { "key": "image", "description": "The layer 'CafĂ©s and pubs 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" @@ -1965,6 +1970,11 @@ "description": "Layer 'CafĂ©s and pubs' shows amenity=biergarten with a fixed text, namely 'An open space where beer is served, typically seen in Germany' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", "value": "biergarten" }, + { + "key": "amenity", + "description": "Layer 'CafĂ©s and pubs' shows amenity=nightclub with a fixed text, namely 'This is a nightclub or disco with a focus on dancing, music by a DJ with accompanying light show and a bar to get (alcoholic) drinks' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "nightclub" + }, { "key": "opening_hours", "description": "Layer 'CafĂ©s and pubs' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Personal theme')" @@ -2023,6 +2033,21 @@ "description": "Layer 'CafĂ©s and pubs' shows wheelchair=no with a fixed text, namely 'This place is not reachable with a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", "value": "no" }, + { + "key": "smoking", + "description": "Layer 'CafĂ©s and pubs' shows smoking=yes with a fixed text, namely 'Smoking is allowed' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "smoking", + "description": "Layer 'CafĂ©s and pubs' shows smoking=no with a fixed text, namely 'Smoking is not allowed' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "no" + }, + { + "key": "smoking", + "description": "Layer 'CafĂ©s and pubs' shows smoking=outside with a fixed text, namely 'Smoking is allowed outside.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "outside" + }, { "key": "service:electricity", "description": "Layer 'CafĂ©s and pubs' shows service:electricity=yes with a fixed text, namely 'There are plenty of domestic sockets available to customers seated indoors, where they can charge their electronics' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", diff --git a/assets/contributors.json b/assets/contributors.json index 4e8ee8289..21e4772ad 100644 --- a/assets/contributors.json +++ b/assets/contributors.json @@ -1,7 +1,7 @@ { "contributors": [ { - "commits": 3863, + "commits": 3871, "contributor": "Pieter Vander Vennet" }, { diff --git a/assets/layers/address/address.json b/assets/layers/address/address.json index ac324ffd7..2fc720e71 100644 --- a/assets/layers/address/address.json +++ b/assets/layers/address/address.json @@ -118,7 +118,8 @@ "id": "Bangunan ini tidak memiliki nomor rumah", "es": "Esta edificaciĂłn no tiene nĂșmero", "zh_Hans": "èż™äžȘć»ș筑物æČĄæœ‰é—šç‰Œć·", - "da": "Denne bygning har intet husnummer" + "da": "Denne bygning har intet husnummer", + "zh_Hant": "é€™æŁŸć»ș築æČ’æœ‰é–€ç‰Œ" } } ] diff --git a/assets/layers/cafe_pub/cafe_pub.json b/assets/layers/cafe_pub/cafe_pub.json index 6d3e13e99..7b16120bd 100644 --- a/assets/layers/cafe_pub/cafe_pub.json +++ b/assets/layers/cafe_pub/cafe_pub.json @@ -1,8 +1,8 @@ { "id": "cafe_pub", "name": { - "nl": "CafĂ©s en nachtclubs", - "en": "CafĂ©s, pubs and nightclubs", + "nl": "CafĂ©s", + "en": "CafĂ©s and pubs", "de": "CafĂ©s und Kneipen", "fr": "CafĂ©s et pubs", "zh_Hant": "ć’–ć•Ąć»łèˆ‡é…’ć§", @@ -154,8 +154,8 @@ "es": "ÂżCual es el nombre de este pub?" }, "render": { - "nl": "De naam van deze zaak is {name}", - "en": "This place is named {name}", + "nl": "De naam van dit cafĂ© is {name}", + "en": "This pub is named {name}", "de": "Diese Kneipe heißt {name}", "fr": "Ce pub se nomme {name}", "hu": "A kocsma neve: {name}", @@ -232,7 +232,6 @@ "then": { "en": "This is a nightclub or disco with a focus on dancing, music by a DJ with accompanying light show and a bar to get (alcoholic) drinks", "nl": "Dit is een nachtclub met dansvloer, DJ met bijhorende lichteffecten en bar waar men (alcoholische) dranken kan nuttigen" - } } ], @@ -325,9 +324,9 @@ } ], "description": { - "en": "A layer showing cafĂ©s, pubs, biergartens and nightclubs where one can gather around a drink. The layer asks for some relevant questions", + "en": "A layer showing cafĂ©s and pubs where one can gather around a drink. The layer asks for some relevant questions", "hu": "Egy olyan rĂ©teg, amely kĂĄvĂ©zĂłkat Ă©s kocsmĂĄkat jelenĂ­t meg, ahol össze lehet gyƱlni egy ital körĂ©. A rĂ©teg nĂ©hĂĄny lĂ©nyeges kĂ©rdĂ©st tesz fel", - "nl": "Een laag die kroegen, koffiehuizen, biergartens en nachtclubs toont waar je iets kunt drinken. De laag zal je enkele vragen stellen", + "nl": "Een laag die kroegen en koffiehuizen toont waar je iets kunt drinken. De laag zal je enkele vragen stellen", "de": "Eine Ebene mit CafĂ©s und Kneipen, in denen man sich auf ein GetrĂ€nk treffen kann. Die Ebene fragt nach einigen relevanten Eigenschaften", "es": "Una capa que muestra cafeterĂ­as y bares donde uno se puede reunir con una bebida. La capa hace algunas preguntas relevantes", "da": "Et lag med cafĂ©er og pubber, hvor man kan samles omkring en drink. Laget stiller nogle relevante spĂžrgsmĂ„l" diff --git a/assets/translators.json b/assets/translators.json index becd3d736..7eaf7030e 100644 --- a/assets/translators.json +++ b/assets/translators.json @@ -5,7 +5,7 @@ "contributor": "Pieter Vander Vennet" }, { - "commits": 120, + "commits": 121, "contributor": "kjon" }, { @@ -29,7 +29,7 @@ "contributor": "Iago" }, { - "commits": 22, + "commits": 23, "contributor": "Supaplex" }, { diff --git a/langs/de.json b/langs/de.json index 905bd7884..257eaa1d6 100644 --- a/langs/de.json +++ b/langs/de.json @@ -456,12 +456,12 @@ "sendReason": "Ich habe Ihnen diese Nachricht geschickt, weil {sender} mich gebeten hat, diese mit {cmd} zu senden" }, "documentation": { + "argid": "Die ID einer {list} oder {list_end}, fĂŒr welche die Dokumente benötigt werden. Alternativ können Sie auch eine von {coded_list} schreiben, um die verfĂŒgbaren IDs zu sehen.", "didYouMean": " Vielleicht meinten Sie einen von: ", "docs": "Ruft die Dokumentation zu einer MapComplete-Ebene, einem Thema oder einem URL-Parameter ab", + "noIdIntro": "Geben Sie eine ID an, um weitere Informationen ĂŒber ein MapComplete-Programmierelement zu erhalten. Bekannte Typen sind {list}", "notFound": "Kein {singular} mit Namen {id} gefunden.", - "urlParam": "URL-Parameter {id}", - "argid": "Die ID einer {list} oder {list_end}, fĂŒr welche die Dokumente benötigt werden. Alternativ können Sie auch eine von {coded_list} schreiben, um die verfĂŒgbaren IDs zu sehen.", - "noIdIntro": "Geben Sie eine ID an, um weitere Informationen ĂŒber ein MapComplete-Programmierelement zu erhalten. Bekannte Typen sind {list}" + "urlParam": "URL-Parameter {id}" }, "dream": { "docs": "Sendet einen computergenerierten Text", diff --git a/langs/layers/en.json b/langs/layers/en.json index 512cdf91e..06e64ec38 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -1274,6 +1274,10 @@ "2": { "description": "A cafe to drink tea, coffee or an alcoholical bevarage in a quiet environment", "title": "a cafe" + }, + "3": { + "description": "A nightclub or disco with a focus on dancing, music by a DJ with accompanying light show and a bar to get (alcoholic) drinks", + "title": "a nightclub or disco" } }, "tagRenderings": { @@ -1293,6 +1297,9 @@ }, "4": { "then": "An open space where beer is served, typically seen in Germany" + }, + "5": { + "then": "This is a nightclub or disco with a focus on dancing, music by a DJ with accompanying light show and a bar to get (alcoholic) drinks" } }, "question": "What kind of cafe is this?" diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 1272929d8..469636b36 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -1280,6 +1280,10 @@ "2": { "description": "Dit is een cafe - een plaats waar men rustig kan zitten om een thee, koffie of alcoholische drank te nuttigen.", "title": "een cafĂ©" + }, + "3": { + "description": "Een nachtclub met dansvloer, DJ met bijhorende lichteffecten en bar waar men (alcoholische) dranken kan nuttigen", + "title": "een nachtclub of disco" } }, "tagRenderings": { @@ -1299,6 +1303,9 @@ }, "4": { "then": "Een open ruimte waar bier geserveerd wordt. Typisch in Duitsland" + }, + "5": { + "then": "Dit is een nachtclub met dansvloer, DJ met bijhorende lichteffecten en bar waar men (alcoholische) dranken kan nuttigen" } }, "question": "Welk soort cafĂ© is dit?" diff --git a/langs/layers/zh_Hant.json b/langs/layers/zh_Hant.json index 2198f6cd1..f9a2f9607 100644 --- a/langs/layers/zh_Hant.json +++ b/langs/layers/zh_Hant.json @@ -625,4 +625,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/shared-questions/en.json b/langs/shared-questions/en.json index fce4c9217..944c5d5cb 100644 --- a/langs/shared-questions/en.json +++ b/langs/shared-questions/en.json @@ -91,6 +91,20 @@ }, "question": "Does this amenity have electrical outlets, available to customers when they are inside?" }, + "smoking": { + "mappings": { + "0": { + "then": "Smoking is allowed" + }, + "1": { + "then": "Smoking is not allowed" + }, + "2": { + "then": "Smoking is allowed outside." + } + }, + "question": "Is smoking allowed at {title()}?" + }, "website": { "question": "What is the website of {title()}?" },