Merge branch '2.12'

2012-05-16 21:05:47 +02:00
parent e2c9662fa1 24b1fa1b08
commit 985233c2dd
7 changed files with 81 additions and 27 deletions
--- a/lib/OpenLayers/Layer/Bing.js
+++ b/lib/OpenLayers/Layer/Bing.js
@@ -233,7 +233,8 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
            new OpenLayers.Projection("EPSG:4326")
        );
        var providers = res.imageryProviders,
-            zoom = this.serverResolutions.indexOf(this.getServerResolution()),
+            zoom = OpenLayers.Util.indexOf(this.serverResolutions,
+                                           this.getServerResolution()),
            copyrights = "", provider, i, ii, j, jj, bbox, coverage;
        for (i=0,ii=providers.length; i<ii; ++i) {
            provider = providers[i];