From 75c5dc7fcf7590bd4ff51e159ba28f2365183063 Mon Sep 17 00:00:00 2001
From: Ismail Sunni <imajimatika@gmail.com>
Date: Mon, 2 Sep 2024 14:14:06 +0200
Subject: [PATCH 01/56] PB-859: Use the same approach to compute polygon area.

---
 .../infobox/components/FeatureAreaInfo.vue    | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/modules/infobox/components/FeatureAreaInfo.vue b/src/modules/infobox/components/FeatureAreaInfo.vue
index 38b62cfef..46fba7938 100644
--- a/src/modules/infobox/components/FeatureAreaInfo.vue
+++ b/src/modules/infobox/components/FeatureAreaInfo.vue
@@ -1,11 +1,11 @@
 <script setup>
-import area from '@turf/area'
+import { Geodesic, PolygonArea } from 'geographiclib-geodesic'
 import { computed, toRefs } from 'vue'
 import { useStore } from 'vuex'
 
 import { useTippyTooltip } from '@/utils/composables/useTippyTooltip'
 import { WGS84 } from '@/utils/coordinates/coordinateSystems'
-import { reprojectGeoJsonData, transformIntoTurfEquivalent } from '@/utils/geoJsonUtils'
+import { reprojectGeoJsonData } from '@/utils/geoJsonUtils'
 
 const props = defineProps({
     geometry: {
@@ -28,9 +28,28 @@ const geometryWgs84 = computed(() => {
     return reprojectGeoJsonData(geometry.value, WGS84, projection.value)
 })
 
+/**
+ * Calculate the area of a polygon using the GeographicLib library.
+ *
+ * @param {number[][]} coords - An array of coordinates representing the polygon. The coordinates
+ *   should be in the format [[longitude, latitude], [longitude, latitude], ...].
+ * @returns {number} The calculated area of the polygon in square meters.
+ *
+ *   Adapted from _calculateGlobalProperties function in geodesicManager.js
+ */
+function calculateAreaGeographicLib(coords) {
+    const geodesicPolygon = new PolygonArea.PolygonArea(Geodesic.WGS84, false)
+    for (const coord of coords) {
+        geodesicPolygon.AddPoint(coord[1], coord[0])
+    }
+    const res = geodesicPolygon.Compute(false, true)
+    return res.area
+}
+
 /** @type {ComputedRef<string>} */
 const humanReadableArea = computed(() => {
-    const calculatedArea = area(transformIntoTurfEquivalent(geometryWgs84.value))
+    const coords = geometryWgs84.value.coordinates[0]
+    const calculatedArea = calculateAreaGeographicLib(coords)
     let result = ''
     if (calculatedArea) {
         const unitThreshold = 1e5

From d2f3e76430e3b1068b3af94d3deaea32c1587394 Mon Sep 17 00:00:00 2001
From: Ismail Sunni <imajimatika@gmail.com>
Date: Mon, 2 Sep 2024 14:24:28 +0200
Subject: [PATCH 02/56] PB-869: Fix unit test and make sure the area is
 positive.

---
 src/modules/infobox/components/FeatureAreaInfo.vue | 2 +-
 tests/cypress/tests-e2e/drawing.cy.js              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/infobox/components/FeatureAreaInfo.vue b/src/modules/infobox/components/FeatureAreaInfo.vue
index 46fba7938..095478f6b 100644
--- a/src/modules/infobox/components/FeatureAreaInfo.vue
+++ b/src/modules/infobox/components/FeatureAreaInfo.vue
@@ -49,7 +49,7 @@ function calculateAreaGeographicLib(coords) {
 /** @type {ComputedRef<string>} */
 const humanReadableArea = computed(() => {
     const coords = geometryWgs84.value.coordinates[0]
-    const calculatedArea = calculateAreaGeographicLib(coords)
+    const calculatedArea = Math.abs(calculateAreaGeographicLib(coords))
     let result = ''
     if (calculatedArea) {
         const unitThreshold = 1e5
diff --git a/tests/cypress/tests-e2e/drawing.cy.js b/tests/cypress/tests-e2e/drawing.cy.js
index 8c6e8726b..b332032a0 100644
--- a/tests/cypress/tests-e2e/drawing.cy.js
+++ b/tests/cypress/tests-e2e/drawing.cy.js
@@ -642,7 +642,7 @@ describe('Drawing module tests', () => {
             cy.get('[data-cy="ol-map"]').click(150, 200)
             cy.get('[data-cy="ol-map"]').click(150, 230)
             cy.get('[data-cy="ol-map"]').click(100, 200)
-            cy.get('[data-cy="feature-area-information"]').should('be.visible').contains('74802 m2')
+            cy.get('[data-cy="feature-area-information"]').should('be.visible').contains('74998 m2')
 
             cy.log('Feature Area Info should be in kilometers above unit threshold')
             cy.clickDrawingTool(EditableFeatureTypes.LINEPOLYGON)

From 7192ce1267092c5cab5c02490ab4dd4fc07f0a61 Mon Sep 17 00:00:00 2001
From: Ismail Sunni <imajimatika@gmail.com>
Date: Mon, 2 Sep 2024 16:45:23 +0200
Subject: [PATCH 03/56] PB-869: Fix unit test.

---
 tests/cypress/tests-e2e/drawing.cy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/cypress/tests-e2e/drawing.cy.js b/tests/cypress/tests-e2e/drawing.cy.js
index b332032a0..a3b0090b0 100644
--- a/tests/cypress/tests-e2e/drawing.cy.js
+++ b/tests/cypress/tests-e2e/drawing.cy.js
@@ -654,7 +654,7 @@ describe('Drawing module tests', () => {
 
             cy.get('[data-cy="feature-area-information"]')
                 .should('be.visible')
-                .contains('0.24935 km2')
+                .contains('0.24999 km2')
         })
     })
     context('KML management', () => {

From fc99fbd8012d3b0480d6170c108cdd8d646099db Mon Sep 17 00:00:00 2001
From: Ismail Sunni <imajimatika@gmail.com>
Date: Wed, 4 Sep 2024 09:42:29 +0200
Subject: [PATCH 04/56] PB-869: Refactor function to compute area and perimeter
 using geographic library.

---
 .../infobox/components/FeatureAreaInfo.vue    | 23 +++-------------
 src/utils/geodesicManager.js                  | 26 +++++++++++++++----
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/modules/infobox/components/FeatureAreaInfo.vue b/src/modules/infobox/components/FeatureAreaInfo.vue
index 095478f6b..6ec558b3c 100644
--- a/src/modules/infobox/components/FeatureAreaInfo.vue
+++ b/src/modules/infobox/components/FeatureAreaInfo.vue
@@ -1,10 +1,10 @@
 <script setup>
-import { Geodesic, PolygonArea } from 'geographiclib-geodesic'
 import { computed, toRefs } from 'vue'
 import { useStore } from 'vuex'
 
 import { useTippyTooltip } from '@/utils/composables/useTippyTooltip'
 import { WGS84 } from '@/utils/coordinates/coordinateSystems'
+import { computePolygonPerimeterArea } from '@/utils/geodesicManager'
 import { reprojectGeoJsonData } from '@/utils/geoJsonUtils'
 
 const props = defineProps({
@@ -28,28 +28,11 @@ const geometryWgs84 = computed(() => {
     return reprojectGeoJsonData(geometry.value, WGS84, projection.value)
 })
 
-/**
- * Calculate the area of a polygon using the GeographicLib library.
- *
- * @param {number[][]} coords - An array of coordinates representing the polygon. The coordinates
- *   should be in the format [[longitude, latitude], [longitude, latitude], ...].
- * @returns {number} The calculated area of the polygon in square meters.
- *
- *   Adapted from _calculateGlobalProperties function in geodesicManager.js
- */
-function calculateAreaGeographicLib(coords) {
-    const geodesicPolygon = new PolygonArea.PolygonArea(Geodesic.WGS84, false)
-    for (const coord of coords) {
-        geodesicPolygon.AddPoint(coord[1], coord[0])
-    }
-    const res = geodesicPolygon.Compute(false, true)
-    return res.area
-}
-
 /** @type {ComputedRef<string>} */
 const humanReadableArea = computed(() => {
     const coords = geometryWgs84.value.coordinates[0]
-    const calculatedArea = Math.abs(calculateAreaGeographicLib(coords))
+    const res = computePolygonPerimeterArea(coords)
+    const calculatedArea = res.area
     let result = ''
     if (calculatedArea) {
         const unitThreshold = 1e5
diff --git a/src/utils/geodesicManager.js b/src/utils/geodesicManager.js
index 5e2692ae2..f8f72cdbb 100644
--- a/src/utils/geodesicManager.js
+++ b/src/utils/geodesicManager.js
@@ -20,6 +20,26 @@ const geod = Geodesic.WGS84
 [-HALF_SIZE, -HALF_SIZE, HALF_SIZE, HALF_SIZE] in webmercator */
 export const HALFSIZE_WEBMERCATOR = Math.PI * 6378137
 
+/**
+ * Calculate the area and perimeter of a polygon using the GeographicLib library
+ *
+ * @param {number[][]} coords - An array of coordinates representing the polygon. The coordinates
+ *   should be in the format [[longitude, latitude], [longitude, latitude], ...].
+ * @returns {Object} An object containing the calculated area and perimeter of the polygon.
+ * @returns {number} Return.area - The calculated area of the polygon in square meters.
+ * @returns {number} Return.perimeter - The calculated perimeter of the polygon in meters.
+ */
+export function computePolygonPerimeterArea(coords) {
+    const geodesicPolygon = new PolygonArea.PolygonArea(geod, false)
+    for (const coord of coords) {
+        geodesicPolygon.AddPoint(coord[1], coord[0])
+    }
+    const result = geodesicPolygon.Compute(false, true)
+    result.area = Math.abs(result.area)
+
+    return result
+}
+
 /**
  * Class responsible for:
  *
@@ -153,11 +173,7 @@ export class GeodesicGeometries {
 
     /* The following "_calculate*" methods are helper methods of "_calculateEverything" */
     _calculateGlobalProperties() {
-        const geodesicPolygon = new PolygonArea.PolygonArea(geod, !this.isPolygon)
-        for (const coord of this.coords) {
-            geodesicPolygon.AddPoint(coord[1], coord[0])
-        }
-        const res = geodesicPolygon.Compute(false, true)
+        const res = computePolygonPerimeterArea(this.coords)
         this.totalLength = res.perimeter
         this.totalArea = res.area
         if (this.hasAzimuthCircle) {

From ac3191da88fcf6bb4be5460bf851e772cacc6aa1 Mon Sep 17 00:00:00 2001
From: Pascal Barth <pak.barth@gmail.com>
Date: Thu, 5 Sep 2024 10:45:40 +0200
Subject: [PATCH 05/56] Keep i18n file key alphabetically sorted

is way easier to find a key by its key this way...
---
 scripts/generate-i18n-files.js   |   7 +
 src/modules/i18n/locales/de.json | 313 ++++++++++++++++---------------
 src/modules/i18n/locales/en.json | 313 ++++++++++++++++---------------
 src/modules/i18n/locales/fr.json | 313 ++++++++++++++++---------------
 src/modules/i18n/locales/it.json | 313 ++++++++++++++++---------------
 src/modules/i18n/locales/rm.json | 313 ++++++++++++++++---------------
 6 files changed, 807 insertions(+), 765 deletions(-)

diff --git a/scripts/generate-i18n-files.js b/scripts/generate-i18n-files.js
index fbf387ac8..f66aedc52 100644
--- a/scripts/generate-i18n-files.js
+++ b/scripts/generate-i18n-files.js
@@ -50,6 +50,13 @@ sheets.spreadsheets.values.get(
                     })
                 }
             })
+            // ordering all keys alphabetically
+            Object.keys(translations).forEach((lang) => {
+                const translationForLang = translations[lang]
+                translations[lang] = Object.keys(translationForLang)
+                    .sort()
+                    .reduce((acc, key) => ({ ...acc, [key]: translationForLang[key] }), {})
+            })
             // we now export each lang as a separate JSON file in our i18n modules' folder
             langByIndex.forEach((lang, index) => {
                 if (index > 0) {
diff --git a/src/modules/i18n/locales/de.json b/src/modules/i18n/locales/de.json
index cc89b204e..73a236350 100644
--- a/src/modules/i18n/locales/de.json
+++ b/src/modules/i18n/locales/de.json
@@ -1,10 +1,16 @@
 {
+    "3d_constructions": "Gebäude und Konstruktionen",
     "3d_ie11_alert": "Sie verwenden InternetExplorer <= 11: Die 3D Darstellung wird nicht performant sein. Bitte nutzen Sie die neueste Version von Microsoft EDGE, Firefox oder Chrome, um optimale Ergebnisse zu erhalten",
+    "3d_labels": "Geografische Namen",
     "3d_overlay_warning": "Wichtiger Hinweis: 3D-Daten nicht aktualisiert / 2D-Daten in 3D.<br/> Seit Okt. 2020 werden 3D-Daten (Gelände, Gebäude und andere 3D-Objekte) in diesem Viewer nicht mehr aktualisiert. Aktuellere Quelldaten stehen zum Download bereit. Einige 2D-Daten sind für die 3D-Visualisierung nicht optimal. Dies gilt insbesondere für Karten und Luftbilder. In steilem Gelände werden diese bei der Nutzung in 3D verzerrt dargestellt.",
     "3d_pegman_help": "Drücke Taste F für Flugmodus.<br>Drücke Taste H für Hilfe.<br> Drücke  ESC um zurückzukehren.",
     "3d_pegman_tooltip": "Ziehe mich auf die Karte!",
     "3d_render_error": "Systemvorraussetzung für 3D Ansicht nicht erfüllt. Damit die 3D-Darstellung funktioniert, muss Ihr Gerät folgende Anforderungen erfüllen: Nutzen Sie die neueste Version von Microsoft EDGE, Firefox oder Chrome sowie eine aktuelle Grafikkarte mit aktuellen Treibern.",
+    "3d_unsupported_projection": "Dieser Datensatz (externe Quelle) kann wegen fehlender Unterstützung der Projektion EPSG:4326 nicht in 3D dargestellt werden",
+    "3d_vegetation": "Vegetation",
+    "Alle": "Fehler beim Löschen der gespeicherten Karten. Bitte versuchen Sie es erneut.",
     "abort": "Abbrechen",
+    "about_us": "Über uns",
     "add": "Hinzufügen",
     "add_image": "Foto hinzufügen",
     "add_layer": "Layer hinzufügen",
@@ -16,10 +22,9 @@
     "add_wmts_layer_failed": "Fehler beim Laden des WMTS Layer",
     "add_wmts_layer_succeeded": "WMTS Layer erfolgreich geladen",
     "alert_title": "Achtung!",
-    "Alle": "Fehler beim Löschen der gespeicherten Karten. Bitte versuchen Sie es erneut.",
-    "appcache_update_available": "Neue Version der Offline Funktion verfügbar. Wollen Sie sie laden?",
     "app_feedback_button_text": "Feedback",
     "app_feedback_button_title": "geben Sie Feedback zur Anwendung",
+    "appcache_update_available": "Neue Version der Offline Funktion verfügbar. Wollen Sie sie laden?",
     "approx_abbr": "ca.",
     "are": "ARE",
     "are_service_link_href": "http://www.are.admin.ch/index.html?lang=de",
@@ -37,10 +42,10 @@
     "bafu": "BAFU",
     "bafu_service_link_href": "https://www.bafu.admin.ch/bafu/de/home.html",
     "bafu_service_link_label": "www.bafu.admin.ch",
+    "basis": "Basiskarte light",
     "bav": "BAV",
     "bav_service_link_href": "https://www.bav.admin.ch/bav/de/home.html",
     "bav_service_link_label": "Bundesamt für Verkehr",
-    "topic_bav_tooltip": "Bundesamt für Verkehr",
     "bfs": "BFS",
     "bfs_service_link_href": "https://www.bfs.admin.ch/bfs/de/home.html",
     "bfs_service_link_label": "Bundesamt für Statistik",
@@ -62,13 +67,19 @@
     "cancel": "Abbrechen",
     "canton": "Kanton",
     "catalog": "Katalog",
+    "ch.swisstopo.pixelkarte-farbe": "Karte farbig",
+    "ch.swisstopo.pixelkarte-grau": "Karte SW",
+    "ch.swisstopo.swissimage": "Luftbilder",
+    "ch.swisstopo.swissimage_3d": "Luftbild",
+    "ch.swisstopo.swisstlm3d-karte-farbe_3d": "Karte farbig",
+    "ch.swisstopo.swisstlm3d-karte-grau_3d": "Karte SW",
     "change_topic": "Thema",
     "choose_theme": "Thema wechseln",
     "choose_wms_url": "URL",
     "close": "Schliessen",
     "close_menu": "Menü schliessen",
-    "cms_link_button_url": "https://www.geo.admin.ch/de/map-viewer/karten-viewer.html",
     "cms_link_button_title": "Mehr Informationen",
+    "cms_link_button_url": "https://www.geo.admin.ch/de/map-viewer/karten-viewer.html",
     "commune": "Gemeinde",
     "compare": "Vergleichen",
     "confirm_remove_all_features": "Wollen Sie wirklich alle Objekte löschen?",
@@ -78,12 +89,15 @@
     "contextpopup_lv03_url": "https://www.swisstopo.admin.ch/de/landestriangulation-lv03",
     "contextpopup_lv95_url": "https://www.swisstopo.admin.ch/de/schweizer-koordinatensystem",
     "coordinates_label": "Koordinaten (m)",
+    "copy_cta": "Kopieren",
+    "copy_done": "Kopiert!",
     "copy_success": "Link kopiert!",
     "copy_url": "Link kopieren",
     "copyright_data": "© Daten:",
     "copyright_label": "Nutzungsbedingungen",
     "copyright_url": "https://www.geo.admin.ch/de/allgemeine-nutzungsbedingungen-bgdi/",
     "ct": "Kt.",
+    "current_value": "Aktueller Wert",
     "custom_size": "Benutzerdefinierte Grösse",
     "data": "Daten:",
     "delete": "Löschen",
@@ -91,11 +105,13 @@
     "description_instructions": "Beschreibung des WMS Layers",
     "desktop_redirect": "Link zur Desktop Version",
     "display_profile": "Profil erstellen",
+    "displayed": "Angezeigt",
     "distance_label": "Distanz",
     "district": "Bezirk",
     "draw": "Zeichnen",
     "draw_annotation": "Text",
     "draw_back": "Zurück / Zeichnen beenden",
+    "draw_button_delete_last_point": "Letzten Punkt löschen",
     "draw_del_all_features": "Lösche alle Elemente ",
     "draw_del_selected_features": "Lösche ausgewählte Elemente ",
     "draw_delete": "Löschen",
@@ -104,6 +120,8 @@
     "draw_delete_selected_features": "Selektierte Objekte löschen",
     "draw_dl_kml": "Download KML",
     "draw_export": "Export",
+    "draw_file_load_error": "Laden des KML fehlgeschlagen",
+    "draw_file_save_error": "Speichern des KML fehlgeschlagen",
     "draw_file_saved": "Alle Änderungen gespeichert",
     "draw_file_saving": "Speichern ....",
     "draw_layer_label": "Zeichnung",
@@ -151,22 +169,38 @@
     "draw_text_placeholder": "kein Titel",
     "draw_tooltip": "Zeichnen Sie auf der Karte",
     "draw_type_marker": "Linie / Fläche",
+    "drawing_attached": "Zeichnung als Anhang hinzugefügt",
+    "drawing_too_large": "Ihre Zeichnung ist zu gross, entfernen Sie einige Details.",
     "drop_invalid_url": "URL ist ungültig.",
     "drop_me_here": "KML Datei hierhin ziehen",
+    "duplicate_layer": "Karte duplizieren",
     "east": "Ost",
     "ech": "Geokatalog",
     "ech_service_link_href": "https://www.geo.admin.ch/de/home.html",
     "ech_service_link_label": "geo.admin.ch",
     "edit_back": "Zurück / Editieren beenden",
+    "edit_confirm_reset_style": "Diese Aktion entfernt alle Ihre Änderungen und wendet den Standardstil der Ebene an.",
+    "edit_current_layer": "Bearbeitung des Datensatz ",
+    "edit_file_saved": "Alle Änderungen gespeichert",
+    "edit_file_saving": "Speichern ....",
+    "edit_fill_color": "Farbe auswählen",
+    "edit_fill_outline_color": "Randfarbe auswählen",
+    "edit_glstyle_choose_color": "Farbe auswählen",
+    "edit_glstyle_choose_layer": "Ebene auswählen",
+    "edit_line_color": "Linienfarbe auswählen",
+    "edit_line_width": "Liniendicke auswählen",
     "edit_mode_title": "Edition",
+    "edit_not_possible": "Leider können Sie diese Ebene nicht bearbeiten. Bitte wählen Sie einen anderen Hintergrund aus",
+    "edit_or_reset_style": "Diese Ebene verwendet einen Stil von Drittanbietern. Sie können diesen nicht ändern, aber Sie können den Standardstil verwenden, indem Sie auf diese Schaltfläche klicken.",
     "edit_panel_title": "Style the map",
     "edit_reset": "Reset",
     "edit_share_file_disclaimer": "Ihr Stil wird automatisch ein Jahr lang gespeichert. Durch die Nutzung dieses Dienstes stimmen Sie den <a href='https://www.geo.admin.ch/de/allgemeine-nutzungsbedingungen-bgdi/' target='_blank'>Nutzungsbedingungen</a> zu.",
-    "open_edit_bt_title": "Open style edition",
-    "edit_file_saved": "Alle Änderungen gespeichert",
-    "edit_file_saving": "Speichern ....",
-    "edit_confirm_reset_style": "Diese Aktion entfernt alle Ihre Änderungen und wendet den Standardstil der Ebene an.",
+    "edit_text_color": "Textfarbe auswählen",
+    "edit_text_halo_color": "Farbe Schatten  auswählen",
+    "edit_text_size": "Textgrösse auswählen",
+    "edit_visibility": "Darstellung",
     "elevation": "Höhe",
+    "elevation_href": "https://www.swisstopo.admin.ch/de/schweizerische-bezugssysteme",
     "email_us": "E-Mail",
     "emapis": "Ländliche Entwicklung",
     "emapis_service_link_href": "mailto:info@blw.admin.ch",
@@ -181,6 +215,7 @@
     "export_kml_notsupported": "Ihr Browser unterstützt die Speicherfunktion nicht. Benutzen Sie IE10, Firefox oder Chrome.",
     "external_data_tooltip": "Daten und/oder Stil eines Drittanbieters ",
     "external_data_warning": "Warnung: Diese Daten und/oder Stil kommen von einem Drittanbieter (--URL--). Verfügbarkeit wird durch Drittanbieter gewährleistet. Es gelten zusätzlich die Bedingungen der entsprechenden Datenherren.",
+    "extra_large_size": "Extra Gross",
     "facebook_tooltip": "Teilen Sie diese Karte mit Ihren Freunden auf Facebook",
     "feature": "Objekt",
     "featuresearch_results_header": "Gehe zum Objekt ...",
@@ -190,18 +225,28 @@
     "feedback_description": "1. Melden Sie uns in diesem Feld Änderungen in der Karte, Verbesserungen der Daten oder Fragen zu dieser Website (erforderlich) :",
     "feedback_disclaimer": "Mit dem Absenden Ihrer Meldung erklären Sie sich mit den <a href='https://www.geo.admin.ch/de/allgemeine-nutzungsbedingungen-bgdi#feedback' target='_blank'>Nutzungsbedingungen</a> einverstanden.",
     "feedback_drawing": "2. Markieren Sie den betroffenen Ort in der Karte :",
+    "feedback_email": "Ihre E-Mail Adresse (optional)",
+    "feedback_empty_warning": "Die Berichtsnachricht darf nicht leer sein",
     "feedback_error_message": "Problem: Meldung konnte nicht übermittelt werden",
+    "feedback_invalid_email": "ungültige E-Mail",
     "feedback_kml_attached": "Die aktuelle Zeichung wird übermittelt. ",
     "feedback_mail": "3. Ihre E-Mail Adresse :",
     "feedback_modify_drawing": "Zeichnung editieren",
     "feedback_permalink": "Folgender Link wird übermittelt: ",
     "feedback_placeholder": "Fügen Sie eine .pdf, .zip, .jpg, .jpeg, .kml, .kmz oder .gpx Datei hinzu",
+    "feedback_rating_text": "Teilen Sie uns mit, wie Sie sich mit unserem Kartenviewer fühlen",
+    "feedback_rating_title": "Wie würden Sie Ihre Erfahrung bewerten ? (erforderlich)",
     "feedback_success_message": "Danke für Ihre Nachricht. Diese wurde erfolgreich übermittelt.",
     "feedback_unsupported_format": "Dieser Dateityp wird leider nicht unterstützt. Bitte verwenden Sie eine .pdf, .zip, .jpg, .jpeg, .kml, .kmz oder .gpx Datei.",
+    "field_required": "Dieses Feld ist erforderlich",
+    "file_imported_success": "Datei erfolgreich importiert",
     "file_is_not_kml": "Dieses File ist keine KML Datei. ",
     "file_too_large": "Die Datei ist zu gross (maximal erlaubte Grösse: {maxFileSize}).",
+    "file_unsupported_format": "Dieses Dateiformat wird nicht unterstützt. Nur die folgenden Formate sind erlaubt: {allowedFormats}",
     "follow_us": "Folgen Sie uns",
+    "form_invalid": "Das Formular ist ungültig",
     "full_screen": "Vollbild",
+    "full_width": "Vollständige Breite",
     "funksender": "Funksender",
     "funksender_service_link_href": "mailto:info@bakom.admin.ch",
     "funksender_service_link_label": "info@bakom.admin.ch",
@@ -211,6 +256,7 @@
     "geol": "Geologie",
     "geol_service_link_href": "http://www.geologieportal.ch/internet/geologieportal/de/home.html",
     "geol_service_link_label": "www.geologieportal.ch",
+    "geoloc_out_of_bounds": "Ihre aktuelle Position liegt ausserhalb der Schweiz und kann deshalb nicht angezeigt werden",
     "geoloc_permission_denied": "Es ist keine Positionsbestimmung möglich, da Ihre Browsereinstellungen dies nicht zulassen. Erlauben Sie die Positionsbestimmung und deaktivieren Sie den \"Privat\" Modus des Browsers.",
     "geoloc_pos_unavailable": "Keine Positionsbestimmung möglich. Fehlermeldung des Geräts (WiFi, GPS). Überprüfen Sie bitte die Einstellungen.",
     "geoloc_start_tracking": "Schalte Positionierung ein",
@@ -218,8 +264,10 @@
     "geoloc_stop_tracking": "Schalte Positionierung aus",
     "geoloc_time_out": "Bei der Positionsbestimmung ist auf ihrem Gerät ein Timeout-Fehler aufgetreten. Bitte versuchen Sie es später nochmals.",
     "geoloc_unknown": "Aufgrund eines unbekannten Fehlers war die Positionsbestimmung nicht erfolgreich. Prüfen Sie die Einstellungen für Lokalisierung, Privatsphäre und Firewall Ihres Gerätes.",
-    "re_center_map": "Karte auf Position zentrieren",
     "geolocation": "Geolocation",
+    "georessourcen": "Georessourcen",
+    "georessourcen_service_link_href": "https://www.swisstopo.admin.ch/de/wissen-fakten/geologie/georessourcen.html",
+    "georessourcen_service_link_label": "Weitere Informationen",
     "geothermie": "Geothermie",
     "geothermie_service_link_href": "http://www.geologieportal.ch/internet/geologieportal/de/home/topics/energy/geothermalenergy/shortdesc.html",
     "geothermie_service_link_label": "Weitere Informationen",
@@ -236,11 +284,21 @@
     "help_search_data": "Mit der 'Suche' können Sie Suchbegriffe eingeben (z.B. 'Moor', 'Strasse', 'Erdbeben' usw.) und nach Beschreibungen aller zentral verfügbaren elektronischen Geodaten suchen. Wenn Sie ein Resultat auswählen, wird es direkt im Kartenviewer dargestellt.",
     "help_search_data_link": "Nach weiteren Karten suchen?",
     "help_search_data_title": "Suche nach Karten",
+    "hidden": "Versteckt",
+    "hide": "Deaktivieren",
     "hide_profile": "Profil verbergen",
     "homescreen_content": "Benutzen Sie diese Funktion, um diese Applikation direkt auf Ihrer Startseite zu platzieren.",
     "homescreen_title": "Startseite",
+    "hydrology": "Hydrologie",
     "import": "Importieren",
+    "import_file": "Datei importieren",
+    "import_file_succeeded": "Erfolg",
+    "import_file_tooltip": "Importieren eine externe KML- oder GPX-Datei",
+    "import_file_url_placeholder": "GPX KML URL",
     "import_kml": "KML Import",
+    "import_maps": "Karten importieren",
+    "import_maps_tooltip": "Importieren Sie externe WMTS- oder WMS-Datenquellen",
+    "import_maps_url_placeholder": "WMTS WMS URL",
     "import_online_placeholder": "WMTS WMS GPX KML URL",
     "import_tooltip": "Importieren Sie externe WMTS-, WMS-, GPX- oder KML-Datenquellen",
     "import_wms": "WMS Import",
@@ -248,13 +306,17 @@
     "inspire": "INSPIRE",
     "inspire_service_link_href": "https://www.geo.admin.ch/de/home.html",
     "inspire_service_link_label": "geo.admin.ch",
+    "invalid_email": "ungültige E-Mail",
+    "invalid_file": "Datei ungültig",
+    "invalid_kml_gpx_file_error": "Ungültige Datei, nur KML- oder GPX-Dateien werden unterstützt",
     "invalid_url": "URL ist ungültig.",
-    "item": "Gehe zum Objekt ...",
-    "items": "Objekte",
+    "invalid_wms_capabilities": "Ungültige WMS-Capabilities-Daten",
+    "invalid_wmts_capabilities": "Ungültige WMTS-Capabilities-Daten",
     "isos": "ISOS-Ortsbilder",
     "isos_service_link_href": "https://www.bak.admin.ch/bak/de/home/baukultur/isos-und-ortsbildschutz.html",
     "isos_service_link_label": "BAK - Inventar ISOS",
-    "topic_isos_tooltip": "ISOS Ortsbilder",
+    "item": "Gehe zum Objekt ...",
+    "items": "Objekte",
     "ivs": "Hist. Verkehrswege",
     "ivs_service_link_href": "http://www.ivs.admin.ch/",
     "ivs_service_link_label": "www.ivs.admin.ch",
@@ -262,9 +324,19 @@
     "kgs_service_link_href": "http://www.babs.admin.ch/de/aufgabenbabs/kgs/inventar.html",
     "kgs_service_link_label": "Kulturgüterschutz",
     "kml": "KML",
+    "kml_gpx_file_empty": "Die KML/GPX-Datei ist leer",
+    "kml_gpx_file_out_of_bounds": "Der Dateiinhalt liegt ausserhalb der Projektionsgrenzen",
+    "kml_icon_url_cors_issue": "Die KML-Datei „{layerName}“ enthält Symbol(e) mit der URL {url}, die keine CORS-Unterstützung bietet! Bitte wenden Sie sich an den Administrator dieser URL, um die Unterstützung für CORS hinzuzufügen.",
     "kml_no_text_elements": "Information: Die Labels werden nicht gespeichert",
+    "kml_style_default": "Standard",
+    "kml_style_geoadmin": "GeoAdmin",
     "kmlimport_tooltip": "Importieren Sie externe KML Datenquellen",
+    "labels": "Labels",
+    "landcover_grass": "Landcover grass",
+    "landuse": "Grünflächen",
+    "landuse-residential": "Landuse residential",
     "lang_chooser_label": "Sprache",
+    "large_size": "Gross",
     "last_available_year": "Last year",
     "layer_cant_be_displayed_in_3d": "Die folgenden Datensätze (externe Quellen) können wegen fehlender Unterstützung der Projektion EPSG:4326 nicht in 3D dargestellt werden:",
     "layer_cant_be_printed": "Die folgenden Datensätze (externe Quellen) können wegen fehlender Unterstützung der Projektion EPSG:2056 nicht gedruckt werden:",
@@ -274,10 +346,23 @@
     "layer_selection": "Auswahl",
     "layers_displayed": "Dargestellte Karten",
     "layers_results_header": "Karte hinzufügen ...",
+    "legacy_drawing_warning": "Es ist nicht möglich, eine von map.geo.admin.ch erstellte Zeichnung auf der Website test.map.geo.admin.ch zu bearbeiten. Wenn Sie eine neue Zeichnung erstellen möchten, müssen Sie entweder die aktuelle Zeichnung entfernen oder die Auswahl aufheben.",
+    "legal_notice": "Impressum",
+    "legal_notice_url": "https://www.geo.admin.ch/de/impressum-verantwortlichkeiten-und-kontakte",
     "legend": "Legende",
+    "light_blue": "hellblau",
+    "light_gray": "hellgrau",
+    "light_green": "hellgrün",
+    "light_yellow": "hellgelb",
     "link_bowl_crosshair": "Teile Position",
+    "link_description": "Link Beschreibung (optional)",
     "link_validate_kml": "Link zur Validierung der KML-Datei",
+    "linkedin_tooltip": "Teilen Sie diese Karte auf LinkedIn",
     "load_local_file": "Laden...",
+    "loading": "Laden",
+    "loading_error_network_failure": "Laden fehlgeschlagen, auf die Datei kann nicht zugegriffen werden",
+    "loading_external_layer": "Laden der externen Layer",
+    "loading_file": "Laden...",
     "locations": "Gehe nach ...",
     "locations_results_header": "Gehe nach ...",
     "locations_results_header_fuzzy": "Meinten Sie ...",
@@ -293,6 +378,7 @@
     "measure": "Messen",
     "measure_instruction": "Erfassen Sie eine Polylinie...",
     "measure_tooltip": "Messen auf der Karte",
+    "media_disclaimer": "Enthält Inhalte von Drittanbietern",
     "medium_size": "Mittel",
     "menu": "Menü",
     "metadata_window_title": "Infobox",
@@ -306,9 +392,12 @@
     "modify_existing_vertex_linepolygon": "Klicke, um den Punkt zu löschen (mind. 2 Punkte).<br/> Punkt verschieben: klicken und ziehen ",
     "modify_existing_vertex_marker": "Verschieben des Symbols: klicken und ziehen ",
     "modify_existing_vertex_measure": "Klicke, um den Punkt zu löschen (mind. 2 Punkte).<br/> Punkt verschieben: klicken und ziehen ",
-    "modify_icon_category_label": "Signaturen",
-    "modify_icon_category_default_label": "Standard",
+    "modify_icon_category_babs-D_label": "Zivile Signaturen D",
+    "modify_icon_category_babs-F_label": "Zivile Signaturen F",
+    "modify_icon_category_babs-I_label": "Zivile Signaturen I",
     "modify_icon_category_babs_label": "Zivile Signaturen",
+    "modify_icon_category_default_label": "Standard",
+    "modify_icon_category_label": "Signaturen",
     "modify_icon_label": "Symbole",
     "modify_icon_size_label": "Grösse",
     "modify_new_vertex_linepolygon": "Klicke, um einen Punkt hinzuzufügen.<br/> Punkt verschieben: klicken und ziehen ",
@@ -318,15 +407,21 @@
     "modify_text_size_label": "Grösse",
     "more_info": "Mehr dazu ...",
     "movie": "Zeitreihen (Multi-PDF)",
+    "mvt_ie11_alert": "Sie verwenden InternetExplorer ≤ 11:  Bitte nutzen Sie die neueste Version von Microsoft EDGE, Firefox oder Chrome, um optimale Ergebnisse zu erhalten",
+    "network_error": "Netzwerkfehler",
     "never_show_again": "Diese Meldung nicht mehr anzeigen.",
     "nga": "Breitbandatlas",
     "nga_service_link_href": "https://www.bakom.admin.ch/bakom/de/home.html",
     "nga_service_link_label": "www.bakom.admin.ch",
+    "no_email": "Das E-Mail-Feld ist erforderlich",
     "no_feature_results": "Keine Objekte gefunden",
     "no_file": "Keine Datei",
+    "no_layer_found": "Keine Layer gefunden",
     "no_layers_info": "Kein Layer auf der Karte",
     "no_more_information": "Keine weiteren Informationen",
+    "no_result": "Kein Ergebnis",
     "no_searchable_layer": "Kein abfragbarer Datensatz",
+    "no_url": "Kein URL",
     "north": "Nord",
     "not_available": "Nicht verfügbar",
     "not_available_3d": "Not available in 3D!",
@@ -336,7 +431,9 @@
     "notruf_service_link_label": "geo.admin.ch",
     "object_information": "Objekt-Information",
     "obstacle_deleted_last_2_weeks": "Gelöschte Hindernisse der letzten 2 Wochen",
+    "obstacle_deleted_last_4_days": "Gelöschte Hindernisse der letzten 4 Tage",
     "obstacle_started_last_2_weeks": "Aktivierte Hindernisse letzte 2 Wochen",
+    "obstacle_started_last_4_days": "Aktivierte Hindernisse letzte 4 Tage",
     "offline_abort": "Abbrechen",
     "offline_abort_warning": "Wollen Sie wirklich alle Karten löschen?",
     "offline_bad_layer_type": "Einer der geladenen Datensätze kann nicht für den Offline-Gebrauch gespeichert werden.",
@@ -357,9 +454,15 @@
     "offline_sorry": "Sie sind im Moment offline",
     "offline_space_warning": "Es ist nicht genügend Speicherplatz vorhanden. Bitte geben sie ~50MB auf ihrem Gerät frei oder wählen Sie maximal 2 Kartenthemen",
     "offline_zoom_extent": "Auf Ausschnitt zoomen",
+    "open_edit_bt_title": "Open style edition",
     "open_menu": "Menü öffnen",
+    "operation_aborted": "Operation abgebrochen",
     "operation_canceled": "Operation abgebrochen",
+    "operation_failed": "Hoppla! Etwas ist schiefgegangen. Bitte versuchen Sie es erneut.",
+    "operation_successful": "Erfolg!",
     "orange": "Orange",
+    "orient_map_north": "Karte einnorden",
+    "outside_valid_year_range": "Das eingegebene Jahr liegt ausserhalb des verfügbaren Bereichs:",
     "page_description": "map.geo.admin.ch ist die Kartenplattform der schweizerischen Eidgenossenschaft. Zugang zu Karten, Geoinformationen, -daten, -dienste und Metadaten der Schweiz.",
     "page_title": "Karten der Schweiz - Schweizerische Eidgenossenschaft - map.geo.admin.ch",
     "parcel": "Parzelle",
@@ -383,6 +486,7 @@
     "profile_elevation_down": "Abstieg",
     "profile_elevation_up": "Aufstieg",
     "profile_hike_time": "Marschzeit",
+    "profile_no_data": "kein Datum",
     "profile_poi_down": "Tiefster Punkt",
     "profile_poi_up": "Höchster Punkt",
     "profile_slope_distance": "Wegstrecke",
@@ -390,6 +494,7 @@
     "profile_too_many_points_error": "Die Profilanfrage war zu gross und konnte nicht verarbeitet werden.",
     "profile_x_label": "Entfernung",
     "profile_y_label": "Höhe",
+    "purple": "lila",
     "qrcode_tooltip": "Erstellen Sie einen QRCode und öffnen Sie die Karte auf Ihrem mobilen Gerät",
     "queries": "Abfragen (BETA)",
     "query_alert_more_than_200_results": "Ihre Abfrage gibt mehr als 200 Resultate zurück!",
@@ -405,6 +510,7 @@
     "query_reset": "Bedingung zurücksetzen",
     "query_search": "Suchen",
     "query_with_bbox": "Kartenausschnitt benutzen",
+    "re_center_map": "Karte auf Position zentrieren",
     "read_failed": "Lesefehler!",
     "read_succeeded": "Laden erfolgreich",
     "reading_file": "Laden...",
@@ -413,6 +519,7 @@
     "reduce_label": "Verkleinern",
     "remove": "Entfernen",
     "revision_service": "Revisionsdienst swisstopo",
+    "roadtraffic": "Strassen",
     "rotate_left": "Drehe nach links",
     "rotate_reset": "Karte wieder nach Norden ausrichten",
     "rotate_right": "Drehe nach rechts",
@@ -423,10 +530,10 @@
     "schneesport_service_link_href": "https://shop.swisstopo.admin.ch/de/products/maps/leisure/ski_tour_maps",
     "schneesport_service_link_label": "Schneesport",
     "schule": "Für die Schule",
-    "topic_schule_tooltip": "Für die Schule",
     "schule_service_link_href": "http://www.schoolmaps.ch",
     "schule_service_link_label": "www.schoolmaps.ch",
     "search_help": "Hilfe",
+    "search_in_catalogue_placeholder": "Suche in importierten Karten",
     "search_placeholder": "Suche nach Adressen, Parzellen oder Karten",
     "search_title": "Ort suchen oder Karte hinzufügen:",
     "select_feature_annotation": "Klicke, um den Text zu selektieren",
@@ -435,7 +542,9 @@
     "select_feature_measure": "Klicke, um die Messung zu selektieren",
     "select_no_feature": "Kein Element zur Auswahl",
     "send": "Senden",
+    "send_failed": "Senden fehlgeschlagen",
     "settings": "Konfiguration",
+    "settlement": "Siedlungsgebiet",
     "share": "Teilen",
     "share_disclaimer": "Sie können die Karte in Ihrer Website oder in einem Blog einbetten. <a href='https://www.geo.admin.ch/de/web-integration-iframe/' target='_blank'>Nutzungsbedingungen</a>",
     "share_file_disclaimer": "Ihre Zeichnung wird automatisch ein Jahr lang gespeichert. Durch  die Nutzung  dieses Dienstes stimmen Sie den  <a href='https://www.geo.admin.ch/de/allgemeine-nutzungsbedingungen-bgdi/' target='_blank'>Nutzungsbedingungen</a> zu.",
@@ -443,6 +552,7 @@
     "share_less": "Einbetten:",
     "share_link": "Share link",
     "share_link_tooltip": "Drücken Sie Ctrl+C, um zu kopieren",
+    "share_map_title": "Link zum Geoportal der Schweizerischen Eidgenossenschaft",
     "share_more": "Einbetten ...",
     "share_preview": "Vorschau der Kartengrösse",
     "shop_cancel": "Abbrechen",
@@ -455,6 +565,7 @@
     "shop_not_available": "Die Karte ist zurzeit vergriffen.",
     "shop_or_fill": "oder füllen Sie die Felder aus (Koordinaten LV95)",
     "shop_order": "Bestellen",
+    "show": "Anzeigen",
     "show_more_options": "Vorschau",
     "show_more_results": "Weitere Ergebnisse laden ...",
     "small_size": "Klein",
@@ -466,27 +577,32 @@
     "swisstopo": "swisstopo",
     "swisstopo_service_link_href": "https://www.swisstopo.admin.ch/de/home.html",
     "swisstopo_service_link_label": "Bundesamt für Landestopografie swisstopo",
-    "test_host_warning": "TESTSEITE – NICHT TEILEN -  NICHT FÜR PRODUKTIVEN GEBRAUCH",
+    "switch_kml_style": "Stil wechseln",
+    "switch_tooltip_attached_to_feature": "Tooltip an Geometrie anhängen",
+    "switch_tooltip_floating": "Einen schwebenden Tooltip verwenden",
+    "territory": "Gelände",
     "test_host_full_disclaimer": "Diese Seite dient ausschliesslich Testzwecken und sollte nicht operativ eingesetzt werden. Es gibt seitens Betreiber dieser Seite keine Garantie für fehlerfreien Inhalt und störungsfreien Betrieb.",
+    "test_host_warning": "TESTSEITE – NICHT TEILEN -  NICHT FÜR PRODUKTIVEN GEBRAUCH",
+    "test_map_give_feedback": "Feedback geben",
     "text_to_display": "Link Beschreibung",
     "third_party_data_warning": "Warnung: diese Daten kommen von einem Drittanbieter. Dieser Permalink zeigt möglicherweise auf Daten eines Drittanbieters. Wollen Sie diese Daten dennoch laden?",
     "tile": "Kartenblatt",
+    "tilt3d_active": "Wechsle zu 2D Darstellung",
+    "tilt3d_disabled": "Dieser Hintergrund kann in 3D nicht verwendet werden",
+    "tilt3d_inactive": "Wechsle zu 3D Darstellung",
     "tilt_down": "Neige Darstellung nach unten",
     "tilt_down_disabled": "Karte kann nicht weiter nach unten geneigt werden",
     "tilt_reset": "Schrägdarstellung zurücksetzen",
     "tilt_up": "Neige Darstellung nach oben",
     "tilt_up_disabled": "Karte kann nicht weiter nach oben geneigt werden",
-    "tilt3d_active": "Wechsle zu 2D Darstellung",
-    "tilt3d_disabled": "Dieser Hintergrund kann in 3D nicht verwendet werden",
-    "tilt3d_inactive": "Wechsle zu 3D Darstellung",
     "time_all": "Alle",
     "time_bt_disabled_tooltip": "Die Darstellung von Zeitständen ist nur mit historisierten Daten möglich. Sie müssen zuerst einen historisierten Datensatz in die Karte laden.",
     "time_current": "Aktuell",
     "time_hide": "Deaktivieren der Anzeige von Daten-Zeitständen.",
     "time_select_year": "Wählen Sie ein Jahr aus",
     "time_show": "Aktivieren der Anzeige von Daten-Zeitständen.",
-    "time_slider_legend_tippy_intro": "Der Zeitschieber zeigt verschiedene Farben an, je nachdem, ob die Karten Daten für das ausgewählte Jahr enthalten oder nicht.",
     "time_slider_legend_tippy_full_data": "Vollständige Daten",
+    "time_slider_legend_tippy_intro": "Der Zeitschieber zeigt verschiedene Farben an, je nachdem, ob die Karten Daten für das ausgewählte Jahr enthalten oder nicht.",
     "time_slider_legend_tippy_no_data": "Keine Daten",
     "time_slider_legend_tippy_partial_data": "Teilweise Daten",
     "title": "Titel",
@@ -495,6 +611,7 @@
     "topic_astra_tooltip": "Bundesamt für Strassen",
     "topic_aviation_tooltip": "Luftfahrtdaten Schweiz",
     "topic_bafu_tooltip": "Bundesamt für Umwelt",
+    "topic_bav_tooltip": "Bundesamt für Verkehr",
     "topic_bfs_tooltip": "Bundesamt für Statistik",
     "topic_blw_tooltip": "Bundesamt für Landwirtschaft",
     "topic_cadastre_tooltip": "Grundstückinformation",
@@ -504,9 +621,11 @@
     "topic_funksender_tooltip": "Funksender",
     "topic_geodesy_tooltip": "Geodäsie",
     "topic_geol_tooltip": "Geologie",
+    "topic_georessourcen_tooltip": "Georessourcen",
     "topic_geothermie_tooltip": "Geothermie",
     "topic_gewiss_tooltip": "Gewässerinformationen",
     "topic_inspire_tooltip": "INSPIRE",
+    "topic_isos_tooltip": "ISOS Ortsbilder",
     "topic_ivs_tooltip": "Inventar historischer Verkehrswege",
     "topic_kgs_tooltip": "Kulturgüterschutz",
     "topic_luftbilder_tooltip": "Luftbilder",
@@ -515,48 +634,55 @@
     "topic_notruf_tooltip": "Notruf",
     "topic_sachplan_tooltip": "Sachpläne des Bundes",
     "topic_schneesport_tooltip": "Schneesport",
+    "topic_schule_tooltip": "Für die Schule",
     "topic_swisstopo_tooltip": "Bundesamt für Landestopografie",
     "topic_verteidigung_tooltip": "Verteidigung",
     "topic_vu_tooltip": "Verkehrsunfälle",
     "topic_wildruhezonen_tooltip": "Wildruhezonen Schweiz",
     "transparency": "Transparenz",
+    "try_test_viewer": "Probieren Sie test.map.geo.admin.ch aus",
     "twitter_tooltip": "Twittern Sie diese Karte",
+    "unsupported_content_type": "Nicht unterstützter Antwortinhaltstyp",
     "upload_failed": "Fehler beim Hochladen!",
     "upload_succeeded": "Upload OK!",
     "uploading_file": "Laden...",
     "url_image": "Foto  URL",
     "url_link": "Webseite URL",
     "url_video": "Video URL",
-    "vector_feedback_description_title": "Vector Tiles BASISKARTE ",
-    "vector_feedback_tryit_title": "Testen sie unsere  neue Vektorkarte !",
-    "vector_feedback_description_text": "Die Karte besteht aus <b>vector tiles</b> anstelle von Rasterkacheln. Sie wird direkt von nur einmal bezogenen Daten in Ihrem Browser gezeichnet. Die Karte erscheint schneller auf dem Bildschirm und Sie können das Erscheinungsbild leicht anpassen. Um das Design und Laden der Karte noch einfacher zu gestalten, sind die Datenebenen übersichtlicher organisiert. Mit einigen wenigen Ebenen können Sie jetzt schnell und einfach Ihre eigene Karte erstellen! <b>Probieren Sie es aus! </b><b style=\"color: #ff6961;\">TEST Viewer optimiert für aktuelle Browser. </b>",
-    "vector_feedback_choose_style": "Darstellung ändern",
-    "vector_feedback_select_style": "Stil wechseln",
-    "vector_feedback_choose_layer": "Ebene auswählen",
     "vector_feedback_choose_color": "Farbe auswählen",
-    "vector_feedback_labels_on_off": "Beschriftungen an/aus",
-    "vector_feedback_getting_started_title": "Für Entwickler ",
+    "vector_feedback_choose_layer": "Ebene auswählen",
+    "vector_feedback_choose_style": "Darstellung ändern",
     "vector_feedback_create_your_own": "Eigene Hintergrundkarte erstellen",
+    "vector_feedback_description_text": "Die Karte besteht aus <b>vector tiles</b> anstelle von Rasterkacheln. Sie wird direkt von nur einmal bezogenen Daten in Ihrem Browser gezeichnet. Die Karte erscheint schneller auf dem Bildschirm und Sie können das Erscheinungsbild leicht anpassen. Um das Design und Laden der Karte noch einfacher zu gestalten, sind die Datenebenen übersichtlicher organisiert. Mit einigen wenigen Ebenen können Sie jetzt schnell und einfach Ihre eigene Karte erstellen! <b>Probieren Sie es aus! </b><b style=\"color: #ff6961;\">TEST Viewer optimiert für aktuelle Browser. </b>",
+    "vector_feedback_description_title": "Vector Tiles BASISKARTE ",
     "vector_feedback_edit_map": "Karte bearbeiten",
     "vector_feedback_getting_started_1": "In unserer ",
     "vector_feedback_getting_started_2": "Dienste Dokumentation ",
     "vector_feedback_getting_started_3": "finden Sie Informationen darüber, wie Sie Vector Tiles in Ihren eigenen Anwendungen einsetzen können.",
-    "vector_feedback_survey_title": "Ihr Feedback ist wichtig. (1 Minute)",
-    "vector_feedback_survey_btn_text": "Umfrage",
-    "vector_feedback_survey_modal_title": "Umfrage",
-    "vector_feedback_style_default": "Standard",
+    "vector_feedback_getting_started_title": "Für Entwickler ",
+    "vector_feedback_labels_on_off": "Beschriftungen an/aus",
+    "vector_feedback_select_style": "Stil wechseln",
     "vector_feedback_style_color": "A",
+    "vector_feedback_style_default": "Standard",
     "vector_feedback_style_grey": "B",
     "vector_feedback_style_lsd": "C",
+    "vector_feedback_survey_btn_text": "Umfrage",
+    "vector_feedback_survey_modal_title": "Umfrage",
+    "vector_feedback_survey_title": "Ihr Feedback ist wichtig. (1 Minute)",
+    "vector_feedback_tryit_title": "Testen sie unsere  neue Vektorkarte !",
     "verteidigung": "Verteidigung",
     "verteidigung_service_link_href": "http://www.vtg.admin.ch/de/armee.html",
     "verteidigung_service_link_label": "www.vtg.admin.ch",
+    "very_small_size": "Sehr klein",
     "view_on_mapgeoadminch": "In {{url}} ansehen",
+    "view_on_mapgeoadminch_webmapviewer": "In {url} ansehen",
     "void_layer": "kein Hintergrund",
     "vu": "Verkehrsunfälle",
     "vu_service_link_href": "http://www.unfalldaten.ch ",
     "vu_service_link_label": "ASTRA - Unfalldaten",
     "wait_data_loading": "Laden...",
+    "warning": "Warnung",
+    "webmapviewer_live_disclaimer": "Der Kartenviewer wird bald aktualisiert - <a target='_blank' href='https://www.geo.admin.ch/de/go-live-kartenviewer'>mach dich startklar</a>",
     "west": "West",
     "whatsapp_tooltip": "Teilen Sie diese Karte mit Ihren Freunden auf Whatsapp",
     "white": "Weiss",
@@ -567,127 +693,8 @@
     "wms": "WMS",
     "wms_max_size_allowed": "Maximal erlaubte WMS Grösse",
     "wmsimport_tooltip": "Importieren Sie externe WMS Datenquellen",
+    "woodland": "Wald",
     "yellow": "Gelb",
     "zoom_in": "Vergrössere Kartenausschnitt",
-    "zoom_out": "Verkleinere Kartenausschnitt",
-    "edit_glstyle_choose_color": "Farbe auswählen",
-    "edit_glstyle_choose_layer": "Ebene auswählen",
-    "landuse-residential": "Landuse residential",
-    "landcover_grass": "Landcover grass",
-    "edit_not_possible": "Leider können Sie diese Ebene nicht bearbeiten. Bitte wählen Sie einen anderen Hintergrund aus",
-    "edit_current_layer": "Bearbeitung des Datensatz ",
-    "edit_fill_color": "Farbe auswählen",
-    "edit_text_color": "Textfarbe auswählen",
-    "edit_text_size": "Textgrösse auswählen",
-    "edit_text_halo_color": "Farbe Schatten  auswählen",
-    "show": "Anzeigen",
-    "hide": "Deaktivieren",
-    "displayed": "Angezeigt",
-    "hidden": "Versteckt",
-    "edit_fill_outline_color": "Randfarbe auswählen",
-    "edit_line_color": "Linienfarbe auswählen",
-    "edit_line_width": "Liniendicke auswählen",
-    "light_gray": "hellgrau",
-    "light_green": "hellgrün",
-    "light_blue": "hellblau",
-    "light_yellow": "hellgelb",
-    "purple": "lila",
-    "edit_or_reset_style": "Diese Ebene verwendet einen Stil von Drittanbietern. Sie können diesen nicht ändern, aber Sie können den Standardstil verwenden, indem Sie auf diese Schaltfläche klicken.",
-    "basis": "Basiskarte light",
-    "labels": "Labels",
-    "roadtraffic": "Strassen",
-    "hydrology": "Hydrologie",
-    "landuse": "Grünflächen",
-    "settlement": "Siedlungsgebiet",
-    "territory": "Gelände",
-    "woodland": "Wald",
-    "edit_visibility": "Darstellung",
-    "current_value": "Aktueller Wert",
-    "mvt_ie11_alert": "Sie verwenden InternetExplorer ≤ 11:  Bitte nutzen Sie die neueste Version von Microsoft EDGE, Firefox oder Chrome, um optimale Ergebnisse zu erhalten",
-    "try_test_viewer": "Probieren Sie test.map.geo.admin.ch aus",
-    "obstacle_started_last_4_days": "Aktivierte Hindernisse letzte 4 Tage",
-    "obstacle_deleted_last_4_days": "Gelöschte Hindernisse der letzten 4 Tage",
-    "draw_button_delete_last_point": "Letzten Punkt löschen",
-    "elevation_href": "https://www.swisstopo.admin.ch/de/schweizerische-bezugssysteme",
-    "copy_cta": "Kopieren",
-    "copy_done": "Kopiert!",
-    "test_map_give_feedback": "Feedback geben",
-    "legacy_drawing_warning": "Es ist nicht möglich, eine von map.geo.admin.ch erstellte Zeichnung auf der Website test.map.geo.admin.ch zu bearbeiten. Wenn Sie eine neue Zeichnung erstellen möchten, müssen Sie entweder die aktuelle Zeichnung entfernen oder die Auswahl aufheben.",
-    "draw_file_load_error": "Laden des KML fehlgeschlagen",
-    "draw_file_save_error": "Speichern des KML fehlgeschlagen",
-    "very_small_size": "Sehr klein",
-    "feedback_rating_text": "Teilen Sie uns mit, wie Sie sich mit unserem Kartenviewer fühlen",
-    "feedback_rating_title": "Wie würden Sie Ihre Erfahrung bewerten ? (erforderlich)",
-    "send_failed": "Senden fehlgeschlagen",
-    "feedback_email": "Ihre E-Mail Adresse (optional)",
-    "feedback_invalid_email": "ungültige E-Mail",
-    "profile_no_data": "kein Datum",
-    "view_on_mapgeoadminch_webmapviewer": "In {url} ansehen",
-    "full_width": "Vollständige Breite",
-    "georessourcen": "Georessourcen",
-    "georessourcen_service_link_label": "Weitere Informationen",
-    "georessourcen_service_link_href": "https://www.swisstopo.admin.ch/de/wissen-fakten/geologie/georessourcen.html",
-    "topic_georessourcen_tooltip": "Georessourcen",
-    "ch.swisstopo.swissimage": "Luftbilder",
-    "ch.swisstopo.pixelkarte-grau": "Karte SW",
-    "ch.swisstopo.pixelkarte-farbe": "Karte farbig",
-    "ch.swisstopo.swissimage_3d": "Luftbild",
-    "ch.swisstopo.swisstlm3d-karte-grau_3d": "Karte SW",
-    "ch.swisstopo.swisstlm3d-karte-farbe_3d": "Karte farbig",
-    "loading_external_layer": "Laden der externen Layer",
-    "import_file": "Datei importieren",
-    "import_file_tooltip": "Importieren eine externe KML- oder GPX-Datei",
-    "import_file_succeeded": "Erfolg",
-    "invalid_file": "Datei ungültig",
-    "no_url": "Kein URL",
-    "loading_error_network_failure": "Laden fehlgeschlagen, auf die Datei kann nicht zugegriffen werden",
-    "loading_file": "Laden...",
-    "invalid_kml_gpx_file_error": "Ungültige Datei, nur KML- oder GPX-Dateien werden unterstützt",
-    "import_maps": "Karten importieren",
-    "import_maps_tooltip": "Importieren Sie externe WMTS- oder WMS-Datenquellen",
-    "unsupported_content_type": "Nicht unterstützter Antwortinhaltstyp",
-    "invalid_wms_capabilities": "Ungültige WMS-Capabilities-Daten",
-    "invalid_wmts_capabilities": "Ungültige WMTS-Capabilities-Daten",
-    "network_error": "Netzwerkfehler",
-    "no_layer_found": "Keine Layer gefunden",
-    "import_maps_url_placeholder": "WMTS WMS URL",
-    "import_file_url_placeholder": "GPX KML URL",
-    "no_result": "Kein Ergebnis",
-    "loading": "Laden",
-    "search_in_catalogue_placeholder": "Suche in importierten Karten",
-    "kml_gpx_file_out_of_bounds": "Der Dateiinhalt liegt ausserhalb der Projektionsgrenzen",
-    "kml_gpx_file_empty": "Die KML/GPX-Datei ist leer",
-    "large_size": "Gross",
-    "extra_large_size": "Extra Gross",
-    "duplicate_layer": "Karte duplizieren",
-    "feedback_empty_warning": "Die Berichtsnachricht darf nicht leer sein",
-    "operation_successful": "Erfolg!",
-    "operation_failed": "Hoppla! Etwas ist schiefgegangen. Bitte versuchen Sie es erneut.",
-    "operation_aborted": "Operation abgebrochen",
-    "outside_valid_year_range": "Das eingegebene Jahr liegt ausserhalb des verfügbaren Bereichs:",
-    "linkedin_tooltip": "Teilen Sie diese Karte auf LinkedIn",
-    "share_map_title": "Link zum Geoportal der Schweizerischen Eidgenossenschaft",
-    "link_description": "Link Beschreibung (optional)",
-    "media_disclaimer": "Enthält Inhalte von Drittanbietern",
-    "drawing_attached": "Zeichnung als Anhang hinzugefügt",
-    "switch_tooltip_attached_to_feature": "Tooltip an Geometrie anhängen",
-    "switch_tooltip_floating": "Einen schwebenden Tooltip verwenden",
-    "field_required": "Dieses Feld ist erforderlich",
-    "invalid_email": "ungültige E-Mail",
-    "no_email": "Das E-Mail-Feld ist erforderlich",
-    "file_unsupported_format": "Dieses Dateiformat wird nicht unterstützt. Nur die folgenden Formate sind erlaubt: {allowedFormats}",
-    "form_invalid": "Das Formular ist ungültig",
-    "file_imported_success": "Datei erfolgreich importiert",
-    "3d_labels": "Geografische Namen",
-    "3d_vegetation": "Vegetation",
-    "3d_constructions": "Gebäude und Konstruktionen",
-    "webmapviewer_live_disclaimer": "Der Kartenviewer wird bald aktualisiert - <a target='_blank' href='https://www.geo.admin.ch/de/go-live-kartenviewer'>mach dich startklar</a>",
-    "drawing_too_large": "Ihre Zeichnung ist zu gross, entfernen Sie einige Details.",
-    "3d_unsupported_projection": "Dieser Datensatz (externe Quelle) kann wegen fehlender Unterstützung der Projektion EPSG:4326 nicht in 3D dargestellt werden",
-    "geoloc_out_of_bounds": "Ihre aktuelle Position liegt ausserhalb der Schweiz und kann deshalb nicht angezeigt werden",
-    "orient_map_north": "Karte einnorden",
-    "kml_icon_url_cors_issue": "Die KML-Datei „{layerName}“ enthält Symbol(e) mit der URL {url}, die keine CORS-Unterstützung bietet! Bitte wenden Sie sich an den Administrator dieser URL, um die Unterstützung für CORS hinzuzufügen.",
-    "warning": "Warnung",
-    "legal_notice": "Impressum",
-    "legal_notice_url": "https://www.geo.admin.ch/de/impressum-verantwortlichkeiten-und-kontakte"
+    "zoom_out": "Verkleinere Kartenausschnitt"
 }
diff --git a/src/modules/i18n/locales/en.json b/src/modules/i18n/locales/en.json
index 8352db3f2..28ea3e06d 100644
--- a/src/modules/i18n/locales/en.json
+++ b/src/modules/i18n/locales/en.json
@@ -1,10 +1,16 @@
 {
+    "3d_constructions": "Buildings and constructions",
     "3d_ie11_alert": "You are using InternetExplorer <= 11 : 3D rendering will be slow. Please use latest Version of Microsoft EDGE, Firefox or Chrome to experience maximum performance",
+    "3d_labels": "Geographic names",
     "3d_overlay_warning": "Important note: 3D data not updated / 2D data in 3D<br/>Since Oct. 2020, 3D data (Terrain, Buildings and other 3D objects) are no longer updated in this viewer. More actual source data is available for download. Some 2D data are not suitable for 3D viewing. This applies to maps and aerial photographs. They appear distorted in steep terrain when used in 3D.\n",
     "3d_pegman_help": "Press to F to fly. <br> Press H for more help.<br>Press ESC to exit.",
     "3d_pegman_tooltip": "Drag me onto the map!",
     "3d_render_error": "Requirements for 3D not met. To use the 3D mode your computer needs:Latest Version of Microsoft EDGE, Firefox or Chrome and up-to-date video card hardware and drivers.",
+    "3d_unsupported_projection": "This map provided by external source can't be displayed in 3d because it doesn't support the projection EPSG:4326",
+    "3d_vegetation": "Vegetation",
+    "Alle": "Error clearing  saved maps. Please try again.",
     "abort": "Abort",
+    "about_us": "About us",
     "add": "Add",
     "add_image": "Add a photo",
     "add_layer": "Add Layer",
@@ -16,10 +22,9 @@
     "add_wmts_layer_failed": "Error when loading WMTS layer",
     "add_wmts_layer_succeeded": "WMTS layer successfully loaded",
     "alert_title": "Alert!",
-    "Alle": "Error clearing  saved maps. Please try again.",
-    "appcache_update_available": "A new version of offline function is available. Load it?",
     "app_feedback_button_text": "Feedback",
     "app_feedback_button_title": "Provide feedback on the application",
+    "appcache_update_available": "A new version of offline function is available. Load it?",
     "approx_abbr": "approx.",
     "are": "ARE",
     "are_service_link_href": "http://www.are.admin.ch/index.html?lang=en",
@@ -37,10 +42,10 @@
     "bafu": "FOEN",
     "bafu_service_link_href": "https://www.bafu.admin.ch/bafu/en/home.html ",
     "bafu_service_link_label": "www.bafu.admin.ch",
+    "basis": "Basemap light",
     "bav": "FOT",
     "bav_service_link_href": "https://www.bav.admin.ch/bav/en/home.html",
     "bav_service_link_label": "Federal Office of Transport\n",
-    "topic_bav_tooltip": "Federal Office of Transport\n",
     "bfs": "FSO",
     "bfs_service_link_href": "https://www.bfs.admin.ch/bfs/en/home.html",
     "bfs_service_link_label": "Federal Statistical Office\n",
@@ -62,13 +67,19 @@
     "cancel": "Cancel",
     "canton": "Canton",
     "catalog": "Catalog",
+    "ch.swisstopo.pixelkarte-farbe": "Color map",
+    "ch.swisstopo.pixelkarte-grau": "Grey map",
+    "ch.swisstopo.swissimage": "Aerial imagery",
+    "ch.swisstopo.swissimage_3d": "Aerial imagery",
+    "ch.swisstopo.swisstlm3d-karte-farbe_3d": "Color map",
+    "ch.swisstopo.swisstlm3d-karte-grau_3d": "Grey map",
     "change_topic": "Topic",
     "choose_theme": "Change topic",
     "choose_wms_url": "URL",
     "close": "Close",
     "close_menu": "Close menu",
-    "cms_link_button_url": "https://www.geo.admin.ch/en/map-viewer/map-viewer.html",
     "cms_link_button_title": "More infomations",
+    "cms_link_button_url": "https://www.geo.admin.ch/en/map-viewer/map-viewer.html",
     "commune": "City",
     "compare": "Compare",
     "confirm_remove_all_features": "Do you really want to delete all features?",
@@ -78,12 +89,15 @@
     "contextpopup_lv03_url": "https://www.swisstopo.admin.ch/en/national-triangulation-network-lv03",
     "contextpopup_lv95_url": "https://www.swisstopo.admin.ch/en/the-swiss-coordinates-system",
     "coordinates_label": "Coordinates (m)",
+    "copy_cta": "Copy",
+    "copy_done": "Copied!",
     "copy_success": "Link copied!",
     "copy_url": "Copy the link",
     "copyright_data": "© Data:",
     "copyright_label": "Terms of Use",
     "copyright_url": "https://www.geo.admin.ch/en/general-terms-of-use-fsdi/",
     "ct": "Ct.",
+    "current_value": "Current value",
     "custom_size": "Custom size",
     "data": "Data:",
     "delete": "Delete",
@@ -91,11 +105,13 @@
     "description_instructions": "Description of the WMS layer",
     "desktop_redirect": "Link to desktop version",
     "display_profile": "Display profile",
+    "displayed": "Displayed",
     "distance_label": "Distance",
     "district": "District",
     "draw": "Draw",
     "draw_annotation": "Text",
     "draw_back": "Back / Finish drawing",
+    "draw_button_delete_last_point": "Delete the last point",
     "draw_del_all_features": "Delete all features",
     "draw_del_selected_features": "Delete selected features",
     "draw_delete": "Delete",
@@ -104,6 +120,8 @@
     "draw_delete_selected_features": "Delete selected features",
     "draw_dl_kml": "Download as KML",
     "draw_export": "Export",
+    "draw_file_load_error": "Loading of the KML file failed",
+    "draw_file_save_error": "Saving of the KML  file failed",
     "draw_file_saved": "All changes have been saved.",
     "draw_file_saving": "Saving ...",
     "draw_layer_label": "Drawing",
@@ -151,22 +169,38 @@
     "draw_text_placeholder": "no title",
     "draw_tooltip": "Draw on the map",
     "draw_type_marker": "Line / surface",
+    "drawing_attached": "Drawing added as attachment",
+    "drawing_too_large": "Your drawing is too large, remove some features",
     "drop_invalid_url": "URL is not valid.",
     "drop_me_here": "Drop KML file here",
+    "duplicate_layer": "Duplicate map",
     "east": "East",
     "ech": "Geocatalog",
     "ech_service_link_href": "https://www.geo.admin.ch/en/home.html",
     "ech_service_link_label": "geo.admin.ch",
     "edit_back": "Back / Finish edition",
+    "edit_confirm_reset_style": "This action wil remove all your changes and apply the default style of the layer. ",
+    "edit_current_layer": "Modifying the layer ",
+    "edit_file_saved": "Map saved.",
+    "edit_file_saving": "Saving ...",
+    "edit_fill_color": "Choose a color",
+    "edit_fill_outline_color": "Choose a border color",
+    "edit_glstyle_choose_color": "Choose a color",
+    "edit_glstyle_choose_layer": "Choose a layer",
+    "edit_line_color": "Choose a line color",
+    "edit_line_width": "Choose a line width",
     "edit_mode_title": "Edition",
+    "edit_not_possible": "Sorry you can't edit this layer. Please choose a different layer from the background selctor",
+    "edit_or_reset_style": "This layer uses a third party style. You can 't modify it, but you can use the default style clicking this button",
     "edit_panel_title": "Style the map",
     "edit_reset": "Reset",
     "edit_share_file_disclaimer": "Your style is automatically saved for one year. By using this service, you agree to the <a href='https://www.geo.admin.ch/en/general-terms-of-use-fsdi/' target='_blank'> terms of use</a>.",
-    "open_edit_bt_title": "Open style edition",
-    "edit_file_saved": "Map saved.",
-    "edit_file_saving": "Saving ...",
-    "edit_confirm_reset_style": "This action wil remove all your changes and apply the default style of the layer. ",
+    "edit_text_color": "Choose a  text color",
+    "edit_text_halo_color": "Choose a shadow color",
+    "edit_text_size": "Choose a text size",
+    "edit_visibility": "Display",
     "elevation": "Elevation",
+    "elevation_href": "https://www.swisstopo.admin.ch/en/swiss-reference-systems",
     "email_us": "Email",
     "emapis": "Rural development",
     "emapis_service_link_href": "mailto:info@blw.admin.ch",
@@ -181,6 +215,7 @@
     "export_kml_notsupported": "Your browser does not support the save function. Use IE10, Firefox or Chrome.",
     "external_data_tooltip": "Dataset and/or style provided by third party",
     "external_data_warning": "Warning: Third party data and/or style shown (--URL--). Availability is ensured by the third party data provider. The terms and conditions of the third party data owner do apply and have to be respected.",
+    "extra_large_size": "Extra Large",
     "facebook_tooltip": "Share this map with your friends",
     "feature": "Object",
     "featuresearch_results_header": "Go to the object ...",
@@ -190,18 +225,28 @@
     "feedback_description": "1. Report in this field changes in the map, improvements to the data or questions about this website (required) :",
     "feedback_disclaimer": "By submitting your message, you agree to the <a href='https://www.geo.admin.ch/en/general-terms-of-use-fsdi#feedback' target='_blank'>terms of use</a>.",
     "feedback_drawing": "2. Indicate the appropriate location on the map :",
+    "feedback_email": "Your Email (optional)",
+    "feedback_empty_warning": "Report message can not be empty",
     "feedback_error_message": "Problem: Your message could not be sent",
+    "feedback_invalid_email": "Invalid email",
     "feedback_kml_attached": "The current drawing will be transferred. ",
     "feedback_mail": "3. Your Email :",
     "feedback_modify_drawing": "Modify drawing",
     "feedback_permalink": "The following URL will be transferred: ",
     "feedback_placeholder": "Attach a pdf, zip, jpg, jpeg, kml, kmz or gpx file",
+    "feedback_rating_text": "Tell us what you think about our new map viewer",
+    "feedback_rating_title": "How would you rate your experience ? (required)",
     "feedback_success_message": "Your message was successfully sent. Thank you.",
     "feedback_unsupported_format": "This file format is not supported. Thanks for using another format for you attachment.",
+    "field_required": "This field is required",
+    "file_imported_success": "File successfully imported",
     "file_is_not_kml": "The file is not a KML file.",
     "file_too_large": "The file is too large (max size allowed {maxFileSize}).",
+    "file_unsupported_format": "This file format is not supported.  Only the following formats are allowed: {allowedFormats}",
     "follow_us": "Follow us",
+    "form_invalid": "The form is invalid",
     "full_screen": "Full screen",
+    "full_width": "Full width",
     "funksender": "Radio transmitter",
     "funksender_service_link_href": "mailto:info@bakom.admin.ch",
     "funksender_service_link_label": "info@bakom.admin.ch",
@@ -211,6 +256,7 @@
     "geol": "Geology",
     "geol_service_link_href": "http://www.geologieportal.ch/internet/geologieportal/en/home.html",
     "geol_service_link_label": "www.geologieportal.ch",
+    "geoloc_out_of_bounds": "Your current location is outside of Switzerland and cannot be shown",
     "geoloc_permission_denied": "The acquisition of the position failed because your browser settings does not allow it. Allow your browser / this website to use your location. Deactivate the \"private\" mode of your browser.",
     "geoloc_pos_unavailable": "The acquisition of the geolocation failed because at least one internal source of your device of position (Wifi, GPS) returned an internal error.",
     "geoloc_start_tracking": "Start tracking your position",
@@ -218,8 +264,10 @@
     "geoloc_stop_tracking": "Stop tracking your position",
     "geoloc_time_out": "The time allowed to acquire the geolocation was reached before the information was obtained.Try later.",
     "geoloc_unknown": "Sorry, for an unknown reason the geolocation service doesn't work. Check your device location, privacy and firewalls settings",
-    "re_center_map": "Center map on position",
     "geolocation": "Geolocation",
+    "georessourcen": "Georesources",
+    "georessourcen_service_link_href": "https://www.swisstopo.admin.ch/en/knowledge-facts/geology/geo-resources.html",
+    "georessourcen_service_link_label": "More information",
     "geothermie": "Geoth. energy",
     "geothermie_service_link_href": "http://www.geologieportal.ch/internet/geologieportal/en/home/topics/energy/geothermalenergy/shortdesc.html",
     "geothermie_service_link_label": "More information",
@@ -236,11 +284,21 @@
     "help_search_data": "Under 'Search' you can enter search terms (keywords such as marsh, road, commune, earthquake) in order to search through all centrally available digital geodata. When you select one of the results offered, it will be displayed on the map viewer, as a separate data layer",
     "help_search_data_link": "Looking for more maps?",
     "help_search_data_title": "Search for maps",
+    "hidden": "Hidden",
+    "hide": "Disable",
     "hide_profile": "Hide profile",
     "homescreen_content": "We recommand to use this function in order to place this application on your homescreen.",
     "homescreen_title": "Homescreen",
+    "hydrology": "Hydrology",
     "import": "Import",
+    "import_file": "Import file",
+    "import_file_succeeded": "Success",
+    "import_file_tooltip": "Import an external KML or GPX file",
+    "import_file_url_placeholder": "GPX KML URL",
     "import_kml": "KML import",
+    "import_maps": "Import maps",
+    "import_maps_tooltip": "Import external WMTS WMS sources",
+    "import_maps_url_placeholder": "WMTS WMS URL",
     "import_online_placeholder": "WMTS WMS GPX KML URL",
     "import_tooltip": "Import external WMTS WMS GPX KML sources",
     "import_wms": "WMS import",
@@ -248,13 +306,17 @@
     "inspire": "INSPIRE",
     "inspire_service_link_href": "https://www.geo.admin.ch/en/home.html",
     "inspire_service_link_label": "geo.admin.ch",
+    "invalid_email": "Invalid email",
+    "invalid_file": "Invalid file",
+    "invalid_kml_gpx_file_error": "Invalid file, only KML or GPX file are supported",
     "invalid_url": "URL is not valid.",
-    "item": "Go to the object ...",
-    "items": "Objects",
+    "invalid_wms_capabilities": "Invalid WMS Capabilities",
+    "invalid_wmts_capabilities": "Invalid WMTS Capabilities",
     "isos": "ISOS Heritage sites",
     "isos_service_link_href": "https://www.bak.admin.ch/bak/en/home/baukultur/isos-und-ortsbildschutz.html",
     "isos_service_link_label": "FOC - Inventory ISOS",
-    "topic_isos_tooltip": "ISOS Heritage sites",
+    "item": "Go to the object ...",
+    "items": "Objects",
     "ivs": "IHR Inventory",
     "ivs_service_link_href": "http://www.ivs.admin.ch/",
     "ivs_service_link_label": "www.ivs.admin.ch",
@@ -262,9 +324,19 @@
     "kgs_service_link_href": "http://www.babs.admin.ch/de/aufgabenbabs/kgs/inventar.html",
     "kgs_service_link_label": "Protection of Cultural Property",
     "kml": "KML",
+    "kml_gpx_file_empty": "KML/GPX file is empty",
+    "kml_gpx_file_out_of_bounds": "File content is out of projection bounds",
+    "kml_icon_url_cors_issue": "The KML \"{layerName}\" contains icon(s) with URL {url} that doesn't support CORS! Please contact the administrator of this URL to add support for CORS.",
     "kml_no_text_elements": "Information: The labels won't be saved",
+    "kml_style_default": "default",
+    "kml_style_geoadmin": "GeoAdmin",
     "kmlimport_tooltip": "Import external KML data sources",
+    "labels": "Labels",
+    "landcover_grass": "Landcover grass",
+    "landuse": "grassed area",
+    "landuse-residential": "Landuse residential",
     "lang_chooser_label": "Language",
+    "large_size": "Large",
     "last_available_year": "Last year",
     "layer_cant_be_displayed_in_3d": "The following layers provided by external sources can't be displayed in 3d because they doesn't support the projection EPSG:4326 :",
     "layer_cant_be_printed": "The following layers provided by external sources can't be printed  they doesn't support the projection EPSG:2056 :",
@@ -274,10 +346,23 @@
     "layer_selection": "Selection",
     "layers_displayed": "Maps displayed",
     "layers_results_header": "Add map ...",
+    "legacy_drawing_warning": "It is not possible to edit drawing created by map.geo.admin.ch on the test.map.geo.admin.ch website. If you want to create a new drawing, either remove the current drawing or deselect it.",
+    "legal_notice": "Legal Notice",
+    "legal_notice_url": "https://www.geo.admin.ch/en/impressum-responsibilities-and-contacts",
     "legend": "Legend",
+    "light_blue": "light blue",
+    "light_gray": "light gray",
+    "light_green": "light green",
+    "light_yellow": "light yellow",
     "link_bowl_crosshair": "Share Position",
+    "link_description": "Link description (optional)",
     "link_validate_kml": "Link to KML validation",
+    "linkedin_tooltip": "Share this map on LinkedIn",
     "load_local_file": "Load",
+    "loading": "Loading",
+    "loading_error_network_failure": "Failed to load, file not accessible",
+    "loading_external_layer": "Loading external layer",
+    "loading_file": "Loading file...",
     "locations": "Go to ...",
     "locations_results_header": "Go to ...",
     "locations_results_header_fuzzy": "Did you mean...",
@@ -293,6 +378,7 @@
     "measure": "Measure",
     "measure_instruction": "Digitize a polyline...",
     "measure_tooltip": "Measure on the map",
+    "media_disclaimer": "Contains third party content",
     "medium_size": "Medium",
     "menu": "Menu",
     "metadata_window_title": "Infobox",
@@ -306,9 +392,12 @@
     "modify_existing_vertex_linepolygon": "Click to delete the point (2 points min.)<br/>Click then drag to move the point",
     "modify_existing_vertex_marker": "Click then drag to move the marker",
     "modify_existing_vertex_measure": "Click to delete the point (2 points min.)<br/>Click then drag to move the point",
-    "modify_icon_category_label": "symbols",
-    "modify_icon_category_default_label": "default",
+    "modify_icon_category_babs-D_label": "Civil symbols D",
+    "modify_icon_category_babs-F_label": "Civil symbols F",
+    "modify_icon_category_babs-I_label": "Civil symbols I",
     "modify_icon_category_babs_label": "Civil symbols",
+    "modify_icon_category_default_label": "default",
+    "modify_icon_category_label": "symbols",
     "modify_icon_label": "symbols",
     "modify_icon_size_label": "Size",
     "modify_new_vertex_linepolygon": "Click to add a point<br/>Click then drag to move the point",
@@ -318,15 +407,21 @@
     "modify_text_size_label": "Size",
     "more_info": "More info ...",
     "movie": "Time serie (Mutliple PDF)",
+    "mvt_ie11_alert": "You are using InternetExplorer ≤ 11 : Please use latest Version of Microsoft EDGE, Firefox or Chrome to experience maximum performance",
+    "network_error": "Network error",
     "never_show_again": "Don't show this message again.",
     "nga": "Broadband map",
     "nga_service_link_href": "https://www.bakom.admin.ch/bakom/en/homepage.html",
     "nga_service_link_label": "www.bakom.admin.ch",
+    "no_email": "The e-mail field is required",
     "no_feature_results": "No objects found",
     "no_file": "No file",
+    "no_layer_found": "No layer found",
     "no_layers_info": "No layer in the map",
     "no_more_information": "No further information",
+    "no_result": "No result",
     "no_searchable_layer": "No searchable layer",
+    "no_url": "No URL",
     "north": "North",
     "not_available": "Not available",
     "not_available_3d": "Not available in 3D!",
@@ -336,7 +431,9 @@
     "notruf_service_link_label": "geo.admin.ch",
     "object_information": "Object information",
     "obstacle_deleted_last_2_weeks": "Deleted obstacles of last 2 weeks",
+    "obstacle_deleted_last_4_days": "Deleted obstacles of last 4 days",
     "obstacle_started_last_2_weeks": "Activated obstacles of last 2 weeks",
+    "obstacle_started_last_4_days": "Activated obstacles of last 4 days",
     "offline_abort": "Abort",
     "offline_abort_warning": "Do you really want to delete all maps?",
     "offline_bad_layer_type": "A layer has an invalid type. It can't be saved for an offline use. ",
@@ -357,9 +454,15 @@
     "offline_sorry": "You are currently offline.",
     "offline_space_warning": "Not enough space left on device, please free at least 50 MB on your device or try to select less layers (we recommend one or 2 layers).",
     "offline_zoom_extent": "Zoom to extent",
+    "open_edit_bt_title": "Open style edition",
     "open_menu": "Open menu",
+    "operation_aborted": "Operation aborted",
     "operation_canceled": "Operation canceled",
+    "operation_failed": "Oops! Something went wrong. Please try again.",
+    "operation_successful": "Operation successful!",
     "orange": "orange",
+    "orient_map_north": "Orient the map",
+    "outside_valid_year_range": "The entered year is outside of the available range:",
     "page_description": "map.geo.admin.ch is the mapping platform of the Swiss Confederation. Access federal geographical information, maps, data, services and metadata of Switzerland.",
     "page_title": "Maps of Switzerland - Swiss Confederation  - map.geo.admin.ch",
     "parcel": "Parcel",
@@ -383,6 +486,7 @@
     "profile_elevation_down": "Descent",
     "profile_elevation_up": "Ascent",
     "profile_hike_time": "Walking time",
+    "profile_no_data": "No data",
     "profile_poi_down": "Lowest point",
     "profile_poi_up": "Highest point",
     "profile_slope_distance": "Path distance",
@@ -390,6 +494,7 @@
     "profile_too_many_points_error": "The profile request was too big and could not be processed.",
     "profile_x_label": "Distance",
     "profile_y_label": "Elevation",
+    "purple": "purple",
     "qrcode_tooltip": "Create a QRCode and open this map on your mobile device",
     "queries": "Filters (BETA)",
     "query_alert_more_than_200_results": "Your query returns more than 200 results!",
@@ -405,6 +510,7 @@
     "query_reset": "Reset condition",
     "query_search": "Search",
     "query_with_bbox": "Use the map's bounding box",
+    "re_center_map": "Center map on position",
     "read_failed": "Reading error!",
     "read_succeeded": "Loading OK!",
     "reading_file": "Loading file...",
@@ -413,6 +519,7 @@
     "reduce_label": "Minimize",
     "remove": "Remove",
     "revision_service": "revision service of swisstopo",
+    "roadtraffic": "Roads",
     "rotate_left": "Rotate left",
     "rotate_reset": "Reset rotation to north",
     "rotate_right": "Rotate right",
@@ -423,10 +530,10 @@
     "schneesport_service_link_href": "https://shop.swisstopo.admin.ch/en/products/maps/leisure/ski_tour_maps",
     "schneesport_service_link_label": "Snowsport",
     "schule": "For schools",
-    "topic_schule_tooltip": "For schools",
     "schule_service_link_href": "http://www.schoolmaps.ch",
     "schule_service_link_label": "www.schoolmaps.ch",
     "search_help": "Help",
+    "search_in_catalogue_placeholder": "Search in imported maps",
     "search_placeholder": "Search for addresses, parcels or maps",
     "search_title": "Search for a place or add a map:",
     "select_feature_annotation": "Click to select the text",
@@ -435,7 +542,9 @@
     "select_feature_measure": "Click to select the measure",
     "select_no_feature": "Nothing to select",
     "send": "Send",
+    "send_failed": "Sending failed",
     "settings": "Configuration",
+    "settlement": "Settlement",
     "share": "Share",
     "share_disclaimer": "You can embed the map into your website or blog. <a href='https://www.geo.admin.ch/de/web-integration-iframe/' target='_blank'>Terms of use</a>",
     "share_file_disclaimer": "Your drawing is automatically saved for one year. By using this service, you agree to the <a href='https://www.geo.admin.ch/en/general-terms-of-use-fsdi/' target='_blank'>the terms of use</a>.",
@@ -443,6 +552,7 @@
     "share_less": "Embed:",
     "share_link": "Share link",
     "share_link_tooltip": "Press Ctrl+C to copy",
+    "share_map_title": "Link to the geoportal of the Swiss Confederation",
     "share_more": "Embed ...",
     "share_preview": "Preview of the actual size ",
     "shop_cancel": "Abort",
@@ -455,6 +565,7 @@
     "shop_not_available": "The map is currently out of stock.",
     "shop_or_fill": "or fill the inputs (coordinates LV95)",
     "shop_order": "Order",
+    "show": "Enable",
     "show_more_options": "Preview",
     "show_more_results": "Load more results ...",
     "small_size": "Small",
@@ -466,27 +577,32 @@
     "swisstopo": "swisstopo",
     "swisstopo_service_link_href": "https://www.swisstopo.admin.ch/en/home.html",
     "swisstopo_service_link_label": "Federal Office of Topography swisstopo",
-    "test_host_warning": "TESTSITE – DO NOT-SHARE -  NOT FOR OPERATIONAL USE",
+    "switch_kml_style": "Switch style",
+    "switch_tooltip_attached_to_feature": "Attach tooltip to geometry",
+    "switch_tooltip_floating": "Use a floating tooltip",
+    "territory": "Territory",
     "test_host_full_disclaimer": "This site is for testing purposes only. It's not for operational use and there's no guarantee by the provider of this site.",
+    "test_host_warning": "TESTSITE – DO NOT-SHARE -  NOT FOR OPERATIONAL USE",
+    "test_map_give_feedback": "Give feedback",
     "text_to_display": "Link description",
     "third_party_data_warning": "Warning: Third party data and/or style shown. The permalink you use contains possibly reference to third party data. Would your really load these data?",
     "tile": "Sheet",
+    "tilt3d_active": "Switch to 2d",
+    "tilt3d_disabled": "Sorry, you can't use 3d with this background",
+    "tilt3d_inactive": "Switch to 3d",
     "tilt_down": "Tilt down",
     "tilt_down_disabled": "You can't tilt less",
     "tilt_reset": "Reset tilt",
     "tilt_up": "Tilt up",
     "tilt_up_disabled": "You can't tilt more",
-    "tilt3d_active": "Switch to 2d",
-    "tilt3d_disabled": "Sorry, you can't use 3d with this background",
-    "tilt3d_inactive": "Switch to 3d",
     "time_all": "All",
     "time_bt_disabled_tooltip": "The representation of data time stamps needs historized data. Please add a historized dataset in order to use this function.",
     "time_current": "Actual",
     "time_hide": "Disable representation of data time stamps.",
     "time_select_year": "Select a year",
     "time_show": "Enable representation of data time stamps.",
-    "time_slider_legend_tippy_intro": "The time slider displays different colors depending on whether the maps have data for the selected year or not.",
     "time_slider_legend_tippy_full_data": "Complete data",
+    "time_slider_legend_tippy_intro": "The time slider displays different colors depending on whether the maps have data for the selected year or not.",
     "time_slider_legend_tippy_no_data": "No data.",
     "time_slider_legend_tippy_partial_data": "Partial data",
     "title": "Title",
@@ -495,6 +611,7 @@
     "topic_astra_tooltip": "Federal roads office",
     "topic_aviation_tooltip": "Swiss aviation data",
     "topic_bafu_tooltip": "Federal Office for the Environment",
+    "topic_bav_tooltip": "Federal Office of Transport\n",
     "topic_bfs_tooltip": "Federal Statistical Office\n",
     "topic_blw_tooltip": "Federal Office for Agriculture",
     "topic_cadastre_tooltip": "Land and property",
@@ -504,9 +621,11 @@
     "topic_funksender_tooltip": "Radio transmitter",
     "topic_geodesy_tooltip": "Geodesy",
     "topic_geol_tooltip": "Geology",
+    "topic_georessourcen_tooltip": "Geo-resources",
     "topic_geothermie_tooltip": "Geothermal energy",
     "topic_gewiss_tooltip": "water related issues",
     "topic_inspire_tooltip": "INSPIRE",
+    "topic_isos_tooltip": "ISOS Heritage sites",
     "topic_ivs_tooltip": "IHR Inventory",
     "topic_kgs_tooltip": "Protection of Cultural Property",
     "topic_luftbilder_tooltip": "Aerial images",
@@ -515,48 +634,55 @@
     "topic_notruf_tooltip": "Emergency call",
     "topic_sachplan_tooltip": "Sectoral plans of the Federal Administration",
     "topic_schneesport_tooltip": "Snowsport",
+    "topic_schule_tooltip": "For schools",
     "topic_swisstopo_tooltip": "Federal Office of Topography",
     "topic_verteidigung_tooltip": "Defence",
     "topic_vu_tooltip": "Road accidents",
     "topic_wildruhezonen_tooltip": "Designated Wildlife Areas  Switzerland",
     "transparency": "Transparency",
+    "try_test_viewer": "Try out test.map.geo.admin.ch",
     "twitter_tooltip": "Tweet this map",
+    "unsupported_content_type": "Unsupported response content type",
     "upload_failed": "Upload error!",
     "upload_succeeded": "Upload OK!",
     "uploading_file": "Loading file...",
     "url_image": "Photo URL",
     "url_link": "Website URL",
     "url_video": "Video URL",
-    "vector_feedback_description_title": "Vector Tiles BASEMAP ",
-    "vector_feedback_tryit_title": "Try our new vector map !",
-    "vector_feedback_description_text": "The map is composed of <b>vector tiles</b> instead of raster tiles. It is created directly in your browser based on data which is retrieved once. The map appears faster on the screen and you can easily adjust the style. To make the styling and loading of the map even easier and faster, the data is organized in a simpler way. With just a few layers you can now quickly and easily create your own map! <b>Just try it! </b><b style=\"color: #ff6961;\">TEST Viewer optimized for latest browser version. </b>",
-    "vector_feedback_choose_style": "Change display",
-    "vector_feedback_select_style": "Switch style",
-    "vector_feedback_choose_layer": "Choose a layer",
     "vector_feedback_choose_color": "Choose a color",
-    "vector_feedback_labels_on_off": "Labels on/off",
-    "vector_feedback_getting_started_title": "For developers",
+    "vector_feedback_choose_layer": "Choose a layer",
+    "vector_feedback_choose_style": "Change display",
     "vector_feedback_create_your_own": "Create your own Basemap",
+    "vector_feedback_description_text": "The map is composed of <b>vector tiles</b> instead of raster tiles. It is created directly in your browser based on data which is retrieved once. The map appears faster on the screen and you can easily adjust the style. To make the styling and loading of the map even easier and faster, the data is organized in a simpler way. With just a few layers you can now quickly and easily create your own map! <b>Just try it! </b><b style=\"color: #ff6961;\">TEST Viewer optimized for latest browser version. </b>",
+    "vector_feedback_description_title": "Vector Tiles BASEMAP ",
     "vector_feedback_edit_map": "Edit map",
     "vector_feedback_getting_started_1": "In our ",
     "vector_feedback_getting_started_2": "service description ",
     "vector_feedback_getting_started_3": "you'll find more information on how to get started with the Vector Tiles yourself.",
-    "vector_feedback_survey_title": "Your feedback is important. (1 min.)",
-    "vector_feedback_survey_btn_text": "Survey",
-    "vector_feedback_survey_modal_title": " Survey",
-    "vector_feedback_style_default": "default",
+    "vector_feedback_getting_started_title": "For developers",
+    "vector_feedback_labels_on_off": "Labels on/off",
+    "vector_feedback_select_style": "Switch style",
     "vector_feedback_style_color": "A",
+    "vector_feedback_style_default": "default",
     "vector_feedback_style_grey": "B",
     "vector_feedback_style_lsd": "C",
+    "vector_feedback_survey_btn_text": "Survey",
+    "vector_feedback_survey_modal_title": " Survey",
+    "vector_feedback_survey_title": "Your feedback is important. (1 min.)",
+    "vector_feedback_tryit_title": "Try our new vector map !",
     "verteidigung": "Defence",
     "verteidigung_service_link_href": "http://www.vtg.admin.ch/en/armee.html",
     "verteidigung_service_link_label": "www.vtg.admin.ch",
+    "very_small_size": "Very small",
     "view_on_mapgeoadminch": "View on {{url}}",
+    "view_on_mapgeoadminch_webmapviewer": "View on {url}",
     "void_layer": "No background",
     "vu": "Road accidents",
     "vu_service_link_href": "http://www.unfalldaten.ch ",
     "vu_service_link_label": "FEDRO - Road accident data",
     "wait_data_loading": "Loading...",
+    "warning": "Warning",
+    "webmapviewer_live_disclaimer": "The new map viewer is coming soon - <a target='_blank' href='https://www.geo.admin.ch/en/go-live-map-viewer'>get ready</a>",
     "west": "West",
     "whatsapp_tooltip": "Share this map with your friends on Whatsapp",
     "white": "white",
@@ -567,127 +693,8 @@
     "wms": "WMS",
     "wms_max_size_allowed": "WMS max size allowed",
     "wmsimport_tooltip": "Import external WMS data sources",
+    "woodland": "Forest",
     "yellow": "yellow",
     "zoom_in": "Zoom in",
-    "zoom_out": "Zoom out",
-    "edit_glstyle_choose_color": "Choose a color",
-    "edit_glstyle_choose_layer": "Choose a layer",
-    "landuse-residential": "Landuse residential",
-    "landcover_grass": "Landcover grass",
-    "edit_not_possible": "Sorry you can't edit this layer. Please choose a different layer from the background selctor",
-    "edit_current_layer": "Modifying the layer ",
-    "edit_fill_color": "Choose a color",
-    "edit_text_color": "Choose a  text color",
-    "edit_text_size": "Choose a text size",
-    "edit_text_halo_color": "Choose a shadow color",
-    "show": "Enable",
-    "hide": "Disable",
-    "displayed": "Displayed",
-    "hidden": "Hidden",
-    "edit_fill_outline_color": "Choose a border color",
-    "edit_line_color": "Choose a line color",
-    "edit_line_width": "Choose a line width",
-    "light_gray": "light gray",
-    "light_green": "light green",
-    "light_blue": "light blue",
-    "light_yellow": "light yellow",
-    "purple": "purple",
-    "edit_or_reset_style": "This layer uses a third party style. You can 't modify it, but you can use the default style clicking this button",
-    "basis": "Basemap light",
-    "labels": "Labels",
-    "roadtraffic": "Roads",
-    "hydrology": "Hydrology",
-    "landuse": "grassed area",
-    "settlement": "Settlement",
-    "territory": "Territory",
-    "woodland": "Forest",
-    "edit_visibility": "Display",
-    "current_value": "Current value",
-    "mvt_ie11_alert": "You are using InternetExplorer ≤ 11 : Please use latest Version of Microsoft EDGE, Firefox or Chrome to experience maximum performance",
-    "try_test_viewer": "Try out test.map.geo.admin.ch",
-    "obstacle_started_last_4_days": "Activated obstacles of last 4 days",
-    "obstacle_deleted_last_4_days": "Deleted obstacles of last 4 days",
-    "draw_button_delete_last_point": "Delete the last point",
-    "elevation_href": "https://www.swisstopo.admin.ch/en/swiss-reference-systems",
-    "copy_cta": "Copy",
-    "copy_done": "Copied!",
-    "test_map_give_feedback": "Give feedback",
-    "legacy_drawing_warning": "It is not possible to edit drawing created by map.geo.admin.ch on the test.map.geo.admin.ch website. If you want to create a new drawing, either remove the current drawing or deselect it.",
-    "draw_file_load_error": "Loading of the KML file failed",
-    "draw_file_save_error": "Saving of the KML  file failed",
-    "very_small_size": "Very small",
-    "feedback_rating_text": "Tell us what you think about our new map viewer",
-    "feedback_rating_title": "How would you rate your experience ? (required)",
-    "send_failed": "Sending failed",
-    "feedback_email": "Your Email (optional)",
-    "feedback_invalid_email": "Invalid email",
-    "profile_no_data": "No data",
-    "view_on_mapgeoadminch_webmapviewer": "View on {url}",
-    "full_width": "Full width",
-    "georessourcen": "Georesources",
-    "georessourcen_service_link_label": "More information",
-    "georessourcen_service_link_href": "https://www.swisstopo.admin.ch/en/knowledge-facts/geology/geo-resources.html",
-    "topic_georessourcen_tooltip": "Geo-resources",
-    "ch.swisstopo.swissimage": "Aerial imagery",
-    "ch.swisstopo.pixelkarte-grau": "Grey map",
-    "ch.swisstopo.pixelkarte-farbe": "Color map",
-    "ch.swisstopo.swissimage_3d": "Aerial imagery",
-    "ch.swisstopo.swisstlm3d-karte-grau_3d": "Grey map",
-    "ch.swisstopo.swisstlm3d-karte-farbe_3d": "Color map",
-    "loading_external_layer": "Loading external layer",
-    "import_file": "Import file",
-    "import_file_tooltip": "Import an external KML or GPX file",
-    "import_file_succeeded": "Success",
-    "invalid_file": "Invalid file",
-    "no_url": "No URL",
-    "loading_error_network_failure": "Failed to load, file not accessible",
-    "loading_file": "Loading file...",
-    "invalid_kml_gpx_file_error": "Invalid file, only KML or GPX file are supported",
-    "import_maps": "Import maps",
-    "import_maps_tooltip": "Import external WMTS WMS sources",
-    "unsupported_content_type": "Unsupported response content type",
-    "invalid_wms_capabilities": "Invalid WMS Capabilities",
-    "invalid_wmts_capabilities": "Invalid WMTS Capabilities",
-    "network_error": "Network error",
-    "no_layer_found": "No layer found",
-    "import_maps_url_placeholder": "WMTS WMS URL",
-    "import_file_url_placeholder": "GPX KML URL",
-    "no_result": "No result",
-    "loading": "Loading",
-    "search_in_catalogue_placeholder": "Search in imported maps",
-    "kml_gpx_file_out_of_bounds": "File content is out of projection bounds",
-    "kml_gpx_file_empty": "KML/GPX file is empty",
-    "large_size": "Large",
-    "extra_large_size": "Extra Large",
-    "duplicate_layer": "Duplicate map",
-    "feedback_empty_warning": "Report message can not be empty",
-    "operation_successful": "Operation successful!",
-    "operation_failed": "Oops! Something went wrong. Please try again.",
-    "operation_aborted": "Operation aborted",
-    "outside_valid_year_range": "The entered year is outside of the available range:",
-    "linkedin_tooltip": "Share this map on LinkedIn",
-    "share_map_title": "Link to the geoportal of the Swiss Confederation",
-    "link_description": "Link description (optional)",
-    "media_disclaimer": "Contains third party content",
-    "drawing_attached": "Drawing added as attachment",
-    "switch_tooltip_attached_to_feature": "Attach tooltip to geometry",
-    "switch_tooltip_floating": "Use a floating tooltip",
-    "field_required": "This field is required",
-    "invalid_email": "Invalid email",
-    "no_email": "The e-mail field is required",
-    "file_unsupported_format": "This file format is not supported.  Only the following formats are allowed: {allowedFormats}",
-    "form_invalid": "The form is invalid",
-    "file_imported_success": "File successfully imported",
-    "3d_labels": "Geographic names",
-    "3d_vegetation": "Vegetation",
-    "3d_constructions": "Buildings and constructions",
-    "webmapviewer_live_disclaimer": "The new map viewer is coming soon - <a target='_blank' href='https://www.geo.admin.ch/en/go-live-map-viewer'>get ready</a>",
-    "drawing_too_large": "Your drawing is too large, remove some features",
-    "3d_unsupported_projection": "This map provided by external source can't be displayed in 3d because it doesn't support the projection EPSG:4326",
-    "geoloc_out_of_bounds": "Your current location is outside of Switzerland and cannot be shown",
-    "orient_map_north": "Orient the map",
-    "kml_icon_url_cors_issue": "The KML \"{layerName}\" contains icon(s) with URL {url} that doesn't support CORS! Please contact the administrator of this URL to add support for CORS.",
-    "warning": "Warning",
-    "legal_notice": "Legal Notice",
-    "legal_notice_url": "https://www.geo.admin.ch/en/impressum-responsibilities-and-contacts"
+    "zoom_out": "Zoom out"
 }
diff --git a/src/modules/i18n/locales/fr.json b/src/modules/i18n/locales/fr.json
index 1bfb346ba..6644e0a31 100644
--- a/src/modules/i18n/locales/fr.json
+++ b/src/modules/i18n/locales/fr.json
@@ -1,10 +1,16 @@
 {
+    "3d_constructions": "Bâtiments et constructions",
     "3d_ie11_alert": "Vous utilisez Internet Explorer ≤ 11 : la représentation 3D ne sera pas performante. Veuillez SVP utiliser la dernière version de Microsoft EDGE, Firefox ou Chrome pour obtenir un résultat optimal.",
+    "3d_labels": "Noms géographiques",
     "3d_overlay_warning": "Note importante: données 3D pas actualisées / données 2D en 3D<br/>Depuis oct. 2020, les données 3D (Terrain, Bâtiments et autres objets 3D) ne sont plus mises à jour dans ce visualiseur. Des données sources plus actuelles sont disponibles en téléchargement. Certaines données 2D ne sont pas adaptées à la visualisation en 3D. Ceci est valable pour les cartes et les photographies aériennes. Elles apparaissent déformées en terrain escarpé dans l'utilisation en 3D.\n ",
     "3d_pegman_help": "Appuyez sur la touche F pour voler.<br>Appuyez sur la touche H pour aide.<br>Appuyez sur la touche ESC pour exit.",
     "3d_pegman_tooltip": "Glisse moi vers la carte",
     "3d_render_error": "Conditions requises pour la vue 3D ne sont pas satisfaites. Pour bénéficier de toutes les fonctionnalités 3D votre ordinateur doit respecter la configuration requise suivante :utiliser la dernière version de Microsoft EDGE, Firefox ou Chrome et une carte graphique et des pilotes à jour.",
+    "3d_unsupported_projection": "La carte ne peut pas être affichées en 3d parce qu'elle ne supporte pas la projection EPSG:4326",
+    "3d_vegetation": "Végétation",
+    "Alle": "Erreur lors de la suppression de la base de données. Réessayez.",
     "abort": "Annuler",
+    "about_us": "À propos de nous",
     "add": "Ajouter",
     "add_image": "Ajouter une photo",
     "add_layer": "Ajouter une couche",
@@ -16,10 +22,9 @@
     "add_wmts_layer_failed": "Erreur au chargement de la couche WMTS",
     "add_wmts_layer_succeeded": "Couche WMTS chargée avec succès",
     "alert_title": "Attention!",
-    "Alle": "Erreur lors de la suppression de la base de données. Réessayez.",
-    "appcache_update_available": "Une mise à jour du site est disponible. Voulez-vous l'utiliser?",
     "app_feedback_button_text": "Feedback",
     "app_feedback_button_title": "Donnez votre avis sur l'application",
+    "appcache_update_available": "Une mise à jour du site est disponible. Voulez-vous l'utiliser?",
     "approx_abbr": "env.",
     "are": "ARE",
     "are_service_link_href": "http://www.are.admin.ch/index.html?lang=fr",
@@ -37,10 +42,10 @@
     "bafu": "OFEV",
     "bafu_service_link_href": "https://www.bafu.admin.ch/bafu/fr/home.html",
     "bafu_service_link_label": "www.bafu.admin.ch",
+    "basis": "Carte de base",
     "bav": "OFT",
     "bav_service_link_href": "https://www.bav.admin.ch/bav/fr/home.html",
     "bav_service_link_label": "Office fédéral des transports\n",
-    "topic_bav_tooltip": "Office fédéral des transports\n",
     "bfs": "OFS",
     "bfs_service_link_href": "https://www.bfs.admin.ch/bfs/fr/home.html",
     "bfs_service_link_label": "Office fédéral de la statistique",
@@ -62,13 +67,19 @@
     "cancel": "Annuler",
     "canton": "Canton",
     "catalog": "Catalogue",
+    "ch.swisstopo.pixelkarte-farbe": "Cartes couleurs",
+    "ch.swisstopo.pixelkarte-grau": "Cartes N&B",
+    "ch.swisstopo.swissimage": "Photo aérienne",
+    "ch.swisstopo.swissimage_3d": "Photo aérienne",
+    "ch.swisstopo.swisstlm3d-karte-farbe_3d": "Cartes couleurs",
+    "ch.swisstopo.swisstlm3d-karte-grau_3d": "Cartes N&B",
     "change_topic": "Thème",
     "choose_theme": "Changer thème",
     "choose_wms_url": "URL",
     "close": "Fermer",
     "close_menu": "Fermer menu",
-    "cms_link_button_url": "https://www.geo.admin.ch/fr/cartes/cartes.html",
     "cms_link_button_title": "Plus d'information",
+    "cms_link_button_url": "https://www.geo.admin.ch/fr/cartes/cartes.html",
     "commune": "Commune",
     "compare": "Comparer",
     "confirm_remove_all_features": "Voulez-vous vraiment effacer tous les objets?",
@@ -78,12 +89,15 @@
     "contextpopup_lv03_url": "https://www.swisstopo.admin.ch/fr/mensuration-nationale-mn03",
     "contextpopup_lv95_url": "https://www.swisstopo.admin.ch/fr/le-systeme-de-coordonnees-suisse",
     "coordinates_label": "Coordonnées (m)",
+    "copy_cta": "Copier",
+    "copy_done": "Copié!",
     "copy_success": "Lien copié !",
     "copy_url": "Copier le lien",
     "copyright_data": "© Données:",
     "copyright_label": "Conditions d’utilisation",
     "copyright_url": "https://www.geo.admin.ch/fr/conditions-generales-utilisation-ifdg/",
     "ct": "Ct. ",
+    "current_value": "Valeur courante",
     "custom_size": "Taille personnalisée",
     "data": "Données:",
     "delete": "Effacer",
@@ -91,11 +105,13 @@
     "description_instructions": "Description des couches WMS",
     "desktop_redirect": "Lien vers version PC",
     "display_profile": "Afficher le profil",
+    "displayed": "Affiché",
     "distance_label": "Distance",
     "district": "District",
     "draw": "Dessiner",
     "draw_annotation": "Texte",
     "draw_back": "Retour / Terminer dessin",
+    "draw_button_delete_last_point": "Effacer le dernier point",
     "draw_del_all_features": "Supprimer tous les objets",
     "draw_del_selected_features": "Supprimer objets sélectionnés",
     "draw_delete": "Effacer",
@@ -104,6 +120,8 @@
     "draw_delete_selected_features": "Effacer les objets sélectionnés",
     "draw_dl_kml": "Télécharger au format KML",
     "draw_export": "Exporter",
+    "draw_file_load_error": "Le chargement du fichier KML a échoué",
+    "draw_file_save_error": "L'enregistrement du fichier KML a échoué",
     "draw_file_saved": "Modifications enregistrées.",
     "draw_file_saving": "Sauvegarde....",
     "draw_layer_label": "Dessin",
@@ -151,22 +169,38 @@
     "draw_text_placeholder": "pas de titre",
     "draw_tooltip": "Dessiner sur la carte",
     "draw_type_marker": "Trait / surface",
+    "drawing_attached": "Dessin ajouté en pièce jointe",
+    "drawing_too_large": "Ton dessin est trop grand, enlève quelques éléments",
     "drop_invalid_url": "URL non valide.",
     "drop_me_here": "Déplacer le fichier KML ici",
+    "duplicate_layer": "Duplication de carte",
     "east": "Est",
     "ech": "Géocatalogue",
     "ech_service_link_href": "https://www.geo.admin.ch/fr/home.html",
     "ech_service_link_label": "geo.admin.ch",
     "edit_back": "Retour / Terminer l'édition",
+    "edit_confirm_reset_style": "Cette action supprimera tous vos changements et appliquera le style par défaut du calque. ",
+    "edit_current_layer": "Modification de la couche ",
+    "edit_file_saved": "Carte sauvegardée.",
+    "edit_file_saving": "Sauvegarde....",
+    "edit_fill_color": "Choisissez une couleur",
+    "edit_fill_outline_color": "Choisissez une couleur des contours",
+    "edit_glstyle_choose_color": "Choisissez une couleur",
+    "edit_glstyle_choose_layer": "Choisissez une couche",
+    "edit_line_color": "Choisissez une couleur de la ligne",
+    "edit_line_width": "Choisissez l'épaisseur de ligne",
     "edit_mode_title": "Edition",
+    "edit_not_possible": "Désolé, vous ne pouvez pas éditer cette couche. Veuillez changer l'arrière-plan.",
+    "edit_or_reset_style": "Cette couche utilise un style tiers. Vous ne pouvez pas le modifier, mais vous pouvez utiliser le style par défaut en cliquant sur ce bouton",
     "edit_panel_title": "Style the map",
     "edit_reset": "Reset",
     "edit_share_file_disclaimer": "Votre style est automatiquement stocké pour une année, vous acceptez ainsi les <a href='https://www.geo.admin.ch/fr/conditions-generales-utilisation-ifdg/' target='_blank'> conditions d'utilisation</a>.",
-    "open_edit_bt_title": "Open style edition",
-    "edit_file_saved": "Carte sauvegardée.",
-    "edit_file_saving": "Sauvegarde....",
-    "edit_confirm_reset_style": "Cette action supprimera tous vos changements et appliquera le style par défaut du calque. ",
+    "edit_text_color": "Choisissez une couleur pour le text",
+    "edit_text_halo_color": "Choisissez une couleur d'ombre",
+    "edit_text_size": "Choisissez taille pour le text",
+    "edit_visibility": "L'affichage",
     "elevation": "Altitude",
+    "elevation_href": "https://www.swisstopo.admin.ch/fr/systemes-de-reference-suisses",
     "email_us": "Courriel",
     "emapis": "Développement rural",
     "emapis_service_link_href": "mailto:info@blw.admin.ch",
@@ -181,6 +215,7 @@
     "export_kml_notsupported": "Votre browser ne prend pas en charge la fonction de sauvegarde. Veuillez employer IE10, Firefox ou Chrome.",
     "external_data_tooltip": "Données et/ou style d’un fournisseur tiers",
     "external_data_warning": "Attention: Ces données et/ou styles proviennent d’un fournisseur tiers (--URL--). La disponibilité des données est assurée par le tiers. Les conditions d’utilisation du propriétaire respectif des données doivent être respectées.",
+    "extra_large_size": "Très Grande",
     "facebook_tooltip": "Partager cette carte avec vos amis",
     "feature": "Objet",
     "featuresearch_results_header": "Aller sur l'objet ...",
@@ -190,18 +225,28 @@
     "feedback_description": "1. Faites-nous part de modifications de la carte, d’amélioration des données ou posez des questions sur ce site dans ce champ (obligatoire) :",
     "feedback_disclaimer": "En envoyant votre message, vous acceptez les <a href='https://www.geo.admin.ch/fr/conditions-generales-utilisation-ifdg#feedback' target='_blank'>conditions d'utilisation</a>.",
     "feedback_drawing": "2. Indiquez le lieu concerné dans la carte :",
+    "feedback_email": "Votre email (facultatif)",
+    "feedback_empty_warning": "Le message ne peut pas être vide",
     "feedback_error_message": "Problème lors de l'envoi",
+    "feedback_invalid_email": "e-mail invalide",
     "feedback_kml_attached": "Le dessin actuel va être envoyé. ",
     "feedback_mail": "3. Votre email :",
     "feedback_modify_drawing": "Modifier le dessin",
     "feedback_permalink": "Le lien suivant sera transféré: ",
     "feedback_placeholder": "Joindre un pdf, zip, jpg, jpeg, kml, kmz ou gpx",
+    "feedback_rating_text": "Faites-nous part de votre avis sur notre nouveau visualiseur de carte",
+    "feedback_rating_title": "Comment évalueriez-vous votre expérience ? (requis)",
     "feedback_success_message": "Votre message a été envoyé avec succès. Merci.",
     "feedback_unsupported_format": "Le format du fichier n’est pas pris en charge, merci d’utiliser un autre format pour votre pièce jointe.",
+    "field_required": "Ce champ est requis",
+    "file_imported_success": "Fichier importé avec succès",
     "file_is_not_kml": "Ce fichier n'est pas un fichier KML.",
     "file_too_large": "Ce fichier est trop volumineux (taille maximale autorisée : {maxFileSize})",
+    "file_unsupported_format": "Ce format de fichier n'est pas pris en charge. Seuls les formats suivants sont autorisés : {allowedFormats}",
     "follow_us": "Suivez-nous",
+    "form_invalid": "Le formulaire est invalide",
     "full_screen": "Plein écran",
+    "full_width": "Largeur complète",
     "funksender": "Emetteur radio",
     "funksender_service_link_href": "mailto:info@bakom.admin.ch",
     "funksender_service_link_label": "info@bakom.admin.ch",
@@ -211,6 +256,7 @@
     "geol": "Géologie",
     "geol_service_link_href": "http://www.geologieportal.ch/internet/geologieportal/fr/home.html",
     "geol_service_link_label": "www.geologieportal.ch",
+    "geoloc_out_of_bounds": "Votre emplacement actuel est en dehors de la Suisse et ne peut pas être affiché",
     "geoloc_permission_denied": "L'acquisition de la position a échoué parce que les paramètres du navigateur ne l'autorisent pas. Autorisez votre navigateur à utiliser votre position. Désactivez le mode \"privé\" de votre navigateur.",
     "geoloc_pos_unavailable": "L'acquisition de la position a échoué parce qu'au moins une source interne de positionnement de votre mobile (WiFi, GPS) a retourné une erreur interne.",
     "geoloc_start_tracking": "Démarrer le suivi de votre position",
@@ -218,8 +264,10 @@
     "geoloc_stop_tracking": "Arréter le suivi de votre position",
     "geoloc_time_out": "La durée maximale d'acquisition de la position a été dépassé avant d'avoir reçu l'information. Réessayez plus tard.",
     "geoloc_unknown": "Désolé, pour une raison inconnue le service de géolocalisation ne fonctionne pas. Vérifiez les paramètres de ce service concernant le mode privé et le firewall.",
-    "re_center_map": "Centrer la carte sur la position",
     "geolocation": "Géolocalisation",
+    "georessourcen": "Géoressources",
+    "georessourcen_service_link_href": "https://www.swisstopo.admin.ch/fr/connaissances-faits/geologie/georessources.html",
+    "georessourcen_service_link_label": "Plus d'informations",
     "geothermie": "Géothermie",
     "geothermie_service_link_href": "http://www.geologieportal.ch/internet/geologieportal/fr/home/topics/energy/geothermalenergy/shortdesc.html",
     "geothermie_service_link_label": "Lire la suite",
@@ -236,11 +284,21 @@
     "help_search_data": "Recherche' est un champ de saisie qui permet de rechercher des mots clefs (par exemple: 'marais', 'route', 'commune', etc.) dans la description de géodonnées disponibles. Lorsque vous sélectionnez un des résultats proposés, celui-ci est directement affiché en tant que jeu de données.",
     "help_search_data_link": "Cherchez-vous d'autres cartes?",
     "help_search_data_title": "Recherche de cartes",
+    "hidden": "Caché",
+    "hide": "Desactiver",
     "hide_profile": "Masquer le profil",
     "homescreen_content": "Nous vous recommandons d'utiliser cette fonction pour placer cette application directement sur l'écran d'accueil.",
     "homescreen_title": "Ecran d'accueil",
+    "hydrology": "Hydrologie",
     "import": "Importer",
+    "import_file": "Importer un fichier",
+    "import_file_succeeded": "Succès",
+    "import_file_tooltip": "Importer un fichier KML ou GPX externe",
+    "import_file_url_placeholder": "GPX KML URL",
     "import_kml": "KML import",
+    "import_maps": "Importer des cartes",
+    "import_maps_tooltip": "Importer des données WMTS WMS externes",
+    "import_maps_url_placeholder": "WMTS WMS URL",
     "import_online_placeholder": "WMTS WMS GPX KML URL",
     "import_tooltip": "Importer des données WMTS WMS GPX KML externes",
     "import_wms": "WMS import",
@@ -248,13 +306,17 @@
     "inspire": "INSPIRE",
     "inspire_service_link_href": "https://www.geo.admin.ch/fr/home.html",
     "inspire_service_link_label": "geo.admin.ch",
+    "invalid_email": "e-mail invalide",
+    "invalid_file": "Fichier invalide, seuls les fichiers KML ou GPX sont pris en charge",
+    "invalid_kml_gpx_file_error": "Fichier invalide, seuls les fichiers KML ou GPX sont pris en charge",
     "invalid_url": "URL non valide.",
-    "item": "Aller sur l'objet ...",
-    "items": "Objets",
+    "invalid_wms_capabilities": "Données WMS Capabilities invalides",
+    "invalid_wmts_capabilities": "Données WMTS Capabilities invalides",
     "isos": "Sites construits ISOS",
     "isos_service_link_href": "https://www.bak.admin.ch/bak/fr/home/baukultur/isos-und-ortsbildschutz.html",
     "isos_service_link_label": "OFC - Inventaire ISOS",
-    "topic_isos_tooltip": "Sites construits ISOS",
+    "item": "Aller sur l'objet ...",
+    "items": "Objets",
     "ivs": "Voies comm. hist.",
     "ivs_service_link_href": "http://www.ivs.admin.ch/fr/",
     "ivs_service_link_label": "www.ivs.admin.ch",
@@ -262,9 +324,19 @@
     "kgs_service_link_href": "http://www.babs.admin.ch/fr/aufgabenbabs/kgs/inventar.html",
     "kgs_service_link_label": "Protection des biens culturels",
     "kml": "KML",
+    "kml_gpx_file_empty": "Le fichier KML/GPX est vide",
+    "kml_gpx_file_out_of_bounds": "Le contenu du fichier est hors des limites de projection",
+    "kml_icon_url_cors_issue": "Le KML « {layerName} » contient des icônes avec l'URL {url} qui ne supporte pas CORS ! Veuillez contacter l'administrateur de cette URL pour avoir du support de CORS.",
     "kml_no_text_elements": "Information: Les étiquettes ne seront pas sauvées",
+    "kml_style_default": "défaut",
+    "kml_style_geoadmin": "GeoAdmin",
     "kmlimport_tooltip": "Importer des données KML externes",
+    "labels": "Etiquettes ",
+    "landcover_grass": "Landcover grass",
+    "landuse": "Espace vert",
+    "landuse-residential": "Zones residentielles",
     "lang_chooser_label": "Langue",
+    "large_size": "Grande",
     "last_available_year": "Last year",
     "layer_cant_be_displayed_in_3d": "Les couches suivantes ne peuvent être affichées en 3d parce qu'elles ne supportent pas la projection EPSG:4326:",
     "layer_cant_be_printed": "Les couches suivantes ne peuvent être imprimées car elles ne supportent pas la projection EPSG:2056:",
@@ -274,10 +346,23 @@
     "layer_selection": "Sélection de couches",
     "layers_displayed": "Cartes affichées",
     "layers_results_header": "Ajouter la carte ...",
+    "legacy_drawing_warning": "Il n'est pas possible de modifier un dessin créé par map.geo.admin.ch sur le site test.map.geo.admin.ch. Si vous voulez créer un nouveau dessin, il faut soit supprimer le dessin actuel, soit le désélectionner.",
+    "legal_notice": "Mentions légales",
+    "legal_notice_url": "https://www.geo.admin.ch/fr/impressum-responsabilites-et-contacts",
     "legend": "Légende",
+    "light_blue": "bleu clair",
+    "light_gray": "gris clair",
+    "light_green": "vert clair",
+    "light_yellow": "jaune clair",
     "link_bowl_crosshair": "Partage position",
+    "link_description": "Description du lien (facultatif)",
     "link_validate_kml": "Lien vers validation KML",
+    "linkedin_tooltip": "Partager cette carte sur LinkedIn",
     "load_local_file": "Charger",
+    "loading": "Chargement",
+    "loading_error_network_failure": "Échec du chargement, fichier non accessible",
+    "loading_external_layer": "Chargement de la couche externe",
+    "loading_file": "Chargement du fichier...",
     "locations": "Aller à ...",
     "locations_results_header": "Aller à ...",
     "locations_results_header_fuzzy": "Pensiez-vous à...",
@@ -293,6 +378,7 @@
     "measure": "Mesurer",
     "measure_instruction": "Digitalisez une polyligne...",
     "measure_tooltip": "Mesurer sur la carte",
+    "media_disclaimer": "Contient du contenu de tiers",
     "medium_size": "Moyenne",
     "menu": "Menu",
     "metadata_window_title": "Infobox",
@@ -306,9 +392,12 @@
     "modify_existing_vertex_linepolygon": "Cliquer pour supprimer le point (2 points min.)<br/>Cliquer puis bouger le curseur pour déplacer le point ",
     "modify_existing_vertex_marker": "Cliquer puis bouger le curseur pour déplacer le symbole",
     "modify_existing_vertex_measure": "Cliquer pour supprimer le point (2 points min.)<br/>Cliquer puis bouger le curseur pour déplacer le point",
-    "modify_icon_category_label": "Signes",
-    "modify_icon_category_default_label": "défaut",
+    "modify_icon_category_babs-D_label": "Signes conventionnels civils D",
+    "modify_icon_category_babs-F_label": "Signes conventionnels civils F",
+    "modify_icon_category_babs-I_label": "Signes conventionnels civils I",
     "modify_icon_category_babs_label": "Signes conventionnels civils",
+    "modify_icon_category_default_label": "défaut",
+    "modify_icon_category_label": "Signes",
     "modify_icon_label": "Signes",
     "modify_icon_size_label": "Taille",
     "modify_new_vertex_linepolygon": "Cliquer pour ajouter un point<br/>Cliquer puis bouger le curseur pour déplacer le point",
@@ -318,15 +407,21 @@
     "modify_text_size_label": "Taille",
     "more_info": "Plus d'informations ...",
     "movie": "Série temporelle (Multi-PDF)",
+    "mvt_ie11_alert": "Vous utilisez Internet Explorer ≤ 11 :  Veuillez SVP utiliser la dernière version de Microsoft EDGE, Firefox ou Chrome pour obtenir un résultat optimal.",
+    "network_error": "Erreur réseau",
     "never_show_again": "Ne plus afficher ce message.",
     "nga": "Atlas large bande",
     "nga_service_link_href": "https://www.bakom.admin.ch/bakom/fr/page-daccueil.html",
     "nga_service_link_label": "www.bakom.admin.ch",
+    "no_email": "Le champ email est requis",
     "no_feature_results": "Pas d'objets trouvés",
     "no_file": "Pas de fichier",
+    "no_layer_found": "Pas de couche trouvée",
     "no_layers_info": "Aucune couche sur la carte",
     "no_more_information": "Pas d'autres informations",
+    "no_result": "Pas de résultat",
     "no_searchable_layer": "Pas de couche disponible",
+    "no_url": "Aucune URL",
     "north": "Nord",
     "not_available": "Non disponible",
     "not_available_3d": "Non disponible en 3D!",
@@ -336,7 +431,9 @@
     "notruf_service_link_label": "geo.admin.ch",
     "object_information": "Information objet",
     "obstacle_deleted_last_2_weeks": "Obstacles supprimés ces 2 dernières semaines",
+    "obstacle_deleted_last_4_days": "Obstacles supprimés ces 4 derniers jours",
     "obstacle_started_last_2_weeks": "Obstacles activés ces 2 dernières semaines",
+    "obstacle_started_last_4_days": "Obstacles activés ces 4 derniers jours",
     "offline_abort": "Annuler",
     "offline_abort_warning": "Voulez-vous vraiment supprimer tous les cartes?",
     "offline_bad_layer_type": "Une couche a un type invalide. Elle ne peut être sauvegardée pour un usage hors-ligne.",
@@ -357,9 +454,15 @@
     "offline_sorry": "Vous êtes actuellement offline. ",
     "offline_space_warning": "Pas suffisament de place sur votre appareil, merci de libérer 50MB ou de ne sélectionner que 1 ou 2 couches.",
     "offline_zoom_extent": "Zoomer sur l'étendue",
+    "open_edit_bt_title": "Open style edition",
     "open_menu": "Ouvrir menu",
+    "operation_aborted": "Opération annulée",
     "operation_canceled": "Opération annulée",
+    "operation_failed": "Oups ! Quelque chose s'est mal passé. Veuillez réessayer, s.v.p.",
+    "operation_successful": "Succès !",
     "orange": "orange",
+    "orient_map_north": "Orienter la carte",
+    "outside_valid_year_range": "L'année indiquée se situe en dehors de la plage disponible :",
     "page_description": "map.geo.admin.ch est la plateforme cartographique de la Confédération suisse et des cantons. Elle donne accès aux cartes, géoinformations, géodonnées, géoservices et métadonnées de la Suisse.",
     "page_title": "Cartes de la Suisse - Confédération suisse - map.geo.admin.ch",
     "parcel": "Parcelle",
@@ -383,6 +486,7 @@
     "profile_elevation_down": "Descente",
     "profile_elevation_up": "Montée",
     "profile_hike_time": "Temps de marche à pied",
+    "profile_no_data": "Aucune donnée",
     "profile_poi_down": "Point le plus bas",
     "profile_poi_up": "Point culminant",
     "profile_slope_distance": "Longeur chemin ",
@@ -390,6 +494,7 @@
     "profile_too_many_points_error": "La demande de profil était trop volumineuse et n'a pas pu être traitée.",
     "profile_x_label": "Distance",
     "profile_y_label": "Altitude",
+    "purple": "violet",
     "qrcode_tooltip": "Créer un QRCode et ouvrir cette carte depuis votre appareil mobile",
     "queries": "Filtres (BETA)",
     "query_alert_more_than_200_results": "Votre requête a plus de 200 résultats!",
@@ -405,6 +510,7 @@
     "query_reset": "Réinitialiser la condition",
     "query_search": "Rechercher",
     "query_with_bbox": "Utiliser l'étendue",
+    "re_center_map": "Centrer la carte sur la position",
     "read_failed": "Erreur de lecture!",
     "read_succeeded": "Chargement OK!",
     "reading_file": "Chargement du fichier...",
@@ -413,6 +519,7 @@
     "reduce_label": "Réduire",
     "remove": "Supprimer",
     "revision_service": "service de révision de swisstopo",
+    "roadtraffic": "Rues",
     "rotate_left": "Rotation à gauche",
     "rotate_reset": "Réinitialiser l'orientation de la carte au nord",
     "rotate_right": "Rotation à droite",
@@ -423,10 +530,10 @@
     "schneesport_service_link_href": "https://shop.swisstopo.admin.ch/fr/products/maps/leisure/ski_tour_maps",
     "schneesport_service_link_label": "Sport de neige",
     "schule": "Pour l'école",
-    "topic_schule_tooltip": "Pour l'école",
     "schule_service_link_href": "http://www.schoolmaps.ch/fr",
     "schule_service_link_label": "www.schoolmaps.ch/fr",
     "search_help": "Aide",
+    "search_in_catalogue_placeholder": "Rechercher dans les cartes importées",
     "search_placeholder": "Recherche d'adresse, parcelles ou cartes",
     "search_title": "Rechercher un lieu ou ajouter une carte :",
     "select_feature_annotation": "Cliquer pour selectionner l'annotation",
@@ -435,7 +542,9 @@
     "select_feature_measure": "Cliquer pour selectionner la mesure",
     "select_no_feature": "Rien à sélectionner",
     "send": "Envoyer",
+    "send_failed": "Envoi échoué",
     "settings": "Réglages",
+    "settlement": "Zone de lotissement",
     "share": "Partager",
     "share_disclaimer": "Vous pouvez intégrer la carte dans votre site web ou votre blog. <a href='https://www.geo.admin.ch/fr/integration-web-iframe/' target='_blank'>Conditions d'utilisation</a>",
     "share_file_disclaimer": "Votre dessin est automatiquement stocké pour une année, vous acceptez ainsi les <a href='https://www.geo.admin.ch/fr/conditions-generales-utilisation-ifdg/' target='_blank'> conditions d'utilisation</a>.",
@@ -443,6 +552,7 @@
     "share_less": "Intégrer:",
     "share_link": "Lien de partage",
     "share_link_tooltip": "Pressez Ctrl+C pour copier",
+    "share_map_title": "Lien sur le géoportail de la Confédération Suisse",
     "share_more": "Intégrer ...",
     "share_preview": "Afficher un aperçu en taille réelle",
     "shop_cancel": "Annuler",
@@ -455,6 +565,7 @@
     "shop_not_available": "La carte est actuellement épuisée.",
     "shop_or_fill": "ou remplisser les champs (coordonnées MN95)",
     "shop_order": "Commander",
+    "show": "Activer",
     "show_more_options": "Prévisualiser",
     "show_more_results": "Afficher plus de résultats ...",
     "small_size": "Petite",
@@ -466,27 +577,32 @@
     "swisstopo": "swisstopo",
     "swisstopo_service_link_href": "https://www.swisstopo.admin.ch/fr/home.html",
     "swisstopo_service_link_label": "Office fédéral de topographie swisstopo",
-    "test_host_warning": "SITE DE TEST - NE PAS PARTAGER - NE PAS UTILISER À DES FINS OPÉRATIONNELLES",
+    "switch_kml_style": "Changez le style",
+    "switch_tooltip_attached_to_feature": "Attacher le tooltip à la géométrie",
+    "switch_tooltip_floating": "Utiliser un tooltip flottant",
+    "territory": "Territoire",
     "test_host_full_disclaimer": "Ce site est destiné à être testé uniquement. Il n'est pas destiné à une utilisation opérationnelle et il n'y a aucune garantie.",
+    "test_host_warning": "SITE DE TEST - NE PAS PARTAGER - NE PAS UTILISER À DES FINS OPÉRATIONNELLES",
+    "test_map_give_feedback": "Donner un avis",
     "text_to_display": "Description du lien",
     "third_party_data_warning": "Mise en garde données tierces. Le permalien que vous utilisez contient peut-être des références à des données tierces ne provenant pas de map.geo.admin.ch. Voulez-vous également visualiser ces données sachant que map.geo.admin.ch ne prend aucune responsabilité quant à ces données?",
     "tile": "Feuille",
+    "tilt3d_active": "Passer en 2d",
+    "tilt3d_disabled": "Vous ne pouvez pas utiliser ce fond de plan en 3d",
+    "tilt3d_inactive": "Passer en 3d",
     "tilt_down": "Incliner vers le bas",
     "tilt_down_disabled": "Vous ne pouvez incliner moins",
     "tilt_reset": "Réinitilaiser l'inclinaison",
     "tilt_up": "Incliner vers le haut",
     "tilt_up_disabled": "Vous ne pouvez incliner plus",
-    "tilt3d_active": "Passer en 2d",
-    "tilt3d_disabled": "Vous ne pouvez pas utiliser ce fond de plan en 3d",
-    "tilt3d_inactive": "Passer en 3d",
     "time_all": "Tout",
     "time_bt_disabled_tooltip": "La représentation de données historiques n'est possible qu'avec les couches historisées. Veuillez d'abord ajouter une couche historisée sur la carte.",
     "time_current": "Actuel",
     "time_hide": "Désactiver l'outil de représentation historique des données.",
     "time_select_year": "Choisissez une année",
     "time_show": "Activer l'outil de représentation historique des données.",
-    "time_slider_legend_tippy_intro": "Le curseur de temps affiche différentes couleurs selon si les cartes temporelles disposent de données ou non.",
     "time_slider_legend_tippy_full_data": "Données complètes",
+    "time_slider_legend_tippy_intro": "Le curseur de temps affiche différentes couleurs selon si les cartes temporelles disposent de données ou non.",
     "time_slider_legend_tippy_no_data": "Aucune donnée",
     "time_slider_legend_tippy_partial_data": "Données partielles",
     "title": "Titre",
@@ -495,6 +611,7 @@
     "topic_astra_tooltip": "Office fédéral des routes",
     "topic_aviation_tooltip": "Données relatives à l'aviation suisse",
     "topic_bafu_tooltip": "Office fédéral de l’environnement",
+    "topic_bav_tooltip": "Office fédéral des transports\n",
     "topic_bfs_tooltip": "Office fédéral de la statistique",
     "topic_blw_tooltip": "Office fédéral de l’agriculture",
     "topic_cadastre_tooltip": "Informations foncières",
@@ -504,9 +621,11 @@
     "topic_funksender_tooltip": "Emetteur radio",
     "topic_geodesy_tooltip": "Géodesie",
     "topic_geol_tooltip": "Géologie",
+    "topic_georessourcen_tooltip": "Géoressources",
     "topic_geothermie_tooltip": "Géothermie",
     "topic_gewiss_tooltip": "informations concernant les eaux",
     "topic_inspire_tooltip": "INSPIRE",
+    "topic_isos_tooltip": "Sites construits ISOS",
     "topic_ivs_tooltip": "Inventaire des voies de communication historiques",
     "topic_kgs_tooltip": "Protection des biens culturels",
     "topic_luftbilder_tooltip": "Photos aériennes",
@@ -515,48 +634,55 @@
     "topic_notruf_tooltip": "Appel d'urgence",
     "topic_sachplan_tooltip": "Plans sectoriels de la Confédération",
     "topic_schneesport_tooltip": "Sport de neige",
+    "topic_schule_tooltip": "Pour l'école",
     "topic_swisstopo_tooltip": "Office fédéral de la topographie",
     "topic_verteidigung_tooltip": "Défense",
     "topic_vu_tooltip": "Accidents de la route",
     "topic_wildruhezonen_tooltip": "Zones de tranquillité en Suisse",
     "transparency": "Transparence",
+    "try_test_viewer": "Essayez test.map.geo.admin.ch",
     "twitter_tooltip": "Tweeter cette carte",
+    "unsupported_content_type": "Type de contenu de réponse non pris en charge",
     "upload_failed": "Erreur d'enregistrement!",
     "upload_succeeded": "Chargement OK!",
     "uploading_file": "Chargement du fichier...",
     "url_image": "Lien de la photo",
     "url_link": "Lien du site web",
     "url_video": "Lien de la vidéo",
-    "vector_feedback_description_title": "Vector Tiles CARTE DE BASE",
-    "vector_feedback_tryit_title": "Essayez notre nouvelle carte vectorielle !",
-    "vector_feedback_description_text": "La carte est composée de <b>vector tiles</b> au lieu de tuiles raster. Elle est dessinée directement dans votre navigateur sur la base des données qui sont récupérées une seule fois. La carte apparaît plus rapidement à l'écran et vous pouvez facilement ajuster l’apparence. Afin de faciliter et d'accélérer la mise en forme et le chargement de la carte, les données sont organisées de manière simple. Avec seulement quelques couches, vous pouvez maintenant créer rapidement et facilement votre propre carte ! <b>Il suffit de l'essayer. </b><b style=\"color: #ff6961;\">TEST Viewer optimisé pour les navigateurs récents.</b>",
-    "vector_feedback_choose_style": "Changez l'affichage",
-    "vector_feedback_select_style": "Changez le style",
-    "vector_feedback_choose_layer": "Choisissez une couche",
     "vector_feedback_choose_color": "Choisissez une couleur",
-    "vector_feedback_labels_on_off": "Etiquettes on/off",
-    "vector_feedback_getting_started_title": "Pour les développeurs ",
+    "vector_feedback_choose_layer": "Choisissez une couche",
+    "vector_feedback_choose_style": "Changez l'affichage",
     "vector_feedback_create_your_own": "Créez votre propre l'arrière-plan",
+    "vector_feedback_description_text": "La carte est composée de <b>vector tiles</b> au lieu de tuiles raster. Elle est dessinée directement dans votre navigateur sur la base des données qui sont récupérées une seule fois. La carte apparaît plus rapidement à l'écran et vous pouvez facilement ajuster l’apparence. Afin de faciliter et d'accélérer la mise en forme et le chargement de la carte, les données sont organisées de manière simple. Avec seulement quelques couches, vous pouvez maintenant créer rapidement et facilement votre propre carte ! <b>Il suffit de l'essayer. </b><b style=\"color: #ff6961;\">TEST Viewer optimisé pour les navigateurs récents.</b>",
+    "vector_feedback_description_title": "Vector Tiles CARTE DE BASE",
     "vector_feedback_edit_map": "Modifier la carte",
     "vector_feedback_getting_started_1": "Dans notre ",
     "vector_feedback_getting_started_2": "descriptif du service ",
     "vector_feedback_getting_started_3": "vous trouverez des informations sur la façon de débuter avec les Vector Tiles dans vos propres applications.",
-    "vector_feedback_survey_title": "Vos commentaires sont importants. (1 min.)",
-    "vector_feedback_survey_btn_text": "Sondage",
-    "vector_feedback_survey_modal_title": "Enquête ",
-    "vector_feedback_style_default": "défaut",
+    "vector_feedback_getting_started_title": "Pour les développeurs ",
+    "vector_feedback_labels_on_off": "Etiquettes on/off",
+    "vector_feedback_select_style": "Changez le style",
     "vector_feedback_style_color": "A",
+    "vector_feedback_style_default": "défaut",
     "vector_feedback_style_grey": "B",
     "vector_feedback_style_lsd": "C",
+    "vector_feedback_survey_btn_text": "Sondage",
+    "vector_feedback_survey_modal_title": "Enquête ",
+    "vector_feedback_survey_title": "Vos commentaires sont importants. (1 min.)",
+    "vector_feedback_tryit_title": "Essayez notre nouvelle carte vectorielle !",
     "verteidigung": "Défense",
     "verteidigung_service_link_href": "http://www.vtg.admin.ch/fr/armee.html",
     "verteidigung_service_link_label": "www.vtg.admin.ch",
+    "very_small_size": "Très petite",
     "view_on_mapgeoadminch": "Voir sur {{url}}",
+    "view_on_mapgeoadminch_webmapviewer": "Voir sur {url}",
     "void_layer": "Fond blanc",
     "vu": "Accidents de la route",
     "vu_service_link_href": "http://www.donneesaccidents.ch",
     "vu_service_link_label": "OFROU - Données des accidents",
     "wait_data_loading": "Chargement...",
+    "warning": "Attention",
+    "webmapviewer_live_disclaimer": "Le visualiseur de cartes sera bientôt mis à jour - <a target='_blank' href='https://www.geo.admin.ch/fr/go-live-visualiseur-de-cartes'>comment se préparer</a>",
     "west": "Ouest",
     "whatsapp_tooltip": "Partager cette carte avec vos amis sur Whatsapp",
     "white": "blanc",
@@ -567,127 +693,8 @@
     "wms": "WMS",
     "wms_max_size_allowed": "Taille maximum WMS autorisée",
     "wmsimport_tooltip": "Importer des données WMS externes",
+    "woodland": "Forêt",
     "yellow": "jaune",
     "zoom_in": "Zoomer plus",
-    "zoom_out": "Zoomer moins",
-    "edit_glstyle_choose_color": "Choisissez une couleur",
-    "edit_glstyle_choose_layer": "Choisissez une couche",
-    "landuse-residential": "Zones residentielles",
-    "landcover_grass": "Landcover grass",
-    "edit_not_possible": "Désolé, vous ne pouvez pas éditer cette couche. Veuillez changer l'arrière-plan.",
-    "edit_current_layer": "Modification de la couche ",
-    "edit_fill_color": "Choisissez une couleur",
-    "edit_text_color": "Choisissez une couleur pour le text",
-    "edit_text_size": "Choisissez taille pour le text",
-    "edit_text_halo_color": "Choisissez une couleur d'ombre",
-    "show": "Activer",
-    "hide": "Desactiver",
-    "displayed": "Affiché",
-    "hidden": "Caché",
-    "edit_fill_outline_color": "Choisissez une couleur des contours",
-    "edit_line_color": "Choisissez une couleur de la ligne",
-    "edit_line_width": "Choisissez l'épaisseur de ligne",
-    "light_gray": "gris clair",
-    "light_green": "vert clair",
-    "light_blue": "bleu clair",
-    "light_yellow": "jaune clair",
-    "purple": "violet",
-    "edit_or_reset_style": "Cette couche utilise un style tiers. Vous ne pouvez pas le modifier, mais vous pouvez utiliser le style par défaut en cliquant sur ce bouton",
-    "basis": "Carte de base",
-    "labels": "Etiquettes ",
-    "roadtraffic": "Rues",
-    "hydrology": "Hydrologie",
-    "landuse": "Espace vert",
-    "settlement": "Zone de lotissement",
-    "territory": "Territoire",
-    "woodland": "Forêt",
-    "edit_visibility": "L'affichage",
-    "current_value": "Valeur courante",
-    "mvt_ie11_alert": "Vous utilisez Internet Explorer ≤ 11 :  Veuillez SVP utiliser la dernière version de Microsoft EDGE, Firefox ou Chrome pour obtenir un résultat optimal.",
-    "try_test_viewer": "Essayez test.map.geo.admin.ch",
-    "obstacle_started_last_4_days": "Obstacles activés ces 4 derniers jours",
-    "obstacle_deleted_last_4_days": "Obstacles supprimés ces 4 derniers jours",
-    "draw_button_delete_last_point": "Effacer le dernier point",
-    "elevation_href": "https://www.swisstopo.admin.ch/fr/systemes-de-reference-suisses",
-    "copy_cta": "Copier",
-    "copy_done": "Copié!",
-    "test_map_give_feedback": "Donner un avis",
-    "legacy_drawing_warning": "Il n'est pas possible de modifier un dessin créé par map.geo.admin.ch sur le site test.map.geo.admin.ch. Si vous voulez créer un nouveau dessin, il faut soit supprimer le dessin actuel, soit le désélectionner.",
-    "draw_file_load_error": "Le chargement du fichier KML a échoué",
-    "draw_file_save_error": "L'enregistrement du fichier KML a échoué",
-    "very_small_size": "Très petite",
-    "feedback_rating_text": "Faites-nous part de votre avis sur notre nouveau visualiseur de carte",
-    "feedback_rating_title": "Comment évalueriez-vous votre expérience ? (requis)",
-    "send_failed": "Envoi échoué",
-    "feedback_email": "Votre email (facultatif)",
-    "feedback_invalid_email": "e-mail invalide",
-    "profile_no_data": "Aucune donnée",
-    "view_on_mapgeoadminch_webmapviewer": "Voir sur {url}",
-    "full_width": "Largeur complète",
-    "georessourcen": "Géoressources",
-    "georessourcen_service_link_label": "Plus d'informations",
-    "georessourcen_service_link_href": "https://www.swisstopo.admin.ch/fr/connaissances-faits/geologie/georessources.html",
-    "topic_georessourcen_tooltip": "Géoressources",
-    "ch.swisstopo.swissimage": "Photo aérienne",
-    "ch.swisstopo.pixelkarte-grau": "Cartes N&B",
-    "ch.swisstopo.pixelkarte-farbe": "Cartes couleurs",
-    "ch.swisstopo.swissimage_3d": "Photo aérienne",
-    "ch.swisstopo.swisstlm3d-karte-grau_3d": "Cartes N&B",
-    "ch.swisstopo.swisstlm3d-karte-farbe_3d": "Cartes couleurs",
-    "loading_external_layer": "Chargement de la couche externe",
-    "import_file": "Importer un fichier",
-    "import_file_tooltip": "Importer un fichier KML ou GPX externe",
-    "import_file_succeeded": "Succès",
-    "invalid_file": "Fichier invalide, seuls les fichiers KML ou GPX sont pris en charge",
-    "no_url": "Aucune URL",
-    "loading_error_network_failure": "Échec du chargement, fichier non accessible",
-    "loading_file": "Chargement du fichier...",
-    "invalid_kml_gpx_file_error": "Fichier invalide, seuls les fichiers KML ou GPX sont pris en charge",
-    "import_maps": "Importer des cartes",
-    "import_maps_tooltip": "Importer des données WMTS WMS externes",
-    "unsupported_content_type": "Type de contenu de réponse non pris en charge",
-    "invalid_wms_capabilities": "Données WMS Capabilities invalides",
-    "invalid_wmts_capabilities": "Données WMTS Capabilities invalides",
-    "network_error": "Erreur réseau",
-    "no_layer_found": "Pas de couche trouvée",
-    "import_maps_url_placeholder": "WMTS WMS URL",
-    "import_file_url_placeholder": "GPX KML URL",
-    "no_result": "Pas de résultat",
-    "loading": "Chargement",
-    "search_in_catalogue_placeholder": "Rechercher dans les cartes importées",
-    "kml_gpx_file_out_of_bounds": "Le contenu du fichier est hors des limites de projection",
-    "kml_gpx_file_empty": "Le fichier KML/GPX est vide",
-    "large_size": "Grande",
-    "extra_large_size": "Très Grande",
-    "duplicate_layer": "Duplication de carte",
-    "feedback_empty_warning": "Le message ne peut pas être vide",
-    "operation_successful": "Succès !",
-    "operation_failed": "Oups ! Quelque chose s'est mal passé. Veuillez réessayer, s.v.p.",
-    "operation_aborted": "Opération annulée",
-    "outside_valid_year_range": "L'année indiquée se situe en dehors de la plage disponible :",
-    "linkedin_tooltip": "Partager cette carte sur LinkedIn",
-    "share_map_title": "Lien sur le géoportail de la Confédération Suisse",
-    "link_description": "Description du lien (facultatif)",
-    "media_disclaimer": "Contient du contenu de tiers",
-    "drawing_attached": "Dessin ajouté en pièce jointe",
-    "switch_tooltip_attached_to_feature": "Attacher le tooltip à la géométrie",
-    "switch_tooltip_floating": "Utiliser un tooltip flottant",
-    "field_required": "Ce champ est requis",
-    "invalid_email": "e-mail invalide",
-    "no_email": "Le champ email est requis",
-    "file_unsupported_format": "Ce format de fichier n'est pas pris en charge. Seuls les formats suivants sont autorisés : {allowedFormats}",
-    "form_invalid": "Le formulaire est invalide",
-    "file_imported_success": "Fichier importé avec succès",
-    "3d_labels": "Noms géographiques",
-    "3d_vegetation": "Végétation",
-    "3d_constructions": "Bâtiments et constructions",
-    "webmapviewer_live_disclaimer": "Le visualiseur de cartes sera bientôt mis à jour - <a target='_blank' href='https://www.geo.admin.ch/fr/go-live-visualiseur-de-cartes'>comment se préparer</a>",
-    "drawing_too_large": "Ton dessin est trop grand, enlève quelques éléments",
-    "3d_unsupported_projection": "La carte ne peut pas être affichées en 3d parce qu'elle ne supporte pas la projection EPSG:4326",
-    "geoloc_out_of_bounds": "Votre emplacement actuel est en dehors de la Suisse et ne peut pas être affiché",
-    "orient_map_north": "Orienter la carte",
-    "kml_icon_url_cors_issue": "Le KML « {layerName} » contient des icônes avec l'URL {url} qui ne supporte pas CORS ! Veuillez contacter l'administrateur de cette URL pour avoir du support de CORS.",
-    "warning": "Attention",
-    "legal_notice": "Mentions légales",
-    "legal_notice_url": "https://www.geo.admin.ch/fr/impressum-responsabilites-et-contacts"
+    "zoom_out": "Zoomer moins"
 }
diff --git a/src/modules/i18n/locales/it.json b/src/modules/i18n/locales/it.json
index f94f8bc74..b2831697d 100644
--- a/src/modules/i18n/locales/it.json
+++ b/src/modules/i18n/locales/it.json
@@ -1,10 +1,16 @@
 {
+    "3d_constructions": "Edifici e costruzioni",
     "3d_ie11_alert": "State usando InternetExplorer versione 11 o più vecchia. La visualizzazione 3D sarà lenta. Usate se possibile l’ultima versione di Microsoft EDGE, Firefox o Chrome per avere prestazioni ottimali.",
+    "3d_labels": "Nomi geografici",
     "3d_overlay_warning": "Nota importante: dati 3D non aggiornati / dati 2D visualizzati in 3D.<br/> Dall’ottobre 2020, i dati 3D (Terreno, Edifici e altri oggetti 3D) non sono più aggiornati in questo visualizzatore. Dei dati sorgente più attuali sono disponibili per il download.  Alcuni dati 2D non sono adatti alla visualizzazione 3D. In particolare le carte e le fotografie aeree appariranno deformate su terreni in forte pendenza quando il 3D è attivo.",
     "3d_pegman_help": "Premere il tasto F per attivare la modalità \"volo\".<br>Premere H per l'aiuto.<br>Premere ESC per uscire.",
     "3d_pegman_tooltip": "Trascinami sulla carta!",
     "3d_render_error": "Requisiti per la vista 3D non soddisfatti. Per utilizzare la versione completa 3D il computer deve soddisfare i seguenti requisiti: Usate l’ultima versione di Microsoft EDGE, Firefox o Chrome.Hardware e driver della scheda video aggiornati. ",
+    "3d_unsupported_projection": "La mappa non può essere visualizzata in 3D perché non supporta la proiezione EPSG:4326",
+    "3d_vegetation": "Vegetazione",
+    "Alle": "Errore nell'eliminazione delle carte. Riprovare.",
     "abort": "Annullare",
+    "about_us": "Chi siamo",
     "add": "Aggiungere",
     "add_image": "Aggiungere una foto",
     "add_layer": "Aggiungere un layer",
@@ -16,10 +22,9 @@
     "add_wmts_layer_failed": "Errore nel caricamento del layer WMTS",
     "add_wmts_layer_succeeded": "Layer WMTS caricato con successo",
     "alert_title": "Attenzione!",
-    "Alle": "Errore nell'eliminazione delle carte. Riprovare.",
-    "appcache_update_available": "È a disposizione un aggiornamento del sito. Desiderate utilizzarlo?",
     "app_feedback_button_text": "Feedback",
     "app_feedback_button_title": "dare il proprio feedback sull'applicazione",
+    "appcache_update_available": "È a disposizione un aggiornamento del sito. Desiderate utilizzarlo?",
     "approx_abbr": "ca.",
     "are": "ARE",
     "are_service_link_href": "http://www.are.admin.ch/index.html?lang=it",
@@ -37,10 +42,10 @@
     "bafu": "UFAM",
     "bafu_service_link_href": "https://www.bafu.admin.ch/bafu/it/home.html",
     "bafu_service_link_label": "www.bafu.admin.ch",
+    "basis": "Carta di base",
     "bav": "UFT",
     "bav_service_link_href": "https://www.bav.admin.ch/bav/it/home.html",
     "bav_service_link_label": "Ufficio federale dei trasporti\n",
-    "topic_bav_tooltip": "Ufficio federale dei trasporti\n",
     "bfs": "UST",
     "bfs_service_link_href": "https://www.bfs.admin.ch/bfs/it/home.html",
     "bfs_service_link_label": "Ufficio federale di statistica\n",
@@ -62,13 +67,19 @@
     "cancel": "Annullare",
     "canton": "Cantone",
     "catalog": "Catalogo",
+    "ch.swisstopo.pixelkarte-farbe": "Carta a colori",
+    "ch.swisstopo.pixelkarte-grau": "Carta B/N",
+    "ch.swisstopo.swissimage": "Veduta aerea",
+    "ch.swisstopo.swissimage_3d": "Veduta aerea",
+    "ch.swisstopo.swisstlm3d-karte-farbe_3d": "Carta a colori",
+    "ch.swisstopo.swisstlm3d-karte-grau_3d": "Carta B/N",
     "change_topic": "Temi",
     "choose_theme": "Cambiare tema",
     "choose_wms_url": "URL",
     "close": "Chiudere",
     "close_menu": "Chiudere menu",
-    "cms_link_button_url": "https://www.geo.admin.ch/it/carte/carte.html",
     "cms_link_button_title": "Ulteriori informazioni",
+    "cms_link_button_url": "https://www.geo.admin.ch/it/carte/carte.html",
     "commune": "Comune",
     "compare": "Confrontare",
     "confirm_remove_all_features": "Volete veramente cancellare tutti gli oggetti?",
@@ -78,12 +89,15 @@
     "contextpopup_lv03_url": "https://www.swisstopo.admin.ch/it/triangolazione-nazionale-mn03",
     "contextpopup_lv95_url": "https://www.swisstopo.admin.ch/it/il-sistema-di-coordinate-svizzero",
     "coordinates_label": "Coordinate (m)",
+    "copy_cta": "Copiare",
+    "copy_done": "Copiato!",
     "copy_success": "Link copiato!",
     "copy_url": "Copia link",
     "copyright_data": "© Dati:",
     "copyright_label": "Condizioni di utilizzo",
     "copyright_url": "https://www.geo.admin.ch/it/condizioni-generali-di-utilizzo-ifdg/",
     "ct": "Ct.",
+    "current_value": "Valore corrente",
     "custom_size": "Dimensione personalizzata",
     "data": "Dati:",
     "delete": "Cancellare",
@@ -91,11 +105,13 @@
     "description_instructions": "Descrizione dei layer WMS",
     "desktop_redirect": "Link per versione desktop",
     "display_profile": "Mostrare il profilo",
+    "displayed": "Visualizzati",
     "distance_label": "Distanza",
     "district": "Distretto",
     "draw": "Disegno",
     "draw_annotation": "Testo",
     "draw_back": "Indietro / Finire il disegno",
+    "draw_button_delete_last_point": "Cancellare l'ultimo punto",
     "draw_del_all_features": "Eliminare tutti gli oggetti",
     "draw_del_selected_features": "Eliminare gli oggetti selezionati",
     "draw_delete": "Cancellare",
@@ -104,6 +120,8 @@
     "draw_delete_selected_features": "Cancellare gli oggetti selezionati",
     "draw_dl_kml": "Download come KML",
     "draw_export": "Export",
+    "draw_file_load_error": "Caricamento del KML non riuscito",
+    "draw_file_save_error": "Salvataggio del KML non riuscito",
     "draw_file_saved": "Modifiche salvate",
     "draw_file_saving": "Salvataggio...",
     "draw_layer_label": "Disegno",
@@ -151,22 +169,38 @@
     "draw_text_placeholder": "Nessun titolo",
     "draw_tooltip": "Disegnare sulla mappa",
     "draw_type_marker": "Linea / superficie",
+    "drawing_attached": "Disegno aggiunto come allegato",
+    "drawing_too_large": "Il suo disegno è troppo grande, rimuova alcuni elementi",
     "drop_invalid_url": "URL non valido",
     "drop_me_here": "Spostare file KML qui",
+    "duplicate_layer": "Mappa duplicata",
     "east": "Est",
     "ech": "Geocatalogo",
     "ech_service_link_href": "https://www.geo.admin.ch/it/home.html",
     "ech_service_link_label": "geo.admin.ch",
     "edit_back": "Indietro / Finire il disegno",
+    "edit_confirm_reset_style": "Questa azione rimuoverà tutte le modifiche e applicherà lo stile predefinito del livello. ",
+    "edit_current_layer": "Modificare il layer ",
+    "edit_file_saved": "Tutte le modifiche salvate",
+    "edit_file_saving": "Salvataggio...",
+    "edit_fill_color": "Scegliere un colore",
+    "edit_fill_outline_color": "Scegliere un colore del bordo",
+    "edit_glstyle_choose_color": "Scegliere un colore",
+    "edit_glstyle_choose_layer": "Scegliere un layer",
+    "edit_line_color": "Scegliere un colore della linea",
+    "edit_line_width": "Scegliere lo spessore della linea",
     "edit_mode_title": "Edition",
+    "edit_not_possible": "Mi dispiace che tu non possa modificare questo layer. Scegliere cambiare lo sfondo.",
+    "edit_or_reset_style": "Questo livello utilizza uno stile di terze parti. Non è possibile modificarlo, ma è possibile utilizzare lo stile predefinito cliccando su questo pulsante",
     "edit_panel_title": "Style the map",
     "edit_reset": "Reset",
     "edit_share_file_disclaimer": "Lo stile è automaticamente salvato per un anno. Utilizzando questo servizio, accetta le <a href='https://www.geo.admin.ch/it/condizioni-generali-di-utilizzo-ifdg/' target='_blank'> condizioni generali di utilizzo</a>.",
-    "open_edit_bt_title": "Open style edition",
-    "edit_file_saved": "Tutte le modifiche salvate",
-    "edit_file_saving": "Salvataggio...",
-    "edit_confirm_reset_style": "Questa azione rimuoverà tutte le modifiche e applicherà lo stile predefinito del livello. ",
+    "edit_text_color": "Scegliere un colore per il testo",
+    "edit_text_halo_color": "Scegliere un colore d'ombra",
+    "edit_text_size": "Scegliere dimensione testo",
+    "edit_visibility": "Display",
     "elevation": "Altitudine",
+    "elevation_href": "https://www.swisstopo.admin.ch/it/livellazione-federale-svizzera-lf02",
     "email_us": "Email",
     "emapis": "Sviluppo rurale",
     "emapis_service_link_href": "mailto:info@blw.admin.ch",
@@ -181,6 +215,7 @@
     "export_kml_notsupported": "Il suobrowser non supporta la funzione Salva. Usare IE10, Firefox o Chrome.",
     "external_data_tooltip": "Dati e/o stile di un fornitore di terze parti",
     "external_data_warning": "Attenzione: questi dati e/o stile provengono da terze parti (--URL--). La loro disponibilità è soggetta al fornitore esterno. I termini e le condizioni dei rispettivi proprietari dei dati devono essere rispettate.",
+    "extra_large_size": "Extra Grande",
     "facebook_tooltip": "Condivida la carta con i suoi amici",
     "feature": "Oggetto",
     "featuresearch_results_header": "Vai all'oggetto ...",
@@ -190,18 +225,28 @@
     "feedback_description": "1. Ci comunichi in questo campo cambiamenti nella mappa, miglioramenti dei dati o domande su questo sito (obbligatorio) :",
     "feedback_disclaimer": "Inviando un messaggio, l’utente accetta le <a href='https://www.geo.admin.ch/it/condizioni-generali-di-utilizzo-ifdg' target='_blank'>condizioni generali d'utilizzo</a>.",
     "feedback_drawing": "2. Indichi il luogo interessato sulla mappa:",
+    "feedback_email": "La sua email (facoltativo)",
+    "feedback_empty_warning": "Il messaggio di segnalazione non può essere vuoto",
     "feedback_error_message": "Errore! Messaggio non trasmesso",
+    "feedback_invalid_email": "e-mail non valide",
     "feedback_kml_attached": "Il disegno attuale verrà inviato.",
     "feedback_mail": "3. La sua email :",
     "feedback_modify_drawing": "Modificare il disegno",
     "feedback_permalink": "Il seguente link verrá inviato: ",
     "feedback_placeholder": "Aggiungere un pdf, zip, jpeg, kml, kmz o gpx",
+    "feedback_rating_text": "Diteci cosa ne pensate del nostro nuovo visualizzatore di carte",
+    "feedback_rating_title": "Come valuta la sua esperienza ? (obbligatorio)",
     "feedback_success_message": "Il suo messaggio è stato inviato con successo. Grazie.",
     "feedback_unsupported_format": "Il formato del file selezionato non è supportato dal sistema, per favore utilizzare un altro formato per il vostro allegato.",
+    "field_required": "Questo campo è obbligatorio",
+    "file_imported_success": "File importato con successo",
     "file_is_not_kml": "Questo file non è un file KML.",
     "file_too_large": "Il file é troppo grande  (dimensione massima consentita: {maxFileSize})",
+    "file_unsupported_format": "Questo formato file non è supportato. Sono ammessi solo i seguenti formati: {allowedFormats}",
     "follow_us": "Seguiteci",
+    "form_invalid": "Il modulo non è valido",
     "full_screen": "Schermo intero",
+    "full_width": "Larghezza intera",
     "funksender": "Trasmettitore radio",
     "funksender_service_link_href": "mailto:info@bakom.admin.ch",
     "funksender_service_link_label": "info@bakom.admin.ch",
@@ -211,6 +256,7 @@
     "geol": "Geologia",
     "geol_service_link_href": "http://www.geologieportal.ch/internet/geologieportal/it/home.html",
     "geol_service_link_label": "www.geologieportal.ch",
+    "geoloc_out_of_bounds": "La Sua posizione attuale è al di fuori della Svizzera e non può essere mostrata.",
     "geoloc_permission_denied": "L'acquisizione della posizione è fallita perché il browser non l'ha permessa. Modificare le impostazioni per permettere a questo sito di utilizzare la geolocalizzazione e disattivare la modalità privata.",
     "geoloc_pos_unavailable": "L'acquisizione della posizione è fallita perchè almeno un sistema di posizionamento del vostro apparecchio (WiFi, GPS) ha dato un errore.",
     "geoloc_start_tracking": "Inizia a registrare la posizione",
@@ -218,8 +264,10 @@
     "geoloc_stop_tracking": "Interrompi la registrazione della posizione",
     "geoloc_time_out": "Il tentativo di geolocalizzazione ha raggiunto il limite di tempo. Provate più tardi.",
     "geoloc_unknown": "Spiacente, per una ragione sconosciuta il servizio di geolocalizzazione non funziona. Controllare le impostazioni del dispositivo per la geolocalizzazione, la privacy ed il firewall.",
-    "re_center_map": "Centra la mappa sulla posizione",
     "geolocation": "Geolocalizzazione",
+    "georessourcen": "Georisorse",
+    "georessourcen_service_link_href": "https://www.swisstopo.admin.ch/it/conoscenze-fatti/geologia/georisorse.html",
+    "georessourcen_service_link_label": "Ulteriori informazioni",
     "geothermie": "Geotermia",
     "geothermie_service_link_href": "http://www.geologieportal.ch/internet/geologieportal/it/home/topics/energy/geothermalenergy/shortdesc.html",
     "geothermie_service_link_label": "Ulteriori informazioni",
@@ -236,11 +284,21 @@
     "help_search_data": "Sotto 'Ricerca', un campo di testo vi permette di ricercare delle parole chiave (ad esempio 'paludi', 'strada', 'comune', ecc.) all’interno delle descrizioni dei dati geografici disponibili. Una volta selezionato un layer tra i risultati proposti, questo viene visualizzato sulla mappa.",
     "help_search_data_link": "Cercate altre mappe?",
     "help_search_data_title": "Ricerca di mappe",
+    "hidden": "Nascosto",
+    "hide": "Disabilitare",
     "hide_profile": "Nascondere il profilo",
     "homescreen_content": "Consigliamo di usare questa funzione per posizionare l'applicazione direttamente sulla schermata iniziale.",
     "homescreen_title": "Pagina iniziale",
+    "hydrology": "Idrologia",
     "import": "Importare",
+    "import_file": "Importare file",
+    "import_file_succeeded": "Successo",
+    "import_file_tooltip": "Importa un file KML o GPX esterno",
+    "import_file_url_placeholder": "GPX KML URL",
     "import_kml": "Importare KML",
+    "import_maps": "Importa mappe",
+    "import_maps_tooltip": "Importare  dati WMTS WMS esterni",
+    "import_maps_url_placeholder": "WMTS WMS URL",
     "import_online_placeholder": "WMTS WMS GPX KML URL",
     "import_tooltip": "Importare  dati WMTS WMS GPX KML esterni",
     "import_wms": "Importare WMS",
@@ -248,13 +306,17 @@
     "inspire": "INSPIRE",
     "inspire_service_link_href": "https://www.geo.admin.ch/it/home.html",
     "inspire_service_link_label": "geo.admin.ch",
+    "invalid_email": "e-mail non valido",
+    "invalid_file": "file non valido",
+    "invalid_kml_gpx_file_error": "File non valido, sono supportati solo file KML o GPX",
     "invalid_url": "URL non valido",
-    "item": "Vai all'oggetto ...",
-    "items": "Oggetti",
+    "invalid_wms_capabilities": "Dati WMS Capabilities non validi",
+    "invalid_wmts_capabilities": "Dati WMTS Capabilities non validi",
     "isos": "Insediamenti ISOS",
     "isos_service_link_href": "https://www.bak.admin.ch/bak/it/home/baukultur/isos-und-ortsbildschutz.html",
     "isos_service_link_label": "UFC - Inventario ISOS",
-    "topic_isos_tooltip": "Insediamenti ISOS",
+    "item": "Vai all'oggetto ...",
+    "items": "Oggetti",
     "ivs": "Vie com. storiche",
     "ivs_service_link_href": "http://www.ivs.admin.ch/it/",
     "ivs_service_link_label": "www.ivs.admin.ch",
@@ -262,9 +324,19 @@
     "kgs_service_link_href": "http://www.babs.admin.ch/it/aufgabenbabs/kgs/inventar.html",
     "kgs_service_link_label": "Protezione dei beni culturali",
     "kml": "KML",
+    "kml_gpx_file_empty": "Il file KML/GPX è vuoto",
+    "kml_gpx_file_out_of_bounds": "Il contenuto del file è fuori dai limiti della proiezione",
+    "kml_icon_url_cors_issue": "Il KML “{layerName}” contiene icone con l'URL {url} che non supporta CORS! Contattare l'amministratore di questo URL per aggiungere il supporto per CORS.",
     "kml_no_text_elements": "Informazione: le etichette non saranno salvate",
+    "kml_style_default": "predefinito",
+    "kml_style_geoadmin": "GeoAdmin",
     "kmlimport_tooltip": "Importare dati KML esterni",
+    "labels": "Etichette",
+    "landcover_grass": "Landcover grass",
+    "landuse": "Zona verde",
+    "landuse-residential": "Landuse residential",
     "lang_chooser_label": "Lingua",
+    "large_size": "Grande",
     "last_available_year": "Last year",
     "layer_cant_be_displayed_in_3d": "Las suandantas unitads da datas (da funtaunas externas) na pon betg vegnir preschentadas en 3D, perquai ch'il sustegn per la projecziun EPSG:4326 manca:",
     "layer_cant_be_printed": "I seguenti set di dati (da fonti esterne) non possono essere stampati a causa della mancanza di supporto per la proiezione EPSG:2056:",
@@ -274,10 +346,23 @@
     "layer_selection": "Selezione",
     "layers_displayed": "Mappe visualizzate",
     "layers_results_header": "Aggiungi set di dati ...",
+    "legacy_drawing_warning": "Non è possibile modificare i disegni creati da map.geo.admin.ch sul sito test.map.geo.admin.ch. Se si desidera creare un nuovo disegno, è necessario rimuovere il disegno corrente o deselezionarlo.",
+    "legal_notice": "Informazioni legali",
+    "legal_notice_url": "https://www.geo.admin.ch/it/colophon-responsabilita-e-contatti",
     "legend": "Legenda",
+    "light_blue": "azzurro",
+    "light_gray": "grigio chiaro",
+    "light_green": "verde chiaro",
+    "light_yellow": "giallo chiaro",
     "link_bowl_crosshair": "Condividere posizione",
+    "link_description": "Descrizione del link  (facoltativo)",
     "link_validate_kml": "Link alla validazione KML",
+    "linkedin_tooltip": "Condivida la carta su LinkedIn",
     "load_local_file": "Caricare",
+    "loading": "Caricamento",
+    "loading_error_network_failure": "Impossibile caricare, file non accessibile",
+    "loading_external_layer": "Caricamento del livello esterno",
+    "loading_file": "Caricamento del file...",
     "locations": "Vai a ...",
     "locations_results_header": "Vai a ...",
     "locations_results_header_fuzzy": "Intendevi forse...",
@@ -293,6 +378,7 @@
     "measure": "Misurazione",
     "measure_instruction": "Digitalizzare una polilinea...",
     "measure_tooltip": "Misurazione sulla mappa",
+    "media_disclaimer": "Contiene contenuti di terze parti",
     "medium_size": "Medie",
     "menu": "Menu",
     "metadata_window_title": "Infobox",
@@ -306,9 +392,12 @@
     "modify_existing_vertex_linepolygon": "Cliccare per eliminare il punto (2 punti min.)<br/>Cliccare quindi trascinare per spostare il punto",
     "modify_existing_vertex_marker": "Cliccare quindi trascinare per spostare il simbolo",
     "modify_existing_vertex_measure": "Cliccare per eliminare il punto (2 punti min.)<br/>Cliccare quindi trascinare per spostare il punto",
-    "modify_icon_category_label": "Segni",
-    "modify_icon_category_default_label": "predefinito",
+    "modify_icon_category_babs-D_label": "Segni convenzionali civili D",
+    "modify_icon_category_babs-F_label": "Segni convenzionali civili F",
+    "modify_icon_category_babs-I_label": "Segni convenzionali civili I",
     "modify_icon_category_babs_label": "Segni convenzionali civili",
+    "modify_icon_category_default_label": "predefinito",
+    "modify_icon_category_label": "Segni",
     "modify_icon_label": "Simboli",
     "modify_icon_size_label": "Grandezza",
     "modify_new_vertex_linepolygon": "Cliccare per aggiungere un punto.<br/>Cliccare quindi trascinare per spostare il punto",
@@ -318,15 +407,21 @@
     "modify_text_size_label": "Grandezza",
     "more_info": "Più informazioni ...",
     "movie": "Serie storica (Multi-PDF)",
+    "mvt_ie11_alert": "State usando InternetExplorer versione 11 o più vecchia.Usate se possibile l’ultima versione di Microsoft EDGE, Firefox o Chrome per avere prestazioni ottimali.",
+    "network_error": "Errore di rete",
     "never_show_again": "Non mostrare più questo messaggio.",
     "nga": "Atlante banda larga",
     "nga_service_link_href": "https://www.bakom.admin.ch/bakom/it/pagina-iniziale.html",
     "nga_service_link_label": "www.bakom.admin.ch",
+    "no_email": "Il campo email è obbligatorio",
     "no_feature_results": "Nessun oggetto trovato",
     "no_file": "Nessun file",
+    "no_layer_found": "Nessun layer trovato",
     "no_layers_info": "Nessun layer sulla mappa",
     "no_more_information": "Nessun'altra informazione",
+    "no_result": "Nessun risultato",
     "no_searchable_layer": "Nessun layer disponibile.",
+    "no_url": "Nessun URL",
     "north": "Nord",
     "not_available": "Non disponibile",
     "not_available_3d": "Non disponibile in 3D!",
@@ -336,7 +431,9 @@
     "notruf_service_link_label": "geo.admin.ch",
     "object_information": "Informazione oggetto",
     "obstacle_deleted_last_2_weeks": "Ostacoli eliminati nelle ultime 2 settimane",
+    "obstacle_deleted_last_4_days": "Ostacoli soppressi negli ultimi 4 giorni",
     "obstacle_started_last_2_weeks": "Ostacoli attivati nelle ultime 2 settimane",
+    "obstacle_started_last_4_days": "Ostacoli attivati negli ultimi 4 giorni",
     "offline_abort": "Annullare",
     "offline_abort_warning": "Volete veramente cancellare tutte le carte?",
     "offline_bad_layer_type": "Uno dei layer non è valido. Non potrà venir salvato per l'uso offline.",
@@ -357,9 +454,15 @@
     "offline_sorry": "Modalità offline",
     "offline_space_warning": "Memoria insufficiente sul dispositivo. Liberare ~50MB di spazio o selezionare al massimo 2 temi.",
     "offline_zoom_extent": "Zoom all'estensione",
+    "open_edit_bt_title": "Open style edition",
     "open_menu": "Aprire menu",
+    "operation_aborted": "Operazione annullata.",
     "operation_canceled": "Operazione annullata",
+    "operation_failed": "Oops! Qualcosa è andato storto. Si prega di riprovare.",
+    "operation_successful": "Successo!",
     "orange": "arancione",
+    "orient_map_north": "Orientare la mappa",
+    "outside_valid_year_range": "L'anno inserito è al di fuori dell'intervallo disponibile:",
     "page_description": "map.geo.admin.ch è la piattaforma cartografica della Confederazione svizzera e dei cantoni. Dà accesso alle mappe, alle geoinformazioni, ai geodati, ai geoservizi e ai metadati della Svizzera.",
     "page_title": "Carta della Svizzera - Confederazione svizzera - map.geo.admin.ch",
     "parcel": "Parcelle",
@@ -383,6 +486,7 @@
     "profile_elevation_down": "Discesa",
     "profile_elevation_up": "Salita",
     "profile_hike_time": "Tempo di percorrenza",
+    "profile_no_data": "Nessun dato",
     "profile_poi_down": "Punto più basso",
     "profile_poi_up": "Punto più alto",
     "profile_slope_distance": "Lunghezza strada ",
@@ -390,6 +494,7 @@
     "profile_too_many_points_error": "La richiesta del profilo era troppo grande e non è stato possibile elaborarla.",
     "profile_x_label": "Distanza",
     "profile_y_label": "Elevazione",
+    "purple": "viola",
     "qrcode_tooltip": "Creare un QRCode e aprire questa carta su dispositivo mobile",
     "queries": "Filtri  (BETA)",
     "query_alert_more_than_200_results": "La richiesta ha prodotto più di 200 risultati!",
@@ -405,6 +510,7 @@
     "query_reset": "Reinizializzare il condizioni",
     "query_search": "Ricerca",
     "query_with_bbox": "Usare la selezione",
+    "re_center_map": "Centra la mappa sulla posizione",
     "read_failed": "Errore di lettura!",
     "read_succeeded": "Caricamento OK!",
     "reading_file": "Caricamento del file...",
@@ -413,6 +519,7 @@
     "reduce_label": "Riduci",
     "remove": "Cancellare",
     "revision_service": "Servizio di revisione di swisstopo",
+    "roadtraffic": "Strade",
     "rotate_left": "Ruota a sinistra",
     "rotate_reset": "Resetta l'orientamento verso Nord",
     "rotate_right": "Ruota a destra",
@@ -423,10 +530,10 @@
     "schneesport_service_link_href": "https://shop.swisstopo.admin.ch/it/products/maps/leisure/ski_tour_maps",
     "schneesport_service_link_label": "Sport sulla neve",
     "schule": "Per la scuola",
-    "topic_schule_tooltip": "Per la scuola",
     "schule_service_link_href": "http://www.schoolmaps.ch/it",
     "schule_service_link_label": "www.schoolmaps.ch/it",
     "search_help": "Aiuto",
+    "search_in_catalogue_placeholder": "Cerca nelle mappe importate",
     "search_placeholder": "Ricerca di indirizzi, parcelle o mappe",
     "search_title": "Cercare un luogo od aggiungi un set di dati :",
     "select_feature_annotation": "Cliccare per selezionare il testo",
@@ -435,7 +542,9 @@
     "select_feature_measure": "Cliccare per selezionare la misura",
     "select_no_feature": "Niente da selezionare",
     "send": "Inviare",
+    "send_failed": "Invio fallito",
     "settings": "Impostazioni",
+    "settlement": "Zona di insediamento",
     "share": "Condividere",
     "share_disclaimer": "Può incorporare la mappa nel suo sito web o blog. <a href='https://www.geo.admin.ch/it/web-integrazione-iframe/' target='_blank'>Condizioni d'uso.</a>",
     "share_file_disclaimer": "Il disegno è automaticamente salvato per un anno. Utilizzando questo servizio, accetta le <a href='https://www.geo.admin.ch/it/condizioni-generali-di-utilizzo-ifdg/' target='_blank'> condizioni generali di utilizzo</a>.",
@@ -443,6 +552,7 @@
     "share_less": "Incorporare:",
     "share_link": "Link di condivisione",
     "share_link_tooltip": "Cliccare Ctrl+C per copiare",
+    "share_map_title": "Link al geoportale della Confederazione Svizzera",
     "share_more": "Incorporare ...",
     "share_preview": "Visualizza un'anteprima a dimensione reale",
     "shop_cancel": "Annullare",
@@ -455,6 +565,7 @@
     "shop_not_available": "La carta è momentaneamente non disponibile.",
     "shop_or_fill": "oppure riempire i campi (coordinate MN95)",
     "shop_order": "Ordinare",
+    "show": "Attivare",
     "show_more_options": "Preview",
     "show_more_results": "Mostra altri risultati ...",
     "small_size": "Piccole",
@@ -466,27 +577,32 @@
     "swisstopo": "swisstopo",
     "swisstopo_service_link_href": "https://www.swisstopo.admin.ch/it/home.html",
     "swisstopo_service_link_label": "Ufficio federale di topografia swisstopo ",
-    "test_host_warning": "SITO DI PROVA - NON CONDIVIDERE - NON PER USO OPERATIVO",
+    "switch_kml_style": "Cambia stile",
+    "switch_tooltip_attached_to_feature": "Collegare il tooltip alla geometria",
+    "switch_tooltip_floating": "Utilizzare un tooltip fluttuante",
+    "territory": "Territorio",
     "test_host_full_disclaimer": "Questo sito è solo a scopo di test. Non è destinato all'uso operativo e non vi è alcuna garanzia.",
+    "test_host_warning": "SITO DI PROVA - NON CONDIVIDERE - NON PER USO OPERATIVO",
+    "test_map_give_feedback": "Dare un feedback",
     "text_to_display": "Descrizione del link",
     "third_party_data_warning": "Attenzione: questi dati provengono da terze parti. Il permalink usato fa riferimento probabilmente a dati di terze parti. Volete veramente caricare questi dati?",
     "tile": "Foglio",
+    "tilt3d_active": "Passa a 2d\n",
+    "tilt3d_disabled": "Non potete usare la funzione 3d con questo sfondo",
+    "tilt3d_inactive": "Passa a 3d",
     "tilt_down": "Inclina verso il basso",
     "tilt_down_disabled": "Non è possibile inclinare di meno",
     "tilt_reset": "Resetta l'inclinazione",
     "tilt_up": "Inclina verso l'alto",
     "tilt_up_disabled": "Non è possibile inclinare di più",
-    "tilt3d_active": "Passa a 2d\n",
-    "tilt3d_disabled": "Non potete usare la funzione 3d con questo sfondo",
-    "tilt3d_inactive": "Passa a 3d",
     "time_all": "Tutti",
     "time_bt_disabled_tooltip": "La visualizzazione storica dei dati è possibile solo con i layer storicizzati. Aggiungere un layer storicizzato per utilizzare questa funzione",
     "time_current": "Attuale",
     "time_hide": "Disattivare la visualizzazione storica dei dati",
     "time_select_year": "Scegliere un anno",
     "time_show": "Attivare la visualizzazione storica dei dati",
-    "time_slider_legend_tippy_intro": "Il cursore del tempo mostra colori diversi a seconda che gli strati temporali abbiano o no dati per l'anno selezionato.",
     "time_slider_legend_tippy_full_data": "Dati completi",
+    "time_slider_legend_tippy_intro": "Il cursore del tempo mostra colori diversi a seconda che gli strati temporali abbiano o no dati per l'anno selezionato.",
     "time_slider_legend_tippy_no_data": "Nessun dato",
     "time_slider_legend_tippy_partial_data": "Dati parziali",
     "title": "Titolo",
@@ -495,6 +611,7 @@
     "topic_astra_tooltip": "Ufficio federale delle strade",
     "topic_aviation_tooltip": "Dati relativi all'aviazione svizzera",
     "topic_bafu_tooltip": "Ufficio federale dell’ambiente",
+    "topic_bav_tooltip": "Ufficio federale dei trasporti\n",
     "topic_bfs_tooltip": "Ufficio federale di statistica\n",
     "topic_blw_tooltip": "Ufficio federale dell’agricoltura",
     "topic_cadastre_tooltip": "Informazioni sui fondi",
@@ -504,9 +621,11 @@
     "topic_funksender_tooltip": "Trasmettitore radio",
     "topic_geodesy_tooltip": "Geodesia",
     "topic_geol_tooltip": "Geologia",
+    "topic_georessourcen_tooltip": "Georisorse",
     "topic_geothermie_tooltip": "Geotermia",
     "topic_gewiss_tooltip": "informazioni sulle acque",
     "topic_inspire_tooltip": "INSPIRE",
+    "topic_isos_tooltip": "Insediamenti ISOS",
     "topic_ivs_tooltip": "Inventario delle vie di comunicazione storiche",
     "topic_kgs_tooltip": "Protezione dei beni culturali",
     "topic_luftbilder_tooltip": "Immagini aeree ",
@@ -515,48 +634,55 @@
     "topic_notruf_tooltip": "Chiamata d'emergenza",
     "topic_sachplan_tooltip": "Piani settorali della Confederazione",
     "topic_schneesport_tooltip": "Sport sulla neve",
+    "topic_schule_tooltip": "Per la scuola",
     "topic_swisstopo_tooltip": "Ufficio federale di topografia",
     "topic_verteidigung_tooltip": "Difesa",
     "topic_vu_tooltip": "Incidenti stradali",
     "topic_wildruhezonen_tooltip": "Zone di tranquillità in Svizzera",
     "transparency": "Trasparenza",
+    "try_test_viewer": "Prova test.map.geo.admin.ch",
     "twitter_tooltip": "Tweet della carta",
+    "unsupported_content_type": "Tipo di contenuto della risposta non supportato",
     "upload_failed": "Caricamento fallito!",
     "upload_succeeded": "Caricamento OK!",
     "uploading_file": "Caricamento del file...",
     "url_image": "Link della foto",
     "url_link": "Link del sito web",
     "url_video": "Link del video",
-    "vector_feedback_description_title": "Vector Tiles MAPPA DI BASE",
-    "vector_feedback_tryit_title": "Prova la nostra nuova mappa vettoriale !",
-    "vector_feedback_description_text": "La mappa è composta da <b>vector tiles</b> invece che tiles raster. Essa è disegnata direttamente nel  browser basandosi su dati che sono scaricati una volta sola. La mappa è disegnata più velocemente e se ne può facilmente cambiare lo stile. Al fine di accelerare il caricamento e lo styling della mappa, i dati sono organizzati in maniera semplice. Con solo pochi layers può ora creare in modo rapido e semplice la sua mappapersonalizzata! <b>Proi ora! </b><b style=\"color: #ff6961;\">TEST Viewer ottimizzato per browser recenti.</b>",
-    "vector_feedback_choose_style": "Cambia display",
-    "vector_feedback_select_style": "Cambia stile",
-    "vector_feedback_choose_layer": "Scegliere un layer",
     "vector_feedback_choose_color": "Scegliere un colore",
-    "vector_feedback_labels_on_off": "Etichette on/off",
-    "vector_feedback_getting_started_title": "Per sviluppatori ",
+    "vector_feedback_choose_layer": "Scegliere un layer",
+    "vector_feedback_choose_style": "Cambia display",
     "vector_feedback_create_your_own": "Crea il tuo sfondo personale",
+    "vector_feedback_description_text": "La mappa è composta da <b>vector tiles</b> invece che tiles raster. Essa è disegnata direttamente nel  browser basandosi su dati che sono scaricati una volta sola. La mappa è disegnata più velocemente e se ne può facilmente cambiare lo stile. Al fine di accelerare il caricamento e lo styling della mappa, i dati sono organizzati in maniera semplice. Con solo pochi layers può ora creare in modo rapido e semplice la sua mappapersonalizzata! <b>Proi ora! </b><b style=\"color: #ff6961;\">TEST Viewer ottimizzato per browser recenti.</b>",
+    "vector_feedback_description_title": "Vector Tiles MAPPA DI BASE",
     "vector_feedback_edit_map": "Modifica mappa",
     "vector_feedback_getting_started_1": "Nella nostra ",
     "vector_feedback_getting_started_2": "descrizione del servizio ",
     "vector_feedback_getting_started_3": "troverete maggiori informazioni su come iniziare ad usare le Vector Tiles con le vostre applicazioni.",
-    "vector_feedback_survey_title": "Il vostro feedback è importante. (1 min.)",
-    "vector_feedback_survey_btn_text": "Sondaggio",
-    "vector_feedback_survey_modal_title": "Sondaggio ",
-    "vector_feedback_style_default": "predefinito",
+    "vector_feedback_getting_started_title": "Per sviluppatori ",
+    "vector_feedback_labels_on_off": "Etichette on/off",
+    "vector_feedback_select_style": "Cambia stile",
     "vector_feedback_style_color": "A",
+    "vector_feedback_style_default": "predefinito",
     "vector_feedback_style_grey": "B",
     "vector_feedback_style_lsd": "C",
+    "vector_feedback_survey_btn_text": "Sondaggio",
+    "vector_feedback_survey_modal_title": "Sondaggio ",
+    "vector_feedback_survey_title": "Il vostro feedback è importante. (1 min.)",
+    "vector_feedback_tryit_title": "Prova la nostra nuova mappa vettoriale !",
     "verteidigung": "Difesa",
     "verteidigung_service_link_href": "http://www.vtg.admin.ch/it/armee.html",
     "verteidigung_service_link_label": "www.vtg.admin.ch",
+    "very_small_size": "",
     "view_on_mapgeoadminch": "Vedi in {{url}}",
+    "view_on_mapgeoadminch_webmapviewer": "Vedi in {url}",
     "void_layer": "Nessuno sfondo",
     "vu": "Incidenti stradali",
     "vu_service_link_href": "http://www.datiincidenti.ch/",
     "vu_service_link_label": "USTRA - Dati sugli incidenti",
     "wait_data_loading": "Caricamento...",
+    "warning": "Avvertenza",
+    "webmapviewer_live_disclaimer": "Il visualizzatore di mappe sarà aggiornato in breve - <a target='_blank' href='https://www.geo.admin.ch/it/go-live-visualizzatore-di-mappe'>tenetevi pronti</a>",
     "west": "Ovest",
     "whatsapp_tooltip": "Condivida la carta con i suoi amici su Whatsapp",
     "white": "bianco",
@@ -567,127 +693,8 @@
     "wms": "WMS",
     "wms_max_size_allowed": "Dimensione massima WMS",
     "wmsimport_tooltip": "Importare dati WMS esterni",
+    "woodland": "Foresta",
     "yellow": "giallo",
     "zoom_in": "Zoom in avanti",
-    "zoom_out": "Zoom indietro",
-    "edit_glstyle_choose_color": "Scegliere un colore",
-    "edit_glstyle_choose_layer": "Scegliere un layer",
-    "landuse-residential": "Landuse residential",
-    "landcover_grass": "Landcover grass",
-    "edit_not_possible": "Mi dispiace che tu non possa modificare questo layer. Scegliere cambiare lo sfondo.",
-    "edit_current_layer": "Modificare il layer ",
-    "edit_fill_color": "Scegliere un colore",
-    "edit_text_color": "Scegliere un colore per il testo",
-    "edit_text_size": "Scegliere dimensione testo",
-    "edit_text_halo_color": "Scegliere un colore d'ombra",
-    "show": "Attivare",
-    "hide": "Disabilitare",
-    "displayed": "Visualizzati",
-    "hidden": "Nascosto",
-    "edit_fill_outline_color": "Scegliere un colore del bordo",
-    "edit_line_color": "Scegliere un colore della linea",
-    "edit_line_width": "Scegliere lo spessore della linea",
-    "light_gray": "grigio chiaro",
-    "light_green": "verde chiaro",
-    "light_blue": "azzurro",
-    "light_yellow": "giallo chiaro",
-    "purple": "viola",
-    "edit_or_reset_style": "Questo livello utilizza uno stile di terze parti. Non è possibile modificarlo, ma è possibile utilizzare lo stile predefinito cliccando su questo pulsante",
-    "basis": "Carta di base",
-    "labels": "Etichette",
-    "roadtraffic": "Strade",
-    "hydrology": "Idrologia",
-    "landuse": "Zona verde",
-    "settlement": "Zona di insediamento",
-    "territory": "Territorio",
-    "woodland": "Foresta",
-    "edit_visibility": "Display",
-    "current_value": "Valore corrente",
-    "mvt_ie11_alert": "State usando InternetExplorer versione 11 o più vecchia.Usate se possibile l’ultima versione di Microsoft EDGE, Firefox o Chrome per avere prestazioni ottimali.",
-    "try_test_viewer": "Prova test.map.geo.admin.ch",
-    "obstacle_started_last_4_days": "Ostacoli attivati negli ultimi 4 giorni",
-    "obstacle_deleted_last_4_days": "Ostacoli soppressi negli ultimi 4 giorni",
-    "draw_button_delete_last_point": "Cancellare l'ultimo punto",
-    "elevation_href": "https://www.swisstopo.admin.ch/it/livellazione-federale-svizzera-lf02",
-    "copy_cta": "Copiare",
-    "copy_done": "Copiato!",
-    "test_map_give_feedback": "Dare un feedback",
-    "legacy_drawing_warning": "Non è possibile modificare i disegni creati da map.geo.admin.ch sul sito test.map.geo.admin.ch. Se si desidera creare un nuovo disegno, è necessario rimuovere il disegno corrente o deselezionarlo.",
-    "draw_file_load_error": "Caricamento del KML non riuscito",
-    "draw_file_save_error": "Salvataggio del KML non riuscito",
-    "very_small_size": "",
-    "feedback_rating_text": "Diteci cosa ne pensate del nostro nuovo visualizzatore di carte",
-    "feedback_rating_title": "Come valuta la sua esperienza ? (obbligatorio)",
-    "send_failed": "Invio fallito",
-    "feedback_email": "La sua email (facoltativo)",
-    "feedback_invalid_email": "e-mail non valide",
-    "profile_no_data": "Nessun dato",
-    "view_on_mapgeoadminch_webmapviewer": "Vedi in {url}",
-    "full_width": "Larghezza intera",
-    "georessourcen": "Georisorse",
-    "georessourcen_service_link_label": "Ulteriori informazioni",
-    "georessourcen_service_link_href": "https://www.swisstopo.admin.ch/it/conoscenze-fatti/geologia/georisorse.html",
-    "topic_georessourcen_tooltip": "Georisorse",
-    "ch.swisstopo.swissimage": "Veduta aerea",
-    "ch.swisstopo.pixelkarte-grau": "Carta B/N",
-    "ch.swisstopo.pixelkarte-farbe": "Carta a colori",
-    "ch.swisstopo.swissimage_3d": "Veduta aerea",
-    "ch.swisstopo.swisstlm3d-karte-grau_3d": "Carta B/N",
-    "ch.swisstopo.swisstlm3d-karte-farbe_3d": "Carta a colori",
-    "loading_external_layer": "Caricamento del livello esterno",
-    "import_file": "Importare file",
-    "import_file_tooltip": "Importa un file KML o GPX esterno",
-    "import_file_succeeded": "Successo",
-    "invalid_file": "file non valido",
-    "no_url": "Nessun URL",
-    "loading_error_network_failure": "Impossibile caricare, file non accessibile",
-    "loading_file": "Caricamento del file...",
-    "invalid_kml_gpx_file_error": "File non valido, sono supportati solo file KML o GPX",
-    "import_maps": "Importa mappe",
-    "import_maps_tooltip": "Importare  dati WMTS WMS esterni",
-    "unsupported_content_type": "Tipo di contenuto della risposta non supportato",
-    "invalid_wms_capabilities": "Dati WMS Capabilities non validi",
-    "invalid_wmts_capabilities": "Dati WMTS Capabilities non validi",
-    "network_error": "Errore di rete",
-    "no_layer_found": "Nessun layer trovato",
-    "import_maps_url_placeholder": "WMTS WMS URL",
-    "import_file_url_placeholder": "GPX KML URL",
-    "no_result": "Nessun risultato",
-    "loading": "Caricamento",
-    "search_in_catalogue_placeholder": "Cerca nelle mappe importate",
-    "kml_gpx_file_out_of_bounds": "Il contenuto del file è fuori dai limiti della proiezione",
-    "kml_gpx_file_empty": "Il file KML/GPX è vuoto",
-    "large_size": "Grande",
-    "extra_large_size": "Extra Grande",
-    "duplicate_layer": "Mappa duplicata",
-    "feedback_empty_warning": "Il messaggio di segnalazione non può essere vuoto",
-    "operation_successful": "Successo!",
-    "operation_failed": "Oops! Qualcosa è andato storto. Si prega di riprovare.",
-    "operation_aborted": "Operazione annullata.",
-    "outside_valid_year_range": "L'anno inserito è al di fuori dell'intervallo disponibile:",
-    "linkedin_tooltip": "Condivida la carta su LinkedIn",
-    "share_map_title": "Link al geoportale della Confederazione Svizzera",
-    "link_description": "Descrizione del link  (facoltativo)",
-    "media_disclaimer": "Contiene contenuti di terze parti",
-    "drawing_attached": "Disegno aggiunto come allegato",
-    "switch_tooltip_attached_to_feature": "Collegare il tooltip alla geometria",
-    "switch_tooltip_floating": "Utilizzare un tooltip fluttuante",
-    "field_required": "Questo campo è obbligatorio",
-    "invalid_email": "e-mail non valido",
-    "no_email": "Il campo email è obbligatorio",
-    "file_unsupported_format": "Questo formato file non è supportato. Sono ammessi solo i seguenti formati: {allowedFormats}",
-    "form_invalid": "Il modulo non è valido",
-    "file_imported_success": "File importato con successo",
-    "3d_labels": "Nomi geografici",
-    "3d_vegetation": "Vegetazione",
-    "3d_constructions": "Edifici e costruzioni",
-    "webmapviewer_live_disclaimer": "Il visualizzatore di mappe sarà aggiornato in breve - <a target='_blank' href='https://www.geo.admin.ch/it/go-live-visualizzatore-di-mappe'>tenetevi pronti</a>",
-    "drawing_too_large": "Il suo disegno è troppo grande, rimuova alcuni elementi",
-    "3d_unsupported_projection": "La mappa non può essere visualizzata in 3D perché non supporta la proiezione EPSG:4326",
-    "geoloc_out_of_bounds": "La Sua posizione attuale è al di fuori della Svizzera e non può essere mostrata.",
-    "orient_map_north": "Orientare la mappa",
-    "kml_icon_url_cors_issue": "Il KML “{layerName}” contiene icone con l'URL {url} che non supporta CORS! Contattare l'amministratore di questo URL per aggiungere il supporto per CORS.",
-    "warning": "Avvertenza",
-    "legal_notice": "Informazioni legali",
-    "legal_notice_url": "https://www.geo.admin.ch/it/colophon-responsabilita-e-contatti"
+    "zoom_out": "Zoom indietro"
 }
diff --git a/src/modules/i18n/locales/rm.json b/src/modules/i18n/locales/rm.json
index 2f1090bd5..696490459 100644
--- a/src/modules/i18n/locales/rm.json
+++ b/src/modules/i18n/locales/rm.json
@@ -1,10 +1,16 @@
 {
+    "3d_constructions": "Edifizis ed installaziuns",
     "3d_ie11_alert": "Vus utilisais in InternetExplorer <= 11: La preschentaziun en 3D na vegn betg ad esser performanta. Utilisai per plaschair la versiun la pli nova da Microsoft EDGE, da Firefox u da Chrome per survegnir ils megliers resultats.",
+    "3d_labels": "Numns geografics",
     "3d_overlay_warning": "Remartga impurtanta: 3D datas non actualisata/ Datas da 2D en 3D.<br/>Vus guardais ussa datas che n'èn betg adattadas per la preschentaziun en 3D. Quai vala en spezial per chartas e fotografias ord l'aria. Quellas vegnan preschentadas en terren stip en 3D en moda defurmada.",
     "3d_pegman_help": "Smatga la tasta F per il modus offline.<br>Smatga la tasta H per l'agid.<br> Smatga Esc per returnar.",
     "3d_pegman_tooltip": "Tira mai sin la charta!",
     "3d_render_error": "Il sistem n'ademplescha betg las premissas per la vista da 3D. Per che la preschentaziun en 3D funcziuneschia, sto Voss apparat ademplir las suandantas pretensiuns. Utilisai la versiun la pli nova da Microsoft EDGE, da Firefox u da Chrome. Utilisaziun d'ina charta grafica actuala cun drivers actuals.",
+    "3d_unsupported_projection": "La carta na po betg vegnir mussada en 3D perquai ch'ella na sustegna betg la projecziun EPSG:4326",
+    "3d_vegetation": "Vegietaziun",
+    "Alle": "Errur cun stizzar las chartas memorisadas. Per plaschair empruvais anc ina giada.",
     "abort": "Annullar",
+    "about_us": "Über uns",
     "add": "Agiuntar",
     "add_image": "Agiuntar ina foto",
     "add_layer": "Agiuntar in Layer",
@@ -16,10 +22,9 @@
     "add_wmts_layer_failed": "Sbagl da chargiar il WMTS layer",
     "add_wmts_layer_succeeded": "Chargià cun success il WMTS Layer",
     "alert_title": "Attenziun!",
-    "Alle": "Errur cun stizzar las chartas memorisadas. Per plaschair empruvais anc ina giada.",
-    "appcache_update_available": "Ina nova versiun stat a disposiziun offline. La vulais Vus chargiar giu?",
     "app_feedback_button_text": "Feedback",
     "app_feedback_button_title": "dare il proprio feedback sull'applicazione",
+    "appcache_update_available": "Ina nova versiun stat a disposiziun offline. La vulais Vus chargiar giu?",
     "approx_abbr": "ca.",
     "are": "ARE",
     "are_service_link_href": "http://www.are.admin.ch/index.html?lang=de",
@@ -37,10 +42,10 @@
     "bafu": "UFAM",
     "bafu_service_link_href": "https://www.bafu.admin.ch/bafu/de/home.html",
     "bafu_service_link_label": "www.bafu.admin.ch",
+    "basis": "Charta da basa light",
     "bav": "UFT",
     "bav_service_link_href": "https://www.bav.admin.ch/bav/de/home.html",
     "bav_service_link_label": "Uffizi federal da traffic\n",
-    "topic_bav_tooltip": "Uffizi federal da traffic\n",
     "bfs": "UST",
     "bfs_service_link_href": "https://www.bfs.admin.ch/bfs/rm/home.html",
     "bfs_service_link_label": "Uffizi federal da statistica\n",
@@ -62,13 +67,19 @@
     "cancel": "Interrumper",
     "canton": "Chantun",
     "catalog": "Catalog",
+    "ch.swisstopo.pixelkarte-farbe": "Charta en colur",
+    "ch.swisstopo.pixelkarte-grau": "Charta en alv e nair",
+    "ch.swisstopo.swissimage": "Fotografia ord l'aria",
+    "ch.swisstopo.swissimage_3d": "Fotografia ord l'aria",
+    "ch.swisstopo.swisstlm3d-karte-farbe_3d": "Charta en colur",
+    "ch.swisstopo.swisstlm3d-karte-grau_3d": "Charta en alv e nair",
     "change_topic": "Tema",
     "choose_theme": "Midar tema  ",
     "choose_wms_url": "URL",
     "close": "Serrar",
     "close_menu": "Serrar menu",
-    "cms_link_button_url": "https://www.geo.admin.ch/rm/chartas/chartas.html",
     "cms_link_button_title": "Dapli infurmaziuns",
+    "cms_link_button_url": "https://www.geo.admin.ch/rm/chartas/chartas.html",
     "commune": "Vischnanca",
     "compare": "Confruntar",
     "confirm_remove_all_features": "Vulais Vus propi stizzar tut ils objects?",
@@ -78,12 +89,15 @@
     "contextpopup_lv03_url": "https://www.swisstopo.admin.ch/de/landestriangulation-lv03",
     "contextpopup_lv95_url": "https://www.swisstopo.admin.ch/de/schweizer-koordinatensystem",
     "coordinates_label": "Coordinatas (m)",
+    "copy_cta": "Copiar",
+    "copy_done": "Copià",
     "copy_success": "Link copià!",
     "copy_url": "Copiar il link",
     "copyright_data": "© Datas:",
     "copyright_label": "Cundiziuns d'utilisaziun",
     "copyright_url": "https://www.geo.admin.ch/de/allgemeine-nutzungsbedingungen-bgdi/",
     "ct": "Kt.",
+    "current_value": "Valur actuala",
     "custom_size": "Grondezza persunalisà",
     "data": "Datas:",
     "delete": "Stizzar",
@@ -91,11 +105,13 @@
     "description_instructions": "Descripziun dil layer WMS",
     "desktop_redirect": "Link tar versiun desktop",
     "display_profile": "Crear in profil",
+    "displayed": "Mussà",
     "distance_label": "Distanza",
     "district": "District",
     "draw": "Dissegnar",
     "draw_annotation": "Text",
     "draw_back": "Enavos / finir dissegnar",
+    "draw_button_delete_last_point": "Stizzar l'ultim punct",
     "draw_del_all_features": "Stizzar tut ils elements",
     "draw_del_selected_features": "Stizzar ils elements selecziunads",
     "draw_delete": "Stizzar",
@@ -104,6 +120,8 @@
     "draw_delete_selected_features": "Stizzar ils objects selecziunads",
     "draw_dl_kml": "TelechargiadaKML",
     "draw_export": "Export",
+    "draw_file_load_error": "Chargiar da KML n'è betg reussì",
+    "draw_file_save_error": "Arcunar la KML n'è betg reussì",
     "draw_file_saved": "Tut las midadas èn arcunadas",
     "draw_file_saving": "Arcunar ...",
     "draw_layer_label": "Dissegn",
@@ -151,22 +169,38 @@
     "draw_text_placeholder": "Betg titel",
     "draw_tooltip": "Dissegnar sin la carta",
     "draw_type_marker": "Lingia / surfatscha",
+    "drawing_attached": "Dissegn è agiuntà sco agiunta.",
+    "drawing_too_large": "Tes dissegn è memia grond, stizza intgins detagls",
     "drop_invalid_url": "URL è nunvalid",
     "drop_me_here": "Trair vi la datoteca KML nà qua",
+    "duplicate_layer": "Mapa duplicada",
     "east": "ost",
     "ech": "Catalog da geodatas",
     "ech_service_link_href": "https://www.geo.admin.ch/de/home.html",
     "ech_service_link_label": "geo.admin.ch",
     "edit_back": "Enavos / finir dissegnar",
+    "edit_confirm_reset_style": "Questa acziun allontanescha tut Vossas midadas ed applitgescha il stil standard dal nivel.",
+    "edit_current_layer": "Elavuraziun da l'unitad da datas",
+    "edit_file_saved": "Arcunà tut las midadas",
+    "edit_file_saving": "Arcunar ...",
+    "edit_fill_color": "Tscherner la colur",
+    "edit_fill_outline_color": "Tscherner la colur dals urs",
+    "edit_glstyle_choose_color": "Tscherner la colur",
+    "edit_glstyle_choose_layer": "Tscherner il nivel",
+    "edit_line_color": "Tscherner la colur da las lingias",
+    "edit_line_width": "Tscherner la grossezza da las lingias",
     "edit_mode_title": "Edition",
+    "edit_not_possible": "Displaschaivlamain na pudais Vus betg elavurar quest nivel. Tscherni per plaschair in auter fund.",
+    "edit_or_reset_style": "Quest nivel dovra in stil da terzs offerents. Vus na pudais betg midar tal, ma Vus pudais duvrar il stil standard, sche Vus cliccais sin quest buttun.",
     "edit_panel_title": "Style the map",
     "edit_reset": "Reset",
     "edit_share_file_disclaimer": "Voss stil vegn arcunà automaticamain per 1 onn. Utilisond quest servetsch acceptais Vus las  <a href='https://www.geo.admin.ch/de/allgemeine-nutzungsbedingungen-bgdi/' target='_blank'> cundiziuns d'utilisaziun</a>.",
-    "open_edit_bt_title": "Open style edition",
-    "edit_file_saved": "Arcunà tut las midadas",
-    "edit_file_saving": "Arcunar ...",
-    "edit_confirm_reset_style": "Questa acziun allontanescha tut Vossas midadas ed applitgescha il stil standard dal nivel.",
+    "edit_text_color": "Tscherner la colur dal text",
+    "edit_text_halo_color": "Tscherner la colur da la sumbriva",
+    "edit_text_size": "Tscherner la grondezza dal text",
+    "edit_visibility": "Preschentaziun",
     "elevation": "Autezza",
+    "elevation_href": "https://www.swisstopo.admin.ch/it/sistemi-di-riferimento-geodetici-svizzeri",
     "email_us": "E-mail",
     "emapis": "Svilup rural",
     "emapis_service_link_href": "mailto:info@blw.admin.ch",
@@ -179,6 +213,7 @@
     "export_kml_notsupported": "Voss browser na sustegna betg arcunar. Duvrai  IE10, Firefox u Chrome.",
     "external_data_tooltip": "Datas e/u stil da terzas partidas",
     "external_data_warning": "Attenziun: questas datas e/u stil derivan da partidas terzas  (--URL--). La disponibladad vegn garantida tras partidas terzas. Ultra da quai valan las cundiziuns dals patruns da las datas correspundentas.",
+    "extra_large_size": "Extra Grond",
     "facebook_tooltip": "Partais quella charta cun Voss amis",
     "feature": "Object",
     "featuresearch_results_header": "Ir al object ...",
@@ -188,18 +223,28 @@
     "feedback_description": "1. As annunziai en quest champ midadas da la charta, meglieraziuns da las datas u dumondas davart questa pagina d'internet (obligatorica) :",
     "feedback_disclaimer": "Cun trametter Vossa novitad As declerais Vus d'accord cun las <a href='https://www.geo.admin.ch/de/allgemeine-nutzungsbedingungen-bgdi' target='_blank'>cundiziuns d'utilisaziun</a>",
     "feedback_drawing": "2. Marcai il lieu pertutgà en la charta :",
+    "feedback_email": "Ihre E-Mail Adresse (optional)",
+    "feedback_empty_warning": "La messadi dal raport po betg esser vegnida lasciada basa",
     "feedback_error_message": "Problem: rapport na tramess cun success",
+    "feedback_invalid_email": "ungültige E-Mail",
     "feedback_kml_attached": "Trametter dissegn actual",
     "feedback_mail": "3. Voss e-mail:",
     "feedback_modify_drawing": "Editar la dissegn",
     "feedback_permalink": "Il suandant link vegn transmess:",
     "feedback_placeholder": "Agiuntai ina datoteca .pdf, .zip, .jpg, .jpeg, .kml, .kmz u .gpx",
+    "feedback_rating_text": "Teilen Sie uns Ihre Meinung zu unserem neuen Kartenviewer mit",
+    "feedback_rating_title": "Co giuditgais Vus Vossa experientscha? (obligatoric)",
     "feedback_success_message": "Messadi trasmess cun success. Grazia.",
     "feedback_unsupported_format": "Tip da datoteca betg supportà. Duvrai empè da quai pdf, .zip, .jpg, .jpeg, .kml, .kmz u .gpx",
+    "field_required": "Quest champ è obligatoric",
+    "file_imported_success": "Datoteca importada cun success",
     "file_is_not_kml": "Questa datoteca nun è ina datoteca KML",
     "file_too_large": "Questa datoteca è memia grond (grondezza maximala lubida: {maxFileSize})",
+    "file_unsupported_format": "Quest format da datoteca na vegn betg sustegnì. Sun ils seguents formats èn permess: {allowedFormats}",
     "follow_us": "Giais suenter a nus",
+    "form_invalid": "Il formular è nunvalaivel",
     "full_screen": "Maletg entir",
+    "full_width": "larghezza entira",
     "funksender": "Emettur radiofonic ",
     "funksender_service_link_href": "mailto:info@bakom.admin.ch",
     "funksender_service_link_label": "info@bakom.admin.ch",
@@ -209,6 +254,7 @@
     "geol": "Geologia",
     "geol_service_link_href": "http://www.geologieportal.ch/internet/geologieportal/de/home.html",
     "geol_service_link_label": "www.geologieportal.ch",
+    "geoloc_out_of_bounds": "Voss lieu actual sa chatta ordaifer la Svizra e na po betg vegnir mussà",
     "geoloc_permission_denied": "La posiziun na po betg vegnir determinada, perquai che la configuraziun da Voss browser na permetta betg quai. Permettai da determinar la posiziun e deactivai il modus \"privat\" dal browser.",
     "geoloc_pos_unavailable": "La posiziun na po betg vegnir fixada. Messadi da sbagl da l'apparat (WiFi, GPS) Controllai la configuraziun.",
     "geoloc_start_tracking": "Activar il posiziunament",
@@ -216,8 +262,10 @@
     "geoloc_stop_tracking": "Deactivar il posiziunament",
     "geoloc_time_out": "n timeout da Voss apparat tar la fixaziun da la posiziun è vegnì cuntanschì. Empruvai per plaschair pli tard.",
     "geoloc_unknown": "Pervia d'in sbagl nunenconuschent n'ha la fixaziun da la posiziun betg gì success. Controllai la configuraziun da localisaziun, da sfera privata ed il firewall da Voss apparat.",
-    "re_center_map": "Centrar la charta sin la posiziun",
     "geolocation": "Geolocation",
+    "georessourcen": "Georessourcen",
+    "georessourcen_service_link_href": "https://www.swisstopo.admin.ch/de/wissen-fakten/geologie/georessourcen.html",
+    "georessourcen_service_link_label": "Ulteriuras infurmaziuns",
     "geothermie": "Geotermia",
     "geothermie_service_link_href": "http://www.geologieportal.ch/internet/geologieportal/de/home/topics/energy/geothermalenergy/shortdesc.html",
     "geothermie_service_link_label": "Ulteriuras infurmaziuns",
@@ -234,11 +282,21 @@
     "help_search_data": "En la \"retschertga\" pudais Vus scriver las noziuns da tschertga (p.ex. \"palì\", \"via\", \"terratrembel\" e.u.v.) e tschertgar las descripziuns da tut las geodatas electronicas disponiblas en moda centrala. Sche Vus tschernis in resultat, vegn quel preschentà directamain en il program per mussar chartas.",
     "help_search_data_link": "Tschertgar ulteriuras chartas?",
     "help_search_data_title": "Tschertgar charta ",
+    "hidden": "Zuppà",
+    "hide": "Deactivar",
     "hide_profile": "Zuppar il profil",
     "homescreen_content": "Nus cussegliain Vus da utilisar questa funcziun per plazzar questa applicaziun directamain sin Vossa pagina iniziala",
     "homescreen_title": "Pagina iniziala",
+    "hydrology": "Idrologia",
     "import": "Importar",
+    "import_file": "Importar ina datoteca",
+    "import_file_succeeded": "Success",
+    "import_file_tooltip": "Importar ina datoteca esterna KML u GPX",
+    "import_file_url_placeholder": "GPX KML URL",
     "import_kml": "Importar KML",
+    "import_maps": "Importar charta",
+    "import_maps_tooltip": "Agiuntar in unitad da datas WMTS WMS externa",
+    "import_maps_url_placeholder": "WMTS WMS URL",
     "import_online_placeholder": "WMTS WMS GPX KML URL",
     "import_tooltip": "Agiuntar in unitad da datas WMTS WMS GPX KML externa",
     "import_wms": "Importar WMS",
@@ -246,13 +304,17 @@
     "inspire": "INSPIRE",
     "inspire_service_link_href": "https://www.geo.admin.ch/rm/home.html",
     "inspire_service_link_label": "geo.admin.ch",
+    "invalid_email": "ungültige E-Mail",
+    "invalid_file": "Datotecadad nun vala",
+    "invalid_kml_gpx_file_error": "Datotecadad nun vala, èn ancum suttatschadas ils files KML u GPX.",
     "invalid_url": "URL è nunvalid",
-    "item": "Ir al object ...",
-    "items": "Objects",
+    "invalid_wms_capabilities": "Dadis WMS Capabilitiesinvalid",
+    "invalid_wmts_capabilities": "Dadis WMTS Capabilitiesinvalid",
     "isos": "Lieus ISOS",
     "isos_service_link_href": "https://www.bak.admin.ch/bak/rm/home/baukultur/isos-und-ortsbildschutz.html",
     "isos_service_link_label": "UFC - Inventari ISOS",
-    "topic_isos_tooltip": "Lieus ISOS",
+    "item": "Ir al object ...",
+    "items": "Objects",
     "ivs": "Vias da com. ist.",
     "ivs_service_link_href": "http://www.ivs.admin.ch/",
     "ivs_service_link_label": "www.ivs.admin.ch",
@@ -260,9 +322,19 @@
     "kgs_service_link_href": "http://www.babs.admin.ch/de/aufgabenbabs/kgs/inventar.html",
     "kgs_service_link_label": "Protecziun dals bains culturals",
     "kml": "KML",
+    "kml_gpx_file_empty": "La datoteca KML/GPX è vegnida empruva",
+    "kml_gpx_file_out_of_bounds": "Il contetn dal file è en furma da las limitas da projezziun",
+    "kml_icon_url_cors_issue": "Il KML \"{layerName}\" cuntegna icona(s) cun URL {url} che na po nagin sustegnair CORS! As drizzai p.pl. a l'administratura da quella URL per agiuntar il sustegn dal CORS.",
     "kml_no_text_elements": " Infurmaziun: ils labels na vegnan betg memorisads",
+    "kml_style_default": "Standard",
+    "kml_style_geoadmin": "GeoAdmin",
     "kmlimport_tooltip": "Agiuntar in unitad da datas externa KML",
+    "labels": "Labels",
+    "landcover_grass": "Landcover grass",
+    "landuse": "Zona verda",
+    "landuse-residential": "Landuse residential",
     "lang_chooser_label": "Lingua",
+    "large_size": "Grond",
     "last_available_year": "Last year",
     "layer_cant_be_displayed_in_3d": "Las suandantas unitads da datas (da funtaunas externas) na pon betg vegnir preschentadas en 3D, perquai ch'il sustegn per la projecziun EPSG:4326 manca:",
     "layer_cant_be_printed": "Las suandantas datas (da funtaunas externas) na pon betg vegnir stampadas, pervia da mancanza d'in sustegn da la projecziun EPSG:2056:",
@@ -272,10 +344,23 @@
     "layer_selection": "Selecziun",
     "layers_displayed": "Chartas preschentadas",
     "layers_results_header": "Agiuntar charta ...",
+    "legacy_drawing_warning": "Es ist nicht möglich, eine von map.geo.admin.ch erstellte Zeichnung auf der Website test.map.geo.admin.ch zu bearbeiten. Wenn Sie eine neue Zeichnung erstellen möchten, müssen Sie entweder die aktuelle Zeichnung entfernen oder die Auswahl aufheben.",
+    "legal_notice": "Dapli infurmaziuns",
+    "legal_notice_url": "https://www.geo.admin.ch/de/impressum-verantwortlichkeiten-und-kontakte",
     "legend": "Legenda",
+    "light_blue": "blau cler",
+    "light_gray": "grisch cler",
+    "light_green": "verd cler",
+    "light_yellow": "mellen cler",
     "link_bowl_crosshair": "Parter posiziun",
+    "link_description": "Descripziun link (optional)",
     "link_validate_kml": "Link zur Validierung der KML-Datei",
+    "linkedin_tooltip": "Partais quella charta sin LinkedIn",
     "load_local_file": "Chargiar",
+    "loading": "Chargiada",
+    "loading_error_network_failure": "Na pudì cargar, il file na stat betg accessibel.",
+    "loading_external_layer": "Chargiar la strata esterna",
+    "loading_file": "La datoteca vegn chargiada",
     "locations": "Ir a ...",
     "locations_results_header": "Ir a ...",
     "locations_results_header_fuzzy": "Manegiais Vus eventualmain...",
@@ -291,6 +376,7 @@
     "measure": "Mesirar",
     "measure_instruction": "Digitalisai ina polilingia ...",
     "measure_tooltip": "Mesirar sin la carta",
+    "media_disclaimer": "Contegn contens da terzas partidas",
     "medium_size": "Media",
     "menu": "Menu",
     "metadata_window_title": "Infobox",
@@ -304,9 +390,12 @@
     "modify_existing_vertex_linepolygon": "Cliccar per stizzar il punct (2 puncts minimum).</br> Spustar punct :cliccar e trair",
     "modify_existing_vertex_marker": "Spustar signalisaziun :cliccar e trair",
     "modify_existing_vertex_measure": "Cliccar per stizzar il punct (2 puncts minimum).</br> Spustar punct :cliccar e trair",
-    "modify_icon_category_label": "Segni",
-    "modify_icon_category_default_label": "Standard",
+    "modify_icon_category_babs-D_label": "Zivile Signaturen D",
+    "modify_icon_category_babs-F_label": "Zivile Signaturen F",
+    "modify_icon_category_babs-I_label": "Zivile Signaturen I",
     "modify_icon_category_babs_label": "Zivile Signaturen",
+    "modify_icon_category_default_label": "Standard",
+    "modify_icon_category_label": "Segni",
     "modify_icon_label": "Simbols",
     "modify_icon_size_label": "Grondezza",
     "modify_new_vertex_linepolygon": "Cliccar per agiuntar punct. Spustar punct :cliccar e trair",
@@ -316,15 +405,21 @@
     "modify_text_size_label": "Grondezza",
     "more_info": "Ulteriuras infurmaziuns ...",
     "movie": "Seria temporala (Multi-PDF)",
+    "mvt_ie11_alert": "Vus utilisais in InternetExplorer ≤ 11 : Utilisai per plaschair la versiun la pli nova da Microsoft EDGE, da Firefox u da Chrome per survegnir ils megliers resultats.",
+    "network_error": "Errur da retg",
     "never_show_again": "Betg pli mussar questa infurmaziun.",
     "nga": "Atlas da spectrum lartg ",
     "nga_service_link_href": "https://www.bakom.admin.ch/bakom/de/home.html",
     "nga_service_link_label": "www.bakom.admin.ch",
+    "no_email": "Il champ da posta eletronicala è necessari",
     "no_feature_results": "Chattà nagins objects",
     "no_file": "Nagina datoteca",
+    "no_layer_found": "Nagut strato chattà",
     "no_layers_info": "Nagin layer sin la charta",
     "no_more_information": "Naginas infurmaziuns ulteriuras",
+    "no_result": "Nagut resultat",
     "no_searchable_layer": "Nagina unitad da datas disponibla",
+    "no_url": "Nagin URL",
     "north": "nord",
     "not_available": "Betg disponibel",
     "not_available_3d": "Betg disponibel en 3D!",
@@ -334,7 +429,9 @@
     "notruf_service_link_label": "geo.admin.ch",
     "object_information": "Infurmaziun da l'object",
     "obstacle_deleted_last_2_weeks": "Obstachels stizzads las ultimas 2 emnas",
+    "obstacle_deleted_last_4_days": "Obstachels stizzads ils ultims 4 dis",
     "obstacle_started_last_2_weeks": "Obstachels activads da las ultimas 2 emnas",
+    "obstacle_started_last_4_days": "Obstachels activads ils ultims 4 dis",
     "offline_abort": "Annullar",
     "offline_abort_warning": "Vulais Vus propi stizzar tut las chartas?",
     "offline_bad_layer_type": "Ina da las unitads da datas na po betg vegnir arcunada per la duvrar offline.",
@@ -355,9 +452,15 @@
     "offline_sorry": "Mumentan nun essas Vus betg collià",
     "offline_space_warning": "La capacitad da memorisar na tanscha betg. Per plaschair rendai disponibel ~50MB sin Voss computer.",
     "offline_zoom_extent": "Zoom vers l'extract ",
+    "open_edit_bt_title": "Open style edition",
     "open_menu": "Avrir menu",
+    "operation_aborted": "Operaziun avorta",
     "operation_canceled": "Operaziun interutta",
+    "operation_failed": "Oops! Insatge è ì mal. Per plaschair empruvai anc ina giada.",
+    "operation_successful": "Success! ",
     "orange": "oransch",
+    "orient_map_north": "Orientar la carta",
+    "outside_valid_year_range": "L'onn entrà sa chatta ordaifer il sectur disponibe:",
     "page_description": "map.geo.admin.ch è la plattafurma da chartas da la Confederaziun svizra. Access a las chartas, geoinfurmaziuns, a las geodatas, als geoservetschs ed a las metadatas da la Svizra.",
     "page_title": "Chartas da la Svizra - Confederaziun svizra - map.geo.admin.ch",
     "parcel": "Parzelle",
@@ -381,6 +484,7 @@
     "profile_elevation_down": "Descensiun",
     "profile_elevation_up": "Ascensiun",
     "profile_hike_time": "Temp da viandar",
+    "profile_no_data": "Nagina data",
     "profile_poi_down": "Punct il pli bass",
     "profile_poi_up": "Punct il pli aut",
     "profile_slope_distance": "Traject",
@@ -388,6 +492,7 @@
     "profile_too_many_points_error": "La dumonda dal profil era memia gronda e n'ha betg pudì vegnir elavurada.",
     "profile_x_label": "Distanza",
     "profile_y_label": "Autezza",
+    "purple": "lila",
     "qrcode_tooltip": "Creais in QRCode e avris la charta sin Voss apparat movibel",
     "queries": "Filters (BETA)",
     "query_alert_more_than_200_results": "Vossa retschertga ha passa 200 resultats!",
@@ -403,6 +508,7 @@
     "query_reset": "Reinizialisar la cundiziun",
     "query_search": "Tschertgar",
     "query_with_bbox": "Duvrar l'extract da la charta",
+    "re_center_map": "Centrar la charta sin la posiziun",
     "read_failed": "Errur d'import",
     "read_succeeded": "Chargiar reussì",
     "reading_file": "La datoteca vegn chargiada",
@@ -411,6 +517,7 @@
     "reduce_label": "empitschnir",
     "remove": "Stizzar",
     "revision_service": "Servetsch da revisiun da swisstopo",
+    "roadtraffic": "Vias",
     "rotate_left": "Volver a sanestra",
     "rotate_reset": "Orientar la charta puspè vers nord",
     "rotate_right": "Volver a dretga",
@@ -421,10 +528,10 @@
     "schneesport_service_link_href": "https://shop.swisstopo.admin.ch/de/products/maps/leisure/ski_tour_maps",
     "schneesport_service_link_label": "Sport da naiv",
     "schule": "Per la scola",
-    "topic_schule_tooltip": "Per la scola",
     "schule_service_link_href": "http://www.schoolmaps.ch",
     "schule_service_link_label": "www.schoolmaps.ch",
     "search_help": "Agid",
+    "search_in_catalogue_placeholder": "Tschertga en chartas importadas",
     "search_placeholder": "Tschertga d'adressas, parcellas u cartas",
     "search_title": "Tschertgar lieu u agiuntar charta :",
     "select_feature_annotation": "Cliccar per tscherner il text",
@@ -433,7 +540,9 @@
     "select_feature_measure": "Cliccar per tscherner il mesiraziun",
     "select_no_feature": "Kein Element zur Auswahl",
     "send": "Trametter",
+    "send_failed": "Trametter malreussì",
     "settings": "Configuraziun ",
+    "settlement": "Territori d'abitadi",
     "share": "Parter",
     "share_disclaimer": "Vus pudais integrar la charta en Vossa pagina d'internet u en in blog. <a href='https://www.geo.admin.ch/de/web-integration-iframe/' target='_blank'>Cundiziuns d'utilisaziun</a>",
     "share_file_disclaimer": "Voss dissegn vegn arcunà automaticamain per 1 onn. Utilisond quest servetsch acceptais Vus las  <a href='https://www.geo.admin.ch/de/allgemeine-nutzungsbedingungen-bgdi/' target='_blank'> cundiziuns d'utilisaziun</a>.",
@@ -441,6 +550,7 @@
     "share_less": "Integrar:",
     "share_link": "Parter il link",
     "share_link_tooltip": "Smatgai Ctrl+C per copiar",
+    "share_map_title": "Link al geoportail da la Confederaziun Svizra",
     "share_more": "Integrar ...",
     "share_preview": "Prevista da la grondezza effectiva",
     "shop_cancel": "Interrumper",
@@ -453,6 +563,7 @@
     "shop_not_available": "La charta è actualmain exausta.",
     "shop_or_fill": "u emplenì ils champs (coordinatas LV95)",
     "shop_order": "Empustar",
+    "show": "Mussar",
     "show_more_options": "Prevista",
     "show_more_results": "Chargiar ulteriurs resultats ...",
     "small_size": "Pitschen",
@@ -464,27 +575,32 @@
     "swisstopo": "swisstopo",
     "swisstopo_service_link_href": "https://www.swisstopo.admin.ch/de/home.html",
     "swisstopo_service_link_label": "Uffizi federal da topografia swisstopo",
-    "test_host_warning": "PAGINA DA TEST ? BETG PARTER – BETG PER IL DIEVER PRODUCTIV",
+    "switch_kml_style": "Midar il stil",
+    "switch_tooltip_attached_to_feature": "Agiuntar il detagl da la geometria",
+    "switch_tooltip_floating": "Duvrar in tool sin ballarait",
+    "territory": "Territori",
     "test_host_full_disclaimer": "Questa pagina è fatga mo per intents da test e na duess betg vegnir duvrada en conturns productivs. I na dat absolutamain nagina garanzia per il diever.",
+    "test_host_warning": "PAGINA DA TEST ? BETG PARTER – BETG PER IL DIEVER PRODUCTIV",
+    "test_map_give_feedback": "Dar feedback",
     "text_to_display": "Descripziun link",
     "third_party_data_warning": "Attenziun: questas datas e/u stil derivan d'in terz purschider. Quest permalink va eventualmain sin datas d'in terz purschider. Vulais Vus tuttina chargiar questas datas?",
     "tile": "Fegl da la charta",
+    "tilt3d_active": "Midar a la preschentaziun en 2D",
+    "tilt3d_disabled": "Quest fund na po betg vegnir utilisà en 3D.",
+    "tilt3d_inactive": "Midar a la preschentaziun en 3D",
     "tilt_down": "Inclinar la preschentaziun vers engiu",
     "tilt_down_disabled": "Ins na po betg inclinar pli ferm vers engiu",
     "tilt_reset": "Reinizialisar la preschentaziun inclinada",
     "tilt_up": "Inclinar la preschentaziun vers ensi",
     "tilt_up_disabled": "Ins na po betg inclinar pli ferm vers ensi",
-    "tilt3d_active": "Midar a la preschentaziun en 2D",
-    "tilt3d_disabled": "Quest fund na po betg vegnir utilisà en 3D.",
-    "tilt3d_inactive": "Midar a la preschentaziun en 3D",
     "time_all": "Tut",
     "time_bt_disabled_tooltip": "La visualisaziun istorica da las datas è pussaivla mo cun ils layers istorisads. Vus stuais l'emprim chargiar in'unitad da datas istorisadas en la charta.",
     "time_current": "Actual",
     "time_hide": "Deactivar la visualisaziun istorica da las datas.",
     "time_select_year": "Selecziunai in onn",
     "time_show": "Activar la visualisaziun istorica da las datas.",
-    "time_slider_legend_tippy_intro": "Il temp slider mussa differentas colurs, tut tenor sche las stresas dal temp han datas per l'onn tschernì u betg.",
     "time_slider_legend_tippy_full_data": "Datas cumplettas",
+    "time_slider_legend_tippy_intro": "Il temp slider mussa differentas colurs, tut tenor sche las stresas dal temp han datas per l'onn tschernì u betg.",
     "time_slider_legend_tippy_no_data": "Naginas datas",
     "time_slider_legend_tippy_partial_data": "Datas parzialas",
     "title": "Titel",
@@ -493,6 +609,7 @@
     "topic_astra_tooltip": "Uffizi federal da vias",
     "topic_aviation_tooltip": "Datas davart l'aviatica en Svizra",
     "topic_bafu_tooltip": "Uffizi federal d’ambient",
+    "topic_bav_tooltip": "Uffizi federal da traffic\n",
     "topic_bfs_tooltip": "Uffizi federal da statistica\n",
     "topic_blw_tooltip": "Uffizi federal d’agricultura",
     "topic_cadastre_tooltip": "Infos bains immobigliars",
@@ -502,9 +619,11 @@
     "topic_funksender_tooltip": "Emettur radiofonic ",
     "topic_geodesy_tooltip": "Geodesia",
     "topic_geol_tooltip": "Geologia",
+    "topic_georessourcen_tooltip": "Georessourcen",
     "topic_geothermie_tooltip": "Geotermia",
     "topic_gewiss_tooltip": "Infurmaziuns da las auas",
     "topic_inspire_tooltip": "INSPIRE",
+    "topic_isos_tooltip": "Lieus ISOS",
     "topic_ivs_tooltip": "Inventari federal da las vias da communicaziun istoricas",
     "topic_kgs_tooltip": "Protecziun dals bains culturals",
     "topic_luftbilder_tooltip": "Fotografia ord l'aria",
@@ -513,48 +632,55 @@
     "topic_notruf_tooltip": "Clom d'urgenza",
     "topic_sachplan_tooltip": "Plans sectorals",
     "topic_schneesport_tooltip": "Sport da naiv",
+    "topic_schule_tooltip": "Per la scola",
     "topic_swisstopo_tooltip": "Uffizi federal da topografia",
     "topic_verteidigung_tooltip": "Defensiun",
     "topic_vu_tooltip": "Accidents da traffic",
     "topic_wildruhezonen_tooltip": "Zonas da paus per la selvaschina en Svizra",
     "transparency": "Transparenza",
+    "try_test_viewer": "Empruvai test.map.geo.admin.ch",
     "twitter_tooltip": "Tschivlottais questa charta",
+    "unsupported_content_type": "Tip da containt da resposta betg sustegnì",
     "upload_failed": "Errur da chargiar",
     "upload_succeeded": "Chargiar reussì",
     "uploading_file": "La datoteca vegn chargiada",
     "url_image": "Link a la fotografia",
     "url_link": "Link a la pagina d’internet",
     "url_video": "Link al video",
-    "vector_feedback_description_title": "Vector Tiles CHARTA DA BASA",
-    "vector_feedback_tryit_title": "Faschai in test cun nossa nova charta vectoriala!",
-    "vector_feedback_description_text": "La charta consista da <b>vector tiles</b> enstagl da quadrels da raster. Ella vegn dissegnada directamain en Voss browser sin basa da datas ch'èn vegnidas retratgas mo ina giada. La charta cumpara pli spert sin il monitur e Vus pudais modifitgar levamain sia apparientscha. Per render il design ed il chargiar la carta a moda anc pli simpla èn ils nivels da las datas organisads pli survesaivel. Cun in pèr paucs nivels pudais Vus ussa crear svelt e simpel Vossa atgna charta! <b>Empruvai ina giada! </b><b style=\"color: #ff6961;\">TEST Viewer optimà per browsers actuals.</b>",
-    "vector_feedback_choose_style": "Midar la preschentaziun",
-    "vector_feedback_select_style": "Midar il stil",
-    "vector_feedback_choose_layer": "Tscherner il nivel",
     "vector_feedback_choose_color": "Tscherner la colur",
-    "vector_feedback_labels_on_off": "Tschentar en/ora las inscripziuns",
-    "vector_feedback_getting_started_title": "Per sviluppaders",
+    "vector_feedback_choose_layer": "Tscherner il nivel",
+    "vector_feedback_choose_style": "Midar la preschentaziun",
     "vector_feedback_create_your_own": "Far atgna charta da fund",
+    "vector_feedback_description_text": "La charta consista da <b>vector tiles</b> enstagl da quadrels da raster. Ella vegn dissegnada directamain en Voss browser sin basa da datas ch'èn vegnidas retratgas mo ina giada. La charta cumpara pli spert sin il monitur e Vus pudais modifitgar levamain sia apparientscha. Per render il design ed il chargiar la carta a moda anc pli simpla èn ils nivels da las datas organisads pli survesaivel. Cun in pèr paucs nivels pudais Vus ussa crear svelt e simpel Vossa atgna charta! <b>Empruvai ina giada! </b><b style=\"color: #ff6961;\">TEST Viewer optimà per browsers actuals.</b>",
+    "vector_feedback_description_title": "Vector Tiles CHARTA DA BASA",
     "vector_feedback_edit_map": "Elavurar la charta",
     "vector_feedback_getting_started_1": "En nossa",
     "vector_feedback_getting_started_2": "documentaziun davart ils servetschs",
     "vector_feedback_getting_started_3": "chattais Vus infurmaziuns, co che Vus pudais duvrar Vector Tiles en Vossas atgnas applicaziuns.",
-    "vector_feedback_survey_title": "Voss feedback è impurtant. (1 minuta)",
-    "vector_feedback_survey_btn_text": "Enquista",
-    "vector_feedback_survey_modal_title": "Vectur",
-    "vector_feedback_style_default": "Standard",
+    "vector_feedback_getting_started_title": "Per sviluppaders",
+    "vector_feedback_labels_on_off": "Tschentar en/ora las inscripziuns",
+    "vector_feedback_select_style": "Midar il stil",
     "vector_feedback_style_color": "A",
+    "vector_feedback_style_default": "Standard",
     "vector_feedback_style_grey": "B",
     "vector_feedback_style_lsd": "C",
+    "vector_feedback_survey_btn_text": "Enquista",
+    "vector_feedback_survey_modal_title": "Vectur",
+    "vector_feedback_survey_title": "Voss feedback è impurtant. (1 minuta)",
+    "vector_feedback_tryit_title": "Faschai in test cun nossa nova charta vectoriala!",
     "verteidigung": "Defensiun",
     "verteidigung_service_link_href": "http://www.vtg.admin.ch/de/armee.html",
     "verteidigung_service_link_label": "www.vtg.admin.ch",
+    "very_small_size": "Sehr klein",
     "view_on_mapgeoadminch": "Contemplar in {{url}}",
+    "view_on_mapgeoadminch_webmapviewer": "Contemplar in {url}",
     "void_layer": "Nagina fund",
     "vu": "Accidents da traffic",
     "vu_service_link_href": "http://www.unfalldaten.ch ",
     "vu_service_link_label": "UVIAS - datas d'accidents",
     "wait_data_loading": "Chargiar ...",
+    "warning": "Avertiment",
+    "webmapviewer_live_disclaimer": "Il visualisader da chartas vegn actualisà proximamain - <a target='_blank' href='https://www.geo.admin.ch/de/go-live-kartenviewer'>stai pronts</a>",
     "west": "vest",
     "whatsapp_tooltip": "Partais quella charta cun Voss amis",
     "white": "alv",
@@ -565,127 +691,8 @@
     "wms": "WMS",
     "wms_max_size_allowed": "Capacitad da WMS maximala ",
     "wmsimport_tooltip": "Agiuntar in server externa WMS",
+    "woodland": "Guaud",
     "yellow": "mellen",
     "zoom_in": "Engrondir l'extract da la charta",
-    "zoom_out": "Empitschnir l'extract da la charta",
-    "edit_glstyle_choose_color": "Tscherner la colur",
-    "edit_glstyle_choose_layer": "Tscherner il nivel",
-    "landuse-residential": "Landuse residential",
-    "landcover_grass": "Landcover grass",
-    "edit_not_possible": "Displaschaivlamain na pudais Vus betg elavurar quest nivel. Tscherni per plaschair in auter fund.",
-    "edit_current_layer": "Elavuraziun da l'unitad da datas",
-    "edit_fill_color": "Tscherner la colur",
-    "edit_text_color": "Tscherner la colur dal text",
-    "edit_text_size": "Tscherner la grondezza dal text",
-    "edit_text_halo_color": "Tscherner la colur da la sumbriva",
-    "show": "Mussar",
-    "hide": "Deactivar",
-    "displayed": "Mussà",
-    "hidden": "Zuppà",
-    "edit_fill_outline_color": "Tscherner la colur dals urs",
-    "edit_line_color": "Tscherner la colur da las lingias",
-    "edit_line_width": "Tscherner la grossezza da las lingias",
-    "light_gray": "grisch cler",
-    "light_green": "verd cler",
-    "light_blue": "blau cler",
-    "light_yellow": "mellen cler",
-    "purple": "lila",
-    "edit_or_reset_style": "Quest nivel dovra in stil da terzs offerents. Vus na pudais betg midar tal, ma Vus pudais duvrar il stil standard, sche Vus cliccais sin quest buttun.",
-    "basis": "Charta da basa light",
-    "labels": "Labels",
-    "roadtraffic": "Vias",
-    "hydrology": "Idrologia",
-    "landuse": "Zona verda",
-    "settlement": "Territori d'abitadi",
-    "territory": "Territori",
-    "woodland": "Guaud",
-    "edit_visibility": "Preschentaziun",
-    "current_value": "Valur actuala",
-    "mvt_ie11_alert": "Vus utilisais in InternetExplorer ≤ 11 : Utilisai per plaschair la versiun la pli nova da Microsoft EDGE, da Firefox u da Chrome per survegnir ils megliers resultats.",
-    "try_test_viewer": "Empruvai test.map.geo.admin.ch",
-    "obstacle_started_last_4_days": "Obstachels activads ils ultims 4 dis",
-    "obstacle_deleted_last_4_days": "Obstachels stizzads ils ultims 4 dis",
-    "draw_button_delete_last_point": "Stizzar l'ultim punct",
-    "elevation_href": "https://www.swisstopo.admin.ch/it/sistemi-di-riferimento-geodetici-svizzeri",
-    "copy_cta": "Copiar",
-    "copy_done": "Copià",
-    "test_map_give_feedback": "Dar feedback",
-    "legacy_drawing_warning": "Es ist nicht möglich, eine von map.geo.admin.ch erstellte Zeichnung auf der Website test.map.geo.admin.ch zu bearbeiten. Wenn Sie eine neue Zeichnung erstellen möchten, müssen Sie entweder die aktuelle Zeichnung entfernen oder die Auswahl aufheben.",
-    "draw_file_load_error": "Chargiar da KML n'è betg reussì",
-    "draw_file_save_error": "Arcunar la KML n'è betg reussì",
-    "very_small_size": "Sehr klein",
-    "feedback_rating_text": "Teilen Sie uns Ihre Meinung zu unserem neuen Kartenviewer mit",
-    "feedback_rating_title": "Co giuditgais Vus Vossa experientscha? (obligatoric)",
-    "send_failed": "Trametter malreussì",
-    "feedback_email": "Ihre E-Mail Adresse (optional)",
-    "feedback_invalid_email": "ungültige E-Mail",
-    "profile_no_data": "Nagina data",
-    "view_on_mapgeoadminch_webmapviewer": "Contemplar in {url}",
-    "full_width": "larghezza entira",
-    "georessourcen": "Georessourcen",
-    "georessourcen_service_link_label": "Ulteriuras infurmaziuns",
-    "georessourcen_service_link_href": "https://www.swisstopo.admin.ch/de/wissen-fakten/geologie/georessourcen.html",
-    "topic_georessourcen_tooltip": "Georessourcen",
-    "ch.swisstopo.swissimage": "Fotografia ord l'aria",
-    "ch.swisstopo.pixelkarte-grau": "Charta en alv e nair",
-    "ch.swisstopo.pixelkarte-farbe": "Charta en colur",
-    "ch.swisstopo.swissimage_3d": "Fotografia ord l'aria",
-    "ch.swisstopo.swisstlm3d-karte-grau_3d": "Charta en alv e nair",
-    "ch.swisstopo.swisstlm3d-karte-farbe_3d": "Charta en colur",
-    "loading_external_layer": "Chargiar la strata esterna",
-    "import_file": "Importar ina datoteca",
-    "import_file_tooltip": "Importar ina datoteca esterna KML u GPX",
-    "import_file_succeeded": "Success",
-    "invalid_file": "Datotecadad nun vala",
-    "no_url": "Nagin URL",
-    "loading_error_network_failure": "Na pudì cargar, il file na stat betg accessibel.",
-    "loading_file": "La datoteca vegn chargiada",
-    "invalid_kml_gpx_file_error": "Datotecadad nun vala, èn ancum suttatschadas ils files KML u GPX.",
-    "import_maps": "Importar charta",
-    "import_maps_tooltip": "Agiuntar in unitad da datas WMTS WMS externa",
-    "unsupported_content_type": "Tip da containt da resposta betg sustegnì",
-    "invalid_wms_capabilities": "Dadis WMS Capabilitiesinvalid",
-    "invalid_wmts_capabilities": "Dadis WMTS Capabilitiesinvalid",
-    "network_error": "Errur da retg",
-    "no_layer_found": "Nagut strato chattà",
-    "import_maps_url_placeholder": "WMTS WMS URL",
-    "import_file_url_placeholder": "GPX KML URL",
-    "no_result": "Nagut resultat",
-    "loading": "Chargiada",
-    "search_in_catalogue_placeholder": "Tschertga en chartas importadas",
-    "kml_gpx_file_out_of_bounds": "Il contetn dal file è en furma da las limitas da projezziun",
-    "kml_gpx_file_empty": "La datoteca KML/GPX è vegnida empruva",
-    "large_size": "Grond",
-    "extra_large_size": "Extra Grond",
-    "duplicate_layer": "Mapa duplicada",
-    "feedback_empty_warning": "La messadi dal raport po betg esser vegnida lasciada basa",
-    "operation_successful": "Success! ",
-    "operation_failed": "Oops! Insatge è ì mal. Per plaschair empruvai anc ina giada.",
-    "operation_aborted": "Operaziun avorta",
-    "outside_valid_year_range": "L'onn entrà sa chatta ordaifer il sectur disponibe:",
-    "linkedin_tooltip": "Partais quella charta sin LinkedIn",
-    "share_map_title": "Link al geoportail da la Confederaziun Svizra",
-    "link_description": "Descripziun link (optional)",
-    "media_disclaimer": "Contegn contens da terzas partidas",
-    "drawing_attached": "Dissegn è agiuntà sco agiunta.",
-    "switch_tooltip_attached_to_feature": "Agiuntar il detagl da la geometria",
-    "switch_tooltip_floating": "Duvrar in tool sin ballarait",
-    "field_required": "Quest champ è obligatoric",
-    "invalid_email": "ungültige E-Mail",
-    "no_email": "Il champ da posta eletronicala è necessari",
-    "file_unsupported_format": "Quest format da datoteca na vegn betg sustegnì. Sun ils seguents formats èn permess: {allowedFormats}",
-    "form_invalid": "Il formular è nunvalaivel",
-    "file_imported_success": "Datoteca importada cun success",
-    "3d_labels": "Numns geografics",
-    "3d_vegetation": "Vegietaziun",
-    "3d_constructions": "Edifizis ed installaziuns",
-    "webmapviewer_live_disclaimer": "Il visualisader da chartas vegn actualisà proximamain - <a target='_blank' href='https://www.geo.admin.ch/de/go-live-kartenviewer'>stai pronts</a>",
-    "drawing_too_large": "Tes dissegn è memia grond, stizza intgins detagls",
-    "3d_unsupported_projection": "La carta na po betg vegnir mussada en 3D perquai ch'ella na sustegna betg la projecziun EPSG:4326",
-    "geoloc_out_of_bounds": "Voss lieu actual sa chatta ordaifer la Svizra e na po betg vegnir mussà",
-    "orient_map_north": "Orientar la carta",
-    "kml_icon_url_cors_issue": "Il KML \"{layerName}\" cuntegna icona(s) cun URL {url} che na po nagin sustegnair CORS! As drizzai p.pl. a l'administratura da quella URL per agiuntar il sustegn dal CORS.",
-    "warning": "Avertiment",
-    "legal_notice": "Dapli infurmaziuns",
-    "legal_notice_url": "https://www.geo.admin.ch/de/impressum-verantwortlichkeiten-und-kontakte"
+    "zoom_out": "Empitschnir l'extract da la charta"
 }

From 7fefb451c2434a5b5f479ed3801b1c8083e869b4 Mon Sep 17 00:00:00 2001
From: Pascal Barth <pak.barth@gmail.com>
Date: Wed, 28 Aug 2024 09:25:25 +0200
Subject: [PATCH 06/56] PB-843 : enable bi-directional reframe (LV03 <=> LV95)

fix
---
 src/api/lv03Reframe.api.js                    | 39 ++++++++++++-------
 .../map/components/LocationPopupPosition.vue  |  5 ++-
 src/store/modules/position.store.js           |  4 +-
 src/utils/militaryGridProjection.js           |  4 ++
 4 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/api/lv03Reframe.api.js b/src/api/lv03Reframe.api.js
index 105aac4b9..759a6c5ae 100644
--- a/src/api/lv03Reframe.api.js
+++ b/src/api/lv03Reframe.api.js
@@ -10,39 +10,52 @@ const REFRAME_BASE_URL = 'https://geodesy.geo.admin.ch/reframe/'
  * Re-frames LV95 coordinate taking all LV03 -> LV95 deformation into account (they are not stable,
  * so using "simple" proj4 matrices isn't enough to get a very accurate result)
  *
- * @param {[Number, Number]} lv95coordinate LV95 coordinate that we want expressed in LV03
- * @returns {Promise<[Number, Number]>} Input LV95 coordinate re-framed by the backend service into
- *   LV03 coordinate
+ * @param {[Number, Number]} config.inputCoordinates LV95 or LV03 coordinate that we want expressed
+ *   in the other coordinate system
+ * @param {CoordinateSystem} config.inputProjection Which projection is used to describe the input
+ *   coordinate, must be either LV03 or LV95.
+ * @returns {Promise<[Number, Number]>} Input coordinates re-framed by the backend service.
+ *   Coordinate system will depend on the input. If LV03 coordinates are given, the output will be
+ *   LV95 coordinates (and vice-versa)
  * @see https://www.swisstopo.admin.ch/en/rest-api-geoservices-reframe-web
  * @see https://github.com/geoadmin/mf-geoadmin3/blob/master/src/components/ReframeService.js
  */
-export default function reframe(lv95coordinate) {
+export default function reframe(config = {}) {
     return new Promise((resolve, reject) => {
-        if (!Array.isArray(lv95coordinate) || lv95coordinate.length !== 2) {
-            reject(new Error('lv95coordinate must be an array with length of 2'))
+        const { inputCoordinates, inputProjection } = config
+        if (!Array.isArray(inputCoordinates) || inputCoordinates.length !== 2) {
+            reject(new Error('inputCoordinates must be an array with length of 2'))
         }
+        if (![LV03.epsg, LV95.epsg].includes(inputProjection?.epsg)) {
+            reject(new Error('inputProjection must be LV03 or LV95'))
+        }
+        const outputProjection = inputProjection === LV03 ? LV95 : LV03
         axios({
             method: 'GET',
-            url: `${REFRAME_BASE_URL}lv95tolv03`,
+            url: `${REFRAME_BASE_URL}${inputProjection === LV95 ? 'lv95tolv03' : 'lv03tolv95'}`,
             params: {
-                easting: lv95coordinate[0],
-                northing: lv95coordinate[1],
+                easting: inputCoordinates[0],
+                northing: inputCoordinates[1],
             },
         })
             .then((response) => {
                 if (response.data?.coordinates) {
-                    resolve(response.data.coordinates)
+                    resolve(response.data.coordinates.map(outputProjection.roundCoordinateValue))
                 } else {
                     log.error(
                         'Error while re-framing coordinate',
-                        lv95coordinate,
+                        inputCoordinates,
                         'fallback to proj4'
                     )
-                    resolve(proj4(LV95.epsg, LV03.epsg, lv95coordinate))
+                    resolve(
+                        proj4(inputProjection.epsg, outputProjection.epsg, inputCoordinates).map(
+                            outputProjection.roundCoordinateValue
+                        )
+                    )
                 }
             })
             .catch((error) => {
-                log.error('Error while re-framing coordinate', lv95coordinate, error)
+                log.error('Error while re-framing coordinate', inputCoordinates, error)
                 reject(error)
             })
     })
diff --git a/src/modules/map/components/LocationPopupPosition.vue b/src/modules/map/components/LocationPopupPosition.vue
index c97785411..aac81fd49 100644
--- a/src/modules/map/components/LocationPopupPosition.vue
+++ b/src/modules/map/components/LocationPopupPosition.vue
@@ -91,7 +91,10 @@ watch(currentLang, () => {
 async function updateLV03Coordinate() {
     try {
         const lv95coordinate = proj4(projection.value.epsg, LV95.epsg, coordinate.value)
-        lv03Coordinate.value = await reframe(lv95coordinate)
+        lv03Coordinate.value = await reframe({
+            inputCoordinates: lv95coordinate,
+            inputProjection: LV95,
+        })
     } catch (error) {
         log.error('Failed to retrieve LV03 coordinate', error)
         lv03Coordinate.value = null
diff --git a/src/store/modules/position.store.js b/src/store/modules/position.store.js
index 0335c9f65..90ba0235e 100644
--- a/src/store/modules/position.store.js
+++ b/src/store/modules/position.store.js
@@ -241,7 +241,7 @@ const actions = {
             return
         }
         if (Array.isArray(center)) {
-            if (state.projection.epsg != LV95.epsg || LV95.isInBounds(center[0], center[1])) {
+            if (state.projection.epsg !== LV95.epsg || LV95.isInBounds(center[0], center[1])) {
                 commit('setCenter', {
                     x: center[0],
                     y: center[1],
@@ -251,7 +251,7 @@ const actions = {
                 log.warn('center received is out of bounds, ignoring')
             }
         } else {
-            if (state.projection.epsg != LV95.epsg || LV95.isInBounds(center.x, center.y)) {
+            if (state.projection.epsg !== LV95.epsg || LV95.isInBounds(center.x, center.y)) {
                 const { x, y } = center
                 commit('setCenter', { x, y, dispatcher })
             } else {
diff --git a/src/utils/militaryGridProjection.js b/src/utils/militaryGridProjection.js
index f80f50525..86533c77c 100644
--- a/src/utils/militaryGridProjection.js
+++ b/src/utils/militaryGridProjection.js
@@ -78,6 +78,10 @@ export function inverse(mgrs) {
     return [bbox.left, bbox.bottom, bbox.right, bbox.top]
 }
 
+/**
+ * @param {String} mgrs
+ * @returns {[Number, Number]}
+ */
 export function toPoint(mgrs) {
     if (mgrs === '') {
         throw new TypeError('toPoint received a blank string')

From c4b339dcd7772d23c8920bd7b7d8a5ccbb11b3a5 Mon Sep 17 00:00:00 2001
From: Pascal Barth <pak.barth@gmail.com>
Date: Wed, 28 Aug 2024 09:27:07 +0200
Subject: [PATCH 07/56] PB-843 : reframe LV03 coord at app startup

instead of using a "simple" matrix reprojection, which leads to a lack of accuracy the further we are from Bern (because LV03 to LV95 isn't a linear change)
---
 src/router/legacyPermalinkManagement.routerPlugin.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/router/legacyPermalinkManagement.routerPlugin.js b/src/router/legacyPermalinkManagement.routerPlugin.js
index 0892fcd8d..9e1c23745 100644
--- a/src/router/legacyPermalinkManagement.routerPlugin.js
+++ b/src/router/legacyPermalinkManagement.routerPlugin.js
@@ -1,6 +1,7 @@
 import proj4 from 'proj4'
 import { START_LOCATION } from 'vue-router'
 
+import reframe from '@/api/lv03Reframe.api'
 import { transformLayerIntoUrlString } from '@/router/storeSync/layersParamParser'
 import {
     EMBED_VIEW,
@@ -217,7 +218,10 @@ const handleLegacyParams = async (legacyParams, store, originView) => {
             )
         } else if (LV03.isInBounds(...legacyCoordinates) && projection.epsg !== LV03.epsg) {
             // if the current projection is not LV03, we also need to re-project x/y or N/E
-            newCoordinates = proj4(LV03.epsg, projection.epsg, legacyCoordinates)
+            newCoordinates = await reframe({
+                inputCoordinates: legacyCoordinates,
+                inputProjection: LV03,
+            })
             log.info(
                 `[Legacy URL] converting LV03 X/Y|E/N=${JSON.stringify(legacyCoordinates)} to ${projection.epsg} => ${JSON.stringify(newCoordinates)}`
             )

From 0423a13f6888a8fcbaf1c80bf0489a905e2bd861 Mon Sep 17 00:00:00 2001
From: Pascal Barth <pak.barth@gmail.com>
Date: Wed, 28 Aug 2024 17:25:44 +0200
Subject: [PATCH 08/56] PB-843 : reframe LV03 coordinate in search bar

rework of how coordinate are extracted from a string, so that it is now an async function (using the reframe service whenever LV03 coordinates are encountered)
The coordinate parser now returns parsed coordinates without reprojection, with the coordinate system it was detected in alongside it.
---
 src/store/modules/search.store.js             |  16 +-
 .../__test__/coordinateExtractors.spec.js     | 164 +++++++-------
 .../__test__/coordinateUtils.spec.js          | 102 +--------
 src/utils/coordinates/coordinateExtractors.js | 201 +++++++++++++-----
 src/utils/coordinates/coordinateUtils.js      |  45 +---
 .../tests-e2e/search/coordinates-search.cy.js |   3 +
 6 files changed, 254 insertions(+), 277 deletions(-)

diff --git a/src/store/modules/search.store.js b/src/store/modules/search.store.js
index 174076150..d8ff44de6 100644
--- a/src/store/modules/search.store.js
+++ b/src/store/modules/search.store.js
@@ -1,3 +1,5 @@
+import proj4 from 'proj4'
+
 import search, { SearchResultTypes } from '@/api/search.api'
 import { isWhat3WordsString, retrieveWhat3WordsLocation } from '@/api/what3words.api'
 import coordinateFromString from '@/utils/coordinates/coordinateExtractors'
@@ -38,9 +40,9 @@ const actions = {
         if (query.length >= 2) {
             const currentProjection = rootState.position.projection
             // checking first if this corresponds to a set of coordinates (or a what3words)
-            const coordinates = coordinateFromString(query, currentProjection)
+            const extractedCoordinate = await coordinateFromString(query)
             let what3wordLocation = null
-            if (!coordinates && isWhat3WordsString(query)) {
+            if (!extractedCoordinate && isWhat3WordsString(query)) {
                 try {
                     what3wordLocation = await retrieveWhat3WordsLocation(query, currentProjection)
                 } catch (error) {
@@ -51,7 +53,15 @@ const actions = {
                 }
             }
 
-            if (coordinates) {
+            if (extractedCoordinate) {
+                let coordinates = [...extractedCoordinate.coordinate]
+                if (extractedCoordinate.coordinateSystem !== currentProjection) {
+                    coordinates = proj4(
+                        extractedCoordinate.coordinateSystem.epsg,
+                        currentProjection.epsg,
+                        coordinates
+                    ).map(currentProjection.roundCoordinateValue)
+                }
                 const dispatcherCoordinate = `${dispatcher}/search.store/setSearchQuery/coordinate`
                 dispatch('setCenter', {
                     center: coordinates,
diff --git a/src/utils/coordinates/__test__/coordinateExtractors.spec.js b/src/utils/coordinates/__test__/coordinateExtractors.spec.js
index 3200493ff..bbef81bc6 100644
--- a/src/utils/coordinates/__test__/coordinateExtractors.spec.js
+++ b/src/utils/coordinates/__test__/coordinateExtractors.spec.js
@@ -29,20 +29,24 @@ describe('Unit test functions from coordinateExtractors.js', () => {
          *   (default is zero)
          * @param {CoordinateSystem} projection Which projection is the output of the parsing
          */
-        const checkText = (text, expected, message, acceptableDelta = 0, projection) => {
-            const result = coordinateFromString(text, projection)
-            expect(result).to.be.an('Array', message)
-            expect(result.length).to.eq(2, message)
-            expect(result[0]).to.approximately(
+        const checkText = async (text, expected, message, acceptableDelta = 0, projection) => {
+            const result = await coordinateFromString(text)
+            expect(result).to.be.an('Object', message)
+            expect(result['coordinate']).to.be.an('Array')
+            expect(result['coordinateSystem']).to.be.an('Object')
+            const { coordinate, coordinateSystem } = result
+            expect(coordinate.length).to.eq(2, message)
+            expect(coordinate[0]).to.approximately(
                 expected[0],
                 acceptableDelta,
                 message + '\nx result: ' + result[0] + '\n'
             )
-            expect(result[1]).to.approximately(
+            expect(coordinate[1]).to.approximately(
                 expected[1],
                 acceptableDelta,
                 message + '\ny result: ' + result[1] + '\n'
             )
+            expect(coordinateSystem.epsg).to.eq(projection.epsg)
         }
         /**
          * Checks that X and Y (given as param) output the expected X and Y with different
@@ -159,35 +163,35 @@ describe('Unit test functions from coordinateExtractors.js', () => {
         )
 
         describe('Testing non valid inputs', () => {
-            it('Returns undefined when anything else than numbers, coma, whitespaces and point is in the text', () => {
-                expect(coordinateFromString('test')).to.be.undefined
-                expect(coordinateFromString('47.0, 7.4test')).to.eq(
+            it('Returns undefined when anything else than numbers, coma, whitespaces and point is in the text', async () => {
+                expect(await coordinateFromString('test')).to.be.undefined
+                expect(await coordinateFromString('47.0, 7.4test')).to.eq(
                     undefined,
                     'must not accept text after the coordinates'
                 )
-                expect(coordinateFromString('47.0.3, 7.4,0')).to.eq(
+                expect(await coordinateFromString('47.0.3, 7.4,0')).to.eq(
                     undefined,
                     'must not accept text after the coordinates'
                 )
-                expect(coordinateFromString('test47.0, 7.4')).to.eq(
+                expect(await coordinateFromString('test47.0, 7.4')).to.eq(
                     undefined,
                     'must not accept text before the coordinates'
                 )
             })
-            it('Returns undefined when the given text is invalid (null or not a string)', () => {
-                expect(coordinateFromString(null)).to.be.undefined
-                expect(coordinateFromString(1234)).to.be.undefined
-                expect(coordinateFromString([45.6, 7.4])).to.be.undefined
-                expect(coordinateFromString({ lon: 7, lat: 45 })).to.be.undefined
+            it('Returns undefined when the given text is invalid (null or not a string)', async () => {
+                expect(await coordinateFromString(null)).to.be.undefined
+                expect(await coordinateFromString(1234)).to.be.undefined
+                expect(await coordinateFromString([45.6, 7.4])).to.be.undefined
+                expect(await coordinateFromString({ lon: 7, lat: 45 })).to.be.undefined
             })
-            it('Returns undefined when the given text is not two numbers separated by a coma, a space or a slash', () => {
-                expect(coordinateFromString('47.0')).to.be.undefined
-                expect(coordinateFromString('47.0,')).to.be.undefined
-                expect(coordinateFromString('47.0,test')).to.be.undefined
-                expect(coordinateFromString('47.0, test')).to.be.undefined
+            it('Returns undefined when the given text is not two numbers separated by a coma, a space or a slash', async () => {
+                expect(await coordinateFromString('47.0')).to.be.undefined
+                expect(await coordinateFromString('47.0,')).to.be.undefined
+                expect(await coordinateFromString('47.0,test')).to.be.undefined
+                expect(await coordinateFromString('47.0, test')).to.be.undefined
             })
-            it("Returns undefined when coordinates entered don't match any projection bur are technically valid (two numbers)", () => {
-                expect(coordinateFromString('600000, 20000')).to.be.undefined
+            it("Returns undefined when coordinates entered don't match any projection bur are technically valid (two numbers)", async () => {
+                expect(await coordinateFromString('600000, 20000')).to.be.undefined
             })
         })
         describe('EPSG:4326 (WGS84)', () => {
@@ -220,26 +224,26 @@ describe('Unit test functions from coordinateExtractors.js', () => {
                 checkXY(
                     expectedCenterWGS84_DD[0],
                     expectedCenterWGS84_DD[1],
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    expectedCenterWGS84[0],
+                    expectedCenterWGS84[1],
+                    WGS84,
                     { acceptableDelta, testInverted: true }
                 )
                 // also checking with cardinals
                 checkXY(
                     `${expectedCenterWGS84_DD[0]} E`,
                     `${expectedCenterWGS84_DD[1]} N`,
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    expectedCenterWGS84[0],
+                    expectedCenterWGS84[1],
+                    WGS84,
                     { acceptableDelta, testInverted: true }
                 )
                 checkXY(
                     `E ${expectedCenterWGS84_DD[0]}`,
                     `N ${expectedCenterWGS84_DD[1]}`,
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    expectedCenterWGS84[0],
+                    expectedCenterWGS84[1],
+                    WGS84,
                     { acceptableDelta, testInverted: true }
                 )
             })
@@ -247,25 +251,25 @@ describe('Unit test functions from coordinateExtractors.js', () => {
                 checkXY(
                     expectedCenterWGS84_DMS[0],
                     expectedCenterWGS84_DMS[1],
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    expectedCenterWGS84[0],
+                    expectedCenterWGS84[1],
+                    WGS84,
                     { acceptableDelta, testInverted: true }
                 )
                 // removing space between degrees and minutes
                 checkXY(
                     ...expectedCenterWGS84_DMS.map((val) => val.replace(/° /g, '°')),
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    expectedCenterWGS84[0],
+                    expectedCenterWGS84[1],
+                    WGS84,
                     { acceptableDelta, testInverted: true }
                 )
                 // removing space between minutes and seconds
                 checkXY(
                     ...expectedCenterWGS84_DMS.map((val) => val.replace(/' /g, "'")),
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    expectedCenterWGS84[0],
+                    expectedCenterWGS84[1],
+                    WGS84,
                     { acceptableDelta, testInverted: true }
                 )
                 // removing space between degrees, minutes and seconds
@@ -273,9 +277,9 @@ describe('Unit test functions from coordinateExtractors.js', () => {
                     ...expectedCenterWGS84_DMS.map((val) =>
                         val.replace(/° /g, '°').replace(/' /g, "'")
                     ),
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    expectedCenterWGS84[0],
+                    expectedCenterWGS84[1],
+                    WGS84,
                     { acceptableDelta, testInverted: true }
                 )
             })
@@ -302,25 +306,25 @@ describe('Unit test functions from coordinateExtractors.js', () => {
                 checkXY(
                     expectedCenterWGS84_DMS_No_NE[0],
                     expectedCenterWGS84_DMS_No_NE[1],
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    expectedCenterWGS84[0],
+                    expectedCenterWGS84[1],
+                    WGS84,
                     { acceptableDelta, testInverted: true }
                 )
                 checkXY(
                     latWithSpaceBetweenDegAndMin,
                     lonWithSpaceBetweenDegAndMin,
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    expectedCenterWGS84[0],
+                    expectedCenterWGS84[1],
+                    WGS84,
                     { acceptableDelta, testInverted: true }
                 )
                 checkXY(
                     latWithSpaceBetweenDegAndMinAndSec,
                     lonWithSpaceBetweenDegAndMinAndSec,
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    expectedCenterWGS84[0],
+                    expectedCenterWGS84[1],
+                    WGS84,
                     { acceptableDelta, testInverted: true }
                 )
 
@@ -328,25 +332,25 @@ describe('Unit test functions from coordinateExtractors.js', () => {
                 checkXY(
                     expectedCenterWGS84_DMS_No_NE[0].replace(/"/g, "''"),
                     expectedCenterWGS84_DMS_No_NE[1].replace(/"/g, "''"),
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    expectedCenterWGS84[0],
+                    expectedCenterWGS84[1],
+                    WGS84,
                     { acceptableDelta, testInverted: true }
                 )
                 checkXY(
                     latWithSpaceBetweenDegAndMin.replace(/"/g, "''"),
                     lonWithSpaceBetweenDegAndMin.replace(/"/g, "''"),
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    expectedCenterWGS84[0],
+                    expectedCenterWGS84[1],
+                    WGS84,
                     { acceptableDelta, testInverted: true }
                 )
                 checkXY(
                     latWithSpaceBetweenDegAndMinAndSec.replace(/"/g, "''"),
                     lonWithSpaceBetweenDegAndMinAndSec.replace(/"/g, "''"),
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    expectedCenterWGS84[0],
+                    expectedCenterWGS84[1],
+                    WGS84,
                     { acceptableDelta, testInverted: true }
                 )
             })
@@ -354,26 +358,26 @@ describe('Unit test functions from coordinateExtractors.js', () => {
                 checkXY(
                     expectedCenterWGS84_DD_NoSymbol[0],
                     expectedCenterWGS84_DD_NoSymbol[1],
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    expectedCenterWGS84[0],
+                    expectedCenterWGS84[1],
+                    WGS84,
                     { acceptableDelta, testInverted: true }
                 )
                 // also checking with cardinals
                 checkXY(
                     `${expectedCenterWGS84_DD_NoSymbol[0]} N`,
                     `${expectedCenterWGS84_DD_NoSymbol[1]} E`,
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    expectedCenterWGS84[0],
+                    expectedCenterWGS84[1],
+                    WGS84,
                     { acceptableDelta, testInverted: true }
                 )
                 checkXY(
                     `N ${expectedCenterWGS84_DD_NoSymbol[0]}`,
                     `E ${expectedCenterWGS84_DD_NoSymbol[1]}`,
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    expectedCenterWGS84[0],
+                    expectedCenterWGS84[1],
+                    WGS84,
                     { acceptableDelta, testInverted: true }
                 )
             })
@@ -381,9 +385,9 @@ describe('Unit test functions from coordinateExtractors.js', () => {
                 checkXY(
                     expectedCenterWGS84_DMS_NoSymbol[0],
                     expectedCenterWGS84_DMS_NoSymbol[1],
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    expectedCenterWGS84[0],
+                    expectedCenterWGS84[1],
+                    WGS84,
                     { acceptableDelta, testInverted: true }
                 )
             })
@@ -391,9 +395,9 @@ describe('Unit test functions from coordinateExtractors.js', () => {
                 checkXY(
                     expectedCenterWGS84_DMS[0],
                     expectedCenterWGS84_DMS[1],
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    expectedCenterWGS84[0],
+                    expectedCenterWGS84[1],
+                    WGS84,
                     { acceptableDelta, testInverted: true }
                 )
             })
@@ -530,7 +534,9 @@ describe('Unit test functions from coordinateExtractors.js', () => {
             checkSwissCoordinateSystem(expectedCenterLV95[0], expectedCenterLV95[1], 0.1)
         })
 
-        describe('EPSG:21781 (LV03)', () => {
+        // After https://jira.swisstopo.ch/browse/PB-843 a backend service is used to reproject LV03 to LV95 coordinates.
+        // It then doesn't really make sense to test that in unit tests, so I skip it
+        describe.skip('EPSG:21781 (LV03)', () => {
             const expectedCenterLV03 = proj4(LV95.epsg, LV03.epsg, expectedCenterLV95).map(
                 (value) => LV03.roundCoordinateValue(value)
             )
@@ -543,7 +549,7 @@ describe('Unit test functions from coordinateExtractors.js', () => {
             it('Returns coordinates in EPSG:4326 when MGRS string is entered', () => {
                 // as MGRS is a grid based system, what is return is essentially a 1-meter box.
                 // So depending on which part of the box is taken, the answer is correct, we then tolerate here a margin of 1m
-                checkText(MGRS, LV95.bounds.center, 'MGRS not supported', 1, LV95)
+                checkText(MGRS, LV95.getBoundsAs(WGS84).center, 'MGRS not supported', 1, WGS84)
             })
         })
     })
diff --git a/src/utils/coordinates/__test__/coordinateUtils.spec.js b/src/utils/coordinates/__test__/coordinateUtils.spec.js
index f0e137b0a..569abe9af 100644
--- a/src/utils/coordinates/__test__/coordinateUtils.spec.js
+++ b/src/utils/coordinates/__test__/coordinateUtils.spec.js
@@ -1,113 +1,15 @@
 import { expect } from 'chai'
-import proj4 from 'proj4'
 import { describe, it } from 'vitest'
 
-import { LV03, LV95, WEBMERCATOR, WGS84 } from '@/utils/coordinates/coordinateSystems'
+import { LV95, WEBMERCATOR, WGS84 } from '@/utils/coordinates/coordinateSystems'
 import {
-    flattenExtent,
-    normalizeExtent,
     removeZValues,
-    reprojectUnknownSrsCoordsToWGS84,
     toLv95,
     unwrapGeometryCoordinates,
+    wrapXCoordinates,
 } from '@/utils/coordinates/coordinateUtils'
-import { wrapXCoordinates } from '@/utils/coordinates/coordinateUtils'
 
 describe('Unit test functions from coordinateUtils.js', () => {
-    describe('reprojectUnknownSrsCoordsToWGS84(x,y)', () => {
-        const coordinatesLV95 = [2600000, 1190000]
-        const coordinatesLV03 = proj4(LV95.epsg, LV03.epsg, coordinatesLV95)
-        const coordinatesWebMercator = proj4(LV95.epsg, WEBMERCATOR.epsg, coordinatesLV95)
-        const coordinatesWGS84 = proj4(LV95.epsg, WGS84.epsg, coordinatesLV95)
-        const checkFunctionOutputs = (output, expectedOutput, acceptableDelta = 0.00001) => {
-            if (expectedOutput) {
-                expect(output).to.be.an('Array').lengthOf(2)
-                const [x, y] = output
-                expect(x).to.be.approximately(expectedOutput[0], acceptableDelta)
-                expect(y).to.be.approximately(expectedOutput[1], acceptableDelta)
-            } else {
-                expect(output).to.be.undefined
-            }
-        }
-        it('handles LV03 coordinates', () => {
-            checkFunctionOutputs(
-                reprojectUnknownSrsCoordsToWGS84(coordinatesLV03[0], coordinatesLV03[1]),
-                coordinatesWGS84
-            )
-        })
-        it('handles inverted LV03 coordinates', () => {
-            checkFunctionOutputs(
-                reprojectUnknownSrsCoordsToWGS84(coordinatesLV03[1], coordinatesLV03[0]),
-                coordinatesWGS84
-            )
-        })
-        it('handles LV95 coordinates', () => {
-            checkFunctionOutputs(
-                reprojectUnknownSrsCoordsToWGS84(coordinatesLV95[0], coordinatesLV95[1]),
-                coordinatesWGS84
-            )
-        })
-        it('handles inverted LV95 coordinates', () => {
-            // trying the same thing but with inverted X,Y
-            checkFunctionOutputs(
-                reprojectUnknownSrsCoordsToWGS84(coordinatesLV95[1], coordinatesLV95[0]),
-                coordinatesWGS84
-            )
-        })
-        it('handles WebMercator coordinates (in LV95 bounds)', () => {
-            checkFunctionOutputs(
-                reprojectUnknownSrsCoordsToWGS84(
-                    coordinatesWebMercator[0],
-                    coordinatesWebMercator[1]
-                ),
-                coordinatesWGS84
-            )
-        })
-        it('rejects WebMercator coordinates that are out of LV95 bounds', () => {
-            // roughly equivalent to 5° lon, 45° lat in WGS84
-            checkFunctionOutputs(reprojectUnknownSrsCoordsToWGS84(556597.45, 4865942.27), undefined)
-        })
-        it('handles WGS84 coordinates', () => {
-            checkFunctionOutputs(
-                reprojectUnknownSrsCoordsToWGS84(coordinatesWGS84[0], coordinatesWGS84[1]),
-                coordinatesWGS84
-            )
-        })
-        it('handles inverted WGS84 coordinates', () => {
-            // Here the function will not be able to detect that we have inverted lat/lon as values for both of them
-            // are under latitude limits. So no way of telling which one is lat or lon, thus the function will output
-            // them inverted
-            checkFunctionOutputs(
-                reprojectUnknownSrsCoordsToWGS84(coordinatesWGS84[1], coordinatesWGS84[0]),
-                coordinatesWGS84
-            )
-        })
-        it('normalize an extent', () => {
-            const flatExtent = [1, 2, 3, 4]
-            const result = normalizeExtent(flatExtent)
-            expect(result).to.have.length(2)
-            expect(result[0]).to.have.length(2)
-            expect(result[1]).to.have.length(2)
-            expect(result[0][0]).to.equal(1)
-            expect(result[0][1]).to.equal(2)
-            expect(result[1][0]).to.equal(3)
-            expect(result[1][1]).to.equal(4)
-
-            expect(normalizeExtent(result)).to.deep.equal(result)
-        })
-        it('flattern an extent', () => {
-            const normalizedExtent = [
-                [1, 2],
-                [3, 4],
-            ]
-            const flatExtent = flattenExtent(normalizedExtent)
-            expect(flatExtent).to.have.length(4)
-            expect(flatExtent).to.deep.equal([1, 2, 3, 4])
-
-            expect(flattenExtent(flatExtent)).to.deep.equal([1, 2, 3, 4])
-        })
-    })
-
     describe('toLv95(coordinate, "EPSG:4326")', () => {
         it('reprojects points from EPSG:4326', () => {
             expect(LV95.isInBounds(...toLv95([6.57268, 46.51333], WGS84.epsg))).to.be.true
diff --git a/src/utils/coordinates/coordinateExtractors.js b/src/utils/coordinates/coordinateExtractors.js
index 589435169..a2a283797 100644
--- a/src/utils/coordinates/coordinateExtractors.js
+++ b/src/utils/coordinates/coordinateExtractors.js
@@ -1,7 +1,5 @@
-import proj4 from 'proj4'
-
-import { LV95, WGS84 } from '@/utils/coordinates/coordinateSystems'
-import { reprojectUnknownSrsCoordsToWGS84 } from '@/utils/coordinates/coordinateUtils'
+import reframe from '@/api/lv03Reframe.api'
+import { LV03, LV95, WEBMERCATOR, WGS84 } from '@/utils/coordinates/coordinateSystems'
 import { toPoint as mgrsToWGS84 } from '@/utils/militaryGridProjection'
 
 const RE_DEGREE_IDENTIFIER = '\\s*°\\s*'
@@ -75,28 +73,119 @@ const REGEX_WGS_84_WITH_SECONDS_PREFIXED = new RegExp(
     'i'
 )
 
+/**
+ * @param {String} text
+ * @returns {[Number, Number] | undefined}
+ */
+function extractWGS84Coordinates(text) {
+    const regexMatch = [
+        REGEX_WGS_84,
+        REGEX_WGS_84_WITH_CARDINALS,
+        REGEX_WGS_84_WITH_PRE_FIXED_CARDINALS,
+        REGEX_WGS_84_WITH_MIN,
+        REGEX_WGS_84_WITH_MIN_PREFIXED,
+        REGEX_WGS_84_WITH_SECONDS,
+        REGEX_WGS_84_WITH_SECONDS_PREFIXED,
+    ]
+        .map((regex) => regex.exec(text.trim()))
+        .find((result) => Array.isArray(result))
+    if (regexMatch) {
+        return wgs84Extractor(regexMatch)
+    }
+    return undefined
+}
+
 // LV95, LV03, metric WebMercator (EPSG:3857)
 const REGEX_METRIC_COORDINATES =
     /^(?<coord1>\d{1,3}(['`´ ]?\d{3})*(\.\d+)?)\s*[,/ \t]\s*(?<coord2>\d{1,3}(['`´ ]?\d{3})*(\.\d+)?)$/i
 
+/**
+ * @param {String} text
+ * @returns {[Number, Number] | undefined}
+ */
+function extractLV95Coordinates(text) {
+    const coordinates = numericalExtractor(REGEX_METRIC_COORDINATES.exec(text.trim()))
+    if (coordinates) {
+        if (LV95.isInBounds(coordinates[0], coordinates[1])) {
+            return [coordinates[0], coordinates[1]].map(LV95.roundCoordinateValue)
+        } else if (LV95.isInBounds(coordinates[1], coordinates[0])) {
+            return [coordinates[1], coordinates[0]].map(LV95.roundCoordinateValue)
+        }
+    }
+    return undefined
+}
+
+/**
+ * @param {String} text
+ * @returns {Promise<[Number, Number] | undefined>}
+ */
+async function extractLV03Coordinates(text) {
+    const coordinates = numericalExtractor(REGEX_METRIC_COORDINATES.exec(text.trim()))
+    if (coordinates) {
+        if (LV03.isInBounds(coordinates[0], coordinates[1])) {
+            return reframe({
+                inputCoordinates: [coordinates[0], coordinates[1]],
+                inputProjection: LV03,
+            })
+        } else if (LV03.isInBounds(coordinates[1], coordinates[0])) {
+            return reframe({
+                inputCoordinates: [coordinates[1], coordinates[0]],
+                inputProjection: LV03,
+            })
+        }
+    }
+    return undefined
+}
+
+function extractMetricMercatorCoordinates(text) {
+    const coordinates = numericalExtractor(REGEX_METRIC_COORDINATES.exec(text.trim()))
+    if (coordinates) {
+        if (LV95_BOUNDS_IN_METRIC_MERCATOR.isInBounds(coordinates[0], coordinates[1])) {
+            return [coordinates[0], coordinates[1]].map(WEBMERCATOR.roundCoordinateValue)
+        } else if (LV95_BOUNDS_IN_METRIC_MERCATOR.isInBounds(coordinates[1], coordinates[0])) {
+            return [coordinates[1], coordinates[0]].map(WEBMERCATOR.roundCoordinateValue)
+        }
+    }
+    return undefined
+}
+
 // Military Grid Reference System (MGRS) (e.g. 32TMS 40959 89723)
 const REGEX_MILITARY_GRID = /^3[123]\s*[a-z]{3}\s*\d{1,5}\s*\d{1,5}$/i
 
+function extractMgrsCoordinates(text) {
+    const coordinate = mgrsExtractor(REGEX_MILITARY_GRID.exec(text.trim()))
+    if (coordinate) {
+        return coordinate
+    }
+    return undefined
+}
+
 const LV95_BOUNDS_IN_WGS84 = LV95.getBoundsAs(WGS84)
+const LV95_BOUNDS_IN_METRIC_MERCATOR = LV95.getBoundsAs(WEBMERCATOR)
 
 const thousandSeparatorRegex = /['`´ ]/g
 
+/**
+ * @param {RegExpExecArray | undefined} regexMatches Matches from REGEX_METRIC_COORDINATES
+ * @returns {[Number, Number] | undefined}
+ */
 const numericalExtractor = (regexMatches) => {
+    if (!regexMatches) {
+        return undefined
+    }
     // removing thousand separators
     const x = Number(regexMatches.groups.coord1.replace(thousandSeparatorRegex, ''))
     const y = Number(regexMatches.groups.coord2.replace(thousandSeparatorRegex, ''))
     if (Number.isNaN(x) || Number.isNaN(y)) {
         return undefined
     }
-    return reprojectUnknownSrsCoordsToWGS84(x, y)
+    return [x, y]
 }
 
 const wgs84Extractor = (regexMatches) => {
+    if (!regexMatches) {
+        return undefined
+    }
     let firstNumber, secondNumber
     let firstCardinal, secondCardinal
 
@@ -160,10 +249,10 @@ const wgs84Extractor = (regexMatches) => {
                 break
         }
         if (LV95_BOUNDS_IN_WGS84.isInBounds(lon, lat)) {
-            return [lon, lat]
+            return [lon, lat].map(WGS84.roundCoordinateValue)
         }
         if (LV95_BOUNDS_IN_WGS84.isInBounds(lat, lon)) {
-            return [lat, lon]
+            return [lat, lon].map(WGS84.roundCoordinateValue)
         }
     }
     return null
@@ -173,34 +262,27 @@ const wgs84Extractor = (regexMatches) => {
 // Grid zone designation for Switzerland + two 100km letters + two digits
 // It's a limitation of proj4 and a sensible default (precision is 10km)
 const MGRSMinimalPrecision = 7
+/**
+ * @param {RegExpExecArray} regexMatches
+ * @returns {[Number, Number] | undefined}
+ */
 const mgrsExtractor = (regexMatches) => {
-    const mgrsString = regexMatches[0].split(' ').join('')
-    if ((mgrsString.length - MGRSMinimalPrecision) % 2 === 0) {
-        return mgrsToWGS84(mgrsString)
-    }
-    return null
-}
-
-const executeAndReturn = (regex, text, outputProjection, extractor = numericalExtractor) => {
-    if (typeof text !== 'string') {
+    if (!regexMatches) {
         return undefined
     }
-
-    const matches = regex.exec(text.trim())
-    if (matches) {
-        const extractedCoordinates = extractor(matches)
-        if (!extractedCoordinates) {
-            return undefined
-        }
-        const projectedResult = proj4(WGS84.epsg, outputProjection.epsg, extractedCoordinates)
-        return [
-            outputProjection.roundCoordinateValue(projectedResult[0]),
-            outputProjection.roundCoordinateValue(projectedResult[1]),
-        ]
+    const mgrsString = regexMatches[0].split(' ').join('')
+    if ((mgrsString.length - MGRSMinimalPrecision) % 2 === 0) {
+        return mgrsToWGS84(mgrsString).map(WGS84.roundCoordinateValue)
     }
     return undefined
 }
 
+/**
+ * @typedef ExtractedCoordinate
+ * @property {CoordinateSystem} coordinateSystem
+ * @property {[Number, Number]} coordinate
+ */
+
 /**
  * Extracts (if possible) a set of coordinates from the text as an array. The text must contain only
  * coordinates and nothing else, otherwise undefined will be returned.
@@ -240,33 +322,50 @@ const executeAndReturn = (regex, text, outputProjection, extractor = numericalEx
  * - I.e. `zufall.anders.blaumeise`
  *
  * @param {String} text The text in which we want to find coordinates
- * @param {CoordinateSystem} toProjection Projection wanted for the output coordinates
- * @returns {Number[]} Coordinates in the given order in text in the wanted projection, or
- *   `undefined` if nothing was found
+ * @returns {Promise<ExtractedCoordinate | undefined>} Coordinates in the given order in text with
+ *   information about which projection they are expressed in, or `undefined` if nothing was found
  */
-const coordinateFromString = (text, toProjection) => {
+const coordinateFromString = async (text) => {
     if (typeof text !== 'string') {
         return undefined
     }
-    // creating a config array with each entry being an object with a regex attribute
-    // and the corresponding extractor when this regex matches the input
-    return [
-        { regex: REGEX_WGS_84, extractor: wgs84Extractor },
-        { regex: REGEX_WGS_84_WITH_CARDINALS, extractor: wgs84Extractor },
-        { regex: REGEX_WGS_84_WITH_PRE_FIXED_CARDINALS, extractor: wgs84Extractor },
-        { regex: REGEX_WGS_84_WITH_MIN, extractor: wgs84Extractor },
-        { regex: REGEX_WGS_84_WITH_MIN_PREFIXED, extractor: wgs84Extractor },
-        { regex: REGEX_WGS_84_WITH_SECONDS, extractor: wgs84Extractor },
-        { regex: REGEX_WGS_84_WITH_SECONDS_PREFIXED, extractor: wgs84Extractor },
-
-        { regex: REGEX_METRIC_COORDINATES, extractor: numericalExtractor },
-        { regex: REGEX_MILITARY_GRID, extractor: mgrsExtractor },
-    ]
-        .map((config) => {
-            // going through each config and extracting the result (can be undefined if not a match)
-            return executeAndReturn(config.regex, text, toProjection, config.extractor)
-        })
-        .find((result) => Array.isArray(result)) // returning the first value that is a coordinate array (will return undefined if nothing is found)
+    const wgs84result = extractWGS84Coordinates(text)
+    if (wgs84result) {
+        return {
+            coordinateSystem: WGS84,
+            coordinate: wgs84result,
+        }
+    }
+    const lv95result = extractLV95Coordinates(text)
+    if (lv95result) {
+        return {
+            coordinateSystem: LV95,
+            coordinate: lv95result,
+        }
+    }
+    const lv03result = await extractLV03Coordinates(text)
+    if (lv03result) {
+        return {
+            // coordinates have been reframed to LV95
+            coordinateSystem: LV95,
+            coordinate: lv03result,
+        }
+    }
+    const mercatorResult = extractMetricMercatorCoordinates(text)
+    if (mercatorResult) {
+        return {
+            coordinateSystem: WEBMERCATOR,
+            coordinate: mercatorResult,
+        }
+    }
+    const mgrsResult = extractMgrsCoordinates(text)
+    if (mgrsResult) {
+        return {
+            coordinateSystem: WGS84,
+            coordinate: mgrsResult,
+        }
+    }
+    return undefined
 }
 
 export default coordinateFromString
diff --git a/src/utils/coordinates/coordinateUtils.js b/src/utils/coordinates/coordinateUtils.js
index 35042e8d6..81d4a3bb2 100644
--- a/src/utils/coordinates/coordinateUtils.js
+++ b/src/utils/coordinates/coordinateUtils.js
@@ -2,51 +2,8 @@ import { wrapX } from 'ol/coordinate'
 import { get as getProjection } from 'ol/proj'
 import proj4 from 'proj4'
 
-import log from '../logging'
 import { formatThousand } from '../numberUtils'
-import { LV03, LV95, WEBMERCATOR, WGS84 } from './coordinateSystems'
-
-const LV95BoundsAsWebMercator = LV95.getBoundsAs(WEBMERCATOR)
-const LV95BoundsAsWGS84 = LV95.getBoundsAs(WGS84)
-
-/**
- * Attempts to re-project given coordinates to WebMercator (WGS84). Will return a tuple containing
- * [lat, lon] even if input is given as [lon, lat] (as this is what OpenLayers wants to be fed.
- *
- * This function supports input from LV95, LV03 or WebMercator input (no other projection supported)
- *
- * @param x {Number} X part of the coordinate (Easting/Longitude)
- * @param y {Number} Y part of the coordinate (Northing/Latitude)
- * @returns {Number[]} Re-projected coordinate as [lon, lat], or undefined if the input was not
- *   convertible to WebMercator
- */
-export const reprojectUnknownSrsCoordsToWGS84 = (x, y) => {
-    // guessing if this is already WGS84, or Mercator or a Swiss projection (if so, we need to reproject it to WGS84)
-    if (LV95BoundsAsWebMercator.isInBounds(x, y)) {
-        return proj4(WEBMERCATOR.epsg, WGS84.epsg, [x, y])
-        // checking LV95 bounds
-    } else if (LV95.isInBounds(x, y)) {
-        return proj4(LV95.epsg, WGS84.epsg, [x, y])
-        // checking LV95 backward
-    } else if (LV95.isInBounds(y, x)) {
-        return proj4(LV95.epsg, WGS84.epsg, [y, x])
-        // checking LV03 bounds
-    } else if (LV03.isInBounds(x, y)) {
-        return proj4(LV03.epsg, WGS84.epsg, [x, y])
-        // checking LV03 backward
-    } else if (LV03.isInBounds(y, x)) {
-        return proj4(LV03.epsg, WGS84.epsg, [y, x])
-        // checking for WGS84 bounds
-    } else if (LV95BoundsAsWGS84.isInBounds(x, y)) {
-        return [x, y]
-        // checking for WGS84 backward
-    } else if (LV95BoundsAsWGS84.isInBounds(y, x)) {
-        return [y, x]
-    } else {
-        log.error('Unknown coordinate type', [x, y])
-        return undefined
-    }
-}
+import { LV95 } from './coordinateSystems'
 
 /**
  * Returns rounded coordinate with thousands separator and comma.
diff --git a/tests/cypress/tests-e2e/search/coordinates-search.cy.js b/tests/cypress/tests-e2e/search/coordinates-search.cy.js
index 9630b68c4..c0927b2e5 100644
--- a/tests/cypress/tests-e2e/search/coordinates-search.cy.js
+++ b/tests/cypress/tests-e2e/search/coordinates-search.cy.js
@@ -110,6 +110,9 @@ describe('Testing coordinates typing in search bar', () => {
     })
 
     it('Paste EPSG:21781 (LV03) coordinates', () => {
+        cy.intercept('**/lv03tolv95**', {
+            coordinates: expectedCenter,
+        })
         standardCheck(expectedCenterLV03[0], expectedCenterLV03[1], {
             acceptableDelta: 0.1,
             withInversion: true,

From 5fd57f043e1ecaf8f7070d9358a37c8b0fac090d Mon Sep 17 00:00:00 2001
From: Pascal Barth <pak.barth@gmail.com>
Date: Mon, 2 Sep 2024 08:40:44 +0200
Subject: [PATCH 09/56] PB-843 : change coordinate extractor to not use backend
 service

but only return unreframed LV03 coordinate, and let the search store do the reframing after detecting it is LV03 coordinates.

Should simplify the code of the extractor, removing the need for async there
---
 src/store/modules/search.store.js             | 28 +++++--
 .../__test__/coordinateExtractors.spec.js     | 77 +++++++++----------
 src/utils/coordinates/coordinateExtractors.js | 40 ++++------
 3 files changed, 76 insertions(+), 69 deletions(-)

diff --git a/src/store/modules/search.store.js b/src/store/modules/search.store.js
index d8ff44de6..d9964e75e 100644
--- a/src/store/modules/search.store.js
+++ b/src/store/modules/search.store.js
@@ -1,9 +1,11 @@
 import proj4 from 'proj4'
 
+import reframe from '@/api/lv03Reframe.api'
 import search, { SearchResultTypes } from '@/api/search.api'
 import { isWhat3WordsString, retrieveWhat3WordsLocation } from '@/api/what3words.api'
 import coordinateFromString from '@/utils/coordinates/coordinateExtractors'
 import { STANDARD_ZOOM_LEVEL_1_25000_MAP } from '@/utils/coordinates/CoordinateSystem.class'
+import { LV03, LV95 } from '@/utils/coordinates/coordinateSystems'
 import CustomCoordinateSystem from '@/utils/coordinates/CustomCoordinateSystem.class'
 import log from '@/utils/logging'
 
@@ -40,7 +42,7 @@ const actions = {
         if (query.length >= 2) {
             const currentProjection = rootState.position.projection
             // checking first if this corresponds to a set of coordinates (or a what3words)
-            const extractedCoordinate = await coordinateFromString(query)
+            const extractedCoordinate = coordinateFromString(query)
             let what3wordLocation = null
             if (!extractedCoordinate && isWhat3WordsString(query)) {
                 try {
@@ -56,11 +58,25 @@ const actions = {
             if (extractedCoordinate) {
                 let coordinates = [...extractedCoordinate.coordinate]
                 if (extractedCoordinate.coordinateSystem !== currentProjection) {
-                    coordinates = proj4(
-                        extractedCoordinate.coordinateSystem.epsg,
-                        currentProjection.epsg,
-                        coordinates
-                    ).map(currentProjection.roundCoordinateValue)
+                    // special case for LV03 input, we can't use proj4 to transform them into
+                    // LV95 or others, as the deformation between LV03 and the others is not constant.
+                    // So we pass through a LV95 reframe (done by a backend service that knows all deformations between the two)
+                    // and then go to the wanted coordinate system
+                    if (extractedCoordinate.coordinateSystem === LV03) {
+                        coordinates = await reframe({
+                            inputProjection: LV03,
+                            inputCoordinates: coordinates,
+                        })
+                        coordinates = proj4(LV95.epsg, currentProjection.epsg, coordinates).map(
+                            currentProjection.roundCoordinateValue
+                        )
+                    } else {
+                        coordinates = proj4(
+                            extractedCoordinate.coordinateSystem.epsg,
+                            currentProjection.epsg,
+                            coordinates
+                        ).map(currentProjection.roundCoordinateValue)
+                    }
                 }
                 const dispatcherCoordinate = `${dispatcher}/search.store/setSearchQuery/coordinate`
                 dispatch('setCenter', {
diff --git a/src/utils/coordinates/__test__/coordinateExtractors.spec.js b/src/utils/coordinates/__test__/coordinateExtractors.spec.js
index bbef81bc6..b3152cedd 100644
--- a/src/utils/coordinates/__test__/coordinateExtractors.spec.js
+++ b/src/utils/coordinates/__test__/coordinateExtractors.spec.js
@@ -29,8 +29,8 @@ describe('Unit test functions from coordinateExtractors.js', () => {
          *   (default is zero)
          * @param {CoordinateSystem} projection Which projection is the output of the parsing
          */
-        const checkText = async (text, expected, message, acceptableDelta = 0, projection) => {
-            const result = await coordinateFromString(text)
+        const checkText = (text, expected, message, acceptableDelta = 0, projection) => {
+            const result = coordinateFromString(text)
             expect(result).to.be.an('Object', message)
             expect(result['coordinate']).to.be.an('Array')
             expect(result['coordinateSystem']).to.be.an('Object')
@@ -163,35 +163,35 @@ describe('Unit test functions from coordinateExtractors.js', () => {
         )
 
         describe('Testing non valid inputs', () => {
-            it('Returns undefined when anything else than numbers, coma, whitespaces and point is in the text', async () => {
-                expect(await coordinateFromString('test')).to.be.undefined
-                expect(await coordinateFromString('47.0, 7.4test')).to.eq(
+            it('Returns undefined when anything else than numbers, coma, whitespaces and point is in the text', () => {
+                expect(coordinateFromString('test')).to.be.undefined
+                expect(coordinateFromString('47.0, 7.4test')).to.eq(
                     undefined,
                     'must not accept text after the coordinates'
                 )
-                expect(await coordinateFromString('47.0.3, 7.4,0')).to.eq(
+                expect(coordinateFromString('47.0.3, 7.4,0')).to.eq(
                     undefined,
                     'must not accept text after the coordinates'
                 )
-                expect(await coordinateFromString('test47.0, 7.4')).to.eq(
+                expect(coordinateFromString('test47.0, 7.4')).to.eq(
                     undefined,
                     'must not accept text before the coordinates'
                 )
             })
-            it('Returns undefined when the given text is invalid (null or not a string)', async () => {
-                expect(await coordinateFromString(null)).to.be.undefined
-                expect(await coordinateFromString(1234)).to.be.undefined
-                expect(await coordinateFromString([45.6, 7.4])).to.be.undefined
-                expect(await coordinateFromString({ lon: 7, lat: 45 })).to.be.undefined
+            it('Returns undefined when the given text is invalid (null or not a string)', () => {
+                expect(coordinateFromString(null)).to.be.undefined
+                expect(coordinateFromString(1234)).to.be.undefined
+                expect(coordinateFromString([45.6, 7.4])).to.be.undefined
+                expect(coordinateFromString({ lon: 7, lat: 45 })).to.be.undefined
             })
-            it('Returns undefined when the given text is not two numbers separated by a coma, a space or a slash', async () => {
-                expect(await coordinateFromString('47.0')).to.be.undefined
-                expect(await coordinateFromString('47.0,')).to.be.undefined
-                expect(await coordinateFromString('47.0,test')).to.be.undefined
-                expect(await coordinateFromString('47.0, test')).to.be.undefined
+            it('Returns undefined when the given text is not two numbers separated by a coma, a space or a slash', () => {
+                expect(coordinateFromString('47.0')).to.be.undefined
+                expect(coordinateFromString('47.0,')).to.be.undefined
+                expect(coordinateFromString('47.0,test')).to.be.undefined
+                expect(coordinateFromString('47.0, test')).to.be.undefined
             })
-            it("Returns undefined when coordinates entered don't match any projection bur are technically valid (two numbers)", async () => {
-                expect(await coordinateFromString('600000, 20000')).to.be.undefined
+            it("Returns undefined when coordinates entered don't match any projection bur are technically valid (two numbers)", () => {
+                expect(coordinateFromString('600000, 20000')).to.be.undefined
             })
         })
         describe('EPSG:4326 (WGS84)', () => {
@@ -477,17 +477,18 @@ describe('Unit test functions from coordinateExtractors.js', () => {
          *
          * @param {Number} x
          * @param {Number} y
+         * @param {CoordinateSystem} expectedProjection
          * @param {Number} acceptableDelta
          */
-        const checkSwissCoordinateSystem = (x, y, acceptableDelta) => {
+        const checkSwissCoordinateSystem = (x, y, expectedProjection, acceptableDelta) => {
             it('Returns coordinates when input is valid', () => {
-                checkXY(x, y, expectedCenterLV95[0], expectedCenterLV95[1], LV95, {
+                checkXY(x, y, x, y, expectedProjection, {
                     acceptableDelta,
                     testInverted: true,
                 })
             })
             it('Returns coordinates when input is entered backward', () => {
-                checkXY(y, x, expectedCenterLV95[0], expectedCenterLV95[1], LV95, {
+                checkXY(y, x, x, y, expectedProjection, {
                     acceptableDelta,
                     testInverted: true,
                 })
@@ -496,17 +497,17 @@ describe('Unit test functions from coordinateExtractors.js', () => {
                 checkXY(
                     numberWithThousandSeparator(x),
                     numberWithThousandSeparator(y),
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    x,
+                    y,
+                    expectedProjection,
                     { acceptableDelta, testInverted: true }
                 )
                 checkXY(
                     numberWithThousandSeparator(x, ' '),
                     numberWithThousandSeparator(y, ' '),
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    x,
+                    y,
+                    expectedProjection,
                     { acceptableDelta, testInverted: true, thousandSpaceSeparator: true }
                 )
             })
@@ -514,33 +515,31 @@ describe('Unit test functions from coordinateExtractors.js', () => {
                 checkXY(
                     numberWithThousandSeparator(y),
                     numberWithThousandSeparator(x),
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    x,
+                    y,
+                    expectedProjection,
                     { acceptableDelta, testInverted: true }
                 )
                 checkXY(
                     numberWithThousandSeparator(y, ' '),
                     numberWithThousandSeparator(x, ' '),
-                    expectedCenterLV95[0],
-                    expectedCenterLV95[1],
-                    LV95,
+                    x,
+                    y,
+                    expectedProjection,
                     { acceptableDelta, testInverted: true, thousandSpaceSeparator: true }
                 )
             })
         }
 
         describe('EPSG:2056 (LV95)', () => {
-            checkSwissCoordinateSystem(expectedCenterLV95[0], expectedCenterLV95[1], 0.1)
+            checkSwissCoordinateSystem(expectedCenterLV95[0], expectedCenterLV95[1], LV95, 0.1)
         })
 
-        // After https://jira.swisstopo.ch/browse/PB-843 a backend service is used to reproject LV03 to LV95 coordinates.
-        // It then doesn't really make sense to test that in unit tests, so I skip it
-        describe.skip('EPSG:21781 (LV03)', () => {
+        describe('EPSG:21781 (LV03)', () => {
             const expectedCenterLV03 = proj4(LV95.epsg, LV03.epsg, expectedCenterLV95).map(
                 (value) => LV03.roundCoordinateValue(value)
             )
-            checkSwissCoordinateSystem(expectedCenterLV03[0], expectedCenterLV03[1], 0.1)
+            checkSwissCoordinateSystem(expectedCenterLV03[0], expectedCenterLV03[1], LV03, 0.1)
         })
 
         describe('Military Grid Reference System (MGRS)', () => {
diff --git a/src/utils/coordinates/coordinateExtractors.js b/src/utils/coordinates/coordinateExtractors.js
index a2a283797..08c9e367d 100644
--- a/src/utils/coordinates/coordinateExtractors.js
+++ b/src/utils/coordinates/coordinateExtractors.js
@@ -1,4 +1,3 @@
-import reframe from '@/api/lv03Reframe.api'
 import { LV03, LV95, WEBMERCATOR, WGS84 } from '@/utils/coordinates/coordinateSystems'
 import { toPoint as mgrsToWGS84 } from '@/utils/militaryGridProjection'
 
@@ -117,21 +116,15 @@ function extractLV95Coordinates(text) {
 
 /**
  * @param {String} text
- * @returns {Promise<[Number, Number] | undefined>}
+ * @returns {[Number, Number] | undefined}
  */
-async function extractLV03Coordinates(text) {
+function extractLV03Coordinates(text) {
     const coordinates = numericalExtractor(REGEX_METRIC_COORDINATES.exec(text.trim()))
     if (coordinates) {
         if (LV03.isInBounds(coordinates[0], coordinates[1])) {
-            return reframe({
-                inputCoordinates: [coordinates[0], coordinates[1]],
-                inputProjection: LV03,
-            })
+            return [coordinates[0], coordinates[1]].map(LV03.roundCoordinateValue)
         } else if (LV03.isInBounds(coordinates[1], coordinates[0])) {
-            return reframe({
-                inputCoordinates: [coordinates[1], coordinates[0]],
-                inputProjection: LV03,
-            })
+            return [coordinates[1], coordinates[0]].map(LV03.roundCoordinateValue)
         }
     }
     return undefined
@@ -322,33 +315,32 @@ const mgrsExtractor = (regexMatches) => {
  * - I.e. `zufall.anders.blaumeise`
  *
  * @param {String} text The text in which we want to find coordinates
- * @returns {Promise<ExtractedCoordinate | undefined>} Coordinates in the given order in text with
+ * @returns {ExtractedCoordinate | undefined} Coordinates in the given order in text with
  *   information about which projection they are expressed in, or `undefined` if nothing was found
  */
-const coordinateFromString = async (text) => {
+const coordinateFromString = (text) => {
     if (typeof text !== 'string') {
         return undefined
     }
-    const wgs84result = extractWGS84Coordinates(text)
-    if (wgs84result) {
+    const wgs84Result = extractWGS84Coordinates(text)
+    if (wgs84Result) {
         return {
             coordinateSystem: WGS84,
-            coordinate: wgs84result,
+            coordinate: wgs84Result,
         }
     }
-    const lv95result = extractLV95Coordinates(text)
-    if (lv95result) {
+    const lv95Result = extractLV95Coordinates(text)
+    if (lv95Result) {
         return {
             coordinateSystem: LV95,
-            coordinate: lv95result,
+            coordinate: lv95Result,
         }
     }
-    const lv03result = await extractLV03Coordinates(text)
-    if (lv03result) {
+    const lv03Result = extractLV03Coordinates(text)
+    if (lv03Result) {
         return {
-            // coordinates have been reframed to LV95
-            coordinateSystem: LV95,
-            coordinate: lv03result,
+            coordinateSystem: LV03,
+            coordinate: lv03Result,
         }
     }
     const mercatorResult = extractMetricMercatorCoordinates(text)

From c2f1e7e4eaa3d59fe35930650d87c263bd3f1c34 Mon Sep 17 00:00:00 2001
From: Pascal Barth <pak.barth@gmail.com>
Date: Fri, 6 Sep 2024 10:57:08 +0200
Subject: [PATCH 10/56] PB-843 : change reframe helper so that it can output
 any projection

should make the code much simpler to use in the context of the search bar
---
 src/api/lv03Reframe.api.js                    | 31 +++++++++++++------
 .../map/components/LocationPopupPosition.vue  |  7 +++--
 .../legacyPermalinkManagement.routerPlugin.js |  1 +
 src/store/modules/search.store.js             | 17 +++++-----
 src/utils/__tests__/extentUtils.spec.js       | 14 ++++-----
 src/utils/coordinates/coordinateUtils.js      | 13 ++++++++
 .../tests-e2e/search/coordinates-search.cy.js | 21 +++++--------
 7 files changed, 60 insertions(+), 44 deletions(-)

diff --git a/src/api/lv03Reframe.api.js b/src/api/lv03Reframe.api.js
index 759a6c5ae..34e1bdcb7 100644
--- a/src/api/lv03Reframe.api.js
+++ b/src/api/lv03Reframe.api.js
@@ -1,7 +1,7 @@
 import axios from 'axios'
-import proj4 from 'proj4'
 
 import { LV03, LV95 } from '@/utils/coordinates/coordinateSystems'
+import { reprojectAndRound } from '@/utils/coordinates/coordinateUtils'
 import log from '@/utils/logging'
 
 const REFRAME_BASE_URL = 'https://geodesy.geo.admin.ch/reframe/'
@@ -14,22 +14,25 @@ const REFRAME_BASE_URL = 'https://geodesy.geo.admin.ch/reframe/'
  *   in the other coordinate system
  * @param {CoordinateSystem} config.inputProjection Which projection is used to describe the input
  *   coordinate, must be either LV03 or LV95.
- * @returns {Promise<[Number, Number]>} Input coordinates re-framed by the backend service.
- *   Coordinate system will depend on the input. If LV03 coordinates are given, the output will be
- *   LV95 coordinates (and vice-versa)
+ * @param {CoordinateSystem} config.outputProjection In which projection the output coordinates
+ *   should be expressed into. If nothing is given, the "opposite" swiss projection of the input
+ *   will be chosen (if LV03 coordinates are given, the output will be LV95 coordinates (and
+ *   vice-versa))
+ * @returns {Promise<[Number, Number]>} Input coordinates re-framed by the backend service, and
+ *   re-projected in the output projection.
  * @see https://www.swisstopo.admin.ch/en/rest-api-geoservices-reframe-web
  * @see https://github.com/geoadmin/mf-geoadmin3/blob/master/src/components/ReframeService.js
  */
 export default function reframe(config = {}) {
     return new Promise((resolve, reject) => {
-        const { inputCoordinates, inputProjection } = config
+        const { inputCoordinates, inputProjection, outputProjection = null } = config
         if (!Array.isArray(inputCoordinates) || inputCoordinates.length !== 2) {
             reject(new Error('inputCoordinates must be an array with length of 2'))
         }
         if (![LV03.epsg, LV95.epsg].includes(inputProjection?.epsg)) {
             reject(new Error('inputProjection must be LV03 or LV95'))
         }
-        const outputProjection = inputProjection === LV03 ? LV95 : LV03
+        const backendResponseProjection = inputProjection === LV03 ? LV95 : LV03
         axios({
             method: 'GET',
             url: `${REFRAME_BASE_URL}${inputProjection === LV95 ? 'lv95tolv03' : 'lv03tolv95'}`,
@@ -40,7 +43,15 @@ export default function reframe(config = {}) {
         })
             .then((response) => {
                 if (response.data?.coordinates) {
-                    resolve(response.data.coordinates.map(outputProjection.roundCoordinateValue))
+                    let outputCoordinates = [...response.data.coordinates]
+                    if (outputProjection && outputProjection !== backendResponseProjection) {
+                        outputCoordinates = reprojectAndRound(
+                            backendResponseProjection,
+                            outputProjection,
+                            outputCoordinates
+                        )
+                    }
+                    resolve(outputCoordinates)
                 } else {
                     log.error(
                         'Error while re-framing coordinate',
@@ -48,8 +59,10 @@ export default function reframe(config = {}) {
                         'fallback to proj4'
                     )
                     resolve(
-                        proj4(inputProjection.epsg, outputProjection.epsg, inputCoordinates).map(
-                            outputProjection.roundCoordinateValue
+                        reprojectAndRound(
+                            inputProjection,
+                            outputProjection ?? backendResponseProjection,
+                            inputCoordinates
                         )
                     )
                 }
diff --git a/src/modules/map/components/LocationPopupPosition.vue b/src/modules/map/components/LocationPopupPosition.vue
index aac81fd49..233fc70e2 100644
--- a/src/modules/map/components/LocationPopupPosition.vue
+++ b/src/modules/map/components/LocationPopupPosition.vue
@@ -1,7 +1,6 @@
 <script setup>
 /** Right click pop up which shows the coordinates of the position under the cursor. */
 
-import proj4 from 'proj4'
 import { computed, onMounted, ref, toRefs, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
@@ -17,6 +16,7 @@ import {
     WGS84Format,
 } from '@/utils/coordinates/coordinateFormat'
 import { LV03, LV95, WGS84 } from '@/utils/coordinates/coordinateSystems'
+import { reprojectAndRound } from '@/utils/coordinates/coordinateUtils'
 import log from '@/utils/logging'
 
 const props = defineProps({
@@ -46,7 +46,7 @@ const height = ref(null)
 const i18n = useI18n()
 
 const coordinateWGS84Metric = computed(() => {
-    return proj4(projection.value.epsg, WGS84.epsg, coordinate.value)
+    return reprojectAndRound(projection.value, WGS84, coordinate.value)
 })
 const coordinateWGS84Plain = computed(() => {
     // we want to output lat / lon, meaning we have to give the coordinate as y / x
@@ -90,10 +90,11 @@ watch(currentLang, () => {
 
 async function updateLV03Coordinate() {
     try {
-        const lv95coordinate = proj4(projection.value.epsg, LV95.epsg, coordinate.value)
+        const lv95coordinate = reprojectAndRound(projection.value, LV95, coordinate.value)
         lv03Coordinate.value = await reframe({
             inputCoordinates: lv95coordinate,
             inputProjection: LV95,
+            outputProjection: LV03,
         })
     } catch (error) {
         log.error('Failed to retrieve LV03 coordinate', error)
diff --git a/src/router/legacyPermalinkManagement.routerPlugin.js b/src/router/legacyPermalinkManagement.routerPlugin.js
index 9e1c23745..9fd7bbf6b 100644
--- a/src/router/legacyPermalinkManagement.routerPlugin.js
+++ b/src/router/legacyPermalinkManagement.routerPlugin.js
@@ -221,6 +221,7 @@ const handleLegacyParams = async (legacyParams, store, originView) => {
             newCoordinates = await reframe({
                 inputCoordinates: legacyCoordinates,
                 inputProjection: LV03,
+                outputProjection: projection,
             })
             log.info(
                 `[Legacy URL] converting LV03 X/Y|E/N=${JSON.stringify(legacyCoordinates)} to ${projection.epsg} => ${JSON.stringify(newCoordinates)}`
diff --git a/src/store/modules/search.store.js b/src/store/modules/search.store.js
index d9964e75e..5ddab4305 100644
--- a/src/store/modules/search.store.js
+++ b/src/store/modules/search.store.js
@@ -1,11 +1,10 @@
-import proj4 from 'proj4'
-
 import reframe from '@/api/lv03Reframe.api'
 import search, { SearchResultTypes } from '@/api/search.api'
 import { isWhat3WordsString, retrieveWhat3WordsLocation } from '@/api/what3words.api'
 import coordinateFromString from '@/utils/coordinates/coordinateExtractors'
 import { STANDARD_ZOOM_LEVEL_1_25000_MAP } from '@/utils/coordinates/CoordinateSystem.class'
-import { LV03, LV95 } from '@/utils/coordinates/coordinateSystems'
+import { LV03 } from '@/utils/coordinates/coordinateSystems'
+import { reprojectAndRound } from '@/utils/coordinates/coordinateUtils'
 import CustomCoordinateSystem from '@/utils/coordinates/CustomCoordinateSystem.class'
 import log from '@/utils/logging'
 
@@ -66,16 +65,14 @@ const actions = {
                         coordinates = await reframe({
                             inputProjection: LV03,
                             inputCoordinates: coordinates,
+                            outputProjection: currentProjection,
                         })
-                        coordinates = proj4(LV95.epsg, currentProjection.epsg, coordinates).map(
-                            currentProjection.roundCoordinateValue
-                        )
                     } else {
-                        coordinates = proj4(
-                            extractedCoordinate.coordinateSystem.epsg,
-                            currentProjection.epsg,
+                        coordinates = reprojectAndRound(
+                            extractedCoordinate.coordinateSystem,
+                            currentProjection,
                             coordinates
-                        ).map(currentProjection.roundCoordinateValue)
+                        )
                     }
                 }
                 const dispatcherCoordinate = `${dispatcher}/search.store/setSearchQuery/coordinate`
diff --git a/src/utils/__tests__/extentUtils.spec.js b/src/utils/__tests__/extentUtils.spec.js
index 9ec5f51d5..0f92446c5 100644
--- a/src/utils/__tests__/extentUtils.spec.js
+++ b/src/utils/__tests__/extentUtils.spec.js
@@ -1,8 +1,8 @@
 import { expect } from 'chai'
-import proj4 from 'proj4'
 import { describe, it } from 'vitest'
 
 import { LV95, WGS84 } from '@/utils/coordinates/coordinateSystems'
+import { reprojectAndRound } from '@/utils/coordinates/coordinateUtils'
 import { getExtentForProjection } from '@/utils/extentUtils'
 
 describe('Test extent utils', () => {
@@ -16,9 +16,7 @@ describe('Test extent utils', () => {
         })
         it('reproject extent of a single coordinate inside the bounds of the projection', () => {
             const singleCoordinate = [8.2, 47.5]
-            const singleCoordinateInLV95 = proj4(WGS84.epsg, LV95.epsg, singleCoordinate).map(
-                LV95.roundCoordinateValue
-            )
+            const singleCoordinateInLV95 = reprojectAndRound(WGS84, LV95, singleCoordinate)
             const extent = [singleCoordinate, singleCoordinate].flat()
             expect(getExtentForProjection(LV95, extent)).to.deep.equal([
                 singleCoordinateInLV95,
@@ -40,11 +38,11 @@ describe('Test extent utils', () => {
         })
         it('only gives back the portion of an extent that is within LV95 bounds', () => {
             const singleCoordinateInsideLV95 = [7.54, 48.12]
-            const singleCoordinateInLV95 = proj4(
-                WGS84.epsg,
-                LV95.epsg,
+            const singleCoordinateInLV95 = reprojectAndRound(
+                WGS84,
+                LV95,
                 singleCoordinateInsideLV95
-            ).map(LV95.roundCoordinateValue)
+            )
             const overlappingExtent = [0, 0, ...singleCoordinateInsideLV95]
             expect(getExtentForProjection(LV95, overlappingExtent)).to.deep.equal([
                 LV95.bounds.bottomLeft,
diff --git a/src/utils/coordinates/coordinateUtils.js b/src/utils/coordinates/coordinateUtils.js
index 81d4a3bb2..6b9330a41 100644
--- a/src/utils/coordinates/coordinateUtils.js
+++ b/src/utils/coordinates/coordinateUtils.js
@@ -155,3 +155,16 @@ export function removeZValues(coordinates) {
     }
     return unwrapped.map((coordinate) => [coordinate[0], coordinate[1]])
 }
+
+/**
+ * @param {CoordinateSystem} from
+ * @param {CoordinateSystem} into
+ * @param {[Number, Number]} coordinates
+ * @returns {[Number, Number] | null}
+ */
+export function reprojectAndRound(from, into, coordinates) {
+    if (!from || !into || !Array.isArray(coordinates)) {
+        return null
+    }
+    return proj4(from.epsg, into.epsg, coordinates).map(into.roundCoordinateValue)
+}
diff --git a/tests/cypress/tests-e2e/search/coordinates-search.cy.js b/tests/cypress/tests-e2e/search/coordinates-search.cy.js
index c0927b2e5..824f31686 100644
--- a/tests/cypress/tests-e2e/search/coordinates-search.cy.js
+++ b/tests/cypress/tests-e2e/search/coordinates-search.cy.js
@@ -1,10 +1,9 @@
 /// <reference types="cypress" />
 
-import proj4 from 'proj4'
-
 import { DEFAULT_PROJECTION } from '@/config/map.config'
 import { STANDARD_ZOOM_LEVEL_1_25000_MAP } from '@/utils/coordinates/CoordinateSystem.class'
 import { LV03, LV95, WEBMERCATOR, WGS84 } from '@/utils/coordinates/coordinateSystems'
+import { reprojectAndRound } from '@/utils/coordinates/coordinateUtils'
 import CustomCoordinateSystem from '@/utils/coordinates/CustomCoordinateSystem.class'
 import { latLonToMGRS } from '@/utils/militaryGridProjection'
 
@@ -15,20 +14,14 @@ describe('Testing coordinates typing in search bar', () => {
         cy.goToMapView()
     })
     const expectedCenter = DEFAULT_PROJECTION.bounds.center.map((value) => value - 1000)
-    const expectedCenterLV95 = proj4(DEFAULT_PROJECTION.epsg, LV95.epsg, expectedCenter).map(
-        LV95.roundCoordinateValue
-    )
-    const expectedCenterLV03 = proj4(DEFAULT_PROJECTION.epsg, LV03.epsg, expectedCenter).map(
-        LV03.roundCoordinateValue
-    )
-    const expectedCenterWebMercator = proj4(
-        DEFAULT_PROJECTION.epsg,
-        WEBMERCATOR.epsg,
+    const expectedCenterLV95 = reprojectAndRound(DEFAULT_PROJECTION, LV95, expectedCenter)
+    const expectedCenterLV03 = reprojectAndRound(DEFAULT_PROJECTION, LV03, expectedCenter)
+    const expectedCenterWebMercator = reprojectAndRound(
+        DEFAULT_PROJECTION,
+        WEBMERCATOR,
         expectedCenter
-    ).map(WEBMERCATOR.roundCoordinateValue)
-    const expectedCenterWGS84 = proj4(DEFAULT_PROJECTION.epsg, WGS84.epsg, expectedCenter).map(
-        WGS84.roundCoordinateValue
     )
+    const expectedCenterWGS84 = reprojectAndRound(DEFAULT_PROJECTION, WGS84, expectedCenter)
 
     const checkCenterInStore = (acceptableDelta = 0.0) => {
         cy.log(`Check that center is at ${JSON.stringify(expectedCenter)}`)

From 0c86cb0e6d359fcabb6bc6535f6c7c56f9e63767 Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Thu, 5 Sep 2024 17:13:58 +0200
Subject: [PATCH 11/56] PB-303: Add reading of icon size from api

---
 src/api/icon.api.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/api/icon.api.js b/src/api/icon.api.js
index 5716a8fae..a13237bfa 100644
--- a/src/api/icon.api.js
+++ b/src/api/icon.api.js
@@ -107,13 +107,15 @@ export class DrawingIcon {
      *   belong to one icon set)
      * @param {Number[]} anchor Offset to apply to this icon when placed on a coordinate ([x,y]
      *   format)
+     * @param {Number[]} size Size of the icons in pixel assuming a scaling factor of 1
      */
-    constructor(name, imageURL, imageTemplateURL, iconSetName, anchor) {
+    constructor(name, imageURL, imageTemplateURL, iconSetName, anchor, size) {
         this._name = name
         this._imageURL = imageURL
         this._imageTemplateURL = imageTemplateURL
         this._iconSetName = iconSetName
         this._anchor = anchor
+        this._size = size
     }
 
     /** @returns {String} Name of this icon in the backend (lower cased) */
@@ -139,6 +141,11 @@ export class DrawingIcon {
         return this._anchor
     }
 
+    /** @returns {Number[]} Size of the icons in pixel assuming a scaling factor of 1 */
+    get size() {
+        return this._size
+    }
+
     /**
      * @returns {String} Name of the {@link DrawingIconSet} in which belongs this icon (an icon can
      *   only belong to one icon set)
@@ -225,7 +232,8 @@ async function loadIconsForIconSet(iconSet) {
                     rawIcon.url,
                     rawIcon.template_url,
                     iconSet.name,
-                    rawIcon.anchor
+                    rawIcon.anchor,
+                    rawIcon.size
                 )
         )
     } catch (error) {

From b348c1ba494035d23539e5870db87d87a90911f1 Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Fri, 6 Sep 2024 17:48:02 +0200
Subject: [PATCH 12/56] PB-303: Replace hard-coded icon size with metadata of
 icon

---
 src/api/features/EditableFeature.class.js              |  2 +-
 src/api/icon.api.js                                    | 10 +---------
 .../infobox/components/styling/FeatureStyleEdit.vue    |  3 +--
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/api/features/EditableFeature.class.js b/src/api/features/EditableFeature.class.js
index 7b0d85cb3..989eac4c9 100644
--- a/src/api/features/EditableFeature.class.js
+++ b/src/api/features/EditableFeature.class.js
@@ -157,7 +157,7 @@ export default class EditableFeature extends SelectableFeature {
                   crossOrigin: 'Anonymous',
                   anchor: this.icon.anchor,
                   scale: this.iconSizeScale,
-                  size: DEFAULT_ICON_URL_PARAMS.size,
+                  size: this.icon.size,
               })
             : null
     }
diff --git a/src/api/icon.api.js b/src/api/icon.api.js
index a13237bfa..e2013b9f0 100644
--- a/src/api/icon.api.js
+++ b/src/api/icon.api.js
@@ -4,15 +4,7 @@ import { getViewerDedicatedServicesBaseUrl } from '@/config/baseUrl.config'
 import { calculateTextOffset, MEDIUM, RED } from '@/utils/featureStyleUtils'
 import log from '@/utils/logging'
 
-/**
- * Default Icon parameters for the URL.
- *
- * NOTE: The size should match the received size for the scale from the backend. It is needed to
- * avoid race condition when exporting/saving KML. Openlayer requires the size to compute the
- * scale.
- *
- * TODO: take the default size from the backend icon API
- */
+/** Default Icon parameters for the URL. */
 export const DEFAULT_ICON_URL_PARAMS = {
     scale: 1,
     size: [48, 48],
diff --git a/src/modules/infobox/components/styling/FeatureStyleEdit.vue b/src/modules/infobox/components/styling/FeatureStyleEdit.vue
index ce1fe053f..c3dfd0855 100644
--- a/src/modules/infobox/components/styling/FeatureStyleEdit.vue
+++ b/src/modules/infobox/components/styling/FeatureStyleEdit.vue
@@ -6,7 +6,6 @@ import { computed, onBeforeUnmount, onMounted, ref, toRefs, watch } from 'vue'
 import { useStore } from 'vuex'
 
 import EditableFeature, { EditableFeatureTypes } from '@/api/features/EditableFeature.class'
-import { DEFAULT_ICON_URL_PARAMS } from '@/api/icon.api'
 import FeatureAreaInfo from '@/modules/infobox/components/FeatureAreaInfo.vue'
 import DrawingStyleColorSelector from '@/modules/infobox/components/styling/DrawingStyleColorSelector.vue'
 import DrawingStyleIconSelector from '@/modules/infobox/components/styling/DrawingStyleIconSelector.vue'
@@ -158,7 +157,7 @@ function updateTextOffset() {
             feature.value.textSize.textScale,
             feature.value.iconSize.iconScale,
             feature.value.icon.anchor,
-            DEFAULT_ICON_URL_PARAMS.size //TODO: PB-303 Use icon size from backend
+            feature.value.icon.size
         )
 
         store.dispatch('changeFeatureTextOffset', {

From 9dc8e4cd64a83caba9f6db6122dbfd3d59106653 Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Fri, 6 Sep 2024 17:49:59 +0200
Subject: [PATCH 13/56] PB-303: Remove cypress test necessary due to hard-coded
 icon size

---
 tests/cypress/support/drawing.js      | 31 ---------------------------
 tests/cypress/tests-e2e/drawing.cy.js |  2 +-
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/tests/cypress/support/drawing.js b/tests/cypress/support/drawing.js
index cf297537b..7efaef1a2 100644
--- a/tests/cypress/support/drawing.js
+++ b/tests/cypress/support/drawing.js
@@ -222,34 +222,3 @@ export function kmlMetadataTemplate(data) {
     }
     return metadata
 }
-
-/**
- * Wait until all defaults red icons have been loaded
- *
- * This wait is required when checking the KML XML content, because openlayer requires the icon size
- * from the icon request in order to compute the icon scale in KML, if the icon is not loaded when
- * saving the KML, openlayer uses a default size of 64 pixel which defer from our icon size of 48
- * pixel.
- *
- * So before doing an action that would change the icon size, we need to make sure that all icons
- * have been already loaded to avoid any race condition.
- *
- * This wait is only needed in cypress as in real life the save has a debouncing of at least 2
- * seconds which ensure that we have the icons.
- */
-Cypress.Commands.add('waitOnAllIconsDefault', () => {
-    cy.get('@icon-set-default').then((interception) => {
-        cy.wait(Array(interception.response.body.items.length).fill('@icon-default'))
-    })
-})
-
-/**
- * Wait until all defaults green icons have been loaded
- *
- * @see waitOnAllIconsDefault for more infos
- */
-Cypress.Commands.add('waitOnAllIconsDefaultGreen', () => {
-    cy.get('@icon-set-default').then((interception) => {
-        cy.wait(Array(interception.response.body.items.length).fill('@icon-default-green'))
-    })
-})
diff --git a/tests/cypress/tests-e2e/drawing.cy.js b/tests/cypress/tests-e2e/drawing.cy.js
index a3b0090b0..5f2489810 100644
--- a/tests/cypress/tests-e2e/drawing.cy.js
+++ b/tests/cypress/tests-e2e/drawing.cy.js
@@ -122,7 +122,7 @@ describe('Drawing module tests', () => {
                     `[data-cy="drawing-style-marker-popup"] [data-cy="drawing-style-color-select-box"] [data-cy="color-selector-${GREEN.name}"]:visible`
                 ).click()
                 // it should load all icons with the green color
-                cy.waitOnAllIconsDefaultGreen()
+                cy.wait('@icon-default-green')
 
                 // the color of the marker already placed on the map must switch to green
                 cy.wait('@update-kml')

From 46dd3bd300e4b6c034271a4e70a5013a5b268c9a Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Mon, 9 Sep 2024 15:45:33 +0200
Subject: [PATCH 14/56] PB-303: Update kml test file for cypress

---
 .../service-icons/set-default.fixture.json    | 140 +++++++++++-------
 1 file changed, 84 insertions(+), 56 deletions(-)

diff --git a/tests/cypress/fixtures/service-icons/set-default.fixture.json b/tests/cypress/fixtures/service-icons/set-default.fixture.json
index b45839395..50e6819ee 100644
--- a/tests/cypress/fixtures/service-icons/set-default.fixture.json
+++ b/tests/cypress/fixtures/service-icons/set-default.fixture.json
@@ -4,170 +4,198 @@
             "icon_set": "default",
             "name": "001-marker",
             "url": "http://localhost:8080/api/icons/sets/default/icons/001-marker-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "002-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/002-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "003-square",
             "url": "http://localhost:8080/api/icons/sets/default/icons/003-square-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "004-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/004-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "005-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/005-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "006-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/006-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "007-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/007-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "008-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/008-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "009-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/009-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "010-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/010-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "011-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/011-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "012-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/012-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "013-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/013-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "014-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/014-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "015-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/015-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "016-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/016-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "017-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/017-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "018-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/018-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "019-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/019-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "020-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/020-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "021-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/021-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "022-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/022-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "023-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/023-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "024-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/024-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "025-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/025-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "026-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/026-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "027-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/027-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "028-placeholder",
             "url": "http://localhost:8080/api/icons/sets/default/icons/028-placeholder-255,0,0.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png"
-        },
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}-{r},{g},{b}.png",
+            "size": [48, 48]
+         },
         {
             "icon_set": "default",
             "name": "029-placeholder",

From 38046961425d80ed784fcc97a2020679fdb3462e Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Tue, 10 Sep 2024 17:39:13 +0200
Subject: [PATCH 15/56] PB-303: Icon default size is no longer exported

---
 src/api/icon.api.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/api/icon.api.js b/src/api/icon.api.js
index e2013b9f0..7a906c615 100644
--- a/src/api/icon.api.js
+++ b/src/api/icon.api.js
@@ -7,18 +7,20 @@ import log from '@/utils/logging'
 /** Default Icon parameters for the URL. */
 export const DEFAULT_ICON_URL_PARAMS = {
     scale: 1,
-    size: [48, 48],
 }
 
 /** Default offset of title for any feature */
 export const DEFAULT_TITLE_OFFSET = [0, 0]
 
+/** Default size of icon for any feature */
+const DEFAULT_ICON_SIZE = [48, 48]
+
 /** Default offset of title for the default marker */
 export const DEFAULT_MARKER_TITLE_OFFSET = calculateTextOffset(
     MEDIUM.textScale,
     MEDIUM.iconScale,
     [0, 0.875],
-    DEFAULT_ICON_URL_PARAMS.size
+    DEFAULT_ICON_SIZE
 )
 
 /**

From 0bfa3d941437e326d57c11d3e6345234b559dd35 Mon Sep 17 00:00:00 2001
From: Pascal Barth <pak.barth@gmail.com>
Date: Fri, 30 Aug 2024 07:59:13 +0200
Subject: [PATCH 16/56] PB-788 : stop using reserved "id" property for menu
 section identifier

It wasn't handled properly when a child component was declaring the ID itself, the parent MenuTray couldn't access the value of ID.
---
 .../menu/components/menu/MenuSection.vue      |  8 +++---
 src/modules/menu/components/menu/MenuTray.vue | 26 +++++++++----------
 .../components/print/MenuPrintSection.vue     | 10 ++++---
 .../components/share/MenuShareSection.vue     |  6 ++---
 .../components/topics/MenuTopicSection.vue    | 14 +++++-----
 5 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/modules/menu/components/menu/MenuSection.vue b/src/modules/menu/components/menu/MenuSection.vue
index fbe6ad8bc..7237cd0d6 100644
--- a/src/modules/menu/components/menu/MenuSection.vue
+++ b/src/modules/menu/components/menu/MenuSection.vue
@@ -52,7 +52,7 @@ export default {
     },
     props: {
         // String that uniquely identifies this section
-        id: {
+        sectionId: {
             type: String,
             required: true,
         },
@@ -78,7 +78,7 @@ export default {
             default: false,
         },
     },
-    expose: ['close', 'open', 'id'],
+    expose: ['close', 'open', 'sectionId'],
     emits: ['openMenuSection', 'closeMenuSection', 'click:header'],
     data() {
         return {
@@ -111,9 +111,9 @@ export default {
             if (this.showBody !== value) {
                 this.showBody = value
                 if (this.showBody) {
-                    this.$emit('openMenuSection', this.id)
+                    this.$emit('openMenuSection', this.sectionId)
                 } else {
-                    this.$emit('closeMenuSection', this.id)
+                    this.$emit('closeMenuSection', this.sectionId)
                 }
             }
         },
diff --git a/src/modules/menu/components/menu/MenuTray.vue b/src/modules/menu/components/menu/MenuTray.vue
index a1a74788a..585a4c305 100644
--- a/src/modules/menu/components/menu/MenuTray.vue
+++ b/src/modules/menu/components/menu/MenuTray.vue
@@ -82,9 +82,9 @@ function onCloseMenuSection(id) {
  *
  * @param {any} el Reference to the element
  */
-function addRefById(el) {
-    if (el !== null && !Object.keys(refs.value).includes(el.id)) {
-        refs.value[el.id] = el
+function addRefBySectionId(el) {
+    if (el !== null && !Object.keys(refs.value).includes(el.sectionId)) {
+        refs.value[el.sectionId] = el
     }
 }
 </script>
@@ -104,21 +104,21 @@ function addRefById(el) {
             <MenuSettings />
         </MenuSection>
         <MenuShareSection
-            :ref="addRefById"
+            :ref="addRefBySectionId"
             :compact="compact"
             @open-menu-section="onOpenMenuSection"
             @close-menu-section="onCloseMenuSection"
         />
         <MenuPrintSection
             v-if="!is3dMode"
-            :ref="addRefById"
+            :ref="addRefBySectionId"
             @open-menu-section="onOpenMenuSection"
         />
         <!-- Drawing section is a glorified button, we always keep it closed and listen to click events -->
         <div id="drawSectionTooltip" tabindex="0">
             <MenuSection
                 v-if="!is3dMode"
-                id="drawSection"
+                section-id="drawSection"
                 :title="i18n.t('draw_panel_title')"
                 secondary
                 :show-content="showDrawingOverlay"
@@ -135,8 +135,8 @@ function addRefById(el) {
             />
         </div>
         <MenuSection
-            id="toolsSection"
-            :ref="addRefById"
+            :ref="addRefBySectionId"
+            section-id="toolsSection"
             data-cy="menu-tray-tool-section"
             :title="i18n.t('map_tools')"
             secondary
@@ -147,8 +147,8 @@ function addRefById(el) {
         </MenuSection>
         <MenuSection
             v-if="is3dMode"
-            id="3dSection"
-            :ref="addRefById"
+            :ref="addRefBySectionId"
+            section-id="3dSection"
             data-cy="menu-tray-3d-section"
             title="3D"
             secondary
@@ -158,15 +158,15 @@ function addRefById(el) {
             <MenuThreeD :compact="compact" />
         </MenuSection>
         <MenuTopicSection
-            :ref="addRefById"
+            :ref="addRefBySectionId"
             :compact="compact"
             @open-menu-section="onOpenMenuSection"
         />
         <!-- Here below we MUST wait that the map has been rendered before displaying any menu
              content, otherwise this would slow down the application startup -->
         <MenuSection
-            id="activeLayersSection"
-            :ref="addRefById"
+            :ref="addRefBySectionId"
+            section-id="activeLayersSection"
             :title="i18n.t('layers_displayed')"
             light
             :show-content="mapModuleReady"
diff --git a/src/modules/menu/components/print/MenuPrintSection.vue b/src/modules/menu/components/print/MenuPrintSection.vue
index 28c212c89..a7353202c 100644
--- a/src/modules/menu/components/print/MenuPrintSection.vue
+++ b/src/modules/menu/components/print/MenuPrintSection.vue
@@ -17,6 +17,7 @@ const dispatcher = { dispatcher: 'MapPrintSection.vue' }
 
 const emits = defineEmits(['openMenuSection'])
 
+const sectionId = ref('printSection')
 const isSectionShown = ref(false)
 const printGrid = ref(false)
 const printLegend = ref(false)
@@ -117,22 +118,23 @@ async function printMap() {
     }
 }
 
-function onOpenMenuSection(id) {
+function onOpenMenuSection(sectionId) {
     if (printStatus.value !== PrintStatus.PRINTING) {
         printStatus.value = PrintStatus.IDLE
     }
-    emits('openMenuSection', id)
+    emits('openMenuSection', sectionId)
 }
 
 defineExpose({
     close,
+    sectionId,
 })
 </script>
 
 <template>
     <MenuSection
-        id="printSection"
-        :title="$t('print')"
+        :section-id="sectionId"
+        :title="i18n.t('print')"
         :show-content="isSectionShown"
         data-cy="menu-print-section"
         secondary
diff --git a/src/modules/menu/components/share/MenuShareSection.vue b/src/modules/menu/components/share/MenuShareSection.vue
index 7f5c5d573..0dca354ce 100644
--- a/src/modules/menu/components/share/MenuShareSection.vue
+++ b/src/modules/menu/components/share/MenuShareSection.vue
@@ -1,6 +1,6 @@
 <template>
     <MenuSection
-        id="shareSection"
+        :section-id="sectionId"
         :title="$t('share')"
         :show-content="isSectionShown"
         data-cy="menu-share-section"
@@ -48,9 +48,9 @@ export default {
         },
     },
     emits: ['openMenuSection'],
-    expose: ['close', 'id'],
+    expose: ['close', 'sectionId'],
     data() {
-        return { id: 'shareSection' }
+        return { sectionId: 'shareSection' }
     },
     computed: {
         ...mapState({
diff --git a/src/modules/menu/components/topics/MenuTopicSection.vue b/src/modules/menu/components/topics/MenuTopicSection.vue
index 04916a7ff..f3d8c72c9 100644
--- a/src/modules/menu/components/topics/MenuTopicSection.vue
+++ b/src/modules/menu/components/topics/MenuTopicSection.vue
@@ -25,7 +25,7 @@ const menuTopicSection = ref(null)
 const showTopicSelectionPopup = ref(false)
 
 // The id needs to be exposed and is used by the MenuTray to close sections.
-const id = 'topicsSection'
+const sectionId = 'topicsSection'
 const currentTopic = computed(() => store.state.topics.current)
 const currentTopicTree = computed(() => store.state.topics.tree)
 const allTopics = computed(() => store.state.topics.config)
@@ -51,23 +51,23 @@ function close() {
     menuTopicSection.value.close()
 }
 
-function onOpenMenuTopics(id) {
-    emit('openMenuSection', id)
+function onOpenMenuTopics(sectionId) {
+    emit('openMenuSection', sectionId)
     store.dispatch('addTopicTreeOpenedThemeId', { themeId: currentTopic.value, ...dispatcher })
 }
 
-function onCloseMenuTopics(id) {
-    emit('closeMenuSection', id)
+function onCloseMenuTopics(sectionId) {
+    emit('closeMenuSection', sectionId)
     store.dispatch('removeTopicTreeOpenedThemeId', { themeId: currentTopic.value, ...dispatcher })
 }
 
-defineExpose({ close, id })
+defineExpose({ close, id: sectionId })
 </script>
 
 <template>
     <MenuSection
-        :id="id"
         ref="menuTopicSection"
+        :section-id="sectionId"
         :title="i18n.t(currentTopic)"
         :show-content="showTopicTree"
         light

From 73266e036048100d49d1370359e94bca454af88c Mon Sep 17 00:00:00 2001
From: Pascal Barth <pak.barth@gmail.com>
Date: Fri, 30 Aug 2024 08:13:50 +0200
Subject: [PATCH 17/56] PB-788 : add new "Help" section on mobile/tablet

and add the language button as an extra button of this new section, so that it may be more easily accessed on mobile/touch devices.
---
 src/modules/i18n/components/LangButton.vue    |  49 ------
 .../i18n/components/LangSwitchToolbar.vue     |  40 -----
 .../components/header/HeaderLangSelector.vue  |  44 +++++
 .../menu/components/header/HeaderLink.vue     |  59 ++++---
 .../components/header/HeaderWithSearch.vue    | 126 +++++++-------
 .../{settings => help}/HelpLink.vue           |  17 +-
 .../menu/components/help/MenuHelpSection.vue  | 154 ++++++++++++++++++
 src/modules/menu/components/help/MoreInfo.vue |  28 ++++
 .../ReportProblemButton.vue                   |   5 +-
 .../common/SendActionButtons.vue              |   0
 .../feedback/FeedbackButton.vue               |   8 +-
 .../feedback/FeedbackRating.vue               |   0
 src/modules/menu/components/menu/MenuTray.vue |  23 +--
 .../components/print/MenuPrintSection.vue     |   2 +-
 .../menu/components/settings/LinksToolbar.vue |  36 ----
 .../menu/components/settings/MenuSettings.vue |  15 --
 .../menu/components/settings/MoreInfo.vue     |  26 ---
 src/scss/webmapviewer-bootstrap-theme.scss    |   7 +
 .../components/AppVersion.vue}                |   0
 src/views/MapView.vue                         |   4 +-
 tests/cypress/support/commands.js             |  14 +-
 tests/cypress/tests-e2e/feedback.cy.js        |   2 +-
 tests/cypress/tests-e2e/header.cy.js          |   7 +-
 tests/cypress/tests-e2e/layers.cy.js          |  14 +-
 tests/cypress/tests-e2e/menuTray.cy.js        |  11 +-
 tests/cypress/tests-e2e/reportProblem.cy.js   |   4 +-
 26 files changed, 378 insertions(+), 317 deletions(-)
 delete mode 100644 src/modules/i18n/components/LangButton.vue
 delete mode 100644 src/modules/i18n/components/LangSwitchToolbar.vue
 create mode 100644 src/modules/menu/components/header/HeaderLangSelector.vue
 rename src/modules/menu/components/{settings => help}/HelpLink.vue (75%)
 create mode 100644 src/modules/menu/components/help/MenuHelpSection.vue
 create mode 100644 src/modules/menu/components/help/MoreInfo.vue
 rename src/modules/menu/components/{settings => help}/ReportProblemButton.vue (98%)
 rename src/modules/menu/components/{settings => help}/common/SendActionButtons.vue (100%)
 rename src/modules/menu/components/{settings => help}/feedback/FeedbackButton.vue (95%)
 rename src/modules/menu/components/{settings => help}/feedback/FeedbackRating.vue (100%)
 delete mode 100644 src/modules/menu/components/settings/LinksToolbar.vue
 delete mode 100644 src/modules/menu/components/settings/MenuSettings.vue
 delete mode 100644 src/modules/menu/components/settings/MoreInfo.vue
 rename src/{modules/map/components/footer/MapFooterAppVersion.vue => utils/components/AppVersion.vue} (100%)

diff --git a/src/modules/i18n/components/LangButton.vue b/src/modules/i18n/components/LangButton.vue
deleted file mode 100644
index 064193641..000000000
--- a/src/modules/i18n/components/LangButton.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<script setup>
-import { computed, toRefs } from 'vue'
-import { useStore } from 'vuex'
-
-import HeaderLink from '@/modules/menu/components/header/HeaderLink.vue'
-import log from '@/utils/logging'
-
-const dispatcher = { dispatcher: 'LangButton.vue' }
-
-const store = useStore()
-
-const props = defineProps({
-    lang: {
-        type: String,
-        required: true,
-    },
-    showAsLinks: {
-        type: Boolean,
-        default: false,
-    },
-})
-const { lang, showAsLinks } = toRefs(props)
-
-const currentLang = computed(() => store.state.i18n.lang)
-
-function changeLang() {
-    log.debug('switching locale', lang.value)
-    store.dispatch('setLang', { lang: lang.value, ...dispatcher })
-}
-</script>
-
-<template>
-    <HeaderLink v-if="showAsLinks" :primary="currentLang === lang" @click="changeLang">
-        {{ lang.toUpperCase() }}
-    </HeaderLink>
-    <button
-        v-else
-        class="btn mx-1"
-        :class="{
-            'btn-light': currentLang !== lang,
-            'btn-primary': currentLang === lang,
-        }"
-        :title="lang.toUpperCase()"
-        :data-cy="`menu-lang-${lang}`"
-        @click="changeLang"
-    >
-        {{ lang.toUpperCase() }}
-    </button>
-</template>
diff --git a/src/modules/i18n/components/LangSwitchToolbar.vue b/src/modules/i18n/components/LangSwitchToolbar.vue
deleted file mode 100644
index f31fd93a2..000000000
--- a/src/modules/i18n/components/LangSwitchToolbar.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<script setup>
-import { ref, toRefs } from 'vue'
-
-import { languages as availableLanguages } from '../index'
-import LangButton from './LangButton.vue'
-
-const props = defineProps({
-    showAsLinks: {
-        type: Boolean,
-        default: false,
-    },
-})
-const { showAsLinks } = toRefs(props)
-
-const languages = ref(Object.keys(availableLanguages))
-</script>
-
-<template>
-    <div
-        :class="{
-            'lang-switch-menu p-1': !showAsLinks,
-            'lang-switch-header me-2': showAsLinks,
-        }"
-    >
-        <LangButton
-            v-for="lang in languages"
-            :key="lang"
-            :lang="lang"
-            :show-as-links="showAsLinks"
-        />
-    </div>
-</template>
-
-<style lang="scss" scoped>
-@import '@/scss/webmapviewer-bootstrap-theme';
-
-.lang-switch-menu {
-    transition: max-height 0.3s linear;
-}
-</style>
diff --git a/src/modules/menu/components/header/HeaderLangSelector.vue b/src/modules/menu/components/header/HeaderLangSelector.vue
new file mode 100644
index 000000000..689724483
--- /dev/null
+++ b/src/modules/menu/components/header/HeaderLangSelector.vue
@@ -0,0 +1,44 @@
+<script setup>
+import { computed, ref } from 'vue'
+import { useStore } from 'vuex'
+
+import { languages as availableLanguages } from '@/modules/i18n'
+import HeaderLink from '@/modules/menu/components/header/HeaderLink.vue'
+import log from '@/utils/logging'
+
+const dispatcher = { dispatcher: 'HeaderLangSelector.vue' }
+
+const store = useStore()
+
+const languages = ref(Object.keys(availableLanguages))
+const currentLang = computed(() => store.state.i18n.lang)
+
+function changeLang(lang) {
+    log.debug('switching locale', lang)
+    store.dispatch('setLang', { lang, ...dispatcher })
+}
+</script>
+
+<template>
+    <div class="lang-switch-header me-2">
+        <HeaderLink
+            v-for="lang in languages"
+            :key="lang"
+            :primary="currentLang === lang"
+            @click="changeLang(lang)"
+        >
+            {{ lang.toUpperCase() }}
+        </HeaderLink>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+@import '@/scss/webmapviewer-bootstrap-theme';
+
+.lang-switch-menu {
+    transition: max-height 0.3s linear;
+}
+.lang-switch-header {
+    display: flex;
+}
+</style>
diff --git a/src/modules/menu/components/header/HeaderLink.vue b/src/modules/menu/components/header/HeaderLink.vue
index 7406abb5b..c66851306 100644
--- a/src/modules/menu/components/header/HeaderLink.vue
+++ b/src/modules/menu/components/header/HeaderLink.vue
@@ -1,7 +1,39 @@
+<script setup>
+/**
+ * As we've many link like buttons in the header, this component aims at having the CSS required for
+ * such link-button once
+ */
+import { toRefs } from 'vue'
+
+const props = defineProps({
+    primary: {
+        type: Boolean,
+        default: false,
+    },
+    secondary: {
+        type: Boolean,
+        default: false,
+    },
+    showAsButton: {
+        type: Boolean,
+        default: false,
+    },
+})
+const { primary, secondary, showAsButton } = toRefs(props)
+
+const emits = defineEmits(['click'])
+
+function forwardClickEvent(e) {
+    emits('click', e)
+}
+</script>
+
 <template>
     <button
-        class="btn btn-xs btn-link m-0 px-1 custom-text-decoration"
+        class="btn m-0 px-1 custom-text-decoration"
         :class="{
+            'btn-xs btn-link': !showAsButton,
+            'btn-light border-light-subtle': showAsButton,
             'text-black': !primary && !secondary,
             'text-primary': primary,
             'text-secondary': secondary,
@@ -12,31 +44,6 @@
     </button>
 </template>
 
-<script>
-/**
- * As we've many link like buttons in the header, this component aims at having the CSS required for
- * such link-button once
- */
-export default {
-    props: {
-        primary: {
-            type: Boolean,
-            default: false,
-        },
-        secondary: {
-            type: Boolean,
-            default: false,
-        },
-    },
-    emits: ['click'],
-    methods: {
-        forwardClickEvent(e) {
-            this.$emit('click', e)
-        },
-    },
-}
-</script>
-
 <style lang="scss" scoped>
 @import '@/scss/webmapviewer-bootstrap-theme';
 
diff --git a/src/modules/menu/components/header/HeaderWithSearch.vue b/src/modules/menu/components/header/HeaderWithSearch.vue
index d1fc41307..2894dbdff 100644
--- a/src/modules/menu/components/header/HeaderWithSearch.vue
+++ b/src/modules/menu/components/header/HeaderWithSearch.vue
@@ -1,3 +1,58 @@
+<script setup>
+import { computed, nextTick, onBeforeUnmount, onMounted, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { useStore } from 'vuex'
+
+import HeaderLangSelector from '@/modules/menu/components/header/HeaderLangSelector.vue'
+import HeaderMenuButton from '@/modules/menu/components/header/HeaderMenuButton.vue'
+import HeaderSwissConfederationText from '@/modules/menu/components/header/HeaderSwissConfederationText.vue'
+import SwissFlag from '@/modules/menu/components/header/SwissFlag.vue'
+import FeedbackButton from '@/modules/menu/components/help/feedback/FeedbackButton.vue'
+import HelpLink from '@/modules/menu/components/help/HelpLink.vue'
+import MoreInfo from '@/modules/menu/components/help/MoreInfo.vue'
+import ReportProblemButton from '@/modules/menu/components/help/ReportProblemButton.vue'
+import SearchBar from '@/modules/menu/components/search/SearchBar.vue'
+
+const dispatcher = { dispatcher: 'HeaderWithSearch.vue' }
+
+const header = ref(null)
+
+const store = useStore()
+const { t } = useI18n()
+
+const currentLang = computed(() => store.state.i18n.lang)
+const currentTopicId = computed(() => store.state.topics.current)
+const isPhoneMode = computed(() => store.getters.isPhoneMode)
+const hasDevSiteWarning = computed(() => store.getters.hasDevSiteWarning)
+const hasGiveFeedbackButton = computed(() => store.getters.hasGiveFeedbackButton)
+const hasReportProblemButton = computed(() => store.getters.hasReportProblemButton)
+
+onMounted(() => {
+    nextTick(() => {
+        // Initial height
+        updateHeaderHeight()
+        // Watch for changes in height
+        window.addEventListener('resize', updateHeaderHeight)
+    })
+})
+onBeforeUnmount(() => {
+    // Remove the event listener when the component is destroyed
+    window.removeEventListener('resize', updateHeaderHeight)
+})
+
+function updateHeaderHeight() {
+    store.dispatch('setHeaderHeight', {
+        height: header.value.clientHeight,
+        ...dispatcher,
+    })
+}
+
+function resetApp() {
+    // an app reset means we keep the lang and the current topic but everything else is thrown away
+    window.location = `${window.location.origin}?lang=${currentLang.value}&topic=${currentTopicId.value}`
+}
+</script>
+
 <template>
     <div ref="header" class="header" data-cy="app-header">
         <div class="header-content w-100 p-sm-0 p-md-1 d-flex align-items-center">
@@ -11,7 +66,7 @@
                 </div>
                 <HeaderSwissConfederationText
                     :current-lang="currentLang"
-                    class="mx-2 cursor-pointer search-header-swiss-confederation-text"
+                    class="mx-2 cursor-pointer d-none d-lg-block search-header-swiss-confederation-text"
                     data-cy="menu-swiss-confederation-text"
                     @click="resetApp"
                 />
@@ -25,75 +80,22 @@
             <HeaderMenuButton v-if="isPhoneMode" class="mx-1" />
         </div>
         <div class="header-settings-section" data-cy="header-settings-section">
-            <LinksToolbar id="menu-links" :show-as-links="true" />
-            <LangSwitchToolbar id="menu-lang-selector" :show-as-links="true" />
+            <FeedbackButton v-if="hasGiveFeedbackButton" show-as-link />
+            <ReportProblemButton v-if="hasReportProblemButton" show-as-link />
+            <MoreInfo small />
+            <HelpLink small />
+            <HeaderLangSelector id="menu-lang-selector" />
         </div>
         <!-- eslint-disable vue/no-v-html-->
         <div
             v-if="hasDevSiteWarning"
             class="header-warning-dev bg-danger text-white text-center text-wrap text-truncate overflow-hidden fw-bold p-1"
-            v-html="$t('test_host_warning')"
+            v-html="t('test_host_warning')"
         />
         <!-- eslint-enable vue/no-v-html-->
     </div>
 </template>
 
-<script>
-import { mapGetters, mapState } from 'vuex'
-
-import LangSwitchToolbar from '@/modules/i18n/components/LangSwitchToolbar.vue'
-import HeaderMenuButton from '@/modules/menu/components/header/HeaderMenuButton.vue'
-import HeaderSwissConfederationText from '@/modules/menu/components/header/HeaderSwissConfederationText.vue'
-import SwissFlag from '@/modules/menu/components/header/SwissFlag.vue'
-import SearchBar from '@/modules/menu/components/search/SearchBar.vue'
-import LinksToolbar from '@/modules/menu/components/settings/LinksToolbar.vue'
-
-const dispatcher = { dispatcher: 'HeaderWithSearch.vue' }
-
-export default {
-    components: {
-        SearchBar,
-        HeaderMenuButton,
-        HeaderSwissConfederationText,
-        SwissFlag,
-        LangSwitchToolbar,
-        LinksToolbar,
-    },
-    computed: {
-        ...mapState({
-            currentLang: (state) => state.i18n.lang,
-            currentTopicId: (state) => state.topics.current,
-        }),
-        ...mapGetters(['isPhoneMode', 'hasDevSiteWarning']),
-    },
-    mounted() {
-        this.$nextTick(() => {
-            // Initial height
-            this.updateHeaderHeight()
-            // Watch for changes in height
-            window.addEventListener('resize', this.updateHeaderHeight)
-        })
-    },
-    beforeUnmount() {
-        // Remove the event listener when the component is destroyed
-        window.removeEventListener('resize', this.updateHeaderHeight)
-    },
-    methods: {
-        resetApp() {
-            // an app reset means we keep the lang and the current topic but everything else is thrown away
-            window.location = `${window.location.origin}?lang=${this.currentLang}&topic=${this.currentTopicId}`
-        },
-
-        updateHeaderHeight() {
-            this.$store.dispatch('setHeaderHeight', {
-                height: this.$refs.header.clientHeight,
-                ...dispatcher,
-            })
-        },
-    },
-}
-</script>
-
 <style lang="scss" scoped>
 @import '@/scss/media-query.mixin';
 @import '@/scss/variables.module';
@@ -139,13 +141,12 @@ $animation-time: 0.5s;
 
 .search-header-swiss-confederation-text,
 .search-title {
-    display: none;
     font-size: 0.825rem;
 }
 
 @include respond-below(lg) {
     .header-settings-section {
-        // See MenuTray.vue where the settings section is enable above lg
+        // See MenuTray.vue where the help section is enable above lg
         display: none !important;
     }
 
@@ -164,7 +165,6 @@ $animation-time: 0.5s;
             }
         }
     }
-    .search-header-swiss-confederation-text,
     .search-title {
         display: block;
     }
diff --git a/src/modules/menu/components/settings/HelpLink.vue b/src/modules/menu/components/help/HelpLink.vue
similarity index 75%
rename from src/modules/menu/components/settings/HelpLink.vue
rename to src/modules/menu/components/help/HelpLink.vue
index 6e3ff9cf9..93cc99c5e 100644
--- a/src/modules/menu/components/settings/HelpLink.vue
+++ b/src/modules/menu/components/help/HelpLink.vue
@@ -1,14 +1,22 @@
 <script setup>
-import { computed } from 'vue'
+import { computed, toRefs } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useStore } from 'vuex'
 
 import HeaderLink from '@/modules/menu/components/header/HeaderLink.vue'
 
+const props = defineProps({
+    showAsButton: {
+        type: Boolean,
+        default: false,
+    },
+})
+
+const { showAsButton } = toRefs(props)
+
 const store = useStore()
 const i18n = useI18n()
 
-const isDesktopMode = computed(() => store.getters.isDesktopMode)
 const lang = computed(() => store.state.i18n.lang)
 const helpPage = computed(() => {
     if (lang.value === 'de' || lang.value === 'rm') {
@@ -30,10 +38,7 @@ function openCmsLink() {
 </script>
 
 <template>
-    <HeaderLink v-if="isDesktopMode" @click="openCmsLink">
+    <HeaderLink :show-as-button="showAsButton" @click="openCmsLink">
         {{ i18n.t('help_label') }}
     </HeaderLink>
-    <button v-else class="btn btn-light m-1" @click="openCmsLink">
-        {{ i18n.t('help_label') }}
-    </button>
 </template>
diff --git a/src/modules/menu/components/help/MenuHelpSection.vue b/src/modules/menu/components/help/MenuHelpSection.vue
new file mode 100644
index 000000000..5eca132f4
--- /dev/null
+++ b/src/modules/menu/components/help/MenuHelpSection.vue
@@ -0,0 +1,154 @@
+<script setup>
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { useStore } from 'vuex'
+
+import { languages } from '@/modules/i18n/index.js'
+import FeedbackButton from '@/modules/menu/components/help/feedback/FeedbackButton.vue'
+import HelpLink from '@/modules/menu/components/help/HelpLink.vue'
+import MoreInfo from '@/modules/menu/components/help/MoreInfo.vue'
+import ReportProblemButton from '@/modules/menu/components/help/ReportProblemButton.vue'
+import MenuSection from '@/modules/menu/components/menu/MenuSection.vue'
+import AppVersion from '@/utils/components/AppVersion.vue'
+import ModalWithBackdrop from '@/utils/components/ModalWithBackdrop.vue'
+
+const dispatcher = { dispatcher: 'MenuHelpSection.vue' }
+
+const emits = defineEmits(['openMenuSection'])
+
+const sectionId = 'helpSection'
+const showContent = ref(false)
+const showAboutUs = ref(false)
+
+const { t } = useI18n()
+const store = useStore()
+const hasGiveFeedbackButton = computed(() => store.getters.hasGiveFeedbackButton)
+const hasReportProblemButton = computed(() => store.getters.hasReportProblemButton)
+
+const currentLang = ref(store.state.i18n.lang)
+
+function changeLang(lang) {
+    store.dispatch('setLang', {
+        lang,
+        ...dispatcher,
+    })
+}
+
+function toggleShowContent() {
+    showContent.value = !showContent.value
+}
+
+function open() {
+    showContent.value = true
+}
+
+function close() {
+    showContent.value = false
+}
+
+function onOpenMenuSection(sectionId) {
+    emits('openMenuSection', sectionId)
+}
+
+defineExpose({
+    open,
+    close,
+    sectionId,
+})
+</script>
+
+<template>
+    <MenuSection
+        :section-id="sectionId"
+        :title="t('search_help')"
+        :show-content="showContent"
+        data-cy="menu-help-section"
+        secondary
+        @click:header="toggleShowContent"
+        @open-menu-section="onOpenMenuSection"
+    >
+        <div class="help-links p-2 d-flex flex-column gap-1" data-cy="menu-help-content">
+            <div class="d-flex gap-1 w-100 justify-content-stretch">
+                <FeedbackButton v-if="hasGiveFeedbackButton" />
+                <ReportProblemButton v-if="hasReportProblemButton" />
+            </div>
+            <HelpLink show-as-button />
+            <button class="btn btn-light border-light-subtle" @click="showAboutUs = true">
+                {{ t('about_us') }}
+            </button>
+            <ModalWithBackdrop
+                v-if="showAboutUs"
+                :title="t('about_us')"
+                @close="showAboutUs = false"
+            >
+                <div class="d-flex flex-column gap-1 w-100 justify-content-stretch">
+                    <MoreInfo show-as-button />
+                    <a
+                        :href="`https://www.geo.admin.ch/${currentLang}/home.html`"
+                        target="_blank"
+                        class="btn btn-light border-light-subtle"
+                    >
+                        {{ t('ech_service_link_label') }}
+                    </a>
+                    <a
+                        :href="t('copyright_url')"
+                        target="_blank"
+                        class="btn btn-light border-light-subtle"
+                    >
+                        {{ t('copyright_label') }}
+                    </a>
+                    <AppVersion class="mt-1 mobile-app-version text-center" />
+                </div>
+            </ModalWithBackdrop>
+        </div>
+        <template #extra-button>
+            <select
+                v-model="currentLang"
+                class="form-control form-control-sm menu-lang-switch bg-light text-dark"
+                data-cy="mobile-lang-selector"
+                @change="changeLang(currentLang)"
+                @click.stop
+            >
+                <option v-for="lang in Object.keys(languages)" :key="lang" :value="lang">
+                    {{ lang.toUpperCase() }}
+                </option>
+            </select>
+        </template>
+    </MenuSection>
+</template>
+
+<style lang="scss" scoped>
+@import '@/scss/webmapviewer-bootstrap-theme';
+.help-links {
+    width: 100%;
+    a {
+        color: $black;
+        text-decoration: initial;
+    }
+    a:hover,
+    a:focus {
+        text-decoration: underline;
+    }
+}
+.mobile-app-version {
+    font-size: 0.75rem;
+}
+
+.menu-lang-switch {
+    position: absolute;
+    right: 2px;
+    top: 4px;
+    width: 60px;
+    text-align: center;
+    border: 0;
+    background: none;
+    padding: 0;
+    font: inherit;
+    color: inherit;
+    outline: inherit;
+    &:hover,
+    &:focus {
+        text-decoration: underline;
+    }
+}
+</style>
diff --git a/src/modules/menu/components/help/MoreInfo.vue b/src/modules/menu/components/help/MoreInfo.vue
new file mode 100644
index 000000000..0da6fb2fb
--- /dev/null
+++ b/src/modules/menu/components/help/MoreInfo.vue
@@ -0,0 +1,28 @@
+<script setup>
+import { computed, toRefs } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import HeaderLink from '@/modules/menu/components/header/HeaderLink.vue'
+
+const props = defineProps({
+    showAsButton: {
+        type: Boolean,
+        default: false,
+    },
+})
+const { showAsButton } = toRefs(props)
+
+const { t } = useI18n()
+
+const cmsUrl = computed(() => t('cms_link_button_url'))
+
+function openCmsLink() {
+    window.open(cmsUrl.value, '_blank', 'noreferrer')
+}
+</script>
+
+<template>
+    <HeaderLink :show-as-button="showAsButton" @click="openCmsLink">
+        {{ t('cms_link_button_title') }}
+    </HeaderLink>
+</template>
diff --git a/src/modules/menu/components/settings/ReportProblemButton.vue b/src/modules/menu/components/help/ReportProblemButton.vue
similarity index 98%
rename from src/modules/menu/components/settings/ReportProblemButton.vue
rename to src/modules/menu/components/help/ReportProblemButton.vue
index 62d9d5d8d..b8486746b 100644
--- a/src/modules/menu/components/settings/ReportProblemButton.vue
+++ b/src/modules/menu/components/help/ReportProblemButton.vue
@@ -6,7 +6,7 @@ import { useStore } from 'vuex'
 import sendFeedback, { ATTACHMENT_MAX_SIZE, KML_MAX_SIZE } from '@/api/feedback.api'
 import { createShortLink } from '@/api/shortlink.api'
 import HeaderLink from '@/modules/menu/components/header/HeaderLink.vue'
-import SendActionButtons from '@/modules/menu/components/settings/common/SendActionButtons.vue'
+import SendActionButtons from '@/modules/menu/components/help/common/SendActionButtons.vue'
 import EmailInput from '@/utils/components/EmailInput.vue'
 import FileInput from '@/utils/components/FileInput.vue'
 import SimpleWindow from '@/utils/components/SimpleWindow.vue'
@@ -174,12 +174,13 @@ function toggleDrawingOverlay() {
     <HeaderLink
         v-if="props.showAsLink"
         primary
+        small
         data-cy="report-problem-link-button"
         @click="openForm"
     >
         <strong>{{ i18n.t('problem_announcement') }}</strong>
     </HeaderLink>
-    <button v-else class="btn btn-primary m-1" data-cy="report-problem-button" @click="openForm">
+    <button v-else class="btn btn-primary" data-cy="report-problem-button" @click="openForm">
         {{ i18n.t('problem_announcement') }}
     </button>
     <SimpleWindow
diff --git a/src/modules/menu/components/settings/common/SendActionButtons.vue b/src/modules/menu/components/help/common/SendActionButtons.vue
similarity index 100%
rename from src/modules/menu/components/settings/common/SendActionButtons.vue
rename to src/modules/menu/components/help/common/SendActionButtons.vue
diff --git a/src/modules/menu/components/settings/feedback/FeedbackButton.vue b/src/modules/menu/components/help/feedback/FeedbackButton.vue
similarity index 95%
rename from src/modules/menu/components/settings/feedback/FeedbackButton.vue
rename to src/modules/menu/components/help/feedback/FeedbackButton.vue
index efcb7aacf..cdbecbab5 100644
--- a/src/modules/menu/components/settings/feedback/FeedbackButton.vue
+++ b/src/modules/menu/components/help/feedback/FeedbackButton.vue
@@ -5,8 +5,8 @@ import { useStore } from 'vuex'
 
 import sendFeedbackApi from '@/api/feedback.api'
 import HeaderLink from '@/modules/menu/components/header/HeaderLink.vue'
-import SendActionButtons from '@/modules/menu/components/settings/common/SendActionButtons.vue'
-import FeedbackRating from '@/modules/menu/components/settings/feedback/FeedbackRating.vue'
+import SendActionButtons from '@/modules/menu/components/help/common/SendActionButtons.vue'
+import FeedbackRating from '@/modules/menu/components/help/feedback/FeedbackRating.vue'
 import EmailInput from '@/utils/components/EmailInput.vue'
 import SimpleWindow from '@/utils/components/SimpleWindow.vue'
 import TextAreaInput from '@/utils/components/TextAreaInput.vue'
@@ -109,10 +109,10 @@ function onEmailValidate(valid) {
 </script>
 
 <template>
-    <HeaderLink v-if="showAsLink" primary data-cy="feedback-link-button" @click="openForm">
+    <HeaderLink v-if="showAsLink" primary data-cy="feedback-link-button" small @click="openForm">
         <strong>{{ i18n.t('test_map_give_feedback') }}</strong>
     </HeaderLink>
-    <button v-else class="btn btn-primary m-1" data-cy="feedback-button" @click="openForm">
+    <button v-else class="btn btn-primary" data-cy="feedback-button" @click="openForm">
         {{ i18n.t('test_map_give_feedback') }}
     </button>
     <SimpleWindow
diff --git a/src/modules/menu/components/settings/feedback/FeedbackRating.vue b/src/modules/menu/components/help/feedback/FeedbackRating.vue
similarity index 100%
rename from src/modules/menu/components/settings/feedback/FeedbackRating.vue
rename to src/modules/menu/components/help/feedback/FeedbackRating.vue
diff --git a/src/modules/menu/components/menu/MenuTray.vue b/src/modules/menu/components/menu/MenuTray.vue
index 585a4c305..fcfae6ab3 100644
--- a/src/modules/menu/components/menu/MenuTray.vue
+++ b/src/modules/menu/components/menu/MenuTray.vue
@@ -6,9 +6,9 @@ import { useStore } from 'vuex'
 import MenuThreeD from '@/modules/menu/components/3d/MenuThreeD.vue'
 import MenuActiveLayersList from '@/modules/menu/components/activeLayers/MenuActiveLayersList.vue'
 import MenuAdvancedToolsList from '@/modules/menu/components/advancedTools/MenuAdvancedToolsList.vue'
+import MenuHelpSection from '@/modules/menu/components/help/MenuHelpSection.vue'
 import MenuSection from '@/modules/menu/components/menu/MenuSection.vue'
 import MenuPrintSection from '@/modules/menu/components/print/MenuPrintSection.vue'
-import MenuSettings from '@/modules/menu/components/settings/MenuSettings.vue'
 import MenuShareSection from '@/modules/menu/components/share/MenuShareSection.vue'
 import MenuTopicSection from '@/modules/menu/components/topics/MenuTopicSection.vue'
 
@@ -32,7 +32,7 @@ const multiMenuSections = ref(['topicsSection', 'activeLayersSection', '3dSectio
 // sections and would therefore toggle other sections automatically.
 const singleModeSections = ref([
     'drawSection',
-    'settingsSection',
+    'helpSection',
     'shareSection',
     'toolsSection',
     'printSection',
@@ -91,18 +91,11 @@ function addRefBySectionId(el) {
 
 <template>
     <div data-cy="menu-tray-inner" :class="[{ 'menu-tray-compact': compact }, 'menu-tray-inner']">
-        <MenuSection
-            id="settingsSection"
-            :ref="addRefById"
-            class="settings-section"
-            :title="i18n.t('settings')"
-            :show-content="false"
-            secondary
-            data-cy="menu-settings-section"
+        <MenuHelpSection
+            :ref="addRefBySectionId"
+            class="d-lg-none help-section"
             @open-menu-section="onOpenMenuSection"
-        >
-            <MenuSettings />
-        </MenuSection>
+        />
         <MenuShareSection
             :ref="addRefBySectionId"
             :compact="compact"
@@ -196,8 +189,8 @@ function addRefBySectionId(el) {
 }
 
 @include respond-above(lg) {
-    .settings-section {
-        // See HeaderWithSearch.vue css where the settings-section is enable below lg
+    .help-section {
+        // See HeaderWithSearch.vue css where the help-section is enable below lg
         display: none;
     }
 }
diff --git a/src/modules/menu/components/print/MenuPrintSection.vue b/src/modules/menu/components/print/MenuPrintSection.vue
index a7353202c..27e260487 100644
--- a/src/modules/menu/components/print/MenuPrintSection.vue
+++ b/src/modules/menu/components/print/MenuPrintSection.vue
@@ -17,7 +17,7 @@ const dispatcher = { dispatcher: 'MapPrintSection.vue' }
 
 const emits = defineEmits(['openMenuSection'])
 
-const sectionId = ref('printSection')
+const sectionId = 'printSection'
 const isSectionShown = ref(false)
 const printGrid = ref(false)
 const printLegend = ref(false)
diff --git a/src/modules/menu/components/settings/LinksToolbar.vue b/src/modules/menu/components/settings/LinksToolbar.vue
deleted file mode 100644
index 542150b10..000000000
--- a/src/modules/menu/components/settings/LinksToolbar.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<script setup>
-import { computed } from 'vue'
-import { useStore } from 'vuex'
-
-import FeedbackButton from '@/modules/menu/components/settings/feedback/FeedbackButton.vue'
-import HelpLink from '@/modules/menu/components/settings/HelpLink.vue'
-import MoreInfo from '@/modules/menu/components/settings/MoreInfo.vue'
-import ReportProblemButton from '@/modules/menu/components/settings/ReportProblemButton.vue'
-
-const props = defineProps({
-    showAsLinks: {
-        type: Boolean,
-        default: false,
-    },
-})
-
-const store = useStore()
-
-// Computed properties
-const hasGiveFeedbackButton = computed(() => store.getters.hasGiveFeedbackButton)
-const hasReportProblemButton = computed(() => store.getters.hasReportProblemButton)
-</script>
-
-<template>
-    <div
-        :class="{
-            container: !props.showAsLinks,
-            'me-2': props.showAsLinks,
-        }"
-    >
-        <FeedbackButton v-if="hasGiveFeedbackButton" :show-as-link="showAsLinks" />
-        <ReportProblemButton v-if="hasReportProblemButton" :show-as-link="showAsLinks" />
-        <MoreInfo :show-as-link="showAsLinks" />
-        <HelpLink :show-as-link="showAsLinks" />
-    </div>
-</template>
diff --git a/src/modules/menu/components/settings/MenuSettings.vue b/src/modules/menu/components/settings/MenuSettings.vue
deleted file mode 100644
index 748a392b4..000000000
--- a/src/modules/menu/components/settings/MenuSettings.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<script setup>
-import LangSwitchToolbar from '@/modules/i18n/components/LangSwitchToolbar.vue'
-import LinksToolbar from '@/modules/menu/components/settings/LinksToolbar.vue'
-</script>
-
-<template>
-    <div id="menu-settings" class="pb-1 text-center" data-cy="menu-settings-content">
-        <div id="menu-lang-selector">
-            <LangSwitchToolbar />
-        </div>
-        <div id="menu-links">
-            <LinksToolbar />
-        </div>
-    </div>
-</template>
diff --git a/src/modules/menu/components/settings/MoreInfo.vue b/src/modules/menu/components/settings/MoreInfo.vue
deleted file mode 100644
index 2dd9a042d..000000000
--- a/src/modules/menu/components/settings/MoreInfo.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<script setup>
-import { computed } from 'vue'
-import { useI18n } from 'vue-i18n'
-import { useStore } from 'vuex'
-
-import HeaderLink from '@/modules/menu/components/header/HeaderLink.vue'
-
-const store = useStore()
-const i18n = useI18n()
-
-const isDesktopMode = computed(() => store.getters.isDesktopMode)
-const cmsUrl = computed(() => i18n.t('cms_link_button_url'))
-
-function openCmsLink() {
-    window.open(cmsUrl.value, '_blank', 'noreferrer')
-}
-</script>
-
-<template>
-    <HeaderLink v-if="isDesktopMode" @click="openCmsLink">
-        {{ i18n.t('cms_link_button_title') }}
-    </HeaderLink>
-    <button v-else class="btn btn-light m-1" @click="openCmsLink">
-        {{ i18n.t('cms_link_button_title') }}
-    </button>
-</template>
diff --git a/src/scss/webmapviewer-bootstrap-theme.scss b/src/scss/webmapviewer-bootstrap-theme.scss
index e83802db8..5b1107d1b 100644
--- a/src/scss/webmapviewer-bootstrap-theme.scss
+++ b/src/scss/webmapviewer-bootstrap-theme.scss
@@ -66,3 +66,10 @@ $nav-tabs-link-active-bg: $primary;
 .w-13 {
     width: 13%;
 }
+
+.justify-content-stretch {
+    & > * {
+        justify-content: stretch;
+        width: 100%;
+    }
+}
\ No newline at end of file
diff --git a/src/modules/map/components/footer/MapFooterAppVersion.vue b/src/utils/components/AppVersion.vue
similarity index 100%
rename from src/modules/map/components/footer/MapFooterAppVersion.vue
rename to src/utils/components/AppVersion.vue
diff --git a/src/views/MapView.vue b/src/views/MapView.vue
index c0db3d3e5..258f3a1f3 100644
--- a/src/views/MapView.vue
+++ b/src/views/MapView.vue
@@ -8,7 +8,6 @@ import CesiumMouseTracker from '@/modules/map/components/cesium/CesiumMouseTrack
 import BackgroundSelector from '@/modules/map/components/footer/backgroundSelector/BackgroundSelector.vue'
 import MapFooter from '@/modules/map/components/footer/MapFooter.vue'
 import MapFooterAppCopyright from '@/modules/map/components/footer/MapFooterAppCopyright.vue'
-import MapFooterAppVersion from '@/modules/map/components/footer/MapFooterAppVersion.vue'
 import MapFooterAttributionList from '@/modules/map/components/footer/MapFooterAttributionList.vue'
 import OpenLayersMouseTracker from '@/modules/map/components/openlayers/OpenLayersMouseTracker.vue'
 import OpenLayersScale from '@/modules/map/components/openlayers/OpenLayersScale.vue'
@@ -17,6 +16,7 @@ import TimeSliderButton from '@/modules/map/components/toolbox/TimeSliderButton.
 import MapModule from '@/modules/map/MapModule.vue'
 import MenuModule from '@/modules/menu/MenuModule.vue'
 import { UIModes } from '@/store/modules/ui.store'
+import AppVersion from '@/utils/components/AppVersion.vue'
 import DragDropOverlay from '@/utils/components/DragDropOverlay.vue'
 import LoadingBar from '@/utils/components/LoadingBar.vue'
 import log from '@/utils/logging'
@@ -90,7 +90,7 @@ onMounted(() => {
                         </template>
                     </template>
                     <template v-if="!isPhoneMode" #bottom-right>
-                        <MapFooterAppVersion />
+                        <AppVersion />
                         <MapFooterAppCopyright />
                     </template>
                 </MapFooter>
diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js
index 6b6f4453a..70b299460 100644
--- a/tests/cypress/support/commands.js
+++ b/tests/cypress/support/commands.js
@@ -561,17 +561,17 @@ Cypress.Commands.add(
  * @param {string} lang Language to click; de, fr, it, en or rm
  */
 Cypress.Commands.add('clickOnLanguage', (lang) => {
-    let menuSection = null
     if (isMobile()) {
-        // mobile/tablet : clicking on the menu button first
-        menuSection = cy.get('[data-cy="menu-settings-section"]')
-        menuSection.click()
+        cy.readStoreValue('state.ui.showMenu').then((isMenuCurrentlyOpen) => {
+            if (!isMenuCurrentlyOpen) {
+                cy.get('[data-cy="menu-button"]').click()
+            }
+        })
+        cy.get('[data-cy="mobile-lang-selector"]').select(lang)
     } else {
         // desktop
-        menuSection = cy.get('[data-cy="header-settings-section"]')
+        cy.get(`[data-cy="menu-lang-${lang}"]`).click()
     }
-    menuSection.should('be.visible')
-    menuSection.find(`[data-cy="menu-lang-${lang}"]`).click()
 })
 
 // cypress-wait-until wrapper to wait for a specific store state.
diff --git a/tests/cypress/tests-e2e/feedback.cy.js b/tests/cypress/tests-e2e/feedback.cy.js
index 1b2010881..f7744982a 100644
--- a/tests/cypress/tests-e2e/feedback.cy.js
+++ b/tests/cypress/tests-e2e/feedback.cy.js
@@ -17,7 +17,7 @@ describe('Testing the feedback form', () => {
     it('test the report problem form UI, validations, and it backend interaction', () => {
         cy.goToMapView()
         cy.get('[data-cy="menu-button"]').click()
-        cy.get('[data-cy="menu-settings-section"]').click()
+        cy.get('[data-cy="menu-help-section"]').click()
 
         cy.log('The button should be in the header as a link on mobile')
         cy.get('[data-cy="feedback-button"]').should('be.visible').click()
diff --git a/tests/cypress/tests-e2e/header.cy.js b/tests/cypress/tests-e2e/header.cy.js
index bacb679b9..d7953cb55 100644
--- a/tests/cypress/tests-e2e/header.cy.js
+++ b/tests/cypress/tests-e2e/header.cy.js
@@ -4,9 +4,8 @@ import { BREAKPOINT_PHONE_WIDTH, BREAKPOINT_TABLET } from '@/config/responsive.c
 
 const backdropSelector = '[data-cy="black-backdrop"]'
 const menuButtonSelector = '[data-cy="menu-button"]'
-const menuSettingsContentSelector = '[data-cy="menu-settings-content"]'
-const menuSettingsSectionSelector =
-    '[data-cy="menu-settings-section"] [data-cy="menu-section-header"]'
+const menuSettingsContentSelector = '[data-cy="menu-help-content"]'
+const menuSettingsSectionSelector = '[data-cy="menu-help-section"] [data-cy="menu-section-header"]'
 
 describe('Test functions for the header / search bar', () => {
     beforeEach(() => {
@@ -52,7 +51,7 @@ describe('Test functions for the header / search bar', () => {
     }
 
     context('Settings Menu Section', () => {
-        it('shows/hide the settings on clicking on the settings section', () => {
+        it('shows/hide the help on clicking on the help section', () => {
             if (width < BREAKPOINT_TABLET) {
                 // mobile/tablet only
                 cy.get(menuButtonSelector).click()
diff --git a/tests/cypress/tests-e2e/layers.cy.js b/tests/cypress/tests-e2e/layers.cy.js
index 415235516..d8fef5876 100644
--- a/tests/cypress/tests-e2e/layers.cy.js
+++ b/tests/cypress/tests-e2e/layers.cy.js
@@ -960,22 +960,12 @@ describe('Test of layer handling', () => {
 
                 //---------------------------------------------------------------------------------
                 cy.log('keep timestamp configuration when the language changes')
-                cy.get('[data-cy="menu-settings-section"]:visible').should('be.visible').click()
-                cy.get('[data-cy="menu-lang-en"]:visible').should('have.class', 'btn-primary')
-                cy.get('[data-cy="menu-lang-fr"]:visible').should('be.visible').click()
-                cy.get('[data-cy="menu-lang-fr"]:visible').should('have.class', 'btn-primary')
+                cy.clickOnLanguage('fr')
                 cy.get('[data-cy="menu-active-layers"]:visible').should('be.visible').click()
                 cy.get('[data-cy="time-selector-test.timeenabled.wmts.layer-2"]:visible').contains(
                     '2016'
                 )
-                cy.get('[data-cy="menu-settings-section"] [data-cy="menu-section-header"]:visible')
-                    .should('be.visible')
-                    .click()
-                cy.get('[data-cy="menu-lang-en"]:visible').should('be.visible').click()
-                cy.get('[data-cy="menu-active-layers"]:visible').should('be.visible').click()
-                cy.get('[data-cy="menu-settings-section"] [data-cy="menu-section-body"]').should(
-                    'not.be.visible'
-                )
+                cy.clickOnLanguage('en')
 
                 //---------------------------------------------------------------------------------
                 cy.log(`duplicate time layer`)
diff --git a/tests/cypress/tests-e2e/menuTray.cy.js b/tests/cypress/tests-e2e/menuTray.cy.js
index 2bd3116ef..7c29d440b 100644
--- a/tests/cypress/tests-e2e/menuTray.cy.js
+++ b/tests/cypress/tests-e2e/menuTray.cy.js
@@ -6,8 +6,7 @@ const menuTopicHeaderSelector = menuTopicSectionSelector + ' > [data-cy="menu-se
 const menuActiveLayersSectionSelector = '[data-cy="menu-active-layers"]'
 const menuActiveLayersHeaderSelector =
     menuActiveLayersSectionSelector + ' > [data-cy="menu-section-header"]'
-const menuSettingsHeaderSelector =
-    '[data-cy="menu-settings-section"] > [data-cy="menu-section-header"]'
+const menuHelpSectionHeader = '[data-cy="menu-help-section"] > [data-cy="menu-section-header"]'
 const menuShareHeaderSelector = '[data-cy="menu-share-section"] > [data-cy="menu-section-header"]'
 
 function getFakeWMTSLayerCatalogEntry(id) {
@@ -114,7 +113,7 @@ function measureMenu(shouldHaveMaxSize) {
         if (shouldHaveMaxSize) {
             cy.get('@menuTrayBottom').should('be.equal', expectedMenuTrayBottom)
         } else {
-            cy.get('@menuTrayBottom').should('be.lt', expectedMenuTrayBottom)
+            cy.get('@menuTrayBottom').should('be.lte', expectedMenuTrayBottom)
         }
     })
 }
@@ -158,7 +157,7 @@ function checkOpenSections(openSections) {
     const sections = [
         { name: 'topics', selector: '[data-cy="menu-topic-tree"]' },
         { name: 'activeLayers', selector: '[data-cy="menu-section-active-layers"]' },
-        { name: 'settings', selector: '[data-cy="menu-settings-content"]' },
+        { name: 'help', selector: '[data-cy="menu-help-content"]' },
         {
             name: 'share',
             selector: '[data-cy="menu-share-section"] > [data-cy="menu-section-body"]',
@@ -235,9 +234,9 @@ describe('Test menu tray ui', () => {
         checkOpenSections(['activeLayers'])
         measureMenu(true)
 
-        cy.get(menuSettingsHeaderSelector).click()
+        cy.get(menuHelpSectionHeader).click()
         waitForAnimationsToFinish()
-        checkOpenSections(['settings'])
+        checkOpenSections(['help'])
         measureMenu(false)
 
         cy.get(menuShareHeaderSelector).click()
diff --git a/tests/cypress/tests-e2e/reportProblem.cy.js b/tests/cypress/tests-e2e/reportProblem.cy.js
index c1b1662b6..eef5ebac7 100644
--- a/tests/cypress/tests-e2e/reportProblem.cy.js
+++ b/tests/cypress/tests-e2e/reportProblem.cy.js
@@ -25,7 +25,7 @@ describe('Testing the report problem form', () => {
         interceptFeedback(false)
         cy.goToMapView()
         cy.get('[data-cy="menu-button"]').should('be.visible').click()
-        cy.get('[data-cy="menu-settings-section"]').should('be.visible').click()
+        cy.get('[data-cy="menu-help-section"]').should('be.visible').click()
 
         cy.log('The button should be in the header as a link on mobile')
         cy.get('[data-cy="report-problem-button"]').should('be.visible').click()
@@ -174,7 +174,7 @@ describe('Testing the report problem form', () => {
         interceptFeedback(true)
         if (isMobile()) {
             cy.get('[data-cy="menu-button"]').should('be.visible').click()
-            cy.get('[data-cy="menu-settings-section"]').should('be.visible').click()
+            cy.get('[data-cy="menu-help-section"]').should('be.visible').click()
         }
 
         cy.get('[data-cy="report-problem-button"]').should('be.visible').click()

From 50b316c9afeac01638980acf9662c07fc85d2588 Mon Sep 17 00:00:00 2001
From: Pascal Barth <pak.barth@gmail.com>
Date: Fri, 30 Aug 2024 08:56:28 +0200
Subject: [PATCH 18/56] PB-788 : add a little CSS trick to circumvent iOS
 Safari bug

select tags are insensitive to `text-align` prop on Safari, very old bug... So using another "technique" to have the text centered

removing/refactoring most component that were previously used in both instances but are now distinct flavors
---
 src/modules/menu/components/help/MenuHelpSection.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/modules/menu/components/help/MenuHelpSection.vue b/src/modules/menu/components/help/MenuHelpSection.vue
index 5eca132f4..ce5d85ced 100644
--- a/src/modules/menu/components/help/MenuHelpSection.vue
+++ b/src/modules/menu/components/help/MenuHelpSection.vue
@@ -140,6 +140,9 @@ defineExpose({
     top: 4px;
     width: 60px;
     text-align: center;
+    // for dumb Safari, bugs still there 14 years after
+    // https://bugs.webkit.org/show_bug.cgi?id=40216
+    text-align-last: center;
     border: 0;
     background: none;
     padding: 0;

From b38677e2414ce821f25760d01d9bb1c21e07f9b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Tue, 23 Jul 2024 12:00:36 +0200
Subject: [PATCH 19/56] PB-818: Ensuring scales are respected on print

Issue : When we were sending print requests, the scales of the symbols and texts in kmls were off. For icons, they were too small, and the texts were too big.

Fix : We corrected the scales for icons and labels.
Icons used a DPI adaptation of * 90 / 254 which was inherited from the old mapviewer. After some empirical testing, it looks like on the new mapviewer needs a *150 / 254 DPI adaptation
Labels were not using the 'scale' parameter for the fonts at all, and they now also use a 150 / 254 DPI adaptation.

It is important to note that the '254' given here is a computed value, as some layers will have smaller resolutions and their DPI will be used in those situations

Still To Do : Text alignment and ensuring fonts are interpreted correctly on the print side.

PB-818: offsets for the correct sizes

Issue : with the scale being corrected for the icons and the fonts, the offsets were no longer correct.
Thus, we adapt those offsets.

small issue : I had to find ways to set the offsets in an empirical way, to ensure they were place at the correct spot. I'm going to investigate why it works, but for now it works.
---
 src/api/print.api.js    | 38 ++++++++++++++++++++++++++++++++++----
 src/utils/styleUtils.js |  7 ++++---
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/api/print.api.js b/src/api/print.api.js
index cd6a63394..1c7f8a8fb 100644
--- a/src/api/print.api.js
+++ b/src/api/print.api.js
@@ -85,6 +85,27 @@ class GeoAdminCustomizer extends BaseCustomizer {
         symbolizer.conflictResolution = false
         symbolizer.fontSize =
             Math.ceil(2 * adjustWidth(parseInt(symbolizer.fontSize), this.printResolution)) + 'px'
+        /*
+        // Ideally this should be done in the geoblocks/mapfishprint
+        // but it's quite complex to handle all the cases
+        try {
+            const fontFamily = symbolizer.fontFamily.split(' ')
+            symbolizer.fontWeight = fontFamily[0]
+            // we need to apply the scale and the resolution to the font size too
+            // To be fair, we're not adjusting width here, but the scaling would be the same
+            symbolizer.fontSize = adjustWidth(
+                parseInt(fontFamily[1]) * text.getScale(),
+                this.printResolution
+            )
+            symbolizer.fontFamily = fontFamily[2].toUpperCase()
+            // we need to adjust the offsets, when a text is coupled with a feature, to ensure
+            // the text is displayed at the correct place.
+            symbolizer.labelYOffset = adjustWidth(symbolizer.labelYOffset, this.printResolution)
+            symbolizer.labelXOffset = adjustWidth(symbolizer.labelXOffset, this.printResolution)
+        } catch (error) {
+            // Keep the font family as it is
+        }
+        */
     }
 
     /**
@@ -114,12 +135,23 @@ class GeoAdminCustomizer extends BaseCustomizer {
         }
 
         if (anchor) {
-            symbolizer.graphicXOffset = adjustWidth(-anchor[0] * scale, this.printResolution)
-            symbolizer.graphicYOffset = adjustWidth(-anchor[1] * scale, this.printResolution)
+            symbolizer.graphicXOffset = symbolizer.graphicXOffset
+                ? adjustWidth(
+                      (size[0] / 2 - anchor[0] + symbolizer.graphicXOffset) * scale,
+                      this.printResolution
+                  )
+                : 0
+            // don't ask why it works, but that's the best I could do.
+
+            symbolizer.graphicYOffset = symbolizer.graphicYOffset
+                ? (symbolizer.graphicYOffset = adjustWidth(-size[1], this.printResolution))
+                : 0
         }
         if (size) {
             symbolizer.graphicWidth = adjustWidth(size[0] * scale, this.printResolution)
         }
+        symbolizer.graphicXOffset = symbolizer.graphicXOffset ? symbolizer.graphicXOffset : 0
+        symbolizer.graphicYOffset = symbolizer.graphicYOffset ? symbolizer.graphicYOffset : 0
 
         if (symbolizer.fillOpacity === 0.0 && symbolizer.fillColor === '#ff0000') {
             // Handling the case where we need to print a circle in the end of measurement lines
@@ -325,9 +357,7 @@ async function transformOlMapToPrintParams(olMap, config) {
     if (!dpi) {
         throw new PrintError('Missing DPI for printing')
     }
-
     const customizer = new GeoAdminCustomizer(excludedLayerIDs, dpi)
-
     const attributionsOneLine = attributions.length > 0 ? `© ${attributions.join(', ')}` : ''
 
     try {
diff --git a/src/utils/styleUtils.js b/src/utils/styleUtils.js
index 21f7e9c38..e5bb4ed11 100644
--- a/src/utils/styleUtils.js
+++ b/src/utils/styleUtils.js
@@ -161,7 +161,8 @@ export function adjustWidth(width, dpi) {
     if (!width) {
         return
     }
-    // 90 is choosen to compensate the difference DPI between the WMTS or WMS and the print DPI used.
-    // The number is from the old geoadmin (see the link above)
-    return (width * 90) / dpi
+    // 90 Was the old mapviewer magic number set to compensate for the DPI difference between the
+    // mapviewer and the service print. Currently, 150 seems to be giving better results at keeping
+    // the same scale overall.
+    return (width * 150) / dpi
 }

From 751224a8df1d49038406ac1fad649da2977f36b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Thu, 8 Aug 2024 17:57:39 +0200
Subject: [PATCH 20/56] PB-818: adapt work done to previous changes in print

Issue : Some of the changes made to handle scaling between print and viewer were using parameters that no longer exist in their previous form.
Fix : We apply changes to the parameters we need to change, and take the new structure into account
---
 src/api/print.api.js | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/api/print.api.js b/src/api/print.api.js
index 1c7f8a8fb..b756329d0 100644
--- a/src/api/print.api.js
+++ b/src/api/print.api.js
@@ -85,27 +85,26 @@ class GeoAdminCustomizer extends BaseCustomizer {
         symbolizer.conflictResolution = false
         symbolizer.fontSize =
             Math.ceil(2 * adjustWidth(parseInt(symbolizer.fontSize), this.printResolution)) + 'px'
-        /*
+
         // Ideally this should be done in the geoblocks/mapfishprint
         // but it's quite complex to handle all the cases
+
+        // we try to adapt the font size and offsets to have roughly the same
+        // scales on print than on the viewer.
         try {
-            const fontFamily = symbolizer.fontFamily.split(' ')
-            symbolizer.fontWeight = fontFamily[0]
-            // we need to apply the scale and the resolution to the font size too
-            // To be fair, we're not adjusting width here, but the scaling would be the same
-            symbolizer.fontSize = adjustWidth(
-                parseInt(fontFamily[1]) * text.getScale(),
+            symbolizer.labelYOffset = symbolizer.labelYOffset
+                ? adjustWidth(symbolizer.labelYOffset, this.printResolution)
+                : 0
+            symbolizer.labelXOffset = symbolizer.labelXOffset
+                ? adjustWidth(symbolizer.labelXOffset, this.printResolution)
+                : 0
+            symbolizer.fontSize = `${adjustWidth(
+                parseInt(symbolizer.fontSize) * text.getScale(),
                 this.printResolution
-            )
-            symbolizer.fontFamily = fontFamily[2].toUpperCase()
-            // we need to adjust the offsets, when a text is coupled with a feature, to ensure
-            // the text is displayed at the correct place.
-            symbolizer.labelYOffset = adjustWidth(symbolizer.labelYOffset, this.printResolution)
-            symbolizer.labelXOffset = adjustWidth(symbolizer.labelXOffset, this.printResolution)
+            )}px`
         } catch (error) {
             // Keep the font family as it is
         }
-        */
     }
 
     /**

From 87e03ef8cbb37eebe2ee66c80a011c6b9574fb5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Mon, 12 Aug 2024 09:38:27 +0200
Subject: [PATCH 21/56] skipping print kml tests while we work on the print, as
 they use a fixture that is no longer valid

small rebase correction
---
 src/api/print.api.js                | 3 ---
 tests/cypress/tests-e2e/print.cy.js | 9 +++++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/api/print.api.js b/src/api/print.api.js
index b756329d0..f0da939ff 100644
--- a/src/api/print.api.js
+++ b/src/api/print.api.js
@@ -86,9 +86,6 @@ class GeoAdminCustomizer extends BaseCustomizer {
         symbolizer.fontSize =
             Math.ceil(2 * adjustWidth(parseInt(symbolizer.fontSize), this.printResolution)) + 'px'
 
-        // Ideally this should be done in the geoblocks/mapfishprint
-        // but it's quite complex to handle all the cases
-
         // we try to adapt the font size and offsets to have roughly the same
         // scales on print than on the viewer.
         try {
diff --git a/tests/cypress/tests-e2e/print.cy.js b/tests/cypress/tests-e2e/print.cy.js
index a2a9f5fe4..f7bbd7f53 100644
--- a/tests/cypress/tests-e2e/print.cy.js
+++ b/tests/cypress/tests-e2e/print.cy.js
@@ -426,7 +426,12 @@ describe('Testing print', () => {
                 ).to.lessThan(1.5) // thinner than the drawn in the OL map.
             })
         })
-        it('should send a print request correctly to mapfishprint (icon and label)', () => {
+        /**
+         * Currently, we are working on the print, which might alter the way data is sent, or the
+         * way data is interpreted. When the work on the print API (and backend) is over, we will
+         * need to modify those tests by providing new pdf reports as fixtures.
+         */
+        it.skip('should send a print request correctly to mapfishprint (icon and label)', () => {
             startPrintWithKml('print/label.kml')
 
             cy.wait('@printRequest').then((interception) => {
@@ -497,7 +502,7 @@ describe('Testing print', () => {
                 }
             })
         })
-        it('should send a print request correctly to mapfishprint (KML from old geoadmin)', () => {
+        it.skip('should send a print request correctly to mapfishprint (KML from old geoadmin)', () => {
             startPrintWithKml('print/old-geoadmin-label.kml')
 
             cy.wait('@printRequest').then((interception) => {

From f6efaf1de80ec209486a7d3e650fbdb4f2bf2c99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Fri, 30 Aug 2024 09:18:45 +0200
Subject: [PATCH 22/56] PB-818: readability update

 - Issue : the code was a bit hard to read in some places and some simplifications could be done.
 - Fix : We moved the magic number currently used in its own config, and created a config file for the print, and we simplified a few functions to make them easier to read.

unordered import
---
 src/api/print.api.js       | 15 ++++-----------
 src/config/print.config.js |  5 +++++
 src/utils/styleUtils.js    | 11 +++++------
 3 files changed, 14 insertions(+), 17 deletions(-)
 create mode 100644 src/config/print.config.js

diff --git a/src/api/print.api.js b/src/api/print.api.js
index f0da939ff..47a419776 100644
--- a/src/api/print.api.js
+++ b/src/api/print.api.js
@@ -83,18 +83,11 @@ class GeoAdminCustomizer extends BaseCustomizer {
         symbolizer.strokeWidth = adjustWidth(symbolizer.strokeWidth, this.printResolution)
         symbolizer.haloRadius = adjustWidth(symbolizer.haloRadius, this.printResolution)
         symbolizer.conflictResolution = false
-        symbolizer.fontSize =
-            Math.ceil(2 * adjustWidth(parseInt(symbolizer.fontSize), this.printResolution)) + 'px'
-
         // we try to adapt the font size and offsets to have roughly the same
         // scales on print than on the viewer.
         try {
-            symbolizer.labelYOffset = symbolizer.labelYOffset
-                ? adjustWidth(symbolizer.labelYOffset, this.printResolution)
-                : 0
-            symbolizer.labelXOffset = symbolizer.labelXOffset
-                ? adjustWidth(symbolizer.labelXOffset, this.printResolution)
-                : 0
+            symbolizer.labelYOffset = adjustWidth(symbolizer.labelYOffset, this.printResolution)
+            symbolizer.labelXOffset = adjustWidth(symbolizer.labelXOffset, this.printResolution)
             symbolizer.fontSize = `${adjustWidth(
                 parseInt(symbolizer.fontSize) * text.getScale(),
                 this.printResolution
@@ -146,8 +139,8 @@ class GeoAdminCustomizer extends BaseCustomizer {
         if (size) {
             symbolizer.graphicWidth = adjustWidth(size[0] * scale, this.printResolution)
         }
-        symbolizer.graphicXOffset = symbolizer.graphicXOffset ? symbolizer.graphicXOffset : 0
-        symbolizer.graphicYOffset = symbolizer.graphicYOffset ? symbolizer.graphicYOffset : 0
+        symbolizer.graphicXOffset = symbolizer.graphicXOffset ?? 0
+        symbolizer.graphicYOffset = symbolizer.graphicYOffset ?? 0
 
         if (symbolizer.fillOpacity === 0.0 && symbolizer.fillColor === '#ff0000') {
             // Handling the case where we need to print a circle in the end of measurement lines
diff --git a/src/config/print.config.js b/src/config/print.config.js
new file mode 100644
index 000000000..5031cf527
--- /dev/null
+++ b/src/config/print.config.js
@@ -0,0 +1,5 @@
+// 90 Was the old mapviewer magic number set to compensate for the DPI difference between the
+// mapviewer and the service print. Currently, 150 seems to be giving better results at keeping
+// the same scale overall.
+// We're going to check thoroughly if this works as intended, or if this is a monitor dpi setting element.
+export const PRINT_MAGIC_NUMBER = 150
diff --git a/src/utils/styleUtils.js b/src/utils/styleUtils.js
index e5bb4ed11..2080a7c9e 100644
--- a/src/utils/styleUtils.js
+++ b/src/utils/styleUtils.js
@@ -1,6 +1,7 @@
 import { Circle, Fill, Stroke, Style } from 'ol/style'
 import CircleStyle from 'ol/style/Circle.js'
 
+import { PRINT_MAGIC_NUMBER } from '@/config/print.config'
 import variables from '@/scss/variables-admin.module.scss'
 
 const { red, mocassin, mocassinToRed1, mocassinToRed2, malibu, black, white } = variables
@@ -158,11 +159,9 @@ export const highlightPointStyle = new Style({
 // Change a width according to the change of DPI (from the old geoadmin)
 // Originally introduced here https://github.com/geoadmin/mf-geoadmin3/pull/3280
 export function adjustWidth(width, dpi) {
-    if (!width) {
-        return
+    if (!width || isNaN(width)) {
+        return 0
     }
-    // 90 Was the old mapviewer magic number set to compensate for the DPI difference between the
-    // mapviewer and the service print. Currently, 150 seems to be giving better results at keeping
-    // the same scale overall.
-    return (width * 150) / dpi
+
+    return (width * PRINT_MAGIC_NUMBER) / dpi
 }

From 05984819b3dc7e39b8bb25b9608d6c7d7ef6c5f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Tue, 3 Sep 2024 13:09:32 +0200
Subject: [PATCH 23/56] PB-818: small change in resize config

---
 src/config/print.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/config/print.config.js b/src/config/print.config.js
index 5031cf527..0534033be 100644
--- a/src/config/print.config.js
+++ b/src/config/print.config.js
@@ -1,5 +1,5 @@
 // 90 Was the old mapviewer magic number set to compensate for the DPI difference between the
-// mapviewer and the service print. Currently, 150 seems to be giving better results at keeping
+// mapviewer and the service print. Currently, 144 seems to be giving better results at keeping
 // the same scale overall.
 // We're going to check thoroughly if this works as intended, or if this is a monitor dpi setting element.
-export const PRINT_MAGIC_NUMBER = 150
+export const PRINT_MAGIC_NUMBER = 144

From 57788d4357366926e051db8e526fb102f8a5e66e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Thu, 5 Sep 2024 14:54:41 +0200
Subject: [PATCH 24/56] PB-818: PR-review corrections

 - Added a check to ensure we operate correctly even if the dpi is not present.
 - Renamed a variable and updated a comment.
---
 src/config/print.config.js | 8 +++-----
 src/utils/styleUtils.js    | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/config/print.config.js b/src/config/print.config.js
index 0534033be..80afed0bb 100644
--- a/src/config/print.config.js
+++ b/src/config/print.config.js
@@ -1,5 +1,3 @@
-// 90 Was the old mapviewer magic number set to compensate for the DPI difference between the
-// mapviewer and the service print. Currently, 144 seems to be giving better results at keeping
-// the same scale overall.
-// We're going to check thoroughly if this works as intended, or if this is a monitor dpi setting element.
-export const PRINT_MAGIC_NUMBER = 144
+// In the old mapviewer, a magic number (90) was set to make some compensation between the print and the viewer,
+// to keep the scale between the two services. In the current implementation, 144 seems to be giving the best results.
+export const PRINT_DPI_COMPENSATION = 144
diff --git a/src/utils/styleUtils.js b/src/utils/styleUtils.js
index 2080a7c9e..08cf55661 100644
--- a/src/utils/styleUtils.js
+++ b/src/utils/styleUtils.js
@@ -159,7 +159,7 @@ export const highlightPointStyle = new Style({
 // Change a width according to the change of DPI (from the old geoadmin)
 // Originally introduced here https://github.com/geoadmin/mf-geoadmin3/pull/3280
 export function adjustWidth(width, dpi) {
-    if (!width || isNaN(width)) {
+    if (!width || isNaN(width || isNaN(dpi) || dpi <= 0)) {
         return 0
     }
 

From bad40b0f5e7b00c3ccbc0d3efdc9d99c63566e46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Mon, 9 Sep 2024 10:56:50 +0200
Subject: [PATCH 25/56] PB-818: adding unit tests for adjust width  - We also
 added some safeguards against division by 0, and corrected the DPI
 compensation constant name across the code where we forgot to do it.

---
 src/api/__tests__/print.api.spec.js | 19 +++++++++++++++++++
 src/utils/styleUtils.js             |  6 +++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/api/__tests__/print.api.spec.js b/src/api/__tests__/print.api.spec.js
index bcafd6c9a..7b39e9404 100644
--- a/src/api/__tests__/print.api.spec.js
+++ b/src/api/__tests__/print.api.spec.js
@@ -2,6 +2,8 @@ import { expect } from 'chai'
 import { describe, it } from 'vitest'
 
 import { PrintLayout, PrintLayoutAttribute } from '@/api/print.api.js'
+import { PRINT_DPI_COMPENSATION } from '@/config/print.config'
+import { adjustWidth } from '@/utils/styleUtils'
 
 describe('Print API unit tests', () => {
     describe('PrintLayoutAttribute tests', () => {
@@ -61,5 +63,22 @@ describe('Print API unit tests', () => {
             )
             expect(scalesInMapAttr.scales).to.eql(scales)
         })
+        it('calculate the width correctly with the "adjustWidth" function', () => {
+            // invalid values should return 0
+            expect(adjustWidth(100, 'invalid value')).to.eql(0)
+            expect(adjustWidth(100, null)).to.eql(0)
+            expect(adjustWidth(100, undefined)).to.eql(0)
+            expect(adjustWidth(null, 254)).to.eql(0)
+            expect(adjustWidth(undefined, 254)).to.eql(0)
+            expect(adjustWidth('invalid value', 254)).to.eql(0)
+            // the dpi parameter should be a positive number
+            expect(adjustWidth(100, 0)).to.eql(0)
+            expect(adjustWidth(100, -15)).to.eql(0)
+            // checking with a slight margin for float rounding errors.
+            expect(adjustWidth(100, 254)).to.be.closeTo(
+                (100 * PRINT_DPI_COMPENSATION) / 254,
+                1 / 254
+            )
+        })
     })
 })
diff --git a/src/utils/styleUtils.js b/src/utils/styleUtils.js
index 08cf55661..75b6985df 100644
--- a/src/utils/styleUtils.js
+++ b/src/utils/styleUtils.js
@@ -1,7 +1,7 @@
 import { Circle, Fill, Stroke, Style } from 'ol/style'
 import CircleStyle from 'ol/style/Circle.js'
 
-import { PRINT_MAGIC_NUMBER } from '@/config/print.config'
+import { PRINT_DPI_COMPENSATION } from '@/config/print.config'
 import variables from '@/scss/variables-admin.module.scss'
 
 const { red, mocassin, mocassinToRed1, mocassinToRed2, malibu, black, white } = variables
@@ -159,9 +159,9 @@ export const highlightPointStyle = new Style({
 // Change a width according to the change of DPI (from the old geoadmin)
 // Originally introduced here https://github.com/geoadmin/mf-geoadmin3/pull/3280
 export function adjustWidth(width, dpi) {
-    if (!width || isNaN(width || isNaN(dpi) || dpi <= 0)) {
+    if (!width || isNaN(width) || !dpi || isNaN(dpi) || dpi <= 0) {
         return 0
     }
 
-    return (width * PRINT_MAGIC_NUMBER) / dpi
+    return (width * PRINT_DPI_COMPENSATION) / dpi
 }

From f4e125cf46acaa6778beaebc9e172c9cea63f8c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Mon, 9 Sep 2024 11:32:49 +0200
Subject: [PATCH 26/56] PB-818: adapt unit tests

Issue : e2e tests were testing the values of the parameters sent, which could make the test fails whenever the code changed.

Fix : We only test the structure of the payload sent to the service, as checking the values are correctly computed should be done in the unit tests.
---
 tests/cypress/tests-e2e/print.cy.js | 104 +++++++++++++---------------
 1 file changed, 48 insertions(+), 56 deletions(-)

diff --git a/tests/cypress/tests-e2e/print.cy.js b/tests/cypress/tests-e2e/print.cy.js
index f7bbd7f53..21c024e90 100644
--- a/tests/cypress/tests-e2e/print.cy.js
+++ b/tests/cypress/tests-e2e/print.cy.js
@@ -426,45 +426,46 @@ describe('Testing print', () => {
                 ).to.lessThan(1.5) // thinner than the drawn in the OL map.
             })
         })
-        /**
-         * Currently, we are working on the print, which might alter the way data is sent, or the
-         * way data is interpreted. When the work on the print API (and backend) is over, we will
-         * need to modify those tests by providing new pdf reports as fixtures.
-         */
-        it.skip('should send a print request correctly to mapfishprint (icon and label)', () => {
+        /** We need to ensure the structure of the query sent is correct */
+        it('should send a print request correctly to mapfishprint (icon and label)', () => {
             startPrintWithKml('print/label.kml')
 
             cy.wait('@printRequest').then((interception) => {
                 expect(interception.request.body).to.haveOwnProperty('layout')
-                expect(interception.request.body['layout']).to.equal('1. A4 landscape')
                 expect(interception.request.body).to.haveOwnProperty('format')
-                expect(interception.request.body['format']).to.equal('pdf')
 
                 const attributes = interception.request.body.attributes
                 expect(attributes).to.haveOwnProperty('printLegend')
-                expect(attributes['printLegend']).to.equals(0)
                 expect(attributes).to.haveOwnProperty('qrimage')
-                expect(attributes['qrimage']).to.contains(
-                    encodeURIComponent('https://s.geo.admin.ch/0000000')
-                )
 
+                expect(attributes).to.haveOwnProperty('map')
                 const mapAttributes = attributes.map
-                expect(mapAttributes['scale']).to.equals(5000)
-                expect(mapAttributes['dpi']).to.equals(254)
-                expect(mapAttributes['projection']).to.equals('EPSG:2056')
+
+                expect(mapAttributes).to.haveOwnProperty('scale')
+                expect(mapAttributes).to.haveOwnProperty('dpi')
+                expect(mapAttributes).to.haveOwnProperty('projection')
+
+                expect(mapAttributes).to.haveOwnProperty('layers')
 
                 const layers = mapAttributes.layers
+
                 expect(layers).to.be.an('array')
                 expect(layers).to.have.length(2)
-                expect(layers[0]['type']).to.equals('geojson')
-                expect(layers[0]['geoJson']['features']).to.have.length(1)
-                expect(layers[0]['geoJson']['features'][0]['properties']).to.haveOwnProperty(
+
+                const geoJsonLayer = layers[0]
+
+                expect(geoJsonLayer).to.haveOwnProperty('type')
+                expect(geoJsonLayer).to.haveOwnProperty('geoJson')
+                expect(geoJsonLayer).to.haveOwnProperty('style')
+                expect(geoJsonLayer['geoJson']).to.haveOwnProperty('features')
+                expect(geoJsonLayer['geoJson']['features'][0]).to.haveOwnProperty('properties')
+                expect(geoJsonLayer['geoJson']['features'][0]['properties']).to.haveOwnProperty(
                     '_mfp_style'
                 )
-                expect(layers[0]['geoJson']['features'][0]['properties']['_mfp_style']).to.equal(
-                    '1'
+                expect(geoJsonLayer['style']).to.haveOwnProperty("[_mfp_style = '1']")
+                expect(geoJsonLayer['style']["[_mfp_style = '1']"]).to.haveOwnProperty(
+                    'symbolizers'
                 )
-                expect(layers[0]['style']).to.haveOwnProperty("[_mfp_style = '1']")
 
                 const symbolizers = layers[0]['style']["[_mfp_style = '1']"]['symbolizers']
                 const pointSymbol = symbolizers[0]
@@ -473,19 +474,13 @@ describe('Testing print', () => {
                     type: 'point',
                     externalGraphic: '001-marker@1x-255,0,0.png', // suffix only
                     graphicWidth: 19.133858267716537,
+                    graphicXOffset: -8.503937007874017,
+                    graphicYOffset: -8.503937007874017,
                 }
 
                 for (const attribute in pointSymbolAttributes) {
                     expect(pointSymbol).to.haveOwnProperty(attribute)
                 }
-                expect(
-                    pointSymbol['externalGraphic'].endsWith(
-                        pointSymbolAttributes['externalGraphic']
-                    )
-                ).to.be.true
-                expect(
-                    pointSymbol['graphicWidth'] - pointSymbolAttributes['graphicWidth']
-                ).to.lessThan(0.1)
 
                 const textSymbol = symbolizers[1]
                 const textSymbolAttributes = {
@@ -498,44 +493,48 @@ describe('Testing print', () => {
                 }
                 for (const attribute in textSymbolAttributes) {
                     expect(textSymbol).to.haveOwnProperty(attribute)
-                    expect(textSymbol[attribute]).to.equal(textSymbolAttributes[attribute])
                 }
             })
         })
-        it.skip('should send a print request correctly to mapfishprint (KML from old geoadmin)', () => {
+        it('should send a print request correctly to mapfishprint (KML from old geoadmin)', () => {
             startPrintWithKml('print/old-geoadmin-label.kml')
 
             cy.wait('@printRequest').then((interception) => {
                 expect(interception.request.body).to.haveOwnProperty('layout')
-                expect(interception.request.body['layout']).to.equal('1. A4 landscape')
                 expect(interception.request.body).to.haveOwnProperty('format')
-                expect(interception.request.body['format']).to.equal('pdf')
 
                 const attributes = interception.request.body.attributes
                 expect(attributes).to.haveOwnProperty('printLegend')
-                expect(attributes['printLegend']).to.equals(0)
                 expect(attributes).to.haveOwnProperty('qrimage')
-                expect(attributes['qrimage']).to.contains(
-                    encodeURIComponent('https://s.geo.admin.ch/0000000')
-                )
 
+                expect(attributes).to.haveOwnProperty('map')
                 const mapAttributes = attributes.map
-                expect(mapAttributes['scale']).to.equals(5000)
-                expect(mapAttributes['dpi']).to.equals(254)
-                expect(mapAttributes['projection']).to.equals('EPSG:2056')
+
+                expect(mapAttributes).to.haveOwnProperty('scale')
+                expect(mapAttributes).to.haveOwnProperty('dpi')
+                expect(mapAttributes).to.haveOwnProperty('projection')
+
+                expect(mapAttributes).to.haveOwnProperty('layers')
 
                 const layers = mapAttributes.layers
+
                 expect(layers).to.be.an('array')
                 expect(layers).to.have.length(2)
-                expect(layers[0]['type']).to.equals('geojson')
-                expect(layers[0]['geoJson']['features']).to.have.length(1)
-                expect(layers[0]['geoJson']['features'][0]['properties']).to.haveOwnProperty(
+
+                const geoJsonLayer = layers[0]
+
+                expect(geoJsonLayer).to.haveOwnProperty('type')
+                expect(geoJsonLayer).to.haveOwnProperty('geoJson')
+                expect(geoJsonLayer).to.haveOwnProperty('style')
+                expect(geoJsonLayer['geoJson']).to.haveOwnProperty('features')
+                expect(geoJsonLayer['geoJson']['features'][0]).to.haveOwnProperty('properties')
+                expect(geoJsonLayer['geoJson']['features'][0]['properties']).to.haveOwnProperty(
                     '_mfp_style'
                 )
-                expect(layers[0]['geoJson']['features'][0]['properties']['_mfp_style']).to.equal(
-                    '1'
+                expect(geoJsonLayer['style']).to.haveOwnProperty("[_mfp_style = '1']")
+                expect(geoJsonLayer['style']["[_mfp_style = '1']"]).to.haveOwnProperty(
+                    'symbolizers'
                 )
-                expect(layers[0]['style']).to.haveOwnProperty("[_mfp_style = '1']")
 
                 const symbolizers = layers[0]['style']["[_mfp_style = '1']"]['symbolizers']
                 const pointSymbol = symbolizers[0]
@@ -543,33 +542,26 @@ describe('Testing print', () => {
                 const pointSymbolAttributes = {
                     type: 'point',
                     externalGraphic: '001-marker@1x-255,0,0.png', // suffix only
-                    graphicWidth: 17.007874015748033,
+                    graphicWidth: 19.133858267716537,
                     graphicXOffset: -8.503937007874017,
                     graphicYOffset: -8.503937007874017,
                 }
 
                 for (const attribute in pointSymbolAttributes) {
                     expect(pointSymbol).to.haveOwnProperty(attribute)
-                    if (attribute === 'externalGraphic') {
-                        expect(pointSymbol[attribute].endsWith(pointSymbolAttributes[attribute])).to
-                            .be.true
-                    } else {
-                        expect(pointSymbol[attribute]).to.equal(pointSymbolAttributes[attribute])
-                    }
                 }
 
                 const textSymbol = symbolizers[1]
                 const textSymbolAttributes = {
                     type: 'text',
-                    label: 'Old Label',
+                    label: 'Sample Label',
                     fontFamily: 'Helvetica',
                     fontSize: '12px',
                     fontWeight: 'normal',
-                    labelYOffset: 0,
+                    labelYOffset: 44.75,
                 }
                 for (const attribute in textSymbolAttributes) {
                     expect(textSymbol).to.haveOwnProperty(attribute)
-                    expect(textSymbol[attribute]).to.equal(textSymbolAttributes[attribute])
                 }
             })
         })

From df42862bdb744f3f5a6525bdcf02411131b9bbfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Mon, 5 Aug 2024 10:24:11 +0200
Subject: [PATCH 27/56] PB-804 : don't center on search query when sharing
 position

Issue : When sharing a position, if there was a search query set, the search query would take priority over the position sharing, removing the shared position pin and centering on the search query result instead.
Fix : When a position is shared, it sets the marker url parameter, which means we can decide that when a marker is present, we should not center on the query result.
---
 .../storeSync/SearchParamConfig.class.js      | 33 +++++++++++++++++++
 src/router/storeSync/storeSync.config.js      | 12 ++-----
 src/store/modules/search.store.js             |  9 +++--
 3 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 src/router/storeSync/SearchParamConfig.class.js

diff --git a/src/router/storeSync/SearchParamConfig.class.js b/src/router/storeSync/SearchParamConfig.class.js
new file mode 100644
index 000000000..85222a842
--- /dev/null
+++ b/src/router/storeSync/SearchParamConfig.class.js
@@ -0,0 +1,33 @@
+import AbstractParamConfig, {
+    STORE_DISPATCHER_ROUTER_PLUGIN,
+} from '@/router/storeSync/abstractParamConfig.class'
+
+/**
+ * The goal is to stop centering on the search when sharing a position. When we share a position,
+ * both the center and the crosshair are sets.
+ *
+ * @param {Object} to The route object containing the query
+ * @param {Object} store The store
+ * @param {String} urlParamValue The search param
+ */
+function dispatchSearchFromUrl(to, store, urlParamValue) {
+    store.dispatch('setSearchQuery', {
+        query: urlParamValue,
+        shouldCenter: to.query.crosshair && to.query.center,
+        dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN,
+    })
+}
+
+export default class SearchParamConfig extends AbstractParamConfig {
+    constructor() {
+        super({
+            urlParamName: 'swisssearch',
+            mutationsToWatch: ['setSearchQuery'],
+            setValuesInStore: dispatchSearchFromUrl,
+            extractValueFromStore: (store) => store.state.search.query,
+            keepInUrlWhenDefault: false,
+            valueType: String,
+            defaultValue: '',
+        })
+    }
+}
diff --git a/src/router/storeSync/storeSync.config.js b/src/router/storeSync/storeSync.config.js
index 2011f6017..78935fa48 100644
--- a/src/router/storeSync/storeSync.config.js
+++ b/src/router/storeSync/storeSync.config.js
@@ -10,6 +10,7 @@ import ZoomParamConfig from '@/router/storeSync/ZoomParamConfig.class'
 import { FeatureInfoPositions } from '@/store/modules/ui.store.js'
 
 import TimeSliderParamConfig from './TimeSliderParamConfig.class'
+import SearchParamConfig from '@/router/storeSync/SearchParamConfig.class'
 
 /**
  * Configuration for all URL parameters of this app that need syncing with the store (and
@@ -89,16 +90,7 @@ const storeSyncConfig = [
         valueType: String,
         defaultValue: null,
     }),
-    new SimpleUrlParamConfig({
-        urlParamName: 'swisssearch',
-        mutationsToWatch: ['setSearchQuery'],
-        dispatchName: 'setSearchQuery',
-        dispatchValueName: 'query',
-        extractValueFromStore: (store) => store.state.search.query,
-        keepInUrlWhenDefault: false,
-        valueType: String,
-        defaultValue: '',
-    }),
+    new SearchParamConfig(),
     new CrossHairParamConfig(),
     new CompareSliderParamConfig(),
     new LayerParamConfig(),
diff --git a/src/store/modules/search.store.js b/src/store/modules/search.store.js
index 5ddab4305..4ff2fa88c 100644
--- a/src/store/modules/search.store.js
+++ b/src/store/modules/search.store.js
@@ -33,7 +33,7 @@ const actions = {
      */
     setSearchQuery: async (
         { commit, rootState, dispatch, getters },
-        { query = '', dispatcher }
+        { query = '', shouldCenter = true, dispatcher }
     ) => {
         let results = []
         commit('setSearchQuery', { query, dispatcher })
@@ -54,7 +54,10 @@ const actions = {
                 }
             }
 
-            if (extractedCoordinate) {
+            // there are situations where we don't want to center on the features or coordinates searched.
+            // for example: when we are sharing a position with a search query. In those situation, the
+            // 'zoom to extent' should be avoided. We center by default.
+            if (extractedCoordinate && shouldCenter) {
                 let coordinates = [...extractedCoordinate.coordinate]
                 if (extractedCoordinate.coordinateSystem !== currentProjection) {
                     // special case for LV03 input, we can't use proj4 to transform them into
@@ -94,7 +97,7 @@ const actions = {
                     })
                 }
                 dispatch('setPinnedLocation', { coordinates, dispatcher: dispatcherCoordinate })
-            } else if (what3wordLocation) {
+            } else if (what3wordLocation && shouldCenter) {
                 const dispatcherWhat3words = `${dispatcher}/search.store/setSearchQuery/what3words`
                 dispatch('setCenter', {
                     center: what3wordLocation,

From de2ccfd5e4826af4ec7bfe986b6cf2043ce2c9f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Mon, 5 Aug 2024 13:08:16 +0200
Subject: [PATCH 28/56] PB-804: linting and fix small issue

Issue : the boolean sent to the setSearchQuery mutation was inverted.
Fix : we put a 'not' in front of the boolean sent. Also linting
---
 src/router/storeSync/SearchParamConfig.class.js | 2 +-
 src/router/storeSync/storeSync.config.js        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/router/storeSync/SearchParamConfig.class.js b/src/router/storeSync/SearchParamConfig.class.js
index 85222a842..20e478962 100644
--- a/src/router/storeSync/SearchParamConfig.class.js
+++ b/src/router/storeSync/SearchParamConfig.class.js
@@ -13,7 +13,7 @@ import AbstractParamConfig, {
 function dispatchSearchFromUrl(to, store, urlParamValue) {
     store.dispatch('setSearchQuery', {
         query: urlParamValue,
-        shouldCenter: to.query.crosshair && to.query.center,
+        shouldCenter: !(to.query.crosshair && to.query.center),
         dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN,
     })
 }
diff --git a/src/router/storeSync/storeSync.config.js b/src/router/storeSync/storeSync.config.js
index 78935fa48..e7060e8e3 100644
--- a/src/router/storeSync/storeSync.config.js
+++ b/src/router/storeSync/storeSync.config.js
@@ -5,12 +5,12 @@ import CompareSliderParamConfig from '@/router/storeSync/CompareSliderParamConfi
 import CrossHairParamConfig from '@/router/storeSync/CrossHairParamConfig.class'
 import LayerParamConfig from '@/router/storeSync/LayerParamConfig.class'
 import PositionParamConfig from '@/router/storeSync/PositionParamConfig.class'
+import SearchParamConfig from '@/router/storeSync/SearchParamConfig.class'
 import SimpleUrlParamConfig from '@/router/storeSync/SimpleUrlParamConfig.class'
 import ZoomParamConfig from '@/router/storeSync/ZoomParamConfig.class'
 import { FeatureInfoPositions } from '@/store/modules/ui.store.js'
 
 import TimeSliderParamConfig from './TimeSliderParamConfig.class'
-import SearchParamConfig from '@/router/storeSync/SearchParamConfig.class'
 
 /**
  * Configuration for all URL parameters of this app that need syncing with the store (and

From eb3a60c35f2e34d5f2a9949b78dba0c2a2c046b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Thu, 8 Aug 2024 13:12:11 +0200
Subject: [PATCH 29/56] PB-804: stopping search center when redoing an already
 done search

Issue : When we follow a link with a crossHair, a search query,  but no layers / lang defined, it calls for a new search query who would center on the search query.
Fix : the 'redoSearch' method no longer center if there is a crosshair.
---
 src/store/plugins/redo-search-when-needed.plugin.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/store/plugins/redo-search-when-needed.plugin.js b/src/store/plugins/redo-search-when-needed.plugin.js
index 94a44903a..18835dce4 100644
--- a/src/store/plugins/redo-search-when-needed.plugin.js
+++ b/src/store/plugins/redo-search-when-needed.plugin.js
@@ -10,6 +10,8 @@ const redoSearchWhenNeeded = (store) => {
         if (store.state.search.query.length > 2) {
             store.dispatch('setSearchQuery', {
                 query: store.state.search.query,
+                // we don't center on the search query when redoing a search if there is a crosshair
+                shouldCenter: store.state.position.crossHair === null,
             })
         }
     }

From 5b2024d17970685918b2ad119d5c5c983571a6cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Thu, 8 Aug 2024 14:07:40 +0200
Subject: [PATCH 30/56] PB-804: allow crossHair parameter with only coordinates

Issue : We accepted only two variants of crossHair parameters : crossHair type, and crosshair Type + coordinates. If we tried to set the crossHair to only its coordinates, it wouldn't work.

Fix : When we give coordinates to the crossHair parameter, it uses the 'marker' crosshair Icon by default

corrected an out of bound error
---
 src/router/storeSync/CrossHairParamConfig.class.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/router/storeSync/CrossHairParamConfig.class.js b/src/router/storeSync/CrossHairParamConfig.class.js
index 3d50bbeaa..9bc5ae398 100644
--- a/src/router/storeSync/CrossHairParamConfig.class.js
+++ b/src/router/storeSync/CrossHairParamConfig.class.js
@@ -1,6 +1,7 @@
 import AbstractParamConfig, {
     STORE_DISPATCHER_ROUTER_PLUGIN,
 } from '@/router/storeSync/abstractParamConfig.class'
+import { CrossHairs } from '@/store/modules/position.store'
 import { round } from '@/utils/numberUtils'
 
 function dispatchCrossHairFromUrlIntoStore(to, store, urlParamValue) {
@@ -22,6 +23,15 @@ function dispatchCrossHairFromUrlIntoStore(to, store, urlParamValue) {
                     dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN,
                 })
             )
+        } else if (parts.length === 2) {
+            const crossHairPosition = [parseFloat(parts[0]), parseFloat(parts[1])]
+            if (!(isNaN(crossHairPosition[0]) || isNaN(crossHairPosition[1]))) {
+                promisesForAllDispatch.push('setCrossHair', {
+                    crossHair: CrossHairs.marker,
+                    crossHairPosition,
+                    dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN,
+                })
+            }
         } else if (parts.length === 3) {
             const crossHair = parts[0]
             const crossHairPosition = [parseFloat(parts[1]), parseFloat(parts[2])]

From be7d4a34c5bd42978af432a026aa460f5e037e70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Mon, 2 Sep 2024 10:59:35 +0200
Subject: [PATCH 31/56] PB-804: dispatching changes to the store

Issue : when there was only two parameters for the crossHair (x,y), the changes were not dispatched to the store

Fix : turns out, telling the dispatcher to dispatch the changes is necessary ^^
---
 src/router/storeSync/CrossHairParamConfig.class.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/router/storeSync/CrossHairParamConfig.class.js b/src/router/storeSync/CrossHairParamConfig.class.js
index 9bc5ae398..b41ce8a7a 100644
--- a/src/router/storeSync/CrossHairParamConfig.class.js
+++ b/src/router/storeSync/CrossHairParamConfig.class.js
@@ -26,11 +26,13 @@ function dispatchCrossHairFromUrlIntoStore(to, store, urlParamValue) {
         } else if (parts.length === 2) {
             const crossHairPosition = [parseFloat(parts[0]), parseFloat(parts[1])]
             if (!(isNaN(crossHairPosition[0]) || isNaN(crossHairPosition[1]))) {
-                promisesForAllDispatch.push('setCrossHair', {
-                    crossHair: CrossHairs.marker,
-                    crossHairPosition,
-                    dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN,
-                })
+                promisesForAllDispatch.push(
+                    store.dispatch('setCrossHair', {
+                        crossHair: CrossHairs.marker,
+                        crossHairPosition,
+                        dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN,
+                    })
+                )
             }
         } else if (parts.length === 3) {
             const crossHair = parts[0]

From f53599928ad04febe866f042c1397564234b2cbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Mon, 9 Sep 2024 17:12:58 +0200
Subject: [PATCH 32/56] PB-804: Harmonizing crossHair parameter syntax

- Changed the URL syntax for the crossHair parameter
 it now can be either `string`, `string,,`, `,x,y` or `string,x,y` and behaves in the same way as the layers parameter
- Added an error message when setting an invalid value for the crossHair parameter
- Changed the way error messages are handled, to allow the use of extra parameters

updating translations
---
 src/App.vue                                   | 13 +++--
 src/modules/i18n/locales/de.json              |  1 +
 src/modules/i18n/locales/en.json              |  1 +
 src/modules/i18n/locales/fr.json              |  1 +
 src/modules/i18n/locales/it.json              |  1 +
 src/modules/i18n/locales/rm.json              |  1 +
 .../utils/useMapInteractions.composable.js    |  3 +-
 .../storeSync/CrossHairParamConfig.class.js   | 55 ++++++++++++++-----
 src/store/modules/ui.store.js                 | 27 ++++++---
 .../plugins/geolocation-management.plugin.js  | 21 +++++--
 10 files changed, 89 insertions(+), 35 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index b93773ad7..0fd40f153 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -21,8 +21,9 @@ const i18n = useI18n()
 const dispatcher = { dispatcher: 'App.vue' }
 
 let debouncedOnResize
-
-const errorText = computed(() => store.state.ui.errorText)
+const error = computed(() => {
+    return store.state.ui.error
+})
 const warning = computed(() => {
     if (store.state.ui.warnings.size > 0) {
         return store.state.ui.warnings.values().next().value
@@ -62,11 +63,13 @@ function refreshPageTitle() {
     >
         <router-view />
         <ErrorWindow
-            v-if="errorText"
+            v-if="error"
             title="error"
-            @close="store.dispatch('setErrorText', { errorText: null, ...dispatcher })"
+            @close="store.dispatch('setError', { error: null, ...dispatcher })"
         >
-            <div>{{ i18n.t(errorText) }}</div>
+            <div>
+                {{ i18n.t(error.msg, error.params) }}
+            </div>
         </ErrorWindow>
         <WarningWindow
             v-if="warning"
diff --git a/src/modules/i18n/locales/de.json b/src/modules/i18n/locales/de.json
index 73a236350..48327a02d 100644
--- a/src/modules/i18n/locales/de.json
+++ b/src/modules/i18n/locales/de.json
@@ -465,6 +465,7 @@
     "outside_valid_year_range": "Das eingegebene Jahr liegt ausserhalb des verfügbaren Bereichs:",
     "page_description": "map.geo.admin.ch ist die Kartenplattform der schweizerischen Eidgenossenschaft. Zugang zu Karten, Geoinformationen, -daten, -dienste und Metadaten der Schweiz.",
     "page_title": "Karten der Schweiz - Schweizerische Eidgenossenschaft - map.geo.admin.ch",
+    "parameter_error": "Es ist ein Problem mit dem folgenden Parameter aufgetreten: ' {param} '. Der von Ihnen angegebene Wert ' {value} ' ist kein gültiger Wert für diesen Parameter und wurde ignoriert. Informationen zu gültigen Werten finden Sie in unserer Dokumentation.",
     "parcel": "Parzelle",
     "parse_failed": "Parsing-Fehler",
     "parse_succeeded": "Laden erfolgreich",
diff --git a/src/modules/i18n/locales/en.json b/src/modules/i18n/locales/en.json
index 28ea3e06d..a47cf3028 100644
--- a/src/modules/i18n/locales/en.json
+++ b/src/modules/i18n/locales/en.json
@@ -465,6 +465,7 @@
     "outside_valid_year_range": "The entered year is outside of the available range:",
     "page_description": "map.geo.admin.ch is the mapping platform of the Swiss Confederation. Access federal geographical information, maps, data, services and metadata of Switzerland.",
     "page_title": "Maps of Switzerland - Swiss Confederation  - map.geo.admin.ch",
+    "parameter_error": "There has been an issue with the following parameter : ' {param} '. The value you have given, ' {value} ' is not valid for this parameter, and has been ignored. Please refer to our documentation for information on which values are valid.",
     "parcel": "Parcel",
     "parse_failed": "Parsing error!",
     "parse_succeeded": "Loading OK!",
diff --git a/src/modules/i18n/locales/fr.json b/src/modules/i18n/locales/fr.json
index 6644e0a31..eebf53373 100644
--- a/src/modules/i18n/locales/fr.json
+++ b/src/modules/i18n/locales/fr.json
@@ -465,6 +465,7 @@
     "outside_valid_year_range": "L'année indiquée se situe en dehors de la plage disponible :",
     "page_description": "map.geo.admin.ch est la plateforme cartographique de la Confédération suisse et des cantons. Elle donne accès aux cartes, géoinformations, géodonnées, géoservices et métadonnées de la Suisse.",
     "page_title": "Cartes de la Suisse - Confédération suisse - map.geo.admin.ch",
+    "parameter_error": "Il y a eu un problème avec le paramètre suivant : ' {param} '. La valeur que vous avez donnée, ' {value} ', n'est pas valide pour ce paramètre et a été ignorée. Veuillez consulter notre documentation pour savoir quelles valeurs sont valides.",
     "parcel": "Parcelle",
     "parse_failed": "Erreur de parsing!",
     "parse_succeeded": "Chargement OK!",
diff --git a/src/modules/i18n/locales/it.json b/src/modules/i18n/locales/it.json
index b2831697d..cce132054 100644
--- a/src/modules/i18n/locales/it.json
+++ b/src/modules/i18n/locales/it.json
@@ -465,6 +465,7 @@
     "outside_valid_year_range": "L'anno inserito è al di fuori dell'intervallo disponibile:",
     "page_description": "map.geo.admin.ch è la piattaforma cartografica della Confederazione svizzera e dei cantoni. Dà accesso alle mappe, alle geoinformazioni, ai geodati, ai geoservizi e ai metadati della Svizzera.",
     "page_title": "Carta della Svizzera - Confederazione svizzera - map.geo.admin.ch",
+    "parameter_error": "Si è verificato un problema con il seguente parametro: ' {param} '. Il valore fornito, ' {value} ', non è valido per questo parametro ed è stato ignorato. Consulti la nostra documentazione per sapere quali sono i valori validi.",
     "parcel": "Parcelle",
     "parse_failed": "Errore di parsing!",
     "parse_succeeded": "Caricamento OK!",
diff --git a/src/modules/i18n/locales/rm.json b/src/modules/i18n/locales/rm.json
index 696490459..1c3b213db 100644
--- a/src/modules/i18n/locales/rm.json
+++ b/src/modules/i18n/locales/rm.json
@@ -463,6 +463,7 @@
     "outside_valid_year_range": "L'onn entrà sa chatta ordaifer il sectur disponibe:",
     "page_description": "map.geo.admin.ch è la plattafurma da chartas da la Confederaziun svizra. Access a las chartas, geoinfurmaziuns, a las geodatas, als geoservetschs ed a las metadatas da la Svizra.",
     "page_title": "Chartas da la Svizra - Confederaziun svizra - map.geo.admin.ch",
+    "parameter_error": "In problem è sa profilà cun il suandant parameter: {param}. La valur inditgada, \" {value}\", n'è betg valaivla per quest parameter ed è vegnida ignorada. Guardai nossa documentaziun uschia, tge valurs valaivlas ch'èn.",
     "parcel": "Parzelle",
     "parse_failed": "Errur da Parsing!",
     "parse_succeeded": "Chargiar reussì",
diff --git a/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js b/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js
index c567f0d56..ee34251fd 100644
--- a/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js
+++ b/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js
@@ -15,6 +15,7 @@ import { normalizeExtent, OutOfBoundsError } from '@/utils/coordinates/coordinat
 import { EmptyGPXError } from '@/utils/gpxUtils'
 import { EmptyKMLError } from '@/utils/kmlUtils'
 import log from '@/utils/logging'
+import WarningMessage from '@/utils/WarningMessage.class'
 
 const dispatcher = {
     dispatcher: 'useMapInteractions.composable',
@@ -266,7 +267,7 @@ export default function useMapInteractions(map) {
                 errorKey = 'invalid_kml_gpx_file_error'
                 log.error(`Failed to load file`, error)
             }
-            store.dispatch('setErrorText', { errorText: errorKey, ...dispatcher })
+            store.dispatch('setError', { error: new WarningMessage(errorKey, null), ...dispatcher })
         }
     }
 
diff --git a/src/router/storeSync/CrossHairParamConfig.class.js b/src/router/storeSync/CrossHairParamConfig.class.js
index b41ce8a7a..26acd6861 100644
--- a/src/router/storeSync/CrossHairParamConfig.class.js
+++ b/src/router/storeSync/CrossHairParamConfig.class.js
@@ -3,9 +3,28 @@ import AbstractParamConfig, {
 } from '@/router/storeSync/abstractParamConfig.class'
 import { CrossHairs } from '@/store/modules/position.store'
 import { round } from '@/utils/numberUtils'
+import WarningMessage from '@/utils/WarningMessage.class'
+
+/**
+ * The function used to dispatch the URL parameters to the store. The following options are accepted
+ *
+ * 1. `marker` --> place the specified marker at the center
+ * 2. `marker,,`--> same as before
+ * 3. `,x,y` --> place the default marker at the coordinates x,y
+ * 4. `marker,x,y --> place the specified marker at the coordinates x,y
+ *
+ * @param {Object} to
+ * @param {Object} store
+ * @param {URLSearchParams} urlParamValue
+ * @returns
+ */
 
 function dispatchCrossHairFromUrlIntoStore(to, store, urlParamValue) {
     const promisesForAllDispatch = []
+    const error = new WarningMessage('parameter_error', {
+        param: 'crosshair',
+        value: 'urlParamValue',
+    })
 
     if (typeof urlParamValue !== 'string' && !(urlParamValue instanceof String)) {
         promisesForAllDispatch.push(
@@ -14,29 +33,35 @@ function dispatchCrossHairFromUrlIntoStore(to, store, urlParamValue) {
                 dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN,
             })
         )
+
+        promisesForAllDispatch.push(
+            store.dispatch('setError', { error, dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN })
+        )
     } else {
         const parts = urlParamValue.split(',')
-        if (parts.length === 1) {
+        let crossHair = parts[0]
+        let crossHairPosition = [parseFloat(parts[1]), parseFloat(parts[2])]
+        if (isNaN(crossHairPosition[0]) || isNaN(crossHairPosition[1])) {
+            crossHairPosition = null
+        }
+
+        if (
+            (!crossHair && !crossHairPosition) ||
+            (!Object.values(CrossHairs).includes(crossHair) && crossHair !== '')
+        ) {
             promisesForAllDispatch.push(
                 store.dispatch('setCrossHair', {
-                    crossHair: urlParamValue,
+                    crossHair: null,
                     dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN,
                 })
             )
-        } else if (parts.length === 2) {
-            const crossHairPosition = [parseFloat(parts[0]), parseFloat(parts[1])]
-            if (!(isNaN(crossHairPosition[0]) || isNaN(crossHairPosition[1]))) {
-                promisesForAllDispatch.push(
-                    store.dispatch('setCrossHair', {
-                        crossHair: CrossHairs.marker,
-                        crossHairPosition,
-                        dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN,
-                    })
-                )
+            promisesForAllDispatch.push(
+                store.dispatch('setError', { error, dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN })
+            )
+        } else {
+            if (crossHair === '') {
+                crossHair = CrossHairs.marker
             }
-        } else if (parts.length === 3) {
-            const crossHair = parts[0]
-            const crossHairPosition = [parseFloat(parts[1]), parseFloat(parts[2])]
             promisesForAllDispatch.push(
                 store.dispatch('setCrossHair', {
                     crossHair,
diff --git a/src/store/modules/ui.store.js b/src/store/modules/ui.store.js
index d63aecac0..16863e0e1 100644
--- a/src/store/modules/ui.store.js
+++ b/src/store/modules/ui.store.js
@@ -153,14 +153,13 @@ export default {
         showDisclaimer: true,
 
         /**
-         * Text to display in the error window
+         * A WarningMessage object containing parameters for error texts, so we can have error
+         * messages which are similar, but not dependant on a translation key, reducing the total
+         * number of translation keys needed.
          *
-         * When this text is set the error window will be displayed
-         *
-         * @type String
+         * @type WarningMessage
          */
-        errorText: null,
-
+        error: null,
         /**
          * Set of warnings to display. Each warning must be an object WarningMessage
          *
@@ -391,8 +390,18 @@ export default {
         setShowDisclaimer({ commit }, { showDisclaimer, dispatcher }) {
             commit('setShowDisclaimer', { showDisclaimer, dispatcher })
         },
-        setErrorText({ commit }, { errorText, dispatcher }) {
-            commit('setErrorText', { errorText, dispatcher })
+        setError({ commit }, { error, dispatcher }) {
+            if (!(error instanceof WarningMessage)) {
+                if (error instanceof String) {
+                    commit('setError', { error: new WarningMessage(error, null) })
+                } else {
+                    throw new Error(
+                        `Error ${error} dispatched by ${dispatcher} is neither of type WarningMessage, nor a string`
+                    )
+                }
+            } else {
+                commit('setError', { error, dispatcher })
+            }
         },
         addWarning({ commit, state }, { warning, dispatcher }) {
             if (!(warning instanceof WarningMessage)) {
@@ -476,7 +485,7 @@ export default {
             state.featureInfoPosition = position
         },
         setShowDisclaimer: (state, { showDisclaimer }) => (state.showDisclaimer = showDisclaimer),
-        setErrorText: (state, { errorText }) => (state.errorText = errorText),
+        setError: (state, { error }) => (state.error = error),
         addWarning: (state, { warning }) => state.warnings.add(warning),
         removeWarning: (state, { warning }) => state.warnings.delete(warning),
         setShowDragAndDropOverlay: (state, { showDragAndDropOverlay }) =>
diff --git a/src/store/plugins/geolocation-management.plugin.js b/src/store/plugins/geolocation-management.plugin.js
index e39a4707a..6a240f88c 100644
--- a/src/store/plugins/geolocation-management.plugin.js
+++ b/src/store/plugins/geolocation-management.plugin.js
@@ -5,6 +5,7 @@ import { IS_TESTING_WITH_CYPRESS } from '@/config/staging.config'
 import { LV95, WGS84 } from '@/utils/coordinates/coordinateSystems'
 import log from '@/utils/logging'
 import { round } from '@/utils/numberUtils'
+import WarningMessage from '@/utils/WarningMessage.class'
 
 const dispatcher = { dispatcher: 'geolocation-management.plugin' }
 
@@ -24,8 +25,9 @@ function setCenterIfInBounds(store, center) {
         }
     } else {
         log.warn(`current geolocation is out of bounds: ${JSON.stringify(center)}`)
-        store.dispatch('setErrorText', {
-            errorText: 'geoloc_out_of_bounds',
+        // TO DO : Warning Message
+        store.dispatch('setError', {
+            error: new WarningMessage('geoloc_out_of_bounds', null),
             ...dispatcher,
         })
     }
@@ -87,11 +89,17 @@ const handlePositionError = (error, store, state, options = {}) => {
                 denied: true,
                 ...dispatcher,
             })
-            store.dispatch('setErrorText', { errorText: 'geoloc_permission_denied', ...dispatcher })
+            store.dispatch('setError', {
+                error: new WarningMessage('geoloc_permission_denied', null),
+                ...dispatcher,
+            })
             break
         case error.TIMEOUT:
             store.dispatch('setGeolocation', { active: false, ...dispatcher })
-            store.dispatch('setErrorText', { errorText: 'geoloc_time_out', ...dispatcher })
+            store.dispatch('setError', {
+                error: new WarningMessage('geoloc_time_out', null),
+                ...dispatcher,
+            })
             break
         default:
             if (IS_TESTING_WITH_CYPRESS && error.code === error.POSITION_UNAVAILABLE) {
@@ -109,7 +117,10 @@ const handlePositionError = (error, store, state, options = {}) => {
                         activeGeolocation(store, state, { useInitial: false })
                     }
                 } else {
-                    store.dispatch('setErrorText', { errorText: 'geoloc_unknown', ...dispatcher })
+                    store.dispatch('setError', {
+                        error: new WarningMessage('geoloc_unknown', null),
+                        ...dispatcher,
+                    })
                     if (reactivate) {
                         // If after 3 retries we failed to re-activate, set the geolocation to false
                         // so that the user can manually retry the geolocation later on. This can

From 34f4b1ad8868b9781caaac2b73be3ab62e7a3bd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Tue, 10 Sep 2024 09:27:14 +0200
Subject: [PATCH 33/56] PB-804: adding a condition to stop e2e tests from being
 flaky

---
 .../storeSync/CrossHairParamConfig.class.js   | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/router/storeSync/CrossHairParamConfig.class.js b/src/router/storeSync/CrossHairParamConfig.class.js
index 26acd6861..958af1d5c 100644
--- a/src/router/storeSync/CrossHairParamConfig.class.js
+++ b/src/router/storeSync/CrossHairParamConfig.class.js
@@ -2,6 +2,7 @@ import AbstractParamConfig, {
     STORE_DISPATCHER_ROUTER_PLUGIN,
 } from '@/router/storeSync/abstractParamConfig.class'
 import { CrossHairs } from '@/store/modules/position.store'
+import log from '@/utils/logging'
 import { round } from '@/utils/numberUtils'
 import WarningMessage from '@/utils/WarningMessage.class'
 
@@ -25,6 +26,10 @@ function dispatchCrossHairFromUrlIntoStore(to, store, urlParamValue) {
         param: 'crosshair',
         value: 'urlParamValue',
     })
+    log.error('ENTRY IN DISPATCH')
+    log.error(to)
+    log.error(urlParamValue)
+    log.warn('bye')
 
     if (typeof urlParamValue !== 'string' && !(urlParamValue instanceof String)) {
         promisesForAllDispatch.push(
@@ -55,9 +60,19 @@ function dispatchCrossHairFromUrlIntoStore(to, store, urlParamValue) {
                     dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN,
                 })
             )
-            promisesForAllDispatch.push(
-                store.dispatch('setError', { error, dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN })
-            )
+            if (crossHair !== undefined) {
+                /**
+                 * There are situations where the function is called without any parameter, and it
+                 * makes some tests crash because the error message is over some necessary buttons.
+                 * We consider that if the parameter is undefined, it's a choice made by the user.
+                 */
+                promisesForAllDispatch.push(
+                    store.dispatch('setError', {
+                        error,
+                        dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN,
+                    })
+                )
+            }
         } else {
             if (crossHair === '') {
                 crossHair = CrossHairs.marker
@@ -76,6 +91,8 @@ function dispatchCrossHairFromUrlIntoStore(to, store, urlParamValue) {
 
 function generateCrossHairUrlParamFromStoreValues(store) {
     if (store.state.position.crossHair) {
+        log.error('CAN SOMEONE EXPLAIN ?')
+        log.error(store.state.position.crossHair)
         let crossHairParamValue = store.state.position.crossHair
         const { center, crossHairPosition } = store.state.position
         if (

From 7a8714b6f447cc82e8e217a887af607e1223032a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Tue, 10 Sep 2024 10:05:32 +0200
Subject: [PATCH 34/56] PB-804: avoid changing store value when unnecessary

Issue : the dispatch to store was called sometimes when the store was null and the parameter was not in the query, resulting in an unecessary dispatch, which in turns caused tests to fail because the error message covered some elements.
Fix : when the query is undefined and the store is at null, we don't call on the dispatch
---
 src/router/storeSync/CrossHairParamConfig.class.js | 11 ++---------
 src/router/storeSync/storeSync.routerPlugin.js     |  8 +++++++-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/router/storeSync/CrossHairParamConfig.class.js b/src/router/storeSync/CrossHairParamConfig.class.js
index 958af1d5c..939c7c909 100644
--- a/src/router/storeSync/CrossHairParamConfig.class.js
+++ b/src/router/storeSync/CrossHairParamConfig.class.js
@@ -2,7 +2,6 @@ import AbstractParamConfig, {
     STORE_DISPATCHER_ROUTER_PLUGIN,
 } from '@/router/storeSync/abstractParamConfig.class'
 import { CrossHairs } from '@/store/modules/position.store'
-import log from '@/utils/logging'
 import { round } from '@/utils/numberUtils'
 import WarningMessage from '@/utils/WarningMessage.class'
 
@@ -24,12 +23,8 @@ function dispatchCrossHairFromUrlIntoStore(to, store, urlParamValue) {
     const promisesForAllDispatch = []
     const error = new WarningMessage('parameter_error', {
         param: 'crosshair',
-        value: 'urlParamValue',
+        value: urlParamValue,
     })
-    log.error('ENTRY IN DISPATCH')
-    log.error(to)
-    log.error(urlParamValue)
-    log.warn('bye')
 
     if (typeof urlParamValue !== 'string' && !(urlParamValue instanceof String)) {
         promisesForAllDispatch.push(
@@ -60,7 +55,7 @@ function dispatchCrossHairFromUrlIntoStore(to, store, urlParamValue) {
                     dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN,
                 })
             )
-            if (crossHair !== undefined) {
+            if (urlParamValue !== undefined) {
                 /**
                  * There are situations where the function is called without any parameter, and it
                  * makes some tests crash because the error message is over some necessary buttons.
@@ -91,8 +86,6 @@ function dispatchCrossHairFromUrlIntoStore(to, store, urlParamValue) {
 
 function generateCrossHairUrlParamFromStoreValues(store) {
     if (store.state.position.crossHair) {
-        log.error('CAN SOMEONE EXPLAIN ?')
-        log.error(store.state.position.crossHair)
         let crossHairParamValue = store.state.position.crossHair
         const { center, crossHairPosition } = store.state.position
         if (
diff --git a/src/router/storeSync/storeSync.routerPlugin.js b/src/router/storeSync/storeSync.routerPlugin.js
index 66029496b..b415292c6 100644
--- a/src/router/storeSync/storeSync.routerPlugin.js
+++ b/src/router/storeSync/storeSync.routerPlugin.js
@@ -124,7 +124,13 @@ function urlQueryWatcher(store, to, from) {
             await paramConfig.populateStoreWithQueryValue(to, store, value)
         }
 
-        if (queryValue && queryValue !== storeValue) {
+        if (
+            queryValue &&
+            queryValue !== storeValue &&
+            // if the query is undefined and the store is null, we also don't dispatch it, as we want
+            // to avoid changing the store value for no reason.
+            !(queryValue === undefined && storeValue === null)
+        ) {
             // dispatching URL value to the store
             log.debug(
                 '[URL query watcher] param',

From 47d3b113d14255e749d15cff607e27daa1835449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Tue, 10 Sep 2024 13:37:26 +0200
Subject: [PATCH 35/56] PB-804: handling unexpected undefined in
 readValueFromQuery

Issue : in some cases, there would be some parameters which would receive an 'undefined' within the query, and thus complete the readValueFromQuery. In general, those parameters are later ignored, but with crosshair and its new error, it would cause an error to appear and, in consequence, make some tests fail

Fix : When going trough readValueFromQuery, we treat the 'undefined' the same way we handle a 'null'
---
 src/router/storeSync/CrossHairParamConfig.class.js | 1 +
 src/router/storeSync/abstractParamConfig.class.js  | 2 +-
 src/store/plugins/geolocation-management.plugin.js | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/router/storeSync/CrossHairParamConfig.class.js b/src/router/storeSync/CrossHairParamConfig.class.js
index 939c7c909..4dcd3dd66 100644
--- a/src/router/storeSync/CrossHairParamConfig.class.js
+++ b/src/router/storeSync/CrossHairParamConfig.class.js
@@ -115,6 +115,7 @@ export default class CrossHairParamConfig extends AbstractParamConfig {
             extractValueFromStore: generateCrossHairUrlParamFromStoreValues,
             keepInUrlWhenDefault: false,
             valueType: String,
+            defaultValue: null,
         })
     }
 }
diff --git a/src/router/storeSync/abstractParamConfig.class.js b/src/router/storeSync/abstractParamConfig.class.js
index bd2d6ad38..a9caf51fe 100644
--- a/src/router/storeSync/abstractParamConfig.class.js
+++ b/src/router/storeSync/abstractParamConfig.class.js
@@ -83,7 +83,7 @@ export default class AbstractParamConfig {
                 queryValue === '' ||
                 (typeof queryValue === 'boolean' && !!queryValue)
             )
-        } else if (queryValue === null) {
+        } else if (queryValue === null || queryValue === undefined) {
             return this.defaultValue
         }
         return this.valueType(queryValue)
diff --git a/src/store/plugins/geolocation-management.plugin.js b/src/store/plugins/geolocation-management.plugin.js
index 6a240f88c..a4a099ede 100644
--- a/src/store/plugins/geolocation-management.plugin.js
+++ b/src/store/plugins/geolocation-management.plugin.js
@@ -25,7 +25,6 @@ function setCenterIfInBounds(store, center) {
         }
     } else {
         log.warn(`current geolocation is out of bounds: ${JSON.stringify(center)}`)
-        // TO DO : Warning Message
         store.dispatch('setError', {
             error: new WarningMessage('geoloc_out_of_bounds', null),
             ...dispatcher,

From 9eda0472dd8d26111a6448ddd7a2204f978c1518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Tue, 10 Sep 2024 15:16:00 +0200
Subject: [PATCH 36/56] PB-804: creating an ErrorMessage class, so we can
 manage warnings and errors message in a different way if we want

forgot a check
---
 src/modules/i18n/locales/de.json                      |  2 +-
 src/modules/i18n/locales/en.json                      |  2 +-
 src/modules/i18n/locales/fr.json                      |  2 +-
 src/modules/i18n/locales/it.json                      |  2 +-
 src/modules/i18n/locales/rm.json                      |  2 +-
 .../openlayers/utils/useMapInteractions.composable.js |  4 ++--
 src/router/storeSync/CrossHairParamConfig.class.js    |  4 ++--
 src/store/modules/ui.store.js                         |  7 ++++---
 src/store/plugins/geolocation-management.plugin.js    | 10 +++++-----
 src/utils/ErrorMessage.class.js                       | 11 +++++++++++
 10 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 src/utils/ErrorMessage.class.js

diff --git a/src/modules/i18n/locales/de.json b/src/modules/i18n/locales/de.json
index 48327a02d..8d27b404f 100644
--- a/src/modules/i18n/locales/de.json
+++ b/src/modules/i18n/locales/de.json
@@ -465,7 +465,6 @@
     "outside_valid_year_range": "Das eingegebene Jahr liegt ausserhalb des verfügbaren Bereichs:",
     "page_description": "map.geo.admin.ch ist die Kartenplattform der schweizerischen Eidgenossenschaft. Zugang zu Karten, Geoinformationen, -daten, -dienste und Metadaten der Schweiz.",
     "page_title": "Karten der Schweiz - Schweizerische Eidgenossenschaft - map.geo.admin.ch",
-    "parameter_error": "Es ist ein Problem mit dem folgenden Parameter aufgetreten: ' {param} '. Der von Ihnen angegebene Wert ' {value} ' ist kein gültiger Wert für diesen Parameter und wurde ignoriert. Informationen zu gültigen Werten finden Sie in unserer Dokumentation.",
     "parcel": "Parzelle",
     "parse_failed": "Parsing-Fehler",
     "parse_succeeded": "Laden erfolgreich",
@@ -649,6 +648,7 @@
     "uploading_file": "Laden...",
     "url_image": "Foto  URL",
     "url_link": "Webseite URL",
+    "url_parameter_error": "Es ist ein Problem mit dem folgenden Parameter aufgetreten: ' {param} '. Der von Ihnen angegebene Wert ' {value} ' ist kein gültiger Wert für diesen Parameter und wurde ignoriert. Informationen zu gültigen Werten finden Sie in unserer Dokumentation.",
     "url_video": "Video URL",
     "vector_feedback_choose_color": "Farbe auswählen",
     "vector_feedback_choose_layer": "Ebene auswählen",
diff --git a/src/modules/i18n/locales/en.json b/src/modules/i18n/locales/en.json
index a47cf3028..6bfcc4c1d 100644
--- a/src/modules/i18n/locales/en.json
+++ b/src/modules/i18n/locales/en.json
@@ -465,7 +465,6 @@
     "outside_valid_year_range": "The entered year is outside of the available range:",
     "page_description": "map.geo.admin.ch is the mapping platform of the Swiss Confederation. Access federal geographical information, maps, data, services and metadata of Switzerland.",
     "page_title": "Maps of Switzerland - Swiss Confederation  - map.geo.admin.ch",
-    "parameter_error": "There has been an issue with the following parameter : ' {param} '. The value you have given, ' {value} ' is not valid for this parameter, and has been ignored. Please refer to our documentation for information on which values are valid.",
     "parcel": "Parcel",
     "parse_failed": "Parsing error!",
     "parse_succeeded": "Loading OK!",
@@ -649,6 +648,7 @@
     "uploading_file": "Loading file...",
     "url_image": "Photo URL",
     "url_link": "Website URL",
+    "url_parameter_error": "There has been an issue with the following parameter : ' {param} '. The value you have given, ' {value} ' is not valid for this parameter, and has been ignored. Please refer to our documentation for information on which values are valid.",
     "url_video": "Video URL",
     "vector_feedback_choose_color": "Choose a color",
     "vector_feedback_choose_layer": "Choose a layer",
diff --git a/src/modules/i18n/locales/fr.json b/src/modules/i18n/locales/fr.json
index eebf53373..37a61ed1b 100644
--- a/src/modules/i18n/locales/fr.json
+++ b/src/modules/i18n/locales/fr.json
@@ -465,7 +465,6 @@
     "outside_valid_year_range": "L'année indiquée se situe en dehors de la plage disponible :",
     "page_description": "map.geo.admin.ch est la plateforme cartographique de la Confédération suisse et des cantons. Elle donne accès aux cartes, géoinformations, géodonnées, géoservices et métadonnées de la Suisse.",
     "page_title": "Cartes de la Suisse - Confédération suisse - map.geo.admin.ch",
-    "parameter_error": "Il y a eu un problème avec le paramètre suivant : ' {param} '. La valeur que vous avez donnée, ' {value} ', n'est pas valide pour ce paramètre et a été ignorée. Veuillez consulter notre documentation pour savoir quelles valeurs sont valides.",
     "parcel": "Parcelle",
     "parse_failed": "Erreur de parsing!",
     "parse_succeeded": "Chargement OK!",
@@ -649,6 +648,7 @@
     "uploading_file": "Chargement du fichier...",
     "url_image": "Lien de la photo",
     "url_link": "Lien du site web",
+    "url_parameter_error": "Il y a eu un problème avec le paramètre suivant : ' {param} '. La valeur que vous avez donnée, ' {value} ', n'est pas valide pour ce paramètre et a été ignorée. Veuillez consulter notre documentation pour savoir quelles valeurs sont valides.",
     "url_video": "Lien de la vidéo",
     "vector_feedback_choose_color": "Choisissez une couleur",
     "vector_feedback_choose_layer": "Choisissez une couche",
diff --git a/src/modules/i18n/locales/it.json b/src/modules/i18n/locales/it.json
index cce132054..bce044eac 100644
--- a/src/modules/i18n/locales/it.json
+++ b/src/modules/i18n/locales/it.json
@@ -465,7 +465,6 @@
     "outside_valid_year_range": "L'anno inserito è al di fuori dell'intervallo disponibile:",
     "page_description": "map.geo.admin.ch è la piattaforma cartografica della Confederazione svizzera e dei cantoni. Dà accesso alle mappe, alle geoinformazioni, ai geodati, ai geoservizi e ai metadati della Svizzera.",
     "page_title": "Carta della Svizzera - Confederazione svizzera - map.geo.admin.ch",
-    "parameter_error": "Si è verificato un problema con il seguente parametro: ' {param} '. Il valore fornito, ' {value} ', non è valido per questo parametro ed è stato ignorato. Consulti la nostra documentazione per sapere quali sono i valori validi.",
     "parcel": "Parcelle",
     "parse_failed": "Errore di parsing!",
     "parse_succeeded": "Caricamento OK!",
@@ -649,6 +648,7 @@
     "uploading_file": "Caricamento del file...",
     "url_image": "Link della foto",
     "url_link": "Link del sito web",
+    "url_parameter_error": "Si è verificato un problema con il seguente parametro: ' {param} '. Il valore fornito, ' {value} ', non è valido per questo parametro ed è stato ignorato. Consulti la nostra documentazione per sapere quali sono i valori validi.",
     "url_video": "Link del video",
     "vector_feedback_choose_color": "Scegliere un colore",
     "vector_feedback_choose_layer": "Scegliere un layer",
diff --git a/src/modules/i18n/locales/rm.json b/src/modules/i18n/locales/rm.json
index 1c3b213db..a24ee25ea 100644
--- a/src/modules/i18n/locales/rm.json
+++ b/src/modules/i18n/locales/rm.json
@@ -463,7 +463,6 @@
     "outside_valid_year_range": "L'onn entrà sa chatta ordaifer il sectur disponibe:",
     "page_description": "map.geo.admin.ch è la plattafurma da chartas da la Confederaziun svizra. Access a las chartas, geoinfurmaziuns, a las geodatas, als geoservetschs ed a las metadatas da la Svizra.",
     "page_title": "Chartas da la Svizra - Confederaziun svizra - map.geo.admin.ch",
-    "parameter_error": "In problem è sa profilà cun il suandant parameter: {param}. La valur inditgada, \" {value}\", n'è betg valaivla per quest parameter ed è vegnida ignorada. Guardai nossa documentaziun uschia, tge valurs valaivlas ch'èn.",
     "parcel": "Parzelle",
     "parse_failed": "Errur da Parsing!",
     "parse_succeeded": "Chargiar reussì",
@@ -647,6 +646,7 @@
     "uploading_file": "La datoteca vegn chargiada",
     "url_image": "Link a la fotografia",
     "url_link": "Link a la pagina d’internet",
+    "url_parameter_error": "In problem è sa profilà cun il suandant parameter: {param}. La valur inditgada, \" {value}\", n'è betg valaivla per quest parameter ed è vegnida ignorada. Guardai nossa documentaziun uschia, tge valurs valaivlas ch'èn.",
     "url_video": "Link al video",
     "vector_feedback_choose_color": "Tscherner la colur",
     "vector_feedback_choose_layer": "Tscherner il nivel",
diff --git a/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js b/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js
index ee34251fd..bfc7e9afd 100644
--- a/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js
+++ b/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js
@@ -12,10 +12,10 @@ import { useDragBoxSelect } from '@/modules/map/components/openlayers/utils/useD
 import { handleFileContent } from '@/modules/menu/components/advancedTools/ImportFile/utils'
 import { ClickInfo, ClickType } from '@/store/modules/map.store'
 import { normalizeExtent, OutOfBoundsError } from '@/utils/coordinates/coordinateUtils'
+import ErrorMessage from '@/utils/ErrorMessage.class'
 import { EmptyGPXError } from '@/utils/gpxUtils'
 import { EmptyKMLError } from '@/utils/kmlUtils'
 import log from '@/utils/logging'
-import WarningMessage from '@/utils/WarningMessage.class'
 
 const dispatcher = {
     dispatcher: 'useMapInteractions.composable',
@@ -267,7 +267,7 @@ export default function useMapInteractions(map) {
                 errorKey = 'invalid_kml_gpx_file_error'
                 log.error(`Failed to load file`, error)
             }
-            store.dispatch('setError', { error: new WarningMessage(errorKey, null), ...dispatcher })
+            store.dispatch('setError', { error: new ErrorMessage(errorKey, null), ...dispatcher })
         }
     }
 
diff --git a/src/router/storeSync/CrossHairParamConfig.class.js b/src/router/storeSync/CrossHairParamConfig.class.js
index 4dcd3dd66..d84444601 100644
--- a/src/router/storeSync/CrossHairParamConfig.class.js
+++ b/src/router/storeSync/CrossHairParamConfig.class.js
@@ -2,8 +2,8 @@ import AbstractParamConfig, {
     STORE_DISPATCHER_ROUTER_PLUGIN,
 } from '@/router/storeSync/abstractParamConfig.class'
 import { CrossHairs } from '@/store/modules/position.store'
+import ErrorMessage from '@/utils/ErrorMessage.class'
 import { round } from '@/utils/numberUtils'
-import WarningMessage from '@/utils/WarningMessage.class'
 
 /**
  * The function used to dispatch the URL parameters to the store. The following options are accepted
@@ -21,7 +21,7 @@ import WarningMessage from '@/utils/WarningMessage.class'
 
 function dispatchCrossHairFromUrlIntoStore(to, store, urlParamValue) {
     const promisesForAllDispatch = []
-    const error = new WarningMessage('parameter_error', {
+    const error = new ErrorMessage('url_parameter_error', {
         param: 'crosshair',
         value: urlParamValue,
     })
diff --git a/src/store/modules/ui.store.js b/src/store/modules/ui.store.js
index 16863e0e1..2ca17a77f 100644
--- a/src/store/modules/ui.store.js
+++ b/src/store/modules/ui.store.js
@@ -5,6 +5,7 @@ import {
     REPORT_PROBLEM_HOSTNAMES,
     WARNING_RIBBON_HOSTNAMES,
 } from '@/config/staging.config'
+import ErrorMessage from '@/utils/ErrorMessage.class'
 import log from '@/utils/logging'
 import WarningMessage from '@/utils/WarningMessage.class'
 
@@ -157,7 +158,7 @@ export default {
          * messages which are similar, but not dependant on a translation key, reducing the total
          * number of translation keys needed.
          *
-         * @type WarningMessage
+         * @type ErrorMessage
          */
         error: null,
         /**
@@ -391,9 +392,9 @@ export default {
             commit('setShowDisclaimer', { showDisclaimer, dispatcher })
         },
         setError({ commit }, { error, dispatcher }) {
-            if (!(error instanceof WarningMessage)) {
+            if (!(error instanceof ErrorMessage)) {
                 if (error instanceof String) {
-                    commit('setError', { error: new WarningMessage(error, null) })
+                    commit('setError', { error: new ErrorMessage(error, null) })
                 } else {
                     throw new Error(
                         `Error ${error} dispatched by ${dispatcher} is neither of type WarningMessage, nor a string`
diff --git a/src/store/plugins/geolocation-management.plugin.js b/src/store/plugins/geolocation-management.plugin.js
index a4a099ede..07061a3df 100644
--- a/src/store/plugins/geolocation-management.plugin.js
+++ b/src/store/plugins/geolocation-management.plugin.js
@@ -3,9 +3,9 @@ import proj4 from 'proj4'
 
 import { IS_TESTING_WITH_CYPRESS } from '@/config/staging.config'
 import { LV95, WGS84 } from '@/utils/coordinates/coordinateSystems'
+import ErrorMessage from '@/utils/ErrorMessage.class'
 import log from '@/utils/logging'
 import { round } from '@/utils/numberUtils'
-import WarningMessage from '@/utils/WarningMessage.class'
 
 const dispatcher = { dispatcher: 'geolocation-management.plugin' }
 
@@ -26,7 +26,7 @@ function setCenterIfInBounds(store, center) {
     } else {
         log.warn(`current geolocation is out of bounds: ${JSON.stringify(center)}`)
         store.dispatch('setError', {
-            error: new WarningMessage('geoloc_out_of_bounds', null),
+            error: new ErrorMessage('geoloc_out_of_bounds', null),
             ...dispatcher,
         })
     }
@@ -89,14 +89,14 @@ const handlePositionError = (error, store, state, options = {}) => {
                 ...dispatcher,
             })
             store.dispatch('setError', {
-                error: new WarningMessage('geoloc_permission_denied', null),
+                error: new ErrorMessage('geoloc_permission_denied', null),
                 ...dispatcher,
             })
             break
         case error.TIMEOUT:
             store.dispatch('setGeolocation', { active: false, ...dispatcher })
             store.dispatch('setError', {
-                error: new WarningMessage('geoloc_time_out', null),
+                error: new ErrorMessage('geoloc_time_out', null),
                 ...dispatcher,
             })
             break
@@ -117,7 +117,7 @@ const handlePositionError = (error, store, state, options = {}) => {
                     }
                 } else {
                     store.dispatch('setError', {
-                        error: new WarningMessage('geoloc_unknown', null),
+                        error: new ErrorMessage('geoloc_unknown', null),
                         ...dispatcher,
                     })
                     if (reactivate) {
diff --git a/src/utils/ErrorMessage.class.js b/src/utils/ErrorMessage.class.js
new file mode 100644
index 000000000..0be0e50da
--- /dev/null
+++ b/src/utils/ErrorMessage.class.js
@@ -0,0 +1,11 @@
+/** Error message to display to the user */
+export default class ErrorMessage {
+    /**
+     * @param {string} msg Translation key message
+     * @param {any} params Translation params to pass to i18n (used for message formatting)
+     */
+    constructor(msg, params = null) {
+        this.msg = msg
+        this.params = params
+    }
+}

From 88c0f1a46d48f1d52e720f51b7298efbe708803c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Tue, 10 Sep 2024 17:41:59 +0200
Subject: [PATCH 37/56] PB-804: replacing references to 'WarningMessages' to
 'ErrorMessages' where relevant

---
 src/store/modules/ui.store.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/store/modules/ui.store.js b/src/store/modules/ui.store.js
index 2ca17a77f..0f70cbbd6 100644
--- a/src/store/modules/ui.store.js
+++ b/src/store/modules/ui.store.js
@@ -154,7 +154,7 @@ export default {
         showDisclaimer: true,
 
         /**
-         * A WarningMessage object containing parameters for error texts, so we can have error
+         * An ErrorMessage object containing parameters for error texts, so we can have error
          * messages which are similar, but not dependant on a translation key, reducing the total
          * number of translation keys needed.
          *
@@ -397,7 +397,7 @@ export default {
                     commit('setError', { error: new ErrorMessage(error, null) })
                 } else {
                     throw new Error(
-                        `Error ${error} dispatched by ${dispatcher} is neither of type WarningMessage, nor a string`
+                        `Error ${error} dispatched by ${dispatcher} is neither of type ErrorMessage, nor a string`
                     )
                 }
             } else {

From bb98630cf1de3bfaec139f42fe9f7b497da33478 Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Wed, 4 Sep 2024 12:20:55 +0200
Subject: [PATCH 38/56] PB-66: Update regex to match new icon set names

---
 src/utils/kmlUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/kmlUtils.js b/src/utils/kmlUtils.js
index 194f61614..1fc361117 100644
--- a/src/utils/kmlUtils.js
+++ b/src/utils/kmlUtils.js
@@ -213,7 +213,7 @@ export function parseIconUrl(url) {
     // /api/icons/sets/{set_name}/icons/{icon_name}@{icon_scale}-{red},{green},{blue}.png
     // if cannot be parsed from legacy or new pattern, then use default
     const setMatch =
-        /api\/icons\/sets\/(?<set>\w+)\/icons\/(?<name>.+?)(@(?<scale>\d+(\.\d+)?)x-(?<r>\d+),(?<g>\d+),(?<b>\d+))\.png/.exec(
+        /api\/icons\/sets\/(?<set>[\w-]+)\/icons\/(?<name>.+?)(@(?<scale>\d+(\.\d+)?)x-(?<r>\d+),(?<g>\d+),(?<b>\d+))\.png/.exec(
             url
         )
 

From 158742041d5c8056da9d2ed77b560f80a58f85dc Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Wed, 4 Sep 2024 14:14:05 +0200
Subject: [PATCH 39/56] PB-66: Do not show legacy icon sets in drop down

---
 src/api/icon.api.js   | 4 ++++
 src/utils/kmlUtils.js | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/api/icon.api.js b/src/api/icon.api.js
index 7a906c615..717731233 100644
--- a/src/api/icon.api.js
+++ b/src/api/icon.api.js
@@ -2,6 +2,7 @@ import axios from 'axios'
 
 import { getViewerDedicatedServicesBaseUrl } from '@/config/baseUrl.config'
 import { calculateTextOffset, MEDIUM, RED } from '@/utils/featureStyleUtils'
+import { LEGACY_ICON_SET } from '@/utils/kmlUtils'
 import log from '@/utils/logging'
 
 /** Default Icon parameters for the URL. */
@@ -192,6 +193,9 @@ export async function loadAllIconSetsFromBackend() {
         const rawSets = (await axios.get(`${getViewerDedicatedServicesBaseUrl()}icons/sets`)).data
             .items
         for (const rawSet of rawSets) {
+            if (LEGACY_ICON_SET.includes(rawSet.name)) {
+                continue
+            }
             const iconSet = new DrawingIconSet(
                 rawSet.name,
                 rawSet.colorable,
diff --git a/src/utils/kmlUtils.js b/src/utils/kmlUtils.js
index 1fc361117..993ec1120 100644
--- a/src/utils/kmlUtils.js
+++ b/src/utils/kmlUtils.js
@@ -30,6 +30,8 @@ import log from '@/utils/logging'
 import KML, { getDefaultStyle } from '@/utils/ol/format/KML'
 import { parseRGBColor } from '@/utils/utils'
 
+export const LEGACY_ICON_SET = ['babs']
+
 export const EMPTY_KML_DATA = '<kml></kml>'
 
 // On the legacy drawing, openlayer used the scale from xml as is, but since openlayer

From 1d038d9f4fbf3286e2927aa39ec6aa1622052703 Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Thu, 5 Sep 2024 11:01:43 +0200
Subject: [PATCH 40/56] PB-66: Add tippy to icon selection

---
 .../styling/DrawingStyleIconSelector.vue      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
index ff815ae28..20c08bd15 100644
--- a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
+++ b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
@@ -46,12 +46,14 @@
             <div class="marker-icon-select-box" :class="{ 'one-line': !showAllSymbols }">
                 <button
                     v-for="icon in currentIconSet.icons"
+                    id="icon-description"
                     :key="icon.name"
                     class="btn btn-sm"
                     :class="{
                         'btn-light': feature.icon.name !== icon.name,
                         'btn-primary': feature.icon.name === icon.name,
                     }"
+                    data-tippy-content="full_screen"
                     :data-cy="`drawing-style-icon-selector-${icon.name}`"
                     @click="onCurrentIconChange(icon)"
                 >
@@ -67,6 +69,7 @@
                             )
                         "
                         crossorigin="anonymous"
+                        @load="onImageLoad"
                     />
                 </button>
             </div>
@@ -82,6 +85,7 @@ import EditableFeature from '@/api/features/EditableFeature.class'
 import DrawingStyleColorSelector from '@/modules/infobox/components/styling/DrawingStyleColorSelector.vue'
 import DrawingStyleSizeSelector from '@/modules/infobox/components/styling/DrawingStyleSizeSelector.vue'
 import DropdownButton, { DropdownItem } from '@/utils/components/DropdownButton.vue'
+import { useTippyTooltip } from '@/utils/composables/useTippyTooltip'
 import { MEDIUM } from '@/utils/featureStyleUtils'
 
 export default {
@@ -102,9 +106,16 @@ export default {
     },
     emits: ['change', 'change:iconSize', 'change:icon', 'change:iconColor'],
     setup() {
+        const { refreshTippyAttachment } = useTippyTooltip(
+            '#icon-description[data-tippy-content]',
+            {
+                placement: 'top',
+            }
+        )
         const i18n = useI18n()
         return {
             i18n,
+            refreshTippyAttachment,
         }
     },
     data: function () {
@@ -114,6 +125,7 @@ export default {
             // we store it because we don't want the selection window's icon to change size
             // only the icon on the map should
             defaultIconSize: MEDIUM,
+            loadedImages: 0,
         }
     },
     computed: {
@@ -172,6 +184,13 @@ export default {
                 return { filter: 'drop-shadow(0px 0px 0 white)' }
             }
         },
+        onImageLoad() {
+            this.loadedImages = this.loadedImages + 1
+            if (this.loadedImages == this.currentIconSet.icons.length) {
+                this.refreshTippyAttachment()
+                this.loadedImages = 0
+            }
+        },
     },
 }
 </script>

From 2da1e604c674ab40745ea9153704ad66457e4261 Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Thu, 5 Sep 2024 12:09:36 +0200
Subject: [PATCH 41/56] PB-66: Read icon translation json from api and display
 it

---
 src/api/icon.api.js                           | 22 ++++++++++++---
 .../styling/DrawingStyleIconSelector.vue      | 27 +++++++++++++++++--
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/api/icon.api.js b/src/api/icon.api.js
index 717731233..c7a7d47ef 100644
--- a/src/api/icon.api.js
+++ b/src/api/icon.api.js
@@ -38,12 +38,14 @@ export class DrawingIconSet {
      *   set
      * @param {String} templateURL A template URL to access this icon set's metadata
      *   ({icon_set_name} needs to be replaced with this icon set's name)
+     * @param {String} descriptionURL A URL to access this icon set's icon descriptions
      */
-    constructor(name, isColorable, iconsURL, templateURL) {
+    constructor(name, isColorable, iconsURL, templateURL, descriptionURL) {
         this._name = name
         this._isColorable = isColorable
         this._iconsURL = iconsURL
         this._templateURL = templateURL
+        this._descriptionURL = descriptionURL
         this._icons = []
     }
 
@@ -73,6 +75,11 @@ export class DrawingIconSet {
         return this._templateURL
     }
 
+    /** @returns {String} A URL to access this icon set's icon descriptions */
+    get descriptionURL() {
+        return this._descriptionURL
+    }
+
     /** @returns {DrawingIcon[]} List of all icons from this icon set */
     get icons() {
         return [...this._icons]
@@ -100,15 +107,17 @@ export class DrawingIcon {
      *   replacing {icon_scale} and {{r},{g},{b}} respectively, see {@link DrawingIcon.generateURL})
      * @param {String} iconSetName Name of the icon set in which belongs this icon (an icon can only
      *   belong to one icon set)
+     * @param {String} description Description of icon in all available languages
      * @param {Number[]} anchor Offset to apply to this icon when placed on a coordinate ([x,y]
      *   format)
      * @param {Number[]} size Size of the icons in pixel assuming a scaling factor of 1
      */
-    constructor(name, imageURL, imageTemplateURL, iconSetName, anchor, size) {
+    constructor(name, imageURL, imageTemplateURL, iconSetName, description, anchor, size) {
         this._name = name
         this._imageURL = imageURL
         this._imageTemplateURL = imageTemplateURL
         this._iconSetName = iconSetName
+        this._description = description
         this._anchor = anchor
         this._size = size
     }
@@ -149,6 +158,11 @@ export class DrawingIcon {
         return this._iconSetName
     }
 
+    /** @returns {String} Description for this icon as JSON object in all available languages */
+    get description() {
+        return this._description
+    }
+
     /**
      * @returns {String} Stringified JSON representation of this object. Is called by
      *   {@link ol.format.KML} if this object is part of the properties of a feature.
@@ -200,7 +214,8 @@ export async function loadAllIconSetsFromBackend() {
                 rawSet.name,
                 rawSet.colorable,
                 rawSet.icons_url,
-                rawSet.template_url
+                rawSet.template_url,
+                rawSet.description_url
             )
             // retrieving all icons for this icon set
             setPromises.push(loadIconsForIconSet(iconSet))
@@ -230,6 +245,7 @@ async function loadIconsForIconSet(iconSet) {
                     rawIcon.url,
                     rawIcon.template_url,
                     iconSet.name,
+                    rawIcon.description,
                     rawIcon.anchor,
                     rawIcon.size
                 )
diff --git a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
index 20c08bd15..380377a8b 100644
--- a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
+++ b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
@@ -53,7 +53,7 @@
                         'btn-light': feature.icon.name !== icon.name,
                         'btn-primary': feature.icon.name === icon.name,
                     }"
-                    data-tippy-content="full_screen"
+                    :data-tippy-content="getIconDescription(icon.description)"
                     :data-cy="`drawing-style-icon-selector-${icon.name}`"
                     @click="onCurrentIconChange(icon)"
                 >
@@ -80,6 +80,7 @@
 
 <script>
 import { useI18n } from 'vue-i18n'
+import { useStore } from 'vuex'
 
 import EditableFeature from '@/api/features/EditableFeature.class'
 import DrawingStyleColorSelector from '@/modules/infobox/components/styling/DrawingStyleColorSelector.vue'
@@ -87,6 +88,7 @@ import DrawingStyleSizeSelector from '@/modules/infobox/components/styling/Drawi
 import DropdownButton, { DropdownItem } from '@/utils/components/DropdownButton.vue'
 import { useTippyTooltip } from '@/utils/composables/useTippyTooltip'
 import { MEDIUM } from '@/utils/featureStyleUtils'
+import log from '@/utils/logging'
 
 export default {
     components: {
@@ -113,8 +115,10 @@ export default {
             }
         )
         const i18n = useI18n()
+        const store = useStore()
         return {
             i18n,
+            store,
             refreshTippyAttachment,
         }
     },
@@ -184,11 +188,30 @@ export default {
                 return { filter: 'drop-shadow(0px 0px 0 white)' }
             }
         },
+        getIconDescription(description) {
+            if (!description) {
+                return null
+            }
+            switch (this.store.state.i18n.lang) {
+                case 'de':
+                    return description.de
+                case 'fr':
+                    return description.fr
+                case 'it':
+                    return description.it ?? description.fr
+                case 'en':
+                    return description.en ?? description.de
+                case 'rm':
+                    return description.rm ?? description.de
+            }
+        },
         onImageLoad() {
             this.loadedImages = this.loadedImages + 1
             if (this.loadedImages == this.currentIconSet.icons.length) {
-                this.refreshTippyAttachment()
                 this.loadedImages = 0
+                if (this.currentIconSet.descriptionURL) {
+                    this.refreshTippyAttachment()
+                }
             }
         },
     },

From c85b3da6df4ec49655bb7feef8fd6b23fbe0b831 Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Thu, 5 Sep 2024 13:29:17 +0200
Subject: [PATCH 42/56] PB-66: Add option to  tippy tooltip helper to not
 translate content

---
 .../components/styling/DrawingStyleIconSelector.vue      | 2 +-
 src/utils/composables/useTippyTooltip.js                 | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
index 380377a8b..4719db070 100644
--- a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
+++ b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
@@ -88,7 +88,6 @@ import DrawingStyleSizeSelector from '@/modules/infobox/components/styling/Drawi
 import DropdownButton, { DropdownItem } from '@/utils/components/DropdownButton.vue'
 import { useTippyTooltip } from '@/utils/composables/useTippyTooltip'
 import { MEDIUM } from '@/utils/featureStyleUtils'
-import log from '@/utils/logging'
 
 export default {
     components: {
@@ -112,6 +111,7 @@ export default {
             '#icon-description[data-tippy-content]',
             {
                 placement: 'top',
+                translate: false,
             }
         )
         const i18n = useI18n()
diff --git a/src/utils/composables/useTippyTooltip.js b/src/utils/composables/useTippyTooltip.js
index fac0322e4..08a97ebb6 100644
--- a/src/utils/composables/useTippyTooltip.js
+++ b/src/utils/composables/useTippyTooltip.js
@@ -53,10 +53,11 @@ import { useI18n } from 'vue-i18n'
  * @param {string} options.theme Theme to use for the tippy
  * @param {string} options.placement Tippy placement
  * @param {[number, number]} options.delay Tippy delay
+ * @param {boolean} translate Indicates if tippy content should get translated
  */
 export function useTippyTooltip(
     selector,
-    { theme = null, placement = null, delay = [300, 0] } = {}
+    { theme = null, placement = null, delay = [300, 0], translate = true } = {}
 ) {
     let tooltips = null
     const options = { delay }
@@ -79,7 +80,11 @@ export function useTippyTooltip(
 
     function setContent() {
         tooltips?.forEach((tp) =>
-            tp.setContent(i18n.t(tp.reference.attributes['data-tippy-content'].value))
+            tp.setContent(
+                translate
+                    ? i18n.t(tp.reference.attributes['data-tippy-content'].value)
+                    : tp.reference.attributes['data-tippy-content'].value
+            )
         )
     }
 

From 34a3ec00336578b25d8ccab2198d41a27ac1f4bd Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Thu, 5 Sep 2024 15:42:33 +0200
Subject: [PATCH 43/56] PB-66: Remove legacy icon set checks as it is now done
 on back-end

---
 src/api/icon.api.js   | 4 ----
 src/utils/kmlUtils.js | 2 --
 2 files changed, 6 deletions(-)

diff --git a/src/api/icon.api.js b/src/api/icon.api.js
index c7a7d47ef..e4b5afa85 100644
--- a/src/api/icon.api.js
+++ b/src/api/icon.api.js
@@ -2,7 +2,6 @@ import axios from 'axios'
 
 import { getViewerDedicatedServicesBaseUrl } from '@/config/baseUrl.config'
 import { calculateTextOffset, MEDIUM, RED } from '@/utils/featureStyleUtils'
-import { LEGACY_ICON_SET } from '@/utils/kmlUtils'
 import log from '@/utils/logging'
 
 /** Default Icon parameters for the URL. */
@@ -207,9 +206,6 @@ export async function loadAllIconSetsFromBackend() {
         const rawSets = (await axios.get(`${getViewerDedicatedServicesBaseUrl()}icons/sets`)).data
             .items
         for (const rawSet of rawSets) {
-            if (LEGACY_ICON_SET.includes(rawSet.name)) {
-                continue
-            }
             const iconSet = new DrawingIconSet(
                 rawSet.name,
                 rawSet.colorable,
diff --git a/src/utils/kmlUtils.js b/src/utils/kmlUtils.js
index 993ec1120..1fc361117 100644
--- a/src/utils/kmlUtils.js
+++ b/src/utils/kmlUtils.js
@@ -30,8 +30,6 @@ import log from '@/utils/logging'
 import KML, { getDefaultStyle } from '@/utils/ol/format/KML'
 import { parseRGBColor } from '@/utils/utils'
 
-export const LEGACY_ICON_SET = ['babs']
-
 export const EMPTY_KML_DATA = '<kml></kml>'
 
 // On the legacy drawing, openlayer used the scale from xml as is, but since openlayer

From 1ddbede440d22ef05907ccc5adaae86e85efed47 Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Thu, 5 Sep 2024 16:01:14 +0200
Subject: [PATCH 44/56] PB-66: Add cypress test checking for icon tippy

---
 .../service-icons/set-babs.fixture.json       | 84 +++++++++++++++----
 .../fixtures/service-icons/sets.fixture.json  |  2 +
 tests/cypress/tests-e2e/drawing.cy.js         |  2 +
 3 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/tests/cypress/fixtures/service-icons/set-babs.fixture.json b/tests/cypress/fixtures/service-icons/set-babs.fixture.json
index 54029c804..af89804a8 100644
--- a/tests/cypress/fixtures/service-icons/set-babs.fixture.json
+++ b/tests/cypress/fixtures/service-icons/set-babs.fixture.json
@@ -4,85 +4,141 @@
             "icon_set": "babs",
             "name": "babs-1",
             "url": "http://localhost:8080/api/icons/sets/babs/icons/babs-1.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png"
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png",
+            "description": {
+                "de": "beispiel",
+                "fr": "exemple"
+              }
         },
         {
             "icon_set": "babs",
             "name": "babs-10",
             "url": "http://localhost:8080/api/icons/sets/babs/icons/babs-10.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png"
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png",
+            "description": {
+                "de": "beispiel",
+                "fr": "exemple"
+              }
         },
         {
             "icon_set": "babs",
             "name": "babs-100",
             "url": "http://localhost:8080/api/icons/sets/babs/icons/babs-100.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png"
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png",
+            "description": {
+                "de": "beispiel",
+                "fr": "exemple"
+              }
         },
         {
             "icon_set": "babs",
             "name": "babs-101",
             "url": "http://localhost:8080/api/icons/sets/babs/icons/babs-101.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png"
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png",
+            "description": {
+                "de": "beispiel",
+                "fr": "exemple"
+              }
         },
         {
             "icon_set": "babs",
             "name": "babs-102",
             "url": "http://localhost:8080/api/icons/sets/babs/icons/babs-102.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png"
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png",
+            "description": {
+                "de": "beispiel",
+                "fr": "exemple"
+              }
         },
         {
             "icon_set": "babs",
             "name": "babs-103",
             "url": "http://localhost:8080/api/icons/sets/babs/icons/babs-103.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png"
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png",
+            "description": {
+                "de": "beispiel",
+                "fr": "exemple"
+              }
         },
         {
             "icon_set": "babs",
             "name": "babs-104",
             "url": "http://localhost:8080/api/icons/sets/babs/icons/babs-104.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png"
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png",
+            "description": {
+                "de": "beispiel",
+                "fr": "exemple"
+              }
         },
         {
             "icon_set": "babs",
             "name": "babs-105",
             "url": "http://localhost:8080/api/icons/sets/babs/icons/babs-105.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png"
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png",
+            "description": {
+                "de": "beispiel",
+                "fr": "exemple"
+              }
         },
         {
             "icon_set": "babs",
             "name": "babs-106",
             "url": "http://localhost:8080/api/icons/sets/babs/icons/babs-106.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png"
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png",
+            "description": {
+                "de": "beispiel",
+                "fr": "exemple"
+              }
         },
         {
             "icon_set": "babs",
             "name": "babs-107",
             "url": "http://localhost:8080/api/icons/sets/babs/icons/babs-107.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png"
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png",
+            "description": {
+                "de": "beispiel",
+                "fr": "exemple"
+              }
         },
         {
             "icon_set": "babs",
             "name": "babs-108",
             "url": "http://localhost:8080/api/icons/sets/babs/icons/babs-108.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png"
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png",
+            "description": {
+                "de": "beispiel",
+                "fr": "exemple"
+              }
         },
         {
             "icon_set": "babs",
             "name": "babs-109",
             "url": "http://localhost:8080/api/icons/sets/babs/icons/babs-109.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png"
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png",
+            "description": {
+                "de": "beispiel",
+                "fr": "exemple"
+              }
         },
         {
             "icon_set": "babs",
             "name": "babs-11",
             "url": "http://localhost:8080/api/icons/sets/babs/icons/babs-11.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png"
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png",
+            "description": {
+                "de": "beispiel",
+                "fr": "exemple"
+              }
         },
         {
             "icon_set": "babs",
             "name": "babs-160",
             "url": "http://localhost:8080/api/icons/sets/babs/icons/babs-160.png",
-            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png"
+            "template_url": "http://localhost:8080/api/icons/sets/{icon_set_name}/icons/{icon_name}@{icon_scale}.png",
+            "description": {
+                "de": "beispiel",
+                "fr": "exemple"
+              }
         }
     ],
     "success": true
diff --git a/tests/cypress/fixtures/service-icons/sets.fixture.json b/tests/cypress/fixtures/service-icons/sets.fixture.json
index d0d61e8f1..d74c76d20 100644
--- a/tests/cypress/fixtures/service-icons/sets.fixture.json
+++ b/tests/cypress/fixtures/service-icons/sets.fixture.json
@@ -3,11 +3,13 @@
         {
             "colorable": false,
             "icons_url": "http://localhost:8080/api/icons/sets/babs/icons",
+            "description_url":  "http://localhost:8080/api/icons/sets/babs/description",
             "name": "babs"
         },
         {
             "colorable": true,
             "icons_url": "http://localhost:8080/api/icons/sets/default/icons",
+            "description_url": null,
             "name": "default"
         }
     ],
diff --git a/tests/cypress/tests-e2e/drawing.cy.js b/tests/cypress/tests-e2e/drawing.cy.js
index 5f2489810..00c75a33b 100644
--- a/tests/cypress/tests-e2e/drawing.cy.js
+++ b/tests/cypress/tests-e2e/drawing.cy.js
@@ -106,6 +106,8 @@ describe('Drawing module tests', () => {
                 cy.get(
                     '[data-cy="drawing-style-marker-popup"] [data-cy="drawing-style-color-select-box"]'
                 ).should('not.exist')
+                // babs icon should have a tippy describing the icon
+                cy.get('[data-cy="drawing-style-icon-selector-babs-1"]').realHover()
                 // going back to the default icon set
                 cy.get(
                     '[data-cy="drawing-style-icon-set-button"] [data-cy="dropdown-main-button"]:visible'

From 83d29698ac30363c3287414d0ecc09642402ebfe Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Tue, 10 Sep 2024 11:08:30 +0200
Subject: [PATCH 45/56] PB-66: Add tippy to dropdown selection

---
 .../components/styling/DrawingStyleIconSelector.vue   |  3 ++-
 src/utils/components/DropdownButton.vue               | 11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
index 4719db070..1fd07d228 100644
--- a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
+++ b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
@@ -143,7 +143,8 @@ export default {
                 return new DropdownItem(
                     iconSet.name,
                     this.i18n.t(`modify_icon_category_${iconSet.name}_label`),
-                    iconSet
+                    iconSet,
+                    iconSet.name == 'default' ? null : 'modify_icon_category_babs_label'
                 )
             })
         },
diff --git a/src/utils/components/DropdownButton.vue b/src/utils/components/DropdownButton.vue
index 0e115d3eb..5f812037c 100644
--- a/src/utils/components/DropdownButton.vue
+++ b/src/utils/components/DropdownButton.vue
@@ -33,6 +33,7 @@
                 <a
                     class="dropdown-item"
                     :class="{ active: currentValue === item.value }"
+                    :data-tippy-content="item.description"
                     :data-cy="`dropdown-item-${item.id}`"
                     @click="selectItem(item)"
                 >
@@ -46,6 +47,7 @@
 <script>
 import { Dropdown } from 'bootstrap'
 
+import { useTippyTooltip } from '@/utils/composables/useTippyTooltip'
 import { randomIntBetween } from '@/utils/numberUtils'
 
 /**
@@ -53,10 +55,11 @@ import { randomIntBetween } from '@/utils/numberUtils'
  * item will be considered the value.
  */
 export class DropdownItem {
-    constructor(id, title, value = null) {
+    constructor(id, title, value = null, description = null) {
         this._id = id
         this._title = title
         this._value = value || title
+        this._description = description
     }
 
     get id() {
@@ -69,6 +72,9 @@ export class DropdownItem {
     get value() {
         return this._value
     }
+    get description() {
+        return this._description
+    }
 }
 
 /**
@@ -114,6 +120,9 @@ export default {
         },
     },
     emits: ['click', 'select:item'],
+    setup() {
+        useTippyTooltip('.dropdown-item[data-tippy-content]', { placement: 'left' })
+    },
     data() {
         return {
             // generating a unique HTML ID for this dropdown

From 0332bfa9fb1df26197a9e7e7d2e5504312b6a4ce Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Tue, 10 Sep 2024 11:42:09 +0200
Subject: [PATCH 46/56] PB-66: Adapt icon api to changed backend

---
 src/api/icon.api.js                                  | 12 ++++++------
 .../components/styling/DrawingStyleIconSelector.vue  |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/api/icon.api.js b/src/api/icon.api.js
index e4b5afa85..78af7a2ad 100644
--- a/src/api/icon.api.js
+++ b/src/api/icon.api.js
@@ -37,14 +37,14 @@ export class DrawingIconSet {
      *   set
      * @param {String} templateURL A template URL to access this icon set's metadata
      *   ({icon_set_name} needs to be replaced with this icon set's name)
-     * @param {String} descriptionURL A URL to access this icon set's icon descriptions
+     * @param {Boolean} hasDescription Tells if this icon set has icon descriptions
      */
-    constructor(name, isColorable, iconsURL, templateURL, descriptionURL) {
+    constructor(name, isColorable, iconsURL, templateURL, hasDescription) {
         this._name = name
         this._isColorable = isColorable
         this._iconsURL = iconsURL
         this._templateURL = templateURL
-        this._descriptionURL = descriptionURL
+        this._hasDescription = hasDescription
         this._icons = []
     }
 
@@ -75,8 +75,8 @@ export class DrawingIconSet {
     }
 
     /** @returns {String} A URL to access this icon set's icon descriptions */
-    get descriptionURL() {
-        return this._descriptionURL
+    get hasDescription() {
+        return this._hasDescription
     }
 
     /** @returns {DrawingIcon[]} List of all icons from this icon set */
@@ -211,7 +211,7 @@ export async function loadAllIconSetsFromBackend() {
                 rawSet.colorable,
                 rawSet.icons_url,
                 rawSet.template_url,
-                rawSet.description_url
+                rawSet.has_description
             )
             // retrieving all icons for this icon set
             setPromises.push(loadIconsForIconSet(iconSet))
diff --git a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
index 1fd07d228..66869ad24 100644
--- a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
+++ b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
@@ -176,6 +176,7 @@ export default {
         onCurrentIconSizeChange(size) {
             this.$emit('change:iconSize', size)
             this.$emit('change')
+            this.refreshTippyAttachment()
         },
         changeDisplayedIconSet(dropdownItem) {
             this.currentIconSet = dropdownItem.value
@@ -210,7 +211,7 @@ export default {
             this.loadedImages = this.loadedImages + 1
             if (this.loadedImages == this.currentIconSet.icons.length) {
                 this.loadedImages = 0
-                if (this.currentIconSet.descriptionURL) {
+                if (this.currentIconSet.hasDescription) {
                     this.refreshTippyAttachment()
                 }
             }

From a61139f8a09c8063729ee7afae13bfd3de1ecea5 Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Tue, 10 Sep 2024 15:25:35 +0200
Subject: [PATCH 47/56] PB-66: Show all translations on hover

---
 src/modules/i18n/index.js                     |  2 +-
 .../styling/DrawingStyleIconSelector.vue      | 28 +++++++++----------
 src/utils/composables/useTippyTooltip.js      |  6 +++-
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/modules/i18n/index.js b/src/modules/i18n/index.js
index 931646722..4834d6143 100644
--- a/src/modules/i18n/index.js
+++ b/src/modules/i18n/index.js
@@ -11,7 +11,7 @@ import rm from './locales/rm.json'
 export const languages = { de, fr, it, en, rm }
 
 const OFFICIAL_SWISS_LANG = ['de', 'fr', 'it', 'rm']
-const SUPPORTED_LANG = ['en', ...OFFICIAL_SWISS_LANG]
+export const SUPPORTED_LANG = ['en', ...OFFICIAL_SWISS_LANG]
 
 const locales = Object.entries(languages).reduce((obj, entry) => {
     const key = langToLocal(entry[0])
diff --git a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
index 66869ad24..7eaf6fa9f 100644
--- a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
+++ b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
@@ -83,11 +83,13 @@ import { useI18n } from 'vue-i18n'
 import { useStore } from 'vuex'
 
 import EditableFeature from '@/api/features/EditableFeature.class'
+import { SUPPORTED_LANG } from '@/modules/i18n/index'
 import DrawingStyleColorSelector from '@/modules/infobox/components/styling/DrawingStyleColorSelector.vue'
 import DrawingStyleSizeSelector from '@/modules/infobox/components/styling/DrawingStyleSizeSelector.vue'
 import DropdownButton, { DropdownItem } from '@/utils/components/DropdownButton.vue'
 import { useTippyTooltip } from '@/utils/composables/useTippyTooltip'
 import { MEDIUM } from '@/utils/featureStyleUtils'
+import log from '@/utils/logging'
 
 export default {
     components: {
@@ -112,6 +114,7 @@ export default {
             {
                 placement: 'top',
                 translate: false,
+                allowHTML: true,
             }
         )
         const i18n = useI18n()
@@ -191,21 +194,18 @@ export default {
             }
         },
         getIconDescription(description) {
-            if (!description) {
-                return null
-            }
-            switch (this.store.state.i18n.lang) {
-                case 'de':
-                    return description.de
-                case 'fr':
-                    return description.fr
-                case 'it':
-                    return description.it ?? description.fr
-                case 'en':
-                    return description.en ?? description.de
-                case 'rm':
-                    return description.rm ?? description.de
+            const lang = this.store.state.i18n.lang
+            if (description) {
+                let str = ''
+                for (const [key, value] of Object.entries(description)) {
+                    str = str + `<div>${lang == key ? `<strong>${value}</strong>` : value}</div>`
+                    if (!SUPPORTED_LANG.includes(key)) {
+                        log.error('Language key provided is not supported: ', key)
+                    }
+                }
+                return str
             }
+            return null
         },
         onImageLoad() {
             this.loadedImages = this.loadedImages + 1
diff --git a/src/utils/composables/useTippyTooltip.js b/src/utils/composables/useTippyTooltip.js
index 08a97ebb6..e62269a78 100644
--- a/src/utils/composables/useTippyTooltip.js
+++ b/src/utils/composables/useTippyTooltip.js
@@ -54,10 +54,11 @@ import { useI18n } from 'vue-i18n'
  * @param {string} options.placement Tippy placement
  * @param {[number, number]} options.delay Tippy delay
  * @param {boolean} translate Indicates if tippy content should get translated
+ * @param {boolean} allowHTML Indicates if tippy content contains HTML code
  */
 export function useTippyTooltip(
     selector,
-    { theme = null, placement = null, delay = [300, 0], translate = true } = {}
+    { theme = null, placement = null, delay = [300, 0], translate = true, allowHTML = false } = {}
 ) {
     let tooltips = null
     const options = { delay }
@@ -67,6 +68,9 @@ export function useTippyTooltip(
     if (placement) {
         options.placement = placement
     }
+    if (allowHTML) {
+        options.allowHTML = allowHTML
+    }
 
     const i18n = useI18n()
 

From 063409c2da4c70dd0396a709c839f10262c84417 Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Tue, 10 Sep 2024 16:59:06 +0200
Subject: [PATCH 48/56] PB-66: Update translations on drop-down file

---
 .../styling/DrawingStyleIconSelector.vue      | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
index 7eaf6fa9f..dd88066ef 100644
--- a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
+++ b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
@@ -133,19 +133,36 @@ export default {
             // only the icon on the map should
             defaultIconSize: MEDIUM,
             loadedImages: 0,
+            should_come_from_backend: {
+                'babs-D': 'de',
+                'babs-F': 'fr',
+                'babs-I': 'it',
+            },
         }
     },
     computed: {
         currentIconSetName() {
             return this.currentIconSet
-                ? this.i18n.t(`modify_icon_category_${this.currentIconSet.name}_label`)
+                ? this.i18n.t(
+                      `modify_icon_category_${this.getIconSetTitle(this.currentIconSet.name)}_label`,
+                      1,
+                      {
+                          locale: this.should_come_from_backend[this.currentIconSet.name],
+                      }
+                  )
                 : ''
         },
         iconSetDropdownItems() {
             return this.iconSets.map((iconSet) => {
                 return new DropdownItem(
                     iconSet.name,
-                    this.i18n.t(`modify_icon_category_${iconSet.name}_label`),
+                    this.i18n.t(
+                        `modify_icon_category_${this.getIconSetTitle(iconSet.name)}_label`,
+                        1,
+                        {
+                            locale: this.should_come_from_backend[iconSet.name],
+                        }
+                    ),
                     iconSet,
                     iconSet.name == 'default' ? null : 'modify_icon_category_babs_label'
                 )
@@ -207,6 +224,12 @@ export default {
             }
             return null
         },
+        getIconSetTitle(title) {
+            if (title.startsWith('babs')) {
+                title = 'babs'
+            }
+            return title
+        },
         onImageLoad() {
             this.loadedImages = this.loadedImages + 1
             if (this.loadedImages == this.currentIconSet.icons.length) {

From 0c48aa94d044f6f2ff9b51927ee0edf0eb8ea634 Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Wed, 11 Sep 2024 11:20:56 +0200
Subject: [PATCH 49/56] PB-66: Show tooltip only when all icons toggle is
 activated

---
 .../styling/DrawingStyleIconSelector.vue          | 15 ++++++++++++---
 src/utils/composables/useTippyTooltip.js          |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
index dd88066ef..7fe99abea 100644
--- a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
+++ b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
@@ -35,7 +35,7 @@
             <div
                 class="rounded d-flex align-items-center p-2"
                 data-cy="drawing-style-toggle-all-icons-button"
-                @click="showAllSymbols = !showAllSymbols"
+                @click="toggleshowAllSymbols()"
             >
                 <div>{{ $t('modify_icon_label') }}</div>
                 <font-awesome-icon
@@ -109,7 +109,7 @@ export default {
     },
     emits: ['change', 'change:iconSize', 'change:icon', 'change:iconColor'],
     setup() {
-        const { refreshTippyAttachment } = useTippyTooltip(
+        const { refreshTippyAttachment, removeTippy } = useTippyTooltip(
             '#icon-description[data-tippy-content]',
             {
                 placement: 'top',
@@ -123,6 +123,7 @@ export default {
             i18n,
             store,
             refreshTippyAttachment,
+            removeTippy,
         }
     },
     data: function () {
@@ -184,6 +185,14 @@ export default {
         generateColorizedURL(icon) {
             return icon.generateURL(this.feature.fillColor)
         },
+        toggleshowAllSymbols() {
+            this.showAllSymbols = !this.showAllSymbols
+            if (this.showAllSymbols) {
+                this.refreshTippyAttachment()
+            } else {
+                this.removeTippy()
+            }
+        },
         onCurrentIconColorChange(color) {
             this.$emit('change:iconColor', color)
             this.$emit('change')
@@ -234,7 +243,7 @@ export default {
             this.loadedImages = this.loadedImages + 1
             if (this.loadedImages == this.currentIconSet.icons.length) {
                 this.loadedImages = 0
-                if (this.currentIconSet.hasDescription) {
+                if (this.currentIconSet.hasDescription && this.showAllSymbols) {
                     this.refreshTippyAttachment()
                 }
             }
diff --git a/src/utils/composables/useTippyTooltip.js b/src/utils/composables/useTippyTooltip.js
index e62269a78..84188fd7a 100644
--- a/src/utils/composables/useTippyTooltip.js
+++ b/src/utils/composables/useTippyTooltip.js
@@ -125,5 +125,5 @@ export function useTippyTooltip(
             tooltips = [tooltips]
         }
     }
-    return { refreshTippyAttachment }
+    return { refreshTippyAttachment, removeTippy }
 }

From 21a41bedaeb056da12c29e5fcc01fbc871fb7f8b Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Wed, 11 Sep 2024 15:27:00 +0200
Subject: [PATCH 50/56] PB-66: Update translations

---
 src/modules/i18n/locales/de.json | 6 +++---
 src/modules/i18n/locales/en.json | 6 +++---
 src/modules/i18n/locales/fr.json | 6 +++---
 src/modules/i18n/locales/it.json | 6 +++---
 src/modules/i18n/locales/rm.json | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/modules/i18n/locales/de.json b/src/modules/i18n/locales/de.json
index 8d27b404f..23e09e6d3 100644
--- a/src/modules/i18n/locales/de.json
+++ b/src/modules/i18n/locales/de.json
@@ -392,9 +392,9 @@
     "modify_existing_vertex_linepolygon": "Klicke, um den Punkt zu löschen (mind. 2 Punkte).<br/> Punkt verschieben: klicken und ziehen ",
     "modify_existing_vertex_marker": "Verschieben des Symbols: klicken und ziehen ",
     "modify_existing_vertex_measure": "Klicke, um den Punkt zu löschen (mind. 2 Punkte).<br/> Punkt verschieben: klicken und ziehen ",
-    "modify_icon_category_babs-D_label": "Zivile Signaturen D",
-    "modify_icon_category_babs-F_label": "Zivile Signaturen F",
-    "modify_icon_category_babs-I_label": "Zivile Signaturen I",
+    "modify_icon_category_babs-de_label": "Zivile Signaturen",
+    "modify_icon_category_babs-fr_label": "Zivile Signaturen",
+    "modify_icon_category_babs-it_label": "Zivile Signaturen",
     "modify_icon_category_babs_label": "Zivile Signaturen",
     "modify_icon_category_default_label": "Standard",
     "modify_icon_category_label": "Signaturen",
diff --git a/src/modules/i18n/locales/en.json b/src/modules/i18n/locales/en.json
index 6bfcc4c1d..46145619d 100644
--- a/src/modules/i18n/locales/en.json
+++ b/src/modules/i18n/locales/en.json
@@ -392,9 +392,9 @@
     "modify_existing_vertex_linepolygon": "Click to delete the point (2 points min.)<br/>Click then drag to move the point",
     "modify_existing_vertex_marker": "Click then drag to move the marker",
     "modify_existing_vertex_measure": "Click to delete the point (2 points min.)<br/>Click then drag to move the point",
-    "modify_icon_category_babs-D_label": "Civil symbols D",
-    "modify_icon_category_babs-F_label": "Civil symbols F",
-    "modify_icon_category_babs-I_label": "Civil symbols I",
+    "modify_icon_category_babs-de_label": "Civil symbols",
+    "modify_icon_category_babs-fr_label": "Civil symbols",
+    "modify_icon_category_babs-it_label": "Civil symbols",
     "modify_icon_category_babs_label": "Civil symbols",
     "modify_icon_category_default_label": "default",
     "modify_icon_category_label": "symbols",
diff --git a/src/modules/i18n/locales/fr.json b/src/modules/i18n/locales/fr.json
index 37a61ed1b..f8880ef4a 100644
--- a/src/modules/i18n/locales/fr.json
+++ b/src/modules/i18n/locales/fr.json
@@ -392,9 +392,9 @@
     "modify_existing_vertex_linepolygon": "Cliquer pour supprimer le point (2 points min.)<br/>Cliquer puis bouger le curseur pour déplacer le point ",
     "modify_existing_vertex_marker": "Cliquer puis bouger le curseur pour déplacer le symbole",
     "modify_existing_vertex_measure": "Cliquer pour supprimer le point (2 points min.)<br/>Cliquer puis bouger le curseur pour déplacer le point",
-    "modify_icon_category_babs-D_label": "Signes conventionnels civils D",
-    "modify_icon_category_babs-F_label": "Signes conventionnels civils F",
-    "modify_icon_category_babs-I_label": "Signes conventionnels civils I",
+    "modify_icon_category_babs-de_label": "Signes conventionnels civils",
+    "modify_icon_category_babs-fr_label": "Signes conventionnels civils",
+    "modify_icon_category_babs-it_label": "Signes conventionnels civils",
     "modify_icon_category_babs_label": "Signes conventionnels civils",
     "modify_icon_category_default_label": "défaut",
     "modify_icon_category_label": "Signes",
diff --git a/src/modules/i18n/locales/it.json b/src/modules/i18n/locales/it.json
index bce044eac..43ddc890e 100644
--- a/src/modules/i18n/locales/it.json
+++ b/src/modules/i18n/locales/it.json
@@ -392,9 +392,9 @@
     "modify_existing_vertex_linepolygon": "Cliccare per eliminare il punto (2 punti min.)<br/>Cliccare quindi trascinare per spostare il punto",
     "modify_existing_vertex_marker": "Cliccare quindi trascinare per spostare il simbolo",
     "modify_existing_vertex_measure": "Cliccare per eliminare il punto (2 punti min.)<br/>Cliccare quindi trascinare per spostare il punto",
-    "modify_icon_category_babs-D_label": "Segni convenzionali civili D",
-    "modify_icon_category_babs-F_label": "Segni convenzionali civili F",
-    "modify_icon_category_babs-I_label": "Segni convenzionali civili I",
+    "modify_icon_category_babs-de_label": "Segni convenzionali civili",
+    "modify_icon_category_babs-fr_label": "Segni convenzionali civili",
+    "modify_icon_category_babs-it_label": "Segni convenzionali civili",
     "modify_icon_category_babs_label": "Segni convenzionali civili",
     "modify_icon_category_default_label": "predefinito",
     "modify_icon_category_label": "Segni",
diff --git a/src/modules/i18n/locales/rm.json b/src/modules/i18n/locales/rm.json
index a24ee25ea..934ddbdcd 100644
--- a/src/modules/i18n/locales/rm.json
+++ b/src/modules/i18n/locales/rm.json
@@ -390,9 +390,9 @@
     "modify_existing_vertex_linepolygon": "Cliccar per stizzar il punct (2 puncts minimum).</br> Spustar punct :cliccar e trair",
     "modify_existing_vertex_marker": "Spustar signalisaziun :cliccar e trair",
     "modify_existing_vertex_measure": "Cliccar per stizzar il punct (2 puncts minimum).</br> Spustar punct :cliccar e trair",
-    "modify_icon_category_babs-D_label": "Zivile Signaturen D",
-    "modify_icon_category_babs-F_label": "Zivile Signaturen F",
-    "modify_icon_category_babs-I_label": "Zivile Signaturen I",
+    "modify_icon_category_babs-de_label": "Zivile Signaturen",
+    "modify_icon_category_babs-fr_label": "Zivile Signaturen",
+    "modify_icon_category_babs-it_label": "Zivile Signaturen",
     "modify_icon_category_babs_label": "Zivile Signaturen",
     "modify_icon_category_default_label": "Standard",
     "modify_icon_category_label": "Segni",

From 30cc524e33aa4e9d71468699e29bcbfa669c27c6 Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Wed, 11 Sep 2024 15:34:38 +0200
Subject: [PATCH 51/56] PB-66: Use language from back-end

---
 src/api/icon.api.js                           | 18 ++++++++--
 .../styling/DrawingStyleIconSelector.vue      | 34 ++++---------------
 2 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/src/api/icon.api.js b/src/api/icon.api.js
index 78af7a2ad..6df57c4b3 100644
--- a/src/api/icon.api.js
+++ b/src/api/icon.api.js
@@ -38,13 +38,16 @@ export class DrawingIconSet {
      * @param {String} templateURL A template URL to access this icon set's metadata
      *   ({icon_set_name} needs to be replaced with this icon set's name)
      * @param {Boolean} hasDescription Tells if this icon set has icon descriptions
+     * @param {String} Language Two letter iso code that corresponds to a specific language, if the
+     *   icon set does not correspond to a language it is null
      */
-    constructor(name, isColorable, iconsURL, templateURL, hasDescription) {
+    constructor(name, isColorable, iconsURL, templateURL, hasDescription, language) {
         this._name = name
         this._isColorable = isColorable
         this._iconsURL = iconsURL
         this._templateURL = templateURL
         this._hasDescription = hasDescription
+        this._language = language
         this._icons = []
     }
 
@@ -74,11 +77,19 @@ export class DrawingIconSet {
         return this._templateURL
     }
 
-    /** @returns {String} A URL to access this icon set's icon descriptions */
+    /** @returns {Boolean} Tells if this icon set has icon descriptions */
     get hasDescription() {
         return this._hasDescription
     }
 
+    /**
+     * @returns {String} Two letter iso code that corresponds to a specific language, if the icon
+     *   set does not correspond to a language it is null
+     */
+    get language() {
+        return this._language
+    }
+
     /** @returns {DrawingIcon[]} List of all icons from this icon set */
     get icons() {
         return [...this._icons]
@@ -211,7 +222,8 @@ export async function loadAllIconSetsFromBackend() {
                 rawSet.colorable,
                 rawSet.icons_url,
                 rawSet.template_url,
-                rawSet.has_description
+                rawSet.has_description,
+                rawSet.language
             )
             // retrieving all icons for this icon set
             setPromises.push(loadIconsForIconSet(iconSet))
diff --git a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
index 7fe99abea..6b66857cf 100644
--- a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
+++ b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
@@ -134,38 +134,25 @@ export default {
             // only the icon on the map should
             defaultIconSize: MEDIUM,
             loadedImages: 0,
-            should_come_from_backend: {
-                'babs-D': 'de',
-                'babs-F': 'fr',
-                'babs-I': 'it',
-            },
         }
     },
     computed: {
         currentIconSetName() {
             return this.currentIconSet
-                ? this.i18n.t(
-                      `modify_icon_category_${this.getIconSetTitle(this.currentIconSet.name)}_label`,
-                      1,
-                      {
-                          locale: this.should_come_from_backend[this.currentIconSet.name],
-                      }
-                  )
+                ? this.i18n.t(`modify_icon_category_${this.currentIconSet.name}_label`, 1, {
+                      locale: this.currentIconSet.language,
+                  })
                 : ''
         },
         iconSetDropdownItems() {
             return this.iconSets.map((iconSet) => {
                 return new DropdownItem(
                     iconSet.name,
-                    this.i18n.t(
-                        `modify_icon_category_${this.getIconSetTitle(iconSet.name)}_label`,
-                        1,
-                        {
-                            locale: this.should_come_from_backend[iconSet.name],
-                        }
-                    ),
+                    this.i18n.t(`modify_icon_category_${iconSet.name}_label`, 1, {
+                        locale: iconSet.language,
+                    }),
                     iconSet,
-                    iconSet.name == 'default' ? null : 'modify_icon_category_babs_label'
+                    `modify_icon_category_${iconSet.name}_label`
                 )
             })
         },
@@ -205,7 +192,6 @@ export default {
         onCurrentIconSizeChange(size) {
             this.$emit('change:iconSize', size)
             this.$emit('change')
-            this.refreshTippyAttachment()
         },
         changeDisplayedIconSet(dropdownItem) {
             this.currentIconSet = dropdownItem.value
@@ -233,12 +219,6 @@ export default {
             }
             return null
         },
-        getIconSetTitle(title) {
-            if (title.startsWith('babs')) {
-                title = 'babs'
-            }
-            return title
-        },
         onImageLoad() {
             this.loadedImages = this.loadedImages + 1
             if (this.loadedImages == this.currentIconSet.icons.length) {

From a8895f46a7e6b051cb4a63dc2110b1270355a62d Mon Sep 17 00:00:00 2001
From: Lukas Joss <lukas.joss@swisstopo.ch>
Date: Thu, 12 Sep 2024 09:16:11 +0200
Subject: [PATCH 52/56] PB-66: Use class instead of id for tippy in v-for

---
 .../infobox/components/styling/DrawingStyleIconSelector.vue  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
index 6b66857cf..6bac57483 100644
--- a/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
+++ b/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
@@ -46,9 +46,8 @@
             <div class="marker-icon-select-box" :class="{ 'one-line': !showAllSymbols }">
                 <button
                     v-for="icon in currentIconSet.icons"
-                    id="icon-description"
                     :key="icon.name"
-                    class="btn btn-sm"
+                    class="icon-description btn btn-sm"
                     :class="{
                         'btn-light': feature.icon.name !== icon.name,
                         'btn-primary': feature.icon.name === icon.name,
@@ -110,7 +109,7 @@ export default {
     emits: ['change', 'change:iconSize', 'change:icon', 'change:iconColor'],
     setup() {
         const { refreshTippyAttachment, removeTippy } = useTippyTooltip(
-            '#icon-description[data-tippy-content]',
+            '.icon-description[data-tippy-content]',
             {
                 placement: 'top',
                 translate: false,

From 9590fe8bab59e7c115210d312e3c3b9b7cea6353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BCnzi?= <Martin.Kuenzi@swisstopo.ch>
Date: Thu, 12 Sep 2024 11:10:09 +0200
Subject: [PATCH 53/56] PB-984: implement an error queue

- Issue : currently, there is only one error message existing at the same time, which means if a new error happens, it'll flush out the previous one, with no possibility of seeing it again.

- Fix : We implement a queue, like for warnings, which means if multiple errors happen at the same time, we can check all of them.
---
 src/App.vue                                   |  7 +++-
 .../utils/useMapInteractions.composable.js    |  2 +-
 .../storeSync/CrossHairParamConfig.class.js   |  4 +-
 src/store/modules/ui.store.js                 | 39 +++++++++++--------
 .../plugins/geolocation-management.plugin.js  |  8 ++--
 5 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 0fd40f153..31be806a9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -22,7 +22,10 @@ const dispatcher = { dispatcher: 'App.vue' }
 
 let debouncedOnResize
 const error = computed(() => {
-    return store.state.ui.error
+    if (store.state.ui.errors.size > 0) {
+        return store.state.ui.errors.values().next().value
+    }
+    return null
 })
 const warning = computed(() => {
     if (store.state.ui.warnings.size > 0) {
@@ -65,7 +68,7 @@ function refreshPageTitle() {
         <ErrorWindow
             v-if="error"
             title="error"
-            @close="store.dispatch('setError', { error: null, ...dispatcher })"
+            @close="store.dispatch('removeError', { error, ...dispatcher })"
         >
             <div>
                 {{ i18n.t(error.msg, error.params) }}
diff --git a/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js b/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js
index bfc7e9afd..72fd3e05f 100644
--- a/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js
+++ b/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js
@@ -267,7 +267,7 @@ export default function useMapInteractions(map) {
                 errorKey = 'invalid_kml_gpx_file_error'
                 log.error(`Failed to load file`, error)
             }
-            store.dispatch('setError', { error: new ErrorMessage(errorKey, null), ...dispatcher })
+            store.dispatch('addError', { error: new ErrorMessage(errorKey, null), ...dispatcher })
         }
     }
 
diff --git a/src/router/storeSync/CrossHairParamConfig.class.js b/src/router/storeSync/CrossHairParamConfig.class.js
index d84444601..a8f7a3714 100644
--- a/src/router/storeSync/CrossHairParamConfig.class.js
+++ b/src/router/storeSync/CrossHairParamConfig.class.js
@@ -35,7 +35,7 @@ function dispatchCrossHairFromUrlIntoStore(to, store, urlParamValue) {
         )
 
         promisesForAllDispatch.push(
-            store.dispatch('setError', { error, dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN })
+            store.dispatch('addError', { error, dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN })
         )
     } else {
         const parts = urlParamValue.split(',')
@@ -62,7 +62,7 @@ function dispatchCrossHairFromUrlIntoStore(to, store, urlParamValue) {
                  * We consider that if the parameter is undefined, it's a choice made by the user.
                  */
                 promisesForAllDispatch.push(
-                    store.dispatch('setError', {
+                    store.dispatch('addError', {
                         error,
                         dispatcher: STORE_DISPATCHER_ROUTER_PLUGIN,
                     })
diff --git a/src/store/modules/ui.store.js b/src/store/modules/ui.store.js
index 0f70cbbd6..51a9a8594 100644
--- a/src/store/modules/ui.store.js
+++ b/src/store/modules/ui.store.js
@@ -154,13 +154,11 @@ export default {
         showDisclaimer: true,
 
         /**
-         * An ErrorMessage object containing parameters for error texts, so we can have error
-         * messages which are similar, but not dependant on a translation key, reducing the total
-         * number of translation keys needed.
+         * Set of errors to display. Each error must be an ErrorMessage object.
          *
-         * @type ErrorMessage
+         * @type Set(ErrorMessage)
          */
-        error: null,
+        errors: new Set(),
         /**
          * Set of warnings to display. Each warning must be an object WarningMessage
          *
@@ -391,17 +389,25 @@ export default {
         setShowDisclaimer({ commit }, { showDisclaimer, dispatcher }) {
             commit('setShowDisclaimer', { showDisclaimer, dispatcher })
         },
-        setError({ commit }, { error, dispatcher }) {
+        addError({ commit, state }, { error, dispatcher }) {
             if (!(error instanceof ErrorMessage)) {
-                if (error instanceof String) {
-                    commit('setError', { error: new ErrorMessage(error, null) })
-                } else {
-                    throw new Error(
-                        `Error ${error} dispatched by ${dispatcher} is neither of type ErrorMessage, nor a string`
-                    )
-                }
-            } else {
-                commit('setError', { error, dispatcher })
+                throw new Error(
+                    `Error ${error} dispatched by ${dispatcher} is not of type ErrorMessage`
+                )
+            }
+            if (!state.errors.has(error)) {
+                commit('addError', { error, dispatcher })
+            }
+        },
+
+        removeError({ commit, state }, { error, dispatcher }) {
+            if (!(error instanceof ErrorMessage)) {
+                throw new Error(
+                    `Error ${error} dispatched by ${dispatcher} is not of type ErrorMessage`
+                )
+            }
+            if (state.errors.has(error)) {
+                commit('removeError', { error, dispatcher })
             }
         },
         addWarning({ commit, state }, { warning, dispatcher }) {
@@ -486,7 +492,8 @@ export default {
             state.featureInfoPosition = position
         },
         setShowDisclaimer: (state, { showDisclaimer }) => (state.showDisclaimer = showDisclaimer),
-        setError: (state, { error }) => (state.error = error),
+        addError: (state, { error }) => state.errors.add(error),
+        removeError: (state, { error }) => state.errors.delete(error),
         addWarning: (state, { warning }) => state.warnings.add(warning),
         removeWarning: (state, { warning }) => state.warnings.delete(warning),
         setShowDragAndDropOverlay: (state, { showDragAndDropOverlay }) =>
diff --git a/src/store/plugins/geolocation-management.plugin.js b/src/store/plugins/geolocation-management.plugin.js
index 07061a3df..81778a346 100644
--- a/src/store/plugins/geolocation-management.plugin.js
+++ b/src/store/plugins/geolocation-management.plugin.js
@@ -25,7 +25,7 @@ function setCenterIfInBounds(store, center) {
         }
     } else {
         log.warn(`current geolocation is out of bounds: ${JSON.stringify(center)}`)
-        store.dispatch('setError', {
+        store.dispatch('addError', {
             error: new ErrorMessage('geoloc_out_of_bounds', null),
             ...dispatcher,
         })
@@ -88,14 +88,14 @@ const handlePositionError = (error, store, state, options = {}) => {
                 denied: true,
                 ...dispatcher,
             })
-            store.dispatch('setError', {
+            store.dispatch('addError', {
                 error: new ErrorMessage('geoloc_permission_denied', null),
                 ...dispatcher,
             })
             break
         case error.TIMEOUT:
             store.dispatch('setGeolocation', { active: false, ...dispatcher })
-            store.dispatch('setError', {
+            store.dispatch('addError', {
                 error: new ErrorMessage('geoloc_time_out', null),
                 ...dispatcher,
             })
@@ -116,7 +116,7 @@ const handlePositionError = (error, store, state, options = {}) => {
                         activeGeolocation(store, state, { useInitial: false })
                     }
                 } else {
-                    store.dispatch('setError', {
+                    store.dispatch('addError', {
                         error: new ErrorMessage('geoloc_unknown', null),
                         ...dispatcher,
                     })

From c888c1d37be2d9a143951110ddf5d46d71e384a4 Mon Sep 17 00:00:00 2001
From: Brice Schaffner <brice.schaffner@swisstopo.ch>
Date: Thu, 12 Sep 2024 09:02:37 +0200
Subject: [PATCH 54/56] PB-970: Add support for simple KMZ file

Only support the kml file inside the KMZ.
---
 package-lock.json                             | 75 ++++++++++++++++++-
 package.json                                  |  1 +
 src/api/files.api.js                          | 18 +++--
 .../utils/useMapInteractions.composable.js    |  4 +-
 .../ImportFile/ImportFileLocalTab.vue         |  8 +-
 .../ImportFile/ImportFileOnlineTab.vue        |  7 +-
 .../advancedTools/ImportFile/utils.js         | 34 ++++++---
 src/store/plugins/load-kml-data.plugin.js     | 12 ++-
 src/utils/kmlUtils.js                         | 65 ++++++++++++++++
 src/utils/utils.js                            | 18 +++++
 10 files changed, 215 insertions(+), 27 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 77be06f88..aca1f1504 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,6 +40,7 @@
                 "geographiclib-geodesic": "^2.1.1",
                 "hammerjs": "^2.0.8",
                 "jquery": "^3.7.1",
+                "jszip": "^3.10.1",
                 "liang-barsky": "^1.0.5",
                 "lodash": "^4.17.21",
                 "maplibre-gl": "^4.6.0",
@@ -3519,8 +3520,7 @@
         "node_modules/core-util-is": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-            "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-            "dev": true
+            "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
         },
         "node_modules/cross-spawn": {
             "version": "7.0.3",
@@ -5620,6 +5620,11 @@
                 "node": ">= 4"
             }
         },
+        "node_modules/immediate": {
+            "version": "3.0.6",
+            "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+            "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="
+        },
         "node_modules/immutable": {
             "version": "4.3.5",
             "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz",
@@ -5855,6 +5860,11 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/isarray": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+            "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+        },
         "node_modules/isexe": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -6094,6 +6104,49 @@
                 "node": ">= 12"
             }
         },
+        "node_modules/jszip": {
+            "version": "3.10.1",
+            "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
+            "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
+            "dependencies": {
+                "lie": "~3.3.0",
+                "pako": "~1.0.2",
+                "readable-stream": "~2.3.6",
+                "setimmediate": "^1.0.5"
+            }
+        },
+        "node_modules/jszip/node_modules/pako": {
+            "version": "1.0.11",
+            "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+            "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+        },
+        "node_modules/jszip/node_modules/readable-stream": {
+            "version": "2.3.8",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+            "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+            "dependencies": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+            }
+        },
+        "node_modules/jszip/node_modules/safe-buffer": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+        },
+        "node_modules/jszip/node_modules/string_decoder": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+            "dependencies": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
         "node_modules/jwa": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
@@ -6174,6 +6227,14 @@
             "resolved": "https://registry.npmjs.org/liang-barsky/-/liang-barsky-1.0.5.tgz",
             "integrity": "sha512-3ReVl+2LKVUYDlASKMJJmi5X17LNOIBYZzDJYG7vqVC/zshlHYWBLs35b1VFRWY4MvwrPhvM1SvRAHYH3OfBHg=="
         },
+        "node_modules/lie": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+            "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+            "dependencies": {
+                "immediate": "~3.0.5"
+            }
+        },
         "node_modules/linkify-it": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
@@ -7890,6 +7951,11 @@
                 "node": ">= 0.6.0"
             }
         },
+        "node_modules/process-nextick-args": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+            "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+        },
         "node_modules/proj4": {
             "version": "2.12.0",
             "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.12.0.tgz",
@@ -8446,6 +8512,11 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/setimmediate": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+            "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
+        },
         "node_modules/shebang-command": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
diff --git a/package.json b/package.json
index 48c750816..664814691 100644
--- a/package.json
+++ b/package.json
@@ -73,6 +73,7 @@
         "geographiclib-geodesic": "^2.1.1",
         "hammerjs": "^2.0.8",
         "jquery": "^3.7.1",
+        "jszip": "^3.10.1",
         "liang-barsky": "^1.0.5",
         "lodash": "^4.17.21",
         "maplibre-gl": "^4.6.0",
diff --git a/src/api/files.api.js b/src/api/files.api.js
index 12629adc5..c6d01c5aa 100644
--- a/src/api/files.api.js
+++ b/src/api/files.api.js
@@ -301,7 +301,7 @@ export function loadKmlMetadata(kmlLayer) {
  * Loads the XML data from the file of a given KML layer, using the KML file URL of the layer.
  *
  * @param {KMLLayer} kmlLayer
- * @returns {Promise<String>}
+ * @returns {Promise<ArrayBuffer>}
  */
 export function loadKmlData(kmlLayer) {
     return new Promise((resolve, reject) => {
@@ -313,7 +313,9 @@ export function loadKmlData(kmlLayer) {
                 new Error(`No file URL defined in this KML layer, cannot load data ${kmlLayer.id}`)
             )
         }
-        getFileFromUrl(kmlLayer.kmlFileUrl)
+        // The file might be a KMZ file, which is a zip archive. Reading zip archive as text
+        // is asking for trouble therefore we use ArrayBuffer
+        getFileFromUrl(kmlLayer.kmlFileUrl, { responseType: 'arraybuffer' })
             .then((response) => {
                 if (response.status === 200 && response.data) {
                     resolve(response.data)
@@ -339,16 +341,18 @@ export function loadKmlData(kmlLayer) {
  *
  * @param {string} url URL to fetch
  * @param {Number} [options.timeout] How long should the call wait before timing out
+ * @param {string} [options.responseType] Type of data that the server will respond with. Options
+ *   are 'arraybuffer', 'document', 'json', 'text', 'stream'. Default is `json`
  * @returns {Promise<AxiosResponse<any, any>>}
  */
 export async function getFileFromUrl(url, options = {}) {
-    const { timeout = null } = options
+    const { timeout = null, responseType = null } = options
     if (/^https?:\/\/localhost/.test(url) || isInternalUrl(url)) {
         // don't go through proxy if it is on localhost or the internal server
-        return axios.get(url, { timeout })
+        return axios.get(url, { timeout, responseType })
     } else if (url.startsWith('http://')) {
         // HTTP request goes through the proxy
-        return axios.get(proxifyUrl(url), { timeout })
+        return axios.get(proxifyUrl(url), { timeout, responseType })
     }
 
     // For other urls we need to check if they support CORS
@@ -370,8 +374,8 @@ export async function getFileFromUrl(url, options = {}) {
 
     if (supportCORS) {
         // Server support CORS
-        return axios.get(url, { timeout })
+        return axios.get(url, { timeout, responseType })
     }
     // server don't support CORS use proxy
-    return axios.get(proxifyUrl(url), { timeout })
+    return axios.get(proxifyUrl(url), { timeout, responseType })
 }
diff --git a/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js b/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js
index 72fd3e05f..ada912a06 100644
--- a/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js
+++ b/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js
@@ -248,7 +248,9 @@ export default function useMapInteractions(map) {
             const reader = new FileReader()
             reader.onload = (event) => resolve(event.target.result)
             reader.onerror = (error) => reject(error)
-            reader.readAsText(file)
+            // The file might be a KMZ file, which is a zip archive. Reading zip archive as text
+            // is asking for trouble therefore we use ArrayBuffer
+            reader.readAsArrayBuffer(file)
         })
     }
 
diff --git a/src/modules/menu/components/advancedTools/ImportFile/ImportFileLocalTab.vue b/src/modules/menu/components/advancedTools/ImportFile/ImportFileLocalTab.vue
index bb0a404b1..a1fa6e9b6 100644
--- a/src/modules/menu/components/advancedTools/ImportFile/ImportFileLocalTab.vue
+++ b/src/modules/menu/components/advancedTools/ImportFile/ImportFileLocalTab.vue
@@ -10,7 +10,7 @@ import { EmptyGPXError } from '@/utils/gpxUtils'
 import { EmptyKMLError } from '@/utils/kmlUtils'
 import log from '@/utils/logging'
 
-const acceptedFileTypes = ['.kml', '.KML', '.gpx', '.GPX']
+const acceptedFileTypes = ['.kml', '.KML', '.kmz', '.KMZ', '.gpx', '.GPX']
 
 const store = useStore()
 
@@ -41,8 +41,10 @@ async function loadFile() {
 
     if (isFormValid.value && selectedFile.value) {
         try {
-            const content = await selectedFile.value.text()
-            handleFileContent(store, content, selectedFile.value.name)
+            // The file might be a KMZ which is a zip archive. Handling zip archive as text is
+            // asking for trouble, therefore we need first to get it as binary
+            const content = await selectedFile.value.arrayBuffer()
+            await handleFileContent(store, content, selectedFile.value.name)
             importSuccessMessage.value = 'file_imported_success'
         } catch (error) {
             if (error instanceof OutOfBoundsError) {
diff --git a/src/modules/menu/components/advancedTools/ImportFile/ImportFileOnlineTab.vue b/src/modules/menu/components/advancedTools/ImportFile/ImportFileOnlineTab.vue
index 25d594cea..763ef5bcd 100644
--- a/src/modules/menu/components/advancedTools/ImportFile/ImportFileOnlineTab.vue
+++ b/src/modules/menu/components/advancedTools/ImportFile/ImportFileOnlineTab.vue
@@ -81,11 +81,14 @@ async function loadFile() {
     loading.value = true
 
     try {
-        const response = await getFileFromUrl(fileUrl.value, { timeout: REQUEST_TIMEOUT })
+        const response = await getFileFromUrl(fileUrl.value, {
+            timeout: REQUEST_TIMEOUT,
+            responseType: 'arraybuffer',
+        })
         if (response.status !== 200) {
             throw new Error(`Failed to fetch ${fileUrl.value}; status_code=${response.status}`)
         }
-        handleFileContent(store, response.data, fileUrl.value)
+        await handleFileContent(store, response.data, fileUrl.value)
         importSuccessMessage.value = 'file_imported_success'
         setTimeout(() => (buttonState.value = 'default'), 3000)
     } catch (error) {
diff --git a/src/modules/menu/components/advancedTools/ImportFile/utils.js b/src/modules/menu/components/advancedTools/ImportFile/utils.js
index a3956b21e..e29a71da1 100644
--- a/src/modules/menu/components/advancedTools/ImportFile/utils.js
+++ b/src/modules/menu/components/advancedTools/ImportFile/utils.js
@@ -5,7 +5,9 @@ import KMLLayer from '@/api/layers/KMLLayer.class'
 import { OutOfBoundsError } from '@/utils/coordinates/coordinateUtils'
 import { getExtentForProjection } from '@/utils/extentUtils.js'
 import { EmptyGPXError, getGpxExtent } from '@/utils/gpxUtils.js'
-import { EmptyKMLError, getKmlExtent } from '@/utils/kmlUtils'
+import { EmptyKMLError, getKmlExtent, unzipKmz } from '@/utils/kmlUtils'
+import log from '@/utils/logging'
+import { isZipContent } from '@/utils/utils'
 
 const dispatcher = { dispatcher: 'ImportFile/utils' }
 
@@ -35,21 +37,30 @@ export function isGpx(fileContent) {
  * Handle file content
  *
  * @param {OBject} store Vuex store
- * @param {string} content Content of the file
+ * @param {ArrayBuffer} content Content of the file
  * @param {string} source Source of the file (either URL or file path)
  * @returns {ExternalLayer} External layer object
  */
-export function handleFileContent(store, content, source) {
+export async function handleFileContent(store, content, source) {
     let layer = null
-    if (isKml(content)) {
+    let textContent
+    if (isZipContent(content)) {
+        log.debug(`File content is a zipfile, assume it is a KMZ archive`)
+        const kmz = await unzipKmz(content, source)
+        textContent = kmz.kml
+    } else {
+        // If it is not a zip file then we assume is a text file and decode it for further handling
+        textContent = new TextDecoder('utf-8').decode(content)
+    }
+    if (isKml(textContent)) {
         layer = new KMLLayer({
             kmlFileUrl: source,
             visible: true,
             opacity: 1.0,
             adminId: null,
-            kmlData: content,
+            kmlData: textContent,
         })
-        const extent = getKmlExtent(content)
+        const extent = getKmlExtent(textContent)
         if (!extent) {
             throw new EmptyKMLError()
         }
@@ -64,17 +75,17 @@ export function handleFileContent(store, content, source) {
         } else {
             store.dispatch('addLayer', { layer, ...dispatcher })
         }
-    } else if (isGpx(content)) {
+    } else if (isGpx(textContent)) {
         const gpxParser = new GPX()
-        const metadata = gpxParser.readMetadata(content)
+        const metadata = gpxParser.readMetadata(textContent)
         layer = new GPXLayer({
             gpxFileUrl: source,
             visible: true,
             opacity: 1.0,
-            gpxData: content,
+            gpxData: textContent,
             gpxMetadata: metadata,
         })
-        const extent = getGpxExtent(content)
+        const extent = getGpxExtent(textContent)
         if (!extent) {
             throw new EmptyGPXError()
         }
@@ -85,7 +96,8 @@ export function handleFileContent(store, content, source) {
         store.dispatch('zoomToExtent', { extent: projectedExtent, ...dispatcher })
         store.dispatch('addLayer', { layer, ...dispatcher })
     } else {
-        throw new Error(`Unsupported file ${source} content`)
+        throw new Error(`Unsupported file ${source} textContent`)
     }
+
     return layer
 }
diff --git a/src/store/plugins/load-kml-data.plugin.js b/src/store/plugins/load-kml-data.plugin.js
index 2120d499e..939825943 100644
--- a/src/store/plugins/load-kml-data.plugin.js
+++ b/src/store/plugins/load-kml-data.plugin.js
@@ -5,7 +5,9 @@
 
 import { loadKmlData, loadKmlMetadata } from '@/api/files.api'
 import KMLLayer from '@/api/layers/KMLLayer.class'
+import { unzipKmz } from '@/utils/kmlUtils'
 import log from '@/utils/logging'
+import { isZipContent } from '@/utils/utils'
 
 const dispatcher = { dispatcher: 'load-kml-data.plugin' }
 
@@ -36,10 +38,18 @@ async function loadMetadata(store, kmlLayer) {
 async function loadData(store, kmlLayer) {
     log.debug(`Loading data for added KML layer`, kmlLayer)
     try {
+        let kmlData
         const data = await loadKmlData(kmlLayer)
+        if (isZipContent(data)) {
+            log.debug(`KML ${kmlLayer.id} is a KMZ file, unzipping it first`)
+            const kmz = await unzipKmz(data, kmlLayer.id)
+            kmlData = kmz.kml
+        } else {
+            kmlData = new TextDecoder('utf-8').decode(data)
+        }
         store.dispatch('setKmlGpxLayerData', {
             layerId: kmlLayer?.id,
-            data,
+            data: kmlData,
             ...dispatcher,
         })
     } catch (error) {
diff --git a/src/utils/kmlUtils.js b/src/utils/kmlUtils.js
index 1fc361117..cbb21831b 100644
--- a/src/utils/kmlUtils.js
+++ b/src/utils/kmlUtils.js
@@ -1,4 +1,5 @@
 import axios from 'axios'
+import JSZip from 'jszip'
 import {
     createEmpty as emptyExtent,
     extend as extendExtent,
@@ -524,3 +525,67 @@ export function parseKml(kmlLayer, projection, iconSets, iconUrlProxy = iconUrlP
 }
 
 export class EmptyKMLError extends Error {}
+export class KMZError extends Error {}
+
+/**
+ * Unzipped KMZ Object
+ *
+ * This class wrap the unzipped content of a KMZ archive.
+ *
+ * @class
+ * @property {string} name Name of the KMZ archive
+ * @property {string} kml Content of the KML file within the KMZ archive (unzipped)
+ * @property {Map<string, ArrayBuffer>} files A Map of files with their absolute path as key and
+ *   their unzipped content as ArrayBuffer
+ */
+export class KMZObject {
+    constructor(params = {}) {
+        const { name = null, kml = null, files = new Map() } = params
+        this.name = name
+        this.kml = kml
+        this.files = files
+    }
+}
+
+/**
+ * Unzipped a KMZ archive following the KMZ google specification.
+ *
+ * See https://developers.google.com/kml/documentation/kmzarchives
+ *
+ * @param {string} kmzContent KMZ archive content as string
+ * @param {string} kmzFileName KMZ archive name
+ * @returns {KMZObject} Returns a KMZ unzip object
+ */
+export async function unzipKmz(kmzContent, kmzFileName) {
+    const kmz = new KMZObject({ name: kmzFileName })
+    const zip = new JSZip()
+    try {
+        await zip.loadAsync(kmzContent)
+    } catch (error) {
+        log.error(`Failed to unzip KMZ file ${kmzFileName}: ${error}`)
+        throw new KMZError(`Failed to unzip KMZ file ${kmzFileName}`)
+    }
+
+    try {
+        // Valid KMZ archive must have 1 KML file with .kml extension
+        kmz.kml = await zip.file(/^.*\.kml$/)[0].async('text')
+    } catch (error) {
+        log.error(`Failed to get KML file from KMZ archive ${kmzFileName}: ${error}`)
+        throw new KMZError(`Failed to get KML file from KMZ archive ${kmzFileName}`)
+    }
+
+    // Get all other files from the archive
+    const files = zip.file(/^(?!.*\.kml$).*$/)
+    for (let i = 0; i < files.length; i++) {
+        const file = files[i]
+        try {
+            kmz.files.set(file.name, await file.async('arraybuffer'))
+        } catch (error) {
+            log.error(
+                `Failed to extract file ${file.name} from KMZ archive ${kmzFileName}: ${error}. File is ignored`
+            )
+        }
+    }
+
+    return kmz
+}
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 18060f46c..1748f9e30 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -260,3 +260,21 @@ export function humanFileSize(size) {
 export function isInternalUrl(url) {
     return internalDomainRegex.test(url)
 }
+
+/**
+ * Check if the input is a zipfile content or not
+ *
+ * @param {ArrayBuffer} content
+ * @returns {boolean} Return true if the content is a zipfile content
+ */
+export function isZipContent(content) {
+    // Check the first 4 bytes for the ZIP file signature
+    const zipSignature = [0x50, 0x4b, 0x03, 0x04]
+    const view = new Uint8Array(content.slice(0, 4))
+    for (let i = 0; i < zipSignature.length; i++) {
+        if (view[i] !== zipSignature[i]) {
+            return false
+        }
+    }
+    return true
+}

From 1989a5cdbe2d449fa8554611dd92808daac36da1 Mon Sep 17 00:00:00 2001
From: Brice Schaffner <brice.schaffner@swisstopo.ch>
Date: Thu, 12 Sep 2024 11:54:27 +0200
Subject: [PATCH 55/56] PB-970: Fix KML with inline icons

Icons in kml can be inlined in href using base64 like this

<IconStyle><Icon><href>data:image/png;base64,...</href></Icon></IconStyle>

So such href cannot be passed to our proxy. Also to get the KML name and/or
extent there is no need to proxify the icon urls, because icons won't be loaded
during these methods.
---
 src/utils/kmlUtils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/kmlUtils.js b/src/utils/kmlUtils.js
index cbb21831b..bb054ee25 100644
--- a/src/utils/kmlUtils.js
+++ b/src/utils/kmlUtils.js
@@ -49,7 +49,7 @@ export const LEGACY_ICON_XML_SCALE_FACTOR = 1.5
  * @returns {string} Return KML name
  */
 export function parseKmlName(content) {
-    const kml = new KML({ extractStyles: false, iconUrlFunction: iconUrlProxyFy })
+    const kml = new KML({ extractStyles: false })
 
     return kml.readName(content)
 }
@@ -61,7 +61,7 @@ export function parseKmlName(content) {
  * @returns {ol/extent|null} KML layer extent in WGS84 projection or null if the KML has no features
  */
 export function getKmlExtent(content) {
-    const kml = new KML({ extractStyles: false, iconUrlFunction: iconUrlProxyFy })
+    const kml = new KML({ extractStyles: false })
     const features = kml.readFeatures(content, {
         dataProjection: WGS84.epsg, // KML files should always be in WGS84
         featureProjection: WGS84.epsg,

From cbe20af6c7e2f8d24452668fd0993754f884bd61 Mon Sep 17 00:00:00 2001
From: Brice Schaffner <brice.schaffner@swisstopo.ch>
Date: Thu, 12 Sep 2024 11:58:19 +0200
Subject: [PATCH 56/56] PB-970: Added support for KMZ icons and fix inline KML
 icon

---
 src/api/layers/KMLLayer.class.js              |  5 ++++
 .../advancedTools/ImportFile/utils.js         |  3 ++
 src/store/modules/layers.store.js             | 15 ++++++++--
 src/store/plugins/load-kml-data.plugin.js     |  3 ++
 src/utils/kmlUtils.js                         | 29 +++++++++++++++++--
 5 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/api/layers/KMLLayer.class.js b/src/api/layers/KMLLayer.class.js
index 847c65dc4..17281ef97 100644
--- a/src/api/layers/KMLLayer.class.js
+++ b/src/api/layers/KMLLayer.class.js
@@ -29,6 +29,9 @@ export default class KMLLayer extends AbstractLayer {
      *   Default is `null`
      * @param {KmlMetadata | null} [kmlLayerData.kmlMetadata=null] Metadata of the KML drawing. This
      *   object contains all the metadata returned by the backend. Default is `null`
+     * @param {Map<string, ArrayBuffer>} [kmlLayerData.linkFiles=Map()] Map of KML link files. Those
+     *   files are usually sent with the kml inside a KMZ archive and can be referenced inside the
+     *   KML (e.g. icon, image, ...). Default is `Map()`
      * @throws InvalidLayerDataError if no `gpxLayerData` is given or if it is invalid
      */
     constructor(kmlLayerData) {
@@ -42,6 +45,7 @@ export default class KMLLayer extends AbstractLayer {
             adminId = null,
             kmlData = null,
             kmlMetadata = null,
+            linkFiles = new Map(),
         } = kmlLayerData
         if (kmlFileUrl === null) {
             throw new InvalidLayerDataError('Missing KML file URL', kmlLayerData)
@@ -79,6 +83,7 @@ export default class KMLLayer extends AbstractLayer {
             this.isLoading = true
         }
         this.kmlData = kmlData
+        this.linkFiles = linkFiles
     }
 
     /**
diff --git a/src/modules/menu/components/advancedTools/ImportFile/utils.js b/src/modules/menu/components/advancedTools/ImportFile/utils.js
index e29a71da1..8e8d2cfb0 100644
--- a/src/modules/menu/components/advancedTools/ImportFile/utils.js
+++ b/src/modules/menu/components/advancedTools/ImportFile/utils.js
@@ -44,10 +44,12 @@ export function isGpx(fileContent) {
 export async function handleFileContent(store, content, source) {
     let layer = null
     let textContent
+    let linkFiles
     if (isZipContent(content)) {
         log.debug(`File content is a zipfile, assume it is a KMZ archive`)
         const kmz = await unzipKmz(content, source)
         textContent = kmz.kml
+        linkFiles = kmz.files
     } else {
         // If it is not a zip file then we assume is a text file and decode it for further handling
         textContent = new TextDecoder('utf-8').decode(content)
@@ -59,6 +61,7 @@ export async function handleFileContent(store, content, source) {
             opacity: 1.0,
             adminId: null,
             kmlData: textContent,
+            linkFiles,
         })
         const extent = getKmlExtent(textContent)
         if (!extent) {
diff --git a/src/store/modules/layers.store.js b/src/store/modules/layers.store.js
index ec5ccbe45..00b3edca1 100644
--- a/src/store/modules/layers.store.js
+++ b/src/store/modules/layers.store.js
@@ -652,11 +652,17 @@ const actions = {
      * NOTE: all matching layer id will be set.
      *
      * @param {string} layerId Layer ID of KML to update
-     * @param {string} data Data KML data to set
-     * @param {object | null} metadata KML metadata to set (only for geoadmin KMLs)
+     * @param {string} [data] Data KML data to set
+     * @param {object} [metadata] KML metadata to set (only for geoadmin KMLs). Default is `null`
+     * @param {Map<string, ArrayBuffer>} [linkFiles] Map of KML link files. Those files are usually
+     *   sent with the kml inside a KMZ archive and can be referenced inside the KML (e.g. icon,
+     *   image, ...).
      * @param {string} dispatcher Action dispatcher name
      */
-    setKmlGpxLayerData({ commit, getters, rootState }, { layerId, data, metadata, dispatcher }) {
+    setKmlGpxLayerData(
+        { commit, getters, rootState },
+        { layerId, data, metadata, linkFiles, dispatcher }
+    ) {
         const layers = getters.getActiveLayersById(layerId)
         if (!layers) {
             throw new Error(
@@ -693,6 +699,9 @@ const actions = {
                     clone.name = metadata.name ?? 'GPX'
                 }
             }
+            if (linkFiles && clone.type === LayerTypes.KML) {
+                clone.linkFiles = linkFiles
+            }
             return clone
         })
         commit('updateLayers', { layers: updatedLayers, dispatcher })
diff --git a/src/store/plugins/load-kml-data.plugin.js b/src/store/plugins/load-kml-data.plugin.js
index 939825943..056b52624 100644
--- a/src/store/plugins/load-kml-data.plugin.js
+++ b/src/store/plugins/load-kml-data.plugin.js
@@ -39,17 +39,20 @@ async function loadData(store, kmlLayer) {
     log.debug(`Loading data for added KML layer`, kmlLayer)
     try {
         let kmlData
+        let kmlLinkFiles = new Map()
         const data = await loadKmlData(kmlLayer)
         if (isZipContent(data)) {
             log.debug(`KML ${kmlLayer.id} is a KMZ file, unzipping it first`)
             const kmz = await unzipKmz(data, kmlLayer.id)
             kmlData = kmz.kml
+            kmlLinkFiles = kmz.files
         } else {
             kmlData = new TextDecoder('utf-8').decode(data)
         }
         store.dispatch('setKmlGpxLayerData', {
             layerId: kmlLayer?.id,
             data: kmlData,
+            linkFiles: kmlLinkFiles,
             ...dispatcher,
         })
     } catch (error) {
diff --git a/src/utils/kmlUtils.js b/src/utils/kmlUtils.js
index bb054ee25..cee1e0953 100644
--- a/src/utils/kmlUtils.js
+++ b/src/utils/kmlUtils.js
@@ -485,17 +485,42 @@ export function iconUrlProxyFy(url, corsIssueCallback = null) {
     return url
 }
 
+function handleIconUrl(url, iconUrlProxy = iconUrlProxyFy, files = new Map()) {
+    // Check if the url is relative to the web application
+    // To do this we take the location origin with the path, making sure that the path is the folder
+    // and not a file.
+    const localPrefix = `${location.origin}${location.pathname.replace(/[^/]+$/, '')}`
+    if (url.startsWith(localPrefix)) {
+        // url is relative file, try to get it from the kml link files
+        const file = url.replace(localPrefix, '')
+        if (files.has(file)) {
+            return URL.createObjectURL(new Blob([files.get(file)]))
+        }
+        return url
+    } else if (/^https?:\/\//.test(url)) {
+        // the url is a remote url we might need to go through our proxy to avoid CORS
+        // issues and allow mix content.
+        return iconUrlProxy(url)
+    }
+    // otherwise fallback by returning the url. This can be the case for inline icon
+    // like data:image/png;base64,...
+    return url
+}
+
 /**
  * Parses a KML's data into OL Features
  *
- * @param {kmlLayer} kmlLayer KML layer to parse
+ * @param {KMLLayer} kmlLayer KML layer to parse
  * @param {CoordinateSystem} projection Projection to use for the OL Feature
  * @param {DrawingIconSet[]} iconSets Icon sets to use for EditabeFeature deserialization
  * @returns {ol/Feature[]} List of OL Features
  */
 export function parseKml(kmlLayer, projection, iconSets, iconUrlProxy = iconUrlProxyFy) {
     const kmlData = kmlLayer.kmlData
-    const features = new KML({ iconUrlFunction: iconUrlProxy }).readFeatures(kmlData, {
+    const files = kmlLayer.linkFiles
+    const features = new KML({
+        iconUrlFunction: (url) => handleIconUrl(url, iconUrlProxy, files),
+    }).readFeatures(kmlData, {
         dataProjection: WGS84.epsg, // KML files should always be in WGS84
         featureProjection: projection.epsg,
     })