From 48bda774c7a1615ef21e4893bb18c0f9c67a50ce Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Thu, 19 Apr 2018 16:00:24 +0200 Subject: [PATCH] Rename VectorTileSource to VectorTile --- src/ol/layer/VectorTile.js | 6 +++--- src/ol/renderer/canvas/VectorTileLayer.js | 10 +++++----- src/ol/source/Vector.js | 2 +- src/ol/source/VectorTile.js | 22 +++++++++++----------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/ol/layer/VectorTile.js b/src/ol/layer/VectorTile.js index 3b5304be64..764765fe81 100644 --- a/src/ol/layer/VectorTile.js +++ b/src/ol/layer/VectorTile.js @@ -40,7 +40,7 @@ import {assign} from '../obj.js'; * animations, but slower performance than the other options. * * When `declutter` is set to `true`, `'hybrid'` will be used instead of `'image'`. - * @property {module:ol/source/VectorTile~VectorTileSource} [source] Source. + * @property {module:ol/source/VectorTile~VectorTile} [source] Source. * @property {module:ol/PluggableMap~PluggableMap} [map] Sets the layer as overlay on a map. The map will not manage * this layer in its layers collection, and the layer will be rendered on top. This is useful for * temporary layers. The standard way to add a layer to a map and have it managed by the map is to @@ -161,9 +161,9 @@ VectorTileLayer.prototype.setUseInterimTilesOnError = function(useInterimTilesOn /** - * Return the associated {@link module:ol/source/VectorTile~VectorTileSource vectortilesource} of the layer. + * Return the associated {@link module:ol/source/VectorTile~VectorTile vectortilesource} of the layer. * @function - * @return {module:ol/source/VectorTile~VectorTileSource} Source. + * @return {module:ol/source/VectorTile~VectorTile} Source. * @api */ VectorTileLayer.prototype.getSource; diff --git a/src/ol/renderer/canvas/VectorTileLayer.js b/src/ol/renderer/canvas/VectorTileLayer.js index c780eba13f..c931cad19c 100644 --- a/src/ol/renderer/canvas/VectorTileLayer.js +++ b/src/ol/renderer/canvas/VectorTileLayer.js @@ -167,7 +167,7 @@ CanvasVectorTileLayerRenderer.prototype.createReplayGroup_ = function(tile, fram return; } - const source = /** @type {module:ol/source/VectorTile~VectorTileSource} */ (layer.getSource()); + const source = /** @type {module:ol/source/VectorTile~VectorTile} */ (layer.getSource()); const sourceTileGrid = source.getTileGrid(); const tileGrid = source.getTileGridForProjection(projection); const resolution = tileGrid.getResolution(tile.tileCoord[0]); @@ -271,7 +271,7 @@ CanvasVectorTileLayerRenderer.prototype.forEachFeatureAtCoordinate = function(co /** @type {Array.} */ const renderedTiles = this.renderedTiles; - const source = /** @type {module:ol/source/VectorTile~VectorTileSource} */ (layer.getSource()); + const source = /** @type {module:ol/source/VectorTile~VectorTile} */ (layer.getSource()); const tileGrid = source.getTileGridForProjection(frameState.viewState.projection); let bufferedExtent, found; let i, ii, replayGroup; @@ -316,7 +316,7 @@ CanvasVectorTileLayerRenderer.prototype.forEachFeatureAtCoordinate = function(co */ CanvasVectorTileLayerRenderer.prototype.getReplayTransform_ = function(tile, frameState) { const layer = this.getLayer(); - const source = /** @type {module:ol/source/VectorTile~VectorTileSource} */ (layer.getSource()); + const source = /** @type {module:ol/source/VectorTile~VectorTile} */ (layer.getSource()); const tileGrid = source.getTileGrid(); const tileCoord = tile.tileCoord; const tileResolution = tileGrid.getResolution(tileCoord[0]); @@ -365,7 +365,7 @@ CanvasVectorTileLayerRenderer.prototype.handleStyleImageChange_ = function(event CanvasVectorTileLayerRenderer.prototype.postCompose = function(context, frameState, layerState) { const layer = this.getLayer(); const declutterReplays = layer.getDeclutter() ? {} : null; - const source = /** @type {module:ol/source/VectorTile~VectorTileSource} */ (layer.getSource()); + const source = /** @type {module:ol/source/VectorTile~VectorTile} */ (layer.getSource()); const renderMode = layer.getRenderMode(); const replayTypes = VECTOR_REPLAYS[renderMode]; const pixelRatio = frameState.pixelRatio; @@ -490,7 +490,7 @@ CanvasVectorTileLayerRenderer.prototype.renderTileImage_ = function( const tileCoord = tile.wrappedTileCoord; const z = tileCoord[0]; const pixelRatio = frameState.pixelRatio; - const source = /** @type {module:ol/source/VectorTile~VectorTileSource} */ (layer.getSource()); + const source = /** @type {module:ol/source/VectorTile~VectorTile} */ (layer.getSource()); const tileGrid = source.getTileGridForProjection(frameState.viewState.projection); const resolution = tileGrid.getResolution(z); const context = tile.getContext(layer); diff --git a/src/ol/source/Vector.js b/src/ol/source/Vector.js index b8d4a2400a..c7bc307eb7 100644 --- a/src/ol/source/Vector.js +++ b/src/ol/source/Vector.js @@ -137,7 +137,7 @@ inherits(VectorSourceEvent, Event); /** * @classdesc * Provides a source of features for vector layers. Vector features provided - * by this source are suitable for editing. See {@link module:ol/source/VectorTile~VectorTileSource} for + * by this source are suitable for editing. See {@link module:ol/source/VectorTile~VectorTile} for * vector data that is optimized for rendering. * * @constructor diff --git a/src/ol/source/VectorTile.js b/src/ol/source/VectorTile.js index 4883666bf7..8b2a14b02c 100644 --- a/src/ol/source/VectorTile.js +++ b/src/ol/source/VectorTile.js @@ -4,7 +4,7 @@ import {inherits} from '../index.js'; import TileState from '../TileState.js'; import VectorImageTile, {defaultLoadFunction} from '../VectorImageTile.js'; -import VectorTile from '../VectorTile.js'; +import Tile from '../VectorTile.js'; import {toSize} from '../size.js'; import UrlTile from '../source/UrlTile.js'; import {getKeyZXY} from '../tilecoord.js'; @@ -70,7 +70,7 @@ import {createXYZ, extentFromProjection, createForProjection} from '../tilegrid. * @param {module:ol/source/VectorTile~Options=} options Vector tile options. * @api */ -const VectorTileSource = function(options) { +const VectorTile = function(options) { const projection = options.projection || 'EPSG:3857'; const extent = options.extent || extentFromProjection(projection); @@ -121,7 +121,7 @@ const VectorTileSource = function(options) { * @type {function(new: module:ol/VectorTile~VectorTile, module:ol/tilecoord~TileCoord, module:ol/TileState~TileState, string, * module:ol/format/Feature~FeatureFormat, module:ol/Tile~LoadFunction)} */ - this.tileClass = options.tileClass ? options.tileClass : VectorTile; + this.tileClass = options.tileClass ? options.tileClass : Tile; /** * @private @@ -131,13 +131,13 @@ const VectorTileSource = function(options) { }; -inherits(VectorTileSource, UrlTile); +inherits(VectorTile, UrlTile); /** * @return {boolean} The source can have overlapping geometries. */ -VectorTileSource.prototype.getOverlaps = function() { +VectorTile.prototype.getOverlaps = function() { return this.overlaps_; }; @@ -145,7 +145,7 @@ VectorTileSource.prototype.getOverlaps = function() { * clear {@link module:ol/TileCache~TileCache} and delete all source tiles * @api */ -VectorTileSource.prototype.clear = function() { +VectorTile.prototype.clear = function() { this.tileCache.clear(); this.sourceTiles_ = {}; }; @@ -153,7 +153,7 @@ VectorTileSource.prototype.clear = function() { /** * @inheritDoc */ -VectorTileSource.prototype.getTile = function(z, x, y, pixelRatio, projection) { +VectorTile.prototype.getTile = function(z, x, y, pixelRatio, projection) { const tileCoordKey = getKeyZXY(z, x, y); if (this.tileCache.containsKey(tileCoordKey)) { return /** @type {!module:ol/Tile~Tile} */ (this.tileCache.get(tileCoordKey)); @@ -180,7 +180,7 @@ VectorTileSource.prototype.getTile = function(z, x, y, pixelRatio, projection) { /** * @inheritDoc */ -VectorTileSource.prototype.getTileGridForProjection = function(projection) { +VectorTile.prototype.getTileGridForProjection = function(projection) { const code = projection.getCode(); let tileGrid = this.tileGrids_[code]; if (!tileGrid) { @@ -197,7 +197,7 @@ VectorTileSource.prototype.getTileGridForProjection = function(projection) { /** * @inheritDoc */ -VectorTileSource.prototype.getTilePixelRatio = function(pixelRatio) { +VectorTile.prototype.getTilePixelRatio = function(pixelRatio) { return pixelRatio; }; @@ -205,9 +205,9 @@ VectorTileSource.prototype.getTilePixelRatio = function(pixelRatio) { /** * @inheritDoc */ -VectorTileSource.prototype.getTilePixelSize = function(z, pixelRatio, projection) { +VectorTile.prototype.getTilePixelSize = function(z, pixelRatio, projection) { const tileGrid = this.getTileGridForProjection(projection); const tileSize = toSize(tileGrid.getTileSize(z), this.tmpSize); return [Math.round(tileSize[0] * pixelRatio), Math.round(tileSize[1] * pixelRatio)]; }; -export default VectorTileSource; +export default VectorTile;