Don't set zoomOffset - maxResolution and numZoomLevels is enough. r=fredj (closes http://trac.osgeo.org/openlayers/ticket/3550)

This commit is contained in:
ahocevar
2011-12-07 14:53:53 +01:00
parent ae56952f00
commit f79520cf9d
2 changed files with 17 additions and 2 deletions
-1
View File
@@ -144,7 +144,6 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
maxResolution: Math.min( maxResolution: Math.min(
this.serverResolutions[res.zoomMin], this.maxResolution this.serverResolutions[res.zoomMin], this.maxResolution
), ),
zoomOffset: res.zoomMin,
numZoomLevels: Math.min( numZoomLevels: Math.min(
res.zoomMax + 1 - res.zoomMin, this.numZoomLevels res.zoomMax + 1 - res.zoomMin, this.numZoomLevels
) )
+17 -1
View File
@@ -41,7 +41,7 @@
var origProcessMetadata = OpenLayers.Layer.Bing.processMetadata; var origProcessMetadata = OpenLayers.Layer.Bing.processMetadata;
OpenLayers.Layer.Bing.processMetadata = function(metadata) { OpenLayers.Layer.Bing.processMetadata = function(metadata) {
meta.push(metadata); meta.push(metadata);
} };
map = new OpenLayers.Map("map"); map = new OpenLayers.Map("map");
layer = new OpenLayers.Layer.Bing(options); layer = new OpenLayers.Layer.Bing(options);
var extent; var extent;
@@ -98,6 +98,22 @@
map.destroy(); map.destroy();
}); });
} }
function test_getXYZ(t) {
t.plan(1);
var map = new OpenLayers.Map("map", {allOverlays: true});
var osm = new OpenLayers.Layer.OSM();
map.addLayer(osm);
map.zoomToExtent(new OpenLayers.Bounds(11373579,-2445208,13628777,680760));
layer = new OpenLayers.Layer.Bing(options);
map.addLayer(layer);
t.delay_call(2, function() {
var xyz = layer.getXYZ(layer.getTileBounds(new OpenLayers.Pixel(1,1)));
t.eq(xyz.z, OpenLayers.Util.indexOf(layer.serverResolutions, map.getResolution()), "zoom level correct");
});
}
function test_clone(t) { function test_clone(t) {
t.plan(1); t.plan(1);