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

Handle projections with different aliases: smarter Projection.equals and Layer.WMS.getFullRequestString methods. r=tschaub (closes #2914)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@10869 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
ahocevar
2010-11-05 07:33:38 +00:00
parent aa9112c494
commit b9517a4cb5
4 changed files with 103 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Layer/WMS.html
+18 -4
View File
@@ -230,15 +230,15 @@
function test_Layer_WMS_getFullRequestString (t) {
t.plan( 2 );
t.plan( 3 );
var map = new OpenLayers.Map('map');
map.projection = "xx";
tUrl = "http://octo.metacarta.com/cgi-bin/mapserv";
tParams = { layers: 'basic',
var tUrl = "http://octo.metacarta.com/cgi-bin/mapserv";
var tParams = { layers: 'basic',
format: 'image/png'};
var tLayer = new OpenLayers.Layer.WMS(name, tUrl, tParams);
map.addLayer(tLayer);
str = tLayer.getFullRequestString();
var str = tLayer.getFullRequestString();
var tParams = {
LAYERS: "basic", FORMAT: "image/png", SERVICE: "WMS",
VERSION: "1.1.1", REQUEST: "GetMap", STYLES: "",
@@ -257,6 +257,20 @@
tUrl + "?" + OpenLayers.Util.getParameterString(tParams),
"getFullRequestString() by default does *not* add SRS value if projection is 'none'");
map.destroy();
map = new OpenLayers.Map("map", {projection: "EPSG:4326"});
var layerProj = new OpenLayers.Projection("FOO", {
equals: function() {return true},
getCode: function() {return "FOO"}
});
tLayer = new OpenLayers.Layer.WMS(name, tUrl, tParams, {projection: layerProj});
map.addLayer(tLayer);
str = tLayer.getFullRequestString();
tParams.SRS = "FOO";
t.eq(str,
tUrl + "?" + OpenLayers.Util.getParameterString(tParams),
"getFullRequestString() uses the layer projection if it equals the map projection");
map.destroy();
}
tests/Projection.html
+41 -1
View File
@@ -21,7 +21,47 @@
t.eq(projection.equals(null), false, "equals on null projection returns false");
t.eq(projection.equals({}), false, "equals on null projection object returns false (doesn't call getCode)");
}
}
function test_Projection_equals(t) {
t.plan(8);
var origTransforms = OpenLayers.Util.extend({}, OpenLayers.Projection.transforms);
OpenLayers.Projection.addTransform("EPSG:4326", "FOO", OpenLayers.Projection.nullTransform);
OpenLayers.Projection.addTransform("FOO", "EPSG:4326", OpenLayers.Projection.nullTransform);
var projection = new OpenLayers.Projection("FOO");
t.eq(projection.equals(new OpenLayers.Projection("EPSG:4326")), true, "EPSG:4326 and FOO are equal without proj4js");
t.eq(projection.equals(new OpenLayers.Projection("EPSG:900913")), false, "EPSG:900913 and FOO are not equal without proj4js");
t.eq(new OpenLayers.Projection("EPSG:4326").equals(new OpenLayers.Projection("EPSG:4326")), true, "EPSG:4326 and EPSG:4326 are equal without proj4js");
t.eq(new OpenLayers.Projection("BAR").equals(new OpenLayers.Projection("EPSG:4326")), false, "Projection.equals() returns false for unknown projections withoug proj4js");
OpenLayers.Projection.transforms = origTransforms;
var proj1 = new OpenLayers.Projection("EPSG:4326");
var proj2 = new OpenLayers.Projection("FOO");
var proj3 = new OpenLayers.Projection("EPSG:900913");
var proj4 = new OpenLayers.Projection("EPSG:4326");
var proj5 = new OpenLayers.Projection("BAR");
// conditionally mock up proj4js
var hasProj = !!window.Proj4js;
if (!hasProj) {
window.Proj4js = true;
}
proj1.proj = {defData: "+title= WGS84 +foo=bar +x=0"};
proj2.proj = {defData: "+title=FOO +foo=bar +x=0", srsCode: "FOO"};
proj3.proj = {defData: "+title=Web Mercator +foo=bar +x=0 +I=am-different"};
proj4.proj = proj1.proj;
proj5.proj = {srsCode: "BAR"};
t.eq(proj2.equals(proj1), true, "EPSG:4326 and FOO are equal with proj4js");
t.eq(proj2.equals(proj3), false, "EPSG:900913 and FOO are not equal with proj4js");
t.eq(proj1.equals(proj4), true, "EPSG:4326 and EPSG:4326 are equal with proj4js");
t.eq(proj2.equals(proj5), false, "Projection.equals() returns false for unknown projections with proj4js");
if (!hasProj) {
delete window.Proj4js
}
}
</script>
</head>