Clean up ol/renderer/canvas classes

src/ol/renderer/canvas/ImageLayer.js

@@ -2,7 +2,6 @@
  * @module ol/renderer/canvas/ImageLayer
  */
 import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js';
-import {inherits} from '../../util.js';
 import ImageCanvas from '../../ImageCanvas.js';
 import LayerType from '../../LayerType.js';
 import ViewHint from '../../ViewHint.js';
@@ -11,19 +10,20 @@ import {getHeight, getIntersection, getWidth, isEmpty} from '../../extent.js';
 import VectorRenderType from '../../layer/VectorRenderType.js';
 import {assign} from '../../obj.js';
 import {layerRendererConstructors} from './Map.js';
-import IntermediateCanvasRenderer from '../canvas/IntermediateCanvas.js';
+import IntermediateCanvasRenderer from './IntermediateCanvas.js';
 import {create as createTransform, compose as composeTransform} from '../../transform.js';
 
-/**
+class CanvasImageLayerRenderer extends IntermediateCanvasRenderer {
- * @constructor
+
- * @extends {module:ol/renderer/canvas/IntermediateCanvas}
+  /**
- * @param {module:ol/layer/Image|module:ol/layer/Vector} imageLayer Image or vector layer.
+   * @constructor
- * @api
+   * @extends {module:ol/renderer/canvas/IntermediateCanvas}
- */
+   * @param {module:ol/layer/Image|module:ol/layer/Vector} imageLayer Image or vector layer.
-class CanvasImageLayerRenderer {
+   * @api
+   */
   constructor(imageLayer) {
 
-    IntermediateCanvasRenderer.call(this, imageLayer);
+    super(imageLayer);
 
     /**
      * @private
@@ -187,8 +187,6 @@ class CanvasImageLayerRenderer {
   }
 }
 
-inherits(CanvasImageLayerRenderer, IntermediateCanvasRenderer);
-
 
 /**
  * Determine if this renderer handles the provided layer.

src/ol/renderer/canvas/IntermediateCanvas.js

@@ -1,7 +1,6 @@
 /**
  * @module ol/renderer/canvas/IntermediateCanvas
  */
-import {inherits} from '../../util.js';
 import {scale as scaleCoordinate} from '../../coordinate.js';
 import {createCanvasContext2D} from '../../dom.js';
 import {containsExtent, intersects} from '../../extent.js';
@@ -9,16 +8,14 @@ import {UNDEFINED} from '../../functions.js';
 import CanvasLayerRenderer from '../canvas/Layer.js';
 import {create as createTransform, apply as applyTransform} from '../../transform.js';
 
-/**
+class IntermediateCanvasRenderer extends CanvasLayerRenderer {
- * @constructor
+
- * @abstract
+  /**
- * @extends {module:ol/renderer/canvas/Layer}
+   * @param {module:ol/layer/Layer} layer Layer.
- * @param {module:ol/layer/Layer} layer Layer.
+   */
- */
-class IntermediateCanvasRenderer {
   constructor(layer) {
 
-    CanvasLayerRenderer.call(this, layer);
+    super(layer);
 
     /**
      * @protected
@@ -143,7 +140,5 @@ class IntermediateCanvasRenderer {
   }
 }
 
-inherits(IntermediateCanvasRenderer, CanvasLayerRenderer);
-
 
 export default IntermediateCanvasRenderer;

src/ol/renderer/canvas/Layer.js

@@ -1,7 +1,6 @@
 /**
  * @module ol/renderer/canvas/Layer
  */
-import {inherits} from '../../util.js';
 import {getBottomLeft, getBottomRight, getTopLeft, getTopRight} from '../../extent.js';
 import {TRUE} from '../../functions.js';
 import RenderEvent from '../../render/Event.js';
@@ -11,16 +10,14 @@ import CanvasImmediateRenderer from '../../render/canvas/Immediate.js';
 import LayerRenderer from '../Layer.js';
 import {create as createTransform, apply as applyTransform, compose as composeTransform} from '../../transform.js';
 
-/**
+class CanvasLayerRenderer extends LayerRenderer {
- * @constructor
+
- * @abstract
+  /**
- * @extends {module:ol/renderer/Layer}
+   * @param {module:ol/layer/Layer} layer Layer.
- * @param {module:ol/layer/Layer} layer Layer.
+   */
- */
-class CanvasLayerRenderer {
   constructor(layer) {
 
-    LayerRenderer.call(this, layer);
+    super(layer);
 
     /**
      * @protected
@@ -181,7 +178,4 @@ class CanvasLayerRenderer {
   prepareFrame(frameState, layerState) {}
 }
 
-inherits(CanvasLayerRenderer, LayerRenderer);
-
-
 export default CanvasLayerRenderer;

src/ol/renderer/canvas/Map.js

@@ -2,7 +2,6 @@
  * @module ol/renderer/canvas/Map
  */
 import {create as createTransform, apply as applyTransform, compose as composeTransform} from '../../transform.js';
-import {inherits} from '../../util.js';
 import {includes, stableSort} from '../../array.js';
 import {CLASS_UNSELECTABLE} from '../../css.js';
 import {createCanvasContext2D} from '../../dom.js';
@@ -21,15 +20,14 @@ import SourceState from '../../source/State.js';
 export const layerRendererConstructors = [];
 
 
-/**
+class CanvasMapRenderer extends MapRenderer {
- * @constructor
+
- * @extends {module:ol/renderer/Map}
+  /**
- * @param {module:ol/PluggableMap} map Map.
+   * @param {module:ol/PluggableMap} map Map.
- * @api
+   * @api
- */
+   */
-class CanvasMapRenderer {
   constructor(map) {
-    MapRenderer.call(this, map);
+    super(map);
 
     const container = map.getViewport();
 
@@ -218,7 +216,5 @@ class CanvasMapRenderer {
   }
 }
 
-inherits(CanvasMapRenderer, MapRenderer);
-
 
 export default CanvasMapRenderer;

src/ol/renderer/canvas/TileLayer.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/renderer/canvas/TileLayer
  */
-import {getUid, inherits} from '../../util.js';
+import {getUid} from '../../util.js';
 import LayerType from '../../LayerType.js';
 import TileRange from '../../TileRange.js';
 import TileState from '../../TileState.js';
@@ -11,22 +11,22 @@ import {containsExtent, createEmpty, equals, getIntersection, isEmpty} from '../
 import IntermediateCanvasRenderer from '../canvas/IntermediateCanvas.js';
 import {create as createTransform, compose as composeTransform} from '../../transform.js';
 
-/**
+class CanvasTileLayerRenderer extends IntermediateCanvasRenderer {
- * @constructor
- * @extends {module:ol/renderer/canvas/IntermediateCanvas}
- * @param {module:ol/layer/Tile|module:ol/layer/VectorTile} tileLayer Tile layer.
- * @api
- */
-class CanvasTileLayerRenderer {
-  constructor(tileLayer) {
 
-    IntermediateCanvasRenderer.call(this, tileLayer);
+  /**
+   * @param {module:ol/layer/Tile|module:ol/layer/VectorTile} tileLayer Tile layer.
+   * @param {boolean=} opt_noContext Skip the context creation.
+   * @api
+   */
+  constructor(tileLayer, opt_noContext) {
+
+    super(tileLayer);
 
     /**
      * @protected
      * @type {CanvasRenderingContext2D}
      */
-    this.context = this.context === null ? null : createCanvasContext2D();
+    this.context = opt_noContext ? null : createCanvasContext2D();
 
     /**
      * @private
@@ -351,8 +351,6 @@ class CanvasTileLayerRenderer {
   }
 }
 
-inherits(CanvasTileLayerRenderer, IntermediateCanvasRenderer);
-
 
 /**
  * Determine if this renderer handles the provided layer.

src/ol/renderer/canvas/VectorLayer.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/renderer/canvas/VectorLayer
  */
-import {getUid, inherits} from '../../util.js';
+import {getUid} from '../../util.js';
 import LayerType from '../../LayerType.js';
 import ViewHint from '../../ViewHint.js';
 import {createCanvasContext2D} from '../../dom.js';
@@ -15,16 +15,15 @@ import CanvasReplayGroup from '../../render/canvas/ReplayGroup.js';
 import CanvasLayerRenderer from '../canvas/Layer.js';
 import {defaultOrder as defaultRenderOrder, getTolerance as getRenderTolerance, getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js';
 
-/**
+class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
- * @constructor
+
- * @extends {module:ol/renderer/canvas/Layer}
+  /**
- * @param {module:ol/layer/Vector} vectorLayer Vector layer.
+   * @param {module:ol/layer/Vector} vectorLayer Vector layer.
- * @api
+   * @api
- */
+   */
-class CanvasVectorLayerRenderer {
   constructor(vectorLayer) {
 
-    CanvasLayerRenderer.call(this, vectorLayer);
+    super(vectorLayer);
 
     /**
      * Declutter tree.
@@ -407,8 +406,6 @@ class CanvasVectorLayerRenderer {
   }
 }
 
-inherits(CanvasVectorLayerRenderer, CanvasLayerRenderer);
-
 
 /**
  * Determine if this renderer handles the provided layer.

src/ol/renderer/canvas/VectorTileLayer.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/renderer/canvas/VectorTileLayer
  */
-import {getUid, inherits} from '../../util.js';
+import {getUid} from '../../util.js';
 import LayerType from '../../LayerType.js';
 import TileState from '../../TileState.js';
 import {createCanvasContext2D} from '../../dom.js';
@@ -47,21 +47,17 @@ const VECTOR_REPLAYS = {
 };
 
 
-/**
+class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
- * @constructor
+
- * @extends {module:ol/renderer/canvas/TileLayer}
+  /**
- * @param {module:ol/layer/VectorTile} layer VectorTile layer.
+   * @constructor
- * @api
+   * @extends {module:ol/renderer/canvas/TileLayer}
- */
+   * @param {module:ol/layer/VectorTile} layer VectorTile layer.
-class CanvasVectorTileLayerRenderer {
+   * @api
+   */
   constructor(layer) {
 
-    /**
+    super(layer, true);
-     * @type {CanvasRenderingContext2D}
-     */
-    this.context = null;
-
-    CanvasTileLayerRenderer.call(this, layer);
 
     /**
      * Declutter tree.
@@ -474,8 +470,6 @@ class CanvasVectorTileLayerRenderer {
   }
 }
 
-inherits(CanvasVectorTileLayerRenderer, CanvasTileLayerRenderer);
-
 
 /**
  * Determine if this renderer handles the provided layer.