Merge branch '2.12'

2012-04-20 15:29:46 +02:00
parent a73d9e3804 f36fd5f0d1
commit a57738e817
8 changed files with 27 additions and 187 deletions
@@ -232,7 +232,8 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
            this.map.getProjectionObject(),
            new OpenLayers.Projection("EPSG:4326")
        );
-        var providers = res.imageryProviders, zoom = this.map.getZoom() + 1,
+        var providers = res.imageryProviders,
+            zoom = this.serverResolutions.indexOf(this.getServerResolution()),
            copyrights = "", provider, i, ii, j, jj, bbox, coverage;
        for (i=0,ii=providers.length; i<ii; ++i) {
            provider = providers[i];