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

Rename _ol_render_canvas_LineStringReplay_ to CanvasLineStringReplay

Browse Source
This commit is contained in:
Frederic Junod
2018-01-15 10:09:32 +01:00
parent 73db907e99
commit 2139db7437
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ol/render/canvas/LineStringReplay.js
View File

@@ -16,13 +16,13 @@ import CanvasReplay from '../canvas/Replay.js';
* @param {?} declutterTree Declutter tree. * @param {?} declutterTree Declutter tree.
* @struct * @struct
*/ */
const _ol_render_canvas_LineStringReplay_ = function( const CanvasLineStringReplay = function(
tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree) { tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree) {
CanvasReplay.call(this, CanvasReplay.call(this,
tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree); tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree);
}; };
inherits(_ol_render_canvas_LineStringReplay_, CanvasReplay); inherits(CanvasLineStringReplay, CanvasReplay);
/** /**
@@ -33,7 +33,7 @@ inherits(_ol_render_canvas_LineStringReplay_, CanvasReplay);
* @private * @private
* @return {number} end. * @return {number} end.
*/ */
_ol_render_canvas_LineStringReplay_.prototype.drawFlatCoordinates_ = function(flatCoordinates, offset, end, stride) { CanvasLineStringReplay.prototype.drawFlatCoordinates_ = function(flatCoordinates, offset, end, stride) {
const myBegin = this.coordinates.length; const myBegin = this.coordinates.length;
const myEnd = this.appendFlatCoordinates( const myEnd = this.appendFlatCoordinates(
flatCoordinates, offset, end, stride, false, false); flatCoordinates, offset, end, stride, false, false);
@@ -48,7 +48,7 @@ _ol_render_canvas_LineStringReplay_.prototype.drawFlatCoordinates_ = function(fl
/** /**
* @inheritDoc * @inheritDoc
*/ */
_ol_render_canvas_LineStringReplay_.prototype.drawLineString = function(lineStringGeometry, feature) { CanvasLineStringReplay.prototype.drawLineString = function(lineStringGeometry, feature) {
const state = this.state; const state = this.state;
const strokeStyle = state.strokeStyle; const strokeStyle = state.strokeStyle;
const lineWidth = state.lineWidth; const lineWidth = state.lineWidth;
@@ -75,7 +75,7 @@ _ol_render_canvas_LineStringReplay_.prototype.drawLineString = function(lineStri
/** /**
* @inheritDoc * @inheritDoc
*/ */
_ol_render_canvas_LineStringReplay_.prototype.drawMultiLineString = function(multiLineStringGeometry, feature) { CanvasLineStringReplay.prototype.drawMultiLineString = function(multiLineStringGeometry, feature) {
const state = this.state; const state = this.state;
const strokeStyle = state.strokeStyle; const strokeStyle = state.strokeStyle;
const lineWidth = state.lineWidth; const lineWidth = state.lineWidth;
@@ -108,7 +108,7 @@ _ol_render_canvas_LineStringReplay_.prototype.drawMultiLineString = function(mul
/** /**
* @inheritDoc * @inheritDoc
*/ */
_ol_render_canvas_LineStringReplay_.prototype.finish = function() { CanvasLineStringReplay.prototype.finish = function() {
const state = this.state; const state = this.state;
if (state.lastStroke != undefined && state.lastStroke != this.coordinates.length) { if (state.lastStroke != undefined && state.lastStroke != this.coordinates.length) {
this.instructions.push([_ol_render_canvas_Instruction_.STROKE]); this.instructions.push([_ol_render_canvas_Instruction_.STROKE]);
@@ -121,7 +121,7 @@ _ol_render_canvas_LineStringReplay_.prototype.finish = function() {
/** /**
* @inheritDoc. * @inheritDoc.
*/ */
_ol_render_canvas_LineStringReplay_.prototype.applyStroke = function(state) { CanvasLineStringReplay.prototype.applyStroke = function(state) {
if (state.lastStroke != undefined && state.lastStroke != this.coordinates.length) { if (state.lastStroke != undefined && state.lastStroke != this.coordinates.length) {
this.instructions.push([_ol_render_canvas_Instruction_.STROKE]); this.instructions.push([_ol_render_canvas_Instruction_.STROKE]);
state.lastStroke = this.coordinates.length; state.lastStroke = this.coordinates.length;
@@ -130,4 +130,4 @@ _ol_render_canvas_LineStringReplay_.prototype.applyStroke = function(state) {
CanvasReplay.prototype.applyStroke.call(this, state); CanvasReplay.prototype.applyStroke.call(this, state);
this.instructions.push([_ol_render_canvas_Instruction_.BEGIN_PATH]); this.instructions.push([_ol_render_canvas_Instruction_.BEGIN_PATH]);
}; };
export default _ol_render_canvas_LineStringReplay_; export default CanvasLineStringReplay;

4
src/ol/render/canvas/ReplayGroup.js
View File

@@ -11,7 +11,7 @@ import ReplayGroup from '../ReplayGroup.js';
import ReplayType from '../ReplayType.js'; import ReplayType from '../ReplayType.js';
import CanvasReplay from '../canvas/Replay.js'; import CanvasReplay from '../canvas/Replay.js';
import CanvasImageReplay from '../canvas/ImageReplay.js'; import CanvasImageReplay from '../canvas/ImageReplay.js';
import _ol_render_canvas_LineStringReplay_ from '../canvas/LineStringReplay.js'; import CanvasLineStringReplay from '../canvas/LineStringReplay.js';
import CanvasPolygonReplay from '../canvas/PolygonReplay.js'; import CanvasPolygonReplay from '../canvas/PolygonReplay.js';
import CanvasTextReplay from '../canvas/TextReplay.js'; import CanvasTextReplay from '../canvas/TextReplay.js';
import _ol_render_replay_ from '../replay.js'; import _ol_render_replay_ from '../replay.js';
@@ -500,7 +500,7 @@ CanvasReplayGroup.BATCH_CONSTRUCTORS_ = {
'Circle': CanvasPolygonReplay, 'Circle': CanvasPolygonReplay,
'Default': CanvasReplay, 'Default': CanvasReplay,
'Image': CanvasImageReplay, 'Image': CanvasImageReplay,
'LineString': _ol_render_canvas_LineStringReplay_, 'LineString': CanvasLineStringReplay,
'Polygon': CanvasPolygonReplay, 'Polygon': CanvasPolygonReplay,
'Text': CanvasTextReplay 'Text': CanvasTextReplay
}; };

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

@@ -7,7 +7,7 @@ import MultiPoint from '../../../../../src/ol/geom/MultiPoint.js';
import MultiPolygon from '../../../../../src/ol/geom/MultiPolygon.js'; import MultiPolygon from '../../../../../src/ol/geom/MultiPolygon.js';
import Point from '../../../../../src/ol/geom/Point.js'; import Point from '../../../../../src/ol/geom/Point.js';
import Polygon from '../../../../../src/ol/geom/Polygon.js'; import Polygon from '../../../../../src/ol/geom/Polygon.js';
import _ol_render_canvas_LineStringReplay_ from '../../../../../src/ol/render/canvas/LineStringReplay.js'; import CanvasLineStringReplay from '../../../../../src/ol/render/canvas/LineStringReplay.js';
import CanvasPolygonReplay from '../../../../../src/ol/render/canvas/PolygonReplay.js'; import CanvasPolygonReplay from '../../../../../src/ol/render/canvas/PolygonReplay.js';
import CanvasReplay from '../../../../../src/ol/render/canvas/Replay.js'; import CanvasReplay from '../../../../../src/ol/render/canvas/Replay.js';
import CanvasReplayGroup from '../../../../../src/ol/render/canvas/ReplayGroup.js'; import CanvasReplayGroup from '../../../../../src/ol/render/canvas/ReplayGroup.js';
@@ -446,7 +446,7 @@ describe('ol.render.canvas.LineStringReplay', function() {
const tolerance = 1; const tolerance = 1;
const extent = [-180, -90, 180, 90]; const extent = [-180, -90, 180, 90];
const resolution = 10; const resolution = 10;
const replay = new _ol_render_canvas_LineStringReplay_(tolerance, extent, const replay = new CanvasLineStringReplay(tolerance, extent,
resolution); resolution);
const stroke = new Stroke({ const stroke = new Stroke({
width: 2 width: 2