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

Transformed types

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/canvas/ImageLayer.js
+13 -13
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));
};
src/ol/renderer/canvas/IntermediateCanvas.js
+5 -5
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) {
src/ol/renderer/canvas/Layer.js
+27 -27
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) {}
src/ol/renderer/canvas/Map.js
+9 -9
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) {
src/ol/renderer/canvas/TileLayer.js
+21 -21
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;
src/ol/renderer/canvas/VectorLayer.js
+26 -26
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));
};
src/ol/renderer/canvas/VectorTileLayer.js
+31 -31
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));
};