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

Factor out beginGeometry and endGeometry

Browse Source
This commit is contained in:
Tom Payne
2013-11-21 14:30:26 +01:00
parent 297251661a
commit 8b6f71f7f6
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,6 +97,19 @@ ol.render.canvas.Replay.prototype.appendFlatCoordinates =
}; };
/**
* @param {ol.geom.Geometry} geometry Geometry.
* @protected
* @return {Array} Begin geometry instruction.
*/
ol.render.canvas.Replay.prototype.beginGeometry = function(geometry) {
var beginGeometryInstruction =
[ol.render.canvas.Instruction.BEGIN_GEOMETRY, geometry, 0, 0];
this.instructions.push(beginGeometryInstruction);
return beginGeometryInstruction;
};
/** /**
* @param {CanvasRenderingContext2D} context Context. * @param {CanvasRenderingContext2D} context Context.
* @param {goog.vec.Mat4.AnyType} transform Transform. * @param {goog.vec.Mat4.AnyType} transform Transform.
@@ -237,6 +250,16 @@ ol.render.canvas.Replay.prototype.drawMultiPolygonGeometry =
goog.abstractMethod; goog.abstractMethod;
/**
* @param {Array} beginGeometryInstruction Begin geometry instruction.
*/
ol.render.canvas.Replay.prototype.endGeometry =
function(beginGeometryInstruction) {
beginGeometryInstruction[2] = this.coordinates.length;
beginGeometryInstruction[3] = this.instructions.length;
};
/** /**
* FIXME empty description for jsdoc * FIXME empty description for jsdoc
*/ */
@@ -637,15 +660,12 @@ ol.render.canvas.PolygonReplay.prototype.drawPolygonGeometry =
} }
ol.extent.extend(this.extent_, polygonGeometry.getExtent()); ol.extent.extend(this.extent_, polygonGeometry.getExtent());
this.setFillStrokeStyles_(); this.setFillStrokeStyles_();
var beginGeometryInstruction = var beginGeometryInstruction = this.beginGeometry(polygonGeometry);
[ol.render.canvas.Instruction.BEGIN_GEOMETRY, polygonGeometry, 0, 0];
this.instructions.push(beginGeometryInstruction);
var ends = polygonGeometry.getEnds(); var ends = polygonGeometry.getEnds();
var flatCoordinates = polygonGeometry.getFlatCoordinates(); var flatCoordinates = polygonGeometry.getFlatCoordinates();
var stride = polygonGeometry.getStride(); var stride = polygonGeometry.getStride();
this.drawFlatCoordinatess_(flatCoordinates, 0, ends, stride); this.drawFlatCoordinatess_(flatCoordinates, 0, ends, stride);
beginGeometryInstruction[2] = this.coordinates.length; this.endGeometry(beginGeometryInstruction);
beginGeometryInstruction[3] = this.instructions.length;
}; };
@@ -666,9 +686,7 @@ ol.render.canvas.PolygonReplay.prototype.drawMultiPolygonGeometry =
} }
ol.extent.extend(this.extent_, multiPolygonGeometry.getExtent()); ol.extent.extend(this.extent_, multiPolygonGeometry.getExtent());
this.setFillStrokeStyles_(); this.setFillStrokeStyles_();
var beginGeometryInstruction = var beginGeometryInstruction = this.beginGeometry(multiPolygonGeometry);
[ol.render.canvas.Instruction.BEGIN_GEOMETRY, multiPolygonGeometry, 0, 0];
this.instructions.push(beginGeometryInstruction);
var endss = multiPolygonGeometry.getEndss(); var endss = multiPolygonGeometry.getEndss();
var flatCoordinates = multiPolygonGeometry.getFlatCoordinates(); var flatCoordinates = multiPolygonGeometry.getFlatCoordinates();
var stride = multiPolygonGeometry.getStride(); var stride = multiPolygonGeometry.getStride();
@@ -678,8 +696,7 @@ ol.render.canvas.PolygonReplay.prototype.drawMultiPolygonGeometry =
offset = this.drawFlatCoordinatess_( offset = this.drawFlatCoordinatess_(
flatCoordinates, offset, endss[i], stride); flatCoordinates, offset, endss[i], stride);
} }
beginGeometryInstruction[2] = this.coordinates.length; this.endGeometry(beginGeometryInstruction);
beginGeometryInstruction[3] = this.instructions.length;
}; };