diff --git a/Docs/BuiltinQuestions.md b/Docs/BuiltinQuestions.md index 907d16c189..5d496085d3 100644 --- a/Docs/BuiltinQuestions.md +++ b/Docs/BuiltinQuestions.md @@ -253,7 +253,7 @@ Are dogs allowed in this business? {description} -Is there still something relevant you couldn't give in the previous questions? Add it here.
Don't repeat already stated facts +Is there still something relevant you couldn't give in the previous questions? Add it here. diff --git a/Docs/Layers/artwork.md b/Docs/Layers/artwork.md index 30edeb27ca..f83d13c860 100644 --- a/Docs/Layers/artwork.md +++ b/Docs/Layers/artwork.md @@ -378,7 +378,7 @@ This tagrendering has labels `bench-questions` -The question is *Does this bench have an inscription?
E.g. on a mounted plaque, in the backrest, ...
* +The question is *Does this bench have an inscription?* This rendering asks information about the property [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) diff --git a/Docs/Layers/bench.md b/Docs/Layers/bench.md index 492b54da44..f9dfc60ea3 100644 --- a/Docs/Layers/bench.md +++ b/Docs/Layers/bench.md @@ -225,7 +225,7 @@ This tagrendering has labels `bench-questions` -The question is *Does this bench have an inscription?
E.g. on a mounted plaque, in the backrest, ...
* +The question is *Does this bench have an inscription?* This rendering asks information about the property [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) @@ -248,7 +248,7 @@ This tagrendering has labels `bench-questions` -The question is *Does this bench have an artistic element?
E.g. it has an integrated painting, statue or other non-trivial, creative work
* +The question is *Does this bench have an artistic element?* diff --git a/Docs/Layers/bicycle_library.md b/Docs/Layers/bicycle_library.md index a5ed32cb68..a730f40765 100644 --- a/Docs/Layers/bicycle_library.md +++ b/Docs/Layers/bicycle_library.md @@ -214,7 +214,7 @@ The question is *Who can loan bicycles here?* -The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.
Don't repeat already stated facts* +The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.* This rendering asks information about the property [description](https://wiki.openstreetmap.org/wiki/Key:description) diff --git a/Docs/Layers/bike_shop.md b/Docs/Layers/bike_shop.md index bc5e447ba8..5ca275fcf3 100644 --- a/Docs/Layers/bike_shop.md +++ b/Docs/Layers/bike_shop.md @@ -518,7 +518,7 @@ This is rendered with `Using the cleaning service costs {service:bicycle:cleani -The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.
Don't repeat already stated facts* +The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.* This rendering asks information about the property [description](https://wiki.openstreetmap.org/wiki/Key:description) diff --git a/Docs/Layers/bike_themed_object.md b/Docs/Layers/bike_themed_object.md index ddd0e9ee54..2db33554ae 100644 --- a/Docs/Layers/bike_themed_object.md +++ b/Docs/Layers/bike_themed_object.md @@ -85,7 +85,7 @@ This tagrendering has no question and is thus read-only -The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.
Don't repeat already stated facts* +The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.* This rendering asks information about the property [description](https://wiki.openstreetmap.org/wiki/Key:description) diff --git a/Docs/Layers/climbing_route.md b/Docs/Layers/climbing_route.md index d4bad7baf4..a453fbe35d 100644 --- a/Docs/Layers/climbing_route.md +++ b/Docs/Layers/climbing_route.md @@ -153,7 +153,7 @@ This is rendered with `This route has {climbing:bolts} bolts
Don't repeat already stated facts* +The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.* This rendering asks information about the property [description](https://wiki.openstreetmap.org/wiki/Key:description) diff --git a/Docs/Layers/entrance.md b/Docs/Layers/entrance.md index e9687b2965..3e2d67c487 100644 --- a/Docs/Layers/entrance.md +++ b/Docs/Layers/entrance.md @@ -140,7 +140,7 @@ The question is *What type of entrance is this?* -The question is *What is the type of this door?
Wether or not the door is automated is asked in the next question* +The question is *What is the type of this door?* diff --git a/Docs/Layers/sport_pitch.md b/Docs/Layers/sport_pitch.md index 4420226889..14b8f1b804 100644 --- a/Docs/Layers/sport_pitch.md +++ b/Docs/Layers/sport_pitch.md @@ -247,6 +247,24 @@ This tagrendering has no question and is thus read-only +id | question | osmTags +---- | ---------- | --------- +accessibility.0 | Publicly accessible | access=yes\|access=public| + + + + +id | question | osmTags +---- | ---------- | --------- +available_sports.0 | All sports (default) | +available_sports.1 | Basketball fields | sport=basketball +available_sports.2 | Soccer fields | sport=soccer +available_sports.3 | Ping-pong table | sport=table_tennis +available_sports.4 | Tennis field | sport=tennis + + + + id | question | osmTags ---- | ---------- | --------- open_now.0 | Opened now | _isOpen=yes diff --git a/Docs/Layers/toilet.md b/Docs/Layers/toilet.md index 72ff4784d4..130ff8482d 100644 --- a/Docs/Layers/toilet.md +++ b/Docs/Layers/toilet.md @@ -348,7 +348,7 @@ The question is *Does one have to bring their own toilet paper to this toilet?* -The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.
Don't repeat already stated facts* +The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.* This rendering asks information about the property [description](https://wiki.openstreetmap.org/wiki/Key:description) diff --git a/Docs/Layers/toilet_at_amenity.md b/Docs/Layers/toilet_at_amenity.md index e79ed9e92d..df443602c9 100644 --- a/Docs/Layers/toilet_at_amenity.md +++ b/Docs/Layers/toilet_at_amenity.md @@ -311,7 +311,7 @@ The question is *Does one have to bring their own toilet paper to this toilet?* -The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.
Don't repeat already stated facts* +The question is *Is there still something relevant you couldn't give in the previous questions? Add it here.* This rendering asks information about the property [toilets:description](https://wiki.openstreetmap.org/wiki/Key:toilets:description) diff --git a/Docs/Layers/usersettings.md b/Docs/Layers/usersettings.md index aaba87fce5..ba823c0704 100644 --- a/Docs/Layers/usersettings.md +++ b/Docs/Layers/usersettings.md @@ -52,6 +52,7 @@ this quick overview is incomplete attribute | type | values which are supported by this layer ----------- | ------ | ------------------------------------------ [](https://taginfo.openstreetmap.org/keys/mapcomplete-pictures-license#values) [mapcomplete-pictures-license](https://wiki.openstreetmap.org/wiki/Key:mapcomplete-pictures-license) | Multiple choice | [CC0](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-pictures-license%3DCC0) [CC-BY 4.0](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-pictures-license%3DCC-BY 4.0) [CC-BY-SA 4.0](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-pictures-license%3DCC-BY-SA 4.0) +[](https://taginfo.openstreetmap.org/keys/mapcomplete-show-all-questions#values) [mapcomplete-show-all-questions](https://wiki.openstreetmap.org/wiki/Key:mapcomplete-show-all-questions) | Multiple choice | [true](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-show-all-questions%3Dtrue) [false](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-show-all-questions%3Dfalse) [](https://taginfo.openstreetmap.org/keys/mapcomplete-translation-mode#values) [mapcomplete-translation-mode](https://wiki.openstreetmap.org/wiki/Key:mapcomplete-translation-mode) | Multiple choice | [false](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-translation-mode%3Dfalse) [true](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-translation-mode%3Dtrue) [mobile](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-translation-mode%3Dmobile) [](https://taginfo.openstreetmap.org/keys/mapcomplete-translation-mode#values) [mapcomplete-translation-mode](https://wiki.openstreetmap.org/wiki/Key:mapcomplete-translation-mode) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-translation-mode%3Dyes) [](https://taginfo.openstreetmap.org/keys/_translation_percentage#values) [_translation_percentage](https://wiki.openstreetmap.org/wiki/Key:_translation_percentage) | Multiple choice | [100](https://wiki.openstreetmap.org/wiki/Tag:_translation_percentage%3D100) @@ -81,6 +82,22 @@ The question is *Under what license do you want to publish your pictures?* +### all-questions-at-once + + + +The question is *Should questions for unknown data fields appear one-by-one or together?* + + + + + + - *Show all questions in the infobox together* corresponds with `mapcomplete-show-all-questions=true` + - *Show questions one-by-one* corresponds with `mapcomplete-show-all-questions=false` + + + + ### translations-title diff --git a/Docs/SpecialInputElements.md b/Docs/SpecialInputElements.md index 525bc52ad2..ed4c9b0f45 100644 --- a/Docs/SpecialInputElements.md +++ b/Docs/SpecialInputElements.md @@ -104,8 +104,8 @@ options | A JSON-object of type `{ removePrefixes: string[], removePostfixes: st subarg \| doc -------- | ----- -removePrefixes | remove these snippets of text from the start of the passed string to search. This is either a list OR a hash of languages to a list -removePostfixes | remove these snippets of text from the end of the passed string to search. This is either a list OR a hash of languages to a list +removePrefixes | remove these snippets of text from the start of the passed string to search. This is either a list OR a hash of languages to a list. The individual strings are interpreted as case ignoring regexes +removePostfixes | remove these snippets of text from the end of the passed string to search. This is either a list OR a hash of languages to a list. The individual strings are interpreted as case ignoring regexes. instanceOf | A list of Q-identifier which indicates that the search results _must_ be an entity of this type, e.g. [`Q5`](https://www.wikidata.org/wiki/Q5) for humans notInstanceof | A list of Q-identifiers which indicates that the search results _must not_ be an entity of this type, e.g. [`Q79007`](https://www.wikidata.org/wiki/Q79007) to filter away all streets from the search results @@ -129,7 +129,8 @@ notInstanceof | A list of Q-identifiers which indicates that the search results "square", "plaza", ], - "nl": ["straat","plein","pad","weg",laan"] + "nl": ["straat","plein","pad","weg",laan"], + "fr":["route (de|de la|de l'| de le)"] }, "#": "Remove streets and parks from the search results:" @@ -221,7 +222,7 @@ options | A JSON-object of type `{ prefix: string, postfix: string }`. subarg \| doc -------- | ----- -prefix | Piece of text that will always be added to the front of the generated opening hours. If the OSM-data does not start with this, it will fail to parse +prefix | Piece of text that will always be added to the front of the generated opening hours. If the OSM-data does not start with this, it will fail to parse. postfix | Piece of text that will always be added to the end of the generated opening hours diff --git a/assets/contributors.json b/assets/contributors.json index cd618c19ea..8ba3150257 100644 --- a/assets/contributors.json +++ b/assets/contributors.json @@ -1,7 +1,7 @@ { "contributors": [ { - "commits": 5071, + "commits": 5094, "contributor": "Pieter Vander Vennet" }, { @@ -145,12 +145,12 @@ "contributor": "pelderson" }, { - "commits": 4, - "contributor": "Nadhem" + "commits": 5, + "contributor": "Codain" }, { "commits": 4, - "contributor": "Codain" + "contributor": "Nadhem" }, { "commits": 4, diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 4efcfd4a84..b6b71d1cbb 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,30 +1,13 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete", - "cs": "Změny provedené pomocí MapComplete", - "de": "Mit MapComplete vorgenommene Änderungen", - "es": "Cambios realizados por MapComplete", - "fr": "Changements faits avec MapComplete", - "nb_NO": "Endringer laget med MapComplete", - "nl": "Wijzigingen gemaakt met 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", - "es": "Muestra los cambios realizados por MapComplete", - "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", - "es": "Este mapa muestra todos los cambios realizados con MapComplete", - "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, @@ -37,12 +20,7 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers", - "ca": "Centres del conjunt de canvis", - "de": "Zentrum der Änderungssätze", - "es": "Centros de cambios", - "fr": "Centres de modifications de paramètres", - "nl": "Middelpunt van de wijzigingenset" + "en": "Changeset centers" }, "minzoom": 0, "source": { @@ -53,78 +31,41 @@ }, "title": { "render": { - "en": "Changeset for {theme}", - "de": "Änderungssatz für {theme}", - "es": "Conjunto de cambios para {theme}", - "fr": "Groupe de modifications pour {theme}", - "nb_NO": "Endringssett for {theme}", - "nl": "Changeset voor {theme}" + "en": "Changeset for {theme}" } }, "description": { - "en": "Shows all MapComplete changes", - "cs": "Zobrazuje všechny změny MapComplete", - "de": "Zeigt alle MapComplete-Änderungen", - "es": "Muestra todos los cambios de MapComplete", - "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}", - "es": "Conjunto de cambios {id}", - "fr": "Groupe de modifications {id}", - "nb_NO": "Endringssett {id}", - "nl": "Wijzigingenset {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?", - "es": "¿Qué colaborador realizó este cambio?", - "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}", - "es": "Cambio realizado por {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?", - "es": "¿Qué tema se utilizó para realizar este cambio?", - "fr": "Quel thème a été utilisé pour faire cette modification ?", - "nb_NO": "Hvilket tema ble brukt for å utføre denne denne endringen?", - "nl": "Welk thema is gebruikt voor deze wijziging?" + "en": "What theme was used to make this change?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}", - "de": "Geändert mit Thema {theme}", - "es": "Cambio con tema {theme}", - "fr": "Modifié avec le thème {theme}", - "nb_NO": "Endre med temaet {theme}", - "nl": "Wijziging met thema {theme}" + "en": "Change with theme {theme}" } }, { @@ -133,39 +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?", - "es": "¿En qué configuración regional (idioma) se realizó este cambio?", - "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}", - "es": "La configuración regional del usuario es {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}", - "es": "Cambio con {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?", - "es": "¿En qué host (sitio web) se realizó este cambio?", - "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" @@ -510,13 +431,7 @@ } ], "question": { - "en": "Themename contains {search}", - "ca": "Nom del tema conté {search}", - "de": "Themename enthält {search}", - "es": "El nombre contiene {search}", - "fr": "Nom de thème contenant {search}", - "nb_NO": "Temanavn inneholder {search}", - "nl": "Themanaam bevat {search}" + "en": "Themename contains {search}" } } ] @@ -532,13 +447,7 @@ } ], "question": { - "en": "Made by contributor {search}", - "cs": "Vytvořil přispěvatel {search}", - "de": "Erstellt vom Mitwirkenden {search}", - "es": "Hecho por colaborador {search}", - "fr": "Fait par le contributeur {search}", - "nb_NO": "Laget av bidragsyter {search}", - "nl": "Gemaakt door {search}" + "en": "Made by contributor {search}" } } ] @@ -554,13 +463,7 @@ } ], "question": { - "en": "Not made by contributor {search}", - "cs": "Nevytvořil přispěvatel {search}", - "de": "Nicht von Mitwirkendem {search}", - "es": "No hecho por colaborador {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}" } } ] @@ -577,13 +480,7 @@ } ], "question": { - "en": "Made before {search}", - "cs": "Vytvořeno před {search}", - "de": "Erstellt vor {search}", - "es": "Hecho antes de {search}", - "fr": "Fait avant {search}", - "nb_NO": "Laget før {search}", - "nl": "Gemaakt voor {search}" + "en": "Made before {search}" } } ] @@ -600,13 +497,7 @@ } ], "question": { - "en": "Made after {search}", - "cs": "Vytvořeno po {search}", - "de": "Erstellt nach {search}", - "es": "Hecho después de {search}", - "fr": "Fait après {search}", - "nb_NO": "Laget etter {search}", - "nl": "Gemaakt na {search}" + "en": "Made after {search}" } } ] @@ -622,13 +513,7 @@ } ], "question": { - "en": "User language (ISO-code) {search}", - "ca": "Idioma de l'usuari (ISO-code) {search}", - "de": "Benutzersprache (ISO-Code) {search}", - "es": "Use lenguaje (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}" } } ] @@ -644,12 +529,7 @@ } ], "question": { - "en": "Made with host {search}", - "de": "Erstellt mit host {search}", - "es": "Hecho con host {search}", - "fr": "Fait par le serveur {search}", - "nb_NO": "Laget med vert {search}", - "nl": "Gemaakt met host {search}" + "en": "Made with host {search}" } } ] @@ -660,12 +540,7 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image", - "de": "Im Änderungssatz wurde mindestens ein Bild hinzugefügt", - "es": "Conjunto de cambios ha añadido al menos una imagen", - "fr": "Le groupe de modifications a ajouté au moins une image", - "nb_NO": "Endringssett la til minst ett bilde", - "nl": "Changeset die een of meerdere afbeeldingen toevoegt" + "en": "Changeset added at least one image" } } ] @@ -680,13 +555,7 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here", - "cs": "Další statistiky najdete na .", - "de": "Weitere Statistiken hier", - "es": "Más estadísticas en aquí", - "fr": "D’autres statistiques sont disponibles ici", - "nb_NO": "Mer statistikk å finne her", - "nl": "Meer statistieken zijn hier te vinden" + "en": "More statistics can be found here" } }, { diff --git a/assets/themes/uk_addresses/uk_addresses.json b/assets/themes/uk_addresses/uk_addresses.json index 49c1d8c673..493e614a5a 100644 --- a/assets/themes/uk_addresses/uk_addresses.json +++ b/assets/themes/uk_addresses/uk_addresses.json @@ -695,4 +695,4 @@ "enableShareScreen": false, "enableMoreQuests": false, "credits": "Pieter Vander Vennet, Rob Nickerson, Russ Garrett" -} +} \ No newline at end of file diff --git a/assets/themes/waste_assen/waste_assen.json b/assets/themes/waste_assen/waste_assen.json index 6e4c036a3e..feea148b16 100644 --- a/assets/themes/waste_assen/waste_assen.json +++ b/assets/themes/waste_assen/waste_assen.json @@ -103,4 +103,4 @@ ], "hideFromOverview": true, "credits": "Robin van der Linde" -} +} \ No newline at end of file