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

@@ -12,9 +12,9 @@ goog.require('ol.projection');
/**
* @constructor
* @extends {goog.events.EventTarget}
* @param {ol.source.SourceOptions} sourceOptions Source options.
* @param {ol.source.SourceOptions} options Source options.
*/
ol.source.Source = function(sourceOptions) {
ol.source.Source = function(options) {
goog.base(this);
@@ -22,28 +22,28 @@ ol.source.Source = function(sourceOptions) {
* @private
* @type {ol.Projection}
*/
this.projection_ = ol.projection.get(sourceOptions.projection);
this.projection_ = ol.projection.get(options.projection);
/**
* @private
* @type {ol.Extent}
*/
this.extent_ = goog.isDef(sourceOptions.extent) ?
sourceOptions.extent : goog.isDef(sourceOptions.projection) ?
this.extent_ = goog.isDef(options.extent) ?
options.extent : goog.isDef(options.projection) ?
this.projection_.getExtent() : null;
/**
* @private
* @type {Array.<ol.Attribution>}
*/
this.attributions_ = goog.isDef(sourceOptions.attributions) ?
sourceOptions.attributions : null;
this.attributions_ = goog.isDef(options.attributions) ?
options.attributions : null;
/**
* @private
* @type {string|undefined}
*/
this.logo_ = sourceOptions.logo;
this.logo_ = options.logo;
};
goog.inherits(ol.source.Source, goog.events.EventTarget);