Changeset 5467

Timestamp:

12/17/07 05:12:56 (1 year ago)

Author:

elemoine

Message:

ModifyFeature: enable dragging without enabling vertex modifications. Special thanks to tschaub for the collaboration on all the changes to the modify feature control. And thanks to crschmidt for the review. (closes #1188)

Files:

• trunk/openlayers/examples/modify-feature.html (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Control/ModifyFeature.js (modified) (6 diffs)
• trunk/openlayers/tests/Control/test_ModifyFeature.html (modified) (4 diffs)

trunk/openlayers/examples/modify-feature.html

@@ -70 +70 @@
-        
-        function update() {
+            // reset modification mode
+            controls.modify.mode = OpenLayers.Control.ModifyFeature.RESHAPE;
-            var rotate = document.getElementById("rotate").checked;
-
+
+
+
-            var resize = document.getElementById("resize").checked;
-
+
+
+
-            var drag = document.getElementById("drag").checked;
-
+
+
+
+
+
+
+
+
-            var sides = parseInt(document.getElementById("sides").value);
-            sides = Math.max(3, isNaN(sides) ? 0 : sides);

trunk/openlayers/lib/OpenLayers/Control/ModifyFeature.js

@@ -89 +89 @@
-
-    /**
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /**
@@ -106 +108 @@
-    radiusHandle: null,
-
-    /**
-     * APIProperty: drag
-     * {Boolean} Allow dragging of feature with a drag handle.
-     */
-    drag: false,
-    
-    /**
-     * Property: dragHandle
@@ -160 +156 @@
-        this.styleVirtual.strokeOpacity = 0.3;
-        this.deleteCodes = [46, 100];
+        this.mode = OpenLayers.Control.ModifyFeature.RESHAPE;
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-        if(!(this.deleteCodes instanceof Array)) {
@@ -428 +425 @@
-        if(this.feature &&
-           this.feature.geometry.CLASS_NAME != "OpenLayers.Geometry.Point") {
-this.drag
+(this.mode & OpenLayers.Control.ModifyFeature.DRAG)
-                this.collectDragHandle();
-            }
-
+
+
-                this.collectRadiusHandle();
-
+
+
-                this.collectVertices();
-            }
@@ -554 +553 @@
-        );
-        var radius = new OpenLayers.Feature.Vector(radiusGeometry);
-this.resize
-this.rotate
+(this.mode & OpenLayers.Control.ModifyFeature.RESIZE)
+(this.mode & OpenLayers.Control.ModifyFeature.ROTATE)
-        radiusGeometry.move = function(x, y) {
-            OpenLayers.Geometry.Point.prototype.move.call(this, x, y);
@@ -594 +593 @@
-    CLASS_NAME: "OpenLayers.Control.ModifyFeature"
-});
+
+/**
+ * Constant: RESHAPE
+ * {Integer} Constant used to make the control work in reshape mode
+ */
+OpenLayers.Control.ModifyFeature.RESHAPE = 1;
+/**
+ * Constant: RESIZE
+ * {Integer} Constant used to make the control work in resize mode
+ */
+OpenLayers.Control.ModifyFeature.RESIZE = 2;
+/**
+ * Constant: ROTATE
+ * {Integer} Constant used to make the control work in rotate mode
+ */
+OpenLayers.Control.ModifyFeature.ROTATE = 4;
+/**
+ * Constant: DRAG
+ * {Integer} Constant used to make the control work in drag mode
+ */
+OpenLayers.Control.ModifyFeature.DRAG = 8;

trunk/openlayers/tests/Control/test_ModifyFeature.html

@@ -5 +5 @@
-    
-    function test_ModifyFeature_constructor(t) {
-2
+3
-        var layer = "foo";        
-        var options = {
@@ -16 +16 @@
-        t.eq(control.selectControl.geometryTypes, "bar",
-             "constructor sets options correctly on feature handler");
+        t.eq(control.mode, OpenLayers.Control.ModifyFeature.RESHAPE,
+             "constructor initializes modification mode correctly");
-    }
-
@@ -248 +250 @@
-
-    function test_ModifyFeature_resetVertices(t) {
-5
+8
-        var layer = new OpenLayers.Layer.Vector();
-        var control = new OpenLayers.Control.ModifyFeature(layer);
@@ -279 +281 @@
-        t.eq(control.virtualVertices.length, 3, "Correct virtual vertices length (polygon).");
-
-drag = true
+mode = OpenLayers.Control.ModifyFeature.DRAG
-        control.resetVertices();
-        t.ok(control.dragHandle != null, "Drag handle is set");
-4, "Correct vertices length with polygon (drag
-
-rotate = true
+0, "Correct vertices length with polygon (DRAG
+
+mode = OpenLayers.Control.ModifyFeature.ROTATE
-        control.resetVertices();
-        t.ok(control.radiusHandle != null, "Radius handle is set");
-rotate
-
-rotate = false
-ize = true
+ROTATE
+
+mode = OpenLayers.Control.ModifyFeature.RESIZE
+etVertices()
-        t.ok(control.radiusHandle != null, "Radius handle is set");
-
+
+
+
+
+
+
+
-    }    
-