ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename _ol_renderer_Layer_ to LayerRenderer

Browse Source
This commit is contained in:
Frederic Junod
2018-01-11 14:23:26 +01:00
parent 68d9f37fec
commit 3ce95099e9
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ol/renderer/Layer.js
View File

@@ -16,7 +16,7 @@ import SourceState from '../source/State.js';
* @param {ol.layer.Layer} layer Layer. * @param {ol.layer.Layer} layer Layer.
* @struct * @struct
*/ */
var _ol_renderer_Layer_ = function(layer) { var LayerRenderer = function(layer) {
Observable.call(this); Observable.call(this);
@@ -29,7 +29,7 @@ var _ol_renderer_Layer_ = function(layer) {
}; };
inherits(_ol_renderer_Layer_, Observable); inherits(LayerRenderer, Observable);
/** /**
@@ -42,7 +42,7 @@ inherits(_ol_renderer_Layer_, Observable);
* @return {T|undefined} Callback result. * @return {T|undefined} Callback result.
* @template S,T * @template S,T
*/ */
_ol_renderer_Layer_.prototype.forEachFeatureAtCoordinate = nullFunction; LayerRenderer.prototype.forEachFeatureAtCoordinate = nullFunction;
/** /**
@@ -50,7 +50,7 @@ _ol_renderer_Layer_.prototype.forEachFeatureAtCoordinate = nullFunction;
* @param {olx.FrameState} frameState Frame state. * @param {olx.FrameState} frameState Frame state.
* @return {boolean} Is there a feature at the given coordinate? * @return {boolean} Is there a feature at the given coordinate?
*/ */
_ol_renderer_Layer_.prototype.hasFeatureAtCoordinate = FALSE; LayerRenderer.prototype.hasFeatureAtCoordinate = FALSE;
/** /**
@@ -64,7 +64,7 @@ _ol_renderer_Layer_.prototype.hasFeatureAtCoordinate = FALSE;
* lookup. * lookup.
* @protected * @protected
*/ */
_ol_renderer_Layer_.prototype.createLoadedTileFinder = function(source, projection, tiles) { LayerRenderer.prototype.createLoadedTileFinder = function(source, projection, tiles) {
return ( return (
/** /**
* @param {number} zoom Zoom level. * @param {number} zoom Zoom level.
@@ -86,7 +86,7 @@ _ol_renderer_Layer_.prototype.createLoadedTileFinder = function(source, projecti
/** /**
* @return {ol.layer.Layer} Layer. * @return {ol.layer.Layer} Layer.
*/ */
_ol_renderer_Layer_.prototype.getLayer = function() { LayerRenderer.prototype.getLayer = function() {
return this.layer_; return this.layer_;
}; };
@@ -96,7 +96,7 @@ _ol_renderer_Layer_.prototype.getLayer = function() {
* @param {ol.events.Event} event Image change event. * @param {ol.events.Event} event Image change event.
* @private * @private
*/ */
_ol_renderer_Layer_.prototype.handleImageChange_ = function(event) { LayerRenderer.prototype.handleImageChange_ = function(event) {
var image = /** @type {ol.Image} */ (event.target); var image = /** @type {ol.Image} */ (event.target);
if (image.getState() === ImageState.LOADED) { if (image.getState() === ImageState.LOADED) {
this.renderIfReadyAndVisible(); this.renderIfReadyAndVisible();
@@ -112,7 +112,7 @@ _ol_renderer_Layer_.prototype.handleImageChange_ = function(event) {
* otherwise. * otherwise.
* @protected * @protected
*/ */
_ol_renderer_Layer_.prototype.loadImage = function(image) { LayerRenderer.prototype.loadImage = function(image) {
var imageState = image.getState(); var imageState = image.getState();
if (imageState != ImageState.LOADED && imageState != ImageState.ERROR) { if (imageState != ImageState.LOADED && imageState != ImageState.ERROR) {
_ol_events_.listen(image, EventType.CHANGE, this.handleImageChange_, this); _ol_events_.listen(image, EventType.CHANGE, this.handleImageChange_, this);
@@ -128,7 +128,7 @@ _ol_renderer_Layer_.prototype.loadImage = function(image) {
/** /**
* @protected * @protected
*/ */
_ol_renderer_Layer_.prototype.renderIfReadyAndVisible = function() { LayerRenderer.prototype.renderIfReadyAndVisible = function() {
var layer = this.getLayer(); var layer = this.getLayer();
if (layer.getVisible() && layer.getSourceState() == SourceState.READY) { if (layer.getVisible() && layer.getSourceState() == SourceState.READY) {
this.changed(); this.changed();
@@ -141,7 +141,7 @@ _ol_renderer_Layer_.prototype.renderIfReadyAndVisible = function() {
* @param {ol.source.Tile} tileSource Tile source. * @param {ol.source.Tile} tileSource Tile source.
* @protected * @protected
*/ */
_ol_renderer_Layer_.prototype.scheduleExpireCache = function(frameState, tileSource) { LayerRenderer.prototype.scheduleExpireCache = function(frameState, tileSource) {
if (tileSource.canExpireCache()) { if (tileSource.canExpireCache()) {
/** /**
* @param {ol.source.Tile} tileSource Tile source. * @param {ol.source.Tile} tileSource Tile source.
@@ -170,7 +170,7 @@ _ol_renderer_Layer_.prototype.scheduleExpireCache = function(frameState, tileSou
* @param {ol.TileRange} tileRange Tile range. * @param {ol.TileRange} tileRange Tile range.
* @protected * @protected
*/ */
_ol_renderer_Layer_.prototype.updateUsedTiles = function(usedTiles, tileSource, z, tileRange) { LayerRenderer.prototype.updateUsedTiles = function(usedTiles, tileSource, z, tileRange) {
// FIXME should we use tilesToDrawByZ instead? // FIXME should we use tilesToDrawByZ instead?
var tileSourceKey = getUid(tileSource).toString(); var tileSourceKey = getUid(tileSource).toString();
var zKey = z.toString(); var zKey = z.toString();
@@ -207,7 +207,7 @@ _ol_renderer_Layer_.prototype.updateUsedTiles = function(usedTiles, tileSource,
* @protected * @protected
* @template T * @template T
*/ */
_ol_renderer_Layer_.prototype.manageTilePyramid = function( LayerRenderer.prototype.manageTilePyramid = function(
frameState, tileSource, tileGrid, pixelRatio, projection, extent, frameState, tileSource, tileGrid, pixelRatio, projection, extent,
currentZ, preload, opt_tileCallback, opt_this) { currentZ, preload, opt_tileCallback, opt_this) {
var tileSourceKey = getUid(tileSource).toString(); var tileSourceKey = getUid(tileSource).toString();
@@ -242,4 +242,4 @@ _ol_renderer_Layer_.prototype.manageTilePyramid = function(
} }
} }
}; };
export default _ol_renderer_Layer_; export default LayerRenderer;

6
src/ol/renderer/canvas/Layer.js
View File

@@ -8,7 +8,7 @@ import _ol_render_Event_ from '../../render/Event.js';
import RenderEventType from '../../render/EventType.js'; import RenderEventType from '../../render/EventType.js';
import _ol_render_canvas_ from '../../render/canvas.js'; import _ol_render_canvas_ from '../../render/canvas.js';
import _ol_render_canvas_Immediate_ from '../../render/canvas/Immediate.js'; import _ol_render_canvas_Immediate_ from '../../render/canvas/Immediate.js';
import _ol_renderer_Layer_ from '../Layer.js'; import LayerRenderer from '../Layer.js';
import _ol_transform_ from '../../transform.js'; import _ol_transform_ from '../../transform.js';
/** /**
@@ -19,7 +19,7 @@ import _ol_transform_ from '../../transform.js';
*/ */
var _ol_renderer_canvas_Layer_ = function(layer) { var _ol_renderer_canvas_Layer_ = function(layer) {
_ol_renderer_Layer_.call(this, layer); LayerRenderer.call(this, layer);
/** /**
* @protected * @protected
@@ -35,7 +35,7 @@ var _ol_renderer_canvas_Layer_ = function(layer) {
}; };
inherits(_ol_renderer_canvas_Layer_, _ol_renderer_Layer_); inherits(_ol_renderer_canvas_Layer_, LayerRenderer);
/** /**

6
src/ol/renderer/webgl/Layer.js
View File

@@ -5,7 +5,7 @@ import {inherits} from '../../index.js';
import _ol_render_Event_ from '../../render/Event.js'; import _ol_render_Event_ from '../../render/Event.js';
import RenderEventType from '../../render/EventType.js'; import RenderEventType from '../../render/EventType.js';
import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js'; import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js';
import _ol_renderer_Layer_ from '../Layer.js'; import LayerRenderer from '../Layer.js';
import _ol_renderer_webgl_defaultmapshader_ from '../webgl/defaultmapshader.js'; import _ol_renderer_webgl_defaultmapshader_ from '../webgl/defaultmapshader.js';
import _ol_renderer_webgl_defaultmapshader_Locations_ from '../webgl/defaultmapshader/Locations.js'; import _ol_renderer_webgl_defaultmapshader_Locations_ from '../webgl/defaultmapshader/Locations.js';
import _ol_transform_ from '../../transform.js'; import _ol_transform_ from '../../transform.js';
@@ -23,7 +23,7 @@ import _ol_webgl_Context_ from '../../webgl/Context.js';
*/ */
var _ol_renderer_webgl_Layer_ = function(mapRenderer, layer) { var _ol_renderer_webgl_Layer_ = function(mapRenderer, layer) {
_ol_renderer_Layer_.call(this, layer); LayerRenderer.call(this, layer);
/** /**
* @protected * @protected
@@ -86,7 +86,7 @@ var _ol_renderer_webgl_Layer_ = function(mapRenderer, layer) {
}; };
inherits(_ol_renderer_webgl_Layer_, _ol_renderer_Layer_); inherits(_ol_renderer_webgl_Layer_, LayerRenderer);
/** /**

4
test/spec/ol/renderer/layer.test.js
View File

@@ -3,7 +3,7 @@ import Map from '../../../../src/ol/Map.js';
import View from '../../../../src/ol/View.js'; import View from '../../../../src/ol/View.js';
import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js'; import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js';
import TileLayer from '../../../../src/ol/layer/Tile.js'; import TileLayer from '../../../../src/ol/layer/Tile.js';
import _ol_renderer_Layer_ from '../../../../src/ol/renderer/Layer.js'; import LayerRenderer from '../../../../src/ol/renderer/Layer.js';
import XYZ from '../../../../src/ol/source/XYZ.js'; import XYZ from '../../../../src/ol/source/XYZ.js';
import _ol_tilecoord_ from '../../../../src/ol/tilecoord.js'; import _ol_tilecoord_ from '../../../../src/ol/tilecoord.js';
@@ -14,7 +14,7 @@ describe('ol.renderer.Layer', function() {
beforeEach(function() { beforeEach(function() {
var layer = new _ol_layer_Layer_({}); var layer = new _ol_layer_Layer_({});
renderer = new _ol_renderer_Layer_(layer); renderer = new LayerRenderer(layer);
}); });
describe('#loadImage', function() { describe('#loadImage', function() {