ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove use of goog.object.get()

Browse Source
This commit is contained in:
Tim Schaub
2016-02-03 21:37:26 -07:00
parent 8b9c393820
commit f38d8bf824
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/source/imagewmssource.js
+3 -5
View File
@@ -3,14 +3,13 @@
goog.provide('ol.source.ImageWMS'); goog.provide('ol.source.ImageWMS');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('ol.events');
goog.require('ol.events.EventType');
goog.require('goog.object');
goog.require('goog.string'); goog.require('goog.string');
goog.require('goog.uri.utils'); goog.require('goog.uri.utils');
goog.require('ol'); goog.require('ol');
goog.require('ol.Image'); goog.require('ol.Image');
goog.require('ol.ImageLoadFunctionType'); goog.require('ol.ImageLoadFunctionType');
goog.require('ol.events');
goog.require('ol.events.EventType');
goog.require('ol.extent'); goog.require('ol.extent');
goog.require('ol.object'); goog.require('ol.object');
goog.require('ol.proj'); goog.require('ol.proj');
@@ -372,7 +371,6 @@ ol.source.ImageWMS.prototype.updateParams = function(params) {
* @private * @private
*/ */
ol.source.ImageWMS.prototype.updateV13_ = function() { ol.source.ImageWMS.prototype.updateV13_ = function() {
var version = var version = this.params_['VERSION'] || ol.DEFAULT_WMS_VERSION;
goog.object.get(this.params_, 'VERSION', ol.DEFAULT_WMS_VERSION);
this.v13_ = goog.string.compareVersions(version, '1.3') >= 0; this.v13_ = goog.string.compareVersions(version, '1.3') >= 0;
}; };
src/ol/source/tilewmssource.js
+2 -4
View File
@@ -6,7 +6,6 @@ goog.provide('ol.source.TileWMS');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('goog.math'); goog.require('goog.math');
goog.require('goog.object');
goog.require('goog.string'); goog.require('goog.string');
goog.require('goog.uri.utils'); goog.require('goog.uri.utils');
goog.require('ol'); goog.require('ol');
@@ -36,7 +35,7 @@ ol.source.TileWMS = function(opt_options) {
var params = options.params || {}; var params = options.params || {};
var transparent = goog.object.get(params, 'TRANSPARENT', true); var transparent = 'TRANSPARENT' in params ? params['TRANSPARENT'] : true;
goog.base(this, { goog.base(this, {
attributions: options.attributions, attributions: options.attributions,
@@ -389,7 +388,6 @@ ol.source.TileWMS.prototype.updateParams = function(params) {
* @private * @private
*/ */
ol.source.TileWMS.prototype.updateV13_ = function() { ol.source.TileWMS.prototype.updateV13_ = function() {
var version = var version = this.params_['VERSION'] || ol.DEFAULT_WMS_VERSION;
goog.object.get(this.params_, 'VERSION', ol.DEFAULT_WMS_VERSION);
this.v13_ = goog.string.compareVersions(version, '1.3') >= 0; this.v13_ = goog.string.compareVersions(version, '1.3') >= 0;
}; };
src/ol/style/atlasmanager.js
+1 -3
View File
@@ -3,7 +3,6 @@ goog.provide('ol.style.AtlasManager');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('goog.functions'); goog.require('goog.functions');
goog.require('goog.object');
goog.require('ol'); goog.require('ol');
@@ -310,8 +309,7 @@ ol.style.Atlas = function(size, space) {
* @return {?ol.style.AtlasInfo} The atlas info. * @return {?ol.style.AtlasInfo} The atlas info.
*/ */
ol.style.Atlas.prototype.get = function(id) { ol.style.Atlas.prototype.get = function(id) {
return /** @type {?ol.style.AtlasInfo} */ ( return this.entries_[id] || null;
goog.object.get(this.entries_, id, null));
}; };