Changeset 7885

Timestamp:

08/28/08 14:41:00 (3 months ago)

Author:

crschmidt

Message:

Clear bounds of geometries when reprojecting. Patch wwork by myself, tschaub,
ahocevar. r=ahocevar. (Closes #1658)

Files:

• trunk/openlayers/lib/OpenLayers/Geometry/Collection.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Geometry/LinearRing.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Geometry/Point.js (modified) (1 diff)
• trunk/openlayers/tests/Geometry/Collection.html (modified) (1 diff)
• trunk/openlayers/tests/Geometry/Point.html (modified) (1 diff)
• trunk/openlayers/tests/Geometry/Polygon.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Geometry/Collection.js

@@ -326 +326 @@
-                component.transform(source, dest);
-            }
-
+
+
-        return this;
-    },

trunk/openlayers/lib/OpenLayers/Geometry/LinearRing.js

@@ -173 +173 @@
-                component.transform(source, dest);
-            }
+            this.bounds = null;
-        }
-        return this;

trunk/openlayers/lib/OpenLayers/Geometry/Point.js

@@ -207 +207 @@
-            OpenLayers.Projection.transform(
-                this, source, dest); 
+            this.bounds = null;
-        }       
-        return this;

trunk/openlayers/tests/Geometry/Collection.html

@@ -227 +227 @@
-    }
-    
+    function test_transform(t) {
+        t.plan(5);
+        var p1 = new OpenLayers.Geometry.Point(0,0);
+        p1.bounds = "foo";
+        var p2 = new OpenLayers.Geometry.Point(1,1);
+        p2.bounds = "foo";
+        var line = new OpenLayers.Geometry.LineString([p1, p2]);
+        var multipoint = new OpenLayers.Geometry.MultiPoint([p1, p2]);
+        var coll = new OpenLayers.Geometry.Collection([
+            p1, p2, line, multipoint
+        ]);
+        coll.bounds = "foo";
+        
+        var wgs84 = new OpenLayers.Projection("EPSG:4326");
+        var sm = new OpenLayers.Projection("EPSG:900913");
+        coll.transform(wgs84, sm);
+        
+        t.eq(coll.bounds, null, "coll bounds cleared");
+        t.eq(p1.bounds, null, "p1 component bounds cleared");
+        t.eq(p2.bounds, null, "p2 component bounds cleared");
+        t.eq(line.bounds, null, "line component bounds cleared");
+        t.eq(multipoint.bounds, null, "multipoint component bounds cleared");
+
+    }
+    
-    function test_Collection_destroy(t) {
-        t.plan( 1 );

trunk/openlayers/tests/Geometry/Point.html

@@ -36 +36 @@
-        t.eq( point.bounds.top, y, "bounds.top is 20" );
-        t.eq( point.bounds.bottom, y, "bounds.bottom is 20" );
+    }
+    
+
+    function test_Point_transform_getBounds (t) {
+        t.plan(2);
+
+        var x = 10;
+        var y = 20;
+        point = new OpenLayers.Geometry.Point(x, y);
+        point.calculateBounds();
+        t.ok( point.bounds != null, "bounds calculated by calcBounds" );
+        point.transform(new OpenLayers.Projection("EPSG:4326"), 
+                        new OpenLayers.Projection("EPSG:900913"));
+        t.eq(point.bounds, null, "Point bounds cleared after transform");
-    }
-    

trunk/openlayers/tests/Geometry/Polygon.html

@@ -33 +33 @@
-    }
-    
+    function test_Polygon_transform_getBounds (t) {
+        t.plan(3);
+
+        var components = [new OpenLayers.Geometry.Point(10,14), new OpenLayers.Geometry.Point(5,3)];
+        var linearRing = new OpenLayers.Geometry.LinearRing(components);
+        polygon = new OpenLayers.Geometry.Polygon([linearRing.clone()]);
+        polygon.calculateBounds();
+        t.ok( polygon.bounds != null, "bounds calculated by calcBounds" );
+        polygon.transform(new OpenLayers.Projection("EPSG:4326"), 
+                        new OpenLayers.Projection("EPSG:900913"));
+        t.eq(polygon.bounds, null, "Point bounds cleared after transform");
+        t.eq(polygon.getBounds().toBBOX(), "556597.453889,334111.171355,1113194.907778,1574216.547942", "Bounds are correct")
+    }
+
-    function test_Polygon_getArea(t) {
-        t.plan( 5 );