Changeset 32722 for gs3-extensions/map-editor/DrawingManager/index.js

Timestamp:

2019-01-09T11:39:08+13:00 (5 years ago)

Author:

ak19

Message:

Redo and undo working

File:

• gs3-extensions/map-editor/DrawingManager/index.js (modified) (11 diffs)

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

@@ -8 +8 @@
 var enableSelectionFeature = false;
 var beingDragged = false;
-
+var resizeEntry = false;
 
 var deselectedLog = []
@@ -65 +65 @@
     }
     
-    document.getElementById("thicknessRange").addEventListener("mousedown", shapeSpecsChange);
-    document.getElementById("colourOpacity").addEventListener("mousedown", shapeSpecsChange);
-    document.getElementById("color-palette1").addEventListener("mousedown", shapeSpecsChange);
+    document.getElementById("thicknessRange").addEventListener("mousedown", shapeSpecsChangeMD);
+    document.getElementById("colourOpacity").addEventListener("mousedown", shapeSpecsChangeMD);
+    document.getElementById("color-palette1").addEventListener("mousedown", shapeSpecsChangeMD);
+    
+    document.getElementById("thicknessRange").addEventListener("mouseup", shapeSpecsChangeMU);
+    document.getElementById("colourOpacity").addEventListener("mouseup", shapeSpecsChangeMU);
+    //document.getElementById("color-palette1").addEventListener("mouseup", shapeSpecsChangeMU);    
 });
 
-function shapeSpecsChange() {
+function shapeSpecsChangeMD() {
     if (selectedShapes.length > 0) {
         historyOverlayPush();
 
     }
+}
+
+function shapeSpecsChangeMU() {
+    if (selectedShapes.length > 0) {
+        presentOverlayPush();
+    }       
 }
 
@@ -84 +94 @@
         selectColor(color);
         setSelectedShapeColor(color);
+        shapeSpecsChangeMU();
     });
     return button;
@@ -156 +167 @@
     google.maps.event.addListener(drawingManager, 'overlaycomplete', function (e) {
         
-        console.log(e)
-        
         historyOverlayPush();
                 
@@ -164 +173 @@
         newShape.type = e.type;
         
-        //historyOverlayPush();
+        presentOverlayPush();
         
         if (e.type !== google.maps.drawing.OverlayType.MARKER) {
@@ -235 +244 @@
     function vertexAndPolyDel(e, newShape) {
         var vertex = e.vertex;
-
+        //console.log(e)
         if (e.vertex !== undefined) {
+            historyOverlayPush();
             if (newShape.type === google.maps.drawing.OverlayType.POLYGON) {
                 var path = newShape.getPaths().getAt(e.path);
@@ -258 +268 @@
     //cLICK EVENT IF A MARKER IS CREATED
             google.maps.event.addListener(newShape, 'click', function (e) {
+                console.log("lol");
                 setSelection(newShape, e);
             });
@@ -270 +281 @@
             google.maps.event.addListener(newShape, 'click', function (e) {
                 vertexAndPolyDel(e, newShape);
-                console.log(e.edge);
-            });
-
-            google.maps.event.addListener(newShape, 'dragstart', function () {
+            });
+
+            google.maps.event.addListener(newShape, 'dragstart', function (e) {
                 beingDragged = true;
                 historyOverlayPush();
+
             });
             
             google.maps.event.addListener(newShape, 'dragend', function () {
                 beingDragged = false;
+                presentOverlayPush();
             });
             
             //Store information after the event ends
-            google.maps.event.addListener(newShape, 'bounds_changed', function () {
-                console.log("bounds_changed");
+            google.maps.event.addListener(newShape, 'bounds_changed', function (e) {
+                //console.log(e);
+                
                 if (beingDragged == false){
-                    historyOverlayPush();
+                    resizeEntry = true;
+                    presentOverlayPush();
+                    resizeEntry = false;
                 }
             });
                         
             google.maps.event.addListener(newShape, 'resize', function () {
-                console.log("lmao");
                 //historyOverlayPush();
                     
@@ -298 +312 @@
             //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 (drawingManager.drawingMode == null) {
                     setSelection(newShape, e);
@@ -457 +472 @@
 function printHistory() {
     
-    console.log(prevOverlays);
-    console.log(selectedShapes);
+    console.log("prev", prevOverlays);
+    console.log("present ", presentOverlays);
+    console.log("undone ", undoneOverlays);
+
+    
+    //for(var i = 0; i< prevOverlays.length; i++) {
+    //  console.log("prev", prevOverlays[prevOverlays.length -1][0].strokeColor);
+    //}
+    //console.log("present ", presentOverlays[0][0].strokeColor);   
 }
 
 function deleteSelectedShape() {
+    historyOverlayPush();
     for (var i = 0; i < selectedShapes.length; i++) {
         selectedShapes[i].setMap(null);
     }
     selectedShapes = [];
+    presentOverlayPush();
 }
 
 function deleteAllShape() {
+    historyOverlayPush();
     for (var i = 0; i < overlays.length; i++) {
         overlays[i].setMap(null);
@@ -474 +499 @@
     }
     overlays = [];
-}
-
+    presentOverlayPush();
+}
+