diff --git a/Docs/BuiltinIndex.md b/Docs/BuiltinIndex.md
index 9a73783b6b..3569066a0b 100644
--- a/Docs/BuiltinIndex.md
+++ b/Docs/BuiltinIndex.md
@@ -17,13 +17,13 @@
+ [email](#email)
+ [wikipedia](#wikipedia)
+ [bench.*bench-questions](#bench*bench-questions)
- + [opening_hours](#opening_hours)
+ + [opening_hours_24_7](#opening_hours_24_7)
+ [artwork.*artwork-question](#artwork*artwork-question)
+ + [opening_hours](#opening_hours)
+ [description](#description)
+ [payment-options](#payment-options)
+ [payment-options-advanced](#payment-options-advanced)
+ [payment-options-split](#payment-options-split)
- + [opening_hours_24_7](#opening_hours_24_7)
+ [level](#level)
+ [bicycle_rental.*bicycle_rental](#bicycle_rental*bicycle_rental)
+ [bike_cleaning.bike_cleaning-service:bicycle:cleaning:charge](#bike_cleaningbike_cleaning-service:bicycle:cleaning:charge)
@@ -127,6 +127,7 @@
- elongated_coin
- entrance
- extinguisher
+ - favourite
- fire_station
- fitness_centre
- fitness_station
@@ -204,12 +205,15 @@
- animal_shelter
- cafe_pub
+ - climbing_area
+ - climbing_gym
- dogpark
- fitness_centre
- food
- hackerspace
- hotel
- pharmacy
+ - playground
- shops
- veterinary
@@ -353,13 +357,46 @@
-### opening_hours
+### opening_hours_24_7
- atm
+ - bike_repair_station
+ - charging_station
+ - defibrillator
+ - drinking_water
+ - elongated_coin
+ - fitness_station
+ - hackerspace
+ - parcel_lockers
+ - recycling
+ - toilet
+ - vending_machine
+
+
+
+
+### artwork.*artwork-question
+
+
+
+
+
+ - bench
+ - drinking_water
+
+
+
+
+### opening_hours
+
+
+
+
+
- bicycle_library
- bicycle_rental
- bike_cafe
@@ -387,17 +424,6 @@
-### artwork.*artwork-question
-
-
-
-
-
- - bench
-
-
-
-
### description
@@ -463,26 +489,6 @@
-### opening_hours_24_7
-
-
-
-
-
- - bike_repair_station
- - charging_station
- - defibrillator
- - elongated_coin
- - fitness_station
- - hackerspace
- - parcel_lockers
- - recycling
- - toilet
- - vending_machine
-
-
-
-
### level
@@ -643,6 +649,7 @@
- charging_station
- etymology
+ - favourite
- hackerspace
- play_forest
- playground
@@ -810,6 +817,7 @@
- elongated_coin
+ - playground
diff --git a/Docs/BuiltinQuestions.md b/Docs/BuiltinQuestions.md
index 5f1a5daf46..e6ee194128 100644
--- a/Docs/BuiltinQuestions.md
+++ b/Docs/BuiltinQuestions.md
@@ -59,6 +59,7 @@ Special library layer which does not need a '.questions'-prefix before being imp
+ [lactose_free](#lactose_free)
+ [gluten_free](#gluten_free)
+ [vegan](#vegan)
+ + [favourite_status](#favourite_status)
@@ -925,6 +926,16 @@ The question is *Does this place offer a vegan option?*
- *This shop has no vegan offering* corresponds with diet:vegan=no
-This tagrendering has labels `diets`
+This tagrendering has labels `diets`
+
+
+
+### favourite_status
+
+
+
+This tagrendering has no question and is thus read-only
+
+
This document is autogenerated from [assets/layers/questions/questions.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/questions/questions.json)
diff --git a/Docs/Hotkeys.md b/Docs/Hotkeys.md
index 9adfa9e33f..8b16ca35a9 100644
--- a/Docs/Hotkeys.md
+++ b/Docs/Hotkeys.md
@@ -17,11 +17,13 @@ MapComplete supports the following keys:
Key combination | Action
----------------- | --------
-B | Opens the layers and filters panel
+B | Opens the background layers panel
Escape | Close the sidebar
+F | Open the favourites page
M | Set the background to a map from external sources. Toggles between the two best, available layers
O | Set the background layer to on OpenStreetMap-based map (or disable the background raster layer)
P | Set the background to aerial or satellite imagery. Toggles between the two best, available layers
+S | Opens the POI-layers and filter panel
shift+O | Set the background layer to OpenStreetMap-carto
diff --git a/Docs/Layers/address.md b/Docs/Layers/address.md
index 2f341cd1a7..c8df8fa0fc 100644
--- a/Docs/Layers/address.md
+++ b/Docs/Layers/address.md
@@ -169,6 +169,16 @@ This tagrendering is only visible in the popup if the following condition is met
+### favourite_status
+
+
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
### all-tags
diff --git a/Docs/Layers/advertising.md b/Docs/Layers/advertising.md
index 7b021940e2..7daf107a6e 100644
--- a/Docs/Layers/advertising.md
+++ b/Docs/Layers/advertising.md
@@ -304,6 +304,16 @@ This tagrendering is only visible in the popup if the following condition is met
+### favourite_status
+
+
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
### all-tags
diff --git a/Docs/Layers/all_streets.md b/Docs/Layers/all_streets.md
index bf88914a6f..4cb28c53c8 100644
--- a/Docs/Layers/all_streets.md
+++ b/Docs/Layers/all_streets.md
@@ -192,6 +192,16 @@ This tagrendering is only visible in the popup if the following condition is met
+### favourite_status
+
+
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
### all-tags
diff --git a/Docs/Layers/all_vending_machine.md b/Docs/Layers/all_vending_machine.md
index 25e0f3028e..c700b0319d 100644
--- a/Docs/Layers/all_vending_machine.md
+++ b/Docs/Layers/all_vending_machine.md
@@ -430,6 +430,16 @@ This tagrendering is only visible in the popup if the following condition is met
+### favourite_status
+
+
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
### all-tags
diff --git a/Docs/Layers/ambulancestation.md b/Docs/Layers/ambulancestation.md
index 462ed11bed..643de5dce7 100644
--- a/Docs/Layers/ambulancestation.md
+++ b/Docs/Layers/ambulancestation.md
@@ -215,6 +215,16 @@ This tagrendering is only visible in the popup if the following condition is met
+### favourite_status
+
+
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
### all-tags
diff --git a/Docs/Layers/animal_shelter.md b/Docs/Layers/animal_shelter.md
index b2d29d3a31..89e6227e42 100644
--- a/Docs/Layers/animal_shelter.md
+++ b/Docs/Layers/animal_shelter.md
@@ -264,6 +264,16 @@ This tagrendering is only visible in the popup if the following condition is met
+### favourite_status
+
+
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
### all-tags
diff --git a/Docs/Layers/artwork.md b/Docs/Layers/artwork.md
index 3f923a8b9f..1959c4a45a 100644
--- a/Docs/Layers/artwork.md
+++ b/Docs/Layers/artwork.md
@@ -492,6 +492,16 @@ This tagrendering is only visible in the popup if the following condition is met
+### favourite_status
+
+
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
### all-tags
diff --git a/Docs/Layers/atm.md b/Docs/Layers/atm.md
index f6961b0198..5cb87ad909 100644
--- a/Docs/Layers/atm.md
+++ b/Docs/Layers/atm.md
@@ -58,7 +58,7 @@ attribute | type | values which are supported by this layer
[](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice |
[
](https://taginfo.openstreetmap.org/keys/brand#values) [brand](https://wiki.openstreetmap.org/wiki/Key:brand) | [string](../SpecialInputElements.md#string) |
[
](https://taginfo.openstreetmap.org/keys/operator#values) [operator](https://wiki.openstreetmap.org/wiki/Key:operator) | [string](../SpecialInputElements.md#string) |
-[
](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) |
+[
](https://taginfo.openstreetmap.org/keys/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/cash_out#values) [cash_out](https://wiki.openstreetmap.org/wiki/Key:cash_out) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:cash_out%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:cash_out%3Dno)
[
](https://taginfo.openstreetmap.org/keys/cash_in#values) [cash_in](https://wiki.openstreetmap.org/wiki/Key:cash_in) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:cash_in%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:cash_in%3Dno)
[
](https://taginfo.openstreetmap.org/keys/cash_out:notes:denominations#values) [cash_out:notes:denominations](https://wiki.openstreetmap.org/wiki/Key:cash_out:notes:denominations) | Multiple choice | [5 EUR](https://wiki.openstreetmap.org/wiki/Tag:cash_out:notes:denominations%3D5 EUR) [10 EUR](https://wiki.openstreetmap.org/wiki/Tag:cash_out:notes:denominations%3D10 EUR) [20 EUR](https://wiki.openstreetmap.org/wiki/Tag:cash_out:notes:denominations%3D20 EUR) [50 EUR](https://wiki.openstreetmap.org/wiki/Tag:cash_out:notes:denominations%3D50 EUR) [100 EUR](https://wiki.openstreetmap.org/wiki/Tag:cash_out:notes:denominations%3D100 EUR) [200 EUR](https://wiki.openstreetmap.org/wiki/Tag:cash_out:notes:denominations%3D200 EUR) [500 EUR](https://wiki.openstreetmap.org/wiki/Tag:cash_out:notes:denominations%3D500 EUR)
@@ -138,7 +138,7 @@ This is rendered with `The ATM is operated by {operator}`
-### opening_hours
+### opening_hours_24_7
@@ -152,6 +152,11 @@ This is rendered with `
There exists an automated account on Mastodon which posts a monthly overview of ghost bikes worldwide
", diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 667b288784..6c73765960 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,33 +1,13 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete", - "ca": "Canvis fets amb MapComplete", - "cs": "Změny provedené pomocí MapComplete", - "de": "Mit MapComplete erstellte Änderungen", - "es": "Cambios realizados con MapComplete", - "fr": "Changements faits avec MapComplete", - "nl": "Wijzigingen gemaakt met MapComplete", - "pl": "Zmiany wprowadzone za pomocą MapComplete" + "en": "Changes made with MapComplete" }, "shortDescription": { - "en": "Show changes made with MapComplete", - "ca": "Mostra els canvis fets amb MapComplete", - "cs": "Zobrazení změn provedených pomocí nástroje MapComplete", - "de": "Mit MapComplete erstellte Änderungen anzeigen", - "es": "Mostrar cambios realizados con MapComplete", - "nl": "Toon wijzigingen gemaakt met MapComplete", - "pl": "Pokaż zmiany wprowadzone za pomocą MapComplete" + "en": "Shows changes made by MapComplete" }, "description": { - "en": "This maps 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 die met MapComplete gemaakt werden", - "pl": "Ta mapa pokazuje wszystkie zmiany wprowadzone za pomocą MapComplete" + "en": "This maps shows all the changes made with MapComplete" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -40,13 +20,7 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers", - "ca": "Centre del conjunt de canvis", - "cs": "Centrum změn", - "de": "Zentrum der Änderungssätze", - "es": "Centro del conjunto de cambios", - "nl": "Centerpunt van changeset", - "pl": "Centra zmian" + "en": "Changeset centers" }, "minzoom": 0, "source": { @@ -57,85 +31,41 @@ }, "title": { "render": { - "en": "Changeset for {theme}", - "ca": "Conjunt de canvis per a {theme}", - "cs": "Změna pro {theme}", - "de": "Änderungssatz für {theme}", - "es": "Conjunto de cambios para {theme}", - "fr": "Groupe de modifications pour {theme}", - "pl": "Zestaw zmian dla {theme}" + "en": "Changeset for {theme}" } }, "description": { - "en": "Show all MapComplete changes", - "ca": "Mostra tots els canvis de MapComplete", - "cs": "Zobrazit všechny změny MapComplete", - "de": "Alle MapComplete-Änderungen anzeigen", - "es": "Mostrar todos los cambios de MapComplete", - "nl": "Toon alle MapComplete wijzigingen", - "pl": "Wyświetl wszystkie zmiany MapComplete" + "en": "Shows all MapComplete changes" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}", - "ca": "Conjunt de canvi {id}", - "cs": "Změny {id}", - "de": "Änderungssatz {id}", - "es": "Conjunto de cambios {id}", - "fr": "Groupe de modifications {id}", - "pl": "Zestaw zmian {id}" + "en": "Changeset {id}" } }, { "id": "contributor", "question": { - "en": "Which contributor made this change?", - "ca": "Quin col·laborador va fer aquest canvi?", - "cs": "Který přispěvatel tuto změnu provedl?", - "de": "Wer hat diese Änderung vorgenommen?", - "es": "¿Qué contribuidor hizo este cambio?", - "fr": "Quel contributeur a fait cette modification ?", - "nl": "Welke bijdrager maakte deze wijziging?", - "pl": "Który współautor dokonał tej zmiany?" + "en": "What contributor did make this change?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}", - "ca": "Canvi fet per {user}", - "cs": "Změna provedená {user}", - "de": "Änderung von {user}", - "es": "Cambio realizado por {user}", - "fr": "Modification faite par {user}", - "nl": "Wijziging gemaakt door {user}", - "pl": "Zmiana dokonana przez {user}" + "en": "Change made by {user}" } }, { "id": "theme-id", "question": { - "en": "What theme was used to make this change?", - "ca": "Quin tema es va utilitzar per fer aquest canvi?", - "cs": "Jaké téma bylo použito k provedení této změny?", - "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 ?", - "pl": "Jakiego tematu użyto do wprowadzenia tej zmiany?" + "en": "What theme was used to make this change?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}", - "ca": "Canvi amb el tema {theme}", - "cs": "Změna s motivem {theme}", - "de": "Geändert mit Thema {theme}", - "es": "Cambio con tema {theme}", - "fr": "Modifié avec le thème {theme}", - "pl": "Zmiana za pomocą motywu {theme}" + "en": "Change with theme {theme}" } }, { @@ -144,45 +74,19 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?", - "ca": "Amb quina configuració regional (idioma) s'ha fet aquest canvi?", - "cs": "V jakém národním prostředí (jazyce) byla tato změna provedena?", - "de": "In welcher Benutzersprache 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 locale (taal) werd deze wijziging gemaakt?", - "pl": "W jakim języku wprowadzono tę zmianę?" + "en": "What locale (language) was this change made in?" }, "render": { - "en": "User locale is {locale}", - "ca": "La configuració regional de l'usuari és {locale}", - "cs": "Uživatelské prostředí je {locale}", - "de": "Benutzersprache {locale}", - "es": "La configuración regional del usuario es {locale}", - "nl": "De gebruikerstaal is {locale}", - "pl": "Ustawienia regionalne użytkownika to {locale}" + "en": "User locale is {locale}" } }, { "id": "host", "render": { - "en": "Change made with {host}", - "ca": "Canviat fet amb {host}", - "cs": "Změna provedená pomocí {host}", - "de": "Geändert über {host}", - "es": "Cambio realizado con {host}", - "fr": "Modification faite avec {host}", - "nl": "Wijziging gemaakt met {host}", - "pl": "Zmiana dokonana w {host}" + "en": "Change with with {host}" }, "question": { - "en": "What host (website) was this change made with?", - "ca": "Amb quin amfitrió (lloc web) es va fer aquest canvi?", - "cs": "U jakého hostitele (webové stránky) byla tato změna provedena?", - "de": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?", - "es": "¿Con qué host (página web) se realizó este cambio?", - "nl": "Met welke host (website) werd deze wijziging gemaakt?", - "pl": "Na jakim hoście (stronie internetowej) dokonano tej zmiany?" + "en": "What host (website) was this change made with?" }, "freeform": { "key": "host" @@ -203,22 +107,10 @@ { "id": "version", "question": { - "en": "What version of MapComplete was used to make this change?", - "ca": "Quina versió de MapComplete es va utilitzar per fer aquest canvi?", - "cs": "Jaká verze aplikace MapComplete byla použita k provedení této změny?", - "de": "Mit welcher Version von MapComplete wurde diese Änderung gemacht?", - "es": "¿Qué versión de MapComplete se usó para realizar este cambio?", - "fr": "Quelle version de MapComplete a été utilisée pour faire cette modification ?", - "pl": "Która wersja MapComplete została wykorzystana, aby zrobić tę zmianę?" + "en": "What version of MapComplete was used to make this change?" }, "render": { - "en": "Made with {editor}", - "ca": "Fet amb {editor}", - "cs": "Vyrobeno pomocí {editor}", - "de": "Erstellt mit {editor}", - "es": "Realizado con {editor}", - "fr": "Fait avec {editor}", - "pl": "Zrobione za pomocą {editor}" + "en": "Made with {editor}" }, "freeform": { "key": "editor" @@ -568,13 +460,7 @@ } ], "question": { - "en": "Theme name contains {search}", - "ca": "El nom del tema conté {search}", - "cs": "Název motivu obsahuje {search}", - "de": "Themenname enthält {search}", - "es": "El nombre del tema contiene {search}", - "nl": "Themenaam bevat {search}", - "pl": "Nazwa tematu zawiera {search}" + "en": "Themename contains {search}" } } ] @@ -590,7 +476,7 @@ } ], "question": { - "en": "Theme name does not contain {search}" + "en": "Themename does not contain {search}" } } ] @@ -606,13 +492,7 @@ } ], "question": { - "en": "Made by contributor {search}", - "ca": "Fet pel col·laborador {search}", - "cs": "Vytvořil přispěvatel {search}", - "de": "Erstellt von {search}", - "es": "Hecho por el colaborador {search}", - "nl": "Gemaakt door bijdrager {search}", - "pl": "Wykonane przez współautora {search}" + "en": "Made by contributor {search}" } } ] @@ -628,13 +508,7 @@ } ], "question": { - "en": "Not made by contributor {search}", - "ca": "No fet pel col·laborador {search}", - "cs": "Není vytvořeno přispěvatelem {search}", - "de": "Nicht erstellt von {search}", - "es": "No hecho por el colaborador {search}", - "nl": "Niet gemaakt door bijdrager {search}", - "pl": "Nie wykonane przez współautora {search}" + "en": "Not made by contributor {search}" } } ] @@ -651,13 +525,7 @@ } ], "question": { - "en": "Made before {search}", - "ca": "Fet abans de {search}", - "cs": "Vytvořeno před {search}", - "de": "Erstellt vor {search}", - "es": "Hecho antes de {search}", - "nl": "Gemaakt voor {search}", - "pl": "Stworzone przed {search}" + "en": "Made before {search}" } } ] @@ -674,13 +542,7 @@ } ], "question": { - "en": "Made after {search}", - "ca": "Fet després de {search}", - "cs": "Vytvořeno po {search}", - "de": "Erstellt nach {search}", - "es": "Hecho después de {search}", - "nl": "Gemaakt na {search}", - "pl": "Stworzone po {search}" + "en": "Made after {search}" } } ] @@ -696,14 +558,7 @@ } ], "question": { - "en": "User language (iso-code) {search}", - "ca": "Idioma de l'usuari (codi iso) {search}", - "cs": "Jazyk uživatele (iso-kód) {search}", - "de": "Benutzersprache (ISO-Code) {search}", - "es": "Use idioma (ISO-code) {search}", - "fr": "Langage utilisateur (code-ISO) {search}", - "nl": "De taal van de bijdrager is {search}", - "pl": "Język użytkownika (kod iso) {search}" + "en": "User language (iso-code) {search}" } } ] @@ -719,13 +574,7 @@ } ], "question": { - "en": "Made with host {search}", - "ca": "Fet amb l'amfitrió {search}", - "cs": "Vytvořeno pomocí hostitele {search}", - "de": "Erstellt mit Host {search}", - "es": "Hecho con el host {search}", - "nl": "Gemaakt met host {search}", - "pl": "Wykonane z hostem {search}" + "en": "Made with host {search}" } } ] @@ -736,14 +585,7 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image", - "ca": "El conjunt de canvis ha afegit almenys una imatge", - "cs": "Sada změn přidala alespoň jeden obrázek", - "de": "Im Änderungssatz wurde mindestens ein Bild hinzugefügt", - "es": "El conjunto de cambios ha añadido al menos una imagen", - "fr": "Le groupe de modifications a ajouté au moins une image", - "nl": "Changeset bevat minstens één afbeelding", - "pl": "Zestaw zmian dodał co najmniej jedno zdjęcie" + "en": "Changeset added at least one image" } } ] @@ -754,7 +596,7 @@ { "osmTags": "theme!=grb", "question": { - "en": "Made with host {search}" + "en": "Exclude GRB theme" } } ] @@ -765,7 +607,7 @@ { "osmTags": "theme!=etymology", "question": { - "en": "Changeset added at least one image" + "en": "Exclude etymology theme" } } ] @@ -780,13 +622,7 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here", - "ca": "Es pot trobar més estadística aquí", - "cs": "Další statistiky najdete here", - "de": "Mehr Statistiken gibt es hier", - "es": "Puede encontrar más estadísticas aquí", - "fr": "D'autres statistiques sont disponibles ici", - "pl": "Więcej statystyk można znaleźć tutaj" + "en": "More statistics can be found here" } }, { diff --git a/assets/themes/trees/trees.json b/assets/themes/trees/trees.json index 52589dcc4e..9d0820ac78 100644 --- a/assets/themes/trees/trees.json +++ b/assets/themes/trees/trees.json @@ -19,7 +19,8 @@ "pa_PK": "رُکھ", "cs": "Stromy", "pt_BR": "Árvores", - "eu": "Zuhaitzak" + "eu": "Zuhaitzak", + "pt": "Árvores" }, "description": { "nl": "Breng bomen in kaart!", @@ -37,7 +38,8 @@ "da": "Kortlæg alle træerne!", "cs": "Zmapujte všechny stromy!", "pt_BR": "Mapeie todas as árvores!", - "pl": "Zmapuj wszystkie drzewa!" + "pl": "Zmapuj wszystkie drzewa!", + "pt": "Mapeie todas as árvores!" }, "shortDescription": { "en": "Map all the trees", diff --git a/langs/layers/en.json b/langs/layers/en.json index 70040a239f..9bfea0a29d 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -7261,6 +7261,12 @@ }, "7": { "then": "The surface is paved" + }, + "8": { + "then": "The surface is tartan - a synthetic, springy surface typically seen on athletic pistes" + }, + "9": { + "then": "The surface is made from rubber, such as rubber tiles, rubber mulch or a big rubber area" } }, "question": "Which is the surface of this playground?", @@ -9049,6 +9055,9 @@ }, "5": { "then": "The surface is fine gravel" + }, + "6": { + "then": "The surface of this track is Tartan, a synthetic, slightly springy, porous surface" } }, "question": "Which is the surface of this sport pitch?", diff --git a/langs/layers/nl.json b/langs/layers/nl.json index e1ac846efa..93bbfd23c1 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -6501,6 +6501,12 @@ }, "7": { "then": "De ondergrond is verhard" + }, + "8": { + "then": "De ondergrond bestaat uit Tartan - een synthetisch, elastisch en poreus materiaal dat je ook vindt op atletiekpistes" + }, + "9": { + "then": "De ondergrond bestaat uit rubber, zoals rubberen tegels, rubber snippers of een groot rubberen oppervlak" } }, "question": "Wat is de ondergrond van deze speeltuin?", @@ -7948,6 +7954,9 @@ }, "5": { "then": "De ondergrond bestaat uit grind" + }, + "6": { + "then": "De ondergrond is Tartan, een synthetisch, licht verende en poreuze ondergrond" } }, "question": "Wat is de ondergrond van dit sportveld?", diff --git a/langs/layers/pt.json b/langs/layers/pt.json index 45b9921bf9..3e2387dc4b 100644 --- a/langs/layers/pt.json +++ b/langs/layers/pt.json @@ -35,16 +35,6 @@ "1": { "title": "uma caixa de pôster independente" }, - "10": { - "description": "Usado para sinais publicitários, sinais de néon, logotipos e sinais de entrada institucionais", - "title": "um sinal" - }, - "11": { - "title": "uma escultura" - }, - "12": { - "title": "uma pintura de parede" - }, "2": { "title": "uma caixa de pôster montada em uma parede" }, @@ -71,6 +61,16 @@ }, "9": { "title": "um totem" + }, + "10": { + "description": "Usado para sinais publicitários, sinais de néon, logotipos e sinais de entrada institucionais", + "title": "um sinal" + }, + "11": { + "title": "uma escultura" + }, + "12": { + "title": "uma pintura de parede" } }, "tagRenderings": { @@ -165,9 +165,6 @@ "1": { "then": "Isso é uma placa" }, - "10": { - "then": "Isto é uma pintura mural" - }, "2": { "then": "Isto é uma coluna" }, @@ -191,6 +188,9 @@ }, "9": { "then": "Isto é um totem" + }, + "10": { + "then": "Isto é uma pintura mural" } }, "question": "Que tipo de recurso de publicitário é este?", @@ -205,9 +205,6 @@ "1": { "then": "Quadro" }, - "10": { - "then": "Pintura mural" - }, "2": { "then": "Caixa de pôster" }, @@ -231,6 +228,9 @@ }, "9": { "then": "Totem" + }, + "10": { + "then": "Pintura mural" } } } @@ -323,15 +323,6 @@ "1": { "then": "Mural" }, - "10": { - "then": "Azulejo (azulejo decorativo espanhol e português)" - }, - "11": { - "then": "Ladrilhos" - }, - "12": { - "then": "Entalhe em madeira" - }, "2": { "then": "Pintura" }, @@ -355,6 +346,15 @@ }, "9": { "then": "Relevo" + }, + "10": { + "then": "Azulejo (azulejo decorativo espanhol e português)" + }, + "11": { + "then": "Ladrilhos" + }, + "12": { + "then": "Entalhe em madeira" } }, "question": "Qual é o tipo desta obra de arte?", @@ -1929,4 +1929,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/themes/pt.json b/langs/themes/pt.json index 8dfe683ae1..8f06b514c9 100644 --- a/langs/themes/pt.json +++ b/langs/themes/pt.json @@ -175,4 +175,4 @@ "description": "Mapeie todas as árvores!", "title": "Árvores" } -} +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 0b4f787c0f..13589909c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mapcomplete", - "version": "0.36.2", + "version": "0.36.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mapcomplete", - "version": "0.36.2", + "version": "0.36.3", "license": "GPL-3.0-or-later", "dependencies": { "@rgossiaux/svelte-headlessui": "^1.0.2", @@ -5329,9 +5329,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001565", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001565.tgz", - "integrity": "sha512-xrE//a3O7TP0vaJ8ikzkD2c2NgcVUvsEe2IvFTntV4Yd1Z9FVzh+gW+enX96L0psrbaFMcVcH2l90xNuGDWc8w==", + "version": "1.0.30001570", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001570.tgz", + "integrity": "sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw==", "dev": true, "funding": [ { @@ -17635,9 +17635,9 @@ "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==" }, "caniuse-lite": { - "version": "1.0.30001565", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001565.tgz", - "integrity": "sha512-xrE//a3O7TP0vaJ8ikzkD2c2NgcVUvsEe2IvFTntV4Yd1Z9FVzh+gW+enX96L0psrbaFMcVcH2l90xNuGDWc8w==", + "version": "1.0.30001570", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001570.tgz", + "integrity": "sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw==", "dev": true }, "canvg": { diff --git a/scripts/studioServer.ts b/scripts/studioServer.ts index f7597f505f..d5d97eff3d 100644 --- a/scripts/studioServer.ts +++ b/scripts/studioServer.ts @@ -58,18 +58,18 @@ async function handleDelete(req: http.IncomingMessage, res: ServerResponse) { res.writeHead(304, { "Content-Type": MIME_TYPES.html }) res.write("No parent directory, nothing deleted", "utf8") res.end() - return + return } } const path = STATIC_PATH + paths.join("/") - if(!fs.existsSync(path)){ + if (!fs.existsSync(path)) { res.writeHead(304, { "Content-Type": MIME_TYPES.html }) res.write("File not found", "utf8") res.end() return } - fs.renameSync(path, path+".bak") + fs.renameSync(path, path + ".bak") res.writeHead(200, { "Content-Type": MIME_TYPES.html }) res.write("File moved to backup", "utf8") res.end() @@ -115,7 +115,12 @@ async function handlePost(req: http.IncomingMessage, res: ServerResponse) { http.createServer(async (req: http.IncomingMessage, res) => { try { - console.log(req.method + " " + req.url, "from:", req.headers.origin, new Date().toISOString()) + console.log( + req.method + " " + req.url, + "from:", + req.headers.origin, + new Date().toISOString() + ) res.setHeader( "Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept" @@ -132,7 +137,7 @@ http.createServer(async (req: http.IncomingMessage, res) => { return } - if(req.method === "DELETE"){ + if (req.method === "DELETE") { console.log("Got a DELETE", new Date()) await handleDelete(req, res) return diff --git a/src/Logic/DetermineLayout.ts b/src/Logic/DetermineLayout.ts index 0b0e9b9a7d..839a5b8508 100644 --- a/src/Logic/DetermineLayout.ts +++ b/src/Logic/DetermineLayout.ts @@ -137,11 +137,12 @@ export default class DetermineLayout { if (json.layers === undefined && json.tagRenderings !== undefined) { // We got fed a layer instead of a theme const layerConfig =