From c4e5a7467e3593931c49ed89e3a449212b28cb2d Mon Sep 17 00:00:00 2001
From: Tim Schaub <tim.schaub@gmail.com>
Date: Tue, 17 Jul 2018 18:26:51 -0600
Subject: [PATCH] Clean up ol/renderer classes

---
 src/ol/renderer/Layer.js | 20 ++++++++------------
 src/ol/renderer/Map.js   | 20 ++++++++------------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/src/ol/renderer/Layer.js b/src/ol/renderer/Layer.js
index f6014665f3..99b5c34e59 100644
--- a/src/ol/renderer/Layer.js
+++ b/src/ol/renderer/Layer.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/renderer/Layer
  */
-import {getUid, inherits} from '../util.js';
+import {getUid} from '../util.js';
 import ImageState from '../ImageState.js';
 import Observable from '../Observable.js';
 import TileState from '../TileState.js';
@@ -10,16 +10,15 @@ import EventType from '../events/EventType.js';
 import {FALSE, UNDEFINED} from '../functions.js';
 import SourceState from '../source/State.js';
 
-/**
- * @constructor
- * @extends {module:ol/Observable}
- * @param {module:ol/layer/Layer} layer Layer.
- * @struct
- */
-class LayerRenderer {
+class LayerRenderer  extends Observable {
+
+  /**
+   * @param {module:ol/layer/Layer} layer Layer.
+   * @struct
+   */
   constructor(layer) {
 
-    Observable.call(this);
+    super();
 
     /**
      * @private
@@ -27,7 +26,6 @@ class LayerRenderer {
      */
     this.layer_ = layer;
 
-
   }
 
   /**
@@ -221,8 +219,6 @@ class LayerRenderer {
   }
 }
 
-inherits(LayerRenderer, Observable);
-
 
 /**
  * @param {module:ol/coordinate~Coordinate} coordinate Coordinate.
diff --git a/src/ol/renderer/Map.js b/src/ol/renderer/Map.js
index f914b0b9ba..2127802d60 100644
--- a/src/ol/renderer/Map.js
+++ b/src/ol/renderer/Map.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/renderer/Map
  */
-import {getUid, inherits} from '../util.js';
+import {getUid} from '../util.js';
 import Disposable from '../Disposable.js';
 import {listen, unlistenByKey} from '../events.js';
 import EventType from '../events/EventType.js';
@@ -12,16 +12,14 @@ import {shared as iconImageCache} from '../style/IconImageCache.js';
 import {compose as composeTransform, invert as invertTransform, setFromArray as transformSetFromArray} from '../transform.js';
 
 
-/**
- * @constructor
- * @abstract
- * @extends {module:ol/Disposable}
- * @param {module:ol/PluggableMap} map Map.
- * @struct
- */
-class MapRenderer {
+class MapRenderer extends Disposable {
+
+  /**
+   * @param {module:ol/PluggableMap} map Map.
+   * @struct
+   */
   constructor(map) {
-    Disposable.call(this);
+    super();
 
     /**
      * @private
@@ -318,8 +316,6 @@ class MapRenderer {
   }
 }
 
-inherits(MapRenderer, Disposable);
-
 
 /**
  * @param {module:ol/PluggableMap} map Map.