Transformed types

Using the [ts.js codemod](https://gist.github.com/tschaub/1ea498c9d1e5268cf36d212b3949be4e):

    jscodeshift --transform ts.js src
This commit is contained in:
Tim Schaub
2018-09-05 08:05:29 -06:00
parent f2aaaa19e1
commit ccfacc5ee6
239 changed files with 3999 additions and 3999 deletions

View File

@@ -13,7 +13,7 @@ import SourceState from '../source/State.js';
class LayerRenderer extends Observable {
/**
* @param {module:ol/layer/Layer} layer Layer.
* @param {import("../layer/Layer.js").default} layer Layer.
*/
constructor(layer) {
@@ -21,7 +21,7 @@ class LayerRenderer extends Observable {
/**
* @private
* @type {module:ol/layer/Layer}
* @type {import("../layer/Layer.js").default}
*/
this.layer_ = layer;
@@ -29,10 +29,10 @@ class LayerRenderer extends Observable {
/**
* Create a function that adds loaded tiles to the tile lookup.
* @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
* @param {import("../source/Tile.js").default} source Tile source.
* @param {import("../proj/Projection.js").default} projection Projection of the tiles.
* @param {Object<number, Object<string, import("../Tile.js").default>>} tiles Lookup of loaded tiles by zoom level.
* @return {function(number, import("../TileRange.js").default):boolean} A function that can be
* called with a zoom level and a tile range to add loaded tiles to the lookup.
* @protected
*/
@@ -40,7 +40,7 @@ class LayerRenderer extends Observable {
return (
/**
* @param {number} zoom Zoom level.
* @param {module:ol/TileRange} tileRange Tile range.
* @param {import("../TileRange.js").default} tileRange Tile range.
* @return {boolean} The tile range is fully loaded.
*/
function(zoom, tileRange) {
@@ -56,7 +56,7 @@ class LayerRenderer extends Observable {
}
/**
* @return {module:ol/layer/Layer} Layer.
* @return {import("../layer/Layer.js").default} Layer.
*/
getLayer() {
return this.layer_;
@@ -64,11 +64,11 @@ class LayerRenderer extends Observable {
/**
* Handle changes in image state.
* @param {module:ol/events/Event} event Image change event.
* @param {import("../events/Event.js").default} event Image change event.
* @private
*/
handleImageChange_(event) {
const image = /** @type {module:ol/Image} */ (event.target);
const image = /** @type {import("../Image.js").default} */ (event.target);
if (image.getState() === ImageState.LOADED) {
this.renderIfReadyAndVisible();
}
@@ -77,7 +77,7 @@ class LayerRenderer extends Observable {
/**
* Load the image if not already loaded, and register the image change
* listener if needed.
* @param {module:ol/ImageBase} image Image.
* @param {import("../ImageBase.js").default} image Image.
* @return {boolean} `true` if the image is already loaded, `false` otherwise.
* @protected
*/
@@ -104,16 +104,16 @@ class LayerRenderer extends Observable {
}
/**
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/source/Tile} tileSource Tile source.
* @param {import("../PluggableMap.js").FrameState} frameState Frame state.
* @param {import("../source/Tile.js").default} tileSource Tile source.
* @protected
*/
scheduleExpireCache(frameState, tileSource) {
if (tileSource.canExpireCache()) {
/**
* @param {module:ol/source/Tile} tileSource Tile source.
* @param {module:ol/PluggableMap} map Map.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {import("../source/Tile.js").default} tileSource Tile source.
* @param {import("../PluggableMap.js").default} map Map.
* @param {import("../PluggableMap.js").FrameState} frameState Frame state.
*/
const postRenderFunction = function(tileSource, map, frameState) {
const tileSourceKey = getUid(tileSource).toString();
@@ -124,16 +124,16 @@ class LayerRenderer extends Observable {
}.bind(null, tileSource);
frameState.postRenderFunctions.push(
/** @type {module:ol/PluggableMap~PostRenderFunction} */ (postRenderFunction)
/** @type {import("../PluggableMap.js").PostRenderFunction} */ (postRenderFunction)
);
}
}
/**
* @param {!Object<string, !Object<string, module:ol/TileRange>>} usedTiles Used tiles.
* @param {module:ol/source/Tile} tileSource Tile source.
* @param {!Object<string, !Object<string, import("../TileRange.js").default>>} usedTiles Used tiles.
* @param {import("../source/Tile.js").default} tileSource Tile source.
* @param {number} z Z.
* @param {module:ol/TileRange} tileRange Tile range.
* @param {import("../TileRange.js").default} tileRange Tile range.
* @protected
*/
updateUsedTiles(usedTiles, tileSource, z, tileRange) {
@@ -159,15 +159,15 @@ class LayerRenderer extends Observable {
* - registers idle tiles in frameState.wantedTiles so that they are not
* discarded by the tile queue
* - enqueues missing tiles
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/source/Tile} tileSource Tile source.
* @param {module:ol/tilegrid/TileGrid} tileGrid Tile grid.
* @param {import("../PluggableMap.js").FrameState} frameState Frame state.
* @param {import("../source/Tile.js").default} tileSource Tile source.
* @param {import("../tilegrid/TileGrid.js").default} tileGrid Tile grid.
* @param {number} pixelRatio Pixel ratio.
* @param {module:ol/proj/Projection} projection Projection.
* @param {module:ol/extent~Extent} extent Extent.
* @param {import("../proj/Projection.js").default} projection Projection.
* @param {import("../extent.js").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)=} opt_tileCallback Tile callback.
* @param {function(this: T, import("../Tile.js").default)=} opt_tileCallback Tile callback.
* @param {T=} opt_this Object to use as `this` in `opt_tileCallback`.
* @protected
* @template T
@@ -220,10 +220,10 @@ class LayerRenderer extends Observable {
/**
* @param {module:ol/coordinate~Coordinate} coordinate Coordinate.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {import("../coordinate.js").Coordinate} coordinate Coordinate.
* @param {import("../PluggableMap.js").FrameState} frameState Frame state.
* @param {number} hitTolerance Hit tolerance in pixels.
* @param {function(this: S, (module:ol/Feature|module:ol/render/Feature), module:ol/layer/Layer): T} callback Feature callback.
* @param {function(this: S, (import("../Feature.js").default|import("../render/Feature.js").default), import("../layer/Layer.js").default): T} callback Feature callback.
* @param {S} thisArg Value to use as `this` when executing `callback`.
* @return {T|void} Callback result.
* @template S,T
@@ -232,8 +232,8 @@ LayerRenderer.prototype.forEachFeatureAtCoordinate = VOID;
/**
* @param {module:ol/coordinate~Coordinate} coordinate Coordinate.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {import("../coordinate.js").Coordinate} coordinate Coordinate.
* @param {import("../PluggableMap.js").FrameState} frameState Frame state.
* @return {boolean} Is there a feature at the given coordinate?
*/
LayerRenderer.prototype.hasFeatureAtCoordinate = FALSE;

View File

@@ -15,32 +15,32 @@ import {compose as composeTransform, invert as invertTransform, setFromArray as
class MapRenderer extends Disposable {
/**
* @param {module:ol/PluggableMap} map Map.
* @param {import("../PluggableMap.js").default} map Map.
*/
constructor(map) {
super();
/**
* @private
* @type {module:ol/PluggableMap}
* @type {import("../PluggableMap.js").default}
*/
this.map_ = map;
/**
* @private
* @type {!Object<string, module:ol/renderer/Layer>}
* @type {!Object<string, import("./Layer.js").default>}
*/
this.layerRenderers_ = {};
/**
* @private
* @type {Object<string, module:ol/events~EventsKey>}
* @type {Object<string, import("../events.js").EventsKey>}
*/
this.layerRendererListeners_ = {};
/**
* @private
* @type {Array<module:ol/renderer/Layer>}
* @type {Array<import("./Layer.js").default>}
*/
this.layerRendererConstructors_ = [];
@@ -48,7 +48,7 @@ class MapRenderer extends Disposable {
/**
* Register layer renderer constructors.
* @param {Array<module:ol/renderer/Layer>} constructors Layer renderers.
* @param {Array<import("./Layer.js").default>} constructors Layer renderers.
*/
registerLayerRenderers(constructors) {
this.layerRendererConstructors_.push.apply(this.layerRendererConstructors_, constructors);
@@ -56,14 +56,14 @@ class MapRenderer extends Disposable {
/**
* Get the registered layer renderer constructors.
* @return {Array<module:ol/renderer/Layer>} Registered layer renderers.
* @return {Array<import("./Layer.js").default>} Registered layer renderers.
*/
getLayerRendererConstructors() {
return this.layerRendererConstructors_;
}
/**
* @param {module:ol/PluggableMap~FrameState} frameState FrameState.
* @param {import("../PluggableMap.js").FrameState} frameState FrameState.
* @protected
*/
calculateMatrices2D(frameState) {
@@ -91,13 +91,13 @@ class MapRenderer extends Disposable {
}
/**
* @param {module:ol/coordinate~Coordinate} coordinate Coordinate.
* @param {module:ol/PluggableMap~FrameState} frameState FrameState.
* @param {import("../coordinate.js").Coordinate} coordinate Coordinate.
* @param {import("../PluggableMap.js").FrameState} frameState FrameState.
* @param {number} hitTolerance Hit tolerance in pixels.
* @param {function(this: S, (module:ol/Feature|module:ol/render/Feature),
* module:ol/layer/Layer): T} callback Feature callback.
* @param {function(this: S, (import("../Feature.js").default|import("../render/Feature.js").default),
* import("../layer/Layer.js").default): T} callback Feature callback.
* @param {S} thisArg Value to use as `this` when executing `callback`.
* @param {function(this: U, module:ol/layer/Layer): boolean} layerFilter Layer filter
* @param {function(this: U, import("../layer/Layer.js").default): 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.
@@ -119,8 +119,8 @@ class MapRenderer extends Disposable {
const viewResolution = viewState.resolution;
/**
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @param {module:ol/layer/Layer} layer Layer.
* @param {import("../Feature.js").default|import("../render/Feature.js").default} feature Feature.
* @param {import("../layer/Layer.js").default} layer Layer.
* @return {?} Callback result.
*/
function forEachFeatureAtCoordinate(feature, layer) {
@@ -167,13 +167,13 @@ class MapRenderer extends Disposable {
/**
* @abstract
* @param {module:ol/pixel~Pixel} pixel Pixel.
* @param {module:ol/PluggableMap~FrameState} frameState FrameState.
* @param {import("../pixel.js").Pixel} pixel Pixel.
* @param {import("../PluggableMap.js").FrameState} frameState FrameState.
* @param {number} hitTolerance Hit tolerance in pixels.
* @param {function(this: S, module:ol/layer/Layer, (Uint8ClampedArray|Uint8Array)): T} callback Layer
* @param {function(this: S, import("../layer/Layer.js").default, (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): boolean} layerFilter Layer filter
* @param {function(this: U, import("../layer/Layer.js").default): 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.
@@ -184,10 +184,10 @@ class MapRenderer extends Disposable {
forEachLayerAtPixel(pixel, frameState, hitTolerance, callback, thisArg, layerFilter, thisArg2) {}
/**
* @param {module:ol/coordinate~Coordinate} coordinate Coordinate.
* @param {module:ol/PluggableMap~FrameState} frameState FrameState.
* @param {import("../coordinate.js").Coordinate} coordinate Coordinate.
* @param {import("../PluggableMap.js").FrameState} frameState FrameState.
* @param {number} hitTolerance Hit tolerance in pixels.
* @param {function(this: U, module:ol/layer/Layer): boolean} layerFilter Layer filter
* @param {function(this: U, import("../layer/Layer.js").default): 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.
@@ -203,9 +203,9 @@ class MapRenderer extends Disposable {
}
/**
* @param {module:ol/layer/Layer} layer Layer.
* @param {import("../layer/Layer.js").default} layer Layer.
* @protected
* @return {module:ol/renderer/Layer} Layer renderer.
* @return {import("./Layer.js").default} Layer renderer.
*/
getLayerRenderer(layer) {
const layerKey = getUid(layer).toString();
@@ -234,7 +234,7 @@ class MapRenderer extends Disposable {
/**
* @param {string} layerKey Layer key.
* @protected
* @return {module:ol/renderer/Layer} Layer renderer.
* @return {import("./Layer.js").default} Layer renderer.
*/
getLayerRendererByKey(layerKey) {
return this.layerRenderers_[layerKey];
@@ -242,14 +242,14 @@ class MapRenderer extends Disposable {
/**
* @protected
* @return {Object<string, module:ol/renderer/Layer>} Layer renderers.
* @return {Object<string, import("./Layer.js").default>} Layer renderers.
*/
getLayerRenderers() {
return this.layerRenderers_;
}
/**
* @return {module:ol/PluggableMap} Map.
* @return {import("../PluggableMap.js").default} Map.
*/
getMap() {
return this.map_;
@@ -265,7 +265,7 @@ class MapRenderer extends Disposable {
/**
* @param {string} layerKey Layer key.
* @return {module:ol/renderer/Layer} Layer renderer.
* @return {import("./Layer.js").default} Layer renderer.
* @private
*/
removeLayerRendererByKey_(layerKey) {
@@ -279,8 +279,8 @@ class MapRenderer extends Disposable {
}
/**
* @param {module:ol/PluggableMap} map Map.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {import("../PluggableMap.js").default} map Map.
* @param {import("../PluggableMap.js").FrameState} frameState Frame state.
* @private
*/
removeUnusedLayerRenderers_(map, frameState) {
@@ -292,22 +292,22 @@ class MapRenderer extends Disposable {
}
/**
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {import("../PluggableMap.js").FrameState} frameState Frame state.
* @protected
*/
scheduleExpireIconCache(frameState) {
frameState.postRenderFunctions.push(/** @type {module:ol/PluggableMap~PostRenderFunction} */ (expireIconCache));
frameState.postRenderFunctions.push(/** @type {import("../PluggableMap.js").PostRenderFunction} */ (expireIconCache));
}
/**
* @param {!module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {!import("../PluggableMap.js").FrameState} frameState Frame state.
* @protected
*/
scheduleRemoveUnusedLayerRenderers(frameState) {
for (const layerKey in this.layerRenderers_) {
if (!(layerKey in frameState.layerStates)) {
frameState.postRenderFunctions.push(
/** @type {module:ol/PluggableMap~PostRenderFunction} */ (this.removeUnusedLayerRenderers_.bind(this))
/** @type {import("../PluggableMap.js").PostRenderFunction} */ (this.removeUnusedLayerRenderers_.bind(this))
);
return;
}
@@ -317,8 +317,8 @@ class MapRenderer extends Disposable {
/**
* @param {module:ol/PluggableMap} map Map.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {import("../PluggableMap.js").default} map Map.
* @param {import("../PluggableMap.js").FrameState} frameState Frame state.
*/
function expireIconCache(map, frameState) {
iconImageCache.expire();
@@ -327,21 +327,21 @@ function expireIconCache(map, frameState) {
/**
* Render.
* @param {?module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {?import("../PluggableMap.js").FrameState} frameState Frame state.
*/
MapRenderer.prototype.renderFrame = VOID;
/**
* @param {module:ol/render/EventType} type Event type.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {import("../render/EventType.js").default} type Event type.
* @param {import("../PluggableMap.js").FrameState} frameState Frame state.
*/
MapRenderer.prototype.dispatchRenderEvent = VOID;
/**
* @param {module:ol/layer/Layer~State} state1 First layer state.
* @param {module:ol/layer/Layer~State} state2 Second layer state.
* @param {import("../layer/Layer.js").State} state1 First layer state.
* @param {import("../layer/Layer.js").State} state2 Second layer state.
* @return {number} The zIndex difference.
*/
export function sortByZIndex(state1, state2) {

View File

@@ -21,7 +21,7 @@ import {create as createTransform, compose as composeTransform} from '../../tran
class CanvasImageLayerRenderer extends IntermediateCanvasRenderer {
/**
* @param {module:ol/layer/Image|module:ol/layer/Vector} imageLayer Image or vector layer.
* @param {import("../../layer/Image.js").default|import("../../layer/Vector.js").default} imageLayer Image or vector layer.
*/
constructor(imageLayer) {
@@ -29,13 +29,13 @@ class CanvasImageLayerRenderer extends IntermediateCanvasRenderer {
/**
* @private
* @type {?module:ol/ImageBase}
* @type {?import("../../ImageBase.js").default}
*/
this.image_ = null;
/**
* @private
* @type {module:ol/transform~Transform}
* @type {import("../../transform.js").Transform}
*/
this.imageTransform_ = createTransform();
@@ -46,7 +46,7 @@ class CanvasImageLayerRenderer extends IntermediateCanvasRenderer {
/**
* @private
* @type {module:ol/renderer/canvas/VectorLayer}
* @type {import("./VectorLayer.js").default}
*/
this.vectorRenderer_ = null;
@@ -98,7 +98,7 @@ class CanvasImageLayerRenderer extends IntermediateCanvasRenderer {
const viewResolution = viewState.resolution;
let image;
const imageLayer = /** @type {module:ol/layer/Image} */ (this.getLayer());
const imageLayer = /** @type {import("../../layer/Image.js").default} */ (this.getLayer());
const imageSource = imageLayer.getSource();
const hints = frameState.viewHints;
@@ -121,12 +121,12 @@ class CanvasImageLayerRenderer extends IntermediateCanvasRenderer {
let skippedFeatures = this.skippedFeatures_;
if (vectorRenderer) {
const context = vectorRenderer.context;
const imageFrameState = /** @type {module:ol/PluggableMap~FrameState} */ (assign({}, frameState, {
const imageFrameState = /** @type {import("../../PluggableMap.js").FrameState} */ (assign({}, frameState, {
size: [
getWidth(renderedExtent) / viewResolution,
getHeight(renderedExtent) / viewResolution
],
viewState: /** @type {module:ol/View~State} */ (assign({}, frameState.viewState, {
viewState: /** @type {import("../../View.js").State} */ (assign({}, frameState.viewState, {
rotation: 0
}))
}));
@@ -192,24 +192,24 @@ class CanvasImageLayerRenderer extends IntermediateCanvasRenderer {
/**
* Determine if this renderer handles the provided layer.
* @param {module:ol/layer/Layer} layer The candidate layer.
* @param {import("../../layer/Layer.js").default} 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} */ (layer).getRenderMode() === VectorRenderType.IMAGE;
/** @type {import("../../layer/Vector.js").default} */ (layer).getRenderMode() === VectorRenderType.IMAGE;
};
/**
* Create a layer renderer.
* @param {module:ol/renderer/Map} mapRenderer The map renderer.
* @param {module:ol/layer/Layer} layer The layer to be rendererd.
* @return {module:ol/renderer/canvas/ImageLayer} The layer renderer.
* @param {import("../Map.js").default} mapRenderer The map renderer.
* @param {import("../../layer/Layer.js").default} layer The layer to be rendererd.
* @return {import("./ImageLayer.js").default} The layer renderer.
*/
CanvasImageLayerRenderer['create'] = function(mapRenderer, layer) {
return new CanvasImageLayerRenderer(/** @type {module:ol/layer/Image} */ (layer));
return new CanvasImageLayerRenderer(/** @type {import("../../layer/Image.js").default} */ (layer));
};

View File

@@ -11,7 +11,7 @@ import {create as createTransform, apply as applyTransform} from '../../transfor
class IntermediateCanvasRenderer extends CanvasLayerRenderer {
/**
* @param {module:ol/layer/Layer} layer Layer.
* @param {import("../../layer/Layer.js").default} layer Layer.
*/
constructor(layer) {
@@ -19,7 +19,7 @@ class IntermediateCanvasRenderer extends CanvasLayerRenderer {
/**
* @protected
* @type {module:ol/transform~Transform}
* @type {import("../../transform.js").Transform}
*/
this.coordinateToCanvasPixelTransform = createTransform();
@@ -47,7 +47,7 @@ class IntermediateCanvasRenderer extends CanvasLayerRenderer {
!containsExtent(extent, frameState.extent) &&
intersects(extent, frameState.extent);
if (clipped) {
this.clip(context, frameState, /** @type {module:ol/extent~Extent} */ (extent));
this.clip(context, frameState, /** @type {import("../../extent.js").Extent} */ (extent));
}
const imageTransform = this.getImageTransform();
@@ -83,7 +83,7 @@ class IntermediateCanvasRenderer extends CanvasLayerRenderer {
/**
* @abstract
* @return {!module:ol/transform~Transform} Image transform.
* @return {!import("../../transform.js").Transform} Image transform.
*/
getImageTransform() {}
@@ -99,7 +99,7 @@ class IntermediateCanvasRenderer extends CanvasLayerRenderer {
return source.forEachFeatureAtCoordinate(
coordinate, resolution, rotation, hitTolerance, skippedFeatureUids,
/**
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @param {import("../../Feature.js").default|import("../../render/Feature.js").default} feature Feature.
* @return {?} Callback result.
*/
function(feature) {

View File

@@ -13,7 +13,7 @@ import {create as createTransform, apply as applyTransform, compose as composeTr
class CanvasLayerRenderer extends LayerRenderer {
/**
* @param {module:ol/layer/Layer} layer Layer.
* @param {import("../../layer/Layer.js").default} layer Layer.
*/
constructor(layer) {
@@ -27,7 +27,7 @@ class CanvasLayerRenderer extends LayerRenderer {
/**
* @private
* @type {module:ol/transform~Transform}
* @type {import("../../transform.js").Transform}
*/
this.transform_ = createTransform();
@@ -35,8 +35,8 @@ class CanvasLayerRenderer extends LayerRenderer {
/**
* @param {CanvasRenderingContext2D} context Context.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/extent~Extent} extent Clip extent.
* @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
* @param {import("../../extent.js").Extent} extent Clip extent.
* @protected
*/
clip(context, frameState, extent) {
@@ -44,10 +44,10 @@ class CanvasLayerRenderer extends LayerRenderer {
const width = frameState.size[0] * pixelRatio;
const height = frameState.size[1] * pixelRatio;
const rotation = frameState.viewState.rotation;
const topLeft = getTopLeft(/** @type {module:ol/extent~Extent} */ (extent));
const topRight = getTopRight(/** @type {module:ol/extent~Extent} */ (extent));
const bottomRight = getBottomRight(/** @type {module:ol/extent~Extent} */ (extent));
const bottomLeft = getBottomLeft(/** @type {module:ol/extent~Extent} */ (extent));
const topLeft = getTopLeft(/** @type {import("../../extent.js").Extent} */ (extent));
const topRight = getTopRight(/** @type {import("../../extent.js").Extent} */ (extent));
const bottomRight = getBottomRight(/** @type {import("../../extent.js").Extent} */ (extent));
const bottomLeft = getBottomLeft(/** @type {import("../../extent.js").Extent} */ (extent));
applyTransform(frameState.coordinateToPixelTransform, topLeft);
applyTransform(frameState.coordinateToPixelTransform, topRight);
@@ -66,10 +66,10 @@ class CanvasLayerRenderer extends LayerRenderer {
}
/**
* @param {module:ol/render/EventType} type Event type.
* @param {import("../../render/EventType.js").default} type Event type.
* @param {CanvasRenderingContext2D} context Context.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/transform~Transform=} opt_transform Transform.
* @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
* @param {import("../../transform.js").Transform=} opt_transform Transform.
* @private
*/
dispatchComposeEvent_(type, context, frameState, opt_transform) {
@@ -92,10 +92,10 @@ class CanvasLayerRenderer extends LayerRenderer {
}
/**
* @param {module:ol/coordinate~Coordinate} coordinate Coordinate.
* @param {module:ol/PluggableMap~FrameState} frameState FrameState.
* @param {import("../../coordinate.js").Coordinate} coordinate Coordinate.
* @param {import("../../PluggableMap.js").FrameState} frameState FrameState.
* @param {number} hitTolerance Hit tolerance in pixels.
* @param {function(this: S, module:ol/layer/Layer, (Uint8ClampedArray|Uint8Array)): T} callback Layer
* @param {function(this: S, import("../../layer/Layer.js").default, (Uint8ClampedArray|Uint8Array)): T} callback Layer
* callback.
* @param {S} thisArg Value to use as `this` when executing `callback`.
* @return {T|undefined} Callback result.
@@ -113,9 +113,9 @@ class CanvasLayerRenderer extends LayerRenderer {
/**
* @param {CanvasRenderingContext2D} context Context.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/layer/Layer~State} layerState Layer state.
* @param {module:ol/transform~Transform=} opt_transform Transform.
* @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
* @param {import("../../layer/Layer.js").State} layerState Layer state.
* @param {import("../../transform.js").Transform=} opt_transform Transform.
* @protected
*/
postCompose(context, frameState, layerState, opt_transform) {
@@ -124,8 +124,8 @@ class CanvasLayerRenderer extends LayerRenderer {
/**
* @param {CanvasRenderingContext2D} context Context.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/transform~Transform=} opt_transform Transform.
* @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
* @param {import("../../transform.js").Transform=} opt_transform Transform.
* @protected
*/
preCompose(context, frameState, opt_transform) {
@@ -134,8 +134,8 @@ class CanvasLayerRenderer extends LayerRenderer {
/**
* @param {CanvasRenderingContext2D} context Context.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/transform~Transform=} opt_transform Transform.
* @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
* @param {import("../../transform.js").Transform=} opt_transform Transform.
* @protected
*/
dispatchRenderEvent(context, frameState, opt_transform) {
@@ -143,10 +143,10 @@ class CanvasLayerRenderer extends LayerRenderer {
}
/**
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
* @param {number} offsetX Offset on the x-axis in view coordinates.
* @protected
* @return {!module:ol/transform~Transform} Transform.
* @return {!import("../../transform.js").Transform} Transform.
*/
getTransform(frameState, offsetX) {
const viewState = frameState.viewState;
@@ -163,16 +163,16 @@ class CanvasLayerRenderer extends LayerRenderer {
/**
* @abstract
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/layer/Layer~State} layerState Layer state.
* @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
* @param {import("../../layer/Layer.js").State} layerState Layer state.
* @param {CanvasRenderingContext2D} context Context.
*/
composeFrame(frameState, layerState, context) {}
/**
* @abstract
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/layer/Layer~State} layerState Layer state.
* @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
* @param {import("../../layer/Layer.js").State} layerState Layer state.
* @return {boolean} whether composeFrame should be called.
*/
prepareFrame(frameState, layerState) {}

View File

@@ -15,7 +15,7 @@ import SourceState from '../../source/State.js';
/**
* @type {Array<module:ol/renderer/Layer>}
* @type {Array<import("../Layer.js").default>}
*/
export const layerRendererConstructors = [];
@@ -27,7 +27,7 @@ export const layerRendererConstructors = [];
class CanvasMapRenderer extends MapRenderer {
/**
* @param {module:ol/PluggableMap} map Map.
* @param {import("../../PluggableMap.js").default} map Map.
*/
constructor(map) {
super(map);
@@ -60,15 +60,15 @@ class CanvasMapRenderer extends MapRenderer {
/**
* @private
* @type {module:ol/transform~Transform}
* @type {import("../../transform.js").Transform}
*/
this.transform_ = createTransform();
}
/**
* @param {module:ol/render/EventType} type Event type.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {import("../../render/EventType.js").default} type Event type.
* @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
*/
dispatchRenderEvent(type, frameState) {
const map = this.getMap();
@@ -90,9 +90,9 @@ class CanvasMapRenderer extends MapRenderer {
}
/**
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
* @protected
* @return {!module:ol/transform~Transform} Transform.
* @return {!import("../../transform.js").Transform} Transform.
*/
getTransform(frameState) {
const viewState = frameState.viewState;
@@ -149,7 +149,7 @@ class CanvasMapRenderer extends MapRenderer {
for (i = 0, ii = layerStatesArray.length; i < ii; ++i) {
layerState = layerStatesArray[i];
layer = layerState.layer;
layerRenderer = /** @type {module:ol/renderer/canvas/Layer} */ (this.getLayerRenderer(layer));
layerRenderer = /** @type {import("./Layer.js").default} */ (this.getLayerRenderer(layer));
if (!visibleAtResolution(layerState, viewResolution) ||
layerState.sourceState != SourceState.READY) {
continue;
@@ -193,7 +193,7 @@ class CanvasMapRenderer extends MapRenderer {
const layerState = layerStates[i];
const layer = layerState.layer;
if (visibleAtResolution(layerState, viewResolution) && layerFilter.call(thisArg2, layer)) {
const layerRenderer = /** @type {module:ol/renderer/canvas/Layer} */ (this.getLayerRenderer(layer));
const layerRenderer = /** @type {import("./Layer.js").default} */ (this.getLayerRenderer(layer));
result = layerRenderer.forEachLayerAtCoordinate(
coordinate, frameState, hitTolerance, callback, thisArg);
if (result) {

View File

@@ -19,7 +19,7 @@ import {create as createTransform, compose as composeTransform} from '../../tran
class CanvasTileLayerRenderer extends IntermediateCanvasRenderer {
/**
* @param {module:ol/layer/Tile|module:ol/layer/VectorTile} tileLayer Tile layer.
* @param {import("../../layer/Tile.js").default|import("../../layer/VectorTile.js").default} tileLayer Tile layer.
* @param {boolean=} opt_noContext Skip the context creation.
*/
constructor(tileLayer, opt_noContext) {
@@ -40,7 +40,7 @@ class CanvasTileLayerRenderer extends IntermediateCanvasRenderer {
/**
* @private
* @type {module:ol/extent~Extent}
* @type {import("../../extent.js").Extent}
*/
this.renderedExtent_ = null;
@@ -52,7 +52,7 @@ class CanvasTileLayerRenderer extends IntermediateCanvasRenderer {
/**
* @protected
* @type {!Array<module:ol/Tile>}
* @type {!Array<import("../../Tile.js").default>}
*/
this.renderedTiles = [];
@@ -64,19 +64,19 @@ class CanvasTileLayerRenderer extends IntermediateCanvasRenderer {
/**
* @protected
* @type {module:ol/extent~Extent}
* @type {import("../../extent.js").Extent}
*/
this.tmpExtent = createEmpty();
/**
* @private
* @type {module:ol/TileRange}
* @type {import("../../TileRange.js").default}
*/
this.tmpTileRange_ = new TileRange(0, 0, 0, 0);
/**
* @private
* @type {module:ol/transform~Transform}
* @type {import("../../transform.js").Transform}
*/
this.imageTransform_ = createTransform();
@@ -90,7 +90,7 @@ class CanvasTileLayerRenderer extends IntermediateCanvasRenderer {
/**
* @private
* @param {module:ol/Tile} tile Tile.
* @param {import("../../Tile.js").default} tile Tile.
* @return {boolean} Tile is drawable.
*/
isDrawableTile_(tile) {
@@ -106,12 +106,12 @@ class CanvasTileLayerRenderer extends IntermediateCanvasRenderer {
* @param {number} x Tile coordinate x.
* @param {number} y Tile coordinate y.
* @param {number} pixelRatio Pixel ratio.
* @param {module:ol/proj/Projection} projection Projection.
* @return {!module:ol/Tile} Tile.
* @param {import("../../proj/Projection.js").default} projection Projection.
* @return {!import("../../Tile.js").default} Tile.
*/
getTile(z, x, y, pixelRatio, projection) {
const layer = this.getLayer();
const source = /** @type {module:ol/source/Tile} */ (layer.getSource());
const source = /** @type {import("../../source/Tile.js").default} */ (layer.getSource());
let tile = source.getTile(z, x, y, pixelRatio, projection);
if (tile.getState() == TileState.ERROR) {
if (!layer.getUseInterimTilesOnError()) {
@@ -141,7 +141,7 @@ class CanvasTileLayerRenderer extends IntermediateCanvasRenderer {
const viewCenter = viewState.center;
const tileLayer = this.getLayer();
const tileSource = /** @type {module:ol/source/Tile} */ (tileLayer.getSource());
const tileSource = /** @type {import("../../source/Tile.js").default} */ (tileLayer.getSource());
const sourceRevision = tileSource.getRevision();
const tileGrid = tileSource.getTileGridForProjection(projection);
const z = tileGrid.getZForResolution(viewResolution, this.zDirection);
@@ -163,7 +163,7 @@ class CanvasTileLayerRenderer extends IntermediateCanvasRenderer {
const tilePixelRatio = tileSource.getTilePixelRatio(pixelRatio);
/**
* @type {Object<number, Object<string, module:ol/Tile>>}
* @type {Object<number, Object<string, import("../../Tile.js").default>>}
*/
const tilesToDrawByZ = {};
tilesToDrawByZ[z] = {};
@@ -301,9 +301,9 @@ class CanvasTileLayerRenderer extends IntermediateCanvasRenderer {
}
/**
* @param {module:ol/Tile} tile Tile.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/layer/Layer~State} layerState Layer state.
* @param {import("../../Tile.js").default} tile Tile.
* @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
* @param {import("../../layer/Layer.js").State} layerState Layer state.
* @param {number} x Left of the tile.
* @param {number} y Top of the tile.
* @param {number} w Width of the tile.
@@ -358,7 +358,7 @@ class CanvasTileLayerRenderer extends IntermediateCanvasRenderer {
/**
* Determine if this renderer handles the provided layer.
* @param {module:ol/layer/Layer} layer The candidate layer.
* @param {import("../../layer/Layer.js").default} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
CanvasTileLayerRenderer['handles'] = function(layer) {
@@ -368,18 +368,18 @@ CanvasTileLayerRenderer['handles'] = function(layer) {
/**
* Create a layer renderer.
* @param {module:ol/renderer/Map} mapRenderer The map renderer.
* @param {module:ol/layer/Layer} layer The layer to be rendererd.
* @return {module:ol/renderer/canvas/TileLayer} The layer renderer.
* @param {import("../Map.js").default} mapRenderer The map renderer.
* @param {import("../../layer/Layer.js").default} layer The layer to be rendererd.
* @return {import("./TileLayer.js").default} The layer renderer.
*/
CanvasTileLayerRenderer['create'] = function(mapRenderer, layer) {
return new CanvasTileLayerRenderer(/** @type {module:ol/layer/Tile} */ (layer));
return new CanvasTileLayerRenderer(/** @type {import("../../layer/Tile.js").default} */ (layer));
};
/**
* @function
* @return {module:ol/layer/Tile|module:ol/layer/VectorTile}
* @return {import("../../layer/Tile.js").default|import("../../layer/VectorTile.js").default}
*/
CanvasTileLayerRenderer.prototype.getLayer;

View File

@@ -23,7 +23,7 @@ import {defaultOrder as defaultRenderOrder, getTolerance as getRenderTolerance,
class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
/**
* @param {module:ol/layer/Vector} vectorLayer Vector layer.
* @param {import("../../layer/Vector.js").default} vectorLayer Vector layer.
*/
constructor(vectorLayer) {
@@ -55,19 +55,19 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
/**
* @private
* @type {module:ol/extent~Extent}
* @type {import("../../extent.js").Extent}
*/
this.renderedExtent_ = createEmpty();
/**
* @private
* @type {function(module:ol/Feature, module:ol/Feature): number|null}
* @type {function(import("../../Feature.js").default, import("../../Feature.js").default): number|null}
*/
this.renderedRenderOrder_ = null;
/**
* @private
* @type {module:ol/render/canvas/ReplayGroup}
* @type {import("../../render/canvas/ReplayGroup.js").default}
*/
this.replayGroup_ = null;
@@ -96,8 +96,8 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
/**
* @param {CanvasRenderingContext2D} context Context.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/layer/Layer~State} layerState Layer state.
* @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
* @param {import("../../layer/Layer.js").State} layerState Layer state.
*/
compose(context, frameState, layerState) {
const extent = frameState.extent;
@@ -108,7 +108,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
const projection = viewState.projection;
const rotation = viewState.rotation;
const projectionExtent = projection.getExtent();
const vectorSource = /** @type {module:ol/source/Vector} */ (this.getLayer().getSource());
const vectorSource = /** @type {import("../../source/Vector.js").default} */ (this.getLayer().getSource());
let transform = this.getTransform(frameState, 0);
@@ -116,14 +116,14 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
const clipExtent = layerState.extent;
const clipped = clipExtent !== undefined;
if (clipped) {
this.clip(context, frameState, /** @type {module:ol/extent~Extent} */ (clipExtent));
this.clip(context, frameState, /** @type {import("../../extent.js").Extent} */ (clipExtent));
}
const replayGroup = this.replayGroup_;
if (replayGroup && !replayGroup.isEmpty()) {
if (this.declutterTree_) {
this.declutterTree_.clear();
}
const layer = /** @type {module:ol/layer/Vector} */ (this.getLayer());
const layer = /** @type {import("../../layer/Vector.js").default} */ (this.getLayer());
let drawOffsetX = 0;
let drawOffsetY = 0;
let replayContext;
@@ -235,12 +235,12 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
} else {
const resolution = frameState.viewState.resolution;
const rotation = frameState.viewState.rotation;
const layer = /** @type {module:ol/layer/Vector} */ (this.getLayer());
const layer = /** @type {import("../../layer/Vector.js").default} */ (this.getLayer());
/** @type {!Object<string, boolean>} */
const features = {};
const result = this.replayGroup_.forEachFeatureAtCoordinate(coordinate, resolution, rotation, hitTolerance, {},
/**
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @param {import("../../Feature.js").default|import("../../render/Feature.js").default} feature Feature.
* @return {?} Callback result.
*/
function(feature) {
@@ -255,7 +255,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
}
/**
* @param {module:ol/events/Event} event Event.
* @param {import("../../events/Event.js").default} event Event.
*/
handleFontsChanged_(event) {
const layer = this.getLayer();
@@ -266,7 +266,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
/**
* Handle changes in image style state.
* @param {module:ol/events/Event} event Image style change event.
* @param {import("../../events/Event.js").default} event Image style change event.
* @private
*/
handleStyleImageChange_(event) {
@@ -277,7 +277,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
* @inheritDoc
*/
prepareFrame(frameState, layerState) {
const vectorLayer = /** @type {module:ol/layer/Vector} */ (this.getLayer());
const vectorLayer = /** @type {import("../../layer/Vector.js").default} */ (this.getLayer());
const vectorSource = vectorLayer.getSource();
const animating = frameState.viewHints[ViewHint.ANIMATING];
@@ -338,8 +338,8 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
pixelRatio, vectorSource.getOverlaps(), this.declutterTree_, vectorLayer.getRenderBuffer());
vectorSource.loadFeatures(extent, resolution, projection);
/**
* @param {module:ol/Feature} feature Feature.
* @this {module:ol/renderer/canvas/VectorLayer}
* @param {import("../../Feature.js").default} feature Feature.
* @this {import("./VectorLayer.js").default}
*/
const render = function(feature) {
let styles;
@@ -354,11 +354,11 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
}
}.bind(this);
if (vectorLayerRenderOrder) {
/** @type {Array<module:ol/Feature>} */
/** @type {Array<import("../../Feature.js").default>} */
const features = [];
vectorSource.forEachFeatureInExtent(extent,
/**
* @param {module:ol/Feature} feature Feature.
* @param {import("../../Feature.js").default} feature Feature.
*/
function(feature) {
features.push(feature);
@@ -383,11 +383,11 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
}
/**
* @param {module:ol/Feature} feature Feature.
* @param {import("../../Feature.js").default} feature Feature.
* @param {number} resolution Resolution.
* @param {number} pixelRatio Pixel ratio.
* @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.
* @param {import("../../style/Style.js").default|Array<import("../../style/Style.js").default>} styles The style or array of styles.
* @param {import("../../render/canvas/ReplayGroup.js").default} replayGroup Replay group.
* @return {boolean} `true` if an image is loading.
*/
renderFeature(feature, resolution, pixelRatio, styles, replayGroup) {
@@ -415,7 +415,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
/**
* Determine if this renderer handles the provided layer.
* @param {module:ol/layer/Layer} layer The candidate layer.
* @param {import("../../layer/Layer.js").default} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
CanvasVectorLayerRenderer['handles'] = function(layer) {
@@ -425,12 +425,12 @@ CanvasVectorLayerRenderer['handles'] = function(layer) {
/**
* Create a layer renderer.
* @param {module:ol/renderer/Map} mapRenderer The map renderer.
* @param {module:ol/layer/Layer} layer The layer to be rendererd.
* @return {module:ol/renderer/canvas/VectorLayer} The layer renderer.
* @param {import("../Map.js").default} mapRenderer The map renderer.
* @param {import("../../layer/Layer.js").default} layer The layer to be rendererd.
* @return {import("./VectorLayer.js").default} The layer renderer.
*/
CanvasVectorLayerRenderer['create'] = function(mapRenderer, layer) {
return new CanvasVectorLayerRenderer(/** @type {module:ol/layer/Vector} */ (layer));
return new CanvasVectorLayerRenderer(/** @type {import("../../layer/Vector.js").default} */ (layer));
};

View File

@@ -29,7 +29,7 @@ import {
/**
* @type {!Object<string, Array<module:ol/render/ReplayType>>}
* @type {!Object<string, Array<import("../../render/ReplayType.js").default>>}
*/
const IMAGE_REPLAYS = {
'image': [ReplayType.POLYGON, ReplayType.CIRCLE,
@@ -39,7 +39,7 @@ const IMAGE_REPLAYS = {
/**
* @type {!Object<string, Array<module:ol/render/ReplayType>>}
* @type {!Object<string, Array<import("../../render/ReplayType.js").default>>}
*/
const VECTOR_REPLAYS = {
'image': [ReplayType.DEFAULT],
@@ -56,7 +56,7 @@ const VECTOR_REPLAYS = {
class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
/**
* @param {module:ol/layer/VectorTile} layer VectorTile layer.
* @param {import("../../layer/VectorTile.js").default} layer VectorTile layer.
*/
constructor(layer) {
@@ -82,7 +82,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
/**
* @private
* @type {module:ol/transform~Transform}
* @type {import("../../transform.js").Transform}
*/
this.tmpTransform_ = createTransform();
@@ -136,15 +136,15 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
}
/**
* @param {module:ol/VectorImageTile} tile Tile.
* @param {import("../../VectorImageTile.js").default} tile Tile.
* @param {number} pixelRatio Pixel ratio.
* @param {module:ol/proj/Projection} projection Projection.
* @param {import("../../proj/Projection.js").default} projection Projection.
* @private
*/
createReplayGroup_(tile, pixelRatio, projection) {
const layer = this.getLayer();
const revision = layer.getRevision();
const renderOrder = /** @type {module:ol/render~OrderFunction} */ (layer.getRenderOrder()) || null;
const renderOrder = /** @type {import("../../render.js").OrderFunction} */ (layer.getRenderOrder()) || null;
const replayState = tile.getReplayState(layer);
if (!replayState.dirty && replayState.renderedRevision == revision &&
@@ -152,7 +152,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
return;
}
const source = /** @type {module:ol/source/VectorTile} */ (layer.getSource());
const source = /** @type {import("../../source/VectorTile.js").default} */ (layer.getSource());
const sourceTileGrid = source.getTileGrid();
const tileGrid = source.getTileGridForProjection(projection);
const resolution = tileGrid.getResolution(tile.tileCoord[0]);
@@ -182,8 +182,8 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
const squaredTolerance = getSquaredRenderTolerance(resolution, pixelRatio);
/**
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @this {module:ol/renderer/canvas/VectorTileLayer}
* @param {import("../../Feature.js").default|import("../../render/Feature.js").default} feature Feature.
* @this {import("./VectorTileLayer.js").default}
*/
const render = function(feature) {
let styles;
@@ -238,7 +238,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
/** @type {!Object<string, boolean>} */
const features = {};
/** @type {Array<module:ol/VectorImageTile>} */
/** @type {Array<import("../../VectorImageTile.js").default>} */
const renderedTiles = this.renderedTiles;
let bufferedExtent, found;
@@ -257,7 +257,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
replayGroup = sourceTile.getReplayGroup(layer, tile.tileCoord.toString());
found = found || replayGroup.forEachFeatureAtCoordinate(coordinate, resolution, rotation, hitTolerance, {},
/**
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @param {import("../../Feature.js").default|import("../../render/Feature.js").default} feature Feature.
* @return {?} Callback result.
*/
function(feature) {
@@ -273,14 +273,14 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
}
/**
* @param {module:ol/VectorTile} tile Tile.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @return {module:ol/transform~Transform} transform Transform.
* @param {import("../../VectorTile.js").default} tile Tile.
* @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
* @return {import("../../transform.js").Transform} transform Transform.
* @private
*/
getReplayTransform_(tile, frameState) {
const layer = this.getLayer();
const source = /** @type {module:ol/source/VectorTile} */ (layer.getSource());
const source = /** @type {import("../../source/VectorTile.js").default} */ (layer.getSource());
const tileGrid = source.getTileGrid();
const tileCoord = tile.tileCoord;
const tileResolution = tileGrid.getResolution(tileCoord[0]);
@@ -302,7 +302,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
}
/**
* @param {module:ol/events/Event} event Event.
* @param {import("../../events/Event.js").default} event Event.
*/
handleFontsChanged_(event) {
const layer = this.getLayer();
@@ -313,7 +313,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
/**
* Handle changes in image style state.
* @param {module:ol/events/Event} event Image style change event.
* @param {import("../../events/Event.js").default} event Image style change event.
* @private
*/
handleStyleImageChange_(event) {
@@ -328,7 +328,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
const renderMode = layer.getRenderMode();
if (renderMode != VectorTileRenderType.IMAGE) {
const declutterReplays = layer.getDeclutter() ? {} : null;
const source = /** @type {module:ol/source/VectorTile} */ (layer.getSource());
const source = /** @type {import("../../source/VectorTile.js").default} */ (layer.getSource());
const replayTypes = VECTOR_REPLAYS[renderMode];
const pixelRatio = frameState.pixelRatio;
const rotation = frameState.viewState.rotation;
@@ -349,7 +349,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
const clips = [];
const zs = [];
for (let i = tiles.length - 1; i >= 0; --i) {
const tile = /** @type {module:ol/VectorImageTile} */ (tiles[i]);
const tile = /** @type {import("../../VectorImageTile.js").default} */ (tiles[i]);
if (tile.getState() == TileState.ABORT) {
continue;
}
@@ -411,10 +411,10 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
}
/**
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @param {import("../../Feature.js").default|import("../../render/Feature.js").default} feature Feature.
* @param {number} squaredTolerance Squared tolerance.
* @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.
* @param {import("../../style/Style.js").default|Array<import("../../style/Style.js").default>} styles The style or array of styles.
* @param {import("../../render/canvas/ReplayGroup.js").default} replayGroup Replay group.
* @return {boolean} `true` if an image is loading.
*/
renderFeature(feature, squaredTolerance, styles, replayGroup) {
@@ -437,9 +437,9 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
}
/**
* @param {module:ol/VectorImageTile} tile Tile.
* @param {import("../../VectorImageTile.js").default} tile Tile.
* @param {number} pixelRatio Pixel ratio.
* @param {module:ol/proj/Projection} projection Projection.
* @param {import("../../proj/Projection.js").default} projection Projection.
* @private
*/
renderTileImage_(tile, pixelRatio, projection) {
@@ -451,7 +451,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
replayState.renderedTileRevision = revision;
const tileCoord = tile.wrappedTileCoord;
const z = tileCoord[0];
const source = /** @type {module:ol/source/VectorTile} */ (layer.getSource());
const source = /** @type {import("../../source/VectorTile.js").default} */ (layer.getSource());
const tileGrid = source.getTileGridForProjection(projection);
const resolution = tileGrid.getResolution(z);
const context = tile.getContext(layer);
@@ -478,7 +478,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
/**
* Determine if this renderer handles the provided layer.
* @param {module:ol/layer/Layer} layer The candidate layer.
* @param {import("../../layer/Layer.js").default} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
CanvasVectorTileLayerRenderer['handles'] = function(layer) {
@@ -488,12 +488,12 @@ CanvasVectorTileLayerRenderer['handles'] = function(layer) {
/**
* Create a layer renderer.
* @param {module:ol/renderer/Map} mapRenderer The map renderer.
* @param {module:ol/layer/Layer} layer The layer to be rendererd.
* @return {module:ol/renderer/canvas/VectorTileLayer} The layer renderer.
* @param {import("../Map.js").default} mapRenderer The map renderer.
* @param {import("../../layer/Layer.js").default} layer The layer to be rendererd.
* @return {import("./VectorTileLayer.js").default} The layer renderer.
*/
CanvasVectorTileLayerRenderer['create'] = function(mapRenderer, layer) {
return new CanvasVectorTileLayerRenderer(/** @type {module:ol/layer/VectorTile} */ (layer));
return new CanvasVectorTileLayerRenderer(/** @type {import("../../layer/VectorTile.js").default} */ (layer));
};

View File

@@ -16,9 +16,9 @@ const SIMPLIFY_TOLERANCE = 0.5;
/**
* @const
* @type {Object<module:ol/geom/GeometryType,
* function(module:ol/render/ReplayGroup, module:ol/geom/Geometry,
* module:ol/style/Style, Object)>}
* @type {Object<import("../geom/GeometryType.js").default,
* function(import("../render/ReplayGroup.js").default, import("../geom/Geometry.js").default,
* import("../style/Style.js").default, Object)>}
*/
const GEOMETRY_RENDERERS = {
'Point': renderPointGeometry,
@@ -33,8 +33,8 @@ const GEOMETRY_RENDERERS = {
/**
* @param {module:ol/Feature|module:ol/render/Feature} feature1 Feature 1.
* @param {module:ol/Feature|module:ol/render/Feature} feature2 Feature 2.
* @param {import("../Feature.js").default|import("../render/Feature.js").default} feature1 Feature 1.
* @param {import("../Feature.js").default|import("../render/Feature.js").default} 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 Replay group.
* @param {module:ol/geom/Circle} geometry Geometry.
* @param {module:ol/style/Style} style Style.
* @param {module:ol/Feature} feature Feature.
* @param {import("../render/ReplayGroup.js").default} replayGroup Replay group.
* @param {import("../geom/Circle.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").default} 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 Replay group.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @param {module:ol/style/Style} style Style.
* @param {import("../render/ReplayGroup.js").default} replayGroup Replay group.
* @param {import("../Feature.js").default|import("../render/Feature.js").default} feature Feature.
* @param {import("../style/Style.js").default} style Style.
* @param {number} squaredTolerance Squared tolerance.
* @param {function(this: T, module:ol/events/Event)} listener Listener function.
* @param {function(this: T, import("../events/Event.js").default)} 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 Replay group.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @param {module:ol/style/Style} style Style.
* @param {import("../render/ReplayGroup.js").default} replayGroup Replay group.
* @param {import("../Feature.js").default|import("../render/Feature.js").default} feature Feature.
* @param {import("../style/Style.js").default} 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 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.
* @param {import("../render/ReplayGroup.js").default} replayGroup Replay group.
* @param {import("../geom/Geometry.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").default|import("../render/Feature.js").default} feature Feature.
*/
function renderGeometry(replayGroup, geometry, style, feature) {
if (geometry.getType() == GeometryType.GEOMETRY_COLLECTION) {
const geometries = /** @type {module:ol/geom/GeometryCollection} */ (geometry).getGeometries();
const geometries = /** @type {import("../geom/GeometryCollection.js").default} */ (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} */ (geometry), feature, style.getRenderer());
replay.drawCustom(/** @type {import("../geom/SimpleGeometry.js").default} */ (geometry), feature, style.getRenderer());
}
/**
* @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.
* @param {import("../render/ReplayGroup.js").default} replayGroup Replay group.
* @param {import("../geom/GeometryCollection.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").default} 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 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.
* @param {import("../render/ReplayGroup.js").default} replayGroup Replay group.
* @param {import("../geom/LineString.js").default|import("../render/Feature.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").default|import("../render/Feature.js").default} 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 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.
* @param {import("../render/ReplayGroup.js").default} replayGroup Replay group.
* @param {import("../geom/MultiLineString.js").default|import("../render/Feature.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").default|import("../render/Feature.js").default} 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 Replay group.
* @param {module:ol/geom/MultiPolygon} geometry Geometry.
* @param {module:ol/style/Style} style Style.
* @param {module:ol/Feature} feature Feature.
* @param {import("../render/ReplayGroup.js").default} replayGroup Replay group.
* @param {import("../geom/MultiPolygon.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").default} 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 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.
* @param {import("../render/ReplayGroup.js").default} replayGroup Replay group.
* @param {import("../geom/Point.js").default|import("../render/Feature.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").default|import("../render/Feature.js").default} 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 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.
* @param {import("../render/ReplayGroup.js").default} replayGroup Replay group.
* @param {import("../geom/MultiPoint.js").default|import("../render/Feature.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").default|import("../render/Feature.js").default} 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 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.
* @param {import("../render/ReplayGroup.js").default} replayGroup Replay group.
* @param {import("../geom/Polygon.js").default|import("../render/Feature.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").default|import("../render/Feature.js").default} feature Feature.
*/
function renderPolygonGeometry(replayGroup, geometry, style, feature) {
const fillStyle = style.getFill();

View File

@@ -29,8 +29,8 @@ import {createTexture} from '../../webgl/Context.js';
class WebGLImageLayerRenderer extends WebGLLayerRenderer {
/**
* @param {module:ol/renderer/webgl/Map} mapRenderer Map renderer.
* @param {module:ol/layer/Image} imageLayer Tile layer.
* @param {import("./Map.js").default} mapRenderer Map renderer.
* @param {import("../../layer/Image.js").default} imageLayer Tile layer.
*/
constructor(mapRenderer, imageLayer) {
@@ -39,7 +39,7 @@ class WebGLImageLayerRenderer extends WebGLLayerRenderer {
/**
* The last rendered image.
* @private
* @type {?module:ol/ImageBase}
* @type {?import("../../ImageBase.js").default}
*/
this.image_ = null;
@@ -51,14 +51,14 @@ class WebGLImageLayerRenderer extends WebGLLayerRenderer {
/**
* @private
* @type {?module:ol/transform~Transform}
* @type {?import("../../transform.js").Transform}
*/
this.hitTransformationMatrix_ = null;
}
/**
* @param {module:ol/ImageBase} image Image.
* @param {import("../../ImageBase.js").default} image Image.
* @private
* @return {WebGLTexture} Texture.
*/
@@ -88,7 +88,7 @@ class WebGLImageLayerRenderer extends WebGLLayerRenderer {
coordinate, resolution, rotation, hitTolerance, skippedFeatureUids,
/**
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @param {import("../../Feature.js").default|import("../../render/Feature.js").default} feature Feature.
* @return {?} Callback result.
*/
function(feature) {
@@ -111,7 +111,7 @@ class WebGLImageLayerRenderer extends WebGLLayerRenderer {
let image = this.image_;
let texture = this.texture;
const imageLayer = /** @type {module:ol/layer/Image} */ (this.getLayer());
const imageLayer = /** @type {import("../../layer/Image.js").default} */ (this.getLayer());
const imageSource = imageLayer.getSource();
const hints = frameState.viewHints;
@@ -147,7 +147,7 @@ class WebGLImageLayerRenderer extends WebGLLayerRenderer {
}
}.bind(null, gl, this.texture);
frameState.postRenderFunctions.push(
/** @type {module:ol/PluggableMap~PostRenderFunction} */ (postRenderFunction)
/** @type {import("../../PluggableMap.js").PostRenderFunction} */ (postRenderFunction)
);
}
}
@@ -179,10 +179,10 @@ class WebGLImageLayerRenderer extends WebGLLayerRenderer {
* @param {number} canvasWidth Canvas width.
* @param {number} canvasHeight Canvas height.
* @param {number} pixelRatio Pixel ratio.
* @param {module:ol/coordinate~Coordinate} viewCenter View center.
* @param {import("../../coordinate.js").Coordinate} viewCenter View center.
* @param {number} viewResolution View resolution.
* @param {number} viewRotation View rotation.
* @param {module:ol/extent~Extent} imageExtent Image extent.
* @param {import("../../extent.js").Extent} imageExtent Image extent.
* @private
*/
updateProjectionMatrix_(
@@ -280,9 +280,9 @@ class WebGLImageLayerRenderer extends WebGLLayerRenderer {
/**
* The transformation matrix to get the pixel on the image for a
* pixel on the map.
* @param {module:ol/size~Size} mapSize The map size.
* @param {module:ol/size~Size} imageSize The image size.
* @return {module:ol/transform~Transform} The transformation matrix.
* @param {import("../../size.js").Size} mapSize The map size.
* @param {import("../../size.js").Size} imageSize The image size.
* @return {import("../../transform.js").Transform} The transformation matrix.
* @private
*/
getHitTransformationMatrix_(mapSize, imageSize) {
@@ -315,7 +315,7 @@ class WebGLImageLayerRenderer extends WebGLLayerRenderer {
/**
* Determine if this renderer handles the provided layer.
* @param {module:ol/layer/Layer} layer The candidate layer.
* @param {import("../../layer/Layer.js").default} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
WebGLImageLayerRenderer['handles'] = function(layer) {
@@ -325,14 +325,14 @@ WebGLImageLayerRenderer['handles'] = function(layer) {
/**
* Create a layer renderer.
* @param {module:ol/renderer/Map} mapRenderer The map renderer.
* @param {module:ol/layer/Layer} layer The layer to be rendererd.
* @return {module:ol/renderer/webgl/ImageLayer} The layer renderer.
* @param {import("../Map.js").default} mapRenderer The map renderer.
* @param {import("../../layer/Layer.js").default} layer The layer to be rendererd.
* @return {import("./ImageLayer.js").default} The layer renderer.
*/
WebGLImageLayerRenderer['create'] = function(mapRenderer, layer) {
return new WebGLImageLayerRenderer(
/** @type {module:ol/renderer/webgl/Map} */ (mapRenderer),
/** @type {module:ol/layer/Image} */ (layer)
/** @type {import("./Map.js").default} */ (mapRenderer),
/** @type {import("../../layer/Image.js").default} */ (layer)
);
};

View File

@@ -17,8 +17,8 @@ import {createEmptyTexture} from '../../webgl/Context.js';
class WebGLLayerRenderer extends LayerRenderer {
/**
* @param {module:ol/renderer/webgl/Map} mapRenderer Map renderer.
* @param {module:ol/layer/Layer} layer Layer.
* @param {import("./Map.js").default} mapRenderer Map renderer.
* @param {import("../../layer/Layer.js").default} layer Layer.
*/
constructor(mapRenderer, layer) {
@@ -26,13 +26,13 @@ class WebGLLayerRenderer extends LayerRenderer {
/**
* @protected
* @type {module:ol/renderer/webgl/Map}
* @type {import("./Map.js").default}
*/
this.mapRenderer = mapRenderer;
/**
* @private
* @type {module:ol/webgl/Buffer}
* @type {import("../../webgl/Buffer.js").default}
*/
this.arrayBuffer_ = new WebGLBuffer([
-1, -1, 0, 0,
@@ -61,13 +61,13 @@ class WebGLLayerRenderer extends LayerRenderer {
/**
* @protected
* @type {module:ol/transform~Transform}
* @type {import("../../transform.js").Transform}
*/
this.texCoordMatrix = createTransform();
/**
* @protected
* @type {module:ol/transform~Transform}
* @type {import("../../transform.js").Transform}
*/
this.projectionMatrix = createTransform();
@@ -79,14 +79,14 @@ class WebGLLayerRenderer extends LayerRenderer {
/**
* @private
* @type {module:ol/renderer/webgl/defaultmapshader/Locations}
* @type {import("./defaultmapshader/Locations.js").default}
*/
this.defaultLocations_ = null;
}
/**
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
* @param {number} framebufferDimension Framebuffer dimension.
* @protected
*/
@@ -109,7 +109,7 @@ class WebGLLayerRenderer extends LayerRenderer {
}.bind(null, gl, this.framebuffer, this.texture);
frameState.postRenderFunctions.push(
/** @type {module:ol/PluggableMap~PostRenderFunction} */ (postRenderFunction)
/** @type {import("../../PluggableMap.js").PostRenderFunction} */ (postRenderFunction)
);
const texture = createEmptyTexture(
@@ -131,9 +131,9 @@ class WebGLLayerRenderer extends LayerRenderer {
}
/**
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/layer/Layer~State} layerState Layer state.
* @param {module:ol/webgl/Context} context Context.
* @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
* @param {import("../../layer/Layer.js").State} layerState Layer state.
* @param {import("../../webgl/Context.js").default} context Context.
*/
composeFrame(frameState, layerState, context) {
@@ -175,9 +175,9 @@ class WebGLLayerRenderer extends LayerRenderer {
}
/**
* @param {module:ol/render/EventType} type Event type.
* @param {module:ol/webgl/Context} context WebGL context.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {import("../../render/EventType.js").default} type Event type.
* @param {import("../../webgl/Context.js").default} context WebGL context.
* @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
* @private
*/
dispatchComposeEvent_(type, context, frameState) {
@@ -200,7 +200,7 @@ class WebGLLayerRenderer extends LayerRenderer {
}
/**
* @return {!module:ol/transform~Transform} Matrix.
* @return {!import("../../transform.js").Transform} Matrix.
*/
getTexCoordMatrix() {
return this.texCoordMatrix;
@@ -214,7 +214,7 @@ class WebGLLayerRenderer extends LayerRenderer {
}
/**
* @return {!module:ol/transform~Transform} Matrix.
* @return {!import("../../transform.js").Transform} Matrix.
*/
getProjectionMatrix() {
return this.projectionMatrix;
@@ -231,18 +231,18 @@ class WebGLLayerRenderer extends LayerRenderer {
/**
* @abstract
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/layer/Layer~State} layerState Layer state.
* @param {module:ol/webgl/Context} context Context.
* @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
* @param {import("../../layer/Layer.js").State} layerState Layer state.
* @param {import("../../webgl/Context.js").default} context Context.
* @return {boolean} whether composeFrame should be called.
*/
prepareFrame(frameState, layerState, context) {}
/**
* @abstract
* @param {module:ol/pixel~Pixel} pixel Pixel.
* @param {module:ol/PluggableMap~FrameState} frameState FrameState.
* @param {function(this: S, module:ol/layer/Layer, (Uint8ClampedArray|Uint8Array)): T} callback Layer
* @param {import("../../pixel.js").Pixel} pixel Pixel.
* @param {import("../../PluggableMap.js").FrameState} frameState FrameState.
* @param {function(this: S, import("../../layer/Layer.js").default, (Uint8ClampedArray|Uint8Array)): T} callback Layer
* callback.
* @param {S} thisArg Value to use as `this` when executing `callback`.
* @return {T|undefined} Callback result.

View File

@@ -45,7 +45,7 @@ const WEBGL_TEXTURE_CACHE_HIGH_WATER_MARK = 1024;
class WebGLMapRenderer extends MapRenderer {
/**
* @param {module:ol/PluggableMap} map Map.
* @param {import("../../PluggableMap.js").default} map Map.
*/
constructor(map) {
super(map);
@@ -102,7 +102,7 @@ class WebGLMapRenderer extends MapRenderer {
/**
* @private
* @type {module:ol/webgl/Context}
* @type {import("../../webgl/Context.js").default}
*/
this.context_ = new WebGLContext(this.canvas_, this.gl_);
@@ -113,28 +113,28 @@ class WebGLMapRenderer extends MapRenderer {
/**
* @private
* @type {module:ol/structs/LRUCache<module:ol/renderer/webgl/Map~TextureCacheEntry|null>}
* @type {import("../../structs/LRUCache.js").default<TextureCacheEntry|null>}
*/
this.textureCache_ = new LRUCache();
/**
* @private
* @type {module:ol/coordinate~Coordinate}
* @type {import("../../coordinate.js").Coordinate}
*/
this.focus_ = null;
/**
* @private
* @type {module:ol/structs/PriorityQueue<Array>}
* @type {import("../../structs/PriorityQueue.js").default<Array>}
*/
this.tileTextureQueue_ = new PriorityQueue(
/**
* @param {Array<*>} element Element.
* @return {number} Priority.
* @this {module:ol/renderer/webgl/Map}
* @this {import("./Map.js").default}
*/
(function(element) {
const tileCenter = /** @type {module:ol/coordinate~Coordinate} */ (element[1]);
const tileCenter = /** @type {import("../../coordinate.js").Coordinate} */ (element[1]);
const tileResolution = /** @type {number} */ (element[2]);
const deltaX = tileCenter[0] - this.focus_[0];
const deltaY = tileCenter[1] - this.focus_[1];
@@ -147,24 +147,24 @@ class WebGLMapRenderer extends MapRenderer {
*/
function(element) {
return (
/** @type {module:ol/Tile} */ (element[0]).getKey()
/** @type {import("../../Tile.js").default} */ (element[0]).getKey()
);
});
/**
* @param {module:ol/PluggableMap} map Map.
* @param {?module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {import("../../PluggableMap.js").default} map Map.
* @param {?import("../../PluggableMap.js").FrameState} frameState Frame state.
* @return {boolean} false.
* @this {module:ol/renderer/webgl/Map}
* @this {import("./Map.js").default}
*/
this.loadNextTileTexture_ =
function(map, frameState) {
if (!this.tileTextureQueue_.isEmpty()) {
this.tileTextureQueue_.reprioritize();
const element = this.tileTextureQueue_.dequeue();
const tile = /** @type {module:ol/Tile} */ (element[0]);
const tileSize = /** @type {module:ol/size~Size} */ (element[3]);
const tile = /** @type {import("../../Tile.js").default} */ (element[0]);
const tileSize = /** @type {import("../../size.js").Size} */ (element[3]);
const tileGutter = /** @type {number} */ (element[4]);
this.bindTileTexture(
tile, tileSize, tileGutter, LINEAR, LINEAR);
@@ -183,8 +183,8 @@ class WebGLMapRenderer extends MapRenderer {
}
/**
* @param {module:ol/Tile} tile Tile.
* @param {module:ol/size~Size} tileSize Tile size.
* @param {import("../../Tile.js").default} tile Tile.
* @param {import("../../size.js").Size} tileSize Tile size.
* @param {number} tileGutter Tile gutter.
* @param {number} magFilter Mag filter.
* @param {number} minFilter Min filter.
@@ -247,8 +247,8 @@ class WebGLMapRenderer extends MapRenderer {
}
/**
* @param {module:ol/render/EventType} type Event type.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {import("../../render/EventType.js").default} type Event type.
* @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
*/
dispatchRenderEvent(type, frameState) {
const map = this.getMap();
@@ -280,7 +280,7 @@ class WebGLMapRenderer extends MapRenderer {
if (!gl.isContextLost()) {
this.textureCache_.forEach(
/**
* @param {?module:ol/renderer/webgl/Map~TextureCacheEntry} textureCacheEntry
* @param {?TextureCacheEntry} textureCacheEntry
* Texture cache entry.
*/
function(textureCacheEntry) {
@@ -294,8 +294,8 @@ class WebGLMapRenderer extends MapRenderer {
}
/**
* @param {module:ol/PluggableMap} map Map.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {import("../../PluggableMap.js").default} map Map.
* @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
* @private
*/
expireCache_(map, frameState) {
@@ -318,7 +318,7 @@ class WebGLMapRenderer extends MapRenderer {
}
/**
* @return {module:ol/webgl/Context} The context.
* @return {import("../../webgl/Context.js").default} The context.
*/
getContext() {
return this.context_;
@@ -332,14 +332,14 @@ class WebGLMapRenderer extends MapRenderer {
}
/**
* @return {module:ol/structs/PriorityQueue<Array>} Tile texture queue.
* @return {import("../../structs/PriorityQueue.js").default<Array>} Tile texture queue.
*/
getTileTextureQueue() {
return this.tileTextureQueue_;
}
/**
* @param {module:ol/events/Event} event Event.
* @param {import("../../events/Event.js").default} event Event.
* @protected
*/
handleWebGLContextLost(event) {
@@ -349,7 +349,7 @@ class WebGLMapRenderer extends MapRenderer {
const renderers = this.getLayerRenderers();
for (const id in renderers) {
const renderer = /** @type {module:ol/renderer/webgl/Layer} */ (renderers[id]);
const renderer = /** @type {import("./Layer.js").default} */ (renderers[id]);
renderer.handleWebGLContextLost();
}
}
@@ -378,7 +378,7 @@ class WebGLMapRenderer extends MapRenderer {
}
/**
* @param {module:ol/Tile} tile Tile.
* @param {import("../../Tile.js").default} tile Tile.
* @return {boolean} Is tile texture loaded.
*/
isTileTextureLoaded(tile) {
@@ -412,7 +412,7 @@ class WebGLMapRenderer extends MapRenderer {
this.dispatchRenderEvent(RenderEventType.PRECOMPOSE, frameState);
/** @type {Array<module:ol/layer/Layer~State>} */
/** @type {Array<import("../../layer/Layer.js").State>} */
const layerStatesToDraw = [];
const layerStatesArray = frameState.layerStatesArray;
stableSort(layerStatesArray, sortByZIndex);
@@ -423,7 +423,7 @@ class WebGLMapRenderer extends MapRenderer {
layerState = layerStatesArray[i];
if (visibleAtResolution(layerState, viewResolution) &&
layerState.sourceState == SourceState.READY) {
layerRenderer = /** @type {module:ol/renderer/webgl/Layer} */ (this.getLayerRenderer(layerState.layer));
layerRenderer = /** @type {import("./Layer.js").default} */ (this.getLayerRenderer(layerState.layer));
if (layerRenderer.prepareFrame(frameState, layerState, context)) {
layerStatesToDraw.push(layerState);
}
@@ -446,7 +446,7 @@ class WebGLMapRenderer extends MapRenderer {
for (i = 0, ii = layerStatesToDraw.length; i < ii; ++i) {
layerState = layerStatesToDraw[i];
layerRenderer = /** @type {module:ol/renderer/webgl/Layer} */ (this.getLayerRenderer(layerState.layer));
layerRenderer = /** @type {import("./Layer.js").default} */ (this.getLayerRenderer(layerState.layer));
layerRenderer.composeFrame(frameState, layerState, context);
}
@@ -460,7 +460,7 @@ class WebGLMapRenderer extends MapRenderer {
if (this.textureCache_.getCount() - this.textureCacheFrameMarkerCount_ >
WEBGL_TEXTURE_CACHE_HIGH_WATER_MARK) {
frameState.postRenderFunctions.push(
/** @type {module:ol/PluggableMap~PostRenderFunction} */ (this.expireCache_.bind(this))
/** @type {import("../../PluggableMap.js").PostRenderFunction} */ (this.expireCache_.bind(this))
);
}
@@ -565,7 +565,7 @@ class WebGLMapRenderer extends MapRenderer {
const layer = layerState.layer;
if (visibleAtResolution(layerState, viewState.resolution) &&
layerFilter.call(thisArg, layer)) {
const layerRenderer = /** @type {module:ol/renderer/webgl/Layer} */ (this.getLayerRenderer(layer));
const layerRenderer = /** @type {import("./Layer.js").default} */ (this.getLayerRenderer(layer));
result = layerRenderer.forEachLayerAtPixel(
pixel, frameState, callback, thisArg);
if (result) {

View File

@@ -32,8 +32,8 @@ import WebGLBuffer from '../../webgl/Buffer.js';
class WebGLTileLayerRenderer extends WebGLLayerRenderer {
/**
* @param {module:ol/renderer/webgl/Map} mapRenderer Map renderer.
* @param {module:ol/layer/Tile} tileLayer Tile layer.
* @param {import("./Map.js").default} mapRenderer Map renderer.
* @param {import("../../layer/Tile.js").default} tileLayer Tile layer.
*/
constructor(mapRenderer, tileLayer) {
@@ -41,25 +41,25 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
/**
* @private
* @type {module:ol/webgl/Fragment}
* @type {import("../../webgl/Fragment.js").default}
*/
this.fragmentShader_ = fragment;
/**
* @private
* @type {module:ol/webgl/Vertex}
* @type {import("../../webgl/Vertex.js").default}
*/
this.vertexShader_ = vertex;
/**
* @private
* @type {module:ol/renderer/webgl/tilelayershader/Locations}
* @type {import("./tilelayershader/Locations.js").default}
*/
this.locations_ = null;
/**
* @private
* @type {module:ol/webgl/Buffer}
* @type {import("../../webgl/Buffer.js").default}
*/
this.renderArrayBuffer_ = new WebGLBuffer([
0, 0, 0, 1,
@@ -70,13 +70,13 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
/**
* @private
* @type {module:ol/TileRange}
* @type {import("../../TileRange.js").default}
*/
this.renderedTileRange_ = null;
/**
* @private
* @type {module:ol/extent~Extent}
* @type {import("../../extent.js").Extent}
*/
this.renderedFramebufferExtent_ = null;
@@ -88,7 +88,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
/**
* @private
* @type {module:ol/size~Size}
* @type {import("../../size.js").Size}
*/
this.tmpSize_ = [0, 0];
@@ -112,7 +112,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
return (
/**
* @param {number} zoom Zoom level.
* @param {module:ol/TileRange} tileRange Tile range.
* @param {import("../../TileRange.js").default} tileRange Tile range.
* @return {boolean} The tile range is fully loaded.
*/
function(zoom, tileRange) {
@@ -150,7 +150,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
const viewState = frameState.viewState;
const projection = viewState.projection;
const tileLayer = /** @type {module:ol/layer/Tile} */ (this.getLayer());
const tileLayer = /** @type {import("../../layer/Tile.js").default} */ (this.getLayer());
const tileSource = tileLayer.getSource();
const tileGrid = tileSource.getTileGridForProjection(projection);
const z = tileGrid.getZForResolution(viewState.resolution);
@@ -214,7 +214,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
gl.uniform1i(this.locations_.u_texture, 0);
/**
* @type {Object<number, Object<string, module:ol/Tile>>}
* @type {Object<number, Object<string, import("../../Tile.js").default>>}
*/
const tilesToDrawByZ = {};
tilesToDrawByZ[z] = {};
@@ -316,7 +316,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
frameState, tileSource, tileGrid, pixelRatio, projection, extent, z,
tileLayer.getPreload(),
/**
* @param {module:ol/Tile} tile Tile.
* @param {import("../../Tile.js").default} tile Tile.
*/
function(tile) {
if (tile.getState() == TileState.LOADED &&
@@ -387,7 +387,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
/**
* Determine if this renderer handles the provided layer.
* @param {module:ol/layer/Layer} layer The candidate layer.
* @param {import("../../layer/Layer.js").default} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
WebGLTileLayerRenderer['handles'] = function(layer) {
@@ -397,14 +397,14 @@ WebGLTileLayerRenderer['handles'] = function(layer) {
/**
* Create a layer renderer.
* @param {module:ol/renderer/Map} mapRenderer The map renderer.
* @param {module:ol/layer/Layer} layer The layer to be rendererd.
* @return {module:ol/renderer/webgl/TileLayer} The layer renderer.
* @param {import("../Map.js").default} mapRenderer The map renderer.
* @param {import("../../layer/Layer.js").default} layer The layer to be rendererd.
* @return {import("./TileLayer.js").default} The layer renderer.
*/
WebGLTileLayerRenderer['create'] = function(mapRenderer, layer) {
return new WebGLTileLayerRenderer(
/** @type {module:ol/renderer/webgl/Map} */ (mapRenderer),
/** @type {module:ol/layer/Tile} */ (layer)
/** @type {import("./Map.js").default} */ (mapRenderer),
/** @type {import("../../layer/Tile.js").default} */ (layer)
);
};

View File

@@ -19,8 +19,8 @@ import {apply as applyTransform} from '../../transform.js';
class WebGLVectorLayerRenderer extends WebGLLayerRenderer {
/**
* @param {module:ol/renderer/webgl/Map} mapRenderer Map renderer.
* @param {module:ol/layer/Vector} vectorLayer Vector layer.
* @param {import("./Map.js").default} mapRenderer Map renderer.
* @param {import("../../layer/Vector.js").default} vectorLayer Vector layer.
*/
constructor(mapRenderer, vectorLayer) {
@@ -46,26 +46,26 @@ class WebGLVectorLayerRenderer extends WebGLLayerRenderer {
/**
* @private
* @type {module:ol/extent~Extent}
* @type {import("../../extent.js").Extent}
*/
this.renderedExtent_ = createEmpty();
/**
* @private
* @type {function(module:ol/Feature, module:ol/Feature): number|null}
* @type {function(import("../../Feature.js").default, import("../../Feature.js").default): number|null}
*/
this.renderedRenderOrder_ = null;
/**
* @private
* @type {module:ol/render/webgl/ReplayGroup}
* @type {import("../../render/webgl/ReplayGroup.js").default}
*/
this.replayGroup_ = null;
/**
* The last layer state.
* @private
* @type {?module:ol/layer/Layer~State}
* @type {?import("../../layer/Layer.js").State}
*/
this.layerState_ = null;
@@ -124,7 +124,7 @@ class WebGLVectorLayerRenderer extends WebGLLayerRenderer {
frameState.size, frameState.pixelRatio, layerState.opacity,
{},
/**
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @param {import("../../Feature.js").default|import("../../render/Feature.js").default} feature Feature.
* @return {?} Callback result.
*/
function(feature) {
@@ -171,7 +171,7 @@ class WebGLVectorLayerRenderer extends WebGLLayerRenderer {
/**
* Handle changes in image style state.
* @param {module:ol/events/Event} event Image style change event.
* @param {import("../../events/Event.js").default} event Image style change event.
* @private
*/
handleStyleImageChange_(event) {
@@ -182,7 +182,7 @@ class WebGLVectorLayerRenderer extends WebGLLayerRenderer {
* @inheritDoc
*/
prepareFrame(frameState, layerState, context) {
const vectorLayer = /** @type {module:ol/layer/Vector} */ (this.getLayer());
const vectorLayer = /** @type {import("../../layer/Vector.js").default} */ (this.getLayer());
const vectorSource = vectorLayer.getSource();
const animating = frameState.viewHints[ViewHint.ANIMATING];
@@ -231,8 +231,8 @@ class WebGLVectorLayerRenderer extends WebGLLayerRenderer {
extent, vectorLayer.getRenderBuffer());
vectorSource.loadFeatures(extent, resolution, projection);
/**
* @param {module:ol/Feature} feature Feature.
* @this {module:ol/renderer/webgl/VectorLayer}
* @param {import("../../Feature.js").default} feature Feature.
* @this {import("./VectorLayer.js").default}
*/
const render = function(feature) {
let styles;
@@ -247,11 +247,11 @@ class WebGLVectorLayerRenderer extends WebGLLayerRenderer {
}
};
if (vectorLayerRenderOrder) {
/** @type {Array<module:ol/Feature>} */
/** @type {Array<import("../../Feature.js").default>} */
const features = [];
vectorSource.forEachFeatureInExtent(extent,
/**
* @param {module:ol/Feature} feature Feature.
* @param {import("../../Feature.js").default} feature Feature.
*/
function(feature) {
features.push(feature);
@@ -273,12 +273,12 @@ class WebGLVectorLayerRenderer extends WebGLLayerRenderer {
}
/**
* @param {module:ol/Feature} feature Feature.
* @param {import("../../Feature.js").default} feature Feature.
* @param {number} resolution Resolution.
* @param {number} pixelRatio Pixel ratio.
* @param {module:ol/style/Style|Array<module:ol/style/Style>} styles The style or array of
* @param {import("../../style/Style.js").default|Array<import("../../style/Style.js").default>} styles The style or array of
* styles.
* @param {module:ol/render/webgl/ReplayGroup} replayGroup Replay group.
* @param {import("../../render/webgl/ReplayGroup.js").default} replayGroup Replay group.
* @return {boolean} `true` if an image is loading.
*/
renderFeature(feature, resolution, pixelRatio, styles, replayGroup) {
@@ -306,7 +306,7 @@ class WebGLVectorLayerRenderer extends WebGLLayerRenderer {
/**
* Determine if this renderer handles the provided layer.
* @param {module:ol/layer/Layer} layer The candidate layer.
* @param {import("../../layer/Layer.js").default} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
WebGLVectorLayerRenderer['handles'] = function(layer) {
@@ -316,14 +316,14 @@ WebGLVectorLayerRenderer['handles'] = function(layer) {
/**
* Create a layer renderer.
* @param {module:ol/renderer/Map} mapRenderer The map renderer.
* @param {module:ol/layer/Layer} layer The layer to be rendererd.
* @return {module:ol/renderer/webgl/VectorLayer} The layer renderer.
* @param {import("../Map.js").default} mapRenderer The map renderer.
* @param {import("../../layer/Layer.js").default} layer The layer to be rendererd.
* @return {import("./VectorLayer.js").default} The layer renderer.
*/
WebGLVectorLayerRenderer['create'] = function(mapRenderer, layer) {
return new WebGLVectorLayerRenderer(
/** @type {module:ol/renderer/webgl/Map} */ (mapRenderer),
/** @type {module:ol/layer/Vector} */ (layer)
/** @type {import("./Map.js").default} */ (mapRenderer),
/** @type {import("../../layer/Vector.js").default} */ (layer)
);
};