diff --git a/Docs/BuiltinIndex.md b/Docs/BuiltinIndex.md index 2fecb0d77..942769bc8 100644 --- a/Docs/BuiltinIndex.md +++ b/Docs/BuiltinIndex.md @@ -31,6 +31,7 @@ - brothel - cafe_pub - car_rental + - caravansites - charging_station - cinema - climbing_area @@ -45,6 +46,7 @@ - doctors - dogpark - drinking_water + - dumpstations - elevator - elongated_coin - entrance @@ -160,6 +162,7 @@ - animal_shelter - brothel - cafe_pub + - caravansites - cinema - climbing_area - climbing_gym @@ -465,7 +468,8 @@ ### questions - - charging_station + - caravansites + - charging_station - etymology - favourite - hackerspace diff --git a/Docs/BuiltinQuestions.md b/Docs/BuiltinQuestions.md index 0190bea73..8b443f36b 100644 --- a/Docs/BuiltinQuestions.md +++ b/Docs/BuiltinQuestions.md @@ -80,7 +80,7 @@ This is a special layer - data is not sourced from OpenStreetMap | [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | | | [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) | | [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) [outside](https://wiki.openstreetmap.org/wiki/Tag:dog%3Doutside) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | | [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | | | [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) | | [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) | @@ -146,9 +146,9 @@ _This tagrendering has no question and is thus read-only_ ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -414,7 +414,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` diff --git a/Docs/ELI-overview.md b/Docs/ELI-overview.md index 06edef0d0..e9c22322d 100644 --- a/Docs/ELI-overview.md +++ b/Docs/ELI-overview.md @@ -160,10 +160,6 @@ This table gives a summary of ids, names and other metainformation. [See the onl | PrahaIPRlatestorthophoto | Praha IPR latest orthophoto | photo | | | | PrahaIPRlow-vegetationorthophoto | Praha IPR low-vegetation orthophoto | photo | ⭐ | IPR Praha | | AktuelleLuftbilderDerLandeshauptstadtMuenchen20cm | Aktuelle Luftbilder der Landeshauptstadt München 20cm | photo | | Datenquelle: dl-de/by-2-0: Landeshauptstadt München – Kommunalreferat – GeodatenService – www.geodatenservice-muenchen.de | -| BY_DOP20C | Bayern Orthophoto 20cm (Farbe) | photo | ⭐ | Bayerische Vermessungsverwaltung | -| BY_DOP20CIR | Bayern Orthophoto 20cm (Colorinfrarot) | photo | | Bayerische Vermessungsverwaltung | -| BY_Relief | Bayern Geländerelief | elevation | | Bayerische Vermessungsverwaltung | -| BY_Webkarte | Bayern Webkarte | map | | Bayerische Vermessungsverwaltung | | Berlin-2020-TrueDOP | Berlin/Geoportal TrueDOP20RGB (2020) | photo | | Geoportal Berlin/Digitale farbige TrueOrthophotos 2020 (TrueDOP20RGB) (codefor.de mirror) | | Berlin-Alkis | Berlin/Geoportal ALKIS | other | | Geoportal Berlin/ALKIS Berlin (Amtliches Liegenschaftskatasterinformationssystem) (codefor.de proxy) | | Berlin-Baumbestand_Alkis | Berlin/Geoportal Baumbestand, Alkis s/w | other | | Geoportal Berlin/Straßen- und Anlagenbaumbestand Berlin, ALKIS s/w (codefor.de proxy) | @@ -278,6 +274,8 @@ This table gives a summary of ids, names and other metainformation. [See the onl | Mulhouse_2018 | Mulhouse - 2018 | photo | | Mulhouse Alsace Agglomération 2018 | | GrandNancy_Orthophotographie_2016 | Nancy - Orthophoto - 2016 | photo | | GrandNancy Orthophotographie 2016 | | GrandNancy_Orthophotographie | Nancy - Orthophoto | photo | ⭐ | GrandNancy Orthophotographie 2016 | +| fr.ign.orthoexpress.2023 | Ortho Express 2023 (20 cm) | photo | | IGN | +| fr.ign.orthoexpress.2024 | Ortho Express 2024 (20 cm) | photo | | IGN | | fr.orthohr | Ortho HR | photo | | IGN, CRAIG, Mégalis Bretagne | | fr.orthohr.2013 | Ortho HR 2013 | historicphoto | | IGN, CRAIG, Mégalis Bretagne | | fr.orthohr.2014 | Ortho HR 2014 | historicphoto | | IGN, Mégalis Bretagne | @@ -309,7 +307,6 @@ This table gives a summary of ids, names and other metainformation. [See the onl | Tours-Orthophoto-2008_2010 | Tours - Orthophotos 2008-2010 | historicphoto | | Orthophoto Tour(s) Plus 2008 | | fr.dpt.84.2010 | Vaucluse 2010 | historicphoto | | ORTHO 2010 © PACA-04-05-84 | | Vercors-Orthophotos-1999 | Vercors (Réserve naturelle des Hauts-Plateaux du Vercors) - Orthophoto - 1999 - 1 m | historicphoto | | Parc Naturel Régional du Vercors | -| fr.ign.orthoexpress.2023 | Ortho Express IGN 2023 (20 cm) | photo | | IGN | | Hampshire-Aerial-FCIR | Hampshire Aerial FCIR | photo | | | | Hampshire-Aerial-RGB | Hampshire Aerial RGB | photo | | | | NLS-OS-NatGrid-11250-1940-60 | NLS - OS 1:1,250 National Grid Maps, 1940s-1960s | historicmap | | National Library of Scotland Historic Maps | @@ -442,9 +439,6 @@ This table gives a summary of ids, names and other metainformation. [See the onl | LV_ORTOFOTO_C5 | Orthophoto (2013-2015), 1:5000, Latvia | photo | | LĢIA (Latvian Geospatial Information Agency) provided these open data (CC0). WMS service is provided by LVM (Latvian State Forestry). | | LV_ORTOFOTO_C6 | Orthophoto (2016–2018), 1:5000, Latvia | photo | ⭐ | LĢIA (Latvian Geospatial Information Agency) provided these open data (CC0). WMS service is provided by LVM (Latvian State Forestry). | | LV_TERRAIN_LIDAR_LGIA | Digital terrain model (2013–2019), LĢIA, Latvia | elevation | | LĢIA (Latvian Geospatial Information Agency) provided these open data (CC0). WMS service is provided by LVM (Latvian State Forestry). | -| MoldovaMap-2020_Ortofoto_2016_RM | Moldova Ortophoto (2016) | photo | ⭐ | © Agenţia Relaţii Funciare şi Cadastru a Republicii Moldova / Geoportal INDS / Moldova Ortofoto 2016 | -| Geoportal-Ortofoto_2016_RM | Moldova Ortophoto (2016) / Geoportal.md Reserve Server | photo | | © Agenţia Relaţii Funciare şi Cadastru a Republicii Moldova / Fondul Naţional de Date Geospaţiale / Geoportal INDS / Moldova Ortofoto 2016 | -| MoldovaMap-2020_ortofoto_moldova_centru | Moldova Ortophoto, Center part (2020) | photo | ⭐ | © Agenţia Relaţii Funciare şi Cadastru a Republicii Moldova / Geoportal INDS / Ortofoto Moldova, Centru 2020 | | Actueel_orthoHR_WMTS | PDOK aerial imagery Beeldmateriaal.nl 8cm (WMTS) latest | photo | ⭐ | Kadaster / Beeldmateriaal.nl, CC BY 4.0 | | kartverket-topo4 | Kartverket topo | map | | © Kartverket | | kartverket-ok-1st | Kartverket Economic Maps (historic) | historicmap | | © Kartverket | diff --git a/Docs/Layers/address.md b/Docs/Layers/address.md index b01d7d6d4..3475395f9 100644 --- a/Docs/Layers/address.md +++ b/Docs/Layers/address.md @@ -16,6 +16,7 @@ Addresses - [street](#street) - [fixme](#fixme) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -70,6 +71,11 @@ The question is `What should be fixed here? Please explain` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/advertising.md b/Docs/Layers/advertising.md index b07c4181d..3726e4e17 100644 --- a/Docs/Layers/advertising.md +++ b/Docs/Layers/advertising.md @@ -17,8 +17,9 @@ We will complete data from advertising features with reference, operator and lit ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [type](#type) - [animated](#animated) @@ -37,6 +38,42 @@ We will complete data from advertising features with reference, operator and lit - [advertising](https://mapcomplete.org/advertising) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a billboard** which has the following tags:advertising=billboard + +**a billboard mounted to a wall** which has the following tags:advertising=billboard (snaps to layers `walls_and_buildings`) + +**a freestanding poster box** which has the following tags:advertising=poster_box + +**a poster box mounted on a wall** which has the following tags:advertising=poster_box (snaps to layers `walls_and_buildings`) + +**a poster box part of a public transport shelter** which has the following tags:advertising=poster_box & support=street_furniture:transit_shelter (snaps to layers `shelter`) + +**a board** which has the following tags:advertising=board + +**a column** which has the following tags:advertising=column + +**a flag** which has the following tags:advertising=flag & man_made=pole + +**a screen** which has the following tags:advertising=screen + +**a screen mounted on a wall** which has the following tags:advertising=screen (snaps to layers `walls_and_buildings`) + +**a screen mounted on a transit shelter** which has the following tags:advertising=screen & support=street_furniture:transit_shelter (snaps to layers `shelter`) + +**a tarp** which has the following tags:advertising=tarp (snaps to layers `walls_and_buildings`) + +**a totem** which has the following tags:advertising=totem + +**a sign** which has the following tags:advertising=sign (snaps to layers `walls_and_buildings`) + +**a sculpture** which has the following tags:advertising=sculpture + +**a wall painting** which has the following tags:advertising=wall_painting (snaps to layers `walls_and_buildings`) + ## Basic tags for this layer Elements must match **all** of the following expressions: diff --git a/Docs/Layers/all_vending_machine.md b/Docs/Layers/all_vending_machine.md index aadc174fb..958bbe6ce 100644 --- a/Docs/Layers/all_vending_machine.md +++ b/Docs/Layers/all_vending_machine.md @@ -221,9 +221,9 @@ The question is `Is this vending machine indoors?` ### phone The question is `What is the phone number of the operator of this vending machine?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/ambulancestation.md b/Docs/Layers/ambulancestation.md index d78ea4994..349373c8b 100644 --- a/Docs/Layers/ambulancestation.md +++ b/Docs/Layers/ambulancestation.md @@ -9,8 +9,9 @@ An ambulance station is an area for storage of ambulance vehicles, medical equip ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [ambulance-name](#ambulance-name) - [ambulance-street](#ambulance-street) - [ambulance-place](#ambulance-place) @@ -18,6 +19,7 @@ An ambulance station is an area for storage of ambulance vehicles, medical equip - [ambulance-operator-type](#ambulance-operator-type) - [images](#images) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -25,6 +27,12 @@ An ambulance station is an area for storage of ambulance vehicles, medical equip - [hailhydrant](https://mapcomplete.org/hailhydrant) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**an ambulance station** which has the following tags:emergency=ambulance_station + ## Basic tags for this layer Elements must match the expression **emergency=ambulance_station** @@ -83,6 +91,11 @@ _This tagrendering has no question and is thus read-only_ _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/animal_shelter.md b/Docs/Layers/animal_shelter.md index da22e314b..6cd94dea5 100644 --- a/Docs/Layers/animal_shelter.md +++ b/Docs/Layers/animal_shelter.md @@ -9,8 +9,9 @@ An animal shelter is a facility where animals in trouble are brought and facilit ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [reviews](#reviews) - [2](#2) @@ -31,6 +32,12 @@ An animal shelter is a facility where animals in trouble are brought and facilit - [personal](https://mapcomplete.org/personal) - [pets](https://mapcomplete.org/pets) +## Presets + +The following options to create new points are included: + +**an animal shelter** which has the following tags:amenity=animal_shelter + ## Basic tags for this layer Elements must match the expression **amenity=animal_shelter** @@ -79,9 +86,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/artwork.md b/Docs/Layers/artwork.md index 0f53d8459..551ce50ce 100644 --- a/Docs/Layers/artwork.md +++ b/Docs/Layers/artwork.md @@ -10,8 +10,9 @@ An open map of statues, busts, graffitis and other artwork all over the world ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [artwork-artwork_type](#artwork-artwork_type) - [artwork-artist-wikidata](#artwork-artist-wikidata) @@ -36,7 +37,7 @@ An open map of statues, busts, graffitis and other artwork all over the world - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -44,6 +45,14 @@ An open map of statues, busts, graffitis and other artwork all over the world - [memorials](https://mapcomplete.org/memorials) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**an artwork** which has the following tags:tourism=artwork + +**an artwork on a wall** which has the following tags:tourism=artwork (snaps to layers `walls_and_buildings`) + ## Basic tags for this layer Elements must match the expression **tourism=artwork** diff --git a/Docs/Layers/assembly_point.md b/Docs/Layers/assembly_point.md index dd09a99c4..f5870a27f 100644 --- a/Docs/Layers/assembly_point.md +++ b/Docs/Layers/assembly_point.md @@ -9,8 +9,9 @@ This layer contains assembly points and waiting areas where all employees, passe ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [assembly_point_name](#assembly_point_name) - [assembly_point_operator](#assembly_point_operator) @@ -24,6 +25,12 @@ This layer contains assembly points and waiting areas where all employees, passe - [disaster_response](https://mapcomplete.org/disaster_response) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**an assembly point** which has the following tags:emergency=assembly_point + ## Basic tags for this layer Elements must match the expression **emergency=assembly_point** diff --git a/Docs/Layers/assisted_repair.md b/Docs/Layers/assisted_repair.md index d279cebaf..eb3980222 100644 --- a/Docs/Layers/assisted_repair.md +++ b/Docs/Layers/assisted_repair.md @@ -9,8 +9,9 @@ A self-assisted workshop is a location where people can come and repair their go ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [preset_description](#preset_description) - [name](#name) @@ -32,6 +33,12 @@ A self-assisted workshop is a location where people can come and repair their go - [circular_economy](https://mapcomplete.org/circular_economy) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**an assisted repair workshop** which has the following tags:amenity=workshop & repair=assisted_self_service + ## Basic tags for this layer Elements must match the expression **repair=assisted_self_service** @@ -79,9 +86,9 @@ The question is `What are the opening hours of {title()}?` ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/atm.md b/Docs/Layers/atm.md index 044992ada..9b39cbcde 100644 --- a/Docs/Layers/atm.md +++ b/Docs/Layers/atm.md @@ -9,8 +9,9 @@ ATMs to withdraw money ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [name](#name) - [brand](#brand) @@ -26,7 +27,7 @@ ATMs to withdraw money - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -34,6 +35,12 @@ ATMs to withdraw money - [personal](https://mapcomplete.org/personal) - [stations](https://mapcomplete.org/stations) +## Presets + +The following options to create new points are included: + +**an ATM** which has the following tags:amenity=atm + ## Basic tags for this layer Elements must match the expression **amenity=atm** diff --git a/Docs/Layers/bank.md b/Docs/Layers/bank.md index f524937bb..7d907d4d8 100644 --- a/Docs/Layers/bank.md +++ b/Docs/Layers/bank.md @@ -14,6 +14,7 @@ A financial institution to deposit money - [images](#images) - [has_atm](#has_atm) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) 4. [Filters](#filters) @@ -55,6 +56,11 @@ The question is `Does this bank have an ATM?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### delete-button _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/banks_with_atm.md b/Docs/Layers/banks_with_atm.md index 566bb88e9..e4993a008 100644 --- a/Docs/Layers/banks_with_atm.md +++ b/Docs/Layers/banks_with_atm.md @@ -16,6 +16,7 @@ A financial institution to deposit money - [images](#images) - [has_atm](#has_atm) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) 4. [Filters](#filters) @@ -59,6 +60,11 @@ The question is `Does this bank have an ATM?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### delete-button _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/barrier.md b/Docs/Layers/barrier.md index 70c1a691d..461e35269 100644 --- a/Docs/Layers/barrier.md +++ b/Docs/Layers/barrier.md @@ -11,8 +11,9 @@ Obstacles while cycling, such as bollards and cycle barriers ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [bicycle=yes/no](#bicycle=yesno) - [barrier_type](#barrier_type) @@ -23,6 +24,7 @@ Obstacles while cycling, such as bollards and cycle barriers - [Width of opening (cyclebarrier)](#width-of-opening-(cyclebarrier)) - [Overlap (cyclebarrier)](#overlap-(cyclebarrier)) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) @@ -31,6 +33,14 @@ Obstacles while cycling, such as bollards and cycle barriers - [cycle_infra](https://mapcomplete.org/cycle_infra) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a bollard** which has the following tags:barrier=bollard (snaps to layers `cycleways_and_roads`) + +**a cycle barrier** which has the following tags:barrier=cycle_barrier (snaps to layers `cycleways_and_roads`) + ## Basic tags for this layer Elements must match **any** of the following expressions: @@ -132,6 +142,11 @@ This tagrendering is only visible in the popup if the following condition is met _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### delete-button _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/bbq.md b/Docs/Layers/bbq.md index bc2f17fe5..0b823e188 100644 --- a/Docs/Layers/bbq.md +++ b/Docs/Layers/bbq.md @@ -9,8 +9,9 @@ A permanently installed barbecue, typically accessible to the public. ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [access](#access) - [covered](#covered) @@ -27,6 +28,12 @@ A permanently installed barbecue, typically accessible to the public. - [personal](https://mapcomplete.org/personal) - [playgrounds](https://mapcomplete.org/playgrounds) +## Presets + +The following options to create new points are included: + +**BBQ** which has the following tags:amenity=bbq + ## Basic tags for this layer Elements must match the expression **amenity=bbq** diff --git a/Docs/Layers/bench.md b/Docs/Layers/bench.md index 89311d071..7676426af 100644 --- a/Docs/Layers/bench.md +++ b/Docs/Layers/bench.md @@ -9,8 +9,9 @@ A bench is a wooden, metal, stone, … surface where a human can sit. This layer ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [bench-backrest](#bench-backrest) - [bench-armrest](#bench-armrest) @@ -31,7 +32,7 @@ A bench is a wooden, metal, stone, … surface where a human can sit. This layer - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -44,6 +45,12 @@ A bench is a wooden, metal, stone, … surface where a human can sit. This layer - [stations](https://mapcomplete.org/stations) - [toerisme_vlaanderen](https://mapcomplete.org/toerisme_vlaanderen) +## Presets + +The following options to create new points are included: + +**a bench** which has the following tags:amenity=bench + ## Basic tags for this layer Elements must match the expression **amenity=bench** diff --git a/Docs/Layers/bicycle_assisted_repair_workshop.md b/Docs/Layers/bicycle_assisted_repair_workshop.md new file mode 100644 index 000000000..1a5aa48d6 --- /dev/null +++ b/Docs/Layers/bicycle_assisted_repair_workshop.md @@ -0,0 +1,159 @@ +[//]: # (WARNING: this file is automatically generated. Please find the sources at the bottom and edit those sources) + +# bicycle_assisted_repair_workshop + +This layer is based on [assisted_repair](../Layers/assisted_repair.md) + +A self-assisted workshop is a location where people can come and repair their goods with help of volunteers and with the tools available at the given location. A repair café is a type of event organized regularly along the same principles. + + - This layer is shown at zoomlevel **11** and higher + +## Table of contents + +1. [Themes using this layer](#themes-using-this-layer) +2. [Basic tags for this layer](#basic-tags-for-this-layer) +3. [Supported attributes](#supported-attributes) + - [images](#images) + - [preset_description](#preset_description) + - [name](#name) + - [opening_hours_by_appointment](#opening_hours_by_appointment) + - [Opening hours](#opening-hours) + - [phone](#phone) + - [email](#email) + - [website](#website) + - [mastodon](#mastodon) + - [facebook](#facebook) + - [item:repair](#itemrepair) + - [leftover-questions](#leftover-questions) + - [move-button](#move-button) + - [delete-button](#delete-button) + - [lod](#lod) + +## Themes using this layer + + - [cyclofix](https://mapcomplete.org/cyclofix) + +## Basic tags for this layer + +Elements must match **all** of the following expressions: + +0. repair=assisted_self_service +1. bicycle:repair=yes | service:bicycle:repair=yes + +[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22repair%22%3D%22assisted_self_service%22%5D%5B%22bicycle%3Arepair%22%3D%22yes%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22repair%22%3D%22assisted_self_service%22%5D%5B%22service%3Abicycle%3Arepair%22%3D%22yes%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) + +## Supported attributes + +**Warning:**,this quick overview is incomplete, + +| attribute | type | values which are supported by this layer | +-----|-----|----- | +| [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | | +| [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | ["by appointment"](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D"by appointment") | +| [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | | +| [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | | +| [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | | +| [contact:mastodon](https://wiki.openstreetmap.org/wiki/Key:contact:mastodon) | [fediverse](../SpecialInputElements.md#fediverse) | | +| [contact:facebook](https://wiki.openstreetmap.org/wiki/Key:contact:facebook) | [url](../SpecialInputElements.md#url) | | + +### images +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images +_This tagrendering has no question and is thus read-only_ +*{image_carousel()}{image_upload()}* + +### preset_description + +_This tagrendering has no question and is thus read-only_ +*{preset_description()}* + +### name + +The question is `What is the name of this repair workshop?` +*This workshop is called {name}* is shown if `name` is set + +### opening_hours_by_appointment + +The question is `What are the opening hours of {title()}?` +*

Opening hours

{opening_hours_table(opening_hours)}* is shown if `opening_hours` is set + + - *Only by appointment* is shown if with opening_hours="by appointment" + - *Only by appointment* is shown if with opening_hours~^("by appointment"|by appointment)$. _This option cannot be chosen as answer_ + - *Marked as closed for an unspecified time* is shown if with opening_hours=closed. _This option cannot be chosen as answer_ + +### phone + +The question is `What is the phone number of {title()}?` +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set + + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + +This tagrendering has labels +`contact` + +### email + +The question is `What is the email address of {title()}?` +*{email}* is shown if `email` is set + + - *{contact:email}* is shown if with contact:email~.+. _This option cannot be chosen as answer_ + - *{operator:email}* is shown if with operator:email~.+. _This option cannot be chosen as answer_ + +This tagrendering has labels +`contact` + +### website + +The question is `What is the website of {title()}?` +*{website}* is shown if `website` is set + + - *{contact:website}* is shown if with contact:website~.+. _This option cannot be chosen as answer_ + +This tagrendering has labels +`contact` + +### mastodon +Shows and asks for the mastodon handle +The question is `What is the Mastodon-handle of {title()}?` +*{fediverse_link(contact:mastodon)}* is shown if `contact:mastodon` is set + +### facebook +Shows and asks for the facebook handle +The question is `What is the facebook page of of {title()}?` +*{link(Facebook page,&LBRACEcontact:facebook&RBRACE,,,,)}
Facebook is known to harm mental health, manipulate public opinion and cause hate. Try to use healthier alternatives
* is shown if `contact:facebook` is set + +### item:repair + +The question is `What type of items are repaired here?` + + - *Mobile phones are repaired here* is shown if with service:mobile_phone:repair=yes. Unselecting this answer will add service:mobile_phone:repair=no + - *Computers are repaired here* is shown if with service:computer:repair=yes. Unselecting this answer will add service:computer:repair=no + - *Bicycles are repaired here* is shown if with service:bicycle:repair=yes. Unselecting this answer will add service:bicycle:repair=no + - *Electronic devices are repaired here* is shown if with service:electronics:repair=yes. Unselecting this answer will add service:electronics:repair=no + - *Furniture is repaired here* is shown if with service:furniture:repair=yes. Unselecting this answer will add service:furniture:repair=no + - *Clothes are repaired here* is shown if with service:clothes:repair=yes. Unselecting this answer will add service:clothes:repair=no + +### leftover-questions + +_This tagrendering has no question and is thus read-only_ +*{questions( ,)}* + +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + +### delete-button + +_This tagrendering has no question and is thus read-only_ +*{delete_button()}* + +### lod + +_This tagrendering has no question and is thus read-only_ +*{linked_data_from_website()}* + +This tagrendering has labels +`added_by_default` + + +This document is autogenerated from [assets/themes/cyclofix/cyclofix.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/cyclofix/cyclofix.json) diff --git a/Docs/Layers/bicycle_library.md b/Docs/Layers/bicycle_library.md index 190ed3527..e29329c22 100644 --- a/Docs/Layers/bicycle_library.md +++ b/Docs/Layers/bicycle_library.md @@ -9,8 +9,9 @@ A facility where bicycles can be lent for longer period of times ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [bicycle_library-name](#bicycle_library-name) - [website](#website) @@ -33,6 +34,12 @@ A facility where bicycles can be lent for longer period of times - [cyclofix](https://mapcomplete.org/cyclofix) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a bicycle library** which has the following tags:amenity=bicycle_library + ## Basic tags for this layer Elements must match the expression **amenity=bicycle_library** @@ -52,7 +59,7 @@ Elements must match the expression ** [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | | | [charge](https://wiki.openstreetmap.org/wiki/Key:charge) | [string](../SpecialInputElements.md#string) | [](https://wiki.openstreetmap.org/wiki/Tag:charge%3D) [€20warranty + €20/year](https://wiki.openstreetmap.org/wiki/Tag:charge%3D€20warranty + €20/year) | | [bicycle_library:for](https://wiki.openstreetmap.org/wiki/Key:bicycle_library:for) | Multiple choice | [child](https://wiki.openstreetmap.org/wiki/Tag:bicycle_library:for%3Dchild) [adult](https://wiki.openstreetmap.org/wiki/Tag:bicycle_library:for%3Dadult) [disabled](https://wiki.openstreetmap.org/wiki/Tag:bicycle_library:for%3Ddisabled) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images @@ -77,9 +84,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/bicycle_rental.md b/Docs/Layers/bicycle_rental.md index 4609874ab..3b01c7834 100644 --- a/Docs/Layers/bicycle_rental.md +++ b/Docs/Layers/bicycle_rental.md @@ -9,8 +9,9 @@ Bicycle rental stations ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [bicycle_rental_type](#bicycle_rental_type) - [website](#website) @@ -42,6 +43,14 @@ Bicycle rental stations - [toerisme_vlaanderen](https://mapcomplete.org/toerisme_vlaanderen) - [velopark](https://mapcomplete.org/velopark) +## Presets + +The following options to create new points are included: + +**a bicycle rental shop** which has the following tags:amenity=bicycle_rental & bicycle_rental=shop + +**a bicycle rental** which has the following tags:amenity=bicycle_rental + ## Basic tags for this layer Elements must match **any** of the following expressions: @@ -114,9 +123,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/bicycle_rental_non_docking.md b/Docs/Layers/bicycle_rental_non_docking.md index 0cefc51c3..b7dd214b4 100644 --- a/Docs/Layers/bicycle_rental_non_docking.md +++ b/Docs/Layers/bicycle_rental_non_docking.md @@ -110,9 +110,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/bike_cafe.md b/Docs/Layers/bike_cafe.md index 3a77d65dd..a70ffe169 100644 --- a/Docs/Layers/bike_cafe.md +++ b/Docs/Layers/bike_cafe.md @@ -9,8 +9,9 @@ A bike café is a café geared towards cyclists, for example with services such ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [bike_cafe-name](#bike_cafe-name) - [bike_cafe-bike-pump](#bike_cafe-bike-pump) @@ -22,6 +23,7 @@ A bike café is a café geared towards cyclists, for example with services such - [opening_hours](#opening_hours) - [Opening hours](#opening-hours) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) @@ -30,6 +32,12 @@ A bike café is a café geared towards cyclists, for example with services such - [cyclofix](https://mapcomplete.org/cyclofix) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a bike cafe** which has the following tags:amenity=pub & pub=cycling + ## Basic tags for this layer Elements must match **all** of the following expressions: @@ -98,9 +106,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -128,6 +136,11 @@ The question is `When it this bike café opened?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### delete-button _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/bike_cleaning.md b/Docs/Layers/bike_cleaning.md index d4391f227..4793fcf75 100644 --- a/Docs/Layers/bike_cleaning.md +++ b/Docs/Layers/bike_cleaning.md @@ -9,8 +9,9 @@ A layer showing facilities where one can clean their bike ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [bike_cleaning-service_bicycle_cleaning_charge](#bike_cleaning-service_bicycle_cleaning_charge) - [bike_cleaning-charge](#bike_cleaning-charge) @@ -24,6 +25,12 @@ A layer showing facilities where one can clean their bike - [cyclofix](https://mapcomplete.org/cyclofix) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a bike cleaning service** which has the following tags:amenity=bicycle_wash + ## Basic tags for this layer Elements must match **any** of the following expressions: diff --git a/Docs/Layers/bike_parking.md b/Docs/Layers/bike_parking.md index 9598a0367..59445c1ca 100644 --- a/Docs/Layers/bike_parking.md +++ b/Docs/Layers/bike_parking.md @@ -9,8 +9,9 @@ A layer showing where you can park your bike ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [Bicycle parking type](#bicycle-parking-type) - [Underground?](#underground) @@ -42,6 +43,12 @@ A layer showing where you can park your bike - [transit](https://mapcomplete.org/transit) - [velopark](https://mapcomplete.org/velopark) +## Presets + +The following options to create new points are included: + +**a bike parking** which has the following tags:amenity=bicycle_parking + ## Basic tags for this layer Elements must match the expression **amenity=bicycle_parking** diff --git a/Docs/Layers/bike_repair_station.md b/Docs/Layers/bike_repair_station.md index b11476fa3..0df6f6585 100644 --- a/Docs/Layers/bike_repair_station.md +++ b/Docs/Layers/bike_repair_station.md @@ -9,8 +9,9 @@ A layer showing bicycle pumps and bicycle repair tool stands ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [bike_repair_station-available-services](#bike_repair_station-available-services) - [Operational status](#operational-status) @@ -41,6 +42,16 @@ A layer showing bicycle pumps and bicycle repair tool stands - [toerisme_vlaanderen](https://mapcomplete.org/toerisme_vlaanderen) - [velopark](https://mapcomplete.org/velopark) +## Presets + +The following options to create new points are included: + +**a bike pump** which has the following tags:amenity=bicycle_repair_station & service:bicycle:tools=no & service:bicycle:pump=yes + +**a bike repair station and pump** which has the following tags:amenity=bicycle_repair_station & service:bicycle:tools=yes & service:bicycle:pump=yes + +**a bike repair station without pump** which has the following tags:amenity=bicycle_repair_station & service:bicycle:tools=yes & service:bicycle:pump=no + ## Basic tags for this layer Elements must match the expression **amenity=bicycle_repair_station** diff --git a/Docs/Layers/bike_shop.md b/Docs/Layers/bike_shop.md index 6ddc79e6f..f875ca8e3 100644 --- a/Docs/Layers/bike_shop.md +++ b/Docs/Layers/bike_shop.md @@ -14,7 +14,6 @@ A shop specifically selling bicycles or related items - [images](#images) - [reviews](#reviews) - [shops-name](#shops-name) - - [shop_types](#shop_types) - [brand](#brand) - [second_hand](#second_hand) - [opening_hours](#opening_hours) @@ -32,18 +31,9 @@ A shop specifically selling bicycles or related items - [bike_second_hand](#bike_second_hand) - [repairs_bikes](#repairs_bikes) - [bicycle_rental](#bicycle_rental) - - [bicycle-types](#bicycle-types) - - [rental-capacity-city_bike](#rental-capacity-city_bike) - - [rental-capacity-ebike](#rental-capacity-ebike) - - [rental-capacity-kid_bike](#rental-capacity-kid_bike) - - [rental-capacity-bmx](#rental-capacity-bmx) - - [rental-capacity-mtb](#rental-capacity-mtb) - - [rental-capacity-bicycle_pannier](#rental-capacity-bicycle_pannier) - - [rental-capacity-tandem_bicycle](#rental-capacity-tandem_bicycle) - [bike_pump_service](#bike_pump_service) - [bike_repair_tools](#bike_repair_tools) - [bike_wash](#bike_wash) - - [bike_cleaning-service_bicycle_cleaning_charge](#bike_cleaning-service_bicycle_cleaning_charge) - [internet](#internet) - [internet-fee](#internet-fee) - [internet-ssid](#internet-ssid) @@ -81,7 +71,6 @@ Elements must match **any** of the following expressions: | attribute | type | values which are supported by this layer | -----|-----|----- | | [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | | -| [shop](https://wiki.openstreetmap.org/wiki/Key:shop) | [string](../SpecialInputElements.md#string) | [bicycle_rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle_rental) [agrarian](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dagrarian) [alcohol](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dalcohol) [anime](https://wiki.openstreetmap.org/wiki/Tag:shop%3Danime) [antiques](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dantiques) [appliance](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dappliance) [art](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dart) [baby_goods](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbaby_goods) [bag](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbag) [bakery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbakery) [bathroom_furnishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbathroom_furnishing) [beauty](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeauty) [bed](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbed) [beverages](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeverages) [bicycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle) [boat](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dboat) [bookmaker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbookmaker) [books](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbooks) [brewing_supplies](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbrewing_supplies) [butcher](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbutcher) [camera](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcamera) [candles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcandles) [cannabis](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcannabis) [car](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar) [car_parts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_parts) [car_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_repair) [caravan](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcaravan) [carpet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcarpet) [catalogue](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcatalogue) [charity](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcharity) [cheese](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcheese) [chemist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchemist) [chocolate](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchocolate) [clothes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dclothes) [coffee](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcoffee) [collector](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcollector) [computer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcomputer) [confectionery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery) [convenience](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience) [copyshop](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop) [cosmetics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcosmetics) [country_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcountry_store) [craft](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcraft) [curtain](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain) [dairy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddairy) [deli](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli) [department_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store) [doityourself](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoityourself) [doors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoors) [dry_cleaning](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddry_cleaning) [e-cigarette](https://wiki.openstreetmap.org/wiki/Tag:shop%3De-cigarette) [electrical](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectrical) [electronics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectronics) [erotic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic) [fabric](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric) [farm](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfarm) [fashion_accessories](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfashion_accessories) [fireplace](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfireplace) [fishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfishing) [flooring](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflooring) [florist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflorist) [frame](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe) [frozen_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfrozen_food) [fuel](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuel) [funeral_directors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuneral_directors) [furniture](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfurniture) [games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgames) [garden_centre](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgarden_centre) [gas](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgas) [general](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgeneral) [gift](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgift) [greengrocer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer) [hairdresser](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser) [hairdresser_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser_supply) [hardware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhardware) [health_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhealth_food) [hearing_aids](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids) [herbalist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dherbalist) [hifi](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhifi) [honey](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhoney) [household_linen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhousehold_linen) [houseware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhouseware) [hunting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhunting) [interior_decoration](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dinterior_decoration) [jewelry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry) [kiosk](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkiosk) [kitchen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen) [laundry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlaundry) [leather](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dleather) [lighting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlighting) [locksmith](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlocksmith) [lottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlottery) [mall](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall) [massage](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmassage) [medical_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmedical_supply) [military_surplus](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmilitary_surplus) [mobile_phone](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone) [model](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmodel) [money_lender](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmoney_lender) [motorcycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle) [motorcycle_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle_repair) [music](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusic) [musical_instrument](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument) [newsagent](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnewsagent) [nutrition_supplements](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnutrition_supplements) [nuts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnuts) [optician](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doptician) [outdoor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutdoor) [outpost](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutpost) [paint](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint) [party](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dparty) [pasta](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpasta) [pastry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpastry) [pawnbroker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpawnbroker) [perfumery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dperfumery) [pet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet) [pet_grooming](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet_grooming) [photo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dphoto) [pottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpottery) [printer_ink](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dprinter_ink) [psychic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpsychic) [pyrotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpyrotechnics) [radiotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dradiotechnics) [religion](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dreligion) [rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental) [repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drepair) [rice](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drice) [scuba_diving](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dscuba_diving) [seafood](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood) [second_hand](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsecond_hand) [sewing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsewing) [shoe_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoe_repair) [shoes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoes) [spices](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dspices) [sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports) [stationery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstationery) [storage_rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstorage_rental) [supermarket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket) [swimming_pool](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dswimming_pool) [tailor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtailor) [tattoo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtattoo) [tea](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtea) [telecommunication](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtelecommunication) [ticket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dticket) [tiles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtiles) [tobacco](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtobacco) [tool_hire](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtool_hire) [toys](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtoys) [trade](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrade) [travel_agency](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtravel_agency) [trophy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrophy) [tyres](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtyres) [vacuum_cleaner](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner) [variety_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store) [video](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo) [video_games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo_games) [watches](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwatches) [water](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater) [water_sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater_sports) [weapons](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dweapons) [wholesale](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwholesale) [wigs](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwigs) [window_blind](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind) [wine](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine) | | [brand](https://wiki.openstreetmap.org/wiki/Key:brand) | [string](../SpecialInputElements.md#string) | | | [second_hand](https://wiki.openstreetmap.org/wiki/Key:second_hand) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:second_hand%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:second_hand%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:second_hand%3Dno) | | [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | | @@ -94,18 +83,9 @@ Elements must match **any** of the following expressions: | [service:bicycle:second_hand](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:second_hand) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:second_hand%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:second_hand%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:second_hand%3Donly) | | [service:bicycle:repair](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:repair) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dno) [only_sold](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Donly_sold) [brand](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dbrand) | | [service:bicycle:rental](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:rental) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dno) | -| [rental](https://wiki.openstreetmap.org/wiki/Key:rental) | [string](../SpecialInputElements.md#string) | [city_bike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dcity_bike) [ebike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Debike) [bmx](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dbmx) [mtb](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dmtb) [kid_bike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dkid_bike) [tandem](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dtandem) [racebike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dracebike) [bike_helmet](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dbike_helmet) [cargo_bike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dcargo_bike) | -| [capacity:city_bike](https://wiki.openstreetmap.org/wiki/Key:capacity:city_bike) | [pnat](../SpecialInputElements.md#pnat) | | -| [capacity:ebike](https://wiki.openstreetmap.org/wiki/Key:capacity:ebike) | [pnat](../SpecialInputElements.md#pnat) | | -| [capacity:kid_bike](https://wiki.openstreetmap.org/wiki/Key:capacity:kid_bike) | [pnat](../SpecialInputElements.md#pnat) | | -| [capacity:bmx](https://wiki.openstreetmap.org/wiki/Key:capacity:bmx) | [pnat](../SpecialInputElements.md#pnat) | | -| [capacity:mtb](https://wiki.openstreetmap.org/wiki/Key:capacity:mtb) | [pnat](../SpecialInputElements.md#pnat) | | -| [capacity:bicycle_pannier](https://wiki.openstreetmap.org/wiki/Key:capacity:bicycle_pannier) | [pnat](../SpecialInputElements.md#pnat) | | -| [capacity:tandem_bicycle](https://wiki.openstreetmap.org/wiki/Key:capacity:tandem_bicycle) | [pnat](../SpecialInputElements.md#pnat) | | | [service:bicycle:pump](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:pump) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dno) [separate](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dseparate) | | [service:bicycle:diy](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:diy) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Dno) [only_sold](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Donly_sold) | | [service:bicycle:cleaning](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning%3Dyes) [diy](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning%3Ddiy) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning%3Dno) | -| [service:bicycle:cleaning:charge](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:charge) | [string](../SpecialInputElements.md#string) | | | [internet_access](https://wiki.openstreetmap.org/wiki/Key:internet_access) | Multiple choice | [wlan](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno) [terminal](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal) [wired](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired) | | [internet_access:fee](https://wiki.openstreetmap.org/wiki/Key:internet_access:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno) [customers](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers) | | [internet_access:ssid](https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid) | [string](../SpecialInputElements.md#string) | [Telekom](https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom) | @@ -130,179 +110,6 @@ _This tagrendering has no question and is thus read-only_ The question is `What is the name of this shop?` *This shop is called {name}* is shown if `name` is set -### shop_types - -The question is `What kind of shop is this?` -*This is a {shop}* is shown if `shop` is set - - - *Bicycle rental shop* is shown if with shop=bicycle_rental - - *Farm Supply Shop* is shown if with shop=agrarian - - *Liquor Store* is shown if with shop=alcohol - - *Anime / Manga Shop* is shown if with shop=anime - - *Antique Shop* is shown if with shop=antiques - - *Appliance Store* is shown if with shop=appliance - - *Art Store* is shown if with shop=art - - *Baby Goods Store* is shown if with shop=baby_goods - - *Bag/Luggage Store* is shown if with shop=bag - - *Bakery* is shown if with shop=bakery - - *Bathroom Furnishing Store* is shown if with shop=bathroom_furnishing - - *Beauty Shop* is shown if with shop=beauty - - *Bedding/Mattress Store* is shown if with shop=bed - - *Beverage Store* is shown if with shop=beverages - - *Bicycle Shop* is shown if with shop=bicycle - - *Boat Store* is shown if with shop=boat - - *Bookmaker* is shown if with shop=bookmaker - - *Bookstore* is shown if with shop=books - - *Brewing Supply Store* is shown if with shop=brewing_supplies - - *Butcher* is shown if with shop=butcher - - *Camera Equipment Store* is shown if with shop=camera - - *Candle Shop* is shown if with shop=candles - - *Cannabis Shop* is shown if with shop=cannabis - - *Car Dealership* is shown if with shop=car - - *Car Parts Store* is shown if with shop=car_parts - - *Car Repair Shop* is shown if with shop=car_repair - - *RV Dealership* is shown if with shop=caravan - - *Carpet Store* is shown if with shop=carpet - - *Catalog Shop* is shown if with shop=catalogue - - *Charity Store* is shown if with shop=charity - - *Cheese Store* is shown if with shop=cheese - - *Drugstore* is shown if with shop=chemist - - *Chocolate Store* is shown if with shop=chocolate - - *Clothing Store* is shown if with shop=clothes - - *Coffee Store* is shown if with shop=coffee - - *Collectibles Shop* is shown if with shop=collector - - *Computer Store* is shown if with shop=computer - - *Candy Store* is shown if with shop=confectionery - - *Convenience Store* is shown if with shop=convenience - - *Copy Store* is shown if with shop=copyshop - - *Cosmetics Store* is shown if with shop=cosmetics - - *Rural Supplies Store* is shown if with shop=country_store - - *Arts & Crafts Store* is shown if with shop=craft - - *Curtain Store* is shown if with shop=curtain - - *Dairy Store* is shown if with shop=dairy - - *Delicatessen* is shown if with shop=deli - - *Department Store* is shown if with shop=department_store - - *DIY Store* is shown if with shop=doityourself - - *Door Shop* is shown if with shop=doors - - *Dry Cleaner* is shown if with shop=dry_cleaning - - *E-Cigarette Shop* is shown if with shop=e-cigarette - - *Electrical Equipment Store* is shown if with shop=electrical - - *Electronics Store* is shown if with shop=electronics - - *Erotic Store* is shown if with shop=erotic - - *Fabric Store* is shown if with shop=fabric - - *Produce Stand* is shown if with shop=farm - - *Fashion Accessories Store* is shown if with shop=fashion_accessories - - *Fireplace Store* is shown if with shop=fireplace - - *Fishing Shop* is shown if with shop=fishing - - *Flooring Supply Shop* is shown if with shop=flooring - - *Florist* is shown if with shop=florist - - *Framing Shop* is shown if with shop=frame - - *Frozen Food Store* is shown if with shop=frozen_food - - *Fuel Shop* is shown if with shop=fuel - - *Funeral Home* is shown if with shop=funeral_directors - - *Furniture Store* is shown if with shop=furniture - - *Tabletop Game Store* is shown if with shop=games - - *Garden Center* is shown if with shop=garden_centre - - *Bottled Gas Shop* is shown if with shop=gas - - *General Store* is shown if with shop=general - - *Gift Shop* is shown if with shop=gift - - *Greengrocer* is shown if with shop=greengrocer - - *Hairdresser* is shown if with shop=hairdresser - - *Hairdresser Supply Store* is shown if with shop=hairdresser_supply - - *Hardware Store* is shown if with shop=hardware - - *Health Food Store* is shown if with shop=health_food - - *Hearing Aids Store* is shown if with shop=hearing_aids - - *Herbalist* is shown if with shop=herbalist - - *Hifi Store* is shown if with shop=hifi - - *Honey Store* is shown if with shop=honey - - *Household Linen Shop* is shown if with shop=household_linen - - *Houseware Store* is shown if with shop=houseware - - *Hunting Shop* is shown if with shop=hunting - - *Interior Decoration Store* is shown if with shop=interior_decoration - - *Jewelry Store* is shown if with shop=jewelry - - *Kiosk* is shown if with shop=kiosk - - *Kitchen Design Store* is shown if with shop=kitchen - - *Laundry* is shown if with shop=laundry - - *Leather Store* is shown if with shop=leather - - *Lighting Store* is shown if with shop=lighting - - *Locksmith* is shown if with shop=locksmith - - *Lottery Shop* is shown if with shop=lottery - - *Mall* is shown if with shop=mall - - *Massage Shop* is shown if with shop=massage - - *Medical Supply Store* is shown if with shop=medical_supply - - *Military Surplus Store* is shown if with shop=military_surplus - - *Mobile Phone Store* is shown if with shop=mobile_phone - - *Model Shop* is shown if with shop=model - - *Money Lender* is shown if with shop=money_lender - - *Motorcycle Dealership* is shown if with shop=motorcycle - - *Motorcycle Repair Shop* is shown if with shop=motorcycle_repair - - *Music Store* is shown if with shop=music - - *Musical Instrument Store* is shown if with shop=musical_instrument - - *Newsstand* is shown if with shop=newsagent - - *Nutrition Supplements Store* is shown if with shop=nutrition_supplements - - *Nuts Shop* is shown if with shop=nuts - - *Optician* is shown if with shop=optician - - *Outdoors Store* is shown if with shop=outdoor - - *Online Retailer Outpost* is shown if with shop=outpost - - *Paint Store* is shown if with shop=paint - - *Party Supply Store* is shown if with shop=party - - *Pasta Store* is shown if with shop=pasta - - *Pastry Shop* is shown if with shop=pastry - - *Pawnshop* is shown if with shop=pawnbroker - - *Perfume Store* is shown if with shop=perfumery - - *Pet Store* is shown if with shop=pet - - *Pet Groomer* is shown if with shop=pet_grooming - - *Photography Store* is shown if with shop=photo - - *Pottery Store* is shown if with shop=pottery - - *Printer Ink Store* is shown if with shop=printer_ink - - *Psychic* is shown if with shop=psychic - - *Fireworks Store* is shown if with shop=pyrotechnics - - *Radio/Electronic Component Store* is shown if with shop=radiotechnics - - *Religious Store* is shown if with shop=religion - - *Rental Shop* is shown if with shop=rental - - *Repair Shop* is shown if with shop=repair - - *Rice Store* is shown if with shop=rice - - *Scuba Diving Shop* is shown if with shop=scuba_diving - - *Seafood Shop* is shown if with shop=seafood - - *Thrift Store* is shown if with shop=second_hand - - *Sewing Supply Shop* is shown if with shop=sewing - - *Shoe Repair Shop* is shown if with shop=shoe_repair - - *Shoe Store* is shown if with shop=shoes - - *Spice Shop* is shown if with shop=spices - - *Sporting Goods Store* is shown if with shop=sports - - *Stationery Store* is shown if with shop=stationery - - *Storage Rental* is shown if with shop=storage_rental - - *Supermarket* is shown if with shop=supermarket - - *Pool Supply Store* is shown if with shop=swimming_pool - - *Tailor* is shown if with shop=tailor - - *Tattoo Parlor* is shown if with shop=tattoo - - *Tea Store* is shown if with shop=tea - - *Telecom Retail Store* is shown if with shop=telecommunication - - *Ticket Seller* is shown if with shop=ticket - - *Tile Shop* is shown if with shop=tiles - - *Tobacco Shop* is shown if with shop=tobacco - - *Tool Rental* is shown if with shop=tool_hire - - *Toy Store* is shown if with shop=toys - - *Trade Shop* is shown if with shop=trade - - *Travel Agency* is shown if with shop=travel_agency - - *Trophy Shop* is shown if with shop=trophy - - *Tire Store* is shown if with shop=tyres - - *Vacuum Cleaner Store* is shown if with shop=vacuum_cleaner - - *Discount Store* is shown if with shop=variety_store - - *Video Store* is shown if with shop=video - - *Video Game Store* is shown if with shop=video_games - - *Watches Shop* is shown if with shop=watches - - *Drinking Water Shop* is shown if with shop=water - - *Watersport/Swim Shop* is shown if with shop=water_sports - - *Weapon Shop* is shown if with shop=weapons - - *Wholesale Store* is shown if with shop=wholesale - - *Wig Shop* is shown if with shop=wigs - - *Window Blind Store* is shown if with shop=window_blind - - *Wine Shop* is shown if with shop=wine - -This tagrendering has labels -`description` - ### brand The question is `What is the brand of this shop?` @@ -351,9 +158,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -459,88 +266,6 @@ The question is `Does this shop rent out bikes?` This tagrendering is only visible in the popup if the following condition is met: shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental | service:bicycle:rental~.+ -### bicycle-types - -The question is `What kind of bicycles and accessories are rented here?` -*{rental} is rented here* is shown if `rental` is set - - - *Normal city bikes can be rented here* is shown if with rental=city_bike - - *Electrical bikes can be rented here* is shown if with rental=ebike - - *BMX bikes can be rented here* is shown if with rental=bmx - - *Mountainbikes can be rented here* is shown if with rental=mtb - - *Bikes for children can be rented here* is shown if with rental=kid_bike - - *Tandem bicycles can be rented here* is shown if with rental=tandem - - *Race bicycles can be rented here* is shown if with rental=racebike - - *Bike helmets can be rented here* is shown if with rental=bike_helmet - - *Cargo bikes can be rented here* is shown if with rental=cargo_bike - -This tagrendering is only visible in the popup if the following condition is met: service:bicycle:rental=yes | bicycle_rental~.+ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-city_bike - -The question is `How many city bikes can be rented here?` -*{capacity:city_bike} city bikes can be rented here* is shown if `capacity:city_bike` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*city_bike.*)$ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-ebike - -The question is `How many electrical bikes can be rented here?` -*{capacity:ebike} electrical bikes can be rented here* is shown if `capacity:ebike` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*ebike.*)$ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-kid_bike - -The question is `How many bikes for children can be rented here?` -*{capacity:kid_bike} bikes for children can be rented here* is shown if `capacity:kid_bike` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*kid_bike.*)$ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-bmx - -The question is `How many BMX bikes can be rented here?` -*{capacity:bmx} BMX bikes can be rented here* is shown if `capacity:bmx` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*bmx.*)$ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-mtb - -The question is `How many mountainbikes can be rented here?` -*{capacity:mtb} mountainbikes can be rented here* is shown if `capacity:mtb` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*mtb.*)$ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-bicycle_pannier - -The question is `How many bicycle panniers can be rented here?` -*{capacity:bicycle_pannier} bicycle panniers can be rented here* is shown if `capacity:bicycle_pannier` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*bicycle_pannier.*)$ -This tagrendering has labels -`bicycle_rental` - -### rental-capacity-tandem_bicycle - -The question is `How many tandem can be rented here?` -*{capacity:tandem_bicycle} tandem can be rented here* is shown if `capacity:tandem_bicycle` is set - -This tagrendering is only visible in the popup if the following condition is met: (service:bicycle:rental=yes | bicycle_rental~.+) & rental~^(.*tandem_bicycle.*)$ -This tagrendering has labels -`bicycle_rental` - ### bike_pump_service The question is `Does this shop offer a bike pump for use by anyone?` @@ -571,16 +296,6 @@ The question is `Are bicycles washed here?` This tagrendering is only visible in the popup if the following condition is met: shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$ | service:bicycle:cleaning~.+ -### bike_cleaning-service_bicycle_cleaning_charge - -The question is `How much does it cost to use the cleaning service?` -*Using the cleaning service costs {service:bicycle:cleaning:charge}* is shown if `service:bicycle:cleaning:charge` is set - - - *The cleaning service is free to use* is shown if with service:bicycle:cleaning:fee=no - - *Free to use* is shown if with service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge=. _This option cannot be chosen as answer_ - -This tagrendering is only visible in the popup if the following condition is met: amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+ - ### internet The question is `Does this place offer internet access?` diff --git a/Docs/Layers/bike_themed_object.md b/Docs/Layers/bike_themed_object.md index 050004de1..659f5a2e4 100644 --- a/Docs/Layers/bike_themed_object.md +++ b/Docs/Layers/bike_themed_object.md @@ -48,7 +48,7 @@ Elements must match **any** of the following expressions: | attribute | type | values which are supported by this layer | -----|-----|----- | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | | [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | | | [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | | | [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | | @@ -88,9 +88,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/binocular.md b/Docs/Layers/binocular.md index 470c7f086..e8f426899 100644 --- a/Docs/Layers/binocular.md +++ b/Docs/Layers/binocular.md @@ -9,8 +9,9 @@ Binoculars ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [binocular-charge](#binocular-charge) - [binocular-direction](#binocular-direction) @@ -25,6 +26,12 @@ Binoculars - [personal](https://mapcomplete.org/personal) - [ski](https://mapcomplete.org/ski) +## Presets + +The following options to create new points are included: + +**a binocular** which has the following tags:amenity=binoculars + ## Basic tags for this layer Elements must match the expression **amenity=binoculars** diff --git a/Docs/Layers/birdhide.md b/Docs/Layers/birdhide.md index 9df6c5074..3ad6ece07 100644 --- a/Docs/Layers/birdhide.md +++ b/Docs/Layers/birdhide.md @@ -9,8 +9,9 @@ A birdhide ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [bird-hide-shelter-or-wall](#bird-hide-shelter-or-wall) - [bird-hide-wheelchair](#bird-hide-wheelchair) @@ -19,13 +20,21 @@ A birdhide - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer - [nature](https://mapcomplete.org/nature) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a birdhide** which has the following tags:leisure=bird_hide & building=yes & shelter=yes & amenity=shelter + +**a bird blind** which has the following tags:leisure=bird_hide & building=no & shelter=no + ## Basic tags for this layer Elements must match the expression **leisure=bird_hide** diff --git a/Docs/Layers/brothel.md b/Docs/Layers/brothel.md index 9b7a1b9ac..dd0338c61 100644 --- a/Docs/Layers/brothel.md +++ b/Docs/Layers/brothel.md @@ -9,8 +9,9 @@ An establishment specifically dedicated to prostitution. ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [reviews](#reviews) - [name](#name) @@ -28,6 +29,12 @@ An establishment specifically dedicated to prostitution. - [openlovemap](https://mapcomplete.org/openlovemap) +## Presets + +The following options to create new points are included: + +**a brothel** which has the following tags:amenity=brothel + ## Basic tags for this layer Elements must match the expression **amenity=brothel** @@ -71,9 +78,9 @@ The question is `What are the opening hours of {title()}?` ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/cafe_pub.md b/Docs/Layers/cafe_pub.md index 70e1ec2a0..40a047d1e 100644 --- a/Docs/Layers/cafe_pub.md +++ b/Docs/Layers/cafe_pub.md @@ -9,8 +9,9 @@ A layer showing cafés and pubs where one can gather around a drink. The layer a ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [repeated](#repeated) - [single_level](#single_level) @@ -34,7 +35,7 @@ A layer showing cafés and pubs where one can gather around a drink. The layer a - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -43,6 +44,18 @@ A layer showing cafés and pubs where one can gather around a drink. The layer a - [personal](https://mapcomplete.org/personal) - [stations](https://mapcomplete.org/stations) +## Presets + +The following options to create new points are included: + +**a pub** which has the following tags:amenity=pub + +**a bar** which has the following tags:amenity=bar + +**a cafe** which has the following tags:amenity=cafe + +**a nightclub or disco** which has the following tags:amenity=nightclub + ## Basic tags for this layer Elements must match **any** of the following expressions: @@ -151,9 +164,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -234,7 +247,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` diff --git a/Docs/Layers/car_rental.md b/Docs/Layers/car_rental.md index 6aaad46b7..763b0ea88 100644 --- a/Docs/Layers/car_rental.md +++ b/Docs/Layers/car_rental.md @@ -9,8 +9,9 @@ Places where you can rent a car ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [name](#name) - [website](#website) @@ -21,12 +22,18 @@ Places where you can rent a car - [leftover-questions](#leftover-questions) - [move-button](#move-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer - [stations](https://mapcomplete.org/stations) +## Presets + +The following options to create new points are included: + +**a car rental** which has the following tags:amenity=car_rental + ## Basic tags for this layer Elements must match the expression **amenity=car_rental** @@ -81,9 +88,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/caravansites.md b/Docs/Layers/caravansites.md index 34d33d444..3f6d16339 100644 --- a/Docs/Layers/caravansites.md +++ b/Docs/Layers/caravansites.md @@ -25,13 +25,13 @@ camper sites - [caravansites-description](#caravansites-description) - [questions](#questions) - [reviews](#reviews) + - [move-button](#move-button) - [lod](#lod) - - [operator](#operator) - - [power_supply](#power_supply) ## Themes using this layer - [campersite](https://mapcomplete.org/campersite) + - [personal](https://mapcomplete.org/personal) ## Basic tags for this layer @@ -59,8 +59,6 @@ Elements must match **all** of the following expressions: | [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | | | [permanent_camping](https://wiki.openstreetmap.org/wiki/Key:permanent_camping) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:permanent_camping%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:permanent_camping%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:permanent_camping%3Donly) | | [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | -| [operator](https://wiki.openstreetmap.org/wiki/Key:operator) | [string](../SpecialInputElements.md#string) | | -| [power_supply](https://wiki.openstreetmap.org/wiki/Key:power_supply) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:power_supply%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:power_supply%3Dno) | ### images This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images @@ -150,6 +148,11 @@ Shows the reviews module (including the possibility to leave a review) _This tagrendering has no question and is thus read-only_ *{create_review()}{list_reviews()}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ @@ -158,18 +161,5 @@ _This tagrendering has no question and is thus read-only_ This tagrendering has labels `added_by_default` -### operator -The question is `Who operates this place?` -*This place is operated by {operator}* is shown if `operator` is set - -### power_supply - -The question is `Does this place have a power supply?` - - - *This place has a power supply* is shown if with power_supply=yes - - *This place does not have power supply* is shown if with power_supply=no - - - -This document is autogenerated from [assets/themes/campersite/campersite.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/campersite/campersite.json) +This document is autogenerated from [assets/layers/caravansites/caravansites.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/caravansites/caravansites.json) diff --git a/Docs/Layers/charging_station.md b/Docs/Layers/charging_station.md index 48a6437bf..81ee3542c 100644 --- a/Docs/Layers/charging_station.md +++ b/Docs/Layers/charging_station.md @@ -9,8 +9,9 @@ A charging station ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [Type](#type) - [access](#access) @@ -124,7 +125,7 @@ A charging station - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -134,6 +135,14 @@ A charging station - [personal](https://mapcomplete.org/personal) - [toerisme_vlaanderen](https://mapcomplete.org/toerisme_vlaanderen) +## Presets + +The following options to create new points are included: + +**charging station for electrical bikes** which has the following tags:amenity=charging_station & motorcar=no & bicycle=yes + +**charging station for cars** which has the following tags:amenity=charging_station & motorcar=yes & bicycle=no + ## Basic tags for this layer Elements must match **any** of the following expressions: diff --git a/Docs/Layers/cinema.md b/Docs/Layers/cinema.md index 6547de4cf..5ea4055fb 100644 --- a/Docs/Layers/cinema.md +++ b/Docs/Layers/cinema.md @@ -19,6 +19,7 @@ - [wikipedia](#wikipedia) - [cinema_type](#cinema_type) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -56,9 +57,9 @@ _This tagrendering has no question and is thus read-only_ ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -104,6 +105,11 @@ The question is `What type of cinema is this?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/climbing_area.md b/Docs/Layers/climbing_area.md index 710895b1a..d487e14d1 100644 --- a/Docs/Layers/climbing_area.md +++ b/Docs/Layers/climbing_area.md @@ -10,8 +10,9 @@ An area where climbing is possible, e.g. a crag, site, boulder, … Contains agg ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [minimap](#minimap) - [Contained routes length hist](#contained-routes-length-hist) @@ -35,6 +36,12 @@ An area where climbing is possible, e.g. a crag, site, boulder, … Contains agg - [climbing](https://mapcomplete.org/climbing) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a climbing opportunity** which has the following tags:sport=climbing + ## Basic tags for this layer Elements must match **all** of the following expressions: diff --git a/Docs/Layers/climbing_club.md b/Docs/Layers/climbing_club.md index 6ae6adbf7..459974dc2 100644 --- a/Docs/Layers/climbing_club.md +++ b/Docs/Layers/climbing_club.md @@ -9,8 +9,9 @@ A climbing club or organisation ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [climbing_club-name](#climbing_club-name) - [website](#website) - [email](#email) @@ -18,6 +19,7 @@ A climbing club or organisation - [opening_hours](#opening_hours) - [Opening hours](#opening-hours) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -25,6 +27,14 @@ A climbing club or organisation - [climbing](https://mapcomplete.org/climbing) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a climbing club** which has the following tags:club=sport & sport=climbing + +**a climbing ngo** which has the following tags:office=ngo & sport=climbing + ## Basic tags for this layer Elements must match **any** of the following expressions: @@ -75,9 +85,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -94,6 +104,11 @@ The question is `What are the opening hours of {title()}?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/climbing_gym.md b/Docs/Layers/climbing_gym.md index 1b8f9b971..852c3ea9f 100644 --- a/Docs/Layers/climbing_gym.md +++ b/Docs/Layers/climbing_gym.md @@ -9,8 +9,9 @@ A climbing gym ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [name](#name) - [website](#website) @@ -38,6 +39,7 @@ A climbing gym - [internet-fee](#internet-fee) - [internet-ssid](#internet-ssid) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -45,6 +47,12 @@ A climbing gym - [climbing](https://mapcomplete.org/climbing) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**Climbing gym** which has the following tags:leisure=sports_centre & sport=climbing + ## Basic tags for this layer Elements must match **all** of the following expressions: @@ -105,9 +113,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -284,7 +292,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -293,6 +301,11 @@ This tagrendering has labels _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/climbing_route.md b/Docs/Layers/climbing_route.md index 8e6e0bd8f..20370ddd7 100644 --- a/Docs/Layers/climbing_route.md +++ b/Docs/Layers/climbing_route.md @@ -11,8 +11,9 @@ A single climbing route and its properties. Some properties are derived from the ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [Name](#name) - [Length](#length) @@ -21,6 +22,7 @@ A single climbing route and its properties. Some properties are derived from the - [description](#description) - [Rock type via embedded feature](#rock-type-via-embedded-feature) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -28,6 +30,12 @@ A single climbing route and its properties. Some properties are derived from the - [climbing](https://mapcomplete.org/climbing) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a climbing route** which has the following tags:sport=climbing & climbing=route (snaps to layers `climbing_opportunity`) + ## Basic tags for this layer Elements must match the expression **climbing=route** @@ -44,7 +52,7 @@ Elements must match the expression ** [climbing:length](https://wiki.openstreetmap.org/wiki/Key:climbing:length) | [pnat](../SpecialInputElements.md#pnat) | | | [climbing:grade:french](https://wiki.openstreetmap.org/wiki/Key:climbing:grade:french) | [string](../SpecialInputElements.md#string) | | | [climbing:bolts](https://wiki.openstreetmap.org/wiki/Key:climbing:bolts) | [pnat](../SpecialInputElements.md#pnat) | | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | | [_embedding_features_with_rock:rock](https://wiki.openstreetmap.org/wiki/Key:_embedding_features_with_rock:rock) | [string](../SpecialInputElements.md#string) | | ### images @@ -91,6 +99,11 @@ _This tagrendering has no question and is thus read-only_ _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/clock.md b/Docs/Layers/clock.md index 5679ffeb6..8dc1985e5 100644 --- a/Docs/Layers/clock.md +++ b/Docs/Layers/clock.md @@ -10,8 +10,9 @@ Layer with public clocks ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [support](#support) - [display](#display) @@ -25,7 +26,7 @@ Layer with public clocks - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -33,6 +34,14 @@ Layer with public clocks - [personal](https://mapcomplete.org/personal) - [stations](https://mapcomplete.org/stations) +## Presets + +The following options to create new points are included: + +**a clock** which has the following tags:amenity=clock + +**a wall-mounted clock** which has the following tags:amenity=clock & support=wall_mounted (snaps to layers `walls_and_buildings`) + ## Basic tags for this layer Elements must match the expression **amenity=clock** diff --git a/Docs/Layers/crossings.md b/Docs/Layers/crossings.md index 9148efab2..2671ed945 100644 --- a/Docs/Layers/crossings.md +++ b/Docs/Layers/crossings.md @@ -11,8 +11,9 @@ Crossings for pedestrians and cyclists ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [crossing-type](#crossing-type) - [crossing-is-zebra](#crossing-is-zebra) @@ -27,8 +28,9 @@ Crossings for pedestrians and cyclists - [crossing-right-turn-through-red](#crossing-right-turn-through-red) - [crossing-continue-through-red](#crossing-continue-through-red) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -36,6 +38,14 @@ Crossings for pedestrians and cyclists - [cycle_infra](https://mapcomplete.org/cycle_infra) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a crossing** which has the following tags:highway=crossing (snaps to layers `cycleways_and_roads`) + +**a traffic signal** which has the following tags:highway=traffic_signals (snaps to layers `cycleways_and_roads`) + ## Basic tags for this layer Elements must match **any** of the following expressions: @@ -189,6 +199,11 @@ This tagrendering is only visible in the popup if the following condition is met _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/crossings_no_traffic_lights.md b/Docs/Layers/crossings_no_traffic_lights.md index c7d77bc76..e14cd8f90 100644 --- a/Docs/Layers/crossings_no_traffic_lights.md +++ b/Docs/Layers/crossings_no_traffic_lights.md @@ -12,8 +12,9 @@ Crossings for pedestrians and cyclists ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [crossing-type](#crossing-type) - [crossing-is-zebra](#crossing-is-zebra) @@ -28,13 +29,20 @@ Crossings for pedestrians and cyclists - [crossing-right-turn-through-red](#crossing-right-turn-through-red) - [crossing-continue-through-red](#crossing-continue-through-red) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer - [kerbs_and_crossings](https://mapcomplete.org/kerbs_and_crossings) +## Presets + +The following options to create new points are included: + +**a crossing** which has the following tags:highway=crossing (snaps to layers `cycleways_and_roads`) + ## Basic tags for this layer Elements must match the expression **highway=crossing** @@ -185,6 +193,11 @@ This tagrendering is only visible in the popup if the following condition is met _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/defibrillator.md b/Docs/Layers/defibrillator.md index 9cbf2163f..c013e21d7 100644 --- a/Docs/Layers/defibrillator.md +++ b/Docs/Layers/defibrillator.md @@ -10,8 +10,9 @@ A layer showing defibrillators which can be used in case of emergency. This cont ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [defibrillator-indoors](#defibrillator-indoors) - [defibrillator-access](#defibrillator-access) @@ -33,13 +34,21 @@ A layer showing defibrillators which can be used in case of emergency. This cont - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer - [aed](https://mapcomplete.org/aed) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a defibrillator** which has the following tags:emergency=defibrillator + +**a defibrillator mounted on a wall** which has the following tags:emergency=defibrillator (snaps to layers `walls_and_buildings`) + ## Basic tags for this layer Elements must match the expression **emergency=defibrillator** diff --git a/Docs/Layers/dentist.md b/Docs/Layers/dentist.md index 8a303dd53..674e871ca 100644 --- a/Docs/Layers/dentist.md +++ b/Docs/Layers/dentist.md @@ -9,8 +9,9 @@ This layer shows dentist offices ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [opening_hours](#opening_hours) - [Opening hours](#opening-hours) @@ -22,13 +23,19 @@ This layer shows dentist offices - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer - [healthcare](https://mapcomplete.org/healthcare) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a dentists office** which has the following tags:amenity=dentist + ## Basic tags for this layer Elements must match the expression **amenity=dentist** @@ -62,9 +69,9 @@ The question is `What are the opening hours of {title()}?` ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/disaster_response.md b/Docs/Layers/disaster_response.md index 9052e3b62..f2cfa09e5 100644 --- a/Docs/Layers/disaster_response.md +++ b/Docs/Layers/disaster_response.md @@ -9,12 +9,14 @@ This layer contains organizations that have the main objective to help the civil ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [website](#website) - [disaster_response_name](#disaster_response_name) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -22,6 +24,12 @@ This layer contains organizations that have the main objective to help the civil - [disaster_response](https://mapcomplete.org/disaster_response) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a disaster response organization** which has the following tags:emergency=disaster_response + ## Basic tags for this layer Elements must match the expression **emergency=disaster_response** @@ -62,6 +70,11 @@ The question is `What is the name of this organization?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/doctors.md b/Docs/Layers/doctors.md index 58076e234..792566c74 100644 --- a/Docs/Layers/doctors.md +++ b/Docs/Layers/doctors.md @@ -9,8 +9,9 @@ This layer shows doctor offices ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [name](#name) - [opening_hours_by_appointment](#opening_hours_by_appointment) @@ -23,7 +24,7 @@ This layer shows doctor offices - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -31,6 +32,12 @@ This layer shows doctor offices - [onwheels](https://mapcomplete.org/onwheels) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a doctors office** which has the following tags:amenity=doctors + ## Basic tags for this layer Elements must match the expression **amenity=doctors** @@ -72,9 +79,9 @@ The question is `What are the opening hours of {title()}?` ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/dogfoodb.md b/Docs/Layers/dogfoodb.md index 77b8ea46e..26c79aa39 100644 --- a/Docs/Layers/dogfoodb.md +++ b/Docs/Layers/dogfoodb.md @@ -84,7 +84,7 @@ Elements must match **all** of the following expressions: | [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | | | [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) | | [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) | -| [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) | +| [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) [mexican ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican ) [japanese ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese ) [chicken ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken ) [seafood ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood ) | | [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) | | | [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) | | [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) | @@ -161,9 +161,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -213,21 +213,25 @@ The question is `Is this place accessible with a wheelchair?` The question is `What kind of food is served here?` *This place mostly serves {cuisine}* is shown if `cuisine` is set - - *This is a pizzeria* is shown if with cuisine=pizza - - *This is a friture* is shown if with cuisine=friture - - *Mainly serves pasta* is shown if with cuisine=pasta - - *This is kebab shop* is shown if with cuisine=kebab - - *This is a sandwich shop* is shown if with cuisine=sandwich - - *Burgers are served here* is shown if with cuisine=burger - - *Sushi is served here* is shown if with cuisine=sushi - - *Coffee is served here* is shown if with cuisine=coffee - - *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with cuisine=italian - - *French dishes are served here* is shown if with cuisine=french - - *Chinese dishes are served here* is shown if with cuisine=chinese - - *Greek dishes are served here* is shown if with cuisine=greek - - *Indian dishes are served here* is shown if with cuisine=indian - - *Turkish dishes are served here* is shown if with cuisine=turkish - - *Thai dishes are served here* is shown if with cuisine=thai + - *This is a pizzeria* is shown if with cuisine=pizza + - *This is a friture* is shown if with cuisine=friture + - *Mainly serves pasta* is shown if with cuisine=pasta + - *This is kebab shop* is shown if with cuisine=kebab + - *This is a sandwich shop* is shown if with cuisine=sandwich + - *Burgers are served here* is shown if with cuisine=burger + - *Sushi is served here* is shown if with cuisine=sushi + - *Coffee is served here* is shown if with cuisine=coffee + - *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with cuisine=italian + - *French dishes are served here* is shown if with cuisine=french + - *Chinese dishes are served here* is shown if with cuisine=chinese + - *Greek dishes are served here* is shown if with cuisine=greek + - *Indian dishes are served here* is shown if with cuisine=indian + - *Turkish dishes are served here* is shown if with cuisine=turkish + - *Thai dishes are served here* is shown if with cuisine=thai + - *Mexican dishes are served here* is shown if with cuisine=mexican + - *Japanese dishes are served here* is shown if with cuisine=japanese + - *Chicken based dishes are served here* is shown if with cuisine=chicken + - *Seafood dishes are served here* is shown if with cuisine=seafood ### show-menu-image @@ -449,7 +453,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -534,6 +538,29 @@ This tagrendering has labels | dogs.1 | Dogs allowed | dog=unleashed | dog=yes | | dogs.2 | No dogs allowed | dog=no | +| id | question | osmTags | +-----|-----|----- | +| Cuisine.0 | *What kind of food is served here?* (default) | | +| Cuisine.1 | This is a pizzeria | cuisine=pizza | +| Cuisine.2 | This is a friture | cuisine=friture | +| Cuisine.3 | Mainly serves pasta | cuisine=pasta | +| Cuisine.4 | This is kebab shop | cuisine=kebab | +| Cuisine.5 | This is a sandwich shop | cuisine=sandwich | +| Cuisine.6 | Burgers are served here | cuisine=burger | +| Cuisine.7 | Sushi is served here | cuisine=sushi | +| Cuisine.8 | Coffee is served here | cuisine=coffee | +| Cuisine.9 | This is an Italian restaurant (which serves more than pasta and pizza) | cuisine=italian | +| Cuisine.10 | French dishes are served here | cuisine=french | +| Cuisine.11 | Chinese dishes are served here | cuisine=chinese | +| Cuisine.12 | Greek dishes are served here | cuisine=greek | +| Cuisine.13 | Indian dishes are served here | cuisine=indian | +| Cuisine.14 | Turkish dishes are served here | cuisine=turkish | +| Cuisine.15 | Thai dishes are served here | cuisine=thai | +| Cuisine.16 | Mexican dishes are served here | cuisine=mexican | +| Cuisine.17 | Japanese dishes are served here | cuisine=japanese | +| Cuisine.18 | Chicken based dishes are served here | cuisine=chicken | +| Cuisine.19 | Seafood dishes are served here | cuisine=seafood | + | id | question | osmTags | -----|-----|----- | | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired | diff --git a/Docs/Layers/dogpark.md b/Docs/Layers/dogpark.md index 3fb130663..49d1c565d 100644 --- a/Docs/Layers/dogpark.md +++ b/Docs/Layers/dogpark.md @@ -9,8 +9,9 @@ A layer showing dogparks, which are areas where dog are allowed to run without a ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [reviews](#reviews) - [Name](#name) @@ -21,6 +22,7 @@ A layer showing dogparks, which are areas where dog are allowed to run without a - [smalldogs](#smalldogs) - [dogarea](#dogarea) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -28,6 +30,12 @@ A layer showing dogparks, which are areas where dog are allowed to run without a - [personal](https://mapcomplete.org/personal) - [pets](https://mapcomplete.org/pets) +## Presets + +The following options to create new points are included: + +**a dog park** which has the following tags:leisure=dog_park + ## Basic tags for this layer Elements must match **any** of the following expressions: @@ -106,6 +114,11 @@ _This tagrendering has no question and is thus read-only_ _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/dogshop.md b/Docs/Layers/dogshop.md index 8e207634b..67e6e56c3 100644 --- a/Docs/Layers/dogshop.md +++ b/Docs/Layers/dogshop.md @@ -112,7 +112,7 @@ Elements must match **all** of the following expressions: | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images @@ -299,6 +299,9 @@ The question is `What kind of shop is this?` - *Window Blind Store* is shown if with shop=window_blind - *Wine Shop* is shown if with shop=wine +This tagrendering has labels +`description` + ### brand The question is `What is the brand of this shop?` @@ -347,9 +350,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -609,7 +612,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -696,14 +699,6 @@ This tagrendering has labels -----|-----|----- | | open_now.0 | Open now | _isOpen=yes | -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-type.0 | Only show shops selling {search} | | search (string) | - -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-name.0 | Only show shops with name {search} | | search (string) | - | id | question | osmTags | -----|-----|----- | | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ | @@ -712,6 +707,174 @@ This tagrendering has labels -----|-----|----- | | has_organic.0 | Has organic options | organic=yes | organic=only | +| id | question | osmTags | +-----|-----|----- | +| shop_types.0 | *What kind of shop is this?* (default) | | +| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | +| shop_types.2 | Farm Supply Shop | shop=agrarian | +| shop_types.3 | Liquor Store | shop=alcohol | +| shop_types.4 | Anime / Manga Shop | shop=anime | +| shop_types.5 | Antique Shop | shop=antiques | +| shop_types.6 | Appliance Store | shop=appliance | +| shop_types.7 | Art Store | shop=art | +| shop_types.8 | Baby Goods Store | shop=baby_goods | +| shop_types.9 | Bag/Luggage Store | shop=bag | +| shop_types.10 | Bakery | shop=bakery | +| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing | +| shop_types.12 | Beauty Shop | shop=beauty | +| shop_types.13 | Bedding/Mattress Store | shop=bed | +| shop_types.14 | Beverage Store | shop=beverages | +| shop_types.15 | Bicycle Shop | shop=bicycle | +| shop_types.16 | Boat Store | shop=boat | +| shop_types.17 | Bookmaker | shop=bookmaker | +| shop_types.18 | Bookstore | shop=books | +| shop_types.19 | Brewing Supply Store | shop=brewing_supplies | +| shop_types.20 | Butcher | shop=butcher | +| shop_types.21 | Camera Equipment Store | shop=camera | +| shop_types.22 | Candle Shop | shop=candles | +| shop_types.23 | Cannabis Shop | shop=cannabis | +| shop_types.24 | Car Dealership | shop=car | +| shop_types.25 | Car Parts Store | shop=car_parts | +| shop_types.26 | Car Repair Shop | shop=car_repair | +| shop_types.27 | RV Dealership | shop=caravan | +| shop_types.28 | Carpet Store | shop=carpet | +| shop_types.29 | Catalog Shop | shop=catalogue | +| shop_types.30 | Charity Store | shop=charity | +| shop_types.31 | Cheese Store | shop=cheese | +| shop_types.32 | Drugstore | shop=chemist | +| shop_types.33 | Chocolate Store | shop=chocolate | +| shop_types.34 | Clothing Store | shop=clothes | +| shop_types.35 | Coffee Store | shop=coffee | +| shop_types.36 | Collectibles Shop | shop=collector | +| shop_types.37 | Computer Store | shop=computer | +| shop_types.38 | Candy Store | shop=confectionery | +| shop_types.39 | Convenience Store | shop=convenience | +| shop_types.40 | Copy Store | shop=copyshop | +| shop_types.41 | Cosmetics Store | shop=cosmetics | +| shop_types.42 | Rural Supplies Store | shop=country_store | +| shop_types.43 | Arts & Crafts Store | shop=craft | +| shop_types.44 | Curtain Store | shop=curtain | +| shop_types.45 | Dairy Store | shop=dairy | +| shop_types.46 | Delicatessen | shop=deli | +| shop_types.47 | Department Store | shop=department_store | +| shop_types.48 | DIY Store | shop=doityourself | +| shop_types.49 | Door Shop | shop=doors | +| shop_types.50 | Dry Cleaner | shop=dry_cleaning | +| shop_types.51 | E-Cigarette Shop | shop=e-cigarette | +| shop_types.52 | Electrical Equipment Store | shop=electrical | +| shop_types.53 | Electronics Store | shop=electronics | +| shop_types.54 | Erotic Store | shop=erotic | +| shop_types.55 | Fabric Store | shop=fabric | +| shop_types.56 | Produce Stand | shop=farm | +| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories | +| shop_types.58 | Fireplace Store | shop=fireplace | +| shop_types.59 | Fishing Shop | shop=fishing | +| shop_types.60 | Flooring Supply Shop | shop=flooring | +| shop_types.61 | Florist | shop=florist | +| shop_types.62 | Framing Shop | shop=frame | +| shop_types.63 | Frozen Food Store | shop=frozen_food | +| shop_types.64 | Fuel Shop | shop=fuel | +| shop_types.65 | Funeral Home | shop=funeral_directors | +| shop_types.66 | Furniture Store | shop=furniture | +| shop_types.67 | Tabletop Game Store | shop=games | +| shop_types.68 | Garden Center | shop=garden_centre | +| shop_types.69 | Bottled Gas Shop | shop=gas | +| shop_types.70 | General Store | shop=general | +| shop_types.71 | Gift Shop | shop=gift | +| shop_types.72 | Greengrocer | shop=greengrocer | +| shop_types.73 | Hairdresser | shop=hairdresser | +| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply | +| shop_types.75 | Hardware Store | shop=hardware | +| shop_types.76 | Health Food Store | shop=health_food | +| shop_types.77 | Hearing Aids Store | shop=hearing_aids | +| shop_types.78 | Herbalist | shop=herbalist | +| shop_types.79 | Hifi Store | shop=hifi | +| shop_types.80 | Honey Store | shop=honey | +| shop_types.81 | Household Linen Shop | shop=household_linen | +| shop_types.82 | Houseware Store | shop=houseware | +| shop_types.83 | Hunting Shop | shop=hunting | +| shop_types.84 | Interior Decoration Store | shop=interior_decoration | +| shop_types.85 | Jewelry Store | shop=jewelry | +| shop_types.86 | Kiosk | shop=kiosk | +| shop_types.87 | Kitchen Design Store | shop=kitchen | +| shop_types.88 | Laundry | shop=laundry | +| shop_types.89 | Leather Store | shop=leather | +| shop_types.90 | Lighting Store | shop=lighting | +| shop_types.91 | Locksmith | shop=locksmith | +| shop_types.92 | Lottery Shop | shop=lottery | +| shop_types.93 | Mall | shop=mall | +| shop_types.94 | Massage Shop | shop=massage | +| shop_types.95 | Medical Supply Store | shop=medical_supply | +| shop_types.96 | Military Surplus Store | shop=military_surplus | +| shop_types.97 | Mobile Phone Store | shop=mobile_phone | +| shop_types.98 | Model Shop | shop=model | +| shop_types.99 | Money Lender | shop=money_lender | +| shop_types.100 | Motorcycle Dealership | shop=motorcycle | +| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair | +| shop_types.102 | Music Store | shop=music | +| shop_types.103 | Musical Instrument Store | shop=musical_instrument | +| shop_types.104 | Newsstand | shop=newsagent | +| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements | +| shop_types.106 | Nuts Shop | shop=nuts | +| shop_types.107 | Optician | shop=optician | +| shop_types.108 | Outdoors Store | shop=outdoor | +| shop_types.109 | Online Retailer Outpost | shop=outpost | +| shop_types.110 | Paint Store | shop=paint | +| shop_types.111 | Party Supply Store | shop=party | +| shop_types.112 | Pasta Store | shop=pasta | +| shop_types.113 | Pastry Shop | shop=pastry | +| shop_types.114 | Pawnshop | shop=pawnbroker | +| shop_types.115 | Perfume Store | shop=perfumery | +| shop_types.116 | Pet Store | shop=pet | +| shop_types.117 | Pet Groomer | shop=pet_grooming | +| shop_types.118 | Photography Store | shop=photo | +| shop_types.119 | Pottery Store | shop=pottery | +| shop_types.120 | Printer Ink Store | shop=printer_ink | +| shop_types.121 | Psychic | shop=psychic | +| shop_types.122 | Fireworks Store | shop=pyrotechnics | +| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics | +| shop_types.124 | Religious Store | shop=religion | +| shop_types.125 | Rental Shop | shop=rental | +| shop_types.126 | Repair Shop | shop=repair | +| shop_types.127 | Rice Store | shop=rice | +| shop_types.128 | Scuba Diving Shop | shop=scuba_diving | +| shop_types.129 | Seafood Shop | shop=seafood | +| shop_types.130 | Thrift Store | shop=second_hand | +| shop_types.131 | Sewing Supply Shop | shop=sewing | +| shop_types.132 | Shoe Repair Shop | shop=shoe_repair | +| shop_types.133 | Shoe Store | shop=shoes | +| shop_types.134 | Spice Shop | shop=spices | +| shop_types.135 | Sporting Goods Store | shop=sports | +| shop_types.136 | Stationery Store | shop=stationery | +| shop_types.137 | Storage Rental | shop=storage_rental | +| shop_types.138 | Supermarket | shop=supermarket | +| shop_types.139 | Pool Supply Store | shop=swimming_pool | +| shop_types.140 | Tailor | shop=tailor | +| shop_types.141 | Tattoo Parlor | shop=tattoo | +| shop_types.142 | Tea Store | shop=tea | +| shop_types.143 | Telecom Retail Store | shop=telecommunication | +| shop_types.144 | Ticket Seller | shop=ticket | +| shop_types.145 | Tile Shop | shop=tiles | +| shop_types.146 | Tobacco Shop | shop=tobacco | +| shop_types.147 | Tool Rental | shop=tool_hire | +| shop_types.148 | Toy Store | shop=toys | +| shop_types.149 | Trade Shop | shop=trade | +| shop_types.150 | Travel Agency | shop=travel_agency | +| shop_types.151 | Trophy Shop | shop=trophy | +| shop_types.152 | Tire Store | shop=tyres | +| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner | +| shop_types.154 | Discount Store | shop=variety_store | +| shop_types.155 | Video Store | shop=video | +| shop_types.156 | Video Game Store | shop=video_games | +| shop_types.157 | Watches Shop | shop=watches | +| shop_types.158 | Drinking Water Shop | shop=water | +| shop_types.159 | Watersport/Swim Shop | shop=water_sports | +| shop_types.160 | Weapon Shop | shop=weapons | +| shop_types.161 | Wholesale Store | shop=wholesale | +| shop_types.162 | Wig Shop | shop=wigs | +| shop_types.163 | Window Blind Store | shop=window_blind | +| shop_types.164 | Wine Shop | shop=wine | + | id | question | osmTags | -----|-----|----- | | accepts_cash.0 | Accepts cash | payment:cash=yes | diff --git a/Docs/Layers/drinking_water.md b/Docs/Layers/drinking_water.md index 856e07adc..b35ebf24b 100644 --- a/Docs/Layers/drinking_water.md +++ b/Docs/Layers/drinking_water.md @@ -11,8 +11,9 @@ A layer showing drinking water fountains ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [Still in use?](#still-in-use) - [type](#type) @@ -43,6 +44,12 @@ A layer showing drinking water fountains - [ski](https://mapcomplete.org/ski) - [stations](https://mapcomplete.org/stations) +## Presets + +The following options to create new points are included: + +**a drinking water** which has the following tags:amenity=drinking_water + ## Basic tags for this layer Elements must match **all** of the following expressions: diff --git a/Docs/Layers/dumpstations.md b/Docs/Layers/dumpstations.md index a8c7c673b..9e02d0f0b 100644 --- a/Docs/Layers/dumpstations.md +++ b/Docs/Layers/dumpstations.md @@ -19,14 +19,14 @@ Sanitary dump stations - [dumpstations-chemical-waste](#dumpstations-chemical-waste) - [dumpstations-access](#dumpstations-access) - [dumpstations-network](#dumpstations-network) - - [operator](#operator) - - [power_supply](#power_supply) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer - [campersite](https://mapcomplete.org/campersite) + - [personal](https://mapcomplete.org/personal) ## Basic tags for this layer @@ -50,8 +50,6 @@ Elements must match **all** of the following expressions: | [sanitary_dump_station:chemical_toilet](https://wiki.openstreetmap.org/wiki/Key:sanitary_dump_station:chemical_toilet) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:sanitary_dump_station:chemical_toilet%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:sanitary_dump_station:chemical_toilet%3Dno) | | [access](https://wiki.openstreetmap.org/wiki/Key:access) | Multiple choice | [network](https://wiki.openstreetmap.org/wiki/Tag:access%3Dnetwork) [customers](https://wiki.openstreetmap.org/wiki/Tag:access%3Dcustomers) [yes](https://wiki.openstreetmap.org/wiki/Tag:access%3Dyes) | | [network](https://wiki.openstreetmap.org/wiki/Key:network) | [string](../SpecialInputElements.md#string) | | -| [operator](https://wiki.openstreetmap.org/wiki/Key:operator) | [string](../SpecialInputElements.md#string) | | -| [power_supply](https://wiki.openstreetmap.org/wiki/Key:power_supply) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:power_supply%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:power_supply%3Dno) | ### images This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images @@ -107,23 +105,16 @@ The question is `Who can use this dump station?` The question is `What network is this place a part of? (skip if none)` *This station is part of network {network}* is shown if `network` is set -### operator - -The question is `Who operates this place?` -*This place is operated by {operator}* is shown if `operator` is set - -### power_supply - -The question is `Does this place have a power supply?` - - - *This place has a power supply* is shown if with power_supply=yes - - *This place does not have power supply* is shown if with power_supply=no - ### leftover-questions _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ @@ -133,4 +124,4 @@ This tagrendering has labels `added_by_default` -This document is autogenerated from [assets/themes/campersite/campersite.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/campersite/campersite.json) +This document is autogenerated from [assets/layers/dumpstations/dumpstations.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/dumpstations/dumpstations.json) diff --git a/Docs/Layers/elevator.md b/Docs/Layers/elevator.md index d6509134e..6dbcf73df 100644 --- a/Docs/Layers/elevator.md +++ b/Docs/Layers/elevator.md @@ -9,8 +9,9 @@ This layer show elevators and asks for operational status and elevator dimension ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [multilevels](#multilevels) - [operational_status](#operational_status) @@ -25,6 +26,7 @@ This layer show elevators and asks for operational status and elevator dimension - [speech_output_available](#speech_output_available) - [speech_output](#speech_output) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -35,6 +37,12 @@ This layer show elevators and asks for operational status and elevator dimension - [personal](https://mapcomplete.org/personal) - [stations](https://mapcomplete.org/stations) +## Presets + +The following options to create new points are included: + +**an elevator** which has the following tags:highway=elevator + ## Basic tags for this layer Elements must match the expression **highway=elevator** @@ -152,6 +160,11 @@ This tagrendering is only visible in the popup if the following condition is met _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/elongated_coin.md b/Docs/Layers/elongated_coin.md index 8575d1ccc..26effa57d 100644 --- a/Docs/Layers/elongated_coin.md +++ b/Docs/Layers/elongated_coin.md @@ -9,8 +9,9 @@ Layer showing penny presses. ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [opening_hours_24_7](#opening_hours_24_7) - [Opening hours](#opening-hours) @@ -29,7 +30,7 @@ Layer showing penny presses. - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -37,6 +38,12 @@ Layer showing penny presses. - [personal](https://mapcomplete.org/personal) - [vending_machine](https://mapcomplete.org/vending_machine) +## Presets + +The following options to create new points are included: + +**a penny press** which has the following tags:amenity=vending_machine & vending=elongated_coin & payment:coins=yes + ## Basic tags for this layer Elements must match **all** of the following expressions: diff --git a/Docs/Layers/entrance.md b/Docs/Layers/entrance.md index 719d15bb7..413228300 100644 --- a/Docs/Layers/entrance.md +++ b/Docs/Layers/entrance.md @@ -13,8 +13,9 @@ A layer showing entrances and offering capabilities to survey some advanced data ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [repeated](#repeated) - [single_level](#single_level) @@ -24,6 +25,7 @@ A layer showing entrances and offering capabilities to survey some advanced data - [width](#width) - [kerb-height](#kerb-height) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -34,6 +36,14 @@ A layer showing entrances and offering capabilities to survey some advanced data - [stations](https://mapcomplete.org/stations) - [walls_and_buildings](https://mapcomplete.org/walls_and_buildings) +## Presets + +The following options to create new points are included: + +**an entrance** which has the following tags:entrance=yes (snaps to layers `walls_and_buildings`, `pedestrian_path`) + +**an indoor door** which has the following tags:indoor=door (snaps to layers `indoors`) + ## Basic tags for this layer Elements must match **any** of the following expressions: @@ -141,6 +151,11 @@ The question is `What is the height of this kerb?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/extinguisher.md b/Docs/Layers/extinguisher.md index 536b6ebc8..ec492ca77 100644 --- a/Docs/Layers/extinguisher.md +++ b/Docs/Layers/extinguisher.md @@ -9,11 +9,13 @@ Map layer to show fire extinguishers. ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [extinguisher-location](#extinguisher-location) - [images](#images) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -21,6 +23,12 @@ Map layer to show fire extinguishers. - [hailhydrant](https://mapcomplete.org/hailhydrant) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a fire extinguisher** which has the following tags:emergency=fire_extinguisher + ## Basic tags for this layer Elements must match the expression **emergency=fire_extinguisher** @@ -53,6 +61,11 @@ _This tagrendering has no question and is thus read-only_ _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/facadegardens.md b/Docs/Layers/facadegardens.md index c513747dc..fd518ac48 100644 --- a/Docs/Layers/facadegardens.md +++ b/Docs/Layers/facadegardens.md @@ -10,8 +10,9 @@ Facade gardens ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [facadegardens-direction](#facadegardens-direction) - [facadegardens-sunshine](#facadegardens-sunshine) @@ -29,6 +30,12 @@ Facade gardens - [facadegardens](https://mapcomplete.org/facadegardens) +## Presets + +The following options to create new points are included: + +**a facade garden** which has the following tags:leisure=garden & garden:type=facade_garden (snaps to layers `walls_and_buildings`) + ## Basic tags for this layer Elements must match **all** of the following expressions: diff --git a/Docs/Layers/fire_station.md b/Docs/Layers/fire_station.md index c76cc8520..b50000d75 100644 --- a/Docs/Layers/fire_station.md +++ b/Docs/Layers/fire_station.md @@ -9,8 +9,9 @@ Map layer to show fire stations. ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [station-name](#station-name) - [station-street](#station-street) - [station-place](#station-place) @@ -18,6 +19,7 @@ Map layer to show fire stations. - [station-operator](#station-operator) - [images](#images) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -25,6 +27,12 @@ Map layer to show fire stations. - [hailhydrant](https://mapcomplete.org/hailhydrant) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a fire station** which has the following tags:amenity=fire_station + ## Basic tags for this layer Elements must match the expression **amenity=fire_station** @@ -85,6 +93,11 @@ _This tagrendering has no question and is thus read-only_ _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/firepit.md b/Docs/Layers/firepit.md index beb37a9fd..2273a6274 100644 --- a/Docs/Layers/firepit.md +++ b/Docs/Layers/firepit.md @@ -9,8 +9,9 @@ An outdoor place to make a fire, typically open to the public. ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [access](#access) - [seasonal](#seasonal) @@ -25,6 +26,12 @@ An outdoor place to make a fire, typically open to the public. - [nature](https://mapcomplete.org/nature) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**Firepit** which has the following tags:leisure=firepit + ## Basic tags for this layer Elements must match the expression **leisure=firepit** diff --git a/Docs/Layers/fitness_centre.md b/Docs/Layers/fitness_centre.md index 2c0855c3e..e0f258ac1 100644 --- a/Docs/Layers/fitness_centre.md +++ b/Docs/Layers/fitness_centre.md @@ -9,8 +9,9 @@ Layer showing fitness centres ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [name](#name) - [images](#images) - [phone](#phone) @@ -23,14 +24,21 @@ Layer showing fitness centres - [single_level](#single_level) - [reviews](#reviews) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer - [personal](https://mapcomplete.org/personal) - [sports](https://mapcomplete.org/sports) +## Presets + +The following options to create new points are included: + +**a fitness centre** which has the following tags:leisure=fitness_centre + ## Basic tags for this layer Elements must match the expression **leisure=fitness_centre** @@ -66,9 +74,9 @@ _This tagrendering has no question and is thus read-only_ ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -143,6 +151,11 @@ _This tagrendering has no question and is thus read-only_ _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/fitness_station.md b/Docs/Layers/fitness_station.md index f8c406446..cc35e3b37 100644 --- a/Docs/Layers/fitness_station.md +++ b/Docs/Layers/fitness_station.md @@ -9,8 +9,9 @@ Find a fitness station near you, and add missing ones. ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [name](#name) - [type](#type) @@ -20,13 +21,19 @@ Find a fitness station near you, and add missing ones. - [leftover-questions](#leftover-questions) - [move-button](#move-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer - [personal](https://mapcomplete.org/personal) - [sports](https://mapcomplete.org/sports) +## Presets + +The following options to create new points are included: + +**a fitness station** which has the following tags:leisure=fitness_station & sport=fitness + ## Basic tags for this layer Elements must match the expression **leisure=fitness_station** diff --git a/Docs/Layers/food.md b/Docs/Layers/food.md index b9334c3ff..7e13fc1fb 100644 --- a/Docs/Layers/food.md +++ b/Docs/Layers/food.md @@ -9,8 +9,9 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [reviews](#reviews) - [Name](#name) @@ -53,7 +54,7 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -67,6 +68,16 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo - [ski](https://mapcomplete.org/ski) - [stations](https://mapcomplete.org/stations) +## Presets + +The following options to create new points are included: + +**a restaurant** which has the following tags:amenity=restaurant + +**a fastfood** which has the following tags:amenity=fast_food + +**a fries shop** which has the following tags:amenity=fast_food & cuisine=friture + ## Basic tags for this layer Elements must match **any** of the following expressions: @@ -90,7 +101,7 @@ Elements must match **any** of the following expressions: | [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | | | [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) | | [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) | -| [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) | +| [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) [mexican ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican ) [japanese ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese ) [chicken ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken ) [seafood ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood ) | | [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) | | | [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) | | [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) | @@ -167,9 +178,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -219,21 +230,25 @@ The question is `Is this place accessible with a wheelchair?` The question is `What kind of food is served here?` *This place mostly serves {cuisine}* is shown if `cuisine` is set - - *This is a pizzeria* is shown if with cuisine=pizza - - *This is a friture* is shown if with cuisine=friture - - *Mainly serves pasta* is shown if with cuisine=pasta - - *This is kebab shop* is shown if with cuisine=kebab - - *This is a sandwich shop* is shown if with cuisine=sandwich - - *Burgers are served here* is shown if with cuisine=burger - - *Sushi is served here* is shown if with cuisine=sushi - - *Coffee is served here* is shown if with cuisine=coffee - - *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with cuisine=italian - - *French dishes are served here* is shown if with cuisine=french - - *Chinese dishes are served here* is shown if with cuisine=chinese - - *Greek dishes are served here* is shown if with cuisine=greek - - *Indian dishes are served here* is shown if with cuisine=indian - - *Turkish dishes are served here* is shown if with cuisine=turkish - - *Thai dishes are served here* is shown if with cuisine=thai + - *This is a pizzeria* is shown if with cuisine=pizza + - *This is a friture* is shown if with cuisine=friture + - *Mainly serves pasta* is shown if with cuisine=pasta + - *This is kebab shop* is shown if with cuisine=kebab + - *This is a sandwich shop* is shown if with cuisine=sandwich + - *Burgers are served here* is shown if with cuisine=burger + - *Sushi is served here* is shown if with cuisine=sushi + - *Coffee is served here* is shown if with cuisine=coffee + - *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with cuisine=italian + - *French dishes are served here* is shown if with cuisine=french + - *Chinese dishes are served here* is shown if with cuisine=chinese + - *Greek dishes are served here* is shown if with cuisine=greek + - *Indian dishes are served here* is shown if with cuisine=indian + - *Turkish dishes are served here* is shown if with cuisine=turkish + - *Thai dishes are served here* is shown if with cuisine=thai + - *Mexican dishes are served here* is shown if with cuisine=mexican + - *Japanese dishes are served here* is shown if with cuisine=japanese + - *Chicken based dishes are served here* is shown if with cuisine=chicken + - *Seafood dishes are served here* is shown if with cuisine=seafood ### show-menu-image @@ -455,7 +470,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -540,6 +555,29 @@ This tagrendering has labels | dogs.1 | Dogs allowed | dog=unleashed | dog=yes | | dogs.2 | No dogs allowed | dog=no | +| id | question | osmTags | +-----|-----|----- | +| Cuisine.0 | *What kind of food is served here?* (default) | | +| Cuisine.1 | This is a pizzeria | cuisine=pizza | +| Cuisine.2 | This is a friture | cuisine=friture | +| Cuisine.3 | Mainly serves pasta | cuisine=pasta | +| Cuisine.4 | This is kebab shop | cuisine=kebab | +| Cuisine.5 | This is a sandwich shop | cuisine=sandwich | +| Cuisine.6 | Burgers are served here | cuisine=burger | +| Cuisine.7 | Sushi is served here | cuisine=sushi | +| Cuisine.8 | Coffee is served here | cuisine=coffee | +| Cuisine.9 | This is an Italian restaurant (which serves more than pasta and pizza) | cuisine=italian | +| Cuisine.10 | French dishes are served here | cuisine=french | +| Cuisine.11 | Chinese dishes are served here | cuisine=chinese | +| Cuisine.12 | Greek dishes are served here | cuisine=greek | +| Cuisine.13 | Indian dishes are served here | cuisine=indian | +| Cuisine.14 | Turkish dishes are served here | cuisine=turkish | +| Cuisine.15 | Thai dishes are served here | cuisine=thai | +| Cuisine.16 | Mexican dishes are served here | cuisine=mexican | +| Cuisine.17 | Japanese dishes are served here | cuisine=japanese | +| Cuisine.18 | Chicken based dishes are served here | cuisine=chicken | +| Cuisine.19 | Seafood dishes are served here | cuisine=seafood | + | id | question | osmTags | -----|-----|----- | | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired | diff --git a/Docs/Layers/food_courts.md b/Docs/Layers/food_courts.md index 91865e16e..21a1206c6 100644 --- a/Docs/Layers/food_courts.md +++ b/Docs/Layers/food_courts.md @@ -21,6 +21,7 @@ Food courts with a variety of food options. - [phone](#phone) - [smoking](#smoking) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -92,9 +93,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -112,6 +113,11 @@ The question is `Is smoking allowed at {title()}?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/food_glutenfree.md b/Docs/Layers/food_glutenfree.md index 58fcc0288..ddcdb0342 100644 --- a/Docs/Layers/food_glutenfree.md +++ b/Docs/Layers/food_glutenfree.md @@ -86,7 +86,7 @@ Elements must match **all** of the following expressions: | [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | | | [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) | | [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) | -| [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) | +| [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) [mexican ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican ) [japanese ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese ) [chicken ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken ) [seafood ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood ) | | [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) | | | [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) | | [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) | @@ -174,9 +174,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -226,21 +226,25 @@ The question is `Is this place accessible with a wheelchair?` The question is `What kind of food is served here?` *This place mostly serves {cuisine}* is shown if `cuisine` is set - - *This is a pizzeria* is shown if with cuisine=pizza - - *This is a friture* is shown if with cuisine=friture - - *Mainly serves pasta* is shown if with cuisine=pasta - - *This is kebab shop* is shown if with cuisine=kebab - - *This is a sandwich shop* is shown if with cuisine=sandwich - - *Burgers are served here* is shown if with cuisine=burger - - *Sushi is served here* is shown if with cuisine=sushi - - *Coffee is served here* is shown if with cuisine=coffee - - *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with cuisine=italian - - *French dishes are served here* is shown if with cuisine=french - - *Chinese dishes are served here* is shown if with cuisine=chinese - - *Greek dishes are served here* is shown if with cuisine=greek - - *Indian dishes are served here* is shown if with cuisine=indian - - *Turkish dishes are served here* is shown if with cuisine=turkish - - *Thai dishes are served here* is shown if with cuisine=thai + - *This is a pizzeria* is shown if with cuisine=pizza + - *This is a friture* is shown if with cuisine=friture + - *Mainly serves pasta* is shown if with cuisine=pasta + - *This is kebab shop* is shown if with cuisine=kebab + - *This is a sandwich shop* is shown if with cuisine=sandwich + - *Burgers are served here* is shown if with cuisine=burger + - *Sushi is served here* is shown if with cuisine=sushi + - *Coffee is served here* is shown if with cuisine=coffee + - *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with cuisine=italian + - *French dishes are served here* is shown if with cuisine=french + - *Chinese dishes are served here* is shown if with cuisine=chinese + - *Greek dishes are served here* is shown if with cuisine=greek + - *Indian dishes are served here* is shown if with cuisine=indian + - *Turkish dishes are served here* is shown if with cuisine=turkish + - *Thai dishes are served here* is shown if with cuisine=thai + - *Mexican dishes are served here* is shown if with cuisine=mexican + - *Japanese dishes are served here* is shown if with cuisine=japanese + - *Chicken based dishes are served here* is shown if with cuisine=chicken + - *Seafood dishes are served here* is shown if with cuisine=seafood ### show-menu-image @@ -450,7 +454,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -535,6 +539,29 @@ This tagrendering has labels | dogs.1 | Dogs allowed | dog=unleashed | dog=yes | | dogs.2 | No dogs allowed | dog=no | +| id | question | osmTags | +-----|-----|----- | +| Cuisine.0 | *What kind of food is served here?* (default) | | +| Cuisine.1 | This is a pizzeria | cuisine=pizza | +| Cuisine.2 | This is a friture | cuisine=friture | +| Cuisine.3 | Mainly serves pasta | cuisine=pasta | +| Cuisine.4 | This is kebab shop | cuisine=kebab | +| Cuisine.5 | This is a sandwich shop | cuisine=sandwich | +| Cuisine.6 | Burgers are served here | cuisine=burger | +| Cuisine.7 | Sushi is served here | cuisine=sushi | +| Cuisine.8 | Coffee is served here | cuisine=coffee | +| Cuisine.9 | This is an Italian restaurant (which serves more than pasta and pizza) | cuisine=italian | +| Cuisine.10 | French dishes are served here | cuisine=french | +| Cuisine.11 | Chinese dishes are served here | cuisine=chinese | +| Cuisine.12 | Greek dishes are served here | cuisine=greek | +| Cuisine.13 | Indian dishes are served here | cuisine=indian | +| Cuisine.14 | Turkish dishes are served here | cuisine=turkish | +| Cuisine.15 | Thai dishes are served here | cuisine=thai | +| Cuisine.16 | Mexican dishes are served here | cuisine=mexican | +| Cuisine.17 | Japanese dishes are served here | cuisine=japanese | +| Cuisine.18 | Chicken based dishes are served here | cuisine=chicken | +| Cuisine.19 | Seafood dishes are served here | cuisine=seafood | + | id | question | osmTags | -----|-----|----- | | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired | diff --git a/Docs/Layers/food_lactosefree.md b/Docs/Layers/food_lactosefree.md index 0ad41dd9c..e7b79cab7 100644 --- a/Docs/Layers/food_lactosefree.md +++ b/Docs/Layers/food_lactosefree.md @@ -86,7 +86,7 @@ Elements must match **all** of the following expressions: | [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | | | [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) | | [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) | -| [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) | +| [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) [mexican ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican ) [japanese ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese ) [chicken ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken ) [seafood ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood ) | | [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) | | | [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) | | [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) | @@ -174,9 +174,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -226,21 +226,25 @@ The question is `Is this place accessible with a wheelchair?` The question is `What kind of food is served here?` *This place mostly serves {cuisine}* is shown if `cuisine` is set - - *This is a pizzeria* is shown if with cuisine=pizza - - *This is a friture* is shown if with cuisine=friture - - *Mainly serves pasta* is shown if with cuisine=pasta - - *This is kebab shop* is shown if with cuisine=kebab - - *This is a sandwich shop* is shown if with cuisine=sandwich - - *Burgers are served here* is shown if with cuisine=burger - - *Sushi is served here* is shown if with cuisine=sushi - - *Coffee is served here* is shown if with cuisine=coffee - - *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with cuisine=italian - - *French dishes are served here* is shown if with cuisine=french - - *Chinese dishes are served here* is shown if with cuisine=chinese - - *Greek dishes are served here* is shown if with cuisine=greek - - *Indian dishes are served here* is shown if with cuisine=indian - - *Turkish dishes are served here* is shown if with cuisine=turkish - - *Thai dishes are served here* is shown if with cuisine=thai + - *This is a pizzeria* is shown if with cuisine=pizza + - *This is a friture* is shown if with cuisine=friture + - *Mainly serves pasta* is shown if with cuisine=pasta + - *This is kebab shop* is shown if with cuisine=kebab + - *This is a sandwich shop* is shown if with cuisine=sandwich + - *Burgers are served here* is shown if with cuisine=burger + - *Sushi is served here* is shown if with cuisine=sushi + - *Coffee is served here* is shown if with cuisine=coffee + - *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with cuisine=italian + - *French dishes are served here* is shown if with cuisine=french + - *Chinese dishes are served here* is shown if with cuisine=chinese + - *Greek dishes are served here* is shown if with cuisine=greek + - *Indian dishes are served here* is shown if with cuisine=indian + - *Turkish dishes are served here* is shown if with cuisine=turkish + - *Thai dishes are served here* is shown if with cuisine=thai + - *Mexican dishes are served here* is shown if with cuisine=mexican + - *Japanese dishes are served here* is shown if with cuisine=japanese + - *Chicken based dishes are served here* is shown if with cuisine=chicken + - *Seafood dishes are served here* is shown if with cuisine=seafood ### show-menu-image @@ -450,7 +454,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -535,6 +539,29 @@ This tagrendering has labels | dogs.1 | Dogs allowed | dog=unleashed | dog=yes | | dogs.2 | No dogs allowed | dog=no | +| id | question | osmTags | +-----|-----|----- | +| Cuisine.0 | *What kind of food is served here?* (default) | | +| Cuisine.1 | This is a pizzeria | cuisine=pizza | +| Cuisine.2 | This is a friture | cuisine=friture | +| Cuisine.3 | Mainly serves pasta | cuisine=pasta | +| Cuisine.4 | This is kebab shop | cuisine=kebab | +| Cuisine.5 | This is a sandwich shop | cuisine=sandwich | +| Cuisine.6 | Burgers are served here | cuisine=burger | +| Cuisine.7 | Sushi is served here | cuisine=sushi | +| Cuisine.8 | Coffee is served here | cuisine=coffee | +| Cuisine.9 | This is an Italian restaurant (which serves more than pasta and pizza) | cuisine=italian | +| Cuisine.10 | French dishes are served here | cuisine=french | +| Cuisine.11 | Chinese dishes are served here | cuisine=chinese | +| Cuisine.12 | Greek dishes are served here | cuisine=greek | +| Cuisine.13 | Indian dishes are served here | cuisine=indian | +| Cuisine.14 | Turkish dishes are served here | cuisine=turkish | +| Cuisine.15 | Thai dishes are served here | cuisine=thai | +| Cuisine.16 | Mexican dishes are served here | cuisine=mexican | +| Cuisine.17 | Japanese dishes are served here | cuisine=japanese | +| Cuisine.18 | Chicken based dishes are served here | cuisine=chicken | +| Cuisine.19 | Seafood dishes are served here | cuisine=seafood | + | id | question | osmTags | -----|-----|----- | | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired | diff --git a/Docs/Layers/friture.md b/Docs/Layers/friture.md index e74533263..1f5a5e6d1 100644 --- a/Docs/Layers/friture.md +++ b/Docs/Layers/friture.md @@ -84,7 +84,7 @@ Elements must match **all** of the following expressions: | [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | | | [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) | | [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) | -| [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) | +| [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) [mexican ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican ) [japanese ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese ) [chicken ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken ) [seafood ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood ) | | [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) | | | [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) | | [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) | @@ -161,9 +161,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -213,21 +213,25 @@ The question is `Is this place accessible with a wheelchair?` The question is `What kind of food is served here?` *This place mostly serves {cuisine}* is shown if `cuisine` is set - - *This is a pizzeria* is shown if with cuisine=pizza - - *This is a friture* is shown if with cuisine=friture - - *Mainly serves pasta* is shown if with cuisine=pasta - - *This is kebab shop* is shown if with cuisine=kebab - - *This is a sandwich shop* is shown if with cuisine=sandwich - - *Burgers are served here* is shown if with cuisine=burger - - *Sushi is served here* is shown if with cuisine=sushi - - *Coffee is served here* is shown if with cuisine=coffee - - *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with cuisine=italian - - *French dishes are served here* is shown if with cuisine=french - - *Chinese dishes are served here* is shown if with cuisine=chinese - - *Greek dishes are served here* is shown if with cuisine=greek - - *Indian dishes are served here* is shown if with cuisine=indian - - *Turkish dishes are served here* is shown if with cuisine=turkish - - *Thai dishes are served here* is shown if with cuisine=thai + - *This is a pizzeria* is shown if with cuisine=pizza + - *This is a friture* is shown if with cuisine=friture + - *Mainly serves pasta* is shown if with cuisine=pasta + - *This is kebab shop* is shown if with cuisine=kebab + - *This is a sandwich shop* is shown if with cuisine=sandwich + - *Burgers are served here* is shown if with cuisine=burger + - *Sushi is served here* is shown if with cuisine=sushi + - *Coffee is served here* is shown if with cuisine=coffee + - *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with cuisine=italian + - *French dishes are served here* is shown if with cuisine=french + - *Chinese dishes are served here* is shown if with cuisine=chinese + - *Greek dishes are served here* is shown if with cuisine=greek + - *Indian dishes are served here* is shown if with cuisine=indian + - *Turkish dishes are served here* is shown if with cuisine=turkish + - *Thai dishes are served here* is shown if with cuisine=thai + - *Mexican dishes are served here* is shown if with cuisine=mexican + - *Japanese dishes are served here* is shown if with cuisine=japanese + - *Chicken based dishes are served here* is shown if with cuisine=chicken + - *Seafood dishes are served here* is shown if with cuisine=seafood ### show-menu-image @@ -449,7 +453,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -534,6 +538,29 @@ This tagrendering has labels | dogs.1 | Dogs allowed | dog=unleashed | dog=yes | | dogs.2 | No dogs allowed | dog=no | +| id | question | osmTags | +-----|-----|----- | +| Cuisine.0 | *What kind of food is served here?* (default) | | +| Cuisine.1 | This is a pizzeria | cuisine=pizza | +| Cuisine.2 | This is a friture | cuisine=friture | +| Cuisine.3 | Mainly serves pasta | cuisine=pasta | +| Cuisine.4 | This is kebab shop | cuisine=kebab | +| Cuisine.5 | This is a sandwich shop | cuisine=sandwich | +| Cuisine.6 | Burgers are served here | cuisine=burger | +| Cuisine.7 | Sushi is served here | cuisine=sushi | +| Cuisine.8 | Coffee is served here | cuisine=coffee | +| Cuisine.9 | This is an Italian restaurant (which serves more than pasta and pizza) | cuisine=italian | +| Cuisine.10 | French dishes are served here | cuisine=french | +| Cuisine.11 | Chinese dishes are served here | cuisine=chinese | +| Cuisine.12 | Greek dishes are served here | cuisine=greek | +| Cuisine.13 | Indian dishes are served here | cuisine=indian | +| Cuisine.14 | Turkish dishes are served here | cuisine=turkish | +| Cuisine.15 | Thai dishes are served here | cuisine=thai | +| Cuisine.16 | Mexican dishes are served here | cuisine=mexican | +| Cuisine.17 | Japanese dishes are served here | cuisine=japanese | +| Cuisine.18 | Chicken based dishes are served here | cuisine=chicken | +| Cuisine.19 | Seafood dishes are served here | cuisine=seafood | + | id | question | osmTags | -----|-----|----- | | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired | diff --git a/Docs/Layers/ghost_bike.md b/Docs/Layers/ghost_bike.md index a3a6fc94c..051727839 100644 --- a/Docs/Layers/ghost_bike.md +++ b/Docs/Layers/ghost_bike.md @@ -9,8 +9,9 @@ A layer showing memorials for cyclists, killed in road accidents ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [preset_description](#preset_description) - [images](#images) - [ghost_bike-name](#ghost_bike-name) @@ -30,6 +31,12 @@ A layer showing memorials for cyclists, killed in road accidents - [memorials](https://mapcomplete.org/memorials) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a ghost bike** which has the following tags:historic=memorial & memorial=ghost_bike + ## Basic tags for this layer Elements must match the expression **memorial=ghost_bike** diff --git a/Docs/Layers/ghostsigns.md b/Docs/Layers/ghostsigns.md index 2fa372376..b760c0861 100644 --- a/Docs/Layers/ghostsigns.md +++ b/Docs/Layers/ghostsigns.md @@ -10,8 +10,9 @@ Layer showing disused signs on buildings ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [historic](#historic) - [images](#images) - [name](#name) @@ -24,6 +25,12 @@ Layer showing disused signs on buildings - [ghostsigns](https://mapcomplete.org/ghostsigns) +## Presets + +The following options to create new points are included: + +**a ghost sign** which has the following tags:historic=advertising & advertising=wall_painting (snaps to layers `walls_and_buildings`) + ## Basic tags for this layer Elements must match **all** of the following expressions: @@ -40,7 +47,7 @@ Elements must match **all** of the following expressions: | attribute | type | values which are supported by this layer | -----|-----|----- | | [historic](https://wiki.openstreetmap.org/wiki/Key:historic) | Multiple choice | [advertising](https://wiki.openstreetmap.org/wiki/Tag:historic%3Dadvertising) [](https://wiki.openstreetmap.org/wiki/Tag:historic%3D) | -| [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) | [string](../SpecialInputElements.md#string) | | +| [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) | [text](../SpecialInputElements.md#text) | | | [brand](https://wiki.openstreetmap.org/wiki/Key:brand) | [string](../SpecialInputElements.md#string) | | ### historic diff --git a/Docs/Layers/governments.md b/Docs/Layers/governments.md index 210884312..b8f9d5f7c 100644 --- a/Docs/Layers/governments.md +++ b/Docs/Layers/governments.md @@ -9,14 +9,16 @@ This layer show governmental buildings. It was setup as commissioned layer for t ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [phone](#phone) - [email](#email) - [website](#website) - [name](#name) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -24,6 +26,12 @@ This layer show governmental buildings. It was setup as commissioned layer for t - [onwheels](https://mapcomplete.org/onwheels) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a Governmental Office** which has the following tags:office=government + ## Basic tags for this layer Elements must match the expression **office=government** @@ -49,9 +57,9 @@ _This tagrendering has no question and is thus read-only_ ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -87,6 +95,11 @@ The question is `What is the name of this Governmental Office?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/grave.md b/Docs/Layers/grave.md index 59b34f7ca..5aca473c6 100644 --- a/Docs/Layers/grave.md +++ b/Docs/Layers/grave.md @@ -9,20 +9,28 @@ Tombstones (and graves) indicate where a person was buried. On this map, those c ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [buried:wikidata](#buriedwikidata) - [name](#name) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer - [memorials](https://mapcomplete.org/memorials) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a tombstone** which has the following tags:historic=tomb + ## Basic tags for this layer Elements must match the expression **historic=tomb** @@ -58,6 +66,11 @@ The question is `What is the name of the person buried here?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/guidepost.md b/Docs/Layers/guidepost.md index 88096f758..31b815e6d 100644 --- a/Docs/Layers/guidepost.md +++ b/Docs/Layers/guidepost.md @@ -9,8 +9,9 @@ Guideposts (also known as fingerposts or finger posts) are often found along off ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [type](#type) - [leftover-questions](#leftover-questions) @@ -26,6 +27,12 @@ Guideposts (also known as fingerposts or finger posts) are often found along off - [personal](https://mapcomplete.org/personal) - [ski](https://mapcomplete.org/ski) +## Presets + +The following options to create new points are included: + +**a guidepost** which has the following tags:information=guidepost & tourism=information + ## Basic tags for this layer Elements must match the expression **information=guidepost** diff --git a/Docs/Layers/hackerspace.md b/Docs/Layers/hackerspace.md index 06f052af3..62089b2a4 100644 --- a/Docs/Layers/hackerspace.md +++ b/Docs/Layers/hackerspace.md @@ -9,8 +9,9 @@ Hackerspace ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [reviews](#reviews) - [is_makerspace](#is_makerspace) @@ -48,6 +49,14 @@ Hackerspace - [hackerspaces](https://mapcomplete.org/hackerspaces) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a hackerspace** which has the following tags:leisure=hackerspace + +**a makerspace** which has the following tags:leisure=hackerspace & hackerspace=makerspace + ## Basic tags for this layer Elements must match the expression **leisure=hackerspace** @@ -153,9 +162,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -298,7 +307,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` diff --git a/Docs/Layers/hospital.md b/Docs/Layers/hospital.md index 47acc8304..cda59f6f4 100644 --- a/Docs/Layers/hospital.md +++ b/Docs/Layers/hospital.md @@ -19,6 +19,7 @@ A layer showing hospital grounds - [oh-visitor](#oh-visitor) - [Opening hours for visitors](#opening-hours-for-visitors) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -65,9 +66,9 @@ The question is `Does this facility admit inpatients?` ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -103,6 +104,11 @@ The question is `When are visitors allowed to visit?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/hydrant.md b/Docs/Layers/hydrant.md index 7063ea617..e820b5a15 100644 --- a/Docs/Layers/hydrant.md +++ b/Docs/Layers/hydrant.md @@ -9,8 +9,9 @@ Map layer to show fire hydrants. ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [hydrant-color](#hydrant-color) - [hydrant-type](#hydrant-type) - [hydrant-state](#hydrant-state) @@ -28,6 +29,12 @@ Map layer to show fire hydrants. - [hailhydrant](https://mapcomplete.org/hailhydrant) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a fire hydrant** which has the following tags:emergency=fire_hydrant + ## Basic tags for this layer Elements must match the expression **emergency=fire_hydrant** diff --git a/Docs/Layers/ice_cream.md b/Docs/Layers/ice_cream.md index f19be22f0..e27a17cb8 100644 --- a/Docs/Layers/ice_cream.md +++ b/Docs/Layers/ice_cream.md @@ -9,8 +9,9 @@ A place where ice cream is sold over the counter ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [reviews](#reviews) - [1](#1) @@ -26,6 +27,7 @@ A place where ice cream is sold over the counter - [payment-options](#payment-options) - [wheelchair-access](#wheelchair-access) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -37,6 +39,12 @@ A place where ice cream is sold over the counter - [personal](https://mapcomplete.org/personal) - [shops](https://mapcomplete.org/shops) +## Presets + +The following options to create new points are included: + +**an ice cream parlor** which has the following tags:amenity=ice_cream + ## Basic tags for this layer Elements must match the expression **amenity=ice_cream** @@ -85,9 +93,9 @@ The question is `What are the opening hours of {title()}?` ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -183,6 +191,11 @@ The question is `Is this place accessible with a wheelchair?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/icecream_glutenfree.md b/Docs/Layers/icecream_glutenfree.md index 5bffc9e01..586645fbb 100644 --- a/Docs/Layers/icecream_glutenfree.md +++ b/Docs/Layers/icecream_glutenfree.md @@ -28,6 +28,7 @@ A place where ice cream is sold over the counter - [payment-options](#payment-options) - [wheelchair-access](#wheelchair-access) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -98,9 +99,9 @@ The question is `What are the opening hours of {title()}?` ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -184,6 +185,11 @@ The question is `Is this place accessible with a wheelchair?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/icecream_lactosefree.md b/Docs/Layers/icecream_lactosefree.md index df0294d6a..984c3a2d0 100644 --- a/Docs/Layers/icecream_lactosefree.md +++ b/Docs/Layers/icecream_lactosefree.md @@ -28,6 +28,7 @@ A place where ice cream is sold over the counter - [payment-options](#payment-options) - [wheelchair-access](#wheelchair-access) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -98,9 +99,9 @@ The question is `What are the opening hours of {title()}?` ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -184,6 +185,11 @@ The question is `Is this place accessible with a wheelchair?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/indoors.md b/Docs/Layers/indoors.md index 139d2a56e..a020b1995 100644 --- a/Docs/Layers/indoors.md +++ b/Docs/Layers/indoors.md @@ -35,6 +35,7 @@ Basic indoor mapping: shows room outlines - [toilet-handwashing](#toilet-handwashing) - [toilet-has-paper](#toilet-has-paper) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -171,9 +172,9 @@ The question is `Are these toilets publicly accessible?` *Access is {access}* is shown if `access` is set - *Public access* is shown if with access=yes - - *Only access to customers* is shown if with access=customers - - *Not accessible* is shown if with access=no - - *Accessible, but one has to ask a key to enter* is shown if with access=key + - *Only access to customers* is shown if with access=customers + - *Not accessible* is shown if with access=no + - *Accessible, but one has to ask a key to enter* is shown if with access=key - *Public access* is shown if with access=public. _This option cannot be chosen as answer_ This tagrendering is only visible in the popup if the following condition is met: amenity=toilets @@ -314,6 +315,11 @@ This tagrendering has labels _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/information_board.md b/Docs/Layers/information_board.md index b28beb14f..02eab60ca 100644 --- a/Docs/Layers/information_board.md +++ b/Docs/Layers/information_board.md @@ -9,8 +9,9 @@ A layer showing touristical, road side information boards (e.g. giving informati ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [leftover-questions](#leftover-questions) - [move-button](#move-button) @@ -23,6 +24,12 @@ A layer showing touristical, road side information boards (e.g. giving informati - [personal](https://mapcomplete.org/personal) - [ski](https://mapcomplete.org/ski) +## Presets + +The following options to create new points are included: + +**an information board** which has the following tags:tourism=information & information=board + ## Basic tags for this layer Elements must match the expression **information=board** diff --git a/Docs/Layers/kerbs.md b/Docs/Layers/kerbs.md index 764846a50..24303ce8a 100644 --- a/Docs/Layers/kerbs.md +++ b/Docs/Layers/kerbs.md @@ -12,15 +12,17 @@ A layer showing kerbs. ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [kerb-type](#kerb-type) - [tactile-paving](#tactile-paving) - [kerb-height](#kerb-height) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -29,6 +31,12 @@ A layer showing kerbs. - [onwheels](https://mapcomplete.org/onwheels) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a kerb** which has the following tags:barrier=kerb (snaps to layers `cycleways_and_roads`, `kerbs`) + ## Basic tags for this layer Elements must match the expression **barrier=kerb** @@ -84,6 +92,11 @@ The question is `What is the height of this kerb?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/kindergarten_childcare.md b/Docs/Layers/kindergarten_childcare.md index 8f449231f..e17726f13 100644 --- a/Docs/Layers/kindergarten_childcare.md +++ b/Docs/Layers/kindergarten_childcare.md @@ -9,8 +9,9 @@ Shows kindergartens and preschools. Both are grouped in one layer, as they are r ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [childcare-type](#childcare-type) - [name](#name) - [website](#website) @@ -29,6 +30,14 @@ Shows kindergartens and preschools. Both are grouped in one layer, as they are r - [education](https://mapcomplete.org/education) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a kindergarten** which has the following tags:amenity=kindergarten & isced:level=0 & isced:2011:level=early_childhood + +**a childcare** which has the following tags:amenity=kindergarten + ## Basic tags for this layer Elements must match **any** of the following expressions: @@ -89,9 +98,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/lighthouse.md b/Docs/Layers/lighthouse.md index bf12ebe49..55ebf271c 100644 --- a/Docs/Layers/lighthouse.md +++ b/Docs/Layers/lighthouse.md @@ -7,12 +7,14 @@ ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [wikipedia](#wikipedia) - [lighthouse-height](#lighthouse-height) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -20,6 +22,12 @@ - [lighthouses](https://mapcomplete.org/lighthouses) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a lighthouse** which has the following tags:man_made=lighthouse + ## Basic tags for this layer Elements must match the expression **man_made=lighthouse** @@ -58,6 +66,11 @@ The question is `What is the height of this lighthouse, in metres?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/love_hotel.md b/Docs/Layers/love_hotel.md index a655cd54e..0a1aeb1e5 100644 --- a/Docs/Layers/love_hotel.md +++ b/Docs/Layers/love_hotel.md @@ -9,8 +9,9 @@ A love hotel is a type of short-stay hotel found around the world operated prima ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [reviews](#reviews) - [name](#name) @@ -18,6 +19,7 @@ A love hotel is a type of short-stay hotel found around the world operated prima - [email](#email) - [website](#website) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -26,6 +28,12 @@ A love hotel is a type of short-stay hotel found around the world operated prima - [openlovemap](https://mapcomplete.org/openlovemap) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a love hotel** which has the following tags:amenity=love_hotel + ## Basic tags for this layer Elements must match the expression **amenity=love_hotel** @@ -61,9 +69,9 @@ The question is `What is the name of this love hotel?` ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -94,6 +102,11 @@ This tagrendering has labels _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/map.md b/Docs/Layers/map.md index f1ea1e85e..8b091ecc7 100644 --- a/Docs/Layers/map.md +++ b/Docs/Layers/map.md @@ -9,8 +9,9 @@ A map, meant for tourists which is permanently installed in the public space ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [map_type](#map_type) - [map_size](#map_size) @@ -28,6 +29,12 @@ A map, meant for tourists which is permanently installed in the public space - [personal](https://mapcomplete.org/personal) - [ski](https://mapcomplete.org/ski) +## Presets + +The following options to create new points are included: + +**a map** which has the following tags:tourism=information & information=map + ## Basic tags for this layer Elements must match **any** of the following expressions: diff --git a/Docs/Layers/medical_shops.md b/Docs/Layers/medical_shops.md index c81463c54..e012c11a1 100644 --- a/Docs/Layers/medical_shops.md +++ b/Docs/Layers/medical_shops.md @@ -11,8 +11,9 @@ A shop ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [reviews](#reviews) - [shops-name](#shops-name) @@ -58,12 +59,22 @@ A shop - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer - [healthcare](https://mapcomplete.org/healthcare) +## Presets + +The following options to create new points are included: + +**a medical supply shop** which has the following tags:shop=medical_supply + +**a hearing aids shop** which has the following tags:shop=hearing_aids + +**an optician** which has the following tags:shop=optician + ## Basic tags for this layer Elements must match **all** of the following expressions: @@ -112,7 +123,7 @@ Elements must match **all** of the following expressions: | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images @@ -299,6 +310,9 @@ The question is `What kind of shop is this?` - *Window Blind Store* is shown if with shop=window_blind - *Wine Shop* is shown if with shop=wine +This tagrendering has labels +`description` + ### brand The question is `What is the brand of this shop?` @@ -347,9 +361,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -609,7 +623,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -704,6 +718,174 @@ This tagrendering has labels -----|-----|----- | | accepts_cards.0 | Accepts payment cards | payment:cards=yes | +| id | question | osmTags | +-----|-----|----- | +| shop_types.0 | *What kind of shop is this?* (default) | | +| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | +| shop_types.2 | Farm Supply Shop | shop=agrarian | +| shop_types.3 | Liquor Store | shop=alcohol | +| shop_types.4 | Anime / Manga Shop | shop=anime | +| shop_types.5 | Antique Shop | shop=antiques | +| shop_types.6 | Appliance Store | shop=appliance | +| shop_types.7 | Art Store | shop=art | +| shop_types.8 | Baby Goods Store | shop=baby_goods | +| shop_types.9 | Bag/Luggage Store | shop=bag | +| shop_types.10 | Bakery | shop=bakery | +| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing | +| shop_types.12 | Beauty Shop | shop=beauty | +| shop_types.13 | Bedding/Mattress Store | shop=bed | +| shop_types.14 | Beverage Store | shop=beverages | +| shop_types.15 | Bicycle Shop | shop=bicycle | +| shop_types.16 | Boat Store | shop=boat | +| shop_types.17 | Bookmaker | shop=bookmaker | +| shop_types.18 | Bookstore | shop=books | +| shop_types.19 | Brewing Supply Store | shop=brewing_supplies | +| shop_types.20 | Butcher | shop=butcher | +| shop_types.21 | Camera Equipment Store | shop=camera | +| shop_types.22 | Candle Shop | shop=candles | +| shop_types.23 | Cannabis Shop | shop=cannabis | +| shop_types.24 | Car Dealership | shop=car | +| shop_types.25 | Car Parts Store | shop=car_parts | +| shop_types.26 | Car Repair Shop | shop=car_repair | +| shop_types.27 | RV Dealership | shop=caravan | +| shop_types.28 | Carpet Store | shop=carpet | +| shop_types.29 | Catalog Shop | shop=catalogue | +| shop_types.30 | Charity Store | shop=charity | +| shop_types.31 | Cheese Store | shop=cheese | +| shop_types.32 | Drugstore | shop=chemist | +| shop_types.33 | Chocolate Store | shop=chocolate | +| shop_types.34 | Clothing Store | shop=clothes | +| shop_types.35 | Coffee Store | shop=coffee | +| shop_types.36 | Collectibles Shop | shop=collector | +| shop_types.37 | Computer Store | shop=computer | +| shop_types.38 | Candy Store | shop=confectionery | +| shop_types.39 | Convenience Store | shop=convenience | +| shop_types.40 | Copy Store | shop=copyshop | +| shop_types.41 | Cosmetics Store | shop=cosmetics | +| shop_types.42 | Rural Supplies Store | shop=country_store | +| shop_types.43 | Arts & Crafts Store | shop=craft | +| shop_types.44 | Curtain Store | shop=curtain | +| shop_types.45 | Dairy Store | shop=dairy | +| shop_types.46 | Delicatessen | shop=deli | +| shop_types.47 | Department Store | shop=department_store | +| shop_types.48 | DIY Store | shop=doityourself | +| shop_types.49 | Door Shop | shop=doors | +| shop_types.50 | Dry Cleaner | shop=dry_cleaning | +| shop_types.51 | E-Cigarette Shop | shop=e-cigarette | +| shop_types.52 | Electrical Equipment Store | shop=electrical | +| shop_types.53 | Electronics Store | shop=electronics | +| shop_types.54 | Erotic Store | shop=erotic | +| shop_types.55 | Fabric Store | shop=fabric | +| shop_types.56 | Produce Stand | shop=farm | +| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories | +| shop_types.58 | Fireplace Store | shop=fireplace | +| shop_types.59 | Fishing Shop | shop=fishing | +| shop_types.60 | Flooring Supply Shop | shop=flooring | +| shop_types.61 | Florist | shop=florist | +| shop_types.62 | Framing Shop | shop=frame | +| shop_types.63 | Frozen Food Store | shop=frozen_food | +| shop_types.64 | Fuel Shop | shop=fuel | +| shop_types.65 | Funeral Home | shop=funeral_directors | +| shop_types.66 | Furniture Store | shop=furniture | +| shop_types.67 | Tabletop Game Store | shop=games | +| shop_types.68 | Garden Center | shop=garden_centre | +| shop_types.69 | Bottled Gas Shop | shop=gas | +| shop_types.70 | General Store | shop=general | +| shop_types.71 | Gift Shop | shop=gift | +| shop_types.72 | Greengrocer | shop=greengrocer | +| shop_types.73 | Hairdresser | shop=hairdresser | +| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply | +| shop_types.75 | Hardware Store | shop=hardware | +| shop_types.76 | Health Food Store | shop=health_food | +| shop_types.77 | Hearing Aids Store | shop=hearing_aids | +| shop_types.78 | Herbalist | shop=herbalist | +| shop_types.79 | Hifi Store | shop=hifi | +| shop_types.80 | Honey Store | shop=honey | +| shop_types.81 | Household Linen Shop | shop=household_linen | +| shop_types.82 | Houseware Store | shop=houseware | +| shop_types.83 | Hunting Shop | shop=hunting | +| shop_types.84 | Interior Decoration Store | shop=interior_decoration | +| shop_types.85 | Jewelry Store | shop=jewelry | +| shop_types.86 | Kiosk | shop=kiosk | +| shop_types.87 | Kitchen Design Store | shop=kitchen | +| shop_types.88 | Laundry | shop=laundry | +| shop_types.89 | Leather Store | shop=leather | +| shop_types.90 | Lighting Store | shop=lighting | +| shop_types.91 | Locksmith | shop=locksmith | +| shop_types.92 | Lottery Shop | shop=lottery | +| shop_types.93 | Mall | shop=mall | +| shop_types.94 | Massage Shop | shop=massage | +| shop_types.95 | Medical Supply Store | shop=medical_supply | +| shop_types.96 | Military Surplus Store | shop=military_surplus | +| shop_types.97 | Mobile Phone Store | shop=mobile_phone | +| shop_types.98 | Model Shop | shop=model | +| shop_types.99 | Money Lender | shop=money_lender | +| shop_types.100 | Motorcycle Dealership | shop=motorcycle | +| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair | +| shop_types.102 | Music Store | shop=music | +| shop_types.103 | Musical Instrument Store | shop=musical_instrument | +| shop_types.104 | Newsstand | shop=newsagent | +| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements | +| shop_types.106 | Nuts Shop | shop=nuts | +| shop_types.107 | Optician | shop=optician | +| shop_types.108 | Outdoors Store | shop=outdoor | +| shop_types.109 | Online Retailer Outpost | shop=outpost | +| shop_types.110 | Paint Store | shop=paint | +| shop_types.111 | Party Supply Store | shop=party | +| shop_types.112 | Pasta Store | shop=pasta | +| shop_types.113 | Pastry Shop | shop=pastry | +| shop_types.114 | Pawnshop | shop=pawnbroker | +| shop_types.115 | Perfume Store | shop=perfumery | +| shop_types.116 | Pet Store | shop=pet | +| shop_types.117 | Pet Groomer | shop=pet_grooming | +| shop_types.118 | Photography Store | shop=photo | +| shop_types.119 | Pottery Store | shop=pottery | +| shop_types.120 | Printer Ink Store | shop=printer_ink | +| shop_types.121 | Psychic | shop=psychic | +| shop_types.122 | Fireworks Store | shop=pyrotechnics | +| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics | +| shop_types.124 | Religious Store | shop=religion | +| shop_types.125 | Rental Shop | shop=rental | +| shop_types.126 | Repair Shop | shop=repair | +| shop_types.127 | Rice Store | shop=rice | +| shop_types.128 | Scuba Diving Shop | shop=scuba_diving | +| shop_types.129 | Seafood Shop | shop=seafood | +| shop_types.130 | Thrift Store | shop=second_hand | +| shop_types.131 | Sewing Supply Shop | shop=sewing | +| shop_types.132 | Shoe Repair Shop | shop=shoe_repair | +| shop_types.133 | Shoe Store | shop=shoes | +| shop_types.134 | Spice Shop | shop=spices | +| shop_types.135 | Sporting Goods Store | shop=sports | +| shop_types.136 | Stationery Store | shop=stationery | +| shop_types.137 | Storage Rental | shop=storage_rental | +| shop_types.138 | Supermarket | shop=supermarket | +| shop_types.139 | Pool Supply Store | shop=swimming_pool | +| shop_types.140 | Tailor | shop=tailor | +| shop_types.141 | Tattoo Parlor | shop=tattoo | +| shop_types.142 | Tea Store | shop=tea | +| shop_types.143 | Telecom Retail Store | shop=telecommunication | +| shop_types.144 | Ticket Seller | shop=ticket | +| shop_types.145 | Tile Shop | shop=tiles | +| shop_types.146 | Tobacco Shop | shop=tobacco | +| shop_types.147 | Tool Rental | shop=tool_hire | +| shop_types.148 | Toy Store | shop=toys | +| shop_types.149 | Trade Shop | shop=trade | +| shop_types.150 | Travel Agency | shop=travel_agency | +| shop_types.151 | Trophy Shop | shop=trophy | +| shop_types.152 | Tire Store | shop=tyres | +| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner | +| shop_types.154 | Discount Store | shop=variety_store | +| shop_types.155 | Video Store | shop=video | +| shop_types.156 | Video Game Store | shop=video_games | +| shop_types.157 | Watches Shop | shop=watches | +| shop_types.158 | Drinking Water Shop | shop=water | +| shop_types.159 | Watersport/Swim Shop | shop=water_sports | +| shop_types.160 | Weapon Shop | shop=weapons | +| shop_types.161 | Wholesale Store | shop=wholesale | +| shop_types.162 | Wig Shop | shop=wigs | +| shop_types.163 | Window Blind Store | shop=window_blind | +| shop_types.164 | Wine Shop | shop=wine | + | id | question | osmTags | -----|-----|----- | | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired | diff --git a/Docs/Layers/memorial.md b/Docs/Layers/memorial.md index cd642c467..2b2ed5d71 100644 --- a/Docs/Layers/memorial.md +++ b/Docs/Layers/memorial.md @@ -9,8 +9,9 @@ Layer showing memorial plaques, based upon a unofficial theme. Can be expanded t ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [memorial-type](#memorial-type) - [inscription](#inscription) @@ -39,6 +40,12 @@ Layer showing memorial plaques, based upon a unofficial theme. Can be expanded t - [memorials](https://mapcomplete.org/memorials) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a memorial** which has the following tags:historic=memorial + ## Basic tags for this layer Elements must match **any** of the following expressions: diff --git a/Docs/Layers/mountain_rescue.md b/Docs/Layers/mountain_rescue.md index 4f72d1948..8fcfd6b49 100644 --- a/Docs/Layers/mountain_rescue.md +++ b/Docs/Layers/mountain_rescue.md @@ -9,8 +9,9 @@ A building where first aid responders store material and might be on watch ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [leftover-questions](#leftover-questions) - [move-button](#move-button) @@ -22,6 +23,12 @@ A building where first aid responders store material and might be on watch - [personal](https://mapcomplete.org/personal) - [ski](https://mapcomplete.org/ski) +## Presets + +The following options to create new points are included: + +**a mountain rescue station** which has the following tags:emergency=mountain_rescue + ## Basic tags for this layer Elements must match the expression **emergency=mountain_rescue** diff --git a/Docs/Layers/nature_reserve.md b/Docs/Layers/nature_reserve.md index 10a976179..3bce253e2 100644 --- a/Docs/Layers/nature_reserve.md +++ b/Docs/Layers/nature_reserve.md @@ -9,8 +9,9 @@ A nature reserve is an area where nature can take its course ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [Access tag](#access-tag) - [Operator tag](#operator-tag) @@ -25,14 +26,21 @@ A nature reserve is an area where nature can take its course - [Surface area](#surface-area) - [wikipedia](#wikipedia) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer - [nature](https://mapcomplete.org/nature) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a nature reserve** which has the following tags:leisure=nature_reserve & fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen + ## Basic tags for this layer Elements must match **any** of the following expressions: @@ -156,6 +164,11 @@ The question is `What is the corresponding Wikidata entity?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/outdoor_seating.md b/Docs/Layers/outdoor_seating.md index a657a5fad..1e3a15443 100644 --- a/Docs/Layers/outdoor_seating.md +++ b/Docs/Layers/outdoor_seating.md @@ -25,6 +25,7 @@ Outdoor seating areas, usually located near cafes and restaurants. - [covered](#covered) - [smoking](#smoking) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -131,7 +132,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -171,6 +172,11 @@ The question is `Is smoking allowed at {title()}?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/parcel_lockers.md b/Docs/Layers/parcel_lockers.md index bbb7e79a1..304c941a8 100644 --- a/Docs/Layers/parcel_lockers.md +++ b/Docs/Layers/parcel_lockers.md @@ -9,8 +9,9 @@ Layer showing parcel lockers for collecting and sending parcels. ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [brand](#brand) - [operator](#operator) @@ -23,13 +24,19 @@ Layer showing parcel lockers for collecting and sending parcels. - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer - [personal](https://mapcomplete.org/personal) - [postboxes](https://mapcomplete.org/postboxes) +## Presets + +The following options to create new points are included: + +**a parcel locker** which has the following tags:amenity=parcel_locker + ## Basic tags for this layer Elements must match **any** of the following expressions: diff --git a/Docs/Layers/parking.md b/Docs/Layers/parking.md index 070d3451f..b11433024 100644 --- a/Docs/Layers/parking.md +++ b/Docs/Layers/parking.md @@ -9,8 +9,9 @@ A layer showing car parkings ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [repeated](#repeated) - [single_level](#single_level) @@ -29,6 +30,12 @@ A layer showing car parkings - [personal](https://mapcomplete.org/personal) - [transit](https://mapcomplete.org/transit) +## Presets + +The following options to create new points are included: + +**a car parking** which has the following tags:amenity=parking + ## Basic tags for this layer Elements must match the expression **amenity=parking** diff --git a/Docs/Layers/parking_spaces.md b/Docs/Layers/parking_spaces.md index 75ed1bc9c..ad143c0de 100644 --- a/Docs/Layers/parking_spaces.md +++ b/Docs/Layers/parking_spaces.md @@ -15,6 +15,7 @@ Layer showing individual parking spaces. - [type](#type) - [capacity](#capacity) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -73,6 +74,11 @@ _This tagrendering has no question and is thus read-only_ _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/parking_spaces_disabled.md b/Docs/Layers/parking_spaces_disabled.md index 6ec11af78..45ddb0dc7 100644 --- a/Docs/Layers/parking_spaces_disabled.md +++ b/Docs/Layers/parking_spaces_disabled.md @@ -18,6 +18,7 @@ Layer showing individual parking spaces. - [images](#images) - [_stolen_entrances](#_stolen_entrances) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -47,6 +48,11 @@ _This tagrendering has no question and is thus read-only_ _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/parking_ticket_machine.md b/Docs/Layers/parking_ticket_machine.md index b5321a3ec..634f27a1e 100644 --- a/Docs/Layers/parking_ticket_machine.md +++ b/Docs/Layers/parking_ticket_machine.md @@ -9,14 +9,16 @@ Layer with parking ticket machines to pay for parking. ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [payment-options-split](#payment-options-split) - [denominations-coins](#denominations-coins) - [denominations-notes](#denominations-notes) - [ref](#ref) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -25,6 +27,12 @@ Layer with parking ticket machines to pay for parking. - [personal](https://mapcomplete.org/personal) - [vending_machine](https://mapcomplete.org/vending_machine) +## Presets + +The following options to create new points are included: + +**a parking ticket machine** which has the following tags:amenity=vending_machine & vending=parking_tickets + ## Basic tags for this layer Elements must match **all** of the following expressions: @@ -115,6 +123,11 @@ The question is `What is the reference number of this parking ticket machine?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/pharmacy.md b/Docs/Layers/pharmacy.md index ca4770203..bdf07e0b8 100644 --- a/Docs/Layers/pharmacy.md +++ b/Docs/Layers/pharmacy.md @@ -9,8 +9,9 @@ A layer showing pharmacies, which (probably) dispense prescription drugs ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [reviews](#reviews) - [name](#name) @@ -24,7 +25,7 @@ A layer showing pharmacies, which (probably) dispense prescription drugs - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -33,6 +34,12 @@ A layer showing pharmacies, which (probably) dispense prescription drugs - [personal](https://mapcomplete.org/personal) - [shops](https://mapcomplete.org/shops) +## Presets + +The following options to create new points are included: + +**a pharmacy** which has the following tags:amenity=pharmacy + ## Basic tags for this layer Elements must match the expression **amenity=pharmacy** @@ -77,9 +84,9 @@ The question is `What are the opening hours of {title()}?` ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/physiotherapist.md b/Docs/Layers/physiotherapist.md index 82be80743..e796e8392 100644 --- a/Docs/Layers/physiotherapist.md +++ b/Docs/Layers/physiotherapist.md @@ -9,8 +9,9 @@ This layer shows physiotherapists ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [name](#name) - [opening_hours_by_appointment](#opening_hours_by_appointment) @@ -22,13 +23,19 @@ This layer shows physiotherapists - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer - [healthcare](https://mapcomplete.org/healthcare) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a physiotherapists office** which has the following tags:healthcare=physiotherapist + ## Basic tags for this layer Elements must match the expression **healthcare=physiotherapist** @@ -69,9 +76,9 @@ The question is `What are the opening hours of {title()}?` ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/picnic_table.md b/Docs/Layers/picnic_table.md index aa8658037..0277126b9 100644 --- a/Docs/Layers/picnic_table.md +++ b/Docs/Layers/picnic_table.md @@ -9,8 +9,9 @@ The layer showing picnic tables ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [repeated](#repeated) - [single_level](#single_level) @@ -28,6 +29,12 @@ The layer showing picnic tables - [playgrounds](https://mapcomplete.org/playgrounds) - [toerisme_vlaanderen](https://mapcomplete.org/toerisme_vlaanderen) +## Presets + +The following options to create new points are included: + +**a picnic table** which has the following tags:leisure=picnic_table + ## Basic tags for this layer Elements must match the expression **leisure=picnic_table** @@ -41,7 +48,7 @@ Elements must match the expression ** [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) | -| [material](https://wiki.openstreetmap.org/wiki/Key:material) | [string](../SpecialInputElements.md#string) | [wood](https://wiki.openstreetmap.org/wiki/Tag:material%3Dwood) [concrete](https://wiki.openstreetmap.org/wiki/Tag:material%3Dconcrete) [plastic](https://wiki.openstreetmap.org/wiki/Tag:material%3Dplastic) | +| [material](https://wiki.openstreetmap.org/wiki/Key:material) | [string](../SpecialInputElements.md#string) | [wood](https://wiki.openstreetmap.org/wiki/Tag:material%3Dwood) [concrete](https://wiki.openstreetmap.org/wiki/Tag:material%3Dconcrete) [plastic](https://wiki.openstreetmap.org/wiki/Tag:material%3Dplastic) [metal](https://wiki.openstreetmap.org/wiki/Tag:material%3Dmetal) | ### images This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images @@ -79,6 +86,7 @@ The question is `What material is this picnic table made of?` - *This is a wooden picnic table* is shown if with material=wood - *This is a concrete picnic table* is shown if with material=concrete - *This picnic table is made from (recycled) plastic* is shown if with material=plastic + - *This picnic table is made from metal* is shown if with material=metal ### leftover-questions diff --git a/Docs/Layers/play_forest.md b/Docs/Layers/play_forest.md index 37fa6dd19..31162e8c7 100644 --- a/Docs/Layers/play_forest.md +++ b/Docs/Layers/play_forest.md @@ -9,8 +9,9 @@ Een speelbos is een vrij toegankelijke zone in een bos ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [play_forest-operator](#play_forest-operator) - [play_forest-opening_hours](#play_forest-opening_hours) @@ -18,6 +19,7 @@ Een speelbos is een vrij toegankelijke zone in een bos - [play_forest-phone](#play_forest-phone) - [questions](#questions) - [play_forest-reviews](#play_forest-reviews) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -25,6 +27,12 @@ Een speelbos is een vrij toegankelijke zone in een bos - [play_forests](https://mapcomplete.org/play_forests) - [speelplekken](https://mapcomplete.org/speelplekken) +## Presets + +The following options to create new points are included: + +**Speelbos** which has the following tags:leisure=playground & playground=forest & fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen + ## Basic tags for this layer Elements must match the expression **playground=forest** @@ -82,6 +90,11 @@ _This tagrendering has no question and is thus read-only_ _This tagrendering has no question and is thus read-only_ *{reviews(name, play_forest)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/playground.md b/Docs/Layers/playground.md index 03bd452f6..0d2982652 100644 --- a/Docs/Layers/playground.md +++ b/Docs/Layers/playground.md @@ -9,10 +9,12 @@ Playgrounds ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [reviews](#reviews) + - [fee](#fee) - [playground-surface](#playground-surface) - [playground-lit](#playground-lit) - [playground-min_age](#playground-min_age) @@ -27,6 +29,7 @@ Playgrounds - [check_date](#check_date) - [questions](#questions) - [playground-reviews](#playground-reviews) + - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) @@ -37,6 +40,12 @@ Playgrounds - [speelplekken](https://mapcomplete.org/speelplekken) - [toerisme_vlaanderen](https://mapcomplete.org/toerisme_vlaanderen) +## Presets + +The following options to create new points are included: + +**a playground** which has the following tags:leisure=playground + ## Basic tags for this layer Elements must match **all** of the following expressions: @@ -52,6 +61,7 @@ Elements must match **all** of the following expressions: | attribute | type | values which are supported by this layer | -----|-----|----- | +| [fee](https://wiki.openstreetmap.org/wiki/Key:fee) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:fee%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:fee%3Dyes) | | [surface](https://wiki.openstreetmap.org/wiki/Key:surface) | [string](../SpecialInputElements.md#string) | [grass](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dgrass) [sand](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dsand) [woodchips](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dwoodchips) [paving_stones](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dpaving_stones) [asphalt](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dasphalt) [concrete](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dconcrete) [tartan](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dtartan) [rubber](https://wiki.openstreetmap.org/wiki/Tag:surface%3Drubber) [fine_gravel](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dfine_gravel) | | [lit](https://wiki.openstreetmap.org/wiki/Key:lit) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:lit%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:lit%3Dno) | | [min_age](https://wiki.openstreetmap.org/wiki/Key:min_age) | [nat](../SpecialInputElements.md#nat) | | @@ -74,6 +84,13 @@ Shows the reviews module (including the possibility to leave a review) _This tagrendering has no question and is thus read-only_ *{create_review()}{list_reviews()}* +### fee + +The question is `Does one have to pay to use this playground?` + + - *Free to use* is shown if with fee=no + - *Paid playground* is shown if with fee=yes + ### playground-surface The question is `Which is the surface of this playground?` @@ -186,6 +203,11 @@ _This tagrendering has no question and is thus read-only_ _This tagrendering has no question and is thus read-only_ *{reviews(name, playground)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### delete-button _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/playground_equipment.md b/Docs/Layers/playground_equipment.md index cfc0b51d3..eb321526f 100644 --- a/Docs/Layers/playground_equipment.md +++ b/Docs/Layers/playground_equipment.md @@ -9,8 +9,9 @@ Layer showing playground equipment ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [type](#type) - [wheelchair-access](#wheelchair-access) @@ -24,6 +25,12 @@ Layer showing playground equipment - [personal](https://mapcomplete.org/personal) - [playgrounds](https://mapcomplete.org/playgrounds) +## Presets + +The following options to create new points are included: + +**a playground device** which has the following tags:playground=yes + ## Basic tags for this layer Elements must match the expression **playground~.+** diff --git a/Docs/Layers/post_offices_with_atm.md b/Docs/Layers/post_offices_with_atm.md index 215bb7cb3..204928767 100644 --- a/Docs/Layers/post_offices_with_atm.md +++ b/Docs/Layers/post_offices_with_atm.md @@ -27,6 +27,7 @@ A layer showing post offices. - [stamps](#stamps) - [has_atm](#has_atm) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) 4. [Filters](#filters) @@ -160,6 +161,11 @@ The question is `Does this post office have an ATM?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/postboxes.md b/Docs/Layers/postboxes.md index 782ffffc5..98f70ef38 100644 --- a/Docs/Layers/postboxes.md +++ b/Docs/Layers/postboxes.md @@ -9,11 +9,13 @@ The layer showing postboxes. ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [minimap](#minimap) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) @@ -22,6 +24,12 @@ The layer showing postboxes. - [personal](https://mapcomplete.org/personal) - [postboxes](https://mapcomplete.org/postboxes) +## Presets + +The following options to create new points are included: + +**a postbox** which has the following tags:amenity=post_box + ## Basic tags for this layer Elements must match the expression **amenity=post_box** @@ -45,6 +53,11 @@ _This tagrendering has no question and is thus read-only_ _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### delete-button _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/postoffices.md b/Docs/Layers/postoffices.md index 8f1001163..da79d69ca 100644 --- a/Docs/Layers/postoffices.md +++ b/Docs/Layers/postoffices.md @@ -9,8 +9,9 @@ A layer showing post offices. ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [minimap](#minimap) - [opening_hours](#opening_hours) @@ -25,8 +26,9 @@ A layer showing post offices. - [stamps](#stamps) - [has_atm](#has_atm) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -34,6 +36,12 @@ A layer showing post offices. - [personal](https://mapcomplete.org/personal) - [postboxes](https://mapcomplete.org/postboxes) +## Presets + +The following options to create new points are included: + +**a post office** which has the following tags:amenity=post_office + ## Basic tags for this layer Elements must match **any** of the following expressions: @@ -160,6 +168,11 @@ The question is `Does this post office have an ATM?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/public_bookcase.md b/Docs/Layers/public_bookcase.md index d11bea442..3514793da 100644 --- a/Docs/Layers/public_bookcase.md +++ b/Docs/Layers/public_bookcase.md @@ -9,8 +9,9 @@ A streetside cabinet with books, accessible to anyone ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [public_bookcase-name](#public_bookcase-name) - [public_bookcase-capacity](#public_bookcase-capacity) @@ -26,7 +27,7 @@ A streetside cabinet with books, accessible to anyone - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -34,6 +35,12 @@ A streetside cabinet with books, accessible to anyone - [circular_economy](https://mapcomplete.org/circular_economy) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a bookcase** which has the following tags:amenity=public_bookcase + ## Basic tags for this layer Elements must match the expression **amenity=public_bookcase** diff --git a/Docs/Layers/rainbow_crossing_high_zoom.md b/Docs/Layers/rainbow_crossing_high_zoom.md index b2ef3a003..14f03abb5 100644 --- a/Docs/Layers/rainbow_crossing_high_zoom.md +++ b/Docs/Layers/rainbow_crossing_high_zoom.md @@ -17,6 +17,7 @@ A layer showing pedestrian crossings with rainbow paintings - [images](#images) - [crossing-with-rainbow](#crossing-with-rainbow) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -49,6 +50,11 @@ The question is `Does this crossing has rainbow paintings?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/rainbow_crossings.md b/Docs/Layers/rainbow_crossings.md index d061454fb..1fdb7b4e8 100644 --- a/Docs/Layers/rainbow_crossings.md +++ b/Docs/Layers/rainbow_crossings.md @@ -10,11 +10,13 @@ A layer showing pedestrian crossings with rainbow paintings ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [crossing-with-rainbow](#crossing-with-rainbow) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -22,6 +24,12 @@ A layer showing pedestrian crossings with rainbow paintings - [personal](https://mapcomplete.org/personal) - [rainbow_crossings](https://mapcomplete.org/rainbow_crossings) +## Presets + +The following options to create new points are included: + +**a crossing** which has the following tags:highway=footway & footway=crossing (snaps to layers `cycleways_and_roads`) + ## Basic tags for this layer Elements must match **any** of the following expressions: @@ -52,6 +60,11 @@ The question is `Does this crossing has rainbow paintings?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/reception_desk.md b/Docs/Layers/reception_desk.md index b80c8c8ec..10da49ff0 100644 --- a/Docs/Layers/reception_desk.md +++ b/Docs/Layers/reception_desk.md @@ -9,14 +9,16 @@ A layer showing where the reception desks are and which asks some accessibility ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [repeated](#repeated) - [single_level](#single_level) - [desk-height](#desk-height) - [induction-loop](#induction-loop) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -24,6 +26,12 @@ A layer showing where the reception desks are and which asks some accessibility - [onwheels](https://mapcomplete.org/onwheels) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a reception desk** which has the following tags:amenity=reception_desk + ## Basic tags for this layer Elements must match the expression **amenity=reception_desk** @@ -85,6 +93,11 @@ The question is `Does this place have an audio induction loop for people with re _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/recycling.md b/Docs/Layers/recycling.md index e14dcea29..1264f7309 100644 --- a/Docs/Layers/recycling.md +++ b/Docs/Layers/recycling.md @@ -9,8 +9,9 @@ A layer with recycling containers and centres ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [recycling-type](#recycling-type) - [recycling-centre-name](#recycling-centre-name) @@ -28,7 +29,7 @@ A layer with recycling containers and centres - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -36,6 +37,14 @@ A layer with recycling containers and centres - [waste](https://mapcomplete.org/waste) - [waste_assen](https://mapcomplete.org/waste_assen) +## Presets + +The following options to create new points are included: + +**a recycling container** which has the following tags:amenity=recycling & recycling_type=container + +**a recycling centre** which has the following tags:amenity=recycling & recycling_type=centre + ## Basic tags for this layer Elements must match the expression **amenity=recycling** @@ -154,9 +163,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering is only visible in the popup if the following condition is met: recycling_type=centre This tagrendering has labels diff --git a/Docs/Layers/route_marker.md b/Docs/Layers/route_marker.md index 7de5dd4b5..d262aa52b 100644 --- a/Docs/Layers/route_marker.md +++ b/Docs/Layers/route_marker.md @@ -9,8 +9,9 @@ Route markers are small markers often found along official hiking/cycling/riding ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [type](#type) - [leftover-questions](#leftover-questions) @@ -23,6 +24,12 @@ Route markers are small markers often found along official hiking/cycling/riding - [cyclenodes](https://mapcomplete.org/cyclenodes) - [walkingnodes](https://mapcomplete.org/walkingnodes) +## Presets + +The following options to create new points are included: + +**a route marker** which has the following tags:tourism=information & information=route_marker + ## Basic tags for this layer Elements must match the expression **information=route_marker** diff --git a/Docs/Layers/school.md b/Docs/Layers/school.md index c059a9696..d3a35665d 100644 --- a/Docs/Layers/school.md +++ b/Docs/Layers/school.md @@ -11,8 +11,9 @@ Schools giving primary and secondary education and post-secondary, non-tertiary ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [school-name](#school-name) - [capacity](#capacity) - [education-level-belgium](#education-level-belgium) @@ -26,13 +27,19 @@ Schools giving primary and secondary education and post-secondary, non-tertiary - [leftover-questions](#leftover-questions) - [move-button](#move-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer - [education](https://mapcomplete.org/education) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a primary or secondary school** which has the following tags:amenity=school & fixme=Added with MapComplete, the precise geometry should still be drawn + ## Basic tags for this layer Elements must match the expression **amenity=school** @@ -133,9 +140,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/shops.md b/Docs/Layers/shops.md index 81148b6cf..190a47e0c 100644 --- a/Docs/Layers/shops.md +++ b/Docs/Layers/shops.md @@ -9,8 +9,9 @@ A shop ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [reviews](#reviews) - [shops-name](#shops-name) @@ -56,7 +57,7 @@ A shop - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -74,6 +75,12 @@ A shop - [shops](https://mapcomplete.org/shops) - [stations](https://mapcomplete.org/stations) +## Presets + +The following options to create new points are included: + +**a shop** which has the following tags:shop=yes + ## Basic tags for this layer Elements must match **all** of the following expressions: @@ -122,7 +129,7 @@ Elements must match **all** of the following expressions: | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images @@ -309,6 +316,9 @@ The question is `What kind of shop is this?` - *Window Blind Store* is shown if with shop=window_blind - *Wine Shop* is shown if with shop=wine +This tagrendering has labels +`description` + ### brand The question is `What is the brand of this shop?` @@ -357,9 +367,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -619,7 +629,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -706,14 +716,6 @@ This tagrendering has labels -----|-----|----- | | open_now.0 | Open now | _isOpen=yes | -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-type.0 | Only show shops selling {search} | | search (string) | - -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-name.0 | Only show shops with name {search} | | search (string) | - | id | question | osmTags | -----|-----|----- | | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ | @@ -722,6 +724,174 @@ This tagrendering has labels -----|-----|----- | | has_organic.0 | Has organic options | organic=yes | organic=only | +| id | question | osmTags | +-----|-----|----- | +| shop_types.0 | *What kind of shop is this?* (default) | | +| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | +| shop_types.2 | Farm Supply Shop | shop=agrarian | +| shop_types.3 | Liquor Store | shop=alcohol | +| shop_types.4 | Anime / Manga Shop | shop=anime | +| shop_types.5 | Antique Shop | shop=antiques | +| shop_types.6 | Appliance Store | shop=appliance | +| shop_types.7 | Art Store | shop=art | +| shop_types.8 | Baby Goods Store | shop=baby_goods | +| shop_types.9 | Bag/Luggage Store | shop=bag | +| shop_types.10 | Bakery | shop=bakery | +| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing | +| shop_types.12 | Beauty Shop | shop=beauty | +| shop_types.13 | Bedding/Mattress Store | shop=bed | +| shop_types.14 | Beverage Store | shop=beverages | +| shop_types.15 | Bicycle Shop | shop=bicycle | +| shop_types.16 | Boat Store | shop=boat | +| shop_types.17 | Bookmaker | shop=bookmaker | +| shop_types.18 | Bookstore | shop=books | +| shop_types.19 | Brewing Supply Store | shop=brewing_supplies | +| shop_types.20 | Butcher | shop=butcher | +| shop_types.21 | Camera Equipment Store | shop=camera | +| shop_types.22 | Candle Shop | shop=candles | +| shop_types.23 | Cannabis Shop | shop=cannabis | +| shop_types.24 | Car Dealership | shop=car | +| shop_types.25 | Car Parts Store | shop=car_parts | +| shop_types.26 | Car Repair Shop | shop=car_repair | +| shop_types.27 | RV Dealership | shop=caravan | +| shop_types.28 | Carpet Store | shop=carpet | +| shop_types.29 | Catalog Shop | shop=catalogue | +| shop_types.30 | Charity Store | shop=charity | +| shop_types.31 | Cheese Store | shop=cheese | +| shop_types.32 | Drugstore | shop=chemist | +| shop_types.33 | Chocolate Store | shop=chocolate | +| shop_types.34 | Clothing Store | shop=clothes | +| shop_types.35 | Coffee Store | shop=coffee | +| shop_types.36 | Collectibles Shop | shop=collector | +| shop_types.37 | Computer Store | shop=computer | +| shop_types.38 | Candy Store | shop=confectionery | +| shop_types.39 | Convenience Store | shop=convenience | +| shop_types.40 | Copy Store | shop=copyshop | +| shop_types.41 | Cosmetics Store | shop=cosmetics | +| shop_types.42 | Rural Supplies Store | shop=country_store | +| shop_types.43 | Arts & Crafts Store | shop=craft | +| shop_types.44 | Curtain Store | shop=curtain | +| shop_types.45 | Dairy Store | shop=dairy | +| shop_types.46 | Delicatessen | shop=deli | +| shop_types.47 | Department Store | shop=department_store | +| shop_types.48 | DIY Store | shop=doityourself | +| shop_types.49 | Door Shop | shop=doors | +| shop_types.50 | Dry Cleaner | shop=dry_cleaning | +| shop_types.51 | E-Cigarette Shop | shop=e-cigarette | +| shop_types.52 | Electrical Equipment Store | shop=electrical | +| shop_types.53 | Electronics Store | shop=electronics | +| shop_types.54 | Erotic Store | shop=erotic | +| shop_types.55 | Fabric Store | shop=fabric | +| shop_types.56 | Produce Stand | shop=farm | +| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories | +| shop_types.58 | Fireplace Store | shop=fireplace | +| shop_types.59 | Fishing Shop | shop=fishing | +| shop_types.60 | Flooring Supply Shop | shop=flooring | +| shop_types.61 | Florist | shop=florist | +| shop_types.62 | Framing Shop | shop=frame | +| shop_types.63 | Frozen Food Store | shop=frozen_food | +| shop_types.64 | Fuel Shop | shop=fuel | +| shop_types.65 | Funeral Home | shop=funeral_directors | +| shop_types.66 | Furniture Store | shop=furniture | +| shop_types.67 | Tabletop Game Store | shop=games | +| shop_types.68 | Garden Center | shop=garden_centre | +| shop_types.69 | Bottled Gas Shop | shop=gas | +| shop_types.70 | General Store | shop=general | +| shop_types.71 | Gift Shop | shop=gift | +| shop_types.72 | Greengrocer | shop=greengrocer | +| shop_types.73 | Hairdresser | shop=hairdresser | +| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply | +| shop_types.75 | Hardware Store | shop=hardware | +| shop_types.76 | Health Food Store | shop=health_food | +| shop_types.77 | Hearing Aids Store | shop=hearing_aids | +| shop_types.78 | Herbalist | shop=herbalist | +| shop_types.79 | Hifi Store | shop=hifi | +| shop_types.80 | Honey Store | shop=honey | +| shop_types.81 | Household Linen Shop | shop=household_linen | +| shop_types.82 | Houseware Store | shop=houseware | +| shop_types.83 | Hunting Shop | shop=hunting | +| shop_types.84 | Interior Decoration Store | shop=interior_decoration | +| shop_types.85 | Jewelry Store | shop=jewelry | +| shop_types.86 | Kiosk | shop=kiosk | +| shop_types.87 | Kitchen Design Store | shop=kitchen | +| shop_types.88 | Laundry | shop=laundry | +| shop_types.89 | Leather Store | shop=leather | +| shop_types.90 | Lighting Store | shop=lighting | +| shop_types.91 | Locksmith | shop=locksmith | +| shop_types.92 | Lottery Shop | shop=lottery | +| shop_types.93 | Mall | shop=mall | +| shop_types.94 | Massage Shop | shop=massage | +| shop_types.95 | Medical Supply Store | shop=medical_supply | +| shop_types.96 | Military Surplus Store | shop=military_surplus | +| shop_types.97 | Mobile Phone Store | shop=mobile_phone | +| shop_types.98 | Model Shop | shop=model | +| shop_types.99 | Money Lender | shop=money_lender | +| shop_types.100 | Motorcycle Dealership | shop=motorcycle | +| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair | +| shop_types.102 | Music Store | shop=music | +| shop_types.103 | Musical Instrument Store | shop=musical_instrument | +| shop_types.104 | Newsstand | shop=newsagent | +| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements | +| shop_types.106 | Nuts Shop | shop=nuts | +| shop_types.107 | Optician | shop=optician | +| shop_types.108 | Outdoors Store | shop=outdoor | +| shop_types.109 | Online Retailer Outpost | shop=outpost | +| shop_types.110 | Paint Store | shop=paint | +| shop_types.111 | Party Supply Store | shop=party | +| shop_types.112 | Pasta Store | shop=pasta | +| shop_types.113 | Pastry Shop | shop=pastry | +| shop_types.114 | Pawnshop | shop=pawnbroker | +| shop_types.115 | Perfume Store | shop=perfumery | +| shop_types.116 | Pet Store | shop=pet | +| shop_types.117 | Pet Groomer | shop=pet_grooming | +| shop_types.118 | Photography Store | shop=photo | +| shop_types.119 | Pottery Store | shop=pottery | +| shop_types.120 | Printer Ink Store | shop=printer_ink | +| shop_types.121 | Psychic | shop=psychic | +| shop_types.122 | Fireworks Store | shop=pyrotechnics | +| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics | +| shop_types.124 | Religious Store | shop=religion | +| shop_types.125 | Rental Shop | shop=rental | +| shop_types.126 | Repair Shop | shop=repair | +| shop_types.127 | Rice Store | shop=rice | +| shop_types.128 | Scuba Diving Shop | shop=scuba_diving | +| shop_types.129 | Seafood Shop | shop=seafood | +| shop_types.130 | Thrift Store | shop=second_hand | +| shop_types.131 | Sewing Supply Shop | shop=sewing | +| shop_types.132 | Shoe Repair Shop | shop=shoe_repair | +| shop_types.133 | Shoe Store | shop=shoes | +| shop_types.134 | Spice Shop | shop=spices | +| shop_types.135 | Sporting Goods Store | shop=sports | +| shop_types.136 | Stationery Store | shop=stationery | +| shop_types.137 | Storage Rental | shop=storage_rental | +| shop_types.138 | Supermarket | shop=supermarket | +| shop_types.139 | Pool Supply Store | shop=swimming_pool | +| shop_types.140 | Tailor | shop=tailor | +| shop_types.141 | Tattoo Parlor | shop=tattoo | +| shop_types.142 | Tea Store | shop=tea | +| shop_types.143 | Telecom Retail Store | shop=telecommunication | +| shop_types.144 | Ticket Seller | shop=ticket | +| shop_types.145 | Tile Shop | shop=tiles | +| shop_types.146 | Tobacco Shop | shop=tobacco | +| shop_types.147 | Tool Rental | shop=tool_hire | +| shop_types.148 | Toy Store | shop=toys | +| shop_types.149 | Trade Shop | shop=trade | +| shop_types.150 | Travel Agency | shop=travel_agency | +| shop_types.151 | Trophy Shop | shop=trophy | +| shop_types.152 | Tire Store | shop=tyres | +| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner | +| shop_types.154 | Discount Store | shop=variety_store | +| shop_types.155 | Video Store | shop=video | +| shop_types.156 | Video Game Store | shop=video_games | +| shop_types.157 | Watches Shop | shop=watches | +| shop_types.158 | Drinking Water Shop | shop=water | +| shop_types.159 | Watersport/Swim Shop | shop=water_sports | +| shop_types.160 | Weapon Shop | shop=weapons | +| shop_types.161 | Wholesale Store | shop=wholesale | +| shop_types.162 | Wig Shop | shop=wigs | +| shop_types.163 | Window Blind Store | shop=window_blind | +| shop_types.164 | Wine Shop | shop=wine | + | id | question | osmTags | -----|-----|----- | | accepts_cash.0 | Accepts cash | payment:cash=yes | diff --git a/Docs/Layers/shops_glutenfree.md b/Docs/Layers/shops_glutenfree.md index 482cb48bf..fe6ec27bc 100644 --- a/Docs/Layers/shops_glutenfree.md +++ b/Docs/Layers/shops_glutenfree.md @@ -114,7 +114,7 @@ Elements must match **all** of the following expressions: | [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) | | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images @@ -313,6 +313,9 @@ The question is `What kind of shop is this?` - *Window Blind Store* is shown if with shop=window_blind - *Wine Shop* is shown if with shop=wine +This tagrendering has labels +`description` + ### brand The question is `What is the brand of this shop?` @@ -361,9 +364,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -623,7 +626,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -697,14 +700,6 @@ This tagrendering has labels -----|-----|----- | | open_now.0 | Open now | _isOpen=yes | -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-type.0 | Only show shops selling {search} | | search (string) | - -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-name.0 | Only show shops with name {search} | | search (string) | - | id | question | osmTags | -----|-----|----- | | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ | @@ -713,6 +708,174 @@ This tagrendering has labels -----|-----|----- | | has_organic.0 | Has organic options | organic=yes | organic=only | +| id | question | osmTags | +-----|-----|----- | +| shop_types.0 | *What kind of shop is this?* (default) | | +| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | +| shop_types.2 | Farm Supply Shop | shop=agrarian | +| shop_types.3 | Liquor Store | shop=alcohol | +| shop_types.4 | Anime / Manga Shop | shop=anime | +| shop_types.5 | Antique Shop | shop=antiques | +| shop_types.6 | Appliance Store | shop=appliance | +| shop_types.7 | Art Store | shop=art | +| shop_types.8 | Baby Goods Store | shop=baby_goods | +| shop_types.9 | Bag/Luggage Store | shop=bag | +| shop_types.10 | Bakery | shop=bakery | +| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing | +| shop_types.12 | Beauty Shop | shop=beauty | +| shop_types.13 | Bedding/Mattress Store | shop=bed | +| shop_types.14 | Beverage Store | shop=beverages | +| shop_types.15 | Bicycle Shop | shop=bicycle | +| shop_types.16 | Boat Store | shop=boat | +| shop_types.17 | Bookmaker | shop=bookmaker | +| shop_types.18 | Bookstore | shop=books | +| shop_types.19 | Brewing Supply Store | shop=brewing_supplies | +| shop_types.20 | Butcher | shop=butcher | +| shop_types.21 | Camera Equipment Store | shop=camera | +| shop_types.22 | Candle Shop | shop=candles | +| shop_types.23 | Cannabis Shop | shop=cannabis | +| shop_types.24 | Car Dealership | shop=car | +| shop_types.25 | Car Parts Store | shop=car_parts | +| shop_types.26 | Car Repair Shop | shop=car_repair | +| shop_types.27 | RV Dealership | shop=caravan | +| shop_types.28 | Carpet Store | shop=carpet | +| shop_types.29 | Catalog Shop | shop=catalogue | +| shop_types.30 | Charity Store | shop=charity | +| shop_types.31 | Cheese Store | shop=cheese | +| shop_types.32 | Drugstore | shop=chemist | +| shop_types.33 | Chocolate Store | shop=chocolate | +| shop_types.34 | Clothing Store | shop=clothes | +| shop_types.35 | Coffee Store | shop=coffee | +| shop_types.36 | Collectibles Shop | shop=collector | +| shop_types.37 | Computer Store | shop=computer | +| shop_types.38 | Candy Store | shop=confectionery | +| shop_types.39 | Convenience Store | shop=convenience | +| shop_types.40 | Copy Store | shop=copyshop | +| shop_types.41 | Cosmetics Store | shop=cosmetics | +| shop_types.42 | Rural Supplies Store | shop=country_store | +| shop_types.43 | Arts & Crafts Store | shop=craft | +| shop_types.44 | Curtain Store | shop=curtain | +| shop_types.45 | Dairy Store | shop=dairy | +| shop_types.46 | Delicatessen | shop=deli | +| shop_types.47 | Department Store | shop=department_store | +| shop_types.48 | DIY Store | shop=doityourself | +| shop_types.49 | Door Shop | shop=doors | +| shop_types.50 | Dry Cleaner | shop=dry_cleaning | +| shop_types.51 | E-Cigarette Shop | shop=e-cigarette | +| shop_types.52 | Electrical Equipment Store | shop=electrical | +| shop_types.53 | Electronics Store | shop=electronics | +| shop_types.54 | Erotic Store | shop=erotic | +| shop_types.55 | Fabric Store | shop=fabric | +| shop_types.56 | Produce Stand | shop=farm | +| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories | +| shop_types.58 | Fireplace Store | shop=fireplace | +| shop_types.59 | Fishing Shop | shop=fishing | +| shop_types.60 | Flooring Supply Shop | shop=flooring | +| shop_types.61 | Florist | shop=florist | +| shop_types.62 | Framing Shop | shop=frame | +| shop_types.63 | Frozen Food Store | shop=frozen_food | +| shop_types.64 | Fuel Shop | shop=fuel | +| shop_types.65 | Funeral Home | shop=funeral_directors | +| shop_types.66 | Furniture Store | shop=furniture | +| shop_types.67 | Tabletop Game Store | shop=games | +| shop_types.68 | Garden Center | shop=garden_centre | +| shop_types.69 | Bottled Gas Shop | shop=gas | +| shop_types.70 | General Store | shop=general | +| shop_types.71 | Gift Shop | shop=gift | +| shop_types.72 | Greengrocer | shop=greengrocer | +| shop_types.73 | Hairdresser | shop=hairdresser | +| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply | +| shop_types.75 | Hardware Store | shop=hardware | +| shop_types.76 | Health Food Store | shop=health_food | +| shop_types.77 | Hearing Aids Store | shop=hearing_aids | +| shop_types.78 | Herbalist | shop=herbalist | +| shop_types.79 | Hifi Store | shop=hifi | +| shop_types.80 | Honey Store | shop=honey | +| shop_types.81 | Household Linen Shop | shop=household_linen | +| shop_types.82 | Houseware Store | shop=houseware | +| shop_types.83 | Hunting Shop | shop=hunting | +| shop_types.84 | Interior Decoration Store | shop=interior_decoration | +| shop_types.85 | Jewelry Store | shop=jewelry | +| shop_types.86 | Kiosk | shop=kiosk | +| shop_types.87 | Kitchen Design Store | shop=kitchen | +| shop_types.88 | Laundry | shop=laundry | +| shop_types.89 | Leather Store | shop=leather | +| shop_types.90 | Lighting Store | shop=lighting | +| shop_types.91 | Locksmith | shop=locksmith | +| shop_types.92 | Lottery Shop | shop=lottery | +| shop_types.93 | Mall | shop=mall | +| shop_types.94 | Massage Shop | shop=massage | +| shop_types.95 | Medical Supply Store | shop=medical_supply | +| shop_types.96 | Military Surplus Store | shop=military_surplus | +| shop_types.97 | Mobile Phone Store | shop=mobile_phone | +| shop_types.98 | Model Shop | shop=model | +| shop_types.99 | Money Lender | shop=money_lender | +| shop_types.100 | Motorcycle Dealership | shop=motorcycle | +| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair | +| shop_types.102 | Music Store | shop=music | +| shop_types.103 | Musical Instrument Store | shop=musical_instrument | +| shop_types.104 | Newsstand | shop=newsagent | +| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements | +| shop_types.106 | Nuts Shop | shop=nuts | +| shop_types.107 | Optician | shop=optician | +| shop_types.108 | Outdoors Store | shop=outdoor | +| shop_types.109 | Online Retailer Outpost | shop=outpost | +| shop_types.110 | Paint Store | shop=paint | +| shop_types.111 | Party Supply Store | shop=party | +| shop_types.112 | Pasta Store | shop=pasta | +| shop_types.113 | Pastry Shop | shop=pastry | +| shop_types.114 | Pawnshop | shop=pawnbroker | +| shop_types.115 | Perfume Store | shop=perfumery | +| shop_types.116 | Pet Store | shop=pet | +| shop_types.117 | Pet Groomer | shop=pet_grooming | +| shop_types.118 | Photography Store | shop=photo | +| shop_types.119 | Pottery Store | shop=pottery | +| shop_types.120 | Printer Ink Store | shop=printer_ink | +| shop_types.121 | Psychic | shop=psychic | +| shop_types.122 | Fireworks Store | shop=pyrotechnics | +| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics | +| shop_types.124 | Religious Store | shop=religion | +| shop_types.125 | Rental Shop | shop=rental | +| shop_types.126 | Repair Shop | shop=repair | +| shop_types.127 | Rice Store | shop=rice | +| shop_types.128 | Scuba Diving Shop | shop=scuba_diving | +| shop_types.129 | Seafood Shop | shop=seafood | +| shop_types.130 | Thrift Store | shop=second_hand | +| shop_types.131 | Sewing Supply Shop | shop=sewing | +| shop_types.132 | Shoe Repair Shop | shop=shoe_repair | +| shop_types.133 | Shoe Store | shop=shoes | +| shop_types.134 | Spice Shop | shop=spices | +| shop_types.135 | Sporting Goods Store | shop=sports | +| shop_types.136 | Stationery Store | shop=stationery | +| shop_types.137 | Storage Rental | shop=storage_rental | +| shop_types.138 | Supermarket | shop=supermarket | +| shop_types.139 | Pool Supply Store | shop=swimming_pool | +| shop_types.140 | Tailor | shop=tailor | +| shop_types.141 | Tattoo Parlor | shop=tattoo | +| shop_types.142 | Tea Store | shop=tea | +| shop_types.143 | Telecom Retail Store | shop=telecommunication | +| shop_types.144 | Ticket Seller | shop=ticket | +| shop_types.145 | Tile Shop | shop=tiles | +| shop_types.146 | Tobacco Shop | shop=tobacco | +| shop_types.147 | Tool Rental | shop=tool_hire | +| shop_types.148 | Toy Store | shop=toys | +| shop_types.149 | Trade Shop | shop=trade | +| shop_types.150 | Travel Agency | shop=travel_agency | +| shop_types.151 | Trophy Shop | shop=trophy | +| shop_types.152 | Tire Store | shop=tyres | +| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner | +| shop_types.154 | Discount Store | shop=variety_store | +| shop_types.155 | Video Store | shop=video | +| shop_types.156 | Video Game Store | shop=video_games | +| shop_types.157 | Watches Shop | shop=watches | +| shop_types.158 | Drinking Water Shop | shop=water | +| shop_types.159 | Watersport/Swim Shop | shop=water_sports | +| shop_types.160 | Weapon Shop | shop=weapons | +| shop_types.161 | Wholesale Store | shop=wholesale | +| shop_types.162 | Wig Shop | shop=wigs | +| shop_types.163 | Window Blind Store | shop=window_blind | +| shop_types.164 | Wine Shop | shop=wine | + | id | question | osmTags | -----|-----|----- | | accepts_cash.0 | Accepts cash | payment:cash=yes | diff --git a/Docs/Layers/shops_lactosefree.md b/Docs/Layers/shops_lactosefree.md index 3407598a8..7cb69a1cd 100644 --- a/Docs/Layers/shops_lactosefree.md +++ b/Docs/Layers/shops_lactosefree.md @@ -114,7 +114,7 @@ Elements must match **all** of the following expressions: | [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) | | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images @@ -313,6 +313,9 @@ The question is `What kind of shop is this?` - *Window Blind Store* is shown if with shop=window_blind - *Wine Shop* is shown if with shop=wine +This tagrendering has labels +`description` + ### brand The question is `What is the brand of this shop?` @@ -361,9 +364,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -623,7 +626,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -697,14 +700,6 @@ This tagrendering has labels -----|-----|----- | | open_now.0 | Open now | _isOpen=yes | -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-type.0 | Only show shops selling {search} | | search (string) | - -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-name.0 | Only show shops with name {search} | | search (string) | - | id | question | osmTags | -----|-----|----- | | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ | @@ -713,6 +708,174 @@ This tagrendering has labels -----|-----|----- | | has_organic.0 | Has organic options | organic=yes | organic=only | +| id | question | osmTags | +-----|-----|----- | +| shop_types.0 | *What kind of shop is this?* (default) | | +| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | +| shop_types.2 | Farm Supply Shop | shop=agrarian | +| shop_types.3 | Liquor Store | shop=alcohol | +| shop_types.4 | Anime / Manga Shop | shop=anime | +| shop_types.5 | Antique Shop | shop=antiques | +| shop_types.6 | Appliance Store | shop=appliance | +| shop_types.7 | Art Store | shop=art | +| shop_types.8 | Baby Goods Store | shop=baby_goods | +| shop_types.9 | Bag/Luggage Store | shop=bag | +| shop_types.10 | Bakery | shop=bakery | +| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing | +| shop_types.12 | Beauty Shop | shop=beauty | +| shop_types.13 | Bedding/Mattress Store | shop=bed | +| shop_types.14 | Beverage Store | shop=beverages | +| shop_types.15 | Bicycle Shop | shop=bicycle | +| shop_types.16 | Boat Store | shop=boat | +| shop_types.17 | Bookmaker | shop=bookmaker | +| shop_types.18 | Bookstore | shop=books | +| shop_types.19 | Brewing Supply Store | shop=brewing_supplies | +| shop_types.20 | Butcher | shop=butcher | +| shop_types.21 | Camera Equipment Store | shop=camera | +| shop_types.22 | Candle Shop | shop=candles | +| shop_types.23 | Cannabis Shop | shop=cannabis | +| shop_types.24 | Car Dealership | shop=car | +| shop_types.25 | Car Parts Store | shop=car_parts | +| shop_types.26 | Car Repair Shop | shop=car_repair | +| shop_types.27 | RV Dealership | shop=caravan | +| shop_types.28 | Carpet Store | shop=carpet | +| shop_types.29 | Catalog Shop | shop=catalogue | +| shop_types.30 | Charity Store | shop=charity | +| shop_types.31 | Cheese Store | shop=cheese | +| shop_types.32 | Drugstore | shop=chemist | +| shop_types.33 | Chocolate Store | shop=chocolate | +| shop_types.34 | Clothing Store | shop=clothes | +| shop_types.35 | Coffee Store | shop=coffee | +| shop_types.36 | Collectibles Shop | shop=collector | +| shop_types.37 | Computer Store | shop=computer | +| shop_types.38 | Candy Store | shop=confectionery | +| shop_types.39 | Convenience Store | shop=convenience | +| shop_types.40 | Copy Store | shop=copyshop | +| shop_types.41 | Cosmetics Store | shop=cosmetics | +| shop_types.42 | Rural Supplies Store | shop=country_store | +| shop_types.43 | Arts & Crafts Store | shop=craft | +| shop_types.44 | Curtain Store | shop=curtain | +| shop_types.45 | Dairy Store | shop=dairy | +| shop_types.46 | Delicatessen | shop=deli | +| shop_types.47 | Department Store | shop=department_store | +| shop_types.48 | DIY Store | shop=doityourself | +| shop_types.49 | Door Shop | shop=doors | +| shop_types.50 | Dry Cleaner | shop=dry_cleaning | +| shop_types.51 | E-Cigarette Shop | shop=e-cigarette | +| shop_types.52 | Electrical Equipment Store | shop=electrical | +| shop_types.53 | Electronics Store | shop=electronics | +| shop_types.54 | Erotic Store | shop=erotic | +| shop_types.55 | Fabric Store | shop=fabric | +| shop_types.56 | Produce Stand | shop=farm | +| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories | +| shop_types.58 | Fireplace Store | shop=fireplace | +| shop_types.59 | Fishing Shop | shop=fishing | +| shop_types.60 | Flooring Supply Shop | shop=flooring | +| shop_types.61 | Florist | shop=florist | +| shop_types.62 | Framing Shop | shop=frame | +| shop_types.63 | Frozen Food Store | shop=frozen_food | +| shop_types.64 | Fuel Shop | shop=fuel | +| shop_types.65 | Funeral Home | shop=funeral_directors | +| shop_types.66 | Furniture Store | shop=furniture | +| shop_types.67 | Tabletop Game Store | shop=games | +| shop_types.68 | Garden Center | shop=garden_centre | +| shop_types.69 | Bottled Gas Shop | shop=gas | +| shop_types.70 | General Store | shop=general | +| shop_types.71 | Gift Shop | shop=gift | +| shop_types.72 | Greengrocer | shop=greengrocer | +| shop_types.73 | Hairdresser | shop=hairdresser | +| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply | +| shop_types.75 | Hardware Store | shop=hardware | +| shop_types.76 | Health Food Store | shop=health_food | +| shop_types.77 | Hearing Aids Store | shop=hearing_aids | +| shop_types.78 | Herbalist | shop=herbalist | +| shop_types.79 | Hifi Store | shop=hifi | +| shop_types.80 | Honey Store | shop=honey | +| shop_types.81 | Household Linen Shop | shop=household_linen | +| shop_types.82 | Houseware Store | shop=houseware | +| shop_types.83 | Hunting Shop | shop=hunting | +| shop_types.84 | Interior Decoration Store | shop=interior_decoration | +| shop_types.85 | Jewelry Store | shop=jewelry | +| shop_types.86 | Kiosk | shop=kiosk | +| shop_types.87 | Kitchen Design Store | shop=kitchen | +| shop_types.88 | Laundry | shop=laundry | +| shop_types.89 | Leather Store | shop=leather | +| shop_types.90 | Lighting Store | shop=lighting | +| shop_types.91 | Locksmith | shop=locksmith | +| shop_types.92 | Lottery Shop | shop=lottery | +| shop_types.93 | Mall | shop=mall | +| shop_types.94 | Massage Shop | shop=massage | +| shop_types.95 | Medical Supply Store | shop=medical_supply | +| shop_types.96 | Military Surplus Store | shop=military_surplus | +| shop_types.97 | Mobile Phone Store | shop=mobile_phone | +| shop_types.98 | Model Shop | shop=model | +| shop_types.99 | Money Lender | shop=money_lender | +| shop_types.100 | Motorcycle Dealership | shop=motorcycle | +| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair | +| shop_types.102 | Music Store | shop=music | +| shop_types.103 | Musical Instrument Store | shop=musical_instrument | +| shop_types.104 | Newsstand | shop=newsagent | +| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements | +| shop_types.106 | Nuts Shop | shop=nuts | +| shop_types.107 | Optician | shop=optician | +| shop_types.108 | Outdoors Store | shop=outdoor | +| shop_types.109 | Online Retailer Outpost | shop=outpost | +| shop_types.110 | Paint Store | shop=paint | +| shop_types.111 | Party Supply Store | shop=party | +| shop_types.112 | Pasta Store | shop=pasta | +| shop_types.113 | Pastry Shop | shop=pastry | +| shop_types.114 | Pawnshop | shop=pawnbroker | +| shop_types.115 | Perfume Store | shop=perfumery | +| shop_types.116 | Pet Store | shop=pet | +| shop_types.117 | Pet Groomer | shop=pet_grooming | +| shop_types.118 | Photography Store | shop=photo | +| shop_types.119 | Pottery Store | shop=pottery | +| shop_types.120 | Printer Ink Store | shop=printer_ink | +| shop_types.121 | Psychic | shop=psychic | +| shop_types.122 | Fireworks Store | shop=pyrotechnics | +| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics | +| shop_types.124 | Religious Store | shop=religion | +| shop_types.125 | Rental Shop | shop=rental | +| shop_types.126 | Repair Shop | shop=repair | +| shop_types.127 | Rice Store | shop=rice | +| shop_types.128 | Scuba Diving Shop | shop=scuba_diving | +| shop_types.129 | Seafood Shop | shop=seafood | +| shop_types.130 | Thrift Store | shop=second_hand | +| shop_types.131 | Sewing Supply Shop | shop=sewing | +| shop_types.132 | Shoe Repair Shop | shop=shoe_repair | +| shop_types.133 | Shoe Store | shop=shoes | +| shop_types.134 | Spice Shop | shop=spices | +| shop_types.135 | Sporting Goods Store | shop=sports | +| shop_types.136 | Stationery Store | shop=stationery | +| shop_types.137 | Storage Rental | shop=storage_rental | +| shop_types.138 | Supermarket | shop=supermarket | +| shop_types.139 | Pool Supply Store | shop=swimming_pool | +| shop_types.140 | Tailor | shop=tailor | +| shop_types.141 | Tattoo Parlor | shop=tattoo | +| shop_types.142 | Tea Store | shop=tea | +| shop_types.143 | Telecom Retail Store | shop=telecommunication | +| shop_types.144 | Ticket Seller | shop=ticket | +| shop_types.145 | Tile Shop | shop=tiles | +| shop_types.146 | Tobacco Shop | shop=tobacco | +| shop_types.147 | Tool Rental | shop=tool_hire | +| shop_types.148 | Toy Store | shop=toys | +| shop_types.149 | Trade Shop | shop=trade | +| shop_types.150 | Travel Agency | shop=travel_agency | +| shop_types.151 | Trophy Shop | shop=trophy | +| shop_types.152 | Tire Store | shop=tyres | +| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner | +| shop_types.154 | Discount Store | shop=variety_store | +| shop_types.155 | Video Store | shop=video | +| shop_types.156 | Video Game Store | shop=video_games | +| shop_types.157 | Watches Shop | shop=watches | +| shop_types.158 | Drinking Water Shop | shop=water | +| shop_types.159 | Watersport/Swim Shop | shop=water_sports | +| shop_types.160 | Weapon Shop | shop=weapons | +| shop_types.161 | Wholesale Store | shop=wholesale | +| shop_types.162 | Wig Shop | shop=wigs | +| shop_types.163 | Window Blind Store | shop=window_blind | +| shop_types.164 | Wine Shop | shop=wine | + | id | question | osmTags | -----|-----|----- | | accepts_cash.0 | Accepts cash | payment:cash=yes | diff --git a/Docs/Layers/shops_second_hand.md b/Docs/Layers/shops_second_hand.md index f6bb8c587..ed940b5d2 100644 --- a/Docs/Layers/shops_second_hand.md +++ b/Docs/Layers/shops_second_hand.md @@ -6,7 +6,7 @@ This layer is based on [shops](../Layers/shops.md) A shop - - This layer is shown at zoomlevel **10** and higher + - This layer is shown at zoomlevel **6** and higher ## Table of contents @@ -111,7 +111,7 @@ Elements must match **any** of the following expressions: | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images @@ -298,6 +298,9 @@ The question is `What kind of shop is this?` - *Window Blind Store* is shown if with shop=window_blind - *Wine Shop* is shown if with shop=wine +This tagrendering has labels +`description` + ### brand The question is `What is the brand of this shop?` @@ -346,9 +349,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -608,7 +611,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` diff --git a/Docs/Layers/shops_with_climbing_shoe_repair.md b/Docs/Layers/shops_with_climbing_shoe_repair.md index eb40bbe75..daf6e3c79 100644 --- a/Docs/Layers/shops_with_climbing_shoe_repair.md +++ b/Docs/Layers/shops_with_climbing_shoe_repair.md @@ -114,7 +114,7 @@ Elements must match **all** of the following expressions: | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### repairs_climbing_shoes @@ -308,6 +308,9 @@ The question is `What kind of shop is this?` - *Window Blind Store* is shown if with shop=window_blind - *Wine Shop* is shown if with shop=wine +This tagrendering has labels +`description` + ### brand The question is `What is the brand of this shop?` @@ -356,9 +359,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -618,7 +621,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -705,14 +708,6 @@ This tagrendering has labels -----|-----|----- | | open_now.0 | Open now | _isOpen=yes | -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-type.0 | Only show shops selling {search} | | search (string) | - -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-name.0 | Only show shops with name {search} | | search (string) | - | id | question | osmTags | -----|-----|----- | | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ | @@ -721,6 +716,174 @@ This tagrendering has labels -----|-----|----- | | has_organic.0 | Has organic options | organic=yes | organic=only | +| id | question | osmTags | +-----|-----|----- | +| shop_types.0 | *What kind of shop is this?* (default) | | +| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | +| shop_types.2 | Farm Supply Shop | shop=agrarian | +| shop_types.3 | Liquor Store | shop=alcohol | +| shop_types.4 | Anime / Manga Shop | shop=anime | +| shop_types.5 | Antique Shop | shop=antiques | +| shop_types.6 | Appliance Store | shop=appliance | +| shop_types.7 | Art Store | shop=art | +| shop_types.8 | Baby Goods Store | shop=baby_goods | +| shop_types.9 | Bag/Luggage Store | shop=bag | +| shop_types.10 | Bakery | shop=bakery | +| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing | +| shop_types.12 | Beauty Shop | shop=beauty | +| shop_types.13 | Bedding/Mattress Store | shop=bed | +| shop_types.14 | Beverage Store | shop=beverages | +| shop_types.15 | Bicycle Shop | shop=bicycle | +| shop_types.16 | Boat Store | shop=boat | +| shop_types.17 | Bookmaker | shop=bookmaker | +| shop_types.18 | Bookstore | shop=books | +| shop_types.19 | Brewing Supply Store | shop=brewing_supplies | +| shop_types.20 | Butcher | shop=butcher | +| shop_types.21 | Camera Equipment Store | shop=camera | +| shop_types.22 | Candle Shop | shop=candles | +| shop_types.23 | Cannabis Shop | shop=cannabis | +| shop_types.24 | Car Dealership | shop=car | +| shop_types.25 | Car Parts Store | shop=car_parts | +| shop_types.26 | Car Repair Shop | shop=car_repair | +| shop_types.27 | RV Dealership | shop=caravan | +| shop_types.28 | Carpet Store | shop=carpet | +| shop_types.29 | Catalog Shop | shop=catalogue | +| shop_types.30 | Charity Store | shop=charity | +| shop_types.31 | Cheese Store | shop=cheese | +| shop_types.32 | Drugstore | shop=chemist | +| shop_types.33 | Chocolate Store | shop=chocolate | +| shop_types.34 | Clothing Store | shop=clothes | +| shop_types.35 | Coffee Store | shop=coffee | +| shop_types.36 | Collectibles Shop | shop=collector | +| shop_types.37 | Computer Store | shop=computer | +| shop_types.38 | Candy Store | shop=confectionery | +| shop_types.39 | Convenience Store | shop=convenience | +| shop_types.40 | Copy Store | shop=copyshop | +| shop_types.41 | Cosmetics Store | shop=cosmetics | +| shop_types.42 | Rural Supplies Store | shop=country_store | +| shop_types.43 | Arts & Crafts Store | shop=craft | +| shop_types.44 | Curtain Store | shop=curtain | +| shop_types.45 | Dairy Store | shop=dairy | +| shop_types.46 | Delicatessen | shop=deli | +| shop_types.47 | Department Store | shop=department_store | +| shop_types.48 | DIY Store | shop=doityourself | +| shop_types.49 | Door Shop | shop=doors | +| shop_types.50 | Dry Cleaner | shop=dry_cleaning | +| shop_types.51 | E-Cigarette Shop | shop=e-cigarette | +| shop_types.52 | Electrical Equipment Store | shop=electrical | +| shop_types.53 | Electronics Store | shop=electronics | +| shop_types.54 | Erotic Store | shop=erotic | +| shop_types.55 | Fabric Store | shop=fabric | +| shop_types.56 | Produce Stand | shop=farm | +| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories | +| shop_types.58 | Fireplace Store | shop=fireplace | +| shop_types.59 | Fishing Shop | shop=fishing | +| shop_types.60 | Flooring Supply Shop | shop=flooring | +| shop_types.61 | Florist | shop=florist | +| shop_types.62 | Framing Shop | shop=frame | +| shop_types.63 | Frozen Food Store | shop=frozen_food | +| shop_types.64 | Fuel Shop | shop=fuel | +| shop_types.65 | Funeral Home | shop=funeral_directors | +| shop_types.66 | Furniture Store | shop=furniture | +| shop_types.67 | Tabletop Game Store | shop=games | +| shop_types.68 | Garden Center | shop=garden_centre | +| shop_types.69 | Bottled Gas Shop | shop=gas | +| shop_types.70 | General Store | shop=general | +| shop_types.71 | Gift Shop | shop=gift | +| shop_types.72 | Greengrocer | shop=greengrocer | +| shop_types.73 | Hairdresser | shop=hairdresser | +| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply | +| shop_types.75 | Hardware Store | shop=hardware | +| shop_types.76 | Health Food Store | shop=health_food | +| shop_types.77 | Hearing Aids Store | shop=hearing_aids | +| shop_types.78 | Herbalist | shop=herbalist | +| shop_types.79 | Hifi Store | shop=hifi | +| shop_types.80 | Honey Store | shop=honey | +| shop_types.81 | Household Linen Shop | shop=household_linen | +| shop_types.82 | Houseware Store | shop=houseware | +| shop_types.83 | Hunting Shop | shop=hunting | +| shop_types.84 | Interior Decoration Store | shop=interior_decoration | +| shop_types.85 | Jewelry Store | shop=jewelry | +| shop_types.86 | Kiosk | shop=kiosk | +| shop_types.87 | Kitchen Design Store | shop=kitchen | +| shop_types.88 | Laundry | shop=laundry | +| shop_types.89 | Leather Store | shop=leather | +| shop_types.90 | Lighting Store | shop=lighting | +| shop_types.91 | Locksmith | shop=locksmith | +| shop_types.92 | Lottery Shop | shop=lottery | +| shop_types.93 | Mall | shop=mall | +| shop_types.94 | Massage Shop | shop=massage | +| shop_types.95 | Medical Supply Store | shop=medical_supply | +| shop_types.96 | Military Surplus Store | shop=military_surplus | +| shop_types.97 | Mobile Phone Store | shop=mobile_phone | +| shop_types.98 | Model Shop | shop=model | +| shop_types.99 | Money Lender | shop=money_lender | +| shop_types.100 | Motorcycle Dealership | shop=motorcycle | +| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair | +| shop_types.102 | Music Store | shop=music | +| shop_types.103 | Musical Instrument Store | shop=musical_instrument | +| shop_types.104 | Newsstand | shop=newsagent | +| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements | +| shop_types.106 | Nuts Shop | shop=nuts | +| shop_types.107 | Optician | shop=optician | +| shop_types.108 | Outdoors Store | shop=outdoor | +| shop_types.109 | Online Retailer Outpost | shop=outpost | +| shop_types.110 | Paint Store | shop=paint | +| shop_types.111 | Party Supply Store | shop=party | +| shop_types.112 | Pasta Store | shop=pasta | +| shop_types.113 | Pastry Shop | shop=pastry | +| shop_types.114 | Pawnshop | shop=pawnbroker | +| shop_types.115 | Perfume Store | shop=perfumery | +| shop_types.116 | Pet Store | shop=pet | +| shop_types.117 | Pet Groomer | shop=pet_grooming | +| shop_types.118 | Photography Store | shop=photo | +| shop_types.119 | Pottery Store | shop=pottery | +| shop_types.120 | Printer Ink Store | shop=printer_ink | +| shop_types.121 | Psychic | shop=psychic | +| shop_types.122 | Fireworks Store | shop=pyrotechnics | +| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics | +| shop_types.124 | Religious Store | shop=religion | +| shop_types.125 | Rental Shop | shop=rental | +| shop_types.126 | Repair Shop | shop=repair | +| shop_types.127 | Rice Store | shop=rice | +| shop_types.128 | Scuba Diving Shop | shop=scuba_diving | +| shop_types.129 | Seafood Shop | shop=seafood | +| shop_types.130 | Thrift Store | shop=second_hand | +| shop_types.131 | Sewing Supply Shop | shop=sewing | +| shop_types.132 | Shoe Repair Shop | shop=shoe_repair | +| shop_types.133 | Shoe Store | shop=shoes | +| shop_types.134 | Spice Shop | shop=spices | +| shop_types.135 | Sporting Goods Store | shop=sports | +| shop_types.136 | Stationery Store | shop=stationery | +| shop_types.137 | Storage Rental | shop=storage_rental | +| shop_types.138 | Supermarket | shop=supermarket | +| shop_types.139 | Pool Supply Store | shop=swimming_pool | +| shop_types.140 | Tailor | shop=tailor | +| shop_types.141 | Tattoo Parlor | shop=tattoo | +| shop_types.142 | Tea Store | shop=tea | +| shop_types.143 | Telecom Retail Store | shop=telecommunication | +| shop_types.144 | Ticket Seller | shop=ticket | +| shop_types.145 | Tile Shop | shop=tiles | +| shop_types.146 | Tobacco Shop | shop=tobacco | +| shop_types.147 | Tool Rental | shop=tool_hire | +| shop_types.148 | Toy Store | shop=toys | +| shop_types.149 | Trade Shop | shop=trade | +| shop_types.150 | Travel Agency | shop=travel_agency | +| shop_types.151 | Trophy Shop | shop=trophy | +| shop_types.152 | Tire Store | shop=tyres | +| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner | +| shop_types.154 | Discount Store | shop=variety_store | +| shop_types.155 | Video Store | shop=video | +| shop_types.156 | Video Game Store | shop=video_games | +| shop_types.157 | Watches Shop | shop=watches | +| shop_types.158 | Drinking Water Shop | shop=water | +| shop_types.159 | Watersport/Swim Shop | shop=water_sports | +| shop_types.160 | Weapon Shop | shop=weapons | +| shop_types.161 | Wholesale Store | shop=wholesale | +| shop_types.162 | Wig Shop | shop=wigs | +| shop_types.163 | Window Blind Store | shop=window_blind | +| shop_types.164 | Wine Shop | shop=wine | + | id | question | osmTags | -----|-----|----- | | accepts_cash.0 | Accepts cash | payment:cash=yes | diff --git a/Docs/Layers/shower.md b/Docs/Layers/shower.md index 656fbe98c..35b59df6c 100644 --- a/Docs/Layers/shower.md +++ b/Docs/Layers/shower.md @@ -9,8 +9,9 @@ A layer showing (public) showers ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [repeated](#repeated) - [single_level](#single_level) @@ -25,13 +26,19 @@ A layer showing (public) showers - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer - [personal](https://mapcomplete.org/personal) - [toilets](https://mapcomplete.org/toilets) +## Presets + +The following options to create new points are included: + +**a shower** which has the following tags:amenity=shower + ## Basic tags for this layer Elements must match the expression **amenity=shower** diff --git a/Docs/Layers/ski_piste.md b/Docs/Layers/ski_piste.md index 100695a72..472c4faec 100644 --- a/Docs/Layers/ski_piste.md +++ b/Docs/Layers/ski_piste.md @@ -15,6 +15,7 @@ Ski and snowboard pistes - [piste_difficulty](#piste_difficulty) - [length](#length) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -65,6 +66,11 @@ _This tagrendering has no question and is thus read-only_ _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/souvenir_coin.md b/Docs/Layers/souvenir_coin.md index 513671c37..4813d3b53 100644 --- a/Docs/Layers/souvenir_coin.md +++ b/Docs/Layers/souvenir_coin.md @@ -9,8 +9,9 @@ Layer showing machines selling souvenir coins ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [opening_hours_24_7](#opening_hours_24_7) - [Opening hours](#opening-hours) @@ -27,13 +28,19 @@ Layer showing machines selling souvenir coins - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer - [elongated_coin](https://mapcomplete.org/elongated_coin) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a souvenir coin machine** which has the following tags:amenity=vending_machine & vending=souvenir_coins + ## Basic tags for this layer Elements must match **all** of the following expressions: diff --git a/Docs/Layers/souvenir_note.md b/Docs/Layers/souvenir_note.md index 3aa9e3912..a6f7b7e6f 100644 --- a/Docs/Layers/souvenir_note.md +++ b/Docs/Layers/souvenir_note.md @@ -9,8 +9,9 @@ Layer showing machines selling souvenir banknotes ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [opening_hours_24_7](#opening_hours_24_7) - [Opening hours](#opening-hours) @@ -27,13 +28,19 @@ Layer showing machines selling souvenir banknotes - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer - [elongated_coin](https://mapcomplete.org/elongated_coin) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a souvenir banknote machine** which has the following tags:amenity=vending_machine & vending=souvenir_notes + ## Basic tags for this layer Elements must match **all** of the following expressions: diff --git a/Docs/Layers/speed_camera.md b/Docs/Layers/speed_camera.md index a7891ca41..221739435 100644 --- a/Docs/Layers/speed_camera.md +++ b/Docs/Layers/speed_camera.md @@ -9,8 +9,9 @@ Layer showing speed cameras ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [maxspeed](#maxspeed) - [ref](#ref) @@ -25,6 +26,12 @@ Layer showing speed cameras - [personal](https://mapcomplete.org/personal) - [surveillance](https://mapcomplete.org/surveillance) +## Presets + +The following options to create new points are included: + +**a speed camera** which has the following tags:highway=speed_camera + ## Basic tags for this layer Elements must match the expression **highway=speed_camera** diff --git a/Docs/Layers/speed_display.md b/Docs/Layers/speed_display.md index db487e18d..ea0d90ac9 100644 --- a/Docs/Layers/speed_display.md +++ b/Docs/Layers/speed_display.md @@ -9,11 +9,13 @@ Layer showing speed displays that alert drivers of their speed. ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [maxspeed](#maxspeed) - [inscription](#inscription) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -21,6 +23,12 @@ Layer showing speed displays that alert drivers of their speed. - [maxspeed](https://mapcomplete.org/maxspeed) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a speed display** which has the following tags:highway=speed_display + ## Basic tags for this layer Elements must match the expression **highway=speed_display** @@ -51,6 +59,11 @@ The question is `What is the text on this speed display?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/sport_pitch.md b/Docs/Layers/sport_pitch.md index 49f8007fb..066cf9ef2 100644 --- a/Docs/Layers/sport_pitch.md +++ b/Docs/Layers/sport_pitch.md @@ -9,8 +9,9 @@ A sport pitch ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [sport_pitch-sport](#sport_pitch-sport) - [basketball-hoops](#basketball-hoops) @@ -22,8 +23,9 @@ A sport pitch - [sport_pitch-opening_hours](#sport_pitch-opening_hours) - [questions](#questions) - [sport-pitch-reviews](#sport-pitch-reviews) + - [move-button](#move-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -32,6 +34,14 @@ A sport pitch - [sport_pitches](https://mapcomplete.org/sport_pitches) - [sports](https://mapcomplete.org/sports) +## Presets + +The following options to create new points are included: + +**a tabletennis table** which has the following tags:leisure=pitch & sport=table_tennis + +**a sport pitch** which has the following tags:leisure=pitch & fixme=Geometry to be drawn, added by MapComplete + ## Basic tags for this layer Elements must match the expression **leisure=pitch** @@ -144,6 +154,11 @@ _This tagrendering has no question and is thus read-only_ _This tagrendering has no question and is thus read-only_ *{reviews(name, sportpitch)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/sport_shops.md b/Docs/Layers/sport_shops.md index bdd5f3505..f6db17f68 100644 --- a/Docs/Layers/sport_shops.md +++ b/Docs/Layers/sport_shops.md @@ -11,8 +11,9 @@ A shop ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [reviews](#reviews) - [shops-name](#shops-name) @@ -58,12 +59,18 @@ A shop - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer - [sports](https://mapcomplete.org/sports) +## Presets + +The following options to create new points are included: + +**a sports shop** which has the following tags:shop=sports + ## Basic tags for this layer Elements must match the expression **shop=sports** @@ -109,7 +116,7 @@ Elements must match the expression ** [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images @@ -296,6 +303,9 @@ The question is `What kind of shop is this?` - *Window Blind Store* is shown if with shop=window_blind - *Wine Shop* is shown if with shop=wine +This tagrendering has labels +`description` + ### brand The question is `What is the brand of this shop?` @@ -344,9 +354,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -606,7 +616,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -693,14 +703,6 @@ This tagrendering has labels -----|-----|----- | | open_now.0 | Open now | _isOpen=yes | -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-type.0 | Only show shops selling {search} | | search (string) | - -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-name.0 | Only show shops with name {search} | | search (string) | - | id | question | osmTags | -----|-----|----- | | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ | @@ -709,6 +711,174 @@ This tagrendering has labels -----|-----|----- | | has_organic.0 | Has organic options | organic=yes | organic=only | +| id | question | osmTags | +-----|-----|----- | +| shop_types.0 | *What kind of shop is this?* (default) | | +| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | +| shop_types.2 | Farm Supply Shop | shop=agrarian | +| shop_types.3 | Liquor Store | shop=alcohol | +| shop_types.4 | Anime / Manga Shop | shop=anime | +| shop_types.5 | Antique Shop | shop=antiques | +| shop_types.6 | Appliance Store | shop=appliance | +| shop_types.7 | Art Store | shop=art | +| shop_types.8 | Baby Goods Store | shop=baby_goods | +| shop_types.9 | Bag/Luggage Store | shop=bag | +| shop_types.10 | Bakery | shop=bakery | +| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing | +| shop_types.12 | Beauty Shop | shop=beauty | +| shop_types.13 | Bedding/Mattress Store | shop=bed | +| shop_types.14 | Beverage Store | shop=beverages | +| shop_types.15 | Bicycle Shop | shop=bicycle | +| shop_types.16 | Boat Store | shop=boat | +| shop_types.17 | Bookmaker | shop=bookmaker | +| shop_types.18 | Bookstore | shop=books | +| shop_types.19 | Brewing Supply Store | shop=brewing_supplies | +| shop_types.20 | Butcher | shop=butcher | +| shop_types.21 | Camera Equipment Store | shop=camera | +| shop_types.22 | Candle Shop | shop=candles | +| shop_types.23 | Cannabis Shop | shop=cannabis | +| shop_types.24 | Car Dealership | shop=car | +| shop_types.25 | Car Parts Store | shop=car_parts | +| shop_types.26 | Car Repair Shop | shop=car_repair | +| shop_types.27 | RV Dealership | shop=caravan | +| shop_types.28 | Carpet Store | shop=carpet | +| shop_types.29 | Catalog Shop | shop=catalogue | +| shop_types.30 | Charity Store | shop=charity | +| shop_types.31 | Cheese Store | shop=cheese | +| shop_types.32 | Drugstore | shop=chemist | +| shop_types.33 | Chocolate Store | shop=chocolate | +| shop_types.34 | Clothing Store | shop=clothes | +| shop_types.35 | Coffee Store | shop=coffee | +| shop_types.36 | Collectibles Shop | shop=collector | +| shop_types.37 | Computer Store | shop=computer | +| shop_types.38 | Candy Store | shop=confectionery | +| shop_types.39 | Convenience Store | shop=convenience | +| shop_types.40 | Copy Store | shop=copyshop | +| shop_types.41 | Cosmetics Store | shop=cosmetics | +| shop_types.42 | Rural Supplies Store | shop=country_store | +| shop_types.43 | Arts & Crafts Store | shop=craft | +| shop_types.44 | Curtain Store | shop=curtain | +| shop_types.45 | Dairy Store | shop=dairy | +| shop_types.46 | Delicatessen | shop=deli | +| shop_types.47 | Department Store | shop=department_store | +| shop_types.48 | DIY Store | shop=doityourself | +| shop_types.49 | Door Shop | shop=doors | +| shop_types.50 | Dry Cleaner | shop=dry_cleaning | +| shop_types.51 | E-Cigarette Shop | shop=e-cigarette | +| shop_types.52 | Electrical Equipment Store | shop=electrical | +| shop_types.53 | Electronics Store | shop=electronics | +| shop_types.54 | Erotic Store | shop=erotic | +| shop_types.55 | Fabric Store | shop=fabric | +| shop_types.56 | Produce Stand | shop=farm | +| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories | +| shop_types.58 | Fireplace Store | shop=fireplace | +| shop_types.59 | Fishing Shop | shop=fishing | +| shop_types.60 | Flooring Supply Shop | shop=flooring | +| shop_types.61 | Florist | shop=florist | +| shop_types.62 | Framing Shop | shop=frame | +| shop_types.63 | Frozen Food Store | shop=frozen_food | +| shop_types.64 | Fuel Shop | shop=fuel | +| shop_types.65 | Funeral Home | shop=funeral_directors | +| shop_types.66 | Furniture Store | shop=furniture | +| shop_types.67 | Tabletop Game Store | shop=games | +| shop_types.68 | Garden Center | shop=garden_centre | +| shop_types.69 | Bottled Gas Shop | shop=gas | +| shop_types.70 | General Store | shop=general | +| shop_types.71 | Gift Shop | shop=gift | +| shop_types.72 | Greengrocer | shop=greengrocer | +| shop_types.73 | Hairdresser | shop=hairdresser | +| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply | +| shop_types.75 | Hardware Store | shop=hardware | +| shop_types.76 | Health Food Store | shop=health_food | +| shop_types.77 | Hearing Aids Store | shop=hearing_aids | +| shop_types.78 | Herbalist | shop=herbalist | +| shop_types.79 | Hifi Store | shop=hifi | +| shop_types.80 | Honey Store | shop=honey | +| shop_types.81 | Household Linen Shop | shop=household_linen | +| shop_types.82 | Houseware Store | shop=houseware | +| shop_types.83 | Hunting Shop | shop=hunting | +| shop_types.84 | Interior Decoration Store | shop=interior_decoration | +| shop_types.85 | Jewelry Store | shop=jewelry | +| shop_types.86 | Kiosk | shop=kiosk | +| shop_types.87 | Kitchen Design Store | shop=kitchen | +| shop_types.88 | Laundry | shop=laundry | +| shop_types.89 | Leather Store | shop=leather | +| shop_types.90 | Lighting Store | shop=lighting | +| shop_types.91 | Locksmith | shop=locksmith | +| shop_types.92 | Lottery Shop | shop=lottery | +| shop_types.93 | Mall | shop=mall | +| shop_types.94 | Massage Shop | shop=massage | +| shop_types.95 | Medical Supply Store | shop=medical_supply | +| shop_types.96 | Military Surplus Store | shop=military_surplus | +| shop_types.97 | Mobile Phone Store | shop=mobile_phone | +| shop_types.98 | Model Shop | shop=model | +| shop_types.99 | Money Lender | shop=money_lender | +| shop_types.100 | Motorcycle Dealership | shop=motorcycle | +| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair | +| shop_types.102 | Music Store | shop=music | +| shop_types.103 | Musical Instrument Store | shop=musical_instrument | +| shop_types.104 | Newsstand | shop=newsagent | +| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements | +| shop_types.106 | Nuts Shop | shop=nuts | +| shop_types.107 | Optician | shop=optician | +| shop_types.108 | Outdoors Store | shop=outdoor | +| shop_types.109 | Online Retailer Outpost | shop=outpost | +| shop_types.110 | Paint Store | shop=paint | +| shop_types.111 | Party Supply Store | shop=party | +| shop_types.112 | Pasta Store | shop=pasta | +| shop_types.113 | Pastry Shop | shop=pastry | +| shop_types.114 | Pawnshop | shop=pawnbroker | +| shop_types.115 | Perfume Store | shop=perfumery | +| shop_types.116 | Pet Store | shop=pet | +| shop_types.117 | Pet Groomer | shop=pet_grooming | +| shop_types.118 | Photography Store | shop=photo | +| shop_types.119 | Pottery Store | shop=pottery | +| shop_types.120 | Printer Ink Store | shop=printer_ink | +| shop_types.121 | Psychic | shop=psychic | +| shop_types.122 | Fireworks Store | shop=pyrotechnics | +| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics | +| shop_types.124 | Religious Store | shop=religion | +| shop_types.125 | Rental Shop | shop=rental | +| shop_types.126 | Repair Shop | shop=repair | +| shop_types.127 | Rice Store | shop=rice | +| shop_types.128 | Scuba Diving Shop | shop=scuba_diving | +| shop_types.129 | Seafood Shop | shop=seafood | +| shop_types.130 | Thrift Store | shop=second_hand | +| shop_types.131 | Sewing Supply Shop | shop=sewing | +| shop_types.132 | Shoe Repair Shop | shop=shoe_repair | +| shop_types.133 | Shoe Store | shop=shoes | +| shop_types.134 | Spice Shop | shop=spices | +| shop_types.135 | Sporting Goods Store | shop=sports | +| shop_types.136 | Stationery Store | shop=stationery | +| shop_types.137 | Storage Rental | shop=storage_rental | +| shop_types.138 | Supermarket | shop=supermarket | +| shop_types.139 | Pool Supply Store | shop=swimming_pool | +| shop_types.140 | Tailor | shop=tailor | +| shop_types.141 | Tattoo Parlor | shop=tattoo | +| shop_types.142 | Tea Store | shop=tea | +| shop_types.143 | Telecom Retail Store | shop=telecommunication | +| shop_types.144 | Ticket Seller | shop=ticket | +| shop_types.145 | Tile Shop | shop=tiles | +| shop_types.146 | Tobacco Shop | shop=tobacco | +| shop_types.147 | Tool Rental | shop=tool_hire | +| shop_types.148 | Toy Store | shop=toys | +| shop_types.149 | Trade Shop | shop=trade | +| shop_types.150 | Travel Agency | shop=travel_agency | +| shop_types.151 | Trophy Shop | shop=trophy | +| shop_types.152 | Tire Store | shop=tyres | +| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner | +| shop_types.154 | Discount Store | shop=variety_store | +| shop_types.155 | Video Store | shop=video | +| shop_types.156 | Video Game Store | shop=video_games | +| shop_types.157 | Watches Shop | shop=watches | +| shop_types.158 | Drinking Water Shop | shop=water | +| shop_types.159 | Watersport/Swim Shop | shop=water_sports | +| shop_types.160 | Weapon Shop | shop=weapons | +| shop_types.161 | Wholesale Store | shop=wholesale | +| shop_types.162 | Wig Shop | shop=wigs | +| shop_types.163 | Window Blind Store | shop=window_blind | +| shop_types.164 | Wine Shop | shop=wine | + | id | question | osmTags | -----|-----|----- | | accepts_cash.0 | Accepts cash | payment:cash=yes | diff --git a/Docs/Layers/sports_centre.md b/Docs/Layers/sports_centre.md index c9bee5df3..14d609840 100644 --- a/Docs/Layers/sports_centre.md +++ b/Docs/Layers/sports_centre.md @@ -9,8 +9,9 @@ Indoor and outdoor sports centres can be found on this layer ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [opening_hours](#opening_hours) - [Opening hours](#opening-hours) @@ -21,13 +22,19 @@ Indoor and outdoor sports centres can be found on this layer - [leftover-questions](#leftover-questions) - [move-button](#move-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer - [personal](https://mapcomplete.org/personal) - [sports](https://mapcomplete.org/sports) +## Presets + +The following options to create new points are included: + +**a sports centre** which has the following tags:leisure=sports_centre + ## Basic tags for this layer Elements must match the expression **leisure=sports_centre** @@ -61,9 +68,9 @@ The question is `What are the opening hours of {title()}?` ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/stairs.md b/Docs/Layers/stairs.md index 29e1f32aa..da587c7ba 100644 --- a/Docs/Layers/stairs.md +++ b/Docs/Layers/stairs.md @@ -20,6 +20,7 @@ Layer showing stairs and escalators - [ramp](#ramp) - [incline](#incline) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -116,6 +117,11 @@ The question is `What is the incline of these stairs?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/street_lamps.md b/Docs/Layers/street_lamps.md index f470b9af7..ddaae5036 100644 --- a/Docs/Layers/street_lamps.md +++ b/Docs/Layers/street_lamps.md @@ -9,8 +9,9 @@ A layer showing street lights ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [ref](#ref) - [support](#support) @@ -31,6 +32,12 @@ A layer showing street lights - [street_lighting](https://mapcomplete.org/street_lighting) - [street_lighting_assen](https://mapcomplete.org/street_lighting_assen) +## Presets + +The following options to create new points are included: + +**a street lamp** which has the following tags:highway=street_lamp + ## Basic tags for this layer Elements must match the expression **highway=street_lamp** diff --git a/Docs/Layers/stripclub.md b/Docs/Layers/stripclub.md index c631e0160..123045e02 100644 --- a/Docs/Layers/stripclub.md +++ b/Docs/Layers/stripclub.md @@ -9,8 +9,9 @@ A venue where erotic dance, striptease, or lap dances are performed commercially ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [reviews](#reviews) - [name](#name) @@ -20,12 +21,19 @@ A venue where erotic dance, striptease, or lap dances are performed commercially - [email](#email) - [website](#website) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer - [openlovemap](https://mapcomplete.org/openlovemap) +## Presets + +The following options to create new points are included: + +**a stripclub** which has the following tags:amenity=stripclub + ## Basic tags for this layer Elements must match the expression **amenity=stripclub** @@ -69,9 +77,9 @@ The question is `What are the opening hours of {title()}?` ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -102,6 +110,11 @@ This tagrendering has labels _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/surveillance_camera.md b/Docs/Layers/surveillance_camera.md index c39d41d1c..9d5839723 100644 --- a/Docs/Layers/surveillance_camera.md +++ b/Docs/Layers/surveillance_camera.md @@ -11,8 +11,9 @@ This layer shows surveillance cameras and allows a contributor to update informa ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [has_alpr](#has_alpr) - [Camera type: fixed; panning; dome](#camera-type-fixed;-panning;-dome) @@ -24,6 +25,7 @@ This layer shows surveillance cameras and allows a contributor to update informa - [Surveillance:zone](#surveillancezone) - [camera:mount](#cameramount) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) @@ -32,6 +34,18 @@ This layer shows surveillance cameras and allows a contributor to update informa - [personal](https://mapcomplete.org/personal) - [surveillance](https://mapcomplete.org/surveillance) +## Presets + +The following options to create new points are included: + +**a surveillance camera** which has the following tags:man_made=surveillance & surveillance:type=camera + +**a surveillance camera mounted on a wall** which has the following tags:man_made=surveillance & surveillance:type=camera & camera:mount=wall (snaps to layers `walls_and_buildings`) + +**an ALPR camera (Automatic Number Plate Reader)** which has the following tags:man_made=surveillance & surveillance:type=ALPR + +**an ALPR camera (Automatic Number Plate Reader) mounted on a wall** which has the following tags:man_made=surveillance & surveillance:type=ALPR & camera:mount=wall (snaps to layers `walls_and_buildings`) + ## Basic tags for this layer Elements must match **all** of the following expressions: @@ -142,6 +156,11 @@ The question is `How is this camera placed?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### delete-button _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/tertiary_education.md b/Docs/Layers/tertiary_education.md index d4b92f382..c8f8c8f2b 100644 --- a/Docs/Layers/tertiary_education.md +++ b/Docs/Layers/tertiary_education.md @@ -9,8 +9,9 @@ Layer with all tertiary education institutes (ISCED:2011 levels 6,7 and 8) ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [institution-kind](#institution-kind) - [isced](#isced) - [capacity](#capacity) @@ -27,6 +28,12 @@ Layer with all tertiary education institutes (ISCED:2011 levels 6,7 and 8) - [education](https://mapcomplete.org/education) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a university** which has the following tags:amenity=university & fixme=Added with MapComplete, geometry to be drawn + ## Basic tags for this layer Elements must match **any** of the following expressions: @@ -106,9 +113,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/ticket_machine.md b/Docs/Layers/ticket_machine.md index bb23172ce..df02f802c 100644 --- a/Docs/Layers/ticket_machine.md +++ b/Docs/Layers/ticket_machine.md @@ -9,8 +9,9 @@ Find ticket machines for public transport tickets ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [repeated](#repeated) - [single_level](#single_level) @@ -29,6 +30,12 @@ Find ticket machines for public transport tickets - [stations](https://mapcomplete.org/stations) - [vending_machine](https://mapcomplete.org/vending_machine) +## Presets + +The following options to create new points are included: + +**a ticket machine** which has the following tags:amenity=vending_machine & vending=public_transport_tickets + ## Basic tags for this layer Elements must match **all** of the following expressions: diff --git a/Docs/Layers/ticket_validator.md b/Docs/Layers/ticket_validator.md index 6fed91695..167e867f6 100644 --- a/Docs/Layers/ticket_validator.md +++ b/Docs/Layers/ticket_validator.md @@ -9,8 +9,9 @@ Find ticket validators to validate public transport tickets ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [repeated](#repeated) - [single_level](#single_level) @@ -26,6 +27,12 @@ Find ticket validators to validate public transport tickets - [stations](https://mapcomplete.org/stations) +## Presets + +The following options to create new points are included: + +**a ticket validator** which has the following tags:amenity=ticket_validator + ## Basic tags for this layer Elements must match the expression **amenity=ticket_validator** diff --git a/Docs/Layers/toilet.md b/Docs/Layers/toilet.md index e13c3c546..1f6f03e6c 100644 --- a/Docs/Layers/toilet.md +++ b/Docs/Layers/toilet.md @@ -9,8 +9,9 @@ A layer showing (public) toilets ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [repeated](#repeated) - [single_level](#single_level) @@ -35,7 +36,7 @@ A layer showing (public) toilets - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -50,6 +51,14 @@ A layer showing (public) toilets - [toilets](https://mapcomplete.org/toilets) - [velopark](https://mapcomplete.org/velopark) +## Presets + +The following options to create new points are included: + +**a public toilet** which has the following tags:amenity=toilets + +**a toilets with wheelchair accessible toilet** which has the following tags:amenity=toilets & wheelchair=yes + ## Basic tags for this layer Elements must match the expression **amenity=toilets** @@ -77,7 +86,7 @@ Elements must match the expression ** [changing_table:location](https://wiki.openstreetmap.org/wiki/Key:changing_table:location) | [string](../SpecialInputElements.md#string) | [female_toilet](https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Dfemale_toilet) [male_toilet](https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Dmale_toilet) [wheelchair_toilet](https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Dwheelchair_toilet) [dedicated_room](https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Ddedicated_room) | | [toilets:handwashing](https://wiki.openstreetmap.org/wiki/Key:toilets:handwashing) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:toilets:handwashing%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:toilets:handwashing%3Dno) | | [toilets:paper_supplied](https://wiki.openstreetmap.org/wiki/Key:toilets:paper_supplied) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:toilets:paper_supplied%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:toilets:paper_supplied%3Dno) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images @@ -113,9 +122,9 @@ The question is `Are these toilets publicly accessible?` *Access is {access}* is shown if `access` is set - *Public access* is shown if with access=yes - - *Only access to customers* is shown if with access=customers - - *Not accessible* is shown if with access=no - - *Accessible, but one has to ask a key to enter* is shown if with access=key + - *Only access to customers* is shown if with access=customers + - *Not accessible* is shown if with access=no + - *Accessible, but one has to ask a key to enter* is shown if with access=key - *Public access* is shown if with access=public. _This option cannot be chosen as answer_ This tagrendering has labels diff --git a/Docs/Layers/tool_library.md b/Docs/Layers/tool_library.md index eb462c2a4..2d22985cd 100644 --- a/Docs/Layers/tool_library.md +++ b/Docs/Layers/tool_library.md @@ -9,8 +9,9 @@ A tool library is a place where people from the general public can borrow tools ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [phone](#phone) - [email](#email) @@ -31,6 +32,12 @@ A tool library is a place where people from the general public can borrow tools - [circular_economy](https://mapcomplete.org/circular_economy) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a tool library** which has the following tags:amenity=tool_library + ## Basic tags for this layer Elements must match the expression **amenity=tool_library** @@ -60,9 +67,9 @@ _This tagrendering has no question and is thus read-only_ ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/tourism_accomodation.md b/Docs/Layers/tourism_accomodation.md index 62ed38787..181782751 100644 --- a/Docs/Layers/tourism_accomodation.md +++ b/Docs/Layers/tourism_accomodation.md @@ -9,8 +9,9 @@ Various types of lodging facilities ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [reviews](#reviews) - [name](#name) @@ -28,7 +29,7 @@ Various types of lodging facilities - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -37,6 +38,26 @@ Various types of lodging facilities - [openlovemap](https://mapcomplete.org/openlovemap) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a hotel** which has the following tags:tourism=hotel + +**a hostel** which has the following tags:tourism=hostel + +**a vacation apartment** which has the following tags:tourism=apartment + +**a vacation chalet** which has the following tags:tourism=chalet + +**a motel** which has the following tags:tourism=motel + +**a bed-and-breakfast** which has the following tags:tourism=guest_house & guest_house=bed_and_breakfast + +**a small-scale lodging facility, typically operated by the owner** which has the following tags:tourism=guest_house + +**a camp site or camp ground** which has the following tags:tourism=camp_site + ## Basic tags for this layer Elements must match **any** of the following expressions: @@ -47,8 +68,9 @@ Elements must match **any** of the following expressions: - tourism=chalet - tourism=motel - tourism=guest_house + - tourism=camp_site -[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22tourism%22%3D%22hotel%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22tourism%22%3D%22hostel%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22tourism%22%3D%22apartment%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22tourism%22%3D%22chalet%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22tourism%22%3D%22motel%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22tourism%22%3D%22guest_house%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) +[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22tourism%22%3D%22hotel%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22tourism%22%3D%22hostel%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22tourism%22%3D%22apartment%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22tourism%22%3D%22chalet%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22tourism%22%3D%22motel%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22tourism%22%3D%22guest_house%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22tourism%22%3D%22camp_site%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) ## Supported attributes @@ -97,9 +119,9 @@ The question is `Is {title()} part of a bigger brand?` ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -166,7 +188,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` diff --git a/Docs/Layers/tree_node.md b/Docs/Layers/tree_node.md index bbfad1c45..a336b2b02 100644 --- a/Docs/Layers/tree_node.md +++ b/Docs/Layers/tree_node.md @@ -9,8 +9,9 @@ A layer showing trees ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [plantnet](#plantnet) - [tree-species-wikidata](#tree-species-wikidata) @@ -34,6 +35,16 @@ A layer showing trees - [personal](https://mapcomplete.org/personal) - [trees](https://mapcomplete.org/trees) +## Presets + +The following options to create new points are included: + +**a broadleaved tree** which has the following tags:natural=tree & leaf_type=broadleaved + +**a needleleaved tree** which has the following tags:natural=tree & leaf_type=needleleaved + +**a tree** which has the following tags:natural=tree + ## Basic tags for this layer Elements must match the expression **natural=tree** diff --git a/Docs/Layers/trolley_bay.md b/Docs/Layers/trolley_bay.md index 80adf288a..fce085b83 100644 --- a/Docs/Layers/trolley_bay.md +++ b/Docs/Layers/trolley_bay.md @@ -9,8 +9,9 @@ Find trolley bays for shopping trolleys. ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [covered](#covered) - [deposit](#deposit) - [denominations](#denominations) @@ -26,6 +27,12 @@ Find trolley bays for shopping trolleys. - [personal](https://mapcomplete.org/personal) - [shops](https://mapcomplete.org/shops) +## Presets + +The following options to create new points are included: + +**a trolley bay** which has the following tags:amenity=trolley_bay + ## Basic tags for this layer Elements must match the expression **amenity=trolley_bay** diff --git a/Docs/Layers/vending_machine.md b/Docs/Layers/vending_machine.md index 6959aec4a..8f0a2a1b2 100644 --- a/Docs/Layers/vending_machine.md +++ b/Docs/Layers/vending_machine.md @@ -9,8 +9,9 @@ Layer showing vending machines ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [repeated](#repeated) - [single_level](#single_level) @@ -33,7 +34,7 @@ Layer showing vending machines - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -42,6 +43,12 @@ Layer showing vending machines - [personal](https://mapcomplete.org/personal) - [vending_machine](https://mapcomplete.org/vending_machine) +## Presets + +The following options to create new points are included: + +**a vending machine** which has the following tags:amenity=vending_machine + ## Basic tags for this layer Elements must match **all** of the following expressions: @@ -221,9 +228,9 @@ The question is `Is this vending machine indoors?` ### phone The question is `What is the phone number of the operator of this vending machine?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/vending_machine_bicycle.md b/Docs/Layers/vending_machine_bicycle.md index 998981f1d..897a88985 100644 --- a/Docs/Layers/vending_machine_bicycle.md +++ b/Docs/Layers/vending_machine_bicycle.md @@ -221,9 +221,9 @@ The question is `Is this vending machine indoors?` ### phone The question is `What is the phone number of the operator of this vending machine?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Layers/veterinary.md b/Docs/Layers/veterinary.md index 58993d321..5b5b7e7b1 100644 --- a/Docs/Layers/veterinary.md +++ b/Docs/Layers/veterinary.md @@ -9,8 +9,9 @@ A layer showing veterinarians ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [website](#website) - [reviews](#reviews) - [phone](#phone) @@ -18,6 +19,7 @@ A layer showing veterinarians - [Opening hours](#opening-hours) - [vetName](#vetname) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -25,6 +27,12 @@ A layer showing veterinarians - [personal](https://mapcomplete.org/personal) - [pets](https://mapcomplete.org/pets) +## Presets + +The following options to create new points are included: + +**a veterianarian** which has the following tags:amenity=veterinary & pet=dog + ## Basic tags for this layer Elements must match the expression **amenity=veterinary** @@ -60,9 +68,9 @@ _This tagrendering has no question and is thus read-only_ ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -84,6 +92,11 @@ The question is `What is the name of this veterinarian?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/viewpoint.md b/Docs/Layers/viewpoint.md index ee9d6695d..4e74a38b8 100644 --- a/Docs/Layers/viewpoint.md +++ b/Docs/Layers/viewpoint.md @@ -9,11 +9,13 @@ A nice viewpoint or nice view. Ideal to add an image if no other category fits ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [viewpoint-description](#viewpoint-description) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -22,6 +24,12 @@ A nice viewpoint or nice view. Ideal to add an image if no other category fits - [personal](https://mapcomplete.org/personal) - [ski](https://mapcomplete.org/ski) +## Presets + +The following options to create new points are included: + +**a viewpoint** which has the following tags:tourism=viewpoint + ## Basic tags for this layer Elements must match the expression **tourism=viewpoint** @@ -51,6 +59,11 @@ The question is `Do you want to add a description?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/village_green.md b/Docs/Layers/village_green.md index ab88ba477..9033ecf0b 100644 --- a/Docs/Layers/village_green.md +++ b/Docs/Layers/village_green.md @@ -15,6 +15,7 @@ A layer showing village-green (which are communal green areas, but not quite par - [village_green-explanation](#village_green-explanation) - [village_green-reviews](#village_green-reviews) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Themes using this layer @@ -49,6 +50,11 @@ _This tagrendering has no question and is thus read-only_ _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/visitor_information_centre.md b/Docs/Layers/visitor_information_centre.md index 0c45192ad..5668daeac 100644 --- a/Docs/Layers/visitor_information_centre.md +++ b/Docs/Layers/visitor_information_centre.md @@ -13,6 +13,7 @@ No themes use this layer 1. [Basic tags for this layer](#basic-tags-for-this-layer) 2. [Supported attributes](#supported-attributes) - [leftover-questions](#leftover-questions) + - [move-button](#move-button) - [lod](#lod) ## Basic tags for this layer @@ -31,6 +32,11 @@ Elements must match **any** of the following expressions: _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Layers/waste_basket.md b/Docs/Layers/waste_basket.md index 36905e02a..b04b3df6e 100644 --- a/Docs/Layers/waste_basket.md +++ b/Docs/Layers/waste_basket.md @@ -9,8 +9,9 @@ This is a public waste basket, thrash can, where you can throw away your thrash. ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [waste-basket-waste-types](#waste-basket-waste-types) - [dispensing_dog_bags](#dispensing_dog_bags) @@ -18,7 +19,7 @@ This is a public waste basket, thrash can, where you can throw away your thrash. - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -30,6 +31,12 @@ This is a public waste basket, thrash can, where you can throw away your thrash. - [waste_assen](https://mapcomplete.org/waste_assen) - [waste_basket](https://mapcomplete.org/waste_basket) +## Presets + +The following options to create new points are included: + +**a waste basket** which has the following tags:amenity=waste_basket + ## Basic tags for this layer Elements must match the expression **amenity=waste_basket** diff --git a/Docs/Layers/waste_disposal.md b/Docs/Layers/waste_disposal.md index d4cc9741f..25f8d82ae 100644 --- a/Docs/Layers/waste_disposal.md +++ b/Docs/Layers/waste_disposal.md @@ -9,8 +9,9 @@ Waste Disposal Bin, medium to large bin for disposal of (household) waste ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [images](#images) - [type](#type) - [access](#access) @@ -19,7 +20,7 @@ Waste Disposal Bin, medium to large bin for disposal of (household) waste - [move-button](#move-button) - [delete-button](#delete-button) - [lod](#lod) -4. [Filters](#filters) +5. [Filters](#filters) ## Themes using this layer @@ -27,6 +28,12 @@ Waste Disposal Bin, medium to large bin for disposal of (household) waste - [waste](https://mapcomplete.org/waste) - [waste_assen](https://mapcomplete.org/waste_assen) +## Presets + +The following options to create new points are included: + +**a waste disposal bin** which has the following tags:amenity=waste_disposal + ## Basic tags for this layer Elements must match the expression **amenity=waste_disposal** diff --git a/Docs/Layers/windturbine.md b/Docs/Layers/windturbine.md index 6bc0a8c04..5b1828ca4 100644 --- a/Docs/Layers/windturbine.md +++ b/Docs/Layers/windturbine.md @@ -9,8 +9,9 @@ Modern windmills generating electricity ## Table of contents 1. [Themes using this layer](#themes-using-this-layer) -2. [Basic tags for this layer](#basic-tags-for-this-layer) -3. [Supported attributes](#supported-attributes) +2. [Presets](#presets) +3. [Basic tags for this layer](#basic-tags-for-this-layer) +4. [Supported attributes](#supported-attributes) - [turbine-output](#turbine-output) - [turbine-operator](#turbine-operator) - [turbine-height](#turbine-height) @@ -26,6 +27,12 @@ Modern windmills generating electricity - [openwindpowermap](https://mapcomplete.org/openwindpowermap) - [personal](https://mapcomplete.org/personal) +## Presets + +The following options to create new points are included: + +**a wind turbine** which has the following tags:power=generator & generator:source=wind + ## Basic tags for this layer Elements must match the expression **generator:source=wind** diff --git a/Docs/SpecialInputElements.md b/Docs/SpecialInputElements.md index c2eb97f9d..ca73d0aca 100644 --- a/Docs/SpecialInputElements.md +++ b/Docs/SpecialInputElements.md @@ -146,12 +146,10 @@ name | doc ------ | ----- options | A JSON-object of type `{ prefix: string, postfix: string }`. -subarg \| doc --------- \| ----- -prefix \| Piece of text that will always be added to the front of the generated opening hours. If the OSM-data does not start with this, it will fail to parse. -postfix \| Piece of text that will always be added to the end of the generated opening hours - - +| subarg | doc | +|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------| +| prefix | Piece of text that will always be added to the front of the generated opening hours. If the OSM-data does not start with this, it will fail to parse. | +| postfix | Piece of text that will always be added to the end of the generated opening hours | ### Example usage diff --git a/Docs/TagInfo/mapcomplete_benches.json b/Docs/TagInfo/mapcomplete_benches.json index d903882d1..f9681c1f1 100644 --- a/Docs/TagInfo/mapcomplete_benches.json +++ b/Docs/TagInfo/mapcomplete_benches.json @@ -83,6 +83,11 @@ "description": "Layer 'Picnic tables' shows material=plastic with a fixed text, namely 'This picnic table is made from (recycled) plastic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Benches')", "value": "plastic" }, + { + "key": "material", + "description": "Layer 'Picnic tables' shows material=metal with a fixed text, namely 'This picnic table is made from metal' and allows to pick this as a default answer (in the mapcomplete.org theme 'Benches')", + "value": "metal" + }, { "key": "amenity", "description": "The MapComplete theme Benches has a layer Benches showing features with this tag", diff --git a/Docs/TagInfo/mapcomplete_bicycle_rental.json b/Docs/TagInfo/mapcomplete_bicycle_rental.json index 9c3a259e6..8d49cac91 100644 --- a/Docs/TagInfo/mapcomplete_bicycle_rental.json +++ b/Docs/TagInfo/mapcomplete_bicycle_rental.json @@ -114,7 +114,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Bicycle rental' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Bicycle rental')" + "description": "Layer 'Bicycle rental' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Bicycle rental')" }, { "key": "opening_hours", diff --git a/Docs/TagInfo/mapcomplete_bicyclelib.json b/Docs/TagInfo/mapcomplete_bicyclelib.json index 2f6884aa5..96920c0d0 100644 --- a/Docs/TagInfo/mapcomplete_bicyclelib.json +++ b/Docs/TagInfo/mapcomplete_bicyclelib.json @@ -53,7 +53,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Bicycle library' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Bicycle libraries')" + "description": "Layer 'Bicycle library' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Bicycle libraries')" }, { "key": "email", diff --git a/Docs/TagInfo/mapcomplete_cafes_and_pubs.json b/Docs/TagInfo/mapcomplete_cafes_and_pubs.json index 72127dfd8..65c0217a6 100644 --- a/Docs/TagInfo/mapcomplete_cafes_and_pubs.json +++ b/Docs/TagInfo/mapcomplete_cafes_and_pubs.json @@ -153,7 +153,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Cafés and pubs' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Cafés and pubs')" + "description": "Layer 'Cafés and pubs' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Cafés and pubs')" }, { "key": "payment:cash", @@ -292,11 +292,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Cafés and pubs' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Cafés and pubs') (This is only shown if internet_access=wlan)" + "description": "Layer 'Cafés and pubs' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Cafés and pubs') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Cafés and pubs' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cafés and pubs') (This is only shown if internet_access=wlan)", + "description": "Layer 'Cafés and pubs' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cafés and pubs') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -433,11 +433,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Outdoor Seating' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Cafés and pubs') (This is only shown if internet_access=wlan)" + "description": "Layer 'Outdoor Seating' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Cafés and pubs') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Outdoor Seating' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cafés and pubs') (This is only shown if internet_access=wlan)", + "description": "Layer 'Outdoor Seating' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cafés and pubs') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -567,7 +567,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Food Courts' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Cafés and pubs')" + "description": "Layer 'Food Courts' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Cafés and pubs')" }, { "key": "smoking", diff --git a/Docs/TagInfo/mapcomplete_circular_economy.json b/Docs/TagInfo/mapcomplete_circular_economy.json index 3765b97eb..04061fce8 100644 --- a/Docs/TagInfo/mapcomplete_circular_economy.json +++ b/Docs/TagInfo/mapcomplete_circular_economy.json @@ -175,7 +175,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Bicycle library' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Circular economy')" + "description": "Layer 'Bicycle library' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Circular economy')" }, { "key": "email", @@ -481,7 +481,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Tool libraries' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Circular economy')" + "description": "Layer 'Tool libraries' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Circular economy')" }, { "key": "email", @@ -622,7 +622,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Repair cafés and assisted repair workshops' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Circular economy')" + "description": "Layer 'Repair cafés and assisted repair workshops' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Circular economy')" }, { "key": "email", @@ -1613,7 +1613,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Second hand shops' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Circular economy')" + "description": "Layer 'Second hand shops' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Circular economy')" }, { "key": "payment:cash", @@ -1952,11 +1952,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Second hand shops' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Circular economy') (This is only shown if internet_access=wlan)" + "description": "Layer 'Second hand shops' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Circular economy') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Second hand shops' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Circular economy') (This is only shown if internet_access=wlan)", + "description": "Layer 'Second hand shops' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Circular economy') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { diff --git a/Docs/TagInfo/mapcomplete_climbing.json b/Docs/TagInfo/mapcomplete_climbing.json index b109d8467..280d12de9 100644 --- a/Docs/TagInfo/mapcomplete_climbing.json +++ b/Docs/TagInfo/mapcomplete_climbing.json @@ -62,7 +62,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Climbing club' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')" + "description": "Layer 'Climbing club' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')" }, { "key": "opening_hours", @@ -150,7 +150,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Climbing gyms' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')" + "description": "Layer 'Climbing gyms' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')" }, { "key": "email", @@ -472,11 +472,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if internet_access=wlan)" + "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Climbing gyms' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if internet_access=wlan)", + "description": "Layer 'Climbing gyms' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -1625,7 +1625,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')" + "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')" }, { "key": "payment:cash", @@ -1964,11 +1964,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if internet_access=wlan)" + "description": "Layer 'Shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if internet_access=wlan)", + "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { diff --git a/Docs/TagInfo/mapcomplete_cyclofix.json b/Docs/TagInfo/mapcomplete_cyclofix.json index b0763bc1a..c20d4aa75 100644 --- a/Docs/TagInfo/mapcomplete_cyclofix.json +++ b/Docs/TagInfo/mapcomplete_cyclofix.json @@ -2,7 +2,7 @@ "data_format": 1, "project": { "name": "MapComplete Cyclofix - a map for cyclists", - "description": "The goal of this map is to present cyclists with an easy-to-use solution to find the appropriate infrastructure for their needs", + "description": "A map for cyclists to find the appropriate infrastructure for their needs, such as bicycle pumps, drinking water, bicycle shops, repair stations or parkings", "project_url": "https://mapcomplete.org/cyclofix", "doc_url": "https://github.com/pietervdvn/MapComplete/tree/master/assets/themes/", "icon_url": "https://mapcomplete.org/assets/themes/cyclofix/logo.svg", @@ -10,6 +10,129 @@ "contact_email": "pietervdvn@posteo.net" }, "tags": [ + { + "key": "repair", + "description": "The MapComplete theme Cyclofix - a map for cyclists has a layer Repair cafés and assisted repair workshops showing features with this tag", + "value": "assisted_self_service" + }, + { + "key": "service:bicycle:repair", + "description": "The MapComplete theme Cyclofix - a map for cyclists has a layer Repair cafés and assisted repair workshops showing features with this tag", + "value": "yes" + }, + { + "key": "bicycle:repair", + "description": "The MapComplete theme Cyclofix - a map for cyclists has a layer Repair cafés and assisted repair workshops showing features with this tag", + "value": "yes" + }, + { + "key": "id", + "description": "Layer 'Repair cafés and assisted repair workshops' 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 'Cyclofix - a map for cyclists') (This is only shown if _backend~.+ & _last_edit:passed_time<300 & (_version_number= | _version_number=1))" + }, + { + "key": "image", + "description": "The layer 'Repair cafés and assisted repair workshops 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 'Repair cafés and assisted repair workshops 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 'Repair cafés and assisted repair workshops 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 'Repair cafés and assisted repair workshops 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": "name", + "description": "Layer 'Repair cafés and assisted repair workshops' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" + }, + { + "key": "opening_hours", + "description": "Layer 'Repair cafés and assisted repair workshops' shows and asks freeform values for key 'opening_hours' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" + }, + { + "key": "opening_hours", + "description": "Layer 'Repair cafés and assisted repair workshops' shows opening_hours=\"by appointment\" with a fixed text, namely 'Only by appointment' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')", + "value": "\"by appointment\"" + }, + { + "key": "opening_hours", + "description": "Layer 'Repair cafés and assisted repair workshops' shows opening_hours~^(\"by appointment\"|by appointment)$ with a fixed text, namely 'Only by appointment' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" + }, + { + "key": "opening_hours", + "description": "Layer 'Repair cafés and assisted repair workshops' shows opening_hours=closed with a fixed text, namely 'Marked as closed for an unspecified time' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')", + "value": "closed" + }, + { + "key": "phone", + "description": "Layer 'Repair cafés and assisted repair workshops' shows and asks freeform values for key 'phone' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" + }, + { + "key": "contact:phone", + "description": "Layer 'Repair cafés and assisted repair workshops' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" + }, + { + "key": "email", + "description": "Layer 'Repair cafés and assisted repair workshops' shows and asks freeform values for key 'email' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" + }, + { + "key": "contact:email", + "description": "Layer 'Repair cafés and assisted repair workshops' shows contact:email~.+ with a fixed text, namely '{contact:email}' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" + }, + { + "key": "operator:email", + "description": "Layer 'Repair cafés and assisted repair workshops' shows operator:email~.+ with a fixed text, namely '{operator:email}' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" + }, + { + "key": "website", + "description": "Layer 'Repair cafés and assisted repair workshops' shows and asks freeform values for key 'website' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" + }, + { + "key": "contact:website", + "description": "Layer 'Repair cafés and assisted repair workshops' shows contact:website~.+ with a fixed text, namely '{contact:website}' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" + }, + { + "key": "contact:mastodon", + "description": "Layer 'Repair cafés and assisted repair workshops' shows and asks freeform values for key 'contact:mastodon' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" + }, + { + "key": "contact:facebook", + "description": "Layer 'Repair cafés and assisted repair workshops' shows and asks freeform values for key 'contact:facebook' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" + }, + { + "key": "service:mobile_phone:repair", + "description": "Layer 'Repair cafés and assisted repair workshops' shows service:mobile_phone:repair=yes with a fixed text, namely 'Mobile phones are repaired here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')", + "value": "yes" + }, + { + "key": "service:computer:repair", + "description": "Layer 'Repair cafés and assisted repair workshops' shows service:computer:repair=yes with a fixed text, namely 'Computers are repaired here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')", + "value": "yes" + }, + { + "key": "service:bicycle:repair", + "description": "Layer 'Repair cafés and assisted repair workshops' shows service:bicycle:repair=yes with a fixed text, namely 'Bicycles are repaired here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')", + "value": "yes" + }, + { + "key": "service:electronics:repair", + "description": "Layer 'Repair cafés and assisted repair workshops' shows service:electronics:repair=yes with a fixed text, namely 'Electronic devices are repaired here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')", + "value": "yes" + }, + { + "key": "service:furniture:repair", + "description": "Layer 'Repair cafés and assisted repair workshops' shows service:furniture:repair=yes with a fixed text, namely 'Furniture is repaired here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')", + "value": "yes" + }, + { + "key": "service:clothes:repair", + "description": "Layer 'Repair cafés and assisted repair workshops' shows service:clothes:repair=yes with a fixed text, namely 'Clothes are repaired here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')", + "value": "yes" + }, { "key": "amenity", "description": "The MapComplete theme Cyclofix - a map for cyclists has a layer Bike cafe showing features with this tag", @@ -118,7 +241,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Bike cafe' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" + "description": "Layer 'Bike cafe' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" }, { "key": "email", @@ -200,830 +323,6 @@ "key": "name", "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'shop' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=bicycle_rental with a fixed text, namely 'Bicycle rental shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "bicycle_rental" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "agrarian" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "alcohol" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "anime" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=antiques with a fixed text, namely 'Antique Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "antiques" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "appliance" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "art" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "baby_goods" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "bag" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "bakery" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "bathroom_furnishing" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "beauty" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "bed" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "beverages" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "bicycle" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "boat" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "bookmaker" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=books with a fixed text, namely 'Bookstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "books" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "brewing_supplies" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "butcher" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "camera" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "candles" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "cannabis" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "car" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "car_parts" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "car_repair" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "caravan" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "carpet" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "catalogue" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "charity" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "cheese" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "chemist" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "chocolate" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "clothes" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "coffee" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "collector" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "computer" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "confectionery" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "convenience" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "copyshop" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "cosmetics" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=country_store with a fixed text, namely 'Rural Supplies Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "country_store" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "craft" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "curtain" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "dairy" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=deli with a fixed text, namely 'Delicatessen' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "deli" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "department_store" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "doityourself" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "doors" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "dry_cleaning" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "e-cigarette" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "electrical" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "electronics" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "erotic" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "fabric" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "farm" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "fashion_accessories" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "fireplace" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "fishing" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "flooring" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "florist" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "frame" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "frozen_food" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "fuel" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "funeral_directors" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "furniture" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "games" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "garden_centre" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "gas" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "general" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "gift" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "greengrocer" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "hairdresser" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "hairdresser_supply" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "hardware" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=health_food with a fixed text, namely 'Health Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "health_food" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "hearing_aids" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "herbalist" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "hifi" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=honey with a fixed text, namely 'Honey Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "honey" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "household_linen" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "houseware" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "hunting" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "interior_decoration" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "jewelry" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "kiosk" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "kitchen" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "laundry" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "leather" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "lighting" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "locksmith" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "lottery" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "mall" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "massage" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "medical_supply" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "military_surplus" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "mobile_phone" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "model" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "money_lender" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "motorcycle" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "motorcycle_repair" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "music" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "musical_instrument" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=newsagent with a fixed text, namely 'Newsstand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "newsagent" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "nutrition_supplements" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=nuts with a fixed text, namely 'Nuts Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "nuts" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "optician" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "outdoor" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "outpost" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "paint" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "party" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=pasta with a fixed text, namely 'Pasta Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "pasta" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "pastry" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=pawnbroker with a fixed text, namely 'Pawnshop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "pawnbroker" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "perfumery" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "pet" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=pet_grooming with a fixed text, namely 'Pet Groomer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "pet_grooming" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "photo" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "pottery" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "printer_ink" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "psychic" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "pyrotechnics" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "radiotechnics" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "religion" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "rental" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "repair" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=rice with a fixed text, namely 'Rice Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "rice" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "scuba_diving" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "seafood" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=second_hand with a fixed text, namely 'Thrift Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "second_hand" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "sewing" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "shoe_repair" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "shoes" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "spices" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "sports" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "stationery" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "storage_rental" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "supermarket" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "swimming_pool" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "tailor" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "tattoo" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "tea" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "telecommunication" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "ticket" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "tiles" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "tobacco" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "tool_hire" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "toys" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "trade" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "travel_agency" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "trophy" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "tyres" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "vacuum_cleaner" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=variety_store with a fixed text, namely 'Discount Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "variety_store" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "video" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "video_games" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "watches" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "water" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "water_sports" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "weapons" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "wholesale" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "wigs" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "window_blind" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)", - "value": "wine" - }, { "key": "brand", "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'brand' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" @@ -1083,7 +382,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Bike repair/shop' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" + "description": "Layer 'Bike repair/shop' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" }, { "key": "payment:cash", @@ -1239,83 +538,6 @@ "description": "Layer 'Bike repair/shop' shows service:bicycle:rental=no with a fixed text, namely 'This shop doesn't rent out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)", "value": "no" }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'rental' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=city_bike with a fixed text, namely 'Normal city bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))", - "value": "city_bike" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=ebike with a fixed text, namely 'Electrical bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))", - "value": "ebike" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=bmx with a fixed text, namely 'BMX bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))", - "value": "bmx" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=mtb with a fixed text, namely 'Mountainbikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))", - "value": "mtb" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=kid_bike with a fixed text, namely 'Bikes for children can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))", - "value": "kid_bike" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=tandem with a fixed text, namely 'Tandem bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))", - "value": "tandem" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=racebike with a fixed text, namely 'Race bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))", - "value": "racebike" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=bike_helmet with a fixed text, namely 'Bike helmets can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))", - "value": "bike_helmet" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=cargo_bike with a fixed text, namely 'Cargo bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))", - "value": "cargo_bike" - }, - { - "key": "capacity:city_bike", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:city_bike' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*city_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))" - }, - { - "key": "capacity:ebike", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:ebike' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*ebike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))" - }, - { - "key": "capacity:kid_bike", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:kid_bike' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*kid_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))" - }, - { - "key": "capacity:bmx", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bmx' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*bmx.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))" - }, - { - "key": "capacity:mtb", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:mtb' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*mtb.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))" - }, - { - "key": "capacity:bicycle_pannier", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*bicycle_pannier.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))" - }, - { - "key": "capacity:tandem_bicycle", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*tandem_bicycle.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))" - }, { "key": "service:bicycle:pump", "description": "Layer 'Bike repair/shop' shows service:bicycle:pump=yes with a fixed text, namely 'This shop offers a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)", @@ -1361,25 +583,6 @@ "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning=no with a fixed text, namely 'This shop doesn't offer bicycle cleaning' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)", "value": "no" }, - { - "key": "service:bicycle:cleaning:charge", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'service:bicycle:cleaning:charge' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)" - }, - { - "key": "service:bicycle:cleaning:fee", - "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=no with a fixed text, namely 'The cleaning service is free to use' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)", - "value": "no" - }, - { - "key": "service:bicycle:cleaning:fee", - "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)", - "value": "yes" - }, - { - "key": "service:bicycle:cleaning:charge", - "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') Picking this answer will delete the key service:bicycle:cleaning:charge. (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)", - "value": "" - }, { "key": "internet_access", "description": "Layer 'Bike repair/shop' shows internet_access=wlan with a fixed text, namely 'This place offers wireless internet access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')", @@ -1422,11 +625,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if internet_access=wlan)" + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Bike repair/shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if internet_access=wlan)", + "description": "Layer 'Bike repair/shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -2034,7 +1237,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Bike-related object' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" + "description": "Layer 'Bike-related object' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" }, { "key": "opening_hours", @@ -2222,7 +1425,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Bicycle rental' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" + "description": "Layer 'Bicycle rental' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" }, { "key": "opening_hours", @@ -2393,7 +1596,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Bicycle library' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" + "description": "Layer 'Bicycle library' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" }, { "key": "email", @@ -4581,7 +3784,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Vending Machines' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" + "description": "Layer 'Vending Machines' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')" }, { "key": "website", diff --git a/Docs/TagInfo/mapcomplete_disaster_response.json b/Docs/TagInfo/mapcomplete_disaster_response.json index f5708e9d6..dfb3f3a1b 100644 --- a/Docs/TagInfo/mapcomplete_disaster_response.json +++ b/Docs/TagInfo/mapcomplete_disaster_response.json @@ -44,7 +44,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Hospitals' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Disaster response')" + "description": "Layer 'Hospitals' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Disaster response')" }, { "key": "email", diff --git a/Docs/TagInfo/mapcomplete_education.json b/Docs/TagInfo/mapcomplete_education.json index d4056e404..3315ebfe0 100644 --- a/Docs/TagInfo/mapcomplete_education.json +++ b/Docs/TagInfo/mapcomplete_education.json @@ -112,7 +112,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Colleges and universities' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Education')" + "description": "Layer 'Colleges and universities' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Education')" }, { "key": "amenity", @@ -298,7 +298,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Primary and secondary schools' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Education')" + "description": "Layer 'Primary and secondary schools' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Education')" }, { "key": "email", @@ -371,7 +371,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Kindergartens and childcare' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Education')" + "description": "Layer 'Kindergartens and childcare' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Education')" }, { "key": "opening_hours", diff --git a/Docs/TagInfo/mapcomplete_food.json b/Docs/TagInfo/mapcomplete_food.json index f7e203aaf..b540d5ee2 100644 --- a/Docs/TagInfo/mapcomplete_food.json +++ b/Docs/TagInfo/mapcomplete_food.json @@ -89,7 +89,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Restaurants and fast food' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Restaurants and fast food')" + "description": "Layer 'Restaurants and fast food' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Restaurants and fast food')" }, { "key": "payment:cash", @@ -234,6 +234,26 @@ "description": "Layer 'Restaurants and fast food' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')", "value": "thai" }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=mexican with a fixed text, namely 'Mexican dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')", + "value": "mexican " + }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=japanese with a fixed text, namely 'Japanese dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')", + "value": "japanese " + }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=chicken with a fixed text, namely 'Chicken based dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')", + "value": "chicken " + }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=seafood with a fixed text, namely 'Seafood dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')", + "value": "seafood " + }, { "key": "image", "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and wikidata, wikipedia, wikimedia_commons and mapillary" @@ -632,11 +652,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Restaurants and fast food') (This is only shown if internet_access=wlan)" + "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Restaurants and fast food') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Restaurants and fast food' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food') (This is only shown if internet_access=wlan)", + "description": "Layer 'Restaurants and fast food' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -683,7 +703,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Ice cream parlors' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Restaurants and fast food')" + "description": "Layer 'Ice cream parlors' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Restaurants and fast food')" }, { "key": "email", @@ -954,11 +974,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Outdoor Seating' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Restaurants and fast food') (This is only shown if internet_access=wlan)" + "description": "Layer 'Outdoor Seating' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Restaurants and fast food') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Outdoor Seating' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food') (This is only shown if internet_access=wlan)", + "description": "Layer 'Outdoor Seating' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -1088,7 +1108,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Food Courts' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Restaurants and fast food')" + "description": "Layer 'Food Courts' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Restaurants and fast food')" }, { "key": "smoking", diff --git a/Docs/TagInfo/mapcomplete_fritures.json b/Docs/TagInfo/mapcomplete_fritures.json index b6bd8bd49..9f3b966de 100644 --- a/Docs/TagInfo/mapcomplete_fritures.json +++ b/Docs/TagInfo/mapcomplete_fritures.json @@ -93,7 +93,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Fries shop' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Fries shops')" + "description": "Layer 'Fries shop' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Fries shops')" }, { "key": "payment:cash", @@ -238,6 +238,26 @@ "description": "Layer 'Fries shop' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')", "value": "thai" }, + { + "key": "cuisine", + "description": "Layer 'Fries shop' shows cuisine=mexican with a fixed text, namely 'Mexican dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')", + "value": "mexican " + }, + { + "key": "cuisine", + "description": "Layer 'Fries shop' shows cuisine=japanese with a fixed text, namely 'Japanese dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')", + "value": "japanese " + }, + { + "key": "cuisine", + "description": "Layer 'Fries shop' shows cuisine=chicken with a fixed text, namely 'Chicken based dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')", + "value": "chicken " + }, + { + "key": "cuisine", + "description": "Layer 'Fries shop' shows cuisine=seafood with a fixed text, namely 'Seafood dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')", + "value": "seafood " + }, { "key": "image", "description": "The layer 'Fries shop shows images based on the keys image, image:0, image:1,... and wikidata, wikipedia, wikimedia_commons and mapillary" @@ -636,11 +656,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Fries shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Fries shops') (This is only shown if internet_access=wlan)" + "description": "Layer 'Fries shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Fries shops') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Fries shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops') (This is only shown if internet_access=wlan)", + "description": "Layer 'Fries shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" } ] diff --git a/Docs/TagInfo/mapcomplete_glutenfree.json b/Docs/TagInfo/mapcomplete_glutenfree.json index a071c48db..a7135d65f 100644 --- a/Docs/TagInfo/mapcomplete_glutenfree.json +++ b/Docs/TagInfo/mapcomplete_glutenfree.json @@ -113,7 +113,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Restaurants and fast food' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Glutenfree')" + "description": "Layer 'Restaurants and fast food' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Glutenfree')" }, { "key": "payment:cash", @@ -258,6 +258,26 @@ "description": "Layer 'Restaurants and fast food' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree')", "value": "thai" }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=mexican with a fixed text, namely 'Mexican dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree')", + "value": "mexican " + }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=japanese with a fixed text, namely 'Japanese dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree')", + "value": "japanese " + }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=chicken with a fixed text, namely 'Chicken based dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree')", + "value": "chicken " + }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=seafood with a fixed text, namely 'Seafood dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree')", + "value": "seafood " + }, { "key": "image", "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and wikidata, wikipedia, wikimedia_commons and mapillary" @@ -636,11 +656,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Glutenfree') (This is only shown if internet_access=wlan)" + "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Glutenfree') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Restaurants and fast food' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if internet_access=wlan)", + "description": "Layer 'Restaurants and fast food' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -711,7 +731,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Ice cream parlors' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Glutenfree')" + "description": "Layer 'Ice cream parlors' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Glutenfree')" }, { "key": "email", @@ -1773,7 +1793,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Glutenfree')" + "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Glutenfree')" }, { "key": "payment:cash", @@ -2112,11 +2132,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Glutenfree') (This is only shown if internet_access=wlan)" + "description": "Layer 'Shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Glutenfree') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if internet_access=wlan)", + "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { diff --git a/Docs/TagInfo/mapcomplete_hackerspaces.json b/Docs/TagInfo/mapcomplete_hackerspaces.json index 88c11673c..c43db10ec 100644 --- a/Docs/TagInfo/mapcomplete_hackerspaces.json +++ b/Docs/TagInfo/mapcomplete_hackerspaces.json @@ -104,7 +104,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Hackerspace' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Hackerspaces and makerspaces')" + "description": "Layer 'Hackerspace' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Hackerspaces and makerspaces')" }, { "key": "contact:mastodon", @@ -335,11 +335,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Hackerspace' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Hackerspaces and makerspaces') (This is only shown if internet_access=wlan)" + "description": "Layer 'Hackerspace' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Hackerspaces and makerspaces') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Hackerspace' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Hackerspaces and makerspaces') (This is only shown if internet_access=wlan)", + "description": "Layer 'Hackerspace' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Hackerspaces and makerspaces') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" } ] diff --git a/Docs/TagInfo/mapcomplete_healthcare.json b/Docs/TagInfo/mapcomplete_healthcare.json index 156d0af02..9cc686591 100644 --- a/Docs/TagInfo/mapcomplete_healthcare.json +++ b/Docs/TagInfo/mapcomplete_healthcare.json @@ -63,7 +63,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Doctors' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Healthcare')" + "description": "Layer 'Doctors' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Healthcare')" }, { "key": "email", @@ -162,7 +162,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Physiotherapist' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Healthcare')" + "description": "Layer 'Physiotherapist' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Healthcare')" }, { "key": "email", @@ -224,7 +224,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Dentist' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Healthcare')" + "description": "Layer 'Dentist' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Healthcare')" }, { "key": "email", @@ -284,7 +284,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Hospitals' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Healthcare')" + "description": "Layer 'Hospitals' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Healthcare')" }, { "key": "email", @@ -354,7 +354,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Pharmacies' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Healthcare')" + "description": "Layer 'Pharmacies' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Healthcare')" }, { "key": "email", @@ -1327,7 +1327,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Healthcare')" + "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Healthcare')" }, { "key": "payment:cash", @@ -1666,11 +1666,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Healthcare') (This is only shown if internet_access=wlan)" + "description": "Layer 'Shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Healthcare') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if internet_access=wlan)", + "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { diff --git a/Docs/TagInfo/mapcomplete_hotels.json b/Docs/TagInfo/mapcomplete_hotels.json index fe051a354..ec0b1e784 100644 --- a/Docs/TagInfo/mapcomplete_hotels.json +++ b/Docs/TagInfo/mapcomplete_hotels.json @@ -40,6 +40,11 @@ "description": "The MapComplete theme Hotels has a layer Tourism accomodation showing features with this tag", "value": "guest_house" }, + { + "key": "tourism", + "description": "The MapComplete theme Hotels has a layer Tourism accomodation showing features with this tag", + "value": "camp_site" + }, { "key": "id", "description": "Layer 'Tourism accomodation' 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 'Hotels') (This is only shown if _backend~.+ & _last_edit:passed_time<300 & (_version_number= | _version_number=1))" @@ -79,7 +84,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Tourism accomodation' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Hotels')" + "description": "Layer 'Tourism accomodation' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Hotels')" }, { "key": "email", @@ -163,11 +168,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Tourism accomodation' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Hotels') (This is only shown if internet_access=wlan)" + "description": "Layer 'Tourism accomodation' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Hotels') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Tourism accomodation' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Hotels') (This is only shown if internet_access=wlan)", + "description": "Layer 'Tourism accomodation' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Hotels') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -230,7 +235,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Love hotels' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Hotels')" + "description": "Layer 'Love hotels' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Hotels')" }, { "key": "email", diff --git a/Docs/TagInfo/mapcomplete_icecream.json b/Docs/TagInfo/mapcomplete_icecream.json index 84b8881d5..5e3d4cf11 100644 --- a/Docs/TagInfo/mapcomplete_icecream.json +++ b/Docs/TagInfo/mapcomplete_icecream.json @@ -54,7 +54,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Ice cream parlors' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Icecream')" + "description": "Layer 'Ice cream parlors' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Icecream')" }, { "key": "email", diff --git a/Docs/TagInfo/mapcomplete_lactosefree.json b/Docs/TagInfo/mapcomplete_lactosefree.json index de90febb8..9a7b01056 100644 --- a/Docs/TagInfo/mapcomplete_lactosefree.json +++ b/Docs/TagInfo/mapcomplete_lactosefree.json @@ -113,7 +113,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Restaurants and fast food' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Lactose free shops and restaurants')" + "description": "Layer 'Restaurants and fast food' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Lactose free shops and restaurants')" }, { "key": "payment:cash", @@ -258,6 +258,26 @@ "description": "Layer 'Restaurants and fast food' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants')", "value": "thai" }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=mexican with a fixed text, namely 'Mexican dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants')", + "value": "mexican " + }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=japanese with a fixed text, namely 'Japanese dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants')", + "value": "japanese " + }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=chicken with a fixed text, namely 'Chicken based dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants')", + "value": "chicken " + }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=seafood with a fixed text, namely 'Seafood dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants')", + "value": "seafood " + }, { "key": "image", "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and wikidata, wikipedia, wikimedia_commons and mapillary" @@ -636,11 +656,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if internet_access=wlan)" + "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Restaurants and fast food' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if internet_access=wlan)", + "description": "Layer 'Restaurants and fast food' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -711,7 +731,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Ice cream parlors' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Lactose free shops and restaurants')" + "description": "Layer 'Ice cream parlors' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Lactose free shops and restaurants')" }, { "key": "email", @@ -1773,7 +1793,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Lactose free shops and restaurants')" + "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Lactose free shops and restaurants')" }, { "key": "payment:cash", @@ -2112,11 +2132,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if internet_access=wlan)" + "description": "Layer 'Shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if internet_access=wlan)", + "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { diff --git a/Docs/TagInfo/mapcomplete_nature.json b/Docs/TagInfo/mapcomplete_nature.json index 5b433ab2b..9e9c5b377 100644 --- a/Docs/TagInfo/mapcomplete_nature.json +++ b/Docs/TagInfo/mapcomplete_nature.json @@ -1024,6 +1024,11 @@ "description": "Layer 'Picnic tables' shows material=plastic with a fixed text, namely 'This picnic table is made from (recycled) plastic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')", "value": "plastic" }, + { + "key": "material", + "description": "Layer 'Picnic tables' shows material=metal with a fixed text, namely 'This picnic table is made from metal' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')", + "value": "metal" + }, { "key": "amenity", "description": "The MapComplete theme Into nature has a layer Toilets showing features with this tag", diff --git a/Docs/TagInfo/mapcomplete_onwheels.json b/Docs/TagInfo/mapcomplete_onwheels.json index 05fccec5e..d73c01ff5 100644 --- a/Docs/TagInfo/mapcomplete_onwheels.json +++ b/Docs/TagInfo/mapcomplete_onwheels.json @@ -153,7 +153,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Cafés and pubs' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'OnWheels')" + "description": "Layer 'Cafés and pubs' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'OnWheels')" }, { "key": "payment:cash", @@ -292,11 +292,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Cafés and pubs' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'OnWheels') (This is only shown if internet_access=wlan)" + "description": "Layer 'Cafés and pubs' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'OnWheels') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Cafés and pubs' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if internet_access=wlan)", + "description": "Layer 'Cafés and pubs' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -613,7 +613,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Restaurants and fast food' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'OnWheels')" + "description": "Layer 'Restaurants and fast food' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'OnWheels')" }, { "key": "payment:cash", @@ -758,6 +758,26 @@ "description": "Layer 'Restaurants and fast food' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')", "value": "thai" }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=mexican with a fixed text, namely 'Mexican dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')", + "value": "mexican " + }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=japanese with a fixed text, namely 'Japanese dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')", + "value": "japanese " + }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=chicken with a fixed text, namely 'Chicken based dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')", + "value": "chicken " + }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=seafood with a fixed text, namely 'Seafood dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')", + "value": "seafood " + }, { "key": "image", "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and wikidata, wikipedia, wikimedia_commons and mapillary" @@ -1156,11 +1176,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'OnWheels') (This is only shown if internet_access=wlan)" + "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'OnWheels') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Restaurants and fast food' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if internet_access=wlan)", + "description": "Layer 'Restaurants and fast food' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -2310,7 +2330,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'OnWheels')" + "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'OnWheels')" }, { "key": "payment:cash", @@ -2649,11 +2669,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'OnWheels') (This is only shown if internet_access=wlan)" + "description": "Layer 'Shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'OnWheels') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if internet_access=wlan)", + "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -3066,7 +3086,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Pharmacies' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'OnWheels')" + "description": "Layer 'Pharmacies' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'OnWheels')" }, { "key": "email", @@ -3156,7 +3176,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Doctors' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'OnWheels')" + "description": "Layer 'Doctors' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'OnWheels')" }, { "key": "email", @@ -3236,7 +3256,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Hospitals' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'OnWheels')" + "description": "Layer 'Hospitals' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'OnWheels')" }, { "key": "email", @@ -3490,6 +3510,11 @@ "description": "The MapComplete theme OnWheels has a layer Tourism accomodation showing features with this tag", "value": "guest_house" }, + { + "key": "tourism", + "description": "The MapComplete theme OnWheels has a layer Tourism accomodation showing features with this tag", + "value": "camp_site" + }, { "key": "id", "description": "Layer 'Tourism accomodation' 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 'OnWheels') (This is only shown if _backend~.+ & _last_edit:passed_time<300 & (_version_number= | _version_number=1))" @@ -3529,7 +3554,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Tourism accomodation' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'OnWheels')" + "description": "Layer 'Tourism accomodation' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'OnWheels')" }, { "key": "email", @@ -3613,11 +3638,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Tourism accomodation' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'OnWheels') (This is only shown if internet_access=wlan)" + "description": "Layer 'Tourism accomodation' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'OnWheels') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Tourism accomodation' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if internet_access=wlan)", + "description": "Layer 'Tourism accomodation' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -3676,7 +3701,7 @@ }, { "key": "contact:phone", - "description": "Layer 'governments' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'OnWheels')" + "description": "Layer 'governments' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'OnWheels')" }, { "key": "email", diff --git a/Docs/TagInfo/mapcomplete_personal.json b/Docs/TagInfo/mapcomplete_personal.json index 6659db639..1a2e4671e 100644 --- a/Docs/TagInfo/mapcomplete_personal.json +++ b/Docs/TagInfo/mapcomplete_personal.json @@ -435,7 +435,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Animal shelters' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Animal shelters' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "email", @@ -1007,7 +1007,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Repair cafés and assisted repair workshops' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Repair cafés and assisted repair workshops' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "email", @@ -1806,7 +1806,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Bicycle library' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Bicycle library' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "email", @@ -1976,7 +1976,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Bicycle rental' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Bicycle rental' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "opening_hours", @@ -2212,7 +2212,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Bike cafe' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Bike cafe' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "email", @@ -2796,830 +2796,6 @@ "key": "name", "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Personal theme')" }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'shop' (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=bicycle_rental with a fixed text, namely 'Bicycle rental shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "bicycle_rental" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "agrarian" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "alcohol" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "anime" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=antiques with a fixed text, namely 'Antique Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "antiques" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "appliance" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "art" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "baby_goods" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "bag" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "bakery" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "bathroom_furnishing" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "beauty" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "bed" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "beverages" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "bicycle" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "boat" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "bookmaker" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=books with a fixed text, namely 'Bookstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "books" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "brewing_supplies" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "butcher" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "camera" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "candles" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "cannabis" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "car" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "car_parts" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "car_repair" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "caravan" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "carpet" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "catalogue" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "charity" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "cheese" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "chemist" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "chocolate" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "clothes" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "coffee" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "collector" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "computer" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "confectionery" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "convenience" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "copyshop" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "cosmetics" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=country_store with a fixed text, namely 'Rural Supplies Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "country_store" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "craft" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "curtain" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "dairy" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=deli with a fixed text, namely 'Delicatessen' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "deli" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "department_store" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "doityourself" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "doors" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "dry_cleaning" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "e-cigarette" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "electrical" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "electronics" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "erotic" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "fabric" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "farm" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "fashion_accessories" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "fireplace" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "fishing" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "flooring" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "florist" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "frame" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "frozen_food" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "fuel" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "funeral_directors" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "furniture" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "games" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "garden_centre" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "gas" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "general" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "gift" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "greengrocer" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "hairdresser" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "hairdresser_supply" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "hardware" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=health_food with a fixed text, namely 'Health Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "health_food" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "hearing_aids" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "herbalist" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "hifi" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=honey with a fixed text, namely 'Honey Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "honey" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "household_linen" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "houseware" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "hunting" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "interior_decoration" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "jewelry" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "kiosk" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "kitchen" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "laundry" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "leather" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "lighting" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "locksmith" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "lottery" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "mall" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "massage" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "medical_supply" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "military_surplus" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "mobile_phone" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "model" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "money_lender" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "motorcycle" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "motorcycle_repair" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "music" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "musical_instrument" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=newsagent with a fixed text, namely 'Newsstand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "newsagent" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "nutrition_supplements" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=nuts with a fixed text, namely 'Nuts Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "nuts" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "optician" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "outdoor" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "outpost" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "paint" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "party" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=pasta with a fixed text, namely 'Pasta Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "pasta" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "pastry" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=pawnbroker with a fixed text, namely 'Pawnshop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "pawnbroker" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "perfumery" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "pet" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=pet_grooming with a fixed text, namely 'Pet Groomer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "pet_grooming" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "photo" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "pottery" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "printer_ink" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "psychic" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "pyrotechnics" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "radiotechnics" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "religion" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "rental" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "repair" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=rice with a fixed text, namely 'Rice Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "rice" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "scuba_diving" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "seafood" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=second_hand with a fixed text, namely 'Thrift Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "second_hand" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "sewing" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "shoe_repair" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "shoes" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "spices" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "sports" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "stationery" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "storage_rental" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "supermarket" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "swimming_pool" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "tailor" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "tattoo" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "tea" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "telecommunication" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "ticket" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "tiles" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "tobacco" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "tool_hire" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "toys" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "trade" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "travel_agency" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "trophy" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "tyres" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "vacuum_cleaner" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=variety_store with a fixed text, namely 'Discount Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "variety_store" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "video" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "video_games" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "watches" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "water" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "water_sports" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "weapons" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "wholesale" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "wigs" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "window_blind" - }, - { - "key": "shop", - "description": "Layer 'Bike repair/shop' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)", - "value": "wine" - }, { "key": "brand", "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'brand' (in the mapcomplete.org theme 'Personal theme')" @@ -3679,7 +2855,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Bike repair/shop' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Bike repair/shop' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "payment:cash", @@ -3835,83 +3011,6 @@ "description": "Layer 'Bike repair/shop' shows service:bicycle:rental=no with a fixed text, namely 'This shop doesn't rent out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)", "value": "no" }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'rental' (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=city_bike with a fixed text, namely 'Normal city bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))", - "value": "city_bike" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=ebike with a fixed text, namely 'Electrical bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))", - "value": "ebike" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=bmx with a fixed text, namely 'BMX bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))", - "value": "bmx" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=mtb with a fixed text, namely 'Mountainbikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))", - "value": "mtb" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=kid_bike with a fixed text, namely 'Bikes for children can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))", - "value": "kid_bike" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=tandem with a fixed text, namely 'Tandem bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))", - "value": "tandem" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=racebike with a fixed text, namely 'Race bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))", - "value": "racebike" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=bike_helmet with a fixed text, namely 'Bike helmets can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))", - "value": "bike_helmet" - }, - { - "key": "rental", - "description": "Layer 'Bike repair/shop' shows rental=cargo_bike with a fixed text, namely 'Cargo bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))", - "value": "cargo_bike" - }, - { - "key": "capacity:city_bike", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:city_bike' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*city_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))" - }, - { - "key": "capacity:ebike", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:ebike' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*ebike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))" - }, - { - "key": "capacity:kid_bike", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:kid_bike' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*kid_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))" - }, - { - "key": "capacity:bmx", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bmx' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*bmx.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))" - }, - { - "key": "capacity:mtb", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:mtb' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*mtb.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))" - }, - { - "key": "capacity:bicycle_pannier", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*bicycle_pannier.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))" - }, - { - "key": "capacity:tandem_bicycle", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*tandem_bicycle.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))" - }, { "key": "service:bicycle:pump", "description": "Layer 'Bike repair/shop' shows service:bicycle:pump=yes with a fixed text, namely 'This shop offers a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)", @@ -3957,25 +3056,6 @@ "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning=no with a fixed text, namely 'This shop doesn't offer bicycle cleaning' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)", "value": "no" }, - { - "key": "service:bicycle:cleaning:charge", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'service:bicycle:cleaning:charge' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)" - }, - { - "key": "service:bicycle:cleaning:fee", - "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=no with a fixed text, namely 'The cleaning service is free to use' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)", - "value": "no" - }, - { - "key": "service:bicycle:cleaning:fee", - "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)", - "value": "yes" - }, - { - "key": "service:bicycle:cleaning:charge", - "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Personal theme') Picking this answer will delete the key service:bicycle:cleaning:charge. (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)", - "value": "" - }, { "key": "internet_access", "description": "Layer 'Bike repair/shop' shows internet_access=wlan with a fixed text, namely 'This place offers wireless internet access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", @@ -4018,11 +3098,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=wlan)" + "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Bike repair/shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=wlan)", + "description": "Layer 'Bike repair/shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -4199,7 +3279,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Bike-related object' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Bike-related object' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "opening_hours", @@ -4510,7 +3590,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Cafés and pubs' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Cafés and pubs' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "payment:cash", @@ -4649,13 +3729,133 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Cafés and pubs' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=wlan)" + "description": "Layer 'Cafés and pubs' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Cafés and pubs' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=wlan)", + "description": "Layer 'Cafés and pubs' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, + { + "key": "tourism", + "description": "The MapComplete theme Personal theme has a layer Camper sites showing features with this tag", + "value": "caravan_site" + }, + { + "key": "id", + "description": "Layer 'Camper sites' 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 'Personal theme') (This is only shown if _backend~.+ & _last_edit:passed_time<300 & (_version_number= | _version_number=1))" + }, + { + "key": "image", + "description": "The layer 'Camper sites 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 'Camper sites 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 'Camper sites 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 'Camper sites 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": "name", + "description": "Layer 'Camper sites' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Personal theme')" + }, + { + "key": "fee", + "description": "Layer 'Camper sites' shows fee=yes with a fixed text, namely 'You need to pay for use' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "yes" + }, + { + "key": "fee", + "description": "Layer 'Camper sites' shows fee=no with a fixed text, namely 'Can be used for free' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "no" + }, + { + "key": "charge", + "description": "Layer 'Camper sites' shows and asks freeform values for key 'charge' (in the mapcomplete.org theme 'Personal theme') (This is only shown if fee=yes)" + }, + { + "key": "sanitary_dump_station", + "description": "Layer 'Camper sites' shows sanitary_dump_station=yes with a fixed text, namely 'This place has a sanitary dump station' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "yes" + }, + { + "key": "sanitary_dump_station", + "description": "Layer 'Camper sites' shows sanitary_dump_station=no with a fixed text, namely 'This place does not have a sanitary dump station' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "no" + }, + { + "key": "capacity", + "description": "Layer 'Camper sites' shows and asks freeform values for key 'capacity' (in the mapcomplete.org theme 'Personal theme')" + }, + { + "key": "internet_access", + "description": "Layer 'Camper sites' shows internet_access=yes with a fixed text, namely 'There is internet access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "yes" + }, + { + "key": "internet_access", + "description": "Layer 'Camper sites' shows internet_access=wifi | internet_access=wlan with a fixed text, namely 'There is internet access' (in the mapcomplete.org theme 'Personal theme')", + "value": "wifi" + }, + { + "key": "internet_access", + "description": "Layer 'Camper sites' shows internet_access=wifi | internet_access=wlan with a fixed text, namely 'There is internet access' (in the mapcomplete.org theme 'Personal theme')", + "value": "wlan" + }, + { + "key": "internet_access", + "description": "Layer 'Camper sites' shows internet_access=no with a fixed text, namely 'There is no internet access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "no" + }, + { + "key": "internet_access:fee", + "description": "Layer 'Camper sites' shows internet_access:fee=yes with a fixed text, namely 'You need to pay extra for internet access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=yes)", + "value": "yes" + }, + { + "key": "internet_access:fee", + "description": "Layer 'Camper sites' shows internet_access:fee=no with a fixed text, namely 'You do not need to pay extra for internet access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=yes)", + "value": "no" + }, + { + "key": "toilets", + "description": "Layer 'Camper sites' shows toilets=yes with a fixed text, namely 'This place has toilets' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "yes" + }, + { + "key": "toilets", + "description": "Layer 'Camper sites' shows toilets=no with a fixed text, namely 'This place does not have toilets' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "no" + }, + { + "key": "website", + "description": "Layer 'Camper sites' shows and asks freeform values for key 'website' (in the mapcomplete.org theme 'Personal theme')" + }, + { + "key": "permanent_camping", + "description": "Layer 'Camper sites' shows permanent_camping=yes with a fixed text, namely 'There are some spots for long term rental, but you can also stay on a daily basis' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "yes" + }, + { + "key": "permanent_camping", + "description": "Layer 'Camper sites' shows permanent_camping=no with a fixed text, namely 'There are no permanent guests here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "no" + }, + { + "key": "permanent_camping", + "description": "Layer 'Camper sites' shows permanent_camping=only with a fixed text, namely 'It is only possible to stay here if you have a long term contract (this place disappears from this map if you choose this)' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "only" + }, + { + "key": "description", + "description": "Layer 'Camper sites' shows and asks freeform values for key 'description' (in the mapcomplete.org theme 'Personal theme')" + }, { "key": "amenity", "description": "The MapComplete theme Personal theme has a layer Charging stations showing features with this tag", @@ -6285,7 +5485,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Climbing club' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Climbing club' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "opening_hours", @@ -6344,7 +5544,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Climbing gyms' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Climbing gyms' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "email", @@ -6666,11 +5866,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=wlan)" + "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Climbing gyms' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=wlan)", + "description": "Layer 'Climbing gyms' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -7935,7 +7135,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Dentist' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Dentist' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "email", @@ -8051,7 +7251,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Doctors' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Doctors' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "email", @@ -8400,6 +7600,99 @@ "key": "subject:wikidata", "description": "Layer 'Drinking water' shows and asks freeform values for key 'subject:wikidata' (in the mapcomplete.org theme 'Personal theme') (This is only shown if tourism=artwork)" }, + { + "key": "amenity", + "description": "The MapComplete theme Personal theme has a layer Sanitary dump stations showing features with this tag", + "value": "sanitary_dump_station" + }, + { + "key": "id", + "description": "Layer 'Sanitary dump stations' 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 'Personal theme') (This is only shown if _backend~.+ & _last_edit:passed_time<300 & (_version_number= | _version_number=1))" + }, + { + "key": "image", + "description": "The layer 'Sanitary dump stations 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 'Sanitary dump stations 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 'Sanitary dump stations 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 'Sanitary dump stations 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": "fee", + "description": "Layer 'Sanitary dump stations' shows fee=yes with a fixed text, namely 'You need to pay for use' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "yes" + }, + { + "key": "fee", + "description": "Layer 'Sanitary dump stations' shows fee=no with a fixed text, namely 'Can be used for free' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "no" + }, + { + "key": "charge", + "description": "Layer 'Sanitary dump stations' shows and asks freeform values for key 'charge' (in the mapcomplete.org theme 'Personal theme') (This is only shown if fee=yes)" + }, + { + "key": "water_point", + "description": "Layer 'Sanitary dump stations' shows water_point=yes with a fixed text, namely 'This place has a water point' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "yes" + }, + { + "key": "water_point", + "description": "Layer 'Sanitary dump stations' shows water_point=no with a fixed text, namely 'This place does not have a water point' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "no" + }, + { + "key": "sanitary_dump_station:grey_water", + "description": "Layer 'Sanitary dump stations' shows sanitary_dump_station:grey_water=yes with a fixed text, namely 'You can dispose of grey water here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "yes" + }, + { + "key": "sanitary_dump_station:grey_water", + "description": "Layer 'Sanitary dump stations' shows sanitary_dump_station:grey_water=no with a fixed text, namely 'You cannot dispose of gray water here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "no" + }, + { + "key": "sanitary_dump_station:chemical_toilet", + "description": "Layer 'Sanitary dump stations' shows sanitary_dump_station:chemical_toilet=yes with a fixed text, namely 'You can dispose of chemical toilet waste here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "yes" + }, + { + "key": "sanitary_dump_station:chemical_toilet", + "description": "Layer 'Sanitary dump stations' shows sanitary_dump_station:chemical_toilet=no with a fixed text, namely 'You cannot dispose of chemical toilet waste here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "no" + }, + { + "key": "access", + "description": "Layer 'Sanitary dump stations' shows access=network with a fixed text, namely 'You need a network key/code to use this' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "network" + }, + { + "key": "access", + "description": "Layer 'Sanitary dump stations' shows access=customers with a fixed text, namely 'You need to be a customer of camping/campersite to use this place' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "customers" + }, + { + "key": "access", + "description": "Layer 'Sanitary dump stations' shows access=public with a fixed text, namely 'Anyone can use this dump station' (in the mapcomplete.org theme 'Personal theme')", + "value": "public" + }, + { + "key": "access", + "description": "Layer 'Sanitary dump stations' shows access=yes with a fixed text, namely 'Anyone can use this dump station' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "yes" + }, + { + "key": "network", + "description": "Layer 'Sanitary dump stations' shows and asks freeform values for key 'network' (in the mapcomplete.org theme 'Personal theme')" + }, { "key": "highway", "description": "The MapComplete theme Personal theme has a layer Elevator showing features with this tag", @@ -9357,7 +8650,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Fitness Centres' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Fitness Centres' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "email", @@ -9714,7 +9007,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Restaurants and fast food' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Restaurants and fast food' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "payment:cash", @@ -9859,6 +9152,26 @@ "description": "Layer 'Restaurants and fast food' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", "value": "thai" }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=mexican with a fixed text, namely 'Mexican dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "mexican " + }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=japanese with a fixed text, namely 'Japanese dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "japanese " + }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=chicken with a fixed text, namely 'Chicken based dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "chicken " + }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=seafood with a fixed text, namely 'Seafood dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "seafood " + }, { "key": "image", "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and wikidata, wikipedia, wikimedia_commons and mapillary" @@ -10257,11 +9570,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=wlan)" + "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Restaurants and fast food' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=wlan)", + "description": "Layer 'Restaurants and fast food' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -10336,7 +9649,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Food Courts' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Food Courts' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "smoking", @@ -10434,7 +9747,7 @@ }, { "key": "contact:phone", - "description": "Layer 'governments' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'governments' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "email", @@ -10637,7 +9950,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Hackerspace' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Hackerspace' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "contact:mastodon", @@ -10868,11 +10181,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Hackerspace' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=wlan)" + "description": "Layer 'Hackerspace' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Hackerspace' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=wlan)", + "description": "Layer 'Hackerspace' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -10909,7 +10222,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Hospitals' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Hospitals' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "email", @@ -11098,7 +10411,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Ice cream parlors' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Ice cream parlors' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "email", @@ -11783,7 +11096,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Kindergartens and childcare' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Kindergartens and childcare' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "opening_hours", @@ -11875,7 +11188,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Love hotels' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Love hotels' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "email", @@ -12859,11 +12172,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Outdoor Seating' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=wlan)" + "description": "Layer 'Outdoor Seating' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Outdoor Seating' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=wlan)", + "description": "Layer 'Outdoor Seating' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -13507,7 +12820,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Pharmacies' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Pharmacies' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "email", @@ -13597,7 +12910,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Physiotherapist' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Physiotherapist' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "email", @@ -13692,6 +13005,11 @@ "description": "Layer 'Picnic tables' shows material=plastic with a fixed text, namely 'This picnic table is made from (recycled) plastic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", "value": "plastic" }, + { + "key": "material", + "description": "Layer 'Picnic tables' shows material=metal with a fixed text, namely 'This picnic table is made from metal' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "metal" + }, { "key": "leisure", "description": "The MapComplete theme Personal theme has a layer Playgrounds showing features with this tag", @@ -13717,6 +13035,16 @@ "key": "wikipedia", "description": "The layer 'Playgrounds 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": "fee", + "description": "Layer 'Playgrounds' shows fee=no with a fixed text, namely 'Free to use' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "no" + }, + { + "key": "fee", + "description": "Layer 'Playgrounds' shows fee=yes with a fixed text, namely 'Paid playground' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')", + "value": "yes" + }, { "key": "surface", "description": "Layer 'Playgrounds' shows and asks freeform values for key 'surface' (in the mapcomplete.org theme 'Personal theme')" @@ -14721,7 +14049,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Recycling' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme') (This is only shown if recycling_type=centre)" + "description": "Layer 'Recycling' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme') (This is only shown if recycling_type=centre)" }, { "key": "opening_hours", @@ -14949,7 +14277,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Primary and secondary schools' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Primary and secondary schools' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "email", @@ -15948,7 +15276,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "payment:cash", @@ -16287,11 +15615,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=wlan)" + "description": "Layer 'Shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=wlan)", + "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -17343,7 +16671,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Sports centres' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Sports centres' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "website", @@ -17985,7 +17313,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Colleges and universities' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Colleges and universities' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "amenity", @@ -18785,7 +18113,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Tool libraries' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Tool libraries' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "email", @@ -18903,6 +18231,11 @@ "description": "The MapComplete theme Personal theme has a layer Tourism accomodation showing features with this tag", "value": "guest_house" }, + { + "key": "tourism", + "description": "The MapComplete theme Personal theme has a layer Tourism accomodation showing features with this tag", + "value": "camp_site" + }, { "key": "id", "description": "Layer 'Tourism accomodation' 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 'Personal theme') (This is only shown if _backend~.+ & _last_edit:passed_time<300 & (_version_number= | _version_number=1))" @@ -18942,7 +18275,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Tourism accomodation' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Tourism accomodation' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "email", @@ -19026,11 +18359,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Tourism accomodation' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=wlan)" + "description": "Layer 'Tourism accomodation' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Tourism accomodation' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=wlan)", + "description": "Layer 'Tourism accomodation' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -19917,7 +19250,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Vending Machines' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'Vending Machines' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "website", @@ -19981,7 +19314,7 @@ }, { "key": "contact:phone", - "description": "Layer 'veterinary' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Personal theme')" + "description": "Layer 'veterinary' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Personal theme')" }, { "key": "opening_hours", diff --git a/Docs/TagInfo/mapcomplete_pets.json b/Docs/TagInfo/mapcomplete_pets.json index bd3d81694..8fe4d71b2 100644 --- a/Docs/TagInfo/mapcomplete_pets.json +++ b/Docs/TagInfo/mapcomplete_pets.json @@ -185,7 +185,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Dog friendly eateries' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')" + "description": "Layer 'Dog friendly eateries' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')" }, { "key": "payment:cash", @@ -330,6 +330,26 @@ "description": "Layer 'Dog friendly eateries' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')", "value": "thai" }, + { + "key": "cuisine", + "description": "Layer 'Dog friendly eateries' shows cuisine=mexican with a fixed text, namely 'Mexican dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "mexican " + }, + { + "key": "cuisine", + "description": "Layer 'Dog friendly eateries' shows cuisine=japanese with a fixed text, namely 'Japanese dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "japanese " + }, + { + "key": "cuisine", + "description": "Layer 'Dog friendly eateries' shows cuisine=chicken with a fixed text, namely 'Chicken based dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "chicken " + }, + { + "key": "cuisine", + "description": "Layer 'Dog friendly eateries' shows cuisine=seafood with a fixed text, namely 'Seafood dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')", + "value": "seafood " + }, { "key": "image", "description": "The layer 'Dog friendly eateries shows images based on the keys image, image:0, image:1,... and wikidata, wikipedia, wikimedia_commons and mapillary" @@ -728,11 +748,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Dog friendly eateries' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if internet_access=wlan)" + "description": "Layer 'Dog friendly eateries' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Dog friendly eateries' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if internet_access=wlan)", + "description": "Layer 'Dog friendly eateries' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -1661,7 +1681,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Dog-friendly shops' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')" + "description": "Layer 'Dog-friendly shops' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')" }, { "key": "payment:cash", @@ -2000,11 +2020,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Dog-friendly shops' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if internet_access=wlan)" + "description": "Layer 'Dog-friendly shops' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Dog-friendly shops' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if internet_access=wlan)", + "description": "Layer 'Dog-friendly shops' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -2109,7 +2129,7 @@ }, { "key": "contact:phone", - "description": "Layer 'veterinary' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')" + "description": "Layer 'veterinary' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')" }, { "key": "opening_hours", @@ -2167,7 +2187,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Animal shelters' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')" + "description": "Layer 'Animal shelters' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')" }, { "key": "email", diff --git a/Docs/TagInfo/mapcomplete_playgrounds.json b/Docs/TagInfo/mapcomplete_playgrounds.json index 0879fad55..e87c1ad58 100644 --- a/Docs/TagInfo/mapcomplete_playgrounds.json +++ b/Docs/TagInfo/mapcomplete_playgrounds.json @@ -35,6 +35,16 @@ "key": "wikipedia", "description": "The layer 'Playgrounds 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": "fee", + "description": "Layer 'Playgrounds' shows fee=no with a fixed text, namely 'Free to use' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')", + "value": "no" + }, + { + "key": "fee", + "description": "Layer 'Playgrounds' shows fee=yes with a fixed text, namely 'Paid playground' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')", + "value": "yes" + }, { "key": "surface", "description": "Layer 'Playgrounds' shows and asks freeform values for key 'surface' (in the mapcomplete.org theme 'Playgrounds')" @@ -715,6 +725,11 @@ "description": "Layer 'Picnic tables' shows material=plastic with a fixed text, namely 'This picnic table is made from (recycled) plastic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')", "value": "plastic" }, + { + "key": "material", + "description": "Layer 'Picnic tables' shows material=metal with a fixed text, namely 'This picnic table is made from metal' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')", + "value": "metal" + }, { "key": "amenity", "description": "The MapComplete theme Playgrounds has a layer Waste Basket showing features with this tag", diff --git a/Docs/TagInfo/mapcomplete_postboxes.json b/Docs/TagInfo/mapcomplete_postboxes.json index 0a1fe9273..2b9f02141 100644 --- a/Docs/TagInfo/mapcomplete_postboxes.json +++ b/Docs/TagInfo/mapcomplete_postboxes.json @@ -1229,7 +1229,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Postbox and Post Office Map')" + "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Postbox and Post Office Map')" }, { "key": "payment:cash", @@ -1568,11 +1568,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if internet_access=wlan)" + "description": "Layer 'Shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if internet_access=wlan)", + "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { diff --git a/Docs/TagInfo/mapcomplete_shops.json b/Docs/TagInfo/mapcomplete_shops.json index e512b0cde..04697324c 100644 --- a/Docs/TagInfo/mapcomplete_shops.json +++ b/Docs/TagInfo/mapcomplete_shops.json @@ -931,7 +931,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Shops')" + "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Shops')" }, { "key": "payment:cash", @@ -1270,11 +1270,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Shops') (This is only shown if internet_access=wlan)" + "description": "Layer 'Shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Shops') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if internet_access=wlan)", + "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { @@ -1400,7 +1400,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Pharmacies' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Shops')" + "description": "Layer 'Pharmacies' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Shops')" }, { "key": "email", @@ -1481,7 +1481,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Ice cream parlors' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Shops')" + "description": "Layer 'Ice cream parlors' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Shops')" }, { "key": "email", diff --git a/Docs/TagInfo/mapcomplete_ski.json b/Docs/TagInfo/mapcomplete_ski.json index 5e639cca3..a9c313a89 100644 --- a/Docs/TagInfo/mapcomplete_ski.json +++ b/Docs/TagInfo/mapcomplete_ski.json @@ -978,7 +978,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Restaurants and fast food' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Ski pistes and aerialways')" + "description": "Layer 'Restaurants and fast food' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Ski pistes and aerialways')" }, { "key": "payment:cash", @@ -1123,6 +1123,26 @@ "description": "Layer 'Restaurants and fast food' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')", "value": "thai" }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=mexican with a fixed text, namely 'Mexican dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')", + "value": "mexican " + }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=japanese with a fixed text, namely 'Japanese dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')", + "value": "japanese " + }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=chicken with a fixed text, namely 'Chicken based dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')", + "value": "chicken " + }, + { + "key": "cuisine", + "description": "Layer 'Restaurants and fast food' shows cuisine=seafood with a fixed text, namely 'Seafood dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')", + "value": "seafood " + }, { "key": "image", "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and wikidata, wikipedia, wikimedia_commons and mapillary" @@ -1521,11 +1541,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Ski pistes and aerialways') (This is only shown if internet_access=wlan)" + "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Ski pistes and aerialways') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Restaurants and fast food' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways') (This is only shown if internet_access=wlan)", + "description": "Layer 'Restaurants and fast food' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { diff --git a/Docs/TagInfo/mapcomplete_sports.json b/Docs/TagInfo/mapcomplete_sports.json index 7ba373471..ba45bcb60 100644 --- a/Docs/TagInfo/mapcomplete_sports.json +++ b/Docs/TagInfo/mapcomplete_sports.json @@ -239,7 +239,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Fitness Centres' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Sports')" + "description": "Layer 'Fitness Centres' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Sports')" }, { "key": "email", @@ -536,7 +536,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Sports centres' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Sports')" + "description": "Layer 'Sports centres' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Sports')" }, { "key": "website", @@ -1490,7 +1490,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Sports')" + "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Sports')" }, { "key": "payment:cash", @@ -1829,11 +1829,11 @@ }, { "key": "internet_access:ssid", - "description": "Layer 'Shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Sports') (This is only shown if internet_access=wlan)" + "description": "Layer 'Shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Sports') (This is only shown if internet_access~^(.*wlan.*)$)" }, { "key": "internet_access:ssid", - "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if internet_access=wlan)", + "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if internet_access~^(.*wlan.*)$)", "value": "Telekom" }, { diff --git a/Docs/TagInfo/mapcomplete_vending_machine.json b/Docs/TagInfo/mapcomplete_vending_machine.json index 85ce5ae7e..5d59e5891 100644 --- a/Docs/TagInfo/mapcomplete_vending_machine.json +++ b/Docs/TagInfo/mapcomplete_vending_machine.json @@ -431,7 +431,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Vending Machines' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Vending Machines')" + "description": "Layer 'Vending Machines' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Vending Machines')" }, { "key": "website", diff --git a/Docs/TagInfo/mapcomplete_waste.json b/Docs/TagInfo/mapcomplete_waste.json index eb9acecc6..dbdf6d532 100644 --- a/Docs/TagInfo/mapcomplete_waste.json +++ b/Docs/TagInfo/mapcomplete_waste.json @@ -339,7 +339,7 @@ }, { "key": "contact:phone", - "description": "Layer 'Recycling' shows contact:phone~.+ with a fixed text, namely '{contact:phone}' (in the mapcomplete.org theme 'Waste') (This is only shown if recycling_type=centre)" + "description": "Layer 'Recycling' shows contact:phone~.+ with a fixed text, namely '{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}' (in the mapcomplete.org theme 'Waste') (This is only shown if recycling_type=centre)" }, { "key": "opening_hours", diff --git a/Docs/Themes/atm.md b/Docs/Themes/atm.md index 447025d02..5ed5abba3 100644 --- a/Docs/Themes/atm.md +++ b/Docs/Themes/atm.md @@ -44,6 +44,7 @@ Available languages: + [images](#images) + [has_atm](#has_atm) + [leftover-questions](#leftover-questions) + + [move-button](#move-button) + [delete-button](#delete-button) + [lod](#lod) - [Filters](#filters) @@ -64,6 +65,7 @@ Available languages: + [stamps](#stamps) + [has_atm](#has_atm) + [leftover-questions](#leftover-questions) + + [move-button](#move-button) + [lod](#lod) - [Filters](#filters) @@ -114,6 +116,11 @@ The question is `Does this bank have an ATM?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### delete-button _This tagrendering has no question and is thus read-only_ @@ -273,6 +280,11 @@ The question is `Does this post office have an ATM?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Themes/buurtnatuur.md b/Docs/Themes/buurtnatuur.md index 12ade88b9..abada26be 100644 --- a/Docs/Themes/buurtnatuur.md +++ b/Docs/Themes/buurtnatuur.md @@ -22,6 +22,7 @@ Available languages: - [Breng jouw buurtnatuur in kaart ( buurtnatuur )](#breng-jouw-buurtnatuur-in-kaart-(-buurtnatuur-)) 1. [Layers defined in this theme configuration file](#layers-defined-in-this-theme-configuration-file) 2. [nature_reserve_buurtnatuur](#nature_reserve_buurtnatuur) + - [Presets](#presets) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [images](#images) @@ -34,6 +35,7 @@ Available languages: + [leftover-questions](#leftover-questions) + [lod](#lod) 3. [parks](#parks) + - [Presets](#presets) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [images](#images) @@ -46,6 +48,7 @@ Available languages: + [leftover-questions](#leftover-questions) + [lod](#lod) 4. [forest](#forest) + - [Presets](#presets) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [images](#images) @@ -68,6 +71,12 @@ Een natuurgebied is een gebied waar actief ruimte gemaakt word voor de natuur. T No themes use this layer +## Presets + +The following options to create new points are included: + +**een natuurreservaat** which has the following tags:leisure=nature_reserve & fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen + ## Basic tags for this layer Elements must match **any** of the following expressions: @@ -163,6 +172,12 @@ Een park is een publiek toegankelijke, groene ruimte binnen de stad. Ze is typis No themes use this layer +## Presets + +The following options to create new points are included: + +**een park** which has the following tags:leisure=park & fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen + ## Basic tags for this layer Elements must match **any** of the following expressions: @@ -258,6 +273,12 @@ Een bos is een verzameling bomen, al dan niet als productiehout. No themes use this layer +## Presets + +The following options to create new points are included: + +**een bos** which has the following tags:landuse=forest & fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen + ## Basic tags for this layer Elements must match **any** of the following expressions: diff --git a/Docs/Themes/campersite.md b/Docs/Themes/campersite.md index 2e9498a37..fd64a03aa 100644 --- a/Docs/Themes/campersite.md +++ b/Docs/Themes/campersite.md @@ -8,8 +8,8 @@ The theme introduction reads: This theme contains the following layers: - - [caravansites (defined in this theme)](#caravansites) - - [dumpstations (defined in this theme)](#dumpstations) + - [caravansites](../Layers/caravansites.md) + - [dumpstations](../Layers/dumpstations.md) Available languages: @@ -31,304 +31,8 @@ Available languages: - eu - pl -# Table of contents - - - [Campersites ( campersite )](#campersites-(-campersite-)) -1. [Layers defined in this theme configuration file](#layers-defined-in-this-theme-configuration-file) -2. [caravansites](#caravansites) - - [Basic tags for this layer](#basic-tags-for-this-layer) - - [Supported attributes](#supported-attributes) - + [images](#images) - + [caravansites-name](#caravansites-name) - + [caravansites-fee](#caravansites-fee) - + [caravansites-charge](#caravansites-charge) - + [caravansites-sanitary-dump](#caravansites-sanitary-dump) - + [caravansites-capacity](#caravansites-capacity) - + [caravansites-internet](#caravansites-internet) - + [caravansites-internet-fee](#caravansites-internet-fee) - + [caravansites-toilets](#caravansites-toilets) - + [caravansites-website](#caravansites-website) - + [caravansites-long-term](#caravansites-long-term) - + [caravansites-description](#caravansites-description) - + [questions](#questions) - + [reviews](#reviews) - + [lod](#lod) - + [operator](#operator) - + [power_supply](#power_supply) -3. [dumpstations](#dumpstations) - - [Basic tags for this layer](#basic-tags-for-this-layer) - - [Supported attributes](#supported-attributes) - + [images](#images) - + [dumpstations-fee](#dumpstations-fee) - + [dumpstations-charge](#dumpstations-charge) - + [dumpstations-waterpoint](#dumpstations-waterpoint) - + [dumpstations-grey-water](#dumpstations-grey-water) - + [dumpstations-chemical-waste](#dumpstations-chemical-waste) - + [dumpstations-access](#dumpstations-access) - + [dumpstations-network](#dumpstations-network) - + [operator](#operator) - + [power_supply](#power_supply) - + [leftover-questions](#leftover-questions) - + [lod](#lod) - # Layers defined in this theme configuration file These layers can not be reused in different themes. -# caravansites - -camper sites - - - This layer is shown at zoomlevel **7** and higher - -No themes use this layer - -## Basic tags for this layer - -Elements must match **all** of the following expressions: - -0. tourism=caravan_site -1. permanent_camping!~^(only)$ - -[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22tourism%22%3D%22caravan_site%22%5D%5B%22permanent_camping%22!~%22%5E%28only%29%24%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) - -## Supported attributes - -**Warning:**,this quick overview is incomplete, - -| attribute | type | values which are supported by this layer | ------|-----|----- | -| [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | | -| [fee](https://wiki.openstreetmap.org/wiki/Key:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:fee%3Dno) | -| [charge](https://wiki.openstreetmap.org/wiki/Key:charge) | [string](../SpecialInputElements.md#string) | | -| [sanitary_dump_station](https://wiki.openstreetmap.org/wiki/Key:sanitary_dump_station) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:sanitary_dump_station%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:sanitary_dump_station%3Dno) | -| [capacity](https://wiki.openstreetmap.org/wiki/Key:capacity) | [pnat](../SpecialInputElements.md#pnat) | | -| [internet_access](https://wiki.openstreetmap.org/wiki/Key:internet_access) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno) | -| [internet_access:fee](https://wiki.openstreetmap.org/wiki/Key:internet_access:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno) | -| [toilets](https://wiki.openstreetmap.org/wiki/Key:toilets) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:toilets%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:toilets%3Dno) | -| [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | | -| [permanent_camping](https://wiki.openstreetmap.org/wiki/Key:permanent_camping) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:permanent_camping%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:permanent_camping%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:permanent_camping%3Donly) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | -| [operator](https://wiki.openstreetmap.org/wiki/Key:operator) | [string](../SpecialInputElements.md#string) | | -| [power_supply](https://wiki.openstreetmap.org/wiki/Key:power_supply) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:power_supply%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:power_supply%3Dno) | - -### images -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images -_This tagrendering has no question and is thus read-only_ -*{image_carousel()}{image_upload()}* - -### caravansites-name - -The question is `What is this place called?` -*This place is called {name}* is shown if `name` is set - -### caravansites-fee - -The question is `Does this place charge a fee?` - - - *You need to pay for use* is shown if with fee=yes - - *Can be used for free* is shown if with fee=no - -### caravansites-charge - -The question is `How much does this place charge?` -*This place charges {charge}* is shown if `charge` is set - -This tagrendering is only visible in the popup if the following condition is met: fee=yes - -### caravansites-sanitary-dump - -The question is `Does this place have a sanitary dump station?` - - - *This place has a sanitary dump station* is shown if with sanitary_dump_station=yes - - *This place does not have a sanitary dump station* is shown if with sanitary_dump_station=no - -### caravansites-capacity - -The question is `How many campers can stay here? (skip if there is no obvious number of spaces or allowed vehicles)` -*{capacity} campers can use this place at the same time* is shown if `capacity` is set - -### caravansites-internet - -The question is `Does this place provide internet access?` - - - *There is internet access* is shown if with internet_access=yes - - *There is internet access* is shown if with internet_access=wifi | internet_access=wlan. _This option cannot be chosen as answer_ - - *There is no internet access* is shown if with internet_access=no - -### caravansites-internet-fee - -The question is `Do you have to pay for the internet access?` - - - *You need to pay extra for internet access* is shown if with internet_access:fee=yes - - *You do not need to pay extra for internet access* is shown if with internet_access:fee=no - -This tagrendering is only visible in the popup if the following condition is met: internet_access=yes - -### caravansites-toilets - -The question is `Does this place have toilets?` - - - *This place has toilets* is shown if with toilets=yes - - *This place does not have toilets* is shown if with toilets=no - -### caravansites-website - -The question is `Does this place have a website?` -*Official website: {website}* is shown if `website` is set - -### caravansites-long-term - -The question is `Does this place offer spots for long term rental?` - - - *There are some spots for long term rental, but you can also stay on a daily basis* is shown if with permanent_camping=yes - - *There are no permanent guests here* is shown if with permanent_camping=no - - *It is only possible to stay here if you have a long term contract (this place disappears from this map if you choose this)* is shown if with permanent_camping=only - -### caravansites-description - -The question is `Would you like to add a general description of this place? (Do not repeat information previously asked or shown above. Please keep it objective - opinions go into the reviews)` -*More details about this place: {description}* is shown if `description` is set - -### questions -Show the questions block at this location -_This tagrendering has no question and is thus read-only_ -*{questions()}* - -### reviews -Shows the reviews module (including the possibility to leave a review) -_This tagrendering has no question and is thus read-only_ -*{create_review()}{list_reviews()}* - -### lod - -_This tagrendering has no question and is thus read-only_ -*{linked_data_from_website()}* - -This tagrendering has labels -`added_by_default` - -### operator - -The question is `Who operates this place?` -*This place is operated by {operator}* is shown if `operator` is set - -### power_supply - -The question is `Does this place have a power supply?` - - - *This place has a power supply* is shown if with power_supply=yes - - *This place does not have power supply* is shown if with power_supply=no - -# dumpstations - -Sanitary dump stations - - - This layer is shown at zoomlevel **7** and higher - -No themes use this layer - -## Basic tags for this layer - -Elements must match **all** of the following expressions: - -0. amenity=sanitary_dump_station -1. vehicle!~^(no)$ - -[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22amenity%22%3D%22sanitary_dump_station%22%5D%5B%22vehicle%22!~%22%5E%28no%29%24%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) - -## Supported attributes - -**Warning:**,this quick overview is incomplete, - -| attribute | type | values which are supported by this layer | ------|-----|----- | -| [fee](https://wiki.openstreetmap.org/wiki/Key:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:fee%3Dno) | -| [charge](https://wiki.openstreetmap.org/wiki/Key:charge) | [string](../SpecialInputElements.md#string) | | -| [water_point](https://wiki.openstreetmap.org/wiki/Key:water_point) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:water_point%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:water_point%3Dno) | -| [sanitary_dump_station:grey_water](https://wiki.openstreetmap.org/wiki/Key:sanitary_dump_station:grey_water) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:sanitary_dump_station:grey_water%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:sanitary_dump_station:grey_water%3Dno) | -| [sanitary_dump_station:chemical_toilet](https://wiki.openstreetmap.org/wiki/Key:sanitary_dump_station:chemical_toilet) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:sanitary_dump_station:chemical_toilet%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:sanitary_dump_station:chemical_toilet%3Dno) | -| [access](https://wiki.openstreetmap.org/wiki/Key:access) | Multiple choice | [network](https://wiki.openstreetmap.org/wiki/Tag:access%3Dnetwork) [customers](https://wiki.openstreetmap.org/wiki/Tag:access%3Dcustomers) [yes](https://wiki.openstreetmap.org/wiki/Tag:access%3Dyes) | -| [network](https://wiki.openstreetmap.org/wiki/Key:network) | [string](../SpecialInputElements.md#string) | | -| [operator](https://wiki.openstreetmap.org/wiki/Key:operator) | [string](../SpecialInputElements.md#string) | | -| [power_supply](https://wiki.openstreetmap.org/wiki/Key:power_supply) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:power_supply%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:power_supply%3Dno) | - -### images -This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images -_This tagrendering has no question and is thus read-only_ -*{image_carousel()}{image_upload()}* - -### dumpstations-fee - -The question is `Does this place charge a fee?` - - - *You need to pay for use* is shown if with fee=yes - - *Can be used for free* is shown if with fee=no - -### dumpstations-charge - -The question is `How much does this place charge?` -*This place charges {charge}* is shown if `charge` is set - -This tagrendering is only visible in the popup if the following condition is met: fee=yes - -### dumpstations-waterpoint - -The question is `Does this place have a water point?` - - - *This place has a water point* is shown if with water_point=yes - - *This place does not have a water point* is shown if with water_point=no - -### dumpstations-grey-water - -The question is `Can you dispose of grey water here?` - - - *You can dispose of grey water here* is shown if with sanitary_dump_station:grey_water=yes - - *You cannot dispose of gray water here* is shown if with sanitary_dump_station:grey_water=no - -### dumpstations-chemical-waste - -The question is `Can you dispose of chemical toilet waste here?` - - - *You can dispose of chemical toilet waste here* is shown if with sanitary_dump_station:chemical_toilet=yes - - *You cannot dispose of chemical toilet waste here* is shown if with sanitary_dump_station:chemical_toilet=no - -### dumpstations-access - -The question is `Who can use this dump station?` - - - *You need a network key/code to use this* is shown if with access=network - - *You need to be a customer of camping/campersite to use this place* is shown if with access=customers - - *Anyone can use this dump station* is shown if with access=public. _This option cannot be chosen as answer_ - - *Anyone can use this dump station* is shown if with access=yes - -### dumpstations-network - -The question is `What network is this place a part of? (skip if none)` -*This station is part of network {network}* is shown if `network` is set - -### operator - -The question is `Who operates this place?` -*This place is operated by {operator}* is shown if `operator` is set - -### power_supply - -The question is `Does this place have a power supply?` - - - *This place has a power supply* is shown if with power_supply=yes - - *This place does not have power supply* is shown if with power_supply=no - -### leftover-questions - -_This tagrendering has no question and is thus read-only_ -*{questions( ,)}* - -### lod - -_This tagrendering has no question and is thus read-only_ -*{linked_data_from_website()}* - -This tagrendering has labels -`added_by_default` This document is autogenerated from [assets/themes/campersite/campersite.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/campersite/campersite.json) diff --git a/Docs/Themes/circular_economy.md b/Docs/Themes/circular_economy.md index dbbf573f0..bf3c53005 100644 --- a/Docs/Themes/circular_economy.md +++ b/Docs/Themes/circular_economy.md @@ -20,6 +20,7 @@ Available languages: - en - es + - de # Table of contents @@ -82,7 +83,7 @@ This layer is based on [shops](../Layers/shops.md) A shop - - This layer is shown at zoomlevel **10** and higher + - This layer is shown at zoomlevel **6** and higher No themes use this layer @@ -134,7 +135,7 @@ Elements must match **any** of the following expressions: | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images @@ -321,6 +322,9 @@ The question is `What kind of shop is this?` - *Window Blind Store* is shown if with shop=window_blind - *Wine Shop* is shown if with shop=wine +This tagrendering has labels +`description` + ### brand The question is `What is the brand of this shop?` @@ -369,9 +373,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -631,7 +635,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` diff --git a/Docs/Themes/climbing.md b/Docs/Themes/climbing.md index 97b87e6a2..7fb995a3f 100644 --- a/Docs/Themes/climbing.md +++ b/Docs/Themes/climbing.md @@ -153,7 +153,7 @@ Elements must match **all** of the following expressions: | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### repairs_climbing_shoes @@ -347,6 +347,9 @@ The question is `What kind of shop is this?` - *Window Blind Store* is shown if with shop=window_blind - *Wine Shop* is shown if with shop=wine +This tagrendering has labels +`description` + ### brand The question is `What is the brand of this shop?` @@ -395,9 +398,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -657,7 +660,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -744,14 +747,6 @@ This tagrendering has labels -----|-----|----- | | open_now.0 | Open now | _isOpen=yes | -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-type.0 | Only show shops selling {search} | | search (string) | - -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-name.0 | Only show shops with name {search} | | search (string) | - | id | question | osmTags | -----|-----|----- | | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ | @@ -760,6 +755,174 @@ This tagrendering has labels -----|-----|----- | | has_organic.0 | Has organic options | organic=yes | organic=only | +| id | question | osmTags | +-----|-----|----- | +| shop_types.0 | *What kind of shop is this?* (default) | | +| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | +| shop_types.2 | Farm Supply Shop | shop=agrarian | +| shop_types.3 | Liquor Store | shop=alcohol | +| shop_types.4 | Anime / Manga Shop | shop=anime | +| shop_types.5 | Antique Shop | shop=antiques | +| shop_types.6 | Appliance Store | shop=appliance | +| shop_types.7 | Art Store | shop=art | +| shop_types.8 | Baby Goods Store | shop=baby_goods | +| shop_types.9 | Bag/Luggage Store | shop=bag | +| shop_types.10 | Bakery | shop=bakery | +| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing | +| shop_types.12 | Beauty Shop | shop=beauty | +| shop_types.13 | Bedding/Mattress Store | shop=bed | +| shop_types.14 | Beverage Store | shop=beverages | +| shop_types.15 | Bicycle Shop | shop=bicycle | +| shop_types.16 | Boat Store | shop=boat | +| shop_types.17 | Bookmaker | shop=bookmaker | +| shop_types.18 | Bookstore | shop=books | +| shop_types.19 | Brewing Supply Store | shop=brewing_supplies | +| shop_types.20 | Butcher | shop=butcher | +| shop_types.21 | Camera Equipment Store | shop=camera | +| shop_types.22 | Candle Shop | shop=candles | +| shop_types.23 | Cannabis Shop | shop=cannabis | +| shop_types.24 | Car Dealership | shop=car | +| shop_types.25 | Car Parts Store | shop=car_parts | +| shop_types.26 | Car Repair Shop | shop=car_repair | +| shop_types.27 | RV Dealership | shop=caravan | +| shop_types.28 | Carpet Store | shop=carpet | +| shop_types.29 | Catalog Shop | shop=catalogue | +| shop_types.30 | Charity Store | shop=charity | +| shop_types.31 | Cheese Store | shop=cheese | +| shop_types.32 | Drugstore | shop=chemist | +| shop_types.33 | Chocolate Store | shop=chocolate | +| shop_types.34 | Clothing Store | shop=clothes | +| shop_types.35 | Coffee Store | shop=coffee | +| shop_types.36 | Collectibles Shop | shop=collector | +| shop_types.37 | Computer Store | shop=computer | +| shop_types.38 | Candy Store | shop=confectionery | +| shop_types.39 | Convenience Store | shop=convenience | +| shop_types.40 | Copy Store | shop=copyshop | +| shop_types.41 | Cosmetics Store | shop=cosmetics | +| shop_types.42 | Rural Supplies Store | shop=country_store | +| shop_types.43 | Arts & Crafts Store | shop=craft | +| shop_types.44 | Curtain Store | shop=curtain | +| shop_types.45 | Dairy Store | shop=dairy | +| shop_types.46 | Delicatessen | shop=deli | +| shop_types.47 | Department Store | shop=department_store | +| shop_types.48 | DIY Store | shop=doityourself | +| shop_types.49 | Door Shop | shop=doors | +| shop_types.50 | Dry Cleaner | shop=dry_cleaning | +| shop_types.51 | E-Cigarette Shop | shop=e-cigarette | +| shop_types.52 | Electrical Equipment Store | shop=electrical | +| shop_types.53 | Electronics Store | shop=electronics | +| shop_types.54 | Erotic Store | shop=erotic | +| shop_types.55 | Fabric Store | shop=fabric | +| shop_types.56 | Produce Stand | shop=farm | +| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories | +| shop_types.58 | Fireplace Store | shop=fireplace | +| shop_types.59 | Fishing Shop | shop=fishing | +| shop_types.60 | Flooring Supply Shop | shop=flooring | +| shop_types.61 | Florist | shop=florist | +| shop_types.62 | Framing Shop | shop=frame | +| shop_types.63 | Frozen Food Store | shop=frozen_food | +| shop_types.64 | Fuel Shop | shop=fuel | +| shop_types.65 | Funeral Home | shop=funeral_directors | +| shop_types.66 | Furniture Store | shop=furniture | +| shop_types.67 | Tabletop Game Store | shop=games | +| shop_types.68 | Garden Center | shop=garden_centre | +| shop_types.69 | Bottled Gas Shop | shop=gas | +| shop_types.70 | General Store | shop=general | +| shop_types.71 | Gift Shop | shop=gift | +| shop_types.72 | Greengrocer | shop=greengrocer | +| shop_types.73 | Hairdresser | shop=hairdresser | +| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply | +| shop_types.75 | Hardware Store | shop=hardware | +| shop_types.76 | Health Food Store | shop=health_food | +| shop_types.77 | Hearing Aids Store | shop=hearing_aids | +| shop_types.78 | Herbalist | shop=herbalist | +| shop_types.79 | Hifi Store | shop=hifi | +| shop_types.80 | Honey Store | shop=honey | +| shop_types.81 | Household Linen Shop | shop=household_linen | +| shop_types.82 | Houseware Store | shop=houseware | +| shop_types.83 | Hunting Shop | shop=hunting | +| shop_types.84 | Interior Decoration Store | shop=interior_decoration | +| shop_types.85 | Jewelry Store | shop=jewelry | +| shop_types.86 | Kiosk | shop=kiosk | +| shop_types.87 | Kitchen Design Store | shop=kitchen | +| shop_types.88 | Laundry | shop=laundry | +| shop_types.89 | Leather Store | shop=leather | +| shop_types.90 | Lighting Store | shop=lighting | +| shop_types.91 | Locksmith | shop=locksmith | +| shop_types.92 | Lottery Shop | shop=lottery | +| shop_types.93 | Mall | shop=mall | +| shop_types.94 | Massage Shop | shop=massage | +| shop_types.95 | Medical Supply Store | shop=medical_supply | +| shop_types.96 | Military Surplus Store | shop=military_surplus | +| shop_types.97 | Mobile Phone Store | shop=mobile_phone | +| shop_types.98 | Model Shop | shop=model | +| shop_types.99 | Money Lender | shop=money_lender | +| shop_types.100 | Motorcycle Dealership | shop=motorcycle | +| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair | +| shop_types.102 | Music Store | shop=music | +| shop_types.103 | Musical Instrument Store | shop=musical_instrument | +| shop_types.104 | Newsstand | shop=newsagent | +| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements | +| shop_types.106 | Nuts Shop | shop=nuts | +| shop_types.107 | Optician | shop=optician | +| shop_types.108 | Outdoors Store | shop=outdoor | +| shop_types.109 | Online Retailer Outpost | shop=outpost | +| shop_types.110 | Paint Store | shop=paint | +| shop_types.111 | Party Supply Store | shop=party | +| shop_types.112 | Pasta Store | shop=pasta | +| shop_types.113 | Pastry Shop | shop=pastry | +| shop_types.114 | Pawnshop | shop=pawnbroker | +| shop_types.115 | Perfume Store | shop=perfumery | +| shop_types.116 | Pet Store | shop=pet | +| shop_types.117 | Pet Groomer | shop=pet_grooming | +| shop_types.118 | Photography Store | shop=photo | +| shop_types.119 | Pottery Store | shop=pottery | +| shop_types.120 | Printer Ink Store | shop=printer_ink | +| shop_types.121 | Psychic | shop=psychic | +| shop_types.122 | Fireworks Store | shop=pyrotechnics | +| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics | +| shop_types.124 | Religious Store | shop=religion | +| shop_types.125 | Rental Shop | shop=rental | +| shop_types.126 | Repair Shop | shop=repair | +| shop_types.127 | Rice Store | shop=rice | +| shop_types.128 | Scuba Diving Shop | shop=scuba_diving | +| shop_types.129 | Seafood Shop | shop=seafood | +| shop_types.130 | Thrift Store | shop=second_hand | +| shop_types.131 | Sewing Supply Shop | shop=sewing | +| shop_types.132 | Shoe Repair Shop | shop=shoe_repair | +| shop_types.133 | Shoe Store | shop=shoes | +| shop_types.134 | Spice Shop | shop=spices | +| shop_types.135 | Sporting Goods Store | shop=sports | +| shop_types.136 | Stationery Store | shop=stationery | +| shop_types.137 | Storage Rental | shop=storage_rental | +| shop_types.138 | Supermarket | shop=supermarket | +| shop_types.139 | Pool Supply Store | shop=swimming_pool | +| shop_types.140 | Tailor | shop=tailor | +| shop_types.141 | Tattoo Parlor | shop=tattoo | +| shop_types.142 | Tea Store | shop=tea | +| shop_types.143 | Telecom Retail Store | shop=telecommunication | +| shop_types.144 | Ticket Seller | shop=ticket | +| shop_types.145 | Tile Shop | shop=tiles | +| shop_types.146 | Tobacco Shop | shop=tobacco | +| shop_types.147 | Tool Rental | shop=tool_hire | +| shop_types.148 | Toy Store | shop=toys | +| shop_types.149 | Trade Shop | shop=trade | +| shop_types.150 | Travel Agency | shop=travel_agency | +| shop_types.151 | Trophy Shop | shop=trophy | +| shop_types.152 | Tire Store | shop=tyres | +| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner | +| shop_types.154 | Discount Store | shop=variety_store | +| shop_types.155 | Video Store | shop=video | +| shop_types.156 | Video Game Store | shop=video_games | +| shop_types.157 | Watches Shop | shop=watches | +| shop_types.158 | Drinking Water Shop | shop=water | +| shop_types.159 | Watersport/Swim Shop | shop=water_sports | +| shop_types.160 | Weapon Shop | shop=weapons | +| shop_types.161 | Wholesale Store | shop=wholesale | +| shop_types.162 | Wig Shop | shop=wigs | +| shop_types.163 | Window Blind Store | shop=window_blind | +| shop_types.164 | Wine Shop | shop=wine | + | id | question | osmTags | -----|-----|----- | | accepts_cash.0 | Accepts cash | payment:cash=yes | diff --git a/Docs/Themes/cyclenodes.md b/Docs/Themes/cyclenodes.md index 97c688f27..40179ecb5 100644 --- a/Docs/Themes/cyclenodes.md +++ b/Docs/Themes/cyclenodes.md @@ -38,6 +38,7 @@ Available languages: + [leftover-questions](#leftover-questions) + [lod](#lod) 3. [node_bicycle](#node_bicycle) + - [Presets](#presets) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [node-rxn_ref](#node-rxn_ref) @@ -47,6 +48,7 @@ Available languages: + [leftover-questions](#leftover-questions) + [lod](#lod) 4. [bicycle_guidepost](#bicycle_guidepost) + - [Presets](#presets) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [images](#images) @@ -112,6 +114,12 @@ This tagrendering has labels No themes use this layer +## Presets + +The following options to create new points are included: + +**a cycling node** which has the following tags:rcn_ref=? & network:type=node_network (snaps to layers `cycleways_and_roads`) + ## Basic tags for this layer Elements must match **any** of the following expressions: @@ -177,6 +185,12 @@ Guideposts (also known as fingerposts or finger posts) are often found along off No themes use this layer +## Presets + +The following options to create new points are included: + +**a guidepost** which has the following tags:tourism=information & information=guidepost & bicycle=yes + ## Basic tags for this layer Elements must match **all** of the following expressions: diff --git a/Docs/Themes/cyclofix.md b/Docs/Themes/cyclofix.md index 487e81370..d255065fc 100644 --- a/Docs/Themes/cyclofix.md +++ b/Docs/Themes/cyclofix.md @@ -4,10 +4,11 @@ _This document details some technical information about this MapComplete theme, mostly about the attributes used in the theme. Various links point toward more information about the attributes, e.g. to the OpenStreetMap-wiki, to TagInfo or tools creating statistics_ The theme introduction reads: -> The goal of this map is to present cyclists with an easy-to-use solution to find the appropriate infrastructure for their needs.You can track your precise location (mobile only) and select layers that are relevant for you in the bottom left corner. You can also use this tool to add or edit pins (points of interest) to the map and provide more data by answering the questions.All changes you make will automatically be saved in the global database of OpenStreetMap and can be freely re-used by others.For more information about the cyclofix project, go to cyclofix.osm.be. +> A map for cyclists to find the appropriate infrastructure for their needs, such as bicycle pumps, drinking water, bicycle shops, repair stations or parkings. This theme contains the following layers: + - [bicycle_assisted_repair_workshop (defined in this theme)](#bicycle_assisted_repair_workshop) - [bike_cafe](../Layers/bike_cafe.md) - [bike_shop](../Layers/bike_shop.md) - [bike_repair_station](../Layers/bike_repair_station.md) @@ -47,7 +48,25 @@ Available languages: - [Cyclofix - a map for cyclists ( cyclofix )](#cyclofix---a-map-for-cyclists-(-cyclofix-)) 1. [Layers defined in this theme configuration file](#layers-defined-in-this-theme-configuration-file) -2. [bicycle_rental_non_docking](#bicycle_rental_non_docking) +2. [bicycle_assisted_repair_workshop](#bicycle_assisted_repair_workshop) + - [Basic tags for this layer](#basic-tags-for-this-layer) + - [Supported attributes](#supported-attributes) + + [images](#images) + + [preset_description](#preset_description) + + [name](#name) + + [opening_hours_by_appointment](#opening_hours_by_appointment) + + [Opening hours](#opening-hours) + + [phone](#phone) + + [email](#email) + + [website](#website) + + [mastodon](#mastodon) + + [facebook](#facebook) + + [item:repair](#itemrepair) + + [leftover-questions](#leftover-questions) + + [move-button](#move-button) + + [delete-button](#delete-button) + + [lod](#lod) +3. [bicycle_rental_non_docking](#bicycle_rental_non_docking) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [images](#images) @@ -71,7 +90,7 @@ Available languages: + [move-button](#move-button) + [delete-button](#delete-button) + [lod](#lod) -3. [charging_station_ebikes](#charging_station_ebikes) +4. [charging_station_ebikes](#charging_station_ebikes) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [images](#images) @@ -187,7 +206,7 @@ Available languages: + [move-button](#move-button) + [delete-button](#delete-button) + [lod](#lod) -4. [vending_machine_bicycle](#vending_machine_bicycle) +5. [vending_machine_bicycle](#vending_machine_bicycle) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [images](#images) @@ -216,6 +235,137 @@ Available languages: # Layers defined in this theme configuration file These layers can not be reused in different themes. +# bicycle_assisted_repair_workshop + +This layer is based on [assisted_repair](../Layers/assisted_repair.md) + +A self-assisted workshop is a location where people can come and repair their goods with help of volunteers and with the tools available at the given location. A repair café is a type of event organized regularly along the same principles. + + - This layer is shown at zoomlevel **11** and higher + +No themes use this layer + +## Basic tags for this layer + +Elements must match **all** of the following expressions: + +0. repair=assisted_self_service +1. bicycle:repair=yes | service:bicycle:repair=yes + +[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22repair%22%3D%22assisted_self_service%22%5D%5B%22bicycle%3Arepair%22%3D%22yes%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22repair%22%3D%22assisted_self_service%22%5D%5B%22service%3Abicycle%3Arepair%22%3D%22yes%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) + +## Supported attributes + +**Warning:**,this quick overview is incomplete, + +| attribute | type | values which are supported by this layer | +-----|-----|----- | +| [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | | +| [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | ["by appointment"](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D"by appointment") | +| [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | | +| [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | | +| [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | | +| [contact:mastodon](https://wiki.openstreetmap.org/wiki/Key:contact:mastodon) | [fediverse](../SpecialInputElements.md#fediverse) | | +| [contact:facebook](https://wiki.openstreetmap.org/wiki/Key:contact:facebook) | [url](../SpecialInputElements.md#url) | | + +### images +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images +_This tagrendering has no question and is thus read-only_ +*{image_carousel()}{image_upload()}* + +### preset_description + +_This tagrendering has no question and is thus read-only_ +*{preset_description()}* + +### name + +The question is `What is the name of this repair workshop?` +*This workshop is called {name}* is shown if `name` is set + +### opening_hours_by_appointment + +The question is `What are the opening hours of {title()}?` +*

Opening hours

{opening_hours_table(opening_hours)}* is shown if `opening_hours` is set + + - *Only by appointment* is shown if with opening_hours="by appointment" + - *Only by appointment* is shown if with opening_hours~^("by appointment"|by appointment)$. _This option cannot be chosen as answer_ + - *Marked as closed for an unspecified time* is shown if with opening_hours=closed. _This option cannot be chosen as answer_ + +### phone + +The question is `What is the phone number of {title()}?` +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set + + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + +This tagrendering has labels +`contact` + +### email + +The question is `What is the email address of {title()}?` +*{email}* is shown if `email` is set + + - *{contact:email}* is shown if with contact:email~.+. _This option cannot be chosen as answer_ + - *{operator:email}* is shown if with operator:email~.+. _This option cannot be chosen as answer_ + +This tagrendering has labels +`contact` + +### website + +The question is `What is the website of {title()}?` +*{website}* is shown if `website` is set + + - *{contact:website}* is shown if with contact:website~.+. _This option cannot be chosen as answer_ + +This tagrendering has labels +`contact` + +### mastodon +Shows and asks for the mastodon handle +The question is `What is the Mastodon-handle of {title()}?` +*{fediverse_link(contact:mastodon)}* is shown if `contact:mastodon` is set + +### facebook +Shows and asks for the facebook handle +The question is `What is the facebook page of of {title()}?` +*{link(Facebook page,&LBRACEcontact:facebook&RBRACE,,,,)}
Facebook is known to harm mental health, manipulate public opinion and cause hate. Try to use healthier alternatives
* is shown if `contact:facebook` is set + +### item:repair + +The question is `What type of items are repaired here?` + + - *Mobile phones are repaired here* is shown if with service:mobile_phone:repair=yes. Unselecting this answer will add service:mobile_phone:repair=no + - *Computers are repaired here* is shown if with service:computer:repair=yes. Unselecting this answer will add service:computer:repair=no + - *Bicycles are repaired here* is shown if with service:bicycle:repair=yes. Unselecting this answer will add service:bicycle:repair=no + - *Electronic devices are repaired here* is shown if with service:electronics:repair=yes. Unselecting this answer will add service:electronics:repair=no + - *Furniture is repaired here* is shown if with service:furniture:repair=yes. Unselecting this answer will add service:furniture:repair=no + - *Clothes are repaired here* is shown if with service:clothes:repair=yes. Unselecting this answer will add service:clothes:repair=no + +### leftover-questions + +_This tagrendering has no question and is thus read-only_ +*{questions( ,)}* + +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + +### delete-button + +_This tagrendering has no question and is thus read-only_ +*{delete_button()}* + +### lod + +_This tagrendering has no question and is thus read-only_ +*{linked_data_from_website()}* + +This tagrendering has labels +`added_by_default` # bicycle_rental_non_docking This layer is based on [bicycle_rental](../Layers/bicycle_rental.md) @@ -296,9 +446,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -1867,9 +2017,9 @@ The question is `Is this vending machine indoors?` ### phone The question is `What is the phone number of the operator of this vending machine?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Themes/facadegardens.md b/Docs/Themes/facadegardens.md index f13e889b2..4252e4916 100644 --- a/Docs/Themes/facadegardens.md +++ b/Docs/Themes/facadegardens.md @@ -32,6 +32,7 @@ Available languages: - [Facade gardens ( facadegardens )](#facade-gardens-(-facadegardens-)) 1. [Layers defined in this theme configuration file](#layers-defined-in-this-theme-configuration-file) 2. [facadegardens](#facadegardens) + - [Presets](#presets) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [images](#images) @@ -57,6 +58,12 @@ Facade gardens No themes use this layer +## Presets + +The following options to create new points are included: + +**a facade garden** which has the following tags:leisure=garden & garden:type=facade_garden (snaps to layers `walls_and_buildings`) + ## Basic tags for this layer Elements must match **all** of the following expressions: diff --git a/Docs/Themes/fritures.md b/Docs/Themes/fritures.md index 96034e85b..953e77760 100644 --- a/Docs/Themes/fritures.md +++ b/Docs/Themes/fritures.md @@ -110,7 +110,7 @@ Elements must match **all** of the following expressions: | [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | | | [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) | | [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) | -| [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) | +| [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) [mexican ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican ) [japanese ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese ) [chicken ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken ) [seafood ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood ) | | [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) | | | [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) | | [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) | @@ -187,9 +187,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -239,21 +239,25 @@ The question is `Is this place accessible with a wheelchair?` The question is `What kind of food is served here?` *This place mostly serves {cuisine}* is shown if `cuisine` is set - - *This is a pizzeria* is shown if with cuisine=pizza - - *This is a friture* is shown if with cuisine=friture - - *Mainly serves pasta* is shown if with cuisine=pasta - - *This is kebab shop* is shown if with cuisine=kebab - - *This is a sandwich shop* is shown if with cuisine=sandwich - - *Burgers are served here* is shown if with cuisine=burger - - *Sushi is served here* is shown if with cuisine=sushi - - *Coffee is served here* is shown if with cuisine=coffee - - *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with cuisine=italian - - *French dishes are served here* is shown if with cuisine=french - - *Chinese dishes are served here* is shown if with cuisine=chinese - - *Greek dishes are served here* is shown if with cuisine=greek - - *Indian dishes are served here* is shown if with cuisine=indian - - *Turkish dishes are served here* is shown if with cuisine=turkish - - *Thai dishes are served here* is shown if with cuisine=thai + - *This is a pizzeria* is shown if with cuisine=pizza + - *This is a friture* is shown if with cuisine=friture + - *Mainly serves pasta* is shown if with cuisine=pasta + - *This is kebab shop* is shown if with cuisine=kebab + - *This is a sandwich shop* is shown if with cuisine=sandwich + - *Burgers are served here* is shown if with cuisine=burger + - *Sushi is served here* is shown if with cuisine=sushi + - *Coffee is served here* is shown if with cuisine=coffee + - *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with cuisine=italian + - *French dishes are served here* is shown if with cuisine=french + - *Chinese dishes are served here* is shown if with cuisine=chinese + - *Greek dishes are served here* is shown if with cuisine=greek + - *Indian dishes are served here* is shown if with cuisine=indian + - *Turkish dishes are served here* is shown if with cuisine=turkish + - *Thai dishes are served here* is shown if with cuisine=thai + - *Mexican dishes are served here* is shown if with cuisine=mexican + - *Japanese dishes are served here* is shown if with cuisine=japanese + - *Chicken based dishes are served here* is shown if with cuisine=chicken + - *Seafood dishes are served here* is shown if with cuisine=seafood ### show-menu-image @@ -475,7 +479,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -560,6 +564,29 @@ This tagrendering has labels | dogs.1 | Dogs allowed | dog=unleashed | dog=yes | | dogs.2 | No dogs allowed | dog=no | +| id | question | osmTags | +-----|-----|----- | +| Cuisine.0 | *What kind of food is served here?* (default) | | +| Cuisine.1 | This is a pizzeria | cuisine=pizza | +| Cuisine.2 | This is a friture | cuisine=friture | +| Cuisine.3 | Mainly serves pasta | cuisine=pasta | +| Cuisine.4 | This is kebab shop | cuisine=kebab | +| Cuisine.5 | This is a sandwich shop | cuisine=sandwich | +| Cuisine.6 | Burgers are served here | cuisine=burger | +| Cuisine.7 | Sushi is served here | cuisine=sushi | +| Cuisine.8 | Coffee is served here | cuisine=coffee | +| Cuisine.9 | This is an Italian restaurant (which serves more than pasta and pizza) | cuisine=italian | +| Cuisine.10 | French dishes are served here | cuisine=french | +| Cuisine.11 | Chinese dishes are served here | cuisine=chinese | +| Cuisine.12 | Greek dishes are served here | cuisine=greek | +| Cuisine.13 | Indian dishes are served here | cuisine=indian | +| Cuisine.14 | Turkish dishes are served here | cuisine=turkish | +| Cuisine.15 | Thai dishes are served here | cuisine=thai | +| Cuisine.16 | Mexican dishes are served here | cuisine=mexican | +| Cuisine.17 | Japanese dishes are served here | cuisine=japanese | +| Cuisine.18 | Chicken based dishes are served here | cuisine=chicken | +| Cuisine.19 | Seafood dishes are served here | cuisine=seafood | + | id | question | osmTags | -----|-----|----- | | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired | diff --git a/Docs/Themes/ghostsigns.md b/Docs/Themes/ghostsigns.md index 10543a609..c1e0f3fe4 100644 --- a/Docs/Themes/ghostsigns.md +++ b/Docs/Themes/ghostsigns.md @@ -17,12 +17,14 @@ Available languages: - en - de + - es # Table of contents - [Ghost Signs ( ghostsigns )](#ghost-signs-(-ghostsigns-)) 1. [Layers defined in this theme configuration file](#layers-defined-in-this-theme-configuration-file) 2. [ghostsigns](#ghostsigns) + - [Presets](#presets) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [historic](#historic) @@ -88,6 +90,12 @@ Layer showing disused signs on buildings No themes use this layer +## Presets + +The following options to create new points are included: + +**a ghost sign** which has the following tags:historic=advertising & advertising=wall_painting (snaps to layers `walls_and_buildings`) + ## Basic tags for this layer Elements must match **all** of the following expressions: @@ -104,7 +112,7 @@ Elements must match **all** of the following expressions: | attribute | type | values which are supported by this layer | -----|-----|----- | | [historic](https://wiki.openstreetmap.org/wiki/Key:historic) | Multiple choice | [advertising](https://wiki.openstreetmap.org/wiki/Tag:historic%3Dadvertising) [](https://wiki.openstreetmap.org/wiki/Tag:historic%3D) | -| [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) | [string](../SpecialInputElements.md#string) | | +| [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) | [text](../SpecialInputElements.md#text) | | | [brand](https://wiki.openstreetmap.org/wiki/Key:brand) | [string](../SpecialInputElements.md#string) | | ### historic diff --git a/Docs/Themes/glutenfree.md b/Docs/Themes/glutenfree.md index be1dfb742..657da66f2 100644 --- a/Docs/Themes/glutenfree.md +++ b/Docs/Themes/glutenfree.md @@ -20,6 +20,7 @@ Available languages: - en - de - it + - es # Table of contents @@ -89,6 +90,7 @@ Available languages: + [payment-options](#payment-options) + [wheelchair-access](#wheelchair-access) + [leftover-questions](#leftover-questions) + + [move-button](#move-button) + [lod](#lod) 4. [shops_glutenfree](#shops_glutenfree) - [Basic tags for this layer](#basic-tags-for-this-layer) @@ -177,7 +179,7 @@ Elements must match **all** of the following expressions: | [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | | | [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) | | [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) | -| [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) | +| [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) [mexican ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican ) [japanese ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese ) [chicken ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken ) [seafood ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood ) | | [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) | | | [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) | | [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) | @@ -265,9 +267,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -317,21 +319,25 @@ The question is `Is this place accessible with a wheelchair?` The question is `What kind of food is served here?` *This place mostly serves {cuisine}* is shown if `cuisine` is set - - *This is a pizzeria* is shown if with cuisine=pizza - - *This is a friture* is shown if with cuisine=friture - - *Mainly serves pasta* is shown if with cuisine=pasta - - *This is kebab shop* is shown if with cuisine=kebab - - *This is a sandwich shop* is shown if with cuisine=sandwich - - *Burgers are served here* is shown if with cuisine=burger - - *Sushi is served here* is shown if with cuisine=sushi - - *Coffee is served here* is shown if with cuisine=coffee - - *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with cuisine=italian - - *French dishes are served here* is shown if with cuisine=french - - *Chinese dishes are served here* is shown if with cuisine=chinese - - *Greek dishes are served here* is shown if with cuisine=greek - - *Indian dishes are served here* is shown if with cuisine=indian - - *Turkish dishes are served here* is shown if with cuisine=turkish - - *Thai dishes are served here* is shown if with cuisine=thai + - *This is a pizzeria* is shown if with cuisine=pizza + - *This is a friture* is shown if with cuisine=friture + - *Mainly serves pasta* is shown if with cuisine=pasta + - *This is kebab shop* is shown if with cuisine=kebab + - *This is a sandwich shop* is shown if with cuisine=sandwich + - *Burgers are served here* is shown if with cuisine=burger + - *Sushi is served here* is shown if with cuisine=sushi + - *Coffee is served here* is shown if with cuisine=coffee + - *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with cuisine=italian + - *French dishes are served here* is shown if with cuisine=french + - *Chinese dishes are served here* is shown if with cuisine=chinese + - *Greek dishes are served here* is shown if with cuisine=greek + - *Indian dishes are served here* is shown if with cuisine=indian + - *Turkish dishes are served here* is shown if with cuisine=turkish + - *Thai dishes are served here* is shown if with cuisine=thai + - *Mexican dishes are served here* is shown if with cuisine=mexican + - *Japanese dishes are served here* is shown if with cuisine=japanese + - *Chicken based dishes are served here* is shown if with cuisine=chicken + - *Seafood dishes are served here* is shown if with cuisine=seafood ### show-menu-image @@ -541,7 +547,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -626,6 +632,29 @@ This tagrendering has labels | dogs.1 | Dogs allowed | dog=unleashed | dog=yes | | dogs.2 | No dogs allowed | dog=no | +| id | question | osmTags | +-----|-----|----- | +| Cuisine.0 | *What kind of food is served here?* (default) | | +| Cuisine.1 | This is a pizzeria | cuisine=pizza | +| Cuisine.2 | This is a friture | cuisine=friture | +| Cuisine.3 | Mainly serves pasta | cuisine=pasta | +| Cuisine.4 | This is kebab shop | cuisine=kebab | +| Cuisine.5 | This is a sandwich shop | cuisine=sandwich | +| Cuisine.6 | Burgers are served here | cuisine=burger | +| Cuisine.7 | Sushi is served here | cuisine=sushi | +| Cuisine.8 | Coffee is served here | cuisine=coffee | +| Cuisine.9 | This is an Italian restaurant (which serves more than pasta and pizza) | cuisine=italian | +| Cuisine.10 | French dishes are served here | cuisine=french | +| Cuisine.11 | Chinese dishes are served here | cuisine=chinese | +| Cuisine.12 | Greek dishes are served here | cuisine=greek | +| Cuisine.13 | Indian dishes are served here | cuisine=indian | +| Cuisine.14 | Turkish dishes are served here | cuisine=turkish | +| Cuisine.15 | Thai dishes are served here | cuisine=thai | +| Cuisine.16 | Mexican dishes are served here | cuisine=mexican | +| Cuisine.17 | Japanese dishes are served here | cuisine=japanese | +| Cuisine.18 | Chicken based dishes are served here | cuisine=chicken | +| Cuisine.19 | Seafood dishes are served here | cuisine=seafood | + | id | question | osmTags | -----|-----|----- | | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired | @@ -704,9 +733,9 @@ The question is `What are the opening hours of {title()}?` ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -790,6 +819,11 @@ The question is `Is this place accessible with a wheelchair?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ @@ -857,7 +891,7 @@ Elements must match **all** of the following expressions: | [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) | | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images @@ -1056,6 +1090,9 @@ The question is `What kind of shop is this?` - *Window Blind Store* is shown if with shop=window_blind - *Wine Shop* is shown if with shop=wine +This tagrendering has labels +`description` + ### brand The question is `What is the brand of this shop?` @@ -1104,9 +1141,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -1366,7 +1403,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -1440,14 +1477,6 @@ This tagrendering has labels -----|-----|----- | | open_now.0 | Open now | _isOpen=yes | -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-type.0 | Only show shops selling {search} | | search (string) | - -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-name.0 | Only show shops with name {search} | | search (string) | - | id | question | osmTags | -----|-----|----- | | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ | @@ -1456,6 +1485,174 @@ This tagrendering has labels -----|-----|----- | | has_organic.0 | Has organic options | organic=yes | organic=only | +| id | question | osmTags | +-----|-----|----- | +| shop_types.0 | *What kind of shop is this?* (default) | | +| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | +| shop_types.2 | Farm Supply Shop | shop=agrarian | +| shop_types.3 | Liquor Store | shop=alcohol | +| shop_types.4 | Anime / Manga Shop | shop=anime | +| shop_types.5 | Antique Shop | shop=antiques | +| shop_types.6 | Appliance Store | shop=appliance | +| shop_types.7 | Art Store | shop=art | +| shop_types.8 | Baby Goods Store | shop=baby_goods | +| shop_types.9 | Bag/Luggage Store | shop=bag | +| shop_types.10 | Bakery | shop=bakery | +| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing | +| shop_types.12 | Beauty Shop | shop=beauty | +| shop_types.13 | Bedding/Mattress Store | shop=bed | +| shop_types.14 | Beverage Store | shop=beverages | +| shop_types.15 | Bicycle Shop | shop=bicycle | +| shop_types.16 | Boat Store | shop=boat | +| shop_types.17 | Bookmaker | shop=bookmaker | +| shop_types.18 | Bookstore | shop=books | +| shop_types.19 | Brewing Supply Store | shop=brewing_supplies | +| shop_types.20 | Butcher | shop=butcher | +| shop_types.21 | Camera Equipment Store | shop=camera | +| shop_types.22 | Candle Shop | shop=candles | +| shop_types.23 | Cannabis Shop | shop=cannabis | +| shop_types.24 | Car Dealership | shop=car | +| shop_types.25 | Car Parts Store | shop=car_parts | +| shop_types.26 | Car Repair Shop | shop=car_repair | +| shop_types.27 | RV Dealership | shop=caravan | +| shop_types.28 | Carpet Store | shop=carpet | +| shop_types.29 | Catalog Shop | shop=catalogue | +| shop_types.30 | Charity Store | shop=charity | +| shop_types.31 | Cheese Store | shop=cheese | +| shop_types.32 | Drugstore | shop=chemist | +| shop_types.33 | Chocolate Store | shop=chocolate | +| shop_types.34 | Clothing Store | shop=clothes | +| shop_types.35 | Coffee Store | shop=coffee | +| shop_types.36 | Collectibles Shop | shop=collector | +| shop_types.37 | Computer Store | shop=computer | +| shop_types.38 | Candy Store | shop=confectionery | +| shop_types.39 | Convenience Store | shop=convenience | +| shop_types.40 | Copy Store | shop=copyshop | +| shop_types.41 | Cosmetics Store | shop=cosmetics | +| shop_types.42 | Rural Supplies Store | shop=country_store | +| shop_types.43 | Arts & Crafts Store | shop=craft | +| shop_types.44 | Curtain Store | shop=curtain | +| shop_types.45 | Dairy Store | shop=dairy | +| shop_types.46 | Delicatessen | shop=deli | +| shop_types.47 | Department Store | shop=department_store | +| shop_types.48 | DIY Store | shop=doityourself | +| shop_types.49 | Door Shop | shop=doors | +| shop_types.50 | Dry Cleaner | shop=dry_cleaning | +| shop_types.51 | E-Cigarette Shop | shop=e-cigarette | +| shop_types.52 | Electrical Equipment Store | shop=electrical | +| shop_types.53 | Electronics Store | shop=electronics | +| shop_types.54 | Erotic Store | shop=erotic | +| shop_types.55 | Fabric Store | shop=fabric | +| shop_types.56 | Produce Stand | shop=farm | +| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories | +| shop_types.58 | Fireplace Store | shop=fireplace | +| shop_types.59 | Fishing Shop | shop=fishing | +| shop_types.60 | Flooring Supply Shop | shop=flooring | +| shop_types.61 | Florist | shop=florist | +| shop_types.62 | Framing Shop | shop=frame | +| shop_types.63 | Frozen Food Store | shop=frozen_food | +| shop_types.64 | Fuel Shop | shop=fuel | +| shop_types.65 | Funeral Home | shop=funeral_directors | +| shop_types.66 | Furniture Store | shop=furniture | +| shop_types.67 | Tabletop Game Store | shop=games | +| shop_types.68 | Garden Center | shop=garden_centre | +| shop_types.69 | Bottled Gas Shop | shop=gas | +| shop_types.70 | General Store | shop=general | +| shop_types.71 | Gift Shop | shop=gift | +| shop_types.72 | Greengrocer | shop=greengrocer | +| shop_types.73 | Hairdresser | shop=hairdresser | +| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply | +| shop_types.75 | Hardware Store | shop=hardware | +| shop_types.76 | Health Food Store | shop=health_food | +| shop_types.77 | Hearing Aids Store | shop=hearing_aids | +| shop_types.78 | Herbalist | shop=herbalist | +| shop_types.79 | Hifi Store | shop=hifi | +| shop_types.80 | Honey Store | shop=honey | +| shop_types.81 | Household Linen Shop | shop=household_linen | +| shop_types.82 | Houseware Store | shop=houseware | +| shop_types.83 | Hunting Shop | shop=hunting | +| shop_types.84 | Interior Decoration Store | shop=interior_decoration | +| shop_types.85 | Jewelry Store | shop=jewelry | +| shop_types.86 | Kiosk | shop=kiosk | +| shop_types.87 | Kitchen Design Store | shop=kitchen | +| shop_types.88 | Laundry | shop=laundry | +| shop_types.89 | Leather Store | shop=leather | +| shop_types.90 | Lighting Store | shop=lighting | +| shop_types.91 | Locksmith | shop=locksmith | +| shop_types.92 | Lottery Shop | shop=lottery | +| shop_types.93 | Mall | shop=mall | +| shop_types.94 | Massage Shop | shop=massage | +| shop_types.95 | Medical Supply Store | shop=medical_supply | +| shop_types.96 | Military Surplus Store | shop=military_surplus | +| shop_types.97 | Mobile Phone Store | shop=mobile_phone | +| shop_types.98 | Model Shop | shop=model | +| shop_types.99 | Money Lender | shop=money_lender | +| shop_types.100 | Motorcycle Dealership | shop=motorcycle | +| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair | +| shop_types.102 | Music Store | shop=music | +| shop_types.103 | Musical Instrument Store | shop=musical_instrument | +| shop_types.104 | Newsstand | shop=newsagent | +| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements | +| shop_types.106 | Nuts Shop | shop=nuts | +| shop_types.107 | Optician | shop=optician | +| shop_types.108 | Outdoors Store | shop=outdoor | +| shop_types.109 | Online Retailer Outpost | shop=outpost | +| shop_types.110 | Paint Store | shop=paint | +| shop_types.111 | Party Supply Store | shop=party | +| shop_types.112 | Pasta Store | shop=pasta | +| shop_types.113 | Pastry Shop | shop=pastry | +| shop_types.114 | Pawnshop | shop=pawnbroker | +| shop_types.115 | Perfume Store | shop=perfumery | +| shop_types.116 | Pet Store | shop=pet | +| shop_types.117 | Pet Groomer | shop=pet_grooming | +| shop_types.118 | Photography Store | shop=photo | +| shop_types.119 | Pottery Store | shop=pottery | +| shop_types.120 | Printer Ink Store | shop=printer_ink | +| shop_types.121 | Psychic | shop=psychic | +| shop_types.122 | Fireworks Store | shop=pyrotechnics | +| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics | +| shop_types.124 | Religious Store | shop=religion | +| shop_types.125 | Rental Shop | shop=rental | +| shop_types.126 | Repair Shop | shop=repair | +| shop_types.127 | Rice Store | shop=rice | +| shop_types.128 | Scuba Diving Shop | shop=scuba_diving | +| shop_types.129 | Seafood Shop | shop=seafood | +| shop_types.130 | Thrift Store | shop=second_hand | +| shop_types.131 | Sewing Supply Shop | shop=sewing | +| shop_types.132 | Shoe Repair Shop | shop=shoe_repair | +| shop_types.133 | Shoe Store | shop=shoes | +| shop_types.134 | Spice Shop | shop=spices | +| shop_types.135 | Sporting Goods Store | shop=sports | +| shop_types.136 | Stationery Store | shop=stationery | +| shop_types.137 | Storage Rental | shop=storage_rental | +| shop_types.138 | Supermarket | shop=supermarket | +| shop_types.139 | Pool Supply Store | shop=swimming_pool | +| shop_types.140 | Tailor | shop=tailor | +| shop_types.141 | Tattoo Parlor | shop=tattoo | +| shop_types.142 | Tea Store | shop=tea | +| shop_types.143 | Telecom Retail Store | shop=telecommunication | +| shop_types.144 | Ticket Seller | shop=ticket | +| shop_types.145 | Tile Shop | shop=tiles | +| shop_types.146 | Tobacco Shop | shop=tobacco | +| shop_types.147 | Tool Rental | shop=tool_hire | +| shop_types.148 | Toy Store | shop=toys | +| shop_types.149 | Trade Shop | shop=trade | +| shop_types.150 | Travel Agency | shop=travel_agency | +| shop_types.151 | Trophy Shop | shop=trophy | +| shop_types.152 | Tire Store | shop=tyres | +| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner | +| shop_types.154 | Discount Store | shop=variety_store | +| shop_types.155 | Video Store | shop=video | +| shop_types.156 | Video Game Store | shop=video_games | +| shop_types.157 | Watches Shop | shop=watches | +| shop_types.158 | Drinking Water Shop | shop=water | +| shop_types.159 | Watersport/Swim Shop | shop=water_sports | +| shop_types.160 | Weapon Shop | shop=weapons | +| shop_types.161 | Wholesale Store | shop=wholesale | +| shop_types.162 | Wig Shop | shop=wigs | +| shop_types.163 | Window Blind Store | shop=window_blind | +| shop_types.164 | Wine Shop | shop=wine | + | id | question | osmTags | -----|-----|----- | | accepts_cash.0 | Accepts cash | payment:cash=yes | diff --git a/Docs/Themes/healthcare.md b/Docs/Themes/healthcare.md index 6a41f25c0..6bf99e1fb 100644 --- a/Docs/Themes/healthcare.md +++ b/Docs/Themes/healthcare.md @@ -39,6 +39,7 @@ Available languages: - [Healthcare ( healthcare )](#healthcare-(-healthcare-)) 1. [Layers defined in this theme configuration file](#layers-defined-in-this-theme-configuration-file) 2. [medical_shops](#medical_shops) + - [Presets](#presets) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [images](#images) @@ -100,6 +101,16 @@ A shop No themes use this layer +## Presets + +The following options to create new points are included: + +**a medical supply shop** which has the following tags:shop=medical_supply + +**a hearing aids shop** which has the following tags:shop=hearing_aids + +**an optician** which has the following tags:shop=optician + ## Basic tags for this layer Elements must match **all** of the following expressions: @@ -148,7 +159,7 @@ Elements must match **all** of the following expressions: | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images @@ -335,6 +346,9 @@ The question is `What kind of shop is this?` - *Window Blind Store* is shown if with shop=window_blind - *Wine Shop* is shown if with shop=wine +This tagrendering has labels +`description` + ### brand The question is `What is the brand of this shop?` @@ -383,9 +397,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -645,7 +659,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -740,6 +754,174 @@ This tagrendering has labels -----|-----|----- | | accepts_cards.0 | Accepts payment cards | payment:cards=yes | +| id | question | osmTags | +-----|-----|----- | +| shop_types.0 | *What kind of shop is this?* (default) | | +| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | +| shop_types.2 | Farm Supply Shop | shop=agrarian | +| shop_types.3 | Liquor Store | shop=alcohol | +| shop_types.4 | Anime / Manga Shop | shop=anime | +| shop_types.5 | Antique Shop | shop=antiques | +| shop_types.6 | Appliance Store | shop=appliance | +| shop_types.7 | Art Store | shop=art | +| shop_types.8 | Baby Goods Store | shop=baby_goods | +| shop_types.9 | Bag/Luggage Store | shop=bag | +| shop_types.10 | Bakery | shop=bakery | +| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing | +| shop_types.12 | Beauty Shop | shop=beauty | +| shop_types.13 | Bedding/Mattress Store | shop=bed | +| shop_types.14 | Beverage Store | shop=beverages | +| shop_types.15 | Bicycle Shop | shop=bicycle | +| shop_types.16 | Boat Store | shop=boat | +| shop_types.17 | Bookmaker | shop=bookmaker | +| shop_types.18 | Bookstore | shop=books | +| shop_types.19 | Brewing Supply Store | shop=brewing_supplies | +| shop_types.20 | Butcher | shop=butcher | +| shop_types.21 | Camera Equipment Store | shop=camera | +| shop_types.22 | Candle Shop | shop=candles | +| shop_types.23 | Cannabis Shop | shop=cannabis | +| shop_types.24 | Car Dealership | shop=car | +| shop_types.25 | Car Parts Store | shop=car_parts | +| shop_types.26 | Car Repair Shop | shop=car_repair | +| shop_types.27 | RV Dealership | shop=caravan | +| shop_types.28 | Carpet Store | shop=carpet | +| shop_types.29 | Catalog Shop | shop=catalogue | +| shop_types.30 | Charity Store | shop=charity | +| shop_types.31 | Cheese Store | shop=cheese | +| shop_types.32 | Drugstore | shop=chemist | +| shop_types.33 | Chocolate Store | shop=chocolate | +| shop_types.34 | Clothing Store | shop=clothes | +| shop_types.35 | Coffee Store | shop=coffee | +| shop_types.36 | Collectibles Shop | shop=collector | +| shop_types.37 | Computer Store | shop=computer | +| shop_types.38 | Candy Store | shop=confectionery | +| shop_types.39 | Convenience Store | shop=convenience | +| shop_types.40 | Copy Store | shop=copyshop | +| shop_types.41 | Cosmetics Store | shop=cosmetics | +| shop_types.42 | Rural Supplies Store | shop=country_store | +| shop_types.43 | Arts & Crafts Store | shop=craft | +| shop_types.44 | Curtain Store | shop=curtain | +| shop_types.45 | Dairy Store | shop=dairy | +| shop_types.46 | Delicatessen | shop=deli | +| shop_types.47 | Department Store | shop=department_store | +| shop_types.48 | DIY Store | shop=doityourself | +| shop_types.49 | Door Shop | shop=doors | +| shop_types.50 | Dry Cleaner | shop=dry_cleaning | +| shop_types.51 | E-Cigarette Shop | shop=e-cigarette | +| shop_types.52 | Electrical Equipment Store | shop=electrical | +| shop_types.53 | Electronics Store | shop=electronics | +| shop_types.54 | Erotic Store | shop=erotic | +| shop_types.55 | Fabric Store | shop=fabric | +| shop_types.56 | Produce Stand | shop=farm | +| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories | +| shop_types.58 | Fireplace Store | shop=fireplace | +| shop_types.59 | Fishing Shop | shop=fishing | +| shop_types.60 | Flooring Supply Shop | shop=flooring | +| shop_types.61 | Florist | shop=florist | +| shop_types.62 | Framing Shop | shop=frame | +| shop_types.63 | Frozen Food Store | shop=frozen_food | +| shop_types.64 | Fuel Shop | shop=fuel | +| shop_types.65 | Funeral Home | shop=funeral_directors | +| shop_types.66 | Furniture Store | shop=furniture | +| shop_types.67 | Tabletop Game Store | shop=games | +| shop_types.68 | Garden Center | shop=garden_centre | +| shop_types.69 | Bottled Gas Shop | shop=gas | +| shop_types.70 | General Store | shop=general | +| shop_types.71 | Gift Shop | shop=gift | +| shop_types.72 | Greengrocer | shop=greengrocer | +| shop_types.73 | Hairdresser | shop=hairdresser | +| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply | +| shop_types.75 | Hardware Store | shop=hardware | +| shop_types.76 | Health Food Store | shop=health_food | +| shop_types.77 | Hearing Aids Store | shop=hearing_aids | +| shop_types.78 | Herbalist | shop=herbalist | +| shop_types.79 | Hifi Store | shop=hifi | +| shop_types.80 | Honey Store | shop=honey | +| shop_types.81 | Household Linen Shop | shop=household_linen | +| shop_types.82 | Houseware Store | shop=houseware | +| shop_types.83 | Hunting Shop | shop=hunting | +| shop_types.84 | Interior Decoration Store | shop=interior_decoration | +| shop_types.85 | Jewelry Store | shop=jewelry | +| shop_types.86 | Kiosk | shop=kiosk | +| shop_types.87 | Kitchen Design Store | shop=kitchen | +| shop_types.88 | Laundry | shop=laundry | +| shop_types.89 | Leather Store | shop=leather | +| shop_types.90 | Lighting Store | shop=lighting | +| shop_types.91 | Locksmith | shop=locksmith | +| shop_types.92 | Lottery Shop | shop=lottery | +| shop_types.93 | Mall | shop=mall | +| shop_types.94 | Massage Shop | shop=massage | +| shop_types.95 | Medical Supply Store | shop=medical_supply | +| shop_types.96 | Military Surplus Store | shop=military_surplus | +| shop_types.97 | Mobile Phone Store | shop=mobile_phone | +| shop_types.98 | Model Shop | shop=model | +| shop_types.99 | Money Lender | shop=money_lender | +| shop_types.100 | Motorcycle Dealership | shop=motorcycle | +| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair | +| shop_types.102 | Music Store | shop=music | +| shop_types.103 | Musical Instrument Store | shop=musical_instrument | +| shop_types.104 | Newsstand | shop=newsagent | +| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements | +| shop_types.106 | Nuts Shop | shop=nuts | +| shop_types.107 | Optician | shop=optician | +| shop_types.108 | Outdoors Store | shop=outdoor | +| shop_types.109 | Online Retailer Outpost | shop=outpost | +| shop_types.110 | Paint Store | shop=paint | +| shop_types.111 | Party Supply Store | shop=party | +| shop_types.112 | Pasta Store | shop=pasta | +| shop_types.113 | Pastry Shop | shop=pastry | +| shop_types.114 | Pawnshop | shop=pawnbroker | +| shop_types.115 | Perfume Store | shop=perfumery | +| shop_types.116 | Pet Store | shop=pet | +| shop_types.117 | Pet Groomer | shop=pet_grooming | +| shop_types.118 | Photography Store | shop=photo | +| shop_types.119 | Pottery Store | shop=pottery | +| shop_types.120 | Printer Ink Store | shop=printer_ink | +| shop_types.121 | Psychic | shop=psychic | +| shop_types.122 | Fireworks Store | shop=pyrotechnics | +| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics | +| shop_types.124 | Religious Store | shop=religion | +| shop_types.125 | Rental Shop | shop=rental | +| shop_types.126 | Repair Shop | shop=repair | +| shop_types.127 | Rice Store | shop=rice | +| shop_types.128 | Scuba Diving Shop | shop=scuba_diving | +| shop_types.129 | Seafood Shop | shop=seafood | +| shop_types.130 | Thrift Store | shop=second_hand | +| shop_types.131 | Sewing Supply Shop | shop=sewing | +| shop_types.132 | Shoe Repair Shop | shop=shoe_repair | +| shop_types.133 | Shoe Store | shop=shoes | +| shop_types.134 | Spice Shop | shop=spices | +| shop_types.135 | Sporting Goods Store | shop=sports | +| shop_types.136 | Stationery Store | shop=stationery | +| shop_types.137 | Storage Rental | shop=storage_rental | +| shop_types.138 | Supermarket | shop=supermarket | +| shop_types.139 | Pool Supply Store | shop=swimming_pool | +| shop_types.140 | Tailor | shop=tailor | +| shop_types.141 | Tattoo Parlor | shop=tattoo | +| shop_types.142 | Tea Store | shop=tea | +| shop_types.143 | Telecom Retail Store | shop=telecommunication | +| shop_types.144 | Ticket Seller | shop=ticket | +| shop_types.145 | Tile Shop | shop=tiles | +| shop_types.146 | Tobacco Shop | shop=tobacco | +| shop_types.147 | Tool Rental | shop=tool_hire | +| shop_types.148 | Toy Store | shop=toys | +| shop_types.149 | Trade Shop | shop=trade | +| shop_types.150 | Travel Agency | shop=travel_agency | +| shop_types.151 | Trophy Shop | shop=trophy | +| shop_types.152 | Tire Store | shop=tyres | +| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner | +| shop_types.154 | Discount Store | shop=variety_store | +| shop_types.155 | Video Store | shop=video | +| shop_types.156 | Video Game Store | shop=video_games | +| shop_types.157 | Watches Shop | shop=watches | +| shop_types.158 | Drinking Water Shop | shop=water | +| shop_types.159 | Watersport/Swim Shop | shop=water_sports | +| shop_types.160 | Weapon Shop | shop=weapons | +| shop_types.161 | Wholesale Store | shop=wholesale | +| shop_types.162 | Wig Shop | shop=wigs | +| shop_types.163 | Window Blind Store | shop=window_blind | +| shop_types.164 | Wine Shop | shop=wine | + | id | question | osmTags | -----|-----|----- | | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired | diff --git a/Docs/Themes/items_with_image.md b/Docs/Themes/items_with_image.md index d966c806e..53e071424 100644 --- a/Docs/Themes/items_with_image.md +++ b/Docs/Themes/items_with_image.md @@ -14,6 +14,7 @@ Available languages: - en - de + - es # Layers defined in this theme configuration file These layers can not be reused in different themes. diff --git a/Docs/Themes/kerbs_and_crossings.md b/Docs/Themes/kerbs_and_crossings.md index 3acf1a964..78edd347a 100644 --- a/Docs/Themes/kerbs_and_crossings.md +++ b/Docs/Themes/kerbs_and_crossings.md @@ -31,6 +31,7 @@ Available languages: - [Kerbs and crossings ( kerbs_and_crossings )](#kerbs-and-crossings-(-kerbs_and_crossings-)) 1. [Layers defined in this theme configuration file](#layers-defined-in-this-theme-configuration-file) 2. [crossings_no_traffic_lights](#crossings_no_traffic_lights) + - [Presets](#presets) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [images](#images) @@ -47,6 +48,7 @@ Available languages: + [crossing-right-turn-through-red](#crossing-right-turn-through-red) + [crossing-continue-through-red](#crossing-continue-through-red) + [leftover-questions](#leftover-questions) + + [move-button](#move-button) + [lod](#lod) - [Filters](#filters) @@ -62,6 +64,12 @@ Crossings for pedestrians and cyclists No themes use this layer +## Presets + +The following options to create new points are included: + +**a crossing** which has the following tags:highway=crossing (snaps to layers `cycleways_and_roads`) + ## Basic tags for this layer Elements must match the expression **highway=crossing** @@ -212,6 +220,11 @@ This tagrendering is only visible in the popup if the following condition is met _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Themes/lactosefree.md b/Docs/Themes/lactosefree.md index 7f3e88e50..b79b1fb53 100644 --- a/Docs/Themes/lactosefree.md +++ b/Docs/Themes/lactosefree.md @@ -18,6 +18,8 @@ This theme contains the following layers: Available languages: - en + - de + - es # Table of contents @@ -87,6 +89,7 @@ Available languages: + [payment-options](#payment-options) + [wheelchair-access](#wheelchair-access) + [leftover-questions](#leftover-questions) + + [move-button](#move-button) + [lod](#lod) 4. [shops_lactosefree](#shops_lactosefree) - [Basic tags for this layer](#basic-tags-for-this-layer) @@ -175,7 +178,7 @@ Elements must match **all** of the following expressions: | [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | | | [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) | | [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) | -| [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) | +| [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) [mexican ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican ) [japanese ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese ) [chicken ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken ) [seafood ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood ) | | [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) | | | [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) | | [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) | @@ -263,9 +266,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -315,21 +318,25 @@ The question is `Is this place accessible with a wheelchair?` The question is `What kind of food is served here?` *This place mostly serves {cuisine}* is shown if `cuisine` is set - - *This is a pizzeria* is shown if with cuisine=pizza - - *This is a friture* is shown if with cuisine=friture - - *Mainly serves pasta* is shown if with cuisine=pasta - - *This is kebab shop* is shown if with cuisine=kebab - - *This is a sandwich shop* is shown if with cuisine=sandwich - - *Burgers are served here* is shown if with cuisine=burger - - *Sushi is served here* is shown if with cuisine=sushi - - *Coffee is served here* is shown if with cuisine=coffee - - *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with cuisine=italian - - *French dishes are served here* is shown if with cuisine=french - - *Chinese dishes are served here* is shown if with cuisine=chinese - - *Greek dishes are served here* is shown if with cuisine=greek - - *Indian dishes are served here* is shown if with cuisine=indian - - *Turkish dishes are served here* is shown if with cuisine=turkish - - *Thai dishes are served here* is shown if with cuisine=thai + - *This is a pizzeria* is shown if with cuisine=pizza + - *This is a friture* is shown if with cuisine=friture + - *Mainly serves pasta* is shown if with cuisine=pasta + - *This is kebab shop* is shown if with cuisine=kebab + - *This is a sandwich shop* is shown if with cuisine=sandwich + - *Burgers are served here* is shown if with cuisine=burger + - *Sushi is served here* is shown if with cuisine=sushi + - *Coffee is served here* is shown if with cuisine=coffee + - *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with cuisine=italian + - *French dishes are served here* is shown if with cuisine=french + - *Chinese dishes are served here* is shown if with cuisine=chinese + - *Greek dishes are served here* is shown if with cuisine=greek + - *Indian dishes are served here* is shown if with cuisine=indian + - *Turkish dishes are served here* is shown if with cuisine=turkish + - *Thai dishes are served here* is shown if with cuisine=thai + - *Mexican dishes are served here* is shown if with cuisine=mexican + - *Japanese dishes are served here* is shown if with cuisine=japanese + - *Chicken based dishes are served here* is shown if with cuisine=chicken + - *Seafood dishes are served here* is shown if with cuisine=seafood ### show-menu-image @@ -539,7 +546,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -624,6 +631,29 @@ This tagrendering has labels | dogs.1 | Dogs allowed | dog=unleashed | dog=yes | | dogs.2 | No dogs allowed | dog=no | +| id | question | osmTags | +-----|-----|----- | +| Cuisine.0 | *What kind of food is served here?* (default) | | +| Cuisine.1 | This is a pizzeria | cuisine=pizza | +| Cuisine.2 | This is a friture | cuisine=friture | +| Cuisine.3 | Mainly serves pasta | cuisine=pasta | +| Cuisine.4 | This is kebab shop | cuisine=kebab | +| Cuisine.5 | This is a sandwich shop | cuisine=sandwich | +| Cuisine.6 | Burgers are served here | cuisine=burger | +| Cuisine.7 | Sushi is served here | cuisine=sushi | +| Cuisine.8 | Coffee is served here | cuisine=coffee | +| Cuisine.9 | This is an Italian restaurant (which serves more than pasta and pizza) | cuisine=italian | +| Cuisine.10 | French dishes are served here | cuisine=french | +| Cuisine.11 | Chinese dishes are served here | cuisine=chinese | +| Cuisine.12 | Greek dishes are served here | cuisine=greek | +| Cuisine.13 | Indian dishes are served here | cuisine=indian | +| Cuisine.14 | Turkish dishes are served here | cuisine=turkish | +| Cuisine.15 | Thai dishes are served here | cuisine=thai | +| Cuisine.16 | Mexican dishes are served here | cuisine=mexican | +| Cuisine.17 | Japanese dishes are served here | cuisine=japanese | +| Cuisine.18 | Chicken based dishes are served here | cuisine=chicken | +| Cuisine.19 | Seafood dishes are served here | cuisine=seafood | + | id | question | osmTags | -----|-----|----- | | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired | @@ -702,9 +732,9 @@ The question is `What are the opening hours of {title()}?` ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -788,6 +818,11 @@ The question is `Is this place accessible with a wheelchair?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ @@ -855,7 +890,7 @@ Elements must match **all** of the following expressions: | [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) | | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images @@ -1054,6 +1089,9 @@ The question is `What kind of shop is this?` - *Window Blind Store* is shown if with shop=window_blind - *Wine Shop* is shown if with shop=wine +This tagrendering has labels +`description` + ### brand The question is `What is the brand of this shop?` @@ -1102,9 +1140,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -1364,7 +1402,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -1438,14 +1476,6 @@ This tagrendering has labels -----|-----|----- | | open_now.0 | Open now | _isOpen=yes | -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-type.0 | Only show shops selling {search} | | search (string) | - -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-name.0 | Only show shops with name {search} | | search (string) | - | id | question | osmTags | -----|-----|----- | | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ | @@ -1454,6 +1484,174 @@ This tagrendering has labels -----|-----|----- | | has_organic.0 | Has organic options | organic=yes | organic=only | +| id | question | osmTags | +-----|-----|----- | +| shop_types.0 | *What kind of shop is this?* (default) | | +| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | +| shop_types.2 | Farm Supply Shop | shop=agrarian | +| shop_types.3 | Liquor Store | shop=alcohol | +| shop_types.4 | Anime / Manga Shop | shop=anime | +| shop_types.5 | Antique Shop | shop=antiques | +| shop_types.6 | Appliance Store | shop=appliance | +| shop_types.7 | Art Store | shop=art | +| shop_types.8 | Baby Goods Store | shop=baby_goods | +| shop_types.9 | Bag/Luggage Store | shop=bag | +| shop_types.10 | Bakery | shop=bakery | +| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing | +| shop_types.12 | Beauty Shop | shop=beauty | +| shop_types.13 | Bedding/Mattress Store | shop=bed | +| shop_types.14 | Beverage Store | shop=beverages | +| shop_types.15 | Bicycle Shop | shop=bicycle | +| shop_types.16 | Boat Store | shop=boat | +| shop_types.17 | Bookmaker | shop=bookmaker | +| shop_types.18 | Bookstore | shop=books | +| shop_types.19 | Brewing Supply Store | shop=brewing_supplies | +| shop_types.20 | Butcher | shop=butcher | +| shop_types.21 | Camera Equipment Store | shop=camera | +| shop_types.22 | Candle Shop | shop=candles | +| shop_types.23 | Cannabis Shop | shop=cannabis | +| shop_types.24 | Car Dealership | shop=car | +| shop_types.25 | Car Parts Store | shop=car_parts | +| shop_types.26 | Car Repair Shop | shop=car_repair | +| shop_types.27 | RV Dealership | shop=caravan | +| shop_types.28 | Carpet Store | shop=carpet | +| shop_types.29 | Catalog Shop | shop=catalogue | +| shop_types.30 | Charity Store | shop=charity | +| shop_types.31 | Cheese Store | shop=cheese | +| shop_types.32 | Drugstore | shop=chemist | +| shop_types.33 | Chocolate Store | shop=chocolate | +| shop_types.34 | Clothing Store | shop=clothes | +| shop_types.35 | Coffee Store | shop=coffee | +| shop_types.36 | Collectibles Shop | shop=collector | +| shop_types.37 | Computer Store | shop=computer | +| shop_types.38 | Candy Store | shop=confectionery | +| shop_types.39 | Convenience Store | shop=convenience | +| shop_types.40 | Copy Store | shop=copyshop | +| shop_types.41 | Cosmetics Store | shop=cosmetics | +| shop_types.42 | Rural Supplies Store | shop=country_store | +| shop_types.43 | Arts & Crafts Store | shop=craft | +| shop_types.44 | Curtain Store | shop=curtain | +| shop_types.45 | Dairy Store | shop=dairy | +| shop_types.46 | Delicatessen | shop=deli | +| shop_types.47 | Department Store | shop=department_store | +| shop_types.48 | DIY Store | shop=doityourself | +| shop_types.49 | Door Shop | shop=doors | +| shop_types.50 | Dry Cleaner | shop=dry_cleaning | +| shop_types.51 | E-Cigarette Shop | shop=e-cigarette | +| shop_types.52 | Electrical Equipment Store | shop=electrical | +| shop_types.53 | Electronics Store | shop=electronics | +| shop_types.54 | Erotic Store | shop=erotic | +| shop_types.55 | Fabric Store | shop=fabric | +| shop_types.56 | Produce Stand | shop=farm | +| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories | +| shop_types.58 | Fireplace Store | shop=fireplace | +| shop_types.59 | Fishing Shop | shop=fishing | +| shop_types.60 | Flooring Supply Shop | shop=flooring | +| shop_types.61 | Florist | shop=florist | +| shop_types.62 | Framing Shop | shop=frame | +| shop_types.63 | Frozen Food Store | shop=frozen_food | +| shop_types.64 | Fuel Shop | shop=fuel | +| shop_types.65 | Funeral Home | shop=funeral_directors | +| shop_types.66 | Furniture Store | shop=furniture | +| shop_types.67 | Tabletop Game Store | shop=games | +| shop_types.68 | Garden Center | shop=garden_centre | +| shop_types.69 | Bottled Gas Shop | shop=gas | +| shop_types.70 | General Store | shop=general | +| shop_types.71 | Gift Shop | shop=gift | +| shop_types.72 | Greengrocer | shop=greengrocer | +| shop_types.73 | Hairdresser | shop=hairdresser | +| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply | +| shop_types.75 | Hardware Store | shop=hardware | +| shop_types.76 | Health Food Store | shop=health_food | +| shop_types.77 | Hearing Aids Store | shop=hearing_aids | +| shop_types.78 | Herbalist | shop=herbalist | +| shop_types.79 | Hifi Store | shop=hifi | +| shop_types.80 | Honey Store | shop=honey | +| shop_types.81 | Household Linen Shop | shop=household_linen | +| shop_types.82 | Houseware Store | shop=houseware | +| shop_types.83 | Hunting Shop | shop=hunting | +| shop_types.84 | Interior Decoration Store | shop=interior_decoration | +| shop_types.85 | Jewelry Store | shop=jewelry | +| shop_types.86 | Kiosk | shop=kiosk | +| shop_types.87 | Kitchen Design Store | shop=kitchen | +| shop_types.88 | Laundry | shop=laundry | +| shop_types.89 | Leather Store | shop=leather | +| shop_types.90 | Lighting Store | shop=lighting | +| shop_types.91 | Locksmith | shop=locksmith | +| shop_types.92 | Lottery Shop | shop=lottery | +| shop_types.93 | Mall | shop=mall | +| shop_types.94 | Massage Shop | shop=massage | +| shop_types.95 | Medical Supply Store | shop=medical_supply | +| shop_types.96 | Military Surplus Store | shop=military_surplus | +| shop_types.97 | Mobile Phone Store | shop=mobile_phone | +| shop_types.98 | Model Shop | shop=model | +| shop_types.99 | Money Lender | shop=money_lender | +| shop_types.100 | Motorcycle Dealership | shop=motorcycle | +| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair | +| shop_types.102 | Music Store | shop=music | +| shop_types.103 | Musical Instrument Store | shop=musical_instrument | +| shop_types.104 | Newsstand | shop=newsagent | +| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements | +| shop_types.106 | Nuts Shop | shop=nuts | +| shop_types.107 | Optician | shop=optician | +| shop_types.108 | Outdoors Store | shop=outdoor | +| shop_types.109 | Online Retailer Outpost | shop=outpost | +| shop_types.110 | Paint Store | shop=paint | +| shop_types.111 | Party Supply Store | shop=party | +| shop_types.112 | Pasta Store | shop=pasta | +| shop_types.113 | Pastry Shop | shop=pastry | +| shop_types.114 | Pawnshop | shop=pawnbroker | +| shop_types.115 | Perfume Store | shop=perfumery | +| shop_types.116 | Pet Store | shop=pet | +| shop_types.117 | Pet Groomer | shop=pet_grooming | +| shop_types.118 | Photography Store | shop=photo | +| shop_types.119 | Pottery Store | shop=pottery | +| shop_types.120 | Printer Ink Store | shop=printer_ink | +| shop_types.121 | Psychic | shop=psychic | +| shop_types.122 | Fireworks Store | shop=pyrotechnics | +| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics | +| shop_types.124 | Religious Store | shop=religion | +| shop_types.125 | Rental Shop | shop=rental | +| shop_types.126 | Repair Shop | shop=repair | +| shop_types.127 | Rice Store | shop=rice | +| shop_types.128 | Scuba Diving Shop | shop=scuba_diving | +| shop_types.129 | Seafood Shop | shop=seafood | +| shop_types.130 | Thrift Store | shop=second_hand | +| shop_types.131 | Sewing Supply Shop | shop=sewing | +| shop_types.132 | Shoe Repair Shop | shop=shoe_repair | +| shop_types.133 | Shoe Store | shop=shoes | +| shop_types.134 | Spice Shop | shop=spices | +| shop_types.135 | Sporting Goods Store | shop=sports | +| shop_types.136 | Stationery Store | shop=stationery | +| shop_types.137 | Storage Rental | shop=storage_rental | +| shop_types.138 | Supermarket | shop=supermarket | +| shop_types.139 | Pool Supply Store | shop=swimming_pool | +| shop_types.140 | Tailor | shop=tailor | +| shop_types.141 | Tattoo Parlor | shop=tattoo | +| shop_types.142 | Tea Store | shop=tea | +| shop_types.143 | Telecom Retail Store | shop=telecommunication | +| shop_types.144 | Ticket Seller | shop=ticket | +| shop_types.145 | Tile Shop | shop=tiles | +| shop_types.146 | Tobacco Shop | shop=tobacco | +| shop_types.147 | Tool Rental | shop=tool_hire | +| shop_types.148 | Toy Store | shop=toys | +| shop_types.149 | Trade Shop | shop=trade | +| shop_types.150 | Travel Agency | shop=travel_agency | +| shop_types.151 | Trophy Shop | shop=trophy | +| shop_types.152 | Tire Store | shop=tyres | +| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner | +| shop_types.154 | Discount Store | shop=variety_store | +| shop_types.155 | Video Store | shop=video | +| shop_types.156 | Video Game Store | shop=video_games | +| shop_types.157 | Watches Shop | shop=watches | +| shop_types.158 | Drinking Water Shop | shop=water | +| shop_types.159 | Watersport/Swim Shop | shop=water_sports | +| shop_types.160 | Weapon Shop | shop=weapons | +| shop_types.161 | Wholesale Store | shop=wholesale | +| shop_types.162 | Wig Shop | shop=wigs | +| shop_types.163 | Window Blind Store | shop=window_blind | +| shop_types.164 | Wine Shop | shop=wine | + | id | question | osmTags | -----|-----|----- | | accepts_cash.0 | Accepts cash | payment:cash=yes | diff --git a/Docs/Themes/mapcomplete-changes.md b/Docs/Themes/mapcomplete-changes.md index 14414047c..ab0bae224 100644 --- a/Docs/Themes/mapcomplete-changes.md +++ b/Docs/Themes/mapcomplete-changes.md @@ -14,6 +14,7 @@ This theme contains the following layers: Available languages: - en + - de # Table of contents diff --git a/Docs/Themes/onwheels.md b/Docs/Themes/onwheels.md index f182847d2..2185f6c7d 100644 --- a/Docs/Themes/onwheels.md +++ b/Docs/Themes/onwheels.md @@ -54,6 +54,7 @@ Available languages: + [images](#images) + [_stolen_entrances](#_stolen_entrances) + [leftover-questions](#leftover-questions) + + [move-button](#move-button) + [lod](#lod) # Layers defined in this theme configuration file @@ -91,6 +92,11 @@ _This tagrendering has no question and is thus read-only_ _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Themes/openlovemap.md b/Docs/Themes/openlovemap.md index d064b0634..c0ca39aec 100644 --- a/Docs/Themes/openlovemap.md +++ b/Docs/Themes/openlovemap.md @@ -30,6 +30,7 @@ Available languages: - [Open Love Map ( openlovemap )](#open-love-map-(-openlovemap-)) 1. [Layers defined in this theme configuration file](#layers-defined-in-this-theme-configuration-file) 2. [erotic_shop](#erotic_shop) + - [Presets](#presets) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [images](#images) @@ -81,6 +82,7 @@ Available languages: + [lod](#lod) - [Filters](#filters) 3. [condom_vending_machine](#condom_vending_machine) + - [Presets](#presets) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [images](#images) @@ -108,6 +110,7 @@ Available languages: + [lod](#lod) - [Filters](#filters) 4. [erotic_cinema](#erotic_cinema) + - [Presets](#presets) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [images](#images) @@ -120,6 +123,7 @@ Available languages: + [Opening hours](#opening-hours) + [has_video_booth](#has_video_booth) + [leftover-questions](#leftover-questions) + + [move-button](#move-button) + [lod](#lod) - [Filters](#filters) @@ -135,6 +139,12 @@ A shop No themes use this layer +## Presets + +The following options to create new points are included: + +**an erotic shop** which has the following tags:shop=erotic + ## Basic tags for this layer Elements must match the expression **shop=erotic** @@ -180,7 +190,7 @@ Elements must match the expression ** [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | | [service:private_video_booth](https://wiki.openstreetmap.org/wiki/Key:service:private_video_booth) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:private_video_booth%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:private_video_booth%3Dno) | ### images @@ -368,6 +378,9 @@ The question is `What kind of shop is this?` - *Window Blind Store* is shown if with shop=window_blind - *Wine Shop* is shown if with shop=wine +This tagrendering has labels +`description` + ### brand The question is `What is the brand of this shop?` @@ -416,9 +429,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -678,7 +691,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -799,6 +812,174 @@ This tagrendering has labels -----|-----|----- | | accepts_cards.0 | Accepts payment cards | payment:cards=yes | +| id | question | osmTags | +-----|-----|----- | +| shop_types.0 | *What kind of shop is this?* (default) | | +| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | +| shop_types.2 | Farm Supply Shop | shop=agrarian | +| shop_types.3 | Liquor Store | shop=alcohol | +| shop_types.4 | Anime / Manga Shop | shop=anime | +| shop_types.5 | Antique Shop | shop=antiques | +| shop_types.6 | Appliance Store | shop=appliance | +| shop_types.7 | Art Store | shop=art | +| shop_types.8 | Baby Goods Store | shop=baby_goods | +| shop_types.9 | Bag/Luggage Store | shop=bag | +| shop_types.10 | Bakery | shop=bakery | +| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing | +| shop_types.12 | Beauty Shop | shop=beauty | +| shop_types.13 | Bedding/Mattress Store | shop=bed | +| shop_types.14 | Beverage Store | shop=beverages | +| shop_types.15 | Bicycle Shop | shop=bicycle | +| shop_types.16 | Boat Store | shop=boat | +| shop_types.17 | Bookmaker | shop=bookmaker | +| shop_types.18 | Bookstore | shop=books | +| shop_types.19 | Brewing Supply Store | shop=brewing_supplies | +| shop_types.20 | Butcher | shop=butcher | +| shop_types.21 | Camera Equipment Store | shop=camera | +| shop_types.22 | Candle Shop | shop=candles | +| shop_types.23 | Cannabis Shop | shop=cannabis | +| shop_types.24 | Car Dealership | shop=car | +| shop_types.25 | Car Parts Store | shop=car_parts | +| shop_types.26 | Car Repair Shop | shop=car_repair | +| shop_types.27 | RV Dealership | shop=caravan | +| shop_types.28 | Carpet Store | shop=carpet | +| shop_types.29 | Catalog Shop | shop=catalogue | +| shop_types.30 | Charity Store | shop=charity | +| shop_types.31 | Cheese Store | shop=cheese | +| shop_types.32 | Drugstore | shop=chemist | +| shop_types.33 | Chocolate Store | shop=chocolate | +| shop_types.34 | Clothing Store | shop=clothes | +| shop_types.35 | Coffee Store | shop=coffee | +| shop_types.36 | Collectibles Shop | shop=collector | +| shop_types.37 | Computer Store | shop=computer | +| shop_types.38 | Candy Store | shop=confectionery | +| shop_types.39 | Convenience Store | shop=convenience | +| shop_types.40 | Copy Store | shop=copyshop | +| shop_types.41 | Cosmetics Store | shop=cosmetics | +| shop_types.42 | Rural Supplies Store | shop=country_store | +| shop_types.43 | Arts & Crafts Store | shop=craft | +| shop_types.44 | Curtain Store | shop=curtain | +| shop_types.45 | Dairy Store | shop=dairy | +| shop_types.46 | Delicatessen | shop=deli | +| shop_types.47 | Department Store | shop=department_store | +| shop_types.48 | DIY Store | shop=doityourself | +| shop_types.49 | Door Shop | shop=doors | +| shop_types.50 | Dry Cleaner | shop=dry_cleaning | +| shop_types.51 | E-Cigarette Shop | shop=e-cigarette | +| shop_types.52 | Electrical Equipment Store | shop=electrical | +| shop_types.53 | Electronics Store | shop=electronics | +| shop_types.54 | Erotic Store | shop=erotic | +| shop_types.55 | Fabric Store | shop=fabric | +| shop_types.56 | Produce Stand | shop=farm | +| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories | +| shop_types.58 | Fireplace Store | shop=fireplace | +| shop_types.59 | Fishing Shop | shop=fishing | +| shop_types.60 | Flooring Supply Shop | shop=flooring | +| shop_types.61 | Florist | shop=florist | +| shop_types.62 | Framing Shop | shop=frame | +| shop_types.63 | Frozen Food Store | shop=frozen_food | +| shop_types.64 | Fuel Shop | shop=fuel | +| shop_types.65 | Funeral Home | shop=funeral_directors | +| shop_types.66 | Furniture Store | shop=furniture | +| shop_types.67 | Tabletop Game Store | shop=games | +| shop_types.68 | Garden Center | shop=garden_centre | +| shop_types.69 | Bottled Gas Shop | shop=gas | +| shop_types.70 | General Store | shop=general | +| shop_types.71 | Gift Shop | shop=gift | +| shop_types.72 | Greengrocer | shop=greengrocer | +| shop_types.73 | Hairdresser | shop=hairdresser | +| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply | +| shop_types.75 | Hardware Store | shop=hardware | +| shop_types.76 | Health Food Store | shop=health_food | +| shop_types.77 | Hearing Aids Store | shop=hearing_aids | +| shop_types.78 | Herbalist | shop=herbalist | +| shop_types.79 | Hifi Store | shop=hifi | +| shop_types.80 | Honey Store | shop=honey | +| shop_types.81 | Household Linen Shop | shop=household_linen | +| shop_types.82 | Houseware Store | shop=houseware | +| shop_types.83 | Hunting Shop | shop=hunting | +| shop_types.84 | Interior Decoration Store | shop=interior_decoration | +| shop_types.85 | Jewelry Store | shop=jewelry | +| shop_types.86 | Kiosk | shop=kiosk | +| shop_types.87 | Kitchen Design Store | shop=kitchen | +| shop_types.88 | Laundry | shop=laundry | +| shop_types.89 | Leather Store | shop=leather | +| shop_types.90 | Lighting Store | shop=lighting | +| shop_types.91 | Locksmith | shop=locksmith | +| shop_types.92 | Lottery Shop | shop=lottery | +| shop_types.93 | Mall | shop=mall | +| shop_types.94 | Massage Shop | shop=massage | +| shop_types.95 | Medical Supply Store | shop=medical_supply | +| shop_types.96 | Military Surplus Store | shop=military_surplus | +| shop_types.97 | Mobile Phone Store | shop=mobile_phone | +| shop_types.98 | Model Shop | shop=model | +| shop_types.99 | Money Lender | shop=money_lender | +| shop_types.100 | Motorcycle Dealership | shop=motorcycle | +| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair | +| shop_types.102 | Music Store | shop=music | +| shop_types.103 | Musical Instrument Store | shop=musical_instrument | +| shop_types.104 | Newsstand | shop=newsagent | +| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements | +| shop_types.106 | Nuts Shop | shop=nuts | +| shop_types.107 | Optician | shop=optician | +| shop_types.108 | Outdoors Store | shop=outdoor | +| shop_types.109 | Online Retailer Outpost | shop=outpost | +| shop_types.110 | Paint Store | shop=paint | +| shop_types.111 | Party Supply Store | shop=party | +| shop_types.112 | Pasta Store | shop=pasta | +| shop_types.113 | Pastry Shop | shop=pastry | +| shop_types.114 | Pawnshop | shop=pawnbroker | +| shop_types.115 | Perfume Store | shop=perfumery | +| shop_types.116 | Pet Store | shop=pet | +| shop_types.117 | Pet Groomer | shop=pet_grooming | +| shop_types.118 | Photography Store | shop=photo | +| shop_types.119 | Pottery Store | shop=pottery | +| shop_types.120 | Printer Ink Store | shop=printer_ink | +| shop_types.121 | Psychic | shop=psychic | +| shop_types.122 | Fireworks Store | shop=pyrotechnics | +| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics | +| shop_types.124 | Religious Store | shop=religion | +| shop_types.125 | Rental Shop | shop=rental | +| shop_types.126 | Repair Shop | shop=repair | +| shop_types.127 | Rice Store | shop=rice | +| shop_types.128 | Scuba Diving Shop | shop=scuba_diving | +| shop_types.129 | Seafood Shop | shop=seafood | +| shop_types.130 | Thrift Store | shop=second_hand | +| shop_types.131 | Sewing Supply Shop | shop=sewing | +| shop_types.132 | Shoe Repair Shop | shop=shoe_repair | +| shop_types.133 | Shoe Store | shop=shoes | +| shop_types.134 | Spice Shop | shop=spices | +| shop_types.135 | Sporting Goods Store | shop=sports | +| shop_types.136 | Stationery Store | shop=stationery | +| shop_types.137 | Storage Rental | shop=storage_rental | +| shop_types.138 | Supermarket | shop=supermarket | +| shop_types.139 | Pool Supply Store | shop=swimming_pool | +| shop_types.140 | Tailor | shop=tailor | +| shop_types.141 | Tattoo Parlor | shop=tattoo | +| shop_types.142 | Tea Store | shop=tea | +| shop_types.143 | Telecom Retail Store | shop=telecommunication | +| shop_types.144 | Ticket Seller | shop=ticket | +| shop_types.145 | Tile Shop | shop=tiles | +| shop_types.146 | Tobacco Shop | shop=tobacco | +| shop_types.147 | Tool Rental | shop=tool_hire | +| shop_types.148 | Toy Store | shop=toys | +| shop_types.149 | Trade Shop | shop=trade | +| shop_types.150 | Travel Agency | shop=travel_agency | +| shop_types.151 | Trophy Shop | shop=trophy | +| shop_types.152 | Tire Store | shop=tyres | +| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner | +| shop_types.154 | Discount Store | shop=variety_store | +| shop_types.155 | Video Store | shop=video | +| shop_types.156 | Video Game Store | shop=video_games | +| shop_types.157 | Watches Shop | shop=watches | +| shop_types.158 | Drinking Water Shop | shop=water | +| shop_types.159 | Watersport/Swim Shop | shop=water_sports | +| shop_types.160 | Weapon Shop | shop=weapons | +| shop_types.161 | Wholesale Store | shop=wholesale | +| shop_types.162 | Wig Shop | shop=wigs | +| shop_types.163 | Window Blind Store | shop=window_blind | +| shop_types.164 | Wine Shop | shop=wine | + | id | question | osmTags | -----|-----|----- | | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired | @@ -825,6 +1006,12 @@ Layer showing vending machines No themes use this layer +## Presets + +The following options to create new points are included: + +**a condom vending machine** which has the following tags:amenity=vending_machine & vending=condoms + ## Basic tags for this layer Elements must match **all** of the following expressions: @@ -1005,9 +1192,9 @@ The question is `Is this vending machine indoors?` ### phone The question is `What is the phone number of the operator of this vending machine?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -1106,6 +1293,12 @@ This layer is based on [cinema](../Layers/cinema.md) No themes use this layer +## Presets + +The following options to create new points are included: + +**an erotic cinema** which has the following tags:amenity=cinema & cinema=erotic + ## Basic tags for this layer Elements must match **all** of the following expressions: @@ -1141,9 +1334,9 @@ _This tagrendering has no question and is thus read-only_ ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -1195,6 +1388,11 @@ The question is `Does {title()} have a private video booth?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Themes/personal.md b/Docs/Themes/personal.md index c1b6db497..a4b9caa4f 100644 --- a/Docs/Themes/personal.md +++ b/Docs/Themes/personal.md @@ -32,6 +32,7 @@ This theme contains the following layers: - [binocular](../Layers/binocular.md) - [birdhide](../Layers/birdhide.md) - [cafe_pub](../Layers/cafe_pub.md) + - [caravansites](../Layers/caravansites.md) - [charging_station](../Layers/charging_station.md) - [climbing_area](../Layers/climbing_area.md) - [climbing_club](../Layers/climbing_club.md) @@ -48,6 +49,7 @@ This theme contains the following layers: - [doctors](../Layers/doctors.md) - [dogpark](../Layers/dogpark.md) - [drinking_water](../Layers/drinking_water.md) + - [dumpstations](../Layers/dumpstations.md) - [elevator](../Layers/elevator.md) - [elongated_coin](../Layers/elongated_coin.md) - [entrance](../Layers/entrance.md) diff --git a/Docs/Themes/pets.md b/Docs/Themes/pets.md index 61c4cf94f..36ebb403c 100644 --- a/Docs/Themes/pets.md +++ b/Docs/Themes/pets.md @@ -166,7 +166,7 @@ Elements must match **all** of the following expressions: | [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | | | [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) | | [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) | -| [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) | +| [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) [mexican ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican ) [japanese ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese ) [chicken ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken ) [seafood ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood ) | | [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) | | | [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) | | [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) | @@ -243,9 +243,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -295,21 +295,25 @@ The question is `Is this place accessible with a wheelchair?` The question is `What kind of food is served here?` *This place mostly serves {cuisine}* is shown if `cuisine` is set - - *This is a pizzeria* is shown if with cuisine=pizza - - *This is a friture* is shown if with cuisine=friture - - *Mainly serves pasta* is shown if with cuisine=pasta - - *This is kebab shop* is shown if with cuisine=kebab - - *This is a sandwich shop* is shown if with cuisine=sandwich - - *Burgers are served here* is shown if with cuisine=burger - - *Sushi is served here* is shown if with cuisine=sushi - - *Coffee is served here* is shown if with cuisine=coffee - - *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with cuisine=italian - - *French dishes are served here* is shown if with cuisine=french - - *Chinese dishes are served here* is shown if with cuisine=chinese - - *Greek dishes are served here* is shown if with cuisine=greek - - *Indian dishes are served here* is shown if with cuisine=indian - - *Turkish dishes are served here* is shown if with cuisine=turkish - - *Thai dishes are served here* is shown if with cuisine=thai + - *This is a pizzeria* is shown if with cuisine=pizza + - *This is a friture* is shown if with cuisine=friture + - *Mainly serves pasta* is shown if with cuisine=pasta + - *This is kebab shop* is shown if with cuisine=kebab + - *This is a sandwich shop* is shown if with cuisine=sandwich + - *Burgers are served here* is shown if with cuisine=burger + - *Sushi is served here* is shown if with cuisine=sushi + - *Coffee is served here* is shown if with cuisine=coffee + - *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with cuisine=italian + - *French dishes are served here* is shown if with cuisine=french + - *Chinese dishes are served here* is shown if with cuisine=chinese + - *Greek dishes are served here* is shown if with cuisine=greek + - *Indian dishes are served here* is shown if with cuisine=indian + - *Turkish dishes are served here* is shown if with cuisine=turkish + - *Thai dishes are served here* is shown if with cuisine=thai + - *Mexican dishes are served here* is shown if with cuisine=mexican + - *Japanese dishes are served here* is shown if with cuisine=japanese + - *Chicken based dishes are served here* is shown if with cuisine=chicken + - *Seafood dishes are served here* is shown if with cuisine=seafood ### show-menu-image @@ -531,7 +535,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -616,6 +620,29 @@ This tagrendering has labels | dogs.1 | Dogs allowed | dog=unleashed | dog=yes | | dogs.2 | No dogs allowed | dog=no | +| id | question | osmTags | +-----|-----|----- | +| Cuisine.0 | *What kind of food is served here?* (default) | | +| Cuisine.1 | This is a pizzeria | cuisine=pizza | +| Cuisine.2 | This is a friture | cuisine=friture | +| Cuisine.3 | Mainly serves pasta | cuisine=pasta | +| Cuisine.4 | This is kebab shop | cuisine=kebab | +| Cuisine.5 | This is a sandwich shop | cuisine=sandwich | +| Cuisine.6 | Burgers are served here | cuisine=burger | +| Cuisine.7 | Sushi is served here | cuisine=sushi | +| Cuisine.8 | Coffee is served here | cuisine=coffee | +| Cuisine.9 | This is an Italian restaurant (which serves more than pasta and pizza) | cuisine=italian | +| Cuisine.10 | French dishes are served here | cuisine=french | +| Cuisine.11 | Chinese dishes are served here | cuisine=chinese | +| Cuisine.12 | Greek dishes are served here | cuisine=greek | +| Cuisine.13 | Indian dishes are served here | cuisine=indian | +| Cuisine.14 | Turkish dishes are served here | cuisine=turkish | +| Cuisine.15 | Thai dishes are served here | cuisine=thai | +| Cuisine.16 | Mexican dishes are served here | cuisine=mexican | +| Cuisine.17 | Japanese dishes are served here | cuisine=japanese | +| Cuisine.18 | Chicken based dishes are served here | cuisine=chicken | +| Cuisine.19 | Seafood dishes are served here | cuisine=seafood | + | id | question | osmTags | -----|-----|----- | | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired | @@ -678,7 +705,7 @@ Elements must match **all** of the following expressions: | [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images @@ -865,6 +892,9 @@ The question is `What kind of shop is this?` - *Window Blind Store* is shown if with shop=window_blind - *Wine Shop* is shown if with shop=wine +This tagrendering has labels +`description` + ### brand The question is `What is the brand of this shop?` @@ -913,9 +943,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -1175,7 +1205,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -1262,14 +1292,6 @@ This tagrendering has labels -----|-----|----- | | open_now.0 | Open now | _isOpen=yes | -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-type.0 | Only show shops selling {search} | | search (string) | - -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-name.0 | Only show shops with name {search} | | search (string) | - | id | question | osmTags | -----|-----|----- | | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ | @@ -1278,6 +1300,174 @@ This tagrendering has labels -----|-----|----- | | has_organic.0 | Has organic options | organic=yes | organic=only | +| id | question | osmTags | +-----|-----|----- | +| shop_types.0 | *What kind of shop is this?* (default) | | +| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | +| shop_types.2 | Farm Supply Shop | shop=agrarian | +| shop_types.3 | Liquor Store | shop=alcohol | +| shop_types.4 | Anime / Manga Shop | shop=anime | +| shop_types.5 | Antique Shop | shop=antiques | +| shop_types.6 | Appliance Store | shop=appliance | +| shop_types.7 | Art Store | shop=art | +| shop_types.8 | Baby Goods Store | shop=baby_goods | +| shop_types.9 | Bag/Luggage Store | shop=bag | +| shop_types.10 | Bakery | shop=bakery | +| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing | +| shop_types.12 | Beauty Shop | shop=beauty | +| shop_types.13 | Bedding/Mattress Store | shop=bed | +| shop_types.14 | Beverage Store | shop=beverages | +| shop_types.15 | Bicycle Shop | shop=bicycle | +| shop_types.16 | Boat Store | shop=boat | +| shop_types.17 | Bookmaker | shop=bookmaker | +| shop_types.18 | Bookstore | shop=books | +| shop_types.19 | Brewing Supply Store | shop=brewing_supplies | +| shop_types.20 | Butcher | shop=butcher | +| shop_types.21 | Camera Equipment Store | shop=camera | +| shop_types.22 | Candle Shop | shop=candles | +| shop_types.23 | Cannabis Shop | shop=cannabis | +| shop_types.24 | Car Dealership | shop=car | +| shop_types.25 | Car Parts Store | shop=car_parts | +| shop_types.26 | Car Repair Shop | shop=car_repair | +| shop_types.27 | RV Dealership | shop=caravan | +| shop_types.28 | Carpet Store | shop=carpet | +| shop_types.29 | Catalog Shop | shop=catalogue | +| shop_types.30 | Charity Store | shop=charity | +| shop_types.31 | Cheese Store | shop=cheese | +| shop_types.32 | Drugstore | shop=chemist | +| shop_types.33 | Chocolate Store | shop=chocolate | +| shop_types.34 | Clothing Store | shop=clothes | +| shop_types.35 | Coffee Store | shop=coffee | +| shop_types.36 | Collectibles Shop | shop=collector | +| shop_types.37 | Computer Store | shop=computer | +| shop_types.38 | Candy Store | shop=confectionery | +| shop_types.39 | Convenience Store | shop=convenience | +| shop_types.40 | Copy Store | shop=copyshop | +| shop_types.41 | Cosmetics Store | shop=cosmetics | +| shop_types.42 | Rural Supplies Store | shop=country_store | +| shop_types.43 | Arts & Crafts Store | shop=craft | +| shop_types.44 | Curtain Store | shop=curtain | +| shop_types.45 | Dairy Store | shop=dairy | +| shop_types.46 | Delicatessen | shop=deli | +| shop_types.47 | Department Store | shop=department_store | +| shop_types.48 | DIY Store | shop=doityourself | +| shop_types.49 | Door Shop | shop=doors | +| shop_types.50 | Dry Cleaner | shop=dry_cleaning | +| shop_types.51 | E-Cigarette Shop | shop=e-cigarette | +| shop_types.52 | Electrical Equipment Store | shop=electrical | +| shop_types.53 | Electronics Store | shop=electronics | +| shop_types.54 | Erotic Store | shop=erotic | +| shop_types.55 | Fabric Store | shop=fabric | +| shop_types.56 | Produce Stand | shop=farm | +| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories | +| shop_types.58 | Fireplace Store | shop=fireplace | +| shop_types.59 | Fishing Shop | shop=fishing | +| shop_types.60 | Flooring Supply Shop | shop=flooring | +| shop_types.61 | Florist | shop=florist | +| shop_types.62 | Framing Shop | shop=frame | +| shop_types.63 | Frozen Food Store | shop=frozen_food | +| shop_types.64 | Fuel Shop | shop=fuel | +| shop_types.65 | Funeral Home | shop=funeral_directors | +| shop_types.66 | Furniture Store | shop=furniture | +| shop_types.67 | Tabletop Game Store | shop=games | +| shop_types.68 | Garden Center | shop=garden_centre | +| shop_types.69 | Bottled Gas Shop | shop=gas | +| shop_types.70 | General Store | shop=general | +| shop_types.71 | Gift Shop | shop=gift | +| shop_types.72 | Greengrocer | shop=greengrocer | +| shop_types.73 | Hairdresser | shop=hairdresser | +| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply | +| shop_types.75 | Hardware Store | shop=hardware | +| shop_types.76 | Health Food Store | shop=health_food | +| shop_types.77 | Hearing Aids Store | shop=hearing_aids | +| shop_types.78 | Herbalist | shop=herbalist | +| shop_types.79 | Hifi Store | shop=hifi | +| shop_types.80 | Honey Store | shop=honey | +| shop_types.81 | Household Linen Shop | shop=household_linen | +| shop_types.82 | Houseware Store | shop=houseware | +| shop_types.83 | Hunting Shop | shop=hunting | +| shop_types.84 | Interior Decoration Store | shop=interior_decoration | +| shop_types.85 | Jewelry Store | shop=jewelry | +| shop_types.86 | Kiosk | shop=kiosk | +| shop_types.87 | Kitchen Design Store | shop=kitchen | +| shop_types.88 | Laundry | shop=laundry | +| shop_types.89 | Leather Store | shop=leather | +| shop_types.90 | Lighting Store | shop=lighting | +| shop_types.91 | Locksmith | shop=locksmith | +| shop_types.92 | Lottery Shop | shop=lottery | +| shop_types.93 | Mall | shop=mall | +| shop_types.94 | Massage Shop | shop=massage | +| shop_types.95 | Medical Supply Store | shop=medical_supply | +| shop_types.96 | Military Surplus Store | shop=military_surplus | +| shop_types.97 | Mobile Phone Store | shop=mobile_phone | +| shop_types.98 | Model Shop | shop=model | +| shop_types.99 | Money Lender | shop=money_lender | +| shop_types.100 | Motorcycle Dealership | shop=motorcycle | +| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair | +| shop_types.102 | Music Store | shop=music | +| shop_types.103 | Musical Instrument Store | shop=musical_instrument | +| shop_types.104 | Newsstand | shop=newsagent | +| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements | +| shop_types.106 | Nuts Shop | shop=nuts | +| shop_types.107 | Optician | shop=optician | +| shop_types.108 | Outdoors Store | shop=outdoor | +| shop_types.109 | Online Retailer Outpost | shop=outpost | +| shop_types.110 | Paint Store | shop=paint | +| shop_types.111 | Party Supply Store | shop=party | +| shop_types.112 | Pasta Store | shop=pasta | +| shop_types.113 | Pastry Shop | shop=pastry | +| shop_types.114 | Pawnshop | shop=pawnbroker | +| shop_types.115 | Perfume Store | shop=perfumery | +| shop_types.116 | Pet Store | shop=pet | +| shop_types.117 | Pet Groomer | shop=pet_grooming | +| shop_types.118 | Photography Store | shop=photo | +| shop_types.119 | Pottery Store | shop=pottery | +| shop_types.120 | Printer Ink Store | shop=printer_ink | +| shop_types.121 | Psychic | shop=psychic | +| shop_types.122 | Fireworks Store | shop=pyrotechnics | +| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics | +| shop_types.124 | Religious Store | shop=religion | +| shop_types.125 | Rental Shop | shop=rental | +| shop_types.126 | Repair Shop | shop=repair | +| shop_types.127 | Rice Store | shop=rice | +| shop_types.128 | Scuba Diving Shop | shop=scuba_diving | +| shop_types.129 | Seafood Shop | shop=seafood | +| shop_types.130 | Thrift Store | shop=second_hand | +| shop_types.131 | Sewing Supply Shop | shop=sewing | +| shop_types.132 | Shoe Repair Shop | shop=shoe_repair | +| shop_types.133 | Shoe Store | shop=shoes | +| shop_types.134 | Spice Shop | shop=spices | +| shop_types.135 | Sporting Goods Store | shop=sports | +| shop_types.136 | Stationery Store | shop=stationery | +| shop_types.137 | Storage Rental | shop=storage_rental | +| shop_types.138 | Supermarket | shop=supermarket | +| shop_types.139 | Pool Supply Store | shop=swimming_pool | +| shop_types.140 | Tailor | shop=tailor | +| shop_types.141 | Tattoo Parlor | shop=tattoo | +| shop_types.142 | Tea Store | shop=tea | +| shop_types.143 | Telecom Retail Store | shop=telecommunication | +| shop_types.144 | Ticket Seller | shop=ticket | +| shop_types.145 | Tile Shop | shop=tiles | +| shop_types.146 | Tobacco Shop | shop=tobacco | +| shop_types.147 | Tool Rental | shop=tool_hire | +| shop_types.148 | Toy Store | shop=toys | +| shop_types.149 | Trade Shop | shop=trade | +| shop_types.150 | Travel Agency | shop=travel_agency | +| shop_types.151 | Trophy Shop | shop=trophy | +| shop_types.152 | Tire Store | shop=tyres | +| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner | +| shop_types.154 | Discount Store | shop=variety_store | +| shop_types.155 | Video Store | shop=video | +| shop_types.156 | Video Game Store | shop=video_games | +| shop_types.157 | Watches Shop | shop=watches | +| shop_types.158 | Drinking Water Shop | shop=water | +| shop_types.159 | Watersport/Swim Shop | shop=water_sports | +| shop_types.160 | Weapon Shop | shop=weapons | +| shop_types.161 | Wholesale Store | shop=wholesale | +| shop_types.162 | Wig Shop | shop=wigs | +| shop_types.163 | Window Blind Store | shop=window_blind | +| shop_types.164 | Wine Shop | shop=wine | + | id | question | osmTags | -----|-----|----- | | accepts_cash.0 | Accepts cash | payment:cash=yes | diff --git a/Docs/Themes/rainbow_crossings.md b/Docs/Themes/rainbow_crossings.md index c47b46cd8..805f581a0 100644 --- a/Docs/Themes/rainbow_crossings.md +++ b/Docs/Themes/rainbow_crossings.md @@ -36,6 +36,7 @@ Available languages: + [images](#images) + [crossing-with-rainbow](#crossing-with-rainbow) + [leftover-questions](#leftover-questions) + + [move-button](#move-button) + [lod](#lod) # Layers defined in this theme configuration file @@ -77,6 +78,11 @@ The question is `Does this crossing has rainbow paintings?` _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Themes/sports.md b/Docs/Themes/sports.md index 47405e249..6e74a33af 100644 --- a/Docs/Themes/sports.md +++ b/Docs/Themes/sports.md @@ -34,6 +34,7 @@ Available languages: - [Sports ( sports )](#sports-(-sports-)) 1. [Layers defined in this theme configuration file](#layers-defined-in-this-theme-configuration-file) 2. [sport_shops](#sport_shops) + - [Presets](#presets) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [images](#images) @@ -95,6 +96,12 @@ A shop No themes use this layer +## Presets + +The following options to create new points are included: + +**a sports shop** which has the following tags:shop=sports + ## Basic tags for this layer Elements must match the expression **shop=sports** @@ -140,7 +147,7 @@ Elements must match the expression ** [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) | | [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) | | [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) | -| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | | +| [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) | | ### images This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images @@ -327,6 +334,9 @@ The question is `What kind of shop is this?` - *Window Blind Store* is shown if with shop=window_blind - *Wine Shop* is shown if with shop=wine +This tagrendering has labels +`description` + ### brand The question is `What is the brand of this shop?` @@ -375,9 +385,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` @@ -637,7 +647,7 @@ The question is `What is the network name for the wireless internet access?` - *Telekom* is shown if with internet_access:ssid=Telekom -This tagrendering is only visible in the popup if the following condition is met: internet_access=wlan +This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$ This tagrendering has labels `internet-all` @@ -724,14 +734,6 @@ This tagrendering has labels -----|-----|----- | | open_now.0 | Open now | _isOpen=yes | -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-type.0 | Only show shops selling {search} | | search (string) | - -| id | question | osmTags | fields | ------|-----|-----|----- | -| shop-name.0 | Only show shops with name {search} | | search (string) | - | id | question | osmTags | -----|-----|----- | | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ | @@ -740,6 +742,174 @@ This tagrendering has labels -----|-----|----- | | has_organic.0 | Has organic options | organic=yes | organic=only | +| id | question | osmTags | +-----|-----|----- | +| shop_types.0 | *What kind of shop is this?* (default) | | +| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | +| shop_types.2 | Farm Supply Shop | shop=agrarian | +| shop_types.3 | Liquor Store | shop=alcohol | +| shop_types.4 | Anime / Manga Shop | shop=anime | +| shop_types.5 | Antique Shop | shop=antiques | +| shop_types.6 | Appliance Store | shop=appliance | +| shop_types.7 | Art Store | shop=art | +| shop_types.8 | Baby Goods Store | shop=baby_goods | +| shop_types.9 | Bag/Luggage Store | shop=bag | +| shop_types.10 | Bakery | shop=bakery | +| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing | +| shop_types.12 | Beauty Shop | shop=beauty | +| shop_types.13 | Bedding/Mattress Store | shop=bed | +| shop_types.14 | Beverage Store | shop=beverages | +| shop_types.15 | Bicycle Shop | shop=bicycle | +| shop_types.16 | Boat Store | shop=boat | +| shop_types.17 | Bookmaker | shop=bookmaker | +| shop_types.18 | Bookstore | shop=books | +| shop_types.19 | Brewing Supply Store | shop=brewing_supplies | +| shop_types.20 | Butcher | shop=butcher | +| shop_types.21 | Camera Equipment Store | shop=camera | +| shop_types.22 | Candle Shop | shop=candles | +| shop_types.23 | Cannabis Shop | shop=cannabis | +| shop_types.24 | Car Dealership | shop=car | +| shop_types.25 | Car Parts Store | shop=car_parts | +| shop_types.26 | Car Repair Shop | shop=car_repair | +| shop_types.27 | RV Dealership | shop=caravan | +| shop_types.28 | Carpet Store | shop=carpet | +| shop_types.29 | Catalog Shop | shop=catalogue | +| shop_types.30 | Charity Store | shop=charity | +| shop_types.31 | Cheese Store | shop=cheese | +| shop_types.32 | Drugstore | shop=chemist | +| shop_types.33 | Chocolate Store | shop=chocolate | +| shop_types.34 | Clothing Store | shop=clothes | +| shop_types.35 | Coffee Store | shop=coffee | +| shop_types.36 | Collectibles Shop | shop=collector | +| shop_types.37 | Computer Store | shop=computer | +| shop_types.38 | Candy Store | shop=confectionery | +| shop_types.39 | Convenience Store | shop=convenience | +| shop_types.40 | Copy Store | shop=copyshop | +| shop_types.41 | Cosmetics Store | shop=cosmetics | +| shop_types.42 | Rural Supplies Store | shop=country_store | +| shop_types.43 | Arts & Crafts Store | shop=craft | +| shop_types.44 | Curtain Store | shop=curtain | +| shop_types.45 | Dairy Store | shop=dairy | +| shop_types.46 | Delicatessen | shop=deli | +| shop_types.47 | Department Store | shop=department_store | +| shop_types.48 | DIY Store | shop=doityourself | +| shop_types.49 | Door Shop | shop=doors | +| shop_types.50 | Dry Cleaner | shop=dry_cleaning | +| shop_types.51 | E-Cigarette Shop | shop=e-cigarette | +| shop_types.52 | Electrical Equipment Store | shop=electrical | +| shop_types.53 | Electronics Store | shop=electronics | +| shop_types.54 | Erotic Store | shop=erotic | +| shop_types.55 | Fabric Store | shop=fabric | +| shop_types.56 | Produce Stand | shop=farm | +| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories | +| shop_types.58 | Fireplace Store | shop=fireplace | +| shop_types.59 | Fishing Shop | shop=fishing | +| shop_types.60 | Flooring Supply Shop | shop=flooring | +| shop_types.61 | Florist | shop=florist | +| shop_types.62 | Framing Shop | shop=frame | +| shop_types.63 | Frozen Food Store | shop=frozen_food | +| shop_types.64 | Fuel Shop | shop=fuel | +| shop_types.65 | Funeral Home | shop=funeral_directors | +| shop_types.66 | Furniture Store | shop=furniture | +| shop_types.67 | Tabletop Game Store | shop=games | +| shop_types.68 | Garden Center | shop=garden_centre | +| shop_types.69 | Bottled Gas Shop | shop=gas | +| shop_types.70 | General Store | shop=general | +| shop_types.71 | Gift Shop | shop=gift | +| shop_types.72 | Greengrocer | shop=greengrocer | +| shop_types.73 | Hairdresser | shop=hairdresser | +| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply | +| shop_types.75 | Hardware Store | shop=hardware | +| shop_types.76 | Health Food Store | shop=health_food | +| shop_types.77 | Hearing Aids Store | shop=hearing_aids | +| shop_types.78 | Herbalist | shop=herbalist | +| shop_types.79 | Hifi Store | shop=hifi | +| shop_types.80 | Honey Store | shop=honey | +| shop_types.81 | Household Linen Shop | shop=household_linen | +| shop_types.82 | Houseware Store | shop=houseware | +| shop_types.83 | Hunting Shop | shop=hunting | +| shop_types.84 | Interior Decoration Store | shop=interior_decoration | +| shop_types.85 | Jewelry Store | shop=jewelry | +| shop_types.86 | Kiosk | shop=kiosk | +| shop_types.87 | Kitchen Design Store | shop=kitchen | +| shop_types.88 | Laundry | shop=laundry | +| shop_types.89 | Leather Store | shop=leather | +| shop_types.90 | Lighting Store | shop=lighting | +| shop_types.91 | Locksmith | shop=locksmith | +| shop_types.92 | Lottery Shop | shop=lottery | +| shop_types.93 | Mall | shop=mall | +| shop_types.94 | Massage Shop | shop=massage | +| shop_types.95 | Medical Supply Store | shop=medical_supply | +| shop_types.96 | Military Surplus Store | shop=military_surplus | +| shop_types.97 | Mobile Phone Store | shop=mobile_phone | +| shop_types.98 | Model Shop | shop=model | +| shop_types.99 | Money Lender | shop=money_lender | +| shop_types.100 | Motorcycle Dealership | shop=motorcycle | +| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair | +| shop_types.102 | Music Store | shop=music | +| shop_types.103 | Musical Instrument Store | shop=musical_instrument | +| shop_types.104 | Newsstand | shop=newsagent | +| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements | +| shop_types.106 | Nuts Shop | shop=nuts | +| shop_types.107 | Optician | shop=optician | +| shop_types.108 | Outdoors Store | shop=outdoor | +| shop_types.109 | Online Retailer Outpost | shop=outpost | +| shop_types.110 | Paint Store | shop=paint | +| shop_types.111 | Party Supply Store | shop=party | +| shop_types.112 | Pasta Store | shop=pasta | +| shop_types.113 | Pastry Shop | shop=pastry | +| shop_types.114 | Pawnshop | shop=pawnbroker | +| shop_types.115 | Perfume Store | shop=perfumery | +| shop_types.116 | Pet Store | shop=pet | +| shop_types.117 | Pet Groomer | shop=pet_grooming | +| shop_types.118 | Photography Store | shop=photo | +| shop_types.119 | Pottery Store | shop=pottery | +| shop_types.120 | Printer Ink Store | shop=printer_ink | +| shop_types.121 | Psychic | shop=psychic | +| shop_types.122 | Fireworks Store | shop=pyrotechnics | +| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics | +| shop_types.124 | Religious Store | shop=religion | +| shop_types.125 | Rental Shop | shop=rental | +| shop_types.126 | Repair Shop | shop=repair | +| shop_types.127 | Rice Store | shop=rice | +| shop_types.128 | Scuba Diving Shop | shop=scuba_diving | +| shop_types.129 | Seafood Shop | shop=seafood | +| shop_types.130 | Thrift Store | shop=second_hand | +| shop_types.131 | Sewing Supply Shop | shop=sewing | +| shop_types.132 | Shoe Repair Shop | shop=shoe_repair | +| shop_types.133 | Shoe Store | shop=shoes | +| shop_types.134 | Spice Shop | shop=spices | +| shop_types.135 | Sporting Goods Store | shop=sports | +| shop_types.136 | Stationery Store | shop=stationery | +| shop_types.137 | Storage Rental | shop=storage_rental | +| shop_types.138 | Supermarket | shop=supermarket | +| shop_types.139 | Pool Supply Store | shop=swimming_pool | +| shop_types.140 | Tailor | shop=tailor | +| shop_types.141 | Tattoo Parlor | shop=tattoo | +| shop_types.142 | Tea Store | shop=tea | +| shop_types.143 | Telecom Retail Store | shop=telecommunication | +| shop_types.144 | Ticket Seller | shop=ticket | +| shop_types.145 | Tile Shop | shop=tiles | +| shop_types.146 | Tobacco Shop | shop=tobacco | +| shop_types.147 | Tool Rental | shop=tool_hire | +| shop_types.148 | Toy Store | shop=toys | +| shop_types.149 | Trade Shop | shop=trade | +| shop_types.150 | Travel Agency | shop=travel_agency | +| shop_types.151 | Trophy Shop | shop=trophy | +| shop_types.152 | Tire Store | shop=tyres | +| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner | +| shop_types.154 | Discount Store | shop=variety_store | +| shop_types.155 | Video Store | shop=video | +| shop_types.156 | Video Game Store | shop=video_games | +| shop_types.157 | Watches Shop | shop=watches | +| shop_types.158 | Drinking Water Shop | shop=water | +| shop_types.159 | Watersport/Swim Shop | shop=water_sports | +| shop_types.160 | Weapon Shop | shop=weapons | +| shop_types.161 | Wholesale Store | shop=wholesale | +| shop_types.162 | Wig Shop | shop=wigs | +| shop_types.163 | Window Blind Store | shop=window_blind | +| shop_types.164 | Wine Shop | shop=wine | + | id | question | osmTags | -----|-----|----- | | accepts_cash.0 | Accepts cash | payment:cash=yes | diff --git a/Docs/Themes/stations.md b/Docs/Themes/stations.md index 1559c57f7..f5380541a 100644 --- a/Docs/Themes/stations.md +++ b/Docs/Themes/stations.md @@ -55,6 +55,7 @@ Available languages: - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) 3. [departures_board](#departures_board) + - [Presets](#presets) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [images](#images) @@ -62,6 +63,7 @@ Available languages: + [repeated](#repeated) + [single_level](#single_level) + [leftover-questions](#leftover-questions) + + [move-button](#move-button) + [lod](#lod) # Layers defined in this theme configuration file @@ -94,6 +96,12 @@ Displays showing the trains that will leave from this station No themes use this layer +## Presets + +The following options to create new points are included: + +**a departures board** which has the following tags:departures_board=yes + ## Basic tags for this layer Elements must match **all** of the following expressions: @@ -155,6 +163,11 @@ This tagrendering has labels _This tagrendering has no question and is thus read-only_ *{questions( ,)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Themes/toerisme_vlaanderen.md b/Docs/Themes/toerisme_vlaanderen.md index 4711c27d8..523f5a17f 100644 --- a/Docs/Themes/toerisme_vlaanderen.md +++ b/Docs/Themes/toerisme_vlaanderen.md @@ -28,6 +28,7 @@ Available languages: - [Pin je punt ( toerisme_vlaanderen )](#pin-je-punt-(-toerisme_vlaanderen-)) 1. [Layers defined in this theme configuration file](#layers-defined-in-this-theme-configuration-file) 2. [charging_station_ebikes](#charging_station_ebikes) + - [Presets](#presets) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [images](#images) @@ -144,6 +145,7 @@ Available languages: + [delete-button](#delete-button) + [lod](#lod) 3. [bicycle_rental_non_docking](#bicycle_rental_non_docking) + - [Presets](#presets) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [images](#images) @@ -180,6 +182,12 @@ A charging station No themes use this layer +## Presets + +The following options to create new points are included: + +**laadpunt voor elektrische fietsen** which has the following tags:amenity=charging_station & motorcar=no & bicycle=yes + ## Basic tags for this layer Elements must match **all** of the following expressions: @@ -1422,6 +1430,14 @@ Bicycle rental stations No themes use this layer +## Presets + +The following options to create new points are included: + +**a bicycle rental shop** which has the following tags:amenity=bicycle_rental & bicycle_rental=shop + +**a bicycle rental** which has the following tags:amenity=bicycle_rental + ## Basic tags for this layer Elements must match **all** of the following expressions: @@ -1492,9 +1508,9 @@ This tagrendering has labels ### phone The question is `What is the phone number of {title()}?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Themes/uk_addresses.md b/Docs/Themes/uk_addresses.md index 476b58244..cbcc1e35b 100644 --- a/Docs/Themes/uk_addresses.md +++ b/Docs/Themes/uk_addresses.md @@ -48,6 +48,7 @@ Available languages: + [uk_addresses_parentstreet](#uk_addresses_parentstreet) + [fixme](#fixme) + [address-sign-image](#address-sign-image) + + [move-button](#move-button) + [lod](#lod) # Layers defined in this theme configuration file @@ -290,6 +291,11 @@ The question is `Please explain what the address is so that someone else can loo _This tagrendering has no question and is thus read-only_ *{image_carousel(image:address)}
{image_upload(image:address, Too complex? Add a photo of the address)}* +### move-button + +_This tagrendering has no question and is thus read-only_ +*{move_button()}* + ### lod _This tagrendering has no question and is thus read-only_ diff --git a/Docs/Themes/vending_machine.md b/Docs/Themes/vending_machine.md index bf82236d3..282a0f08c 100644 --- a/Docs/Themes/vending_machine.md +++ b/Docs/Themes/vending_machine.md @@ -251,9 +251,9 @@ The question is `Is this vending machine indoors?` ### phone The question is `What is the phone number of the operator of this vending machine?` -*{phone}* is shown if `phone` is set +*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set - - *{contact:phone}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ + - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_ This tagrendering has labels `contact` diff --git a/Docs/Themes/walkingnodes.md b/Docs/Themes/walkingnodes.md index d293aaf05..dc8af0ed1 100644 --- a/Docs/Themes/walkingnodes.md +++ b/Docs/Themes/walkingnodes.md @@ -33,6 +33,7 @@ Available languages: + [leftover-questions](#leftover-questions) + [lod](#lod) 3. [node_hiking](#node_hiking) + - [Presets](#presets) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [node-rwn_ref](#node-rwn_ref) @@ -42,6 +43,7 @@ Available languages: + [leftover-questions](#leftover-questions) + [lod](#lod) 4. [guidepost_hiking](#guidepost_hiking) + - [Presets](#presets) - [Basic tags for this layer](#basic-tags-for-this-layer) - [Supported attributes](#supported-attributes) + [images](#images) @@ -107,6 +109,12 @@ This tagrendering has labels No themes use this layer +## Presets + +The following options to create new points are included: + +**a walking node** which has the following tags:rwn_ref=? & network:type=node_network (snaps to layers `cycleways_and_roads`) + ## Basic tags for this layer Elements must match **any** of the following expressions: @@ -172,6 +180,12 @@ Guideposts (also known as fingerposts or finger posts) are often found along off No themes use this layer +## Presets + +The following options to create new points are included: + +**a guidepost** which has the following tags:tourism=information & information=guidepost & hiking=yes + ## Basic tags for this layer Elements must match **all** of the following expressions: diff --git a/Docs/URL_Parameters.md b/Docs/URL_Parameters.md index 38cf89abf..b52a8d1db 100644 --- a/Docs/URL_Parameters.md +++ b/Docs/URL_Parameters.md @@ -67,15 +67,11 @@ The URL-hash can contain multiple values: - The currently opened menu view -- The base64-encoded JSON-file specifying a custom theme (only when loading) - ### Possible hashes to open a menu The possible hashes are: -`menu:about`,`menu:settings`,`menu:favourites`,`menu:community`,`menu:privacy`,`menu:advanced` - -`theme-menu:intro`,`theme-menu:download`,`theme-menu:copyright`,`theme-menu:share` +`copyright`,`copyright_icons`,`community_index`,`hotkeys`,`privacy`,`filter`,`background`,`about_theme`,`download`,`favourites`,`usersettings`,`share`,`menu` ## language @@ -415,7 +411,7 @@ The default value is _true_ The mode the application starts in, e.g. 'map', 'dashboard' or 'statistics' -This documentation is defined in the source code at [generateDocs.ts](ervdvn/git2/MapComplete/scripts/generateDocs.ts#L434) +This documentation is defined in the source code at [generateDocs.ts](ervdvn/git/MapComplete/scripts/generateDocs.ts#L436) The default value is _map_ diff --git a/Docs/wikiIndex.txt b/Docs/wikiIndex.txt index b1b61962f..62abfa16e 100644 --- a/Docs/wikiIndex.txt +++ b/Docs/wikiIndex.txt @@ -14,7 +14,7 @@ |name= [https://mapcomplete.org/cyclofix cyclofix] |region= Worldwide |lang= {{#language:en|en}}, {{#language:nl|en}}, {{#language:fr|en}}, {{#language:gl|en}}, {{#language:de|en}}, {{#language:ja|en}}, {{#language:zh_Hant|en}}, {{#language:it|en}}, {{#language:hu|en}}, {{#language:es|en}}, {{#language:da|en}}, {{#language:cs|en}}, {{#language:ca|en}}, {{#language:pl|en}} -|descr= A MapComplete theme: The goal of this map is to present cyclists with an easy-to-use solution to find the appropriate infrastructure for their needs +|descr= A MapComplete theme: A map for cyclists to find the appropriate infrastructure for their needs, such as bicycle pumps, drinking water, bicycle shops, repair stations or parkings |material= {{yes|[https://mapcomplete.org/ Yes]}} |image= MapComplete_Screenshot.png |genre= POI, editor, cyclofix @@ -211,7 +211,7 @@ {{service_item |name= [https://mapcomplete.org/circular_economy circular_economy] |region= Worldwide -|lang= {{#language:en|en}}, {{#language:es|en}} +|lang= {{#language:en|en}}, {{#language:es|en}}, {{#language:de|en}} |descr= A MapComplete theme: Various items which help people to share, reuse or recycle |material= {{yes|[https://mapcomplete.org/ Yes]}} |image= MapComplete_Screenshot.png @@ -337,7 +337,7 @@ {{service_item |name= [https://mapcomplete.org/glutenfree glutenfree] |region= Worldwide -|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:it|en}} +|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:it|en}}, {{#language:es|en}} |descr= A MapComplete theme: A crowdsourced map with glutenfree items |material= {{yes|[https://mapcomplete.org/ Yes]}} |image= MapComplete_Screenshot.png @@ -411,7 +411,7 @@ The position of a signpost can be used by a hiker/biker/rider/s… {{service_item |name= [https://mapcomplete.org/lactosefree lactosefree] |region= Worldwide -|lang= {{#language:en|en}} +|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:es|en}} |descr= A MapComplete theme: A crowdsourced map with lactose free shops and restaurants |material= {{yes|[https://mapcomplete.org/ Yes]}} |image= MapComplete_Screenshot.png diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index 132a6710e..1d5bccb6d 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -5,13 +5,7 @@ "nl": "Oplaadpunten", "de": "Ladestationen" }, - "description": { - "en": "A charging station", - "nl": "Oplaadpunten", - "ca": "Una estació de càrrega", - "de": "Eine Ladestation", - "fr": "Une station de recharge" - }, + "minzoom": 10, "source": { "osmTags": { "and": [ @@ -26,7 +20,6 @@ ] } }, - "minzoom": 10, "title": { "render": { "en": "Charging station", @@ -72,109 +65,14 @@ } ] }, - "pointRendering": [ - { - "location": [ - "point", - "centroid" - ], - "marker": [ - { - "icon": "pin", - "color": "#fff" - }, - { - "icon": { - "render": "./assets/themes/charging_stations/plug.svg", - "mappings": [ - { - "if": "bicycle=yes", - "then": "./assets/themes/charging_stations/bicycle.svg" - }, - { - "if": { - "or": [ - "car=yes", - "motorcar=yes" - ] - }, - "then": "./assets/themes/charging_stations/car.svg" - } - ] - } - } - ], - "iconBadges": [ - { - "if": { - "or": [ - "disused:amenity=charging_station", - "operational_status=broken" - ] - }, - "then": "close:#c22;" - }, - { - "if": { - "or": [ - "proposed:amenity=charging_station", - "planned:amenity=charging_station" - ] - }, - "then": "./assets/layers/charging_station/under_construction.svg" - }, - { - "if": { - "and": [ - "bicycle=yes", - { - "or": [ - "motorcar=yes", - "car=yes" - ] - } - ] - }, - "then": "circle:#fff;./assets/themes/charging_stations/car.svg" - } - ], - "anchor": "bottom", - "iconSize": "50,50" - } - ], - "lineRendering": [ - { - "color": "black", - "width": 2, - "fillColor": "#80808080" - } - ], - "presets": [ - { - "tags": [ - "amenity=charging_station", - "motorcar=no", - "bicycle=yes" - ], - "title": { - "en": "charging station for electrical bikes", - "nl": "oplaadpunt voor elektrische fietsen", - "de": "Ladestation für Elektrofahrräder" - } - }, - { - "tags": [ - "amenity=charging_station", - "motorcar=yes", - "bicycle=no" - ], - "title": { - "en": "charging station for cars", - "nl": "oplaadstation voor elektrische auto's", - "de": "Ladestation für Autos" - } - } - ], + "description": { + "en": "A charging station", + "nl": "Oplaadpunten", + "ca": "Una estació de càrrega", + "de": "Eine Ladestation", + "fr": "Une station de recharge" + }, + "#": "no-question-hint-check", "tagRenderings": [ "images", { @@ -2880,6 +2778,109 @@ } } ], + "lineRendering": [ + { + "color": "black", + "width": 2, + "fillColor": "#80808080" + } + ], + "pointRendering": [ + { + "location": [ + "point", + "centroid" + ], + "marker": [ + { + "icon": "pin", + "color": "#fff" + }, + { + "icon": { + "render": "./assets/themes/charging_stations/plug.svg", + "mappings": [ + { + "if": "bicycle=yes", + "then": "./assets/themes/charging_stations/bicycle.svg" + }, + { + "if": { + "or": [ + "car=yes", + "motorcar=yes" + ] + }, + "then": "./assets/themes/charging_stations/car.svg" + } + ] + } + } + ], + "iconBadges": [ + { + "if": { + "or": [ + "disused:amenity=charging_station", + "operational_status=broken" + ] + }, + "then": "close:#c22;" + }, + { + "if": { + "or": [ + "proposed:amenity=charging_station", + "planned:amenity=charging_station" + ] + }, + "then": "./assets/layers/charging_station/under_construction.svg" + }, + { + "if": { + "and": [ + "bicycle=yes", + { + "or": [ + "motorcar=yes", + "car=yes" + ] + } + ] + }, + "then": "circle:#fff;./assets/themes/charging_stations/car.svg" + } + ], + "anchor": "bottom", + "iconSize": "50,50" + } + ], + "presets": [ + { + "tags": [ + "amenity=charging_station", + "motorcar=no", + "bicycle=yes" + ], + "title": { + "en": "charging station for electrical bikes", + "nl": "oplaadpunt voor elektrische fietsen", + "de": "Ladestation für Elektrofahrräder" + } + }, + { + "tags": [ + "amenity=charging_station", + "motorcar=yes", + "bicycle=no" + ], + "title": { + "en": "charging station for cars", + "nl": "oplaadstation voor elektrische auto's", + "de": "Ladestation für Autos" + } + } + ], "filter": [ { "id": "vehicle-type", @@ -3127,19 +3128,6 @@ ] } ], - "deletion": { - "softDeletionTags": { - "and": [ - "amenity=", - "disused:amenity=charging_station" - ] - }, - "neededChangesets": 10 - }, - "allowMove": { - "enableRelocation": false, - "enableImproveAccuracy": true - }, "units": [ { "maxstay": { @@ -3334,5 +3322,17 @@ } } ], - "#": "no-question-hint-check" -} + "allowMove": { + "enableRelocation": false, + "enableImproveAccuracy": true + }, + "deletion": { + "softDeletionTags": { + "and": [ + "amenity=", + "disused:amenity=charging_station" + ] + }, + "neededChangesets": 10 + } +} \ No newline at end of file diff --git a/assets/layers/climbing_opportunity/climbing_opportunity.json b/assets/layers/climbing_opportunity/climbing_opportunity.json index 371897325..b25ca2c69 100644 --- a/assets/layers/climbing_opportunity/climbing_opportunity.json +++ b/assets/layers/climbing_opportunity/climbing_opportunity.json @@ -34,6 +34,9 @@ ] } }, + "snapName": { + "en": "a wall, cliff or rock" + }, "minzoom": 18, "title": { "render": { diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json index bb126a08b..61337d9a5 100644 --- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json +++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json @@ -9,6 +9,10 @@ "ca": "Vies ciclistes i carreteres", "cs": "Cyklostezky a silnice" }, + "snapName": { + "en": "a road or a cycleway", + "nl": "een weg, straat of fietspad" + }, "description": { "en": "All infrastructure that someone can cycle over, accompanied with questions about this infrastructure", "nl": "Alle infrastructuur waar je over kunt fietsen, met vragen over die infrastructuur", diff --git a/assets/layers/hackerspace/hackerspace.json b/assets/layers/hackerspace/hackerspace.json index fe5bea954..5cf6bfbae 100644 --- a/assets/layers/hackerspace/hackerspace.json +++ b/assets/layers/hackerspace/hackerspace.json @@ -192,6 +192,12 @@ "ca": "Aquest és un espai hacker tradicional (orientat al software)", "cs": "Toto je tradiční (softwarově orientovaný) hackerský prostor" } + }, + { + "if": "hackerspace=hacklab", + "then": { + "en": "This is a hacklab which is mostly focussed on basic computer skills, using recycled devices and/or providing internet to the community. This is typically located in autonomous spaces, squats or social facilities" + } } ] }, diff --git a/assets/layers/indoors/indoors.json b/assets/layers/indoors/indoors.json index 7eea28037..abef3fbb7 100644 --- a/assets/layers/indoors/indoors.json +++ b/assets/layers/indoors/indoors.json @@ -8,6 +8,10 @@ "ca": "Interiors", "cs": "Vnitřní prostory" }, + "snapName": { + "en": "an indoor wall", + "nl": "een binnenmuur" + }, "description": { "en": "Basic indoor mapping: shows room outlines", "de": "Grundlegende Innenraumkartierung: zeigt Umrisse von Räumen", diff --git a/assets/layers/kerbs/kerbs.json b/assets/layers/kerbs/kerbs.json index 2b5c4aa19..b10bc4061 100644 --- a/assets/layers/kerbs/kerbs.json +++ b/assets/layers/kerbs/kerbs.json @@ -11,6 +11,9 @@ "ca": "Vroades", "cs": "Obrubníky" }, + "snapName": { + "en": "a kerb" + }, "description": { "en": "A layer showing kerbs.", "nl": "Een laag met stoepranden.", diff --git a/assets/layers/pedestrian_path/pedestrian_path.json b/assets/layers/pedestrian_path/pedestrian_path.json index e1bac0a66..ac8ccef8c 100644 --- a/assets/layers/pedestrian_path/pedestrian_path.json +++ b/assets/layers/pedestrian_path/pedestrian_path.json @@ -8,6 +8,9 @@ "ca": "Camins per a vianants", "cs": "Cesty pro chodce" }, + "snapName": { + "en": "a pedestrian path" + }, "description": { "en": "Pedestrian footpaths, especially used for indoor navigation and snapping entrances to this layer", "nl": "Pad voor voetgangers, in het bijzonder gebruikt voor navigatie binnen gebouwen en om aan toegangen vast te klikken in deze laag", diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json index 419746490..5595d6ada 100644 --- a/assets/layers/questions/questions.json +++ b/assets/layers/questions/questions.json @@ -702,7 +702,8 @@ "*": "{description}" }, "freeform": { - "key": "description" + "key": "description", + "type": "text" }, "questionHint": { "nl": "Herhaal geen antwoorden die je reeds gaf", @@ -2079,6 +2080,7 @@ "ca": "Aquest lloc ofereix accés a internet?", "pl": "Czy to miejsce oferuje dostęp do Internetu?" }, + "multiAnswer": true, "mappings": [ { "if": "internet_access=wlan", @@ -2258,7 +2260,7 @@ "labels": [ "internet-all" ], - "condition": "internet_access=wlan", + "condition": "internet_access~.*wlan.*", "question": { "en": "What is the network name for the wireless internet access?", "nl": "Wat is de netwerknaam voor de draadloze internettoegang?", diff --git a/assets/layers/shelter/shelter.json b/assets/layers/shelter/shelter.json index 79cc2fae9..26361dc07 100644 --- a/assets/layers/shelter/shelter.json +++ b/assets/layers/shelter/shelter.json @@ -8,6 +8,9 @@ "fr": "Abri", "cs": "Přístřešek" }, + "snapName": { + "en": "a shelter" + }, "description": { "en": "Layer showing shelter structures", "de": "Eine Ebene, die verschiedene Bauformen von Unterständen zeigt", diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json index 5cfca96fa..d1e62cbfa 100644 --- a/assets/layers/walls_and_buildings/walls_and_buildings.json +++ b/assets/layers/walls_and_buildings/walls_and_buildings.json @@ -12,6 +12,10 @@ "zh_Hant": "特殊的內建圖層顯示所有牆壁與建築。這個圖層對於規畫要靠牆的東西 (例如 AED、郵筒、入口、地址、監視器等) 相當實用。這個圖層預設顯示而且無法由使用者開關。", "pl": "Specjalna warstwa zabudowana zapewniająca wszystkie mury i budynki. Warstwa ta jest przydatna w ustawieniach wstępnych obiektów, które można umieścić przy ścianach (np. AED, skrzynki pocztowe, wejścia, adresy, kamery monitorujące itp.). Warstwa ta jest domyślnie niewidoczna i użytkownik nie może jej przełączać." }, + "snapName": { + "en": "a wall or building", + "nl": "een muur of gebouw" + }, "source": { "osmTags": { "or": [ diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json index 0c3e03626..8e80ddef7 100644 --- a/assets/svg/license_info.json +++ b/assets/svg/license_info.json @@ -1075,6 +1075,14 @@ "https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/AUTHORS.txt" ] }, + { + "path": "snap.svg", + "license": "CC0-1.0", + "authors": [ + "Pieter Vander Vennet" + ], + "sources": [] + }, { "path": "speech_bubble.svg", "license": "CC-BY-4.0", @@ -1223,6 +1231,14 @@ ], "sources": [] }, + { + "path": "unsnap.svg", + "license": "CC0-1.0", + "authors": [ + "Pieter Vander Vennet" + ], + "sources": [] + }, { "path": "wikidata.svg", "license": "LOGO", diff --git a/assets/svg/snap.svg b/assets/svg/snap.svg new file mode 100644 index 000000000..ed4b40d12 --- /dev/null +++ b/assets/svg/snap.svg @@ -0,0 +1,84 @@ + + + + diff --git a/assets/svg/snap.svg.license b/assets/svg/snap.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/svg/snap.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/svg/unsnap.svg b/assets/svg/unsnap.svg new file mode 100644 index 000000000..c35760744 --- /dev/null +++ b/assets/svg/unsnap.svg @@ -0,0 +1,83 @@ + + + + diff --git a/assets/svg/unsnap.svg.license b/assets/svg/unsnap.svg.license new file mode 100644 index 000000000..2452bee1e --- /dev/null +++ b/assets/svg/unsnap.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0 \ No newline at end of file diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index a20472d7a..7873f6b66 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,16 +1,13 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete", - "de": "Änderungen mit MapComplete vorgenommen" + "en": "Changes made with MapComplete" }, "shortDescription": { - "en": "Shows changes made by MapComplete", - "de": "Änderungen von MapComplete anzeigen" + "en": "Shows changes made by MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete", - "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen" + "en": "This maps shows all the changes made with MapComplete" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -21,8 +18,7 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers", - "de": "Zentrum der Änderungssätze" + "en": "Changeset centers" }, "minzoom": 0, "source": { @@ -32,48 +28,41 @@ }, "title": { "render": { - "en": "Changeset for {theme}", - "de": "Änderungssatz für {theme}" + "en": "Changeset for {theme}" } }, "description": { - "en": "Shows all MapComplete changes", - "de": "Zeigt alle MapComplete-Änderungen" + "en": "Shows all MapComplete changes" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}", - "de": "Änderungssatz {id}" + "en": "Changeset {id}" } }, { "id": "contributor", "question": { - "en": "What contributor did make this change?", - "de": "Wer hat diese Änderung vorgenommen?" + "en": "What contributor did make this change?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}", - "de": "Änderung von {user}" + "en": "Change made by {user}" } }, { "id": "theme-id", "question": { - "en": "What theme was used to make this change?", - "de": "Welches Thema wurde für die Änderung verwendet?" + "en": "What theme was used to make this change?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}", - "de": "Änderung mit Thema {theme}" + "en": "Change with theme {theme}" } }, { @@ -82,23 +71,19 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?", - "de": "In welcher Benutzersprache wurde die Änderung vorgenommen?" + "en": "What locale (language) was this change made in?" }, "render": { - "en": "User locale is {locale}", - "de": "Benutzersprache ist {locale}" + "en": "User locale is {locale}" } }, { "id": "host", "render": { - "en": "Change with with {host}", - "de": "Änderung mit {host}" + "en": "Change with with {host}" }, "question": { - "en": "What host (website) was this change made with?", - "de": "Mit welchem Host (Website) wurde diese Änderung vorgenommen?" + "en": "What host (website) was this change made with?" }, "freeform": { "key": "host" @@ -119,12 +104,10 @@ { "id": "version", "question": { - "en": "What version of MapComplete was used to make this change?", - "de": "Welche Version von MapComplete wurde für diese Änderung verwendet?" + "en": "What version of MapComplete was used to make this change?" }, "render": { - "en": "Made with {editor}", - "de": "Erstellt mit {editor}" + "en": "Made with {editor}" }, "freeform": { "key": "editor" @@ -522,8 +505,7 @@ } ], "question": { - "en": "Themename contains {search}", - "de": "Themename enthält {search}" + "en": "Themename contains {search}" } } ] @@ -539,8 +521,7 @@ } ], "question": { - "en": "Themename does not contain {search}", - "de": "Themenname enthält nicht {search}" + "en": "Themename does not contain {search}" } } ] @@ -556,8 +537,7 @@ } ], "question": { - "en": "Made by contributor {search}", - "de": "Der Name enthält nicht {search}" + "en": "Made by contributor {search}" } } ] @@ -573,8 +553,7 @@ } ], "question": { - "en": "Not made by contributor {search}", - "de": "Nicht erstellt von Mitwirkendem {search}" + "en": "Not made by contributor {search}" } } ] @@ -591,8 +570,7 @@ } ], "question": { - "en": "Made before {search}", - "de": "Erstellt nach {search}" + "en": "Made before {search}" } } ] @@ -609,8 +587,7 @@ } ], "question": { - "en": "Made after {search}", - "de": "Erstellt nach {search}" + "en": "Made after {search}" } } ] @@ -626,8 +603,7 @@ } ], "question": { - "en": "User language (iso-code) {search}", - "de": "Benutzersprache (ISO-Code) {search}" + "en": "User language (iso-code) {search}" } } ] @@ -643,8 +619,7 @@ } ], "question": { - "en": "Made with host {search}", - "de": "Erstellt mit Host {search}" + "en": "Made with host {search}" } } ] @@ -655,8 +630,7 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image", - "de": "Änderungssatz fügte mindestens ein Bild hinzu" + "en": "Changeset added at least one image" } } ] @@ -667,8 +641,7 @@ { "osmTags": "theme!=grb", "question": { - "en": "Exclude GRB theme", - "de": "GRB-Thema ausschließen" + "en": "Exclude GRB theme" } } ] @@ -679,8 +652,7 @@ { "osmTags": "theme!=etymology", "question": { - "en": "Exclude etymology theme", - "de": "Etymologie-Thema ausschließen" + "en": "Exclude etymology theme" } } ] @@ -695,8 +667,7 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here", - "de": "Weitere Statistiken findest du hier" + "en": "More statistics can be found here" } }, { diff --git a/langs/de.json b/langs/de.json index f0b76e258..16671edcb 100644 --- a/langs/de.json +++ b/langs/de.json @@ -79,7 +79,7 @@ "isFavourite": "Der Standort ist derzeit als Favorit markiert und wird auf allen thematischen Karten von MapComplete angezeigt, die Sie besuchen.", "isMarkedShort": "Als bevorzugter Standort markiert", "isNotMarkedShort": "Nicht als Favorit markiert", - "markAsFavouriteTitle": "Diesen Standort als Favorit markieren", + "markAsFavouriteTitle": "Standort als Favorit markieren", "markDescription": "Diesen Standort zur persönlichen Liste bevorzugter Standorte hinzufügen", "unmark": "Standort von Favoritenliste entfernen", "unmarkNotDeleted": "Dieser Punkt wird nicht gelöscht und ist weiterhin auf der entsprechenden Karte für dich und andere sichtbar" @@ -193,6 +193,7 @@ }, "josmNotOpened": "JOSM konnte nicht erreicht werden. Bitte sicherstellen, dass das Programm geöffnet und Remote Control aktiviert ist", "josmOpened": "JOSM ist geöffnet", + "madeBy": "Erstellt von {author}", "mapContributionsBy": "Die angezeigten Daten wurden bearbeitet durch {contributors}", "mapContributionsByAndHidden": "Die angezeigten Daten wurden bearbeitet von {contributors} und {hiddenCount} weiteren Beitragenden", "mapDataByOsm": "Kartendaten: OpenStreetMap", @@ -210,7 +211,7 @@ "back": "Zurück", "backToIndex": "Alle Themenkarten anzeigen", "backToMap": "Zurück zur Karte", - "backgroundMap": "Hintergrundkarte auswählen", + "backgroundMap": "Hintergrund auswählen", "backgroundSwitch": "Hintergrund wechseln", "cancel": "Abbrechen", "clearPendingChanges": "Ausstehende Änderungen löschen", @@ -241,6 +242,7 @@ "downloadGeojson": "Sichtbare Daten als GeoJSON herunterladen", "downloadGpx": "GPX Datei herunterladen", "downloadGpxHelper": "Eine GPX Datei kann von den meisten Geräten und Anwendungen gelesen werden", + "downloadImage": "Bild herunterladen", "exporting": "Exportieren…", "includeMetaData": "Metadaten übernehmen (letzter Bearbeiter, berechnete Werte, ...)", "licenseInfo": "

Copyright-Hinweis

Die bereitgestellten Daten sind unter ODbL verfügbar. Die Wiederverwendung ist für jeden Zweck frei, aber Bitte lesen Sie den vollständigen Copyright-Hinweis für weitere Details.", @@ -297,13 +299,17 @@ "loginToStart": "Anmelden, um diese Frage zu beantworten", "loginWithOpenStreetMap": "Bei OpenStreetMap anmelden", "logout": "Abmelden", - "mappingsAreHidden": "Einige Optionen sind versteckt. Verwende die Suche, um mehr Optionen anzuzeigen.", + "mappingsAreHidden": "Suche verwenden, um weitere Auswahlmöglichkeiten anzuzeigen.", "menu": { + "aboutCurrentThemeTitle": "Über diese Karte", "aboutMapComplete": "Über MapComplete", - "filter": "Daten filtern" + "filter": "Daten filtern", + "moreUtilsTitle": "Mehr entdecken", + "showIntroduction": "Einführung anzeigen", + "title": "Menü" }, "morescreen": { - "createYourOwnTheme": "Ein eigenes MapComplete-Thema von Grund auf neu erstellen", + "createYourOwnTheme": "Eigenes MapComplete-Thema von Grund auf neu erstellen", "enterToOpen": "Drücke Enter um Theme zu öffnen", "hiddenExplanation": "Diese Themen sind nur für Personen zugänglich, die einen Link erhalten haben. Sie haben {hidden_discovered} von {total_hidden} versteckten Themen entdeckt.", "noMatchingThemes": "Keine Themen, die Ihren Suchkriterien entsprechen", @@ -408,7 +414,8 @@ "fsGeolocation": "Geolokalisierung aktivieren", "fsUserbadge": "Anmelde-Button aktivieren, um Änderungen vornehmen zu können", "fsWelcomeMessage": "Begrüßung und Registerkarten anzeigen", - "intro": "

Karte teilen

Mit dem folgenden Link kann die Karte mit Freunden und Familie geteilt werden:", + "intro": "Mit dem folgenden Link kann die Karte mit Freunden und Familie geteilt werden:", + "openInOtherApplications": "Aktuellen Standort mit einer anderen Kartenanwendung öffnen", "openLayers": "Ebenen- und Filterauswahl öffnen", "options": "Optionen teilen", "stateIsIncluded": "Die aktuelle Ebenen- und Filterauswahl ist im geteilten Link und iFrame enthalten.", @@ -510,8 +517,8 @@ }, "welcomeBack": "Willkommen zurück!", "welcomeExplanation": { - "addNew": "Fehlt ein Element? Verwende die Schaltfläche unten links, um ein neues Objekt hinzuzufügen.", - "general": "Auf dieser Karte können themenspezifische Kartenobjekte angesehen, bearbeitet und hinzugefügt werden. Verschieben Sie den Kartenausschnitt, um Objekte zu entdecken, tippen Sie auf eines, um weitere Informationen zu sehen oder zu bearbeiten. Alle Daten stammen von OpenStreetMap und dürfen frei verwendet werden." + "addNew": "Fehlt ein Element? Über die Schaltfläche unten links, kann ein neues Objekt hinzugefügt werden.", + "general": "Auf dieser Karte können Objekte angesehen, bearbeitet und hinzugefügt werden. Der Kartenausschnitt kann verschoben werden, um Objekte zu entdecken. Objekte können ausgewählt werden, um weitere Informationen anzuzeigen oder zu bearbeiten. Alle Daten stammen von OpenStreetMap und dürfen frei verwendet werden." }, "wikipedia": { "addEntry": "Eine weitere Wikipedia-Seite hinzufügen", @@ -857,4 +864,4 @@ "startsWithQ": "Ein Wikidata-Identifikator beginnt mit Q und wird von einer Zahl gefolgt" } } -} \ No newline at end of file +} diff --git a/langs/en.json b/langs/en.json index a88bbdfc9..a2da017bd 100644 --- a/langs/en.json +++ b/langs/en.json @@ -193,7 +193,7 @@ }, "josmNotOpened": "JOSM could not be reached. Make sure it is opened and remote control is enabled", "josmOpened": "JOSM is opened", - "madeBy": "Mady by {author}", + "madeBy": "Made by {author}", "mapContributionsBy": "The current visible data has edits made by {contributors}", "mapContributionsByAndHidden": "The current visible data has edits made by {contributors} and {hiddenCount} more contributors", "mapDataByOsm": "Map data: OpenStreetMap", @@ -418,7 +418,7 @@ "fsGeolocation": "Enable geolocation", "fsUserbadge": "Enable the login button and thus the possibility to make changes", "fsWelcomeMessage": "Show the welcome message popup and associated tabs", - "intro": "

Share this map

Share this map by copying the link below and sending it to friends and family:", + "intro": "Share this map by copying the link below and sending it to friends and family:", "openInOtherApplications": "Open the current location with another map application", "openLayers": "Open the layers and filters menu", "options": "Sharing options", @@ -647,7 +647,8 @@ "pointIsMoved": "The point has been moved", "reasons": { "reasonInaccurate": "The location is inaccurate by a few meter", - "reasonRelocation": "The object has been relocated to a totally different location" + "reasonRelocation": "The object has been relocated to a totally different location", + "reasonSnapTo": "This should be snapped onto {name}" }, "selectReason": "Why do you move this object?", "whyMove": "Why do you want to move this point?", @@ -782,6 +783,14 @@ "missing": "{count} untranslated strings", "notImmediate": "Translations are not updated directly. This typically takes a few days" }, + "unknown": { + "clear": "Clear answer", + "explanation": "Clear this bit of information if the current answer is incorrect but the actual value is not known. No other information will be removed.", + "keep": "Keep answer", + "markUnknown": "Mark as unknown", + "removedKeys": "The following keys will be removed:", + "title": "Mark as unknown?" + }, "userinfo": { "gotoInbox": "Open your inbox", "gotoSettings": "Go to your settings on OpenStreetMap.org", @@ -868,4 +877,4 @@ "startsWithQ": "A wikidata identifier starts with Q and is followed by a number" } } -} \ No newline at end of file +} diff --git a/langs/es.json b/langs/es.json index 91bd24431..8526a6eb0 100644 --- a/langs/es.json +++ b/langs/es.json @@ -57,7 +57,17 @@ "title": "Elementos conflictivos" }, "currentInOsmIs": "Por el momento, OpenStreetMap tiene el siguiente valor registrado:", - "done": "Listo" + "done": "Listo", + "error": "Los datos vinculados no se pudieron cargar desde el sitio web", + "lastModified": "Los datos externos se modificaron por última vez el {date}", + "loadedFrom": "Los siguientes datos se cargan desde {source} usando el JSON-LD incorporado", + "missing": { + "intro": "OpenStreetMap no tiene información sobre los siguientes atributos", + "title": "Elementos que faltan" + }, + "noDataLoaded": "El sitio web externo no tiene datos vinculados que se puedan cargar", + "overwrite": "Sobrescribir en OpenStreetMap", + "title": "Datos estructurados cargados desde un sitio externo" }, "favourite": { "loginNeeded": "

Entrar

El diseño personalizado sólo está disponible para los usuarios de OpenStreetMap", @@ -135,8 +145,11 @@ "confirmButton": "Añade una {category}
Tu adición es visible para todos
", "confirmLocation": "Confirmar esta ubicación", "confirmTitle": "¿Añadir un {title}?", + "confirmWarning": "La función que crees aquí será visible para todos. Por favor, solo agrega cosas al mapa si realmente existen. Muchas aplicaciones utilizan estos datos.", + "creating": "Creando un nuevo punto...", "disableFilters": "Desactivar todos los filtros", "disableFiltersExplanation": "Algunas características pueden estar ocultas por un filtro", + "enableLayer": "Habilitar capa {name}", "hasBeenImported": "Este elemento ya ha sido importado", "import": { "hasBeenImported": "Este objeto ya ha sido importado", @@ -144,6 +157,7 @@ "importTags": "El elemento recibirá {tags}", "officialThemesOnly": "El botón de importación está desactivado para los temas no oficiales para evitar accidentes", "wrongType": "Este elemento no es un nodo o una vía y no puede ser importado", + "wrongTypeToConflate": "Esta característica no es un nodo ni una vía y no se puede combinar", "zoomInMore": "Ampliar más para importar este elemento" }, "importTags": "El elemento recibirá {tags}", @@ -164,6 +178,8 @@ "isApplied": "Los cambios serán aplicados" }, "attribution": { + "attributionBackgroundLayer": "La capa de fondo actual es {name}", + "attributionBackgroundLayerWithCopyright": "La capa de fondo actual es {name}: {copyright}", "attributionContent": "

Todos los datos son proporcionados por OpenStreetMap, reutilizables libremente bajo la Licencia Abierta de Bases de Datos (ODL).

", "attributionTitle": "Aviso de atribución", "codeContributionsBy": "MapComplete ha sido construido por {contributors} y {hiddenCount} más contribuidores", @@ -171,31 +187,52 @@ "editId": "Abre el editor en línea de OpenStreetMap aquí", "editJosm": "Edita aquí conJOSM", "followOnMastodon": "Seguir a MapComplete en Mastodon", + "gotoSourceCode": "Ver el código fuente", "iconAttribution": { "title": "Iconos usados" }, "josmNotOpened": "No se pudo llegar a JSOM. Asegúrate de que esta abierto y que el control remoto esta activado", "josmOpened": "JOSM está abierto", + "madeBy": "Realizado por {author}", "mapContributionsBy": "La información visible actual tiene ediciones hechas por {contributors}", "mapContributionsByAndHidden": "Los datos actualmente visibles tienen ediciones hechas por {contributors} y {hiddenCount} más contribuidores", + "mapDataByOsm": "Datos del mapa: OpenStreetMap", "mapillaryHelp": "Mapillary es un servicio en línea que recoge imágenes a pié de calle y las ofrece bajo una licencia libre. Los contribuidores pueden utilizar estás imágenes para mejorar OpenStreetMap", "openIssueTracker": "Reportar un error", "openMapillary": "Abrir Mapillary aquí", "openOsmcha": "Ver las últimas ediciones hechas con {theme}", + "openOsmchaLastWeek": "Ver ediciones de los últimos 7 días", + "openThemeDocumentation": "Abrir la documentación para el mapa temático {name}", + "seeOnMapillary": "Vea esta imagen en Mapillary", "themeBy": "Tema mantenido por {author}", + "title": "Derechos de autor y atribución", "translatedBy": "MapComplete ha sido traducido por {contributors} y {hiddenCount} más contribuidores" }, "back": "Atrás", - "backToIndex": "Volver a la vista general con todos los mapas temáticos", + "backToIndex": "Ver todos los mapas temáticos", + "backToMap": "Volver al mapa", "backgroundMap": "Seleccione una capa de fondo", + "backgroundSwitch": "Cambiar fondo", "cancel": "Cancelar", + "clearPendingChanges": "Borrar cambios pendientes", "confirm": "Confirmar", "customThemeIntro": "Estos son los temas generados por los usuarios que han sido visitados previamente.", + "customThemeTitle": "Temas personalizados", "download": { + "custom": { + "download": "Descargar PNG de {width}mm de ancho y {height}mm de alto", + "downloadHelper": "Esto está pensado para imprimir", + "height": "Altura de la imagen (en mm):", + "title": "Descarga una imagen con un ancho y alto personalizados", + "width": "Ancho de imagen (en mm): " + }, "downloadAsPdf": "Descargar un PDF del mapa actual", "downloadAsPdfHelper": "Ideal para imprimir el mapa actual", + "downloadAsPng": "Descargar como imagen", + "downloadAsPngHelper": "Ideal para incluir en informes", "downloadAsSvg": "Descargar un SVG del mapa actual", "downloadAsSvgHelper": "Compatible con Inkscape o Adobe Illustrator; necesitará más procesado", + "downloadAsSvgLinesOnly": "Descarga un SVG del mapa actual que solo contenga líneas", "downloadCSV": "Descargar los datos visibles como CSV", "downloadCSVHelper": "Compatible con LibreOffice Calc, Excel, …", "downloadFeatureAsGeojson": "Descargar como un archivo GeoJSON", @@ -555,4 +592,4 @@ "description": "Un identificador de Wikidata" } } -} \ No newline at end of file +} diff --git a/langs/layers/de.json b/langs/layers/de.json index 2d7bafdf1..4626fd38d 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -7395,6 +7395,9 @@ }, "2": { "then": "Dieser Picknicktisch ist aus (recyceltem) Kunststoff hergestellt" + }, + "3": { + "then": "Der Picknicktisch ist aus Metall" } }, "question": "Aus welchem Material besteht dieser Picknicktisch?", @@ -7435,6 +7438,17 @@ }, "question": "Ist der Spielplatz für Rollstuhlfahrer zugänglich?" }, + "fee": { + "mappings": { + "0": { + "then": "Nutzung kostenlos" + }, + "1": { + "then": "Gebührenpflichtiger Spielplatz" + } + }, + "question": "Muss man zahlen, um den Spielplatz zu nutzen?" + }, "playground-access": { "mappings": { "0": { @@ -12211,4 +12225,4 @@ "render": "Windrad" } } -} \ No newline at end of file +} diff --git a/langs/layers/en.json b/langs/layers/en.json index 6a8af4c42..9c3855c37 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -3027,6 +3027,7 @@ "climbing_opportunity": { "description": "Fallback layer with items on which climbing _might_ be possible. It is loaded when zoomed in a lot, to prevent duplicate items to be added", "name": "Climbing opportunities?", + "snapName": "a wall, cliff or rock", "tagRenderings": { "climbing-opportunity-name": { "render": "{name}" @@ -3428,6 +3429,7 @@ "cycleways_and_roads": { "description": "All infrastructure that someone can cycle over, accompanied with questions about this infrastructure", "name": "Cycleways and roads", + "snapName": "a road or a cycleway", "tagRenderings": { "Cycleway type for a road": { "mappings": { @@ -5926,6 +5928,7 @@ "indoors": { "description": "Basic indoor mapping: shows room outlines", "name": "Indoors", + "snapName": "an indoor wall", "tagRenderings": { "name": { "freeform": { @@ -6095,6 +6098,7 @@ "title": "a kerb" } }, + "snapName": "a kerb", "tagRenderings": { "kerb-height": { "freeform": { @@ -7312,7 +7316,8 @@ }, "pedestrian_path": { "description": "Pedestrian footpaths, especially used for indoor navigation and snapping entrances to this layer", - "name": "Pedestrian paths" + "name": "Pedestrian paths", + "snapName": "a pedestrian path" }, "pharmacy": { "description": "A layer showing pharmacies, which (probably) dispense prescription drugs", @@ -9061,6 +9066,7 @@ "shelter": { "description": "Layer showing shelter structures", "name": "Shelter", + "snapName": "a shelter", "tagRenderings": { "shelter-type": { "mappings": { @@ -12015,6 +12021,7 @@ }, "walls_and_buildings": { "description": "Special builtin layer providing all walls and buildings. This layer is useful in presets for objects which can be placed against walls (e.g. AEDs, postboxes, entrances, addresses, surveillance cameras, …). This layer is invisible by default and not toggleable by the user.", + "snapName": "a wall or building", "tagRenderings": { "entrance_info": { "mappings": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index f44308006..7e7f3da82 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -2960,6 +2960,7 @@ "cycleways_and_roads": { "description": "Alle infrastructuur waar je over kunt fietsen, met vragen over die infrastructuur", "name": "Fietspaden, straten en wegen", + "snapName": "een weg, straat of fietspad", "tagRenderings": { "Cycleway type for a road": { "mappings": { @@ -4942,6 +4943,7 @@ "indoors": { "description": "Een basis voor indoor-navigatie: toont binnenruimtes", "name": "Binnenruimtes", + "snapName": "een binnenmuur", "tagRenderings": { "name": { "freeform": { @@ -9687,6 +9689,7 @@ }, "walls_and_buildings": { "description": "Speciale ingebouwde laag voor alle muren en gebouwen. Deze laag is nuttig in voorkeuzen voor objecten die tegen muren geplaatst kunnen worden (bv. AEDs, brievenbussen, ingangen, adressen, beveiligingscamera's,…). Deze laag is standaard onzichtbaar en niet in te schakelen door de gebruiker.", + "snapName": "een muur of gebouw", "tagRenderings": { "entrance_info": { "mappings": { diff --git a/langs/layers/sl.json b/langs/layers/sl.json index 2ac1d0797..ed88b41cc 100644 --- a/langs/layers/sl.json +++ b/langs/layers/sl.json @@ -179,6 +179,9 @@ }, "question": "Kakšne vrste spomenik je to?", "render": "To je {memorial}" + }, + "start_date": { + "render": "Datum postavitve {start_date}" } } }, @@ -517,4 +520,4 @@ } } } -} \ No newline at end of file +} diff --git a/langs/nl.json b/langs/nl.json index ac351ae6d..d409d2502 100644 --- a/langs/nl.json +++ b/langs/nl.json @@ -345,7 +345,7 @@ "embedIntro": "

Plaats dit op je website

Voeg dit kaartje toe op je eigen website.
We moedigen dit zelfs aan - je hoeft geen toestemming te vragen.
Het is gratis en zal dat altijd blijven. Hoe meer het gebruikt wordt, hoe waardevoller", "fsUserbadge": "Activeer de login-knop en dus de mogelijkheid om data aan te passen", "fsWelcomeMessage": "Toon het welkomstbericht en de bijhorende tabbladen", - "intro": "

Deel deze kaart

Kopieer onderstaande link om deze kaart naar vrienden en familie door te sturen:", + "intro": "Kopieer onderstaande link om deze kaart naar vrienden en familie door te sturen:", "thanksForSharing": "Bedankt om te delen!", "title": "Deel deze kaart" }, diff --git a/langs/sl.json b/langs/sl.json index a25cb014f..1cdbd23fb 100644 --- a/langs/sl.json +++ b/langs/sl.json @@ -15,6 +15,7 @@ "favouritePoi": { "button": { "markAsFavouriteTitle": "Označite to lokacijo kot priljubljeno", + "markDescription": "Dodaj to lokacijo na moj seznam priljubljenih", "unmark": "Odstrani to lokacijo s seznama priljubljenih" }, "introPrivacy": "Ta seznam je viden le vam", @@ -34,6 +35,7 @@ "title": "Prenos" }, "getStartedLogin": "Za začetek se vpišite s svojim OpenStreetMap računom", + "loading": "Nalaganje…", "loginFailed": "Vpis v OpenStreetMap ni uspe", "loginFailedOfflineMode": "Zaradi vzdrževanja OpenStreetMap.org trenutno ni na voljo. Urejanje bo kmalu spet mogoče", "loginFailedReadonlyMode": "Zaradi vzdrževanja je OpenStreetMap.org trenutno možno samo brati. Urejanje bo kmalu spet mogoče", @@ -71,6 +73,11 @@ "wednesday": "Srede {ranges}" }, "pickLanguage": "Izberite jezik", + "questionBox": { + "reactivate": "Prikaži preskočena vprašanja", + "skippedMultiple": "Preskočili ste {skipped} vprašanj", + "skippedOne": "Preskočili ste eno vprašanje" + }, "save": "Shrani", "search": { "error": "Nekaj se je zalomilo…", @@ -103,6 +110,14 @@ "thursday": "Četrtek", "tuesday": "Torek", "wednesday": "Sreda" + }, + "wikipedia": { + "previewbox": { + "born": "Rojen: {value}", + "died": "Umrl: {value}" + }, + "readMore": "Preberi preostanek članka", + "searchWikidata": "Išči na Wikidata" } }, "image": { @@ -114,7 +129,12 @@ "nearby": { "seeNearby": "Prebrskaj in poveži bližnje slike" }, - "pleaseLogin": "Vpišite se za dodajanje slik" + "pleaseLogin": "Vpišite se za dodajanje slik", + "respectPrivacy": "Ne fotografirajte oseb ali registrskih tablic. Ne objavljajte slik z Zemljevidov Google, Streetview ali drugih avtorsko zaščitenih virov.", + "toBig": "Vaša slika je prevelika, ker je velika {actual_size}. Prosimo, uporabite slike največ {max_size}", + "upload": { + "failReasons": "Morda ste izgubili povezavo s spletom" + } }, "index": { "intro": "MapComplete je pregledovalnik in urejevalnik zemljevida OpenStreetMap, ki prikazuje in omogoča urejanje informacij na določeno tematiko.", @@ -129,4 +149,4 @@ "partOfRelation": "Ta element je del relacije. Premaknete ga lahko z drugim urejevalnikom.", "whyMove": "Zakaj želite premakniti ta element?" } -} \ No newline at end of file +} diff --git a/langs/themes/ca.json b/langs/themes/ca.json index 74029e90c..f37474778 100644 --- a/langs/themes/ca.json +++ b/langs/themes/ca.json @@ -1038,4 +1038,4 @@ "shortDescription": "Un mapa amb papereres", "title": "Papepera" } -} \ No newline at end of file +} diff --git a/langs/themes/cs.json b/langs/themes/cs.json index 40b54044a..893f914b2 100644 --- a/langs/themes/cs.json +++ b/langs/themes/cs.json @@ -1054,4 +1054,4 @@ "shortDescription": "Mapa odpadkových košů", "title": "Odpadkový koš" } -} \ No newline at end of file +} diff --git a/langs/themes/da.json b/langs/themes/da.json index f780a079f..ec2a068e7 100644 --- a/langs/themes/da.json +++ b/langs/themes/da.json @@ -846,4 +846,4 @@ "shortDescription": "Et kort over skraldespande", "title": "Skraldespande" } -} \ No newline at end of file +} diff --git a/langs/themes/de.json b/langs/themes/de.json index 9bcbdb1b3..835f2bfe6 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -1470,8 +1470,8 @@ "title": "Abfall" }, "waste_basket": { - "description": "Auf dieser Karte findest Du Abfalleimer in Deiner Nähe. Wenn ein Abfalleimer auf dieser Karte fehlt, kannst du ihn selbst hinzufügen", + "description": "Die Karte zeigt Abfalleimer in der Nähe. Wenn ein Abfalleimer fehlt, kannst du ihn selbst hinzufügen.", "shortDescription": "Eine Karte mit Abfalleimern", "title": "Abfalleimer" } -} \ No newline at end of file +} diff --git a/langs/themes/en.json b/langs/themes/en.json index c23142e4b..8b6e6f7fd 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -1470,8 +1470,8 @@ "title": "Waste" }, "waste_basket": { - "description": "On this map, you'll find waste baskets near you. If a waste basket is missing on this map, you can add it yourself", + "description": "On this map, you'll find waste baskets near you. If a waste basket is missing on this map, you can add it yourself.", "shortDescription": "A map with waste baskets", "title": "Waste Baskets" } -} \ No newline at end of file +} diff --git a/langs/themes/es.json b/langs/themes/es.json index b4b88d6d8..0601fa87f 100644 --- a/langs/themes/es.json +++ b/langs/themes/es.json @@ -581,6 +581,7 @@ "title": "Jardines de fachada" }, "fireplace": { + "description": "Lugar al aire libre adecuado para hacer fuego y con barbacoas.", "title": "Chimenea y barbacoas" }, "food": { @@ -803,6 +804,137 @@ "description": "Un mapa en que colaborar con tiendas y restaurantes con productos sin lactosa", "title": "Tiendas y restaurantes con productos sin lactosa" }, + "lighthouses": { + "description": "Los faros son edificios altos con una luz en la parte superior para guiar el tráfico marítimo.", + "title": "Faros" + }, + "mapcomplete-changes": { + "description": "Este mapa muestra todos los cambios realizados con MapComplete", + "layers": { + "0": { + "description": "Muestra todos los cambios de MapComplete", + "filter": { + "0": { + "options": { + "0": { + "question": "El nombre del tema contiene {search}" + } + } + }, + "1": { + "options": { + "0": { + "question": "El nombre del tema contiene no {search}" + } + } + }, + "10": { + "options": { + "0": { + "question": "Excluir el tema etimológico" + } + } + }, + "2": { + "options": { + "0": { + "question": "Hecho por el colaborador {search}" + } + } + }, + "3": { + "options": { + "0": { + "question": "No realizado por el colaborador {search}" + } + } + }, + "4": { + "options": { + "0": { + "question": "Hecho antes de {search}" + } + } + }, + "5": { + "options": { + "0": { + "question": "Hecho después de {search}" + } + } + }, + "6": { + "options": { + "0": { + "question": "Idioma del usuario (código iso) {search}" + } + } + }, + "7": { + "options": { + "0": { + "question": "Hecho con el host {search}" + } + } + }, + "8": { + "options": { + "0": { + "question": "El conjunto de cambios agregó al menos una imagen" + } + } + }, + "9": { + "options": { + "0": { + "question": "Excluir tema RGB" + } + } + } + }, + "name": "Centros de conjuntos de cambios", + "tagRenderings": { + "contributor": { + "question": "¿Qué colaborador realizó este cambio?", + "render": "Cambio realizado por {user}" + }, + "host": { + "question": "¿Con qué host (sitio web) se realizó este cambio?", + "render": "Cambiar con {host}" + }, + "locale": { + "question": "¿En qué configuración regional (idioma) se realizó este cambio?", + "render": "La configuración regional del usuario es {locale}" + }, + "show_changeset_id": { + "render": "Conjunto de cambios {id}" + }, + "theme-id": { + "question": "¿Qué tema se ha utilizado para realizar este cambio?", + "render": "Cambiar con el tema {theme}" + }, + "version": { + "question": "¿Qué versión de MapComplete se ha utilizado para realizar este cambio?", + "render": "Elaborado con {editor}" + } + }, + "title": { + "render": "Cambios para {theme}" + } + }, + "1": { + "override": { + "tagRenderings+": { + "0": { + "render": "Encontraras más estadísticas aquí" + } + } + } + } + }, + "shortDescription": "Muestra los cambios realizados por MapComplete", + "title": "Cambios realizados con MapComplete" + }, "maproulette": { "description": "Tema que muestra las tareas de MapRoulette, permitiendo buscarlas, filtrarlas y arreglarlas.", "title": "Tareas de MapRoulette" @@ -817,6 +949,10 @@ "shortDescription": "Este mapa muestra la velocidad máxima permitida legalmente en cada carretera.", "title": "Velocidad" }, + "memorials": { + "description": "Los monumentos conmemorativos son objetos físicos colocados de forma permanente en el espacio público para recordar a una persona o un acontecimiento. Pueden ser objetos muy diversos, como estatuas, placas, pinturas, objetos militares (como tanques),...", + "title": "Memoriales" + }, "nature": { "description": "En este mapa, uno puede encontrar información interesante para turistas y amantes de la naturaleza.", "shortDescription": "Un mapa para amantes de la naturaleza, con PDIs interesantes", @@ -917,7 +1053,29 @@ "title": "una tienda erótica" } }, - "name": "Tiendas eróticas" + "name": "Tiendas eróticas", + "tagRenderings+": { + "0": { + "mappings": { + "0": { + "then": "Esta tienda ofrece artículos BDSM suaves, como esposas mullidas, un conjunto de ..." + }, + "1": { + "then": "Esta tienda ofrece artículos especializados en BDSM, como barras separadoras, artículos para juegos con agujas, artículos de bondage médico, herramientas de impacto, grilletes, colores metálicos, esposas, pinzas para pezones, accesorios de shibari, ..." + }, + "2": { + "then": "Esta tienda ofrece accesorios para mascotas, como máscaras de cachorros, máscaras de animales, juegos de ponis, colas, herraduras..." + }, + "3": { + "then": "Esta tienda ofrece ropa de cuero, desde pantalones y camisas de uso diario hasta arneses de cuero" + }, + "4": { + "then": "Esta tienda ofrece uniformes para juegos de rol, tales como uniformes de enfermera, uniformes militares, policía, colegiala, criada francesa, ..." + } + }, + "question": "¿Ofrece esta tienda artículos fetichistas?" + } + } } }, "4": { @@ -1036,6 +1194,32 @@ }, "postboxes": { "description": "En este mapa podrás buscar y añadir los datos de las oficinas de correos y buzones de correo. ¡Puedes utilizar este mapa para encontrar dónde enviar tu próxima postal! :)
¿Has detectado un error o falta algún buzón de correo? Puedes editar este mapa con una cuenta gratuita de OpenStreetMap.", + "layers": { + "3": { + "override": { + "+tagRenderings": { + "0": { + "mappings": { + "0": { + "then": "Esta tienda es colaboradora de correos o alguna agencia de transporte" + }, + "1": { + "then": "Esta tienda no está asociada a ninguna agencia de transporte" + } + }, + "question": "¿Es esta tienda un puesto de recogida de paquetes?" + } + }, + "=presets": { + "0": { + "description": "Si una tienda aún no está en el mapa y es un puntode recogida de paquetes, puedes añadirla aquí.", + "title": "Una tienda desaparecida que era un punto de recogida de paquetes" + } + }, + "description": "Agregar un nuevo punto de recogida al mapa en una tienda existente" + } + } + }, "shortDescription": "Un mapa que muestra buzones y oficinas de correo", "title": "Mapa de Buzones y Oficinas de Correos" }, @@ -1286,8 +1470,8 @@ "title": "Basura y reciclaje" }, "waste_basket": { - "description": "En este mapa, encontrará las papeleras cercanas a usted. Si falta una papelera en el mapa, puede añadirla usted mismo", + "description": "En este mapa, encontrarás las papeleras cercanas a ti. Si falta alguna en el mapa, puedes añadirla tu mismo.", "shortDescription": "Un mapa con papeleras", "title": "Papeleras" } -} \ No newline at end of file +} diff --git a/langs/themes/fr.json b/langs/themes/fr.json index fdffc9531..0680da154 100644 --- a/langs/themes/fr.json +++ b/langs/themes/fr.json @@ -1004,4 +1004,4 @@ "shortDescription": "Une carte des poubelles", "title": "Poubelles" } -} \ No newline at end of file +} diff --git a/langs/themes/hu.json b/langs/themes/hu.json index 48d58f1c0..507129f2b 100644 --- a/langs/themes/hu.json +++ b/langs/themes/hu.json @@ -388,4 +388,4 @@ "shortDescription": "Szemeteskosarakat ábrázoló térkép", "title": "Kukatérkép" } -} \ No newline at end of file +} diff --git a/langs/themes/it.json b/langs/themes/it.json index 9b0da466a..7531f5ce3 100644 --- a/langs/themes/it.json +++ b/langs/themes/it.json @@ -687,4 +687,4 @@ "shortDescription": "Una cartina dei cestini dei rifiuti", "title": "Cestino dei rifiuti" } -} \ No newline at end of file +} diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 177b20e8a..fc5a94b00 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -1158,4 +1158,4 @@ "shortDescription": "Een kaart met vuilnisbakken", "title": "Vuilnisbakken" } -} \ No newline at end of file +} diff --git a/langs/themes/pl.json b/langs/themes/pl.json index e3be5755f..8c37f2be7 100644 --- a/langs/themes/pl.json +++ b/langs/themes/pl.json @@ -1019,4 +1019,4 @@ "shortDescription": "Mapa koszy na śmieci", "title": "Kosz na śmieci" } -} \ No newline at end of file +} diff --git a/langs/themes/zh_Hant.json b/langs/themes/zh_Hant.json index a76a102df..6643da7eb 100644 --- a/langs/themes/zh_Hant.json +++ b/langs/themes/zh_Hant.json @@ -491,4 +491,4 @@ "shortDescription": "垃圾筒的地圖", "title": "垃圾筒" } -} \ No newline at end of file +} diff --git a/package-lock.json b/package-lock.json index adc32441a..76959decf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mapcomplete", - "version": "0.45.5", + "version": "0.46.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mapcomplete", - "version": "0.45.5", + "version": "0.46.0", "license": "GPL-3.0-or-later", "dependencies": { "@comunica/core": "^3.0.1", @@ -7894,9 +7894,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001651", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz", - "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==", + "version": "1.0.30001655", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz", + "integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==", "dev": true, "funding": [ { @@ -25255,9 +25255,9 @@ "version": "2.0.1" }, "caniuse-lite": { - "version": "1.0.30001651", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz", - "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==", + "version": "1.0.30001655", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz", + "integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==", "dev": true }, "canonicalize": { diff --git a/package.json b/package.json index 1322423d1..34b3f23cf 100644 --- a/package.json +++ b/package.json @@ -42,13 +42,12 @@ }, "default_overpass_urls": [ "https://overpass-api.de/api/interpreter", - "https://overpass.private.coffee/api/", - "https://overpass.osm.jp/api/interpreter", + "https://overpass.private.coffee/api/interpreter", + "https://overpass.osm.jp/api/interpreter" ], "#broken_overpass_urls": { "https://maps.mail.ru/osm/tools/overpass/api/interpreter": "Blocked by firefox strict tracking protection as 'tracking'", - "https://overpass.openstreetmap.ru/cgi/interpreter": "Broken as of 2024-09-05, might be a glitch", - + "https://overpass.openstreetmap.ru/cgi/interpreter": "Broken as of 2024-09-05, might be a glitch" }, "country_coder_host": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/latlon2country", "nominatimEndpoint": "https://geocoding.geofabrik.de/b75350b1cfc34962ac49824fe5b582dc/", @@ -132,7 +131,6 @@ "generate:summaryCache": "vite-node scripts/generateSummaryTileCache.ts", "create:database": "vite-node scripts/osm2pgsql/createNewDatabase.ts", "delete:database:old": "vite-node scripts/osm2pgsql/deleteOldDbs.ts" - }, "keywords": [ "OpenStreetMap", diff --git a/public/css/openinghourstable.css b/public/css/openinghourstable.css index 88400363b..731da535e 100644 --- a/public/css/openinghourstable.css +++ b/public/css/openinghourstable.css @@ -78,13 +78,6 @@ box-sizing: border-box; } -.oh-timecell-0 { - border-left: 10px solid rgba(0, 0, 0, 0); -} - -.oh-timecell-6 { - border-right: 10px solid rgba(0, 0, 0, 0); -} .oh-timecol-selected { border-right: var(--catch-detail-color); diff --git a/scripts/generateDocs.ts b/scripts/generateDocs.ts index a34db9237..2daa8ff26 100644 --- a/scripts/generateDocs.ts +++ b/scripts/generateDocs.ts @@ -55,15 +55,15 @@ class ToSlideshowJson { sections.push(currentSection) currentSection = [] } - line = line.replace("src=\"../../public/", "src=\"./") - line = line.replace("src=\"../../", "src=\"./") + line = line.replace('src="../../public/', 'src="./') + line = line.replace('src="../../', 'src="./') currentSection.push(line) } sections.push(currentSection) writeFileSync( this._target, JSON.stringify({ - sections: sections.map((s) => s.join("\n")).filter((s) => s.length > 0) + sections: sections.map((s) => s.join("\n")).filter((s) => s.length > 0), }) ) } @@ -82,7 +82,7 @@ class WikiPageGenerator { generate() { let wikiPage = - "{|class=\"wikitable sortable\"\n" + + '{|class="wikitable sortable"\n' + "! Name, link !! Genre !! Covered region !! Language !! Description !! Free materials !! Image\n" + "|-" @@ -140,7 +140,7 @@ export class GenerateDocs extends Script { } this.WriteMarkdownFile("./Docs/Tags_format.md", TagUtils.generateDocs(), [ - "src/Logic/Tags/TagUtils.ts" + "src/Logic/Tags/TagUtils.ts", ]) new ToSlideshowJson( @@ -166,7 +166,7 @@ export class GenerateDocs extends Script { }) this.WriteMarkdownFile("./Docs/SpecialRenderings.md", SpecialVisualizations.HelpMessage(), [ - "src/UI/SpecialVisualizations.ts" + "src/UI/SpecialVisualizations.ts", ]) this.WriteMarkdownFile( "./Docs/CalculatedTags.md", @@ -174,29 +174,31 @@ export class GenerateDocs extends Script { ["src/Logic/SimpleMetaTagger.ts", "src/Logic/ExtraFunctions.ts"] ) this.WriteMarkdownFile("./Docs/SpecialInputElements.md", Validators.HelpText(), [ - "src/UI/InputElement/Validators.ts" + "src/UI/InputElement/Validators.ts", ]) this.WriteMarkdownFile("./Docs/ChangesetMeta.md", Changes.getDocs(), [ "src/Logic/Osm/Changes.ts", - "src/Logic/Osm/ChangesetHandler.ts" + "src/Logic/Osm/ChangesetHandler.ts", ]) const eli = await AvailableRasterLayers.editorLayerIndex() - this.WriteMarkdownFile("./Docs/ELI-overview.md", + this.WriteMarkdownFile( + "./Docs/ELI-overview.md", [ "# Layers in the Editor Layer Index", "This table gives a summary of ids, names and other metainformation. [See the online, interactive map here](https://osmlab.github.io/editor-layer-index/) or [visit the repository](https://github.com/osmlab/editor-layer-index)", MarkdownUtils.table( ["id", "name", "category", "Best", "attribution"], - eli.map(f => [f.properties.id, f.properties.name, f.properties.category, f.properties.best ? "⭐" : "", - f.properties.attribution?.html ?? f.properties.attribution?.text + eli.map((f) => [ + f.properties.id, + f.properties.name, + f.properties.category, + f.properties.best ? "⭐" : "", + f.properties.attribution?.html ?? f.properties.attribution?.text, ]) - ) - - ].join("\n\n"), [ - "./public/assets/data/editor-layer-index.json" - - ] + ), + ].join("\n\n"), + ["./public/assets/data/editor-layer-index.json"] ) new WikiPageGenerator().generate() @@ -244,7 +246,7 @@ export class GenerateDocs extends Script { "This document is autogenerated from", autogenSource .map((s) => `[${s}](https://github.com/pietervdvn/MapComplete/blob/develop/${s})`) - .join(", ") + .join(", "), ].join(" ") writeFileSync(filename, warnAutomated + md + "\n\n" + generatedFrom + "\n") @@ -253,7 +255,7 @@ export class GenerateDocs extends Script { private generateHotkeyDocs() { new ThemeViewState(new LayoutConfig(bookcases), new Set()) this.WriteMarkdownFile("./Docs/Hotkeys.md", Hotkeys.generateDocumentation(), [ - "src/UI/Base/Hotkeys.ts" + "src/UI/Base/Hotkeys.ts", ]) } @@ -287,7 +289,7 @@ export class GenerateDocs extends Script { } this.WriteMarkdownFile("./Docs/builtin_units.md", ["# Units", ...els].join("\n\n"), [ - `assets/layers/unit/unit.json` + `assets/layers/unit/unit.json`, ]) } @@ -468,7 +470,7 @@ export class GenerateDocs extends Script { theme.title, "(", `[${theme.id}](https://mapcomplete.org/${theme.id})`, - ")" + ")", ].join(" "), "_This document details some technical information about this MapComplete theme, mostly about the attributes used in the theme. Various links point toward more information about the attributes, e.g. to the OpenStreetMap-wiki, to TagInfo or tools creating statistics_", @@ -488,7 +490,7 @@ export class GenerateDocs extends Script { MarkdownUtils.list(theme.language.filter((ln) => ln !== "_context")), "# Layers defined in this theme configuration file", "These layers can not be reused in different themes.", - ...layersToInline.map((l) => l.GenerateDocumentation(null)) + ...layersToInline.map((l) => l.GenerateDocumentation(null)), ].join("\n") this.WriteMarkdownFile( "./Docs/Themes/" + theme.id + ".md", @@ -568,10 +570,10 @@ export class GenerateDocs extends Script { Array.from(AllSharedLayers.sharedLayers.keys()).map( (id) => `[${id}](./Layers/${id}.md)` ) - ) + ), ].join("\n\n") this.WriteMarkdownFile("./Docs/BuiltinLayers.md", el, [ - "src/Customizations/AllKnownLayouts.ts" + "src/Customizations/AllKnownLayouts.ts", ]) } } diff --git a/scripts/generateLayerOverview.ts b/scripts/generateLayerOverview.ts index 18e98ed02..1de859c67 100644 --- a/scripts/generateLayerOverview.ts +++ b/scripts/generateLayerOverview.ts @@ -230,7 +230,7 @@ class LayerOverviewUtils extends Script { return } - word = Utils.SubstituteKeys(word, {}).trim() + word = Utils.SubstituteKeys(word, {})?.trim() if(!word){ return } diff --git a/scripts/generateSunnyUnlabeled.ts b/scripts/generateSunnyUnlabeled.ts index 7ce93f17c..51ca4c1a6 100644 --- a/scripts/generateSunnyUnlabeled.ts +++ b/scripts/generateSunnyUnlabeled.ts @@ -7,17 +7,15 @@ export class GenerateSunnyUnlabeled extends Script { super("Generates 'sunny-unlabeled.json' based on sunny.json") } - generateUnlabeled() { const unlabeled = { "#": "AUTOMATICALLY GENERATED! Do not edit.", ...sunny } unlabeled.name = unlabeled.name + "-unlabeled" unlabeled.layers = sunny.layers.filter( - (l) => l.type !== "symbol" || !l.layout["text-field"], + (l) => l.type !== "symbol" || !l.layout["text-field"] ) writeFileSync("public/assets/sunny-unlabeled.json", JSON.stringify(unlabeled, null, " ")) } - async main(args: string[]): Promise { this.generateUnlabeled() } diff --git a/scripts/generateTranslations.ts b/scripts/generateTranslations.ts index c6ee72d84..8521188c9 100644 --- a/scripts/generateTranslations.ts +++ b/scripts/generateTranslations.ts @@ -52,10 +52,10 @@ class TranslationPart { if (typeof v != "string") { console.error( `Non-string object at ${context} in translation while trying to add the translation ` + - JSON.stringify(v) + - ` to '` + - translationsKey + - "'. The offending object which _should_ be a translation is: ", + JSON.stringify(v) + + ` to '` + + translationsKey + + "'. The offending object which _should_ be a translation is: ", v, "\n\nThe current object is (only showing en):", this.toJson(), @@ -94,9 +94,9 @@ class TranslationPart { if (noTranslate !== undefined) { console.log( "Ignoring some translations for " + - context + - ": " + - dontTranslateKeys.join(", ") + context + + ": " + + dontTranslateKeys.join(", ") ) } } @@ -150,7 +150,7 @@ class TranslationPart { this.contents.set(key, new TranslationPart()) } - (this.contents.get(key) as TranslationPart).recursiveAdd(v, context + "." + key) + ;(this.contents.get(key) as TranslationPart).recursiveAdd(v, context + "." + key) } } @@ -179,7 +179,7 @@ class TranslationPart { let value = this.contents.get(key) if (typeof value === "string") { - value = value.replace(/"/g, "\\\"").replace(/\n/g, "\\n") + value = value.replace(/"/g, '\\"').replace(/\n/g, "\\n") if (neededLanguage === undefined) { parts.push(`"${key}": "${value}"`) } else if (key === neededLanguage) { @@ -229,7 +229,7 @@ class TranslationPart { } else if (!isLeaf) { errors.push({ error: "Mixed node: non-leaf node has translation strings", - path: path + path: path, }) } @@ -280,7 +280,7 @@ class TranslationPart { value + "\n" + fixLink, - path: path + path: path, }) } return @@ -292,7 +292,7 @@ class TranslationPart { error: `The translation for ${key} does not have the required subpart ${part} (in ${usedByLanguage}). \tThe full translation is ${value} \t${fixLink}`, - path: path + path: path, }) } } @@ -329,7 +329,6 @@ class TranslationPart { } } - /** * Converts a translation object into something that can be added to the 'generated translations'. * @@ -373,9 +372,7 @@ function transformTranslation( )}.${key}\n\tThe translations in other languages are ${JSON.stringify(value)}` } const subParts: string[] = value["en"].match(/{[^}]*}/g) - let expr = `new Translation(${JSON.stringify(value)}, "core:${path.join( - "." - )}.${key}")` + let expr = `new Translation(${JSON.stringify(value)}, "core:${path.join(".")}.${key}")` if (subParts !== null) { // convert '{to_substitute}' into 'to_substitute' const types = Utils.Dedup(subParts.map((tp) => tp.substring(1, tp.length - 1))) @@ -393,7 +390,6 @@ function transformTranslation( } if (shortNotation) { values.push(`${spaces} ${key}: ${expr}`) - } else { values.push(`${spaces}get ${key}() { return ${expr} }`) } @@ -423,26 +419,29 @@ function stringifySorted(o: object, space: string = undefined, depth = 0): strin const keys = Object.keys(o) let obj = "{" - obj += keys.sort().map(key => { - const v = o[key] - let r = "" - if (space !== undefined) { - r += "\n" - for (let i = 0; i <= depth; i++) { - r += space + obj += keys + .sort() + .map((key) => { + const v = o[key] + let r = "" + if (space !== undefined) { + r += "\n" + for (let i = 0; i <= depth; i++) { + r += space + } } - } - r += JSON.stringify("" + key) + ": " - if (typeof v === "object") { - r += stringifySorted(v, space, depth + 1) - } else if (Array.isArray(v)) { - r += "[" + v.map(v_ => stringifySorted(v_, space, depth + 1)).join(",") + "]" - } else { - r += JSON.stringify(v) - } - return r - }).join(",") + r += JSON.stringify("" + key) + ": " + if (typeof v === "object") { + r += stringifySorted(v, space, depth + 1) + } else if (Array.isArray(v)) { + r += "[" + v.map((v_) => stringifySorted(v_, space, depth + 1)).join(",") + "]" + } else { + r += JSON.stringify(v) + } + return r + }) + .join(",") if (space !== undefined) { obj += "\n" for (let i = 0; i < depth; i++) { @@ -477,7 +476,6 @@ function formatFile(path) { writeFileSync(path, contents) } - /** * Reads 'lang/*.json', writes them into to 'assets/generated/translations.json'. * This is only for the core translations @@ -662,7 +660,9 @@ function removeNonEnglishTranslations(object: any) { leaf["en"] = en }, (possibleLeaf) => - possibleLeaf !== null && typeof possibleLeaf === "object" && GenerateTranslations.isTranslation(possibleLeaf) + possibleLeaf !== null && + typeof possibleLeaf === "object" && + GenerateTranslations.isTranslation(possibleLeaf) ) } @@ -738,7 +738,6 @@ class GenerateTranslations extends Script { } } - /** * Generates the big compiledTranslations file based on 'translations.json' */ @@ -749,7 +748,12 @@ class GenerateTranslations extends Script { const translations = JSON.parse( fs.readFileSync("./src/assets/generated/translations.json", "utf-8") ) - const transformed = transformTranslation(translations, undefined, englishOnly ? ["en"] : undefined, englishOnly) + const transformed = transformTranslation( + translations, + undefined, + englishOnly ? ["en"] : undefined, + englishOnly + ) let module = `import {Translation, TypedTranslation} from "../../UI/i18n/Translation"\n\nexport default class CompiledTranslations {\n\n` module += " public static t = " + transformed diff --git a/scripts/handleErrors.ts b/scripts/handleErrors.ts index afde25d7b..8247e1175 100644 --- a/scripts/handleErrors.ts +++ b/scripts/handleErrors.ts @@ -31,12 +31,18 @@ class HandleErrors extends Script { private readonly ignoreUsers = new Set([]) - private async handleError(parsed: ErrorMessage, changesObj: Changes, downloader: OsmObjectDownloader, createdChangesets: Set, refusedFiles: Set) { + private async handleError( + parsed: ErrorMessage, + changesObj: Changes, + downloader: OsmObjectDownloader, + createdChangesets: Set, + refusedFiles: Set + ) { console.log( parsed.message.username, parsed.message.layout, parsed.message.message, - parsed.date, + parsed.date ) const e = parsed.message @@ -48,12 +54,11 @@ class HandleErrors extends Script { }>( neededIds.map(async (id) => { try { - const osmObj = await downloader.DownloadObjectAsync(id) - return ({ + return { id, osmObj, - }) + } } catch (e) { console.error("COULD NOT DOWNLOAD OBJECT", id) return { @@ -61,7 +66,7 @@ class HandleErrors extends Script { osmObj: "deleted", } } - }), + }) ) const objects = osmObjects @@ -77,8 +82,7 @@ class HandleErrors extends Script { } = changesObj.CreateChangesetObjects(toUpload, objects, true) const changeset = Changes.buildChangesetXML("", changes) - const path = - "error_changeset_" + parsed.index + "_" + e.layout + "_" + e.username + ".osc" + const path = "error_changeset_" + parsed.index + "_" + e.layout + "_" + e.username + ".osc" if ( changeset === `` @@ -130,7 +134,7 @@ ${changeset}` osmConnection, }, false, - (err) => console.error(err), + (err) => console.error(err) ) const all: ErrorMessage[] = [] @@ -152,7 +156,7 @@ ${changeset}` console.log( "\t https://osm.org/" + pendingChange.type + "/" + pendingChange.id, pendingChange.meta.changeType, - pendingChange.doDelete ? "DELETE" : "", + pendingChange.doDelete ? "DELETE" : "" ) } all.push(parsed) @@ -163,10 +167,20 @@ ${changeset}` for (const parsed of all) { try { - await this.handleError(parsed, changesObj, downloader, createdChangesets, refusedFiles) + await this.handleError( + parsed, + changesObj, + downloader, + createdChangesets, + refusedFiles + ) } catch (e) { console.error("ERROR: could not handle ", parsed, " due to", e) - writeFileSync("ERRORS."+parsed.index, "ERROR: due to " + e + ": could not handle\n" + JSON.stringify(parsed), "utf8") + writeFileSync( + "ERRORS." + parsed.index, + "ERROR: due to " + e + ": could not handle\n" + JSON.stringify(parsed), + "utf8" + ) } } } diff --git a/scripts/osm2pgsql/createNewDatabase.ts b/scripts/osm2pgsql/createNewDatabase.ts index d51533819..b22aa80ef 100644 --- a/scripts/osm2pgsql/createNewDatabase.ts +++ b/scripts/osm2pgsql/createNewDatabase.ts @@ -3,7 +3,9 @@ import { OsmPoiDatabase } from "./osmPoiDatabase" class CreateNewDatabase extends Script { constructor() { - super("Creates a new version of the database. Usage: `createNewDatabase -- YYYY-MM-DD` which will create database `osm-poi.YYYY-MM-DD`") + super( + "Creates a new version of the database. Usage: `createNewDatabase -- YYYY-MM-DD` which will create database `osm-poi.YYYY-MM-DD`" + ) } async main(args: string[]): Promise { @@ -12,5 +14,4 @@ class CreateNewDatabase extends Script { } } - new CreateNewDatabase().run() diff --git a/scripts/osm2pgsql/deleteOldDbs.ts b/scripts/osm2pgsql/deleteOldDbs.ts index 1fa6fd240..32d69bac3 100644 --- a/scripts/osm2pgsql/deleteOldDbs.ts +++ b/scripts/osm2pgsql/deleteOldDbs.ts @@ -12,5 +12,4 @@ class DeleteOldDbs extends Script { } } - new DeleteOldDbs().run() diff --git a/scripts/osm2pgsql/osmPoiDatabase.ts b/scripts/osm2pgsql/osmPoiDatabase.ts index cb7159e9c..d03406ae3 100644 --- a/scripts/osm2pgsql/osmPoiDatabase.ts +++ b/scripts/osm2pgsql/osmPoiDatabase.ts @@ -68,7 +68,6 @@ export class OsmPoiDatabase { const metaclient = this.getMetaClient() await metaclient.connect() try { - const meta = await metaclient.query("SELECT datname FROM pg_database") let latest: string = undefined let latestDate: Date = new Date(0) @@ -104,7 +103,7 @@ export class OsmPoiDatabase { } console.log("Latest database is:", latest) - return "osm-poi."+latest + return "osm-poi." + latest } async createNew(date: string) { @@ -113,7 +112,6 @@ export class OsmPoiDatabase { const metaclient = this.getMetaClient() await metaclient.connect() try { - await metaclient.query(`CREATE DATABASE "${dbname}"`) console.log("Database created - installing extensions") const client = new Client(this._connectionString + "/" + dbname) @@ -129,7 +127,7 @@ export class OsmPoiDatabase { } } - async deleteAllButLatest(){ + async deleteAllButLatest() { const dbs = await this.findSuitableDatabases() for (let i = 0; i < dbs.length - 1; i++) { await this.deleteDatabase(dbs[i]) @@ -152,7 +150,6 @@ export class OsmPoiDatabase { } } - async connectToLatest() { const latest = await this.searchLatest() this._client = new Client(this._connectionString + "/" + latest) @@ -161,7 +158,7 @@ export class OsmPoiDatabase { async getCount( layer: string, - bbox: [[number, number], [number, number]] = undefined, + bbox: [[number, number], [number, number]] = undefined ): Promise<{ count: number; lat: number; lon: number }> { await this.connectIfNeeded() diff --git a/scripts/osm2pgsql/tilecountServer.ts b/scripts/osm2pgsql/tilecountServer.ts index beb0d2d61..15a35c86c 100644 --- a/scripts/osm2pgsql/tilecountServer.ts +++ b/scripts/osm2pgsql/tilecountServer.ts @@ -3,7 +3,6 @@ import { Server } from "../server" import Script from "../Script" import { OsmPoiDatabase } from "./osmPoiDatabase" - class CachedSqlCount { private readonly _cache: Record< string, diff --git a/src/Logic/Actors/PreferredRasterLayerSelector.ts b/src/Logic/Actors/PreferredRasterLayerSelector.ts index 25af44345..98d71211b 100644 --- a/src/Logic/Actors/PreferredRasterLayerSelector.ts +++ b/src/Logic/Actors/PreferredRasterLayerSelector.ts @@ -64,9 +64,9 @@ export class PreferredRasterLayerSelector { */ private async updateLayer() { // What is the ID of the layer we have to (try to) load? - const targetLayerId = ( - (this._queryParameter.data ?? this._preferredBackgroundLayer.data)?.toLowerCase() - )?.toLowerCase() + const targetLayerId = (this._queryParameter.data ?? this._preferredBackgroundLayer.data) + ?.toLowerCase() + ?.toLowerCase() if (targetLayerId === undefined || targetLayerId === "default") { return } @@ -78,7 +78,7 @@ export class PreferredRasterLayerSelector { return } await AvailableRasterLayers.editorLayerIndex() - const isCategory = (eliCategory).indexOf( targetLayerId) >= 0 + const isCategory = eliCategory.indexOf(targetLayerId) >= 0 const available = this._availableLayers.store.data const foundLayer = isCategory ? available.find((l) => l.properties.category === targetLayerId) diff --git a/src/Logic/FeatureSource/Sources/OverpassFeatureSource.ts b/src/Logic/FeatureSource/Sources/OverpassFeatureSource.ts index 29b441068..7872d67bc 100644 --- a/src/Logic/FeatureSource/Sources/OverpassFeatureSource.ts +++ b/src/Logic/FeatureSource/Sources/OverpassFeatureSource.ts @@ -50,17 +50,20 @@ export default class OverpassFeatureSource implements UpdatableFeatureSource { options?: { padToTiles?: Store isActive?: Store - }, + } ) { this.state = state this._isActive = options?.isActive ?? new ImmutableStore(true) this.padToZoomLevel = options?.padToTiles const self = this - this._layersToDownload = state.zoom.map(zoom => this.layersToDownload(zoom)) + this._layersToDownload = state.zoom.map((zoom) => this.layersToDownload(zoom)) - state.bounds.mapD((_) => { - self.updateAsyncIfNeeded() - }, [this._layersToDownload]) + state.bounds.mapD( + (_) => { + self.updateAsyncIfNeeded() + }, + [this._layersToDownload] + ) } private layersToDownload(zoom: number): LayerConfig[] { @@ -82,7 +85,7 @@ export default class OverpassFeatureSource implements UpdatableFeatureSource { // This is a special layer. Should not have been here console.warn( "OverpassFeatureSource received a layer for which the source is null:", - layer.id, + layer.id ) continue } @@ -116,7 +119,7 @@ export default class OverpassFeatureSource implements UpdatableFeatureSource { throw "Panic: overpassFeatureSource didn't receive any overpassUrls" } // Note: the bounds are updated between attempts, in case that the user zoomed around - let bounds : BBox + let bounds: BBox do { try { bounds = this.state.bounds.data @@ -165,10 +168,16 @@ export default class OverpassFeatureSource implements UpdatableFeatureSource { const end = new Date() const timeNeeded = (end.getTime() - start.getTime()) / 1000 - console.log("Overpass returned", data.features.length, "features in", timeNeeded, "seconds") + console.log( + "Overpass returned", + data.features.length, + "features in", + timeNeeded, + "seconds" + ) self.features.setData(data.features) this._lastQueryBBox = bounds - this._lastRequestedLayers= layersToDownload + this._lastRequestedLayers = layersToDownload } catch (e) { console.error("Got the overpass response, but could not process it: ", e, e.stack) } finally { diff --git a/src/Logic/Osm/Actions/ChangeLocationAction.ts b/src/Logic/Osm/Actions/ChangeLocationAction.ts index 9c774b839..85b6a34b1 100644 --- a/src/Logic/Osm/Actions/ChangeLocationAction.ts +++ b/src/Logic/Osm/Actions/ChangeLocationAction.ts @@ -1,10 +1,15 @@ import { ChangeDescription } from "./ChangeDescription" import OsmChangeAction from "./OsmChangeAction" +import { WayId } from "../../../Models/OsmFeature" +import InsertPointIntoWayAction from "./InsertPointIntoWayAction" +import { SpecialVisualizationState } from "../../../UI/SpecialVisualization" export default class ChangeLocationAction extends OsmChangeAction { private readonly _id: number private readonly _newLonLat: [number, number] private readonly _meta: { theme: string; reason: string } + private readonly state: SpecialVisualizationState + private snapTo: WayId | undefined static metatags: { readonly key?: string readonly value?: string @@ -21,28 +26,30 @@ export default class ChangeLocationAction extends OsmChangeAction { ] constructor( + state: SpecialVisualizationState, id: string, newLonLat: [number, number], + snapTo: WayId | undefined, meta: { theme: string reason: string - } + }, ) { super(id, true) + this.state = state if (!id.startsWith("node/")) { throw "Invalid ID: only 'node/number' is accepted" } this._id = Number(id.substring("node/".length)) this._newLonLat = newLonLat + this.snapTo = snapTo this._meta = meta } protected async CreateChangeDescriptions(): Promise { + const [lon, lat] = this._newLonLat const d: ChangeDescription = { - changes: { - lat: this._newLonLat[1], - lon: this._newLonLat[0], - }, + changes: { lon, lat }, type: "node", id: this._id, meta: { @@ -51,7 +58,21 @@ export default class ChangeLocationAction extends OsmChangeAction { specialMotivation: this._meta.reason, }, } + if (!this.snapTo) { + return [d] + } + const snapToWay = await this.state.osmObjectDownloader.DownloadObjectAsync(this.snapTo, 0) + if (snapToWay === "deleted") { + return [d] + } - return [d] + const insertIntoWay = new InsertPointIntoWayAction( + lat, lon, this._id, snapToWay, { + allowReuseOfPreviouslyCreatedPoints: false, + reusePointWithinMeters: 0.25, + }, + ).prepareChangeDescription() + + return [d, { ...insertIntoWay, meta: d.meta }] } } diff --git a/src/Logic/Osm/Actions/CreateNewNodeAction.ts b/src/Logic/Osm/Actions/CreateNewNodeAction.ts index 251a9413a..a935575d2 100644 --- a/src/Logic/Osm/Actions/CreateNewNodeAction.ts +++ b/src/Logic/Osm/Actions/CreateNewNodeAction.ts @@ -5,6 +5,7 @@ import { ChangeDescription } from "./ChangeDescription" import { And } from "../../Tags/And" import { OsmWay } from "../OsmObject" import { GeoOperations } from "../../GeoOperations" +import InsertPointIntoWayAction from "./InsertPointIntoWayAction" export default class CreateNewNodeAction extends OsmCreateAction { /** @@ -37,7 +38,7 @@ export default class CreateNewNodeAction extends OsmCreateAction { theme: string changeType: "create" | "import" | null specialMotivation?: string - } + }, ) { super(null, basicTags !== undefined && basicTags.length > 0) this._basicTags = basicTags @@ -101,72 +102,20 @@ export default class CreateNewNodeAction extends OsmCreateAction { return [newPointChange] } - // Project the point onto the way - console.log("Snapping a node onto an existing way...") - const geojson = this._snapOnto.asGeoJson() - const projected = GeoOperations.nearestPoint(GeoOperations.outerRing(geojson), [ - this._lon, + const change = new InsertPointIntoWayAction( this._lat, - ]) - const projectedCoor = <[number, number]>projected.geometry.coordinates - const index = projected.properties.index - console.log("Attempting to snap:", { geojson, projected, projectedCoor, index }) - // We check that it isn't close to an already existing point - let reusedPointId = undefined - let reusedPointCoordinates: [number, number] = undefined - let outerring: [number, number][] + this._lon, + id, + this._snapOnto, + { + reusePointWithinMeters: this._reusePointDistance, + allowReuseOfPreviouslyCreatedPoints: this._reusePreviouslyCreatedPoint, + }, + ).prepareChangeDescription() - if (geojson.geometry.type === "LineString") { - outerring = <[number, number][]>geojson.geometry.coordinates - } else if (geojson.geometry.type === "Polygon") { - outerring = <[number, number][]>geojson.geometry.coordinates[0] - } - - const prev = outerring[index] - if (GeoOperations.distanceBetween(prev, projectedCoor) < this._reusePointDistance) { - // We reuse this point instead! - reusedPointId = this._snapOnto.nodes[index] - reusedPointCoordinates = this._snapOnto.coordinates[index] - } - const next = outerring[index + 1] - if (GeoOperations.distanceBetween(next, projectedCoor) < this._reusePointDistance) { - // We reuse this point instead! - reusedPointId = this._snapOnto.nodes[index + 1] - reusedPointCoordinates = this._snapOnto.coordinates[index + 1] - } - if (reusedPointId !== undefined) { - this.setElementId(reusedPointId) - return [ - { - tags: new And(this._basicTags).asChange(properties), - type: "node", - id: reusedPointId, - meta: this.meta, - changes: { lat: reusedPointCoordinates[0], lon: reusedPointCoordinates[1] }, - }, - ] - } - - const locations = [ - ...this._snapOnto.coordinates?.map(([lat, lon]) => <[number, number]>[lon, lat]), - ] - const ids = [...this._snapOnto.nodes] - - locations.splice(index + 1, 0, [this._lon, this._lat]) - ids.splice(index + 1, 0, id) - - // Allright, we have to insert a new point in the way return [ newPointChange, - { - type: "way", - id: this._snapOnto.id, - changes: { - coordinates: locations, - nodes: ids, - }, - meta: this.meta, - }, + { ...change, meta: this.meta }, ] } diff --git a/src/Logic/Osm/Actions/InsertPointIntoWayAction.ts b/src/Logic/Osm/Actions/InsertPointIntoWayAction.ts new file mode 100644 index 000000000..fb013e56e --- /dev/null +++ b/src/Logic/Osm/Actions/InsertPointIntoWayAction.ts @@ -0,0 +1,96 @@ +import { ChangeDescription } from "./ChangeDescription" +import { GeoOperations } from "../../GeoOperations" +import { OsmWay } from "../OsmObject" + +export default class InsertPointIntoWayAction { + private readonly _lat: number + private readonly _lon: number + private readonly _idToInsert: number + private readonly _snapOnto: OsmWay + private readonly _options: { + allowReuseOfPreviouslyCreatedPoints?: boolean + reusePointWithinMeters?: number + } + + constructor( + lat: number, + lon: number, + idToInsert: number, + snapOnto: OsmWay, + options: { + allowReuseOfPreviouslyCreatedPoints?: boolean + reusePointWithinMeters?: number + } + ){ + this._lat = lat + this._lon = lon + this._idToInsert = idToInsert + this._snapOnto = snapOnto + this._options = options + + } + + /** + * Tries to create the changedescription of the way where the point is inserted + * Returns `undefined` if inserting failed + */ + public prepareChangeDescription(): Omit | undefined { + + + // Project the point onto the way + console.log("Snapping a node onto an existing way...") + const geojson = this._snapOnto.asGeoJson() + const projected = GeoOperations.nearestPoint(GeoOperations.outerRing(geojson), [ + this._lon, + this._lat, + ]) + const projectedCoor = <[number, number]>projected.geometry.coordinates + const index = projected.properties.index + console.log("Attempting to snap:", { geojson, projected, projectedCoor, index }) + // We check that it isn't close to an already existing point + let reusedPointId = undefined + let reusedPointCoordinates: [number, number] = undefined + let outerring: [number, number][] + + if (geojson.geometry.type === "LineString") { + outerring = <[number, number][]>geojson.geometry.coordinates + } else if (geojson.geometry.type === "Polygon") { + outerring = <[number, number][]>geojson.geometry.coordinates[0] + } + + const prev = outerring[index] + if (GeoOperations.distanceBetween(prev, projectedCoor) < this._options.reusePointWithinMeters) { + // We reuse this point instead! + reusedPointId = this._snapOnto.nodes[index] + reusedPointCoordinates = this._snapOnto.coordinates[index] + } + const next = outerring[index + 1] + if (GeoOperations.distanceBetween(next, projectedCoor) < this._options.reusePointWithinMeters) { + // We reuse this point instead! + reusedPointId = this._snapOnto.nodes[index + 1] + reusedPointCoordinates = this._snapOnto.coordinates[index + 1] + } + if (reusedPointId !== undefined) { + return undefined + } + + const locations = [ + ...this._snapOnto.coordinates?.map(([lat, lon]) => <[number, number]>[lon, lat]), + ] + const ids = [...this._snapOnto.nodes] + + locations.splice(index + 1, 0, [this._lon, this._lat]) + ids.splice(index + 1, 0, this._idToInsert) + + return { + type: "way", + id: this._snapOnto.id, + changes: { + coordinates: locations, + nodes: ids, + } + } + + } + +} diff --git a/src/Logic/Osm/Changes.ts b/src/Logic/Osm/Changes.ts index f7ece74bf..03b971b83 100644 --- a/src/Logic/Osm/Changes.ts +++ b/src/Logic/Osm/Changes.ts @@ -53,7 +53,7 @@ export class Changes { featureSwitches?: FeatureSwitchState }, leftRightSensitive: boolean = false, - reportError?: (string: string | Error, extramessage?: string) => void, + reportError?: (string: string | Error, extramessage?: string) => void ) { this._leftRightSensitive = leftRightSensitive // We keep track of all changes just as well @@ -68,7 +68,7 @@ export class Changes { state.osmConnection, state.featurePropertiesStore, this, - (e, extramessage: string) => this._reportError(e, extramessage), + (e, extramessage: string) => this._reportError(e, extramessage) ) this.historicalUserLocations = state.historicalUserLocations @@ -82,7 +82,7 @@ export class Changes { modifiedObjects: OsmObject[] newObjects: OsmObject[] deletedObjects: OsmObject[] - }, + } ): string { const changedElements = allChanges.modifiedObjects ?? [] const newElements = allChanges.newObjects ?? [] @@ -172,7 +172,7 @@ export class Changes { docs: "The identifier of the used background layer, this will probably be an identifier from the [editor layer index](https://github.com/osmlab/editor-layer-index)", }, ], - "default", + "default" ), ...addSource(ChangeTagAction.metatags, "ChangeTag"), ...addSource(ChangeLocationAction.metatags, "ChangeLocation"), @@ -201,7 +201,7 @@ export class Changes { : "", ].join("\n"), source, - ]), + ]) ), ].join("\n\n") } @@ -217,7 +217,11 @@ export class Changes { // See #2082. We check for previous rewritings, as a remapping might be from a previous session do { this._nextId-- - } while (this._changesetHandler._remappings.has("node/" + this._nextId) || this._changesetHandler._remappings.has("way/" + this._nextId) || this._changesetHandler._remappings.has("relation/" + this._nextId)) + } while ( + this._changesetHandler._remappings.has("node/" + this._nextId) || + this._changesetHandler._remappings.has("way/" + this._nextId) || + this._changesetHandler._remappings.has("relation/" + this._nextId) + ) return this._nextId } @@ -254,7 +258,7 @@ export class Changes { const changeDescriptions = await action.Perform(this) const remapped = ChangeDescriptionTools.rewriteAllIds( changeDescriptions, - this._changesetHandler._remappings, + this._changesetHandler._remappings ) remapped[0].meta.distanceToObject = this.calculateDistanceToChanges(action, remapped) @@ -319,7 +323,7 @@ export class Changes { } if (change.changes === undefined) { // This object is a change to a newly created object. However, we have not seen the creation changedescription yet! - if(ignoreNoCreate){ + if (ignoreNoCreate) { continue } throw "Not a creation of the object: " + JSON.stringify(change) @@ -462,7 +466,7 @@ export class Changes { result.modifiedObjects.length, "modified;", result.deletedObjects.length, - "deleted", + "deleted" ) } return result @@ -470,7 +474,7 @@ export class Changes { private calculateDistanceToChanges( change: OsmChangeAction, - changeDescriptions: ChangeDescription[], + changeDescriptions: ChangeDescription[] ) { const locations = this.historicalUserLocations?.features?.data if (locations === undefined) { @@ -490,7 +494,7 @@ export class Changes { .filter((feat) => feat.geometry.type === "Point") .filter((feat) => { const visitTime = new Date( - ((feat.properties)).date, + ((feat.properties)).date ) // In seconds const diff = (now.getTime() - visitTime.getTime()) / 1000 @@ -537,9 +541,9 @@ export class Changes { ...recentLocationPoints.map((gpsPoint) => { const otherCoor = GeoOperations.centerpointCoordinates(gpsPoint) return GeoOperations.distanceBetween(coor, otherCoor) - }), - ), - ), + }) + ) + ) ) } @@ -575,7 +579,7 @@ export class Changes { public fragmentChanges( pending: ChangeDescription[], - objects: OsmObject[], + objects: OsmObject[] ): { refused: ChangeDescription[] toUpload: ChangeDescription[] @@ -585,7 +589,7 @@ export class Changes { // All ids which have an 'update' const createdIds = new Set( - pending.filter((cd) => cd.changes !== undefined).map((cd) => cd.id), + pending.filter((cd) => cd.changes !== undefined).map((cd) => cd.id) ) pending.forEach((c) => { if (c.id < 0) { @@ -594,7 +598,7 @@ export class Changes { } else { this._reportError( `Got an orphaned change. The 'creation'-change description for ${c.type}/${c.id} got lost. Permanently dropping this change:` + - JSON.stringify(c), + JSON.stringify(c) ) } return @@ -605,10 +609,10 @@ export class Changes { } else { console.log( "Refusing change about " + - c.type + - "/" + - c.id + - " as not in the objects. No internet?", + c.type + + "/" + + c.id + + " as not in the objects. No internet?" ) refused.push(c) } @@ -623,16 +627,18 @@ export class Changes { */ private async flushSelectChanges( pending: ChangeDescription[], - openChangeset: UIEventSource, + openChangeset: UIEventSource ): Promise { const neededIds = Changes.GetNeededIds(pending) /* Download the latest version of the OSM-objects - * We _do not_ pass in the Changes object itself - we want the data from OSM directly in order to apply the changes - */ + * We _do not_ pass in the Changes object itself - we want the data from OSM directly in order to apply the changes + */ const downloader = new OsmObjectDownloader(this.backend, undefined) - const osmObjects = Utils.NoNull(await Promise.all<{ id: string; osmObj: OsmObject | "deleted" }>( - neededIds.map((id) => this.getOsmObject(id, downloader)), - )) + const osmObjects = Utils.NoNull( + await Promise.all<{ id: string; osmObj: OsmObject | "deleted" }>( + neededIds.map((id) => this.getOsmObject(id, downloader)) + ) + ) // Drop changes to deleted items for (const { osmObj, id } of osmObjects) { @@ -665,7 +671,7 @@ export class Changes { (csId, remappings) => { if (remappings.size > 0) { toUpload = toUpload.map((ch) => - ChangeDescriptionTools.rewriteIds(ch, remappings), + ChangeDescriptionTools.rewriteIds(ch, remappings) ) } @@ -678,7 +684,7 @@ export class Changes { return Changes.buildChangesetXML("" + csId, changes) }, metatags, - openChangeset, + openChangeset ) console.log("Upload successful! Refused changes are", refused) @@ -695,15 +701,15 @@ export class Changes { pending .filter( (descr) => - descr.meta.changeType !== undefined && descr.meta.changeType !== null, + descr.meta.changeType !== undefined && descr.meta.changeType !== null ) - .map((descr) => descr.meta.changeType), + .map((descr) => descr.meta.changeType) ), ([key, count]) => ({ key: key, value: count, aggregate: true, - }), + }) ) const motivations = pending .filter((descr) => descr.meta.specialMotivation !== undefined) @@ -742,7 +748,7 @@ export class Changes { value: count, aggregate: true, } - }), + }) ) // This method is only called with changedescriptions for this theme @@ -788,14 +794,14 @@ export class Changes { try { const openChangeset = UIEventSource.asInt( this.state.osmConnection.GetPreference( - "current-open-changeset-" + theme, - ), + "current-open-changeset-" + theme + ) ) console.log( "Using current-open-changeset-" + - theme + - " from the preferences, got " + - openChangeset.data, + theme + + " from the preferences, got " + + openChangeset.data ) const refused = await self.flushSelectChanges(pendingChanges, openChangeset) @@ -810,7 +816,7 @@ export class Changes { this.errors.ping() return pendingChanges } - }), + }) ) // We keep all the refused changes to try them again @@ -818,7 +824,7 @@ export class Changes { } catch (e) { console.error( "Could not handle changes - probably an old, pending changeset in localstorage with an invalid format; erasing those", - e, + e ) this.errors.data.push(e) this.errors.ping() diff --git a/src/Logic/Osm/ChangesetHandler.ts b/src/Logic/Osm/ChangesetHandler.ts index 90e87e1ef..370146817 100644 --- a/src/Logic/Osm/ChangesetHandler.ts +++ b/src/Logic/Osm/ChangesetHandler.ts @@ -21,8 +21,11 @@ export type ChangesetMetadata = { uid: number user: string changes_count: number - tags: Record, - minlat: number, minlon: number, maxlat: number, maxlon: number + tags: Record + minlat: number + minlon: number + maxlat: number + maxlon: number comments_count: number } @@ -49,7 +52,7 @@ export class ChangesetHandler { | { addAlias: (id0: string, id1: string) => void } | undefined, changes: Changes, - reportError: (e: string | Error, extramessage: string) => void, + reportError: (e: string | Error, extramessage: string) => void ) { this.osmConnection = osmConnection this._reportError = reportError @@ -107,27 +110,27 @@ export class ChangesetHandler { return hasChange } - private async UploadWithNew(generateChangeXML: (csid: number, remappings: Map) => string, openChangeset: UIEventSource, extraMetaTags: ChangesetTag[]) { + private async UploadWithNew( + generateChangeXML: (csid: number, remappings: Map) => string, + openChangeset: UIEventSource, + extraMetaTags: ChangesetTag[] + ) { const csId = await this.OpenChangeset(extraMetaTags) openChangeset.setData(csId) const changeset = generateChangeXML(csId, this._remappings) console.log( "Opened a new changeset (openChangeset.data is undefined):", changeset, - extraMetaTags, + extraMetaTags ) const changes = await this.UploadChange(csId, changeset) - const hasSpecialMotivationChanges = ChangesetHandler.rewriteMetaTags( - extraMetaTags, - changes, - ) + const hasSpecialMotivationChanges = ChangesetHandler.rewriteMetaTags(extraMetaTags, changes) if (hasSpecialMotivationChanges) { // At this point, 'extraMetaTags' will have changed - we need to set the tags again await this.UpdateTags(csId, extraMetaTags) } } - /** * The full logic to upload a change to one or more elements. * @@ -141,7 +144,7 @@ export class ChangesetHandler { public async UploadChangeset( generateChangeXML: (csid: number, remappings: Map) => string, extraMetaTags: ChangesetTag[], - openChangeset: UIEventSource, + openChangeset: UIEventSource ): Promise { if ( !extraMetaTags.some((tag) => tag.key === "comment") || @@ -174,30 +177,30 @@ export class ChangesetHandler { // We can hopefully reuse the changeset try { - const rewritings = await this.UploadChange( csId, - generateChangeXML(csId, this._remappings), + generateChangeXML(csId, this._remappings) ) const rewrittenTags = this.RewriteTagsOf( extraMetaTags, rewritings, - oldChangesetMeta, + oldChangesetMeta ) await this.UpdateTags(csId, rewrittenTags) return // We are done! } catch (e) { this._reportError(e, "While reusing a changeset " + openChangeset.data) } - } } catch (e) { - this._reportError(e, "While getting metadata from a changeset " + openChangeset.data) + this._reportError( + e, + "While getting metadata from a changeset " + openChangeset.data + ) } } - // We have to open a new changeset try { return await this.UploadWithNew(generateChangeXML, openChangeset, extraMetaTags) @@ -212,7 +215,7 @@ export class ChangesetHandler { console.warn( "Could not open/upload changeset due to ", e, - "trying again with a another fresh changeset ", + "trying again with a another fresh changeset " ) openChangeset.setData(undefined) @@ -238,7 +241,7 @@ export class ChangesetHandler { uid: number // User ID changes_count: number tags: any - }, + } ): ChangesetTag[] { // Note: extraMetaTags is where all the tags are collected into @@ -375,7 +378,7 @@ export class ChangesetHandler { tag.key !== undefined && tag.value !== undefined && tag.key !== "" && - tag.value !== "", + tag.value !== "" ) const metadata = tags.map((kv) => ``) const content = [``, metadata, ``].join("") @@ -415,7 +418,7 @@ export class ChangesetHandler { const csId = await this.osmConnection.put( "changeset/create", [``, metadata, ``].join(""), - { "Content-Type": "text/xml" }, + { "Content-Type": "text/xml" } ) return Number(csId) } @@ -425,12 +428,12 @@ export class ChangesetHandler { */ private async UploadChange( changesetId: number, - changesetXML: string, + changesetXML: string ): Promise> { const response = await this.osmConnection.post( "changeset/" + changesetId + "/upload", changesetXML, - { "Content-Type": "text/xml" }, + { "Content-Type": "text/xml" } ) const changes = this.parseUploadChangesetResponse(response) console.log("Uploaded changeset ", changesetId) diff --git a/src/Logic/State/FeatureSwitchState.ts b/src/Logic/State/FeatureSwitchState.ts index 2b4ccf8c8..ad3d0458c 100644 --- a/src/Logic/State/FeatureSwitchState.ts +++ b/src/Logic/State/FeatureSwitchState.ts @@ -81,7 +81,7 @@ export default class FeatureSwitchState extends OsmConnectionFeatureSwitches { const legacyRewrite: Record = { "fs-userbadge": "fs-enable-login", - "fs-layers": ["fs-filter", "fs-background"] + "fs-layers": ["fs-filter", "fs-background"], } for (const key in legacyRewrite) { @@ -251,17 +251,20 @@ export default class FeatureSwitchState extends OsmConnectionFeatureSwitches { this.backgroundLayerId = QueryParameters.GetQueryParameter( "background", layoutToUse?.defaultBackgroundId, - ["When set, load this raster layer (or a layer of this category) as background layer instead of using the default background. This is as if the user opened the background selection menu and selected the layer with the given id or category.", + [ + "When set, load this raster layer (or a layer of this category) as background layer instead of using the default background. This is as if the user opened the background selection menu and selected the layer with the given id or category.", "Most raster layers are based on the [editor layer index](https://github.com/osmlab/editor-layer-index)", "#### Selecting a category", "If one of the following values is used, this parameter will be interpreted as a _category_ instead of the id of a specific layer. The best layer of this category will be used. Supported categories are those from the editor layer index and are:", - eliCategory.map(c => "- " + c).join("\n"), + eliCategory.map((c) => "- " + c).join("\n"), "#### Selecting a specific layer", "One can use the [ID of an ELI-layer](./ELI-overview.md) or use one of the global, builtin layers:", - MarkdownUtils.list(AvailableRasterLayers.globalLayers.map(global => - global.properties.id+(global.properties.best ? " ⭐" : "") - )) + MarkdownUtils.list( + AvailableRasterLayers.globalLayers.map( + (global) => global.properties.id + (global.properties.best ? " ⭐" : "") + ) + ), ].join("\n\n") ) } diff --git a/src/Logic/State/UserRelatedState.ts b/src/Logic/State/UserRelatedState.ts index 90cc0645d..82c17484c 100644 --- a/src/Logic/State/UserRelatedState.ts +++ b/src/Logic/State/UserRelatedState.ts @@ -95,7 +95,7 @@ export default class UserRelatedState { this.showAllQuestionsAtOnce = UIEventSource.asBoolean( this.osmConnection.GetPreference("show-all-questions", "false", { documentation: - "Either 'true' or 'false'. If set, all questions will be shown all at once" + "Either 'true' or 'false'. If set, all questions will be shown all at once", }) ) this.language = this.osmConnection.GetPreference("language") @@ -115,7 +115,7 @@ export default class UserRelatedState { undefined, { documentation: - "The ID of a layer or layer category that MapComplete uses by default" + "The ID of a layer or layer category that MapComplete uses by default", } ) @@ -123,12 +123,12 @@ export default class UserRelatedState { "preferences-add-new-mode", "button_click_right", { - documentation: "How adding a new feature is done" + documentation: "How adding a new feature is done", } ) this.imageLicense = this.osmConnection.GetPreference("pictures-license", "CC0", { - documentation: "The license under which new images are uploaded" + documentation: "The license under which new images are uploaded", }) this.installedUserThemes = this.InitInstalledUserThemes() this.translationMode = this.initTranslationMode() @@ -171,7 +171,6 @@ export default class UserRelatedState { this.language.syncWith(Locale.language) } - private initTranslationMode(): UIEventSource<"false" | "true" | "mobile" | undefined | string> { const translationMode: UIEventSource = this.osmConnection.GetPreference("translation-mode", "false") @@ -191,7 +190,6 @@ export default class UserRelatedState { } }) return translationMode - } private static initUserSettingsState(): LayerConfig { @@ -216,8 +214,8 @@ export default class UserRelatedState { } catch (e) { console.warn( "Removing theme " + - id + - " as it could not be parsed from the preferences; the content is:", + id + + " as it could not be parsed from the preferences; the content is:", str ) pref.setData(null) @@ -247,7 +245,7 @@ export default class UserRelatedState { icon: layout.icon, title: layout.title.translations, shortDescription: layout.shortDescription.translations, - definition: layout["definition"] + definition: layout["definition"], }) ) } @@ -287,13 +285,13 @@ export default class UserRelatedState { id: "home", "user:home": "yes", _lon: homeLonLat[0], - _lat: homeLonLat[1] + _lat: homeLonLat[1], }, geometry: { type: "Point", - coordinates: homeLonLat - } - } + coordinates: homeLonLat, + }, + }, ] }) return new StaticFeatureSource(feature) @@ -314,7 +312,7 @@ export default class UserRelatedState { _applicationOpened: new Date().toISOString(), _supports_sharing: typeof window === "undefined" ? "no" : window.navigator.share ? "yes" : "no", - _iframe: Utils.isIframe ? "yes" : "no" + _iframe: Utils.isIframe ? "yes" : "no", }) for (const key in Constants.userJourney) { @@ -367,18 +365,18 @@ export default class UserRelatedState { const zenLinks: { link: string; id: string }[] = Utils.NoNull([ hasMissingTheme ? { - id: "theme:" + layout.id, - link: LinkToWeblate.hrefToWeblateZen( - language, - "themes", - layout.id - ) - } + id: "theme:" + layout.id, + link: LinkToWeblate.hrefToWeblateZen( + language, + "themes", + layout.id + ), + } : undefined, ...missingLayers.map((id) => ({ id: "layer:" + id, - link: LinkToWeblate.hrefToWeblateZen(language, "layers", id) - })) + link: LinkToWeblate.hrefToWeblateZen(language, "layers", id), + })), ]) const untranslated_count = untranslated.length amendedPrefs.data["_translation_total"] = "" + total diff --git a/src/Logic/Tags/And.ts b/src/Logic/Tags/And.ts index 950091ac0..fa1435499 100644 --- a/src/Logic/Tags/And.ts +++ b/src/Logic/Tags/And.ts @@ -21,15 +21,17 @@ export class And extends TagsFilter { } public static construct(and: ReadonlyArray): TagsFilter - public static construct(and: ReadonlyArray<(FlatTag | (Or & OptimizedTag))>): TagsFilterClosed & OptimizedTag - public static construct(and: ReadonlyArray< TagsFilter>): TagsFilter { + public static construct( + and: ReadonlyArray + ): TagsFilterClosed & OptimizedTag + public static construct(and: ReadonlyArray): TagsFilter { if (and.length === 1) { return and[0] } return new And(and) } - private static combine(filter: string, choices: ReadonlyArray< string>): string[] { + private static combine(filter: string, choices: ReadonlyArray): string[] { const values = [] for (const or of choices) { values.push(filter + or) @@ -447,7 +449,7 @@ export class And extends TagsFilter { if (containedOrs.length === 1) { newAnds.push(containedOrs[0]) } else if (containedOrs.length > 1) { - let commonValues: TagsFilter[] = [...(containedOrs[0].or)] + let commonValues: TagsFilter[] = [...containedOrs[0].or] for (let i = 1; i < containedOrs.length && commonValues.length > 0; i++) { const containedOr = containedOrs[i] commonValues = commonValues.filter((cv) => diff --git a/src/Logic/Tags/Or.ts b/src/Logic/Tags/Or.ts index 8ddebc209..1d967b8cd 100644 --- a/src/Logic/Tags/Or.ts +++ b/src/Logic/Tags/Or.ts @@ -264,7 +264,7 @@ export class Or extends TagsFilter { if (containedAnds.length === 1) { newOrs.push(containedAnds[0]) } else if (containedAnds.length > 1) { - let commonValues: TagsFilter[] = [...(containedAnds[0].and)] + let commonValues: TagsFilter[] = [...containedAnds[0].and] for (let i = 1; i < containedAnds.length && commonValues.length > 0; i++) { const containedAnd = containedAnds[i] commonValues = commonValues.filter((cv) => diff --git a/src/Logic/Tags/TagUtils.ts b/src/Logic/Tags/TagUtils.ts index 97f5b6999..bcd73cc58 100644 --- a/src/Logic/Tags/TagUtils.ts +++ b/src/Logic/Tags/TagUtils.ts @@ -685,7 +685,10 @@ export class TagUtils { * TagUtils.containsEquivalents([new Tag("key","value")], [ new Tag("other_key","value")]) // => false * TagUtils.containsEquivalents([new Tag("key","value")], [ new Tag("key","other_value")]) // => false */ - public static containsEquivalents(guards: ReadonlyArray, listToFilter: ReadonlyArray): boolean { + public static containsEquivalents( + guards: ReadonlyArray, + listToFilter: ReadonlyArray + ): boolean { return listToFilter.some((tf) => guards.some((guard) => guard.shadows(tf))) } diff --git a/src/Logic/Web/ThemeViewStateHashActor.ts b/src/Logic/Web/ThemeViewStateHashActor.ts index acded8c92..6142c0394 100644 --- a/src/Logic/Web/ThemeViewStateHashActor.ts +++ b/src/Logic/Web/ThemeViewStateHashActor.ts @@ -16,7 +16,7 @@ export default class ThemeViewStateHashActor { "", "The possible hashes are:", "", - MenuState.pageNames.map((tab) => "`" + tab + "`").join(",") + MenuState.pageNames.map((tab) => "`" + tab + "`").join(","), ] /** @@ -41,14 +41,13 @@ export default class ThemeViewStateHashActor { }) } - // At last, register callbacks on the state to update the hash when they change. // Note: these should use 'addCallback', not 'addCallbackAndRun' state.selectedElement.addCallback(() => this.setHash()) // Register a hash change listener to correctly handle the back button Hash.hash.addCallback((hash) => { - if(this.isUpdatingHash){ + if (this.isUpdatingHash) { return } if (!hash) { @@ -91,12 +90,7 @@ export default class ThemeViewStateHashActor { if (found.properties.id.startsWith("last_click")) { return true } - console.log( - "Setting selected element based on hash", - hash, - "; found", - found - ) + console.log("Setting selected element based on hash", hash, "; found", found) selectedElement.setData(found) return true } diff --git a/src/Models/MenuState.ts b/src/Models/MenuState.ts index 0d5a73ccc..6d3e5f868 100644 --- a/src/Models/MenuState.ts +++ b/src/Models/MenuState.ts @@ -14,18 +14,26 @@ export type PageType = (typeof MenuState.pageNames)[number] * Some convenience methods are provided for this as well */ export class MenuState { - - public static readonly pageNames = [ - "copyright", "copyright_icons", "community_index", "hotkeys", - "privacy", "filter", "background", "about_theme", "download", "favourites", - "usersettings", "share", "menu", + "copyright", + "copyright_icons", + "community_index", + "hotkeys", + "privacy", + "filter", + "background", + "about_theme", + "download", + "favourites", + "usersettings", + "share", + "menu", ] as const public readonly pageStates: Record> public readonly highlightedLayerInFilters: UIEventSource = new UIEventSource( - undefined, + undefined ) public highlightedUserSetting: UIEventSource = new UIEventSource(undefined) @@ -39,10 +47,10 @@ export class MenuState { this.pageStates = >>states for (const pageName of MenuState.pageNames) { - if(pageName === "menu"){ + if (pageName === "menu") { continue } - this.pageStates[pageName].addCallback(enabled => { + this.pageStates[pageName].addCallback((enabled) => { if (enabled) { this.pageStates.menu.set(false) } @@ -50,7 +58,8 @@ export class MenuState { } const visitedBefore = LocalStorageSource.GetParsed( - themeid + "thememenuisopened", false, + themeid + "thememenuisopened", + false ) if (!visitedBefore.data && shouldShowWelcomeMessage) { this.pageStates.about_theme.set(true) @@ -85,11 +94,12 @@ export class MenuState { Utils.sortedByLevenshteinDistance( highlightTagRendering, UserRelatedState.availableUserSettingsIds, - (x) => x, - ), + (x) => x + ) ) } this.highlightedUserSetting.setData(highlightTagRendering) + this.pageStates.usersettings.set(true) } public isSomethingOpen(): boolean { @@ -115,5 +125,4 @@ export class MenuState { return true } } - } diff --git a/src/Models/RasterLayerProperties.ts b/src/Models/RasterLayerProperties.ts index f924a8fa8..8b1fffdea 100644 --- a/src/Models/RasterLayerProperties.ts +++ b/src/Models/RasterLayerProperties.ts @@ -1,11 +1,13 @@ -export const eliCategory = ["photo" - , "map" - , "historicmap" - , "osmbasedmap" - , "historicphoto" - , "qa" - , "elevation" - , "other"] as const +export const eliCategory = [ + "photo", + "map", + "historicmap", + "osmbasedmap", + "historicphoto", + "qa", + "elevation", + "other", +] as const export type EliCategory = (typeof eliCategory)[number] /** diff --git a/src/Models/RasterLayers.ts b/src/Models/RasterLayers.ts index 75bf6a9c3..aac8daa9c 100644 --- a/src/Models/RasterLayers.ts +++ b/src/Models/RasterLayers.ts @@ -38,7 +38,7 @@ export class AvailableRasterLayers { { type: "Feature", properties, - geometry: BBox.global.asGeometry() + geometry: BBox.global.asGeometry(), } ) public static bing = bingJson @@ -48,18 +48,18 @@ export class AvailableRasterLayers { url: "https://tile.openstreetmap.org/{z}/{x}/{y}.png", attribution: { text: "OpenStreetMap", - url: "https://openStreetMap.org/copyright" + url: "https://openStreetMap.org/copyright", }, best: true, max_zoom: 19, min_zoom: 0, - category: "osmbasedmap" + category: "osmbasedmap", } public static readonly osmCarto: RasterLayerPolygon = { type: "Feature", properties: AvailableRasterLayers.osmCartoProperties, - geometry: BBox.global.asGeometry() + geometry: BBox.global.asGeometry(), } /** @@ -197,7 +197,7 @@ export interface EditorLayerIndexProperties extends RasterLayerProperties { /** * A URL template for imagery tiles */ - readonly url: string + readonly url: string readonly min_zoom?: number readonly max_zoom?: number /** diff --git a/src/Models/ThemeConfig/Conversion/CreateNoteImportLayer.ts b/src/Models/ThemeConfig/Conversion/CreateNoteImportLayer.ts index feb5578ad..f36b21f56 100644 --- a/src/Models/ThemeConfig/Conversion/CreateNoteImportLayer.ts +++ b/src/Models/ThemeConfig/Conversion/CreateNoteImportLayer.ts @@ -203,7 +203,7 @@ export default class CreateNoteImportLayer extends Conversion { context.err("'freeform' is a string, but should be an object") return json } + + if(!Object.values(json.render).some(render => render !== "{"+json.freeform.key+"}")){ + // We only render the current value, without anything more. Not worth inlining + return json + } + + json.freeform.inline ??= true return json } diff --git a/src/Models/ThemeConfig/Conversion/PrepareTheme.ts b/src/Models/ThemeConfig/Conversion/PrepareTheme.ts index 4a14b1aa4..3ff4268c5 100644 --- a/src/Models/ThemeConfig/Conversion/PrepareTheme.ts +++ b/src/Models/ThemeConfig/Conversion/PrepareTheme.ts @@ -30,7 +30,7 @@ class SubstituteLayer extends Conversion 0 ) { context.err( - `When overriding a layer, an override is not allowed to override into tagRenderings. Use "+tagRenderings" or "tagRenderings+" instead to prepend or append some questions.` + `When overriding a layer, an override is not allowed to override into tagRenderings. Use "+tagRenderings" or "tagRenderings+" instead to prepend or append some questions.`, ) } try { const trPlus = json["override"]["tagRenderings+"] if (trPlus) { let index = found.tagRenderings.findIndex( - (tr) => tr["id"] === "leftover-questions" + (tr) => tr["id"] === "leftover-questions", ) if (index < 0) { index = found.tagRenderings.length @@ -107,8 +107,8 @@ class SubstituteLayer extends Conversion 0) { context.err( "This theme specifies that certain tagrenderings have to be removed based on forbidden layers. One or more of these layers did not match any tagRenderings and caused no deletions: " + - unused.join(", ") + - "\n This means that this label can be removed or that the original tagRendering that should be deleted does not have this label anymore" + unused.join(", ") + + "\n This means that this label can be removed or that the original tagRendering that should be deleted does not have this label anymore", ) } found.tagRenderings = filtered @@ -184,7 +184,7 @@ class AddDefaultLayers extends DesugaringStep { super( "Adds the default layers, namely: " + Constants.added_by_default.join(", "), ["layers"], - "AddDefaultLayers" + "AddDefaultLayers", ) this._state = state } @@ -207,10 +207,10 @@ class AddDefaultLayers extends DesugaringStep { if (alreadyLoaded.has(v.id)) { context.warn( "Layout " + - context + - " already has a layer with name " + - v.id + - "; skipping inclusion of this builtin layer" + context + + " already has a layer with name " + + v.id + + "; skipping inclusion of this builtin layer", ) continue } @@ -226,14 +226,14 @@ class AddImportLayers extends DesugaringStep { super( "For every layer in the 'layers'-list, create a new layer which'll import notes. (Note that priviliged layers and layers which have a geojson-source set are ignored)", ["layers"], - "AddImportLayers" + "AddImportLayers", ) } convert(json: LayoutConfigJson, context: ConversionContext): LayoutConfigJson { if (!(json.enableNoteImports ?? true)) { context.info( - "Not creating a note import layers for theme " + json.id + " as they are disabled" + "Not creating a note import layers for theme " + json.id + " as they are disabled", ) return json } @@ -268,7 +268,7 @@ class AddImportLayers extends DesugaringStep { try { const importLayerResult = creator.convert( layer, - context.inOperation(this.name).enter(i1) + context.inOperation(this.name).enter(i1), ) if (importLayerResult !== undefined) { json.layers.push(importLayerResult) @@ -288,7 +288,7 @@ class AddContextToTranslationsInLayout extends DesugaringStep super( "Adds context to translations, including the prefix 'themes:json.id'; this is to make sure terms in an 'overrides' or inline layer are linkable too", ["_context"], - "AddContextToTranlationsInLayout" + "AddContextToTranlationsInLayout", ) } @@ -297,7 +297,7 @@ class AddContextToTranslationsInLayout extends DesugaringStep // The context is used to generate the 'context' in the translation .It _must_ be `json.id` to correctly link into weblate return conversion.convert( json, - ConversionContext.construct([json.id], ["AddContextToTranslation"]) + ConversionContext.construct([json.id], ["AddContextToTranslation"]), ) } } @@ -307,7 +307,7 @@ class ApplyOverrideAll extends DesugaringStep { super( "Applies 'overrideAll' onto every 'layer'. The 'overrideAll'-field is removed afterwards", ["overrideAll", "layers"], - "ApplyOverrideAll" + "ApplyOverrideAll", ) } @@ -336,7 +336,7 @@ class ApplyOverrideAll extends DesugaringStep { layer.tagRenderings = tagRenderingsPlus } else { let index = layer.tagRenderings.findIndex( - (tr) => tr["id"] === "leftover-questions" + (tr) => tr["id"] === "leftover-questions", ) if (index < 0) { index = layer.tagRenderings.length - 1 @@ -357,14 +357,9 @@ class AddDependencyLayersToTheme extends DesugaringStep { constructor(state: DesugaringContext) { super( - `If a layer has a dependency on another layer, these layers are added automatically on the theme. (For example: defibrillator depends on 'walls_and_buildings' to snap onto. This layer is added automatically) - - Note that these layers are added _at the start_ of the layer list, meaning that they will see _every_ feature. - Furthermore, \`passAllFeatures\` will be set, so that they won't steal away features from further layers. - Some layers (e.g. \`all_buildings_and_walls\' or \'streets_with_a_name\') are invisible, so by default, \'force_load\' is set too. - `, + `If a layer has a dependency on another layer, these layers are added automatically on the theme. (For example: defibrillator depends on 'walls_and_buildings' to snap onto. This layer is added automatically)`, ["layers"], - "AddDependencyLayersToTheme" + "AddDependencyLayersToTheme", ) this._state = state } @@ -373,7 +368,7 @@ class AddDependencyLayersToTheme extends DesugaringStep { alreadyLoaded: LayerConfigJson[], allKnownLayers: Map, themeId: string, - context: ConversionContext + context: ConversionContext, ): { config: LayerConfigJson; reason: string }[] { const dependenciesToAdd: { config: LayerConfigJson; reason: string }[] = [] const loadedLayerIds: Set = new Set(alreadyLoaded.map((l) => l?.id)) @@ -391,12 +386,13 @@ class AddDependencyLayersToTheme extends DesugaringStep { reason: string context?: string neededBy: string + checkHasSnapName: boolean }[] = [] for (const layerConfig of alreadyLoaded) { try { const layerDeps = DependencyCalculator.getLayerDependencies( - new LayerConfig(layerConfig, themeId + "(dependencies)") + new LayerConfig(layerConfig, themeId + "(dependencies)"), ) dependencies.push(...layerDeps) } catch (e) { @@ -413,7 +409,11 @@ class AddDependencyLayersToTheme extends DesugaringStep { for (const dependency of dependencies) { if (loadedLayerIds.has(dependency.neededLayer)) { // We mark the needed layer as 'mustLoad' - alreadyLoaded.find((l) => l.id === dependency.neededLayer).forceLoad = true + const loadedLayer = alreadyLoaded.find((l) => l.id === dependency.neededLayer) + loadedLayer.forceLoad = true + if(dependency.checkHasSnapName && !loadedLayer.snapName){ + context.enters("layer dependency").err("Layer "+dependency.neededLayer+" is loaded because "+dependency.reason+"; so it must specify a `snapName`. This is used in the sentence `move this point to snap it to {snapName}`") + } } } @@ -436,10 +436,10 @@ class AddDependencyLayersToTheme extends DesugaringStep { if (dep === undefined) { const message = [ "Loading a dependency failed: layer " + - unmetDependency.neededLayer + - " is not found, neither as layer of " + - themeId + - " nor as builtin layer.", + unmetDependency.neededLayer + + " is not found, neither as layer of " + + themeId + + " nor as builtin layer.", reason, "Loaded layers are: " + alreadyLoaded.map((l) => l.id).join(","), ] @@ -455,11 +455,12 @@ class AddDependencyLayersToTheme extends DesugaringStep { }) loadedLayerIds.add(dep.id) unmetDependencies = unmetDependencies.filter( - (d) => d.neededLayer !== unmetDependency.neededLayer + (d) => d.neededLayer !== unmetDependency.neededLayer, ) } } while (unmetDependencies.length > 0) + return dependenciesToAdd } @@ -477,12 +478,12 @@ class AddDependencyLayersToTheme extends DesugaringStep { layers, allKnownLayers, theme.id, - context + context, ) if (dependencies.length > 0) { for (const dependency of dependencies) { context.info( - "Added " + dependency.config.id + " to the theme. " + dependency.reason + "Added " + dependency.config.id + " to the theme. " + dependency.reason, ) } } @@ -530,7 +531,7 @@ class WarnForUnsubstitutedLayersInTheme extends DesugaringStep super( "Generates a warning if a theme uses an unsubstituted layer", ["layers"], - "WarnForUnsubstitutedLayersInTheme" + "WarnForUnsubstitutedLayersInTheme", ) } @@ -542,7 +543,7 @@ class WarnForUnsubstitutedLayersInTheme extends DesugaringStep context .enter("layers") .err( - "No layers are defined. You must define at least one layer to have a valid theme" + "No layers are defined. You must define at least one layer to have a valid theme", ) return json } @@ -566,10 +567,10 @@ class WarnForUnsubstitutedLayersInTheme extends DesugaringStep context.warn( "The theme " + - json.id + - " has an inline layer: " + - layer["id"] + - ". This is discouraged." + json.id + + " has an inline layer: " + + layer["id"] + + ". This is discouraged.", ) } return json @@ -578,6 +579,7 @@ class WarnForUnsubstitutedLayersInTheme extends DesugaringStep class PostvalidateTheme extends DesugaringStep { private readonly _state: DesugaringContext + constructor(state: DesugaringContext) { super("Various validation steps when everything is done", [], "PostvalidateTheme") this._state = state @@ -596,13 +598,13 @@ class PostvalidateTheme extends DesugaringStep { } const sameBasedOn = ( json.layers.filter( - (l) => l["_basedOn"] === layer["_basedOn"] && l["id"] !== layer.id + (l) => l["_basedOn"] === layer["_basedOn"] && l["id"] !== layer.id, ) ) const minZoomAll = Math.min(...sameBasedOn.map((sbo) => sbo.minzoom)) const sameNameDetected = sameBasedOn.some( - (same) => JSON.stringify(layer["name"]) === JSON.stringify(same["name"]) + (same) => JSON.stringify(layer["name"]) === JSON.stringify(same["name"]), ) if (!sameNameDetected) { // The name is unique, so it'll won't be confusing @@ -611,12 +613,12 @@ class PostvalidateTheme extends DesugaringStep { if (minZoomAll < layer.minzoom) { context.err( "There are multiple layers based on " + - basedOn + - ". The layer with id " + - layer.id + - " has a minzoom of " + - layer.minzoom + - ", and has a name set. Another similar layer has a lower minzoom. As such, the layer selection might show 'zoom in to see features' even though some of the features are already visible. Set `\"name\": null` for this layer and eventually remove the 'name':null for the other layer." + basedOn + + ". The layer with id " + + layer.id + + " has a minzoom of " + + layer.minzoom + + ", and has a name set. Another similar layer has a lower minzoom. As such, the layer selection might show 'zoom in to see features' even though some of the features are already visible. Set `\"name\": null` for this layer and eventually remove the 'name':null for the other layer.", ) } } @@ -636,17 +638,17 @@ class PostvalidateTheme extends DesugaringStep { const closeLayers = Utils.sortedByLevenshteinDistance( sameAs, json.layers, - (l) => l["id"] + (l) => l["id"], ).map((l) => l["id"]) context .enters("layers", config.id, "filter", "sameAs") .err( "The layer " + - config.id + - " follows the filter state of layer " + - sameAs + - ", but no layer with this name was found.\n\tDid you perhaps mean one of: " + - closeLayers.slice(0, 3).join(", ") + config.id + + " follows the filter state of layer " + + sameAs + + ", but no layer with this name was found.\n\tDid you perhaps mean one of: " + + closeLayers.slice(0, 3).join(", "), ) } } @@ -654,6 +656,7 @@ class PostvalidateTheme extends DesugaringStep { return json } } + export class PrepareTheme extends Fuse { private state: DesugaringContext @@ -661,7 +664,7 @@ export class PrepareTheme extends Fuse { state: DesugaringContext, options?: { skipDefaultLayers: false | boolean - } + }, ) { super( "Fully prepares and expands a theme", @@ -683,7 +686,7 @@ export class PrepareTheme extends Fuse { : new AddDefaultLayers(state), new AddDependencyLayersToTheme(state), new AddImportLayers(), - new PostvalidateTheme(state) + new PostvalidateTheme(state), ) this.state = state } @@ -698,13 +701,13 @@ export class PrepareTheme extends Fuse { const needsNodeDatabase = result.layers?.some((l: LayerConfigJson) => l.tagRenderings?.some((tr) => ValidationUtils.getSpecialVisualisations(tr)?.some( - (special) => special.needsNodeDatabase - ) - ) + (special) => special.needsNodeDatabase, + ), + ), ) if (needsNodeDatabase) { context.info( - "Setting 'enableNodeDatabase' as this theme uses a special visualisation which needs to keep track of _all_ nodes" + "Setting 'enableNodeDatabase' as this theme uses a special visualisation which needs to keep track of _all_ nodes", ) result.enableNodeDatabase = true } diff --git a/src/Models/ThemeConfig/Conversion/PrevalidateLayer.ts b/src/Models/ThemeConfig/Conversion/PrevalidateLayer.ts index 5412fe52e..ed6a787f1 100644 --- a/src/Models/ThemeConfig/Conversion/PrevalidateLayer.ts +++ b/src/Models/ThemeConfig/Conversion/PrevalidateLayer.ts @@ -141,13 +141,9 @@ export class PrevalidateLayer extends DesugaringStep { } } - if(json.allowMove === undefined && json.source["geoJson"] === undefined){ + if(this._isBuiltin && json.allowMove === undefined && json.source["geoJson"] === undefined) { if (!Constants.priviliged_layers.find((x) => x == json.id)) { - context.err( - "Layer " + - json.id + - " does not have an explicit 'allowMove'" - ) + context.err("Layer " + json.id + " does not have an explicit 'allowMove'") } } diff --git a/src/Models/ThemeConfig/DependencyCalculator.ts b/src/Models/ThemeConfig/DependencyCalculator.ts index 0b2b814c9..66fa129f5 100644 --- a/src/Models/ThemeConfig/DependencyCalculator.ts +++ b/src/Models/ThemeConfig/DependencyCalculator.ts @@ -33,8 +33,8 @@ export default class DependencyCalculator { */ public static getLayerDependencies( layer: LayerConfig - ): { neededLayer: string; reason: string; context?: string; neededBy: string }[] { - const deps: { neededLayer: string; reason: string; context?: string; neededBy: string }[] = + ): { neededLayer: string; reason: string; context?: string; neededBy: string, checkHasSnapName: boolean }[] { + const deps: { neededLayer: string; reason: string; context?: string; neededBy: string, checkHasSnapName: boolean }[] = [] for (let i = 0; layer.presets !== undefined && i < layer.presets.length; i++) { @@ -51,6 +51,7 @@ export default class DependencyCalculator { reason: `preset \`${preset.title.textFor("en")}\` snaps to this layer`, context: `${layer.id}.presets[${i}]`, neededBy: layer.id, + checkHasSnapName: true }) }) } @@ -62,6 +63,7 @@ export default class DependencyCalculator { reason: "a tagrendering needs this layer", context: tr.id, neededBy: layer.id, + checkHasSnapName: false }) } } @@ -97,6 +99,7 @@ export default class DependencyCalculator { "] which calculates the value for " + currentKey, neededBy: layer.id, + checkHasSnapName: false }) return [] diff --git a/src/Models/ThemeConfig/Json/LayerConfigJson.ts b/src/Models/ThemeConfig/Json/LayerConfigJson.ts index 3ddd140c4..1805158e2 100644 --- a/src/Models/ThemeConfig/Json/LayerConfigJson.ts +++ b/src/Models/ThemeConfig/Json/LayerConfigJson.ts @@ -587,4 +587,13 @@ export interface LayerConfigJson { * iftrue: Do not write 'change_within_x_m' and do not indicate that this was done by survey */ enableMorePrivacy?: boolean + + /** + * question: When a feature is snapped to this name, how should this item be called? + * + * In the move wizard, the option `snap object onto {snapName}` is shown + * + * group: hidden + */ + snapName?: Translatable } diff --git a/src/Models/ThemeConfig/LayerConfig.ts b/src/Models/ThemeConfig/LayerConfig.ts index f6529d834..b484626ff 100644 --- a/src/Models/ThemeConfig/LayerConfig.ts +++ b/src/Models/ThemeConfig/LayerConfig.ts @@ -22,6 +22,7 @@ import { Overpass } from "../../Logic/Osm/Overpass" import Constants from "../Constants" import { QuestionableTagRenderingConfigJson } from "./Json/QuestionableTagRenderingConfigJson" import MarkdownUtils from "../../Utils/MarkdownUtils" +import { And } from "../../Logic/Tags/And" import Combine from "../../UI/Base/Combine" export default class LayerConfig extends WithContextLoader { @@ -50,6 +51,7 @@ export default class LayerConfig extends WithContextLoader { public readonly allowSplit: boolean public readonly shownByDefault: boolean public readonly doCount: boolean + public readonly snapName?: Translation /** * In seconds */ @@ -102,12 +104,13 @@ export default class LayerConfig extends WithContextLoader { mercatorCrs: json.source["mercatorCrs"], idKey: json.source["idKey"], }, - json.id + json.id, ) } this.allowSplit = json.allowSplit ?? false this.name = Translations.T(json.name, translationContext + ".name") + this.snapName = Translations.T(json.snapName, translationContext + ".snapName") if (json.description !== undefined) { if (Object.keys(json.description).length === 0) { @@ -457,6 +460,22 @@ export default class LayerConfig extends WithContextLoader { ) } + let presets: string[] = [] + if (this.presets.length > 0) { + + presets = [ + "## Presets", + "The following options to create new points are included:", + MarkdownUtils.list(this.presets.map(preset => { + let snaps = "" + if (preset.preciseInput?.snapToLayers) { + snaps = " (snaps to layers " + preset.preciseInput.snapToLayers.map(id => `\`${id}\``).join(", ") + ")" + } + return "**" + preset.title.txt + "** which has the following tags:" + new And(preset.tags).asHumanString(true) + snaps + })), + ] + } + for (const revDep of Utils.Dedup(layerIsNeededBy?.get(this.id) ?? [])) { extraProps.push( ["This layer is needed as dependency for layer", `[${revDep}](#${revDep})`].join( @@ -566,6 +585,7 @@ export default class LayerConfig extends WithContextLoader { ].join("\n\n"), MarkdownUtils.list(extraProps), ...usingLayer, + ...presets, ...tagsDescription, "## Supported attributes", quickOverview, @@ -590,4 +610,35 @@ export default class LayerConfig extends WithContextLoader { public isLeftRightSensitive(): boolean { return this.lineRendering.some((lr) => lr.leftRightSensitive) } + + public getMostMatchingPreset(tags: Record): PresetConfig { + const presets = this.presets + if (!presets) { + return undefined + } + const matchingPresets = presets + .filter((pr) => new And(pr.tags).matchesProperties(tags)) + let mostShadowed = matchingPresets[0] + let mostShadowedTags = new And(mostShadowed.tags) + for (let i = 1; i < matchingPresets.length; i++) { + const pr = matchingPresets[i] + const prTags = new And(pr.tags) + if (mostShadowedTags.shadows(prTags)) { + if (!prTags.shadows(mostShadowedTags)) { + // We have a new most shadowed item + mostShadowed = pr + mostShadowedTags = prTags + } else { + // Both shadow each other: abort + mostShadowed = undefined + break + } + } else if (!prTags.shadows(mostShadowedTags)) { + // The new contender does not win, but it might defeat the current contender + mostShadowed = undefined + break + } + } + return mostShadowed ?? matchingPresets[0] + } } diff --git a/src/Models/ThemeConfig/TagRenderingConfig.ts b/src/Models/ThemeConfig/TagRenderingConfig.ts index dfda1a7e9..3408cbcd9 100644 --- a/src/Models/ThemeConfig/TagRenderingConfig.ts +++ b/src/Models/ThemeConfig/TagRenderingConfig.ts @@ -18,6 +18,7 @@ import { GeoOperations } from "../../Logic/GeoOperations" import { Feature } from "geojson" import MarkdownUtils from "../../Utils/MarkdownUtils" import { UploadableTag } from "../../Logic/Tags/TagTypes" +import LayerConfig from "./LayerConfig" export interface Mapping { readonly if: UploadableTag @@ -84,7 +85,7 @@ export default class TagRenderingConfig { | string | TagRenderingConfigJson | (QuestionableTagRenderingConfigJson & { questionHintIsMd?: boolean }), - context?: string + context?: string, ) { let json = config if (json === undefined) { @@ -143,7 +144,7 @@ export default class TagRenderingConfig { this.description = Translations.T(json.description, translationKey + ".description") this.editButtonAriaLabel = Translations.T( json.editButtonAriaLabel, - translationKey + ".editButtonAriaLabel" + translationKey + ".editButtonAriaLabel", ) this.condition = TagUtils.Tag(json.condition ?? { and: [] }, `${context}.condition`) @@ -159,7 +160,7 @@ export default class TagRenderingConfig { } this.metacondition = TagUtils.Tag( json.metacondition ?? { and: [] }, - `${context}.metacondition` + `${context}.metacondition`, ) if (json.freeform) { if ( @@ -177,7 +178,7 @@ export default class TagRenderingConfig { }, perhaps you meant ${Utils.sortedByLevenshteinDistance( json.freeform.key, Validators.availableTypes, - (s) => s + (s) => s, )}` } const type: ValidatorType = json.freeform.type ?? "string" @@ -199,7 +200,7 @@ export default class TagRenderingConfig { placeholder, addExtraTags: json.freeform.addExtraTags?.map((tg, i) => - TagUtils.ParseUploadableTag(tg, `${context}.extratag[${i}]`) + TagUtils.ParseUploadableTag(tg, `${context}.extratag[${i}]`), ) ?? [], inline: json.freeform.inline ?? false, default: json.freeform.default, @@ -265,8 +266,8 @@ export default class TagRenderingConfig { context, this.multiAnswer, this.question !== undefined, - commonIconSize - ) + commonIconSize, + ), ) } else { this.mappings = [] @@ -292,7 +293,7 @@ export default class TagRenderingConfig { for (const expectedKey of keys) { if (usedKeys.indexOf(expectedKey) < 0) { const msg = `${context}.mappings[${i}]: This mapping only defines values for ${usedKeys.join( - ", " + ", ", )}, but it should also give a value for ${expectedKey}` this.configuration_warnings.push(msg) } @@ -339,7 +340,7 @@ export default class TagRenderingConfig { context: string, multiAnswer?: boolean, isQuestionable?: boolean, - commonSize: string = "small" + commonSize: string = "small", ): Mapping { const ctx = `${translationKey}.mappings.${i}` if (mapping.if === undefined) { @@ -348,7 +349,7 @@ export default class TagRenderingConfig { if (mapping.then === undefined) { if (mapping["render"] !== undefined) { throw `${ctx}: Invalid mapping: no 'then'-clause found. You might have typed 'render' instead of 'then', change it in ${JSON.stringify( - mapping + mapping, )}` } throw `${ctx}: Invalid mapping: no 'then'-clause found in ${JSON.stringify(mapping)}` @@ -359,7 +360,7 @@ export default class TagRenderingConfig { if (mapping["render"] !== undefined) { throw `${ctx}: Invalid mapping: a 'render'-key is present, this is probably a bug: ${JSON.stringify( - mapping + mapping, )}` } if (typeof mapping.if !== "string" && mapping.if["length"] !== undefined) { @@ -382,11 +383,11 @@ export default class TagRenderingConfig { } else if (mapping.hideInAnswer !== undefined) { hideInAnswer = TagUtils.Tag( mapping.hideInAnswer, - `${context}.mapping[${i}].hideInAnswer` + `${context}.mapping[${i}].hideInAnswer`, ) } const addExtraTags = (mapping.addExtraTags ?? []).map((str, j) => - TagUtils.SimpleTag(str, `${ctx}.addExtraTags[${j}]`) + TagUtils.SimpleTag(str, `${ctx}.addExtraTags[${j}]`), ) if (hideInAnswer === true && addExtraTags.length > 0) { throw `${ctx}: Invalid mapping: 'hideInAnswer' is set to 'true', but 'addExtraTags' is enabled as well. This means that extra tags will be applied if this mapping is chosen as answer, but it cannot be chosen as answer. This either indicates a thought error or obsolete code that must be removed.` @@ -482,7 +483,7 @@ export default class TagRenderingConfig { * @constructor */ public GetRenderValues( - tags: Record + tags: Record, ): { then: Translation; icon?: string; iconClass?: string }[] { if (!this.multiAnswer) { return [this.GetRenderValueWithImage(tags)] @@ -505,7 +506,7 @@ export default class TagRenderingConfig { return mapping } return undefined - }) + }), ) if (freeformKeyDefined && tags[this.freeform.key] !== undefined) { @@ -513,7 +514,7 @@ export default class TagRenderingConfig { applicableMappings ?.flatMap((m) => m.if?.usedTags() ?? []) ?.filter((kv) => kv.key === this.freeform.key) - ?.map((kv) => kv.value) + ?.map((kv) => kv.value), ) const freeformValues = tags[this.freeform.key].split(";") @@ -522,7 +523,7 @@ export default class TagRenderingConfig { applicableMappings.push({ then: new TypedTranslation( this.render.replace("{" + this.freeform.key + "}", leftover).translations, - this.render.context + this.render.context, ), }) } @@ -540,7 +541,7 @@ export default class TagRenderingConfig { * @constructor */ public GetRenderValueWithImage( - tags: Record + tags: Record, ): { then: TypedTranslation; icon?: string; iconClass?: string } | undefined { if (this.condition !== undefined) { if (!this.condition.matchesProperties(tags)) { @@ -609,7 +610,7 @@ export default class TagRenderingConfig { const answerMappings = this.mappings?.filter((m) => m.hideInAnswer !== true) if (key === undefined) { const values: { k: string; v: string }[][] = Utils.NoNull( - answerMappings?.map((m) => m.if.asChange({})) ?? [] + answerMappings?.map((m) => m.if.asChange({})) ?? [], ) if (values.length === 0) { return @@ -627,15 +628,15 @@ export default class TagRenderingConfig { return { key: commonKey, values: Utils.NoNull( - values.map((arr) => arr.filter((item) => item.k === commonKey)[0]?.v) + values.map((arr) => arr.filter((item) => item.k === commonKey)[0]?.v), ), } } let values = Utils.NoNull( answerMappings?.map( - (m) => m.if.asChange({}).filter((item) => item.k === key)[0]?.v - ) ?? [] + (m) => m.if.asChange({}).filter((item) => item.k === key)[0]?.v, + ) ?? [], ) if (values.length === undefined) { values = undefined @@ -699,7 +700,7 @@ export default class TagRenderingConfig { freeformValue: string | undefined, singleSelectedMapping: number, multiSelectedMapping: boolean[] | undefined, - currentProperties: Record + currentProperties: Record, ): UploadableTag { if (typeof freeformValue === "string") { freeformValue = freeformValue?.trim() @@ -774,7 +775,7 @@ export default class TagRenderingConfig { new And([ new Tag(this.freeform.key, freeformValue), ...(this.freeform.addExtraTags ?? []), - ]) + ]), ) } const and = TagUtils.FlattenMultiAnswer([...selectedMappings, ...unselectedMappings]) @@ -844,11 +845,11 @@ export default class TagRenderingConfig { } const msgs: string[] = [ icon + - " " + - "*" + - m.then.textFor(lang) + - "* is shown if with " + - m.if.asHumanString(true, false, {}), + " " + + "*" + + m.then.textFor(lang) + + "* is shown if with " + + m.if.asHumanString(true, false, {}), ] if (m.hideInAnswer === true) { @@ -857,11 +858,11 @@ export default class TagRenderingConfig { if (m.ifnot !== undefined) { msgs.push( "Unselecting this answer will add " + - m.ifnot.asHumanString(true, false, {}) + m.ifnot.asHumanString(true, false, {}), ) } return msgs.join(". ") - }) + }), ) } @@ -870,7 +871,7 @@ export default class TagRenderingConfig { const conditionAsLink = (this.condition.optimize()).asHumanString( true, false, - {} + {}, ) condition = "This tagrendering is only visible in the popup if the following condition is met: " + @@ -904,7 +905,7 @@ export default class TagRenderingConfig { this.metacondition, this.condition, this.freeform?.key ? new RegexTag(this.freeform?.key, /.*/) : undefined, - this.invalidValues + this.invalidValues, ) for (const m of this.mappings ?? []) { tags.push(m.if) @@ -922,18 +923,42 @@ export default class TagRenderingConfig { /** * The keys that should be erased if one has to revert to 'unknown'. - * Might give undefined + * Might give undefined if setting to unknown is not possible */ - public settableKeys(): string[] | undefined { + public removeToSetUnknown(partOfLayer: LayerConfig, currentTags: Record): string[] | undefined { const toDelete = new Set() if (this.freeform) { toDelete.add(this.freeform.key) - } - for (const mapping of this.mappings) { - for (const usedKey of mapping.if.usedKeys()) { - toDelete.add(usedKey) + const extraTags = new And(this.freeform.addExtraTags ?? []).usedKeys().filter(k => k !== "fixme") + if (extraTags.length > 0) { + return undefined } } + if (this.mappings?.length > 0) { + const mainkey = this.mappings[0].if.usedKeys() + mainkey.forEach(k => toDelete.add(k)) + for (const mapping of this.mappings) { + if (mapping.addExtraTags?.length > 0) { + return undefined + } + for (const usedKey of mapping.if.usedKeys()) { + if (mainkey.indexOf(usedKey) < 0) { + // This is a complicated case, we ignore this for now + return undefined + } + } + } + } + + + currentTags = { ...currentTags } + for (const key of toDelete) { + delete currentTags[key] + } + const required = partOfLayer.source.osmTags + if (!required.matchesProperties(currentTags)) { + return undefined + } return Array.from(toDelete) } @@ -943,7 +968,7 @@ export class TagRenderingConfigUtils { public static withNameSuggestionIndex( config: TagRenderingConfig, tags: UIEventSource>, - feature?: Feature + feature?: Feature, ): Store { const isNSI = NameSuggestionIndex.supportedTypes().indexOf(config.freeform?.key) >= 0 if (!isNSI) { @@ -961,8 +986,8 @@ export class TagRenderingConfigUtils { tags, country.split(";"), center, - { sortByFrequency: true } - ) + { sortByFrequency: true }, + ), ) }) return extraMappings.map((extraMappings) => { @@ -978,7 +1003,7 @@ export class TagRenderingConfigUtils { ...m, addExtraTags: [new Tag("nobrand", "")], priorityIf: m.priorityIf ?? TagUtils.Tag("id~*"), - } + }, ) ?? [] clone.mappings = [...oldMappingsCloned, ...extraMappings] return clone diff --git a/src/Models/ThemeViewState.ts b/src/Models/ThemeViewState.ts index 5e910c85a..0bff70de7 100644 --- a/src/Models/ThemeViewState.ts +++ b/src/Models/ThemeViewState.ts @@ -58,7 +58,7 @@ import { GeolocationControlState } from "../UI/BigComponents/GeolocationControl" import Zoomcontrol from "../UI/Zoomcontrol" import { SummaryTileSource, - SummaryTileSourceRewriter + SummaryTileSourceRewriter, } from "../Logic/FeatureSource/TiledFeatureSource/SummaryTileSource" import summaryLayer from "../assets/generated/layers/summary.json" import last_click_layerconfig from "../assets/generated/layers/last_click.json" @@ -175,7 +175,7 @@ export default class ThemeViewState implements SpecialVisualizationState { "oauth_token", undefined, "Used to complete the login" - ) + ), }) this.userRelatedState = new UserRelatedState( this.osmConnection, @@ -254,8 +254,8 @@ export default class ThemeViewState implements SpecialVisualizationState { bbox.asGeoJson({ zoom: this.mapProperties.zoom.data, ...this.mapProperties.location.data, - id: "current_view_" + currentViewIndex - }) + id: "current_view_" + currentViewIndex, + }), ] }) ) @@ -272,7 +272,7 @@ export default class ThemeViewState implements SpecialVisualizationState { featurePropertiesStore: this.featureProperties, osmConnection: this.osmConnection, historicalUserLocations: this.geolocation.historicalUserLocations, - featureSwitches: this.featureSwitches + featureSwitches: this.featureSwitches, }, layout?.isLeftRightSensitive() ?? false, (e, extraMsg) => this.reportError(e, extraMsg) @@ -300,7 +300,7 @@ export default class ThemeViewState implements SpecialVisualizationState { "leftover features, such as", features[0].properties ) - } + }, } ) this.perLayer = perLayer.perLayer @@ -356,7 +356,7 @@ export default class ThemeViewState implements SpecialVisualizationState { { currentZoom: this.mapProperties.zoom, layerState: this.layerState, - bounds: this.visualFeedbackViewportBounds + bounds: this.visualFeedbackViewportBounds, } ) this.hasDataInView = new NoElementsInViewDetector(this).hasFeatureInView @@ -453,7 +453,7 @@ export default class ThemeViewState implements SpecialVisualizationState { doShowLayer, metaTags: this.userRelatedState.preferencesAsTags, selectedElement: this.selectedElement, - fetchStore: (id) => this.featureProperties.getStore(id) + fetchStore: (id) => this.featureProperties.getStore(id), }) }) return filteringFeatureSource @@ -480,7 +480,7 @@ export default class ThemeViewState implements SpecialVisualizationState { doShowLayer: flayerGps.isDisplayed, layer: flayerGps.layerDef, metaTags: this.userRelatedState.preferencesAsTags, - selectedElement: this.selectedElement + selectedElement: this.selectedElement, }) } @@ -554,11 +554,11 @@ export default class ThemeViewState implements SpecialVisualizationState { this.previewedImage.setData(undefined) return } - if(this.searchState.showSearchDrawer.data){ + if (this.searchState.showSearchDrawer.data){ this.searchState.showSearchDrawer.set(false) return } - if(this.guistate.closeAll()){ + if (this.guistate.closeAll()){ return } this.selectedElement.setData(undefined) @@ -573,17 +573,14 @@ export default class ThemeViewState implements SpecialVisualizationState { Hotkeys.RegisterHotkey( { nomod: " ", - onUp: true + onUp: true, }, docs.selectItem, () => { if (this.selectedElement.data !== undefined) { return false } - if ( - this.guistate.isSomethingOpen() || - this.previewedImage.data !== undefined - ) { + if (this.guistate.isSomethingOpen() || this.previewedImage.data !== undefined) { return } if(document.activeElement.tagName === "button" || document.activeElement.tagName === "input"){ @@ -605,7 +602,7 @@ export default class ThemeViewState implements SpecialVisualizationState { Hotkeys.RegisterHotkey( { nomod: "" + i, - onUp: true + onUp: true, }, doc, () => this.selectClosestAtCenter(i - 1) @@ -624,7 +621,7 @@ export default class ThemeViewState implements SpecialVisualizationState { } Hotkeys.RegisterHotkey( { - nomod: "b" + nomod: "b", }, docs.openLayersPanel, () => { @@ -635,7 +632,7 @@ export default class ThemeViewState implements SpecialVisualizationState { ) Hotkeys.RegisterHotkey( { - nomod: "s" + nomod: "s", }, Translations.t.hotkeyDocumentation.openFilterPanel, () => { @@ -713,12 +710,12 @@ export default class ThemeViewState implements SpecialVisualizationState { Hotkeys.RegisterHotkey( { - shift: "T" + shift: "T", }, Translations.t.hotkeyDocumentation.translationMode, () => { const tm = this.userRelatedState.translationMode - if(tm.data === "false"){ + if (tm.data === "false") { tm.setData("true") } else { tm.setData("false") @@ -750,7 +747,7 @@ export default class ThemeViewState implements SpecialVisualizationState { this.mapProperties.zoom.map((z) => Math.max(Math.floor(z), 0)), this.mapProperties, { - isActive: this.mapProperties.zoom.map((z) => z < maxzoom) + isActive: this.mapProperties.zoom.map((z) => z < maxzoom), } ) @@ -837,7 +834,7 @@ export default class ThemeViewState implements SpecialVisualizationState { doShowLayer: flayer.isDisplayed, layer: flayer.layerDef, metaTags: this.userRelatedState.preferencesAsTags, - selectedElement: this.selectedElement + selectedElement: this.selectedElement, }) }) const summaryLayerConfig = new LayerConfig(summaryLayer, "summaryLayer") @@ -845,7 +842,7 @@ export default class ThemeViewState implements SpecialVisualizationState { features: specialLayers.summary, layer: summaryLayerConfig, // doShowLayer: this.mapProperties.zoom.map((z) => z < maxzoom), - selectedElement: this.selectedElement + selectedElement: this.selectedElement, }) const lastClickLayerConfig = new LayerConfig( @@ -856,14 +853,14 @@ export default class ThemeViewState implements SpecialVisualizationState { lastClickLayerConfig.isShown === undefined ? specialLayers.last_click : specialLayers.last_click.features.mapD((fs) => - fs.filter((f) => { - const matches = lastClickLayerConfig.isShown.matchesProperties( - f.properties - ) - console.debug("LastClick ", f, "matches", matches) - return matches - }) - ) + fs.filter((f) => { + const matches = lastClickLayerConfig.isShown.matchesProperties( + f.properties + ) + console.debug("LastClick ", f, "matches", matches) + return matches + }) + ) new ShowDataLayer(this.map, { features: new StaticFeatureSource(lastClickFiltered), layer: lastClickLayerConfig, @@ -874,9 +871,9 @@ export default class ThemeViewState implements SpecialVisualizationState { } this.map.data.flyTo({ zoom: Constants.minZoomLevelToAddNewPoint, - center: GeoOperations.centerpointCoordinates(feature) + center: GeoOperations.centerpointCoordinates(feature), }) - } + }, }) } @@ -968,7 +965,13 @@ export default class ThemeViewState implements SpecialVisualizationState { } catch (e) { // pass } - message = "XMLHttpRequest with status code " + req.status + ", " + req.statusText + ", received: " + body + message = + "XMLHttpRequest with status code " + + req.status + + ", " + + req.statusText + + ", received: " + + body } if (extramessage) { @@ -990,8 +993,8 @@ export default class ThemeViewState implements SpecialVisualizationState { userid: this.osmConnection.userDetails.data?.uid, pendingChanges: this.changes.pendingChanges.data, previousChanges: this.changes.allChanges.data, - changeRewrites: Utils.MapToObj(this.changes._changesetHandler._remappings) - }) + changeRewrites: Utils.MapToObj(this.changes._changesetHandler._remappings), + }), }) } catch (e) { console.error("Could not upload an error report") diff --git a/src/UI/Base/DrawerLeft.svelte b/src/UI/Base/DrawerLeft.svelte index d12ba07ba..33fe2c038 100644 --- a/src/UI/Base/DrawerLeft.svelte +++ b/src/UI/Base/DrawerLeft.svelte @@ -3,28 +3,27 @@ import { sineIn } from "svelte/easing" import { UIEventSource } from "../../Logic/UIEventSource.js" - export let shown: UIEventSource; + export let shown: UIEventSource let transitionParams = { x: -320, duration: 200, - easing: sineIn - }; + easing: sineIn, + } let hidden = !shown.data $: { shown.setData(!hidden) } - shown.addCallback(sh => { + shown.addCallback((sh) => { hidden = !sh }) - - - - CONTENTS - + + CONTENTS - diff --git a/src/UI/Base/FloatOver.svelte b/src/UI/Base/FloatOver.svelte index ad68faaf8..7d5d9e122 100644 --- a/src/UI/Base/FloatOver.svelte +++ b/src/UI/Base/FloatOver.svelte @@ -30,7 +30,7 @@ }} >
{}} >
@@ -39,20 +39,16 @@
- - dispatch("close")} - /> + dispatch("close")} />
-
diff --git a/src/UI/Base/Link.svelte b/src/UI/Base/Link.svelte index 6456c5361..180ac2a14 100644 --- a/src/UI/Base/Link.svelte +++ b/src/UI/Base/Link.svelte @@ -4,7 +4,6 @@ export let text: string export let href: string - export let classnames: string = undefined export let download: string = undefined export let ariaLabel: string = undefined @@ -13,7 +12,7 @@ - + diff --git a/src/UI/Base/MapControlButton.svelte b/src/UI/Base/MapControlButton.svelte index 7fd143454..43fac4cc1 100644 --- a/src/UI/Base/MapControlButton.svelte +++ b/src/UI/Base/MapControlButton.svelte @@ -14,7 +14,6 @@ export let arialabel: Translation = undefined export let arialabelDynamic: Store = new ImmutableStore(arialabel) let arialabelString = arialabelDynamic.bind((tr) => tr?.current) - {/if} diff --git a/src/UI/Base/Popup.svelte b/src/UI/Base/Popup.svelte new file mode 100644 index 000000000..65fcd08f1 --- /dev/null +++ b/src/UI/Base/Popup.svelte @@ -0,0 +1,55 @@ + + + + shown.set(false)} outsideclose + size="xl" + {dismissable} + {defaultClass} {bodyClass} {dialogClass} {headerClass} + color="none"> + + + {#if $$slots.header} +

+ +

+ {/if} + + + {#if $$slots.footer} + + {/if} + diff --git a/src/UI/Base/TitledPanel.svelte b/src/UI/Base/TitledPanel.svelte index 6e68e500e..346bd44d8 100644 --- a/src/UI/Base/TitledPanel.svelte +++ b/src/UI/Base/TitledPanel.svelte @@ -7,6 +7,5 @@ - - + diff --git a/src/UI/BigComponents/CopyrightAllIcons.svelte b/src/UI/BigComponents/CopyrightAllIcons.svelte index f1423db48..78dd6c129 100644 --- a/src/UI/BigComponents/CopyrightAllIcons.svelte +++ b/src/UI/BigComponents/CopyrightAllIcons.svelte @@ -14,7 +14,6 @@ const license: SmallLicense = licenses[key] allLicenses[license.path] = license } - {#each iconAttributions as iconAttribution} diff --git a/src/UI/BigComponents/CopyrightPanel.svelte b/src/UI/BigComponents/CopyrightPanel.svelte index 3fec0de6b..67410dba7 100644 --- a/src/UI/BigComponents/CopyrightPanel.svelte +++ b/src/UI/BigComponents/CopyrightPanel.svelte @@ -20,7 +20,6 @@ const t = Translations.t.general.attribution const layoutToUse = state.layout - let maintainer: Translation = undefined if (layoutToUse.credits !== undefined && layoutToUse.credits !== "") { maintainer = t.themeBy.Subs({ author: layoutToUse.credits }) @@ -48,8 +47,6 @@ return Translations.t.general.attribution.attributionBackgroundLayer.Subs(props) }) - - function calculateDataContributions(contributions: Map): Translation { if (contributions === undefined) { return undefined @@ -147,7 +144,6 @@ -
MapComplete {Constants.vNumber}
diff --git a/src/UI/BigComponents/Geosearch.svelte b/src/UI/BigComponents/Geosearch.svelte new file mode 100644 index 000000000..e69de29bb diff --git a/src/UI/BigComponents/HotkeyTable.svelte b/src/UI/BigComponents/HotkeyTable.svelte index e31fa98e3..31830be61 100644 --- a/src/UI/BigComponents/HotkeyTable.svelte +++ b/src/UI/BigComponents/HotkeyTable.svelte @@ -15,31 +15,31 @@ } - - + +
+ + + + + + + {#each byKey as [key, doc, alsoTriggeredBy]} - - - - + + + - {#each byKey as [key, doc, alsoTriggeredBy]} - - - - - - {/each} -
+
+
-
-
+ {#if alsoTriggeredBy} +
+
{key}
+
{alsoTriggeredBy}
+
+ {:else} +
{key}
+ {/if} + 		+
- {#if alsoTriggeredBy} -
-
{key}
-
{alsoTriggeredBy}
-
- {:else} -
{key}
- {/if} - 		-
+ {/each} + diff --git a/src/UI/BigComponents/MenuDrawer.svelte b/src/UI/BigComponents/MenuDrawer.svelte index 105c00e8e..c7ce90b7d 100644 --- a/src/UI/BigComponents/MenuDrawer.svelte +++ b/src/UI/BigComponents/MenuDrawer.svelte @@ -1,5 +1,4 @@ -
+

- +

- {pg.menu.set(false)}} /> + { + pg.menu.set(false) + }} + />
{#if $showHome} - + {#if Utils.isIframe} @@ -81,23 +84,21 @@ {/if} - - -
+ +
{#if $userdetails.img} - + {/if} {$userdetails.name}
- - + - + @@ -112,30 +113,24 @@ highlightedRendering={state.guistate.highlightedUserSetting} layer={usersettingslayer} selectedElement={{ - type: "Feature", - properties: { id: "settings" }, - geometry: { type: "Point", coordinates: [0, 0] }, - }} - + type: "Feature", + properties: { id: "settings" }, + geometry: { type: "Point", coordinates: [0, 0] }, + }} {state} tags={state.userRelatedState.preferencesAsTags} /> - - - -

-

@@ -155,7 +150,6 @@ -

@@ -163,12 +157,12 @@

-
- - -
- + + + + + @@ -180,17 +174,16 @@ - + - {#if state.featureSwitches.featureSwitchEnableExport} - + @@ -201,15 +194,15 @@ @@ -220,7 +213,6 @@ {/if} - @@ -228,16 +220,14 @@ - - + - @@ -246,7 +236,6 @@ - @@ -254,19 +243,16 @@ - +
- + - + @@ -282,7 +268,6 @@ - @@ -293,7 +278,6 @@ - @@ -302,17 +286,14 @@ - - - - + + + - - @@ -321,7 +302,6 @@ -
{Constants.vNumber}
diff --git a/src/UI/BigComponents/MoreScreen.ts b/src/UI/BigComponents/MoreScreen.ts index 91d8b3d91..997be4c92 100644 --- a/src/UI/BigComponents/MoreScreen.ts +++ b/src/UI/BigComponents/MoreScreen.ts @@ -18,7 +18,7 @@ export default class MoreScreen { } = themeOverview public static readonly officialThemesById: Map = new Map() static { - for (const th of MoreScreen.officialThemes.themes) { + for (const th of MoreScreen.officialThemes.themes ?? []) { MoreScreen.officialThemesById.set(th.id, th) } } diff --git a/src/UI/BigComponents/NewPointLocationInput.svelte b/src/UI/BigComponents/NewPointLocationInput.svelte index 0ba608143..f677841f1 100644 --- a/src/UI/BigComponents/NewPointLocationInput.svelte +++ b/src/UI/BigComponents/NewPointLocationInput.svelte @@ -18,6 +18,7 @@ import StaticFeatureSource from "../../Logic/FeatureSource/Sources/StaticFeatureSource" import { Tag } from "../../Logic/Tags/Tag" import { TagUtils } from "../../Logic/Tags/TagUtils" + import type { WayId } from "../../Models/OsmFeature" /** * An advanced location input, which has support to: @@ -45,11 +46,16 @@ } export let snapToLayers: string[] | undefined = undefined export let targetLayer: LayerConfig | undefined = undefined + /** + * If a 'targetLayer' is given, objects of this layer will be shown as well to avoid duplicates + * If you want to hide some of them, blacklist them here + */ + export let dontShow: string[] = [] export let maxSnapDistance: number = undefined export let presetProperties: Tag[] = [] let presetPropertiesUnpacked = TagUtils.KVtoProperties(presetProperties) - export let snappedTo: UIEventSource + export let snappedTo: UIEventSource let preciseLocation: UIEventSource<{ lon: number; lat: number }> = new UIEventSource<{ lon: number @@ -57,7 +63,7 @@ }>(undefined) const map: UIEventSource = new UIEventSource(undefined) - let initialMapProperties: Partial & { location } = { + export let mapProperties: Partial & { location } = { zoom: new UIEventSource(19), maxbounds: new UIEventSource(undefined), /*If no snapping needed: the value is simply the map location; @@ -77,8 +83,11 @@ if (targetLayer) { // Show already existing items - const featuresForLayer = state.perLayer.get(targetLayer.id) + let featuresForLayer: FeatureSource = state.perLayer.get(targetLayer.id) if (featuresForLayer) { + if (dontShow) { + featuresForLayer = new StaticFeatureSource(featuresForLayer.features.map(feats => feats.filter(f => dontShow.indexOf(f.properties.id) < 0))) + } new ShowDataLayer(map, { layer: targetLayer, features: featuresForLayer, @@ -104,13 +113,13 @@ const snappedLocation = new SnappingFeatureSource( new FeatureSourceMerger(...Utils.NoNull(snapSources)), // We snap to the (constantly updating) map location - initialMapProperties.location, + mapProperties.location, { maxDistance: maxSnapDistance ?? 15, allowUnsnapped: true, snappedTo, snapLocation: value, - } + }, ) const withCorrectedAttributes = new StaticFeatureSource( snappedLocation.features.mapD((feats) => @@ -124,8 +133,8 @@ ...f, properties, } - }) - ) + }), + ), ) // The actual point to be created, snapped at the new location new ShowDataLayer(map, { @@ -139,7 +148,7 @@
- state.selectedElement.setData(undefined)}/> + state.selectedElement.setData(undefined)} />
-
diff --git a/src/UI/BigComponents/ShareScreen.svelte b/src/UI/BigComponents/ShareScreen.svelte index e848b4150..10f26cc1a 100644 --- a/src/UI/BigComponents/ShareScreen.svelte +++ b/src/UI/BigComponents/ShareScreen.svelte @@ -118,8 +118,7 @@ ) -
- +
Open the current location in other applications
diff --git a/src/UI/BigComponents/ThemeIntroPanel.svelte b/src/UI/BigComponents/ThemeIntroPanel.svelte index fe6d8470a..bbd6691e2 100644 --- a/src/UI/BigComponents/ThemeIntroPanel.svelte +++ b/src/UI/BigComponents/ThemeIntroPanel.svelte @@ -54,7 +54,10 @@ - state.guistate.pageStates.about_theme.setData(false)}> + state.guistate.pageStates.about_theme.setData(false)} + >
@@ -97,10 +100,9 @@ {/if}
-
+
-
diff --git a/src/UI/Comparison/ComparisonTool.svelte b/src/UI/Comparison/ComparisonTool.svelte index 4d3edc91c..bc06f15d9 100644 --- a/src/UI/Comparison/ComparisonTool.svelte +++ b/src/UI/Comparison/ComparisonTool.svelte @@ -47,7 +47,6 @@ - {#if !$sourceUrl || !$enableLogin} {:else if $externalData === undefined} @@ -59,15 +58,15 @@ {:else if $propertyKeysExternal.length === 0 && $knownImages.size + $unknownImages.length === 0} {:else if !$hasDifferencesAtStart} - - - + + + {:else if $comparisonState !== undefined} - - - - + + + + let fallbackImage: string = undefined @@ -16,36 +20,58 @@ let imgEl: HTMLImageElement export let imgClass: string = undefined - export let previewedImage: UIEventSource = undefined export let attributionFormat: "minimal" | "medium" | "large" = "medium" - let canZoom = previewedImage !== undefined // We check if there is a SOURCE, not if there is data in it! + export let previewedImage: UIEventSource + export let canZoom = previewedImage !== undefined let loaded = false + let showBigPreview = new UIEventSource(false) + onDestroy(showBigPreview.addCallbackAndRun(shown=>{ + if(!shown){ + previewedImage.set(false) + } + })) + onDestroy(previewedImage.addCallbackAndRun(previewedImage => { + showBigPreview.set(previewedImage?.id === image.id) + })) + +
+
+ + + +
+
+ {console.log("Closing");previewedImage.set(undefined)}}> +
+
loaded = true} + on:load={() => (loaded = true)} class={imgClass ?? ""} - class:cursor-zoom-in={previewedImage !== undefined} + class:cursor-zoom-in={canZoom} on:click={() => { - previewedImage?.setData(image) + previewedImage?.set(image) }} on:error={() => { - if (fallbackImage) { - imgEl.src = fallbackImage - } - }} + if (fallbackImage) { + imgEl.src = fallbackImage + } + }} src={image.url} /> {#if canZoom && loaded} -
previewedImage.set(image)}> - +
previewedImage.set(image)}> +
{/if} -
diff --git a/src/UI/Image/ImageAttribution.svelte b/src/UI/Image/ImageAttribution.svelte index cd7c9847a..9594c87d8 100644 --- a/src/UI/Image/ImageAttribution.svelte +++ b/src/UI/Image/ImageAttribution.svelte @@ -20,7 +20,9 @@ {#if $license !== undefined} -
+
{#if icon !== undefined}
@@ -28,7 +30,7 @@ {/if}
- {#if attributionFormat !== "minimal" } + {#if attributionFormat !== "minimal"} {#if $license.title} {#if $license.informationLocation} @@ -42,7 +44,7 @@ {#if $license.artist} {#if attributionFormat === "large"} - + {:else}
{@html $license.artist} @@ -58,7 +60,7 @@ {#if attributionFormat !== "minimal"}
- {#if ($license.license !== undefined || $license.licenseShortName !== undefined)} + {#if $license.license !== undefined || $license.licenseShortName !== undefined}
{$license?.license ?? $license?.licenseShortName}
@@ -72,7 +74,6 @@ {/if}
{/if} -
{/if} diff --git a/src/UI/Image/ImageOperations.svelte b/src/UI/Image/ImageOperations.svelte index 592ee7597..58b8aa5dd 100644 --- a/src/UI/Image/ImageOperations.svelte +++ b/src/UI/Image/ImageOperations.svelte @@ -39,18 +39,18 @@
-
- +
+
+ +
diff --git a/src/UI/Image/LinkableImage.svelte b/src/UI/Image/LinkableImage.svelte index da3cbfbf6..b290ecf95 100644 --- a/src/UI/Image/LinkableImage.svelte +++ b/src/UI/Image/LinkableImage.svelte @@ -33,7 +33,7 @@ key: undefined, provider: AllImageProviders.byName(image.provider), date: new Date(image.date), - id: Object.values(image.osmTags)[0] + id: Object.values(image.osmTags)[0], } async function applyLink(isLinked: boolean) { @@ -44,7 +44,7 @@ if (isLinked) { const action = new LinkImageAction(currentTags.id, key, url, tags, { theme: tags.data._orig_theme ?? state.layout.id, - changeType: "link-image" + changeType: "link-image", }) await state.changes.applyAction(action) } else { @@ -53,7 +53,7 @@ if (v === url) { const action = new ChangeTagAction(currentTags.id, new Tag(k, ""), currentTags, { theme: tags.data._orig_theme ?? state.layout.id, - changeType: "remove-image" + changeType: "remove-image", }) state.changes.applyAction(action) } @@ -62,17 +62,31 @@ } isLinked.addCallback((isLinked) => applyLink(isLinked)) - -
+
+ > + + {#if linkable}
+ +
- +
{#if $_availableLayers?.length < 1} {:else} - -
+
{ - private readonly _ohs: UIEventSource - private readonly _backgroundTable: OpeningHoursPickerTable - - constructor(ohs: UIEventSource = new UIEventSource([])) { - super() - this._ohs = ohs - - ohs.addCallback((oh) => { - ohs.setData(OH.MergeTimes(oh)) - }) - - this._backgroundTable = new OpeningHoursPickerTable(this._ohs) - this._backgroundTable.ConstructElement() - } - - GetValue(): UIEventSource { - return this._ohs - } - - IsValid(_: OpeningHour[]): boolean { - return true - } - - protected InnerConstructElement(): HTMLElement { - return this._backgroundTable.ConstructElement() - } -} diff --git a/src/UI/OpeningHours/OpeningHoursPickerTable.ts b/src/UI/OpeningHours/OpeningHoursPickerTable.ts deleted file mode 100644 index 0e660f714..000000000 --- a/src/UI/OpeningHours/OpeningHoursPickerTable.ts +++ /dev/null @@ -1,332 +0,0 @@ -/** - * This is the base-table which is selectable by hovering over it. - * It will genarate the currently selected opening hour. - */ -import { UIEventSource } from "../../Logic/UIEventSource" -import { Utils } from "../../Utils" -import { OpeningHour } from "./OpeningHours" -import { InputElement } from "../Input/InputElement" -import Translations from "../i18n/Translations" -import { Translation } from "../i18n/Translation" -import { FixedUiElement } from "../Base/FixedUiElement" -import { VariableUiElement } from "../Base/VariableUIElement" -import Combine from "../Base/Combine" -import OpeningHoursRange from "./OpeningHoursRange" - -export default class OpeningHoursPickerTable extends InputElement { - public static readonly days: Translation[] = [ - Translations.t.general.weekdays.abbreviations.monday, - Translations.t.general.weekdays.abbreviations.tuesday, - Translations.t.general.weekdays.abbreviations.wednesday, - Translations.t.general.weekdays.abbreviations.thursday, - Translations.t.general.weekdays.abbreviations.friday, - Translations.t.general.weekdays.abbreviations.saturday, - Translations.t.general.weekdays.abbreviations.sunday, - ] - /* - These html-elements are an overlay over the table columns and act as a host for the ranges in the weekdays - */ - public readonly weekdayElements: HTMLElement[] = Utils.TimesT(7, () => - document.createElement("div") - ) - private readonly source: UIEventSource - - constructor(source?: UIEventSource) { - super() - this.source = source ?? new UIEventSource([]) - this.SetClass("w-full block") - } - - IsValid(_: OpeningHour[]): boolean { - return true - } - - GetValue(): UIEventSource { - return this.source - } - - protected InnerConstructElement(): HTMLElement { - const table = document.createElement("table") - table.classList.add("oh-table") - table.classList.add("no-weblate") - table.classList.add("relative") // Workaround for webkit-based viewers, see #1019 - - const cellHeightInPx = 14 - - const headerRow = document.createElement("tr") - headerRow.appendChild(document.createElement("th")) - headerRow.classList.add("relative") - for (let i = 0; i < OpeningHoursPickerTable.days.length; i++) { - let weekday = OpeningHoursPickerTable.days[i].Clone() - const cell = document.createElement("th") - cell.style.width = "14%" - cell.appendChild(weekday.ConstructElement()) - - const fullColumnSpan = this.weekdayElements[i] - fullColumnSpan.classList.add("w-full", "relative") - - // We need to round! The table height is rounded as following, we use this to calculate the actual number of pixels afterwards - fullColumnSpan.style.height = cellHeightInPx * 48 + "px" - - const ranges = new VariableUiElement( - this.source - .map((ohs) => (ohs ?? []).filter((oh: OpeningHour) => oh.weekday === i)) - .map((ohsForToday) => { - return new Combine( - ohsForToday.map( - (oh) => - new OpeningHoursRange(oh, () => { - this.source.data.splice(this.source.data.indexOf(oh), 1) - this.source.ping() - }) - ) - ) - }) - ) - fullColumnSpan.appendChild(ranges.ConstructElement()) - - const fullColumnSpanWrapper = document.createElement("div") - fullColumnSpanWrapper.classList.add("absolute") - fullColumnSpanWrapper.style.zIndex = "10" - fullColumnSpanWrapper.style.width = "13.5%" - fullColumnSpanWrapper.style.pointerEvents = "none" - - fullColumnSpanWrapper.appendChild(fullColumnSpan) - - cell.appendChild(fullColumnSpanWrapper) - headerRow.appendChild(cell) - } - - table.appendChild(headerRow) - - const self = this - for (let h = 0; h < 24; h++) { - const hs = Utils.TwoDigits(h) - const firstCell = document.createElement("td") - firstCell.rowSpan = 2 - firstCell.classList.add("oh-left-col", "oh-timecell-full", "border-box") - firstCell.appendChild(new FixedUiElement(hs + ":00").ConstructElement()) - - const evenRow = document.createElement("tr") - evenRow.appendChild(firstCell) - - for (let weekday = 0; weekday < 7; weekday++) { - const cell = document.createElement("td") - cell.classList.add("oh-timecell", "oh-timecell-full", `oh-timecell-${weekday}`) - evenRow.appendChild(cell) - } - evenRow.style.height = cellHeightInPx + "px" - evenRow.style.maxHeight = evenRow.style.height - evenRow.style.minHeight = evenRow.style.height - table.appendChild(evenRow) - - const oddRow = document.createElement("tr") - - for (let weekday = 0; weekday < 7; weekday++) { - const cell = document.createElement("td") - cell.classList.add("oh-timecell", "oh-timecell-half", `oh-timecell-${weekday}`) - oddRow.appendChild(cell) - } - oddRow.style.minHeight = evenRow.style.height - oddRow.style.maxHeight = evenRow.style.height - - table.appendChild(oddRow) - } - - /**** Event handling below ***/ - - let mouseIsDown = false - let selectionStart: [number, number] = undefined - let selectionEnd: [number, number] = undefined - - function h(timeSegment: number) { - return Math.floor(timeSegment / 2) - } - - function m(timeSegment: number) { - return (timeSegment % 2) * 30 - } - - function startSelection(i: number, j: number) { - mouseIsDown = true - selectionStart = [i, j] - selectionEnd = [i, j] - } - - function endSelection() { - if (selectionStart === undefined) { - return - } - if (!mouseIsDown) { - return - } - mouseIsDown = false - const dStart = Math.min(selectionStart[1], selectionEnd[1]) - const dEnd = Math.max(selectionStart[1], selectionEnd[1]) - const timeStart = Math.min(selectionStart[0], selectionEnd[0]) - 1 - const timeEnd = Math.max(selectionStart[0], selectionEnd[0]) - 1 - for (let weekday = dStart; weekday <= dEnd; weekday++) { - const oh: OpeningHour = { - weekday: weekday, - startHour: h(timeStart), - startMinutes: m(timeStart), - endHour: h(timeEnd + 1), - endMinutes: m(timeEnd + 1), - } - if (oh.endHour > 23) { - oh.endHour = 24 - oh.endMinutes = 0 - } - self.source.data.push(oh) - } - self.source.ping() - - // Clear the highlighting - let header = table.rows[0] - for (let j = 1; j < header.cells.length; j++) { - header.cells[j].classList?.remove("oh-timecol-selected") - } - for (let i = 1; i < table.rows.length; i++) { - let row = table.rows[i] - for (let j = 0; j < row.cells.length; j++) { - let cell = row.cells[j] - cell?.classList?.remove("oh-timecell-selected") - row.classList?.remove("oh-timerow-selected") - } - } - } - - table.onmouseup = () => { - endSelection() - } - table.onmouseleave = () => { - endSelection() - } - - let lastSelectionIend, lastSelectionJEnd - - function selectAllBetween(iEnd, jEnd) { - if (lastSelectionIend === iEnd && lastSelectionJEnd === jEnd) { - return // We already did this - } - lastSelectionIend = iEnd - lastSelectionJEnd = jEnd - - let iStart = selectionStart[0] - let jStart = selectionStart[1] - - if (iStart > iEnd) { - const h = iStart - iStart = iEnd - iEnd = h - } - if (jStart > jEnd) { - const h = jStart - jStart = jEnd - jEnd = h - } - - let header = table.rows[0] - for (let j = 1; j < header.cells.length; j++) { - let cell = header.cells[j] - cell.classList?.remove("oh-timecol-selected-round-left") - cell.classList?.remove("oh-timecol-selected-round-right") - - if (jStart + 1 <= j && j <= jEnd + 1) { - cell.classList?.add("oh-timecol-selected") - if (jStart + 1 == j) { - cell.classList?.add("oh-timecol-selected-round-left") - } - if (jEnd + 1 == j) { - cell.classList?.add("oh-timecol-selected-round-right") - } - } else { - cell.classList?.remove("oh-timecol-selected") - } - } - - for (let i = 1; i < table.rows.length; i++) { - let row = table.rows[i] - if (iStart <= i && i <= iEnd) { - row.classList?.add("oh-timerow-selected") - } else { - row.classList?.remove("oh-timerow-selected") - } - for (let j = 0; j < row.cells.length; j++) { - let cell = row.cells[j] - if (cell === undefined) { - continue - } - let offset = 0 - if (i % 2 == 1) { - if (j == 0) { - // This is the first column of a full hour -> This is the time indication (skip) - continue - } - offset = -1 - } - - if (iStart <= i && i <= iEnd && jStart <= j + offset && j + offset <= jEnd) { - cell?.classList?.add("oh-timecell-selected") - } else { - cell?.classList?.remove("oh-timecell-selected") - } - } - } - } - - for (let i = 1; i < table.rows.length; i++) { - let row = table.rows[i] - for (let j = 0; j < row.cells.length; j++) { - let cell = row.cells[j] - let offset = 0 - if (i % 2 == 1) { - if (j == 0) { - continue - } - offset = -1 - } - - cell.onmousedown = (ev) => { - ev.preventDefault() - startSelection(i, j + offset) - selectAllBetween(i, j + offset) - } - cell.ontouchstart = (ev) => { - ev.preventDefault() - startSelection(i, j + offset) - selectAllBetween(i, j + offset) - } - cell.onmouseenter = () => { - if (mouseIsDown) { - selectionEnd = [i, j + offset] - selectAllBetween(i, j + offset) - } - } - - cell.ontouchmove = (ev: TouchEvent) => { - ev.preventDefault() - for (const k in ev.targetTouches) { - const touch = ev.targetTouches[k] - if (touch.clientX === undefined || touch.clientY === undefined) { - continue - } - const elUnderTouch = document.elementFromPoint(touch.clientX, touch.clientY) - // @ts-ignore - const f = elUnderTouch.onmouseenter - if (f) { - f() - } - } - } - - cell.ontouchend = (ev) => { - ev.preventDefault() - endSelection() - } - } - } - - return table - } -} diff --git a/src/UI/OpeningHours/OpeningHoursRange.ts b/src/UI/OpeningHours/OpeningHoursRange.ts index 45e210cd2..c26af273a 100644 --- a/src/UI/OpeningHours/OpeningHoursRange.ts +++ b/src/UI/OpeningHours/OpeningHoursRange.ts @@ -38,7 +38,7 @@ export default class OpeningHoursRange extends BaseUIElement { }) let content: BaseUIElement - if (height > 2) { + if (height > 3) { content = new Combine([startTime, deleteRange, endTime]).SetClass( "flex flex-col h-full justify-between" ) @@ -55,6 +55,10 @@ export default class OpeningHoursRange extends BaseUIElement { return el } + /** + * Gets the relative height, in number of hours to display + * Range: ]0 - 24] + */ private getHeight(): number { const oh = this._oh diff --git a/src/UI/OpeningHours/OpeningHoursInput.ts b/src/UI/OpeningHours/OpeningHoursState.ts similarity index 61% rename from src/UI/OpeningHours/OpeningHoursInput.ts rename to src/UI/OpeningHours/OpeningHoursState.ts index cf76d105b..1d5dccc6c 100644 --- a/src/UI/OpeningHours/OpeningHoursInput.ts +++ b/src/UI/OpeningHours/OpeningHoursState.ts @@ -3,29 +3,19 @@ * Keeps track of unparsed rules * Exports everything conveniently as a string, for direct use */ -import OpeningHoursPicker from "./OpeningHoursPicker" import { Store, UIEventSource } from "../../Logic/UIEventSource" -import { VariableUiElement } from "../Base/VariableUIElement" -import Combine from "../Base/Combine" -import { FixedUiElement } from "../Base/FixedUiElement" import { OH, OpeningHour } from "./OpeningHours" -import { InputElement } from "../Input/InputElement" -import Translations from "../i18n/Translations" -import BaseUIElement from "../BaseUIElement" -import SvelteUIElement from "../Base/SvelteUIElement" -import PublicHolidaySelector from "./PublicHolidaySelector.svelte" -export default class OpeningHoursInput extends InputElement { - private readonly _value: UIEventSource - private readonly _element: BaseUIElement +export default class OpeningHoursState { + public readonly normalOhs: UIEventSource + public readonly leftoverRules: Store + public readonly phSelectorValue: UIEventSource constructor( value: UIEventSource = new UIEventSource(""), prefix = "", - postfix = "" + postfix = "", ) { - super() - this._value = value let valueWithoutPrefix = value if (prefix !== "" && postfix !== "") { valueWithoutPrefix = value.sync( @@ -54,11 +44,11 @@ export default class OpeningHoursInput extends InputElement { } return prefix + noPrefix + postfix - } + }, ) } - const leftoverRules: Store = valueWithoutPrefix.map((str) => { + this.leftoverRules = valueWithoutPrefix.map((str) => { if (str === undefined) { return [] } @@ -88,24 +78,25 @@ export default class OpeningHoursInput extends InputElement { break } } - const phSelectorValue = new UIEventSource(ph ?? "") + this.phSelectorValue = new UIEventSource(ph ?? "") + // Note: MUST be bound AFTER the leftover rules! - const rulesFromOhPicker: UIEventSource = valueWithoutPrefix.sync( + this.normalOhs = valueWithoutPrefix.sync( (str) => { return OH.Parse(str) }, - [leftoverRules, phSelectorValue], + [this.leftoverRules, this.phSelectorValue], (rules, oldString) => { // We always add a ';', to easily add new rules. We remove the ';' again at the end of the function // Important: spaces are _not_ allowed after a ';' as it'll destabilize the parsing! let str = OH.ToString(rules) + ";" - const ph = phSelectorValue.data + const ph = this.phSelectorValue.data if (ph) { str += ph + ";" } - str += leftoverRules.data.join(";") + ";" + str += this.leftoverRules.data.join(";") + ";" str = str.trim() while (str.endsWith(";")) { @@ -120,41 +111,24 @@ export default class OpeningHoursInput extends InputElement { return oldString // We pass a reference to the old string to stabilize the EventSource } return str - } + }, ) + /* + const leftoverWarning = new VariableUiElement( + leftoverRules.map((leftovers: string[]) => { + if (leftovers.length == 0) { + return "" + } + return new Combine([ + Translations.t.general.opening_hours.not_all_rules_parsed, + new FixedUiElement(leftovers.map((r) => `${r}
`).join("")).SetClass( + "subtle" + ), + ]) + }) + )*/ - const leftoverWarning = new VariableUiElement( - leftoverRules.map((leftovers: string[]) => { - if (leftovers.length == 0) { - return "" - } - return new Combine([ - Translations.t.general.opening_hours.not_all_rules_parsed, - new FixedUiElement(leftovers.map((r) => `${r}
`).join("")).SetClass( - "subtle" - ), - ]) - }) - ) - const ohPicker = new OpeningHoursPicker(rulesFromOhPicker) - - this._element = new Combine([ - leftoverWarning, - ohPicker, - new SvelteUIElement(PublicHolidaySelector, { value: phSelectorValue }), - ]) } - GetValue(): UIEventSource { - return this._value - } - - IsValid(_: string): boolean { - return true - } - - protected InnerConstructElement(): HTMLElement { - return this._element.ConstructElement() - } } diff --git a/src/UI/Popup/AddNewPoint/PresetList.svelte b/src/UI/Popup/AddNewPoint/PresetList.svelte index a2404df1e..41cb9eacf 100644 --- a/src/UI/Popup/AddNewPoint/PresetList.svelte +++ b/src/UI/Popup/AddNewPoint/PresetList.svelte @@ -55,7 +55,7 @@ for (const preset of layer.presets) { const tags = TagUtils.KVtoProperties(preset.tags ?? []) - if(preset.preciseInput.snapToLayers){ + if (preset.preciseInput.snapToLayers) { tags["_referencing_ways"] = '["way/-1"]' } diff --git a/src/UI/Popup/MoveWizard.svelte b/src/UI/Popup/MoveWizard.svelte index cbb7407de..9b7c7889e 100644 --- a/src/UI/Popup/MoveWizard.svelte +++ b/src/UI/Popup/MoveWizard.svelte @@ -10,7 +10,6 @@ import type { MapProperties } from "../../Models/MapProperties" import type { Feature, Point } from "geojson" import { GeoOperations } from "../../Logic/GeoOperations" - import LocationInput from "../InputElement/Helpers/LocationInput.svelte" import OpenBackgroundSelectorButton from "../BigComponents/OpenBackgroundSelectorButton.svelte" import If from "../Base/If.svelte" import Constants from "../../Models/Constants" @@ -19,6 +18,8 @@ import ChevronLeft from "@babeard/svelte-heroicons/solid/ChevronLeft" import ThemeViewState from "../../Models/ThemeViewState" import Icon from "../Map/Icon.svelte" + import NewPointLocationInput from "../BigComponents/NewPointLocationInput.svelte" + import type { WayId } from "../../Models/OsmFeature" export let state: ThemeViewState @@ -34,20 +35,22 @@ let newLocation = new UIEventSource<{ lon: number; lat: number }>(undefined) - function initMapProperties() { + let snappedTo = new UIEventSource(undefined) + + function initMapProperties(reason: MoveReason) { return { allowMoving: new UIEventSource(true), allowRotating: new UIEventSource(false), allowZooming: new UIEventSource(true), bounds: new UIEventSource(undefined), location: new UIEventSource({ lon, lat }), - minzoom: new UIEventSource($reason.minZoom), + minzoom: new UIEventSource(reason.minZoom), rasterLayer: state.mapProperties.rasterLayer, - zoom: new UIEventSource($reason?.startZoom ?? 16), + zoom: new UIEventSource(reason?.startZoom ?? 16), } } - let moveWizardState = new MoveWizardState(id, layer.allowMove, state) + let moveWizardState = new MoveWizardState(id, layer.allowMove, layer, state) if (moveWizardState.reasons.length === 1) { reason.setData(moveWizardState.reasons[0]) } @@ -55,8 +58,8 @@ let currentMapProperties: MapProperties = undefined - - {#if moveWizardState.reasons.length > 0} +{#if moveWizardState.reasons.length > 0} + {#if $notAllowed}
@@ -79,7 +82,7 @@ {#if currentStep === "reason" && moveWizardState.reasons.length > 1} {#each moveWizardState.reasons as reasonSpec} - + +
+ +
- - - - {#if config.freeform?.key && allowDeleteOfFreeform && !checkedMappings?.some((m) => m) && !$freeformInput && !$freeformInputUnvalidated && $tags[config.freeform.key]} - - {:else} - + {/if} + + +
+ + + + + {#if config.freeform?.key && !checkedMappings?.some((m) => m) && !$freeformInput && !$freeformInputUnvalidated && $tags[config.freeform.key]} + + {:else} + - {/if} - + > + + + {/if} + +
+
{#if UserRelatedState.SHOW_TAGS_VALUES.indexOf($showTags) >= 0 || ($showTags === "" && numberOfCs >= Constants.userJourney.tagsVisibleAt) || $featureSwitchIsTesting || $featureSwitchIsDebugging} diff --git a/src/UI/Popup/TagRendering/TagRenderingQuestionDynamic.svelte b/src/UI/Popup/TagRendering/TagRenderingQuestionDynamic.svelte index d977d1f9b..15cb4f19b 100644 --- a/src/UI/Popup/TagRendering/TagRenderingQuestionDynamic.svelte +++ b/src/UI/Popup/TagRendering/TagRenderingQuestionDynamic.svelte @@ -28,8 +28,6 @@ export let selectedTags: UploadableTag = undefined export let extraTags: UIEventSource> = new UIEventSource({}) - export let allowDeleteOfFreeform: boolean = true - let dynamicConfig = TagRenderingConfigUtils.withNameSuggestionIndex(config, tags, selectedElement) @@ -40,7 +38,6 @@ {selectedElement} {layer} {selectedTags} - {allowDeleteOfFreeform} {extraTags} > diff --git a/src/UI/SpecialVisualizations.ts b/src/UI/SpecialVisualizations.ts index dc4a89439..a19040e7e 100644 --- a/src/UI/SpecialVisualizations.ts +++ b/src/UI/SpecialVisualizations.ts @@ -5,7 +5,7 @@ import Title from "./Base/Title" import { RenderingSpecification, SpecialVisualization, - SpecialVisualizationState + SpecialVisualizationState, } from "./SpecialVisualization" import { HistogramViz } from "./Popup/HistogramViz" import MinimapViz from "./Popup/MinimapViz.svelte" @@ -108,13 +108,13 @@ class NearbyImageVis implements SpecialVisualization { { name: "mode", defaultValue: "closed", - doc: "Either `open` or `closed`. If `open`, then the image carousel will always be shown" + doc: "Either `open` or `closed`. If `open`, then the image carousel will always be shown", }, { name: "readonly", required: false, - doc: "If 'readonly', will not show the 'link'-button" - } + doc: "If 'readonly', will not show the 'link'-button", + }, ] docs = "A component showing nearby images loaded from various online services such as Mapillary. In edit mode and when used on a feature, the user can select an image to add to the feature" @@ -138,7 +138,7 @@ class NearbyImageVis implements SpecialVisualization { lat, feature, layer, - linkable: !readonly + linkable: !readonly, }) } } @@ -152,13 +152,13 @@ class StealViz implements SpecialVisualization { { name: "featureId", doc: "The key of the attribute which contains the id of the feature from which to use the tags", - required: true + required: true, }, { name: "tagRenderingId", doc: "The layer-id and tagRenderingId to render. Can be multiple value if ';'-separated (in which case every value must also contain the layerId, e.g. `layerId.tagRendering0; layerId.tagRendering1`). Note: this can cause layer injection", - required: true - } + required: true, + }, ] needsUrls = [] svelteBased = true @@ -192,7 +192,7 @@ class StealViz implements SpecialVisualization { tags: otherTags, selectedElement: otherFeature, state, - layer + layer, }) ) } @@ -225,30 +225,30 @@ class CloseNoteViz implements SpecialVisualization { { name: "text", doc: "Text to show on this button", - required: true + required: true, }, { name: "icon", doc: "Icon to show", - defaultValue: "checkmark.svg" + defaultValue: "checkmark.svg", }, { name: "idkey", doc: "The property name where the ID of the note to close can be found", - defaultValue: "id" + defaultValue: "id", }, { name: "comment", - doc: "Text to add onto the note when closing" + doc: "Text to add onto the note when closing", }, { name: "minZoom", - doc: "If set, only show the closenote button if zoomed in enough" + doc: "If set, only show the closenote button if zoomed in enough", }, { name: "zoomButton", - doc: "Text to show if not zoomed in enough" - } + doc: "Text to show if not zoomed in enough", + }, ] public constr( @@ -269,7 +269,7 @@ class CloseNoteViz implements SpecialVisualization { message: comment, text: Translations.T(text), minzoom: minZoom, - zoomMoreMessage: zoomButton + zoomMoreMessage: zoomButton, }) } } @@ -285,12 +285,12 @@ export class QuestionViz implements SpecialVisualization { args = [ { name: "labels", - doc: "One or more ';'-separated labels. If these are given, only questions with these labels will be given. Use `unlabeled` for all questions that don't have an explicit label. If none given, all questions will be shown" + doc: "One or more ';'-separated labels. If these are given, only questions with these labels will be given. Use `unlabeled` for all questions that don't have an explicit label. If none given, all questions will be shown", }, { name: "blacklisted-labels", - doc: "One or more ';'-separated labels of questions which should _not_ be included" - } + doc: "One or more ';'-separated labels of questions which should _not_ be included", + }, ] svelteBased = true @@ -315,7 +315,7 @@ export class QuestionViz implements SpecialVisualization { selectedElement: feature, state, onlyForLabels: labels, - notForLabels: blacklist + notForLabels: blacklist, }).SetClass("w-full") } } @@ -351,18 +351,18 @@ export default class SpecialVisualizations { viz.docs, viz.args.length > 0 ? MarkdownUtils.table( - ["name", "default", "description"], - viz.args.map((arg) => { - let defaultArg = arg.defaultValue ?? "_undefined_" - if (defaultArg == "") { - defaultArg = "_empty string_" - } - return [arg.name, defaultArg, arg.doc] - }) - ) + ["name", "default", "description"], + viz.args.map((arg) => { + let defaultArg = arg.defaultValue ?? "_undefined_" + if (defaultArg == "") { + defaultArg = "_empty string_" + } + return [arg.name, defaultArg, arg.doc] + }) + ) : undefined, "#### Example usage of " + viz.funcName, - "" + example + "" + "" + example + "", ].join("\n\n") } @@ -398,24 +398,24 @@ export default class SpecialVisualizations { argname: "some_arg", message: { en: "some other really long message", - nl: "een boodschap in een andere taal" + nl: "een boodschap in een andere taal", }, - other_arg_name: "more args" + other_arg_name: "more args", }, before: { en: "Some text to prefix before the special element (e.g. a title)", - nl: "Een tekst om voor het element te zetten (bv. een titel)" + nl: "Een tekst om voor het element te zetten (bv. een titel)", }, after: { - en: "Some text to put after the element, e.g. a footer" - } - } + en: "Some text to put after the element, e.g. a footer", + }, + }, }, null, " " ) ).SetClass("code"), - "In other words: use `{ \"before\": ..., \"after\": ..., \"special\": {\"type\": ..., \"argname\": ...argvalue...}`. The args are in the `special` block; an argvalue can be a string, a translation or another value. (Refer to class `RewriteSpecial` in case of problems)" + 'In other words: use `{ "before": ..., "after": ..., "special": {"type": ..., "argname": ...argvalue...}`. The args are in the `special` block; an argvalue can be a string, a translation or another value. (Refer to class `RewriteSpecial` in case of problems)', ]) .SetClass("flex flex-col") .AsMarkdown() @@ -435,9 +435,9 @@ export default class SpecialVisualizations { const [lon, lat] = GeoOperations.centerpointCoordinates(feature) return new SvelteUIElement(AddNewPoint, { state, - coordinate: { lon, lat } + coordinate: { lon, lat }, }).SetClass("w-full h-full overflow-auto") - } + }, }, { funcName: "language_picker", @@ -454,11 +454,11 @@ export default class SpecialVisualizations { availableLanguages: languages, preferredLanguages: state.osmConnection.userDetails.map( (ud) => ud.languages - ) + ), }) }) ) - } + }, }, { funcName: "logout", @@ -468,7 +468,7 @@ export default class SpecialVisualizations { constr(state: SpecialVisualizationState): BaseUIElement { return new SvelteUIElement(LogoutButton, { osmConnection: state.osmConnection }) - } + }, }, new HistogramViz(), new StealViz(), @@ -480,13 +480,13 @@ export default class SpecialVisualizations { { doc: "The (maximum) zoomlevel: the target zoomlevel after fitting the entire feature. The minimap will fit the entire feature, then zoom out to this zoom level. The higher, the more zoomed in with 1 being the entire world and 19 being really close", name: "zoomlevel", - defaultValue: "18" + defaultValue: "18", }, { doc: "(Matches all resting arguments) This argument should be the key of a property of the feature. The corresponding value is interpreted as either the id or the a list of ID's. The features with these ID's will be shown on this minimap. (Note: if the key is 'id', list interpration is disabled)", name: "idKey", - defaultValue: "id" - } + defaultValue: "id", + }, ], example: "`{minimap()}`, `{minimap(17, id, _list_of_embedded_feature_ids_calculated_by_calculated_tag):height:10rem; border: 2px solid black}`", @@ -498,7 +498,7 @@ export default class SpecialVisualizations { feature: Feature ): SvelteUIElement { return new SvelteUIElement(MinimapViz, { state, args, feature, tagSource }) - } + }, }, { funcName: "split_button", @@ -519,7 +519,7 @@ export default class SpecialVisualizations { return undefined }) ) - } + }, }, { funcName: "move_button", @@ -540,9 +540,9 @@ export default class SpecialVisualizations { return new SvelteUIElement(MoveWizard, { state, featureToMove: feature, - layer + layer, }) - } + }, }, { funcName: "delete_button", @@ -564,9 +564,9 @@ export default class SpecialVisualizations { deleteConfig: layer.deletion, state, feature, - layer + layer, }).SetClass("p-0 m-0") - } + }, }, new ShareLinkViz(), new ExportAsGpxViz(), @@ -587,9 +587,9 @@ export default class SpecialVisualizations { const [lon, lat] = GeoOperations.centerpointCoordinates(feature) return new SvelteUIElement(CreateNewNote, { state, - coordinate: new UIEventSource({ lon, lat }) + coordinate: new UIEventSource({ lon, lat }), }) - } + }, }, new CloseNoteViz(), new PlantNetDetectionViz(), @@ -608,8 +608,8 @@ export default class SpecialVisualizations { { name: "keyToShowWikipediaFor", doc: "Use the wikidata entry from this key to show the wikipedia article for. Multiple keys can be given (separated by ';'), in which case the first matching value is used", - defaultValue: "wikidata;wikipedia" - } + defaultValue: "wikidata;wikipedia", + }, ], needsUrls: [...Wikidata.neededUrls, ...Wikipedia.neededUrls], @@ -622,9 +622,9 @@ export default class SpecialVisualizations { return tags[key]?.split(";")?.map((id) => id.trim()) ?? [] }) return new SvelteUIElement(WikipediaPanel, { - wikiIds + wikiIds, }) - } + }, }, { funcName: "wikidata_label", @@ -633,8 +633,8 @@ export default class SpecialVisualizations { { name: "keyToShowWikidataFor", doc: "Use the wikidata entry from this key to show the label", - defaultValue: "wikidata" - } + defaultValue: "wikidata", + }, ], needsUrls: Wikidata.neededUrls, example: @@ -658,7 +658,7 @@ export default class SpecialVisualizations { }) ) }) - ) + ), }, new MapillaryLinkVis(), new LanguageElement(), @@ -672,7 +672,7 @@ export default class SpecialVisualizations { _, __, layer: LayerConfig - ) => new SvelteUIElement(AllTagsPanel, { tags, layer }) + ) => new SvelteUIElement(AllTagsPanel, { tags, layer }), }, { funcName: "image_carousel", @@ -681,8 +681,8 @@ export default class SpecialVisualizations { { name: "image_key", defaultValue: AllImageProviders.defaultKeys.join(","), - doc: "The keys given to the images, e.g. if image is given, the first picture URL will be added as image, the second as image:0, the third as image:1, etc... Multiple values are allowed if ';'-separated " - } + doc: "The keys given to the images, e.g. if image is given, the first picture URL will be added as image, the second as image:0, the third as image:1, etc... Multiple values are allowed if ';'-separated ", + }, ], needsUrls: AllImageProviders.apiUrls, constr: (state, tags, args) => { @@ -695,7 +695,7 @@ export default class SpecialVisualizations { tags, state ) - } + }, }, { funcName: "image_upload", @@ -705,13 +705,13 @@ export default class SpecialVisualizations { { name: "image-key", doc: "Image tag to add the URL to (or image-tag:0, image-tag:1 when multiple images are added)", - required: false + required: false, }, { name: "label", doc: "The text to show on the button", - required: false - } + required: false, + }, ], constr: (state, tags, args) => { const targetKey = args[0] === "" ? undefined : args[0] @@ -720,9 +720,9 @@ export default class SpecialVisualizations { tags, targetKey, labelText: args[1], - image: args[2] + image: args[2], }) - } + }, }, { funcName: "rating", @@ -732,12 +732,12 @@ export default class SpecialVisualizations { { name: "subjectKey", defaultValue: "name", - doc: "The key to use to determine the subject. If the value is specified, the subject will be tags[subjectKey] and will use this to filter the reviews." + doc: "The key to use to determine the subject. If the value is specified, the subject will be tags[subjectKey] and will use this to filter the reviews.", }, { name: "fallback", - doc: "The identifier to use, if tags[subjectKey] as specified above is not available. This is effectively a fallback value" - } + doc: "The identifier to use, if tags[subjectKey] as specified above is not available. This is effectively a fallback value", + }, ], constr: (state, tags, args, feature) => { const nameKey = args[0] ?? "name" @@ -748,14 +748,14 @@ export default class SpecialVisualizations { state.userRelatedState.mangroveIdentity, { nameKey: nameKey, - fallbackName + fallbackName, }, state.featureSwitchIsTesting ) return new SvelteUIElement(StarsBarIcon, { - score: reviews.average + score: reviews.average, }) - } + }, }, { @@ -766,12 +766,12 @@ export default class SpecialVisualizations { { name: "subjectKey", defaultValue: "name", - doc: "The key to use to determine the subject. If specified, the subject will be tags[subjectKey]" + doc: "The key to use to determine the subject. If specified, the subject will be tags[subjectKey]", }, { name: "fallback", - doc: "The identifier to use, if tags[subjectKey] as specified above is not available. This is effectively a fallback value" - } + doc: "The identifier to use, if tags[subjectKey] as specified above is not available. This is effectively a fallback value", + }, ], constr: (state, tags, args, feature, layer) => { const nameKey = args[0] ?? "name" @@ -782,12 +782,12 @@ export default class SpecialVisualizations { state.userRelatedState?.mangroveIdentity, { nameKey: nameKey, - fallbackName + fallbackName, }, state.featureSwitchIsTesting ) return new SvelteUIElement(ReviewForm, { reviews, state, tags, feature, layer }) - } + }, }, { funcName: "list_reviews", @@ -797,12 +797,12 @@ export default class SpecialVisualizations { { name: "subjectKey", defaultValue: "name", - doc: "The key to use to determine the subject. If specified, the subject will be tags[subjectKey]" + doc: "The key to use to determine the subject. If specified, the subject will be tags[subjectKey]", }, { name: "fallback", - doc: "The identifier to use, if tags[subjectKey] as specified above is not available. This is effectively a fallback value" - } + doc: "The identifier to use, if tags[subjectKey] as specified above is not available. This is effectively a fallback value", + }, ], constr: (state, tags, args, feature, layer) => { const nameKey = args[0] ?? "name" @@ -813,12 +813,12 @@ export default class SpecialVisualizations { state.userRelatedState?.mangroveIdentity, { nameKey: nameKey, - fallbackName + fallbackName, }, state.featureSwitchIsTesting ) return new SvelteUIElement(AllReviews, { reviews, state, tags, feature, layer }) - } + }, }, { funcName: "reviews", @@ -829,12 +829,12 @@ export default class SpecialVisualizations { { name: "subjectKey", defaultValue: "name", - doc: "The key to use to determine the subject. If specified, the subject will be tags[subjectKey]" + doc: "The key to use to determine the subject. If specified, the subject will be tags[subjectKey]", }, { name: "fallback", - doc: "The identifier to use, if tags[subjectKey] as specified above is not available. This is effectively a fallback value" - } + doc: "The identifier to use, if tags[subjectKey] as specified above is not available. This is effectively a fallback value", + }, ], constr( state: SpecialVisualizationState, @@ -857,9 +857,9 @@ export default class SpecialVisualizations { args, feature, layer - ) + ), ]) - } + }, }, { funcName: "import_mangrove_key", @@ -867,8 +867,8 @@ export default class SpecialVisualizations { args: [ { name: "text", - doc: "The text that is shown on the button" - } + doc: "The text that is shown on the button", + }, ], needsUrls: [], constr( @@ -878,7 +878,7 @@ export default class SpecialVisualizations { ): BaseUIElement { const [text] = argument return new SvelteUIElement(ImportReviewIdentity, { state, text }) - } + }, }, { funcName: "opening_hours_table", @@ -887,18 +887,18 @@ export default class SpecialVisualizations { { name: "key", defaultValue: "opening_hours", - doc: "The tagkey from which the table is constructed." + doc: "The tagkey from which the table is constructed.", }, { name: "prefix", defaultValue: "", - doc: "Remove this string from the start of the value before parsing. __Note: use `&LPARENs` to indicate `(` if needed__" + doc: "Remove this string from the start of the value before parsing. __Note: use `&LPARENs` to indicate `(` if needed__", }, { name: "postfix", defaultValue: "", - doc: "Remove this string from the end of the value before parsing. __Note: use `&RPARENs` to indicate `)` if needed__" - } + doc: "Remove this string from the end of the value before parsing. __Note: use `&RPARENs` to indicate `)` if needed__", + }, ], needsUrls: [Constants.countryCoderEndpoint], example: @@ -906,7 +906,7 @@ export default class SpecialVisualizations { constr: (state, tagSource: UIEventSource, args) => { const [key, prefix, postfix] = args return new OpeningHoursVisualization(tagSource, key, prefix, postfix) - } + }, }, { funcName: "opening_hours_state", @@ -915,18 +915,18 @@ export default class SpecialVisualizations { { name: "key", defaultValue: "opening_hours", - doc: "The tagkey from which the opening hours are read." + doc: "The tagkey from which the opening hours are read.", }, { name: "prefix", defaultValue: "", - doc: "Remove this string from the start of the value before parsing. __Note: use `&LPARENs` to indicate `(` if needed__" + doc: "Remove this string from the start of the value before parsing. __Note: use `&LPARENs` to indicate `(` if needed__", }, { name: "postfix", defaultValue: "", - doc: "Remove this string from the end of the value before parsing. __Note: use `&RPARENs` to indicate `)` if needed__" - } + doc: "Remove this string from the end of the value before parsing. __Note: use `&RPARENs` to indicate `)` if needed__", + }, ], constr( state: SpecialVisualizationState, @@ -941,9 +941,9 @@ export default class SpecialVisualizations { keyToUse, tags, prefix, - postfix + postfix, }) - } + }, }, { funcName: "canonical", @@ -955,8 +955,8 @@ export default class SpecialVisualizations { { name: "key", doc: "The key of the tag to give the canonical text for", - required: true - } + required: true, + }, ], constr: (state, tagSource, args) => { const key = args[0] @@ -980,7 +980,7 @@ export default class SpecialVisualizations { return unit.asHumanLongValue(value, getCountry) }) ) - } + }, }, { funcName: "export_as_geojson", @@ -994,7 +994,7 @@ export default class SpecialVisualizations { new SvelteUIElement(ArrowDownTray), new Combine([ t.downloadFeatureAsGeojson.SetClass("font-bold text-lg"), - t.downloadGeoJsonHelper.SetClass("subtle") + t.downloadGeoJsonHelper.SetClass("subtle"), ]).SetClass("flex flex-col") ) .onClick(() => { @@ -1007,12 +1007,12 @@ export default class SpecialVisualizations { data, title + "_mapcomplete_export.geojson", { - mimetype: "application/vnd.geo+json" + mimetype: "application/vnd.geo+json", } ) }) .SetClass("w-full") - } + }, }, { funcName: "open_in_iD", @@ -1022,9 +1022,9 @@ export default class SpecialVisualizations { constr: (state, feature) => { return new SvelteUIElement(OpenIdEditor, { mapProperties: state.mapProperties, - objectId: feature.data.id + objectId: feature.data.id, }) - } + }, }, { funcName: "open_in_josm", @@ -1034,7 +1034,7 @@ export default class SpecialVisualizations { constr: (state) => { return new SvelteUIElement(OpenJosm, { state }) - } + }, }, { funcName: "clear_location_history", @@ -1049,7 +1049,7 @@ export default class SpecialVisualizations { state.historicalUserLocations.features.setData([]) state.selectedElement.setData(undefined) }) - } + }, }, { funcName: "visualize_note_comments", @@ -1058,13 +1058,13 @@ export default class SpecialVisualizations { { name: "commentsKey", doc: "The property name of the comments, which should be stringified json", - defaultValue: "comments" + defaultValue: "comments", }, { name: "start", doc: "Drop the first 'start' comments", - defaultValue: "0" - } + defaultValue: "0", + }, ], needsUrls: [Constants.osmAuthConfig.url], constr: (state, tags, args) => @@ -1086,7 +1086,7 @@ export default class SpecialVisualizations { ) ).SetClass("flex flex-col") }) - ) + ), }, { funcName: "add_image_to_note", @@ -1095,8 +1095,8 @@ export default class SpecialVisualizations { { name: "Id-key", doc: "The property name where the ID of the note to close can be found", - defaultValue: "id" - } + defaultValue: "id", + }, ], needsUrls: [Imgur.apiUrl], @@ -1105,7 +1105,7 @@ export default class SpecialVisualizations { tags = state.featureProperties.getStore(id) console.log("Id is", id) return new SvelteUIElement(UploadImage, { state, tags }) - } + }, }, { funcName: "title", @@ -1135,12 +1135,12 @@ export default class SpecialVisualizations { tags: tagsSource, state, feature, - layer + layer, }) .SetClass("px-1") .setSpan() }) - ) + ), }, { funcName: "maproulette_task", @@ -1184,7 +1184,7 @@ export default class SpecialVisualizations { }) ) }, - docs: "Fetches the metadata of MapRoulette campaign that this task is part of and shows those details (namely `title`, `description` and `instruction`).\n\nThis reads the property `mr_challengeId` to detect the parent campaign." + docs: "Fetches the metadata of MapRoulette campaign that this task is part of and shows those details (namely `title`, `description` and `instruction`).\n\nThis reads the property `mr_challengeId` to detect the parent campaign.", }, { funcName: "maproulette_set_status", @@ -1195,15 +1195,15 @@ export default class SpecialVisualizations { "\n" + "```json\n" + "{\n" + - " \"id\": \"mark_duplicate\",\n" + - " \"render\": {\n" + - " \"special\": {\n" + - " \"type\": \"maproulette_set_status\",\n" + - " \"message\": {\n" + - " \"en\": \"Mark as not found or false positive\"\n" + + ' "id": "mark_duplicate",\n' + + ' "render": {\n' + + ' "special": {\n' + + ' "type": "maproulette_set_status",\n' + + ' "message": {\n' + + ' "en": "Mark as not found or false positive"\n' + " },\n" + - " \"status\": \"2\",\n" + - " \"image\": \"close\"\n" + + ' "status": "2",\n' + + ' "image": "close"\n' + " }\n" + " }\n" + "}\n" + @@ -1211,32 +1211,32 @@ export default class SpecialVisualizations { args: [ { name: "message", - doc: "A message to show to the user" + doc: "A message to show to the user", }, { name: "image", doc: "Image to show", - defaultValue: "confirm" + defaultValue: "confirm", }, { name: "message_confirm", - doc: "What to show when the task is closed, either by the user or was already closed." + doc: "What to show when the task is closed, either by the user or was already closed.", }, { name: "status", doc: "A statuscode to apply when the button is clicked. 1 = `close`, 2 = `false_positive`, 3 = `skip`, 4 = `deleted`, 5 = `already fixed` (on the map, e.g. for duplicates), 6 = `too hard`", - defaultValue: "1" + defaultValue: "1", }, { name: "maproulette_id", doc: "The property name containing the maproulette id", - defaultValue: "mr_taskId" + defaultValue: "mr_taskId", }, { name: "ask_feedback", doc: "If not an empty string, this will be used as question to ask some additional feedback. A text field will be added", - defaultValue: "" - } + defaultValue: "", + }, ], constr: (state, tagsSource, args) => { @@ -1246,7 +1246,7 @@ export default class SpecialVisualizations { message_closed, statusToSet, maproulette_id_key, - askFeedback + askFeedback, ] = args if (image === "") { image = "confirm" @@ -1263,9 +1263,9 @@ export default class SpecialVisualizations { message_closed, statusToSet, maproulette_id_key, - askFeedback + askFeedback, }) - } + }, }, { funcName: "statistics", @@ -1292,7 +1292,7 @@ export default class SpecialVisualizations { [state.mapProperties.bounds] ) ) - } + }, }, { funcName: "send_email", @@ -1301,29 +1301,29 @@ export default class SpecialVisualizations { { name: "to", doc: "Who to send the email to?", - required: true + required: true, }, { name: "subject", doc: "The subject of the email", - required: true + required: true, }, { name: "body", doc: "The text in the email", - required: true + required: true, }, { name: "button_text", doc: "The text shown on the button in the UI", - required: true - } + required: true, + }, ], constr(__, tags, args) { return new SvelteUIElement(SendEmail, { args, tags }) - } + }, }, { funcName: "link", @@ -1332,29 +1332,29 @@ export default class SpecialVisualizations { { name: "text", doc: "Text to be shown", - required: true + required: true, }, { name: "href", doc: "The URL to link to. Note that this will be URI-encoded before ", - required: true + required: true, }, { name: "class", - doc: "CSS-classes to add to the element" + doc: "CSS-classes to add to the element", }, { name: "download", - doc: "Expects a string which denotes the filename to download the contents of `href` into. If set, this link will act as a download-button." + doc: "Expects a string which denotes the filename to download the contents of `href` into. If set, this link will act as a download-button.", }, { name: "arialabel", - doc: "If set, this text will be used as aria-label" + doc: "If set, this text will be used as aria-label", }, { name: "icon", - doc: "If set, show this icon next to the link. You might want to combine this with `class: button`" - } + doc: "If set, show this icon next to the link. You might want to combine this with `class: button`", + }, ], constr( @@ -1368,9 +1368,7 @@ export default class SpecialVisualizations { } const newTab = download === undefined && !href.startsWith("#") const textStore = tagSource.map((tags) => Utils.SubstituteKeys(text, tags)) - const hrefStore = tagSource.map( - (tags) => Utils.SubstituteKeys(href, tags) - ) + const hrefStore = tagSource.map((tags) => Utils.SubstituteKeys(href, tags)) return new SvelteUIElement(DynLink, { text: textStore, href: hrefStore, @@ -1378,9 +1376,9 @@ export default class SpecialVisualizations { download: tagSource.map((tags) => Utils.SubstituteKeys(download, tags)), ariaLabel: tagSource.map((tags) => Utils.SubstituteKeys(ariaLabel, tags)), newTab: new ImmutableStore(newTab), - icon: tagSource.map((tags) => Utils.SubstituteKeys(icon, tags)) + icon: tagSource.map((tags) => Utils.SubstituteKeys(icon, tags)), }).setSpan() - } + }, }, { funcName: "multi", @@ -1394,10 +1392,10 @@ export default class SpecialVisualizations { type: "multi", key: "_doors_from_building_properties", tagrendering: { - en: "The building containing this feature has a door of width {entrance:width}" - } - } - } + en: "The building containing this feature has a door of width {entrance:width}", + }, + }, + }, }, null, " " @@ -1407,17 +1405,17 @@ export default class SpecialVisualizations { { name: "key", doc: "The property to read and to interpret as a list of properties", - required: true + required: true, }, { name: "tagrendering", doc: "An entire tagRenderingConfig", - required: true + required: true, }, { name: "classes", - doc: "CSS-classes to apply on every individual item. Seperated by `space`" - } + doc: "CSS-classes to apply on every individual item. Seperated by `space`", + }, ], constr( state: SpecialVisualizationState, @@ -1453,14 +1451,14 @@ export default class SpecialVisualizations { tags: new ImmutableStore(property), state, feature, - layer + layer, }).SetClass(classes) elements.push(subsTr) } return elements }) ) - } + }, }, { funcName: "translated", @@ -1470,8 +1468,8 @@ export default class SpecialVisualizations { { name: "key", doc: "The attribute to interpret as json", - defaultValue: "value" - } + defaultValue: "value", + }, ], constr( state: SpecialVisualizationState, @@ -1492,7 +1490,7 @@ export default class SpecialVisualizations { } }) ) - } + }, }, { funcName: "fediverse_link", @@ -1501,8 +1499,8 @@ export default class SpecialVisualizations { { name: "key", doc: "The attribute-name containing the link", - required: true - } + required: true, + }, ], constr( @@ -1526,13 +1524,13 @@ export default class SpecialVisualizations { const normalLink = new SvelteUIElement(Link, { text: fediAccount, href: "https://" + host + "/@" + username, - newTab: true + newTab: true, }) const loggedInContributorMastodon = state.userRelatedState?.preferencesAsTags?.data?.[ "_mastodon_link" - ] + ] console.log( "LoggedinContributorMastodon", loggedInContributorMastodon @@ -1548,12 +1546,12 @@ export default class SpecialVisualizations { new SvelteUIElement(Link, { href: homeHost + "/" + fediAccount, text: Translations.t.validation.fediverse.onYourServer, - newTab: true - }).SetClass("button") + newTab: true, + }).SetClass("button"), ]) }) ) - } + }, }, { funcName: "braced", @@ -1563,8 +1561,8 @@ export default class SpecialVisualizations { { name: "text", required: true, - doc: "The value to show" - } + doc: "The value to show", + }, ], constr( state: SpecialVisualizationState, @@ -1574,7 +1572,7 @@ export default class SpecialVisualizations { layer: LayerConfig ): BaseUIElement { return new FixedUiElement("{" + args[0] + "}") - } + }, }, { funcName: "tags", @@ -1584,8 +1582,8 @@ export default class SpecialVisualizations { { name: "key", defaultValue: "value", - doc: "The key to look for the tags" - } + doc: "The key to look for the tags", + }, ], constr( state: SpecialVisualizationState, @@ -1610,14 +1608,14 @@ export default class SpecialVisualizations { } catch (e) { return new FixedUiElement( "Could not parse this tag: " + - JSON.stringify(value) + - " due to " + - e + JSON.stringify(value) + + " due to " + + e ).SetClass("alert") } }) ) - } + }, }, { funcName: "giggity", @@ -1625,8 +1623,8 @@ export default class SpecialVisualizations { { name: "giggityUrl", required: true, - doc: "The URL of the giggity-XML" - } + doc: "The URL of the giggity-XML", + }, ], docs: "Shows events that are happening based on a Giggity URL", needsUrls: (args) => args[0], @@ -1640,7 +1638,7 @@ export default class SpecialVisualizations { ): BaseUIElement { const giggityUrl = argument[0] return new SvelteUIElement(Giggity, { tags: tagSource, state, giggityUrl }) - } + }, }, { funcName: "gps_all_tags", @@ -1663,10 +1661,10 @@ export default class SpecialVisualizations { new SvelteUIElement(OrientationDebugPanel, {}), new SvelteUIElement(AllTagsPanel, { state, - tags - }) + tags, + }), ]) - } + }, }, { funcName: "favourite_status", @@ -1685,9 +1683,9 @@ export default class SpecialVisualizations { tags: tagSource, state, layer, - feature + feature, }) - } + }, }, { funcName: "favourite_icon", @@ -1705,9 +1703,9 @@ export default class SpecialVisualizations { tags: tagSource, state, layer, - feature + feature, }).SetClass("w-full h-full") - } + }, }, { funcName: "direction_indicator", @@ -1722,7 +1720,7 @@ export default class SpecialVisualizations { layer: LayerConfig ): BaseUIElement { return new SvelteUIElement(DirectionIndicator, { state, feature }) - } + }, }, { funcName: "qr_code", @@ -1735,7 +1733,7 @@ export default class SpecialVisualizations { feature: Feature ): SvelteUIElement { return new SvelteUIElement(QrCode, { state, tags, feature }) - } + }, }, { funcName: "direction_absolute", @@ -1744,8 +1742,8 @@ export default class SpecialVisualizations { { name: "key", doc: "The attribute containing the degrees", - defaultValue: "_direction:centerpoint" - } + defaultValue: "_direction:centerpoint", + }, ], constr( @@ -1768,7 +1766,7 @@ export default class SpecialVisualizations { return Translations.t.general.visualFeedback.directionsAbsolute[dir] }) ) - } + }, }, { funcName: "compare_data", @@ -1777,18 +1775,18 @@ export default class SpecialVisualizations { { name: "url", required: true, - doc: "The attribute containing the url where to fetch more data" + doc: "The attribute containing the url where to fetch more data", }, { name: "host", required: true, - doc: "The domain name(s) where data might be fetched from - this is needed to set the CSP. A domain must include 'https', e.g. 'https://example.com'. For multiple domains, separate them with ';'. If you don't know the possible domains, use '*'. " + doc: "The domain name(s) where data might be fetched from - this is needed to set the CSP. A domain must include 'https', e.g. 'https://example.com'. For multiple domains, separate them with ';'. If you don't know the possible domains, use '*'. ", }, { name: "readonly", required: false, - doc: "If 'yes', will not show 'apply'-buttons" - } + doc: "If 'yes', will not show 'apply'-buttons", + }, ], docs: "Gives an interactive element which shows a tag comparison between the OSM-object and the upstream object. This allows to copy some or all tags into OSM", constr( @@ -1808,9 +1806,9 @@ export default class SpecialVisualizations { layer, feature, readonly, - externalData + externalData, }) - } + }, }, { funcName: "login_button", @@ -1829,7 +1827,7 @@ export default class SpecialVisualizations { new SvelteUIElement(LoginButton, { osmConnection: state.osmConnection }), state.osmConnection.isLoggedIn ) - } + }, }, { funcName: "linked_data_from_website", @@ -1838,26 +1836,26 @@ export default class SpecialVisualizations { { name: "key", defaultValue: "website", - doc: "Attempt to load ld+json from the specified URL. This can be in an embedded -
+
+ +
diff --git a/src/UI/ThemeViewGUI.svelte b/src/UI/ThemeViewGUI.svelte index 1e3771893..651e793f9 100644 --- a/src/UI/ThemeViewGUI.svelte +++ b/src/UI/ThemeViewGUI.svelte @@ -17,7 +17,6 @@ import FloatOver from "./Base/FloatOver.svelte" import Constants from "../Models/Constants" import LoginToggle from "./Base/LoginToggle.svelte" - import ModalRight from "./Base/ModalRight.svelte" import LevelSelector from "./BigComponents/LevelSelector.svelte" import type { RasterLayerPolygon } from "../Models/RasterLayers" import { AvailableRasterLayers } from "../Models/RasterLayers" @@ -30,7 +29,6 @@ import Min from "../assets/svg/Min.svelte" import Plus from "../assets/svg/Plus.svelte" import Filter from "../assets/svg/Filter.svelte" - import ImageOperations from "./Image/ImageOperations.svelte" import VisualFeedbackPanel from "./BigComponents/VisualFeedbackPanel.svelte" import { Orientation } from "../Sensors/Orientation" import GeolocationIndicator from "./BigComponents/GeolocationIndicator.svelte" @@ -49,6 +47,8 @@ import Searchbar from "./Base/Searchbar.svelte" import ChevronRight from "@babeard/svelte-heroicons/mini/ChevronRight" import ChevronLeft from "@babeard/svelte-heroicons/solid/ChevronLeft" + import { Drawer } from "flowbite-svelte" + import { linear, sineIn } from "svelte/easing" export let state: ThemeViewState @@ -77,20 +77,26 @@ Orientation.singleton.startMeasurements() - state.selectedElement.addCallback((selected) => { - if (!selected) { - selectedElement.setData(selected) + let slideDuration = 150 // ms + state.selectedElement.addCallback((value) => { + if (!value) { + selectedElement.setData(undefined) return } - if (selected !== selectedElement.data) { - // We first set the selected element to 'undefined' to force the popup to close... - selectedElement.setData(undefined) + if(!selectedElement.data){ + // The store for this component doesn't have value right now, so we can simply set it + selectedElement.set(value) + return } - // ... we give svelte some time to update with requestAnimationFrame ... - window.requestAnimationFrame(() => { - // ... and we force a fresh popup window - selectedElement.setData(selected) - }) + // We first set the selected element to 'undefined' to force the popup to close... + selectedElement.setData(undefined) + // ... and we give svelte some time to update with requestAnimationFrame ... + window.setTimeout(() => { + window.requestAnimationFrame(() => { + // ... and we force a fresh popup window + selectedElement.setData(value) + }) + }, slideDuration) }) state.mapProperties.installCustomKeyboardHandler(viewport) @@ -220,7 +226,7 @@ {#if $currentZoom < Constants.minZoomLevelToAddNewPoint} {:else if state.layout.hasPresets()} - + ✨ {:else} {/if} @@ -240,15 +246,14 @@ - +
diff --git a/src/UI/i18n/Translation.ts b/src/UI/i18n/Translation.ts index 24b1679fb..0aa8212b3 100644 --- a/src/UI/i18n/Translation.ts +++ b/src/UI/i18n/Translation.ts @@ -417,6 +417,9 @@ export class TypedTranslation> extends Translation key: string, replaceWith: Translation ): TypedTranslation> { + if(replaceWith === undefined){ + return this + } const newTranslations: Record = {} const toSearch = "{" + key + "}" const missingLanguages = new Set(Object.keys(this.translations)) diff --git a/src/Utils.ts b/src/Utils.ts index 73e1c6efc..4ac7494f2 100644 --- a/src/Utils.ts +++ b/src/Utils.ts @@ -114,7 +114,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be "version", "wayHandling", "widenFactor", - "width" + "width", ] private static extraKeys = [ "nl", @@ -133,7 +133,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be "yes", "no", "true", - "false" + "false", ] private static injectedDownloads = {} private static _download_cache = new Map< @@ -150,7 +150,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be if (Utils.runningFromConsole) { return } - DOMPurify.addHook("afterSanitizeAttributes", function(node) { + DOMPurify.addHook("afterSanitizeAttributes", function (node) { // set all elements owning target to target=_blank + add noopener noreferrer const target = node.getAttribute("target") if (target) { @@ -163,7 +163,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be public static purify(src: string): string { return DOMPurify.sanitize(src, { USE_PROFILES: { html: true }, - ADD_ATTR: ["target"] // Don't remove target='_blank'. Note that Utils.initDomPurify does add a hook which automatically adds 'rel=noopener' + ADD_ATTR: ["target"], // Don't remove target='_blank'. Note that Utils.initDomPurify does add a hook which automatically adds 'rel=noopener' }) } @@ -344,7 +344,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be console.error("Error while calculating a lazy property", e) return undefined } - } + }, }) } @@ -368,7 +368,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be whenDone() } }) - } + }, }) } @@ -651,7 +651,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be if (!Array.isArray(targetV)) { throw new Error( "Cannot concatenate: value to add is not an array: " + - JSON.stringify(targetV) + JSON.stringify(targetV) ) } if (Array.isArray(sourceV)) { @@ -659,9 +659,9 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be } else { throw new Error( "Could not merge concatenate " + - JSON.stringify(sourceV) + - " and " + - JSON.stringify(targetV) + JSON.stringify(sourceV) + + " and " + + JSON.stringify(targetV) ) } } else { @@ -922,7 +922,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be continue } const i = part.charCodeAt(0) - result += "\"" + keys[i] + "\":" + part.substring(1) + result += '"' + keys[i] + '":' + part.substring(1) } return result @@ -1009,7 +1009,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be resolve({ error: "other error: " + xhr.statusText + ", " + xhr.responseText, url, - statuscode: xhr.status + statuscode: xhr.status, }) } } @@ -1023,12 +1023,12 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be xhr.onerror = (ev: ProgressEvent) => reject( "Could not get " + - url + - ", xhr status code is " + - xhr.status + - " (" + - xhr.statusText + - ")" + url + + ", xhr status code is " + + xhr.status + + " (" + + xhr.statusText + + ")" ) }) } @@ -1086,9 +1086,9 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be } const promise = /*NO AWAIT as we work with the promise directly */ Utils.downloadJsonAdvanced( - url, - headers - ) + url, + headers + ) Utils._download_cache.set(url, { promise, timestamp: new Date().getTime() }) return await promise } @@ -1281,7 +1281,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be ): T[] { const withDistance: [T, number][] = ts.map((t) => [ t, - Utils.levenshteinDistance(getName(t), reference) + Utils.levenshteinDistance(getName(t), reference), ]) withDistance.sort(([_, a], [__, b]) => a - b) return withDistance.map((n) => n[0]) @@ -1404,7 +1404,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be return { r: Utils.percentageToNumber(match[1]), g: Utils.percentageToNumber(match[2]), - b: Utils.percentageToNumber(match[3]) + b: Utils.percentageToNumber(match[3]), } } @@ -1415,14 +1415,14 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be return { r: parseInt(hex.substr(1, 1), 16), g: parseInt(hex.substr(2, 1), 16), - b: parseInt(hex.substr(3, 1), 16) + b: parseInt(hex.substr(3, 1), 16), } } return { r: parseInt(hex.substr(1, 2), 16), g: parseInt(hex.substr(3, 2), 16), - b: parseInt(hex.substr(5, 2), 16) + b: parseInt(hex.substr(5, 2), 16), } } @@ -1605,7 +1605,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be line: Number(line), column: Number(column), markdownLocation, - filename: path.substring(path.lastIndexOf("/") + 1) + filename: path.substring(path.lastIndexOf("/") + 1), } } @@ -1810,10 +1810,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be } /* Chromium based browsers eat the spaces */ - href = href.replaceAll( - / /g, - "%20" - ) + href = href.replaceAll(/ /g, "%20") return href } diff --git a/src/assets/contributors.json b/src/assets/contributors.json index 251d5c8b8..5145d9180 100644 --- a/src/assets/contributors.json +++ b/src/assets/contributors.json @@ -1,7 +1,7 @@ { "contributors": [ { - "commits": 7993, + "commits": 8118, "contributor": "Pieter Vander Vennet" }, { @@ -13,12 +13,12 @@ "contributor": "Tobias" }, { - "commits": 38, - "contributor": "Win Olario" + "commits": 39, + "contributor": "dependabot[bot]" }, { - "commits": 37, - "contributor": "dependabot[bot]" + "commits": 38, + "contributor": "Win Olario" }, { "commits": 33, diff --git a/src/assets/language_native.json b/src/assets/language_native.json index c7869833f..3847089e4 100644 --- a/src/assets/language_native.json +++ b/src/assets/language_native.json @@ -1,6 +1,5 @@ { "ca": "català", - "cs": "čeština", "da": "dansk", "de": "Deutsch", "en": "English", @@ -23,6 +22,7 @@ "ru": "русский язык", "sl": "slovenščina", "sv": "svenska", + "zgh": "ⵜⴰⵎⴰⵣⵉⵖⵜ ⵜⴰⵏⴰⵡⴰⵢⵜ ⵜⴰⵎⵖⵔⵉⴱⵉⵜ", "zh_Hans": "简体中文", "zh_Hant": "繁體中文" } \ No newline at end of file diff --git a/src/assets/language_translations.json b/src/assets/language_translations.json index 6601239b5..ba6be35cb 100644 --- a/src/assets/language_translations.json +++ b/src/assets/language_translations.json @@ -1,18 +1,18 @@ { "aa": { - "ca": "llengua àfar", + "ca": "àfar", "cs": "afarština", "de": "Afar", "en": "Afar", "eo": "afara lingvo", "es": "idioma afar", "eu": "Afarrera", - "fi": "afarin kieli", + "fi": "afar", "fr": "afar", "gl": "Lingua afar", "he": "עפרית", "hu": "afar", - "id": "Bahasa Afar", + "id": "Afar", "it": "afar", "ja": "アファル語", "nb_NO": "afar", @@ -21,7 +21,10 @@ "pt": "Língua afar", "pt_BR": "língua afar", "ru": "афарский язык", + "sl": "afarščina", "sv": "afar", + "zh_Hans": "阿法尔语", + "zh_Hant": "阿法爾語", "_meta": { "dir": [ "left-to-right" @@ -42,7 +45,7 @@ "gl": "Lingua abkhaza", "he": "אבחזית", "hu": "abház", - "id": "Bahasa Abkhaz", + "id": "Abkhaz", "it": "abcaso", "ja": "アブハズ語", "nb_NO": "abkhasisk", @@ -51,7 +54,7 @@ "pt": "Língua abecásia", "pt_BR": "Língua abecásia", "ru": "абхазский язык", - "sl": "Abhaščina", + "sl": "abhaščina", "sv": "abchaziska", "zh_Hans": "阿布哈兹语", "zh_Hant": "阿布哈茲語", @@ -73,12 +76,12 @@ "eo": "abaza lingvo", "es": "abaza", "eu": "abazera", - "fi": "Abazan kieli", + "fi": "abazan kieli", "fr": "abaza", "gl": "Lingua abaza", "he": "אבזית", "hu": "abaza", - "id": "Bahasa Abaza", + "id": "Abaza", "it": "lingua abazina", "ja": "アバザ語", "nb_NO": "abazinsk", @@ -87,6 +90,7 @@ "pt": "Língua abaza", "pt_BR": "Língua abaza", "ru": "абазинский язык", + "sl": "abaščina", "sv": "abazinska", "zh_Hans": "阿巴扎语", "zh_Hant": "阿巴扎語", @@ -103,6 +107,7 @@ "eo": "Mezopotamia araba dialekto", "es": "árabe mesopotámico", "fr": "arabe mésopotamien", + "he": "ערבית עיראקית", "id": "Bahasa Arab Mesopotamia", "ja": "アラビア語イラク方言", "nl": "Mesopotamisch-Arabisch", @@ -112,6 +117,7 @@ "ru": "иракский диалект арабского языка", "sl": "mezopotamska arabščina", "sv": "irakisk arabiska", + "zh_Hant": "美索不達米亞阿拉伯語", "_meta": { "dir": [ "right-to-left" @@ -141,12 +147,12 @@ "eo": "adigea lingvo", "es": "adigués", "eu": "adigera", - "fi": "adygen kieli", + "fi": "adyge", "fr": "adyguéen", "gl": "Lingua adigue", "he": "אדיגית", "hu": "adigei", - "id": "bahasa Adyghe", + "id": "Adyghe", "it": "adighè", "ja": "アディゲ語", "nb_NO": "adygeisk", @@ -165,37 +171,6 @@ ] } }, - "aeb": { - "ca": "àrab tunisià", - "cs": "tuniština", - "da": "Tunesisk arabisk", - "de": "Tunesisch-Arabisch", - "en": "Tunisian Arabic", - "eo": "tunizia araba lingvo", - "es": "árabe tunecino", - "fi": "tunisianarabia", - "fr": "arabe tunisien", - "he": "ערבית תוניסאית", - "id": "Bahasa Arab Tunisia", - "it": "arabo tunisino", - "ja": "アラビア語チュニジア方言", - "nb_NO": "tunisisk arabisk", - "nl": "Tunesisch-Arabisch", - "pl": "tunezyjski", - "pt": "árabe tunisino", - "pt_BR": "Árabe tunisino", - "ru": "Тунисский диалект арабского языка", - "sl": "tunizijska arabščina", - "sv": "tunisisk arabiska", - "zh_Hans": "突尼斯阿拉伯语", - "zh_Hant": "突尼西亞阿拉伯語", - "_meta": { - "dir": [ - "left-to-right", - "right-to-left" - ] - } - }, "af": { "ca": "afrikaans", "cs": "afrikánština", @@ -257,9 +232,10 @@ "eo": "Levantenia araba dialekto", "es": "árabe levantino", "fr": "arabe levantin", + "gl": "Árabe levantino", "he": "ערבית לבנטינית", - "id": "Arab Syam", - "it": "lingue arabe levantine", + "id": "Arab Levant", + "it": "arabo levantino", "ja": "アラビア語レバント方言", "nl": "Levantijns-Arabisch", "pl": "dialekty syryjsko-palestyńskie języka arabskiego", @@ -281,7 +257,7 @@ "en": "Akan", "eo": "akanaj lingvoj", "es": "lenguas akánicas", - "fi": "akanin kieli", + "fi": "akan", "fr": "akan", "gl": "Lingua akan", "he": "אקאן", @@ -294,6 +270,7 @@ "pt": "língua akan", "pt_BR": "língua akan", "ru": "акан", + "sl": "akanščina", "sv": "akan", "zh_Hans": "阿肯语", "zh_Hant": "阿寒語", @@ -314,11 +291,12 @@ "fi": "Aklanon", "fr": "aklanon", "gl": "Lingua aklanon", - "id": "bahasa Akyan", + "id": "Bahasa Aklanon", "it": "lingua Aklan", "ja": "アクラノン語", "pl": "Język aklanon", "pt": "Língua aklan", + "ru": "акланон", "sv": "aklan", "_meta": { "dir": [ @@ -341,6 +319,7 @@ "nl": "Alabama", "pl": "język alabama", "ru": "Алабамский язык", + "sl": "alabamščina", "sv": "alabama", "_meta": { "dir": [ @@ -353,7 +332,7 @@ "cs": "gegština", "da": "gegisk", "de": "Gegisch", - "en": "Gheg Albanian", + "en": "Gheg", "eo": "geg-albana lingvo", "es": "Albanés guego", "eu": "gheg albaniera", @@ -414,11 +393,13 @@ "fr": "altaï méridional", "gl": "Lingua altai meridional", "he": "אלטאית דרומית", + "id": "bahasa Altai Selatan", "it": "lingua altai meridionale", "ja": "南アルタイ語", "nb_NO": "Søraltaisk", "nl": "Zuid-Altajs", "ru": "aлтайский язык", + "sl": "južna altajščina", "sv": "sydaltaiska", "zh_Hant": "南阿爾泰語", "_meta": { @@ -436,12 +417,12 @@ "eo": "amhara lingvo", "es": "amhárico", "eu": "Amharera", - "fi": "amharan kieli", + "fi": "amhara", "fr": "amharique", "gl": "Lingua amhárica", "he": "אמהרית", "hu": "amhara", - "id": "Bahasa Amhar", + "id": "Amhara", "it": "amarico", "ja": "アムハラ語", "nb_NO": "amharisk", @@ -468,7 +449,7 @@ "de": "Amisisch", "en": "Amis", "es": "idioma amis", - "fi": "Amisin kieli", + "fi": "amis", "fr": "amis", "gl": "Lingua amis", "id": "Bahasa Amis", @@ -478,6 +459,7 @@ "pl": "Język amis", "pt": "língua amis", "ru": "амисский язык", + "sl": "amisijščina", "sv": "amis", "zh_Hans": "阿美语", "zh_Hant": "阿美語", @@ -501,7 +483,7 @@ "gl": "Lingua aragonesa", "he": "אראגונית", "hu": "aragóniai", - "id": "Bahasa Aragon", + "id": "bahasa Aragon", "it": "aragonese", "ja": "アラゴン語", "nb_NO": "aragonesisk", @@ -526,7 +508,7 @@ "en": "Angika", "eo": "angika", "es": "Idioma angika", - "fi": "Angika", + "fi": "angika", "fr": "angika", "gl": "Lingua angika", "it": "lingua angika", @@ -550,6 +532,7 @@ "eo": "pemona lingvo", "es": "Idioma pemón", "fr": "pemon", + "gl": "Lingua pemón", "it": "pemon", "ja": "ペモン語", "nb_NO": "Pemón", @@ -557,6 +540,7 @@ "pt": "Língua taurepangue", "pt_BR": "Língua taurepangue", "ru": "Пемонский язык", + "sl": "pemonščina", "sv": "pemon", "_meta": { "dir": [ @@ -572,9 +556,10 @@ "eo": "Levantenia araba dialekto", "es": "árabe levantino", "fr": "arabe levantin", + "gl": "Árabe levantino", "he": "ערבית לבנטינית", - "id": "Arab Syam", - "it": "lingue arabe levantine", + "id": "Arab Levant", + "it": "arabo levantino", "ja": "アラビア語レバント方言", "nl": "Levantijns-Arabisch", "pl": "dialekty syryjsko-palestyńskie języka arabskiego", @@ -589,67 +574,6 @@ ] } }, - "ar": { - "ca": "àrab", - "cs": "arabština", - "da": "arabisk", - "de": "Arabisch", - "en": "Arabic", - "eo": "araba lingvo", - "es": "árabe", - "eu": "arabiera", - "fi": "arabia", - "fr": "arabe", - "gl": "árabe", - "he": "ערבית", - "hu": "arab", - "id": "bahasa Arab", - "it": "arabo", - "ja": "アラビア語", - "nb_NO": "arabisk", - "nl": "Arabisch", - "pl": "język arabski", - "pt": "árabe", - "pt_BR": "árabe", - "ru": "арабский язык", - "sl": "arabščina", - "sv": "arabiska", - "zh_Hans": "阿拉伯语", - "zh_Hant": "阿拉伯語", - "_meta": { - "countries": [ - "AE", - "AF", - "BH", - "DJ", - "DZ", - "EG", - "ER", - "IQ", - "JO", - "KM", - "KW", - "LB", - "LY", - "MA", - "MR", - "OM", - "PS", - "QA", - "SA", - "SD", - "SO", - "SS", - "SY", - "TD", - "TN", - "YE" - ], - "dir": [ - "right-to-left" - ] - } - }, "arn": { "ca": "mapudungun", "cs": "mapučština", @@ -671,7 +595,7 @@ "pl": "Język mapudungun", "pt": "mapudungun", "ru": "мапуче", - "sl": "Mapudungun", + "sl": "mapudungunščina", "sv": "mapudungun", "zh_Hans": "马普切语", "zh_Hant": "馬普切語", @@ -693,13 +617,13 @@ "fr": "arabe algérien", "gl": "Árabe alxeriano", "hu": "algériai arab", - "id": "Bahasa Arab Aljazair", + "id": "Arab Aljazair", "it": "arabo algerino", "ja": "アラビア語アルジェリア方言", "nb_NO": "algerisk-arabisk", "nl": "Algerijns-Arabisch", "pt": "árabe argelino", - "ru": "Алжирский диалект арабского языка", + "ru": "алжирский диалект арабского языка", "sl": "alžirska arabščina", "sv": "algerisk arabiska", "zh_Hant": "阿爾及利亞阿拉伯語", @@ -719,7 +643,7 @@ "es": "árabe marroquí", "eu": "marokoar arabiera", "fi": "marokonarabia", - "fr": "Darija marocain", + "fr": "arabe marocain", "gl": "árabe marroquí", "he": "ערבית מרוקאית", "id": "Bahasa Arab Maroko", @@ -753,7 +677,7 @@ "gl": "Árabe exipcio", "he": "ערבית מצרית", "hu": "egyiptomi arab", - "id": "bahasa Arab Mesir", + "id": "Arab Mesir", "it": "arabo egiziano", "ja": "アラビア語エジプト方言", "nb_NO": "egyptisk arabisk", @@ -824,6 +748,7 @@ "pt": "língua de sinais americana", "pt_BR": "língua de sinais americana", "ru": "амслен", + "sl": "ameriški znakovni jezik", "sv": "amerikanskt teckenspråk", "zh_Hant": "美國手語", "_meta": { @@ -847,7 +772,7 @@ "gl": "lingua asturiana", "he": "אסטורית", "hu": "asztúriai", - "id": "Bahasa Asturia", + "id": "Asturia", "it": "asturiano", "ja": "アストゥリアス語", "nb_NO": "asturiansk", @@ -872,15 +797,17 @@ "de": "Atikamekw", "en": "Atikamekw", "es": "atikamekw", - "fi": "Atikamekw", + "fi": "atikamekw", "fr": "atikamekw", "gl": "Lingua atikamekw", + "he": "אטיקמק", "it": "lingua atikamekw", "ja": "アティカメク語", "nb_NO": "atikamekw", "nl": "Atikamekw", "pt": "Língua atikamekw", "ru": "aтикамек", + "sl": "atimeščina", "sv": "atikamekw", "zh_Hans": "阿提卡米克语", "zh_Hant": "阿提卡米克語", @@ -898,20 +825,20 @@ "eo": "avara lingvo", "es": "avar", "eu": "avarera", - "fi": "Avaarin kieli", + "fi": "avaari", "fr": "avar", "gl": "Lingua avar", "he": "אווארית", "hu": "avar", - "id": "Bahasa Avar", + "id": "Avar", "it": "avaro", "ja": "アヴァル語", "nb_NO": "avarisk", "nl": "Avaars", "pl": "język awarski", - "pt": "Língua avar", + "pt": "Língua ávara", "ru": "аварский язык", - "sl": "Avarščina", + "sl": "avarščina", "sv": "avariska", "_meta": { "dir": [ @@ -926,10 +853,10 @@ "eo": "avadhia", "es": "awadhi", "eu": "Awadhiera", - "fi": "Awadhin kieli", + "fi": "awadhi", "fr": "awadhi", "gl": "Lingua awadhi", - "he": "אוודהית", + "he": "אוודית", "id": "Bahasa Awadhi", "it": "awadhi", "ja": "アワディー語", @@ -939,6 +866,7 @@ "pt": "Língua awadhi", "pt_BR": "Língua awadhi", "ru": "авадхи", + "sl": "avadščina", "sv": "awadhi", "zh_Hans": "阿瓦德语", "zh_Hant": "阿瓦德語", @@ -971,7 +899,7 @@ "pt": "Língua aymará", "pt_BR": "Língua aimará", "ru": "аймара", - "sl": "Ajmarščina", + "sl": "ajmarščina", "sv": "aymara", "zh_Hans": "艾马拉语", "zh_Hant": "艾馬拉語", @@ -996,10 +924,10 @@ "eu": "azerbaijanera", "fi": "azeri", "fr": "azéri", - "gl": "Lingua azerí", + "gl": "Lingua azarí", "he": "אזרית", "hu": "azeri", - "id": "Bahasa Azeri", + "id": "bahasa Azerbaijan", "it": "azero", "ja": "アゼルバイジャン語", "nb_NO": "aserbajdsjansk", @@ -1022,6 +950,28 @@ ] } }, + "azb": { + "ca": "àzeri del sud", + "cs": "jižní ázerbájdžánština", + "de": "Südaserbaidschanisch", + "en": "South Azerbaijani", + "eo": "sud-azerbajĝana lingvo", + "fi": "eteläazeri", + "fr": "azéri du Sud", + "he": "אזרבייג'נית דרומית", + "ja": "南アゼルバイジャン語", + "nl": "Zuid-Azerbeidzjaans", + "ru": "южно-азербайджанский язык", + "sl": "južna azerbajdžanščina", + "sv": "sydazerbajdzjanska", + "zh_Hans": "南阿塞拜疆语", + "zh_Hant": "南阿塞拜疆語", + "_meta": { + "dir": [ + "right-to-left" + ] + } + }, "ba": { "ca": "baixkir", "cs": "baškirština", @@ -1036,7 +986,7 @@ "gl": "Lingua baskir", "he": "בשקירית", "hu": "baskír", - "id": "Bahasa Bashkir", + "id": "bahasa Bashkir", "it": "baschiro", "ja": "バシキール語", "nb_NO": "basjkirsk", @@ -1045,13 +995,14 @@ "pt": "Língua bashkir", "pt_BR": "Língua bashkir", "ru": "башкирский язык", - "sl": "Baškirščina", + "sl": "baškirščina", "sv": "basjkiriska", "zh_Hans": "巴什基尔语", "zh_Hant": "巴什基爾語", "_meta": { "dir": [ - "left-to-right" + "left-to-right", + "right-to-left" ] } }, @@ -1064,11 +1015,11 @@ "eo": "balia lingvo", "es": "balinés", "eu": "baliera", - "fi": "Balin kieli", + "fi": "bali", "fr": "balinais", "gl": "Lingua balinesa", "he": "באלינזית", - "id": "Bahasa Bali", + "id": "Bali", "it": "balinese", "ja": "バリ語", "nb_NO": "balinesisk", @@ -1096,12 +1047,12 @@ "eo": "bavara lingvo", "es": "bávaro", "eu": "Bavariera", - "fi": "Baijerin kieli", + "fi": "baijeri", "fr": "bavarois", "gl": "Lingua bavaresa", "he": "בווארית", "hu": "bajor", - "id": "Bahasa Bayern", + "id": "Bavaria", "it": "bavarese", "ja": "バイエルン・オーストリア語", "nb_NO": "bairisk", @@ -1128,7 +1079,7 @@ "eo": "Ĵemajtia dialekto", "es": "Idioma samogitiano", "eu": "samogatiera", - "fi": "Samogiitti", + "fi": "samogiitti", "fr": "samogitien", "gl": "Samoxiciano", "hu": "szamogit", @@ -1159,11 +1110,11 @@ "eo": "Batak Toba", "es": "Batak Toba", "eu": "Batak Toba", - "fi": "Batak Toba", + "fi": "batak-toba", "fr": "batak toba", "gl": "Lingua toba batak", "hu": "Batak Toba", - "id": "Bahasa Batak Toba", + "id": "bahasa Batak Toba", "it": "lingua batak toba", "ja": "バタク・トバ語", "nb_NO": "Batak Toba", @@ -1171,8 +1122,8 @@ "pl": "język batak toba", "pt": "Batak Toba", "pt_BR": "Batak Toba", - "ru": "Тоба", - "sl": "Batak Toba", + "ru": "тоба", + "sl": "tobabataščina", "sv": "toba batak", "_meta": { "dir": [ @@ -1185,6 +1136,7 @@ "en": "West Coast Bajau", "fr": "bajau de la côte occidentale", "gl": "Lingua bajaw da costa occidental", + "ja": "サマ・バジャウ諸語", "nb_NO": "vestkystbajau", "nl": "Westkust-Bajau", "ru": "баджо западного побережья", @@ -1204,7 +1156,7 @@ "eu": "Bedawi hizkuntza", "fi": "Bedžan kieli", "fr": "bedja", - "id": "Bahasa Beja", + "id": "Beja", "it": "begia", "ja": "ベジャ語", "nb_NO": "Beja", @@ -1224,6 +1176,7 @@ "bfi": { "ca": "llengau de signes britànica", "cs": "britský znakový jazyk", + "da": "brittisk tegnsprog", "de": "Britische Gebärdensprache", "en": "British Sign Language", "eo": "brita signolingvo", @@ -1231,7 +1184,7 @@ "fi": "brittiläinen viittomakieli", "fr": "langue des signes britannique", "he": "שפת הסימנים הבריטית", - "id": "Bahasa Isyarat Britania", + "id": "Bahasa Isyarat Inggris", "it": "lingua dei segni britannica", "ja": "イギリス手話", "nb_NO": "britisk tegnspråk", @@ -1239,6 +1192,7 @@ "pl": "brytyjski język migowy", "pt": "língua de sinais britânica", "ru": "британский жестовый язык", + "sl": "britanski znakovni jezik", "sv": "brittiskt teckenspråk", "_meta": { "dir": [ @@ -1313,12 +1267,12 @@ "eo": "bhojpura lingvo", "es": "Idioma bopurí", "eu": "bhojpuri", - "fi": "Bhodžpurin kieli", + "fi": "bhodžpuri", "fr": "bhodjpouri", "gl": "Lingua bhojpuri", "he": "בוג'פורית", "hu": "bhódzspurí", - "id": "bahasa Bhojpuri", + "id": "Bhojpuri", "it": "bhojpuri", "ja": "ボージュプリー語", "nb_NO": "Bhojpuri", @@ -1344,12 +1298,12 @@ "eo": "bhojpura lingvo", "es": "Idioma bopurí", "eu": "bhojpuri", - "fi": "Bhodžpurin kieli", + "fi": "bhodžpuri", "fr": "bhodjpouri", "gl": "Lingua bhojpuri", "he": "בוג'פורית", "hu": "bhódzspurí", - "id": "bahasa Bhojpuri", + "id": "Bhojpuri", "it": "bhojpuri", "ja": "ボージュプリー語", "nb_NO": "Bhojpuri", @@ -1374,7 +1328,7 @@ "eo": "bislama lingvo", "es": "Bislama", "eu": "Bislama", - "fi": "Bislama", + "fi": "bislama", "fr": "bichelamar", "gl": "Bislama", "he": "ביסלמה", @@ -1400,7 +1354,7 @@ } }, "bla": { - "ca": "blackfoot", + "ca": "llengua blackfoot", "de": "Blackfoot", "en": "Blackfoot", "eo": "nigrapieda lingvo", @@ -1425,6 +1379,22 @@ ] } }, + "blk": { + "en": "Pa'O", + "fr": "pa'o", + "gl": "Lingua pa'o", + "ja": "パーオー語", + "nl": "Pa'O", + "pt": "Língua Pa'O", + "ru": "пао", + "sl": "pa'O", + "sv": "pa'o", + "_meta": { + "dir": [ + "left-to-right" + ] + } + }, "bm": { "ca": "bàmbara", "cs": "bambarština", @@ -1434,20 +1404,22 @@ "eo": "bambara lingvo", "es": "bambara", "eu": "Banbara hizkuntza", - "fi": "bambaran kieli", + "fi": "bambara", "fr": "bambara", "gl": "Lingua bambara", "he": "במברה", "hu": "bambara", "id": "Bahasa Bambara", - "it": "Bambara", + "it": "bambara", "ja": "バンバラ語", "nb_NO": "bambara", "nl": "Bambara", "pl": "język bambara", "pt": "Língua bambara", "ru": "бамана", + "sl": "bambarščina", "sv": "bambara", + "zh_Hant": "班巴拉語", "_meta": { "countries": [ "ML" @@ -1459,30 +1431,31 @@ } }, "bn": { - "ca": "bengalí", + "ca": "bangla", "cs": "bengálština", - "da": "bengali", + "da": "Bangla", "de": "Bengalisch", "en": "Bangla", "eo": "bengala lingvo", - "es": "bengalí", + "es": "bangla", "eu": "bengalera", "fi": "bengali", - "fr": "bengali", + "fr": "bangla", "gl": "lingua bengalí", "he": "בנגלית", - "hu": "bengáli", - "id": "Bahasa Bengali", + "hu": "bangla", + "id": "bahasa Bengali", "it": "bengali", "ja": "ベンガル語", - "nb_NO": "bengali", + "nb_NO": "bangla", "nl": "Bengaals", "pl": "język bengalski", - "pt": "língua bengali", - "pt_BR": "língua bengali", + "pt": "língua bangla", + "pt_BR": "língua bangla", "ru": "бенгальский язык", "sl": "bengalščina", - "sv": "bengali", + "sv": "bangla", + "zgh": "ⵜⵓⵜⵍⴰⵢⵜ ⵜⴰⴱⵏⴳⴰⵍⵉⵜ", "zh_Hans": "孟加拉语", "zh_Hant": "孟加拉語", "_meta": { @@ -1500,6 +1473,7 @@ "eu": "bununera", "fi": "bununin kieli", "fr": "bunun", + "he": "בונון", "id": "Bahasa Bunun", "it": "lingua bunun", "ja": "ブヌン語", @@ -1524,12 +1498,12 @@ "eo": "tibeta lingvo", "es": "tibetano", "eu": "Tibetera", - "fi": "tiibetin kieli", + "fi": "tiibetti", "fr": "tibétain", "gl": "Lingua tibetana", "he": "טיבטית", "hu": "tibeti", - "id": "bahasa Tibet Lhasa", + "id": "Tibet", "it": "tibetano", "ja": "チベット語", "nb_NO": "tibetansk", @@ -1553,7 +1527,7 @@ "en": "Bishnupriya Manipuri", "eo": "biŝnuprija manipura lingvo", "es": "Bishnupriya manipurí", - "fi": "Bishnupriya Manipuri", + "fi": "bišnupria", "fr": "manipourî de Bishnupriyay", "gl": "Lingua bishnupriya manipuri", "he": "בישנופרייה מניפורי", @@ -1564,7 +1538,8 @@ "nl": "Bishnupriya Manipuri", "pl": "Język bisznuprija-manipuri", "pt": "Bishnupriya Manipuri", - "ru": "Бишнуприя-манипури", + "ru": "бишнуприя-манипури", + "sl": "bišnuprijska manipurščina", "sv": "bishnupriya manipuri", "zh_Hans": "比什努普里亚-曼尼普尔语", "zh_Hant": "比什努普里亞-曼尼普爾語", @@ -1583,6 +1558,7 @@ "nl": "Bachtiarisch", "pl": "Język bachtiarski", "ru": "Бахтиярский язык", + "sl": "bahtijarščina", "sv": "bakhtiari", "zh_Hans": "巴赫蒂亚语", "zh_Hant": "巴赫蒂亞語", @@ -1592,39 +1568,6 @@ ] } }, - "br": { - "ca": "bretó", - "cs": "bretonština", - "da": "bretonsk", - "de": "Bretonisch", - "en": "Breton", - "eo": "bretona lingvo", - "es": "bretón", - "eu": "Bretainiera", - "fi": "bretoni", - "fr": "breton", - "gl": "lingua bretoa", - "he": "ברטונית", - "hu": "breton", - "id": "Bahasa Breton", - "it": "bretone", - "ja": "ブルトン語", - "nb_NO": "bretonsk", - "nl": "Bretons", - "pl": "język bretoński", - "pt": "bretão", - "pt_BR": "língua bretã", - "ru": "бретонский язык", - "sl": "bretonščina", - "sv": "bretonska", - "zh_Hans": "布列塔尼语", - "zh_Hant": "布列塔尼語", - "_meta": { - "dir": [ - "left-to-right" - ] - } - }, "brx": { "ca": "bodo", "cs": "jazyk Bodo", @@ -1635,7 +1578,7 @@ "fi": "Bodon kieli", "fr": "bodo", "he": "בודו", - "id": "Bahasa Bodo", + "id": "Bodo", "it": "bodo", "ja": "ボド語", "nb_NO": "Bodo", @@ -1643,6 +1586,7 @@ "pl": "Język bodo", "pt": "Língua bodo", "ru": "Бодо", + "sl": "bodojščina", "sv": "bodo", "_meta": { "dir": [ @@ -1655,7 +1599,7 @@ "cs": "abinomn", "en": "Abinomn", "es": "Idioma abinomn", - "fi": "Abinomn", + "fi": "abinomn", "fr": "abinomn", "gl": "Lingua abinomn", "id": "Abinomn", @@ -1685,7 +1629,7 @@ "gl": "Lingua burushaski", "he": "בורושסקי", "hu": "burusaszki", - "id": "Bahasa Burushaski", + "id": "Burushaski", "it": "lingua burushaski", "ja": "ブルシャスキー語", "nl": "Burushaski", @@ -1719,9 +1663,10 @@ }, "btm": { "cs": "Mandailing", - "en": "Mandailing", + "en": "Mandailing Batak", "fr": "batak mandailing", - "id": "Bahasa Mandailing", + "gl": "Lingua mandailing", + "id": "bahasa Batak Mandailing", "ja": "バタク・マンダイリン語", "nl": "Batak Mandailing", "pl": "język batak mandailing", @@ -1742,7 +1687,7 @@ "en": "Bugis", "eo": "buĝia lingvo", "es": "idioma buguinés", - "fi": "Bugin kieli", + "fi": "bugi", "fr": "bouguinais", "gl": "Lingua bugi", "hu": "bugisz", @@ -1756,6 +1701,7 @@ "ru": "бугийский язык", "sl": "buginščina", "sv": "buginesiska", + "zh_Hant": "布吉語", "_meta": { "dir": [ "left-to-right" @@ -1768,9 +1714,9 @@ "de": "Burjatisch", "en": "Buryat", "eo": "burjata lingvo", - "es": "idioma buriato", + "es": "buriato", "eu": "Buriatera", - "fi": "Burjaatin kieli", + "fi": "burjaatti", "fr": "bouriate", "gl": "Lingua buriata", "he": "בוריאטית", @@ -1784,7 +1730,9 @@ "pt": "Língua buriata", "pt_BR": "Língua buriata", "ru": "бурятский язык", + "sl": "burjatščina", "sv": "burjatiska", + "zh_Hans": "布里亚特语", "zh_Hant": "布里亞特語", "_meta": { "dir": [ @@ -1831,7 +1779,7 @@ "gl": "lingua catalá", "he": "קטלאנית", "hu": "katalán", - "id": "Katalan", + "id": "bahasa Katalan", "it": "catalano", "ja": "カタルーニャ語", "nb_NO": "katalansk", @@ -1870,7 +1818,9 @@ "pl": "Język kaqchikel", "pt": "Língua caqchiquel", "ru": "Какчикельский язык", + "sl": "kakčikelščina", "sv": "cakchiquel", + "zh_Hant": "喀克其奎語", "_meta": { "dir": [ "left-to-right" @@ -1879,6 +1829,7 @@ }, "cal": { "ca": "carolinià", + "cs": "karolínština", "de": "Karolinisch", "en": "Carolinian", "eo": "karolina lingvo", @@ -1906,12 +1857,14 @@ "en": "Chakma", "eo": "ĉakma lingvo", "fr": "changma kodha", + "he": "צ׳אקמה", "ja": "チャクマ語", "nl": "Chakma", "pl": "język czakma", "pt": "língua chakma", "pt_BR": "língua chakma", "ru": "чакма", + "sl": "čakmijščina", "sv": "chakma", "_meta": { "dir": [ @@ -1929,7 +1882,7 @@ "fr": "mindong", "gl": "Lingua ming dong", "he": "מין מזרחית", - "id": "Bahasa Min Timur", + "id": "Min Timur", "it": "min dong", "ja": "閩東語", "nb_NO": "Mindong", @@ -1938,12 +1891,13 @@ "pt": "Língua min oriental", "pt_BR": "Min Dong", "ru": "Восточноминьский язык", + "sl": "min dong", "sv": "mindong", "zh_Hans": "闽东语", "zh_Hant": "閩東語", "_meta": { "dir": [ - "top-to-bottom", + "vertical right-to-left", "left-to-right" ] } @@ -1957,12 +1911,12 @@ "eo": "ĉeĉena lingvo", "es": "checheno", "eu": "txetxenera", - "fi": "Tšetšeenin kieli", + "fi": "tšetšeeni", "fr": "tchétchène", "gl": "Lingua chechena", "he": "צ'צ'נית", "hu": "csecsen", - "id": "Bahasa Chechnya", + "id": "bahasa Chechnya", "it": "ceceno", "ja": "チェチェン語", "nb_NO": "tsjetsjensk", @@ -1990,12 +1944,12 @@ "eo": "cebua lingvo", "es": "cebuano", "eu": "cebuera", - "fi": "Cebun kieli", - "fr": "cebouan", + "fi": "cebuano", + "fr": "cébouano", "gl": "Lingua cebuana", "he": "סבואנו", "hu": "szebuano", - "id": "Cebu", + "id": "bahasa Cebu", "it": "cebuano", "ja": "セブ語", "nb_NO": "cebuano", @@ -2021,7 +1975,7 @@ "eo": "ĉamora lingvo", "es": "idioma chamorro", "eu": "Chamorro", - "fi": "Tšamorron kieli", + "fi": "tšamorro", "fr": "chamorro", "gl": "Lingua chamorra", "he": "צ'מורו", @@ -2048,12 +2002,14 @@ "eo": "ĉinuka piĝino", "fi": "chinook-jargon", "fr": "chinook", + "gl": "Xerga chinook", "he": "עגה של הצ'ינוק", "ja": "チヌーク・ジャーゴン", "nb_NO": "Chinook jargon", "nl": "Chinook Jargon", "pt": "Jargão chinook", "ru": "чинукский жаргон", + "sl": "činuški žargon", "sv": "chinookjargong", "zh_Hans": "奇努克混合语", "zh_Hant": "支努幹混合語", @@ -2070,7 +2026,7 @@ "en": "Choctaw", "eo": "ĉakta lingvo", "es": "idioma choctaw", - "fi": "Choctawin kieli", + "fi": "choctaw", "fr": "choctaw", "gl": "lingua choctaw", "hu": "csaktó", @@ -2099,12 +2055,12 @@ "eo": "Ĉeroka lingvo", "es": "cheroqui", "eu": "Txerokiera", - "fi": "Cherokeen kieli", + "fi": "cherokee", "fr": "cherokee", - "gl": "Lingua cheroqui", + "gl": "Lingua cherokee", "he": "צ'רוקי", "hu": "cseroki", - "id": "Bahasa Cherokee", + "id": "Cherokee", "it": "cherokee", "ja": "チェロキー語", "nb_NO": "cherokesisk", @@ -2130,7 +2086,7 @@ "eo": "Ĉejena lingvo", "es": "cheyene", "eu": "Cheyennera", - "fi": "Cheyennen kieli", + "fi": "cheyenne", "fr": "cheyenne", "gl": "Lingua cheyenne", "he": "שאיין", @@ -2143,6 +2099,7 @@ "pl": "język czejeński", "pt": "Língua cheyenne", "ru": "шайенский язык", + "sl": "šejenščina", "sv": "cheyenne", "zh_Hans": "夏延语", "zh_Hant": "夏安語", @@ -2166,7 +2123,7 @@ "gl": "lingua kurda central", "he": "סוראנית", "hu": "szoráni", - "id": "Soranî", + "id": "Sorani", "it": "sorani", "ja": "ソラニー", "nl": "Sorani", @@ -2194,10 +2151,10 @@ "eu": "Txuktxiera", "fi": "Tšuktšin kieli", "fr": "tchouktche", - "gl": "Lingua Chukoto", + "gl": "Lingua chukchi", "he": "צ'וקצ'ית", "hu": "csukcs", - "id": "Bahasa Chukchi", + "id": "Chukchi", "it": "lingua ciukcia", "ja": "チュクチ語", "nb_NO": "Luoravetlansk", @@ -2205,7 +2162,7 @@ "pl": "Język czukocki", "pt": "Língua chukoto", "ru": "чукотский язык", - "sl": "Čukotščina", + "sl": "čukotščina", "sv": "tjuktjiska", "_meta": { "dir": [ @@ -2235,14 +2192,14 @@ "en": "Corsican", "eo": "korsika lingvo", "es": "corso", - "eu": "Korsikera", - "fi": "Korsikan kieli", + "eu": "korsikera", + "fi": "korsika", "fr": "corse", - "gl": "Lingua corsa", + "gl": "corso", "he": "קורסיקאית", "hu": "korzikai", - "id": "Bahasa Korsika", - "it": "Lingua corsa", + "id": "bahasa Korsika", + "it": "corso", "ja": "コルシカ語", "nb_NO": "korsikansk", "nl": "Corsicaans", @@ -2260,7 +2217,9 @@ "cpx": { "de": "Pu-Xian", "en": "Pu-Xian Min", + "es": "Pu-Xian", "fr": "puxian", + "it": "Pu-Xian Min", "ja": "莆仙語", "nb_NO": "Puxian", "nl": "Puxian", @@ -2284,7 +2243,7 @@ "eo": "kria lingvo", "es": "idioma cree", "eu": "cree hizkuntza", - "fi": "Cree", + "fi": "cree", "fr": "cri", "gl": "Lingua cree", "he": "קרי", @@ -2319,7 +2278,7 @@ "gl": "Lingua tártara de Crimea", "he": "טטרית של קרים", "hu": "krími tatár", - "id": "Bahasa Tatar Krimea", + "id": "Tatar Krimea", "it": "tataro di Crimea", "ja": "クリミア・タタール語", "nb_NO": "krimtatarisk", @@ -2351,7 +2310,7 @@ "gl": "Crioulo das Seychelles", "he": "קריאולית סיישלית", "hu": "seychelle-i kreol", - "id": "Bahasa Kreol Seychelles", + "id": "Kreol Seychelles", "it": "creolo delle Seychelles", "ja": "セーシェル・クレオール語", "nb_NO": "seychellisk kreol", @@ -2366,42 +2325,6 @@ ] } }, - "cs": { - "ca": "txec", - "cs": "čeština", - "da": "tjekkisk", - "de": "Tschechisch", - "en": "Czech", - "eo": "ĉeĥa lingvo", - "es": "checo", - "eu": "txekiera", - "fi": "tšekki", - "fr": "tchèque", - "gl": "lingua checa", - "he": "צ'כית", - "hu": "cseh", - "id": "Bahasa Ceska", - "it": "ceco", - "ja": "チェコ語", - "nb_NO": "tsjekkisk", - "nl": "Tsjechisch", - "pl": "język czeski", - "pt": "checo", - "pt_BR": "língua tcheca", - "ru": "чешский язык", - "sl": "češčina", - "sv": "tjeckiska", - "zh_Hans": "捷克语", - "zh_Hant": "捷克語", - "_meta": { - "countries": [ - "CZ" - ], - "dir": [ - "left-to-right" - ] - } - }, "csb": { "ca": "caixubi", "cs": "kašubština", @@ -2442,12 +2365,14 @@ "fr": "chittagonien", "gl": "Lingua chittagoniana", "he": "צ'יטגונית", - "id": "Bahasa Chittagonia", + "id": "Chittagong", "it": "lingua chittagonian", "ja": "チッタゴン語", + "nb_NO": "Chittagong", "pl": "Język chatgaya", "pt": "Língua chittagong", "pt_BR": "Língua chittagong", + "sl": "čitagonščina", "sv": "chittagoniska", "_meta": { "dir": [ @@ -2469,7 +2394,7 @@ "gl": "Lingua chuvash", "he": "צ'ובשית", "hu": "csuvas", - "id": "Bahasa Chuvash", + "id": "Chuvash", "it": "ciuvascio", "ja": "チュヴァシ語", "nb_NO": "tsjuvasjisk", @@ -2511,7 +2436,7 @@ "pt": "galês", "pt_BR": "galês", "ru": "валлийский язык", - "sl": "velščina", + "sl": "valižanščina", "sv": "kymriska", "zh_Hans": "威尔士语", "zh_Hant": "威爾士語", @@ -2566,7 +2491,7 @@ "eo": "Dagbania lingvo", "es": "dagbani", "eu": "Dagbani", - "fi": "Dagbanin kieli", + "fi": "dagbani", "fr": "dagbani", "gl": "Lingua dagbani", "it": "Dagbani", @@ -2577,6 +2502,7 @@ "pt": "Língua dagbani", "pt_BR": "Língua dagbani", "ru": "дагбани", + "sl": "dagbanščina", "sv": "dagbani", "_meta": { "dir": [ @@ -2609,6 +2535,7 @@ "ru": "немецкий язык", "sl": "nemščina", "sv": "tyska", + "zgh": "ⵜⵓⵜⵍⴰⵢⵜ ⵜⴰⵍⵉⵎⴰⵏⵜ", "zh_Hans": "德语", "zh_Hant": "德語", "_meta": { @@ -2639,10 +2566,12 @@ "id": "Bahasa Dinka", "it": "lingua dinka", "ja": "ディンカ語", + "nb_NO": "dinka", "nl": "Dinka", "pl": "język dinka", "pt": "Língua dinka", "ru": "Динка", + "sl": "dinščina", "sv": "dinka", "_meta": { "dir": [ @@ -2664,7 +2593,7 @@ "gl": "Lingua zazaki", "he": "זאזאקי", "hu": "zazaki", - "id": "bahasa Zazaki", + "id": "Zaza", "it": "zazaki", "ja": "ザザキ語", "nb_NO": "zazaisk", @@ -2714,11 +2643,12 @@ "eo": "malsuprasoraba lingvo", "es": "bajo sorabo", "eu": "Behe sorabiera", + "fi": "alasorbi", "fr": "bas-sorabe", "gl": "Baixo sorabo", "he": "סורבית תחתית", "hu": "alsó szorb", - "id": "Bahasa Sorbia Hilir", + "id": "Sorbia Hilir", "it": "sorabo inferiore", "ja": "低地ソルブ語", "nl": "Nedersorbisch", @@ -2726,7 +2656,7 @@ "pt": "baixo sorábio", "pt_BR": "Baixo sorábio", "ru": "нижнелужицкий язык", - "sl": "Dolnjesrbščina", + "sl": "dolnja lužiška srbščina", "sv": "lågsorbiska", "_meta": { "dir": [ @@ -2757,6 +2687,7 @@ "en": "Doteli", "eo": "Doteli", "es": "Doteli", + "fi": "doteli", "fr": "dotyali", "gl": "Lingua doteli", "ja": "ドテリ語", @@ -2805,12 +2736,12 @@ "eo": "maldiva lingvo", "es": "maldivo", "eu": "Maldivera", - "fi": "Divehin kieli", + "fi": "divehi", "fr": "maldivien", "gl": "lingua maldivana", "he": "דיבהי", "hu": "maldív", - "id": "Divehi", + "id": "Maladewa", "it": "maldiviano", "ja": "ディベヒ語", "nb_NO": "dhivehi", @@ -2855,7 +2786,7 @@ "pt": "língua butanesa", "pt_BR": "Língua butanesa", "ru": "дзонг-кэ", - "sl": "Dzongkha", + "sl": "butanščina", "sv": "dzongkha", "zh_Hans": "宗卡语", "zh_Hant": "宗喀語", @@ -2877,12 +2808,12 @@ "eo": "evea lingvo", "es": "ewé", "eu": "eweera", - "fi": "ewen kieli", + "fi": "ewe", "fr": "ewé", "gl": "Lingua ewe", - "he": "אבגבה", + "he": "אווה", "hu": "eve", - "id": "Bahasa Ewe", + "id": "Ewe", "it": "ewe", "ja": "エウェ語", "nb_NO": "ewe", @@ -2901,7 +2832,7 @@ "efi": { "ca": "efik", "de": "Efik", - "en": "Ibibio", + "en": "Efik", "eo": "efika lingvo", "es": "Idioma efik", "fi": "Efik", @@ -2913,6 +2844,7 @@ "nb_NO": "Efik", "nl": "Efik", "pt": "Língua efik", + "sl": "efiščina", "sv": "efik", "zh_Hant": "艾菲克語", "_meta": { @@ -2927,7 +2859,8 @@ "en": "Emilian", "eo": "emiliaj lingvoj", "es": "emiliano", - "fi": "Emilian kieli", + "eu": "emiliera", + "fi": "emilia", "fr": "émilien", "hu": "emilián", "id": "bahasa Emilia", @@ -2936,6 +2869,7 @@ "nl": "Emiliaans", "pt": "dialeto emiliano", "ru": "эмилианский", + "sl": "emilijščina", "sv": "emilianska", "zh_Hant": "艾米利亞語", "_meta": { @@ -2961,14 +2895,15 @@ "id": "Yunani Modern", "it": "greco moderno", "ja": "現代ギリシア語", - "nb_NO": "nygresk", + "nb_NO": "gresk", "nl": "Nieuwgrieks", - "pl": "język nowogrecki", - "pt": "grego moderno", + "pl": "język grecki", + "pt": "grego", "pt_BR": "língua grega", - "ru": "новогреческий язык", - "sl": "novogrščina", - "sv": "nygrekiska", + "ru": "греческий язык", + "sl": "grščina", + "sv": "grekiska", + "zgh": "ⵜⵓⵜⵍⴰⵢⵜ ⵜⴰⴳⵔⵉⴽⵜ", "zh_Hans": "希腊语", "zh_Hant": "希臘語", "_meta": { @@ -3006,6 +2941,7 @@ "ru": "английский язык", "sl": "angleščina", "sv": "engelska", + "zgh": "ⵜⵓⵜⵍⴰⵢⵜ ⵜⴰⵏⴳⵍⵉⵣⵜ", "zh_Hans": "英语", "zh_Hant": "英語", "_meta": { @@ -3133,6 +3069,7 @@ "ru": "испанский язык", "sl": "španščina", "sv": "spanska", + "zgh": "ⵜⵓⵜⵍⴰⵢⵜ ⵜⴰⵙⴱⵍⵢⵓⵏⵜ", "zh_Hans": "西班牙语", "zh_Hant": "西班牙語", "_meta": { @@ -3171,12 +3108,14 @@ "fi": "alaskanjupik", "fr": "yupik de l'Alaska central", "gl": "Lingua iupik de Alasca central", + "he": "יופיקית מרכזית", "it": "lingua yupik centrale", "ja": "中央アラスカ・ユピック語", "nb_NO": "Alaskayupik", "nl": "Joepik", "pl": "Język yupik środkowy", - "ru": "Центрально-юпикский язык", + "pt": "Língua iúpique do Alasca Central", + "ru": "центрально-юпикский язык", "sv": "centraljupik", "zh_Hans": "中阿拉斯加尤皮克语", "_meta": { @@ -3199,7 +3138,7 @@ "gl": "lingua estoniana", "he": "אסטונית", "hu": "észt", - "id": "Esti", + "id": "bahasa Estonia", "it": "estone", "ja": "エストニア語", "nb_NO": "estisk", @@ -3234,7 +3173,7 @@ "gl": "lingua éuscara", "he": "בסקית", "hu": "baszk", - "id": "Bahasa Basque", + "id": "Basque", "it": "basco", "ja": "バスク語", "nb_NO": "baskisk", @@ -3257,7 +3196,7 @@ "ca": "extremeny", "de": "Extremadurisch", "en": "Extremaduran", - "eo": "ekstremadura lingvo", + "eo": "ekstremadura lingvovario", "es": "extremeño", "eu": "Extremadurera", "fi": "extremadura", @@ -3273,6 +3212,7 @@ "ru": "Эстремадурский язык", "sl": "ekstremadurščina", "sv": "extremaduriska", + "zh_Hant": "埃斯特雷馬杜拉語", "_meta": { "dir": [ "left-to-right" @@ -3328,7 +3268,7 @@ "gl": "Lingua dari", "he": "דארי", "hu": "dari", - "id": "Dari", + "id": "bahasa Dari", "it": "dari", "ja": "ダリー語", "nb_NO": "dari", @@ -3339,7 +3279,7 @@ "ru": "дари", "sl": "darijščina", "sv": "dari", - "zh_Hans": "达利语", + "zh_Hans": "达里语", "zh_Hant": "達利語", "_meta": { "dir": [ @@ -3356,10 +3296,10 @@ "eo": "fula lingvo", "es": "fula", "eu": "fula", - "fi": "Fulani", + "fi": "fulani", "fr": "peul", "gl": "Lingua fula", - "he": "שפת הפולה", + "he": "פולה", "hu": "ful", "id": "Bahasa Fula", "it": "fula", @@ -3394,10 +3334,10 @@ "eu": "finlandiera", "fi": "suomi", "fr": "finnois", - "gl": "finés", + "gl": "lingua finesa", "he": "פינית", "hu": "finn", - "id": "Suomi", + "id": "bahasa Finlandia", "it": "finlandese", "ja": "フィンランド語", "nb_NO": "finsk", @@ -3444,6 +3384,7 @@ "ru": "филиппинский язык", "sl": "filipinščina", "sv": "filippinska", + "zh_Hans": "菲律宾语", "zh_Hant": "菲律賓語", "_meta": { "dir": [ @@ -3465,6 +3406,7 @@ "gl": "meänkieli", "he": "מאנקיילי", "hu": "meänkieli", + "id": "bahasa Meänkieli", "it": "lingua meänkieli", "ja": "メアンキエリ", "nb_NO": "tornedalsfinsk", @@ -3473,6 +3415,7 @@ "pt": "Língua meänkieli", "pt_BR": "Língua meänkieli", "ru": "Меянкиели", + "sl": "meänkieli", "sv": "meänkieli", "zh_Hans": "梅安语", "zh_Hant": "梅安語", @@ -3493,8 +3436,9 @@ "fi": "võro", "fr": "võro", "gl": "Lingua võro", + "he": "וירו", "hu": "võro", - "id": "Bahasa Võro", + "id": "Võro", "it": "võro", "ja": "ヴォロ語", "nb_NO": "sørestisk", @@ -3502,6 +3446,7 @@ "pl": "język võro", "pt": "Língua võro", "ru": "выруский диалект", + "sl": "võro", "sv": "võro", "zh_Hans": "沃罗语", "_meta": { @@ -3519,12 +3464,12 @@ "eo": "fiĝia lingvo", "es": "fiyiano", "eu": "Fijiera", - "fi": "Fidžin kieli", + "fi": "fidži", "fr": "fidjien", "gl": "Lingua fidxiana", "he": "פיג'ית", "hu": "fidzsi", - "id": "Bahasa Fiji", + "id": "Fiji", "it": "figiano", "ja": "フィジー語", "nb_NO": "fijiansk", @@ -3533,7 +3478,10 @@ "pt": "Língua fidjiana", "pt_BR": "Língua fijiana", "ru": "фиджийский язык", + "sl": "fidžijščina", "sv": "fijianska", + "zh_Hans": "斐济语", + "zh_Hant": "斐濟語", "_meta": { "countries": [ "FJ" @@ -3557,7 +3505,7 @@ "gl": "Lingua kven", "he": "קוון", "hu": "kven", - "id": "Bahasa Kven", + "id": "Kven", "it": "kven", "ja": "クヴェン語", "nb_NO": "kvensk", @@ -3583,7 +3531,7 @@ "eo": "feroa lingvo", "es": "feroés", "eu": "Faroera", - "fi": "fäärin kieli", + "fi": "fääri", "fr": "féroïen", "gl": "lingua feroesa", "he": "פארואזית", @@ -3612,7 +3560,7 @@ "eo": "fonua lingvo", "es": "idioma fon", "eu": "Fonera", - "fi": "Fonin kieli", + "fi": "fon", "fr": "fon-gbe", "gl": "Lingua fon", "he": "פון", @@ -3657,6 +3605,7 @@ "ru": "французский язык", "sl": "francoščina", "sv": "franska", + "zgh": "ⵜⵓⵜⵍⴰⵢⵜ ⵜⴰⴼⵕⴰⵏⵚⵉⵚⵜ", "zh_Hans": "法语", "zh_Hant": "法語", "_meta": { @@ -3704,12 +3653,13 @@ "es": "francés cajún", "eu": "Louisianako frantses", "fr": "français de Louisiane", - "id": "Bahasa Prancis Louisiana", + "id": "Prancis Louisiana", "it": "francese cajun", "ja": "ケイジャン・フランス語", "nl": "Cajun-Frans", "pt": "francês cajun", "ru": "Кажунский диалект французского языка", + "sl": "louisianska francoščina", "sv": "louisianafranska", "_meta": { "dir": [ @@ -3726,12 +3676,12 @@ "eo": "arpitana lingvo", "es": "franco-provenzal", "eu": "Frankoprovenzera", - "fi": "Arpitaani", + "fi": "arpitaani", "fr": "francoprovençal", "gl": "Lingua francoprovenzal", "he": "פרנקו-פרובנסאלית", "hu": "frankoprovanszál", - "id": "Bahasa Arpitan", + "id": "Franco-Provençal", "it": "francoprovenzale", "ja": "アルピタン語", "nb_NO": "frankoprovençalsk", @@ -3751,21 +3701,21 @@ "frr": { "ca": "frisó septentrional", "da": "Nordfrisisk", - "de": "Nordfriesisch", + "de": "nordfriesische Sprache", "en": "North Frisian", "eo": "nordfrisa lingvo", "es": "frisón septentrional", "eu": "Iparraldeko frisiera", - "fi": "Pohjoisfriisi", + "fi": "pohjoisfriisi", "fr": "frison septentrional", "gl": "Lingua frisoa setentrional", "he": "פריזית צפונית", "hu": "északi fríz", - "id": "Bahasa Frisia Utara", + "id": "Frisia Utara", "it": "frisone settentrionale", "ja": "北フリジア語", "nb_NO": "nordfrisisk", - "nl": "Noord-Fries", + "nl": "Noord-Friese talen", "pl": "język północnofryzyjski", "pt": "frisão setentrional", "ru": "севернофризский язык", @@ -3779,6 +3729,20 @@ ] } }, + "fuf": { + "en": "Pular", + "fr": "pular", + "gl": "Lingua pular", + "ja": "プラー語", + "nl": "Pular", + "sv": "pular", + "_meta": { + "dir": [ + "left-to-right", + "right-to-left" + ] + } + }, "fur": { "ca": "furlà", "cs": "furlanština", @@ -3788,12 +3752,12 @@ "eo": "friula lingvo", "es": "friulano", "eu": "Friuliera", - "fi": "Friulin kieli", + "fi": "friuli", "fr": "frioulan", "gl": "Lingua friulana", "he": "פורלן", "hu": "friuli", - "id": "Bahasa Friuli", + "id": "Friuli", "it": "friulano", "ja": "フリウリ語", "nb_NO": "friulisk", @@ -3803,6 +3767,7 @@ "ru": "фриульский язык", "sl": "furlanščina", "sv": "friuliska", + "zh_Hant": "佛里烏利語", "_meta": { "dir": [ "left-to-right" @@ -3818,12 +3783,12 @@ "eo": "okcidentfrisa lingvo", "es": "frisón occidental", "eu": "Mendebaldeko frisiera", - "fi": "länsifriisin kieli", + "fi": "länsifriisi", "fr": "frison occidental", "gl": "Lingua frisoa occidental", "he": "פריזית מערבית", "hu": "nyugati fríz", - "id": "Bahasa Frisia Barat", + "id": "Frisia Barat", "it": "frisone occidentale", "ja": "西フリジア語", "nb_NO": "vestfrisisk", @@ -3832,6 +3797,7 @@ "pt": "frísio ocidental", "pt_BR": "frísio ocidental", "ru": "западнофризский язык", + "sl": "zahodna frizijščina", "sv": "västfrisiska", "zh_Hans": "西弗里斯兰语", "zh_Hant": "西菲士蘭語", @@ -3855,7 +3821,7 @@ "gl": "lingua irlandesa", "he": "אירית", "hu": "ír", - "id": "Bahasa Irlandia", + "id": "bahasa Irlandia", "it": "irlandese", "ja": "アイルランド語", "nb_NO": "irsk", @@ -3889,6 +3855,7 @@ "he": "גה", "it": "lingua ga", "ja": "ガ語", + "nb_NO": "ga", "nl": "Ga", "pl": "Język ga", "ru": "Га", @@ -3938,7 +3905,7 @@ "en": "Gan Chinese", "eo": "gana lingvo", "es": "chino gan", - "fi": "Gan-kiina", + "fi": "gan-kiina", "fr": "gan", "gl": "Gan", "he": "סינית גאן", @@ -3955,7 +3922,7 @@ "zh_Hant": "贛語", "_meta": { "dir": [ - "top-to-bottom" + "vertical right-to-left" ] } }, @@ -3965,7 +3932,7 @@ "eo": "franc-gujana kreola lingvo", "es": "Criollo de Guayana Francesa", "fi": "Ranskan Guayanan kreoli", - "fr": "créole guyanais", + "fr": "Créole guyanais", "gl": "Crioulo da Güiana Francesa", "it": "lingua creola della Guyana francese", "ja": "仏領ギアナのクレオール語", @@ -3991,12 +3958,12 @@ "eo": "skotgaela lingvo", "es": "gaélico escocés", "eu": "Eskoziako gaelera", - "fi": "Gaeli", + "fi": "gaeli", "fr": "gaélique écossais", "gl": "Lingua gaélica escocesa", "he": "גאלית סקוטית", "hu": "skót gael", - "id": "Bahasa Gaelik Skotlandia", + "id": "Gaelik Skotlandia", "it": "gaelico scozzese", "ja": "スコットランド・ゲール語", "nb_NO": "skotsk-gælisk", @@ -4027,7 +3994,7 @@ "gl": "Lingua kiribatiana", "he": "גילברטית", "hu": "gilberti", - "id": "Bahasa Kiribati", + "id": "Kiribati", "it": "gilbertese", "ja": "キリバス語", "nb_NO": "Kiribatisk", @@ -4077,16 +4044,17 @@ }, "glk": { "ca": "gilaki", + "cs": "Gilákština", "de": "Gilaki", "en": "Gilaki", "eo": "gila lingvo", "es": "gileki", "eu": "Gilaki", - "fi": "Gilakin kieli", + "fi": "gilaki", "fr": "gilaki", "gl": "Lingua gilaki", "hu": "gilaki", - "id": "Bahasa Gilaki", + "id": "Gilaki", "it": "gilaki", "ja": "ギラキ語", "nb_NO": "Gileki", @@ -4094,7 +4062,9 @@ "pl": "Język giliański", "pt": "Língua gilaki", "ru": "гилякский язык", + "sl": "gilaščina", "sv": "gilaki", + "zh_Hant": "吉拉基語", "_meta": { "dir": [ "right-to-left" @@ -4110,7 +4080,7 @@ "eo": "gvarania lingvo", "es": "guaraní", "eu": "Guaraniera", - "fi": "Guaranin kieli", + "fi": "guarani", "fr": "guarani", "gl": "lingua guaraní", "he": "גוארני", @@ -4124,8 +4094,9 @@ "pt": "língua guarani", "pt_BR": "língua guarani", "ru": "гуарани", - "sl": "Gvaranščina", + "sl": "gvaranščina", "sv": "guaraní", + "zgh": "ⵜⵓⵜⵍⴰⵢⵜ ⵜⴰⴳⵡⴰⵔⴰⵏⵉⵜ", "zh_Hans": "瓜纳尼语", "zh_Hant": "瓜拉尼語", "_meta": { @@ -4141,10 +4112,12 @@ "gom": { "de": "Goa-Konkani", "en": "Goan Konkani", + "fi": "goankonkani", "fr": "konkani de Goa", "he": "קונקנית של גואה", "ja": "ゴア・コンカニ語", "nl": "Goa-Konkani", + "sl": "gojevska konkanščina", "sv": "goakonkani", "_meta": { "dir": [ @@ -4161,7 +4134,7 @@ "eo": "gorontala lingvo", "es": "Idioma gorontalo", "eu": "Gorontalo", - "fi": "Gorontalon kieli", + "fi": "gorontalo", "fr": "gorontalo", "gl": "Gorontalo", "id": "Gorontalo", @@ -4173,7 +4146,7 @@ "pt": "Gorontalo", "pt_BR": "Gorontalo", "ru": "Горонтало", - "sl": "Gorontalo", + "sl": "gorontalščina", "sv": "gorontalo", "zh_Hans": "哥伦打洛语", "zh_Hant": "哥倫打洛語", @@ -4190,6 +4163,7 @@ "gl": "Pidgin ghanés", "nl": "Ghanees-Pidgin", "ru": "ганский пиджин английского", + "sl": "ganska kreolščina", "sv": "ghanansk pidginengelska", "_meta": { "dir": [ @@ -4205,7 +4179,7 @@ "eo": "germana signolingvo", "es": "lengua de señas alemana", "fi": "saksalainen viittomakieli", - "fr": "Langue des signes allemande - DGS", + "fr": "langue des signes allemande - DGS", "hu": "német jelnyelv", "id": "Bahasa Isyarat Jerman", "it": "lingua dei segni tedesca", @@ -4216,6 +4190,7 @@ "pt": "língua gestual alemã", "pt_BR": "língua de sinais alemã", "ru": "германский жестовый язык", + "sl": "nemški znakovni jezik", "sv": "tyskt teckenspråk", "zh_Hans": "德国手语", "zh_Hant": "德國手語", @@ -4238,7 +4213,7 @@ "gl": "Lingua alsaciana", "he": "אלזסית", "hu": "elzászi", - "id": "bahasa Elsass", + "id": "Alsace", "it": "dialetto alsaziano", "ja": "アルザス語", "nb_NO": "elsassisk", @@ -4247,6 +4222,7 @@ "pt": "Língua alsaciana", "pt_BR": "Língua alsaciana", "ru": "эльзасский диалект", + "sl": "alzaščina", "sv": "elsassiska", "_meta": { "dir": [ @@ -4268,7 +4244,7 @@ "gl": "lingua guxaratí", "he": "גוג'ראטית", "hu": "gudzsaráti", - "id": "Bahasa Gujarati", + "id": "Gujarat", "it": "gujarati", "ja": "グジャラート語", "nb_NO": "gujarati", @@ -4292,6 +4268,7 @@ "eo": "vajua lingvo", "es": "Idioma wayú", "eu": "Wayuu hizkuntza", + "fi": "wayuu", "fr": "wayuu", "gl": "Lingua wayuu", "it": "lingua wayuu", @@ -4310,9 +4287,12 @@ }, "guw": { "ca": "gun", + "cs": "gunština", "de": "Gun", "en": "Gun", + "eo": "gungbea lingvo", "es": "Idioma Gungbe", + "fi": "gun", "fr": "gun-gbe", "gl": "Lingua gun", "he": "גון", @@ -4340,7 +4320,7 @@ "gl": "Lingua manx", "he": "מאנית", "hu": "manx", - "id": "Bahasa Manx", + "id": "Man", "it": "mannese", "ja": "マン島語", "nb_NO": "mansk", @@ -4349,7 +4329,7 @@ "pt": "Língua manesa", "pt_BR": "manês", "ru": "мэнский язык", - "sl": "Manska gelščina", + "sl": "manščina", "sv": "manx", "_meta": { "dir": [ @@ -4366,7 +4346,7 @@ "eo": "haŭsa lingvo", "es": "hausa", "eu": "Hausa", - "fi": "hausan kieli", + "fi": "hausa", "fr": "haoussa", "gl": "Lingua hausa", "he": "האוסה", @@ -4380,6 +4360,7 @@ "pt": "Língua haúça", "pt_BR": "língua hauçá", "ru": "хауса", + "sl": "havščina", "sv": "hausa", "zh_Hant": "豪薩語", "_meta": { @@ -4423,7 +4404,7 @@ "en": "Hakka Chinese", "eo": "hakaa lingvo", "es": "chino hakka", - "fi": "Hakka-kiina", + "fi": "hakka-kiina", "fr": "hakka", "gl": "Lingua hakka", "he": "האקה", @@ -4442,7 +4423,7 @@ "zh_Hant": "客家話", "_meta": { "dir": [ - "top-to-bottom" + "vertical right-to-left" ] } }, @@ -4455,12 +4436,12 @@ "eo": "havaja lingvo", "es": "hawaiano", "eu": "hawaiiera", - "fi": "havaijin kieli", + "fi": "havaiji", "fr": "hawaïen", "gl": "Lingua hawaiana", "he": "הוואית", "hu": "hawaii", - "id": "Bahasa Hawaii", + "id": "bahasa Hawaii", "it": "hawaiano", "ja": "ハワイ語", "nb_NO": "hawaiisk", @@ -4471,6 +4452,7 @@ "ru": "гавайский язык", "sl": "havajščina", "sv": "hawaiiska", + "zh_Hans": "夏威夷语", "zh_Hant": "夏威夷語", "_meta": { "dir": [ @@ -4492,7 +4474,7 @@ "gl": "lingua hebrea", "he": "עברית", "hu": "héber", - "id": "Ibrani", + "id": "bahasa Ibrani", "it": "ebraico", "ja": "ヘブライ語", "nb_NO": "hebraisk", @@ -4523,11 +4505,11 @@ "eo": "Fiĝia hindia lingvo", "es": "hindi de Fiyi", "eu": "Fijiko hindi", - "fi": "Fidžinhindi", + "fi": "fidžinhindi", "fr": "hindi des Fidji", "gl": "Hindi de Fidxi", "he": "הינדוסטני", - "id": "Bahasa Fiji Hindi", + "id": "Hindi Fiji", "it": "hindi figiano", "ja": "フィジー・ヒンディー語", "nb_NO": "Fijiansk hindi", @@ -4552,7 +4534,7 @@ "fi": "Hiligainon kieli", "fr": "hiligaïnon", "hu": "ilongo", - "id": "Bahasa Hiligaynon", + "id": "Hiligaynon", "it": "lingua hiligaynon", "ja": "ヒリガイノン語", "nl": "Hiligaynon", @@ -4561,6 +4543,7 @@ "ru": "Хилигайнон", "sl": "hiligajnonščina", "sv": "hiligaynon", + "zh_Hant": "希利蓋農語", "_meta": { "dir": [ "left-to-right" @@ -4574,7 +4557,7 @@ "en": "Hindko", "fi": "Hindko", "fr": "hindko", - "id": "Bahasa Hindko", + "id": "Hindko", "it": "Hindko", "ja": "ヒンドコ語", "nb_NO": "hindko", @@ -4600,7 +4583,7 @@ "eo": "hirimotua lingvo", "es": "Hiri motu", "eu": "Hiri Motu", - "fi": "Hiri motu", + "fi": "hiri-motu", "fr": "hiri motou", "gl": "Hiri Motu", "he": "הארי מוטו", @@ -4615,6 +4598,7 @@ "ru": "хири-моту", "sl": "hiri motu", "sv": "hiri motu", + "zh_Hant": "希里摩圖語", "_meta": { "countries": [ "PG" @@ -4680,7 +4664,7 @@ "gl": "Alto sorabo", "he": "סורבית עילית", "hu": "felsőszorb", - "id": "Bahasa Sorbia Hulu", + "id": "Sorbia Hulu", "it": "alto sorabo", "ja": "高地ソルブ語", "nl": "Oppersorbisch", @@ -4688,7 +4672,7 @@ "pt": "alto sorábio", "pt_BR": "Alto sorábio", "ru": "верхнелужицкий язык", - "sl": "Zgornjelužiščina", + "sl": "zgornjelužiščina", "sv": "högsorbiska", "zh_Hans": "上索布语", "zh_Hant": "上索布语", @@ -4702,7 +4686,7 @@ "ca": "crioll haitià", "cs": "haitská kreolština", "da": "haitisk", - "de": "Haitianisch", + "de": "Haitianisch-Kreolisch", "en": "Haitian Creole", "eo": "haitia kreola lingvo", "es": "criollo haitiano", @@ -4712,7 +4696,7 @@ "gl": "Crioulo haitiano", "he": "קריאולית האיטית", "hu": "haiti kreol", - "id": "Bahasa Kreol Haiti", + "id": "Kreol Haiti", "it": "creolo haitiano", "ja": "ハイチ語", "nb_NO": "haitisk", @@ -4785,7 +4769,7 @@ "gl": "lingua armenia", "he": "ארמנית", "hu": "örmény", - "id": "Bahasa Armenia", + "id": "bahasa Armenia", "it": "armeno", "ja": "アルメニア語", "nb_NO": "armensk", @@ -4808,13 +4792,16 @@ }, "hyw": { "ca": "armeni occidental", + "cs": "Západní Arménština", "de": "Westarmenisch", "en": "Western Armenian", "eo": "okcident-armena lingvo", "es": "armenio occidental", + "fi": "länsiarmenia", "fr": "arménien occidental", "gl": "Armenio occidental", "he": "ארמנית מערבית", + "hu": "Nyugat-örmény nyelv", "id": "Armenia Barat", "it": "dialetto armeno occidentale", "ja": "西アルメニア語", @@ -4840,7 +4827,7 @@ "eo": "herera lingvo", "es": "herero", "eu": "Hereroera", - "fi": "Hereron kieli", + "fi": "herero", "fr": "héréro", "gl": "Lingua herero", "hu": "herero", @@ -4853,7 +4840,9 @@ "pt": "hereró", "pt_BR": "Língua hereró", "ru": "Гереро", + "sl": "hererščina", "sv": "herero", + "zh_Hant": "赫雷羅語", "_meta": { "dir": [ "left-to-right" @@ -4885,7 +4874,7 @@ "ru": "индонезийский язык", "sl": "indonezijščina", "sv": "indonesiska", - "zh_Hans": "印度尼西亚语", + "zh_Hans": "印尼语", "zh_Hant": "印尼語", "_meta": { "countries": [ @@ -4903,7 +4892,7 @@ "eo": "Siĉuana jia lingvo", "es": "Idioma nuosu", "eu": "nuosu", - "fi": "Sichuanin-yi", + "fi": "sichuanin-yi", "fr": "nuosu", "gl": "Lingua nuosu", "he": "שפת נווסוו", @@ -4915,6 +4904,7 @@ "pt": "Língua Nuosu", "ru": "носу", "sv": "nuosu", + "zh_Hant": "彝語北部方言", "_meta": { "dir": [ "left-to-right" @@ -4925,11 +4915,11 @@ "ca": "inupiaq", "cs": "Inupiaq", "de": "Inupiaq", - "en": "Inupiaq", + "en": "Iñupiaq", "eo": "inupiaka lingvo", "es": "Idioma iñupiaq", "eu": "inupiaq", - "fi": "Inupiatun", + "fi": "inupiatun", "fr": "inupiaq", "gl": "Lingua inupiaq", "he": "אינופיאק", @@ -4957,7 +4947,7 @@ "en": "Ilocano", "eo": "iloka lingvo", "es": "ilocano", - "fi": "Iloko", + "fi": "iloko", "fr": "ilocano", "gl": "Lingua ilocana", "hu": "ilokano", @@ -4986,12 +4976,12 @@ "eo": "inguŝa lingvo", "es": "ingusetio", "eu": "Inguxera", - "fi": "Inguušin kieli", + "fi": "inguuši", "fr": "ingouche", "gl": "Lingua ingusetia", "he": "אינגושית", "hu": "ingus", - "id": "Bahasa Ingush", + "id": "Ingush", "it": "lingua inguscia", "ja": "イングーシ語", "nb_NO": "ingusjisk", @@ -5068,6 +5058,7 @@ "ru": "итальянский язык", "sl": "italijanščina", "sv": "italienska", + "zgh": "ⵜⵓⵜⵍⴰⵢⵜ ⵜⴰⵟⴰⵍⵢⴰⵏⵉⵜ", "zh_Hans": "意大利语", "zh_Hant": "義大利語", "_meta": { @@ -5089,9 +5080,9 @@ "de": "Inuktitut", "en": "Inuktitut", "eo": "inuktituta lingvo", - "es": "lenguas inuit", + "es": "inuktitut", "eu": "Inuitera", - "fi": "Inuktitut", + "fi": "inuktitut", "fr": "inuktitut", "gl": "Lingua inuktitut", "he": "אינוקטיטוט", @@ -5140,6 +5131,7 @@ "ru": "японский язык", "sl": "japonščina", "sv": "japanska", + "zgh": "ⵜⵓⵜⵍⴰⵢⵜ ⵜⴰⵏⵉⴱⵓⵏⵜ", "zh_Hans": "日语", "zh_Hant": "日語", "_meta": { @@ -5154,20 +5146,20 @@ } }, "jam": { - "ca": "jamaican", + "ca": "crioll anglès de Jamaica", "cs": "Jamajský patois", "da": "Patois", - "de": "Jamaika-Kreolisch", + "de": "Jamaikanisch-Kreolisch", "en": "Jamaican Patois", "eo": "jamajka-kreola lingvo", - "es": "Criollo jamaicano", + "es": "criollo jamaicano", "eu": "Jamaikako kreolera", - "fi": "Jamaikankreoli", + "fi": "jamaikankreoli", "fr": "créole jamaïcain", "gl": "Patois xamaicano", "he": "ג'מייקנית קריאולית", "hu": "jamaicai angol", - "id": "Patwa Jamaika", + "id": "Patois Jamaika", "it": "lingua creola giamaicana", "ja": "ジャマイカ・クレオール語", "nl": "Jamaicaans-Patois", @@ -5175,9 +5167,10 @@ "pt": "Patoá jamaicano", "pt_BR": "Patoá jamaicano", "ru": "ямайский креольский язык", + "sl": "jamajški patois", "sv": "patwa", - "zh_Hans": "牙买加土语", - "zh_Hant": "牙買加土語", + "zh_Hans": "牙买加克里奥尔语", + "zh_Hant": "牙買加克里奧爾語", "_meta": { "dir": [ "left-to-right" @@ -5187,10 +5180,11 @@ "jax": { "en": "Jambi Malay", "fr": "malais jambi", - "id": "Bahasa Melayu Jambi", + "id": "Melayu Jambi", "ja": "ジャンビ・マレー語", "pl": "Język jambi", "ru": "Джамби", + "sl": "džambijska malajščina", "sv": "jambimalajiska", "_meta": { "dir": [ @@ -5207,7 +5201,7 @@ "eo": "java lingvo", "es": "javanés", "eu": "Javera", - "fi": "jaavan kieli", + "fi": "jaava", "fr": "javanais", "gl": "Lingua xavanesa", "he": "ג'אווה", @@ -5246,7 +5240,7 @@ "gl": "lingua xeorxiana", "he": "גאורגית", "hu": "grúz", - "id": "Bahasa Georgia", + "id": "bahasa Georgia", "it": "georgiano", "ja": "ジョージア語", "nb_NO": "georgisk", @@ -5276,12 +5270,12 @@ "eo": "karakalpaka lingvo", "es": "Idioma karakalpako", "eu": "Karakalpakera", - "fi": "karapalkki", + "fi": "karakalpakki", "fr": "karakalpak", "gl": "Lingua karakalpak", "he": "קראקלפקית", "hu": "karakalpak", - "id": "Bahasa Karakalpak", + "id": "Karakalpak", "it": "karakalpako", "ja": "カラカルパク語", "nl": "Karakalpaks", @@ -5298,28 +5292,30 @@ } }, "kab": { - "ca": "cabil", + "ca": "cabilenc", "da": "Kabylsk", "de": "Kabylisch", "en": "Kabyle", "eo": "kabila lingvo", "es": "cabilio", "eu": "kabiliera", - "fi": "Kabyyli", + "fi": "kabyyli", "fr": "kabyle", - "gl": "Lingua cabilia", + "gl": "cabilio", "he": "קבילית", "hu": "kabil", + "id": "Bahasa Kabyle", "it": "cabilo", - "ja": "カビル語", + "ja": "カビール語", "nb_NO": "Kabylsk", "nl": "Kabylisch", - "pl": "Język kabylski", - "pt": "Língua cabila", - "pt_BR": "Língua cabila", + "pl": "kabylski", + "pt": "cabila", + "pt_BR": "cabila", "ru": "кабильский язык", "sl": "kabilščina", "sv": "kabyliska", + "zgh": "ⵜⴰⵇⴱⴰⵢⵍⵉⵜ", "zh_Hant": "卡拜爾語", "_meta": { "dir": [ @@ -5335,11 +5331,12 @@ "eo": "kabarda lingvo", "es": "cabardino", "eu": "Kabardera", - "fi": "Kabardin kieli", + "fi": "kabardi", "fr": "kabarde", "gl": "Lingua kabardina", "he": "קברדינית", "hu": "kabard", + "id": "Kabardia", "it": "cabardo", "ja": "カバルド語", "nb_NO": "kabardisk", @@ -5347,6 +5344,7 @@ "pl": "Język kabardyjski", "pt": "Língua cabardiana", "ru": "кабардино-черкесский язык", + "sl": "kabardinščina", "sv": "kabardinska", "zh_Hans": "卡巴尔达语", "zh_Hant": "卡巴爾達語", @@ -5376,6 +5374,7 @@ "pt": "Língua kabiyé", "ru": "Кабийе", "sv": "kabiye", + "zh_Hant": "卡比耶語", "_meta": { "dir": [ "left-to-right" @@ -5383,16 +5382,18 @@ } }, "kcg": { - "ca": "katab", + "ca": "tyap", "de": "Tjap", "en": "Tyap", "es": "Katab", - "fi": "Tyap", + "fi": "tyap", "fr": "tyap", "gl": "Lingua tyap", "ja": "カタブ語", "nl": "Tyap", + "sl": "tjapščina", "sv": "katab", + "zh_Hant": "提亞普語", "_meta": { "dir": [ "left-to-right" @@ -5408,8 +5409,8 @@ "eo": "Kabo-Verda kreolo", "es": "criollo caboverdiano", "fi": "Kapverdenkreoli", - "fr": "créole du Cap-Vert", - "gl": "Crioulo caboverdiano", + "fr": "créole cap-verdien", + "gl": "crioulo caboverdiano", "he": "קריאולית כף ורדה", "it": "creolo capoverdiano", "ja": "カーボベルデ・クレオール語", @@ -5435,12 +5436,12 @@ "eo": "konga lingvo", "es": "kikongo", "eu": "Kikongo", - "fi": "kongon kieli", + "fi": "kongo", "fr": "kikongo", "gl": "Lingua congo", "he": "קונגו", "hu": "kikongo", - "id": "Bahasa Kongo", + "id": "Kongo", "it": "kongo", "ja": "コンゴ語", "nb_NO": "kongo", @@ -5465,6 +5466,7 @@ "ja": "カインガング語", "nb_NO": "Kaingang", "nl": "Kaingang", + "pl": "Języki caingang", "pt": "Língua caingangue", "pt_BR": "Língua kaingáng", "ru": "Каинганг", @@ -5490,6 +5492,7 @@ "pl": "Język khasi", "pt": "Língua khasi", "ru": "Кхаси", + "sl": "kasijščina", "sv": "khasi", "zh_Hans": "卡西语", "zh_Hant": "卡西語", @@ -5503,6 +5506,7 @@ "en": "Khams Tibetan", "fr": "tibétain khamké", "hu": "khami tibeti", + "id": "Tibet Khams", "ja": "カム・チベット語", "pl": "Język kham", "pt": "Tibetano khams", @@ -5517,6 +5521,7 @@ "khw": { "de": "Khowar", "en": "Khowar", + "es": "Khowar", "fi": "Khowarin kieli", "fr": "khowar", "id": "Bahasa Khowar", @@ -5528,6 +5533,7 @@ "pt": "Língua khovar", "ru": "кховар", "sv": "khowar", + "zh_Hant": "科瓦語", "_meta": { "dir": [ "right-to-left" @@ -5542,7 +5548,7 @@ "eo": "kikuja lingvo", "es": "kikuyu", "eu": "kikuyuera", - "fi": "Kikujun kieli", + "fi": "kikuju", "fr": "kikuyu", "gl": "Lingua kikuyu", "he": "קיקויו", @@ -5572,6 +5578,7 @@ "en": "Kwanyama", "eo": "kuanjama lingvo", "es": "idioma kuanyama", + "fi": "kuanjama", "fr": "kwanyama", "gl": "Lingua kwanyama", "hu": "kvanyama", @@ -5581,6 +5588,7 @@ "pl": "Język kwanyama", "pt": "Língua cuanhama", "ru": "кваньяма", + "sl": "kvanjamščina", "sv": "kwanyama", "zh_Hans": "夸摩马语", "zh_Hant": "誇摩馬語", @@ -5595,6 +5603,7 @@ "en": "Khmu", "es": "Idioma khmu", "fr": "khmu", + "id": "Khmu", "ja": "クム語", "pl": "Język khmu", "pt": "Língua Khmu", @@ -5614,6 +5623,7 @@ "nl": "Oostelijk Pwo", "pt": "Língua pwo leste", "ru": "Восточный пво", + "sl": "vzhodni pwo", "sv": "östlig pwo", "_meta": { "dir": [ @@ -5635,7 +5645,7 @@ "gl": "Lingua casaca", "he": "קזחית", "hu": "kazak", - "id": "bahasa Kazakh", + "id": "Kazakh", "it": "kazako", "ja": "カザフ語", "nb_NO": "kasakhisk", @@ -5658,38 +5668,6 @@ ] } }, - "kl": { - "ca": "Groenlandès", - "cs": "grónština", - "da": "grønlandsk", - "de": "Grönländisch", - "en": "Greenlandic", - "eo": "gronlanda lingvo", - "es": "groenlandés", - "eu": "groenlandiera", - "fi": "grönlannin kieli", - "fr": "groenlandais", - "gl": "Lingua grenlandesa", - "he": "גרינלנדית", - "hu": "grönlandi", - "id": "bahasa Greenland", - "it": "groenlandese", - "ja": "グリーンランド語", - "nb_NO": "grønlandsk", - "nl": "Groenlands", - "pl": "język grenlandzki", - "pt": "gronelandês", - "ru": "гренландский язык", - "sl": "grenlandščina", - "sv": "grönländska", - "zh_Hans": "格陵兰语", - "zh_Hant": "格陵蘭語", - "_meta": { - "dir": [ - "left-to-right" - ] - } - }, "km": { "ca": "khmer", "cs": "khmerština", @@ -5725,6 +5703,24 @@ ] } }, + "kmz": { + "ca": "turc de Khorasan", + "de": "Chorasan-Türkisch", + "en": "Khorasani Turkic", + "es": "Idioma turco de Jorasán", + "fi": "Khorasaninturkin kieli", + "fr": "turc du Khorassan", + "it": "lingua khorasani", + "ja": "ホラサン・トルコ語", + "pt": "Língua turca coraçone", + "ru": "Хорасанско-тюркский язык", + "sl": "korasanska turščina", + "_meta": { + "dir": [ + "right-to-left" + ] + } + }, "kn": { "ca": "kannada", "cs": "kannadština", @@ -5771,7 +5767,7 @@ "gl": "lingua coreana", "he": "קוריאנית", "hu": "koreai", - "id": "Korea", + "id": "bahasa Korea", "it": "coreano", "ja": "朝鮮語", "nb_NO": "koreansk", @@ -5782,6 +5778,7 @@ "ru": "корейский язык", "sl": "korejščina", "sv": "koreanska", + "zgh": "ⵜⵓⵜⵍⴰⵢⵜ ⵜⴰⴽⵓⵔⵉⵜ", "zh_Hans": "朝鲜语", "zh_Hant": "韓語", "_meta": { @@ -5804,7 +5801,7 @@ "eo": "komipermjaka lingvo", "es": "komi permio", "eu": "komi-permyak", - "fi": "komipermjakin kieli", + "fi": "komipermjakki", "fr": "komi-permiak", "gl": "Lingua komi-permyac", "hu": "permják", @@ -5815,6 +5812,7 @@ "pl": "język komi-permiacki", "pt": "Língua komi-permyak", "ru": "коми-пермяцкий язык", + "sl": "permjaščina", "sv": "komi-permjakiska", "zh_Hans": "彼尔姆科米语", "zh_Hant": "彼爾姆科米語", @@ -5832,7 +5830,7 @@ "eo": "kanura lingvo", "es": "kanuri", "eu": "Kanuri hizkuntza", - "fi": "Kanurin kieli", + "fi": "kanuri", "fr": "kanouri", "gl": "Lingua kanuri", "he": "קאנורי", @@ -5845,6 +5843,7 @@ "pt": "Língua kanuri", "ru": "Канури", "sv": "kanuri", + "zh_Hant": "卡努里語", "_meta": { "dir": [ "right-to-left", @@ -5854,12 +5853,13 @@ }, "krc": { "ca": "karatxai-balkar", + "cs": "karačajsko-balkarština", "de": "Karatschai-Balkarisch", "en": "Karachay-Balkar", "eo": "karaĉaja-balkara lingvo", "es": "idioma karachái-bálkaro", "eu": "Karatxaiera-balkarera", - "fi": "Karatšai-balkaarin kieli", + "fi": "karatšai-balkaari", "fr": "karatchaï-balkar", "gl": "Lingua carachaio-bálcara", "he": "קראצ׳י-בלקר", @@ -5872,6 +5872,7 @@ "pl": "Język karaczajsko-bałkarski", "pt": "Língua carachaio-bálcara", "ru": "карачаево-балкарский язык", + "sl": "karačajska balkarščina", "sv": "karatjajbalkariska", "zh_Hans": "卡拉恰伊－巴尔卡尔语", "zh_Hant": "卡拉恰伊－巴爾卡爾語", @@ -5891,13 +5892,15 @@ "fi": "Krion kieli", "fr": "krio", "gl": "Lingua krio", - "id": "Bahasa Krio", + "hu": "krio", + "id": "Krio", "it": "lingua krio", "ja": "クリオ語", "nl": "Krio", "pl": "Język krio", "pt": "Língua krio", "ru": "Крио", + "sl": "krio", "sv": "krio", "zh_Hans": "克里奥语", "zh_Hant": "克里奧語", @@ -5917,7 +5920,7 @@ "fr": "harayen", "he": "קריאית", "id": "bahasa Karaik’a", - "it": "caraio", + "it": "haraio", "ja": "キナライア語", "nb_NO": "Kinaray-a", "nl": "Kinaray-a", @@ -5974,12 +5977,12 @@ "eo": "kaŝmira lingvo", "es": "cachemir", "eu": "kaxmirera", - "fi": "Kašmirin kieli", + "fi": "kašmiri", "fr": "cachemiri", "gl": "Lingua caxemiresa", "he": "קשמירית", "hu": "kasmíri", - "id": "Bahasa Kashmiri", + "id": "Kashmir", "it": "kashmiri", "ja": "カシミール語", "nb_NO": "kasjmiri", @@ -5988,7 +5991,7 @@ "pt": "língua caxemira", "pt_BR": "Língua caxemira", "ru": "кашмирский язык", - "sl": "Kašmirščina", + "sl": "kašmirščina", "sv": "kashmiri", "zh_Hans": "克什米尔语", "zh_Hant": "喀什米爾語", @@ -6017,6 +6020,7 @@ "pt": "Língua ripuária", "ru": "рипуарские диалекты", "sv": "ripuariska", + "zh_Hant": "利普里安語", "_meta": { "dir": [ "left-to-right" @@ -6032,7 +6036,7 @@ "eo": "kurmanĝa lingvo", "es": "kurmanji", "eu": "Kurmanji", - "fi": "Kurmandži", + "fi": "kurmandži", "fr": "kurmandji", "gl": "lingua kurda", "he": "כורמנג'ית", @@ -6062,6 +6066,7 @@ }, "kum": { "ca": "kumyk", + "da": "kumykisk", "de": "Kumykisch", "en": "Kumyk", "eo": "kumika lingvo", @@ -6071,7 +6076,7 @@ "fr": "koumyk", "he": "קומיקית", "hu": "kumik", - "id": "Bahasa Kumyk", + "id": "Kumyk", "it": "cumucco", "ja": "クムク語", "nb_NO": "kumykisk", @@ -6080,7 +6085,9 @@ "pt": "Língua kumyk", "pt_BR": "Língua kumyk", "ru": "кумыкский язык", + "sl": "kumiščina", "sv": "kumykiska", + "zh_Hant": "庫梅克語", "_meta": { "dir": [ "left-to-right", @@ -6103,6 +6110,7 @@ "pl": "Język kutenai", "pt": "Língua kutenai", "ru": "Кутенай", + "sl": "kutenajščina", "sv": "kootenai", "zh_Hans": "库特奈语", "zh_Hant": "庫特奈語", @@ -6126,7 +6134,7 @@ "gl": "lingua komi", "he": "קומי", "hu": "komi", - "id": "Bahasa Komi", + "id": "Komi", "it": "comi", "ja": "コミ語", "nb_NO": "syrjensk", @@ -6134,7 +6142,9 @@ "pl": "język komi", "pt": "língua komi", "ru": "коми язык", + "sl": "komijščina", "sv": "komi", + "zh_Hant": "科米語", "_meta": { "dir": [ "left-to-right" @@ -6154,7 +6164,7 @@ "fr": "kerinci", "gl": "Kerinci", "hu": "Kerinci", - "id": "Bahasa Kerinci", + "id": "bahasa Kerinci", "it": "kerinci", "ja": "クリンチ語", "nb_NO": "Kerinci", @@ -6162,7 +6172,7 @@ "pl": "język kerinci", "pt": "Kerinci", "pt_BR": "Kerinci", - "sl": "Kerinci", + "sl": "kerinščina", "sv": "kerinci", "_meta": { "dir": [ @@ -6179,12 +6189,12 @@ "eo": "kornvala lingvo", "es": "córnico", "eu": "Kornubiera", - "fi": "Korni", + "fi": "korni", "fr": "cornique", "gl": "Lingua córnica", "he": "קורנית", "hu": "korni", - "id": "Bahasa Kernowek", + "id": "bahasa Kernowek", "it": "cornico", "ja": "コーンウォール語", "nb_NO": "kornisk", @@ -6225,7 +6235,7 @@ "pt": "quirguiz", "pt_BR": "Língua quirguiz", "ru": "киргизский язык", - "sl": "Kirgiščina", + "sl": "kirgiščina", "sv": "kirgiziska", "zh_Hans": "柯尔克孜语", "zh_Hant": "吉爾吉斯語", @@ -6239,38 +6249,6 @@ ] } }, - "lad": { - "ca": "judeocastellà", - "cs": "ladino", - "da": "Ladino", - "de": "Sephardisch", - "en": "Judaeo-Spanish", - "eo": "judhispana lingvo", - "es": "judeoespañol", - "eu": "Ladino", - "fi": "ladino", - "fr": "judéo-espagnol", - "gl": "Lingua xudeu-española", - "he": "לאדינו", - "hu": "ladino", - "id": "Bahasa Ladino", - "it": "giudeo-spagnolo", - "ja": "ラディーノ語", - "nb_NO": "jødespansk", - "nl": "Ladino", - "pl": "ladino", - "pt": "judeu-espanhol", - "pt_BR": "Judeu-espanhol", - "ru": "сефардский язык", - "sl": "sefardščina", - "sv": "ladino", - "_meta": { - "dir": [ - "left-to-right", - "right-to-left" - ] - } - }, "lag": { "de": "Langi", "en": "Rangi", @@ -6336,7 +6314,7 @@ "gl": "Lingua lezguia", "he": "לזגית", "hu": "lezg", - "id": "Bahasa Lezgia", + "id": "Lezgin", "it": "lesgo", "ja": "レズギ語", "nb_NO": "lezgisk", @@ -6345,7 +6323,7 @@ "pt": "Língua lezgui", "pt_BR": "Língua lezgui", "ru": "лезгинский язык", - "sl": "Lezginščina", + "sl": "lezginščina", "sv": "lezginska", "zh_Hans": "列兹金语", "zh_Hant": "列茲金語", @@ -6364,7 +6342,7 @@ "eo": "ganda lingvo", "es": "luganda", "eu": "luganda", - "fi": "Gandan kieli", + "fi": "ganda", "fr": "luganda", "gl": "Lingua luganda", "he": "לוגנדה", @@ -6377,8 +6355,9 @@ "pl": "Język luganda", "pt": "Língua luganda", "ru": "Луганда", + "sl": "lugandščina", "sv": "luganda", - "zh_Hant": "烏干達語", + "zh_Hant": "盧干達語", "_meta": { "dir": [ "left-to-right" @@ -6393,12 +6372,12 @@ "eo": "limburga lingvo", "es": "limburgués", "eu": "limburgera", - "fi": "limburgin kieli", + "fi": "limburg", "fr": "limbourgeois", "gl": "Lingua limburguesa", "he": "לימבורגית", "hu": "limburgi nyelv", - "id": "Bahasa Limburgish", + "id": "Limburg", "it": "limburghese", "ja": "リンブルフ語", "nb_NO": "limburgsk", @@ -6430,7 +6409,7 @@ "gl": "Lingua lígur", "he": "ליגורית", "hu": "ligur", - "id": "Bahasa Liguria", + "id": "Liguria", "it": "lingua ligure", "ja": "リグリア語", "nb_NO": "ligurisk", @@ -6455,11 +6434,12 @@ "fi": "laki", "fr": "laki", "gl": "Lingua laki", - "id": "Bahasa Laki", + "id": "Laki", "ja": "ラーク語", "nl": "Laki", "pt": "Laki", "ru": "лаки", + "sl": "lakiščina", "sv": "lekî", "_meta": { "dir": [ @@ -6489,6 +6469,7 @@ "pt": "Língua dacota", "pt_BR": "Língua dacota", "ru": "лакота", + "sl": "lakotščina", "sv": "lakota", "zh_Hans": "拉科塔语", "_meta": { @@ -6506,7 +6487,7 @@ "eo": "ladina lingvo", "es": "ladino", "eu": "Ladino", - "fi": "Ladinin kieli", + "fi": "ladini", "fr": "ladin", "gl": "Lingua ladina", "he": "לדינית", @@ -6519,6 +6500,7 @@ "pl": "Język ladyński", "pt": "língua ladino-dolomítica", "ru": "ладинский язык", + "sl": "ladinščina", "sv": "ladinska", "zh_Hans": "拉迪恩语", "zh_Hant": "拉迪恩語", @@ -6537,10 +6519,10 @@ "eo": "lombarda lingvo", "es": "lombardo", "eu": "Lombardiera", - "fi": "lombardin kieli", + "fi": "lombardi", "fr": "lombard", "gl": "Lingua lombarda", - "he": "לומברד (שפה)", + "he": "לומברד", "hu": "lombard", "id": "bahasa Lombard", "it": "lingua lombarda", @@ -6552,6 +6534,7 @@ "ru": "ломбардский язык", "sl": "lombardščina", "sv": "lombardiska", + "zh_Hant": "倫巴底語", "_meta": { "dir": [ "left-to-right" @@ -6580,6 +6563,7 @@ "pl": "język lingala", "pt": "Língua lingala", "ru": "лингала", + "sl": "lingalščina", "sv": "lingala", "zh_Hant": "林格拉語", "_meta": { @@ -6654,12 +6638,14 @@ "de": "Nördliches Luri", "en": "Northern Luri", "es": "luri septentrional", + "fi": "pohjoisluri", "fr": "lori du Nord", "gl": "lingua luri setentrional", "it": "luri del nord", "ja": "北ロル語", "nl": "Noordelijk Luri", "pt": "luri setentrional", + "sl": "severna luriščina", "sv": "nordluriska", "_meta": { "dir": [ @@ -6681,7 +6667,7 @@ "gl": "lingua lituana", "he": "ליטאית", "hu": "litván", - "id": "bahasa Lituavi", + "id": "bahasa Lituania", "it": "lituano", "ja": "リトアニア語", "nb_NO": "litauisk", @@ -6712,19 +6698,47 @@ "eo": "latgala lingvo", "es": "Idioma latgaliano", "eu": "Latgaliera", - "fi": "latgallin kieli", + "fi": "latgalli", "fr": "latgalien", "gl": "Lingua latgaliá", "he": "לטגלית", "hu": "latgal", - "id": "Bahasa Latgalia", + "id": "Latgalia", "it": "letgallo", "ja": "ラトガリア語", "nl": "Letgaals", "pl": "język łatgalski", "pt": "Língua latgália", "ru": "латгальский язык", + "sl": "latgalščiina", "sv": "lettgalliska", + "zh_Hant": "拉特加萊語", + "_meta": { + "dir": [ + "left-to-right" + ] + } + }, + "lua": { + "ca": "tshiluba", + "de": "Tschiluba", + "en": "Luba-Kasai", + "eo": "luba lingvo", + "es": "chiluba", + "fi": "Luban kieli", + "fr": "luba-kasaï", + "gl": "Lingua tshiluba", + "id": "Bahasa Luba-Kasai", + "it": "lingua tshiluba", + "ja": "ルバ語", + "nb_NO": "Luba", + "nl": "Luba-Kasai", + "pl": "Język luba", + "pt": "Língua tshiluba", + "ru": "луба", + "sv": "Luba-Kasai", + "zh_Hans": "鲁巴-开赛语", + "zh_Hant": "魯巴-開賽語", "_meta": { "dir": [ "left-to-right" @@ -6761,6 +6775,7 @@ "ja": "南ロル語", "nl": "Zuid-Luri", "ru": "южнолурский язык", + "sl": "južna luriščina", "sv": "sydluriska", "_meta": { "dir": [ @@ -6779,10 +6794,10 @@ "eu": "letoniera", "fi": "latvia", "fr": "letton", - "gl": "lingua letona", + "gl": "lingua letoa", "he": "לטבית", "hu": "lett", - "id": "Latvi", + "id": "bahasa Latvia", "it": "lettone", "ja": "ラトビア語", "nb_NO": "latvisk", @@ -6841,6 +6856,7 @@ "pl": "Język lazyjski", "pt": "laz", "ru": "лазский язык", + "sl": "lazijščina", "sv": "laziska", "zh_Hans": "拉兹語", "zh_Hant": "拉茲語", @@ -6857,11 +6873,11 @@ "en": "Madurese", "eo": "madura lingvo", "es": "madurés", - "fi": "Maduran kieli", + "fi": "madura", "fr": "madurais", "gl": "Lingua maduresa", "he": "מאדורית", - "id": "Madura", + "id": "bahasa Madura", "it": "madurese", "ja": "マドゥラ語", "nl": "Madurees", @@ -6870,6 +6886,7 @@ "ru": "Мадурский язык", "sl": "madureščina", "sv": "maduresiska", + "zh_Hant": "馬都拉語", "_meta": { "dir": [ "left-to-right" @@ -6884,12 +6901,12 @@ "eo": "maitila lingvo", "es": "Maithili", "eu": "mahitiliera", - "fi": "Maithilin kieli", + "fi": "maithili", "fr": "maïthili", "gl": "Lingua maithili", "he": "מאיטהילית", "hu": "maithili", - "id": "Bahasa Maithili", + "id": "Maithili", "it": "maithili", "ja": "マイティリー語", "nb_NO": "Maithili", @@ -6898,6 +6915,7 @@ "pt": "Língua maithili", "pt_BR": "Língua maithili", "ru": "майтхили", + "sl": "maitilščina", "sv": "maithili", "zh_Hans": "迈蒂利语", "_meta": { @@ -6928,6 +6946,7 @@ "pt": "Língua moksha", "pt_BR": "Língua moksha", "ru": "мокшанский язык", + "sl": "mokšanščina", "sv": "moksja", "_meta": { "dir": [ @@ -6972,7 +6991,7 @@ "gl": "Lingua malgaxe", "he": "מלגשית", "hu": "malgas", - "id": "Bahasa Malagasi", + "id": "bahasa Malagasi", "it": "malgascio", "ja": "マダガスカル語", "nb_NO": "gassisk", @@ -6981,6 +7000,7 @@ "pt": "Língua malgaxe", "pt_BR": "Língua malgaxe", "ru": "малагасийский язык", + "sl": "malgaščina", "sv": "malagassiska", "zh_Hans": "马达加斯加语", "zh_Hant": "馬達加斯加語", @@ -7002,12 +7022,12 @@ "eo": "marŝala lingvo", "es": "marshalés", "eu": "Marshallera", - "fi": "Marshallin kieli", + "fi": "marshall", "fr": "marshallais", "gl": "Lingua marshalesa", "he": "מרשלית", "hu": "Marshall-szigeteki", - "id": "Bahasa Marshall", + "id": "Marshall", "it": "marshallese", "ja": "マーシャル語", "nb_NO": "marshallesisk", @@ -7029,12 +7049,12 @@ } }, "mhr": { - "ca": "txeremís oriental", + "ca": "mari oriental", "de": "Wiesenmari", "en": "Meadow Mari", "es": "mari de las praderas", "eu": "ekialdeko mari", - "fi": "niittymarin kieli", + "fi": "niittymari", "fr": "mari des prairies", "gl": "Lingua mari das pradeiras", "hu": "mezei mari", @@ -7045,49 +7065,15 @@ "pl": "maryjski łąkowy", "pt": "Língua mari das campinas", "ru": "луговомарийский язык", + "sl": "travniška marijščina", "sv": "östmariska", + "zh_Hant": "草原馬里語", "_meta": { "dir": [ "left-to-right" ] } }, - "mi": { - "ca": "maori", - "cs": "maorština", - "da": "maori", - "de": "Māori", - "en": "Māori", - "eo": "maoria lingvo", - "es": "maorí", - "eu": "maoriera", - "fi": "Maorin kieli", - "fr": "māori", - "gl": "Lingua maorí", - "he": "מאורית", - "hu": "maori", - "id": "Bahasa Maori", - "it": "māori", - "ja": "マオリ語", - "nb_NO": "maorisk", - "nl": "Maori", - "pl": "język maori", - "pt": "língua maori", - "pt_BR": "língua maori", - "ru": "маори", - "sl": "maorščina", - "sv": "maori", - "zh_Hans": "毛利语", - "zh_Hant": "毛利語", - "_meta": { - "countries": [ - "NZ" - ], - "dir": [ - "left-to-right" - ] - } - }, "mic": { "ca": "micmac", "cs": "mikmačtina", @@ -7105,6 +7091,7 @@ "nl": "Mi'kmaq", "pl": "Język mikmak", "ru": "микмак", + "sl": "mikmaščina", "sv": "micmac", "_meta": { "dir": [ @@ -7120,11 +7107,11 @@ "eo": "minankabaŭa lingvo", "es": "minangkabau", "eu": "Minangkabauera", - "fi": "Minangkabaun kieli", + "fi": "minangkabau", "fr": "minangkabau", "gl": "Lingua minangkabau", "he": "מינאנגקבאו", - "id": "Bahasa Minangkabau", + "id": "bahasa Minangkabau", "it": "minangkabau", "ja": "ミナンカバウ語", "nb_NO": "Minangkabau", @@ -7200,8 +7187,8 @@ "nb_NO": "malayalam", "nl": "Malayalam", "pl": "język malajalam", - "pt": "malaiala", - "pt_BR": "Língua malaiala", + "pt": "língua malaiala", + "pt_BR": "língua malaiala", "ru": "малаялам", "sl": "malajalamščina", "sv": "malayalam", @@ -7270,6 +7257,7 @@ "pl": "język mandżurski", "pt": "Língua manchu", "ru": "маньчжурский язык", + "sl": "mandžurščina", "sv": "manchuiska", "zh_Hans": "满语", "zh_Hant": "滿語", @@ -7287,7 +7275,7 @@ "eo": "manipura lingvo", "es": "meitei", "eu": "Manipurera", - "fi": "Manipurin kieli", + "fi": "manipuri", "fr": "meitei", "gl": "Lingua meitei", "id": "Bahasa Manipuri", @@ -7298,6 +7286,7 @@ "pl": "Język manipuri", "pt": "Língua manipuri", "ru": "манипури", + "sl": "manipurščina", "sv": "meitei", "zh_Hans": "曼尼普尔语", "zh_Hant": "曼尼普爾語", @@ -7313,9 +7302,10 @@ "en": "Mon", "eo": "Mon", "es": "Mon", + "fi": "mon", "fr": "môn", "gl": "lingua mon", - "id": "Bahasa Mon", + "id": "Mon", "it": "lingua mon", "ja": "モン語", "nb_NO": "mon", @@ -7323,6 +7313,7 @@ "pl": "język mon", "pt": "língua mon", "ru": "монский язык", + "sl": "monščina", "sv": "mon", "zh_Hans": "孟语", "zh_Hant": "孟語", @@ -7340,18 +7331,18 @@ "eo": "moldava lingvo", "es": "moldavo", "eu": "Moldaviera", - "fi": "Moldavian kieli", + "fi": "moldova", "fr": "moldave", "gl": "lingua moldova", "he": "מולדובנית", "hu": "moldáv", - "id": "bahasa Moldova", + "id": "Moldova", "it": "moldavo", "ja": "モルドバ語", "nb_NO": "moldovsk", "nl": "Moldavisch", - "pl": "Język mołdawski", - "pt": "Língua moldávia", + "pl": "język mołdawski", + "pt": "língua moldávia", "pt_BR": "língua moldávia", "ru": "молдавский язык", "sl": "moldavščina", @@ -7370,11 +7361,13 @@ "es": "innu", "eu": "Innuera", "fr": "innu-aimun", + "he": "אינו־איימון", "id": "Bahasa Innu", "it": "innu-aimun", "ja": "モンタニェ語", "nl": "Innu", "ru": "Монтанье-наскапи", + "sl": "inujščina", "sv": "innu-aimun", "_meta": { "dir": [ @@ -7407,8 +7400,8 @@ "ru": "маратхи", "sl": "maratščina", "sv": "marathi", - "zh_Hans": "马拉地语", - "zh_Hant": "馬拉地語", + "zh_Hans": "马拉提语", + "zh_Hant": "馬拉提語", "_meta": { "dir": [ "left-to-right" @@ -7430,12 +7423,12 @@ } }, "mrj": { - "ca": "txeremís occidental", + "ca": "mari occidental", "de": "Bergmari", "en": "Hill Mari", "es": "mari de las colinas", "eu": "mendebaldeko mari", - "fi": "vuorimarin kieli", + "fi": "vuorimari", "fr": "mari des montagnes", "gl": "Lingua mari das montañas", "hu": "hegyi mari", @@ -7446,7 +7439,9 @@ "pl": "maryjski górski", "pt": "mari ocidental", "ru": "горномарийский язык", + "sl": "hribovska marijščina", "sv": "västmariska", + "zh_Hant": "山地馬里語", "_meta": { "dir": [ "left-to-right" @@ -7478,6 +7473,7 @@ "ru": "малайский язык", "sl": "malajščina", "sv": "malajiska", + "zgh": "ⵜⵓⵜⵍⴰⵢⵜ ⵜⴰⵎⴰⵍⴰⵢⵜ", "zh_Hans": "马来语", "zh_Hant": "馬來語", "_meta": { @@ -7517,6 +7513,7 @@ "ru": "мальтийский язык", "sl": "malteščina", "sv": "maltesiska", + "zh_Hant": "馬爾他語", "_meta": { "countries": [ "MT" @@ -7553,11 +7550,11 @@ "en": "Muscogee", "eo": "krika lingvo", "es": "idioma maskoki", - "fi": "Creekin kieli", + "fi": "creek", "fr": "creek", "gl": "Lingua muscogee", "hu": "muszkogi", - "id": "Bahasa Muskogee", + "id": "Muscogee", "it": "lingua creek", "ja": "マスコギ語", "nl": "Muskogi", @@ -7565,6 +7562,7 @@ "pt": "Língua creek", "pt_BR": "Língua creek", "ru": "Крикский язык", + "sl": "muskoščina", "sv": "muskogi", "_meta": { "dir": [ @@ -7579,12 +7577,12 @@ "eo": "miranda lingvo", "es": "mirandés", "eu": "Mirandes", - "fi": "Mirandeesi", + "fi": "mirandeesi", "fr": "mirandais", "gl": "lingua mirandesa", "he": "מירנדזית", "hu": "mirandai", - "id": "Bahasa Miranda", + "id": "Miranda", "it": "mirandese", "ja": "ミランダ語", "nb_NO": "mirandesisk", @@ -7645,7 +7643,7 @@ "gl": "birmano", "he": "בורמזית", "hu": "burmai", - "id": "bahasa Burma", + "id": "bahasa Myanmar", "it": "birmano", "ja": "ビルマ語", "nb_NO": "burmesisk", @@ -7687,7 +7685,7 @@ "pt": "Língua erzya", "pt_BR": "Língua erzya", "ru": "эрзянский язык", - "sl": "Erzjanščina", + "sl": "erzjanščina", "sv": "erzya", "_meta": { "dir": [ @@ -7703,12 +7701,12 @@ "eo": "mazandarana lingvo", "es": "mazandaraní", "eu": "Mazandarandera", - "fi": "Mazandaranin kieli", + "fi": "mazandarani", "fr": "mazandarani", "gl": "Lingua mazanderani", "he": "מאזנדראנית", "hu": "mázandaráni", - "id": "Bahasa Mazandaran", + "id": "Mazandaran", "it": "mazanderani", "ja": "マーザンダラーン語", "nb_NO": "Mazandarani", @@ -7717,6 +7715,7 @@ "pt": "Língua mazandarani", "pt_BR": "Língua mazandarani", "ru": "мазандеранский язык", + "sl": "mazandaranščina", "sv": "mazenderani", "_meta": { "dir": [ @@ -7732,7 +7731,7 @@ "eo": "naura lingvo", "es": "nauruano", "eu": "Nauruera", - "fi": "Naurun kieli", + "fi": "nauru", "fr": "nauruan", "gl": "Lingua nauruana", "he": "נאורית", @@ -7766,7 +7765,7 @@ "eo": "minnana lingvo", "es": "chino min nan", "eu": "hegoaldeko min", - "fi": "Minnan", + "fi": "minnan", "fr": "minnan", "gl": "lingua min nam", "he": "מין דרומי", @@ -7786,7 +7785,7 @@ "zh_Hant": "閩南語", "_meta": { "dir": [ - "top-to-bottom" + "vertical right-to-left" ] } }, @@ -7804,7 +7803,7 @@ "gl": "Lingua napolitana", "he": "נפוליטנית", "hu": "nápolyi", - "id": "Bahasa Napolitan", + "id": "Napoli", "it": "lingua napoletana", "ja": "ナポリ語", "nb_NO": "napolitansk", @@ -7867,7 +7866,7 @@ "gl": "Lingua baixo alemá", "he": "גרמנית תחתית", "hu": "alnémet", - "id": "Bahasa Sachsen Hilir", + "id": "Jerman Hilir", "it": "lingue basso-tedesche", "ja": "低地ドイツ語", "nb_NO": "nedertysk", @@ -7893,12 +7892,12 @@ "eo": "nepala lingvo", "es": "nepalí", "eu": "nepalera", - "fi": "nepalin kieli", + "fi": "nepali", "fr": "népalais", "gl": "Lingua nepalesa", "he": "נפאלית", "hu": "nepáli", - "id": "Bahasa Nepali", + "id": "Nepal", "it": "nepalese", "ja": "ネパール語", "nb_NO": "nepali", @@ -7926,12 +7925,12 @@ "eo": "nevara lingvo", "es": "Newari", "eu": "newarera", - "fi": "Newari", + "fi": "newari", "fr": "newari", "gl": "Lingua newari", "he": "נפאל בהאסה", "hu": "névári", - "id": "bahasa Newar", + "id": "Newar", "it": "nepal bhasa", "ja": "ネパール・バサ語", "nb_NO": "Nepal bhasa", @@ -7939,6 +7938,7 @@ "pl": "Język newarski", "pt": "Língua bhasa", "ru": "неварский язык", + "sl": "nevarščina", "sv": "newari", "_meta": { "dir": [ @@ -7953,16 +7953,18 @@ "eo": "ndonga lingvo", "es": "ndonga", "eu": "Ndonga", - "fi": "Ndonga", + "fi": "ndonga", "fr": "ndonga", "gl": "Lingua ndonga", "hu": "ndonga", + "id": "Dialek Ndonga", "it": "ndonga", "ja": "ンドンガ語", "nl": "Ndonga", "pl": "Język ndonga", "pt": "Ndonga", "ru": "Ндонга", + "sl": "ndonga", "sv": "ndonga", "_meta": { "dir": [ @@ -7974,7 +7976,7 @@ "de": "Nias", "en": "Nias", "eo": "niasa lingvo", - "fi": "Niasin kieli", + "fi": "nias", "fr": "niha", "gl": "Lingua nias", "id": "Bahasa Nias", @@ -7984,6 +7986,7 @@ "pl": "Język nias", "pt": "Língua nias", "ru": "Ниасский язык", + "sl": "niaščina", "sv": "nias", "zh_Hans": "尼亚斯语", "zh_Hant": "尼亞斯語", @@ -8005,7 +8008,7 @@ "fr": "niuéen", "he": "ניואית", "hu": "niuei", - "id": "Bahasa Niue", + "id": "Niue", "it": "lingua niueana", "ja": "ニウエ語", "nb_NO": "Niuisk", @@ -8045,6 +8048,7 @@ "ru": "нидерландский язык", "sl": "nizozemščina", "sv": "nederländska", + "zgh": "ⵜⵓⵜⵍⴰⵢⵜ ⵜⴰⵀⵓⵍⴰⵏⴷⵉⵜ", "zh_Hans": "荷兰语", "zh_Hant": "荷蘭語", "_meta": { @@ -8083,6 +8087,7 @@ "ru": "нюнорск", "sl": "nynorsk", "sv": "nynorska", + "zh_Hans": "新挪威语", "zh_Hant": "新挪威語", "_meta": { "countries": [ @@ -8137,7 +8142,7 @@ "es": "idioma tailandés septentrional", "fr": "thaï du Nord", "he": "תאית צפונית", - "id": "bahasa Thai Utara", + "id": "Thai Utara", "it": "thailandese settentrionale", "ja": "北タイ語", "nl": "Noordelijk Thai", @@ -8160,7 +8165,7 @@ "de": "Nogaisch", "en": "Nogai", "eo": "nogaja lingvo", - "es": "nogai", + "es": "Nogai", "eu": "nogaiera", "fi": "Nogain kieli", "fr": "nogaï", @@ -8173,6 +8178,7 @@ "pl": "Język nogajski", "pt": "Língua nogai", "ru": "ногайский язык", + "sl": "nogajščina", "sv": "nogai", "_meta": { "dir": [ @@ -8181,7 +8187,9 @@ } }, "nqo": { - "en": "N'Ko", + "en": "NKo", + "eu": "mandingera", + "fi": "n’ko", "fr": "n'ko", "gl": "Lingua n'ko", "ja": "ンコ語", @@ -8218,6 +8226,7 @@ "pt": "língua ndebele", "pt_BR": "língua ndebele", "ru": "южный ндебеле", + "sl": "južna ndebelščina", "sv": "sydndebele", "zh_Hans": "南恩德贝莱语", "zh_Hant": "南恩德貝萊語", @@ -8239,7 +8248,7 @@ "es": "guernseyés", "fi": "Guernésiais", "fr": "guernesiais", - "id": "bahasa Guernésiais", + "id": "Guernésiais", "it": "dialetto guernesiais", "ja": "ガーンジー島方言", "nb_NO": "guernésiais", @@ -8247,7 +8256,7 @@ "pl": "Dgèrnésiais", "pt": "Guernésiais", "ru": "Гернсийский диалект нормандского языка", - "sl": "Guernseyščina", + "sl": "guernseyščina", "sv": "guernésiais", "zh_Hans": "根西方言", "_meta": { @@ -8259,17 +8268,18 @@ "nso": { "ca": "pedi", "cs": "severní sotho", + "da": "nordsotho", "de": "Nord-Sotho", "en": "Northern Sotho", "eo": "peda lingvo", "es": "Sesotho sa leboa", "eu": "pediera", - "fi": "Pohjoissothon kieli", + "fi": "pohjoissotho", "fr": "sotho du Nord", "gl": "Lingua sotho do norte", "he": "סוטו צפונית", "hu": "északi szoto", - "id": "Bahasa Sepedi", + "id": "Sotho Utara", "it": "sotho del nord", "ja": "北ソト語", "nb_NO": "nordsotho", @@ -8302,7 +8312,7 @@ "he": "נאוואחו", "hu": "navahó", "id": "Bahasa Navajo", - "it": "lingua navajo", + "it": "navajo", "ja": "ナバホ語", "nb_NO": "navajo", "nl": "Navajo", @@ -8310,6 +8320,7 @@ "pt": "Língua navaja", "pt_BR": "Língua navaja", "ru": "навахо", + "sl": "navaščina", "sv": "navajo", "_meta": { "dir": [ @@ -8326,12 +8337,12 @@ "eo": "njanĝa lingvo", "es": "chichewa", "eu": "txewera", - "fi": "njandžan kieli", + "fi": "njandža", "fr": "chewa", "gl": "lingua chichewa", "he": "צ'ואה", "hu": "cseva", - "id": "Bahasa Chichewa", + "id": "Chewa", "it": "chewa", "ja": "チェワ語", "nb_NO": "chewa", @@ -8341,6 +8352,7 @@ "ru": "ньянджа", "sl": "čičevščina", "sv": "chichewa", + "zh_Hans": "切瓦语", "_meta": { "countries": [ "MW", @@ -8354,12 +8366,16 @@ "nys": { "de": "Noongar", "en": "Noongar", + "es": "noongar", "eu": "nyungar", - "fr": "nyungan", - "gl": "Lngua noongar", - "ja": "ニュンガル語", - "nl": "Nyunga", - "sv": "nyunga", + "fr": "nyungar", + "gl": "noongar", + "he": "נונגאר", + "it": "noongar", + "ja": "ヌーンガー語", + "nl": "Nyungar", + "sl": "nungarščina", + "sv": "nyungar", "_meta": { "dir": [ "left-to-right" @@ -8380,7 +8396,7 @@ "gl": "lingua occitana", "he": "אוקסיטנית", "hu": "okcitán", - "id": "Oksitan", + "id": "bahasa Oksitan", "it": "occitano", "ja": "オック語", "nb_NO": "oksitansk", @@ -8434,13 +8450,14 @@ "eo": "olonec-karela lingvo", "fi": "livvinkarjala", "fr": "olonetsien", - "gl": "Lingua livvi", + "gl": "lingua livvi", "it": "lingua livvi", "ja": "リッヴィ語", "nb_NO": "livvisk", "nl": "Olonetsisch", - "pl": "Dialekt ołoniecki", + "pl": "dialekt ołoniecki", "ru": "ливвиковское наречие", + "sl": "livijščina", "sv": "livvi", "zh_Hant": "利維卡累利阿語", "_meta": { @@ -8458,7 +8475,7 @@ "eo": "oroma lingvo", "es": "oromo", "eu": "Oromoera", - "fi": "oromon kieli", + "fi": "oromo", "fr": "oromo", "gl": "Lingua oromo", "he": "אורומו", @@ -8471,7 +8488,9 @@ "pl": "Język oromo", "pt": "Língua oromo", "ru": "оромо", + "sl": "oromoščina", "sv": "oromo", + "zh_Hant": "奧羅莫語", "_meta": { "dir": [ "left-to-right" @@ -8512,7 +8531,7 @@ "gl": "Lingua oriya", "he": "אורייה", "hu": "orija", - "id": "Oriya", + "id": "Odia", "it": "oriya", "ja": "オリヤー語", "nb_NO": "oriya", @@ -8568,11 +8587,13 @@ "en": "Osage", "fi": "Osagen kieli", "fr": "osage", + "he": "אוסייג'", + "id": "Osage", "it": "lingua osage", "ja": "オセージ語", - "nb_NO": "Osage", + "nb_NO": "osage", "nl": "Osage", - "ru": "Оседжи", + "ru": "оседжи", "sv": "osage", "_meta": { "dir": [ @@ -8599,6 +8620,7 @@ "pl": "Elfdalski", "pt": "Älvdalsmål", "ru": "эльвдальский диалект", + "sl": "elfdalščina", "sv": "älvdalska", "_meta": { "dir": [ @@ -8610,17 +8632,17 @@ "ca": "panjabi (Shahmukhi)", "cs": "paňdžábština (šáhmukhí)", "da": "Punjabi (Shahmukhi)", - "de": "Panjabi (Shahmukhi)", + "de": "Panjabi (Schahmuchi)", "en": "Punjabi (Shahmukhi)", "eo": "panĝaba lingvo (Ŝahmuĥi-ortografio)", - "es": "panyabí (Shahmuji)", + "es": "punyabí (Shahmuji)", "eu": "Punjabera (Shahmukhi)", - "fi": "punjabin kieli (Shahmukhi)", + "fi": "pandžabi (Shahmukhi)", "fr": "pendjabi (shahmukhi)", "gl": "lingua punjabi (Shahmukhi)", "he": "פנג'אבי (אלפבית שאהמוקי)", "hu": "pandzsábi (Shahmukhi)", - "id": "Bahasa Punjab (Abjad Shahmukhi)", + "id": "Punjab (Abjad Shahmukhi)", "it": "punjabi (Shahmukhī)", "ja": "パンジャーブ語 (シャームキー文字)", "nb_NO": "panjabi (Shahmukhi)", @@ -8629,7 +8651,7 @@ "pt": "Língua panjabi (Shahmukhi)", "ru": "панджаби (Шахмукхи)", "sl": "pandžabščina (šahmuki)", - "sv": "punjabi (Shahmukhi)", + "sv": "punjabi (shahmukhi)", "zh_Hans": "旁遮普语 (Shahmukhi)", "zh_Hant": "旁遮普語 (Shahmukhi)", "_meta": { @@ -8648,7 +8670,7 @@ "eo": "pangasina lingvo", "es": "pangasinense", "eu": "pagasinanera", - "fi": "Pangasinanin kieli", + "fi": "pangasinan", "fr": "pangassinais", "gl": "Lingua pangasinesa", "hu": "pangasinan", @@ -8659,7 +8681,8 @@ "nl": "Pangasinan", "pl": "Język pangasinan", "pt": "Língua pangasinesa", - "ru": "Пангасинанский язык", + "ru": "пангасинанский язык", + "sl": "pangasinščina", "sv": "pangasinan", "zh_Hans": "邦阿西楠语", "_meta": { @@ -8677,12 +8700,12 @@ "eo": "Papiamento", "es": "papiamento", "eu": "Papiamento", - "fi": "Papiamentu", + "fi": "papiamentu", "fr": "papiamento", "gl": "Papiamento", "he": "פאפיאמנטו", "hu": "papiamentu", - "id": "Bahasa Papiamento", + "id": "Papiamento", "it": "lingua papiamento", "ja": "パピアメント語", "nb_NO": "papiamento", @@ -8690,7 +8713,7 @@ "pl": "Język papiamento", "pt": "Papiamento", "ru": "папьяменто", - "sl": "Papiamento", + "sl": "papiamento", "sv": "papiamento", "zh_Hans": "帕皮阿门托语", "zh_Hant": "帕皮阿門托語", @@ -8702,18 +8725,19 @@ }, "pcd": { "ca": "picard", + "cs": "pikardština", "da": "Pikardisk", "de": "Picardisch", "en": "Picard", "eo": "pikarda franca dialekto", "es": "picardo", "eu": "Pikardiera", - "fi": "Picardin kieli", + "fi": "picardi", "fr": "picard", "gl": "Lingua picarda", "he": "פיקארד", "hu": "pikárd", - "id": "Bahasa Picard", + "id": "Picardia", "it": "piccardo", "ja": "ピカルディ語", "nb_NO": "pikardisk", @@ -8737,7 +8761,7 @@ "eo": "pensilvangermana dialekto", "es": "alemán de Pensilvania", "eu": "Pennsylvaniako aleman", - "fi": "Pennsylvaniansaksa", + "fi": "pennsylvaniansaksa", "fr": "allemand de Pennsylvanie", "gl": "Alemán de Pensilvania", "hu": "pennsylvaniai német", @@ -8749,7 +8773,7 @@ "pl": "język niemiecki w Pensylwanii", "pt": "Alemão da Pensilvânia", "ru": "пенсильванско-немецкий диалект", - "sl": "Pensilvanska nemščina", + "sl": "pensilvanska nemščina", "sv": "pennsylvaniatyska", "_meta": { "dir": [ @@ -8774,6 +8798,7 @@ "pl": "plautdietsch", "pt": "Plautdietsch", "ru": "Немецко-платский диалект", + "sl": "menonitska nizka nemščina", "sv": "plautdietsch", "_meta": { "dir": [ @@ -8793,11 +8818,13 @@ "fr": "palatin", "gl": "Alemán do Palatinado", "hu": "pfalzi", + "id": "Jerman Palatinate", "it": "tedesco palatino", "ja": "プファルツ語", "nl": "Paltsisch", - "pl": "Gwary palatynackie", + "pl": "gwary palatynackie", "ru": "Пфальцский диалект", + "sl": "pfalška nemščina", "sv": "pfalziska", "_meta": { "dir": [ @@ -8827,6 +8854,7 @@ "pt_BR": "Língua pitcairnesa", "ru": "питкэрнский язык", "sv": "pitcairnesiska", + "zh_Hant": "皮特肯語", "_meta": { "dir": [ "left-to-right" @@ -8845,7 +8873,9 @@ "pl": "Język neosalomoński", "pt": "Língua pijin", "ru": "Пиджин Соломоновых Островов", + "sl": "salomonski pidžin", "sv": "pijin", + "zh_Hant": "皮京語", "_meta": { "dir": [ "left-to-right" @@ -8885,7 +8915,7 @@ "gl": "lingua polaca", "he": "פולנית", "hu": "lengyel", - "id": "bahasa Polski", + "id": "bahasa Polandia", "it": "polacco", "ja": "ポーランド語", "nb_NO": "polsk", @@ -8909,17 +8939,18 @@ }, "pms": { "ca": "piemontès", + "cs": "Piemontština", "de": "Piemontesisch", "en": "Piedmontese", "eo": "piemonta lingvo", "es": "piamontés", "eu": "Piemontera", - "fi": "Piemonten kieli", + "fi": "piemonte", "fr": "piémontais", "gl": "Lingua piemontesa", "he": "פיימונטית", "hu": "piemonti", - "id": "Bahasa Piemonte", + "id": "bahasa Piemonte", "it": "lingua piemontese", "ja": "ピエモンテ語", "nb_NO": "piemontesisk", @@ -8928,6 +8959,7 @@ "pt": "Língua piemontesa", "pt_BR": "Língua piemontesa", "ru": "пьемонтский язык", + "sl": "piemonteščina", "sv": "piemontesiska", "zh_Hans": "皮埃蒙特语", "zh_Hant": "皮埃蒙特語", @@ -8944,6 +8976,7 @@ "en": "Pontic Greek", "eo": "Ponta greka lingvo", "es": "griego póntico", + "fi": "pontoksenkreikka", "fr": "grec pontique", "gl": "Grego póntico", "hu": "pontoszi görög", @@ -8955,6 +8988,7 @@ "pl": "język pontyjski", "pt": "Grego do Ponto", "ru": "понтийский язык", + "sl": "pontščina", "sv": "pontisk grekiska", "zh_Hant": "旁狄希臘語", "_meta": { @@ -8976,7 +9010,7 @@ "gl": "Lingua prusiana antiga", "he": "פרוסית עתיקה", "hu": "óporosz", - "id": "Bahasa Prusia Kuno", + "id": "Prusia Kuno", "it": "antico prussiano", "ja": "プロシア語", "nb_NO": "gammelprøyssisk", @@ -8985,7 +9019,9 @@ "pt": "prussiano antigo", "pt_BR": "Prussiano antigo", "ru": "прусский язык", + "sl": "stara pruščina", "sv": "prusiska", + "zh_Hant": "普魯士語", "_meta": { "dir": [ "left-to-right" @@ -9001,7 +9037,7 @@ "eo": "paŝtuna lingvo", "es": "pastún", "eu": "paxtuera", - "fi": "paštun kieli", + "fi": "paštu", "fr": "pachto", "gl": "Lingua paxta", "he": "פשטו", @@ -9053,6 +9089,7 @@ "ru": "португальский язык", "sl": "portugalščina", "sv": "portugisiska", + "zgh": "ⵜⵓⵜⵍⴰⵢⵜ ⵜⴰⴱⵓⵔⵜⵓⴳⴰⵍⵉⵜ", "zh_Hans": "葡萄牙语", "zh_Hant": "葡萄牙語", "_meta": { @@ -9160,7 +9197,9 @@ "pl": "Język kicze", "pt": "Língua quiché", "ru": "киче", + "sl": "kihejščina", "sv": "quiché", + "zh_Hant": "基切語", "_meta": { "dir": [ "left-to-right" @@ -9185,6 +9224,7 @@ "pl": "język maoryski Wysp Cooka", "pt": "Maori das Ilhas Cook", "ru": "кукский язык", + "sl": "cookovootoška maorščina", "sv": "rarotongesiska", "zh_Hant": "庫克羣島毛利人", "_meta": { @@ -9199,16 +9239,16 @@ "en": "Romagnol", "eo": "romanja lingvo", "es": "romañol", - "fi": "romagnolin kieli", + "fi": "romagnoli", "fr": "romagnol", "hu": "romagnai nyelv", - "id": "bahasa Romagnol", + "id": "bahasa Romagna", "it": "romagnolo", "ja": "ロマーニャ語", "nl": "Romagnools", "pt": "romagnol", "ru": "Романьольский язык", - "sl": "romanjolščina", + "sl": "romanjščina", "sv": "romagnol", "zh_Hans": "罗马涅语", "zh_Hant": "羅馬涅語", @@ -9223,7 +9263,7 @@ "de": "Tarifit", "en": "Tarifit", "es": "rifeño", - "eu": "Tmaziɣt", + "eu": "Tarifit", "fi": "Tarifit", "fr": "rifain", "gl": "Lingua rifeña", @@ -9236,14 +9276,12 @@ "ru": "Рифский язык", "sl": "tarifit", "sv": "rif", + "zgh": "ⵜⴰⵔⵉⴼⵉⵜ", "zh_Hans": "里夫语", "zh_Hant": "里夫語", "_meta": { "dir": [ - "right-to-left", - "left-to-right", - "top-to-bottom", - "bottom-to-top" + "left-to-right" ] } }, @@ -9252,7 +9290,7 @@ "en": "Rakhine", "fr": "arakanais", "gl": "Lingua arakanesa", - "id": "bahasa Rakhine", + "id": "Rakhine", "ja": "ラカイン語", "nl": "Arakanees", "pl": "Język arakański", @@ -9292,6 +9330,7 @@ "ru": "романшский язык", "sl": "retoromanščina", "sv": "rätoromanska", + "zgh": "ⵜⵓⵜⵍⴰⵢⵜ ⵜⴰⵔⵓⵎⴰⵏⵛⵜ", "_meta": { "countries": [ "CH" @@ -9310,6 +9349,7 @@ "ja": "カルパティア・ロマ語", "nl": "Karpathisch-Romani", "ru": "Карпатские диалекты цыганского языка", + "sl": "karpatska romščna", "sv": "centralromani", "_meta": { "dir": [ @@ -9326,12 +9366,12 @@ "eo": "cigana lingvo", "es": "romaní", "eu": "erromaniera", - "fi": "romanikieli", + "fi": "romani", "fr": "romani", "gl": "lingua romaní", "he": "רומאני", "hu": "cigány nyelv", - "id": "Bahasa Romani", + "id": "bahasa Romani", "it": "romaní", "ja": "ロマ語", "nb_NO": "romanés", @@ -9356,7 +9396,7 @@ "eo": "burunda lingvo", "es": "kirundi", "eu": "kirundi", - "fi": "Kirundi", + "fi": "kirundi", "fr": "kirundi", "gl": "Lingua kirundi", "he": "קירונדי", @@ -9369,7 +9409,9 @@ "pl": "język rundi", "pt": "Língua kirundi", "ru": "рунди", + "sl": "rundščina", "sv": "kirundi", + "zh_Hans": "基隆迪语", "_meta": { "countries": [ "BI" @@ -9393,7 +9435,7 @@ "gl": "lingua romanesa", "he": "רומנית", "hu": "román", - "id": "Rumania", + "id": "bahasa Rumania", "it": "romeno", "ja": "ルーマニア語", "nb_NO": "rumensk", @@ -9440,6 +9482,7 @@ "ru": "русский язык", "sl": "ruščina", "sv": "ryska", + "zgh": "ⵜⵓⵜⵍⴰⵢⵜ ⵜⴰⵔⵓⵙⵉⵜ", "zh_Hans": "俄语", "zh_Hant": "俄語", "_meta": { @@ -9489,8 +9532,8 @@ "rup": { "ca": "aromanès", "cs": "arumunština", - "da": "Aromunsk", - "de": "Aromunisch", + "da": "aromunsk", + "de": "Aromunische Sprache", "en": "Aromanian", "eo": "arumana lingvo", "es": "arumano", @@ -9500,8 +9543,8 @@ "gl": "Lingua arromanesa", "he": "ארומנית", "hu": "aromán", - "id": "Bahasa Arumania", - "it": "arumeno", + "id": "Aromania", + "it": "Lingua arumena", "ja": "アルーマニア語", "nb_NO": "arumensk", "nl": "Aroemeens", @@ -9525,7 +9568,7 @@ "eo": "ruanda lingvo", "es": "kiñaruanda", "eu": "kinyaruanda", - "fi": "ruandan kieli", + "fi": "ruanda", "fr": "kinyarwanda", "gl": "Lingua ruanda", "he": "קינירואנדה", @@ -9538,7 +9581,9 @@ "pl": "język ruanda", "pt": "Língua kinyarwanda", "ru": "руанда", + "sl": "ruandščina", "sv": "rwanda", + "zh_Hans": "卢旺达语", "zh_Hant": "盧安達語", "_meta": { "countries": [ @@ -9561,14 +9606,15 @@ "gl": "Lingua okinawana", "he": "השפה האוקינאווית", "hu": "okinavai nyelv", - "id": "Bahasa Okinawa", + "id": "Okinawa", "it": "lingua di Okinawa", "ja": "沖縄語", "nb_NO": "Okinawa", "nl": "Okinawaans", "pl": "Język okinawski", "pt": "okinawano", - "ru": "Окинавский язык", + "ru": "окинавский язык", + "sl": "okinavščina", "sv": "okinawianska", "zh_Hans": "冲绳语", "zh_Hant": "沖繩語", @@ -9593,7 +9639,7 @@ "gl": "Lingua sakha", "he": "סאחה", "hu": "jakut", - "id": "Bahasa Yakut", + "id": "bahasa Yakut", "it": "sacha", "ja": "サハ語", "nb_NO": "sakha", @@ -9601,6 +9647,7 @@ "pl": "Język jakucki", "pt": "Língua iacuta", "ru": "якутский язык", + "sl": "jakutščina", "sv": "jakutiska", "_meta": { "dir": [ @@ -9617,12 +9664,12 @@ "eo": "santala lingvo", "es": "idioma santalí", "eu": "Santali", - "fi": "Santalin kieli", + "fi": "santali", "fr": "santâlî", "gl": "lingua santali", "he": "סנטלית", "hu": "szantáli", - "id": "Bahasa Santali", + "id": "Santal", "it": "santali", "ja": "サンタル語", "nb_NO": "Santali", @@ -9653,7 +9700,7 @@ "gl": "Lingua sarda", "he": "סרדו", "hu": "szárd", - "id": "Bahasa Sardinia", + "id": "Sardinia", "it": "sardo", "ja": "サルデーニャ語", "nb_NO": "sardisk", @@ -9661,7 +9708,7 @@ "pl": "Język sardyński", "pt": "Língua sarda", "ru": "сардинский язык", - "sl": "Sardinščina", + "sl": "sardinščina", "sv": "sardiska", "zh_Hans": "撒丁语", "zh_Hant": "薩丁尼亞語", @@ -9685,7 +9732,7 @@ "gl": "Lingua siciliana", "he": "סיציליאנית", "hu": "szicíliai", - "id": "Bahasa Sisilia", + "id": "Sisilia", "it": "siciliano", "ja": "シチリア語", "nb_NO": "siciliansk", @@ -9711,12 +9758,12 @@ "eo": "skota lingvo", "es": "escocés", "eu": "eskoziera", - "fi": "Skotin kieli", + "fi": "skotti", "fr": "scots", - "gl": "Lingua escocesa", + "gl": "Lingua scots", "he": "סקוטית", "hu": "scots", - "id": "Bahasa Scots", + "id": "bahasa Skots", "it": "lingua scots", "ja": "スコットランド語", "nb_NO": "skotsk", @@ -9745,13 +9792,13 @@ "gl": "Lingua sassaresa", "he": "סאסארזה", "hu": "sassari", - "id": "Bahasa Sassari", - "it": "(lingua) sassarese", + "id": "Sassari", + "it": "lingua sassarese", "ja": "サッサリ・サルデーニャ語", "nl": "Sassarees", "pl": "Dialekt sassarski", "ru": "сассарский язык", - "sl": "Sasarščina", + "sl": "sasarščina", "sv": "sassaresiska", "zh_Hans": "萨萨里语", "zh_Hant": "薩薩里語", @@ -9770,7 +9817,7 @@ "eo": "Sudaj Kurdaj dialektoj", "fr": "kurde du Sud", "he": "כורדית דרומית", - "id": "Bahasa Kurdi Selatan", + "id": "Kurdi Selatan", "it": "lingua curda meridionale", "ja": "南部クルド語", "nl": "Zuid-Koerdisch", @@ -9778,6 +9825,7 @@ "pt": "Curdo meridional", "pt_BR": "Curdo meridional", "ru": "южнокурдский язык", + "sl": "južna kurdščina", "sv": "sydkurdiska", "zh_Hans": "南库尔德语", "zh_Hant": "南庫德語", @@ -9801,6 +9849,7 @@ "gl": "Lingua saami setentrional", "he": "סאמי צפונית", "hu": "északi számi", + "id": "Sami Utara", "it": "sami settentrionale", "ja": "北部サーミ語", "nb_NO": "nordsamisk", @@ -9833,6 +9882,7 @@ "pl": "Język seri", "pt": "Língua seri", "ru": "Сери", + "sl": "serijščina", "sv": "seri", "zh_Hant": "塞裏語", "_meta": { @@ -9865,7 +9915,7 @@ "eo": "sangoa lingvo", "es": "idioma sango", "eu": "Sango", - "fi": "Sango", + "fi": "sango", "fr": "sango", "gl": "Lingua sango", "he": "סאנגו", @@ -9891,14 +9941,47 @@ ] } }, + "sh": { + "ca": "serbocroat", + "cs": "srbochorvatština", + "da": "serbokroatisk", + "de": "Serbokroatisch", + "en": "Serbo-Croatian", + "eo": "serbokroata lingvo", + "es": "serbocroata", + "eu": "Serbokroaziera", + "fi": "serbokroaatti", + "fr": "serbo-croate", + "gl": "Lingua serbocroata", + "he": "סרבו-קרואטית", + "hu": "szerbhorvát", + "id": "bahasa Serbo-Kroasia", + "it": "serbo-croato", + "ja": "セルビア・クロアチア語", + "nb_NO": "serbokroatisk", + "nl": "Servo-Kroatisch", + "pl": "język serbsko-chorwacki", + "pt": "Língua servo-croata", + "pt_BR": "Língua servo-croata", + "ru": "сербохорватский язык", + "sl": "srbohrvaščina", + "sv": "serbokroatiska", + "zh_Hans": "塞尔维亚-克罗地亚语", + "zh_Hant": "塞爾維亞-克羅地亞語", + "_meta": { + "dir": [ + "left-to-right" + ] + } + }, "shi": { "ca": "taixelhit", "cs": "tašelhit", "de": "Taschelhit", - "en": "Shilha", + "en": "Tachelhit", "eo": "ŝelha lingvo", "es": "chilha", - "fi": "Tašelhit", + "fi": "tašelhit", "fr": "chleuh", "gl": "Lingua shilha", "he": "תשלחית", @@ -9911,13 +9994,12 @@ "ru": "Шильхские языки", "sl": "tašelhit", "sv": "tachelhit", + "zgh": "ⵜⴰⵛⵍⵃⵉⵜ", "zh_Hans": "施卢赫语", "zh_Hant": "施盧赫語", "_meta": { "dir": [ "left-to-right", - "top-to-bottom", - "bottom-to-top", "right-to-left" ] } @@ -9928,10 +10010,10 @@ "en": "Shan", "eo": "ŝana lingvo", "es": "shan", - "fi": "Shanin kieli", + "fi": "shan", "fr": "shan", "gl": "Lingua shan", - "id": "Bahasa Shan", + "id": "Shan", "it": "lingua shan", "ja": "シャン語", "nl": "Shan", @@ -9939,6 +10021,7 @@ "pt": "língua shan", "pt_BR": "Língua shan", "ru": "шанский язык", + "sl": "šanščina", "sv": "shan", "zh_Hans": "掸语", "zh_Hant": "撣語", @@ -9962,13 +10045,12 @@ "pl": "język chaouia", "pt": "Língua chaouis", "ru": "Шавия", + "sl": "šavijščina", "sv": "shawiya", "_meta": { "dir": [ - "right-to-left", "left-to-right", - "top-to-bottom", - "bottom-to-top" + "right-to-left" ] } }, @@ -9981,7 +10063,7 @@ "eo": "sinhala lingvo", "es": "cingalés", "eu": "Sinhala", - "fi": "Sinhali", + "fi": "sinhali", "fr": "singhalais", "gl": "Lingua cingalesa", "he": "סינהלית", @@ -9995,7 +10077,7 @@ "pt": "Língua cingalesa", "pt_BR": "Língua cingalesa", "ru": "сингальский язык", - "sl": "sinhalščina", + "sl": "singalščina", "sv": "singalesiska", "zh_Hant": "僧伽羅語", "_meta": { @@ -10040,7 +10122,9 @@ "fi": "kiltinänsaame", "fr": "same de Kildin", "gl": "Lingua saami de Kildin", + "he": "סאמית קילדינית", "hu": "kildini számi", + "id": "Sami Kildin", "it": "lingua sami di Kildin", "ja": "キルディン・サーミ語", "nb_NO": "kildinsamisk", @@ -10075,7 +10159,9 @@ "pl": "język ter", "pt": "sami de Ter", "ru": "йоканьгско-саамский язык", + "sl": "terska samijščina", "sv": "tersamiska", + "zh_Hant": "特爾薩米語", "_meta": { "dir": [ "left-to-right" @@ -10092,6 +10178,7 @@ "fi": "uumajansaame", "fr": "same d'Ume", "gl": "Lingua saami de Ume", + "he": "סאמית אומית", "hu": "umei számi", "it": "lingua sami di Ume", "ja": "ウーメ・サーミ語", @@ -10133,6 +10220,7 @@ "ru": "словацкий язык", "sl": "slovaščina", "sv": "slovakiska", + "zh_Hans": "斯洛伐克语", "zh_Hant": "斯洛伐克語", "_meta": { "countries": [ @@ -10195,6 +10283,7 @@ "nl": "Silezisch-Duits", "pl": "dialekt śląski języka niemieckiego", "ru": "силезские диалекты немецкого языка", + "sl": "šlezijska nemščina", "sv": "schlesisk tyska", "zh_Hans": "西里西亚语", "zh_Hant": "西里西亞語", @@ -10213,12 +10302,12 @@ "eo": "samoa lingvo", "es": "samoano", "eu": "Samoera", - "fi": "samoan kieli", + "fi": "samoa", "fr": "samoan", "gl": "Lingua samoana", "he": "סמואית", "hu": "szamoai", - "id": "Bahasa Samoa", + "id": "Samoa", "it": "samoano", "ja": "サモア語", "nb_NO": "samoansk", @@ -10226,7 +10315,10 @@ "pl": "język samoański", "pt": "Língua samoana", "ru": "самоанский язык", + "sl": "samojščina", "sv": "samoanska", + "zh_Hans": "萨摩亚语", + "zh_Hant": "薩摩亞語", "_meta": { "countries": [ "WS" @@ -10247,8 +10339,9 @@ "fi": "eteläsaame", "fr": "same du Sud", "gl": "Lingua saami meridional", + "he": "סאמי דרומית", "hu": "déli számi", - "id": "Bahasa Sami Selatan", + "id": "bahasa Sami Selatan", "it": "sami meridionale", "ja": "南部サーミ語", "nb_NO": "sørsamisk", @@ -10277,7 +10370,9 @@ "fi": "luulajansaame", "fr": "same de Lule", "gl": "Lingua saami de Lule", + "he": "סאמית לולית", "hu": "lulei számi", + "id": "Sami Lule", "it": "lingua sami di Lule", "ja": "ルレ・サーミ語", "nb_NO": "lulesamisk", @@ -10307,7 +10402,9 @@ "fi": "inarinsaame", "fr": "same d'Inari", "gl": "Lingua saami de Inari", + "he": "סאמית אינארית", "hu": "inari számi", + "id": "Sami Inari", "it": "sami di Inari", "ja": "イナリ・サーミ語", "nb_NO": "enaresamisk", @@ -10335,6 +10432,7 @@ "fi": "koltansaame", "fr": "same skolt", "gl": "Lingua saami de Skolt", + "he": "סאמית סקולטית", "hu": "kolta számi", "it": "lingua sami skolt", "ja": "スコルト・サーミ語", @@ -10344,7 +10442,7 @@ "pt": "kíngua sami de Skolt", "pt_BR": "Língua sami de Skolt", "ru": "колтта-саамский язык", - "sl": "sokltska samijščina", + "sl": "skoltska samijščina", "sv": "skoltsamiska", "zh_Hans": "斯科尔特萨米语", "zh_Hant": "斯科爾特薩米語", @@ -10361,7 +10459,8 @@ "en": "Shona", "eo": "Ŝona lingvo", "es": "shona", - "fi": "šonan kieli", + "eu": "Shonera", + "fi": "šona", "fr": "shona", "gl": "Lingua shona", "he": "שונה", @@ -10374,6 +10473,7 @@ "pl": "Język shona", "pt": "Língua chona", "ru": "шона", + "sl": "šonščina", "sv": "shona", "zh_Hant": "修納語", "_meta": { @@ -10394,12 +10494,12 @@ "eo": "somala lingvo", "es": "somalí", "eu": "somaliera", - "fi": "somalin kieli", + "fi": "somali", "fr": "somali", "gl": "Lingua somalí", "he": "סומלית", "hu": "szomáli", - "id": "Bahasa Somali", + "id": "bahasa Somali", "it": "somalo", "ja": "ソマリ語", "nb_NO": "somali", @@ -10408,6 +10508,7 @@ "pt": "Língua somali", "pt_BR": "Língua somali", "ru": "сомалийский язык", + "sl": "somalščina", "sv": "somaliska", "zh_Hans": "索马里语", "zh_Hant": "索馬利亞語", @@ -10421,12 +10522,13 @@ } }, "sou": { + "ca": "tailandès meridional", "de": "Südthailändisch", "en": "Southern Thai", "eo": "sud-taja lingvo", "fr": "thaï du Sud", "he": "תאית דרומית", - "id": "Bahasa Thai Selatan", + "id": "Thai Selatan", "ja": "南タイ語", "nl": "Zuidelijk Thai", "pl": "Język południowotajski", @@ -10452,10 +10554,10 @@ "eu": "albaniera", "fi": "albania", "fr": "albanais", - "gl": "Lingua albanesa", + "gl": "lingua albanesa", "he": "אלבנית", "hu": "albán", - "id": "Bahasa Albania", + "id": "Albania", "it": "albanese", "ja": "アルバニア語", "nb_NO": "albansk", @@ -10466,6 +10568,7 @@ "ru": "албанский язык", "sl": "albanščina", "sv": "albanska", + "zgh": "ⵜⵓⵜⵍⴰⵢⵜ ⵜⴰⵍⴱⴰⵏⵉⵜ", "zh_Hans": "阿尔巴尼亚语", "zh_Hant": "阿爾巴尼亞語", "_meta": { @@ -10487,7 +10590,7 @@ "eo": "srana lingvo", "es": "sranan tongo", "eu": "Sranan Tongo", - "fi": "Sranantongo", + "fi": "sranantongo", "fr": "sranan", "gl": "Sranan tongo", "he": "סרנן טונגו", @@ -10500,7 +10603,7 @@ "pl": "sranan tongo", "pt": "Sranan", "ru": "cранан-тонго", - "sl": "Surinamščina", + "sl": "surinamščina", "sv": "sranan", "zh_Hans": "苏里南语", "zh_Hant": "蘇利南語", @@ -10515,6 +10618,7 @@ "en": "Sirionó", "es": "sirionó", "fr": "sirionó", + "gl": "Lingnua sirionó", "ja": "シリオノ語", "nb_NO": "sirionó", "nl": "Sirionó", @@ -10535,12 +10639,12 @@ "eo": "svazia lingvo", "es": "suazi", "eu": "swaziera", - "fi": "swazin kieli", + "fi": "swazi", "fr": "swati", "gl": "Lingua suazi", "he": "סווזי", "hu": "szvázi", - "id": "Bahasa Swati", + "id": "Swazi", "it": "swati", "ja": "スワジ語", "nb_NO": "swazi", @@ -10549,8 +10653,9 @@ "pt": "língua suázi", "pt_BR": "língua suázi", "ru": "свати", + "sl": "svazijščina", "sv": "siswati", - "zh_Hans": "斯威士语", + "zh_Hans": "斯瓦蒂语", "zh_Hant": "史瓦濟語", "_meta": { "countries": [ @@ -10571,12 +10676,12 @@ "eo": "sota lingvo", "es": "sesotho", "eu": "sothoera", - "fi": "eteläsothon kieli", + "fi": "eteläsotho", "fr": "sotho du Sud", "gl": "Lingua sotho", "he": "ססוטו", "hu": "déli szoto", - "id": "Bahasa Sesotho", + "id": "Sotho", "it": "sotho del sud", "ja": "ソト語", "nb_NO": "sotho", @@ -10587,6 +10692,7 @@ "ru": "сесото", "sl": "sesotščina", "sv": "sesotho", + "zh_Hant": "索托語", "_meta": { "countries": [ "LS", @@ -10609,7 +10715,7 @@ "fr": "shelta", "gl": "Shelta", "he": "שלטה", - "id": "bahasa Shelta", + "id": "Shelta", "it": "lingua shelta", "ja": "シェルタ語", "nb_NO": "Shelta", @@ -10618,6 +10724,7 @@ "pt": "Língua shelta", "ru": "шелта", "sv": "shelta", + "zh_Hant": "雪爾塔語", "_meta": { "dir": [ "left-to-right" @@ -10644,6 +10751,7 @@ "pl": "Język fryzyjski saterlandzki", "pt": "frisão oriental", "ru": "Затерландский фризский язык", + "sl": "saterska frizijščina", "sv": "saterfrisiska", "zh_Hans": "萨特弗里斯兰语", "zh_Hant": "薩特菲士蘭語", @@ -10667,7 +10775,7 @@ "gl": "Sunda", "he": "סונדנזית", "hu": "szundai", - "id": "Sunda", + "id": "bahasa Sunda", "it": "sunda", "ja": "スンダ語", "nb_NO": "sundanesisk", @@ -10678,6 +10786,8 @@ "ru": "сунданский язык", "sl": "sundanščina", "sv": "sunda", + "zh_Hans": "巽他语", + "zh_Hant": "巽他語", "_meta": { "dir": [ "left-to-right" @@ -10735,7 +10845,7 @@ "gl": "Lingua suahili", "he": "סוואהילי", "hu": "szuahéli", - "id": "Bahasa Swahili", + "id": "Swahili", "it": "swahili", "ja": "スワヒリ語", "nb_NO": "swahili", @@ -10744,8 +10854,9 @@ "pt": "Língua suaíli", "pt_BR": "língua suaíli", "ru": "суахили", - "sl": "Svahili", + "sl": "svahili", "sv": "swahili", + "zh_Hans": "斯瓦希里语", "zh_Hant": "史瓦希利語", "_meta": { "countries": [ @@ -10755,12 +10866,13 @@ "UG" ], "dir": [ - "left-to-right", - "right-to-left" + "left-to-right" ] } }, "syl": { + "ca": "sileti", + "cs": "Silotčtina", "de": "Sylheti", "en": "Sylheti", "es": "Idioma sylheti", @@ -10768,12 +10880,16 @@ "fr": "sylheti", "gl": "Lingua sylheti", "he": "סילהטית", - "it": "lingua silotica", + "hu": "sziloti", + "id": "Sylhet", + "it": "silotese", "ja": "シレット語", "nb_NO": "Sylhetti", "nl": "Sylheti", "pl": "język syloti", + "pt": "Siroto", "ru": "силхетский язык", + "sl": "silhetščina", "sv": "syloti", "zh_Hans": "锡尔赫特语", "zh_Hant": "錫爾赫特語", @@ -10797,7 +10913,7 @@ "gl": "Lingua silesiana", "he": "שלזית", "hu": "sziléziai", - "id": "bahasa Silesia", + "id": "Silesia", "it": "slesiano", "ja": "シレジア語", "nb_NO": "schlesisk", @@ -10807,6 +10923,8 @@ "ru": "силезский язык", "sl": "šlezijščina", "sv": "schlesiska", + "zh_Hans": "西里西亚语", + "zh_Hant": "西里西亞語", "_meta": { "dir": [ "left-to-right" @@ -10817,6 +10935,7 @@ "ca": "sakizaya", "cs": "sakizayština", "en": "Sakizaya", + "fi": "sakizaya", "fr": "sakizaya", "gl": "Lingua sakizaya", "id": "Bahasa Sakizaya", @@ -10846,7 +10965,7 @@ "gl": "Lingua támil", "he": "טמילית", "hu": "tamil", - "id": "Bahasa Tamil", + "id": "Tamil", "it": "tamil", "ja": "タミル語", "nb_NO": "tamilsk", @@ -10880,12 +10999,13 @@ "fr": "atayal", "gl": "Lingua atayal", "hu": "atajal", - "id": "Bahasa Atayal", + "id": "Atayal", "it": "lingua atayal", "ja": "タイヤル語", "nl": "Atayal", "pt": "Língua atayal", "ru": "атаяльский язык", + "sl": "atajalščina", "sv": "atayal", "zh_Hans": "泰雅语", "zh_Hant": "泰雅語", @@ -10903,7 +11023,7 @@ "eo": "tulua lingvo", "es": "tulu", "eu": "Tulu", - "fi": "Tulun kieli", + "fi": "tulu", "fr": "toulou", "gl": "Lingua tulu", "he": "טולו", @@ -10964,12 +11084,12 @@ "eo": "tetuna lingvo", "es": "Idioma tetun", "eu": "Tetum", - "fi": "Tetumin kieli", + "fi": "tetum", "fr": "tétoum", "gl": "Tetún", "he": "טטום", "hu": "tetum", - "id": "Tetum", + "id": "Tetun", "it": "tetum", "ja": "テトゥン語", "nb_NO": "tetum", @@ -10977,6 +11097,7 @@ "pl": "język tetum", "pt": "língua tétum", "ru": "тетум", + "sl": "tetumščina", "sv": "tetum", "_meta": { "dir": [ @@ -10998,7 +11119,7 @@ "gl": "Lingua taxica", "he": "טג'יקית", "hu": "tádzsik", - "id": "Tajik", + "id": "bahasa Tajik", "it": "tagico", "ja": "タジク語", "nb_NO": "tadsjikisk", @@ -11009,6 +11130,8 @@ "ru": "таджикский язык", "sl": "tadžiščina", "sv": "tadzjikiska", + "zh_Hans": "塔吉克语", + "zh_Hant": "塔吉克語", "_meta": { "countries": [ "TJ" @@ -11028,7 +11151,7 @@ "eo": "taja lingvo", "es": "tailandés", "eu": "Thailandiera", - "fi": "thain kieli", + "fi": "thai", "fr": "thaï", "gl": "lingua tailandesa", "he": "תאית", @@ -11044,6 +11167,7 @@ "ru": "тайский язык", "sl": "tajščina", "sv": "thai", + "zgh": "ⵜⵓⵜⵍⴰⵢⵜ ⵜⴰⵜⴰⵢⵍⴰⵏⴷⵉⵜ", "zh_Hans": "泰语", "zh_Hant": "泰語", "_meta": { @@ -11069,7 +11193,7 @@ "gl": "Lingua tigriña", "he": "תיגרינית", "hu": "tigrinya", - "id": "Bahasa Tigrinya", + "id": "Tigrinya", "it": "tigrino", "ja": "ティグリニャ語", "nb_NO": "tigrinja", @@ -11077,8 +11201,9 @@ "pl": "Język tigrinia", "pt": "Língua tigrínia", "ru": "тигринья", - "sl": "Tigrajščina", + "sl": "tigrinjščina", "sv": "tigrinska", + "zh_Hans": "提格雷尼亚语", "zh_Hant": "提格利尼亞語", "_meta": { "countries": [ @@ -11103,7 +11228,7 @@ "gl": "Lingua turcomá", "he": "טורקמנית", "hu": "türkmén", - "id": "bahasa Turkmen", + "id": "Turkmen", "it": "Turkmeno", "ja": "トルクメン語", "nb_NO": "turkmensk", @@ -11112,7 +11237,7 @@ "pt": "Língua turcomena", "pt_BR": "Língua turcomena", "ru": "туркменский язык", - "sl": "Turkmenščina", + "sl": "turkmenščina", "sv": "turkmeniska", "_meta": { "countries": [ @@ -11163,19 +11288,21 @@ "en": "Tlingit", "eo": "Tlingita", "es": "tlingit", - "fi": "Tlingit", + "fi": "tlingit", "fr": "tlingit", "hu": "tlingit", "id": "Bahasa Tlingit", "it": "lingua tlingit", "ja": "トリンギット語", - "nb_NO": "Tlingit", + "nb_NO": "tlingit", "nl": "Tlingit", "pl": "Język tlingit", "pt": "Língua tlingit", "pt_BR": "Língua tlingit", - "ru": "Тлингитский язык", + "ru": "тлингитский язык", + "sl": "tlingitščina", "sv": "tlingit", + "zh_Hant": "特林吉特語", "_meta": { "dir": [ "left-to-right" @@ -11184,12 +11311,13 @@ }, "tly": { "ca": "talixi", + "cs": "talyština", "de": "Talisch", "en": "Talysh", "eo": "taliŝa lingvo", "es": "talishi", "eu": "Talyshera", - "fi": "Tališin kieli", + "fi": "tališi", "fr": "talysh", "gl": "Lingua talysh", "he": "טליש", @@ -11201,6 +11329,7 @@ "pl": "język tałyski", "pt": "Língua talish", "ru": "талышский язык", + "sl": "tališčina", "sv": "talysj", "_meta": { "dir": [ @@ -11218,7 +11347,7 @@ "eo": "cvana lingvo", "es": "setsuana", "eu": "tswanera", - "fi": "tswanan kieli", + "fi": "tswana", "fr": "tswana", "gl": "Lingua tswana", "he": "סצוואנה", @@ -11234,6 +11363,7 @@ "ru": "тсвана", "sl": "cvanščina", "sv": "setswana", + "zh_Hans": "茨瓦纳语", "zh_Hant": "札那語", "_meta": { "countries": [ @@ -11245,39 +11375,6 @@ ] } }, - "to": { - "ca": "tongalès", - "cs": "tongánština", - "da": "tongansk", - "de": "Tongaisch", - "en": "Tongan", - "eo": "Tonga lingvo", - "es": "tongano", - "eu": "Tongera", - "fi": "Tongan kieli", - "fr": "tongien", - "gl": "Lingua tongana", - "he": "טונגאית", - "hu": "tongai", - "id": "Bahasa Tonga", - "it": "tongano", - "ja": "トンガ語", - "nb_NO": "Tongansk", - "nl": "Tongaans", - "pl": "Język tonga", - "pt": "Língua tonganesa", - "ru": "тонганский язык", - "sl": "tongovščina", - "sv": "tonganska", - "_meta": { - "countries": [ - "TO" - ], - "dir": [ - "left-to-right" - ] - } - }, "tpi": { "ca": "tok pisin", "cs": "Tok Pisin", @@ -11319,7 +11416,9 @@ "pl": "Turoyo", "pt": "Língua turoyo", "ru": "Туройо", + "sl": "turojoščina", "sv": "turoyo", + "zh_Hant": "圖羅尤語", "_meta": { "dir": [ "left-to-right", @@ -11329,10 +11428,10 @@ }, "trv": { "ca": "seediq", - "cs": "Seediq", + "cs": "seedičtina", "en": "Seediq", "eo": "sedeka lingvo", - "fi": "Taroko", + "fi": "taroko", "fr": "seediq", "gl": "Lingua seediq", "id": "Bahasa Seediq", @@ -11358,7 +11457,7 @@ "eo": "conga lingvo", "es": "tsonga", "eu": "tsongera", - "fi": "tsongan kieli", + "fi": "tsonga", "fr": "tsonga", "gl": "Lingua tsonga", "he": "צונגה", @@ -11372,6 +11471,7 @@ "pt": "língua tsonga", "pt_BR": "língua tsonga", "ru": "тсонга", + "sl": "tsonga", "sv": "tsonga", "zh_Hans": "聪加语", "zh_Hant": "聰加語", @@ -11408,7 +11508,7 @@ "pt": "Língua tártara", "pt_BR": "Língua tártara", "ru": "татарский язык", - "sl": "Tatarščina", + "sl": "tatarščina", "sv": "tatariska", "zh_Hans": "鞑靼语", "zh_Hant": "韃靼語", @@ -11418,13 +11518,44 @@ ] } }, + "tu": { + "ca": "àrab tunisià", + "cs": "tuniština", + "da": "Tunesisk arabisk", + "de": "Tunesisch-Arabisch", + "en": "Tunisian Arabic", + "eo": "tunizia araba lingvo", + "es": "árabe tunecino", + "fi": "tunisianarabia", + "fr": "arabe tunisien", + "he": "ערבית תוניסאית", + "id": "Bahasa Arab Tunisia", + "it": "arabo tunisino", + "ja": "アラビア語チュニジア方言", + "nb_NO": "tunisisk arabisk", + "nl": "Tunesisch-Arabisch", + "pl": "tunezyjski", + "pt": "árabe tunisino", + "pt_BR": "Árabe tunisino", + "ru": "Тунисский диалект арабского языка", + "sl": "tunizijska arabščina", + "sv": "tunisisk arabiska", + "zh_Hans": "突尼斯阿拉伯语", + "zh_Hant": "突尼西亞阿拉伯語", + "_meta": { + "dir": [ + "left-to-right", + "right-to-left" + ] + } + }, "tum": { "ca": "tumbuka", "de": "Tumbuka", "en": "Tumbuka", "eo": "tumbuka lingvo", "es": "Idioma tumbuka", - "fi": "Tumbuka", + "fi": "tumbuka", "fr": "tumbuka", "gl": "Lingua tumbuka", "he": "שפת טומבוקה", @@ -11435,6 +11566,7 @@ "pl": "Język tumbuka", "pt": "Língua tumbuka", "ru": "Тумбука", + "sl": "tumbuščina", "sv": "tumbuka", "_meta": { "dir": [ @@ -11455,7 +11587,7 @@ "gl": "Lingua tuvalesa", "he": "טובאלית", "hu": "tuvalui", - "id": "Bahasa Tuvalu", + "id": "Tuvalu", "it": "lingua tuvaluana", "ja": "ツバル語", "nb_NO": "tuvalsk", @@ -11464,6 +11596,7 @@ "pt": "Língua tuvaluana", "pt_BR": "Língua tuvaluana", "ru": "тувалу", + "sl": "tuvalujščina", "sv": "tuvaluanska", "_meta": { "dir": [ @@ -11493,7 +11626,9 @@ "pt": "Língua twi", "pt_BR": "Língua twi", "ru": "чви", + "sl": "tvijščina", "sv": "twi", + "zh_Hant": "契維語", "_meta": { "dir": [ "left-to-right" @@ -11540,7 +11675,7 @@ "eo": "tuva lingvo", "es": "idioma tuvano", "eu": "Tuvera", - "fi": "tuvan kieli", + "fi": "tuva", "fr": "touvain", "gl": "Lingua tuvaniana", "he": "טובאנית", @@ -11554,7 +11689,9 @@ "pt": "Língua tuviniana", "pt_BR": "Língua tuviniana", "ru": "тувинский язык", + "sl": "tuvanščina", "sv": "tuvinska", + "zh_Hans": "图瓦语", "_meta": { "dir": [ "left-to-right" @@ -11575,15 +11712,15 @@ "nl": "Centraal Atlas-Tamazight", "pl": "Język tamazight", "ru": "Тамазигхтские языки", + "sl": "centralnoatlaški tamazigt", "sv": "tamazight", + "zgh": "ⵜⴰⵎⴰⵣⵉⵖⵜ ⵏ ⵡⴰⵟⵍⴰⵚ ⴰⵏⴰⵎⵎⴰⵙ", "zh_Hans": "中阿特拉斯柏柏尔语", "zh_Hant": "中阿特拉斯柏柏語", "_meta": { "dir": [ "right-to-left", - "left-to-right", - "top-to-bottom", - "bottom-to-top" + "left-to-right" ] } }, @@ -11596,12 +11733,12 @@ "eo": "udmurta lingvo", "es": "udmurto", "eu": "Udmurtera", - "fi": "udmurtin kieli", + "fi": "udmurtti", "fr": "oudmourte", "gl": "Lingua udmurta", "he": "אודמורטית", "hu": "udmurt", - "id": "Bahasa Udmurt", + "id": "Udmurt", "it": "udmurto", "ja": "ウドムルト語", "nb_NO": "udmurtisk", @@ -11610,6 +11747,7 @@ "pt": "Língua udmurte", "pt_BR": "Língua udmurte", "ru": "удмуртский язык", + "sl": "udmurtščina", "sv": "udmurtiska", "_meta": { "dir": [ @@ -11631,7 +11769,7 @@ "gl": "Lingua uigur", "he": "אויגורית", "hu": "ujgur", - "id": "bahasa Uyghur", + "id": "Uighur", "it": "uiguro", "ja": "ウイグル語", "nb_NO": "uigurisk", @@ -11701,7 +11839,7 @@ "gl": "Lingua usbeka", "he": "אוזבקית", "hu": "üzbég", - "id": "bahasa Uzbek", + "id": "Uzbek", "it": "uzbeco", "ja": "ウズベク語", "nb_NO": "usbekisk", @@ -11730,6 +11868,7 @@ "en": "Southern Uzbek", "eo": "sud-uzbeka lingvo", "fr": "ouzbek du Sud", + "id": "Uzbek Selatan", "ru": "Южноузбекский язык", "sv": "syduzbekiska", "zh_Hans": "南乌兹别克语", @@ -11747,7 +11886,7 @@ "eo": "venda lingvo", "es": "venda", "eu": "vendera", - "fi": "vendan kieli", + "fi": "venda", "fr": "venda", "gl": "Lingua venda", "he": "ונדה", @@ -11761,6 +11900,7 @@ "pt": "língua venda", "pt_BR": "língua venda", "ru": "венда", + "sl": "vendščina", "sv": "venda", "zh_Hans": "文达语", "zh_Hant": "文達語", @@ -11820,15 +11960,16 @@ "gl": "Lingua vepsa", "he": "ופס", "hu": "vepsze", - "id": "Bahasa Veps", + "id": "Veps", "it": "vepso", "ja": "ヴェプス語", "nb_NO": "vepsisk", "nl": "Wepsisch", "pl": "język wepski", - "pt": "Língua vepes", + "pt": "língua vepes", "pt_BR": "Língua vepes", "ru": "вепсский язык", + "sl": "vepščina", "sv": "vepsiska", "zh_Hans": "维普斯语", "zh_Hant": "維普斯語", @@ -11852,7 +11993,7 @@ "gl": "Lingua vietnamita", "he": "וייטנאמית", "hu": "vietnámi", - "id": "Vietnam", + "id": "bahasa Vietnam", "it": "vietnamita", "ja": "ベトナム語", "nb_NO": "vietnamesisk", @@ -11884,6 +12025,7 @@ "fi": "länsiflaami", "fr": "flamand occidental", "gl": "Flamengo occidental", + "he": "פלמית מערבית", "id": "Flam Barat", "it": "dialetto fiammingo occidentale", "ja": "西フラマン語", @@ -11910,6 +12052,7 @@ "ja": "マインフランク語", "nl": "Mainfrankisch", "ru": "Майнфранкские диалекты", + "sl": "majnskofrankovska namščina", "sv": "Main-frankiska", "_meta": { "dir": [ @@ -11937,6 +12080,7 @@ "pl": "Język wotycki", "pt": "vótico", "ru": "водский язык", + "sl": "votščina", "sv": "votiska", "zh_Hans": "瓦佳语", "zh_Hant": "瓦佳語", @@ -11957,8 +12101,9 @@ "fi": "võro", "fr": "võro", "gl": "Lingua võro", + "he": "וירו", "hu": "võro", - "id": "Bahasa Võro", + "id": "Võro", "it": "võro", "ja": "ヴォロ語", "nb_NO": "sørestisk", @@ -11966,6 +12111,7 @@ "pl": "język võro", "pt": "Língua võro", "ru": "выруский диалект", + "sl": "võro", "sv": "võro", "zh_Hans": "沃罗语", "_meta": { @@ -11983,12 +12129,12 @@ "eo": "valona lingvo", "es": "valón", "eu": "Valoniera", - "fi": "Valloni", + "fi": "valloni", "fr": "wallon", "gl": "Lingua valoa", "he": "ולונית", "hu": "vallon nyelv", - "id": "Bahasa Walloon", + "id": "bahasa Walonia", "it": "vallone", "ja": "ワロン語", "nb_NO": "vallonsk", @@ -12005,14 +12151,16 @@ } }, "wal": { + "ca": "wolayta", "de": "Wolaytta", - "en": "Wolaytta", + "en": "Wolayttattuwa", "es": "Idioma wolayta", "fi": "Wolaitta", "fr": "wolaita", "he": "וולאיטה", "it": "lingua wolaytta", "ja": "ウォライタ語", + "nb_NO": "Wolayttattuwa", "nl": "Wolayta", "pt": "Língua wolaytta", "ru": "Воламо", @@ -12033,11 +12181,11 @@ "es": "samareño", "eu": "samarera", "fi": "waray-waray", - "fr": "ouarayen", + "fr": "waray-waray", "gl": "Lingua waray-waray", "he": "ואריי-ואריי", "hu": "waray", - "id": "Bahasa Waray-waray", + "id": "Waray", "it": "waray-waray", "ja": "ワライ語", "nb_NO": "waray-waray", @@ -12046,7 +12194,9 @@ "pt": "língua waray-waray", "pt_BR": "Língua waray-waray", "ru": "варайский язык", + "sl": "varajščina", "sv": "waray-waray", + "zh_Hant": "瓦瑞語", "_meta": { "dir": [ "left-to-right" @@ -12071,6 +12221,7 @@ "pt": "Língua wakhi", "pt_BR": "Língua wakhi", "ru": "Ваханский язык", + "sl": "vahijščina", "sv": "wakhí", "_meta": { "dir": [ @@ -12088,12 +12239,12 @@ "eo": "soraba lingvo", "es": "sorbio", "eu": "Sorabiera", - "fi": "Sorbi", + "fi": "sorbi", "fr": "sorabe", "gl": "Lingua sorabia", "he": "שפות סורביות", "hu": "szorb", - "id": "Bahasa Sorbia", + "id": "Sorbia", "it": "sorabo", "ja": "ソルブ語", "nb_NO": "sorbisk", @@ -12124,6 +12275,7 @@ "pl": "Język uvea wschodni", "pt": "Língua wallisiana", "ru": "Уоллисский язык", + "sl": "vališčina", "sv": "walliska", "_meta": { "dir": [ @@ -12140,7 +12292,7 @@ "eo": "volofa lingvo", "es": "wólof", "eu": "Wolofera", - "fi": "wolofin kieli", + "fi": "wolof", "fr": "wolof", "gl": "lingua wolof", "he": "וולופית", @@ -12151,10 +12303,11 @@ "nb_NO": "wolof", "nl": "Wolof", "pl": "język wolof", - "pt": "Língua wolof", + "pt": "Língua uolofe", "ru": "волоф", "sl": "volofščina", "sv": "wolof", + "zh_Hant": "沃洛夫語", "_meta": { "countries": [ "SN" @@ -12173,7 +12326,7 @@ "eo": "vua lingvo", "es": "Chino wu", "eu": "Wu txinera", - "fi": "Wu-kiina", + "fi": "wu-kiina", "fr": "wu", "gl": "Lingua wu", "he": "סינית וו", @@ -12190,7 +12343,7 @@ "zh_Hant": "吳語", "_meta": { "dir": [ - "top-to-bottom" + "vertical right-to-left" ] } }, @@ -12199,7 +12352,7 @@ "cs": "vilamovština", "da": "vimisørisk", "de": "Wilmesaurisch", - "en": "Vilamovian", + "en": "Wymysorys", "eo": "vilamovica lingvo", "es": "vilamoviciano", "eu": "Wymysorys", @@ -12217,6 +12370,7 @@ "pt_BR": "Wymysorys", "ru": "вилямовский язык", "sv": "wymysöriska", + "zh_Hant": "維拉莫維安語", "_meta": { "dir": [ "left-to-right" @@ -12225,19 +12379,19 @@ }, "xh": { "ca": "xosa", - "cs": "Xhoština", + "cs": "xhoština", "da": "isiXhosa", "de": "IsiXhosa", "en": "Xhosa", "eo": "kosa lingvo", "es": "xhosa", "eu": "xhosera", - "fi": "xhosan kieli", + "fi": "xhosa", "fr": "xhosa", "gl": "Lingua xhosa", "he": "קוסה", "hu": "xhosza", - "id": "Bahasa Xhosa", + "id": "Xhosa", "it": "xhosa", "ja": "コサ語", "nb_NO": "xhosa", @@ -12281,6 +12435,7 @@ "pt": "Língua mingreliana", "pt_BR": "Língua mingreliana", "ru": "мегрельский язык", + "sl": "mingrelščina", "sv": "megreliska", "_meta": { "dir": [ @@ -12288,6 +12443,24 @@ ] } }, + "xsy": { + "ca": "saisiyat", + "en": "Saisiyat", + "fr": "saisiyat", + "id": "Saisiyat", + "it": "lingua saisiyat", + "ja": "サイシャット語", + "nl": "Saisiyat", + "pt": "Língua saisiyat", + "sv": "saisiyat", + "zh_Hans": "赛夏语", + "zh_Hant": "賽夏語", + "_meta": { + "dir": [ + "left-to-right" + ] + } + }, "yai": { "cs": "jaghnóbština", "de": "Jaghnobi", @@ -12306,6 +12479,7 @@ "pt": "Língua yaghnobi", "ru": "ягнобский язык", "sv": "yaghnobi", + "zh_Hant": "亞爾諾比語", "_meta": { "dir": [ "left-to-right" @@ -12359,6 +12533,7 @@ "nl": "Jenisch", "pt": "Língua yeniche", "ru": "Енишский язык", + "sl": "jeniščina", "sv": "jeniska", "_meta": { "dir": [ @@ -12406,7 +12581,7 @@ "eo": "joruba lingvo", "es": "yoruba", "eu": "jorubera", - "fi": "joruban kieli", + "fi": "joruba", "fr": "yoruba", "gl": "Lingua yoruba", "he": "יורובה", @@ -12421,6 +12596,7 @@ "ru": "йоруба", "sl": "jorubščina", "sv": "yoruba", + "zh_Hans": "约鲁巴语", "zh_Hant": "約魯巴語", "_meta": { "dir": [ @@ -12434,11 +12610,13 @@ "es": "yonaguni", "eu": "yonaguniera", "fr": "yonaguni", + "gl": "Lingua yonaguni", "id": "Bahasa Yonaguni", "it": "yonaguni", - "ja": "与那国方言", + "ja": "与那国語", "pt": "Língua Yonaguni", "ru": "Йонагунский язык", + "sl": "jonagunščina", "sv": "yonaguni", "zh_Hant": "與那國語", "_meta": { @@ -12467,6 +12645,7 @@ "nl": "Nenets", "pl": "język nieniecki", "ru": "ненецкий язык", + "sl": "nenščina", "sv": "nentsiska", "zh_Hans": "涅涅茨语", "zh_Hant": "涅涅茨語", @@ -12507,7 +12686,7 @@ "eo": "ĝuanga lingvo", "es": "chuang", "eu": "zhuangera", - "fi": "Zhuangin kieli", + "fi": "zhuang", "fr": "zhuang", "gl": "Linguas zhuang", "he": "ג'ואנג", @@ -12520,6 +12699,7 @@ "pl": "język zhuang", "pt": "Língua zhuang", "ru": "чжуанский язык", + "sl": "džuanski jeziki", "sv": "zhuang", "zh_Hans": "壮语", "zh_Hant": "壯語", @@ -12535,6 +12715,7 @@ "en": "Zeelandic", "eo": "zelanda lingvo", "es": "zelandés", + "fi": "seelanti", "fr": "zélandais", "gl": "Lingua zelandesa", "he": "זילנדית", @@ -12545,6 +12726,7 @@ "pl": "dialekt zelandzki", "pt": "zeêuws", "ru": "зеландский диалект", + "sl": "zelandščina", "sv": "zeeländska", "zh_Hans": "西兰语", "zh_Hant": "西蘭語", @@ -12556,18 +12738,19 @@ }, "zgh": { "ca": "amazic estàndard marroquí", - "de": "marokkanisches Tamazight", - "en": "Standard Moroccan Berber", + "de": "marokkanisches Amazigh", + "en": "Standard Moroccan Amazigh", "eo": "norma maroka tamaziĥta lingvo", "es": "Amazig estándar marroquí", - "fi": "Vakioitu tamazight", + "fi": "vakioitu tamazight", "fr": "amazighe standard marocain", "gl": "Amazigh estándar marroquí", "ja": "標準モロッコ・タマジクト語", - "nl": "Standaardtamazight", + "nl": "Standaard Amazigh", "ru": "Стандартный марокканский берберский язык", "sl": "knjižna maroška berberščina", "sv": "marockansk standardberbiska", + "zgh": "ⵜⴰⵎⴰⵣⵉⵖⵜ ⵜⴰⵏⴰⵡⴰⵢⵜ ⵜⴰⵎⵖⵔⵉⴱⵉⵜ", "zh_Hans": "标准摩洛哥柏柏尔语", "zh_Hant": "標準摩洛哥柏柏語", "_meta": { @@ -12601,6 +12784,7 @@ "ru": "китайский язык", "sl": "kitajščina", "sv": "kinesiska", + "zgh": "ⵜⵓⵜⵍⴰⵢⵜ ⵜⴰⵛⵉⵏⵡⵉⵜ", "zh_Hans": "中文", "zh_Hant": "漢語", "_meta": { @@ -12608,8 +12792,8 @@ "CN" ], "dir": [ - "left-to-right", - "top-to-bottom" + "vertical right-to-left", + "left-to-right" ] } }, @@ -12622,7 +12806,7 @@ "eo": "minnana lingvo", "es": "chino min nan", "eu": "hegoaldeko min", - "fi": "Minnan", + "fi": "minnan", "fr": "minnan", "gl": "lingua min nam", "he": "מין דרומי", @@ -12642,7 +12826,7 @@ "zh_Hant": "閩南語", "_meta": { "dir": [ - "top-to-bottom" + "vertical right-to-left" ] } }, @@ -12659,7 +12843,7 @@ "gl": "chinés simplificado", "he": "סינית מפושטת", "hu": "egyszerűsített kínai", - "id": "aksara Han sederhana", + "id": "Tionghoa Sederhana", "it": "cinese semplificato", "ja": "簡体字中国語", "nb_NO": "forenklet kinesisk", @@ -12685,11 +12869,12 @@ "en": "Traditional Chinese", "eo": "ĉina lingvo de tradicia ortografio", "es": "chino tradicional", - "eu": "Txinera tradizional", + "eu": "txinera tradizional", "fi": "perinteinen kiina", "fr": "chinois traditionnel", "gl": "chinés tradicional", "he": "סינית מסורתית", + "id": "Tionghoa Tradisional", "it": "cinese tradizionale", "ja": "繁体字中国語", "nb_NO": "tradisjonell kinesisk", @@ -12721,7 +12906,7 @@ "gl": "Lingua zulú", "he": "זולו", "hu": "zulu", - "id": "Bahasa Zulu", + "id": "Zulu", "it": "zulu", "ja": "ズールー語", "nb_NO": "zulu", diff --git a/src/assets/schemas/layerconfigmeta.json b/src/assets/schemas/layerconfigmeta.json index 827158020..382725e36 100644 --- a/src/assets/schemas/layerconfigmeta.json +++ b/src/assets/schemas/layerconfigmeta.json @@ -1808,6 +1808,11 @@ "then": "home", "icon": "home" }, + { + "if": "value=key", + "then": "key", + "icon": "key" + }, { "if": "value=invalid", "then": "invalid", @@ -1838,6 +1843,11 @@ "then": "location_locked", "icon": "location_locked" }, + { + "if": "value=lock", + "then": "lock", + "icon": "lock" + }, { "if": "value=mastodon", "then": "mastodon", @@ -10425,6 +10435,10 @@ "if": "value=car_rental", "then": "car_rental - Places where you can rent a car" }, + { + "if": "value=caravansites", + "then": "caravansites - camper sites" + }, { "if": "value=charging_station", "then": "charging_station - A charging station" @@ -10513,6 +10527,10 @@ "if": "value=drinking_water", "then": "drinking_water - A layer showing drinking water fountains" }, + { + "if": "value=dumpstations", + "then": "dumpstations - Sanitary dump stations" + }, { "if": "value=elevator", "then": "elevator - This layer show elevators and asks for operational status and elevator dimensions. Useful for wheelchair accessibility information" diff --git a/src/assets/schemas/layoutconfigmeta.json b/src/assets/schemas/layoutconfigmeta.json index aaa6773a4..4a133d5f8 100644 --- a/src/assets/schemas/layoutconfigmeta.json +++ b/src/assets/schemas/layoutconfigmeta.json @@ -227,6 +227,11 @@ "then": "home", "icon": "home" }, + { + "if": "value=key", + "then": "key", + "icon": "key" + }, { "if": "value=invalid", "then": "invalid", @@ -257,6 +262,11 @@ "then": "location_locked", "icon": "location_locked" }, + { + "if": "value=lock", + "then": "lock", + "icon": "lock" + }, { "if": "value=mastodon", "then": "mastodon", @@ -654,6 +664,10 @@ "if": "value=car_rental", "then": "car_rental (builtin) - Places where you can rent a car" }, + { + "if": "value=caravansites", + "then": "caravansites (builtin) - camper sites" + }, { "if": "value=charging_station", "then": "charging_station (builtin) - A charging station" @@ -742,6 +756,10 @@ "if": "value=drinking_water", "then": "drinking_water (builtin) - A layer showing drinking water fountains" }, + { + "if": "value=dumpstations", + "then": "dumpstations (builtin) - Sanitary dump stations" + }, { "if": "value=elevator", "then": "elevator (builtin) - This layer show elevators and asks for operational status and elevator dimensions. Useful for wheelchair accessibility information" @@ -4065,6 +4083,11 @@ "then": "home", "icon": "home" }, + { + "if": "value=key", + "then": "key", + "icon": "key" + }, { "if": "value=invalid", "then": "invalid", @@ -4095,6 +4118,11 @@ "then": "location_locked", "icon": "location_locked" }, + { + "if": "value=lock", + "then": "lock", + "icon": "lock" + }, { "if": "value=mastodon", "then": "mastodon", @@ -12957,6 +12985,10 @@ "if": "value=car_rental", "then": "car_rental - Places where you can rent a car" }, + { + "if": "value=caravansites", + "then": "caravansites - camper sites" + }, { "if": "value=charging_station", "then": "charging_station - A charging station" @@ -13045,6 +13077,10 @@ "if": "value=drinking_water", "then": "drinking_water - A layer showing drinking water fountains" }, + { + "if": "value=dumpstations", + "then": "dumpstations - Sanitary dump stations" + }, { "if": "value=elevator", "then": "elevator - This layer show elevators and asks for operational status and elevator dimensions. Useful for wheelchair accessibility information" @@ -25028,6 +25064,11 @@ "then": "home", "icon": "home" }, + { + "if": "value=key", + "then": "key", + "icon": "key" + }, { "if": "value=invalid", "then": "invalid", @@ -25058,6 +25099,11 @@ "then": "location_locked", "icon": "location_locked" }, + { + "if": "value=lock", + "then": "lock", + "icon": "lock" + }, { "if": "value=mastodon", "then": "mastodon", @@ -34195,6 +34241,10 @@ "if": "value=car_rental", "then": "car_rental - Places where you can rent a car" }, + { + "if": "value=caravansites", + "then": "caravansites - camper sites" + }, { "if": "value=charging_station", "then": "charging_station - A charging station" @@ -34283,6 +34333,10 @@ "if": "value=drinking_water", "then": "drinking_water - A layer showing drinking water fountains" }, + { + "if": "value=dumpstations", + "then": "dumpstations - Sanitary dump stations" + }, { "if": "value=elevator", "then": "elevator - This layer show elevators and asks for operational status and elevator dimensions. Useful for wheelchair accessibility information" diff --git a/src/assets/svg/Snap.svelte b/src/assets/svg/Snap.svelte new file mode 100644 index 000000000..3ce3aff48 --- /dev/null +++ b/src/assets/svg/Snap.svelte @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/src/assets/translators.json b/src/assets/translators.json index bb31b75c7..44083f58f 100644 --- a/src/assets/translators.json +++ b/src/assets/translators.json @@ -1,11 +1,11 @@ { "contributors": [ { - "commits": 391, + "commits": 478, "contributor": "Pieter Vander Vennet" }, { - "commits": 356, + "commits": 368, "contributor": "kjon" }, { @@ -17,7 +17,7 @@ "contributor": "Allan Nordhøy" }, { - "commits": 84, + "commits": 91, "contributor": "mcliquid" }, { @@ -52,6 +52,10 @@ "commits": 32, "contributor": "Babos Gábor" }, + { + "commits": 30, + "contributor": "gallegonovato" + }, { "commits": 29, "contributor": "Artem" @@ -64,10 +68,6 @@ "commits": 25, "contributor": "SC" }, - { - "commits": 24, - "contributor": "gallegonovato" - }, { "commits": 23, "contributor": "Marco" @@ -400,6 +400,10 @@ "commits": 3, "contributor": "SiegbjornSitumeang" }, + { + "commits": 2, + "contributor": "Thomas" + }, { "commits": 2, "contributor": "Beardhatcode" diff --git a/src/service-worker.ts b/src/service-worker.ts index a0f1140f8..73dc590b8 100644 --- a/src/service-worker.ts +++ b/src/service-worker.ts @@ -41,42 +41,29 @@ async function cacheFirst(event: ServiceWorkerFetchEvent, attemptUpdate: boolean fetchAndCache(event) } return cacheResponse - } -const neverCache: RegExp[] = [ - /\.html$/, - /service-worker/ -] -const neverCacheHost : RegExp[] = [ - /127\.0\.0\.[0-9]+/, - /\.local/, - /\.gitpod\.io/, - /localhost/ -] +const neverCache: RegExp[] = [/\.html$/, /service-worker/] +const neverCacheHost: RegExp[] = [/127\.0\.0\.[0-9]+/, /\.local/, /\.gitpod\.io/, /localhost/] async function handleRequest(event: ServiceWorkerFetchEvent) { const origin = new URL(self.origin) const requestUrl = new URL(event.request.url) if (requestUrl.pathname.endsWith("service-worker-version")) { console.log("Sending version number...") - await event.respondWith( - new Response(JSON.stringify({ "service-worker-version": version })), - ) + await event.respondWith(new Response(JSON.stringify({ "service-worker-version": version }))) return } if (requestUrl.pathname.endsWith("/service-worker-clear")) { await clearCaches() - await event.respondWith( - new Response(JSON.stringify({ "cache-cleared": true })), - ) + await event.respondWith(new Response(JSON.stringify({ "cache-cleared": true }))) return } const shouldBeCached = origin.host === requestUrl.host && - !neverCacheHost.some(blacklisted => origin.host.match(blacklisted)) && - !neverCache.some(blacklisted => event.request.url.match(blacklisted)) + !neverCacheHost.some((blacklisted) => origin.host.match(blacklisted)) && + !neverCache.some((blacklisted) => event.request.url.match(blacklisted)) if (!shouldBeCached) { console.debug("Not intercepting ", requestUrl.toString(), origin.host, requestUrl.host) // We return _without_ calling event.respondWith, which signals the browser that it'll have to handle it himself