From 59cc18d85b672c4c426fcff04192abb9bf19bde5 Mon Sep 17 00:00:00 2001
From: Bart van den Eijnden <bartvde@opengeo.org>
Date: Tue, 10 Apr 2012 14:31:20 +0200
Subject: [PATCH] fix Bing attribution issue reported by PitneyBowes

---
 lib/OpenLayers/Layer/Bing.js |  3 ++-
 tests/Layer/Bing.html        | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/lib/OpenLayers/Layer/Bing.js b/lib/OpenLayers/Layer/Bing.js
index 8304fbe5b4..30bb412550 100644
--- a/lib/OpenLayers/Layer/Bing.js
+++ b/lib/OpenLayers/Layer/Bing.js
@@ -229,7 +229,8 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             provider = providers[i];
             for (j=0,jj=provider.coverageAreas.length; j<jj; ++j) {
                 coverage = provider.coverageAreas[j];
-                bbox = OpenLayers.Bounds.fromArray(coverage.bbox);
+                // axis order provided is Y,X
+                bbox = OpenLayers.Bounds.fromArray(coverage.bbox, true);
                 if (extent.intersectsBounds(bbox) &&
                         zoom <= coverage.zoomMax && zoom >= coverage.zoomMin) {
                     copyrights += provider.attribution + " ";
diff --git a/tests/Layer/Bing.html b/tests/Layer/Bing.html
index 8bb5016dd8..a55d2ebb24 100644
--- a/tests/Layer/Bing.html
+++ b/tests/Layer/Bing.html
@@ -98,6 +98,25 @@
             map.destroy();
         });
     }
+
+    function test_attribution_notempty(t) {
+        t.plan(1);
+        
+        var log = [];
+        var map = new OpenLayers.Map("map");
+        layer = new OpenLayers.Layer.Bing(OpenLayers.Util.applyDefaults({type: 'Road'}, options));
+        map.addLayer(layer);
+        var format = OpenLayers.String.format;
+        OpenLayers.String.format = function(tpl, options) {
+            log.push(options.copyrights);
+        }
+        map.zoomToExtent(new OpenLayers.Bounds(-14768652, 4492113, -12263964, 5744457));
+        t.delay_call(2, function() {
+            t.ok(log.join("") !== "", "Copyright not empty");
+            OpenLayers.String.format = format;
+            map.destroy();
+        });
+    }
     
     function test_getXYZ(t) {
         t.plan(1);