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

Merge pull request #1132 from tschaub/wide-stroke

Browse Source 
Only call lineTo if we are in a new pixel.
This commit is contained in:
Tim Schaub
2013-10-15 12:35:58 -07:00
parent a5c6a865bf 2011e02364
commit 5fe7c20450
1 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/ol/renderer/canvas/canvasvectorrenderer.js
View File

@@ -144,8 +144,12 @@ ol.renderer.canvas.Vector.prototype.renderLineStringFeatures_ =
function(features, symbolizer) {
var context = this.context_,
i, ii, feature, id, currentSize, geometry, components, j, jj, line,
k, kk, vec, strokeSize;
i, ii, feature, id, currentSize, geometry, components, j, jj,
coordinates, coordinate, k, kk, strokeSize;
var vec = [NaN, NaN, 0];
var pixel = [NaN, NaN];
var lastPixel = [NaN, NaN];
context.globalAlpha = symbolizer.opacity;
context.strokeStyle = symbolizer.color;
@@ -175,14 +179,24 @@ ol.renderer.canvas.Vector.prototype.renderLineStringFeatures_ =
components = geometry.getComponents();
}
for (j = 0, jj = components.length; j < jj; ++j) {
line = components[j];
for (k = 0, kk = line.getCount(); k < kk; ++k) {
vec = [line.get(k, 0), line.get(k, 1), 0];
coordinates = components[j].getCoordinates();
for (k = 0, kk = coordinates.length; k < kk; ++k) {
coordinate = coordinates[k];
vec[0] = coordinate[0];
vec[1] = coordinate[1];
goog.vec.Mat4.multVec3(this.transform_, vec, vec);
if (k === 0) {
lastPixel[0] = NaN;
lastPixel[1] = NaN;
context.moveTo(vec[0], vec[1]);
} else {
context.lineTo(vec[0], vec[1]);
pixel[0] = Math.round(vec[0]);
pixel[1] = Math.round(vec[1]);
if (pixel[0] !== lastPixel[0] || pixel[1] !== lastPixel[1]) {
context.lineTo(vec[0], vec[1]);
lastPixel[0] = pixel[0];
lastPixel[1] = pixel[1];
}
}
}
}
@@ -350,7 +364,11 @@ ol.renderer.canvas.Vector.prototype.renderPolygonFeatures_ =
fillOpacity = symbolizer.fillOpacity,
globalAlpha,
i, ii, geometry, components, j, jj, poly,
rings, numRings, ring, k, kk, vec, feature;
rings, numRings, coordinates, coordinate, k, kk, feature;
var vec = [NaN, NaN, 0];
var pixel = [NaN, NaN];
var lastPixel = [NaN, NaN];
if (strokeColor) {
context.strokeStyle = strokeColor;
@@ -391,14 +409,24 @@ ol.renderer.canvas.Vector.prototype.renderPolygonFeatures_ =
numRings = rings.length;
if (numRings > 0) {
// TODO: scenario 4
ring = rings[0];
for (k = 0, kk = ring.getCount(); k < kk; ++k) {
vec = [ring.get(k, 0), ring.get(k, 1), 0];
coordinates = rings[0].getCoordinates();
for (k = 0, kk = coordinates.length; k < kk; ++k) {
coordinate = coordinates[k];
vec[0] = coordinate[0];
vec[1] = coordinate[1];
goog.vec.Mat4.multVec3(this.transform_, vec, vec);
if (k === 0) {
lastPixel[0] = NaN;
lastPixel[1] = NaN;
context.moveTo(vec[0], vec[1]);
} else {
context.lineTo(vec[0], vec[1]);
pixel[0] = Math.round(vec[0]);
pixel[1] = Math.round(vec[1]);
if (pixel[0] !== lastPixel[0] || pixel[1] !== lastPixel[1]) {
context.lineTo(vec[0], vec[1]);
lastPixel[0] = pixel[0];
lastPixel[1] = pixel[1];
}
}
}
if (fillColor && strokeColor) {