From 80be3eb9ef753ac6289741899bb092ef444a71ca Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Mon, 18 Jul 2022 11:49:22 +0200 Subject: [PATCH] Sync; fix build --- Models/ThemeConfig/Json/LayoutConfigJson.ts | 2 +- assets/layers/pharmacy/pharmacy.json | 12 +++++++----- assets/themes/buurtnatuur/buurtnatuur.json | 5 ++++- assets/themes/grb_import/grb.json | 2 +- assets/themes/onwheels/onwheels.json | 3 +-- assets/themes/speelplekken/speelplekken.json | 2 +- index.manifest | 2 +- langs/de.json | 8 ++++---- langs/layers/de.json | 5 +++++ langs/layers/en.json | 15 +++++++++++++++ langs/layers/es.json | 5 +++++ langs/layers/nl.json | 5 +++++ langs/nl.json | 2 +- langs/themes/de.json | 9 +++++++++ langs/themes/en.json | 16 ++++++++++++++++ langs/themes/es.json | 9 +++++++++ langs/themes/nl.json | 9 +++++++++ 17 files changed, 94 insertions(+), 17 deletions(-) diff --git a/Models/ThemeConfig/Json/LayoutConfigJson.ts b/Models/ThemeConfig/Json/LayoutConfigJson.ts index c63fb4f826..c767029ed6 100644 --- a/Models/ThemeConfig/Json/LayoutConfigJson.ts +++ b/Models/ThemeConfig/Json/LayoutConfigJson.ts @@ -150,7 +150,7 @@ export interface LayoutConfigJson { * * In the above scenario, `sometagrendering` will be added at the beginning of the tagrenderings of every layer */ - overrideAll?: Partial; + overrideAll?: Partial; /** * The id of the default background. BY default: vanilla OSM diff --git a/assets/layers/pharmacy/pharmacy.json b/assets/layers/pharmacy/pharmacy.json index 5d23cc93ef..cfac37ca2a 100644 --- a/assets/layers/pharmacy/pharmacy.json +++ b/assets/layers/pharmacy/pharmacy.json @@ -7,12 +7,14 @@ "render": { "en": "{name}" }, - "mappings": [{ - "if": "name=", - "then": { - "en": "Pharmacy" + "mappings": [ + { + "if": "name=", + "then": { + "en": "Pharmacy" + } } - }] + ] }, "source": { "osmTags": { diff --git a/assets/themes/buurtnatuur/buurtnatuur.json b/assets/themes/buurtnatuur/buurtnatuur.json index 0527a4e398..a1ff62cfb0 100644 --- a/assets/themes/buurtnatuur/buurtnatuur.json +++ b/assets/themes/buurtnatuur/buurtnatuur.json @@ -35,7 +35,10 @@ "or": [ "leisure=nature_reserve", { - "and": ["boundary=protected_area","protect_class!=22"] + "and": [ + "boundary=protected_area", + "protect_class!=22" + ] } ] } diff --git a/assets/themes/grb_import/grb.json b/assets/themes/grb_import/grb.json index d0581433ea..4edd16593f 100644 --- a/assets/themes/grb_import/grb.json +++ b/assets/themes/grb_import/grb.json @@ -630,7 +630,7 @@ } } ], - "isShown":{ + "isShown": { "or": [ "_imported_osm_object_found!=true", "_imported_osm_still_fresh!=true" diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json index 0b258c9420..2994e849b3 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 weelchair accessible places are shown and can be easily added" }, "maintainer": "MapComplete", "icon": "./assets/themes/onwheels/crest.svg", @@ -35,7 +35,6 @@ "+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": [ { diff --git a/assets/themes/speelplekken/speelplekken.json b/assets/themes/speelplekken/speelplekken.json index 9b0b1825ec..de451a2b53 100644 --- a/assets/themes/speelplekken/speelplekken.json +++ b/assets/themes/speelplekken/speelplekken.json @@ -288,6 +288,6 @@ "then": "./assets/themes/speelplekken/youtube.svg" } ], - "isShown":"_is_shadowed!=yes" + "isShown": "_is_shadowed!=yes" } } \ No newline at end of file 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/de.json b/langs/de.json index 070ad4b26f..afbc374944 100644 --- a/langs/de.json +++ b/langs/de.json @@ -271,9 +271,9 @@ "born": "Geboren am: {value}", "died": "Gestorben am: {value}" }, + "searchToShort": "Ihre Suchanfrage ist zu kurz, geben Sie einen längeren Text ein", "searchWikidata": "Wikidata durchsuchen", - "wikipediaboxTitle": "Wikipedia", - "searchToShort": "Ihre Suchanfrage ist zu kurz, geben Sie einen längeren Text ein" + "wikipediaboxTitle": "Wikipedia" } }, "image": { @@ -575,12 +575,12 @@ "arglayerid": "Der Name einer Ebene ODER ein einzelner Suchbegriff", "argsearch": "Der Suchbegriff", "argverb": "Entweder in einem geografischen Gebiet (z. B. einer Stadt) oder in der Nähe eines POI suchen", + "docs": "Sucht Interessante Orte in oder in der Nähe eines Standorts", "noMatchingLayer": "Ich habe keine passende Ebene gefunden", "noNearOrIn": "Entschuldigung, ich habe Ihren Befehl nicht verstanden, da ich kein in der Nähe oder in in Ihrer Suchanfrage gefunden habe.\n Versuchen Sie etwas wie Suche Trinkwasser in London, Suche Friture in Brüssel\n Alternativ versuchen Sie info {cmd}, um Informationen über ein einzelnes Objekt zu erhalten.", "nothingFound": "Entschuldigung, ich konnte nichts für {search} finden, also kann ich nicht nach {layerTitle} suchen", "overview": "Ich habe {length} passende Artikel gefunden.", - "searching": "Suche {layerTitle} {mode} {search}…", - "docs": "Sucht Interessante Orte in oder in der Nähe eines Standorts" + "searching": "Suche {layerTitle} {mode} {search}…" }, "shutdown": { "argmode": "Gibt an, ob der Dienst neu gestartet werden soll, muss einer der folgenden Werte sein: {verbs}", diff --git a/langs/layers/de.json b/langs/layers/de.json index b563fa055f..d2928f18fb 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -6120,6 +6120,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 600f5b5a2a..b7ba9d66c6 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -4776,6 +4776,11 @@ } }, "title": { + "mappings": { + "0": { + "then": "Pharmacy" + } + }, "render": "{name}" } }, @@ -6528,6 +6533,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)} meters " + } + }, "title": { "render": "Wall or building" } diff --git a/langs/layers/es.json b/langs/layers/es.json index 8ea7f34c7f..26d0ff41d1 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 8b303458fa..62b17eec8b 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -6214,6 +6214,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" } diff --git a/langs/nl.json b/langs/nl.json index 1df14bf9b5..5cdcf3a4eb 100644 --- a/langs/nl.json +++ b/langs/nl.json @@ -255,8 +255,8 @@ "welcomeBack": "Je bent aangemeld. Welkom terug!", "welcomeExplanation": { "addNew": "Klik op de kaart om een nieuw punt toe te voegen.", - "browseOtherThemesIntro": "Er zijn diverse thematische kaarten op MapComplete", "browseMoreMaps": "Ontdek meer kaarten", + "browseOtherThemesIntro": "Er zijn diverse thematische kaarten op MapComplete", "general": "Op deze kaart kan je interessepunten bekijken, bewerken en toevoegen. Zoom in om de interessepunten te zien, duid eentje aan om alle informatie te zien en te bewerken. Alle informatie komt van OpenStreetMap die gratis hergebruikt mag worden." }, "wikipedia": { diff --git a/langs/themes/de.json b/langs/themes/de.json index 7702fbfbbc..1e0a05e15b 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -737,6 +737,15 @@ "shortDescription": "Öffentlich zugängliche Türme zum Genießen der Aussicht", "title": "Aussichtstürme" }, + "onwheels": { + "overrideAll": { + "+tagRenderings": { + "_poi_entrance:width": { + "render": "Diese Tür hat eine Durchgangsbreite von {canonical(_poi_entrance:width)} Meter" + } + } + } + }, "openwindpowermap": { "description": "Eine Karte zum Anzeigen und Bearbeiten von Windkraftanlagen.", "title": "Freie Windenergie-Karte" diff --git a/langs/themes/en.json b/langs/themes/en.json index 5dd1e80ae7..2807ac718f 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -743,6 +743,18 @@ }, "onwheels": { "description": "On this map, publicly weelchair accessible places are shown and can be easily added", + "overrideAll": { + "+tagRenderings": { + "_poi_entrance:width": { + "mappings": { + "0": { + "then": "This entrance has no width information" + } + }, + "render": "This door has a width of {canonical(_poi_entrance:width)} meter" + } + } + }, "title": "OnWheels" }, "openwindpowermap": { @@ -974,6 +986,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" diff --git a/langs/themes/es.json b/langs/themes/es.json index 5720c927a4..0370b19ab9 100644 --- a/langs/themes/es.json +++ b/langs/themes/es.json @@ -517,6 +517,15 @@ "shortDescription": "Torres accesibles públicamente para disfrutar de la vista", "title": "Torres de observación" }, + "onwheels": { + "overrideAll": { + "+tagRenderings": { + "_poi_entrance:width": { + "render": "Esta puerta tiene una ancho de {canonical(_poi_entrance:width)} metros" + } + } + } + }, "openwindpowermap": { "description": "Un para mostrar y editar turbinas de viento" }, diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 956c458894..83b6c7961e 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -1011,6 +1011,15 @@ "shortDescription": "Publieke uitkijktorens om van het panorama te genieten", "title": "Uitkijktorens" }, + "onwheels": { + "overrideAll": { + "+tagRenderings": { + "_poi_entrance:width": { + "render": "Deze deur heeft een breedte van {canonical(_poi_entrance:width)} meter" + } + } + } + }, "openwindpowermap": { "description": "Een kaart om windturbines te tonen en te bewerken.", "title": "Windmolens"