Changeset 32724 for gs3-extensions/map-editor/DrawingManager/index.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/index.js (modified) (13 diffs)

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);
 }