From 8199419ec8ea7aebcd8678197e003513d3767481 Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Tue, 12 Jul 2022 10:25:31 +0200 Subject: [PATCH 01/10] added walls and buildings theme --- .../walls_and_buildings.json | 3 +++ .../walls_and_buildings.png | Bin 0 -> 342 bytes .../walls_and_buildings.json | 20 ++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 assets/layers/walls_and_buildings/walls_and_buildings.png create mode 100644 assets/themes/walls_and_buildings/walls_and_buildings.json diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json index bd130083d9..c632e9d770 100644 --- a/assets/layers/walls_and_buildings/walls_and_buildings.json +++ b/assets/layers/walls_and_buildings/walls_and_buildings.json @@ -43,5 +43,8 @@ "render": "2" } } + ], + "calculatedTags": [ + "_entrance=feat.get('entrance')" ] } \ No newline at end of file diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.png b/assets/layers/walls_and_buildings/walls_and_buildings.png new file mode 100644 index 0000000000000000000000000000000000000000..1b9332d3d5529b058b78cbe8f210f295fb3777b3 GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^wIIyF1SA`sf11=sxao#-&>ft~kp3IPl66gHf+|;}hAeVt*&$>-Bfz$<0 z7srr_TW{|e@-iq0usF_p5HFzkW1*5Gqt=hMNY3Dx%EE72Uh9<}oQu7)v)j77@VVZ* zJ4ffj8M}8Bi Date: Tue, 12 Jul 2022 11:25:19 +0200 Subject: [PATCH 02/10] fixes --- assets/layers/walls_and_buildings/license_info.json | 12 ++++++++++++ .../mapcomplete-changes/mapcomplete-changes.json | 4 ++++ .../walls_and_buildings/walls_and_buildings.json | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 assets/layers/walls_and_buildings/license_info.json diff --git a/assets/layers/walls_and_buildings/license_info.json b/assets/layers/walls_and_buildings/license_info.json new file mode 100644 index 0000000000..b59a82e287 --- /dev/null +++ b/assets/layers/walls_and_buildings/license_info.json @@ -0,0 +1,12 @@ +[ + { + "path": "walls_and_buildings.png", + "license": "CC0", + "authors": [ + "OSM" + ], + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Barrier_fence_mapnik.png#file" + ] + } +] \ No newline at end of file diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 60452cb5b3..90048681e3 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -331,6 +331,10 @@ "if": "theme=uk_addresses", "then": "./assets/themes/uk_addresses/housenumber_unknown.svg" }, + { + "if": "theme=walls_and_buildings", + "then": "./assets/layers/walls_and_buildings/walls_and_buildings.png" + }, { "if": "theme=waste", "then": "./assets/layers/recycling/recycling-14.svg" diff --git a/assets/themes/walls_and_buildings/walls_and_buildings.json b/assets/themes/walls_and_buildings/walls_and_buildings.json index aa0d108b67..b1416e3a00 100644 --- a/assets/themes/walls_and_buildings/walls_and_buildings.json +++ b/assets/themes/walls_and_buildings/walls_and_buildings.json @@ -4,7 +4,7 @@ "en": "Walls and buildings" }, "description": { - "en": "Buildings are shown with entrance metatags" + "en": "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." }, "maintainer": "MapComplete", "icon": "./assets/layers/walls_and_buildings/walls_and_buildings.png", From 99530fb27d5eb9e186c9153d765bdd739e20da91 Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Tue, 12 Jul 2022 13:56:57 +0200 Subject: [PATCH 03/10] changed shownByDefault to true --- assets/layers/walls_and_buildings/walls_and_buildings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json index c632e9d770..34aa5db94a 100644 --- a/assets/layers/walls_and_buildings/walls_and_buildings.json +++ b/assets/layers/walls_and_buildings/walls_and_buildings.json @@ -23,7 +23,7 @@ } }, "passAllFeatures": true, - "shownByDefault": false, + "shownByDefault": true, "mapRendering": [ { "color": { @@ -45,6 +45,6 @@ } ], "calculatedTags": [ - "_entrance=feat.get('entrance')" + "_entrance=feat.get('entrance')?.map(e => e.id)" ] } \ No newline at end of file From 99fabe6e5c6726816a2dc9622b4605e0f5a41468 Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Tue, 12 Jul 2022 15:38:39 +0200 Subject: [PATCH 04/10] can find entrance id --- Models/ThemeConfig/LayerConfig.ts | 3 ++- assets/layers/walls_and_buildings/walls_and_buildings.json | 2 +- assets/themes/walls_and_buildings/walls_and_buildings.json | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Models/ThemeConfig/LayerConfig.ts b/Models/ThemeConfig/LayerConfig.ts index 0582c57ac7..131bc23d6e 100644 --- a/Models/ThemeConfig/LayerConfig.ts +++ b/Models/ThemeConfig/LayerConfig.ts @@ -192,7 +192,8 @@ export default class LayerConfig extends WithContextLoader { this.passAllFeatures = json.passAllFeatures ?? false; this.minzoom = json.minzoom ?? 0; if(json["minZoom"] !== undefined){ - throw "At "+context+": minzoom is written all lowercase" + //throw "At "+context+": minzoom is written all lowercase" + // TODO: REENABLE } this.minzoomVisible = json.minzoomVisible ?? this.minzoom; this.shownByDefault = json.shownByDefault ?? true; diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json index 34aa5db94a..e0430338a7 100644 --- a/assets/layers/walls_and_buildings/walls_and_buildings.json +++ b/assets/layers/walls_and_buildings/walls_and_buildings.json @@ -45,6 +45,6 @@ } ], "calculatedTags": [ - "_entrance=feat.get('entrance')?.map(e => e.id)" + "_entrance=feat.overlapWith('entrance')?.map(e => e.feat.properties.id)" ] } \ No newline at end of file diff --git a/assets/themes/walls_and_buildings/walls_and_buildings.json b/assets/themes/walls_and_buildings/walls_and_buildings.json index b1416e3a00..6b248f3b47 100644 --- a/assets/themes/walls_and_buildings/walls_and_buildings.json +++ b/assets/themes/walls_and_buildings/walls_and_buildings.json @@ -15,6 +15,7 @@ "startZoom": 16, "widenFactor": 2, "layers": [ - "walls_and_buildings" + "walls_and_buildings", + "entrance" ] } \ No newline at end of file From c2328e784a3a39c9b9692711ca052c86aebe6408 Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Wed, 13 Jul 2022 14:33:53 +0200 Subject: [PATCH 05/10] can display calculated tags with tag renderings --- .../walls_and_buildings.json | 26 ++++++++++++++++++- assets/themes/onwheels/onwheels.json | 5 ++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json index e0430338a7..b906b2a5eb 100644 --- a/assets/layers/walls_and_buildings/walls_and_buildings.json +++ b/assets/layers/walls_and_buildings/walls_and_buildings.json @@ -45,6 +45,30 @@ } ], "calculatedTags": [ - "_entrance=feat.overlapWith('entrance')?.map(e => e.feat.properties.id)" + "_entrance_properties=feat.overlapWith('entrance')?.map(e => e.feat.properties).filter(p => p !== undefined)", + "_entrance:id=feat.get('_entrance_properties')?.map(e => e.id)", + "_entrance:width=feat.get('_entrance_properties')?.map(e => e.width)?.at(0)" + ], + "tagRenderings": [ + { + "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", + "de": "Diese Tür hat eine Durchgangsbreite von {canonical(_entrance:width)} Meter", + "es": "Esta puerta tiene una ancho de {canonical(_entrance:width)} metros" + }, + "freeform": { + "key": "_entrance:width" + }, + "mappings": [ + { + "if": "_entrance:width=", + "then": { + "en": "This entrance has no width information" + } + } + ] + } ] } \ No newline at end of file diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json index 881729e71e..2d78b4b4e9 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 weelchair 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", @@ -27,7 +27,8 @@ "shops", "toilet", "viewpoint", - "doctors" + "doctors", + "walls_and_buildings" ], "overrideAll" : { "minzoom" : "15", From a5d80401a38fbd5e5748257adde9628286580d8e Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Mon, 18 Jul 2022 09:31:54 +0200 Subject: [PATCH 06/10] 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" From f749259b76d5c220935b44bc474ae017bd83e267 Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Mon, 18 Jul 2022 09:58:03 +0200 Subject: [PATCH 07/10] tags don't show if we click on an entrance --- assets/themes/onwheels/onwheels.json | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json index 8e9275fdc4..0540c849c5 100644 --- a/assets/themes/onwheels/onwheels.json +++ b/assets/themes/onwheels/onwheels.json @@ -39,6 +39,7 @@ "+tagRenderings": [ { "id": "_poi_entrance:width", + "condition": "entrance=", "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", From 7e46aa8656fe2c28776875411e49f1690a8ce2ed Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Mon, 18 Jul 2022 10:02:48 +0200 Subject: [PATCH 08/10] reenabled line 195 --- Models/ThemeConfig/LayerConfig.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Models/ThemeConfig/LayerConfig.ts b/Models/ThemeConfig/LayerConfig.ts index 131bc23d6e..0582c57ac7 100644 --- a/Models/ThemeConfig/LayerConfig.ts +++ b/Models/ThemeConfig/LayerConfig.ts @@ -192,8 +192,7 @@ export default class LayerConfig extends WithContextLoader { this.passAllFeatures = json.passAllFeatures ?? false; this.minzoom = json.minzoom ?? 0; if(json["minZoom"] !== undefined){ - //throw "At "+context+": minzoom is written all lowercase" - // TODO: REENABLE + throw "At "+context+": minzoom is written all lowercase" } this.minzoomVisible = json.minzoomVisible ?? this.minzoom; this.shownByDefault = json.shownByDefault ?? true; From 4af43b4afca00e3f9c527bb8e8943795d1e36d9a Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Mon, 18 Jul 2022 10:15:17 +0200 Subject: [PATCH 09/10] added entrance:id to render --- .../walls_and_buildings/walls_and_buildings.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json index 48d88e6ce0..0ae793e590 100644 --- a/assets/layers/walls_and_buildings/walls_and_buildings.json +++ b/assets/layers/walls_and_buildings/walls_and_buildings.json @@ -23,7 +23,7 @@ } }, "passAllFeatures": true, - "shownByDefault": true, + "shownByDefault": false, "mapRendering": [ { "color": { @@ -46,17 +46,17 @@ ], "calculatedTags": [ "_entrance_properties=feat.overlapWith('entrance')?.map(e => e.feat.properties).filter(p => p !== undefined)", - "_entrance:id=feat.get('_entrance_properties')?.map(e => e.id)", - "_entrance:width=feat.get('_entrance_properties')?.map(e => e.width)?.at(0)" + "_entrance:id=feat.get('_entrance_properties')?.map(e => e.id)?.at(0)", + "_entrance:width=feat.get('_entrance_properties')?.map(e => e.width)" ], "tagRenderings": [ { "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", - "de": "Diese Tür hat eine Durchgangsbreite von {canonical(_entrance:width)} Meter", - "es": "Esta puerta tiene una ancho de {canonical(_entrance:width)} metros" + "en": "This door has a width of {canonical(_entrance:width)} meters ", + "nl": "Deze deur heeft een breedte van {canonical(_entrance:width)} meter ", + "de": "Diese Tür hat eine Durchgangsbreite von {canonical(_entrance:width)} Meter ", + "es": "Esta puerta tiene una ancho de {canonical(_entrance:width)} metros " }, "freeform": { "key": "_entrance:width" From de53d6757752d00473c11851ffb49cc975bd9131 Mon Sep 17 00:00:00 2001 From: Andrews Leruth Date: Mon, 18 Jul 2022 10:19:28 +0200 Subject: [PATCH 10/10] reset unnecessary files --- .../mapcomplete-changes.json | 4 -- index.manifest | 2 +- langs/en.json | 2 + langs/layers/de.json | 34 +++----------- langs/layers/en.json | 44 +++++-------------- langs/layers/es.json | 5 --- langs/layers/fr.json | 17 +++---- langs/layers/nl.json | 39 +++++----------- langs/themes/en.json | 4 -- 9 files changed, 33 insertions(+), 118 deletions(-) diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 90048681e3..60452cb5b3 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -331,10 +331,6 @@ "if": "theme=uk_addresses", "then": "./assets/themes/uk_addresses/housenumber_unknown.svg" }, - { - "if": "theme=walls_and_buildings", - "then": "./assets/layers/walls_and_buildings/walls_and_buildings.png" - }, { "if": "theme=waste", "then": "./assets/layers/recycling/recycling-14.svg" diff --git a/index.manifest b/index.manifest index 5679708fcb..1e577af789 100644 --- a/index.manifest +++ b/index.manifest @@ -1,5 +1,5 @@ { - "name": "MapComplete", + "name": "index", "short_name": "MapComplete", "start_url": "index.html", "lang": "en", diff --git a/langs/en.json b/langs/en.json index e893fb2621..aa7323d5c6 100644 --- a/langs/en.json +++ b/langs/en.json @@ -235,6 +235,8 @@ "skip": "Skip this question", "skippedQuestions": "Some questions are skipped", "testing": "Testing - changes won't be saved", + "useSearch": "Use the search above to see presets", + "useSearchForMore": "Use the search function to search within {total} more values....", "weekdays": { "abbreviations": { "friday": "Fri", diff --git a/langs/layers/de.json b/langs/layers/de.json index fb8f4b7a42..b563fa055f 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -5122,6 +5122,11 @@ } }, "tagRenderings": { + "8": { + "override": { + "question": "Was ist die Hauptsprache dieser Schule?
Welche Sprache wird mit den Schülern in den nicht sprachbezogenen Kursen und mit der Verwaltung gesprochen?
" + } + }, "capacity": { "question": "Wie viele Schüler können sich maximal an dieser Schule anmelden?", "render": "Diese Schule kann höchstens {capacity} Schüler aufnehmen" @@ -5169,30 +5174,6 @@ }, "question": "Welche Geschlechter können sich an dieser Schule anmelden?" }, - "language": { - "freeform": { - "placeholder": "Sprache in Englisch in Kleinbuchstaben" - }, - "mappings": { - "0": { - "then": "Die Hauptsprache dieser Schule ist unbekannt" - }, - "1": { - "then": "Französisch ist die Hauptsprache von {name}" - }, - "2": { - "then": "Niederländisch ist die Hauptsprache von {name}" - }, - "3": { - "then": "Deutsch ist die Hauptsprache von {name}" - }, - "4": { - "then": "Die Hauptsprache dieser Schule ist unbekannt" - } - }, - "question": "Was ist die Hauptsprache dieser Schule?
Welche Sprache wird mit den Schülern in den nicht sprachbezogenen Kursen und mit der Verwaltung gesprochen?
", - "render": "{school:language} ist die Hauptsprache von {title()}" - }, "school-name": { "question": "Wie lautet der Name dieser Schule?", "render": "Diese Schule heißt {name}" @@ -6139,11 +6120,6 @@ }, "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 b405e8850e..600f5b5a2a 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -5303,6 +5303,16 @@ } }, "tagRenderings": { + "8": { + "override": { + "+mappings": { + "0": { + "then": "The main language of this school is unknown" + } + }, + "question": "What is the main language of this school?
What language is spoken with the students in non-language related courses and with the administration?
" + } + }, "capacity": { "question": "How much students can at most enroll in this school?", "render": "This school can enroll at most {capacity} students" @@ -5350,30 +5360,6 @@ }, "question": "Which genders can enroll at this school?" }, - "language": { - "freeform": { - "placeholder": "Language in lowercase English" - }, - "mappings": { - "0": { - "then": "The main language of this school is unknown" - }, - "1": { - "then": "French is the main language of {name}" - }, - "2": { - "then": "Dutch is the main language of {name}" - }, - "3": { - "then": "German is the main language of {name}" - }, - "4": { - "then": "The main language of this school is unknown" - } - }, - "question": "What is the main language of this school?
What language is spoken with the students in non-language related courses and with the administration?
", - "render": "{school:language} is the main language of {title()}" - }, "school-name": { "question": "What is the name of this school?", "render": "This school is named {name}" @@ -6542,16 +6528,6 @@ }, "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 a1b3078a7c..8ea7f34c7f 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -3985,11 +3985,6 @@ } }, "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/fr.json b/langs/layers/fr.json index 388f839319..3ff5eb6e69 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -2419,6 +2419,11 @@ } }, "tagRenderings": { + "8": { + "override": { + "question": "Quelle est la langue principale de cette école ?
Quelle langue est parlée avec les élèves des cours non linguistiques et avec l'administration ?
" + } + }, "capacity": { "question": "Combien d'élèves peuvent s'inscrire au maximum dans cette école ?", "render": "Cette école peut accueillir au maximum {capacity} étudiants" @@ -2466,18 +2471,6 @@ }, "question": "Quels genres de personnes peuvent s'inscrire dans cette école ?" }, - "language": { - "mappings": { - "0": { - "then": "La langue principale de cette école est inconnue" - }, - "4": { - "then": "La langue principale de cette école est inconnue" - } - }, - "question": "Quelle est la langue principale de cette école ?
Quelle langue est parlée avec les élèves des cours non linguistiques et avec l'administration ?
", - "render": "{school:language} est la langue principale de {title()}" - }, "school-name": { "question": "Quel est le nom de cet établissement scolaire?", "render": "Cet établissement scolaire s'appelle {name}" diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 579ab1a4d9..8b303458fa 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -5112,6 +5112,16 @@ } }, "tagRenderings": { + "8": { + "override": { + "+mappings": { + "0": { + "then": "De voertaal van deze school is niet gekend" + } + }, + "question": "Wat is de voertaal van deze school?
Welke taal wordt met de studenten gesproken in niet-taal-gerelateerde vakken en met de administratie?
" + } + }, "capacity": { "question": "Ten hoogste hoeveel studenten kunnen er les volgen in deze school?", "render": "Deze school kan maximaal {capacity} studenten lesgeven" @@ -5159,30 +5169,6 @@ }, "question": "Mogen jongens en meisjes les volgen op deze school?" }, - "language": { - "freeform": { - "placeholder": "Taal in lowercase Engel" - }, - "mappings": { - "0": { - "then": "De voertaal van deze school is niet gekend" - }, - "1": { - "then": "Frans is de voertaal van {name}" - }, - "2": { - "then": "Nederlands is de voertaal van {name}" - }, - "3": { - "then": "Duits is de voertaal van {name}" - }, - "4": { - "then": "De voertaal van deze school is niet gekend" - } - }, - "question": "Wat is de voertaal van deze school?
Welke taal wordt met de studenten gesproken in niet-taal-gerelateerde vakken en met de administratie?
", - "render": "{school:language} is de voertaal van {title()}" - }, "school-name": { "question": "Wat is de naam van deze school?", "render": "Deze school heet {name}" @@ -6228,11 +6214,6 @@ }, "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" } diff --git a/langs/themes/en.json b/langs/themes/en.json index 49201c12f3..5dd1e80ae7 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -974,10 +974,6 @@ "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"