From f38d8bf824ba12b7bdf3ed405fb927b19b55dd07 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Wed, 3 Feb 2016 21:37:26 -0700 Subject: [PATCH] Remove use of goog.object.get() --- src/ol/source/imagewmssource.js | 8 +++----- src/ol/source/tilewmssource.js | 6 ++---- src/ol/style/atlasmanager.js | 4 +--- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/ol/source/imagewmssource.js b/src/ol/source/imagewmssource.js index 9fc3d80de3..ea9184dcba 100644 --- a/src/ol/source/imagewmssource.js +++ b/src/ol/source/imagewmssource.js @@ -3,14 +3,13 @@ goog.provide('ol.source.ImageWMS'); goog.require('goog.asserts'); -goog.require('ol.events'); -goog.require('ol.events.EventType'); -goog.require('goog.object'); goog.require('goog.string'); goog.require('goog.uri.utils'); goog.require('ol'); goog.require('ol.Image'); goog.require('ol.ImageLoadFunctionType'); +goog.require('ol.events'); +goog.require('ol.events.EventType'); goog.require('ol.extent'); goog.require('ol.object'); goog.require('ol.proj'); @@ -372,7 +371,6 @@ ol.source.ImageWMS.prototype.updateParams = function(params) { * @private */ ol.source.ImageWMS.prototype.updateV13_ = function() { - var version = - goog.object.get(this.params_, 'VERSION', ol.DEFAULT_WMS_VERSION); + var version = this.params_['VERSION'] || ol.DEFAULT_WMS_VERSION; this.v13_ = goog.string.compareVersions(version, '1.3') >= 0; }; diff --git a/src/ol/source/tilewmssource.js b/src/ol/source/tilewmssource.js index 4ba0730b2d..b35a17b2f7 100644 --- a/src/ol/source/tilewmssource.js +++ b/src/ol/source/tilewmssource.js @@ -6,7 +6,6 @@ goog.provide('ol.source.TileWMS'); goog.require('goog.asserts'); goog.require('goog.math'); -goog.require('goog.object'); goog.require('goog.string'); goog.require('goog.uri.utils'); goog.require('ol'); @@ -36,7 +35,7 @@ ol.source.TileWMS = function(opt_options) { var params = options.params || {}; - var transparent = goog.object.get(params, 'TRANSPARENT', true); + var transparent = 'TRANSPARENT' in params ? params['TRANSPARENT'] : true; goog.base(this, { attributions: options.attributions, @@ -389,7 +388,6 @@ ol.source.TileWMS.prototype.updateParams = function(params) { * @private */ ol.source.TileWMS.prototype.updateV13_ = function() { - var version = - goog.object.get(this.params_, 'VERSION', ol.DEFAULT_WMS_VERSION); + var version = this.params_['VERSION'] || ol.DEFAULT_WMS_VERSION; this.v13_ = goog.string.compareVersions(version, '1.3') >= 0; }; diff --git a/src/ol/style/atlasmanager.js b/src/ol/style/atlasmanager.js index 3a0a18ce7e..ef1759fc8e 100644 --- a/src/ol/style/atlasmanager.js +++ b/src/ol/style/atlasmanager.js @@ -3,7 +3,6 @@ goog.provide('ol.style.AtlasManager'); goog.require('goog.asserts'); goog.require('goog.functions'); -goog.require('goog.object'); goog.require('ol'); @@ -310,8 +309,7 @@ ol.style.Atlas = function(size, space) { * @return {?ol.style.AtlasInfo} The atlas info. */ ol.style.Atlas.prototype.get = function(id) { - return /** @type {?ol.style.AtlasInfo} */ ( - goog.object.get(this.entries_, id, null)); + return this.entries_[id] || null; };