From e508be66d98d5a81b946148bb005e9b6d843e9af Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Wed, 13 Nov 2013 10:49:14 +0100
Subject: [PATCH] Rename ol.source.BingMapsOptions style property to imagerySet

To match the Bing Maps terminology
---
 examples/bing-maps.js                        | 2 +-
 examples/full-screen-drag-rotate-and-zoom.js | 2 +-
 examples/full-screen.js                      | 2 +-
 examples/hue-saturation.js                   | 2 +-
 examples/mobile-full-screen.js               | 2 +-
 examples/preload.js                          | 4 ++--
 src/objectliterals.jsdoc                     | 2 +-
 src/ol/source/bingmapssource.js              | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/bing-maps.js b/examples/bing-maps.js
index dc1d3078ab..68a48d9bb5 100644
--- a/examples/bing-maps.js
+++ b/examples/bing-maps.js
@@ -14,7 +14,7 @@ for (var i = 0; i < styles.length; ++i) {
     preload: Infinity,
     source: new ol.source.BingMaps({
       key: 'Ak-dzM4wZjSqTlzveKz5u0d4IQ4bRzVI309GxmkgSVr1ewS6iPSrOvOKhA-CJlm3',
-      style: styles[i]
+      imagerySet: styles[i]
     })
   }));
 }
diff --git a/examples/full-screen-drag-rotate-and-zoom.js b/examples/full-screen-drag-rotate-and-zoom.js
index 6542366377..c4f66b84d9 100644
--- a/examples/full-screen-drag-rotate-and-zoom.js
+++ b/examples/full-screen-drag-rotate-and-zoom.js
@@ -20,7 +20,7 @@ var map = new ol.Map({
     new ol.layer.Tile({
       source: new ol.source.BingMaps({
         key: 'Ak-dzM4wZjSqTlzveKz5u0d4IQ4bRzVI309GxmkgSVr1ewS6iPSrOvOKhA-CJlm3',
-        style: 'Aerial'
+        imagerySet: 'Aerial'
       })
     })
   ],
diff --git a/examples/full-screen.js b/examples/full-screen.js
index 5a71586324..6ab364c9f0 100644
--- a/examples/full-screen.js
+++ b/examples/full-screen.js
@@ -20,7 +20,7 @@ var map = new ol.Map({
     new ol.layer.Tile({
       source: new ol.source.BingMaps({
         key: 'Ak-dzM4wZjSqTlzveKz5u0d4IQ4bRzVI309GxmkgSVr1ewS6iPSrOvOKhA-CJlm3',
-        style: 'Aerial'
+        imagerySet: 'Aerial'
       })
     })
   ],
diff --git a/examples/hue-saturation.js b/examples/hue-saturation.js
index 76e9199549..8770a4ccb6 100644
--- a/examples/hue-saturation.js
+++ b/examples/hue-saturation.js
@@ -26,7 +26,7 @@ if (!ol.webgl.SUPPORTED) {
   var layer = new ol.layer.Tile({
     source: new ol.source.BingMaps({
       key: 'Ak-dzM4wZjSqTlzveKz5u0d4IQ4bRzVI309GxmkgSVr1ewS6iPSrOvOKhA-CJlm3',
-      style: 'Aerial'
+      imagerySet: 'Aerial'
     })
   });
 
diff --git a/examples/mobile-full-screen.js b/examples/mobile-full-screen.js
index 5cd9c638da..97891a85e8 100644
--- a/examples/mobile-full-screen.js
+++ b/examples/mobile-full-screen.js
@@ -16,7 +16,7 @@ var map = new ol.Map({
     new ol.layer.Tile({
       source: new ol.source.BingMaps({
         key: 'Ak-dzM4wZjSqTlzveKz5u0d4IQ4bRzVI309GxmkgSVr1ewS6iPSrOvOKhA-CJlm3',
-        style: 'Road'
+        imagerySet: 'Road'
       })
     })
   ],
diff --git a/examples/preload.js b/examples/preload.js
index 20bd2986a5..233c9e80e5 100644
--- a/examples/preload.js
+++ b/examples/preload.js
@@ -11,7 +11,7 @@ var map1 = new ol.Map({
       preload: Infinity,
       source: new ol.source.BingMaps({
         key: 'Ak-dzM4wZjSqTlzveKz5u0d4IQ4bRzVI309GxmkgSVr1ewS6iPSrOvOKhA-CJlm3',
-        style: 'Aerial'
+        imagerySet: 'Aerial'
       })
     })
   ],
@@ -29,7 +29,7 @@ var map2 = new ol.Map({
       preload: 0, // default value
       source: new ol.source.BingMaps({
         key: 'Ak-dzM4wZjSqTlzveKz5u0d4IQ4bRzVI309GxmkgSVr1ewS6iPSrOvOKhA-CJlm3',
-        style: 'AerialWithLabels'
+        imagerySet: 'AerialWithLabels'
       })
     })
   ],
diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index ad2c6a0a0e..6f6a2cc917 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -590,7 +590,7 @@
  * @property {string|undefined} culture Culture.
  * @property {string} key Bing Maps API key. Get yours at
  *     http://bingmapsportal.com/.
- * @property {string} style Style.
+ * @property {string} imagerySet Type of imagery.
  * @property {ol.TileLoadFunctionType|undefined} tileLoadFunction Optional
  *     function to load a tile given a URL.
  * @todo stability experimental
diff --git a/src/ol/source/bingmapssource.js b/src/ol/source/bingmapssource.js
index 12526ff281..81820341cb 100644
--- a/src/ol/source/bingmapssource.js
+++ b/src/ol/source/bingmapssource.js
@@ -38,7 +38,7 @@ ol.source.BingMaps = function(options) {
   this.culture_ = goog.isDef(options.culture) ? options.culture : 'en-us';
 
   var uri = new goog.Uri(
-      '//dev.virtualearth.net/REST/v1/Imagery/Metadata/' + options.style);
+      '//dev.virtualearth.net/REST/v1/Imagery/Metadata/' + options.imagerySet);
   var jsonp = new goog.net.Jsonp(uri, 'jsonp');
   jsonp.send({
     'include': 'ImageryProviders',