Changeset 32724

Timestamp:

2019-01-15T10:08:58+13:00 (5 years ago)

Author:

ak19

Message:

Potential fix for a history bug found after resizing rectangles and circles

Location:

gs3-extensions/map-editor/DrawingManager

Files:

• checkpt28 (added)
• checkpt28/historyManager.js (added)
• checkpt28/index.css (added)
• checkpt28/index.html (added)
• checkpt28/index.js (added)
• historyManager.js (modified) (6 diffs)
• index.js (modified) (13 diffs)

gs3-extensions/map-editor/DrawingManager/historyManager.js

@@ -27 +27 @@
 
     //Deactivated at the moment
-    if (enableSelectionFeature) {
-        selectedShapes = [];
-        var i = 0;
-        var lastEntry = prevOverlays[prevOverlays.length - 1][i];
-        console.log(prevOverlays[prevOverlays.length - 1].length);
-
-        for (var i = 0; i < lastEntry.length; i++) {
-            selectedShapes.push(prevOverlays)
-            console.log("comes here");
-        }
-
-    }
+    //if (enableSelectionFeature) {
+    //  selectedShapes = [];
+    //  var i = 0;
+    //  var lastEntry = prevOverlays[prevOverlays.length - 1][i];
+    //  console.log(prevOverlays[prevOverlays.length - 1].length);
+    //
+    //  for (var i = 0; i < lastEntry.length; i++) {
+    //      selectedShapes.push(prevOverlays)
+    //      console.log("comes here");
+    //  }
+    //
+    //}
 }
 
@@ -144 +144 @@
     var fillOpacity = rect.fillOpacity;
     var bounds = rect.getBounds();
+    var type = rect.type;
     //var editable      = rect.editable;
 
@@ -154 +155 @@
             bounds: bounds,
             draggable: true,
-            editable: false
+            editable: false,
+            type: type
         });
 
@@ -238 +240 @@
 
 function historyOverlayPush() {
+    if(undoneOverlays.length > 0) { 
+        for(var i = 0; i < undoneOverlays.length; i++) {
+            
+            entryType.pop();
+        }       
+    }
     undoneOverlays = [];
-    var overlays_copy = [];
-    for (var i = 0; i < overlays.length; i++) {
-        
-        var clone_shape = cloneShape(overlays[i]);
-        if (overlayItemIsShape(clone_shape)) {
-            addShapeListeners(clone_shape, null); // don't have an overlay event!
-        } else {
-            addMarkerListeners(clone_shape, null); // don't have an overlay event!
-        }
-        overlays_copy[i] = clone_shape;
-    }
-
-    prevOverlays.push(overlays_copy);
-
+    //if(resizeEntry){
+            //prevOverlays.push(presentOverlays[0]);
+            
+    //} else {
+        var overlays_copy = [];
+        for (var i = 0; i < overlays.length; i++) {
+            var clone_shape = cloneShape(overlays[i]);
+            if(resizeEntry) {
+                //console.log("hey lol");
+                clone_shape = cloneShape(presentOverlays[0][i]);
+            }
+            if (overlayItemIsShape(clone_shape)) {
+                addShapeListeners(clone_shape, null); // don't have an overlay event!
+            } else {
+                addMarkerListeners(clone_shape, null); // don't have an overlay event!
+            }
+            overlays_copy[i] = clone_shape;
+        }
+        prevOverlays.push(overlays_copy);       
+    //}
 }
 
 function presentOverlayPush() {
-    if (resizeEntry) {
-        prevOverlays.push(presentOverlays[0]);
-    }
+    
+    //clean the entry type array
+
+    if(resizeEntry) {
+        entryType.push("resize");
+    } else {
+        entryType.push("not resize");
+    }
+    
     presentOverlays = [];
     var overlays_copy = [];
@@ -274 +294 @@
 
 function undoneOverlaysPush() {
+    
     var conditionUndone = presentOverlays[presentOverlays.length - 1] !== undefined;
 
@@ -284 +305 @@
     if (conditionPresent) {
         presentOverlays.push(prevOverlays[prevOverlays.length - 1]);
-
-    }
-}
+    }
+}

gs3-extensions/map-editor/DrawingManager/index.js

@@ -10 +10 @@
 var opacityValue = 0.4;
 var overlays = [];
+var entryType = [];
 var drawingManager;
 var selectedShape;
@@ -42 +43 @@
         setSelectedOpacity(opacityValue);
     }
-    
+
     document.getElementById("thicknessRange").addEventListener("mousedown", shapeSpecsChangeMD);
     document.getElementById("colourOpacity").addEventListener("mousedown", shapeSpecsChangeMD);
@@ -51 +52 @@
 });
 
+document.addEventListener("mousedown", function(){
+    
+  //console.log(document.body.style.cursor);
+ // console.log(document.getElementById("map").style.cursor);
+});
 function shapeSpecsChangeMD() {
     if (selectedShapes.length > 0) {
@@ -115 +121 @@
             center: {lat: -34.397, lng: 150.644
             },
-            zoom: 8,
+            zoom: 2,
         });
 
     drawingManager = new google.maps.drawing.DrawingManager({
-            drawingMode: google.maps.drawing.OverlayType.MARKER,
+            drawingMode: google.maps.drawing.OverlayType.RECTANGLE,
             drawingControl: true,
             drawingControlOptions: {
@@ -138 +144 @@
     //overlays.push(event.overlay); // store reference to added overlay
     google.maps.event.addListener(drawingManager, 'overlaycomplete', function (e) {
+        console.log(e);
         
         historyOverlayPush();
@@ -257 +264 @@
     google.maps.event.addListener(newShape, 'dragstart', function (e) {
         
+        
+        
         beingDragged = true;
         historyOverlayPush();
@@ -278 +287 @@
     
     google.maps.event.addListener(newShape, 'drag', function (e) {
+        
+        
 
         //for(var i = 0; i < selectedShapes.length; i++) {
@@ -287 +298 @@
         //          west: selectedShapes[i].getBounds().ea.j + (selectedShapes[i].getBounds().ea.j - mal)
         //      }
-        //      selectedShapes[i].set
+        //      selectedShapes[i].setBounds
         //  } else {
-            
+        //
         //  }
         //  
@@ -299 +310 @@
     
     google.maps.event.addListener(newShape, 'dragstart', function (e) {
+        
+        //faj = newShape.bounds.fa.j;
+        //fal = newShape.bounds.fa.l;
+        //maj = newShape.bounds.ma.j;
+        //mal = newShape.bounds.ma.l;
+        
+        //console.log(faj, fal, maj, mal);
+    
         
         beingDragged = true;
@@ -315 +334 @@
         if (beingDragged == false){
             resizeEntry = true;
+            historyOverlayPush();
             presentOverlayPush();
             resizeEntry = false;
         }
+        
     });
 
     //Add an event listener to select a shape if the mouse hovers over it
     google.maps.event.addListener(newShape, 'mousedown', function (e) {
+        //console.log(e);
         if (e.vertex !== undefined || e.edge !== undefined) {
             historyOverlayPush()
@@ -355 +377 @@
     
 //Set selection for the selected overlay
-    function setSelection(shape, e) {   
-        if (shape.type !== 'marker') {
-            if (shiftKeyPressed == false) {
-                if (e.vertex == undefined) {
-                    if(e.edge == undefined) {                   
-                        clearSelection();
-                        shape.setEditable(true);
-                    }
+function setSelection(shape, e) {   
+    if (shape.type !== 'marker') {
+        if (shiftKeyPressed == false) {
+            if (e.vertex == undefined) {
+                if(e.edge == undefined) {                   
+                    clearSelection();
+                    shape.setEditable(true);
                 }
             }
-            if (selectedShapes.includes(shape)) {
-                if(e.vertex == undefined ) {
-                    if(e.edge == undefined) {
-                        //removeFromSelectedShapes(shape);
-                    }
+        }
+        if (selectedShapes.includes(shape)) {
+            if(e.vertex == undefined ) {
+                if(e.edge == undefined) {
+                    //removeFromSelectedShapes(shape);
                 }
-            } else {
-                shape.setEditable(true);
-                selectedShapes.push(shape);
-            }
-
-
-            //Send the values to be updated
-            var thi = shape.strokeWeight;
-            var opa = shape.fillOpacity;
-            var fCol = shape.fillColor;
-            var sCol = shape.strokeColor;
-            updateMenuValues(thi, opa, fCol, sCol);
-
-        } else if (shape.type == 'marker') {
-            clearSelection();
-        }
-        selectedShape = shape;
-    }
-    
+            }
+        } else {
+            shape.setEditable(true);
+            selectedShapes.push(shape);
+        }
+
+
+        //Send the values to be updated
+        var thi = shape.strokeWeight;
+        var opa = shape.fillOpacity;
+        var fCol = shape.fillColor;
+        var sCol = shape.strokeColor;
+        updateMenuValues(thi, opa, fCol, sCol);
+
+    } else if (shape.type == 'marker') {
+        clearSelection();
+    }
+    selectedShape = shape;
+}
+
+function boundsExtraction() {
+    
+    
+}
 
 function removeFromSelectedShapes(shape) {
@@ -399 +425 @@
         }
         allowDeselect = false;
-    }
-    
-    
+    }   
 }
     
@@ -468 +492 @@
 }
 
+
 function printHistory() {
     console.log("prev", prevOverlays);
     console.log("present ", presentOverlays);
     console.log("undone ", undoneOverlays);
+    console.log(entryType);
 }