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

Rename _ol_render_canvas_Immediate_ to ImmediateCanvasRenderer

Browse Source
This commit is contained in:
Tim Schaub
2018-01-11 10:16:44 -07:00
parent afb1f6db28
commit d840eab615
7 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/render.js
View File

@@ -3,7 +3,7 @@
*/
import _ol_has_ from './has.js';
import _ol_transform_ from './transform.js';
import _ol_render_canvas_Immediate_ from './render/canvas/Immediate.js';
import CanvasImmediateRenderer from './render/canvas/Immediate.js';
var _ol_render_ = {};
@@ -40,7 +40,7 @@ _ol_render_.toContext = function(context, opt_options) {
}
var extent = [0, 0, canvas.width, canvas.height];
var transform = _ol_transform_.scale(_ol_transform_.create(), pixelRatio, pixelRatio);
return new _ol_render_canvas_Immediate_(context, pixelRatio, extent, transform,
return new CanvasImmediateRenderer(context, pixelRatio, extent, transform,
0);
};
export default _ol_render_;

48
src/ol/render/canvas/Immediate.js
View File

@@ -35,7 +35,7 @@ import _ol_transform_ from '../../transform.js';
* @param {number} viewRotation View rotation.
* @struct
*/
var _ol_render_canvas_Immediate_ = function(context, pixelRatio, extent, transform, viewRotation) {
var CanvasImmediateRenderer = function(context, pixelRatio, extent, transform, viewRotation) {
VectorContext.call(this);
/**
@@ -238,7 +238,7 @@ var _ol_render_canvas_Immediate_ = function(context, pixelRatio, extent, transfo
};
inherits(_ol_render_canvas_Immediate_, VectorContext);
inherits(CanvasImmediateRenderer, VectorContext);
/**
@@ -248,7 +248,7 @@ inherits(_ol_render_canvas_Immediate_, VectorContext);
* @param {number} stride Stride.
* @private
*/
_ol_render_canvas_Immediate_.prototype.drawImages_ = function(flatCoordinates, offset, end, stride) {
CanvasImmediateRenderer.prototype.drawImages_ = function(flatCoordinates, offset, end, stride) {
if (!this.image_) {
return;
}
@@ -303,7 +303,7 @@ _ol_render_canvas_Immediate_.prototype.drawImages_ = function(flatCoordinates, o
* @param {number} stride Stride.
* @private
*/
_ol_render_canvas_Immediate_.prototype.drawText_ = function(flatCoordinates, offset, end, stride) {
CanvasImmediateRenderer.prototype.drawText_ = function(flatCoordinates, offset, end, stride) {
if (!this.textState_ || this.text_ === '') {
return;
}
@@ -355,7 +355,7 @@ _ol_render_canvas_Immediate_.prototype.drawText_ = function(flatCoordinates, off
* @private
* @return {number} end End.
*/
_ol_render_canvas_Immediate_.prototype.moveToLineTo_ = function(flatCoordinates, offset, end, stride, close) {
CanvasImmediateRenderer.prototype.moveToLineTo_ = function(flatCoordinates, offset, end, stride, close) {
var context = this.context_;
var pixelCoordinates = _ol_geom_flat_transform_.transform2D(
flatCoordinates, offset, end, stride, this.transform_,
@@ -383,7 +383,7 @@ _ol_render_canvas_Immediate_.prototype.moveToLineTo_ = function(flatCoordinates,
* @private
* @return {number} End.
*/
_ol_render_canvas_Immediate_.prototype.drawRings_ = function(flatCoordinates, offset, ends, stride) {
CanvasImmediateRenderer.prototype.drawRings_ = function(flatCoordinates, offset, ends, stride) {
var i, ii;
for (i = 0, ii = ends.length; i < ii; ++i) {
offset = this.moveToLineTo_(
@@ -401,7 +401,7 @@ _ol_render_canvas_Immediate_.prototype.drawRings_ = function(flatCoordinates, of
* @override
* @api
*/
_ol_render_canvas_Immediate_.prototype.drawCircle = function(geometry) {
CanvasImmediateRenderer.prototype.drawCircle = function(geometry) {
if (!intersects(this.extent_, geometry.getExtent())) {
return;
}
@@ -442,7 +442,7 @@ _ol_render_canvas_Immediate_.prototype.drawCircle = function(geometry) {
* @override
* @api
*/
_ol_render_canvas_Immediate_.prototype.setStyle = function(style) {
CanvasImmediateRenderer.prototype.setStyle = function(style) {
this.setFillStrokeStyle(style.getFill(), style.getStroke());
this.setImageStyle(style.getImage());
this.setTextStyle(style.getText());
@@ -457,7 +457,7 @@ _ol_render_canvas_Immediate_.prototype.setStyle = function(style) {
* @override
* @api
*/
_ol_render_canvas_Immediate_.prototype.drawGeometry = function(geometry) {
CanvasImmediateRenderer.prototype.drawGeometry = function(geometry) {
var type = geometry.getType();
switch (type) {
case GeometryType.POINT:
@@ -500,7 +500,7 @@ _ol_render_canvas_Immediate_.prototype.drawGeometry = function(geometry) {
* @override
* @api
*/
_ol_render_canvas_Immediate_.prototype.drawFeature = function(feature, style) {
CanvasImmediateRenderer.prototype.drawFeature = function(feature, style) {
var geometry = style.getGeometryFunction()(feature);
if (!geometry || !intersects(this.extent_, geometry.getExtent())) {
return;
@@ -517,7 +517,7 @@ _ol_render_canvas_Immediate_.prototype.drawFeature = function(feature, style) {
* @param {ol.geom.GeometryCollection} geometry Geometry collection.
* @override
*/
_ol_render_canvas_Immediate_.prototype.drawGeometryCollection = function(geometry) {
CanvasImmediateRenderer.prototype.drawGeometryCollection = function(geometry) {
var geometries = geometry.getGeometriesArray();
var i, ii;
for (i = 0, ii = geometries.length; i < ii; ++i) {
@@ -533,7 +533,7 @@ _ol_render_canvas_Immediate_.prototype.drawGeometryCollection = function(geometr
* @param {ol.geom.Point|ol.render.Feature} geometry Point geometry.
* @override
*/
_ol_render_canvas_Immediate_.prototype.drawPoint = function(geometry) {
CanvasImmediateRenderer.prototype.drawPoint = function(geometry) {
var flatCoordinates = geometry.getFlatCoordinates();
var stride = geometry.getStride();
if (this.image_) {
@@ -552,7 +552,7 @@ _ol_render_canvas_Immediate_.prototype.drawPoint = function(geometry) {
* @param {ol.geom.MultiPoint|ol.render.Feature} geometry MultiPoint geometry.
* @override
*/
_ol_render_canvas_Immediate_.prototype.drawMultiPoint = function(geometry) {
CanvasImmediateRenderer.prototype.drawMultiPoint = function(geometry) {
var flatCoordinates = geometry.getFlatCoordinates();
var stride = geometry.getStride();
if (this.image_) {
@@ -571,7 +571,7 @@ _ol_render_canvas_Immediate_.prototype.drawMultiPoint = function(geometry) {
* @param {ol.geom.LineString|ol.render.Feature} geometry LineString geometry.
* @override
*/
_ol_render_canvas_Immediate_.prototype.drawLineString = function(geometry) {
CanvasImmediateRenderer.prototype.drawLineString = function(geometry) {
if (!intersects(this.extent_, geometry.getExtent())) {
return;
}
@@ -599,7 +599,7 @@ _ol_render_canvas_Immediate_.prototype.drawLineString = function(geometry) {
* geometry.
* @override
*/
_ol_render_canvas_Immediate_.prototype.drawMultiLineString = function(geometry) {
CanvasImmediateRenderer.prototype.drawMultiLineString = function(geometry) {
var geometryExtent = geometry.getExtent();
if (!intersects(this.extent_, geometryExtent)) {
return;
@@ -633,7 +633,7 @@ _ol_render_canvas_Immediate_.prototype.drawMultiLineString = function(geometry)
* @param {ol.geom.Polygon|ol.render.Feature} geometry Polygon geometry.
* @override
*/
_ol_render_canvas_Immediate_.prototype.drawPolygon = function(geometry) {
CanvasImmediateRenderer.prototype.drawPolygon = function(geometry) {
if (!intersects(this.extent_, geometry.getExtent())) {
return;
}
@@ -668,7 +668,7 @@ _ol_render_canvas_Immediate_.prototype.drawPolygon = function(geometry) {
* @param {ol.geom.MultiPolygon} geometry MultiPolygon geometry.
* @override
*/
_ol_render_canvas_Immediate_.prototype.drawMultiPolygon = function(geometry) {
CanvasImmediateRenderer.prototype.drawMultiPolygon = function(geometry) {
if (!intersects(this.extent_, geometry.getExtent())) {
return;
}
@@ -708,7 +708,7 @@ _ol_render_canvas_Immediate_.prototype.drawMultiPolygon = function(geometry) {
* @param {ol.CanvasFillState} fillState Fill state.
* @private
*/
_ol_render_canvas_Immediate_.prototype.setContextFillState_ = function(fillState) {
CanvasImmediateRenderer.prototype.setContextFillState_ = function(fillState) {
var context = this.context_;
var contextFillState = this.contextFillState_;
if (!contextFillState) {
@@ -728,7 +728,7 @@ _ol_render_canvas_Immediate_.prototype.setContextFillState_ = function(fillState
* @param {ol.CanvasStrokeState} strokeState Stroke state.
* @private
*/
_ol_render_canvas_Immediate_.prototype.setContextStrokeState_ = function(strokeState) {
CanvasImmediateRenderer.prototype.setContextStrokeState_ = function(strokeState) {
var context = this.context_;
var contextStrokeState = this.contextStrokeState_;
if (!contextStrokeState) {
@@ -785,7 +785,7 @@ _ol_render_canvas_Immediate_.prototype.setContextStrokeState_ = function(strokeS
* @param {ol.CanvasTextState} textState Text state.
* @private
*/
_ol_render_canvas_Immediate_.prototype.setContextTextState_ = function(textState) {
CanvasImmediateRenderer.prototype.setContextTextState_ = function(textState) {
var context = this.context_;
var contextTextState = this.contextTextState_;
var textAlign = textState.textAlign ?
@@ -822,7 +822,7 @@ _ol_render_canvas_Immediate_.prototype.setContextTextState_ = function(textState
* @param {ol.style.Stroke} strokeStyle Stroke style.
* @override
*/
_ol_render_canvas_Immediate_.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) {
CanvasImmediateRenderer.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) {
if (!fillStyle) {
this.fillState_ = null;
} else {
@@ -869,7 +869,7 @@ _ol_render_canvas_Immediate_.prototype.setFillStrokeStyle = function(fillStyle,
* @param {ol.style.Image} imageStyle Image style.
* @override
*/
_ol_render_canvas_Immediate_.prototype.setImageStyle = function(imageStyle) {
CanvasImmediateRenderer.prototype.setImageStyle = function(imageStyle) {
if (!imageStyle) {
this.image_ = null;
} else {
@@ -901,7 +901,7 @@ _ol_render_canvas_Immediate_.prototype.setImageStyle = function(imageStyle) {
* @param {ol.style.Text} textStyle Text style.
* @override
*/
_ol_render_canvas_Immediate_.prototype.setTextStyle = function(textStyle) {
CanvasImmediateRenderer.prototype.setTextStyle = function(textStyle) {
if (!textStyle) {
this.text_ = '';
} else {
@@ -971,4 +971,4 @@ _ol_render_canvas_Immediate_.prototype.setTextStyle = function(textStyle) {
textScale : 1);
}
};
export default _ol_render_canvas_Immediate_;
export default CanvasImmediateRenderer;

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

@@ -7,7 +7,7 @@ import {TRUE} from '../../functions.js';
import _ol_render_Event_ from '../../render/Event.js';
import RenderEventType from '../../render/EventType.js';
import _ol_render_canvas_ from '../../render/canvas.js';
import _ol_render_canvas_Immediate_ from '../../render/canvas/Immediate.js';
import CanvasImmediateRenderer from '../../render/canvas/Immediate.js';
import LayerRenderer from '../Layer.js';
import _ol_transform_ from '../../transform.js';
@@ -87,7 +87,7 @@ CanvasLayerRenderer.prototype.dispatchComposeEvent_ = function(type, context, fr
_ol_render_canvas_.rotateAtOffset(context, -rotation, width / 2, height / 2);
var transform = opt_transform !== undefined ?
opt_transform : this.getTransform(frameState, 0);
var render = new _ol_render_canvas_Immediate_(
var render = new CanvasImmediateRenderer(
context, frameState.pixelRatio, frameState.extent, transform,
frameState.viewState.rotation);
var composeEvent = new _ol_render_Event_(type, render, frameState,

4
src/ol/renderer/canvas/Map.js
View File

@@ -12,7 +12,7 @@ import _ol_layer_Layer_ from '../../layer/Layer.js';
import _ol_render_Event_ from '../../render/Event.js';
import RenderEventType from '../../render/EventType.js';
import _ol_render_canvas_ from '../../render/canvas.js';
import _ol_render_canvas_Immediate_ from '../../render/canvas/Immediate.js';
import CanvasImmediateRenderer from '../../render/canvas/Immediate.js';
import MapRenderer from '../Map.js';
import RendererType from '../Type.js';
import SourceState from '../../source/State.js';
@@ -100,7 +100,7 @@ CanvasMapRenderer.prototype.dispatchComposeEvent_ = function(type, frameState) {
var transform = this.getTransform(frameState);
var vectorContext = new _ol_render_canvas_Immediate_(context, pixelRatio,
var vectorContext = new CanvasImmediateRenderer(context, pixelRatio,
extent, transform, rotation);
var composeEvent = new _ol_render_Event_(type, vectorContext,
frameState, context, null);

4
test/rendering/ol/render.test.js
View File

@@ -3,7 +3,7 @@ import Point from '../../../src/ol/geom/Point.js';
import Polygon from '../../../src/ol/geom/Polygon.js';
import _ol_render_ from '../../../src/ol/render.js';
import VectorContext from '../../../src/ol/render/VectorContext.js';
import _ol_render_canvas_Immediate_ from '../../../src/ol/render/canvas/Immediate.js';
import CanvasImmediateRenderer from '../../../src/ol/render/canvas/Immediate.js';
import _ol_style_Circle_ from '../../../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../src/ol/style/Stroke.js';
@@ -23,7 +23,7 @@ describe('ol.render', function() {
size: [100, 100]
});
expect(vectorContext).to.be.a(VectorContext);
expect(vectorContext).to.be.a(_ol_render_canvas_Immediate_);
expect(vectorContext).to.be.a(CanvasImmediateRenderer);
});
it('can be used to render a point geometry', function(done) {

4
test/spec/ol/render.test.js
View File

@@ -1,7 +1,7 @@
import {equals} from '../../../src/ol/array.js';
import _ol_has_ from '../../../src/ol/has.js';
import _ol_render_ from '../../../src/ol/render.js';
import _ol_render_canvas_Immediate_ from '../../../src/ol/render/canvas/Immediate.js';
import CanvasImmediateRenderer from '../../../src/ol/render/canvas/Immediate.js';
import _ol_transform_ from '../../../src/ol/transform.js';
@@ -12,7 +12,7 @@ describe('ol.render', function() {
it('creates an ol.render.canvas.Immediate and sets defaults', function() {
var canvas = document.createElement('canvas');
var render = _ol_render_.toContext(canvas.getContext('2d'));
expect(render).to.be.a(_ol_render_canvas_Immediate_);
expect(render).to.be.a(CanvasImmediateRenderer);
expect(render.pixelRatio_).to.be(_ol_has_.DEVICE_PIXEL_RATIO);
});

26
test/spec/ol/render/canvas/immediate.test.js
View File

@@ -7,7 +7,7 @@ import MultiPolygon from '../../../../../src/ol/geom/MultiPolygon.js';
import Point from '../../../../../src/ol/geom/Point.js';
import Polygon from '../../../../../src/ol/geom/Polygon.js';
import VectorContext from '../../../../../src/ol/render/VectorContext.js';
import _ol_render_canvas_Immediate_ from '../../../../../src/ol/render/canvas/Immediate.js';
import CanvasImmediateRenderer from '../../../../../src/ol/render/canvas/Immediate.js';
import _ol_style_Circle_ from '../../../../../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../../src/ol/style/Stroke.js';
@@ -30,15 +30,15 @@ describe('ol.render.canvas.Immediate', function() {
describe('constructor', function() {
it('creates an instance', function() {
var instance = new _ol_render_canvas_Immediate_();
expect(instance).to.be.a(_ol_render_canvas_Immediate_);
var instance = new CanvasImmediateRenderer();
expect(instance).to.be.a(CanvasImmediateRenderer);
expect(instance).to.be.a(VectorContext);
});
});
describe('#setStyle()', function() {
it('calls the more specific methods with style parts', function() {
var context = new _ol_render_canvas_Immediate_();
var context = new CanvasImmediateRenderer();
sinon.spy(context, 'setFillStrokeStyle');
sinon.spy(context, 'setImageStyle');
sinon.spy(context, 'setTextStyle');
@@ -68,7 +68,7 @@ describe('ol.render.canvas.Immediate', function() {
var extent = [-10, -10, 10, 10];
it('calls drawPoint() with a Point', function() {
var context = new _ol_render_canvas_Immediate_(getMockContext(), 1, extent);
var context = new CanvasImmediateRenderer(getMockContext(), 1, extent);
sinon.spy(context, 'drawPoint');
var geometry = new Point([1, 2]);
@@ -78,7 +78,7 @@ describe('ol.render.canvas.Immediate', function() {
});
it('calls drawLineString() with a LineString', function() {
var context = new _ol_render_canvas_Immediate_(getMockContext(), 1, extent);
var context = new CanvasImmediateRenderer(getMockContext(), 1, extent);
sinon.spy(context, 'drawLineString');
var geometry = new LineString([[1, 2], [3, 4]]);
@@ -88,7 +88,7 @@ describe('ol.render.canvas.Immediate', function() {
});
it('calls drawPolygon() with a Polygon', function() {
var context = new _ol_render_canvas_Immediate_(getMockContext(), 1, extent);
var context = new CanvasImmediateRenderer(getMockContext(), 1, extent);
sinon.spy(context, 'drawPolygon');
var geometry = new Polygon([[[1, 2], [3, 4], [5, 6], [1, 2]]]);
@@ -98,7 +98,7 @@ describe('ol.render.canvas.Immediate', function() {
});
it('calls drawMultiPoint() with a MultiPoint', function() {
var context = new _ol_render_canvas_Immediate_(getMockContext(), 1, extent);
var context = new CanvasImmediateRenderer(getMockContext(), 1, extent);
sinon.spy(context, 'drawMultiPoint');
var geometry = new MultiPoint([[1, 2], [3, 4]]);
@@ -108,7 +108,7 @@ describe('ol.render.canvas.Immediate', function() {
});
it('calls drawMultiLineString() with a MultiLineString', function() {
var context = new _ol_render_canvas_Immediate_(getMockContext(), 1, extent);
var context = new CanvasImmediateRenderer(getMockContext(), 1, extent);
sinon.spy(context, 'drawMultiLineString');
var geometry = new MultiLineString([[[1, 2], [3, 4]]]);
@@ -118,7 +118,7 @@ describe('ol.render.canvas.Immediate', function() {
});
it('calls drawMultiPolygon() with a MultiPolygon', function() {
var context = new _ol_render_canvas_Immediate_(getMockContext(), 1, extent);
var context = new CanvasImmediateRenderer(getMockContext(), 1, extent);
sinon.spy(context, 'drawMultiPolygon');
var geometry = new MultiPolygon([[[[1, 2], [3, 4], [5, 6], [1, 2]]]]);
@@ -128,7 +128,7 @@ describe('ol.render.canvas.Immediate', function() {
});
it('calls drawGeometryCollection() with a GeometryCollection', function() {
var context = new _ol_render_canvas_Immediate_(getMockContext(), 1, extent);
var context = new CanvasImmediateRenderer(getMockContext(), 1, extent);
sinon.spy(context, 'drawGeometryCollection');
sinon.spy(context, 'drawPoint');
sinon.spy(context, 'drawLineString');
@@ -151,7 +151,7 @@ describe('ol.render.canvas.Immediate', function() {
});
it('calls drawCircle() with a Circle', function() {
var context = new _ol_render_canvas_Immediate_(getMockContext(), 1, extent);
var context = new CanvasImmediateRenderer(getMockContext(), 1, extent);
sinon.spy(context, 'drawCircle');
var geometry = new Circle([0, 0]);
@@ -223,7 +223,7 @@ describe('ol.render.canvas.Immediate', function() {
-7572748.158493212, 3741317.9895594316
];
var canvas = new _ol_render_canvas_Immediate_(context, 1, extent, transform);
var canvas = new CanvasImmediateRenderer(context, 1, extent, transform);
canvas.strokeState_ = {
lineCap: 'round',