From 76cae0e63f87633e8f4e0416d6b59d3b2a723c29 Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Fri, 13 Jan 2017 18:57:17 +0100
Subject: [PATCH] Make sure moveTo is called after beginPath

---
 src/ol/render/canvas/replay.js              |  5 +----
 test/spec/ol/renderer/canvas/replay.test.js | 14 +++++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/ol/render/canvas/replay.js b/src/ol/render/canvas/replay.js
index 74502b7317..21d15b4638 100644
--- a/src/ol/render/canvas/replay.js
+++ b/src/ol/render/canvas/replay.js
@@ -283,6 +283,7 @@ ol.render.canvas.Replay.prototype.replay_ = function(
         }
         if (!pendingFill && !pendingStroke) {
           context.beginPath();
+          prevX = prevY = NaN;
         }
         ++i;
         break;
@@ -430,8 +431,6 @@ ol.render.canvas.Replay.prototype.replay_ = function(
           this.fill_(context, viewRotation);
         }
         ++i;
-        prevX = NaN;
-        prevY = NaN;
         break;
       case ol.render.canvas.Instruction.MOVE_TO_LINE_TO:
         d = /** @type {number} */ (instruction[1]);
@@ -503,8 +502,6 @@ ol.render.canvas.Replay.prototype.replay_ = function(
           context.lineDashOffset = lineDashOffset;
           context.setLineDash(lineDash);
         }
-        prevX = NaN;
-        prevY = NaN;
         ++i;
         break;
       case ol.render.canvas.Instruction.SET_TEXT_STYLE:
diff --git a/test/spec/ol/renderer/canvas/replay.test.js b/test/spec/ol/renderer/canvas/replay.test.js
index 3aa3b2b883..306367dd69 100644
--- a/test/spec/ol/renderer/canvas/replay.test.js
+++ b/test/spec/ol/renderer/canvas/replay.test.js
@@ -18,7 +18,8 @@ describe('ol.render.canvas.ReplayGroup', function() {
 
     var context, replay, fillCount, transform;
     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() {
       transform = ol.transform.create();
@@ -31,9 +32,12 @@ describe('ol.render.canvas.ReplayGroup', function() {
           [[[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({
+      fill0 = new ol.style.Style({
         fill: new ol.style.Fill({color: 'black'})
       });
+      fill1 = new ol.style.Style({
+        fill: new ol.style.Fill({color: 'red'})
+      });
       style1 = new ol.style.Style({
         fill: new ol.style.Fill({color: 'black'}),
         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() {
-      ol.renderer.vector.renderFeature(replay, feature0, style0, 1);
+      ol.renderer.vector.renderFeature(replay, feature0, fill0, 1);
       replay.replay(context, 1, transform, 0, {});
       expect(lineToCount).to.be(4);
       lineToCount = 0;
@@ -89,8 +93,8 @@ describe('ol.render.canvas.ReplayGroup', function() {
     });
 
     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);
+      ol.renderer.vector.renderFeature(replay, feature0, fill0, 1);
+      ol.renderer.vector.renderFeature(replay, feature1, fill1, 1);
       replay.replay(context, 1, transform, 0, {});
       expect(moveToCount).to.be(2);
     });