fix(isochrone): wrong rules for form validation

IGNF · Nov 27, 2024 · e6290de · e6290de
1 parent 8956278
commit e6290de
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/src/js/isochrone/isochrone-dom.js b/src/js/isochrone/isochrone-dom.js
@@ -190,7 +190,22 @@ let IsochroneDOM = {
           });
         }
         e.target.value = !!e.target.value && parseFloat(e.target.value) < 0 ? 0 : parseFloat(e.target.value) > limit ? limit : e.target.value;
-        if (e.target.value > 0 && self.dom.location.dataset.coordinates) {
+      };
+    };
+
+    const checkInputValidity = (checkBox) => {
+      return function(e) {
+        if (e.target.value > 0 && checkBox.checked && self.dom.location.dataset.coordinates) {
+          self.dom.isochroneCompute.classList.remove("disabled");
+        } else {
+          self.dom.isochroneCompute.classList.add("disabled");
+        }
+      };
+    };
+
+    const checkCheckboxValidity = (input) => {
+      return function(e) {
+        if (input.value > 0 && e.target.checked && self.dom.location.dataset.coordinates) {
           self.dom.isochroneCompute.classList.remove("disabled");
         } else {
           self.dom.isochroneCompute.classList.add("disabled");
@@ -200,6 +215,11 @@ let IsochroneDOM = {
 
     this.dom.durationValueMinutes.addEventListener("input", limitInputValue(60));
     this.dom.distanceValue.addEventListener("input", limitInputValue(50));
+    this.dom.durationValueMinutes.addEventListener("input", checkInputValidity(this.dom.modeDuration));
+    this.dom.distanceValue.addEventListener("input", checkInputValidity(this.dom.modeDistance));
+
+    this.dom.modeDistance.addEventListener("change", checkCheckboxValidity(this.dom.distanceValue));
+    this.dom.modeDuration.addEventListener("change", checkCheckboxValidity(this.dom.durationValueMinutes));
 
     this.dom.showOutPoisChk.addEventListener("change", (e) => {
       if (e.target.checked) {

diff --git a/src/js/isochrone/isochrone.js b/src/js/isochrone/isochrone.js
@@ -410,10 +410,21 @@ class Isochrone {
     this.map.moveLayer(this.configuration.source, this.configuration.source + "line");
   }
 
+  /**
+   * nettoyage du formularie
+   * @public
+   */
+  clearForm() {
+    this.dom.location.value = "";
+    this.dom.location.dataset.coordinates = "";
+    this.dom.distanceValue.value = "";
+    this.dom.durationValueMinutes.value = "";
+    this.dom.clearLocation.classList.add("d-none");
+  }
+
   /**
    * nettoyage du tracé
    * @public
-   * @todo supprimer la couche POI isochrone
    */
   clear() {
     // stopper le fetch en cours sur le service
@@ -520,7 +531,9 @@ class Isochrone {
       target.dataset.coordinates = "[" + e.detail.coordinates.lon + "," + e.detail.coordinates.lat + "]";
       target.value = e.detail.text;
       self.dom.clearLocation.classList.remove("d-none");
-      if (parseFloat(self.dom.distanceValue.value) > 0 || parseFloat(self.dom.durationValueMinutes.value) > 0) {
+      if (self.dom.modeDistance.checked && parseFloat(self.dom.distanceValue.value) > 0 ||
+        self.dom.modeDuration.checked && parseFloat(self.dom.durationValueMinutes.value) > 0
+      ) {
         self.dom.isochroneCompute.classList.remove("disabled");
       }
       // on supprime les écouteurs

diff --git a/src/js/nav.js b/src/js/nav.js
@@ -555,6 +555,7 @@ class MenuNavigation {
       DOM.$fullScreenBtn.classList.remove("highest");
       DOM.$backTopLeftBtn.classList.add("d-none");
       Globals.isochrone.clear();
+      Globals.isochrone.clearForm();
       Globals.interactivityIndicator.enable();
       break;
     case "search":