Changeset 5452

Timestamp:

12/16/07 22:12:57 (1 year ago)

Author:

crschmidt

Message:

Add support for reprojection of lonlats/bounds. (Closes #1213)

Files:

• trunk/openlayers/lib/OpenLayers/BaseTypes/Bounds.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/BaseTypes/LonLat.js (modified) (1 diff)
• trunk/openlayers/tests/BaseTypes/test_Bounds.html (modified) (1 diff)
• trunk/openlayers/tests/BaseTypes/test_LonLat.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/BaseTypes/Bounds.js

@@ -426 +426 @@
-        return quadrant; 
-    },
+    
+    /**
+     * APIMethod: transform
+     * Transform the Bounds object from source to dest. 
+     *
+     * Parameters: 
+     * source - {<OpenLayers.Projection>} Source projection. 
+     * dest   - {<OpenLayers.Projection>} Destination projection. 
+     *
+     * Returns:
+     * {<OpenLayers.Bounds>} Itself, for use in chaining operations.
+     */
+    transform: function(source, dest) {
+        var ll = OpenLayers.Projection.transform(
+            {'x': this.left, 'y': this.bottom}, source, dest);
+        var ur = OpenLayers.Projection.transform(
+            {'x': this.right, 'y': this.top}, source, dest);
+        this.left   = ll.x;
+        this.bottom = ll.y;
+        this.right  = ur.x;
+        this.top    = ur.y;
+        return this;
+    },
-
-    /**

trunk/openlayers/lib/OpenLayers/BaseTypes/LonLat.js

@@ -113 +113 @@
-        return equals;
-    },
+
+    /**
+     * APIMethod: transform
+     * Transform the LonLat object from source to dest. 
+     *
+     * Parameters: 
+     * source - {<OpenLayers.Projection>} Source projection. 
+     * dest   - {<OpenLayers.Projection>} Destination projection. 
+     *
+     * Returns:
+     * {<OpenLayers.LonLat>} Itself, for use in chaining operations.
+     */
+    transform: function(source, dest) {
+        var point = OpenLayers.Projection.transform(
+            {'x': this.lon, 'y': this.lat}, source, dest);
+        this.lon = point.x;
+        this.lat = point.y;
+        return this;
+    },
-    
-    /**

trunk/openlayers/tests/BaseTypes/test_Bounds.html

@@ -495 +495 @@
-
-      }
+    function test_Bounds_transform(t) {
+        t.plan( 3 );
+        bounds = new OpenLayers.Bounds(10, -10, 20, 10);
+        bounds.transform(new OpenLayers.Projection("foo"), new OpenLayers.Projection("Bar")); 
+        t.eq(bounds.toBBOX(), "10,-10,20,10", "null transform okay");
+        bounds.transform(new OpenLayers.Projection("EPSG:4326"), new OpenLayers.Projection("EPSG:900913")); 
+        t.eq(bounds.toBBOX(), "1113194.907778,-1118889.974702,2226389.815556,1118889.974702", "bounds for spherical mercator transform are correct");
+        bounds.transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326")); 
+        t.eq(bounds.toBBOX(), "10,-10,20,10", "bounds for inverse spherical mercator transform are correct");
+    }
-
-    function test_17_Bounds_add(t) {

trunk/openlayers/tests/BaseTypes/test_LonLat.html

@@ -103 +103 @@
-    }
-
+    function test_LonLat_transform(t) {
+        t.plan( 6 );
+        lonlat = new OpenLayers.LonLat(10, -10);
+        lonlat.transform(new OpenLayers.Projection("foo"), new OpenLayers.Projection("Bar")); 
+        t.eq(lonlat.lon, 10, "lon for null transform is the same")
+        t.eq(lonlat.lat, -10, "lat for null transform is the same")
+        lonlat.transform(new OpenLayers.Projection("EPSG:4326"), new OpenLayers.Projection("EPSG:900913")); 
+        t.eq(Math.round(lonlat.lon), 1113195, "lon for spherical mercator transform is correct");
+        t.eq(Math.round(lonlat.lat), -1118890, "lat for spherical mercator correct")
+        lonlat.transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326")); 
+        t.eq(lonlat.lon, 10, "lon for inverse spherical mercator transform is correct");
+        t.eq(Math.round(lonlat.lat), -10, "lat for inverse spherical mercator correct")
+    }
+    
-    function test_08_LonLat_wrapDateLine(t) {
-        t.plan( 6 );