Transformed types
Using the [ts.js codemod](https://gist.github.com/tschaub/1ea498c9d1e5268cf36d212b3949be4e): jscodeshift --transform ts.js src
This commit is contained in:
@@ -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)
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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)
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
@@ -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)
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user