From a14a348246d75e14131bd7690ab8a3dfd27275a4 Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Mon, 29 Aug 2016 10:31:21 +0200
Subject: [PATCH] Merge pull request #5798 from ahocevar/fix-rotated-circles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move to 90° along the circle, not 0°
---
 src/ol/render/canvas/replay.js                |   2 +-
 .../layer/expected/vector-canvas-rotated.png  | Bin 0 -> 1270 bytes
 test_rendering/spec/ol/layer/vector.test.js   |  20 ++++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 test_rendering/spec/ol/layer/expected/vector-canvas-rotated.png

diff --git a/src/ol/render/canvas/replay.js b/src/ol/render/canvas/replay.js
index d9060df9f5..7eb19173f3 100644
--- a/src/ol/render/canvas/replay.js
+++ b/src/ol/render/canvas/replay.js
@@ -313,7 +313,7 @@ ol.render.canvas.Replay.prototype.replay_ = function(
         var dx = x2 - x1;
         var dy = y2 - y1;
         var r = Math.sqrt(dx * dx + dy * dy);
-        context.moveTo(x2, y2);
+        context.moveTo(x1 + r, y1);
         context.arc(x1, y1, r, 0, 2 * Math.PI, true);
         ++i;
         break;
diff --git a/test_rendering/spec/ol/layer/expected/vector-canvas-rotated.png b/test_rendering/spec/ol/layer/expected/vector-canvas-rotated.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb1efcf21f5762ef98f81f555df40410c416b38e
GIT binary patch
literal 1270
zcmV<S1PS|zP)<h;3K|Lk000e1NJLTq002+`002-31^@s6juG;$000ENNkl<Zc%1E=
z-)|K~6vsb%F;t#vtM4X4OAHX6@u3hDP+p~oh=4z_(iZ-Ps+5HAjD#ri!}ud4@DC_I
z9(Yp-udS2@)U+TGfd}iu_2HaxZku}V&hFjW*~@&AO>TG3nK}E-&d$!vnL;EIi9{li
zNF)-8L?V$$#i#*mfdjyC;1Vze+z0*v=JfXza8YeW)hF>EZWz>n4Zum@E>O>S+|@D$
zw9Jm@Y2ahvCi8`uMugZ8yaMzAJ-|{udi2~TwfRbY8q4?v7y`O{-HcBXU=Q#s^KW<z
z=+9AZzm_r8Q0^VzZ91rV_W@V1H~2HKjn+-B8#u2=cMIDZFbG_0sOPfQU1{C|9wImN
zJFts%PewOz6)VP7T8oI5y&ITOzX!l}=cof90ghq?I14<J(zj8(o7nedS`pE@zH6xe
zFcoUjPXVWq!2bq5bnsm$-t&575fNaY#!yE(sU;4+rH~*`TODb-FFW`yCY~XWh?}vm
zkuwDTBp$(vx6Z+@nRtdgBCZ1-tM9mjpI3Hbo9#vizck_*@`$(*+nnEU@bf}H@D~!?
z2M&HN;u-RYIE3w;S2*|;N`n2)``W=Ti+F}SB7UoW7YXEjxEK4Km-SP{MLa`R5qp4H
z_1l@D-nOy~_zekWS4y9Dh-b(u;$HQ+jf}NR!@N^|!hM91S3E-&5fk7#?(gijQbQ&L
z>cHzM?28c3kVVApYCl0q@4^jOG15#76eXU)Rm2)_OYH{=h^HlAYUN`s?0kr4a24@W
zwLMW_Op8(j?rG)C=JR}tXK)emMYWs7b2DD672j%NQ-*j37ZGo(-5L*Z{l`J<498-W
zDV`y%h^N$M#8X^=tc=x>^@)XqAf6$Oh$DLan8&!dtd(wBa6TmQ46Q`mf*sm<!z|*w
z&~Pq9@eIvGT#k*|8~3%+Ui~{{@eKbb;&XcL51+xzX{BZj_5xvxXJ{1hf}ZQb&SQEb
z3Ye2lY{K_^24gyr<qhXT7BRR^<Px3p8S|=M`_X4m@k2T%qjb(t&Lja0dx{INlL^yJ
zY~o}>6KdGR$dyg(LZ8lBt#&h%Ff09qR{lu~yO1YTKcl1xRe<$We@fqExvnoDo|e>r
zNey6I3j5F&m3C0_q7uMI8pO4fL4>rdc|(2PZ$k{3>B8nc?@s9x!ovEy*sq9E7uG=%
zx=l}3h18B-Y--1w8R~6233h1rje}oV$wlYX?*|8;!s$a&#_Gs>F)hB++lJNePv%dA
z1cB+*LQSyTicPQ_bnx@aI1=Dv!b<Udi3+6ng1isUAb~za61>w=RFe5?z$5iNO(02?
z%~*oW(wOEv<lx)xZ4SfO<%g40V4H&>!8YeQ@I8Jv+VpCjrv7m%@Z>GVAhvg&MKVK+
z-s<%ZcBbe70e2W_S%Iwj8!@gUH`VUVhC8ssGxMDnOeTI_5@h3{nY=W^s4-wwj&fH4
zhnT;2cp4G2BUy^<otwbka2*l$6tX_C8Ob?(78z@I>F<8MHj4D7cNUZ}0lY^5V_P32
zNLuX)?AFvQ$BdRSKt(%=c90<J5hK9o$nxSOvUop-{ihR?dhM9nuI33AEfR@DB9TZW
g5{X12kw``P7g4%9Se~o5E&u=k07*qoM6N<$f@9=jx&QzG

literal 0
HcmV?d00001

diff --git a/test_rendering/spec/ol/layer/vector.test.js b/test_rendering/spec/ol/layer/vector.test.js
index a64903069b..0ab45d9762 100644
--- a/test_rendering/spec/ol/layer/vector.test.js
+++ b/test_rendering/spec/ol/layer/vector.test.js
@@ -96,6 +96,26 @@ describe('ol.rendering.layer.Vector', function() {
       });
     });
 
+    it('renders rotation correctly with the canvas renderer', function(done) {
+      map = createMap('canvas');
+      map.getView().setRotation(Math.PI + Math.PI / 4);
+      addPolygon(300);
+      addCircle(500);
+      map.addLayer(new ol.layer.Vector({
+        source: source,
+        style: new ol.style.Style({
+          stroke: new ol.style.Stroke({
+            width: 2,
+            color: 'black'
+          })
+        })
+      }));
+      map.once('postrender', function() {
+        expectResemble(map, 'spec/ol/layer/expected/vector-canvas-rotated.png',
+            1.7, done);
+      });
+    });
+
     it('renders fill/stroke batches correctly with the canvas renderer', function(done) {
       map = createMap('canvas');
       source = new ol.source.Vector({