From 4002d780c2a3243a706cc07107a0300c18d6befb Mon Sep 17 00:00:00 2001
From: thery <Laurent.Thery@inria.fr>
Date: Fri, 28 Feb 2025 18:02:46 +0100
Subject: [PATCH] Adding errors when creating obstacles

---
 www/grid.html |  4 +++-
 www/grid.js   | 52 ++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/www/grid.html b/www/grid.html
index b8e368f..2a02878 100755
--- a/www/grid.html
+++ b/www/grid.html
@@ -39,7 +39,9 @@
   To add an obstacle, click to a first end-point (blue square)
   then click to the second end-point.<br/>
  The user interface will silently
-  refuse to add vertical obstacles or obstacles that cross existing ones.</p>
+  refuse to add <span id="vertical">vertical obstacles</span> or 
+  <span id="cross">obstacles that cross existing ones</span>.
+</p>
 <p>
   To remove an obstacle, click to a first end-point (blue square)
   then click to the second end-point.</p>
diff --git a/www/grid.js b/www/grid.js
index b104950..80564e2 100644
--- a/www/grid.js
+++ b/www/grid.js
@@ -80,6 +80,8 @@ var  obstacles = [];
 const lineColor = new THREE.Color( 'green' );
 const lineMat = new THREE.LineBasicMaterial({color: lineColor, linewidth: 1});
 
+var error = false; 
+
 function addObstacle(fX, fZ, tX, tZ) {
     if (tX < fX) {
         let xX = fX;
@@ -127,25 +129,47 @@ function addObstacle(fX, fZ, tX, tZ) {
     const v = {fX : fX, fZ : fZ, tX : tX, tZ : tZ, line : vline };
     obstacles.push(v);
     renderer.render( scene, camera );
+    cleanCells();
+    getCells();   
+}
+
+function checkCrossing (fX, fZ, tX, tZ) {
+    if (tX < fX) {
+        let xX = fX;
+        let xZ = fZ;
+        fX = tX;
+        fZ = tZ;
+        tX = xX;
+        tZ = xZ;
+    }
     var val = "";  
     for (const obstacle of obstacles) {
       val += outVal(obstacle.fX) + outVal(obstacle.fZ)
              + outVal(obstacle.tX) + outVal(obstacle.tZ);  
     } 
-    console.log("boarders " + borders.length + " obstacles " + obstacles.length);
+    val += outVal(fX) + outVal(fZ) + outVal(tX) + outVal(tZ);  
     console.log("val " + val);
     let res = ocamlLib.nointersection(val);
     console.log("intersection?");
     console.log(res);
-    if (res == "false") {
-      console.log("cancelling");
-      addObstacle(fX, fZ, tX, tZ);
-      return;
-    }
-    cleanCells();
-    getCells();   
+    return (res == "false"); 
+}
+
+function setErrorCross() {
+  error = true;
+  document.getElementById('cross').style.background = "red";
 }
 
+function setErrorVertical() {
+  error = true;
+  document.getElementById('vertical').style.background = "red";
+}
+
+function cleanError() {
+  error = false;
+  document.getElementById('vertical').style.background = "white";
+  document.getElementById('cross').style.background = "white";
+}
 
 /* The cells */
 var cells = [];
@@ -490,7 +514,10 @@ renderer.domElement.addEventListener('click', onDocumentMouseDown, false);
 var positions;
 
 function onDocumentMouseDown( event ) {
-
+   if (error) {
+    error = false;
+    cleanError();
+   }
     // Get screen-space x/y
     mouse.x = ( event.clientX / renderer.domElement.clientWidth ) * 2 - 1;
     mouse.y = - ( event.clientY / renderer.domElement.clientHeight ) * 2 + 1;
@@ -526,6 +553,7 @@ function onDocumentMouseDown( event ) {
         toZ = Math.round(gSize + posZ + 0.5) -gSize - 0.5;
         toX = Math.round(gSize + posX + 0.5) -gSize - 0.5;
         if ((fromX == toX) && (fromZ != toZ) && (modality == "obstacles")) {
+            setErrorVertical();
             return;
         }
         console.log("modality = " + modality);
@@ -538,6 +566,12 @@ function onDocumentMouseDown( event ) {
                 renderer.render( scene, camera ); 
                 return;
             }
+            if (checkCrossing(fromX, fromZ, toX, toZ)) {
+              fromValid = true;  
+              toValid = false;
+              setErrorCross();
+              return;         
+            }
             cleanCurve();
             cleanStraight();
             addObstacle(fromX, fromZ, toX, toZ);