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

Do not skip moveTo calls after fill

Browse Source
This commit is contained in:
Andreas Hocevar
2017-01-11 17:12:46 +01:00
parent c09c7ef3e2
commit 2296ca3942
2 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,18 +16,24 @@ describe('ol.render.canvas.ReplayGroup', function() {
describe('#replay', function() {
var context, replay, fillCount, strokeCount, beginPathCount;
var feature1, feature2, feature3, style1, style2, transform;
var context, replay, fillCount, transform;
var strokeCount, beginPathCount, moveToCount, lineToCount;
var feature0, feature1, feature2, feature3, style0, style1, style2;
beforeEach(function() {
transform = ol.transform.create();
replay = new ol.render.canvas.ReplayGroup(1, [-180, -90, 180, 90], 1, false);
feature0 = new ol.Feature(new ol.geom.Polygon(
[[[-90, 0], [-45, 45], [0, 0], [1, 1], [0, -45], [-90, 0]]]));
feature1 = new ol.Feature(new ol.geom.Polygon(
[[[-90, -45], [-90, 0], [0, 0], [0, -45], [-90, -45]]]));
feature2 = new ol.Feature(new ol.geom.Polygon(
[[[90, 45], [90, 0], [0, 0], [0, 45], [90, 45]]]));
feature3 = new ol.Feature(new ol.geom.Polygon(
[[[-90, -45], [-90, 45], [90, 45], [90, -45], [-90, -45]]]));
style0 = new ol.style.Style({
fill: new ol.style.Fill({color: 'black'})
});
style1 = new ol.style.Style({
fill: new ol.style.Fill({color: 'black'}),
stroke: new ol.style.Stroke({color: 'white', width: 1})
@@ -40,6 +46,8 @@ describe('ol.render.canvas.ReplayGroup', function() {
fillCount = 0;
strokeCount = 0;
beginPathCount = 0;
moveToCount = 0;
lineToCount = 0;
context = {
fill: function() {
fillCount++;
@@ -51,18 +59,42 @@ describe('ol.render.canvas.ReplayGroup', function() {
beginPathCount++;
},
clip: function() {
// remove beginPath, moveTo and lineTo counts for clipping
beginPathCount--;
moveToCount--;
lineToCount -= 3;
},
moveTo: function() {
moveToCount++;
},
lineTo: function() {
lineToCount++;
},
save: function() {},
moveTo: function() {},
lineTo: function() {},
closePath: function() {},
setLineDash: function() {},
save: function() {},
restore: function() {}
};
});
it('omits lineTo for repeated coordinates', function() {
ol.renderer.vector.renderFeature(replay, feature0, style0, 1);
replay.replay(context, 1, transform, 0, {});
expect(lineToCount).to.be(4);
lineToCount = 0;
ol.transform.scale(transform, 0.25, 0.25);
replay.replay(context, 1, transform, 0, {});
expect(lineToCount).to.be(3);
});
it('does not omit moveTo for repeated coordinates', function() {
ol.renderer.vector.renderFeature(replay, feature0, style0, 1);
ol.renderer.vector.renderFeature(replay, feature1, style0, 1);
replay.replay(context, 1, transform, 0, {});
expect(moveToCount).to.be(2);
});
it('batches fill and stroke instructions for same style', function() {
ol.renderer.vector.renderFeature(replay, feature1, style1, 1);
ol.renderer.vector.renderFeature(replay, feature2, style1, 1);