diff --git a/src/ol/geom/GeometryCollection.js b/src/ol/geom/GeometryCollection.js index 9b5058558f..0f84c38e80 100644 --- a/src/ol/geom/GeometryCollection.js +++ b/src/ol/geom/GeometryCollection.js @@ -274,7 +274,7 @@ class GeometryCollection extends Geometry { */ disposeInternal() { this.unlistenGeometriesChange_(); - Geometry.prototype.disposeInternal.call(this); + super.disposeInternal(); } } diff --git a/src/ol/pointer/PointerEventHandler.js b/src/ol/pointer/PointerEventHandler.js index 421fadc64a..cc8ea9f02c 100644 --- a/src/ol/pointer/PointerEventHandler.js +++ b/src/ol/pointer/PointerEventHandler.js @@ -411,7 +411,7 @@ class PointerEventHandler extends EventTarget { */ disposeInternal() { this.unregister_(); - EventTarget.prototype.disposeInternal.call(this); + super.disposeInternal(); } } diff --git a/src/ol/render/canvas/LineStringReplay.js b/src/ol/render/canvas/LineStringReplay.js index 8b2d7eb189..86fc6a01c3 100644 --- a/src/ol/render/canvas/LineStringReplay.js +++ b/src/ol/render/canvas/LineStringReplay.js @@ -108,7 +108,7 @@ class CanvasLineStringReplay extends CanvasReplay { state.lastStroke = this.coordinates.length; } state.lastStroke = 0; - CanvasReplay.prototype.applyStroke.call(this, state); + super.applyStroke(state); this.instructions.push(beginPathInstruction); } } diff --git a/src/ol/render/webgl/ImageReplay.js b/src/ol/render/webgl/ImageReplay.js index 1cd8d40e35..d9bc609aa0 100644 --- a/src/ol/render/webgl/ImageReplay.js +++ b/src/ol/render/webgl/ImageReplay.js @@ -91,7 +91,7 @@ class WebGLImageReplay extends WebGLTextureReplay { this.images_ = null; this.hitDetectionImages_ = null; - WebGLTextureReplay.prototype.finish.call(this, context); + super.finish(context); } /** diff --git a/src/ol/render/webgl/TextReplay.js b/src/ol/render/webgl/TextReplay.js index 3d4b1c73b1..b772376d58 100644 --- a/src/ol/render/webgl/TextReplay.js +++ b/src/ol/render/webgl/TextReplay.js @@ -338,7 +338,7 @@ class WebGLTextReplay extends WebGLTextureReplay { this.images_ = null; this.atlases_ = {}; this.currAtlas_ = undefined; - WebGLTextureReplay.prototype.finish.call(this, context); + super.finish(context); } /** diff --git a/src/ol/renderer/canvas/ImageLayer.js b/src/ol/renderer/canvas/ImageLayer.js index f4810c21b5..2edb602c6a 100644 --- a/src/ol/renderer/canvas/ImageLayer.js +++ b/src/ol/renderer/canvas/ImageLayer.js @@ -69,7 +69,7 @@ class CanvasImageLayerRenderer extends IntermediateCanvasRenderer { if (this.vectorRenderer_) { this.vectorRenderer_.dispose(); } - IntermediateCanvasRenderer.prototype.disposeInternal.call(this); + super.disposeInternal(); } /** @@ -184,7 +184,7 @@ class CanvasImageLayerRenderer extends IntermediateCanvasRenderer { if (this.vectorRenderer_) { return this.vectorRenderer_.forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback, thisArg); } else { - return IntermediateCanvasRenderer.prototype.forEachFeatureAtCoordinate.call(this, coordinate, frameState, hitTolerance, callback, thisArg); + return super.forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback, thisArg); } } } diff --git a/src/ol/renderer/canvas/IntermediateCanvas.js b/src/ol/renderer/canvas/IntermediateCanvas.js index de7b66ce7b..b5156c4bd6 100644 --- a/src/ol/renderer/canvas/IntermediateCanvas.js +++ b/src/ol/renderer/canvas/IntermediateCanvas.js @@ -118,7 +118,7 @@ class IntermediateCanvasRenderer extends CanvasLayerRenderer { if (this.getLayer().getSource().forEachFeatureAtCoordinate !== VOID) { // for ImageCanvas sources use the original hit-detection logic, // so that for example also transparent polygons are detected - return CanvasLayerRenderer.prototype.forEachLayerAtCoordinate.apply(this, arguments); + return super.forEachLayerAtCoordinate(arguments); } else { const pixel = applyTransform(this.coordinateToCanvasPixelTransform, coordinate.slice()); scaleCoordinate(pixel, frameState.viewState.resolution / this.renderedResolution); diff --git a/src/ol/renderer/canvas/Map.js b/src/ol/renderer/canvas/Map.js index 34293f96ea..d812da60de 100644 --- a/src/ol/renderer/canvas/Map.js +++ b/src/ol/renderer/canvas/Map.js @@ -209,7 +209,7 @@ class CanvasMapRenderer extends MapRenderer { * @inheritDoc */ registerLayerRenderers(constructors) { - MapRenderer.prototype.registerLayerRenderers.call(this, constructors); + super.registerLayerRenderers(constructors); for (let i = 0, ii = constructors.length; i < ii; ++i) { const ctor = constructors[i]; if (!includes(layerRendererConstructors, ctor)) { diff --git a/src/ol/renderer/canvas/VectorLayer.js b/src/ol/renderer/canvas/VectorLayer.js index 18d7d2dcc4..136aba67d1 100644 --- a/src/ol/renderer/canvas/VectorLayer.js +++ b/src/ol/renderer/canvas/VectorLayer.js @@ -91,7 +91,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer { */ disposeInternal() { unlisten(labelCache, EventType.CLEAR, this.handleFontsChanged_, this); - CanvasLayerRenderer.prototype.disposeInternal.call(this); + super.disposeInternal(); } /** diff --git a/src/ol/renderer/canvas/VectorTileLayer.js b/src/ol/renderer/canvas/VectorTileLayer.js index b3057fdc78..9e69471731 100644 --- a/src/ol/renderer/canvas/VectorTileLayer.js +++ b/src/ol/renderer/canvas/VectorTileLayer.js @@ -97,14 +97,14 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer { */ disposeInternal() { unlisten(labelCache, EventType.CLEAR, this.handleFontsChanged_, this); - CanvasTileLayerRenderer.prototype.disposeInternal.call(this); + super.disposeInternal(); } /** * @inheritDoc */ getTile(z, x, y, pixelRatio, projection) { - const tile = CanvasTileLayerRenderer.prototype.getTile.call(this, z, x, y, pixelRatio, projection); + const tile = super.getTile(z, x, y, pixelRatio, projection); if (tile.getState() === TileState.LOADED) { this.createReplayGroup_(tile, pixelRatio, projection); if (this.context) { @@ -131,7 +131,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer { } } this.renderedLayerRevision_ = layerRevision; - return CanvasTileLayerRenderer.prototype.prepareFrame.apply(this, arguments); + return super.prepareFrame(frameState, layerState); } /** @@ -404,7 +404,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer { /** @type {number} */ (offsetX), /** @type {number} */ (offsetY)); } } - CanvasTileLayerRenderer.prototype.postCompose.apply(this, arguments); + super.postCompose(context, frameState, layerState); } /** diff --git a/src/ol/renderer/webgl/Map.js b/src/ol/renderer/webgl/Map.js index eddf98a8f7..1717ffedb3 100644 --- a/src/ol/renderer/webgl/Map.js +++ b/src/ol/renderer/webgl/Map.js @@ -291,7 +291,7 @@ class WebGLMapRenderer extends MapRenderer { }); } this.context_.dispose(); - MapRenderer.prototype.disposeInternal.call(this); + super.disposeInternal(); } /** diff --git a/src/ol/renderer/webgl/TileLayer.js b/src/ol/renderer/webgl/TileLayer.js index da7339a522..b56bfc5906 100644 --- a/src/ol/renderer/webgl/TileLayer.js +++ b/src/ol/renderer/webgl/TileLayer.js @@ -100,7 +100,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer { disposeInternal() { const context = this.mapRenderer.getContext(); context.deleteBuffer(this.renderArrayBuffer_); - WebGLLayerRenderer.prototype.disposeInternal.call(this); + super.disposeInternal(); } /** @@ -135,7 +135,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer { * @inheritDoc */ handleWebGLContextLost() { - WebGLLayerRenderer.prototype.handleWebGLContextLost.call(this); + super.handleWebGLContextLost(); this.locations_ = null; } diff --git a/src/ol/renderer/webgl/VectorLayer.js b/src/ol/renderer/webgl/VectorLayer.js index a91807103f..388c7582c9 100644 --- a/src/ol/renderer/webgl/VectorLayer.js +++ b/src/ol/renderer/webgl/VectorLayer.js @@ -103,7 +103,7 @@ class WebGLVectorLayerRenderer extends WebGLLayerRenderer { replayGroup.getDeleteResourcesFunction(context)(); this.replayGroup_ = null; } - WebGLLayerRenderer.prototype.disposeInternal.call(this); + super.disposeInternal(); } /** diff --git a/src/ol/reproj/Image.js b/src/ol/reproj/Image.js index 1533e7e292..75ab3a2222 100644 --- a/src/ol/reproj/Image.js +++ b/src/ol/reproj/Image.js @@ -121,7 +121,7 @@ class ReprojImage extends ImageBase { if (this.state == ImageState.LOADING) { this.unlistenSource_(); } - ImageBase.prototype.disposeInternal.call(this); + super.disposeInternal(); } /** diff --git a/src/ol/reproj/Tile.js b/src/ol/reproj/Tile.js index 87a38e25de..774325e943 100644 --- a/src/ol/reproj/Tile.js +++ b/src/ol/reproj/Tile.js @@ -210,7 +210,7 @@ class ReprojTile extends Tile { if (this.state == TileState.LOADING) { this.unlistenSources_(); } - Tile.prototype.disposeInternal.call(this); + super.disposeInternal(); } /** diff --git a/src/ol/source/Cluster.js b/src/ol/source/Cluster.js index f4238d4129..9f9f45c388 100644 --- a/src/ol/source/Cluster.js +++ b/src/ol/source/Cluster.js @@ -143,7 +143,7 @@ class Cluster extends VectorSource { this.clear(); this.cluster(); this.addFeatures(this.features); - VectorSource.prototype.refresh.call(this); + super.refresh(); } /** diff --git a/src/ol/source/ImageStatic.js b/src/ol/source/ImageStatic.js index 77677fb243..b60a183fd2 100644 --- a/src/ol/source/ImageStatic.js +++ b/src/ol/source/ImageStatic.js @@ -132,7 +132,7 @@ class Static extends ImageSource { this.image_.setImage(canvas); } } - ImageSource.prototype.handleImageChange.call(this, evt); + super.handleImageChange(evt); } } diff --git a/src/ol/source/TileImage.js b/src/ol/source/TileImage.js index 8698b3c42e..290ef0725b 100644 --- a/src/ol/source/TileImage.js +++ b/src/ol/source/TileImage.js @@ -130,7 +130,7 @@ class TileImage extends UrlTile { */ canExpireCache() { if (!ENABLE_RASTER_REPROJECTION) { - return UrlTile.prototype.canExpireCache.call(this); + return super.canExpireCache(); } if (this.tileCache.canExpireCache()) { return true; @@ -149,7 +149,7 @@ class TileImage extends UrlTile { */ expireCache(projection, usedTiles) { if (!ENABLE_RASTER_REPROJECTION) { - UrlTile.prototype.expireCache.call(this, projection, usedTiles); + super.expireCache(projection, usedTiles); return; } const usedTileCache = this.getTileCacheForProjection(projection); @@ -188,7 +188,7 @@ class TileImage extends UrlTile { this.getProjection() && projection && !equivalent(this.getProjection(), projection)) { return false; } else { - return UrlTile.prototype.getOpaque.call(this, projection); + return super.getOpaque(projection); } }