Merge branch 'master' into feature/studio

2023-07-28 14:38:12 +02:00 · 2023-07-28 14:38:12 +02:00 · 6ff2c629f0
commit 6ff2c629f0
parent eb9307dbbe 3c08c12974
994 changed files with 5917 additions and 4262 deletions
--- a/Docs/BuiltinIndex.md
+++ b/Docs/BuiltinIndex.md
@ -54,6 +54,7 @@
    + [payment-options-split](#payment-options-split)
    + [denominations-coins](#denominations-coins)
    + [denominations-notes](#denominations-notes)
+    + [survey_date](#survey_date)
    + [id_presets.shop_types](#id_presetsshop_types)
    + [school.capacity](#schoolcapacity)
    + [school.gender](#schoolgender)
@ -839,6 +840,17 @@



+### survey_date 
+
+
+
+
+
+  - recycling
+
+
+
+
 ### id_presets.shop_types 


--- a/Docs/BuiltinQuestions.md
+++ b/Docs/BuiltinQuestions.md
@ -52,6 +52,7 @@ Special library layer which does not need a '.questions'-prefix before being imp
    + [internet-fee](#internet-fee)
    + [internet-ssid](#internet-ssid)
    + [luminous_or_lit](#luminous_or_lit)
+    + [survey_date](#survey_date)



@ -114,6 +115,7 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access#values) [internet_access](https://wiki.openstreetmap.org/wiki/Key:internet_access) | Multiple choice | [wlan](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno) [terminal](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal) [wired](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access:fee#values) [internet_access:fee](https://wiki.openstreetmap.org/wiki/Key:internet_access:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno) [customers](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access:ssid#values) [internet_access:ssid](https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid) | [string](../SpecialInputElements.md#string) | [Telekom](https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/survey:date#values) [survey:date](https://wiki.openstreetmap.org/wiki/Key:survey:date) | [date](../SpecialInputElements.md#date) | [](https://wiki.openstreetmap.org/wiki/Tag:survey:date%3D)



@ -754,6 +756,25 @@ The question is  *Is this object lit or does it emit light?*
  - *This object emits light*  corresponds with  `luminous=yes`
  - *This object is lit externally, e.g. by a spotlight or other lights*  corresponds with  `lit=yes`
  - *This object does not emit light and is not lighted by externally*  corresponds with  `lit=no&luminous=no`
+
+
+
+
+### survey_date 
+
+
+
+The question is  *When was this object last surveyed?*
+
+This rendering asks information about the property  [survey:date](https://wiki.openstreetmap.org/wiki/Key:survey:date) 
+
+This is rendered with  `This object was last surveyed on <b>{survey:date}</b>`
+
+
+
+
+
+  - *This object was last surveyed today*  corresponds with  `survey:date=`
 

 This document is autogenerated from [assets/layers/questions/questions.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/questions/questions.json)
--- a/Docs/Layers/climbing_opportunity.md
+++ b/Docs/Layers/climbing_opportunity.md
@ -15,6 +15,7 @@ Fallback layer with items on which climbing _might_ be possible. It is loaded wh


  - This layer is shown at zoomlevel **19** and higher
+  - This layer is needed as dependency for layer [climbing_route](#climbing_route)



--- a/Docs/Layers/climbing_route.md
+++ b/Docs/Layers/climbing_route.md
@ -15,6 +15,7 @@ A single climbing route and its properties. Some properties are derived from the


  - This layer is shown at zoomlevel **18** and higher
+  - This layer will automatically load  [climbing_opportunity](./climbing_opportunity.md)  into the layout as it depends on it:  a preset snaps to this layer (presets[0])
  - This layer is needed as dependency for layer [climbing_area](#climbing_area)


--- a/Docs/Layers/recycling.md
+++ b/Docs/Layers/recycling.md
@ -14,7 +14,7 @@ A layer with recycling containers and centres



-  - This layer is shown at zoomlevel **11** and higher
+  - This layer is shown at zoomlevel **10** and higher



@ -55,6 +55,7 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | 
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](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)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](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)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/survey:date#values) [survey:date](https://wiki.openstreetmap.org/wiki/Key:survey:date) | [date](../SpecialInputElements.md#date) | [](https://wiki.openstreetmap.org/wiki/Tag:survey:date%3D)



@ -341,6 +342,25 @@ This is rendered with  `This recycling facility can be used by {access}`



+### survey_date 
+
+
+
+The question is  *When was this object last surveyed?*
+
+This rendering asks information about the property  [survey:date](https://wiki.openstreetmap.org/wiki/Key:survey:date) 
+
+This is rendered with  `This object was last surveyed on <b>{survey:date}</b>`
+
+
+
+
+
+  - *This object was last surveyed today*  corresponds with  `survey:date=`
+
+
+
+
 ### leftover-questions 


--- a/Docs/Layers/waste_disposal.md
+++ b/Docs/Layers/waste_disposal.md
@ -14,7 +14,7 @@ Waste Disposal Bin, medium to large bin for disposal of (household) waste



-  - This layer is shown at zoomlevel **18** and higher
+  - This layer is shown at zoomlevel **12** and higher



--- a/Docs/TagInfo/mapcomplete_personal.json
+++ b/Docs/TagInfo/mapcomplete_personal.json
@ -9813,6 +9813,15 @@
      "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": "survey:date",
+      "description": "Layer 'Recycling' shows and asks freeform values for key 'survey:date' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "survey:date",
+      "description": "Layer 'Recycling' shows survey:date= with a fixed text, namely 'This object was last surveyed today' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme') Picking this answer will delete the key survey:date.",
+      "value": ""
+    },
    {
      "key": "amenity",
      "description": "The MapComplete theme Personal theme has a layer Primary and secondary schools showing features with this tag",
--- a/Docs/TagInfo/mapcomplete_waste.json
+++ b/Docs/TagInfo/mapcomplete_waste.json
@ -350,6 +350,15 @@
      "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": "survey:date",
+      "description": "Layer 'Recycling' shows and asks freeform values for key 'survey:date' (in the MapComplete.osm.be theme 'Waste')"
+    },
+    {
+      "key": "survey:date",
+      "description": "Layer 'Recycling' shows survey:date= with a fixed text, namely 'This object was last surveyed today' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste') Picking this answer will delete the key survey:date.",
+      "value": ""
+    },
    {
      "key": "amenity",
      "description": "The MapComplete theme Waste has a layer Waste Disposal Bins showing features with this tag",
--- a/Docs/Themes/postboxes.md
+++ b/Docs/Themes/postboxes.md
@ -5,7 +5,7 @@



-On this map you can find and add data of post offices and post boxes. You can use this map to find where you can mail your next postcard! :)<br/>Spotted an error or is a post box missing? You can edit this map with a free OpenStreetMap account. 
+On this map you can find and add data of post offices and post boxes. You can use this map to find where you can mail your next postcard! :)<br/>Spotted an error or is a post box missing? You can edit this map with a free OpenStreetMap account.

 This theme contains the following layers:

--- a/Docs/URL_Parameters.md
+++ b/Docs/URL_Parameters.md
@ -68,7 +68,7 @@ Finally, the URL-hash is the part after the `#`. It is `node/1234` in this case.
 The language to display MapComplete in.
 The user display language is determined in the following order:

-1. Use the language as set by the URL-parameter `language`. This will _disable_ setting the language by the user
+1. Use the language as set by the URL-parameter `language` (following ISO 639-1 | ex. `language=nl`). This will _disable_ setting the language by the user
 2. If the user did log in and did set their language before with MapComplete, use this language. This language selection is synchronized accross devices using the openstreetmap.org user preferences.
 3. If the user visited MapComplete before and did change their language manually, this changed language will be saved in local storage. Use the language from local storage
 4. Use the navigator-language (if available)
@ -77,174 +77,274 @@ The user display language is determined in the following order:
 Note that this URL-parameter is not added to the URL-bar by default.
 Note that the _loading_ screen will always use the navigator language.

-Translations are never complete. If a translation in a certain language is missing, English is used as fallback. No default value set
+Translations are never complete. If a translation in a certain language is missing, English is used as fallback.
+
+This documentation is defined in the source code at [Locale.ts](/src/UI/i18n/Locale.ts#L35)
+
+ No default value set



 fs-translation-mode 
 ---------------------

- If set, will show a translation button next to every string. The default value is _false_
+ If set, will show a translation button next to every string.
+
+This documentation is defined in the source code at [Locale.ts](/src/UI/i18n/Locale.ts#L70)
+
+ The default value is _false_



 backend 
 ---------

- The OSM backend to use - can be used to redirect mapcomplete to the testing backend when using 'osm-test' The default value is _osm_
+ The OSM backend to use - can be used to redirect mapcomplete to the testing backend when using 'osm-test'
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L29)
+
+ The default value is _osm_



 fake-user 
 -----------

- If true, 'dryrun' mode is activated and a fake user account is loaded The default value is _false_
+ If true, 'dryrun' mode is activated and a fake user account is loaded
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L35)
+
+ The default value is _false_



 fs-userbadge 
 --------------

- Disables/Enables the user information pill (userbadge) at the top left. Disabling this disables logging in and thus disables editing all together, effectively putting MapComplete into read-only mode. The default value is _true_
+ Disables/Enables the user information pill (userbadge) at the top left. Disabling this disables logging in and thus disables editing all together, effectively putting MapComplete into read-only mode.
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L76)
+
+ The default value is _true_



 fs-search 
 -----------

- Disables/Enables the search bar The default value is _true_
+ Disables/Enables the search bar
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L81)
+
+ The default value is _true_



 fs-background 
 ---------------

- Disables/Enables the background layer control The default value is _true_
+ Disables/Enables the background layer control
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L86)
+
+ The default value is _true_



 fs-filter 
 -----------

- Disables/Enables the filter view The default value is _true_
+ Disables/Enables the filter view
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L92)
+
+ The default value is _true_



 fs-add-new 
 ------------

- Disables/Enables the 'add new feature'-popup. (A theme without presets might not have it in the first place) The default value is _true_
+ Disables/Enables the 'add new feature'-popup. (A theme without presets might not have it in the first place)
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L97)
+
+ The default value is _true_



 fs-welcome-message 
 --------------------

- Disables/enables the help menu or welcome message The default value is _true_
+ Disables/enables the help menu or welcome message
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L102)
+
+ The default value is _true_



 fs-community-index 
 --------------------

- Disables/enables the button to get in touch with the community The default value is _true_
+ Disables/enables the button to get in touch with the community
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L107)
+
+ The default value is _true_



 fs-iframe-popout 
 ------------------

- Disables/Enables the extraLink button. By default, if in iframe mode and the welcome message is hidden, a popout button to the full mapcomplete instance is shown instead (unless disabled with this switch or another extraLink button is enabled) The default value is _true_
+ Disables/Enables the extraLink button. By default, if in iframe mode and the welcome message is hidden, a popout button to the full mapcomplete instance is shown instead (unless disabled with this switch or another extraLink button is enabled)
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L112)
+
+ The default value is _true_



 fs-more-quests 
 ----------------

- Disables/Enables the 'More Quests'-tab in the welcome message The default value is _true_
+ Disables/Enables the 'More Quests'-tab in the welcome message
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L117)
+
+ The default value is _true_



 fs-share-screen 
 -----------------

- Disables/Enables the 'Share-screen'-tab in the welcome message The default value is _true_
+ Disables/Enables the 'Share-screen'-tab in the welcome message
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L122)
+
+ The default value is _true_



 fs-geolocation 
 ----------------

- Disables/Enables the geolocation button The default value is _true_
+ Disables/Enables the geolocation button
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L127)
+
+ The default value is _true_



 fs-all-questions 
 ------------------

- Always show all questions The default value is _false_
+ Always show all questions
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L132)
+
+ The default value is _false_



 fs-export 
 -----------

- Enable the export as GeoJSON and CSV button The default value is _true_
+ Enable the export as GeoJSON and CSV button
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L138)
+
+ The default value is _true_



 test 
 ------

- If true, 'dryrun' mode is activated. The app will behave as normal, except that changes to OSM will be printed onto the console instead of actually uploaded to osm.org The default value is _false_
+ If true, 'dryrun' mode is activated. The app will behave as normal, except that changes to OSM will be printed onto the console instead of actually uploaded to osm.org
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L153)
+
+ The default value is _false_



 debug 
 -------

- If true, shows some extra debugging help such as all the available tags on every object The default value is _false_
+ If true, shows some extra debugging help such as all the available tags on every object
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L159)
+
+ The default value is _false_



 overpassUrl 
 -------------

- Point mapcomplete to a different overpass-instance. Example: https://overpass-api.de/api/interpreter The default value is _https://overpass-api.de/api/interpreter,https://overpass.kumi.systems/api/interpreter,https://overpass.openstreetmap.ru/cgi/interpreter_
+ Point mapcomplete to a different overpass-instance. Example: https://overpass-api.de/api/interpreter
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L165)
+
+ The default value is _https://overpass-api.de/api/interpreter,https://overpass.kumi.systems/api/interpreter,https://overpass.openstreetmap.ru/cgi/interpreter_



 overpassTimeout 
 -----------------

- Set a different timeout (in seconds) for queries in overpass The default value is _30_
+ Set a different timeout (in seconds) for queries in overpass
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L176)
+
+ The default value is _30_



 overpassMaxZoom 
 -----------------

-  point to switch between OSM-api and overpass The default value is _16_
+  point to switch between OSM-api and overpass
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L184)
+
+ The default value is _16_



 osmApiTileSize 
 ----------------

- Tilesize when the OSM-API is used to fetch data within a BBOX The default value is _17_
+ Tilesize when the OSM-API is used to fetch data within a BBOX
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L192)
+
+ The default value is _17_



 background 
 ------------

- The id of the background layer to start with The default value is _osm_
+ The id of the background layer to start with
+
+This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L205)
+
+ The default value is _osm_



 layer-&lt;layer-id&gt; 
 ------------------------

- Wether or not the layer with id <layer-id> is shown The default value is _true_ 
+ Wether or not the layer with id <layer-id> is shown
+
+This documentation is defined in the source code at [QueryParameterDocumentation.ts](/src/UI/QueryParameterDocumentation.ts#L52)
+
+ The default value is _true_ 

 This document is autogenerated from [src/Logic/Web/QueryParameters.ts](https://github.com/pietervdvn/MapComplete/blob/develop/src/Logic/Web/QueryParameters.ts), [src/UI/QueryParameterDocumentation.ts](https://github.com/pietervdvn/MapComplete/blob/develop/src/UI/QueryParameterDocumentation.ts)