Merge branch 'master' into tile-fade-in

tests/Control/TransformFeature.html

@@ -82,6 +82,44 @@
         control.box.move(center);
         t.geom_eq(control.handles[0].geometry, control.box.geometry.components[0], "handle moved with box");
     }
+    
+    function test_handleMove(t) {
+        t.plan(16);
+        var map = new OpenLayers.Map("map", {allOverlays: true});
+        var layer = new OpenLayers.Layer.Vector();
+        var feature = new OpenLayers.Feature.Vector(
+            OpenLayers.Geometry.fromWKT("POLYGON((-1 -1, 1 -1, 1 1, -1 1))"));
+        layer.addFeatures([feature]);
+        map.addLayer(layer);
+        map.setCenter(new OpenLayers.LonLat(0, 0), 18);
+        var control = new OpenLayers.Control.TransformFeature(layer);
+        map.addControl(control);
+        control.setFeature(feature);
+        
+        var bottomLeft = new OpenLayers.LonLat(-2, -2);
+        control.handles[0].move(bottomLeft);
+        t.geom_eq(control.handles[0].geometry, new OpenLayers.Geometry.Point(-2, -2), "bottom left handle at -2,-2");
+        t.geom_eq(control.handles[1].geometry, new OpenLayers.Geometry.Point(0, -2), "bottom handle at 0,-2");
+        t.geom_eq(control.handles[2].geometry, new OpenLayers.Geometry.Point(2, -2), "bottom right handle at 2,-2");
+        t.geom_eq(control.handles[3].geometry, new OpenLayers.Geometry.Point(2, 0), "right handle at 2,0");
+        t.geom_eq(control.handles[4].geometry, new OpenLayers.Geometry.Point(2, 2), "top right handle at 2,2");
+        t.geom_eq(control.handles[5].geometry, new OpenLayers.Geometry.Point(0, 2), "top handle at 0,2");
+        t.geom_eq(control.handles[6].geometry, new OpenLayers.Geometry.Point(-2, 2), "top left handle at -2,2");
+        t.geom_eq(control.handles[7].geometry, new OpenLayers.Geometry.Point(-2, 0), "left handle at -2,0");
+        
+        control.irregular = true;
+        
+        var bottomLeft = new OpenLayers.LonLat(-3, -3);
+        control.handles[0].move(bottomLeft);
+        t.geom_eq(control.handles[0].geometry, new OpenLayers.Geometry.Point(-3, -3), "bottom left handle at -3,-3");
+        t.geom_eq(control.handles[1].geometry, new OpenLayers.Geometry.Point(-0.5, -3), "bottom handle at 0,-3");
+        t.geom_eq(control.handles[2].geometry, new OpenLayers.Geometry.Point(2, -3), "bottom right handle at 2,-3");
+        t.geom_eq(control.handles[3].geometry, new OpenLayers.Geometry.Point(2, -0.5), "right handle at 2,0");
+        t.geom_eq(control.handles[4].geometry, new OpenLayers.Geometry.Point(2, 2), "top right handle at 2,2");
+        t.geom_eq(control.handles[5].geometry, new OpenLayers.Geometry.Point(-0.5, 2), "top handle at 0,2");
+        t.geom_eq(control.handles[6].geometry, new OpenLayers.Geometry.Point(-3, 2), "top left handle at -3,2");
+        t.geom_eq(control.handles[7].geometry, new OpenLayers.Geometry.Point(-3, -0.5), "left handle at -3,0");
+    }
 
     </script>
 </head>

tests/Test.AnotherWay.geom_eq.js

@@ -34,6 +34,35 @@
         }
     }
     
+    /**
+     * Function assertFloatEqual
+     * Test two objects for floating point equivalence.  Throw an exception
+     *     if not equivalent.
+     * 
+     * Parameters:
+     * got - {Object}
+     * expected - {Object}
+     * msg - {String} The message to be thrown.  This message will be appended
+     *     with ": got {got} but expected {expected}" where got and expected are
+     *     replaced with string representations of the above arguments.
+     */
+    function assertFloatEqual(got, expected, msg) {
+        var OpenLayers = Test.AnotherWay._g_test_iframe.OpenLayers;
+        if(got === undefined) {
+            got = "undefined";
+        } else if (got === null) {
+            got = "null";
+        }
+        if(expected === undefined) {
+            expected = "undefined";
+        } else if (expected === null) {
+            expected = "null";
+        }
+        if(Math.abs(got - expected) > Math.pow(10, -OpenLayers.Util.DEFAULT_PRECISION)) {
+            throw msg + ": got '" + got + "' but expected '" + expected + "'";
+        }
+    }
+    
     /**
      * Function assertGeometryEqual
      * Test two geometries for equivalence.  Geometries are considered
@@ -58,9 +87,9 @@
         
         if(got instanceof OpenLayers.Geometry.Point) {
             // compare points
-            assertEqual(got.x, expected.x, "x mismatch");
-            assertEqual(got.y, expected.y, "y mismatch");
-            assertEqual(got.z, expected.z, "z mismatch");
+            assertFloatEqual(got.x, expected.x, "x mismatch");
+            assertFloatEqual(got.y, expected.y, "y mismatch");
+            assertFloatEqual(got.z, expected.z, "z mismatch");
         } else {
             // compare components
             assertEqual(
@@ -107,4 +136,4 @@
         }
     }
     
-})();
+})();

tests/deprecated/Geometry/Rectangle.html

@@ -1,6 +1,7 @@
 <html>
 <head>
-  <script src="../OLLoader.js"></script>
+  <script src="../../OLLoader.js"></script>
+  <script src="../../../lib/deprecated.js"></script>
   <script type="text/javascript">
 
     function test_Rectangle_constructor (t) {

tests/list-tests.html

@@ -123,7 +123,6 @@
     <li>Geometry/MultiPolygon.html</li>
     <li>Geometry/Point.html</li>
     <li>Geometry/Polygon.html</li>
-    <li>Geometry/Rectangle.html</li>
     <li>Handler.html</li>
     <li>Handler/Box.html</li>
     <li>Handler/Click.html</li>
@@ -222,6 +221,7 @@
     <li>deprecated/BaseTypes/Class.html</li>
     <li>deprecated/BaseTypes/Element.html</li>
     <li>deprecated/Control/MouseToolbar.html</li>
+    <li>deprecated/Geometry/Rectangle.html</li>
     <li>deprecated/Layer/GML.html</li>
     <li>deprecated/Layer/MapServer.html</li>
     <li>deprecated/Layer/MapServer/Untiled.html</li>