Changeset 5316

Timestamp:

12/01/07 06:26:41 (1 year ago)

Author:

ahocevar

Message:

merging from r5246 to HEAD

Files:

• sandbox/ahocevar/styles/apidoc_config/Menu.txt (modified) (5 diffs)
• sandbox/ahocevar/styles/doc_config/Menu.txt (modified) (5 diffs)
• sandbox/ahocevar/styles/examples/modify-feature.html (modified) (3 diffs)
• sandbox/ahocevar/styles/examples/smoothDragging.html (modified) (1 diff)
• sandbox/ahocevar/styles/lib/OpenLayers/Control/ModifyFeature.js (modified) (7 diffs)
• sandbox/ahocevar/styles/lib/OpenLayers/Layer/Boxes.js (modified) (1 diff)
• sandbox/ahocevar/styles/lib/OpenLayers/Layer/Text.js (modified) (5 diffs)
• sandbox/ahocevar/styles/lib/OpenLayers/Layer/Vector.js (modified) (1 diff)
• sandbox/ahocevar/styles/lib/OpenLayers/Renderer/VML.js (modified) (1 diff)
• sandbox/ahocevar/styles/lib/OpenLayers/Tile/Image.js (modified) (5 diffs)
• sandbox/ahocevar/styles/lib/OpenLayers/Util.js (modified) (4 diffs)
• sandbox/ahocevar/styles/tests/Control/test_ModifyFeature.html (modified) (6 diffs)
• sandbox/ahocevar/styles/tests/Layer/test_Vector.html (modified) (2 diffs)
• sandbox/ahocevar/styles/tests/manual (copied) (copied from trunk/openlayers/tests/manual)
• sandbox/ahocevar/styles/tests/manual/google-panning.html (copied) (copied from trunk/openlayers/tests/manual/google-panning.html)
• sandbox/ahocevar/styles/tests/test_Util.html (modified) (5 diffs)

sandbox/ahocevar/styles/apidoc_config/Menu.txt

@@ -51 +51 @@
-   Group: Control  {
-
-no auto-title, 
+
-      File: ArgParser  (no auto-title, OpenLayers/Control/ArgParser.js)
-
-
+
-      File: DragFeature  (no auto-title, OpenLayers/Control/DragFeature.js)
-      File: DragPan  (no auto-title, OpenLayers/Control/DragPan.js)
@@ -61 +60 @@
-      File: KeyboardDefaults  (no auto-title, OpenLayers/Control/KeyboardDefaults.js)
-      File: LayerSwitcher  (no auto-title, OpenLayers/Control/LayerSwitcher.js)
+      File: ModifyFeature  (no auto-title, OpenLayers/Control/ModifyFeature.js)
-      File: MouseDefaults  (no auto-title, OpenLayers/Control/MouseDefaults.js)
-      File: MousePosition  (no auto-title, OpenLayers/Control/MousePosition.js)
@@ -66 +66 @@
-      File: Navigation  (no auto-title, OpenLayers/Control/Navigation.js)
-      File: NavToolbar  (no auto-title, OpenLayers/Control/NavToolbar.js)
+      File: OverviewMap  (no auto-title, OpenLayers/Control/OverviewMap.js)
-      File: Panel  (no auto-title, OpenLayers/Control/Panel.js)
+      File: PanZoom  (no auto-title, OpenLayers/Control/PanZoom.js)
-      File: PanZoomBar  (no auto-title, OpenLayers/Control/PanZoomBar.js)
-      File: Permalink  (no auto-title, OpenLayers/Control/Permalink.js)
@@ -72 +74 @@
-      File: SelectFeature  (no auto-title, OpenLayers/Control/SelectFeature.js)
-      File: ZoomBox  (no auto-title, OpenLayers/Control/ZoomBox.js)
-PanZoom  (OpenLayers/Control/PanZoom
+ZoomToMaxExtent  (no auto-title, OpenLayers/Control/ZoomToMaxExtent
-      }  # Group: Control
-
@@ -79 +81 @@
-   Group: Feature  {
-
-
+
+
-      File: WFS  (no auto-title, OpenLayers/Feature/WFS.js)
-      File: Vector  (no auto-title, OpenLayers/Feature/Vector.js)
-      }  # Group: Feature
-

sandbox/ahocevar/styles/doc_config/Menu.txt

@@ -53 +53 @@
-      File: Control  (OpenLayers/Control.js)
-      File: ArgParser  (no auto-title, OpenLayers/Control/ArgParser.js)
-
-
+
-      File: DragFeature  (no auto-title, OpenLayers/Control/DragFeature.js)
-      File: DragPan  (no auto-title, OpenLayers/Control/DragPan.js)
@@ -61 +60 @@
-      File: KeyboardDefaults  (no auto-title, OpenLayers/Control/KeyboardDefaults.js)
-      File: LayerSwitcher  (no auto-title, OpenLayers/Control/LayerSwitcher.js)
+      File: ModifyFeature  (no auto-title, OpenLayers/Control/ModifyFeature.js)
-      File: MouseDefaults  (no auto-title, OpenLayers/Control/MouseDefaults.js)
-      File: MousePosition  (no auto-title, OpenLayers/Control/MousePosition.js)
@@ -66 +66 @@
-      File: Navigation  (no auto-title, OpenLayers/Control/Navigation.js)
-      File: NavToolbar  (no auto-title, OpenLayers/Control/NavToolbar.js)
+      File: OverviewMap  (no auto-title, OpenLayers/Control/OverviewMap.js)
-      File: Panel  (no auto-title, OpenLayers/Control/Panel.js)
+      File: PanZoom  (no auto-title, OpenLayers/Control/PanZoom.js)
-      File: PanZoomBar  (no auto-title, OpenLayers/Control/PanZoomBar.js)
-      File: Permalink  (no auto-title, OpenLayers/Control/Permalink.js)
@@ -72 +74 @@
-      File: SelectFeature  (no auto-title, OpenLayers/Control/SelectFeature.js)
-      File: ZoomBox  (no auto-title, OpenLayers/Control/ZoomBox.js)
-PanZoom  (no auto-title, OpenLayers/Control/PanZoom
+ZoomToMaxExtent  (no auto-title, OpenLayers/Control/ZoomToMaxExtent
-      }  # Group: Control
-
@@ -80 +82 @@
-
-      File: Feature  (OpenLayers/Feature.js)
+      File: Vector  (no auto-title, OpenLayers/Feature/Vector.js)
-      File: WFS  (no auto-title, OpenLayers/Feature/WFS.js)
-      File: Vector  (no auto-title, OpenLayers/Feature/Vector.js)
-      }  # Group: Feature
-

sandbox/ahocevar/styles/examples/modify-feature.html

@@ -54 +54 @@
-                polygon: new OpenLayers.Control.DrawFeature(vectors,
-                            OpenLayers.Handler.Polygon),
+                regular: new OpenLayers.Control.DrawFeature(vectors,
+                            OpenLayers.Handler.RegularPolygon,
+                            {handlerOptions: {sides: 5}}),
-                modify: new OpenLayers.Control.ModifyFeature(vectors,
-                                                             modifyOptions)
@@ -66 +69 @@
-        }
-        
+        function update() {
+            var rotate = document.getElementById("rotate").checked;
+            controls.modify.rotate = rotate;
+            var resize = document.getElementById("resize").checked;
+            controls.modify.resize = resize;
+            var drag = document.getElementById("drag").checked;
+            controls.modify.drag = drag;
+            var sides = parseInt(document.getElementById("sides").value);
+            sides = Math.max(3, isNaN(sides) ? 0 : sides);
+            controls.regular.handler.sides = sides;
+            var irregular =  document.getElementById("irregular").checked;
+            controls.regular.handler.irregular = irregular;
+        }
-
-        function toggleControl(element) {
@@ -103 +119 @@
-            </li>
-            <li>
+                <input type="radio" name="type" value="regular" id="regularToggle" onclick="toggleControl(this);" />
+                <label for="regularToggle">draw regular polygon</label>
+                <label for="sides"> - sides</label>
+                <input id="sides" type="text" size="2" maxlength="2"
+                       name="sides" value="5" onchange="update()" />
+                <ul>
+                    <li>
+                        <input id="irregular" type="checkbox"
+                               name="irregular" onchange="update()" />
+                        <label for="irregular">irregular</label>
+                    </li>
+                </ul>
+            </li>
+            <li>
-                <input type="radio" name="type" value="modify" id="modifyToggle"
-                       onclick="toggleControl(this);" />
-                <label for="modifyToggle">modify feature</label>
+                <ul>
+                    <li>
+                        <input id="rotate" type="checkbox"
+                               name="rotate" onchange="update()" />
+                        <label for="rotate">allow rotation</label>
+                    </li>
+                    <li>
+                        <input id="resize" type="checkbox"
+                               name="resize" onchange="update()" />
+                        <label for="resize">allow resizing</label>
+                    </li>
+                    <li>
+                        <input id="drag" type="checkbox"
+                               name="drag" onchange="update()" />
+                        <label for="drag">allow dragging</label>
+                    </li>
+                </ul>
-            </li>
-        </ul>

sandbox/ahocevar/styles/examples/smoothDragging.html

@@ -9 +9 @@
-    </style>
-
-QtCjFYhdtNUZyqZQW2mFbq_dOIHBSGvjZ-C7_tXAXYdB-ehlOacmC_xA
+R_wWLPFku8Ix9i2SXYRVK3e45q1BQUd_beF8dtzKET_EteAjPdGDwqpQ
-    <script src='http://dev.virtualearth.net/mapcontrol/v3/mapcontrol.js'></script>
-    <script src="http://api.maps.yahoo.com/ajaxymap?v=3.0&appid=euzuro-openlayers"></script>

sandbox/ahocevar/styles/lib/OpenLayers/Control/ModifyFeature.js

@@ -87 +87 @@
-     */
-    virtualStyle: null,
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /**
-     * APIProperty: onModificationStart 
@@ -251 +281 @@
-    unselectFeature: function(feature) {
-        this.layer.removeFeatures(this.vertices);
-        this.layer.removeFeatures(this.virtualVertices);
-        this.vertices = [];
+        this.layer.destroyFeatures(this.virtualVertices);
-        this.virtualVertices = [];
+        if(this.dragHandle) {
+            this.layer.destroyFeatures([this.dragHandle]);
+            delete this.dragHandle;
+        }
+        if(this.radiusHandle) {
+            this.layer.destroyFeatures([this.radiusHandle]);
+            delete this.radiusHandle;
+        }
-        this.feature = null;
-        this.dragControl.deactivate();
@@ -275 +313 @@
-    dragStart: function(feature, pixel) {
-        // only change behavior if the feature is not in the vertices array
-
-
-
+
+
-            if(this.feature) {
-                // unselect the currently selected feature
@@ -316 +353 @@
-     */
-    dragVertex: function(vertex) {
+        /**
+         * Five cases:
+         * 1) dragging a simple point
+         * 2) dragging a virtual vertex
+         * 3) dragging a drag handle
+         * 4) dragging a radius handle
+         * 5) dragging a real vertex
+         */
-        if(this.feature.geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
+            // dragging a simple point
-            if(this.feature != vertex) {
-                this.feature = vertex;
-            }
-        } else {
-
+
+
-                vertex.geometry.parent.addComponent(vertex.geometry,
-                                                    vertex._index);
-                delete vertex._index;
-                OpenLayers.Util.removeItem(this.virtualVertices, vertex);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        // keep the vertex on top so it gets the mouseout after dragging
-        // this should be removed in favor of an option to draw under or
@@ -361 +418 @@
-            this.virtualVertices = [];
-        }
+        if(this.dragHandle) {
+            this.layer.destroyFeatures([this.dragHandle]);
+            this.dragHandle = null;
+        }
+        if(this.radiusHandle) {
+            this.layer.destroyFeatures([this.radiusHandle]);
+            this.radiusHandle = null;
+        }
-        if(this.feature &&
-           this.feature.geometry.CLASS_NAME != "OpenLayers.Geometry.Point") {
-
-
-
+
+
+
+
+
+
+
+
-        }
-    },
@@ -386 +456 @@
-            if(vertex &&
-               OpenLayers.Util.indexOf(this.vertices, vertex) != -1 &&
-
+
+
-                // remove the vertex
-                vertex.geometry.parent.removeComponent(vertex.geometry);
@@ -443 +514 @@
-                }
-            }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    },
-

sandbox/ahocevar/styles/lib/OpenLayers/Layer/Boxes.js

@@ -9 +9 @@
- *
- * Class: OpenLayers.Layer.Boxes
-
+x
- *
- * Inherits from:

sandbox/ahocevar/styles/lib/OpenLayers/Layer/Text.js

@@ -9 +9 @@
- *
- * Class: OpenLayers.Layer.Text
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- *  - <OpenLayers.Layer.Markers>
- */
@@ -18 +42 @@
-    /**
-     * APIProperty: location 
-store url of text file - this should be specified in the 
-"options" hashtable
+URL of text file.  Must be specified in the "options" argument
+of the constructor
-     */
-    location:null,
@@ -36 +60 @@
-
-    /**
-
-
-
-
-
-* options - {Object} Hashtable of extra options to tag onto
-*                    the layer. Must include "location"
-
+ 
+ 
+ 
+ 
+ 
+ * options - {Object} Object with properties to be set on the layer.
+ *     Must include <location>
+ 
-    initialize: function(name, options) {
-        OpenLayers.Layer.Markers.prototype.initialize.apply(this, arguments);
@@ -59 +83 @@
-    },
-
-
+ 
-     * APIMethod: destroy 
-     */
@@ -199 +223 @@
-    CLASS_NAME: "OpenLayers.Layer.Text"
-});
-     
-    

sandbox/ahocevar/styles/lib/OpenLayers/Layer/Vector.js

@@ -308 +308 @@
-    /**
-     * APIMethod: destroyFeatures
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    },

sandbox/ahocevar/styles/lib/OpenLayers/Renderer/VML.js

@@ -141 +141 @@
-     *
-     * Parameters:
-
+An VML element to decorate
-     * style - {Object}
-
-isFilled - {Boolean} 
-isStroked -
+Currently supported options include 
+                             'isFilled' {Boolean} and
+                             'isStroked'
-     * geometry - {<OpenLayers.Geometry>}
-     */

sandbox/ahocevar/styles/lib/OpenLayers/Tile/Image.js

@@ -37 +37 @@
-    frame: null, 
-
+    
+    /**
+     * Property: layerAlphaHack
+     * {Boolean} True if the png alpha hack needs to be applied on the layer's div.
+     */
+    layerAlphaHack: null,
+
-    /** TBD 3.0 - reorder the parameters to the init function to remove 
-     *             URL. the getUrl() function on the layer gets called on 
@@ -59 +66 @@
-        this.frame.style.overflow = 'hidden'; 
-        this.frame.style.position = 'absolute'; 
+
+        this.layerAlphaHack = this.layer.alpha && OpenLayers.Util.alphaHack();
-    },
-
@@ -116 +125 @@
-
-        var imageSize = this.layer.getImageSize(); 
-.alpha
+AlphaHack
-            OpenLayers.Util.modifyAlphaImageDiv(this.imgDiv,
-                    null, null, imageSize, this.url);
@@ -147 +156 @@
-        var size = this.layer.getImageSize(); 
-     
-.alpha
+AlphaHack
-            this.imgDiv = OpenLayers.Util.createAlphaImageDiv(null,
-                                                           offset,
@@ -231 +240 @@
-        // from the map, in which case this check is not needed.  
-        if (this.layer) {
-.alpha
+AlphaHack
-            if (!OpenLayers.Util.isEquivalentUrl(loaded, this.url)) {
-                this.imgDiv.style.display = "none";

sandbox/ahocevar/styles/lib/OpenLayers/Util.js

@@ -39 +39 @@
- * APIFunction: extend
- * Copy all properties of a source object to a destination object.  Modifies
-
+
+
- *
- * Parameters:
@@ -51 +52 @@
-    if(destination && source) {
-        for(var property in source) {
-
+
+
+
+
-        }
-        /**
@@ -370 +374 @@
-    
-    try { 
-document.body.filters
+!!(document.body.filters)
-    } catch (e) {
-    }    
@@ -490 +494 @@
-/** 
- * Function: applyDefaults
- hashtable and copies any key
-hashtable
+n object and copies any propertie
+properties
- *     Prototype.js.
- * 
- * Parameters:
-
-
+
+
+
+
+
+
+
- */
-OpenLayers.Util.applyDefaults = function (to, from) {
-    for (var key in from) {
-
+
+
+
-            to[key] = from[key];
-        }
-    }
+    /**
+     * IE doesn't include the toString property when iterating over an object's
+     * properties with the for(property in object) syntax.  Explicitly check if
+     * the source has its own toString property.
+     */
+    if(from.hasOwnProperty
+       && from.hasOwnProperty('toString') && !to.hasOwnProperty('toString')) {
+        to.toString = from.toString;
+    }
+    
-    return to;
-};

sandbox/ahocevar/styles/tests/Control/test_ModifyFeature.html

@@ -191 +191 @@
-        control.onModificationEnd = function (feature) { t.eq(feature.id, fakeFeature.id, "onModificationEnd got feature.") }
-        layer.removeFeatures = function(verts) {
-
+
+
+
+
-        }
-        control.unselectFeature(fakeFeature);
@@ -215 +218 @@
-        
-        control.collectVertices = function() { 
+          t.ok(true, "collectVertices called"); 
-          this.vertices = 'a';
-          this.virtualVertices = 'd';
-
+
+
-        }
-        
@@ -243 +248 @@
-
-    function test_ModifyFeature_resetVertices(t) {
-9
+15
-        var layer = new OpenLayers.Layer.Vector();
-        var control = new OpenLayers.Control.ModifyFeature(layer);
@@ -254 +259 @@
-        t.eq(control.vertices.length, 0, "Correct vertices length");
-        t.eq(control.virtualVertices.length, 0, "Correct virtual vertices length.");
-
+
-        var multiPoint = new OpenLayers.Geometry.MultiPoint([point, point2]);
-        control.feature = new OpenLayers.Feature.Vector(multiPoint);
@@ -274 +279 @@
-        t.eq(control.virtualVertices.length, 3, "Correct virtual vertices length (polygon).");
-
+        control.drag = true;
+        control.resetVertices();
+        t.ok(control.dragHandle != null, "Drag handle is set");
+        t.eq(control.vertices.length, 4, "Correct vertices length with polygon (drag)");
+
+        control.rotate = true;
+        control.resetVertices();
+        t.ok(control.radiusHandle != null, "Radius handle is set");
+        t.eq(control.vertices.length, 0, "Correct vertices length with polygon (rotate)");
+
+        control.rotate = false;
+        control.resize = true;
+        t.ok(control.radiusHandle != null, "Radius handle is set");
+        t.eq(control.vertices.length, 0, "Correct vertices length with polygon (resize)");
-    }    
-        
@@ -290 +309 @@
-         'id': 'fakeFeature'
-        };
-
-
+
+
+
+
+
+
+
+
+
+
+
-            this.vertices = 'normal';
-            this.virtualVertices = 'virtual';
-
-
-
-
-
-
-
-
-
+
+
-        }
-        control.feature = fakeFeature;

sandbox/ahocevar/styles/tests/Layer/test_Vector.html

@@ -131 +131 @@
-
-    function test_Layer_Vector_destroyFeatures (t) {
-3
+5
-        layer = new OpenLayers.Layer.Vector(name);
-        var map = new OpenLayers.Map('map');
@@ -146 +146 @@
-        t.eq(layer.features.length, 0, "destroyFeatures triggers removal");
-        t.eq(layer.selectedFeatures, [], "Destroy features removes selected features");
+        features = [];
+        for (var i = 0; i < 5; i++) {
+            features.push(new OpenLayers.Feature.Vector(
+                          new OpenLayers.Geometry.Point(0,0)));
+        }
+        layer.addFeatures(features);
+        layer.selectedFeatures.push(features[0]);
+        layer.selectedFeatures.push(features[1]);
+        layer.destroyFeatures([features[0], features[1]]);
+        t.eq(layer.features.length, 3, "destroyFeatures removes appropriate features");
+        t.eq(layer.selectedFeatures, [], "destroyFeatures removes appropriate selected features");
-    }
-

sandbox/ahocevar/styles/tests/test_Util.html

@@ -142 +142 @@
-    }
-
-06_
-
-8
+
+
+10
-        
-        var to = { 
-            'a': "abra",
-
+
+
-        };
-
-        var from = { 
-            'b': "zoink",
-
+
+
+
-        };
-
@@ -168 +171 @@
-        t.eq( ret["b"], "blorg", "key present in ret and from, maintained in ret");
-        t.eq( ret["c"], "press", "key present in from and not ret successfully copied to ret");
+        t.eq(to.toString(), "works", "correctly applies custom toString");
+        t.eq(to.n, null, "correctly preserves null");
-    }
-
@@ -587 +592 @@
-
-    function tests_Util_extend(t) {
-5
+6
-
-        var source = {
@@ -599 +604 @@
-            toString: function() {
-                return "source";
-
-
-
+
+
+
+
-        t.eq(destination.num, source.num,
-             "extend properly sets primitive property on destination");
@@ -610 +616 @@
-        t.eq(destination.toString(), "source",
-             "extend properly sets custom toString method");
+        t.eq(destination.nada, "untouched",
+             "undefined source properties don't clobber existing properties");
-        t.eq(window.property, undefined, "Property variable not clobbered.");
-    }