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

Remove unnecessary duplicated polygon close points

Browse Source
This commit is contained in:
Andreas Hocevar
2016-03-31 14:47:07 +02:00
parent 18f3d7243d
commit ee53fd772d
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ol/render/canvas/canvasreplay.js
View File

@@ -153,11 +153,10 @@ goog.inherits(ol.render.canvas.Replay, ol.render.VectorContext);
* @param {number} offset Offset. * @param {number} offset Offset.
* @param {number} end End. * @param {number} end End.
* @param {number} stride Stride. * @param {number} stride Stride.
* @param {boolean} close Close.
* @protected * @protected
* @return {number} My end. * @return {number} My end.
*/ */
ol.render.canvas.Replay.prototype.appendFlatCoordinates = function(flatCoordinates, offset, end, stride, close) { ol.render.canvas.Replay.prototype.appendFlatCoordinates = function(flatCoordinates, offset, end, stride) {
var myEnd = this.coordinates.length; var myEnd = this.coordinates.length;
var extent = this.getBufferedMaxExtent(); var extent = this.getBufferedMaxExtent();
@@ -196,10 +195,6 @@ ol.render.canvas.Replay.prototype.appendFlatCoordinates = function(flatCoordinat
this.coordinates[myEnd++] = lastCoord[1]; this.coordinates[myEnd++] = lastCoord[1];
} }
if (close) {
this.coordinates[myEnd++] = flatCoordinates[offset];
this.coordinates[myEnd++] = flatCoordinates[offset + 1];
}
return myEnd; return myEnd;
}; };
@@ -771,8 +766,7 @@ goog.inherits(ol.render.canvas.ImageReplay, ol.render.canvas.Replay);
* @return {number} My end. * @return {number} My end.
*/ */
ol.render.canvas.ImageReplay.prototype.drawCoordinates_ = function(flatCoordinates, offset, end, stride) { ol.render.canvas.ImageReplay.prototype.drawCoordinates_ = function(flatCoordinates, offset, end, stride) {
return this.appendFlatCoordinates( return this.appendFlatCoordinates(flatCoordinates, offset, end, stride);
flatCoordinates, offset, end, stride, false);
}; };
@@ -993,8 +987,7 @@ goog.inherits(ol.render.canvas.LineStringReplay, ol.render.canvas.Replay);
*/ */
ol.render.canvas.LineStringReplay.prototype.drawFlatCoordinates_ = function(flatCoordinates, offset, end, stride) { ol.render.canvas.LineStringReplay.prototype.drawFlatCoordinates_ = function(flatCoordinates, offset, end, stride) {
var myBegin = this.coordinates.length; var myBegin = this.coordinates.length;
var myEnd = this.appendFlatCoordinates( var myEnd = this.appendFlatCoordinates(flatCoordinates, offset, end, stride);
flatCoordinates, offset, end, stride, false);
var moveToLineToInstruction = var moveToLineToInstruction =
[ol.render.canvas.Instruction.MOVE_TO_LINE_TO, myBegin, myEnd]; [ol.render.canvas.Instruction.MOVE_TO_LINE_TO, myBegin, myEnd];
this.instructions.push(moveToLineToInstruction); this.instructions.push(moveToLineToInstruction);
@@ -1245,8 +1238,7 @@ ol.render.canvas.PolygonReplay.prototype.drawFlatCoordinatess_ = function(flatCo
for (i = 0, ii = ends.length; i < ii; ++i) { for (i = 0, ii = ends.length; i < ii; ++i) {
var end = ends[i]; var end = ends[i];
var myBegin = this.coordinates.length; var myBegin = this.coordinates.length;
var myEnd = this.appendFlatCoordinates( var myEnd = this.appendFlatCoordinates(flatCoordinates, offset, end, stride);
flatCoordinates, offset, end, stride, true);
var moveToLineToInstruction = var moveToLineToInstruction =
[ol.render.canvas.Instruction.MOVE_TO_LINE_TO, myBegin, myEnd]; [ol.render.canvas.Instruction.MOVE_TO_LINE_TO, myBegin, myEnd];
var closePathInstruction = [ol.render.canvas.Instruction.CLOSE_PATH]; var closePathInstruction = [ol.render.canvas.Instruction.CLOSE_PATH];
@@ -1300,7 +1292,7 @@ ol.render.canvas.PolygonReplay.prototype.drawCircle = function(circleGeometry, f
var stride = circleGeometry.getStride(); var stride = circleGeometry.getStride();
var myBegin = this.coordinates.length; var myBegin = this.coordinates.length;
this.appendFlatCoordinates( this.appendFlatCoordinates(
flatCoordinates, 0, flatCoordinates.length, stride, false); flatCoordinates, 0, flatCoordinates.length, stride);
var beginPathInstruction = [ol.render.canvas.Instruction.BEGIN_PATH]; var beginPathInstruction = [ol.render.canvas.Instruction.BEGIN_PATH];
var circleInstruction = [ol.render.canvas.Instruction.CIRCLE, myBegin]; var circleInstruction = [ol.render.canvas.Instruction.CIRCLE, myBegin];
if (!state.pendingFill && !state.pendingStroke) { if (!state.pendingFill && !state.pendingStroke) {
@@ -1648,8 +1640,7 @@ ol.render.canvas.TextReplay.prototype.drawText = function(flatCoordinates, offse
this.setReplayTextState_(this.textState_); this.setReplayTextState_(this.textState_);
this.beginGeometry(geometry, feature); this.beginGeometry(geometry, feature);
var myBegin = this.coordinates.length; var myBegin = this.coordinates.length;
var myEnd = var myEnd = this.appendFlatCoordinates(flatCoordinates, offset, end, stride);
this.appendFlatCoordinates(flatCoordinates, offset, end, stride, false);
var fill = !!this.textFillState_; var fill = !!this.textFillState_;
var stroke = !!this.textStrokeState_; var stroke = !!this.textStrokeState_;
var drawTextInstruction = [ var drawTextInstruction = [