Merge pull request #7619 from fredj/more_rename

More variable renaming
This commit is contained in:
Frédéric Junod
2017-12-17 09:57:49 +01:00
committed by GitHub
23 changed files with 159 additions and 160 deletions

View File

@@ -3,7 +3,7 @@
*/
import {getUid, inherits} from '../index.js';
import _ol_ImageCanvas_ from '../ImageCanvas.js';
import _ol_TileQueue_ from '../TileQueue.js';
import TileQueue from '../TileQueue.js';
import {createCanvasContext2D} from '../dom.js';
import _ol_events_ from '../events.js';
import Event from '../events/Event.js';
@@ -69,7 +69,7 @@ var _ol_source_Raster_ = function(options) {
* @private
* @type {ol.TileQueue}
*/
this.tileQueue_ = new _ol_TileQueue_(
this.tileQueue_ = new TileQueue(
function() {
return 1;
},

View File

@@ -2,7 +2,7 @@
* @module ol/source/Tile
*/
import {inherits, nullFunction} from '../index.js';
import _ol_TileCache_ from '../TileCache.js';
import TileCache from '../TileCache.js';
import _ol_TileState_ from '../TileState.js';
import Event from '../events/Event.js';
import {equivalent} from '../proj.js';
@@ -56,7 +56,7 @@ var _ol_source_Tile_ = function(options) {
* @protected
* @type {ol.TileCache}
*/
this.tileCache = new _ol_TileCache_(options.cacheSize);
this.tileCache = new TileCache(options.cacheSize);
/**
* @protected

View File

@@ -4,7 +4,7 @@
import {ENABLE_RASTER_REPROJECTION} from '../reproj/common.js';
import {getUid, inherits} from '../index.js';
import _ol_ImageTile_ from '../ImageTile.js';
import _ol_TileCache_ from '../TileCache.js';
import TileCache from '../TileCache.js';
import _ol_TileState_ from '../TileState.js';
import _ol_events_ from '../events.js';
import EventType from '../events/EventType.js';
@@ -193,7 +193,7 @@ _ol_source_TileImage_.prototype.getTileCacheForProjection = function(projection)
} else {
var projKey = getUid(projection).toString();
if (!(projKey in this.tileCacheForProjection)) {
this.tileCacheForProjection[projKey] = new _ol_TileCache_(this.tileCache.highWaterMark);
this.tileCacheForProjection[projKey] = new TileCache(this.tileCache.highWaterMark);
}
return this.tileCacheForProjection[projKey];
}

View File

@@ -19,7 +19,7 @@ import _ol_obj_ from '../obj.js';
import _ol_source_Source_ from '../source/Source.js';
import _ol_source_State_ from '../source/State.js';
import _ol_source_VectorEventType_ from '../source/VectorEventType.js';
import _ol_structs_RBush_ from '../structs/RBush.js';
import RBush from '../structs/RBush.js';
/**
* @classdesc
@@ -90,13 +90,13 @@ var _ol_source_Vector_ = function(opt_options) {
* @private
* @type {ol.structs.RBush.<ol.Feature>}
*/
this.featuresRtree_ = useSpatialIndex ? new _ol_structs_RBush_() : null;
this.featuresRtree_ = useSpatialIndex ? new RBush() : null;
/**
* @private
* @type {ol.structs.RBush.<{extent: ol.Extent}>}
*/
this.loadedExtentsRtree_ = new _ol_structs_RBush_();
this.loadedExtentsRtree_ = new RBush();
/**
* @private