diff --git a/.gitignore b/.gitignore index ed8cb6f153..6770a760aa 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ scratch assets/editor-layer-index.json assets/generated/* assets/generated/images/* -/*.webmanifest +public/*.webmanifest /*.html !/index.html !/customGenerator.html @@ -35,4 +35,4 @@ service-worker.js .history/ # Built Visual Studio Code Extensions -*.vsix \ No newline at end of file +*.vsix diff --git a/Docs/BuiltinIndex.md b/Docs/BuiltinIndex.md index e12a3076de..79f86ab84c 100644 --- a/Docs/BuiltinIndex.md +++ b/Docs/BuiltinIndex.md @@ -50,11 +50,12 @@ + [export_as_geojson](#export_as_geojson) + [{upload_to_osm()}](#{upload_to_osm()}) + [minimap](#minimap) + + [payment-options-split](#payment-options-split) + + [denominations-coins](#denominations-coins) + + [denominations-notes](#denominations-notes) + [id_presets.shop_types](#id_presetsshop_types) + [school.capacity](#schoolcapacity) + [school.gender](#schoolgender) - + [payment-options-split](#payment-options-split) - + [denominations-coins](#denominations-coins) + [toilet.toilets-type](#toilettoilets-type) + [toilet.toilets-changing-table](#toilettoilets-changing-table) + [toilet.toilet-changing_table:location](#toilettoilet-changing_table:location) @@ -129,6 +130,7 @@ - parcel_lockers - parking - parking_spaces + - parking_ticket_machine - pharmacy - physiotherapist - picnic_table @@ -157,6 +159,7 @@ - viewpoint - village_green - waste_basket + - waste_disposal - windturbine @@ -767,6 +770,43 @@ +### payment-options-split + + + + + + - parking_ticket_machine + - ticket_machine + - toilet + + + + +### denominations-coins + + + + + + - parking_ticket_machine + - ticket_machine + + + + +### denominations-notes + + + + + + - parking_ticket_machine + - ticket_machine + + + + ### id_presets.shop_types @@ -800,29 +840,6 @@ -### payment-options-split - - - - - - - ticket_machine - - toilet - - - - -### denominations-coins - - - - - - - ticket_machine - - - - ### toilet.toilets-type diff --git a/Docs/BuiltinLayers.md b/Docs/BuiltinLayers.md index 4d59495396..038f599b92 100644 --- a/Docs/BuiltinLayers.md +++ b/Docs/BuiltinLayers.md @@ -998,6 +998,7 @@ The following layers are included in MapComplete: - [parcel_lockers](./Layers/parcel_lockers.md) - [parking](./Layers/parking.md) - [parking_spaces](./Layers/parking_spaces.md) + - [parking_ticket_machine](./Layers/parking_ticket_machine.md) - [pedestrian_path](./Layers/pedestrian_path.md) - [pharmacy](./Layers/pharmacy.md) - [physiotherapist](./Layers/physiotherapist.md) diff --git a/Docs/BuiltinQuestions.md b/Docs/BuiltinQuestions.md index dce5732897..df881e8825 100644 --- a/Docs/BuiltinQuestions.md +++ b/Docs/BuiltinQuestions.md @@ -34,6 +34,7 @@ The following items can be easily reused in your layers + [payment-options-split](#payment-options-split) + [payment-options-advanced](#payment-options-advanced) + [denominations-coins](#denominations-coins) + + [denominations-notes](#denominations-notes) + [last_edit](#last_edit) + [all_tags](#all_tags) + [multilevels](#multilevels) @@ -382,6 +383,25 @@ What coins can you use to pay here? +### denominations-notes + + + +what notes can you use to pay here? + + + + - 5 euro notes are accepted + - 10 euro notes are accepted + - 20 euro notes are accepted + - 50 euro notes are accepted + - 100 euro notes are accepted + - 200 euro notes are accepted + - 500 euro notes are accepted + + + + ### last_edit diff --git a/Docs/Layers/bike_shop.md b/Docs/Layers/bike_shop.md index 190b8d8b28..8c49bee32d 100644 --- a/Docs/Layers/bike_shop.md +++ b/Docs/Layers/bike_shop.md @@ -40,10 +40,10 @@ Elements must have the all of following tags to be shown on this layer: - - shop=bicycle|amenity=bicycle_rental|shop=sports&service:bicycle:retail!=no&service:bicycle:repair!=no&sport=bicycle|sport=cycling| + - shop=bicycle|shop=sports&service:bicycle:retail!=no&service:bicycle:repair!=no&sport=bicycle|sport=cycling| -[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22shop%22%3D%22bicycle%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22bicycle_rental%22%5D%5B!%22network%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22shop%22%3D%22sports%22%5D%5B%22sport%22%3D%22bicycle%22%5D%5B%22service%3Abicycle%3Aretail%22!%3D%22no%22%5D%5B%22service%3Abicycle%3Arepair%22!%3D%22no%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22shop%22%3D%22sports%22%5D%5B%22sport%22%3D%22cycling%22%5D%5B%22service%3Abicycle%3Aretail%22!%3D%22no%22%5D%5B%22service%3Abicycle%3Arepair%22!%3D%22no%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22shop%22%3D%22sports%22%5D%5B!%22sport%22%5D%5B%22service%3Abicycle%3Aretail%22!%3D%22no%22%5D%5B%22service%3Abicycle%3Arepair%22!%3D%22no%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) +[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22shop%22%3D%22bicycle%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22shop%22%3D%22sports%22%5D%5B%22sport%22%3D%22bicycle%22%5D%5B%22service%3Abicycle%3Aretail%22!%3D%22no%22%5D%5B%22service%3Abicycle%3Arepair%22!%3D%22no%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22shop%22%3D%22sports%22%5D%5B%22sport%22%3D%22cycling%22%5D%5B%22service%3Abicycle%3Aretail%22!%3D%22no%22%5D%5B%22service%3Abicycle%3Arepair%22!%3D%22no%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22shop%22%3D%22sports%22%5D%5B!%22sport%22%5D%5B%22service%3Abicycle%3Aretail%22!%3D%22no%22%5D%5B%22service%3Abicycle%3Arepair%22!%3D%22no%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B) diff --git a/Docs/Layers/parking_ticket_machine.md b/Docs/Layers/parking_ticket_machine.md new file mode 100644 index 0000000000..d012a2d756 --- /dev/null +++ b/Docs/Layers/parking_ticket_machine.md @@ -0,0 +1,175 @@ + + + parking_ticket_machine +======================== + + + + + +Layer with parking ticket machines to pay for parking. + + + + + + + - This layer is shown at zoomlevel **16** and higher + + + + +#### Themes using this layer + + + + + + - [parkings](https://mapcomplete.osm.be/parkings) + - [personal](https://mapcomplete.osm.be/personal) + + + + + Basic tags for this layer +--------------------------- + + + +Elements must have the all of following tags to be shown on this layer: + + + + - amenity=vending_machine + - vending=parking_tickets + + +[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22vending_machine%22%5D%5B%22vending%22%3D%22parking_tickets%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%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 +----------- | ------ | ------------------------------------------ +[](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR) +[](https://taginfo.openstreetmap.org/keys/payment:notes:denominations#values) [payment:notes:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:notes:denominations) | Multiple choice | [5 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D5 EUR) [10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 EUR) [20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 EUR) [50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 EUR) [100 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 EUR) [200 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 EUR) [500 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D500 EUR) +[](https://taginfo.openstreetmap.org/keys/ref#values) [ref](https://wiki.openstreetmap.org/wiki/Key:ref) | [string](../SpecialInputElements.md#string) | + + + + +### images + + + +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` + +This tagrendering has no question and is thus read-only + + + + + +### payment-options-split + + + +The question is *Which methods of payment are accepted here?* + + + + + + - *Cash is accepted here* corresponds with `payment:cash=yes` + - This option cannot be chosen as answer + - Unselecting this answer will add + - *Payment cards are accepted here* corresponds with `payment:cards=yes` + - This option cannot be chosen as answer + - Unselecting this answer will add + - *Coins are accepted here* corresponds with `payment:coins=yes` + - Unselecting this answer will add payment:coins=no + - *Bank notes are accepted here* corresponds with `payment:notes=yes` + - Unselecting this answer will add payment:notes=no + - *Debit cards are accepted here* corresponds with `payment:debit_cards=yes` + - Unselecting this answer will add payment_debit_cards=no + - *Credit cards are accepted here* corresponds with `payment:credit_cards=yes` + - Unselecting this answer will add payment:credit_cards=no + + + + +### denominations-coins + + + +The question is *What coins can you use to pay here?* + + + + + + - *1 cent coins are accepted* corresponds with `payment:coins:denominations=0.01 EUR` + - *2 cent coins are accepted* corresponds with `payment:coins:denominations=0.02 EUR` + - *5 cent coins are accepted* corresponds with `payment:coins:denominations=0.05 EUR` + - *10 cent coins are accepted* corresponds with `payment:coins:denominations=0.10 EUR` + - *20 cent coins are accepted* corresponds with `payment:coins:denominations=0.20 EUR` + - *50 cent coins are accepted* corresponds with `payment:coins:denominations=0.50 EUR` + - *1 euro coins are accepted* corresponds with `payment:coins:denominations=1 EUR` + - *2 euro coins are accepted* corresponds with `payment:coins:denominations=2 EUR` + + +This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk` + + + +### denominations-notes + + + +The question is *what notes can you use to pay here?* + + + + + + - *5 euro notes are accepted* corresponds with `payment:notes:denominations=5 EUR` + - *10 euro notes are accepted* corresponds with `payment:notes:denominations=10 EUR` + - *20 euro notes are accepted* corresponds with `payment:notes:denominations=20 EUR` + - *50 euro notes are accepted* corresponds with `payment:notes:denominations=50 EUR` + - *100 euro notes are accepted* corresponds with `payment:notes:denominations=100 EUR` + - *200 euro notes are accepted* corresponds with `payment:notes:denominations=200 EUR` + - *500 euro notes are accepted* corresponds with `payment:notes:denominations=500 EUR` + + +This tagrendering is only visible in the popup if the following condition is met: `payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk` + + + +### ref + + + +The question is *What is the reference number of this parking ticket machine?* + +This rendering asks information about the property [ref](https://wiki.openstreetmap.org/wiki/Key:ref) + +This is rendered with `This parking ticket machine has the reference number {ref}` + + + + + + - *This parking ticket machine has no reference number* corresponds with `noref=yes` + + +This document is autogenerated from [assets/layers/parking_ticket_machine/parking_ticket_machine.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/parking_ticket_machine/parking_ticket_machine.json) \ No newline at end of file diff --git a/Docs/Layers/recycling.md b/Docs/Layers/recycling.md index 0704c52d99..f51141391a 100644 --- a/Docs/Layers/recycling.md +++ b/Docs/Layers/recycling.md @@ -67,6 +67,7 @@ attribute | type | values which are supported by this layer [](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | [](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | [](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [24/7](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D24/7) +[](https://taginfo.openstreetmap.org/keys/access#values) [access](https://wiki.openstreetmap.org/wiki/Key:access) | [string](../SpecialInputElements.md#string) | [yes](https://wiki.openstreetmap.org/wiki/Tag:access%3Dyes) [residents](https://wiki.openstreetmap.org/wiki/Tag:access%3Dresidents) [private](https://wiki.openstreetmap.org/wiki/Tag:access%3Dprivate) @@ -301,6 +302,27 @@ This is rendered with `

Opening hours

{opening_hours_table(opening_hours +### access + + + +The question is *Who can use this recycling facility?* + +This rendering asks information about the property [access](https://wiki.openstreetmap.org/wiki/Key:access) + +This is rendered with `This recycling facility can be used by {access}` + + + + + + - *Everyone can use this recycling facility* corresponds with `access=yes` + - *Only residents can use this recycling facility* corresponds with `access=residents` + - *This recycling facility is only for private use* corresponds with `access=private` + + + + #### Filters @@ -336,6 +358,13 @@ recyclingType.16 | Recycling of plastic | recycling:plastic=yes recyclingType.17 | Recycling of scrap metal | recycling:scrap_metal=yes recyclingType.18 | Recycling of small electrical appliances | recycling:small_appliances=yes\|recycling:small_electrical_appliances=yes recyclingType.19 | Recycling of residual waste | recycling:waste=yes + + + + +id | question | osmTags +---- | ---------- | --------- +public-access.0 | Only public access | access=yes\| This document is autogenerated from [assets/layers/recycling/recycling.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/recycling/recycling.json) \ No newline at end of file diff --git a/Docs/Layers/ticket_machine.md b/Docs/Layers/ticket_machine.md index 56e31abbcf..6b89557af6 100644 --- a/Docs/Layers/ticket_machine.md +++ b/Docs/Layers/ticket_machine.md @@ -52,6 +52,7 @@ attribute | type | values which are supported by this layer [](https://taginfo.openstreetmap.org/keys/level#values) [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) [](https://taginfo.openstreetmap.org/keys/operator#values) [operator](https://wiki.openstreetmap.org/wiki/Key:operator) | [string](../SpecialInputElements.md#string) | [Nederlandse Spoorwegen](https://wiki.openstreetmap.org/wiki/Tag:operator%3DNederlandse Spoorwegen) [](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR) +[](https://taginfo.openstreetmap.org/keys/payment:notes:denominations#values) [payment:notes:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:notes:denominations) | Multiple choice | [5 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D5 EUR) [10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 EUR) [20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 EUR) [50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 EUR) [100 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 EUR) [200 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 EUR) [500 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D500 EUR) @@ -160,6 +161,29 @@ The question is *What coins can you use to pay here?* - *2 euro coins are accepted* corresponds with `payment:coins:denominations=2 EUR` -This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk` +This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk` + + + +### denominations-notes + + + +The question is *what notes can you use to pay here?* + + + + + + - *5 euro notes are accepted* corresponds with `payment:notes:denominations=5 EUR` + - *10 euro notes are accepted* corresponds with `payment:notes:denominations=10 EUR` + - *20 euro notes are accepted* corresponds with `payment:notes:denominations=20 EUR` + - *50 euro notes are accepted* corresponds with `payment:notes:denominations=50 EUR` + - *100 euro notes are accepted* corresponds with `payment:notes:denominations=100 EUR` + - *200 euro notes are accepted* corresponds with `payment:notes:denominations=200 EUR` + - *500 euro notes are accepted* corresponds with `payment:notes:denominations=500 EUR` + + +This tagrendering is only visible in the popup if the following condition is met: `payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk` This document is autogenerated from [assets/layers/ticket_machine/ticket_machine.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/ticket_machine/ticket_machine.json) \ No newline at end of file diff --git a/Docs/Layers/waste_disposal.md b/Docs/Layers/waste_disposal.md index 735c0ada73..e68e8fdb33 100644 --- a/Docs/Layers/waste_disposal.md +++ b/Docs/Layers/waste_disposal.md @@ -60,12 +60,43 @@ this quick overview is incomplete attribute | type | values which are supported by this layer ----------- | ------ | ------------------------------------------ +[](https://taginfo.openstreetmap.org/keys/amenity#values) [amenity](https://wiki.openstreetmap.org/wiki/Key:amenity) | Multiple choice | [waste_disposal](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_disposal) [recycling](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drecycling) [](https://taginfo.openstreetmap.org/keys/access#values) [access](https://wiki.openstreetmap.org/wiki/Key:access) | [string](../SpecialInputElements.md#string) | [yes](https://wiki.openstreetmap.org/wiki/Tag:access%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:access%3Dno) [residents](https://wiki.openstreetmap.org/wiki/Tag:access%3Dresidents) [](https://taginfo.openstreetmap.org/keys/location#values) [location](https://wiki.openstreetmap.org/wiki/Key:location) | Multiple choice | [underground](https://wiki.openstreetmap.org/wiki/Tag:location%3Dunderground) [indoor](https://wiki.openstreetmap.org/wiki/Tag:location%3Dindoor) [](https://wiki.openstreetmap.org/wiki/Tag:location%3D) +### images + + + +This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` + +This tagrendering has no question and is thus read-only + + + + + +### type + + + +Mapping allowing to change between waste_disposal and recycling + +The question is *What kind of waste disposal bin is this?* + + + + + + - *This is a medium to large bin for disposal of (household) waste* corresponds with `amenity=waste_disposal` + - *This is actually a recycling container* corresponds with `amenity=recycling` + + + + ### access diff --git a/Docs/TagInfo/mapcomplete_cyclofix.json b/Docs/TagInfo/mapcomplete_cyclofix.json index 61b02998fe..d1e3601019 100644 --- a/Docs/TagInfo/mapcomplete_cyclofix.json +++ b/Docs/TagInfo/mapcomplete_cyclofix.json @@ -133,16 +133,6 @@ "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bike repair/shop showing features with this tag", "value": "bicycle" }, - { - "key": "amenity", - "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bike repair/shop showing features with this tag", - "value": "bicycle_rental" - }, - { - "key": "network", - "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bike repair/shop showing features with this tag", - "value": "" - }, { "key": "shop", "description": "The MapComplete theme Cyclofix - an open map for cyclists has a layer Bike repair/shop showing features with this tag", diff --git a/Docs/TagInfo/mapcomplete_education.json b/Docs/TagInfo/mapcomplete_education.json index a4a0c2f04c..510ba34741 100644 --- a/Docs/TagInfo/mapcomplete_education.json +++ b/Docs/TagInfo/mapcomplete_education.json @@ -2,7 +2,7 @@ "data_format": 1, "project": { "name": "MapComplete Education", - "description": "On this map, you'll find information about all types of schools and eduction and can easily add more information", + "description": "On this map, you'll find information about all types of schools and education and can easily add more information", "project_url": "https://mapcomplete.osm.be/education", "doc_url": "https://github.com/pietervdvn/MapComplete/tree/master/assets/themes/", "icon_url": "https://mapcomplete.osm.be/assets/layers/school/college.svg", diff --git a/Docs/TagInfo/mapcomplete_parkings.json b/Docs/TagInfo/mapcomplete_parkings.json index c0f772d1f8..df2fe01ed7 100644 --- a/Docs/TagInfo/mapcomplete_parkings.json +++ b/Docs/TagInfo/mapcomplete_parkings.json @@ -233,6 +233,146 @@ "key": "capacity", "description": "Layer 'Parking Spaces' shows capacity=1 with a fixed text, namely 'This parking space has 1 space.' (in the MapComplete.osm.be theme 'Parking')", "value": "1" + }, + { + "key": "amenity", + "description": "The MapComplete theme Parking has a layer Parking Ticket Machines showing features with this tag", + "value": "vending_machine" + }, + { + "key": "vending", + "description": "The MapComplete theme Parking has a layer Parking Ticket Machines showing features with this tag", + "value": "parking_tickets" + }, + { + "key": "image", + "description": "The layer 'Parking Ticket Machines allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "mapillary", + "description": "The layer 'Parking Ticket Machines allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikidata", + "description": "The layer 'Parking Ticket Machines allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikipedia", + "description": "The layer 'Parking Ticket Machines 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": "payment:cash", + "description": "Layer 'Parking Ticket Machines' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' (in the MapComplete.osm.be theme 'Parking')", + "value": "yes" + }, + { + "key": "payment:cards", + "description": "Layer 'Parking Ticket Machines' shows payment:cards=yes with a fixed text, namely 'Payment cards are accepted here' (in the MapComplete.osm.be theme 'Parking')", + "value": "yes" + }, + { + "key": "payment:coins", + "description": "Layer 'Parking Ticket Machines' shows payment:coins=yes with a fixed text, namely 'Coins are accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking')", + "value": "yes" + }, + { + "key": "payment:notes", + "description": "Layer 'Parking Ticket Machines' shows payment:notes=yes with a fixed text, namely 'Bank notes are accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking')", + "value": "yes" + }, + { + "key": "payment:debit_cards", + "description": "Layer 'Parking Ticket Machines' shows payment:debit_cards=yes with a fixed text, namely 'Debit cards are accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking')", + "value": "yes" + }, + { + "key": "payment:credit_cards", + "description": "Layer 'Parking Ticket Machines' shows payment:credit_cards=yes with a fixed text, namely 'Credit cards are accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking')", + "value": "yes" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "0.01 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "0.02 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "0.05 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "0.10 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "0.20 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "0.50 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "1 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "2 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=5 EUR with a fixed text, namely '5 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "5 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=10 EUR with a fixed text, namely '10 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "10 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=20 EUR with a fixed text, namely '20 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "20 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=50 EUR with a fixed text, namely '50 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "50 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=100 EUR with a fixed text, namely '100 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "100 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=200 EUR with a fixed text, namely '200 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "200 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=500 EUR with a fixed text, namely '500 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "500 EUR" + }, + { + "key": "ref", + "description": "Layer 'Parking Ticket Machines' shows and asks freeform values for key 'ref' (in the MapComplete.osm.be theme 'Parking')" + }, + { + "key": "noref", + "description": "Layer 'Parking Ticket Machines' shows noref=yes with a fixed text, namely 'This parking ticket machine has no reference number' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Parking')", + "value": "yes" } ] } \ No newline at end of file diff --git a/Docs/TagInfo/mapcomplete_personal.json b/Docs/TagInfo/mapcomplete_personal.json index a0431cce6f..3b0314b005 100644 --- a/Docs/TagInfo/mapcomplete_personal.json +++ b/Docs/TagInfo/mapcomplete_personal.json @@ -1789,16 +1789,6 @@ "description": "The MapComplete theme Personal theme has a layer Bike repair/shop showing features with this tag", "value": "bicycle" }, - { - "key": "amenity", - "description": "The MapComplete theme Personal theme has a layer Bike repair/shop showing features with this tag", - "value": "bicycle_rental" - }, - { - "key": "network", - "description": "The MapComplete theme Personal theme has a layer Bike repair/shop showing features with this tag", - "value": "" - }, { "key": "shop", "description": "The MapComplete theme Personal theme has a layer Bike repair/shop showing features with this tag", @@ -8112,6 +8102,146 @@ "description": "Layer 'Parking Spaces' shows capacity=1 with a fixed text, namely 'This parking space has 1 space.' (in the MapComplete.osm.be theme 'Personal theme')", "value": "1" }, + { + "key": "amenity", + "description": "The MapComplete theme Personal theme has a layer Parking Ticket Machines showing features with this tag", + "value": "vending_machine" + }, + { + "key": "vending", + "description": "The MapComplete theme Personal theme has a layer Parking Ticket Machines showing features with this tag", + "value": "parking_tickets" + }, + { + "key": "image", + "description": "The layer 'Parking Ticket Machines allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "mapillary", + "description": "The layer 'Parking Ticket Machines allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikidata", + "description": "The layer 'Parking Ticket Machines allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary" + }, + { + "key": "wikipedia", + "description": "The layer 'Parking Ticket Machines 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": "payment:cash", + "description": "Layer 'Parking Ticket Machines' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "payment:cards", + "description": "Layer 'Parking Ticket Machines' shows payment:cards=yes with a fixed text, namely 'Payment cards are accepted here' (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "payment:coins", + "description": "Layer 'Parking Ticket Machines' shows payment:coins=yes with a fixed text, namely 'Coins are accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "payment:notes", + "description": "Layer 'Parking Ticket Machines' shows payment:notes=yes with a fixed text, namely 'Bank notes are accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "payment:debit_cards", + "description": "Layer 'Parking Ticket Machines' shows payment:debit_cards=yes with a fixed text, namely 'Debit cards are accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "payment:credit_cards", + "description": "Layer 'Parking Ticket Machines' shows payment:credit_cards=yes with a fixed text, namely 'Credit cards are accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "0.01 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "0.02 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "0.05 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "0.10 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "0.20 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "0.50 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "1 EUR" + }, + { + "key": "payment:coins:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "2 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=5 EUR with a fixed text, namely '5 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "5 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=10 EUR with a fixed text, namely '10 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "10 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=20 EUR with a fixed text, namely '20 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "20 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=50 EUR with a fixed text, namely '50 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "50 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=100 EUR with a fixed text, namely '100 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "100 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=200 EUR with a fixed text, namely '200 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "200 EUR" + }, + { + "key": "payment:notes:denominations", + "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=500 EUR with a fixed text, namely '500 euro notes are accepted' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)", + "value": "500 EUR" + }, + { + "key": "ref", + "description": "Layer 'Parking Ticket Machines' shows and asks freeform values for key 'ref' (in the MapComplete.osm.be theme 'Personal theme')" + }, + { + "key": "noref", + "description": "Layer 'Parking Ticket Machines' shows noref=yes with a fixed text, namely 'This parking ticket machine has no reference number' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, { "key": "highway", "description": "The MapComplete theme Personal theme has a layer Pedestrian paths showing features with this tag", @@ -9108,6 +9238,25 @@ "description": "Layer 'Recycling' shows opening_hours=24/7 with a fixed text, namely '24/7 opened (including holidays)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", "value": "24/7" }, + { + "key": "access", + "description": "Layer 'Recycling' shows and asks freeform values for key 'access' (in the MapComplete.osm.be theme 'Personal theme')" + }, + { + "key": "access", + "description": "Layer 'Recycling' shows access=yes with a fixed text, namely 'Everyone can use this recycling facility' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "yes" + }, + { + "key": "access", + "description": "Layer 'Recycling' shows access=residents with a fixed text, namely 'Only residents can use this recycling facility' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "residents" + }, + { + "key": "access", + "description": "Layer 'Recycling' shows access=private with a fixed text, namely 'This recycling facility is only for private use' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "private" + }, { "key": "amenity", "description": "The MapComplete theme Personal theme has a layer Primary and secondary schools showing features with this tag", @@ -11967,6 +12116,32 @@ "description": "The MapComplete theme Personal theme has a layer Waste Disposal Bins showing features with this tag", "value": "waste_disposal" }, + { + "key": "image", + "description": "The layer 'Waste Disposal Bins 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 'Waste Disposal Bins 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 'Waste Disposal Bins 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 'Waste Disposal Bins 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": "amenity", + "description": "Layer 'Waste Disposal Bins' shows amenity=waste_disposal with a fixed text, namely 'This is a medium to large bin for disposal of (household) waste' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "waste_disposal" + }, + { + "key": "amenity", + "description": "Layer 'Waste Disposal Bins' shows amenity=recycling with a fixed text, namely 'This is actually a recycling container' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')", + "value": "recycling" + }, { "key": "access", "description": "Layer 'Waste Disposal Bins' shows and asks freeform values for key 'access' (in the MapComplete.osm.be theme 'Personal theme')" diff --git a/Docs/TagInfo/mapcomplete_waste.json b/Docs/TagInfo/mapcomplete_waste.json index 2ae981a43b..5aa9a63170 100644 --- a/Docs/TagInfo/mapcomplete_waste.json +++ b/Docs/TagInfo/mapcomplete_waste.json @@ -303,11 +303,56 @@ "description": "Layer 'Recycling' shows opening_hours=24/7 with a fixed text, namely '24/7 opened (including holidays)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", "value": "24/7" }, + { + "key": "access", + "description": "Layer 'Recycling' shows and asks freeform values for key 'access' (in the MapComplete.osm.be theme 'Waste')" + }, + { + "key": "access", + "description": "Layer 'Recycling' shows access=yes with a fixed text, namely 'Everyone can use this recycling facility' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", + "value": "yes" + }, + { + "key": "access", + "description": "Layer 'Recycling' shows access=residents with a fixed text, namely 'Only residents can use this recycling facility' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", + "value": "residents" + }, + { + "key": "access", + "description": "Layer 'Recycling' shows access=private with a fixed text, namely 'This recycling facility is only for private use' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", + "value": "private" + }, { "key": "amenity", "description": "The MapComplete theme Waste has a layer Waste Disposal Bins showing features with this tag", "value": "waste_disposal" }, + { + "key": "image", + "description": "The layer 'Waste Disposal Bins 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 'Waste Disposal Bins 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 'Waste Disposal Bins 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 'Waste Disposal Bins 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": "amenity", + "description": "Layer 'Waste Disposal Bins' shows amenity=waste_disposal with a fixed text, namely 'This is a medium to large bin for disposal of (household) waste' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", + "value": "waste_disposal" + }, + { + "key": "amenity", + "description": "Layer 'Waste Disposal Bins' shows amenity=recycling with a fixed text, namely 'This is actually a recycling container' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste')", + "value": "recycling" + }, { "key": "access", "description": "Layer 'Waste Disposal Bins' shows and asks freeform values for key 'access' (in the MapComplete.osm.be theme 'Waste')" diff --git a/Docs/Themes/aed.md b/Docs/Themes/aed.md index f4bb77860d..8ab03e576a 100644 --- a/Docs/Themes/aed.md +++ b/Docs/Themes/aed.md @@ -48,4 +48,4 @@ Available languages: - zgh -This document is autogenerated from [assets/themes/aed/aed.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/aed/aed.json) +This document is autogenerated from [assets/themes/aed/aed.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/aed/aed.json) \ No newline at end of file diff --git a/Docs/Themes/education.md b/Docs/Themes/education.md index 47567b54f3..595a0e3634 100644 --- a/Docs/Themes/education.md +++ b/Docs/Themes/education.md @@ -5,7 +5,7 @@ -On this map, you'll find information about all types of schools and eduction and can easily add more information +On this map, you'll find information about all types of schools and education and can easily add more information This theme contains the following layers: diff --git a/Docs/Themes/osm_community_index.md b/Docs/Themes/osm_community_index.md index 39555ca2fb..6817964ae6 100644 --- a/Docs/Themes/osm_community_index.md +++ b/Docs/Themes/osm_community_index.md @@ -26,6 +26,7 @@ Available languages: - en - de - nl + - fr This document is autogenerated from [assets/themes/osm_community_index/osm_community_index.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/osm_community_index/osm_community_index.json) \ No newline at end of file diff --git a/Docs/Themes/parkings.md b/Docs/Themes/parkings.md index d4df670948..d595cb3edb 100644 --- a/Docs/Themes/parkings.md +++ b/Docs/Themes/parkings.md @@ -13,6 +13,7 @@ This theme contains the following layers: - [parking](../Layers/parking.md) - [parking_spaces](../Layers/parking_spaces.md) + - [parking_ticket_machine](../Layers/parking_ticket_machine.md) - [selected_element](../Layers/selected_element.md) - [gps_location](../Layers/gps_location.md) - [gps_location_history](../Layers/gps_location_history.md) diff --git a/Docs/Themes/personal.md b/Docs/Themes/personal.md index 4250ceffce..3d631fcc31 100644 --- a/Docs/Themes/personal.md +++ b/Docs/Themes/personal.md @@ -70,6 +70,7 @@ This theme contains the following layers: - [parcel_lockers](../Layers/parcel_lockers.md) - [parking](../Layers/parking.md) - [parking_spaces](../Layers/parking_spaces.md) + - [parking_ticket_machine](../Layers/parking_ticket_machine.md) - [pedestrian_path](../Layers/pedestrian_path.md) - [pharmacy](../Layers/pharmacy.md) - [physiotherapist](../Layers/physiotherapist.md) diff --git a/Docs/Themes/stations.md b/Docs/Themes/stations.md index 635fe6af0b..d223061bd4 100644 --- a/Docs/Themes/stations.md +++ b/Docs/Themes/stations.md @@ -47,6 +47,7 @@ Available languages: - de - nl - nb_NO + - fr This document is autogenerated from [assets/themes/stations/stations.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/stations/stations.json) \ No newline at end of file diff --git a/Docs/wikiIndex.txt b/Docs/wikiIndex.txt index c284b2651f..14a2c0a6f5 100644 --- a/Docs/wikiIndex.txt +++ b/Docs/wikiIndex.txt @@ -221,7 +221,7 @@ |name= [https://mapcomplete.osm.be/education education] |region= Worldwide |lang= {{#language:en|en}}, {{#language:nl|en}}, {{#language:de|en}}, {{#language:fr|en}}, {{#language:ca|en}}, {{#language:da|en}}, {{#language:cs|en}} -|descr= A MapComplete theme: On this map, you'll find information about all types of schools and eduction and can easily add more information +|descr= A MapComplete theme: On this map, you'll find information about all types of schools and education and can easily add more information |material= {{yes|[https://mapcomplete.osm.be/ Yes]}} |image= MapComplete_Screenshot.png |genre= POI, editor, education @@ -229,7 +229,7 @@ {{service_item |name= [https://mapcomplete.osm.be/facadegardens facadegardens] |region= Worldwide -|lang= {{#language:nl|en}}, {{#language:en|en}}, {{#language:ja|en}}, {{#language:zh_Hant|en}}, {{#language:it|en}}, {{#language:fr|en}}, {{#language:de|en}}, {{#language:hu|en}}, {{#language:es|en}}, {{#language:da|en}}, {{#language:cs|en}} +|lang= {{#language:nl|en}}, {{#language:en|en}}, {{#language:ja|en}}, {{#language:zh_Hant|en}}, {{#language:it|en}}, {{#language:fr|en}}, {{#language:de|en}}, {{#language:hu|en}}, {{#language:es|en}}, {{#language:da|en}}, {{#language:cs|en}}, {{#language:ca|en}} |descr= A MapComplete theme: This map shows facade gardens with pictures and useful info about orientation, sunshine and plant types. |material= {{yes|[https://mapcomplete.osm.be/ Yes]}} |image= MapComplete_Screenshot.png @@ -364,7 +364,7 @@ {{service_item |name= [https://mapcomplete.osm.be/osm_community_index osm_community_index] |region= Worldwide -|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:nl|en}} +|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:nl|en}}, {{#language:fr|en}} |descr= A MapComplete theme: An index of community resources for OpenStreetMap. |material= {{yes|[https://mapcomplete.osm.be/ Yes]}} |image= MapComplete_Screenshot.png diff --git a/UI/BigComponents/Attribution.ts b/UI/BigComponents/Attribution.ts index 3b60134f23..d1f7bb4973 100644 --- a/UI/BigComponents/Attribution.ts +++ b/UI/BigComponents/Attribution.ts @@ -9,6 +9,7 @@ import { VariableUiElement } from "../Base/VariableUIElement" import LayoutConfig from "../../Models/ThemeConfig/LayoutConfig" import { BBox } from "../../Logic/BBox" import { Utils } from "../../Utils" +import Translations from "../i18n/Translations" /** * The bottom right attribution panel in the leaflet map @@ -58,7 +59,13 @@ export default class Attribution extends Combine { true ) - let editWithJosm = new VariableUiElement( + const mapDataByOsm = new Link( + Translations.t.general.attribution.mapDataByOsm, + "https://openstreetmap.org/copyright", + true + ) + + const editWithJosm = new VariableUiElement( userDetails.map( (userDetails) => { if (userDetails.csCount < Constants.userJourney.tagsVisibleAndWikiLinked) { @@ -79,7 +86,7 @@ export default class Attribution extends Combine { [location, currentBounds] ) ) - super([mapComplete, reportBug, stats, editHere, editWithJosm, mapillary]) + super([mapComplete, reportBug, stats, editHere, editWithJosm, mapillary, mapDataByOsm]) this.SetClass("flex") } } diff --git a/UI/BigComponents/CopyrightPanel.ts b/UI/BigComponents/CopyrightPanel.ts index 83dad07db5..2cdadec7ea 100644 --- a/UI/BigComponents/CopyrightPanel.ts +++ b/UI/BigComponents/CopyrightPanel.ts @@ -2,13 +2,13 @@ import Combine from "../Base/Combine" import Translations from "../i18n/Translations" import { Store, UIEventSource } from "../../Logic/UIEventSource" import { FixedUiElement } from "../Base/FixedUiElement" -import * as licenses from "../../assets/generated/license_info.json" +import licenses from "../../assets/generated/license_info.json" import SmallLicense from "../../Models/smallLicense" import { Utils } from "../../Utils" import Link from "../Base/Link" import { VariableUiElement } from "../Base/VariableUIElement" -import * as contributors from "../../assets/contributors.json" -import * as translators from "../../assets/translators.json" +import contributors from "../../assets/contributors.json" +import translators from "../../assets/translators.json" import BaseUIElement from "../BaseUIElement" import LayoutConfig from "../../Models/ThemeConfig/LayoutConfig" import Title from "../Base/Title" diff --git a/UI/BigComponents/FullWelcomePaneWithTabs.ts b/UI/BigComponents/FullWelcomePaneWithTabs.ts index e54b2e29ae..5637a05d15 100644 --- a/UI/BigComponents/FullWelcomePaneWithTabs.ts +++ b/UI/BigComponents/FullWelcomePaneWithTabs.ts @@ -85,15 +85,6 @@ export default class FullWelcomePaneWithTabs extends ScrollableFullScreen { tabs.push({ header: Svg.share_img, content: new ShareScreen(state) }) } - const copyright = { - header: Svg.copyright_svg(), - content: new Combine([ - Translations.t.general.openStreetMapIntro.SetClass("link-underline"), - new CopyrightPanel(state), - ]), - } - tabs.push(copyright) - const privacy = { header: Svg.eye_svg(), content: new PrivacyPolicy(), diff --git a/UI/BigComponents/LeftControls.ts b/UI/BigComponents/LeftControls.ts index a75daabd27..9a342c0baa 100644 --- a/UI/BigComponents/LeftControls.ts +++ b/UI/BigComponents/LeftControls.ts @@ -105,24 +105,7 @@ export default class LeftControls extends Combine { state.featureSwitchBackgroundSelection ) - // If the welcomeMessage is disabled, the copyright is hidden (as that is where the copyright is located - const copyright = new Toggle( - undefined, - new Lazy(() => { - new ScrollableFullScreen( - () => Translations.t.general.attribution.attributionTitle, - () => new CopyrightPanel(state), - "copyright", - guiState.copyrightViewIsOpened - ) - return new MapControlButton(Svg.copyright_svg()).onClick(() => - guiState.copyrightViewIsOpened.setData(true) - ) - }), - state.featureSwitchWelcomeMessage - ) - - super([currentViewAction, filterButton, downloadButton, copyright, mapSwitch]) + super([currentViewAction, filterButton, downloadButton, mapSwitch]) this.SetClass("flex flex-col") } diff --git a/UI/DefaultGUI.ts b/UI/DefaultGUI.ts index d368d0cab8..5aa832043f 100644 --- a/UI/DefaultGUI.ts +++ b/UI/DefaultGUI.ts @@ -33,6 +33,8 @@ import GeoLocationHandler from "../Logic/Actors/GeoLocationHandler" import { GeoLocationState } from "../Logic/State/GeoLocationState" import Hotkeys from "./Base/Hotkeys" import AvailableBaseLayers from "../Logic/Actors/AvailableBaseLayers" +import Lazy from "./Base/Lazy" +import CopyrightPanel from "./BigComponents/CopyrightPanel" /** * The default MapComplete GUI initializer @@ -239,7 +241,22 @@ export default class DefaultGUI { const testingBadge = Toggle.If(state.featureSwitchIsTesting, () => new FixedUiElement("TESTING").SetClass("alert m-2 border-2 border-black") ) - new Combine([welcomeMessageMapControl, userInfoMapControl, extraLink, testingBadge]) + new ScrollableFullScreen( + () => Translations.t.general.attribution.attributionTitle, + () => new CopyrightPanel(state), + "copyright", + guiState.copyrightViewIsOpened + ) + const copyright = new MapControlButton(Svg.copyright_svg()).onClick(() => + guiState.copyrightViewIsOpened.setData(true) + ) + new Combine([ + welcomeMessageMapControl, + userInfoMapControl, + copyright, + extraLink, + testingBadge, + ]) .SetClass("flex flex-col") .AttachTo("top-left") diff --git a/assets/contributors.json b/assets/contributors.json index 30e1bedef7..45e2cdf151 100644 --- a/assets/contributors.json +++ b/assets/contributors.json @@ -1,11 +1,11 @@ { "contributors": [ { - "commits": 4966, + "commits": 5005, "contributor": "Pieter Vander Vennet" }, { - "commits": 327, + "commits": 332, "contributor": "Robin van der Linde" }, { @@ -13,7 +13,7 @@ "contributor": "Tobias" }, { - "commits": 34, + "commits": 35, "contributor": "Win Olario" }, { @@ -49,7 +49,7 @@ "contributor": "AlexanderRebai" }, { - "commits": 19, + "commits": 20, "contributor": "Hosted Weblate" }, { @@ -102,11 +102,11 @@ }, { "commits": 10, - "contributor": "LiamSimons" + "contributor": "RobJN" }, { - "commits": 9, - "contributor": "RobJN" + "commits": 10, + "contributor": "LiamSimons" }, { "commits": 8, @@ -141,12 +141,12 @@ "contributor": "pelderson" }, { - "commits": 4, - "contributor": "Nadhem" + "commits": 5, + "contributor": "OliNau" }, { "commits": 4, - "contributor": "OliNau" + "contributor": "Nadhem" }, { "commits": 4, @@ -168,6 +168,10 @@ "commits": 3, "contributor": "Léo Villeveygoux" }, + { + "commits": 2, + "contributor": "ⵣⵓⵀⵉⵔ ⴰⵎⴰⵣⵉⵖ زهير أمازيغ" + }, { "commits": 2, "contributor": "Jiří Podhorecký" @@ -212,10 +216,6 @@ "commits": 2, "contributor": "Stanislas Gueniffey" }, - { - "commits": 1, - "contributor": "ⵣⵓⵀⵉⵔ ⴰⵎⴰⵣⵉⵖ زهير أمازيغ" - }, { "commits": 1, "contributor": "flaburgan" diff --git a/assets/layers/birdhide/birdhide.json b/assets/layers/birdhide/birdhide.json index 5f8a7cf280..e243f6fa68 100644 --- a/assets/layers/birdhide/birdhide.json +++ b/assets/layers/birdhide/birdhide.json @@ -272,20 +272,6 @@ "id": "birdhide-operator" } ], - "size": { - "freeform": { - "addExtraTags": [] - }, - "render": { - "nl": "40,40,center" - }, - "mappings": [] - }, - "stroke": { - "render": { - "nl": "3" - } - }, "presets": [ { "tags": [ @@ -393,7 +379,7 @@ }, "allowMove": { "enableRelocation": false, - "enableImproveAccuraccy": true + "enableImproveAccuracy": true }, "mapRendering": [ { diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index b3c66adddb..acd824eb02 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -1846,8 +1846,8 @@ "question": { "en": "What voltage do the plugs with
Chademo
offer?", "nl": "Welke spanning levert de stekker van type
Chademo
", - "de": "Welche Spannung bieten die Stecker mit
Chademo
?", - "ca": "Quin voltatge ofereixen els endolls amb
CHAdeMO
?" + "ca": "Quin voltatge ofereixen els endolls amb
CHAdeMO
?", + "de": "Welche Spannung bieten die Stecker mit
Chademo
?" }, "render": { "en": "
Chademo
outputs {socket:chademo:voltage} volt", @@ -1864,8 +1864,8 @@ "then": { "en": "Chademo outputs 500 volt", "nl": "Chademo heeft een spanning van 500 volt", - "de": "Chademo liefert 500 Volt", - "ca": "CHAdeMO proporciona 500 volts" + "ca": "CHAdeMO proporciona 500 volts", + "de": "Chademo liefert 500 Volt" }, "icon": { "path": "./assets/layers/charging_station/Chademo_type4.svg", @@ -3252,8 +3252,8 @@ "then": { "en": "Tesla Supercharger (Destination) outputs at most 125 A", "nl": "Tesla Supercharger (destination) levert een stroom van maximaal 125 A", - "de": "Tesla Supercharger (Destination) liefert maximal 125 A", - "ca": "Tesla Supercharger (Destinació) emet com a màxim 125 A" + "ca": "Tesla Supercharger (Destinació) emet com a màxim 125 A", + "de": "Tesla Supercharger (Destination) liefert maximal 125 A" }, "icon": { "path": "./assets/layers/charging_station/Tesla-hpwc-model-s.svg", @@ -3265,8 +3265,8 @@ "then": { "en": "Tesla Supercharger (Destination) outputs at most 350 A", "nl": "Tesla Supercharger (destination) levert een stroom van maximaal 350 A", - "de": "Tesla Supercharger (Destination) liefert maximal 350 A", - "ca": "Tesla Supercharger (Destinació) emet com a màxim 350 A" + "ca": "Tesla Supercharger (Destinació) emet com a màxim 350 A", + "de": "Tesla Supercharger (Destination) liefert maximal 350 A" }, "icon": { "path": "./assets/layers/charging_station/Tesla-hpwc-model-s.svg", @@ -3847,9 +3847,9 @@ "then": { "nl": "Gratis te gebruiken, maar aanmelden met een applicatie is verplicht", "en": "Free to use, but one has to authenticate", + "ca": "Ús gratuït, però un s'ha d'autentificar", "da": "Gratis at bruge, men man skal godkende", - "de": "Die Nutzung ist kostenlos, Authentifizierung erforderlich", - "ca": "Ús gratuït, però un s'ha d'autentificar" + "de": "Die Nutzung ist kostenlos, Authentifizierung erforderlich" } }, { diff --git a/assets/layers/nature_reserve/nature_reserve.json b/assets/layers/nature_reserve/nature_reserve.json index fae924af3d..1c774c5927 100644 --- a/assets/layers/nature_reserve/nature_reserve.json +++ b/assets/layers/nature_reserve/nature_reserve.json @@ -46,8 +46,7 @@ "description": { "en": "A nature reserve is an area where nature can take its course", "nl": "Een natuurgebied is een gebied waar actief ruimte gemaakt word voor de natuur. Typisch zijn deze in beheer van Natuurpunt of het Agentschap Natuur en Bos of zijn deze erkend door de overheid.", - "de": "Ein Naturschutzgebiet ist ein Gebiet, das der Natur überlassen wurde", - "es": "" + "de": "Ein Naturschutzgebiet ist ein Gebiet, das der Natur überlassen wurde" }, "tagRenderings": [ "images", @@ -219,8 +218,7 @@ "nl": "Dit gebied heet {name}", "en": "This area is named {name}", "de": "Dieses Gebiet heißt {name}", - "es": "Esta área se llama {name}", - "ca": "" + "es": "Esta área se llama {name}" }, "question": { "nl": "Wat is de naam van dit gebied?", diff --git a/assets/svg/copyright.svg b/assets/svg/copyright.svg index 786af75a29..38335671a7 100644 --- a/assets/svg/copyright.svg +++ b/assets/svg/copyright.svg @@ -1,6 +1,42 @@ - - - - + + + + + + - \ No newline at end of file + diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json index c84ed89247..efbf42e576 100644 --- a/assets/tagRenderings/questions.json +++ b/assets/tagRenderings/questions.json @@ -1233,7 +1233,8 @@ }, "question": { "en": "what notes can you use to pay here?", - "nl": "Met welke bankbiljetten kan je hier betalen?" + "nl": "Met welke bankbiljetten kan je hier betalen?", + "de": "Mit welchen Banknoten kann man hier bezahlen?" }, "multiAnswer": true, "mappings": [ @@ -1242,7 +1243,8 @@ "icon": "./assets/tagRenderings/5euro.svg", "then": { "en": "5 euro notes are accepted", - "nl": "Biljetten van 5 euro worden geaccepteerd" + "nl": "Biljetten van 5 euro worden geaccepteerd", + "de": "5-Euro-Scheine werden angenommen" } }, { @@ -1250,7 +1252,8 @@ "icon": "./assets/tagRenderings/10euro.svg", "then": { "en": "10 euro notes are accepted", - "nl": "Biljetten van 10 euro worden geaccepteerd" + "nl": "Biljetten van 10 euro worden geaccepteerd", + "de": "10-Euro-Scheine werden angenommen" } }, { @@ -1258,7 +1261,8 @@ "icon": "./assets/tagRenderings/20euro.svg", "then": { "en": "20 euro notes are accepted", - "nl": "Biljetten van 20 euro worden geaccepteerd" + "nl": "Biljetten van 20 euro worden geaccepteerd", + "de": "20-Euro-Scheine werden angenommen" } }, { @@ -1266,7 +1270,8 @@ "icon": "./assets/tagRenderings/50euro.svg", "then": { "en": "50 euro notes are accepted", - "nl": "Biljetten van 50 euro worden geaccepteerd" + "nl": "Biljetten van 50 euro worden geaccepteerd", + "de": "50-Euro-Scheine werden angenommen" } }, { @@ -1274,7 +1279,8 @@ "icon": "./assets/tagRenderings/100euro.svg", "then": { "en": "100 euro notes are accepted", - "nl": "Biljetten van 100 euro worden geaccepteerd" + "nl": "Biljetten van 100 euro worden geaccepteerd", + "de": "100-Euro-Scheine werden angenommen" } }, { @@ -1282,7 +1288,8 @@ "icon": "./assets/tagRenderings/200euro.svg", "then": { "en": "200 euro notes are accepted", - "nl": "Biljetten van 200 euro worden geaccepteerd" + "nl": "Biljetten van 200 euro worden geaccepteerd", + "de": "200-Euro-Scheine werden angenommen" } }, { @@ -1290,7 +1297,8 @@ "icon": "./assets/tagRenderings/500euro.svg", "then": { "en": "500 euro notes are accepted", - "nl": "Biljetten van 500 euro worden geaccepteerd" + "nl": "Biljetten van 500 euro worden geaccepteerd", + "de": "500-Euro-Scheine werden angenommen" } } ] diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 03ff2c60e0..137bb92603 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,27 +1,13 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete", - "cs": "Změny provedené pomocí MapComplete", - "de": "Mit MapComplete vorgenommene Änderungen", - "nb_NO": "Endringer laget med MapComplete", - "nl": "Wijzigingen gemaakt met MapComplete", - "fr": "Changements faits avec MapComplete" + "en": "Changes made with MapComplete" }, "shortDescription": { - "en": "Shows changes made by MapComplete", - "cs": "Zobrazuje změny provedené pomocí MapComplete", - "de": "Zeigt Änderungen, die von MapComplete vorgenommen wurden", - "nb_NO": "Vis endringer laget med MapComplete", - "nl": "Toont wijzigingen gemaakt met MapComplete" + "en": "Shows changes made by MapComplete" }, "description": { - "en": "This map shows all the changes made with MapComplete", - "ca": "Aquest mapa mostra tots els canvis fets amb MapComplete", - "cs": "Tato mapa zobrazuje všechny změny provedené pomocí MapComplete", - "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", - "fr": "Cette carte montre tous les changements faits avec MapComplete", - "nl": "Deze kaart toont alle wijzigingen gemaakt met MapComplete" + "en": "This maps shows all the changes made with MapComplete" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -34,10 +20,7 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers", - "de": "Zentrum der Änderungssätze", - "fr": "Centres de modifications de paramètres", - "nl": "Middelpunt van de wijzigingenset" + "en": "Changeset centers" }, "minzoom": 0, "source": { @@ -48,71 +31,41 @@ }, "title": { "render": { - "en": "Changeset for {theme}", - "de": "Änderungssatz für {theme}", - "nb_NO": "Endringssett for {theme}", - "nl": "Changeset voor {theme}", - "fr": "Groupe de modifications pour {theme}" + "en": "Changeset for {theme}" } }, "description": { - "en": "Shows all MapComplete changes", - "cs": "Zobrazuje všechny změny MapComplete", - "de": "Zeigt alle MapComplete-Änderungen", - "fr": "Montre tous les changements de MapComplete", - "nb_NO": "Viser alle MapComplete-endringer", - "nl": "Toon alle MapComplete wijzigingen" + "en": "Shows all MapComplete changes" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}", - "de": "Änderungssatz {id}", - "nb_NO": "Endringssett {id}", - "nl": "Wijzigingenset {id}", - "fr": "Groupe de modifications {id}" + "en": "Changeset {id}" } }, { "id": "contributor", "question": { - "en": "What contributor did make this change?", - "cs": "Jaký přispěvatel provedl tuto změnu?", - "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?", - "fr": "Quel contributeur a fait ce changement ?", - "nl": "Welke bijdrager maakte deze wijziging?" + "en": "What contributor did make this change?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}", - "cs": "Změna byla provedena uživatelem {user}", - "de": "Änderung vorgenommen von {user}", - "fr": "Modification faite par {user}", - "nb_NO": "Endring gjort av {user}", - "nl": "Wijziging gemaakt door {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 diese Änderung verwendet?", - "nb_NO": "Hvilket tema ble brukt for å utføre denne denne endringen?", - "nl": "Welk thema is gebruikt voor deze wijziging?", - "fr": "Quel thème a été utilisé pour faire cette modification ?" + "en": "What theme was used to make this change?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}", - "de": "Geändert mit Thema {theme}", - "nb_NO": "Endre med temaet {theme}", - "nl": "Wijziging met thema {theme}", - "fr": "Modifié avec le thème {theme}" + "en": "Change with theme {theme}" } }, { @@ -121,35 +74,19 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?", - "cs": "V jakém prostředí (jazyce) byla tato změna provedena?", - "de": "In welchem Gebietsschema (Sprache) wurde diese Änderung vorgenommen?", - "fr": "En quelle langue est-ce que ce changement a été fait ?", - "nl": "In welke taal (en cultuur) werd deze wijziging gemaakt?" + "en": "What locale (language) was this change made in?" }, "render": { - "en": "User locale is {locale}", - "cs": "Uživatelské prostředí je {locale}", - "de": "Benutzergebietsschema ist {locale}", - "fr": "La langue de l'utilisateur est {locale}", - "nl": "De locale van de bijdrager is {locale}" + "en": "User locale is {locale}" } }, { "id": "host", "render": { - "en": "Change with {host}", - "ca": "Canvi amb {host}", - "cs": "Změnit s {host}", - "de": "Geändert über {host}", - "fr": "Changement avec {host}", - "nl": "Wijziging met {host}" + "en": "Change with with {host}" }, "question": { - "en": "What host (website) was this change made with?", - "de": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?", - "fr": "Depuis quel serveur (site web) ce changement a-t-il été fait ?", - "nl": "Op welk webadres werd deze wijziging gemaakt?" + "en": "What host (website) was this change made with?" }, "freeform": { "key": "host" @@ -490,11 +427,7 @@ } ], "question": { - "en": "Themename contains {search}", - "de": "Themename enthält {search}", - "fr": "Nom de thème contenant {search}", - "nb_NO": "Temanavn inneholder {search}", - "nl": "Themanaam bevat {search}" + "en": "Themename contains {search}" } } ] @@ -510,12 +443,7 @@ } ], "question": { - "en": "Made by contributor {search}", - "cs": "Vytvořil přispěvatel {search}", - "de": "Erstellt vom Mitwirkenden {search}", - "fr": "Fait par le contributeur {search}", - "nb_NO": "Laget av bidragsyter {search}", - "nl": "Gemaakt door {search}" + "en": "Made by contributor {search}" } } ] @@ -531,12 +459,7 @@ } ], "question": { - "en": "Not made by contributor {search}", - "cs": "Nevytvořil přispěvatel {search}", - "de": "Nicht von Mitwirkendem {search}", - "fr": "Non réalisé par le contributeur{search}", - "nb_NO": "Ikke laget av bidragsyter {search}", - "nl": "Niet gemaakt door {search}" + "en": "Not made by contributor {search}" } } ] @@ -553,12 +476,7 @@ } ], "question": { - "en": "Made before {search}", - "cs": "Vytvořeno před {search}", - "de": "Erstellt vor {search}", - "fr": "Fait avant {search}", - "nb_NO": "Laget før {search}", - "nl": "Gemaakt voor {search}" + "en": "Made before {search}" } } ] @@ -575,12 +493,7 @@ } ], "question": { - "en": "Made after {search}", - "cs": "Vytvořeno po {search}", - "de": "Erstellt nach {search}", - "fr": "Fait après {search}", - "nb_NO": "Laget etter {search}", - "nl": "Gemaakt na {search}" + "en": "Made after {search}" } } ] @@ -596,11 +509,7 @@ } ], "question": { - "en": "User language (ISO-code) {search}", - "de": "Benutzersprache (ISO-Code) {search}", - "fr": "Langage utilisateur (code-ISO) {search}", - "nb_NO": "Brukerspråk (ISO-kode) {search}", - "nl": "Gebruikerstaal (ISO-code) {search}" + "en": "User language (iso-code) {search}" } } ] @@ -616,11 +525,7 @@ } ], "question": { - "en": "Made with host {search}", - "de": "Erstellt mit host {search}", - "fr": "Fait par le serveur {search}", - "nb_NO": "Laget med vert {search}", - "nl": "Gemaakt met host {search}" + "en": "Made with host {search}" } } ] @@ -631,11 +536,7 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image", - "de": "Im Änderungssatz wurde mindestens ein Bild hinzugefügt", - "nb_NO": "Endringssett la til minst ett bilde", - "nl": "Changeset die een of meerdere afbeeldingen toevoegt", - "fr": "Le groupe de modifications a ajouté au moins une image" + "en": "Changeset added at least one image" } } ] @@ -650,12 +551,7 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here", - "cs": "Další statistiky najdete na .", - "de": "Weitere Statistiken hier", - "nb_NO": "Mer statistikk å finne her", - "nl": "Meer statistieken zijn hier te vinden", - "fr": "D’autres statistiques sont disponibles ici" + "en": "More statistics can be found here" } }, { diff --git a/assets/translators.json b/assets/translators.json index ec43aa113d..f6efd33cf6 100644 --- a/assets/translators.json +++ b/assets/translators.json @@ -1,29 +1,29 @@ { "contributors": [ { - "commits": 239, + "commits": 247, "contributor": "Pieter Vander Vennet" }, { - "commits": 217, + "commits": 233, "contributor": "kjon" }, { - "commits": 82, + "commits": 94, "contributor": "Allan Nordhøy" }, { - "commits": 63, + "commits": 65, + "contributor": "paunofu" + }, + { + "commits": 65, "contributor": "Robin van der Linde" }, { "commits": 61, "contributor": "danieldegroot2" }, - { - "commits": 46, - "contributor": "paunofu" - }, { "commits": 45, "contributor": "Anonymous" @@ -72,6 +72,10 @@ "commits": 14, "contributor": "J. Lavoie" }, + { + "commits": 13, + "contributor": "Olivier" + }, { "commits": 13, "contributor": "Romain de Bossoreille" @@ -84,10 +88,6 @@ "commits": 11, "contributor": "Jiří Podhorecký" }, - { - "commits": 11, - "contributor": "Olivier" - }, { "commits": 10, "contributor": "bgo-eiu" @@ -104,22 +104,22 @@ "commits": 10, "contributor": "Irina" }, + { + "commits": 9, + "contributor": "mcliquid" + }, + { + "commits": 9, + "contributor": "Niels Madsen" + }, { "commits": 9, "contributor": "Jacque Fresco" }, - { - "commits": 8, - "contributor": "Niels Madsen" - }, { "commits": 8, "contributor": "Vinicius" }, - { - "commits": 7, - "contributor": "mcliquid" - }, { "commits": 7, "contributor": "快乐的老鼠宝宝" @@ -132,6 +132,10 @@ "commits": 7, "contributor": "Niels Elgaard Larsen" }, + { + "commits": 6, + "contributor": "ⵣⵓⵀⵉⵔ ⴰⵎⴰⵣⵉⵖ زهير أمازيغ" + }, { "commits": 6, "contributor": "Jaime Marquínez Ferrándiz" @@ -200,6 +204,22 @@ "commits": 5, "contributor": "Alexey Shabanov" }, + { + "commits": 4, + "contributor": "Lucas" + }, + { + "commits": 4, + "contributor": "ⵣⵓⵀⵉⵔ ⴰⵎⴰⵣⵉⵖ ZOUHIR DEHBI" + }, + { + "commits": 4, + "contributor": "André Marcelo Alvarenga" + }, + { + "commits": 4, + "contributor": "Klára Fleischhansová" + }, { "commits": 4, "contributor": "Hiroshi Miura" @@ -222,7 +242,7 @@ }, { "commits": 3, - "contributor": "ⵣⵓⵀⵉⵔ ⴰⵎⴰⵣⵉⵖ زهير أمازيغ" + "contributor": "Ettore Atalan" }, { "commits": 3, @@ -278,19 +298,11 @@ }, { "commits": 2, - "contributor": "ⵣⵓⵀⵉⵔ ⴰⵎⴰⵣⵉⵖ ZOUHIR DEHBI" + "contributor": "multiflexi" }, { "commits": 2, - "contributor": "André Marcelo Alvarenga" - }, - { - "commits": 2, - "contributor": "Ettore Atalan" - }, - { - "commits": 2, - "contributor": "Klára Fleischhansová" + "contributor": "gallegonovato" }, { "commits": 2, @@ -364,18 +376,6 @@ "commits": 2, "contributor": "Leo Alcaraz" }, - { - "commits": 1, - "contributor": "multiflexi" - }, - { - "commits": 1, - "contributor": "gallegonovato" - }, - { - "commits": 1, - "contributor": "Lucas" - }, { "commits": 1, "contributor": "Magnitudee" diff --git a/css/index-tailwind-output.css b/css/index-tailwind-output.css index 3ac35f1423..1b42e5aca7 100644 --- a/css/index-tailwind-output.css +++ b/css/index-tailwind-output.css @@ -8,7 +8,7 @@ */ /* - ! tailwindcss v3.1.8 | MIT License | https://tailwindcss.com + ! tailwindcss v3.2.4 | MIT License | https://tailwindcss.com */ /* @@ -39,6 +39,7 @@ 2. Prevent adjustments of font size after orientation changes in iOS. 3. Use a more readable tab size. 4. Use the user's configured `sans` font-family by default. +5. Use the user's configured `sans` font-feature-settings by default. */ html { @@ -51,6 +52,9 @@ html { /* 3 */ font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; /* 4 */ + -webkit-font-feature-settings: normal; + font-feature-settings: normal; + /* 5 */ } /* @@ -417,6 +421,12 @@ video { height: auto; } +/* Make elements with the HTML hidden attribute stay hidden by default */ + +[hidden] { + display: none; +} + *, ::before, ::after { --tw-border-spacing-x: 0; --tw-border-spacing-y: 0; @@ -592,6 +602,18 @@ video { } } +.sr-only { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0, 0, 0, 0); + white-space: nowrap; + border-width: 0; +} + .pointer-events-none { pointer-events: none; } @@ -608,6 +630,10 @@ video { visibility: hidden; } +.collapse { + visibility: collapse; +} + .static { position: static; } @@ -624,10 +650,6 @@ video { position: relative; } -.\!relative { - position: relative !important; -} - .sticky { position: -webkit-sticky; position: sticky; @@ -997,10 +1019,6 @@ video { height: 3rem; } -.h-6 { - height: 1.5rem; -} - .h-4 { height: 1rem; } @@ -1017,6 +1035,10 @@ video { height: 2.75rem; } +.h-6 { + height: 1.5rem; +} + .h-96 { height: 24rem; } @@ -1132,10 +1154,6 @@ video { flex: none; } -.flex-auto { - flex: 1 1 auto; -} - .flex-shrink-0 { flex-shrink: 0; } @@ -1512,11 +1530,6 @@ video { padding: 0.125rem; } -.px-2 { - padding-left: 0.5rem; - padding-right: 0.5rem; -} - .px-0 { padding-left: 0px; padding-right: 0px; @@ -1721,13 +1734,11 @@ video { } .underline { - -webkit-text-decoration-line: underline; - text-decoration-line: underline; + text-decoration-line: underline; } .line-through { - -webkit-text-decoration-line: line-through; - text-decoration-line: line-through; + text-decoration-line: line-through; } .opacity-50 { @@ -1791,17 +1802,15 @@ video { } .transition { - transition-property: color, background-color, border-color, fill, stroke, opacity, box-shadow, -webkit-text-decoration-color, -webkit-transform, -webkit-filter, -webkit-backdrop-filter; + transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, -webkit-transform, -webkit-filter, -webkit-backdrop-filter; transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter; - transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-text-decoration-color, -webkit-transform, -webkit-filter, -webkit-backdrop-filter; + transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-transform, -webkit-filter, -webkit-backdrop-filter; transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); transition-duration: 150ms; } .transition-colors { - transition-property: color, background-color, border-color, fill, stroke, -webkit-text-decoration-color; transition-property: color, background-color, border-color, text-decoration-color, fill, stroke; - transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, -webkit-text-decoration-color; transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); transition-duration: 150ms; } @@ -1836,14 +1845,6 @@ video { color: var(--unsubtle-detail-color-contrast); } -.\[out\:json\] { - out: json; -} - -.\[timeout\:90\] { - timeout: 90; -} - .\[key\:string\] { key: string; } @@ -1908,7 +1909,7 @@ body { } .leaflet-control-attribution { - display: block ruby; + display: flex; } .badge { diff --git a/index.css b/index.css index 57918e7dbc..4f707d254e 100644 --- a/index.css +++ b/index.css @@ -118,7 +118,7 @@ body { } .leaflet-control-attribution { - display: block ruby; + display: flex; } .badge { diff --git a/index.html b/index.html index 66053168ac..1c286477fc 100644 --- a/index.html +++ b/index.html @@ -17,7 +17,7 @@ MapComplete - + Mastodon diff --git a/langs/en.json b/langs/en.json index e9e2c2fc82..50605772e7 100644 --- a/langs/en.json +++ b/langs/en.json @@ -133,6 +133,7 @@ "josmOpened": "JOSM is opened", "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", "mapillaryHelp": "Mapillary is an online service which gathers street-level pictures and offers them under a free license. Contributors are allowed to use these pictures to improve OpenStreetMap", "openIssueTracker": "File a bug", "openMapillary": "Open Mapillary here", diff --git a/langs/layers/ca.json b/langs/layers/ca.json index fa0451cdb5..2f14b097a6 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -1768,7 +1768,6 @@ "Email": { "render": "{email}" }, - "Name tag": {}, "Surface area": { "render": "Superfície: {_surface:ha}Ha" } diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 7935b98f39..240225df3c 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -1385,12 +1385,6 @@ "title": "een vogelkijkwand" } }, - "size": { - "render": "40,40,center" - }, - "stroke": { - "render": "3" - }, "tagRenderings": { "bird-hide-shelter-or-wall": { "mappings": { diff --git a/langs/shared-questions/de.json b/langs/shared-questions/de.json index b26ba5fcd2..0050991ffa 100644 --- a/langs/shared-questions/de.json +++ b/langs/shared-questions/de.json @@ -29,6 +29,32 @@ }, "question": "Mit welchen Münzen kann man hier bezahlen?" }, + "denominations-notes": { + "mappings": { + "0": { + "then": "5-Euro-Scheine werden angenommen" + }, + "1": { + "then": "10-Euro-Scheine werden angenommen" + }, + "2": { + "then": "20-Euro-Scheine werden angenommen" + }, + "3": { + "then": "50-Euro-Scheine werden angenommen" + }, + "4": { + "then": "100-Euro-Scheine werden angenommen" + }, + "5": { + "then": "200-Euro-Scheine werden angenommen" + }, + "6": { + "then": "500-Euro-Scheine werden angenommen" + } + }, + "question": "Mit welchen Banknoten kann man hier bezahlen?" + }, "description": { "question": "Gibt es noch etwas, das die vorhergehenden Fragen nicht abgedeckt haben? Hier wäre Platz dafür.
Bitte keine bereits erhobenen Informationen." }, diff --git a/scripts/generateLayouts.ts b/scripts/generateLayouts.ts index aff6879fce..0921f68e12 100644 --- a/scripts/generateLayouts.ts +++ b/scripts/generateLayouts.ts @@ -353,7 +353,7 @@ async function main(): Promise { const { manifest, whiteIcons } = await createManifest(layout, alreadyWritten) const manif = JSON.stringify(manifest, undefined, 2) const manifestLocation = encodeURIComponent(layout.id.toLowerCase()) + ".webmanifest" - writeFile(manifestLocation, manif, err) + writeFile("public/" + manifestLocation, manif, err) // Create a landing page for the given theme const landing = await createLandingPage(layout, manifest, whiteIcons, alreadyWritten) @@ -377,7 +377,7 @@ async function main(): Promise { ) const manif = JSON.stringify(manifest, undefined, 2) - writeFileSync("index.manifest", manif) + writeFileSync("public/index.webmanifest", manif) } main().then(() => {