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

Rename _ol_renderer_canvas_IntermediateCanvas_ to IntermediateCanvasRenderer

Browse Source
This commit is contained in:
Tim Schaub
2018-01-11 10:11:27 -07:00
parent 91ae3c3f4c
commit afb1f6db28
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ol/renderer/canvas/ImageLayer.js
View File

@@ -12,7 +12,7 @@ import _ol_layer_VectorRenderType_ from '../../layer/VectorRenderType.js';
import _ol_obj_ from '../../obj.js';
import {getLayerRendererPlugins} from '../../plugins.js';
import RendererType from '../Type.js';
import _ol_renderer_canvas_IntermediateCanvas_ from '../canvas/IntermediateCanvas.js';
import IntermediateCanvasRenderer from '../canvas/IntermediateCanvas.js';
import _ol_transform_ from '../../transform.js';
/**
@@ -23,7 +23,7 @@ import _ol_transform_ from '../../transform.js';
*/
var CanvasImageLayerRenderer = function(imageLayer) {
_ol_renderer_canvas_IntermediateCanvas_.call(this, imageLayer);
IntermediateCanvasRenderer.call(this, imageLayer);
/**
* @private
@@ -50,7 +50,7 @@ var CanvasImageLayerRenderer = function(imageLayer) {
};
inherits(CanvasImageLayerRenderer, _ol_renderer_canvas_IntermediateCanvas_);
inherits(CanvasImageLayerRenderer, IntermediateCanvasRenderer);
/**
@@ -201,7 +201,7 @@ CanvasImageLayerRenderer.prototype.forEachFeatureAtCoordinate = function(coordin
if (this.vectorRenderer_) {
return this.vectorRenderer_.forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback, thisArg);
} else {
return _ol_renderer_canvas_IntermediateCanvas_.prototype.forEachFeatureAtCoordinate.call(this, coordinate, frameState, hitTolerance, callback, thisArg);
return IntermediateCanvasRenderer.prototype.forEachFeatureAtCoordinate.call(this, coordinate, frameState, hitTolerance, callback, thisArg);
}
};

16
src/ol/renderer/canvas/IntermediateCanvas.js
View File

@@ -14,7 +14,7 @@ import _ol_transform_ from '../../transform.js';
* @extends {ol.renderer.canvas.Layer}
* @param {ol.layer.Layer} layer Layer.
*/
var _ol_renderer_canvas_IntermediateCanvas_ = function(layer) {
var IntermediateCanvasRenderer = function(layer) {
CanvasLayerRenderer.call(this, layer);
@@ -32,13 +32,13 @@ var _ol_renderer_canvas_IntermediateCanvas_ = function(layer) {
};
inherits(_ol_renderer_canvas_IntermediateCanvas_, CanvasLayerRenderer);
inherits(IntermediateCanvasRenderer, CanvasLayerRenderer);
/**
* @inheritDoc
*/
_ol_renderer_canvas_IntermediateCanvas_.prototype.composeFrame = function(frameState, layerState, context) {
IntermediateCanvasRenderer.prototype.composeFrame = function(frameState, layerState, context) {
this.preCompose(context, frameState);
@@ -84,20 +84,20 @@ _ol_renderer_canvas_IntermediateCanvas_.prototype.composeFrame = function(frameS
* @abstract
* @return {HTMLCanvasElement|HTMLVideoElement|Image} Canvas.
*/
_ol_renderer_canvas_IntermediateCanvas_.prototype.getImage = function() {};
IntermediateCanvasRenderer.prototype.getImage = function() {};
/**
* @abstract
* @return {!ol.Transform} Image transform.
*/
_ol_renderer_canvas_IntermediateCanvas_.prototype.getImageTransform = function() {};
IntermediateCanvasRenderer.prototype.getImageTransform = function() {};
/**
* @inheritDoc
*/
_ol_renderer_canvas_IntermediateCanvas_.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg) {
IntermediateCanvasRenderer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg) {
var layer = this.getLayer();
var source = layer.getSource();
var resolution = frameState.viewState.resolution;
@@ -118,7 +118,7 @@ _ol_renderer_canvas_IntermediateCanvas_.prototype.forEachFeatureAtCoordinate = f
/**
* @inheritDoc
*/
_ol_renderer_canvas_IntermediateCanvas_.prototype.forEachLayerAtCoordinate = function(coordinate, frameState, callback, thisArg) {
IntermediateCanvasRenderer.prototype.forEachLayerAtCoordinate = function(coordinate, frameState, callback, thisArg) {
if (!this.getImage()) {
return undefined;
}
@@ -146,4 +146,4 @@ _ol_renderer_canvas_IntermediateCanvas_.prototype.forEachLayerAtCoordinate = fun
}
}
};
export default _ol_renderer_canvas_IntermediateCanvas_;
export default IntermediateCanvasRenderer;

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

@@ -9,7 +9,7 @@ import ViewHint from '../../ViewHint.js';
import {createCanvasContext2D} from '../../dom.js';
import {containsExtent, createEmpty, equals, getIntersection, isEmpty} from '../../extent.js';
import RendererType from '../Type.js';
import _ol_renderer_canvas_IntermediateCanvas_ from '../canvas/IntermediateCanvas.js';
import IntermediateCanvasRenderer from '../canvas/IntermediateCanvas.js';
import _ol_transform_ from '../../transform.js';
/**
@@ -20,7 +20,7 @@ import _ol_transform_ from '../../transform.js';
*/
var CanvasTileLayerRenderer = function(tileLayer) {
_ol_renderer_canvas_IntermediateCanvas_.call(this, tileLayer);
IntermediateCanvasRenderer.call(this, tileLayer);
/**
* @protected
@@ -78,7 +78,7 @@ var CanvasTileLayerRenderer = function(tileLayer) {
};
inherits(CanvasTileLayerRenderer, _ol_renderer_canvas_IntermediateCanvas_);
inherits(CanvasTileLayerRenderer, IntermediateCanvasRenderer);
/**

8
test/spec/ol/map.test.js
View File

@@ -12,7 +12,7 @@ import MouseWheelZoom from '../../../src/ol/interaction/MouseWheelZoom.js';
import PinchZoom from '../../../src/ol/interaction/PinchZoom.js';
import TileLayer from '../../../src/ol/layer/Tile.js';
import VectorLayer from '../../../src/ol/layer/Vector.js';
import _ol_renderer_canvas_IntermediateCanvas_ from '../../../src/ol/renderer/canvas/IntermediateCanvas.js';
import IntermediateCanvasRenderer from '../../../src/ol/renderer/canvas/IntermediateCanvas.js';
import VectorSource from '../../../src/ol/source/Vector.js';
import XYZ from '../../../src/ol/source/XYZ.js';
@@ -257,8 +257,8 @@ describe('ol.Map', function() {
beforeEach(function(done) {
log = [];
original = _ol_renderer_canvas_IntermediateCanvas_.prototype.forEachLayerAtCoordinate;
_ol_renderer_canvas_IntermediateCanvas_.prototype.forEachLayerAtCoordinate = function(coordinate) {
original = IntermediateCanvasRenderer.prototype.forEachLayerAtCoordinate;
IntermediateCanvasRenderer.prototype.forEachLayerAtCoordinate = function(coordinate) {
log.push(coordinate.slice());
};
@@ -296,7 +296,7 @@ describe('ol.Map', function() {
});
afterEach(function() {
_ol_renderer_canvas_IntermediateCanvas_.prototype.forEachLayerAtCoordinate = original;
IntermediateCanvasRenderer.prototype.forEachLayerAtCoordinate = original;
map.dispose();
document.body.removeChild(target);
log = null;

4
test/spec/ol/renderer/canvas/intermediatecanvas.test.js
View File

@@ -1,7 +1,7 @@
import _ol_transform_ from '../../../../../src/ol/transform.js';
import ImageLayer from '../../../../../src/ol/layer/Image.js';
import MapRenderer from '../../../../../src/ol/renderer/Map.js';
import _ol_renderer_canvas_IntermediateCanvas_ from '../../../../../src/ol/renderer/canvas/IntermediateCanvas.js';
import IntermediateCanvasRenderer from '../../../../../src/ol/renderer/canvas/IntermediateCanvas.js';
describe('ol.renderer.canvas.IntermediateCanvas', function() {
@@ -12,7 +12,7 @@ describe('ol.renderer.canvas.IntermediateCanvas', function() {
var layer = new ImageLayer({
extent: [1, 2, 3, 4]
});
renderer = new _ol_renderer_canvas_IntermediateCanvas_(layer);
renderer = new IntermediateCanvasRenderer(layer);
var image = new Image();
image.width = 3;
image.height = 3;