From 003430131bb156b050b6eb554816fabf120516d5 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 10 Jan 2024 15:10:19 +0100 Subject: [PATCH] Fix #1748 --- assets/layers/maxspeed/maxspeed.json | 7 +- .../mapcomplete-changes.json | 112 +++++------------- 2 files changed, 35 insertions(+), 84 deletions(-) diff --git a/assets/layers/maxspeed/maxspeed.json b/assets/layers/maxspeed/maxspeed.json index cc5e325f20..378a0cd399 100644 --- a/assets/layers/maxspeed/maxspeed.json +++ b/assets/layers/maxspeed/maxspeed.json @@ -130,7 +130,12 @@ }, "mappings": [ { - "if": "highway=living_street", + "if": { + "and": [ + "highway=living_street", + "_country=be" + ] + }, "then": { "en": "This is a living street, which has a maxspeed of 20km/h", "nl": "Dit is een woonerf en heeft dus een maximale snelheid van 20km/h", diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 09444a1fa3..6c73765960 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,19 +1,13 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete", - "de": "Mit MapComplete vorgenommene Änderungen", - "ca": "Canvis fets amb MapComplete" + "en": "Changes made with MapComplete" }, "shortDescription": { - "en": "Shows changes made by MapComplete", - "de": "Zeigt die von MapComplete vorgenommenen Änderungen an", - "ca": "Mostra els canvis fets amb MapComplete" + "en": "Shows changes made by MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete", - "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", - "ca": "Aquest mapa mostra tots els canvis fets amb MapComplete" + "en": "This maps shows all the changes made with MapComplete" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -26,8 +20,7 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers", - "de": "Zentrum der Änderungssätze" + "en": "Changeset centers" }, "minzoom": 0, "source": { @@ -38,55 +31,41 @@ }, "title": { "render": { - "en": "Changeset for {theme}", - "de": "Änderungssatz für {theme}", - "ca": "Conjunt de canvis per a {theme}" + "en": "Changeset for {theme}" } }, "description": { - "en": "Shows all MapComplete changes", - "de": "Zeigt alle MapComplete-Änderungen", - "ca": "Mostra tots els canvis de MapComplete" + "en": "Shows all MapComplete changes" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}", - "de": "Änderungssatz {id}", - "ca": "Conjunt de canvi {id}" + "en": "Changeset {id}" } }, { "id": "contributor", "question": { - "en": "What contributor did make this change?", - "de": "Wer hat diese Änderung vorgenommen?", - "ca": "Quin col·laborador va fer aquest canvi?" + "en": "What contributor did make this change?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}", - "de": "Änderung von {user}", - "ca": "Canvi fet per {user}" + "en": "Change made by {user}" } }, { "id": "theme-id", "question": { - "en": "What theme was used to make this change?", - "de": "Welches Theme wurde für diese Änderung verwendet?", - "ca": "Quin tema es va utilitzar per fer aquest canvi?" + "en": "What theme was used to make this change?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}", - "de": "Geändert mit Thema {theme}", - "ca": "Canvi amb el tema {theme}" + "en": "Change with theme {theme}" } }, { @@ -95,27 +74,19 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?", - "de": "In welcher Benutzersprache wurde diese Änderung vorgenommen?", - "ca": "Amb quina configuració regional (idioma) s'ha fet aquest canvi?" + "en": "What locale (language) was this change made in?" }, "render": { - "en": "User locale is {locale}", - "de": "Benutzersprache {locale}", - "ca": "La configuració regional de l'usuari és {locale}" + "en": "User locale is {locale}" } }, { "id": "host", "render": { - "en": "Change with with {host}", - "de": "Geändert über {host}", - "ca": "Canviat amb {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?", - "ca": "Amb quin amfitrió (lloc web) es va fer aquest canvi?" + "en": "What host (website) was this change made with?" }, "freeform": { "key": "host" @@ -136,14 +107,10 @@ { "id": "version", "question": { - "en": "What version of MapComplete was used to make this change?", - "de": "Welche Version von MapComplete wurde verwendet, um diese Änderung vorzunehmen?", - "ca": "Quina versió de MapComplete es va utilitzar per fer aquest canvi?" + "en": "What version of MapComplete was used to make this change?" }, "render": { - "en": "Made with {editor}", - "de": "Erstellt mit {editor}", - "ca": "Fet amb {editor}" + "en": "Made with {editor}" }, "freeform": { "key": "editor" @@ -493,9 +460,7 @@ } ], "question": { - "en": "Themename contains {search}", - "de": "Themename enthält {search}", - "ca": "El nom del tema conté {search}" + "en": "Themename contains {search}" } } ] @@ -511,8 +476,7 @@ } ], "question": { - "en": "Themename does not contain {search}", - "de": "Der Name enthält nicht {search}" + "en": "Themename does not contain {search}" } } ] @@ -528,9 +492,7 @@ } ], "question": { - "en": "Made by contributor {search}", - "de": "Der Name enthält nicht {search}", - "ca": "Fet pel col·laborador {search}" + "en": "Made by contributor {search}" } } ] @@ -546,9 +508,7 @@ } ], "question": { - "en": "Not made by contributor {search}", - "de": "Nicht erstellt von {search}", - "ca": "No fet pel col·laborador {search}" + "en": "Not made by contributor {search}" } } ] @@ -565,9 +525,7 @@ } ], "question": { - "en": "Made before {search}", - "de": "Erstellt vor {search}", - "ca": "Fet abans de {search}" + "en": "Made before {search}" } } ] @@ -584,9 +542,7 @@ } ], "question": { - "en": "Made after {search}", - "de": "Erstellt nach {search}", - "ca": "Fet després de {search}" + "en": "Made after {search}" } } ] @@ -602,9 +558,7 @@ } ], "question": { - "en": "User language (iso-code) {search}", - "de": "Benutzersprache (ISO-Code) {search}", - "ca": "Idioma de l'usuari (codi iso) {search}" + "en": "User language (iso-code) {search}" } } ] @@ -620,9 +574,7 @@ } ], "question": { - "en": "Made with host {search}", - "de": "Erstellt mit Host {search}", - "ca": "Fet amb l'amfitrió {search}" + "en": "Made with host {search}" } } ] @@ -633,9 +585,7 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image", - "de": "Änderungssatz hat mindestens ein Bild hinzugefügt", - "ca": "El conjunt de canvis ha afegit almenys una imatge" + "en": "Changeset added at least one image" } } ] @@ -646,8 +596,7 @@ { "osmTags": "theme!=grb", "question": { - "en": "Exclude GRB theme", - "de": "GRB-Theme ausschließen" + "en": "Exclude GRB theme" } } ] @@ -658,8 +607,7 @@ { "osmTags": "theme!=etymology", "question": { - "en": "Exclude etymology theme", - "de": "Etymologie-Thema ausschließen" + "en": "Exclude etymology theme" } } ] @@ -674,9 +622,7 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here", - "de": "Mehr Statistiken gibt es hier", - "ca": "Es pot trobar més estadística aquí" + "en": "More statistics can be found here" } }, {