From a5d80401a38fbd5e5748257adde9628286580d8e Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Mon, 18 Jul 2022 09:31:54 +0200 Subject: [PATCH] POIs can display data from their outer walls --- assets/layers/parking/parking.json | 2 +- .../walls_and_buildings.json | 2 +- .../mapcomplete-changes.json | 55 +++++-------------- assets/themes/onwheels/onwheels.json | 30 +++++++++- index.manifest | 2 +- langs/layers/de.json | 5 ++ langs/layers/en.json | 10 ++++ langs/layers/es.json | 5 ++ langs/layers/nl.json | 7 ++- langs/themes/en.json | 4 ++ 10 files changed, 76 insertions(+), 46 deletions(-) diff --git a/assets/layers/parking/parking.json b/assets/layers/parking/parking.json index 27159a4506..0e7d24f8cd 100644 --- a/assets/layers/parking/parking.json +++ b/assets/layers/parking/parking.json @@ -140,7 +140,7 @@ }, "render": { "en": "There are {capacity:disabled} disabled parking spots", - "nl": "Er zijn capacity:disabled} parkeerplaatsen voor gehandicapten" + "nl": "Er zijn {capacity:disabled} parkeerplaatsen voor gehandicapten" } }, { diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json index b906b2a5eb..48d88e6ce0 100644 --- a/assets/layers/walls_and_buildings/walls_and_buildings.json +++ b/assets/layers/walls_and_buildings/walls_and_buildings.json @@ -51,7 +51,7 @@ ], "tagRenderings": [ { - "id": "Entrance_width", + "id": "_entrance:width", "render": { "en": "This door has a width of {canonical(_entrance:width)} meter", "nl": "Deze deur heeft een breedte van {canonical(_entrance:width)} meter", diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 21218f235b..90048681e3 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", - "nl": "Wijzigingen gemaakt met MapComplete", - "de": "Mit MapComplete vorgenommene Änderungen" + "en": "Changes made with MapComplete" }, "shortDescription": { - "en": "Shows changes made by MapComplete", - "nl": "Toont wijzigingen gemaakt met MapComplete", - "de": "Zeigt die mit MapComplete vorgenommenen Änderungen" + "en": "Shows changes made by MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete", - "nl": "Deze kaart toont alle wijzigingen die met MapComplete werden gemaakt", - "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen" + "en": "This maps shows all the changes made with MapComplete" }, "maintainer": "", "icon": "./assets/svg/logo.svg", @@ -28,8 +22,7 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers", - "de": "Zentrum der Änderungssätze" + "en": "Changeset centers" }, "minzoom": 0, "source": { @@ -43,47 +36,35 @@ ], "title": { "render": { - "en": "Changeset for {theme}", - "nl": "Wijzigingset voor {theme}", - "de": "Änderungssatz für {theme}" + "en": "Changeset for {theme}" } }, "description": { - "en": "Shows all MapComplete changes", - "nl": "Toont alle wijzigingen met MapComplete", - "de": "Zeigt alle MapComplete Änderungen" + "en": "Shows all MapComplete changes" }, "tagRenderings": [ { "id": "render_id", "render": { - "en": "Changeset {id}", - "nl": "Wijzigingset {id}", - "de": "Änderungssatz {id}" + "en": "Changeset {id}" } }, { "id": "contributor", "render": { - "en": "Change made by {_last_edit:contributor}", - "nl": "Wijziging gemaakt door {_last_edit:contributor}", - "de": "Geändert von {_last_edit:contributor}" + "en": "Change made by {_last_edit:contributor}" } }, { "id": "theme", "render": { - "en": "Change with theme {theme}", - "nl": "Wijziging met thema {theme}", - "de": "Änderung mit Thema {theme}" + "en": "Change with theme {theme}" }, "mappings": [ { "if": "theme~http.*", "then": { - "en": "Change with unofficial theme {theme}", - "nl": "Wijziging met officieus thema {theme}", - "de": "Änderung mit inoffiziellem Thema {theme}" + "en": "Change with unofficial theme {theme}" } } ] @@ -383,9 +364,7 @@ } ], "question": { - "en": "Themename contains {search}", - "nl": "Themanaam bevat {search}", - "de": "Themenname enthält {search}" + "en": "Themename contains {search}" } } ] @@ -401,9 +380,7 @@ } ], "question": { - "en": "Made by contributor {search}", - "nl": "Gemaakt door bijdrager {search}", - "de": "Erstellt von {search}" + "en": "Made by contributor {search}" } } ] @@ -419,9 +396,7 @@ } ], "question": { - "en": "Not made by contributor {search}", - "nl": "Niet gemaakt door bijdrager {search}", - "de": "Nicht erstellt von {search}" + "en": "Not made by contributor {search}" } } ] @@ -436,9 +411,7 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here", - "nl": "Meer statistieken kunnen hier gevonden worden", - "de": "Weitere Statistiken finden Sie hier" + "en": "More statistics can be found here" } }, { diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json index f0f32bfbfb..8e9275fdc4 100644 --- a/assets/themes/onwheels/onwheels.json +++ b/assets/themes/onwheels/onwheels.json @@ -4,7 +4,7 @@ "en": "OnWheels" }, "description": { - "en": "On this map, publicly wheelchair accessible places are shown and can be easily added" + "en": "On this map, publicly wheelchair accessible places are shown and can be easily added" }, "maintainer": "MapComplete", "icon": "./assets/themes/onwheels/crest.svg", @@ -31,6 +31,34 @@ "walls_and_buildings" ], "overrideAll": { + "+calculatedTags": [ + "_poi_walls_and_buildings_entrance_properties=feat.closestn('walls_and_buildings', 1, undefined, 1000).map(w => ({id: w.feat.properties.id, width: w.feat.properties['_entrance:width']}))[0]", + "_poi_entrance:width=JSON.parse(feat.properties._poi_walls_and_buildings_entrance_properties)?.width" + + ], + "+tagRenderings": [ + { + "id": "_poi_entrance:width", + "render": { + "en": "This door has a width of {canonical(_poi_entrance:width)} meter", + "nl": "Deze deur heeft een breedte van {canonical(_poi_entrance:width)} meter", + "de": "Diese Tür hat eine Durchgangsbreite von {canonical(_poi_entrance:width)} Meter", + "es": "Esta puerta tiene una ancho de {canonical(_poi_entrance:width)} metros" + }, + "freeform": { + "key": "_poi_entrance:width", + "type": "distance" + }, + "mappings": [ + { + "if": "_poi_entrance:width=", + "then": { + "en": "This entrance has no width information" + } + } + ] + } + ], "minzoom": "15", "mapRendering": [ { diff --git a/index.manifest b/index.manifest index 1e577af789..5679708fcb 100644 --- a/index.manifest +++ b/index.manifest @@ -1,5 +1,5 @@ { - "name": "index", + "name": "MapComplete", "short_name": "MapComplete", "start_url": "index.html", "lang": "en", diff --git a/langs/layers/de.json b/langs/layers/de.json index bfe2f47f8a..fb8f4b7a42 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -6139,6 +6139,11 @@ }, "walls_and_buildings": { "description": "Spezielle eingebaute Ebene, die alle Wände und Gebäude bereitstellt. Diese Ebene ist in Voreinstellungen für Objekte nützlich, die an Wänden platziert werden können (z. B. AEDs, Briefkästen, Eingänge, Adressen, Überwachungskameras, …). Diese Ebene ist standardmäßig unsichtbar und kann vom Benutzer nicht eingeschaltet werden.", + "tagRenderings": { + "Entrance_width": { + "render": "Diese Tür hat eine Durchgangsbreite von {canonical(_entrance:width)} Meter" + } + }, "title": { "render": "Wand oder Gebäude" } diff --git a/langs/layers/en.json b/langs/layers/en.json index 3e51d47e22..b405e8850e 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -6542,6 +6542,16 @@ }, "walls_and_buildings": { "description": "Special builtin layer providing all walls and buildings. This layer is useful in presets for objects which can be placed against walls (e.g. AEDs, postboxes, entrances, addresses, surveillance cameras, …). This layer is invisible by default and not toggleable by the user.", + "tagRenderings": { + "Entrance_width": { + "mappings": { + "0": { + "then": "This entrance has no width information" + } + }, + "render": "This door has a width of {canonical(_entrance:width)} meter" + } + }, "title": { "render": "Wall or building" } diff --git a/langs/layers/es.json b/langs/layers/es.json index 8ea7f34c7f..a1b3078a7c 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -3985,6 +3985,11 @@ } }, "walls_and_buildings": { + "tagRenderings": { + "Entrance_width": { + "render": "Esta puerta tiene una ancho de {canonical(_entrance:width)} metros" + } + }, "title": { "render": "Pared o edificio" } diff --git a/langs/layers/nl.json b/langs/layers/nl.json index cfba0ceeb3..579ab1a4d9 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -6228,6 +6228,11 @@ }, "walls_and_buildings": { "description": "Speciale laag met alle muren en gebouwen. Deze laag is nuttig om objecten toe te voegen die met een muur verbonden zijn (zoals AEDs, brievenbussen, adressen, bewakingscamera's,…). Deze laag is standaard onzichtbaar en kan niet aangezet worden door de gebruiker.", + "tagRenderings": { + "Entrance_width": { + "render": "Deze deur heeft een breedte van {canonical(_entrance:width)} meter" + } + }, "title": { "render": "Muur of gebouw" } @@ -6493,4 +6498,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/themes/en.json b/langs/themes/en.json index 5dd1e80ae7..49201c12f3 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -974,6 +974,10 @@ "shortDescription": "Map all the trees", "title": "Trees" }, + "walls_and_buildings": { + "description": "Special builtin layer providing all walls and buildings. This layer is useful in presets for objects which can be placed against walls (e.g. AEDs, postboxes, entrances, addresses, surveillance cameras, …). This layer is invisible by default and not toggleable by the user.", + "title": "Walls and buildings" + }, "waste": { "description": "Map showing waste baskets and recycling facilities.", "title": "Waste"