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

Get rid of olx.js and typedef.js typedefs for ol

Browse Source
This commit is contained in:
Andreas Hocevar
2018-03-08 18:42:57 +01:00
parent 8f0ffe2043
commit 95d6251dbb
198 changed files with 2262 additions and 2698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/renderer/canvas/ImageLayer.js
View File

@@ -33,7 +33,7 @@ const CanvasImageLayerRenderer = function(imageLayer) {
/**
* @private
* @type {ol.Transform}
* @type {module:ol/transform~Transform}
*/
this.imageTransform_ = createTransform();

6
src/ol/renderer/canvas/IntermediateCanvas.js
View File

@@ -21,7 +21,7 @@ const IntermediateCanvasRenderer = function(layer) {
/**
* @protected
* @type {ol.Transform}
* @type {module:ol/transform~Transform}
*/
this.coordinateToCanvasPixelTransform = createTransform();
@@ -52,7 +52,7 @@ IntermediateCanvasRenderer.prototype.composeFrame = function(frameState, layerSt
!containsExtent(extent, frameState.extent) &&
intersects(extent, frameState.extent);
if (clipped) {
this.clip(context, frameState, /** @type {ol.Extent} */ (extent));
this.clip(context, frameState, /** @type {module:ol/extent~Extent} */ (extent));
}
const imageTransform = this.getImageTransform();
@@ -90,7 +90,7 @@ IntermediateCanvasRenderer.prototype.getImage = function() {};
/**
* @abstract
* @return {!ol.Transform} Image transform.
* @return {!module:ol/transform~Transform} Image transform.
*/
IntermediateCanvasRenderer.prototype.getImageTransform = function() {};

30
src/ol/renderer/canvas/Layer.js
View File

@@ -29,7 +29,7 @@ const CanvasLayerRenderer = function(layer) {
/**
* @private
* @type {ol.Transform}
* @type {module:ol/transform~Transform}
*/
this.transform_ = createTransform();
@@ -41,7 +41,7 @@ inherits(CanvasLayerRenderer, LayerRenderer);
/**
* @param {CanvasRenderingContext2D} context Context.
* @param {olx.FrameState} frameState Frame state.
* @param {ol.Extent} extent Clip extent.
* @param {module:ol/extent~Extent} extent Clip extent.
* @protected
*/
CanvasLayerRenderer.prototype.clip = function(context, frameState, extent) {
@@ -49,10 +49,10 @@ CanvasLayerRenderer.prototype.clip = function(context, frameState, extent) {
const width = frameState.size[0] * pixelRatio;
const height = frameState.size[1] * pixelRatio;
const rotation = frameState.viewState.rotation;
const topLeft = getTopLeft(/** @type {ol.Extent} */ (extent));
const topRight = getTopRight(/** @type {ol.Extent} */ (extent));
const bottomRight = getBottomRight(/** @type {ol.Extent} */ (extent));
const bottomLeft = getBottomLeft(/** @type {ol.Extent} */ (extent));
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));
applyTransform(frameState.coordinateToPixelTransform, topLeft);
applyTransform(frameState.coordinateToPixelTransform, topRight);
@@ -75,7 +75,7 @@ CanvasLayerRenderer.prototype.clip = function(context, frameState, extent) {
* @param {ol.render.EventType} type Event type.
* @param {CanvasRenderingContext2D} context Context.
* @param {olx.FrameState} frameState Frame state.
* @param {ol.Transform=} opt_transform Transform.
* @param {module:ol/transform~Transform=} opt_transform Transform.
* @private
*/
CanvasLayerRenderer.prototype.dispatchComposeEvent_ = function(type, context, frameState, opt_transform) {
@@ -99,7 +99,7 @@ CanvasLayerRenderer.prototype.dispatchComposeEvent_ = function(type, context, fr
/**
* @param {ol.Coordinate} coordinate Coordinate.
* @param {module:ol/coordinate~Coordinate} coordinate Coordinate.
* @param {olx.FrameState} frameState FrameState.
* @param {function(this: S, ol.layer.Layer, (Uint8ClampedArray|Uint8Array)): T} callback Layer
* callback.
@@ -121,8 +121,8 @@ CanvasLayerRenderer.prototype.forEachLayerAtCoordinate = function(coordinate, fr
/**
* @param {CanvasRenderingContext2D} context Context.
* @param {olx.FrameState} frameState Frame state.
* @param {ol.LayerState} layerState Layer state.
* @param {ol.Transform=} opt_transform Transform.
* @param {module:ol/layer/Layer~State} layerState Layer state.
* @param {module:ol/transform~Transform=} opt_transform Transform.
* @protected
*/
CanvasLayerRenderer.prototype.postCompose = function(context, frameState, layerState, opt_transform) {
@@ -133,7 +133,7 @@ CanvasLayerRenderer.prototype.postCompose = function(context, frameState, layerS
/**
* @param {CanvasRenderingContext2D} context Context.
* @param {olx.FrameState} frameState Frame state.
* @param {ol.Transform=} opt_transform Transform.
* @param {module:ol/transform~Transform=} opt_transform Transform.
* @protected
*/
CanvasLayerRenderer.prototype.preCompose = function(context, frameState, opt_transform) {
@@ -144,7 +144,7 @@ CanvasLayerRenderer.prototype.preCompose = function(context, frameState, opt_tra
/**
* @param {CanvasRenderingContext2D} context Context.
* @param {olx.FrameState} frameState Frame state.
* @param {ol.Transform=} opt_transform Transform.
* @param {module:ol/transform~Transform=} opt_transform Transform.
* @protected
*/
CanvasLayerRenderer.prototype.dispatchRenderEvent = function(context, frameState, opt_transform) {
@@ -156,7 +156,7 @@ CanvasLayerRenderer.prototype.dispatchRenderEvent = function(context, frameState
* @param {olx.FrameState} frameState Frame state.
* @param {number} offsetX Offset on the x-axis in view coordinates.
* @protected
* @return {!ol.Transform} Transform.
* @return {!module:ol/transform~Transform} Transform.
*/
CanvasLayerRenderer.prototype.getTransform = function(frameState, offsetX) {
const viewState = frameState.viewState;
@@ -175,7 +175,7 @@ CanvasLayerRenderer.prototype.getTransform = function(frameState, offsetX) {
/**
* @abstract
* @param {olx.FrameState} frameState Frame state.
* @param {ol.LayerState} layerState Layer state.
* @param {module:ol/layer/Layer~State} layerState Layer state.
* @param {CanvasRenderingContext2D} context Context.
*/
CanvasLayerRenderer.prototype.composeFrame = function(frameState, layerState, context) {};
@@ -183,7 +183,7 @@ CanvasLayerRenderer.prototype.composeFrame = function(frameState, layerState, co
/**
* @abstract
* @param {olx.FrameState} frameState Frame state.
* @param {ol.LayerState} layerState Layer state.
* @param {module:ol/layer/Layer~State} layerState Layer state.
* @return {boolean} whether composeFrame should be called.
*/
CanvasLayerRenderer.prototype.prepareFrame = function(frameState, layerState) {};

4
src/ol/renderer/canvas/Map.js
View File

@@ -54,7 +54,7 @@ const CanvasMapRenderer = function(container, map) {
/**
* @private
* @type {ol.Transform}
* @type {module:ol/transform~Transform}
*/
this.transform_ = createTransform();
@@ -112,7 +112,7 @@ CanvasMapRenderer.prototype.dispatchComposeEvent_ = function(type, frameState) {
/**
* @param {olx.FrameState} frameState Frame state.
* @protected
* @return {!ol.Transform} Transform.
* @return {!module:ol/transform~Transform} Transform.
*/
CanvasMapRenderer.prototype.getTransform = function(frameState) {
const viewState = frameState.viewState;

8
src/ol/renderer/canvas/TileLayer.js
View File

@@ -36,7 +36,7 @@ const CanvasTileLayerRenderer = function(tileLayer) {
/**
* @private
* @type {ol.Extent}
* @type {module:ol/extent~Extent}
*/
this.renderedExtent_ = null;
@@ -54,7 +54,7 @@ const CanvasTileLayerRenderer = function(tileLayer) {
/**
* @protected
* @type {ol.Extent}
* @type {module:ol/extent~Extent}
*/
this.tmpExtent = createEmpty();
@@ -66,7 +66,7 @@ const CanvasTileLayerRenderer = function(tileLayer) {
/**
* @private
* @type {ol.Transform}
* @type {module:ol/transform~Transform}
*/
this.imageTransform_ = createTransform();
@@ -300,7 +300,7 @@ CanvasTileLayerRenderer.prototype.prepareFrame = function(frameState, layerState
/**
* @param {ol.Tile} tile Tile.
* @param {olx.FrameState} frameState Frame state.
* @param {ol.LayerState} layerState Layer state.
* @param {module:ol/layer/Layer~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.

4
src/ol/renderer/canvas/VectorLayer.js
View File

@@ -52,7 +52,7 @@ const CanvasVectorLayerRenderer = function(vectorLayer) {
/**
* @private
* @type {ol.Extent}
* @type {module:ol/extent~Extent}
*/
this.renderedExtent_ = createEmpty();
@@ -140,7 +140,7 @@ CanvasVectorLayerRenderer.prototype.composeFrame = function(frameState, layerSta
const clipExtent = layerState.extent;
const clipped = clipExtent !== undefined;
if (clipped) {
this.clip(context, frameState, /** @type {ol.Extent} */ (clipExtent));
this.clip(context, frameState, /** @type {module:ol/extent~Extent} */ (clipExtent));
}
const replayGroup = this.replayGroup_;
if (replayGroup && !replayGroup.isEmpty()) {

8
src/ol/renderer/canvas/VectorTileLayer.js
View File

@@ -83,7 +83,7 @@ const CanvasVectorTileLayerRenderer = function(layer) {
/**
* @private
* @type {ol.Transform}
* @type {module:ol/transform~Transform}
*/
this.tmpTransform_ = createTransform();
@@ -159,7 +159,7 @@ CanvasVectorTileLayerRenderer.prototype.createReplayGroup_ = function(tile, fram
const pixelRatio = frameState.pixelRatio;
const projection = frameState.viewState.projection;
const revision = layer.getRevision();
const renderOrder = /** @type {ol.RenderOrderFunction} */ (layer.getRenderOrder()) || null;
const renderOrder = /** @type {module:ol/render~OrderFunction} */ (layer.getRenderOrder()) || null;
const replayState = tile.getReplayState(layer);
if (!replayState.dirty && replayState.renderedRevision == revision &&
@@ -311,7 +311,7 @@ CanvasVectorTileLayerRenderer.prototype.forEachFeatureAtCoordinate = function(co
/**
* @param {ol.VectorTile} tile Tile.
* @param {olx.FrameState} frameState Frame state.
* @return {ol.Transform} transform Transform.
* @return {module:ol/transform~Transform} transform Transform.
* @private
*/
CanvasVectorTileLayerRenderer.prototype.getReplayTransform_ = function(tile, frameState) {
@@ -476,7 +476,7 @@ CanvasVectorTileLayerRenderer.prototype.renderFeature = function(feature, square
/**
* @param {ol.VectorImageTile} tile Tile.
* @param {olx.FrameState} frameState Frame state.
* @param {ol.LayerState} layerState Layer state.
* @param {module:ol/layer/Layer~State} layerState Layer state.
* @private
*/
CanvasVectorTileLayerRenderer.prototype.renderTileImage_ = function(