From d7eca6f98c5734b47845b02a232d713676b6822f Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Mon, 21 Feb 2022 21:24:17 +0000 Subject: [PATCH 01/10] Translated using Weblate (English) Currently translated at 100.0% (1593 of 1593 strings) Translation: MapComplete/Layer translations Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layer-translations/en/ --- langs/layers/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/langs/layers/en.json b/langs/layers/en.json index 1fbb0a54e..d21693660 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -3059,7 +3059,7 @@ } }, "extinguisher": { - "description": "Map layer to show fire hydrants.", + "description": "Map layer to show fire extinguishers.", "name": "Map of fire extinguishers.", "presets": { "0": { @@ -5024,4 +5024,4 @@ "watermill": { "name": "Watermill" } -} \ No newline at end of file +} From 321e7b57c8b162cdf0b4e2c9cd919547b00f04b9 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Mon, 21 Feb 2022 21:04:24 +0000 Subject: [PATCH 02/10] Translated using Weblate (Dutch) Currently translated at 94.9% (1513 of 1593 strings) Translation: MapComplete/Layer translations Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layer-translations/nl/ --- langs/layers/nl.json | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 100f09504..c844e9b45 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -1823,7 +1823,7 @@ }, "plugs-12": { "question": "Hoeveel stekkers van type
Tesla supercharger (destination) (Een Type 2 met kabel en Tesla-logo)
heeft dit oplaadpunt?", - "render": "Hier zijn {socket:tesla_destination} stekkers van het type
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
" + "render": "Hier zijn {socket:tesla_destination} stekkers van het type
Tesla supercharger (destination) (Een Type 2 met kabel en Tesla-logo)
" }, "plugs-13": { "question": "Hoeveel stekkers van type
USB om GSMs en kleine electronica op te laden
heeft dit oplaadpunt?", @@ -1923,8 +1923,8 @@ "then": "Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) levert een vermogen van maximaal 22 kw A" } }, - "question": "Welk vermogen levert een enkele stekker van type
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
?", - "render": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
levert een vermogen van maximaal {socket:tesla_destination:output}" + "question": "Welk vermogen levert een enkele stekker van type
Tesla supercharger (destination) (Een Type 2 met kabel en Tesla-logo)
?", + "render": "
Tesla supercharger (destination) (Een Type 2 met kabel en Tesla-logo)
levert een vermogen van maximaal {socket:tesla_destination:output}" }, "power-output-13": { "mappings": { @@ -2106,8 +2106,8 @@ "then": "Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) heeft een spanning van 400 volt" } }, - "question": "Welke spanning levert de stekker van type
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
", - "render": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
heeft een spanning van {socket:tesla_destination:voltage} volt" + "question": "Welke spanning levert de stekker van type
Tesla supercharger (destination). (Een Type 2 met kabel en Tesla-logo)
?", + "render": "
Tesla supercharger (destination). (Een Type 2 met kabel en Tesla-logo)
heeft een spanning van {socket:tesla_destination:voltage} volt" }, "voltage-13": { "mappings": { @@ -3037,6 +3037,9 @@ "width": { "question": "Wat is de breedte van deze deur/toegang?" } + }, + "title": { + "render": "Ingang" } }, "etymology": { @@ -3061,6 +3064,12 @@ }, "zoeken op inventaris onroerend erfgoed": { "render": "Zoeken op inventaris onroerend erfgoed" + }, + "wikipedia": { + "render": "Een Wikipedia artikel over deze straat bestaat:
{wikipedia():max-height:25rem}" + }, + "etymology_multi_apply": { + "render": "{multi_apply(_same_name_ids, name:etymology:wikidata,name:etymology, Wijzigingen worden automatisch gedaan op alle segmenten met dezelfde naam, true)}" } } }, @@ -4929,5 +4938,27 @@ }, "render": "Watermolens" } + }, + "extinguisher": { + "tagRenderings": { + "extinguisher-location": { + "render": "Locatie: {location}" + } + }, + "title": { + "render": "Brandblussers" + }, + "description": "Kaartlaag met brandblussers.", + "name": "Kaart van brandblussers.", + "presets": { + "0": { + "description": "Een brandblusser is een klein, draagbaar apparaat om een brand te blussen", + "title": "Brandblusser" + } + } + }, + "hydrant": { + "description": "Kaartlaag met brandkranen.", + "name": "Kaart van brandkranen" } } \ No newline at end of file From e22c17054fc7d30a903ed3f05a339a509c2488ae Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Mon, 21 Feb 2022 21:02:56 +0000 Subject: [PATCH 03/10] Translated using Weblate (Dutch) Currently translated at 81.6% (351 of 430 strings) Translation: MapComplete/Core Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/nl/ --- langs/nl.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/langs/nl.json b/langs/nl.json index 28f22cb21..b6a078c13 100644 --- a/langs/nl.json +++ b/langs/nl.json @@ -485,5 +485,8 @@ "description": "een link naar een webpagina", "feedback": "Dit is geen geldige link" } + }, + "importHelper": { + "allAttributesSame": "Alle kaart-objecten om te importeren hebben deze tag" } -} \ No newline at end of file +} From 945c60303f2235694a1413b316f8c8c1394fa423 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Mon, 21 Feb 2022 21:31:54 +0000 Subject: [PATCH 04/10] Translated using Weblate (Dutch) Currently translated at 55.3% (238 of 430 strings) Translation: MapComplete/themes Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/nl/ --- langs/themes/nl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 4e77e8d09..b88b74981 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -1055,4 +1055,4 @@ "shortDescription": "Een kaart met vuilnisbakken", "title": "Vuilnisbak" } -} \ No newline at end of file +} From 247b2e4db15e13fd7b15e721142ff760c21255fb Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Tue, 22 Feb 2022 16:13:49 +0100 Subject: [PATCH 05/10] Translation sync --- .../charging_station/charging_station.json | 10 ++-- assets/layers/entrance/entrance.json | 3 +- assets/layers/etymology/etymology.json | 6 +- assets/layers/extinguisher/extinguisher.json | 20 ++++--- assets/layers/hydrant/hydrant.json | 6 +- langs/layers/en.json | 2 +- langs/layers/nl.json | 56 +++++++++---------- langs/nl.json | 8 +-- langs/themes/nl.json | 2 +- 9 files changed, 62 insertions(+), 51 deletions(-) diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index 5ced753a4..613ad070f 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -1284,7 +1284,7 @@ }, "render": { "en": "There are {socket:tesla_destination} plugs of type
Tesla supercharger (destination) (A Type 2 with cable branded as tesla)
available here", - "nl": "Hier zijn {socket:tesla_destination} stekkers van het type
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
" + "nl": "Hier zijn {socket:tesla_destination} stekkers van het type
Tesla supercharger (destination) (Een Type 2 met kabel en Tesla-logo)
" }, "freeform": { "key": "socket:tesla_destination", @@ -2933,11 +2933,11 @@ "group": "technical", "question": { "en": "What voltage do the plugs with
Tesla supercharger (destination) (A Type 2 with cable branded as tesla)
offer?", - "nl": "Welke spanning levert de stekker van type
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
" + "nl": "Welke spanning levert de stekker van type
Tesla supercharger (destination). (Een Type 2 met kabel en Tesla-logo)
?" }, "render": { "en": "
Tesla supercharger (destination) (A Type 2 with cable branded as tesla)
outputs {socket:tesla_destination:voltage} volt", - "nl": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
heeft een spanning van {socket:tesla_destination:voltage} volt" + "nl": "
Tesla supercharger (destination). (Een Type 2 met kabel en Tesla-logo)
heeft een spanning van {socket:tesla_destination:voltage} volt" }, "freeform": { "key": "socket:tesla_destination:voltage", @@ -3025,11 +3025,11 @@ "group": "technical", "question": { "en": "What power output does a single plug of type
Tesla supercharger (destination) (A Type 2 with cable branded as tesla)
offer?", - "nl": "Welk vermogen levert een enkele stekker van type
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
?" + "nl": "Welk vermogen levert een enkele stekker van type
Tesla supercharger (destination) (Een Type 2 met kabel en Tesla-logo)
?" }, "render": { "en": "
Tesla supercharger (destination) (A Type 2 with cable branded as tesla)
outputs at most {socket:tesla_destination:output}", - "nl": "
Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo)
levert een vermogen van maximaal {socket:tesla_destination:output}" + "nl": "
Tesla supercharger (destination) (Een Type 2 met kabel en Tesla-logo)
levert een vermogen van maximaal {socket:tesla_destination:output}" }, "freeform": { "key": "socket:tesla_destination:output", diff --git a/assets/layers/entrance/entrance.json b/assets/layers/entrance/entrance.json index 8b2b0b2d4..57782545f 100644 --- a/assets/layers/entrance/entrance.json +++ b/assets/layers/entrance/entrance.json @@ -19,7 +19,8 @@ "minzoom": 14, "title": { "render": { - "en": "Entrance" + "en": "Entrance", + "nl": "Ingang" } }, "tagRenderings": [ diff --git a/assets/layers/etymology/etymology.json b/assets/layers/etymology/etymology.json index 46d8a22ba..7e7c5d0ea 100644 --- a/assets/layers/etymology/etymology.json +++ b/assets/layers/etymology/etymology.json @@ -139,14 +139,16 @@ { "id": "etymology_multi_apply", "render": { - "en": "{multi_apply(_same_name_ids, name:etymology:wikidata;name:etymology, Auto-applying data on all segments with the same name, true)}" + "en": "{multi_apply(_same_name_ids, name:etymology:wikidata;name:etymology, Auto-applying data on all segments with the same name, true)}", + "nl": "{multi_apply(_same_name_ids, name:etymology:wikidata,name:etymology, Wijzigingen worden automatisch gedaan op alle segmenten met dezelfde naam, true)}" } }, { "id": "wikipedia", "#": "Note that this is a _read_only_ option, to prevent people entering a 'wikidata'-link instead of 'name:etymology:wikidata'", "render": { - "en": "A Wikipedia article about this street exists:
{wikipedia():max-height:25rem}" + "en": "A Wikipedia article about this street exists:
{wikipedia():max-height:25rem}", + "nl": "Een Wikipedia artikel over deze straat bestaat:
{wikipedia():max-height:25rem}" }, "condition": "wikidata~*" } diff --git a/assets/layers/extinguisher/extinguisher.json b/assets/layers/extinguisher/extinguisher.json index 61a010cc3..78fca9848 100644 --- a/assets/layers/extinguisher/extinguisher.json +++ b/assets/layers/extinguisher/extinguisher.json @@ -7,7 +7,8 @@ "ru": "Карта огнетушителей.", "fr": "Couche des extincteurs.", "de": "Karte mit Feuerlöschern.", - "it": "Cartina degli estintori." + "it": "Cartina degli estintori.", + "nl": "Kaart van brandblussers." }, "minzoom": 14, "source": { @@ -25,18 +26,20 @@ "nb_NO": "Brannslokkere", "fr": "Exctincteurs", "de": "Feuerlöscher", - "it": "Estintori" + "it": "Estintori", + "nl": "Brandblussers" } }, "description": { - "en": "Map layer to show fire hydrants.", + "en": "Map layer to show fire extinguishers.", "ja": "消火栓を表示するマップレイヤ。", "zh_Hant": "顯示消防栓的地圖圖層。", "nb_NO": "Kartlag for å vise brannslokkere.", "ru": "Слой карты, отображающий огнетушители.", "fr": "Couche des lances à incendie.", "de": "Kartenebene zur Anzeige von Hydranten.", - "it": "Livello della mappa che mostra gli idranti antincendio." + "it": "Livello della mappa che mostra gli idranti antincendio.", + "nl": "Kaartlaag met brandblussers." }, "tagRenderings": [ { @@ -48,7 +51,8 @@ "fr": "Emplacement : {location}", "de": "Standort: {location}", "eo": "Loko: {location}", - "it": "Posizione: {location}" + "it": "Posizione: {location}", + "nl": "Locatie: {location}" }, "question": { "en": "Where is it positioned?", @@ -108,7 +112,8 @@ "ru": "Огнетушитель", "fr": "Extincteur", "de": "Feuerlöscher", - "it": "Estintore" + "it": "Estintore", + "nl": "Brandblusser" }, "description": { "en": "A fire extinguisher is a small, portable device used to stop a fire", @@ -116,7 +121,8 @@ "ru": "Огнетушитель - небольшое переносное устройство для тушения огня", "fr": "Un extincteur est un appareil portatif servant à éteindre un feu", "de": "Ein Feuerlöscher ist ein kleines, tragbares Gerät, das dazu dient, ein Feuer zu löschen", - "it": "Un estintore è un dispositivo portatile di piccole dimensioni usato per spegnere un incendio" + "it": "Un estintore è un dispositivo portatile di piccole dimensioni usato per spegnere un incendio", + "nl": "Een brandblusser is een klein, draagbaar apparaat om een brand te blussen" } } ], diff --git a/assets/layers/hydrant/hydrant.json b/assets/layers/hydrant/hydrant.json index af931bc9b..b5b6c8305 100644 --- a/assets/layers/hydrant/hydrant.json +++ b/assets/layers/hydrant/hydrant.json @@ -8,7 +8,8 @@ "ru": "Карта пожарных гидрантов", "fr": "Carte des bornes incendie", "de": "Karte der Hydranten", - "it": "Mappa degli idranti" + "it": "Mappa degli idranti", + "nl": "Kaart van brandkranen" }, "minzoom": 14, "source": { @@ -37,7 +38,8 @@ "ru": "Слой карты, отображающий пожарные гидранты.", "fr": "Couche des bornes incendie.", "de": "Kartenebene zur Anzeige von Hydranten.", - "it": "Livello della mappa che mostra gli idranti antincendio." + "it": "Livello della mappa che mostra gli idranti antincendio.", + "nl": "Kaartlaag met brandkranen." }, "tagRenderings": [ { diff --git a/langs/layers/en.json b/langs/layers/en.json index d21693660..e2076a2ea 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -5024,4 +5024,4 @@ "watermill": { "name": "Watermill" } -} +} \ No newline at end of file diff --git a/langs/layers/nl.json b/langs/layers/nl.json index c844e9b45..e77e706d5 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -3046,6 +3046,9 @@ "description": "Alle lagen met een gelinkt etymology", "name": "Heeft etymology info", "tagRenderings": { + "etymology_multi_apply": { + "render": "{multi_apply(_same_name_ids, name:etymology:wikidata,name:etymology, Wijzigingen worden automatisch gedaan op alle segmenten met dezelfde naam, true)}" + }, "simple etymology": { "mappings": { "0": { @@ -3058,21 +3061,36 @@ "street-name-sign-image": { "render": "{image_carousel(image:streetsign)}
{image_upload(image:streetsign, Voeg afbeelding van straatnaambordje toe)}" }, + "wikipedia": { + "render": "Een Wikipedia artikel over deze straat bestaat:
{wikipedia():max-height:25rem}" + }, "wikipedia-etymology": { "question": "Wat is het Wikidata-item van hetgeen dit object is naar vernoemd?", "render": "

Wikipedia artikel van de naamgever

{wikipedia(name:etymology:wikidata):max-height:20rem}" }, "zoeken op inventaris onroerend erfgoed": { "render": "Zoeken op inventaris onroerend erfgoed" - }, - "wikipedia": { - "render": "Een Wikipedia artikel over deze straat bestaat:
{wikipedia():max-height:25rem}" - }, - "etymology_multi_apply": { - "render": "{multi_apply(_same_name_ids, name:etymology:wikidata,name:etymology, Wijzigingen worden automatisch gedaan op alle segmenten met dezelfde naam, true)}" } } }, + "extinguisher": { + "description": "Kaartlaag met brandblussers.", + "name": "Kaart van brandblussers.", + "presets": { + "0": { + "description": "Een brandblusser is een klein, draagbaar apparaat om een brand te blussen", + "title": "Brandblusser" + } + }, + "tagRenderings": { + "extinguisher-location": { + "render": "Locatie: {location}" + } + }, + "title": { + "render": "Brandblussers" + } + }, "food": { "filter": { "0": { @@ -3381,6 +3399,10 @@ "render": "Speelweide in een park" } }, + "hydrant": { + "description": "Kaartlaag met brandkranen.", + "name": "Kaart van brandkranen" + }, "information_board": { "description": "Deze laag toont informatieborden in de publieke ruimte die uitleg geven over een bezienswaardigheid (bv. uitleg over het landschap, een ruine, een kaart van de omgeving, ...)", "name": "Informatieborden", @@ -4938,27 +4960,5 @@ }, "render": "Watermolens" } - }, - "extinguisher": { - "tagRenderings": { - "extinguisher-location": { - "render": "Locatie: {location}" - } - }, - "title": { - "render": "Brandblussers" - }, - "description": "Kaartlaag met brandblussers.", - "name": "Kaart van brandblussers.", - "presets": { - "0": { - "description": "Een brandblusser is een klein, draagbaar apparaat om een brand te blussen", - "title": "Brandblusser" - } - } - }, - "hydrant": { - "description": "Kaartlaag met brandkranen.", - "name": "Kaart van brandkranen" } } \ No newline at end of file diff --git a/langs/nl.json b/langs/nl.json index b6a078c13..ce59b8a58 100644 --- a/langs/nl.json +++ b/langs/nl.json @@ -294,6 +294,9 @@ "uploadingPicture": "Bezig met een foto te uploaden…", "willBePublished": "Jouw foto wordt gepubliceerd " }, + "importHelper": { + "allAttributesSame": "Alle kaart-objecten om te importeren hebben deze tag" + }, "importLayer": { "alreadyMapped": "Er staat hier reeds een {title} op de kaart; dit punt is een duplicaat. Verwijder deze van de kaart", "description": "Deze laag toont kaart-nota's die wijzen op een {title}", @@ -485,8 +488,5 @@ "description": "een link naar een webpagina", "feedback": "Dit is geen geldige link" } - }, - "importHelper": { - "allAttributesSame": "Alle kaart-objecten om te importeren hebben deze tag" } -} +} \ No newline at end of file diff --git a/langs/themes/nl.json b/langs/themes/nl.json index b88b74981..4e77e8d09 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -1055,4 +1055,4 @@ "shortDescription": "Een kaart met vuilnisbakken", "title": "Vuilnisbak" } -} +} \ No newline at end of file From b5e5179643b76ec8e85fab2b896598599dd6e914 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Tue, 22 Feb 2022 16:14:07 +0100 Subject: [PATCH 06/10] Version bump --- Models/Constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Models/Constants.ts b/Models/Constants.ts index a8bec17f0..3675cdcb6 100644 --- a/Models/Constants.ts +++ b/Models/Constants.ts @@ -2,7 +2,7 @@ import {Utils} from "../Utils"; export default class Constants { - public static vNumber = "0.16.1"; + public static vNumber = "0.16.2"; public static ImgurApiKey = '7070e7167f0a25a' public static readonly mapillary_client_token_v4 = "MLY|4441509239301885|b40ad2d3ea105435bd40c7e76993ae85" From cdc386d8ba2d93cd605e64bcc3ed111633b32729 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Tue, 22 Feb 2022 18:51:34 +0100 Subject: [PATCH 07/10] Small fixes --- assets/themes/buurtnatuur/buurtnatuur.json | 16 ++++++++-------- langs/themes/icon.json | 21 --------------------- scripts/build.sh | 3 ++- 3 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 langs/themes/icon.json diff --git a/assets/themes/buurtnatuur/buurtnatuur.json b/assets/themes/buurtnatuur/buurtnatuur.json index 991654c46..97526b843 100644 --- a/assets/themes/buurtnatuur/buurtnatuur.json +++ b/assets/themes/buurtnatuur/buurtnatuur.json @@ -504,9 +504,9 @@ ] }, "then": { - "nl": "Dit gebied wordt beheerd door Natuurpunt", - "icon": "./assets/themes/buurtnatuur/Natuurpunt.jpg" - } + "nl": "Dit gebied wordt beheerd door Natuurpunt" + }, + "icon": "./assets/themes/buurtnatuur/Natuurpunt.jpg" }, { "if": { @@ -515,9 +515,9 @@ ] }, "then": { - "nl": "Dit gebied wordt beheerd door {operator}", - "icon": "./assets/themes/buurtnatuur/Natuurpunt.jpg" + "nl": "Dit gebied wordt beheerd door {operator}" }, + "icon": "./assets/themes/buurtnatuur/Natuurpunt.jpg", "hideInAnswer": true }, { @@ -527,9 +527,9 @@ ] }, "then": { - "nl": "Dit gebied wordt beheerd door het Agentschap Natuur en Bos", - "icon": "./assets/themes/buurtnatuur/ANB.jpg" - } + "nl": "Dit gebied wordt beheerd door het Agentschap Natuur en Bos" + }, + "icon": "./assets/themes/buurtnatuur/ANB.jpg" }, { "if": { diff --git a/langs/themes/icon.json b/langs/themes/icon.json deleted file mode 100644 index 9544aaac9..000000000 --- a/langs/themes/icon.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "buurtnatuur": { - "overrideAll": { - "tagRenderings+": { - "1": { - "mappings": { - "1": { - "then": "./assets/themes/buurtnatuur/Natuurpunt.jpg" - }, - "2": { - "then": "./assets/themes/buurtnatuur/Natuurpunt.jpg" - }, - "3": { - "then": "./assets/themes/buurtnatuur/ANB.jpg" - } - } - } - } - } - } -} \ No newline at end of file diff --git a/scripts/build.sh b/scripts/build.sh index a983fce24..cd5e9e016 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -12,7 +12,8 @@ mkdir dist/assets 2> /dev/null npm run generate:editor-layer-index npm run generate && npm run test && -npm run generate:layouts +npm run generate:layouts && +npm run generate:layouts # generate:layouts has to be run twice: the personal theme won't pick up all the layers otherwise if [ $? -ne 0 ]; then echo "ERROR - stopping the build" From c1e1c8aa1a2f2655eb45e9e420d962f1da62570b Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Wed, 23 Feb 2022 16:51:32 +0100 Subject: [PATCH 08/10] Actually fix build.sh --- scripts/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index cd5e9e016..24dfd9e39 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -11,9 +11,9 @@ mkdir dist/assets 2> /dev/null # This script ends every line with '&&' to chain everything. A failure will thus stop the build npm run generate:editor-layer-index npm run generate && +npm run generate:layeroverview && # generate:layeroverview has to be run twice: the personal theme won't pick up all the layers otherwise npm run test && -npm run generate:layouts && -npm run generate:layouts # generate:layouts has to be run twice: the personal theme won't pick up all the layers otherwise +npm run generate:layouts if [ $? -ne 0 ]; then echo "ERROR - stopping the build" From c94d9d838e4f48006039cb670415a2d95edab420 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Thu, 24 Feb 2022 02:51:10 +0100 Subject: [PATCH 09/10] Fix #677 --- UI/Popup/ImportButton.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/UI/Popup/ImportButton.ts b/UI/Popup/ImportButton.ts index 3f956c3f0..1f96829e3 100644 --- a/UI/Popup/ImportButton.ts +++ b/UI/Popup/ImportButton.ts @@ -41,6 +41,7 @@ import {AutoAction} from "./AutoApplyButton"; import LayoutConfig from "../../Models/ThemeConfig/LayoutConfig"; import {Changes} from "../../Logic/Osm/Changes"; import {ElementStorage} from "../../Logic/ElementStorage"; +import Hash from "../../Logic/Web/Hash"; /** * A helper class for the various import-flows. @@ -268,8 +269,8 @@ ${Utils.special_visualizations_importRequirementDocs} originalFeatureTags.data["_imported"] = "yes" originalFeatureTags.ping() // will set isImported as per its definition state.changes.applyAction(action) - state.selectedElement.setData(state.allElements.ContainingFeatures.get(action.newElementId ?? action.mainObjectId)) - + const newId = action.newElementId ?? action.mainObjectId + state.selectedElement.setData(state.allElements.ContainingFeatures.get(newId)) } }) @@ -572,6 +573,8 @@ export class ImportPointButton extends AbstractImportButton { state.selectedElement.setData(state.allElements.ContainingFeatures.get( newElementAction.newElementId )) + Hash.hash.setData(newElementAction.newElementId) + if (note_id !== undefined) { state.osmConnection.closeNote(note_id, "imported") originalFeatureTags.data["closed_at"] = new Date().toISOString() From 7b837d74355b05e3a82d8be846a4be33d54af59c Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Thu, 24 Feb 2022 03:09:30 +0100 Subject: [PATCH 10/10] Fix GRB theme --- Logic/BBox.ts | 4 ++-- UI/Popup/ImportButton.ts | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Logic/BBox.ts b/Logic/BBox.ts index 1aa9d0882..aa8e69935 100644 --- a/Logic/BBox.ts +++ b/Logic/BBox.ts @@ -209,9 +209,9 @@ export class BBox { } - private check() { + private check() { if (isNaN(this.maxLon) || isNaN(this.maxLat) || isNaN(this.minLon) || isNaN(this.minLat)) { - console.log(this); + console.trace("BBox with NaN detected:", this); throw "BBOX has NAN"; } } diff --git a/UI/Popup/ImportButton.ts b/UI/Popup/ImportButton.ts index 1f96829e3..f6f5337aa 100644 --- a/UI/Popup/ImportButton.ts +++ b/UI/Popup/ImportButton.ts @@ -504,14 +504,23 @@ export class ImportWayButton extends AbstractImportButton implements AutoAction mergeConfigs, "import" ) - } else { - + } else if(feature.geometry.type === "Polygon"){ + const outer = coors[0] + return new CreateWayWithPointReuseAction( + args.newTags.data, + outer, + state, + mergeConfigs + ) + }else if(feature.geometry.type === "LineString"){ return new CreateWayWithPointReuseAction( args.newTags.data, coors, state, mergeConfigs ) + }else{ + throw "Unsupported type" } } }