Remove remaining use of inherits in src

This commit is contained in:
Tim Schaub
2018-07-17 23:43:10 -06:00
parent f6046c023c
commit 1a5cf52b61
63 changed files with 837 additions and 982 deletions

View File

@@ -7,12 +7,12 @@ import {inherits} from '../util.js';
import Disposable from '../Disposable.js';
import Polygon from '../geom/Polygon.js';
/**
* @constructor
* @extends {module:ol/Disposable}
* @param {string} className CSS class name.
*/
class RenderBox {
class RenderBox extends Disposable {
/**
* @constructor
* @extends {module:ol/Disposable}
* @param {string} className CSS class name.
*/
constructor(className) {
/**
@@ -126,7 +126,5 @@ class RenderBox {
}
}
inherits(RenderBox, Disposable);
export default RenderBox;

View File

@@ -4,20 +4,20 @@
import {inherits} from '../util.js';
import Event from '../events/Event.js';
/**
* @constructor
* @extends {module:ol/events/Event}
* @param {module:ol/render/EventType} type Type.
* @param {module:ol/render/VectorContext=} opt_vectorContext Vector context.
* @param {module:ol/PluggableMap~FrameState=} opt_frameState Frame state.
* @param {?CanvasRenderingContext2D=} opt_context Context.
* @param {?module:ol/webgl/Context=} opt_glContext WebGL Context.
*/
class RenderEvent {
class RenderEvent extends Event {
/**
* @constructor
* @extends {module:ol/events/Event}
* @param {module:ol/render/EventType} type Type.
* @param {module:ol/render/VectorContext=} opt_vectorContext Vector context.
* @param {module:ol/PluggableMap~FrameState=} opt_frameState Frame state.
* @param {?CanvasRenderingContext2D=} opt_context Context.
* @param {?module:ol/webgl/Context=} opt_glContext WebGL Context.
*/
constructor(type, opt_vectorContext, opt_frameState, opt_context, opt_glContext) {
Event.call(this, type);
super(type);
/**
* For canvas, this is an instance of {@link module:ol/render/canvas/Immediate}.
@@ -53,5 +53,4 @@ class RenderEvent {
}
inherits(RenderEvent, Event);
export default RenderEvent;

View File

@@ -5,21 +5,20 @@ import {inherits} from '../../util.js';
import CanvasInstruction from '../canvas/Instruction.js';
import CanvasReplay from '../canvas/Replay.js';
/**
* @constructor
* @extends {module:ol/render/canvas/Replay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Maximum extent.
* @param {number} resolution Resolution.
* @param {number} pixelRatio Pixel ratio.
* @param {boolean} overlaps The replay can have overlapping geometries.
* @param {?} declutterTree Declutter tree.
* @struct
*/
class CanvasImageReplay {
class CanvasImageReplay extends CanvasReplay {
/**
* @constructor
* @extends {module:ol/render/canvas/Replay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Maximum extent.
* @param {number} resolution Resolution.
* @param {number} pixelRatio Pixel ratio.
* @param {boolean} overlaps The replay can have overlapping geometries.
* @param {?} declutterTree Declutter tree.
* @struct
*/
constructor(tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree) {
CanvasReplay.call(this,
tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree);
super(tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree);
/**
* @private
@@ -225,7 +224,5 @@ class CanvasImageReplay {
}
}
inherits(CanvasImageReplay, CanvasReplay);
export default CanvasImageReplay;

View File

@@ -17,27 +17,27 @@ import VectorContext from '../VectorContext.js';
import {defaultTextAlign, defaultFillStyle, defaultLineCap, defaultLineDash, defaultLineDashOffset, defaultLineJoin, defaultLineWidth, defaultMiterLimit, defaultStrokeStyle, defaultTextBaseline, defaultFont} from '../canvas.js';
import {create as createTransform, compose as composeTransform} from '../../transform.js';
/**
* @classdesc
* A concrete subclass of {@link module:ol/render/VectorContext} that implements
* direct rendering of features and geometries to an HTML5 Canvas context.
* Instances of this class are created internally by the library and
* provided to application code as vectorContext member of the
* {@link module:ol/render/Event~RenderEvent} object associated with postcompose, precompose and
* render events emitted by layers and maps.
*
* @constructor
* @extends {module:ol/render/VectorContext}
* @param {CanvasRenderingContext2D} context Context.
* @param {number} pixelRatio Pixel ratio.
* @param {module:ol/extent~Extent} extent Extent.
* @param {module:ol/transform~Transform} transform Transform.
* @param {number} viewRotation View rotation.
* @struct
*/
class CanvasImmediateRenderer {
class CanvasImmediateRenderer extends VectorContext {
/**
* @classdesc
* A concrete subclass of {@link module:ol/render/VectorContext} that implements
* direct rendering of features and geometries to an HTML5 Canvas context.
* Instances of this class are created internally by the library and
* provided to application code as vectorContext member of the
* {@link module:ol/render/Event~RenderEvent} object associated with postcompose, precompose and
* render events emitted by layers and maps.
*
* @constructor
* @extends {module:ol/render/VectorContext}
* @param {CanvasRenderingContext2D} context Context.
* @param {number} pixelRatio Pixel ratio.
* @param {module:ol/extent~Extent} extent Extent.
* @param {module:ol/transform~Transform} transform Transform.
* @param {number} viewRotation View rotation.
* @struct
*/
constructor(context, pixelRatio, extent, transform, viewRotation) {
VectorContext.call(this);
super();
/**
* @private
@@ -943,7 +943,5 @@ class CanvasImmediateRenderer {
}
}
inherits(CanvasImmediateRenderer, VectorContext);
export default CanvasImmediateRenderer;

View File

@@ -5,21 +5,20 @@ import {inherits} from '../../util.js';
import CanvasInstruction, {strokeInstruction, beginPathInstruction} from '../canvas/Instruction.js';
import CanvasReplay from '../canvas/Replay.js';
/**
* @constructor
* @extends {module:ol/render/canvas/Replay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Maximum extent.
* @param {number} resolution Resolution.
* @param {number} pixelRatio Pixel ratio.
* @param {boolean} overlaps The replay can have overlapping geometries.
* @param {?} declutterTree Declutter tree.
* @struct
*/
class CanvasLineStringReplay {
class CanvasLineStringReplay extends CanvasReplay {
/**
* @constructor
* @extends {module:ol/render/canvas/Replay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Maximum extent.
* @param {number} resolution Resolution.
* @param {number} pixelRatio Pixel ratio.
* @param {boolean} overlaps The replay can have overlapping geometries.
* @param {?} declutterTree Declutter tree.
* @struct
*/
constructor(tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree) {
CanvasReplay.call(this,
tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree);
super(tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree);
}
/**
@@ -118,7 +117,5 @@ class CanvasLineStringReplay {
}
}
inherits(CanvasLineStringReplay, CanvasReplay);
export default CanvasLineStringReplay;

View File

@@ -11,21 +11,20 @@ import CanvasInstruction, {
import CanvasReplay from '../canvas/Replay.js';
/**
* @constructor
* @extends {module:ol/render/canvas/Replay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Maximum extent.
* @param {number} resolution Resolution.
* @param {number} pixelRatio Pixel ratio.
* @param {boolean} overlaps The replay can have overlapping geometries.
* @param {?} declutterTree Declutter tree.
* @struct
*/
class CanvasPolygonReplay {
class CanvasPolygonReplay extends CanvasReplay {
/**
* @constructor
* @extends {module:ol/render/canvas/Replay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Maximum extent.
* @param {number} resolution Resolution.
* @param {number} pixelRatio Pixel ratio.
* @param {boolean} overlaps The replay can have overlapping geometries.
* @param {?} declutterTree Declutter tree.
* @struct
*/
constructor(tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree) {
CanvasReplay.call(this,
tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree);
super(tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree);
}
/**
@@ -215,7 +214,5 @@ class CanvasPolygonReplay {
}
}
inherits(CanvasPolygonReplay, CanvasReplay);
export default CanvasPolygonReplay;

View File

@@ -41,20 +41,20 @@ const tmpExtent = createEmpty();
const tmpTransform = createTransform();
/**
* @constructor
* @extends {module:ol/render/VectorContext}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Maximum extent.
* @param {number} resolution Resolution.
* @param {number} pixelRatio Pixel ratio.
* @param {boolean} overlaps The replay can have overlapping geometries.
* @param {?} declutterTree Declutter tree.
* @struct
*/
class CanvasReplay {
class CanvasReplay extends VectorContext {
/**
* @constructor
* @extends {module:ol/render/VectorContext}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Maximum extent.
* @param {number} resolution Resolution.
* @param {number} pixelRatio Pixel ratio.
* @param {boolean} overlaps The replay can have overlapping geometries.
* @param {?} declutterTree Declutter tree.
* @struct
*/
constructor(tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree) {
VectorContext.call(this);
super();
/**
* @type {?}
@@ -1082,8 +1082,6 @@ class CanvasReplay {
}
}
inherits(CanvasReplay, VectorContext);
/**
* FIXME empty description for jsdoc

View File

@@ -33,20 +33,20 @@ const BATCH_CONSTRUCTORS = {
};
/**
* @constructor
* @extends {module:ol/render/ReplayGroup}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @param {number} resolution Resolution.
* @param {number} pixelRatio Pixel ratio.
* @param {boolean} overlaps The replay group can have overlapping geometries.
* @param {?} declutterTree Declutter tree
* for declutter processing in postrender.
* @param {number=} opt_renderBuffer Optional rendering buffer.
* @struct
*/
class CanvasReplayGroup {
class CanvasReplayGroup extends ReplayGroup {
/**
* @constructor
* @extends {module:ol/render/ReplayGroup}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @param {number} resolution Resolution.
* @param {number} pixelRatio Pixel ratio.
* @param {boolean} overlaps The replay group can have overlapping geometries.
* @param {?} declutterTree Declutter tree
* for declutter processing in postrender.
* @param {number=} opt_renderBuffer Optional rendering buffer.
* @struct
*/
constructor(
tolerance,
maxExtent,
@@ -56,7 +56,7 @@ class CanvasReplayGroup {
declutterTree,
opt_renderBuffer
) {
ReplayGroup.call(this);
super();
/**
* Declutter tree.
@@ -407,8 +407,6 @@ class CanvasReplayGroup {
}
}
inherits(CanvasReplayGroup, ReplayGroup);
/**
* This cache is used for storing calculated pixel circles for increasing performance.

View File

@@ -14,21 +14,20 @@ import CanvasReplay from '../canvas/Replay.js';
import {TEXT_ALIGN} from '../replay.js';
import TextPlacement from '../../style/TextPlacement.js';
/**
* @constructor
* @extends {module:ol/render/canvas/Replay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Maximum extent.
* @param {number} resolution Resolution.
* @param {number} pixelRatio Pixel ratio.
* @param {boolean} overlaps The replay can have overlapping geometries.
* @param {?} declutterTree Declutter tree.
* @struct
*/
class CanvasTextReplay {
class CanvasTextReplay extends CanvasReplay {
/**
* @constructor
* @extends {module:ol/render/canvas/Replay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Maximum extent.
* @param {number} resolution Resolution.
* @param {number} pixelRatio Pixel ratio.
* @param {boolean} overlaps The replay can have overlapping geometries.
* @param {?} declutterTree Declutter tree.
* @struct
*/
constructor(tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree) {
CanvasReplay.call(this,
tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree);
super(tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree);
/**
* @private
@@ -521,8 +520,6 @@ class CanvasTextReplay {
}
}
inherits(CanvasTextReplay, CanvasReplay);
/**
* @param {string} font Font to use for measuring.

View File

@@ -15,16 +15,16 @@ import {DEFAULT_LINEDASH, DEFAULT_LINEDASHOFFSET, DEFAULT_STROKESTYLE,
import {FLOAT} from '../../webgl.js';
import WebGLBuffer from '../../webgl/Buffer.js';
/**
* @constructor
* @extends {module:ol/render/webgl/Replay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @struct
*/
class WebGLCircleReplay {
class WebGLCircleReplay extends WebGLReplay {
/**
* @constructor
* @extends {module:ol/render/webgl/Replay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @struct
*/
constructor(tolerance, maxExtent) {
WebGLReplay.call(this, tolerance, maxExtent);
super(tolerance, maxExtent);
/**
* @private
@@ -404,7 +404,5 @@ class WebGLCircleReplay {
}
}
inherits(WebGLCircleReplay, WebGLReplay);
export default WebGLCircleReplay;

View File

@@ -5,16 +5,16 @@ import {getUid, inherits} from '../../util.js';
import WebGLTextureReplay from '../webgl/TextureReplay.js';
import WebGLBuffer from '../../webgl/Buffer.js';
/**
* @constructor
* @extends {module:ol/render/webgl/TextureReplay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @struct
*/
class WebGLImageReplay {
class WebGLImageReplay extends WebGLTextureReplay {
/**
* @constructor
* @extends {module:ol/render/webgl/TextureReplay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @struct
*/
constructor(tolerance, maxExtent) {
WebGLTextureReplay.call(this, tolerance, maxExtent);
super(tolerance, maxExtent);
/**
* @type {Array.<HTMLCanvasElement|HTMLImageElement|HTMLVideoElement>}
@@ -163,7 +163,5 @@ class WebGLImageReplay {
}
}
inherits(WebGLImageReplay, WebGLTextureReplay);
export default WebGLImageReplay;

View File

@@ -8,21 +8,21 @@ import ReplayType from '../ReplayType.js';
import VectorContext from '../VectorContext.js';
import WebGLReplayGroup from '../webgl/ReplayGroup.js';
/**
* @constructor
* @extends {module:ol/render/VectorContext}
* @param {module:ol/webgl/Context} context Context.
* @param {module:ol/coordinate~Coordinate} center Center.
* @param {number} resolution Resolution.
* @param {number} rotation Rotation.
* @param {module:ol/size~Size} size Size.
* @param {module:ol/extent~Extent} extent Extent.
* @param {number} pixelRatio Pixel ratio.
* @struct
*/
class WebGLImmediateRenderer {
class WebGLImmediateRenderer extends VectorContext {
/**
* @constructor
* @extends {module:ol/render/VectorContext}
* @param {module:ol/webgl/Context} context Context.
* @param {module:ol/coordinate~Coordinate} center Center.
* @param {number} resolution Resolution.
* @param {number} rotation Rotation.
* @param {module:ol/size~Size} size Size.
* @param {module:ol/extent~Extent} extent Extent.
* @param {number} pixelRatio Pixel ratio.
* @struct
*/
constructor(context, center, resolution, rotation, size, extent, pixelRatio) {
VectorContext.call(this);
super();
/**
* @private
@@ -385,7 +385,5 @@ class WebGLImmediateRenderer {
}
}
inherits(WebGLImmediateRenderer, VectorContext);
export default WebGLImmediateRenderer;

View File

@@ -35,16 +35,16 @@ const Instruction = {
};
/**
* @constructor
* @extends {module:ol/render/webgl/Replay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @struct
*/
class WebGLLineStringReplay {
class WebGLLineStringReplay extends WebGLReplay {
/**
* @constructor
* @extends {module:ol/render/webgl/Replay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @struct
*/
constructor(tolerance, maxExtent) {
WebGLReplay.call(this, tolerance, maxExtent);
super(tolerance, maxExtent);
/**
* @private
@@ -666,7 +666,5 @@ class WebGLLineStringReplay {
}
}
inherits(WebGLLineStringReplay, WebGLReplay);
export default WebGLLineStringReplay;

View File

@@ -36,16 +36,16 @@ import WebGLBuffer from '../../webgl/Buffer.js';
*/
/**
* @constructor
* @extends {module:ol/render/webgl/Replay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @struct
*/
class WebGLPolygonReplay {
class WebGLPolygonReplay extends WebGLReplay {
/**
* @constructor
* @extends {module:ol/render/webgl/Replay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @struct
*/
constructor(tolerance, maxExtent) {
WebGLReplay.call(this, tolerance, maxExtent);
super(tolerance, maxExtent);
this.lineStringReplay = new WebGLLineStringReplay(
tolerance, maxExtent);
@@ -1045,7 +1045,5 @@ class WebGLPolygonReplay {
}
}
inherits(WebGLPolygonReplay, WebGLReplay);
export default WebGLPolygonReplay;

View File

@@ -15,17 +15,17 @@ import {create, fromTransform} from '../../vec/mat4.js';
import {ARRAY_BUFFER, ELEMENT_ARRAY_BUFFER, TRIANGLES,
UNSIGNED_INT, UNSIGNED_SHORT} from '../../webgl.js';
/**
* @constructor
* @abstract
* @extends {module:ol/render/VectorContext}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @struct
*/
class WebGLReplay {
class WebGLReplay extends VectorContext {
/**
* @constructor
* @abstract
* @extends {module:ol/render/VectorContext}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @struct
*/
constructor(tolerance, maxExtent) {
VectorContext.call(this);
super();
/**
* @protected
@@ -359,7 +359,5 @@ class WebGLReplay {
}
}
inherits(WebGLReplay, VectorContext);
export default WebGLReplay;

View File

@@ -32,17 +32,17 @@ const BATCH_CONSTRUCTORS = {
};
/**
* @constructor
* @extends {module:ol/render/ReplayGroup}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @param {number=} opt_renderBuffer Render buffer.
* @struct
*/
class WebGLReplayGroup {
class WebGLReplayGroup extends ReplayGroup {
/**
* @constructor
* @extends {module:ol/render/ReplayGroup}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @param {number=} opt_renderBuffer Render buffer.
* @struct
*/
constructor(tolerance, maxExtent, opt_renderBuffer) {
ReplayGroup.call(this);
super();
/**
* @type {module:ol/extent~Extent}
@@ -341,7 +341,5 @@ class WebGLReplayGroup {
}
}
inherits(WebGLReplayGroup, ReplayGroup);
export default WebGLReplayGroup;

View File

@@ -22,16 +22,16 @@ import WebGLBuffer from '../../webgl/Buffer.js';
*/
/**
* @constructor
* @extends {module:ol/render/webgl/TextureReplay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @struct
*/
class WebGLTextReplay {
class WebGLTextReplay extends WebGLTextureReplay {
/**
* @constructor
* @extends {module:ol/render/webgl/TextureReplay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @struct
*/
constructor(tolerance, maxExtent) {
WebGLTextureReplay.call(this, tolerance, maxExtent);
super(tolerance, maxExtent);
/**
* @private
@@ -457,7 +457,5 @@ class WebGLTextReplay {
}
}
inherits(WebGLTextReplay, WebGLTextureReplay);
export default WebGLTextReplay;

View File

@@ -10,17 +10,17 @@ import WebGLReplay from '../webgl/Replay.js';
import {CLAMP_TO_EDGE, FLOAT, TEXTURE_2D} from '../../webgl.js';
import {createTexture} from '../../webgl/Context.js';
/**
* @constructor
* @abstract
* @extends {module:ol/render/webgl/Replay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @struct
*/
class WebGLTextureReplay {
class WebGLTextureReplay extends WebGLReplay {
/**
* @constructor
* @abstract
* @extends {module:ol/render/webgl/Replay}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @struct
*/
constructor(tolerance, maxExtent) {
WebGLReplay.call(this, tolerance, maxExtent);
super(tolerance, maxExtent);
/**
* @type {number|undefined}
@@ -478,7 +478,5 @@ class WebGLTextureReplay {
getHitDetectionTextures() {}
}
inherits(WebGLTextureReplay, WebGLReplay);
export default WebGLTextureReplay;