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

Make sure moveTo is called after beginPath

Browse Source
This commit is contained in:
Andreas Hocevar
2017-01-13 18:57:17 +01:00
parent 472ab00d24
commit 76cae0e63f
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/render/canvas/replay.js
+1 -4
View File
@@ -283,6 +283,7 @@ ol.render.canvas.Replay.prototype.replay_ = function(
} }
if (!pendingFill && !pendingStroke) { if (!pendingFill && !pendingStroke) {
context.beginPath(); context.beginPath();
prevX = prevY = NaN;
} }
++i; ++i;
break; break;
@@ -430,8 +431,6 @@ ol.render.canvas.Replay.prototype.replay_ = function(
this.fill_(context, viewRotation); this.fill_(context, viewRotation);
} }
++i; ++i;
prevX = NaN;
prevY = NaN;
break; break;
case ol.render.canvas.Instruction.MOVE_TO_LINE_TO: case ol.render.canvas.Instruction.MOVE_TO_LINE_TO:
d = /** @type {number} */ (instruction[1]); d = /** @type {number} */ (instruction[1]);
@@ -503,8 +502,6 @@ ol.render.canvas.Replay.prototype.replay_ = function(
context.lineDashOffset = lineDashOffset; context.lineDashOffset = lineDashOffset;
context.setLineDash(lineDash); context.setLineDash(lineDash);
} }
prevX = NaN;
prevY = NaN;
++i; ++i;
break; break;
case ol.render.canvas.Instruction.SET_TEXT_STYLE: case ol.render.canvas.Instruction.SET_TEXT_STYLE:
test/spec/ol/renderer/canvas/replay.test.js
+9 -5
View File
@@ -18,7 +18,8 @@ describe('ol.render.canvas.ReplayGroup', function() {
var context, replay, fillCount, transform; var context, replay, fillCount, transform;
var strokeCount, beginPathCount, moveToCount, lineToCount; var strokeCount, beginPathCount, moveToCount, lineToCount;
var feature0, feature1, feature2, feature3, style0, style1, style2; var feature0, feature1, feature2, feature3;
var fill0, fill1, style1, style2;
beforeEach(function() { beforeEach(function() {
transform = ol.transform.create(); transform = ol.transform.create();
@@ -31,9 +32,12 @@ describe('ol.render.canvas.ReplayGroup', function() {
[[[90, 45], [90, 0], [0, 0], [0, 45], [90, 45]]])); [[[90, 45], [90, 0], [0, 0], [0, 45], [90, 45]]]));
feature3 = new ol.Feature(new ol.geom.Polygon( feature3 = new ol.Feature(new ol.geom.Polygon(
[[[-90, -45], [-90, 45], [90, 45], [90, -45], [-90, -45]]])); [[[-90, -45], [-90, 45], [90, 45], [90, -45], [-90, -45]]]));
style0 = new ol.style.Style({ fill0 = new ol.style.Style({
fill: new ol.style.Fill({color: 'black'}) fill: new ol.style.Fill({color: 'black'})
}); });
fill1 = new ol.style.Style({
fill: new ol.style.Fill({color: 'red'})
});
style1 = new ol.style.Style({ style1 = new ol.style.Style({
fill: new ol.style.Fill({color: 'black'}), fill: new ol.style.Fill({color: 'black'}),
stroke: new ol.style.Stroke({color: 'white', width: 1}) stroke: new ol.style.Stroke({color: 'white', width: 1})
@@ -79,7 +83,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
}); });
it('omits lineTo for repeated coordinates', function() { it('omits lineTo for repeated coordinates', function() {
ol.renderer.vector.renderFeature(replay, feature0, style0, 1); ol.renderer.vector.renderFeature(replay, feature0, fill0, 1);
replay.replay(context, 1, transform, 0, {}); replay.replay(context, 1, transform, 0, {});
expect(lineToCount).to.be(4); expect(lineToCount).to.be(4);
lineToCount = 0; lineToCount = 0;
@@ -89,8 +93,8 @@ describe('ol.render.canvas.ReplayGroup', function() {
}); });
it('does not omit moveTo for repeated coordinates', function() { it('does not omit moveTo for repeated coordinates', function() {
ol.renderer.vector.renderFeature(replay, feature0, style0, 1); ol.renderer.vector.renderFeature(replay, feature0, fill0, 1);
ol.renderer.vector.renderFeature(replay, feature1, style0, 1); ol.renderer.vector.renderFeature(replay, feature1, fill1, 1);
replay.replay(context, 1, transform, 0, {}); replay.replay(context, 1, transform, 0, {});
expect(moveToCount).to.be(2); expect(moveToCount).to.be(2);
}); });