Changeset 32732 for gs3-extensions/map-editor/DrawingManager/historyManager.js

Timestamp:

2019-01-31T17:03:19+13:00 (5 years ago)

Author:

ak19

Message:

Work to eliminate a undo history bug, and fixed the selection issue.

File:

• gs3-extensions/map-editor/DrawingManager/historyManager.js (modified) (13 diffs)

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

@@ -2 +2 @@
 var presentOverlays = [];
 var undoneOverlays = [];
-var enableSelectionFeature = false;
+var cycleComplete = true;
 
 function undo() {
-    
+
     for (var i = 0; i < overlays.length; i++) {
         overlays[i].setMap(null);
-
     }
     if (prevOverlays.length != 0) {
@@ -15 +14 @@
         undoneOverlaysPush();
         var prev_overlay = prevOverlays.pop();
-        
-        if(prev_overlay.length > 0) {
+
+        if (prev_overlay.length > 0) {
             for (var i = 0; i < prev_overlay.length; i++) {
-            overlays[i] = prev_overlay[i];
-            overlays[i].setMap(map);
-            }
-        }
-        
-
-    }
-
-    //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");
-    //  }
-    //
-    //}
+                overlays[i] = prev_overlay[i];
+                overlays[i].setMap(map);
+                overlays[i].draggable = draggableState;
+            }
+        }
+    }
 }
 
 function redo() {
-    
+
     if (undoneOverlays.length != 0) {
         selectedShapes = [];
@@ -48 +32 @@
             overlays[i].setMap(null);
         }
+
         overlays = [];
         var lastEntry = undoneOverlays[undoneOverlays.length - 1];
@@ -53 +38 @@
             overlays[i] = lastEntry[i];
             overlays[i].setMap(map);
-        }
-        var conditionPrevious = presentOverlays[presentOverlays.length - 1] !== undefined ;
-        
-        if (conditionPrevious){
-            prevOverlays.push(presentOverlays[0]);
-        }
-        
+            overlays[i].draggable = draggableState;
+        }
+
+        var conditionPrevious = presentOverlays[0];
+        if (conditionPrevious !== undefined) {
+            if (conditionPrevious.length == 0) {
+                prevOverlays.push(presentOverlays[0]);
+            } else {
+                var overlays_copy = [];
+                for (var i = 0; i < presentOverlays[0].length; i++) {
+                    var clone_shape = cloneShape(presentOverlays[0][i]);
+                    if (overlayItemIsShape(clone_shape)) {
+                        addShapeListeners(clone_shape, null);
+                    } else {
+                        addMarkerListeners(clone_shape, null);
+                    }
+                    overlays_copy[i] = clone_shape;
+                }
+                prevOverlays.push(overlays_copy);
+            }
+        }
         presentOverlays = [];
-        //console.log("last undone", undoneOverlays[undoneOverlays.length -1]);
         presentOverlays.push(undoneOverlays[undoneOverlays.length - 1]);
         undoneOverlays.pop();
-
-    }
-
+    }
 }
 
@@ -100 +96 @@
             strokeWeight: strokeWeight,
             path: clone_path,
-            draggable: true,
+            draggable: draggableState,
             editable: false
         });
@@ -128 +124 @@
             fillOpacity: fillOpacity,
             path: clone_path,
-            draggable: true,
+            draggable: draggableState,
             editable: false
         });
@@ -154 +150 @@
             fillOpacity: fillOpacity,
             bounds: bounds,
-            draggable: true,
+            draggable: draggableState,
             editable: false,
             type: type
@@ -182 +178 @@
             center: center,
             radius: radius,
-            draggable: true,
+            draggable: draggableState,
             editable: false
         });
@@ -194 +190 @@
     var position = marker.getPosition();
     var anchorPoint = marker.anchorPoint;
-    var clone_marker  = new google.maps.Marker({
-        anchorPoint: anchorPoint,
-        position : position,
-        clickable: true,
-        draggable: true,
-        editable: false 
-    })
-    clone_marker.type = google.maps.drawing.OverlayType.MARKER;
-    
+    var clone_marker = new google.maps.Marker({
+            anchorPoint: anchorPoint,
+            position: position,
+            clickable: true,
+            draggable: draggableState,
+            editable: false
+        })
+        clone_marker.type = google.maps.drawing.OverlayType.MARKER;
+
     return clone_marker;
 }
@@ -225 +221 @@
         return clone_marker;
     }
-    console.log(cloneShape);
 }
 
@@ -240 +235 @@
 
 function historyOverlayPush() {
-    if(undoneOverlays.length > 0) { 
-        for(var i = 0; i < undoneOverlays.length; i++) {
-            
-            entryType.pop();
-        }       
-    }
-    undoneOverlays = [];
-    //if(resizeEntry){
-            //prevOverlays.push(presentOverlays[0]);
-            
-    //} else {
+    if (cycleComplete) {
         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!
@@ -265 +247 @@
             overlays_copy[i] = clone_shape;
         }
-        prevOverlays.push(overlays_copy);       
-    //}
-}
-
+        undoneOverlays = [];
+        prevOverlays.push(overlays_copy);
+    }
+
+    cycleComplete = false;
+}
 function presentOverlayPush() {
-    
-    //clean the entry type array
-
-    if(resizeEntry) {
-        entryType.push("resize");
-    } else {
-        entryType.push("not resize");
-    }
-    
+
+    OVbeforeClearing = overlays;
+    PObeforeClearing = presentOverlays;
     presentOverlays = [];
     var overlays_copy = [];
@@ -291 +269 @@
     }
     presentOverlays.push(overlays_copy);
+    cycleComplete = true;
+
 }
 
 function undoneOverlaysPush() {
-    
+
     var conditionUndone = presentOverlays[presentOverlays.length - 1] !== undefined;
 
     if (conditionUndone) {
-        undoneOverlays.push(presentOverlays[0]);
-    }
-    presentOverlays = [];
+        var overlays_copy = [];
+        for (var i = 0; i < presentOverlays[0].length; i++) {
+            var 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;
+        }
+        undoneOverlays.push(overlays_copy);
+    }
+
     var conditionPresent = prevOverlays[prevOverlays.length - 1] !== undefined;
 
     if (conditionPresent) {
-        presentOverlays.push(prevOverlays[prevOverlays.length - 1]);
-    }
-}
+        presentOverlays = [];
+        var overlays_copy = [];
+        for (var i = 0; i < prevOverlays[prevOverlays.length - 1].length; i++) {
+            var clone_shape = cloneShape(prevOverlays[prevOverlays.length - 1][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;
+        }
+        presentOverlays.push(overlays_copy);
+    }
+}