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

Shorter module paths for default exports

Browse Source
This commit is contained in:
ahocevar
2018-04-25 17:23:56 +02:00
parent 6cb115d6a4
commit 440d1ad3e1
233 changed files with 2136 additions and 2042 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/Layer.js
+24 -23
View File
@@ -12,8 +12,8 @@ import SourceState from '../source/State.js';
/**
* @constructor
* @extends {module:ol/Observable~Observable}
* @param {module:ol/layer/Layer~Layer} layer Layer.
* @extends {module:ol/Observable}
* @param {module:ol/layer/Layer} layer Layer.
* @struct
*/
const LayerRenderer = function(layer) {
@@ -22,7 +22,7 @@ const LayerRenderer = function(layer) {
/**
* @private
* @type {module:ol/layer/Layer~Layer}
* @type {module:ol/layer/Layer}
*/
this.layer_ = layer;
@@ -36,7 +36,7 @@ inherits(LayerRenderer, Observable);
* @param {module:ol/coordinate~Coordinate} coordinate Coordinate.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {number} hitTolerance Hit tolerance in pixels.
* @param {function(this: S, (module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature), module:ol/layer/Layer~Layer): T}
* @param {function(this: S, (module:ol/Feature|module:ol/render/Feature), module:ol/layer/Layer): T}
* callback Feature callback.
* @param {S} thisArg Value to use as `this` when executing `callback`.
* @return {T|undefined} Callback result.
@@ -55,10 +55,10 @@ LayerRenderer.prototype.hasFeatureAtCoordinate = FALSE;
/**
* Create a function that adds loaded tiles to the tile lookup.
* @param {module:ol/source/Tile~TileSource} source Tile source.
* @param {module:ol/proj/Projection~Projection} projection Projection of the tiles.
* @param {Object.<number, Object.<string, module:ol/Tile~Tile>>} tiles Lookup of loaded tiles by zoom level.
* @return {function(number, module:ol/TileRange~TileRange):boolean} A function that can be
* @param {module:ol/source/Tile} source Tile source.
* @param {module:ol/proj/Projection} projection Projection of the tiles.
* @param {Object.<number, Object.<string, module:ol/Tile>>} tiles Lookup of loaded tiles by zoom level.
* @return {function(number, module:ol/TileRange):boolean} A function that can be
* called with a zoom level and a tile range to add loaded tiles to the lookup.
* @protected
*/
@@ -66,7 +66,7 @@ LayerRenderer.prototype.createLoadedTileFinder = function(source, projection, ti
return (
/**
* @param {number} zoom Zoom level.
* @param {module:ol/TileRange~TileRange} tileRange Tile range.
* @param {module:ol/TileRange} tileRange Tile range.
* @return {boolean} The tile range is fully loaded.
*/
function(zoom, tileRange) {
@@ -77,12 +77,13 @@ LayerRenderer.prototype.createLoadedTileFinder = function(source, projection, ti
tiles[zoom][tile.tileCoord.toString()] = tile;
}
return source.forEachLoadedTile(projection, zoom, tileRange, callback);
});
}
);
};
/**
* @return {module:ol/layer/Layer~Layer} Layer.
* @return {module:ol/layer/Layer} Layer.
*/
LayerRenderer.prototype.getLayer = function() {
return this.layer_;
@@ -91,7 +92,7 @@ LayerRenderer.prototype.getLayer = function() {
/**
* Handle changes in image state.
* @param {module:ol/events/Event~Event} event Image change event.
* @param {module:ol/events/Event} event Image change event.
* @private
*/
LayerRenderer.prototype.handleImageChange_ = function(event) {
@@ -105,7 +106,7 @@ LayerRenderer.prototype.handleImageChange_ = function(event) {
/**
* Load the image if not already loaded, and register the image change
* listener if needed.
* @param {module:ol/ImageBase~ImageBase} image Image.
* @param {module:ol/ImageBase} image Image.
* @return {boolean} `true` if the image is already loaded, `false` otherwise.
* @protected
*/
@@ -135,14 +136,14 @@ LayerRenderer.prototype.renderIfReadyAndVisible = function() {
/**
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/source/Tile~TileSource} tileSource Tile source.
* @param {module:ol/source/Tile} tileSource Tile source.
* @protected
*/
LayerRenderer.prototype.scheduleExpireCache = function(frameState, tileSource) {
if (tileSource.canExpireCache()) {
/**
* @param {module:ol/source/Tile~TileSource} tileSource Tile source.
* @param {module:ol/PluggableMap~PluggableMap} map Map.
* @param {module:ol/source/Tile} tileSource Tile source.
* @param {module:ol/PluggableMap} map Map.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
*/
const postRenderFunction = function(tileSource, map, frameState) {
@@ -161,10 +162,10 @@ LayerRenderer.prototype.scheduleExpireCache = function(frameState, tileSource) {
/**
* @param {!Object.<string, !Object.<string, module:ol/TileRange~TileRange>>} usedTiles Used tiles.
* @param {module:ol/source/Tile~TileSource} tileSource Tile source.
* @param {!Object.<string, !Object.<string, module:ol/TileRange>>} usedTiles Used tiles.
* @param {module:ol/source/Tile} tileSource Tile source.
* @param {number} z Z.
* @param {module:ol/TileRange~TileRange} tileRange Tile range.
* @param {module:ol/TileRange} tileRange Tile range.
* @protected
*/
LayerRenderer.prototype.updateUsedTiles = function(usedTiles, tileSource, z, tileRange) {
@@ -192,14 +193,14 @@ LayerRenderer.prototype.updateUsedTiles = function(usedTiles, tileSource, z, til
* discarded by the tile queue
* - enqueues missing tiles
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/source/Tile~TileSource} tileSource Tile source.
* @param {module:ol/tilegrid/TileGrid~TileGrid} tileGrid Tile grid.
* @param {module:ol/source/Tile} tileSource Tile source.
* @param {module:ol/tilegrid/TileGrid} tileGrid Tile grid.
* @param {number} pixelRatio Pixel ratio.
* @param {module:ol/proj/Projection~Projection} projection Projection.
* @param {module:ol/proj/Projection} projection Projection.
* @param {module:ol/extent~Extent} extent Extent.
* @param {number} currentZ Current Z.
* @param {number} preload Load low resolution tiles up to 'preload' levels.
* @param {function(this: T, module:ol/Tile~Tile)=} opt_tileCallback Tile callback.
* @param {function(this: T, module:ol/Tile)=} opt_tileCallback Tile callback.
* @param {T=} opt_this Object to use as `this` in `opt_tileCallback`.
* @protected
* @template T
src/ol/renderer/Map.js
+18 -18
View File
@@ -15,8 +15,8 @@ import {compose as composeTransform, invert as invertTransform, setFromArray as
/**
* @constructor
* @abstract
* @extends {module:ol/Disposable~Disposable}
* @param {module:ol/PluggableMap~PluggableMap} map Map.
* @extends {module:ol/Disposable}
* @param {module:ol/PluggableMap} map Map.
* @struct
*/
const MapRenderer = function(map) {
@@ -24,7 +24,7 @@ const MapRenderer = function(map) {
/**
* @private
* @type {module:ol/PluggableMap~PluggableMap}
* @type {module:ol/PluggableMap}
*/
this.map_ = map;
@@ -42,7 +42,7 @@ const MapRenderer = function(map) {
/**
* @private
* @type {Array.<module:ol/renderer/Layer~LayerRenderer>}
* @type {Array.<module:ol/renderer/Layer>}
*/
this.layerRendererConstructors_ = [];
@@ -53,7 +53,7 @@ inherits(MapRenderer, Disposable);
/**
* Register layer renderer constructors.
* @param {Array.<module:ol/renderer/Layer~LayerRenderer>} constructors Layer renderers.
* @param {Array.<module:ol/renderer/Layer>} constructors Layer renderers.
*/
MapRenderer.prototype.registerLayerRenderers = function(constructors) {
this.layerRendererConstructors_.push.apply(this.layerRendererConstructors_, constructors);
@@ -62,7 +62,7 @@ MapRenderer.prototype.registerLayerRenderers = function(constructors) {
/**
* Get the registered layer renderer constructors.
* @return {Array.<module:ol/renderer/Layer~LayerRenderer>} Registered layer renderers.
* @return {Array.<module:ol/renderer/Layer>} Registered layer renderers.
*/
MapRenderer.prototype.getLayerRendererConstructors = function() {
return this.layerRendererConstructors_;
@@ -100,7 +100,7 @@ MapRenderer.prototype.removeLayerRenderers = function() {
/**
* @param {module:ol/PluggableMap~PluggableMap} map Map.
* @param {module:ol/PluggableMap} map Map.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
*/
function expireIconCache(map, frameState) {
@@ -112,10 +112,10 @@ function expireIconCache(map, frameState) {
* @param {module:ol/coordinate~Coordinate} coordinate Coordinate.
* @param {module:ol/PluggableMap~FrameState} frameState FrameState.
* @param {number} hitTolerance Hit tolerance in pixels.
* @param {function(this: S, (module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature),
* module:ol/layer/Layer~Layer): T} callback Feature callback.
* @param {function(this: S, (module:ol/Feature|module:ol/render/Feature),
* module:ol/layer/Layer): T} callback Feature callback.
* @param {S} thisArg Value to use as `this` when executing `callback`.
* @param {function(this: U, module:ol/layer/Layer~Layer): boolean} layerFilter Layer filter
* @param {function(this: U, module:ol/layer/Layer): boolean} layerFilter Layer filter
* function, only layers which are visible and for which this function
* returns `true` will be tested for features. By default, all visible
* layers will be tested.
@@ -130,8 +130,8 @@ MapRenderer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameSta
const viewResolution = viewState.resolution;
/**
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @param {module:ol/layer/Layer~Layer} layer Layer.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @param {module:ol/layer/Layer} layer Layer.
* @return {?} Callback result.
*/
function forEachFeatureAtCoordinate(feature, layer) {
@@ -181,10 +181,10 @@ MapRenderer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameSta
* @abstract
* @param {module:ol~Pixel} pixel Pixel.
* @param {module:ol/PluggableMap~FrameState} frameState FrameState.
* @param {function(this: S, module:ol/layer/Layer~Layer, (Uint8ClampedArray|Uint8Array)): T} callback Layer
* @param {function(this: S, module:ol/layer/Layer, (Uint8ClampedArray|Uint8Array)): T} callback Layer
* callback.
* @param {S} thisArg Value to use as `this` when executing `callback`.
* @param {function(this: U, module:ol/layer/Layer~Layer): boolean} layerFilter Layer filter
* @param {function(this: U, module:ol/layer/Layer): boolean} layerFilter Layer filter
* function, only layers which are visible and for which this function
* returns `true` will be tested for features. By default, all visible
* layers will be tested.
@@ -200,7 +200,7 @@ MapRenderer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback
* @param {module:ol/coordinate~Coordinate} coordinate Coordinate.
* @param {module:ol/PluggableMap~FrameState} frameState FrameState.
* @param {number} hitTolerance Hit tolerance in pixels.
* @param {function(this: U, module:ol/layer/Layer~Layer): boolean} layerFilter Layer filter
* @param {function(this: U, module:ol/layer/Layer): boolean} layerFilter Layer filter
* function, only layers which are visible and for which this function
* returns `true` will be tested for features. By default, all visible
* layers will be tested.
@@ -217,7 +217,7 @@ MapRenderer.prototype.hasFeatureAtCoordinate = function(coordinate, frameState,
/**
* @param {module:ol/layer/Layer~Layer} layer Layer.
* @param {module:ol/layer/Layer} layer Layer.
* @protected
* @return {ol.renderer.Layer} Layer renderer.
*/
@@ -266,7 +266,7 @@ MapRenderer.prototype.getLayerRenderers = function() {
/**
* @return {module:ol/PluggableMap~PluggableMap} Map.
* @return {module:ol/PluggableMap} Map.
*/
MapRenderer.prototype.getMap = function() {
return this.map_;
@@ -306,7 +306,7 @@ MapRenderer.prototype.renderFrame = UNDEFINED;
/**
* @param {module:ol/PluggableMap~PluggableMap} map Map.
* @param {module:ol/PluggableMap} map Map.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @private
*/
src/ol/renderer/canvas/ImageLayer.js
+7 -7
View File
@@ -16,7 +16,7 @@ import {create as createTransform, compose as composeTransform} from '../../tran
/**
* @constructor
* @extends {ol.renderer.canvas.IntermediateCanvas}
* @param {module:ol/layer/Image~ImageLayer} imageLayer Single image layer.
* @param {module:ol/layer/Image} imageLayer Single image layer.
* @api
*/
const CanvasImageLayerRenderer = function(imageLayer) {
@@ -25,7 +25,7 @@ const CanvasImageLayerRenderer = function(imageLayer) {
/**
* @private
* @type {?module:ol/ImageBase~ImageBase}
* @type {?module:ol/ImageBase}
*/
this.image_ = null;
@@ -53,24 +53,24 @@ inherits(CanvasImageLayerRenderer, IntermediateCanvasRenderer);
/**
* Determine if this renderer handles the provided layer.
* @param {module:ol/layer/Layer~Layer} layer The candidate layer.
* @param {module:ol/layer/Layer} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
CanvasImageLayerRenderer['handles'] = function(layer) {
return layer.getType() === LayerType.IMAGE ||
layer.getType() === LayerType.VECTOR &&
/** @type {module:ol/layer/Vector~VectorLayer} */ (layer).getRenderMode() === VectorRenderType.IMAGE;
/** @type {module:ol/layer/Vector} */ (layer).getRenderMode() === VectorRenderType.IMAGE;
};
/**
* Create a layer renderer.
* @param {ol.renderer.Map} mapRenderer The map renderer.
* @param {module:ol/layer/Layer~Layer} layer The layer to be rendererd.
* @param {module:ol/layer/Layer} layer The layer to be rendererd.
* @return {ol.renderer.canvas.ImageLayer} The layer renderer.
*/
CanvasImageLayerRenderer['create'] = function(mapRenderer, layer) {
const renderer = new CanvasImageLayerRenderer(/** @type {module:ol/layer/Image~ImageLayer} */ (layer));
const renderer = new CanvasImageLayerRenderer(/** @type {module:ol/layer/Image} */ (layer));
if (layer.getType() === LayerType.VECTOR) {
const candidates = mapRenderer.getLayerRendererConstructors();
for (let i = 0, ii = candidates.length; i < ii; ++i) {
@@ -124,7 +124,7 @@ CanvasImageLayerRenderer.prototype.prepareFrame = function(frameState, layerStat
const viewResolution = viewState.resolution;
let image;
const imageLayer = /** @type {module:ol/layer/Image~ImageLayer} */ (this.getLayer());
const imageLayer = /** @type {module:ol/layer/Image} */ (this.getLayer());
const imageSource = imageLayer.getSource();
const hints = frameState.viewHints;
src/ol/renderer/canvas/IntermediateCanvas.js
+2 -2
View File
@@ -13,7 +13,7 @@ import {create as createTransform, apply as applyTransform} from '../../transfor
* @constructor
* @abstract
* @extends {ol.renderer.canvas.Layer}
* @param {module:ol/layer/Layer~Layer} layer Layer.
* @param {module:ol/layer/Layer} layer Layer.
*/
const IntermediateCanvasRenderer = function(layer) {
@@ -107,7 +107,7 @@ IntermediateCanvasRenderer.prototype.forEachFeatureAtCoordinate = function(coord
return source.forEachFeatureAtCoordinate(
coordinate, resolution, rotation, hitTolerance, skippedFeatureUids,
/**
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @return {?} Callback result.
*/
function(feature) {
src/ol/renderer/canvas/Layer.js
+2 -2
View File
@@ -15,7 +15,7 @@ import {create as createTransform, apply as applyTransform, compose as composeTr
* @constructor
* @abstract
* @extends {ol.renderer.Layer}
* @param {module:ol/layer/Layer~Layer} layer Layer.
* @param {module:ol/layer/Layer} layer Layer.
*/
const CanvasLayerRenderer = function(layer) {
@@ -101,7 +101,7 @@ CanvasLayerRenderer.prototype.dispatchComposeEvent_ = function(type, context, fr
/**
* @param {module:ol/coordinate~Coordinate} coordinate Coordinate.
* @param {module:ol/PluggableMap~FrameState} frameState FrameState.
* @param {function(this: S, module:ol/layer/Layer~Layer, (Uint8ClampedArray|Uint8Array)): T} callback Layer
* @param {function(this: S, module:ol/layer/Layer, (Uint8ClampedArray|Uint8Array)): T} callback Layer
* callback.
* @param {S} thisArg Value to use as `this` when executing `callback`.
* @return {T|undefined} Callback result.
src/ol/renderer/canvas/Map.js
+1 -1
View File
@@ -17,7 +17,7 @@ import SourceState from '../../source/State.js';
/**
* @constructor
* @extends {ol.renderer.Map}
* @param {module:ol/PluggableMap~PluggableMap} map Map.
* @param {module:ol/PluggableMap} map Map.
* @api
*/
const CanvasMapRenderer = function(map) {
src/ol/renderer/canvas/TileLayer.js
+11 -11
View File
@@ -14,7 +14,7 @@ import {create as createTransform, compose as composeTransform} from '../../tran
/**
* @constructor
* @extends {ol.renderer.canvas.IntermediateCanvas}
* @param {module:ol/layer/Tile~TileLayer|module:ol/layer/VectorTile~VectorTile} tileLayer Tile layer.
* @param {module:ol/layer/Tile|module:ol/layer/VectorTile~VectorTile} tileLayer Tile layer.
* @api
*/
const CanvasTileLayerRenderer = function(tileLayer) {
@@ -47,7 +47,7 @@ const CanvasTileLayerRenderer = function(tileLayer) {
/**
* @protected
* @type {!Array.<module:ol/Tile~Tile>}
* @type {!Array.<module:ol/Tile>}
*/
this.renderedTiles = [];
@@ -59,7 +59,7 @@ const CanvasTileLayerRenderer = function(tileLayer) {
/**
* @private
* @type {module:ol/TileRange~TileRange}
* @type {module:ol/TileRange}
*/
this.tmpTileRange_ = new TileRange(0, 0, 0, 0);
@@ -82,7 +82,7 @@ inherits(CanvasTileLayerRenderer, IntermediateCanvasRenderer);
/**
* Determine if this renderer handles the provided layer.
* @param {module:ol/layer/Layer~Layer} layer The candidate layer.
* @param {module:ol/layer/Layer} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
CanvasTileLayerRenderer['handles'] = function(layer) {
@@ -93,17 +93,17 @@ CanvasTileLayerRenderer['handles'] = function(layer) {
/**
* Create a layer renderer.
* @param {ol.renderer.Map} mapRenderer The map renderer.
* @param {module:ol/layer/Layer~Layer} layer The layer to be rendererd.
* @param {module:ol/layer/Layer} layer The layer to be rendererd.
* @return {ol.renderer.canvas.TileLayer} The layer renderer.
*/
CanvasTileLayerRenderer['create'] = function(mapRenderer, layer) {
return new CanvasTileLayerRenderer(/** @type {module:ol/layer/Tile~TileLayer} */ (layer));
return new CanvasTileLayerRenderer(/** @type {module:ol/layer/Tile} */ (layer));
};
/**
* @private
* @param {module:ol/Tile~Tile} tile Tile.
* @param {module:ol/Tile} tile Tile.
* @return {boolean} Tile is drawable.
*/
CanvasTileLayerRenderer.prototype.isDrawableTile_ = function(tile) {
@@ -127,7 +127,7 @@ CanvasTileLayerRenderer.prototype.prepareFrame = function(frameState, layerState
const viewCenter = viewState.center;
const tileLayer = this.getLayer();
const tileSource = /** @type {module:ol/source/Tile~TileSource} */ (tileLayer.getSource());
const tileSource = /** @type {module:ol/source/Tile} */ (tileLayer.getSource());
const sourceRevision = tileSource.getRevision();
const tileGrid = tileSource.getTileGridForProjection(projection);
const z = tileGrid.getZForResolution(viewResolution, this.zDirection);
@@ -149,7 +149,7 @@ CanvasTileLayerRenderer.prototype.prepareFrame = function(frameState, layerState
const tilePixelRatio = tileSource.getTilePixelRatio(pixelRatio);
/**
* @type {Object.<number, Object.<string, module:ol/Tile~Tile>>}
* @type {Object.<number, Object.<string, module:ol/Tile>>}
*/
const tilesToDrawByZ = {};
tilesToDrawByZ[z] = {};
@@ -296,7 +296,7 @@ CanvasTileLayerRenderer.prototype.prepareFrame = function(frameState, layerState
/**
* @param {module:ol/Tile~Tile} tile Tile.
* @param {module:ol/Tile} tile Tile.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/layer/Layer~State} layerState Layer state.
* @param {number} x Left of the tile.
@@ -346,7 +346,7 @@ CanvasTileLayerRenderer.prototype.getImage = function() {
/**
* @function
* @return {module:ol/layer/Tile~TileLayer|module:ol/layer/VectorTile~VectorTile}
* @return {module:ol/layer/Tile|module:ol/layer/VectorTile~VectorTile}
*/
CanvasTileLayerRenderer.prototype.getLayer;
src/ol/renderer/canvas/VectorLayer.js
+19 -19
View File
@@ -18,7 +18,7 @@ import {defaultOrder as defaultRenderOrder, getTolerance as getRenderTolerance,
/**
* @constructor
* @extends {ol.renderer.canvas.Layer}
* @param {module:ol/layer/Vector~VectorLayer} vectorLayer Vector layer.
* @param {module:ol/layer/Vector} vectorLayer Vector layer.
* @api
*/
const CanvasVectorLayerRenderer = function(vectorLayer) {
@@ -57,13 +57,13 @@ const CanvasVectorLayerRenderer = function(vectorLayer) {
/**
* @private
* @type {function(module:ol/Feature~Feature, module:ol/Feature~Feature): number|null}
* @type {function(module:ol/Feature, module:ol/Feature): number|null}
*/
this.renderedRenderOrder_ = null;
/**
* @private
* @type {module:ol/render/canvas/ReplayGroup~CanvasReplayGroup}
* @type {module:ol/render/canvas/ReplayGroup}
*/
this.replayGroup_ = null;
@@ -87,7 +87,7 @@ inherits(CanvasVectorLayerRenderer, CanvasLayerRenderer);
/**
* Determine if this renderer handles the provided layer.
* @param {module:ol/layer/Layer~Layer} layer The candidate layer.
* @param {module:ol/layer/Layer} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
CanvasVectorLayerRenderer['handles'] = function(layer) {
@@ -98,11 +98,11 @@ CanvasVectorLayerRenderer['handles'] = function(layer) {
/**
* Create a layer renderer.
* @param {ol.renderer.Map} mapRenderer The map renderer.
* @param {module:ol/layer/Layer~Layer} layer The layer to be rendererd.
* @param {module:ol/layer/Layer} layer The layer to be rendererd.
* @return {ol.renderer.canvas.VectorLayer} The layer renderer.
*/
CanvasVectorLayerRenderer['create'] = function(mapRenderer, layer) {
return new CanvasVectorLayerRenderer(/** @type {module:ol/layer/Vector~VectorLayer} */ (layer));
return new CanvasVectorLayerRenderer(/** @type {module:ol/layer/Vector} */ (layer));
};
@@ -128,7 +128,7 @@ CanvasVectorLayerRenderer.prototype.composeFrame = function(frameState, layerSta
const projection = viewState.projection;
const rotation = viewState.rotation;
const projectionExtent = projection.getExtent();
const vectorSource = /** @type {module:ol/source/Vector~VectorSource} */ (this.getLayer().getSource());
const vectorSource = /** @type {module:ol/source/Vector} */ (this.getLayer().getSource());
let transform = this.getTransform(frameState, 0);
@@ -145,7 +145,7 @@ CanvasVectorLayerRenderer.prototype.composeFrame = function(frameState, layerSta
if (this.declutterTree_) {
this.declutterTree_.clear();
}
const layer = /** @type {module:ol/layer/Vector~VectorLayer} */ (this.getLayer());
const layer = /** @type {module:ol/layer/Vector} */ (this.getLayer());
let drawOffsetX = 0;
let drawOffsetY = 0;
let replayContext;
@@ -250,12 +250,12 @@ CanvasVectorLayerRenderer.prototype.forEachFeatureAtCoordinate = function(coordi
} else {
const resolution = frameState.viewState.resolution;
const rotation = frameState.viewState.rotation;
const layer = /** @type {module:ol/layer/Vector~VectorLayer} */ (this.getLayer());
const layer = /** @type {module:ol/layer/Vector} */ (this.getLayer());
/** @type {!Object.<string, boolean>} */
const features = {};
const result = this.replayGroup_.forEachFeatureAtCoordinate(coordinate, resolution, rotation, hitTolerance, {},
/**
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @return {?} Callback result.
*/
function(feature) {
@@ -271,7 +271,7 @@ CanvasVectorLayerRenderer.prototype.forEachFeatureAtCoordinate = function(coordi
/**
* @param {module:ol/events/Event~Event} event Event.
* @param {module:ol/events/Event} event Event.
*/
CanvasVectorLayerRenderer.prototype.handleFontsChanged_ = function(event) {
const layer = this.getLayer();
@@ -283,7 +283,7 @@ CanvasVectorLayerRenderer.prototype.handleFontsChanged_ = function(event) {
/**
* Handle changes in image style state.
* @param {module:ol/events/Event~Event} event Image style change event.
* @param {module:ol/events/Event} event Image style change event.
* @private
*/
CanvasVectorLayerRenderer.prototype.handleStyleImageChange_ = function(event) {
@@ -295,7 +295,7 @@ CanvasVectorLayerRenderer.prototype.handleStyleImageChange_ = function(event) {
* @inheritDoc
*/
CanvasVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerState) {
const vectorLayer = /** @type {module:ol/layer/Vector~VectorLayer} */ (this.getLayer());
const vectorLayer = /** @type {module:ol/layer/Vector} */ (this.getLayer());
const vectorSource = vectorLayer.getSource();
const animating = frameState.viewHints[ViewHint.ANIMATING];
@@ -356,7 +356,7 @@ CanvasVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerSta
pixelRatio, vectorSource.getOverlaps(), this.declutterTree_, vectorLayer.getRenderBuffer());
vectorSource.loadFeatures(extent, resolution, projection);
/**
* @param {module:ol/Feature~Feature} feature Feature.
* @param {module:ol/Feature} feature Feature.
* @this {ol.renderer.canvas.VectorLayer}
*/
const render = function(feature) {
@@ -372,11 +372,11 @@ CanvasVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerSta
}
}.bind(this);
if (vectorLayerRenderOrder) {
/** @type {Array.<module:ol/Feature~Feature>} */
/** @type {Array.<module:ol/Feature>} */
const features = [];
vectorSource.forEachFeatureInExtent(extent,
/**
* @param {module:ol/Feature~Feature} feature Feature.
* @param {module:ol/Feature} feature Feature.
*/
function(feature) {
features.push(feature);
@@ -402,11 +402,11 @@ CanvasVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerSta
/**
* @param {module:ol/Feature~Feature} feature Feature.
* @param {module:ol/Feature} feature Feature.
* @param {number} resolution Resolution.
* @param {number} pixelRatio Pixel ratio.
* @param {(module:ol/style/Style~Style|Array.<module:ol/style/Style~Style>)} styles The style or array of styles.
* @param {module:ol/render/canvas/ReplayGroup~CanvasReplayGroup} replayGroup Replay group.
* @param {(module:ol/style/Style|Array.<module:ol/style/Style>)} styles The style or array of styles.
* @param {module:ol/render/canvas/ReplayGroup} replayGroup Replay group.
* @return {boolean} `true` if an image is loading.
*/
CanvasVectorLayerRenderer.prototype.renderFeature = function(feature, resolution, pixelRatio, styles, replayGroup) {
src/ol/renderer/canvas/VectorTileLayer.js
+20 -20
View File
@@ -98,7 +98,7 @@ inherits(CanvasVectorTileLayerRenderer, CanvasTileLayerRenderer);
/**
* Determine if this renderer handles the provided layer.
* @param {module:ol/layer/Layer~Layer} layer The candidate layer.
* @param {module:ol/layer/Layer} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
CanvasVectorTileLayerRenderer['handles'] = function(layer) {
@@ -109,7 +109,7 @@ CanvasVectorTileLayerRenderer['handles'] = function(layer) {
/**
* Create a layer renderer.
* @param {ol.renderer.Map} mapRenderer The map renderer.
* @param {module:ol/layer/Layer~Layer} layer The layer to be rendererd.
* @param {module:ol/layer/Layer} layer The layer to be rendererd.
* @return {ol.renderer.canvas.VectorTileLayer} The layer renderer.
*/
CanvasVectorTileLayerRenderer['create'] = function(mapRenderer, layer) {
@@ -148,7 +148,7 @@ CanvasVectorTileLayerRenderer.prototype.prepareFrame = function(frameState, laye
/**
* @param {module:ol/VectorImageTile~VectorImageTile} tile Tile.
* @param {module:ol/VectorImageTile} tile Tile.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @private
*/
@@ -165,7 +165,7 @@ CanvasVectorTileLayerRenderer.prototype.createReplayGroup_ = function(tile, fram
return;
}
const source = /** @type {module:ol/source/VectorTile~VectorTile} */ (layer.getSource());
const source = /** @type {module:ol/source/VectorTile} */ (layer.getSource());
const sourceTileGrid = source.getTileGrid();
const tileGrid = source.getTileGridForProjection(projection);
const resolution = tileGrid.getResolution(tile.tileCoord[0]);
@@ -195,7 +195,7 @@ CanvasVectorTileLayerRenderer.prototype.createReplayGroup_ = function(tile, fram
const squaredTolerance = getSquaredRenderTolerance(resolution, pixelRatio);
/**
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @this {ol.renderer.canvas.VectorTileLayer}
*/
const render = function(feature) {
@@ -246,7 +246,7 @@ CanvasVectorTileLayerRenderer.prototype.createReplayGroup_ = function(tile, fram
*/
CanvasVectorTileLayerRenderer.prototype.drawTileImage = function(
tile, frameState, layerState, x, y, w, h, gutter, transition) {
const vectorImageTile = /** @type {module:ol/VectorImageTile~VectorImageTile} */ (tile);
const vectorImageTile = /** @type {module:ol/VectorImageTile} */ (tile);
this.createReplayGroup_(vectorImageTile, frameState);
if (this.context) {
this.renderTileImage_(vectorImageTile, frameState, layerState);
@@ -266,10 +266,10 @@ CanvasVectorTileLayerRenderer.prototype.forEachFeatureAtCoordinate = function(co
/** @type {!Object.<string, boolean>} */
const features = {};
/** @type {Array.<module:ol/VectorImageTile~VectorImageTile>} */
/** @type {Array.<module:ol/VectorImageTile>} */
const renderedTiles = this.renderedTiles;
const source = /** @type {module:ol/source/VectorTile~VectorTile} */ (layer.getSource());
const source = /** @type {module:ol/source/VectorTile} */ (layer.getSource());
const tileGrid = source.getTileGridForProjection(frameState.viewState.projection);
let bufferedExtent, found;
let i, ii, replayGroup;
@@ -290,7 +290,7 @@ CanvasVectorTileLayerRenderer.prototype.forEachFeatureAtCoordinate = function(co
replayGroup = sourceTile.getReplayGroup(layer, tile.tileCoord.toString());
found = found || replayGroup.forEachFeatureAtCoordinate(coordinate, resolution, rotation, hitTolerance, {},
/**
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @return {?} Callback result.
*/
function(feature) {
@@ -307,14 +307,14 @@ CanvasVectorTileLayerRenderer.prototype.forEachFeatureAtCoordinate = function(co
/**
* @param {module:ol/VectorTile~VectorTile} tile Tile.
* @param {module:ol/VectorTile} tile Tile.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @return {module:ol/transform~Transform} transform Transform.
* @private
*/
CanvasVectorTileLayerRenderer.prototype.getReplayTransform_ = function(tile, frameState) {
const layer = this.getLayer();
const source = /** @type {module:ol/source/VectorTile~VectorTile} */ (layer.getSource());
const source = /** @type {module:ol/source/VectorTile} */ (layer.getSource());
const tileGrid = source.getTileGrid();
const tileCoord = tile.tileCoord;
const tileResolution = tileGrid.getResolution(tileCoord[0]);
@@ -337,7 +337,7 @@ CanvasVectorTileLayerRenderer.prototype.getReplayTransform_ = function(tile, fra
/**
* @param {module:ol/events/Event~Event} event Event.
* @param {module:ol/events/Event} event Event.
*/
CanvasVectorTileLayerRenderer.prototype.handleFontsChanged_ = function(event) {
const layer = this.getLayer();
@@ -349,7 +349,7 @@ CanvasVectorTileLayerRenderer.prototype.handleFontsChanged_ = function(event) {
/**
* Handle changes in image style state.
* @param {module:ol/events/Event~Event} event Image style change event.
* @param {module:ol/events/Event} event Image style change event.
* @private
*/
CanvasVectorTileLayerRenderer.prototype.handleStyleImageChange_ = function(event) {
@@ -363,7 +363,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~VectorTile} */ (layer.getSource());
const source = /** @type {module:ol/source/VectorTile} */ (layer.getSource());
const renderMode = layer.getRenderMode();
const replayTypes = VECTOR_REPLAYS[renderMode];
const pixelRatio = frameState.pixelRatio;
@@ -383,7 +383,7 @@ CanvasVectorTileLayerRenderer.prototype.postCompose = function(context, frameSta
const clips = [];
const zs = [];
for (let i = tiles.length - 1; i >= 0; --i) {
const tile = /** @type {module:ol/VectorImageTile~VectorImageTile} */ (tiles[i]);
const tile = /** @type {module:ol/VectorImageTile} */ (tiles[i]);
if (tile.getState() == TileState.ABORT) {
continue;
}
@@ -444,10 +444,10 @@ CanvasVectorTileLayerRenderer.prototype.postCompose = function(context, frameSta
/**
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @param {number} squaredTolerance Squared tolerance.
* @param {(module:ol/style/Style~Style|Array.<module:ol/style/Style~Style>)} styles The style or array of styles.
* @param {module:ol/render/canvas/ReplayGroup~CanvasReplayGroup} replayGroup Replay group.
* @param {(module:ol/style/Style|Array.<module:ol/style/Style>)} styles The style or array of styles.
* @param {module:ol/render/canvas/ReplayGroup} replayGroup Replay group.
* @return {boolean} `true` if an image is loading.
*/
CanvasVectorTileLayerRenderer.prototype.renderFeature = function(feature, squaredTolerance, styles, replayGroup) {
@@ -471,7 +471,7 @@ CanvasVectorTileLayerRenderer.prototype.renderFeature = function(feature, square
/**
* @param {module:ol/VectorImageTile~VectorImageTile} tile Tile.
* @param {module:ol/VectorImageTile} tile Tile.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/layer/Layer~State} layerState Layer state.
* @private
@@ -487,7 +487,7 @@ CanvasVectorTileLayerRenderer.prototype.renderTileImage_ = function(
const tileCoord = tile.wrappedTileCoord;
const z = tileCoord[0];
const pixelRatio = frameState.pixelRatio;
const source = /** @type {module:ol/source/VectorTile~VectorTile} */ (layer.getSource());
const source = /** @type {module:ol/source/VectorTile} */ (layer.getSource());
const tileGrid = source.getTileGridForProjection(frameState.viewState.projection);
const resolution = tileGrid.getResolution(z);
const context = tile.getContext(layer);
src/ol/renderer/vector.js
+49 -49
View File
@@ -17,8 +17,8 @@ const SIMPLIFY_TOLERANCE = 0.5;
/**
* @const
* @type {Object.<module:ol/geom/GeometryType,
* function(module:ol/render/ReplayGroup~ReplayGroup, module:ol/geom/Geometry~Geometry,
* module:ol/style/Style~Style, Object)>}
* function(module:ol/render/ReplayGroup, module:ol/geom/Geometry,
* module:ol/style/Style, Object)>}
*/
const GEOMETRY_RENDERERS = {
'Point': renderPointGeometry,
@@ -33,8 +33,8 @@ const GEOMETRY_RENDERERS = {
/**
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature1 Feature 1.
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature2 Feature 2.
* @param {module:ol/Feature|module:ol/render/Feature} feature1 Feature 1.
* @param {module:ol/Feature|module:ol/render/Feature} feature2 Feature 2.
* @return {number} Order.
*/
export function defaultOrder(feature1, feature2) {
@@ -64,10 +64,10 @@ export function getTolerance(resolution, pixelRatio) {
/**
* @param {module:ol/render/ReplayGroup~ReplayGroup} replayGroup Replay group.
* @param {module:ol/geom/Circle~Circle} geometry Geometry.
* @param {module:ol/style/Style~Style} style Style.
* @param {module:ol/Feature~Feature} feature Feature.
* @param {module:ol/render/ReplayGroup} replayGroup Replay group.
* @param {module:ol/geom/Circle} geometry Geometry.
* @param {module:ol/style/Style} style Style.
* @param {module:ol/Feature} feature Feature.
*/
function renderCircleGeometry(replayGroup, geometry, style, feature) {
const fillStyle = style.getFill();
@@ -87,11 +87,11 @@ function renderCircleGeometry(replayGroup, geometry, style, feature) {
/**
* @param {module:ol/render/ReplayGroup~ReplayGroup} replayGroup Replay group.
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @param {module:ol/style/Style~Style} style Style.
* @param {module:ol/render/ReplayGroup} replayGroup Replay group.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @param {module:ol/style/Style} style Style.
* @param {number} squaredTolerance Squared tolerance.
* @param {function(this: T, module:ol/events/Event~Event)} listener Listener function.
* @param {function(this: T, module:ol/events/Event)} listener Listener function.
* @param {T} thisArg Value to use as `this` when executing `listener`.
* @return {boolean} `true` if style is loading.
* @template T
@@ -119,9 +119,9 @@ export function renderFeature(replayGroup, feature, style, squaredTolerance, lis
/**
* @param {module:ol/render/ReplayGroup~ReplayGroup} replayGroup Replay group.
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @param {module:ol/style/Style~Style} style Style.
* @param {module:ol/render/ReplayGroup} replayGroup Replay group.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @param {module:ol/style/Style} style Style.
* @param {number} squaredTolerance Squared tolerance.
*/
function renderFeatureInternal(replayGroup, feature, style, squaredTolerance) {
@@ -141,29 +141,29 @@ function renderFeatureInternal(replayGroup, feature, style, squaredTolerance) {
/**
* @param {module:ol/render/ReplayGroup~ReplayGroup} replayGroup Replay group.
* @param {module:ol/geom/Geometry~Geometry} geometry Geometry.
* @param {module:ol/style/Style~Style} style Style.
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @param {module:ol/render/ReplayGroup} replayGroup Replay group.
* @param {module:ol/geom/Geometry} geometry Geometry.
* @param {module:ol/style/Style} style Style.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
*/
function renderGeometry(replayGroup, geometry, style, feature) {
if (geometry.getType() == GeometryType.GEOMETRY_COLLECTION) {
const geometries = /** @type {module:ol/geom/GeometryCollection~GeometryCollection} */ (geometry).getGeometries();
const geometries = /** @type {module:ol/geom/GeometryCollection} */ (geometry).getGeometries();
for (let i = 0, ii = geometries.length; i < ii; ++i) {
renderGeometry(replayGroup, geometries[i], style, feature);
}
return;
}
const replay = replayGroup.getReplay(style.getZIndex(), ReplayType.DEFAULT);
replay.drawCustom(/** @type {module:ol/geom/SimpleGeometry~SimpleGeometry} */ (geometry), feature, style.getRenderer());
replay.drawCustom(/** @type {module:ol/geom/SimpleGeometry} */ (geometry), feature, style.getRenderer());
}
/**
* @param {module:ol/render/ReplayGroup~ReplayGroup} replayGroup Replay group.
* @param {module:ol/geom/GeometryCollection~GeometryCollection} geometry Geometry.
* @param {module:ol/style/Style~Style} style Style.
* @param {module:ol/Feature~Feature} feature Feature.
* @param {module:ol/render/ReplayGroup} replayGroup Replay group.
* @param {module:ol/geom/GeometryCollection} geometry Geometry.
* @param {module:ol/style/Style} style Style.
* @param {module:ol/Feature} feature Feature.
*/
function renderGeometryCollectionGeometry(replayGroup, geometry, style, feature) {
const geometries = geometry.getGeometriesArray();
@@ -177,10 +177,10 @@ function renderGeometryCollectionGeometry(replayGroup, geometry, style, feature)
/**
* @param {module:ol/render/ReplayGroup~ReplayGroup} replayGroup Replay group.
* @param {module:ol/geom/LineString~LineString|module:ol/render/Feature~RenderFeature} geometry Geometry.
* @param {module:ol/style/Style~Style} style Style.
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @param {module:ol/render/ReplayGroup} replayGroup Replay group.
* @param {module:ol/geom/LineString|module:ol/render/Feature} geometry Geometry.
* @param {module:ol/style/Style} style Style.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
*/
function renderLineStringGeometry(replayGroup, geometry, style, feature) {
const strokeStyle = style.getStroke();
@@ -199,10 +199,10 @@ function renderLineStringGeometry(replayGroup, geometry, style, feature) {
/**
* @param {module:ol/render/ReplayGroup~ReplayGroup} replayGroup Replay group.
* @param {module:ol/geom/MultiLineString~MultiLineString|module:ol/render/Feature~RenderFeature} geometry Geometry.
* @param {module:ol/style/Style~Style} style Style.
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @param {module:ol/render/ReplayGroup} replayGroup Replay group.
* @param {module:ol/geom/MultiLineString|module:ol/render/Feature} geometry Geometry.
* @param {module:ol/style/Style} style Style.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
*/
function renderMultiLineStringGeometry(replayGroup, geometry, style, feature) {
const strokeStyle = style.getStroke();
@@ -221,10 +221,10 @@ function renderMultiLineStringGeometry(replayGroup, geometry, style, feature) {
/**
* @param {module:ol/render/ReplayGroup~ReplayGroup} replayGroup Replay group.
* @param {module:ol/geom/MultiPolygon~MultiPolygon} geometry Geometry.
* @param {module:ol/style/Style~Style} style Style.
* @param {module:ol/Feature~Feature} feature Feature.
* @param {module:ol/render/ReplayGroup} replayGroup Replay group.
* @param {module:ol/geom/MultiPolygon} geometry Geometry.
* @param {module:ol/style/Style} style Style.
* @param {module:ol/Feature} feature Feature.
*/
function renderMultiPolygonGeometry(replayGroup, geometry, style, feature) {
const fillStyle = style.getFill();
@@ -244,10 +244,10 @@ function renderMultiPolygonGeometry(replayGroup, geometry, style, feature) {
/**
* @param {module:ol/render/ReplayGroup~ReplayGroup} replayGroup Replay group.
* @param {module:ol/geom/Point~Point|module:ol/render/Feature~RenderFeature} geometry Geometry.
* @param {module:ol/style/Style~Style} style Style.
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @param {module:ol/render/ReplayGroup} replayGroup Replay group.
* @param {module:ol/geom/Point|module:ol/render/Feature} geometry Geometry.
* @param {module:ol/style/Style} style Style.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
*/
function renderPointGeometry(replayGroup, geometry, style, feature) {
const imageStyle = style.getImage();
@@ -269,10 +269,10 @@ function renderPointGeometry(replayGroup, geometry, style, feature) {
/**
* @param {module:ol/render/ReplayGroup~ReplayGroup} replayGroup Replay group.
* @param {module:ol/geom/MultiPoint~MultiPoint|module:ol/render/Feature~RenderFeature} geometry Geometry.
* @param {module:ol/style/Style~Style} style Style.
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @param {module:ol/render/ReplayGroup} replayGroup Replay group.
* @param {module:ol/geom/MultiPoint|module:ol/render/Feature} geometry Geometry.
* @param {module:ol/style/Style} style Style.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
*/
function renderMultiPointGeometry(replayGroup, geometry, style, feature) {
const imageStyle = style.getImage();
@@ -294,10 +294,10 @@ function renderMultiPointGeometry(replayGroup, geometry, style, feature) {
/**
* @param {module:ol/render/ReplayGroup~ReplayGroup} replayGroup Replay group.
* @param {module:ol/geom/Polygon~Polygon|module:ol/render/Feature~RenderFeature} geometry Geometry.
* @param {module:ol/style/Style~Style} style Style.
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @param {module:ol/render/ReplayGroup} replayGroup Replay group.
* @param {module:ol/geom/Polygon|module:ol/render/Feature} geometry Geometry.
* @param {module:ol/style/Style} style Style.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
*/
function renderPolygonGeometry(replayGroup, geometry, style, feature) {
const fillStyle = style.getFill();
src/ol/renderer/webgl/ImageLayer.js
+10 -10
View File
@@ -26,7 +26,7 @@ import {createTexture} from '../../webgl/Context.js';
* @constructor
* @extends {ol.renderer.webgl.Layer}
* @param {ol.renderer.webgl.Map} mapRenderer Map renderer.
* @param {module:ol/layer/Image~ImageLayer} imageLayer Tile layer.
* @param {module:ol/layer/Image} imageLayer Tile layer.
* @api
*/
const WebGLImageLayerRenderer = function(mapRenderer, imageLayer) {
@@ -36,7 +36,7 @@ const WebGLImageLayerRenderer = function(mapRenderer, imageLayer) {
/**
* The last rendered image.
* @private
* @type {?module:ol/ImageBase~ImageBase}
* @type {?module:ol/ImageBase}
*/
this.image_ = null;
@@ -59,7 +59,7 @@ inherits(WebGLImageLayerRenderer, WebGLLayerRenderer);
/**
* Determine if this renderer handles the provided layer.
* @param {module:ol/layer/Layer~Layer} layer The candidate layer.
* @param {module:ol/layer/Layer} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
WebGLImageLayerRenderer['handles'] = function(layer) {
@@ -70,19 +70,19 @@ WebGLImageLayerRenderer['handles'] = function(layer) {
/**
* Create a layer renderer.
* @param {ol.renderer.Map} mapRenderer The map renderer.
* @param {module:ol/layer/Layer~Layer} layer The layer to be rendererd.
* @param {module:ol/layer/Layer} layer The layer to be rendererd.
* @return {ol.renderer.webgl.ImageLayer} The layer renderer.
*/
WebGLImageLayerRenderer['create'] = function(mapRenderer, layer) {
return new WebGLImageLayerRenderer(
/** @type {ol.renderer.webgl.Map} */ (mapRenderer),
/** @type {module:ol/layer/Image~ImageLayer} */ (layer)
/** @type {module:ol/layer/Image} */ (layer)
);
};
/**
* @param {module:ol/ImageBase~ImageBase} image Image.
* @param {module:ol/ImageBase} image Image.
* @private
* @return {WebGLTexture} Texture.
*/
@@ -113,9 +113,9 @@ WebGLImageLayerRenderer.prototype.forEachFeatureAtCoordinate = function(coordina
coordinate, resolution, rotation, hitTolerance, skippedFeatureUids,
/**
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @return {?} Callback result.
*/
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @return {?} Callback result.
*/
function(feature) {
return callback.call(thisArg, feature, layer);
});
@@ -137,7 +137,7 @@ WebGLImageLayerRenderer.prototype.prepareFrame = function(frameState, layerState
let image = this.image_;
let texture = this.texture;
const imageLayer = /** @type {module:ol/layer/Image~ImageLayer} */ (this.getLayer());
const imageLayer = /** @type {module:ol/layer/Image} */ (this.getLayer());
const imageSource = imageLayer.getSource();
const hints = frameState.viewHints;
src/ol/renderer/webgl/Layer.js
+6 -6
View File
@@ -20,7 +20,7 @@ import {createEmptyTexture} from '../../webgl/Context.js';
* @abstract
* @extends {ol.renderer.Layer}
* @param {ol.renderer.webgl.Map} mapRenderer Map renderer.
* @param {module:ol/layer/Layer~Layer} layer Layer.
* @param {module:ol/layer/Layer} layer Layer.
*/
const WebGLLayerRenderer = function(mapRenderer, layer) {
@@ -34,7 +34,7 @@ const WebGLLayerRenderer = function(mapRenderer, layer) {
/**
* @private
* @type {module:ol/webgl/Buffer~WebGLBuffer}
* @type {module:ol/webgl/Buffer}
*/
this.arrayBuffer_ = new WebGLBuffer([
-1, -1, 0, 0,
@@ -139,7 +139,7 @@ WebGLLayerRenderer.prototype.bindFramebuffer = function(frameState, framebufferD
/**
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/layer/Layer~State} layerState Layer state.
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
*/
WebGLLayerRenderer.prototype.composeFrame = function(frameState, layerState, context) {
@@ -183,7 +183,7 @@ WebGLLayerRenderer.prototype.composeFrame = function(frameState, layerState, con
/**
* @param {module:ol/render/EventType~EventType} type Event type.
* @param {module:ol/webgl/Context~WebGLContext} context WebGL context.
* @param {module:ol/webgl/Context} context WebGL context.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @private
*/
@@ -245,7 +245,7 @@ WebGLLayerRenderer.prototype.handleWebGLContextLost = function() {
* @abstract
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/layer/Layer~State} layerState Layer state.
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
* @return {boolean} whether composeFrame should be called.
*/
WebGLLayerRenderer.prototype.prepareFrame = function(frameState, layerState, context) {};
@@ -255,7 +255,7 @@ WebGLLayerRenderer.prototype.prepareFrame = function(frameState, layerState, con
* @abstract
* @param {module:ol~Pixel} pixel Pixel.
* @param {module:ol/PluggableMap~FrameState} frameState FrameState.
* @param {function(this: S, module:ol/layer/Layer~Layer, (Uint8ClampedArray|Uint8Array)): T} callback Layer
* @param {function(this: S, module:ol/layer/Layer, (Uint8ClampedArray|Uint8Array)): T} callback Layer
* callback.
* @param {S} thisArg Value to use as `this` when executing `callback`.
* @return {T|undefined} Callback result.
src/ol/renderer/webgl/Map.js
+20 -18
View File
@@ -41,7 +41,7 @@ const WEBGL_TEXTURE_CACHE_HIGH_WATER_MARK = 1024;
/**
* @constructor
* @extends {ol.renderer.Map}
* @param {module:ol/PluggableMap~PluggableMap} map Map.
* @param {module:ol/PluggableMap} map Map.
* @api
*/
const WebGLMapRenderer = function(map) {
@@ -99,7 +99,7 @@ const WebGLMapRenderer = function(map) {
/**
* @private
* @type {module:ol/webgl/Context~WebGLContext}
* @type {module:ol/webgl/Context}
*/
this.context_ = new WebGLContext(this.canvas_, this.gl_);
@@ -126,29 +126,31 @@ const WebGLMapRenderer = function(map) {
*/
this.tileTextureQueue_ = new PriorityQueue(
/**
* @param {Array.<*>} element Element.
* @return {number} Priority.
* @this {ol.renderer.webgl.Map}
*/
(function(element) {
* @param {Array.<*>} element Element.
* @return {number} Priority.
* @this {ol.renderer.webgl.Map}
*/
function(element) {
const tileCenter = /** @type {module:ol/coordinate~Coordinate} */ (element[1]);
const tileResolution = /** @type {number} */ (element[2]);
const deltaX = tileCenter[0] - this.focus_[0];
const deltaY = tileCenter[1] - this.focus_[1];
return 65536 * Math.log(tileResolution) +
Math.sqrt(deltaX * deltaX + deltaY * deltaY) / tileResolution;
}).bind(this),
}.bind(this),
/**
* @param {Array.<*>} element Element.
* @return {string} Key.
*/
* @param {Array.<*>} element Element.
* @return {string} Key.
*/
function(element) {
return /** @type {module:ol/Tile~Tile} */ (element[0]).getKey();
return (
/** @type {module:ol/Tile} */ (element[0]).getKey()
);
});
/**
* @param {module:ol/PluggableMap~PluggableMap} map Map.
* @param {module:ol/PluggableMap} map Map.
* @param {?module:ol/PluggableMap~FrameState} frameState Frame state.
* @return {boolean} false.
* @this {ol.renderer.webgl.Map}
@@ -158,7 +160,7 @@ const WebGLMapRenderer = function(map) {
if (!this.tileTextureQueue_.isEmpty()) {
this.tileTextureQueue_.reprioritize();
const element = this.tileTextureQueue_.dequeue();
const tile = /** @type {module:ol/Tile~Tile} */ (element[0]);
const tile = /** @type {module:ol/Tile} */ (element[0]);
const tileSize = /** @type {module:ol/size~Size} */ (element[3]);
const tileGutter = /** @type {number} */ (element[4]);
this.bindTileTexture(
@@ -296,7 +298,7 @@ WebGLMapRenderer.prototype.disposeInternal = function() {
/**
* @param {module:ol/PluggableMap~PluggableMap} map Map.
* @param {module:ol/PluggableMap} map Map.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @private
*/
@@ -321,7 +323,7 @@ WebGLMapRenderer.prototype.expireCache_ = function(map, frameState) {
/**
* @return {module:ol/webgl/Context~WebGLContext} The context.
* @return {module:ol/webgl/Context} The context.
*/
WebGLMapRenderer.prototype.getContext = function() {
return this.context_;
@@ -345,7 +347,7 @@ WebGLMapRenderer.prototype.getTileTextureQueue = function() {
/**
* @param {module:ol/events/Event~Event} event Event.
* @param {module:ol/events/Event} event Event.
* @protected
*/
WebGLMapRenderer.prototype.handleWebGLContextLost = function(event) {
@@ -387,7 +389,7 @@ WebGLMapRenderer.prototype.initializeGL_ = function() {
/**
* @param {module:ol/Tile~Tile} tile Tile.
* @param {module:ol/Tile} tile Tile.
* @return {boolean} Is tile texture loaded.
*/
WebGLMapRenderer.prototype.isTileTextureLoaded = function(tile) {
src/ol/renderer/webgl/TileLayer.js
+15 -14
View File
@@ -29,7 +29,7 @@ import WebGLBuffer from '../../webgl/Buffer.js';
* @constructor
* @extends {ol.renderer.webgl.Layer}
* @param {ol.renderer.webgl.Map} mapRenderer Map renderer.
* @param {module:ol/layer/Tile~TileLayer} tileLayer Tile layer.
* @param {module:ol/layer/Tile} tileLayer Tile layer.
* @api
*/
const WebGLTileLayerRenderer = function(mapRenderer, tileLayer) {
@@ -38,13 +38,13 @@ const WebGLTileLayerRenderer = function(mapRenderer, tileLayer) {
/**
* @private
* @type {module:ol/webgl/Fragment~WebGLFragment}
* @type {module:ol/webgl/Fragment}
*/
this.fragmentShader_ = fragment;
/**
* @private
* @type {module:ol/webgl/Vertex~WebGLVertex}
* @type {module:ol/webgl/Vertex}
*/
this.vertexShader_ = vertex;
@@ -56,7 +56,7 @@ const WebGLTileLayerRenderer = function(mapRenderer, tileLayer) {
/**
* @private
* @type {module:ol/webgl/Buffer~WebGLBuffer}
* @type {module:ol/webgl/Buffer}
*/
this.renderArrayBuffer_ = new WebGLBuffer([
0, 0, 0, 1,
@@ -67,7 +67,7 @@ const WebGLTileLayerRenderer = function(mapRenderer, tileLayer) {
/**
* @private
* @type {module:ol/TileRange~TileRange}
* @type {module:ol/TileRange}
*/
this.renderedTileRange_ = null;
@@ -96,7 +96,7 @@ inherits(WebGLTileLayerRenderer, WebGLLayerRenderer);
/**
* Determine if this renderer handles the provided layer.
* @param {module:ol/layer/Layer~Layer} layer The candidate layer.
* @param {module:ol/layer/Layer} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
WebGLTileLayerRenderer['handles'] = function(layer) {
@@ -107,13 +107,13 @@ WebGLTileLayerRenderer['handles'] = function(layer) {
/**
* Create a layer renderer.
* @param {ol.renderer.Map} mapRenderer The map renderer.
* @param {module:ol/layer/Layer~Layer} layer The layer to be rendererd.
* @param {module:ol/layer/Layer} layer The layer to be rendererd.
* @return {ol.renderer.webgl.TileLayer} The layer renderer.
*/
WebGLTileLayerRenderer['create'] = function(mapRenderer, layer) {
return new WebGLTileLayerRenderer(
/** @type {ol.renderer.webgl.Map} */ (mapRenderer),
/** @type {module:ol/layer/Tile~TileLayer} */ (layer)
/** @type {module:ol/layer/Tile} */ (layer)
);
};
@@ -137,7 +137,7 @@ WebGLTileLayerRenderer.prototype.createLoadedTileFinder = function(source, proje
return (
/**
* @param {number} zoom Zoom level.
* @param {module:ol/TileRange~TileRange} tileRange Tile range.
* @param {module:ol/TileRange} tileRange Tile range.
* @return {boolean} The tile range is fully loaded.
*/
function(zoom, tileRange) {
@@ -152,7 +152,8 @@ WebGLTileLayerRenderer.prototype.createLoadedTileFinder = function(source, proje
return loaded;
}
return source.forEachLoadedTile(projection, zoom, tileRange, callback);
});
}
);
};
@@ -176,7 +177,7 @@ WebGLTileLayerRenderer.prototype.prepareFrame = function(frameState, layerState,
const viewState = frameState.viewState;
const projection = viewState.projection;
const tileLayer = /** @type {module:ol/layer/Tile~TileLayer} */ (this.getLayer());
const tileLayer = /** @type {module:ol/layer/Tile} */ (this.getLayer());
const tileSource = tileLayer.getSource();
const tileGrid = tileSource.getTileGridForProjection(projection);
const z = tileGrid.getZForResolution(viewState.resolution);
@@ -240,7 +241,7 @@ WebGLTileLayerRenderer.prototype.prepareFrame = function(frameState, layerState,
gl.uniform1i(this.locations_.u_texture, 0);
/**
* @type {Object.<number, Object.<string, module:ol/Tile~Tile>>}
* @type {Object.<number, Object.<string, module:ol/Tile>>}
*/
const tilesToDrawByZ = {};
tilesToDrawByZ[z] = {};
@@ -342,8 +343,8 @@ WebGLTileLayerRenderer.prototype.prepareFrame = function(frameState, layerState,
frameState, tileSource, tileGrid, pixelRatio, projection, extent, z,
tileLayer.getPreload(),
/**
* @param {module:ol/Tile~Tile} tile Tile.
*/
* @param {module:ol/Tile} tile Tile.
*/
function(tile) {
if (tile.getState() == TileState.LOADED &&
!mapRenderer.isTileTextureLoaded(tile) &&
src/ol/renderer/webgl/VectorLayer.js
+13 -13
View File
@@ -14,7 +14,7 @@ import {apply as applyTransform} from '../../transform.js';
* @constructor
* @extends {ol.renderer.webgl.Layer}
* @param {ol.renderer.webgl.Map} mapRenderer Map renderer.
* @param {module:ol/layer/Vector~VectorLayer} vectorLayer Vector layer.
* @param {module:ol/layer/Vector} vectorLayer Vector layer.
* @api
*/
const WebGLVectorLayerRenderer = function(mapRenderer, vectorLayer) {
@@ -47,7 +47,7 @@ const WebGLVectorLayerRenderer = function(mapRenderer, vectorLayer) {
/**
* @private
* @type {function(module:ol/Feature~Feature, module:ol/Feature~Feature): number|null}
* @type {function(module:ol/Feature, module:ol/Feature): number|null}
*/
this.renderedRenderOrder_ = null;
@@ -71,7 +71,7 @@ inherits(WebGLVectorLayerRenderer, WebGLLayerRenderer);
/**
* Determine if this renderer handles the provided layer.
* @param {module:ol/layer/Layer~Layer} layer The candidate layer.
* @param {module:ol/layer/Layer} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
WebGLVectorLayerRenderer['handles'] = function(layer) {
@@ -82,13 +82,13 @@ WebGLVectorLayerRenderer['handles'] = function(layer) {
/**
* Create a layer renderer.
* @param {ol.renderer.Map} mapRenderer The map renderer.
* @param {module:ol/layer/Layer~Layer} layer The layer to be rendererd.
* @param {module:ol/layer/Layer} layer The layer to be rendererd.
* @return {ol.renderer.webgl.VectorLayer} The layer renderer.
*/
WebGLVectorLayerRenderer['create'] = function(mapRenderer, layer) {
return new WebGLVectorLayerRenderer(
/** @type {ol.renderer.webgl.Map} */ (mapRenderer),
/** @type {module:ol/layer/Vector~VectorLayer} */ (layer)
/** @type {module:ol/layer/Vector} */ (layer)
);
};
@@ -148,7 +148,7 @@ WebGLVectorLayerRenderer.prototype.forEachFeatureAtCoordinate = function(coordin
frameState.size, frameState.pixelRatio, layerState.opacity,
{},
/**
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @return {?} Callback result.
*/
function(feature) {
@@ -198,7 +198,7 @@ WebGLVectorLayerRenderer.prototype.forEachLayerAtPixel = function(pixel, frameSt
/**
* Handle changes in image style state.
* @param {module:ol/events/Event~Event} event Image style change event.
* @param {module:ol/events/Event} event Image style change event.
* @private
*/
WebGLVectorLayerRenderer.prototype.handleStyleImageChange_ = function(event) {
@@ -210,7 +210,7 @@ WebGLVectorLayerRenderer.prototype.handleStyleImageChange_ = function(event) {
* @inheritDoc
*/
WebGLVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerState, context) {
const vectorLayer = /** @type {module:ol/layer/Vector~VectorLayer} */ (this.getLayer());
const vectorLayer = /** @type {module:ol/layer/Vector} */ (this.getLayer());
const vectorSource = vectorLayer.getSource();
const animating = frameState.viewHints[ViewHint.ANIMATING];
@@ -259,7 +259,7 @@ WebGLVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerStat
extent, vectorLayer.getRenderBuffer());
vectorSource.loadFeatures(extent, resolution, projection);
/**
* @param {module:ol/Feature~Feature} feature Feature.
* @param {module:ol/Feature} feature Feature.
* @this {ol.renderer.webgl.VectorLayer}
*/
const render = function(feature) {
@@ -275,11 +275,11 @@ WebGLVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerStat
}
};
if (vectorLayerRenderOrder) {
/** @type {Array.<module:ol/Feature~Feature>} */
/** @type {Array.<module:ol/Feature>} */
const features = [];
vectorSource.forEachFeatureInExtent(extent,
/**
* @param {module:ol/Feature~Feature} feature Feature.
* @param {module:ol/Feature} feature Feature.
*/
function(feature) {
features.push(feature);
@@ -302,10 +302,10 @@ WebGLVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerStat
/**
* @param {module:ol/Feature~Feature} feature Feature.
* @param {module:ol/Feature} feature Feature.
* @param {number} resolution Resolution.
* @param {number} pixelRatio Pixel ratio.
* @param {(module:ol/style/Style~Style|Array.<module:ol/style/Style~Style>)} styles The style or array of
* @param {(module:ol/style/Style|Array.<module:ol/style/Style>)} styles The style or array of
* styles.
* @param {ol.render.webgl.ReplayGroup} replayGroup Replay group.
* @return {boolean} `true` if an image is loading.