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

Timestamp:

2019-01-07T15:12:19+13:00 (5 years ago)

Author:

ak19

Message:

Fixed selection bug and added colour, thickness and opacity change to history.

File:

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

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

@@ -1 +1 @@
 var prevOverlays = [];
 
-function undoMovement() {
-    console.log("*** undoMovement called");
+function undo() {
+
     for (var i = 0; i < overlays.length; i++) {
         overlays[i].setMap(null);
 
     }
-    
-    overlays = [];
-    
-    var prev_overlay = prevOverlays.pop();
-    
-    for (var i = 0; i < prev_overlay.length; i++) {
-        overlays[i] = prev_overlay[i];
-        overlays[i].setMap(map);
-    }
+    if (prevOverlays.length != 0){
+        overlays = [];
+        console.log(prevOverlays);
+        var prev_overlay = prevOverlays.pop();
+        
+        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");
+        }
+        
+    }
+    
     
 }
@@ -43 +60 @@
     var strokeOpacity = polyline.strokeOpacity;
     var strokeWeight  = polyline.strokeWeight;
-    
     var clone_path    = clonePath(path);
+    //var editable      = rect.editable;
     
     var clone_polyline = new google.maps.Polyline({
@@ -51 +68 @@
         strokeOpacity: strokeOpacity,
         strokeWeight: strokeWeight,
-        path: clone_path
+        path: clone_path,
+        draggable: true,
+        editable: false
     });
     
@@ -68 +87 @@
     var fillColor     = polygon.fillColor;
     var fillOpacity   = polygon.fillOpacity;
-    
     var clone_path    = clonePath(path);
+    //var editable      = rect.editable;
     
     var clone_polygon = new google.maps.Polygon({
@@ -78 +97 @@
         fillColor: fillColor,
         fillOpacity: fillOpacity,
-        path: clone_path
+        path: clone_path,
+        draggable: true,
+        editable: false
     });
     
@@ -94 +115 @@
     var fillOpacity   = rect.fillOpacity;
     var bounds        = rect.getBounds();
+    //var editable      = rect.editable;
     
     var clone_rect = new google.maps.Rectangle({
@@ -101 +123 @@
         fillColor: fillColor,
         fillOpacity: fillOpacity,
-        bounds: bounds
+        bounds: bounds,
+        draggable: true,
+        editable: false
     });
     
@@ -118 +142 @@
     var center        = circ.center;
     var radius        = circ.radius;
+    //var editable      = rect.editable;
     
     var clone_circ = new google.maps.Circle({
@@ -126 +151 @@
         fillOpacity: fillOpacity,
         center: center,
-        radius: radius
+        radius: radius,
+        draggable: true,
+        editable: false
     });
     
@@ -161 +188 @@
 }
 
+function overlayItemIsShape(overlay_item)
+{
+    var type = overlay_item.type;
+    
+    is_shape = (type === google.maps.drawing.OverlayType.POLYLINE)
+     || (type === google.maps.drawing.OverlayType.POLYGON)
+     || (type === google.maps.drawing.OverlayType.RECTANGLE)
+     || (type === google.maps.drawing.OverlayType.CIRCLE);
+     
+     return is_shape;
+}
+
 function historyOverlayPush()
 {
-    console.log("historyOverlayPush()");
+    console.log("comes here");
     var overlays_copy = [];
     for (var i = 0; i<overlays.length; i++) {
         var clone_shape = cloneShape(overlays[i]);
-        
-        google.maps.event.addListener(clone_shape, 'click', function () {
-            setSelection(clone_shape);
-        });
-            
+        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;
-        
     }