Be more consistent with source options

This commit is contained in:
Tom Payne
2013-04-06 19:15:29 +02:00
parent ac8762b493
commit a537632199
12 changed files with 85 additions and 95 deletions

View File

@@ -20,9 +20,9 @@ goog.require('ol.tilegrid.XYZ');
/**
* @constructor
* @extends {ol.source.ImageTileSource}
* @param {ol.source.BingMapsOptions} bingMapsOptions Bing Maps options.
* @param {ol.source.BingMapsOptions} options Bing Maps options.
*/
ol.source.BingMaps = function(bingMapsOptions) {
ol.source.BingMaps = function(options) {
goog.base(this, {
crossOrigin: 'anonymous',
@@ -34,8 +34,7 @@ ol.source.BingMaps = function(bingMapsOptions) {
* @private
* @type {string}
*/
this.culture_ = goog.isDef(bingMapsOptions.culture) ?
bingMapsOptions.culture : 'en-us';
this.culture_ = goog.isDef(options.culture) ? options.culture : 'en-us';
/**
* @private
@@ -44,12 +43,11 @@ ol.source.BingMaps = function(bingMapsOptions) {
this.ready_ = false;
var uri = new goog.Uri(
'//dev.virtualearth.net/REST/v1/Imagery/Metadata/' +
bingMapsOptions.style);
'//dev.virtualearth.net/REST/v1/Imagery/Metadata/' + options.style);
var jsonp = new goog.net.Jsonp(uri, 'jsonp');
jsonp.send({
'include': 'ImageryProviders',
'key': bingMapsOptions.key
'key': options.key
}, goog.bind(this.handleImageryMetadataResponse, this));
};