From 896e9c8e609c8f2f70093fafd84df55c0f7af46b Mon Sep 17 00:00:00 2001
From: rldhont <rldhont@gmail.com>
Date: Tue, 9 Jul 2024 16:21:29 +0200
Subject: [PATCH 1/5] JS Digitizing component: measure attribute

To enable measure with digitizing component, the attribute measure has to be added.
---
 assets/src/components/Digitizing.js        | 2 +-
 lizmap/modules/view/templates/map_draw.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/src/components/Digitizing.js b/assets/src/components/Digitizing.js
index 0873a3c8df..110a27baf0 100644
--- a/assets/src/components/Digitizing.js
+++ b/assets/src/components/Digitizing.js
@@ -114,7 +114,7 @@ export default class Digitizing extends HTMLElement {
             <button type="button" class="digitizing-toggle-visibility btn" ?disabled=${!mainLizmap.digitizing.featureDrawn} @click=${() => mainLizmap.digitizing.toggleVisibility()} data-original-title="${lizDict['tree.button.checkbox']}">
                 <i class="icon-eye-${mainLizmap.digitizing.visibility ? 'open' : 'close'}"></i>
             </button>
-            <button type="button" class="digitizing-toggle-measure btn ${mainLizmap.digitizing.hasMeasureVisible ? 'active btn-primary' : ''}" @click=${() => mainLizmap.digitizing.toggleMeasure()} data-original-title="${lizDict['digitizing.toolbar.measure']}">
+            <button type="button" class="digitizing-toggle-measure btn ${mainLizmap.digitizing.hasMeasureVisible ? 'active btn-primary' : ''} ${this.hasAttribute('measure') ? '' : 'hide'}" @click=${() => mainLizmap.digitizing.toggleMeasure()} data-original-title="${lizDict['digitizing.toolbar.measure']}">
                 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
                     <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
                     <path d="M17 3l4 4l-14 14l-4 -4z"></path>
diff --git a/lizmap/modules/view/templates/map_draw.tpl b/lizmap/modules/view/templates/map_draw.tpl
index 8341cb5a08..5e2da36388 100644
--- a/lizmap/modules/view/templates/map_draw.tpl
+++ b/lizmap/modules/view/templates/map_draw.tpl
@@ -11,6 +11,6 @@
     </h3>
 
     <div class="menu-content">
-        <lizmap-digitizing save import-export></lizmap-digitizing>
+        <lizmap-digitizing save import-export measure></lizmap-digitizing>
     </div>
 </div>

From 0633de61d648e85eaceaa77c65800c0229bc30bd Mon Sep 17 00:00:00 2001
From: rldhont <rldhont@gmail.com>
Date: Wed, 10 Jul 2024 14:35:38 +0200
Subject: [PATCH 2/5] JS Digitizing: Add erase all

Add a new button to erase all digitizing features in the digitizing component, and the method in the digitizing module.
---
 assets/src/components/Digitizing.js             | 15 ++++++++++++++-
 assets/src/images/svg/eraser-all.svg            |  8 ++++++++
 assets/src/modules/Digitizing.js                | 17 ++++++++++++++++-
 .../locales/en_US/dictionnary.UTF-8.properties  |  2 ++
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 assets/src/images/svg/eraser-all.svg

diff --git a/assets/src/components/Digitizing.js b/assets/src/components/Digitizing.js
index 110a27baf0..89c4e27eb3 100644
--- a/assets/src/components/Digitizing.js
+++ b/assets/src/components/Digitizing.js
@@ -19,6 +19,7 @@ import '../images/svg/freehand.svg';
 import '../images/svg/pencil.svg';
 import '../images/svg/edit.svg';
 import '../images/svg/eraser.svg';
+import '../images/svg/eraser-all.svg';
 import '../images/svg/save.svg';
 
 import '../images/svg/file-download.svg';
@@ -111,6 +112,11 @@ export default class Digitizing extends HTMLElement {
                     <use xlink:href="#eraser"/>
                 </svg>
             </button>
+            <button type="button" class="digitizing-all btn" ?disabled=${!mainLizmap.digitizing.featureDrawn} @click=${() => this.eraseAll()} data-original-title="${lizDict['digitizing.toolbar.erase.all']}">
+                <svg>
+                    <use xlink:href="#eraser-all"/>
+                </svg>
+            </button>
             <button type="button" class="digitizing-toggle-visibility btn" ?disabled=${!mainLizmap.digitizing.featureDrawn} @click=${() => mainLizmap.digitizing.toggleVisibility()} data-original-title="${lizDict['tree.button.checkbox']}">
                 <i class="icon-eye-${mainLizmap.digitizing.visibility ? 'open' : 'close'}"></i>
             </button>
@@ -213,10 +219,17 @@ export default class Digitizing extends HTMLElement {
             () => {
                 render(mainTemplate(), this);
             },
-            ['digitizing.featureDrawn', 'digitizing.visibility', 'digitizing.toolSelected', 'digitizing.editionBegins', 'digitizing.editionEnds', 'digitizing.erasingBegins', 'digitizing.erasingEnds', 'digitizing.erase', 'digitizing.drawColor', 'digitizing.save', 'digitizing.measure', 'digitizing.editedFeatureText', 'digitizing.editedFeatureRotation', 'digitizing.editedFeatureScale']
+            ['digitizing.featureDrawn', 'digitizing.visibility', 'digitizing.toolSelected', 'digitizing.editionBegins', 'digitizing.editionEnds', 'digitizing.erasingBegins', 'digitizing.erasingEnds', 'digitizing.erase', 'digitizing.erase.all', 'digitizing.drawColor', 'digitizing.save', 'digitizing.measure', 'digitizing.editedFeatureText', 'digitizing.editedFeatureRotation', 'digitizing.editedFeatureScale']
         );
     }
 
     disconnectedCallback() {
     }
+
+    eraseAll() {
+        if (!confirm(lizDict['digitizing.confirm.erase.all'])) {
+            return false;
+        }
+        mainLizmap.digitizing.eraseAll();
+    }
 }
diff --git a/assets/src/images/svg/eraser-all.svg b/assets/src/images/svg/eraser-all.svg
new file mode 100644
index 0000000000..57115493f4
--- /dev/null
+++ b/assets/src/images/svg/eraser-all.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-eraser-all" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z"/>
+  <path d="M 20.41,19 H 6 L 2,15 C 1.6122764,14.609963 1.6122764,13.980037 2,13.59 l 10,-10 c 0.390037,-0.3877236 1.019963,-0.3877236 1.41,0 l 5,5 c 0.387724,0.3900375 0.387724,1.0199625 0,1.41 l -9,9"/>
+  <path d="m 15,3.6 c 0.390037,-0.3877236 1.019963,-0.3877236 1.41,0 l 5,5 c 0.515269,0.2607417 0.703209,0.9024897 0.41,1.4 l -9,9"/>
+  <path d="M 16,12.3 9.7,6"/>
+  <path d="M 19.254106,12.436927 17.624342,10.821262"/>
+</svg>
diff --git a/assets/src/modules/Digitizing.js b/assets/src/modules/Digitizing.js
index 950f777827..cf7b41ec0d 100644
--- a/assets/src/modules/Digitizing.js
+++ b/assets/src/modules/Digitizing.js
@@ -345,7 +345,7 @@ export default class Digitizing {
         } else {
             this._contextFeatures[this._context] = null;
         }
-        this._isSaved = false;
+        this._isSaved = (localStorage.getItem(this._repoAndProjectString + '_' + this._context + '_drawLayer') !== null);
         this._measureTooltips.forEach((measureTooltip) => {
             mainLizmap.map.removeOverlay(measureTooltip[0]);
             mainLizmap.map.removeOverlay(measureTooltip[1]);
@@ -990,6 +990,20 @@ export default class Digitizing {
         mainEventDispatcher.dispatch('digitizing.save');
     }
 
+    eraseAll() {
+        this._measureTooltips.forEach((measureTooltip) => {
+            mainLizmap.map.removeOverlay(measureTooltip[0]);
+            mainLizmap.map.removeOverlay(measureTooltip[1]);
+            this._measureTooltips.delete(measureTooltip);
+        });
+        this._drawSource.clear();
+
+        this.saveFeatureDrawn();
+
+        mainEventDispatcher.dispatch('digitizing.erase.all');
+        mainEventDispatcher.dispatch('digitizing.erase');
+    }
+
     /**
      * Save all drawn features in local storage
      */
@@ -1088,6 +1102,7 @@ export default class Digitizing {
 
             // Draw features
             this._drawSource.addFeatures(loadedFeatures);
+            this._isSaved = (loadedFeatures.length > 0);
         }
     }
 
diff --git a/lizmap/modules/view/locales/en_US/dictionnary.UTF-8.properties b/lizmap/modules/view/locales/en_US/dictionnary.UTF-8.properties
index 9989b218a4..3c8815f2d9 100644
--- a/lizmap/modules/view/locales/en_US/dictionnary.UTF-8.properties
+++ b/lizmap/modules/view/locales/en_US/dictionnary.UTF-8.properties
@@ -218,7 +218,9 @@ digitizing.toolbar.textScale=Size
 digitizing.toolbar.import=Import in GeoJSON, GPX or KML
 digitizing.toolbar.edit=Edit (hold "Shift" to select multiple features)
 digitizing.toolbar.erase=Delete some features
+digitizing.toolbar.erase.all=Delete all features
 digitizing.confirme.erase=Are you sure you want to delete this feature?
+digitizing.confirm.erase.all=Are you sure you want to delete all features?
 digitizing.toolbar.save=Save draw in the browser
 digitizing.toolbar.measure=Measures
 

From 9e84b0695980df18e44be77031770f700e6920e2 Mon Sep 17 00:00:00 2001
From: rldhont <rldhont@gmail.com>
Date: Wed, 10 Jul 2024 14:38:00 +0200
Subject: [PATCH 3/5] JS Digitizing fix locale key confirm erase

Replace `digitizing.confirme.erase` by `digitizing.confirm.erase`
---
 assets/src/modules/Digitizing.js                                | 2 +-
 .../app/locales/cs_CZ/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/de_DE/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/el_GR/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/es_ES/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/eu_ES/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/fi_FI/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/fr_FR/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/gl_ES/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/hu_HU/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/it_IT/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/ja_JP/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/nl_NL/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/no_NO/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/pl_PL/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/pt_BR/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/pt_PT/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/ro_RO/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/ru_RU/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/sk_SK/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/sl_SI/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/sv_SE/view/locales/dictionnary.UTF-8.properties | 2 +-
 .../app/locales/uk_UA/view/locales/dictionnary.UTF-8.properties | 2 +-
 lizmap/modules/view/locales/en_US/dictionnary.UTF-8.properties  | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/assets/src/modules/Digitizing.js b/assets/src/modules/Digitizing.js
index cf7b41ec0d..d4bbbb59e4 100644
--- a/assets/src/modules/Digitizing.js
+++ b/assets/src/modules/Digitizing.js
@@ -577,7 +577,7 @@ export default class Digitizing {
                         hitTolerance: 8
                     });
                     if(features.length){
-                        if (!confirm(lizDict['digitizing.confirme.erase'])) {
+                        if (!confirm(lizDict['digitizing.confirm.erase'])) {
                             return false;
                         }
 
diff --git a/lizmap/app/locales/cs_CZ/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/cs_CZ/view/locales/dictionnary.UTF-8.properties
index ccf4cad355..6496ec7307 100644
--- a/lizmap/app/locales/cs_CZ/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/cs_CZ/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Velikost
 digitizing.toolbar.import=Importovat v GeoJSON, GPX nebo KML
 digitizing.toolbar.edit=Upravte ( podržte klávesu "Shift" pro výběr více funkcí)
 digitizing.toolbar.erase=Smazat některé funkce
-digitizing.confirme.erase=Opravdu chcete smazat tuto funkci?
+digitizing.confirm.erase=Opravdu chcete smazat tuto funkci?
 digitizing.toolbar.save=Uložit kresbu v prohlížeči
 digitizing.toolbar.measure=Měření
 digitizing.constraint.title=Omezení
diff --git a/lizmap/app/locales/de_DE/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/de_DE/view/locales/dictionnary.UTF-8.properties
index c3e3756f16..5d06fa43bc 100644
--- a/lizmap/app/locales/de_DE/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/de_DE/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Size
 digitizing.toolbar.import=GeoJSON, GPX oder KML importieren
 digitizing.toolbar.edit=Edit (hold "Shift" to select multiple features)
 digitizing.toolbar.erase=Delete some features
-digitizing.confirme.erase=Are you sure you want to delete this feature?
+digitizing.confirm.erase=Are you sure you want to delete this feature?
 digitizing.toolbar.save=Zeichnung im Browser speichern
 digitizing.toolbar.measure=Grössen
 digitizing.constraint.title=Constraints
diff --git a/lizmap/app/locales/el_GR/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/el_GR/view/locales/dictionnary.UTF-8.properties
index 5ec1f0135a..ddae540852 100644
--- a/lizmap/app/locales/el_GR/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/el_GR/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Size
 digitizing.toolbar.import=Import in GeoJSON, GPX or KML
 digitizing.toolbar.edit=Edit (hold "Shift" to select multiple features)
 digitizing.toolbar.erase=Delete some features
-digitizing.confirme.erase=Are you sure you want to delete this feature?
+digitizing.confirm.erase=Are you sure you want to delete this feature?
 digitizing.toolbar.save=Save draw in the browser
 digitizing.toolbar.measure=Measures
 digitizing.constraint.title=Constraints
diff --git a/lizmap/app/locales/es_ES/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/es_ES/view/locales/dictionnary.UTF-8.properties
index 82af2271ab..5aa92744a7 100644
--- a/lizmap/app/locales/es_ES/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/es_ES/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Size
 digitizing.toolbar.import=Importación en GeoJSON, GPX o KML
 digitizing.toolbar.edit=Edit (hold "Shift" to select multiple features)
 digitizing.toolbar.erase=Delete some features
-digitizing.confirme.erase=Are you sure you want to delete this feature?
+digitizing.confirm.erase=Are you sure you want to delete this feature?
 digitizing.toolbar.save=Save draw in the browser
 digitizing.toolbar.measure=Medidas
 digitizing.constraint.title=Constraints
diff --git a/lizmap/app/locales/eu_ES/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/eu_ES/view/locales/dictionnary.UTF-8.properties
index 22ed217f28..32bd5c5edd 100644
--- a/lizmap/app/locales/eu_ES/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/eu_ES/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Size
 digitizing.toolbar.import=Import in GeoJSON, GPX or KML
 digitizing.toolbar.edit=Edit (hold "Shift" to select multiple features)
 digitizing.toolbar.erase=Delete some features
-digitizing.confirme.erase=Are you sure you want to delete this feature?
+digitizing.confirm.erase=Are you sure you want to delete this feature?
 digitizing.toolbar.save=Save draw in the browser
 digitizing.toolbar.measure=Measures
 digitizing.constraint.title=Constraints
diff --git a/lizmap/app/locales/fi_FI/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/fi_FI/view/locales/dictionnary.UTF-8.properties
index 6953d65209..5f9eb136b0 100644
--- a/lizmap/app/locales/fi_FI/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/fi_FI/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Size
 digitizing.toolbar.import=Import in GeoJSON, GPX or KML
 digitizing.toolbar.edit=Edit (hold "Shift" to select multiple features)
 digitizing.toolbar.erase=Delete some features
-digitizing.confirme.erase=Are you sure you want to delete this feature?
+digitizing.confirm.erase=Are you sure you want to delete this feature?
 digitizing.toolbar.save=Save draw in the browser
 digitizing.toolbar.measure=Mitat
 digitizing.constraint.title=Constraints
diff --git a/lizmap/app/locales/fr_FR/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/fr_FR/view/locales/dictionnary.UTF-8.properties
index 2e2064db74..b3cca59663 100644
--- a/lizmap/app/locales/fr_FR/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/fr_FR/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Taille
 digitizing.toolbar.import=Import en GeoJSON, GPX ou KML
 digitizing.toolbar.edit=Éditer (maintenir "Shift" pour sélectionner plusieurs entités)
 digitizing.toolbar.erase=Supprimer quelques entités
-digitizing.confirme.erase=Êtes-vous certain de vouloir supprimer cet entité ?
+digitizing.confirm.erase=Êtes-vous certain de vouloir supprimer cet entité ?
 digitizing.toolbar.save=Sauvegarder le dessin dans le navigateur
 digitizing.toolbar.measure=Mesures
 digitizing.constraint.title=Contraintes
diff --git a/lizmap/app/locales/gl_ES/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/gl_ES/view/locales/dictionnary.UTF-8.properties
index 35fee18201..233d50a0a1 100644
--- a/lizmap/app/locales/gl_ES/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/gl_ES/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Size
 digitizing.toolbar.import=Importar en GeoJSON, GPX ou KML
 digitizing.toolbar.edit=Edit (hold "Shift" to select multiple features)
 digitizing.toolbar.erase=Delete some features
-digitizing.confirme.erase=Are you sure you want to delete this feature?
+digitizing.confirm.erase=Are you sure you want to delete this feature?
 digitizing.toolbar.save=Garde o debuxo no navegador
 digitizing.toolbar.measure=Medidas
 digitizing.constraint.title=Constraints
diff --git a/lizmap/app/locales/hu_HU/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/hu_HU/view/locales/dictionnary.UTF-8.properties
index 20c8ef6a71..27b0c3d2b9 100644
--- a/lizmap/app/locales/hu_HU/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/hu_HU/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Size
 digitizing.toolbar.import=Import in GeoJSON, GPX or KML
 digitizing.toolbar.edit=Edit (hold "Shift" to select multiple features)
 digitizing.toolbar.erase=Delete some features
-digitizing.confirme.erase=Are you sure you want to delete this feature?
+digitizing.confirm.erase=Are you sure you want to delete this feature?
 digitizing.toolbar.save=Save draw in the browser
 digitizing.toolbar.measure=Mérések
 digitizing.constraint.title=Constraints
diff --git a/lizmap/app/locales/it_IT/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/it_IT/view/locales/dictionnary.UTF-8.properties
index 5418bb25ea..2a9e85869b 100644
--- a/lizmap/app/locales/it_IT/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/it_IT/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Dimensione
 digitizing.toolbar.import=Importa in GeoJSON, GPX o KML
 digitizing.toolbar.edit=Modifica (tieni premuto il tasto "Shift" per selezionare più elementi)
 digitizing.toolbar.erase=Elimina alcuni elementi
-digitizing.confirme.erase=Sei sicuro di voler eliminare questo elemento?
+digitizing.confirm.erase=Sei sicuro di voler eliminare questo elemento?
 digitizing.toolbar.save=Salva il disegno nel browser
 digitizing.toolbar.measure=Misure
 digitizing.constraint.title=Vincoli
diff --git a/lizmap/app/locales/ja_JP/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/ja_JP/view/locales/dictionnary.UTF-8.properties
index 2410d1ee40..31b5529db7 100644
--- a/lizmap/app/locales/ja_JP/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/ja_JP/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Size
 digitizing.toolbar.import=GeoJSON、GPX または KML でのインポート‎
 digitizing.toolbar.edit=Edit (hold "Shift" to select multiple features)
 digitizing.toolbar.erase=Delete some features
-digitizing.confirme.erase=Are you sure you want to delete this feature?
+digitizing.confirm.erase=Are you sure you want to delete this feature?
 digitizing.toolbar.save=‎ブラウザで描画を保存する‎
 digitizing.toolbar.measure=計測
 digitizing.constraint.title=Constraints
diff --git a/lizmap/app/locales/nl_NL/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/nl_NL/view/locales/dictionnary.UTF-8.properties
index bb385c2a9b..bd28a9d33e 100644
--- a/lizmap/app/locales/nl_NL/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/nl_NL/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Grootte
 digitizing.toolbar.import=Importeer in GeoJSON, GPX or KML
 digitizing.toolbar.edit=Bewerken (houd 'Shift' ingedrukt om meerdere objecten te selecteren)
 digitizing.toolbar.erase=Verwijder enkele functies
-digitizing.confirme.erase=Weet u zeker dat u deze functie wilt verwijderen?
+digitizing.confirm.erase=Weet u zeker dat u deze functie wilt verwijderen?
 digitizing.toolbar.save=Sla tekening op in de browser
 digitizing.toolbar.measure=Eenheden
 digitizing.constraint.title=Beperkingen
diff --git a/lizmap/app/locales/no_NO/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/no_NO/view/locales/dictionnary.UTF-8.properties
index 0ec279dd2f..f58822768b 100644
--- a/lizmap/app/locales/no_NO/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/no_NO/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Size
 digitizing.toolbar.import=Import in GeoJSON, GPX or KML
 digitizing.toolbar.edit=Edit (hold "Shift" to select multiple features)
 digitizing.toolbar.erase=Delete some features
-digitizing.confirme.erase=Are you sure you want to delete this feature?
+digitizing.confirm.erase=Are you sure you want to delete this feature?
 digitizing.toolbar.save=Save draw in the browser
 digitizing.toolbar.measure=Measures
 digitizing.constraint.title=Constraints
diff --git a/lizmap/app/locales/pl_PL/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/pl_PL/view/locales/dictionnary.UTF-8.properties
index 6345413c4d..a641c92f86 100644
--- a/lizmap/app/locales/pl_PL/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/pl_PL/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Rozmiar
 digitizing.toolbar.import=Importuj GeoJSON, GPX lub KML
 digitizing.toolbar.edit=Edytuj (przytrzymaj „Shift”, aby wybrać wiele funkcji)
 digitizing.toolbar.erase=Usuń niektóre obiekty
-digitizing.confirme.erase=Czy na pewno chcesz usunąć ten obiekt?
+digitizing.confirm.erase=Czy na pewno chcesz usunąć ten obiekt?
 digitizing.toolbar.save=Zapisz rysunek w przeglądarce
 digitizing.toolbar.measure=Pomiary
 digitizing.constraint.title=Wymagania
diff --git a/lizmap/app/locales/pt_BR/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/pt_BR/view/locales/dictionnary.UTF-8.properties
index e369fd83e9..826513f6dd 100644
--- a/lizmap/app/locales/pt_BR/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/pt_BR/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Size
 digitizing.toolbar.import=Import in GeoJSON, GPX or KML
 digitizing.toolbar.edit=Edit (hold "Shift" to select multiple features)
 digitizing.toolbar.erase=Delete some features
-digitizing.confirme.erase=Are you sure you want to delete this feature?
+digitizing.confirm.erase=Are you sure you want to delete this feature?
 digitizing.toolbar.save=Save draw in the browser
 digitizing.toolbar.measure=Medidas
 digitizing.constraint.title=Constraints
diff --git a/lizmap/app/locales/pt_PT/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/pt_PT/view/locales/dictionnary.UTF-8.properties
index c16aae71c2..309320ad1f 100644
--- a/lizmap/app/locales/pt_PT/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/pt_PT/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Tamanho
 digitizing.toolbar.import=Importar GeoJSON, GPX ou KML
 digitizing.toolbar.edit=Editar (manter pressionada a tecla "Shift" para selecionar vários elementos)
 digitizing.toolbar.erase=Eliminar alguns elementos
-digitizing.confirme.erase=Tem a certeza que pretende eliminar este elemento?
+digitizing.confirm.erase=Tem a certeza que pretende eliminar este elemento?
 digitizing.toolbar.save=Guardar o desenho no browser
 digitizing.toolbar.measure=Medições
 digitizing.constraint.title=Restrições
diff --git a/lizmap/app/locales/ro_RO/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/ro_RO/view/locales/dictionnary.UTF-8.properties
index 14e4cbba98..a065f51c4b 100644
--- a/lizmap/app/locales/ro_RO/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/ro_RO/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Dimensiune
 digitizing.toolbar.import=Importare GeoJSON, GPX sau KML
 digitizing.toolbar.edit=Editează (ține apăsată tasta "Shift" pentru a selecta mai multe obiecte)
 digitizing.toolbar.erase=Șterge unele obiecte
-digitizing.confirme.erase=Sigur dorești să ștergi acest obiect?
+digitizing.confirm.erase=Sigur dorești să ștergi acest obiect?
 digitizing.toolbar.save=Salvare desen în browser
 digitizing.toolbar.measure=Măsurări
 digitizing.constraint.title=Constrângeri
diff --git a/lizmap/app/locales/ru_RU/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/ru_RU/view/locales/dictionnary.UTF-8.properties
index b24cd5e9c7..64812e8a51 100644
--- a/lizmap/app/locales/ru_RU/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/ru_RU/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Size
 digitizing.toolbar.import=Импорт в GeoJSON, GPX или KML
 digitizing.toolbar.edit=Edit (hold "Shift" to select multiple features)
 digitizing.toolbar.erase=Delete some features
-digitizing.confirme.erase=Are you sure you want to delete this feature?
+digitizing.confirm.erase=Are you sure you want to delete this feature?
 digitizing.toolbar.save=Сохранить чертеж в браузере
 digitizing.toolbar.measure=Измерения
 digitizing.constraint.title=Constraints
diff --git a/lizmap/app/locales/sk_SK/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/sk_SK/view/locales/dictionnary.UTF-8.properties
index a8d19fa76e..5a84ec0462 100644
--- a/lizmap/app/locales/sk_SK/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/sk_SK/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Size
 digitizing.toolbar.import=Importujte v GeoJSON, GPX alebo KML
 digitizing.toolbar.edit=Edit (hold "Shift" to select multiple features)
 digitizing.toolbar.erase=Delete some features
-digitizing.confirme.erase=Are you sure you want to delete this feature?
+digitizing.confirm.erase=Are you sure you want to delete this feature?
 digitizing.toolbar.save=Save draw in the browser
 digitizing.toolbar.measure=Miery
 digitizing.constraint.title=Constraints
diff --git a/lizmap/app/locales/sl_SI/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/sl_SI/view/locales/dictionnary.UTF-8.properties
index ea667283ba..5d9d9b82ec 100644
--- a/lizmap/app/locales/sl_SI/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/sl_SI/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Velikost
 digitizing.toolbar.import=Uvozite v GeoJSON, GPX ali KML
 digitizing.toolbar.edit=Urejanje (z "Shift" izberete več elementov)
 digitizing.toolbar.erase=Izbrišite elemente
-digitizing.confirme.erase=Želite izbrisati element?
+digitizing.confirm.erase=Želite izbrisati element?
 digitizing.toolbar.save=Shranite sliko v brskalniku
 digitizing.toolbar.measure=Ukrepi
 digitizing.constraint.title=Relacije
diff --git a/lizmap/app/locales/sv_SE/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/sv_SE/view/locales/dictionnary.UTF-8.properties
index a96c7ade16..8c0016ab9f 100644
--- a/lizmap/app/locales/sv_SE/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/sv_SE/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Size
 digitizing.toolbar.import=Importera från GeoJSON. GPX eller KML
 digitizing.toolbar.edit=Edit (hold "Shift" to select multiple features)
 digitizing.toolbar.erase=Delete some features
-digitizing.confirme.erase=Are you sure you want to delete this feature?
+digitizing.confirm.erase=Are you sure you want to delete this feature?
 digitizing.toolbar.save=Spara ritningen i webbläsaren
 digitizing.toolbar.measure=Mätningar
 digitizing.constraint.title=Constraints
diff --git a/lizmap/app/locales/uk_UA/view/locales/dictionnary.UTF-8.properties b/lizmap/app/locales/uk_UA/view/locales/dictionnary.UTF-8.properties
index 15c5f787cb..20db272abc 100644
--- a/lizmap/app/locales/uk_UA/view/locales/dictionnary.UTF-8.properties
+++ b/lizmap/app/locales/uk_UA/view/locales/dictionnary.UTF-8.properties
@@ -192,7 +192,7 @@ digitizing.toolbar.textScale=Size
 digitizing.toolbar.import=Імпорт в GeoJSON, GPX або KML
 digitizing.toolbar.edit=Edit (hold "Shift" to select multiple features)
 digitizing.toolbar.erase=Delete some features
-digitizing.confirme.erase=Are you sure you want to delete this feature?
+digitizing.confirm.erase=Are you sure you want to delete this feature?
 digitizing.toolbar.save=Збережіть малюнок у браузері
 digitizing.toolbar.measure=Заходи
 digitizing.constraint.title=Constraints
diff --git a/lizmap/modules/view/locales/en_US/dictionnary.UTF-8.properties b/lizmap/modules/view/locales/en_US/dictionnary.UTF-8.properties
index 3c8815f2d9..f5ee69d767 100644
--- a/lizmap/modules/view/locales/en_US/dictionnary.UTF-8.properties
+++ b/lizmap/modules/view/locales/en_US/dictionnary.UTF-8.properties
@@ -219,7 +219,7 @@ digitizing.toolbar.import=Import in GeoJSON, GPX or KML
 digitizing.toolbar.edit=Edit (hold "Shift" to select multiple features)
 digitizing.toolbar.erase=Delete some features
 digitizing.toolbar.erase.all=Delete all features
-digitizing.confirme.erase=Are you sure you want to delete this feature?
+digitizing.confirm.erase=Are you sure you want to delete this feature?
 digitizing.confirm.erase.all=Are you sure you want to delete all features?
 digitizing.toolbar.save=Save draw in the browser
 digitizing.toolbar.measure=Measures

From 8ee506d28958f370e65f062e06def25cade05eb5 Mon Sep 17 00:00:00 2001
From: rldhont <rldhont@gmail.com>
Date: Wed, 10 Jul 2024 15:19:34 +0200
Subject: [PATCH 4/5] JS Digitizing: Removed from localstorage when saved is
 toggled

Now when the saved is toggle the browser localstorage is clear.
When the user click on digitizing saved button, a message is displayed to explain that the drawing changes wil be saved in the browser, and the digitizing save title changed to explain that the drawing will be removed from the browser.
---
 assets/src/components/Digitizing.js            | 18 +++++++++++++++++-
 assets/src/modules/Digitizing.js               |  4 +++-
 .../locales/en_US/dictionnary.UTF-8.properties |  2 ++
 lizmap/www/assets/css/map.css                  | 10 ++++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/assets/src/components/Digitizing.js b/assets/src/components/Digitizing.js
index 89c4e27eb3..b7d1ad4474 100644
--- a/assets/src/components/Digitizing.js
+++ b/assets/src/components/Digitizing.js
@@ -130,7 +130,7 @@ export default class Digitizing extends HTMLElement {
                     <path d="M7 16l-1.5 -1.5"></path>
                 </svg>
             </button>
-            <button type="button" class="digitizing-save btn ${mainLizmap.digitizing.isSaved ? 'active btn-primary' : ''} ${this.hasAttribute('save') ? '' : 'hide'}" @click=${()=> mainLizmap.digitizing.toggleSave()} data-original-title="${lizDict['digitizing.toolbar.save']}">
+            <button type="button" class="digitizing-save btn ${mainLizmap.digitizing.isSaved ? 'active btn-primary' : ''} ${this.hasAttribute('save') ? '' : 'hide'}" @click=${()=> this.toggleSave()} data-original-title="${lizDict['digitizing.toolbar.save']}">
                 <svg>
                     <use xlink:href="#save" />
                 </svg>
@@ -173,6 +173,9 @@ export default class Digitizing extends HTMLElement {
                     <span class="file-name"></span>
                 </div>
             </div>
+            <div class="digitizing-state hide">
+                <div class="digitizing-save-state hide">${lizDict['digitizing.toolbar.save.state']}</div>
+            </div>
             <div class="digitizing-constraints ${mainLizmap.digitizing.hasConstraintsPanelVisible ? '' : 'hide'}">
                 <details>
                     <summary>${lizDict['digitizing.constraint.title']}</summary>${lizDict['digitizing.constraint.details']}
@@ -232,4 +235,17 @@ export default class Digitizing extends HTMLElement {
         }
         mainLizmap.digitizing.eraseAll();
     }
+
+    toggleSave() {
+        mainLizmap.digitizing.toggleSave();
+        if (mainLizmap.digitizing.isSaved) {
+            this.querySelector('button.digitizing-save').dataset.originalTitle = lizDict['digitizing.toolbar.save.remove'];
+            this.querySelector('div.digitizing-save-state').classList.remove('hide');
+            this.querySelector('div.digitizing-state').classList.remove('hide');
+        } else {
+            this.querySelector('button.digitizing-save').dataset.originalTitle = lizDict['digitizing.toolbar.save'];
+            this.querySelector('div.digitizing-save-state').classList.add('hide');
+            this.querySelector('div.digitizing-state').classList.add('hide');
+        }
+    }
 }
diff --git a/assets/src/modules/Digitizing.js b/assets/src/modules/Digitizing.js
index d4bbbb59e4..7e165c86b0 100644
--- a/assets/src/modules/Digitizing.js
+++ b/assets/src/modules/Digitizing.js
@@ -1033,6 +1033,8 @@ export default class Digitizing {
             } else {
                 localStorage.removeItem(this._repoAndProjectString + '_' + this._context + '_drawLayer');
             }
+        } else {
+            localStorage.removeItem(this._repoAndProjectString + '_' + this._context + '_drawLayer');
         }
     }
 
@@ -1101,8 +1103,8 @@ export default class Digitizing {
             }
 
             // Draw features
-            this._drawSource.addFeatures(loadedFeatures);
             this._isSaved = (loadedFeatures.length > 0);
+            this._drawSource.addFeatures(loadedFeatures);
         }
     }
 
diff --git a/lizmap/modules/view/locales/en_US/dictionnary.UTF-8.properties b/lizmap/modules/view/locales/en_US/dictionnary.UTF-8.properties
index f5ee69d767..18b642d8a4 100644
--- a/lizmap/modules/view/locales/en_US/dictionnary.UTF-8.properties
+++ b/lizmap/modules/view/locales/en_US/dictionnary.UTF-8.properties
@@ -222,6 +222,8 @@ digitizing.toolbar.erase.all=Delete all features
 digitizing.confirm.erase=Are you sure you want to delete this feature?
 digitizing.confirm.erase.all=Are you sure you want to delete all features?
 digitizing.toolbar.save=Save draw in the browser
+digitizing.toolbar.save.state=The drawing changes will be saved in the browser
+digitizing.toolbar.save.remove=Remove draw from the browser
 digitizing.toolbar.measure=Measures
 
 digitizing.constraint.title=Constraints
diff --git a/lizmap/www/assets/css/map.css b/lizmap/www/assets/css/map.css
index 0793ee965f..b47324f512 100644
--- a/lizmap/www/assets/css/map.css
+++ b/lizmap/www/assets/css/map.css
@@ -2572,6 +2572,16 @@ input[type="color"].digitizing-color{
   vertical-align: middle;
 }
 
+.digitizing-state{
+  max-height: 100px;
+  overflow: auto;
+  font-size: 0.8em;
+  padding: 5px;
+  font-style: italic;
+  background: lightgray;
+  margin-right: 5%;
+}
+
 .digitizing-constraints input{
   width: 6em;
 }

From 43726c39e2e67ac0433b3500ec82adb3a79cf824 Mon Sep 17 00:00:00 2001
From: rldhont <rldhont@gmail.com>
Date: Mon, 15 Jul 2024 15:49:34 +0200
Subject: [PATCH 5/5] Tests e2e playwright: enhancing draw tests

* Test erase all
* Check toggle save
---
 tests/end2end/playwright/draw.spec.js | 57 +++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 3 deletions(-)

diff --git a/tests/end2end/playwright/draw.spec.js b/tests/end2end/playwright/draw.spec.js
index 329a4d4084..03ea7d5887 100644
--- a/tests/end2end/playwright/draw.spec.js
+++ b/tests/end2end/playwright/draw.spec.js
@@ -232,6 +232,54 @@ test.describe('Draw', () => {
         expect(await page.locator('#newOlMap').screenshot()).toMatchSnapshot('draw-edition.png');
     });
 
+    test('Erase all', async ({ page }) => {
+        // Polygon
+        await page.locator('#draw').getByRole('link').nth(1).click();
+        await page.locator('.digitizing-polygon > svg').click();
+        await page.locator('#newOlMap').click({
+            position: {
+                x: 290,
+                y: 50
+            }
+        });
+        await page.locator('#newOlMap').click({
+            position: {
+                x: 330,
+                y: 50
+            }
+        });
+
+        await page.locator('#newOlMap').dblclick({
+            position: {
+                x: 330,
+                y: 115
+            }
+        });
+
+        // Box
+        await page.locator('#draw').getByRole('link').nth(1).click();
+        await page.locator('.digitizing-box > svg').click();
+        await page.locator('#newOlMap').click({
+            position: {
+                x: 340,
+                y: 50
+            }
+        });
+        await page.locator('#newOlMap').click({
+            position: {
+                x: 390,
+                y: 115
+            }
+        });
+
+        expect(await page.evaluate(() => lizMap.mainLizmap.digitizing.featureDrawn)).toHaveLength(2);
+
+        page.on('dialog', dialog => dialog.accept());
+        await page.locator('.digitizing-all').click();
+
+        expect(await page.evaluate(() => lizMap.mainLizmap.digitizing.featureDrawn)).toBeNull();
+    });
+
     test('From local storage', async ({ page }) => {
         const the_json = '[{"type":"Polygon","color":"#000000","coords":[[[764321.0416656,6290805.935670358],[767628.3399468632,6290805.935670358],[767628.3399468632,6295105.423436],[764321.0416656,6295105.423436],[764321.0416656,6290805.935670358],[764321.0416656,6290805.935670358]]]}]';
         await page.evaluate(token => localStorage.setItem('testsrepository_draw_draw_drawLayer', token), the_json);
@@ -242,9 +290,10 @@ test.describe('Draw', () => {
         await reloadMap(page);
         // Display
         await page.locator('#button-draw').click();
+        await expect(page.locator('.digitizing-save')).toHaveClass(/active/);
 
         // Clear local storage
-        await page.evaluate(() => localStorage.removeItem('testsrepository_draw_draw_drawLayer'));
+        await page.locator('.digitizing-save').click();
         expect(await page.evaluate(() => localStorage.getItem('testsrepository_draw_draw_drawLayer'))).toBeNull;
 
         // Check the geometry has been drawn
@@ -290,15 +339,17 @@ test.describe('Draw', () => {
 
         // The WKT has been moved to the new storage
         const new_stored = await page.evaluate(() => localStorage.getItem('testsrepository_draw_draw_drawLayer'));
-        await expect(new_stored).toEqual(wkt);
+        await expect(new_stored).not.toBeNull();
+        await expect(new_stored).not.toEqual(wkt);
         expect(await page.evaluate(() => localStorage.getItem('testsrepository_draw_drawLayer'))).toBeNull;
 
         // Save to local storage
         await page.locator('#button-draw').click();
-        await page.locator('.digitizing-save').click();
+        await expect(page.locator('.digitizing-save')).toHaveClass(/active/);
 
         // The JSON has been stored
         const json_stored = await page.evaluate(() => localStorage.getItem('testsrepository_draw_draw_drawLayer'));
+        await expect(new_stored).toEqual(json_stored);
         // '[{"type":"Point","color":"#ff0000","coords":[770737.2003016905,6279832.319974077]}]'
         await expect(json_stored).toContain('Point');
         await expect(json_stored).not.toContain('LineString');