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

Reduce the use of goog.*

Browse Source
This commit is contained in:
Andreas Hocevar
2015-10-17 23:25:14 +02:00
parent 656023e569
commit 80fa26ddd8
9 changed files with 36 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/source/tileimagesource.js
View File

@@ -34,7 +34,7 @@ ol.source.TileImage = function(options) {
state: options.state !== undefined ?
/** @type {ol.source.State} */ (options.state) : undefined,
tileGrid: options.tileGrid,
tileLoadFunction: goog.isDef(options.tileLoadFunction) ?
tileLoadFunction: options.tileLoadFunction ?
options.tileLoadFunction : ol.source.TileImage.defaultTileLoadFunction,
tilePixelRatio: options.tilePixelRatio,
tileUrlFunction: options.tileUrlFunction,

2
src/ol/source/urltilesource.js
View File

@@ -47,7 +47,7 @@ ol.source.UrlTile = function(options) {
logo: options.logo,
opaque: options.opaque,
projection: options.projection,
state: goog.isDef(options.state) ?
state: options.state ?
/** @type {ol.source.State} */ (options.state) : undefined,
tileGrid: options.tileGrid,
tilePixelRatio: options.tilePixelRatio,

17
src/ol/source/vectortilesource.js
View File

@@ -35,10 +35,10 @@ ol.source.VectorTile = function(options) {
logo: options.logo,
opaque: options.opaque,
projection: options.projection,
state: goog.isDef(options.state) ?
state: options.state ?
/** @type {ol.source.State} */ (options.state) : undefined,
tileGrid: options.tileGrid,
tileLoadFunction: goog.isDef(options.tileLoadFunction) ?
tileLoadFunction: options.tileLoadFunction ?
options.tileLoadFunction : ol.source.VectorTile.defaultTileLoadFunction,
tileUrlFunction: options.tileUrlFunction,
tilePixelRatio: options.tilePixelRatio,
@@ -51,15 +51,14 @@ ol.source.VectorTile = function(options) {
* @private
* @type {ol.format.Feature}
*/
this.format_ = goog.isDef(options.format) ? options.format : null;
this.format_ = options.format ? options.format : null;
/**
* @protected
* @type {function(new: ol.VectorTile, ol.TileCoord, ol.TileState, string,
* ol.format.Feature, ol.TileLoadFunctionType)}
*/
this.tileClass = goog.isDef(options.tileClass) ?
options.tileClass : ol.VectorTile;
this.tileClass = options.tileClass ? options.tileClass : ol.VectorTile;
};
goog.inherits(ol.source.VectorTile, ol.source.UrlTile);
@@ -78,12 +77,12 @@ ol.source.VectorTile.prototype.getTile =
var tileCoord = [z, x, y];
var urlTileCoord = this.getTileCoordForTileUrlFunction(
tileCoord, projection);
var tileUrl = goog.isNull(urlTileCoord) ? undefined :
this.tileUrlFunction(urlTileCoord, pixelRatio, projection);
var tileUrl = urlTileCoord ?
this.tileUrlFunction(urlTileCoord, pixelRatio, projection) : undefined;
var tile = new this.tileClass(
tileCoord,
goog.isDef(tileUrl) ? ol.TileState.IDLE : ol.TileState.EMPTY,
goog.isDef(tileUrl) ? tileUrl : '',
tileUrl !== undefined ? ol.TileState.IDLE : ol.TileState.EMPTY,
tileUrl !== undefined ? tileUrl : '',
this.format_,
this.tileLoadFunction);
goog.events.listen(tile, goog.events.EventType.CHANGE,