ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move mercator transforms to Projection.js.

Browse Source 
The SphericalMercator mixin is not required for coordinate transforms.  Default transforms included whenever Projection.js is included.
This commit is contained in:
Tim Schaub
2012-01-16 22:39:44 -07:00
parent 0e8b3f2ff8
commit 4b949176d3
5 changed files with 75 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Layer/Google/v3.html
View File

@@ -65,11 +65,7 @@
// works correctly both ways.
var gLatLng = new google.maps.LatLng(50,100);
// v3 uses sphericalMercator by default
var correspondingOLLonLat = new OpenLayers.LonLat(100,50).transform(
new OpenLayers.Projection("EPSG:4326"),
map.getProjectionObject()
);
var correspondingOLLonLat = layer.forwardMercator(100, 50);
olLonLat = layer.getOLLonLatFromMapObjectLonLat(gLatLng);
t.ok(olLonLat.equals(correspondingOLLonLat), "Translation from GLatLng to OpenLayers.LonLat works");

23
tests/Layer/SphericalMercator.html
View File

@@ -38,8 +38,8 @@
t.eq(sw.lon, -180, "Southwest lon correct");
t.eq(ne.lon, 180, "Northeast lon correct");
t.eq(sw.lat, -85.051128779807, "Southwest lat correct");
t.eq(ne.lat, 85.051128779807, "Northeast lat correct");
t.eq(sw.lat.toFixed(10), "-85.0511287798", "Southwest lat correct");
t.eq(ne.lat.toFixed(10), "85.0511287798", "Northeast lat correct");
}
function strToFixed(str, dig) {
@@ -51,22 +51,11 @@
});
}
function test_SphericalMercator_projectForward(t) {
t.plan(1);
var point = new OpenLayers.Geometry.Point(10, 20);
OpenLayers.Layer.SphericalMercator.projectForward(point);
t.eq(strToFixed(point.toString()),
strToFixed("POINT(1113194.9077777779 2273030.9266712805)"),
"point transforms from EPSG:4326 to Spherical Mercator");
}
function test_SphericalMercator_to4326(t) {
t.plan(1);
var point = new OpenLayers.Geometry.Point(1113195, 2273031);
var point = new OpenLayers.Geometry.Point(1113195, 2273031);
point.transform("EPSG:900913", "EPSG:4326");
OpenLayers.Layer.SphericalMercator.projectInverse(point);
t.eq(strToFixed(point.toString()),
strToFixed("POINT(10.000000828446318 20.000000618997227)"),
"point transforms from Spherical Mercator to EPSG:4326");
@@ -82,9 +71,9 @@
var smerc = OpenLayers.Projection.transforms["EPSG:900913"];
t.ok(smerc instanceof Object, "EPSG:900913 exists in table");
t.ok(wgs84["EPSG:900913"] === OpenLayers.Layer.SphericalMercator.projectForward,
t.ok(typeof(wgs84["EPSG:900913"]) === "function",
"from EPSG:4326 to EPSG:900913 correctly defined");
t.ok(smerc["EPSG:4326"] === OpenLayers.Layer.SphericalMercator.projectInverse,
t.ok(typeof(smerc["EPSG:4326"]) === "function",
"from EPSG:900913 to EPSG:4326 correctly defined");
}