Clean up ol/renderer classes

This commit is contained in:
Tim Schaub
2018-07-17 18:26:51 -06:00
parent 9ee5edf19c
commit c4e5a7467e
2 changed files with 16 additions and 24 deletions

View File

@@ -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.

View File

@@ -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.