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

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

File:

• gs3-extensions/map-editor/DrawingManager/historyManager.js (modified) (6 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]);
-
-    }
-}
+    }
+}