From 719abf726500dcdfe521477d89d07f373b29b55e Mon Sep 17 00:00:00 2001
From: gkresic <gordan.kresic@steatoda.com>
Date: Mon, 24 Jul 2017 12:34:53 +0200
Subject: [PATCH 1/2] Support for lineDashOffset

---
 src/ol/render/canvas/immediate.js | 6 ++++++
 src/ol/style/regularshape.js      | 6 ++++++
 src/ol/typedefs.js                | 1 +
 3 files changed, 13 insertions(+)

diff --git a/src/ol/render/canvas/immediate.js b/src/ol/render/canvas/immediate.js
index bcf72367f7..a54503a9a6 100644
--- a/src/ol/render/canvas/immediate.js
+++ b/src/ol/render/canvas/immediate.js
@@ -735,6 +735,7 @@ ol.render.canvas.Immediate.prototype.setContextStrokeState_ = function(strokeSta
     context.lineCap = strokeState.lineCap;
     if (ol.has.CANVAS_LINE_DASH) {
       context.setLineDash(strokeState.lineDash);
+      context.lineDashOffset = strokeState.lineDashOffset;
     }
     context.lineJoin = strokeState.lineJoin;
     context.lineWidth = strokeState.lineWidth;
@@ -743,6 +744,7 @@ ol.render.canvas.Immediate.prototype.setContextStrokeState_ = function(strokeSta
     this.contextStrokeState_ = {
       lineCap: strokeState.lineCap,
       lineDash: strokeState.lineDash,
+      lineDashOffset: strokeState.lineDashOffset,
       lineJoin: strokeState.lineJoin,
       lineWidth: strokeState.lineWidth,
       miterLimit: strokeState.miterLimit,
@@ -757,6 +759,10 @@ ol.render.canvas.Immediate.prototype.setContextStrokeState_ = function(strokeSta
           contextStrokeState.lineDash, strokeState.lineDash)) {
         context.setLineDash(contextStrokeState.lineDash = strokeState.lineDash);
       }
+      if (contextStrokeState.lineDashOffset != strokeState.lineDashOffset) {
+        contextStrokeState.lineDashOffset = context.lineDashOffset =
+            strokeState.lineDashOffset;
+      }
     }
     if (contextStrokeState.lineJoin != strokeState.lineJoin) {
       contextStrokeState.lineJoin = context.lineJoin = strokeState.lineJoin;
diff --git a/src/ol/style/regularshape.js b/src/ol/style/regularshape.js
index 4a992a4daa..08f0a80e36 100644
--- a/src/ol/style/regularshape.js
+++ b/src/ol/style/regularshape.js
@@ -317,6 +317,7 @@ ol.style.RegularShape.prototype.render_ = function(atlasManager) {
   var lineJoin = '';
   var miterLimit = 0;
   var lineDash = null;
+  var lineDashOffset = 0;
   var strokeStyle;
   var strokeWidth = 0;
 
@@ -331,8 +332,10 @@ ol.style.RegularShape.prototype.render_ = function(atlasManager) {
       strokeWidth = ol.render.canvas.defaultLineWidth;
     }
     lineDash = this.stroke_.getLineDash();
+    lineDashOffset = this.stroke_.getLineDashOffset();
     if (!ol.has.CANVAS_LINE_DASH) {
       lineDash = null;
+      lineDashOffset = 0;
     }
     lineJoin = this.stroke_.getLineJoin();
     if (lineJoin === undefined) {
@@ -357,6 +360,7 @@ ol.style.RegularShape.prototype.render_ = function(atlasManager) {
     size: size,
     lineCap: lineCap,
     lineDash: lineDash,
+    lineDashOffset: lineDashOffset,
     lineJoin: lineJoin,
     miterLimit: miterLimit
   };
@@ -460,6 +464,7 @@ ol.style.RegularShape.prototype.draw_ = function(renderOptions, context, x, y) {
     context.lineWidth = renderOptions.strokeWidth;
     if (renderOptions.lineDash) {
       context.setLineDash(renderOptions.lineDash);
+      context.lineDashOffset = renderOptions.lineDashOffset;
     }
     context.lineCap = renderOptions.lineCap;
     context.lineJoin = renderOptions.lineJoin;
@@ -533,6 +538,7 @@ ol.style.RegularShape.prototype.drawHitDetectionCanvas_ = function(renderOptions
     context.lineWidth = renderOptions.strokeWidth;
     if (renderOptions.lineDash) {
       context.setLineDash(renderOptions.lineDash);
+      context.lineDashOffset = renderOptions.lineDashOffset;
     }
     context.stroke();
   }
diff --git a/src/ol/typedefs.js b/src/ol/typedefs.js
index 8581394c33..d9300c5912 100644
--- a/src/ol/typedefs.js
+++ b/src/ol/typedefs.js
@@ -79,6 +79,7 @@ ol.CanvasFunctionType;
 /**
  * @typedef {{lineCap: string,
  *            lineDash: Array.<number>,
+ *            lineDashOffset: number,
  *            lineJoin: string,
  *            lineWidth: number,
  *            miterLimit: number,

From dd914ef6350f6a27bf04f7581b8ca9e3e977b418 Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Mon, 24 Jul 2017 18:36:08 +0200
Subject: [PATCH 2/2] Add rendering tests

---
 .../ol/expected/render-polygon-linedash.png   | Bin 0 -> 396 bytes
 .../render-polygon-linedashoffset.png         | Bin 0 -> 403 bytes
 test_rendering/spec/ol/render.test.js         |  43 ++++++++++++++++++
 .../expected/regularshape-canvas-linedash.png | Bin 0 -> 819 bytes
 .../regularshape-canvas-linedashoffset.png    | Bin 0 -> 831 bytes
 .../spec/ol/style/regularshape.test.js        |  17 +++++++
 6 files changed, 60 insertions(+)
 create mode 100644 test_rendering/spec/ol/expected/render-polygon-linedash.png
 create mode 100644 test_rendering/spec/ol/expected/render-polygon-linedashoffset.png
 create mode 100644 test_rendering/spec/ol/style/expected/regularshape-canvas-linedash.png
 create mode 100644 test_rendering/spec/ol/style/expected/regularshape-canvas-linedashoffset.png

diff --git a/test_rendering/spec/ol/expected/render-polygon-linedash.png b/test_rendering/spec/ol/expected/render-polygon-linedash.png
new file mode 100644
index 0000000000000000000000000000000000000000..73ca5f7402c8ba8e22c52063cc4a16006070ec35
GIT binary patch
literal 396
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$}jSU<~$jaSW-L^Y+fc%)<^MEEnP@
z{OY#$usU_|_?D^32W|-LF_P=O$9z|1@y&@hU5{Ba19gJIfr~lDpG%+L_*WVCX={7Q
z%$cvx)ZCHz&i3rv9C!CqV3G6X_gU&igxnMpqquG!lMz~~>h3#XnvAJqRM8cd%#(q_
zOH|#@zFM+uf*2R);t2+(t!vIGuCG}8@6FyTBAbMsTwMJ-J$`k){vGerk5YC{u$_Nu
z*7BNGr$ZVlKHiGYCfuwS2(w%N?Dkb5pfNCWXE<L{;dQ#y^?m}_UXf2s&n6gnHc!~{
zsCxD^rz{PX9;ZWZVo#iU{{~{f|9#Uofut04Ewh@oJXyhcY0_df5AVKNS3P|db-`w2
zaT&I^WO82mlyFrf$XPK_MCh53vHj%T+IL=-O{xB}%O*8^$K|&g?680-P}`qz_GGAp
R-^8ULAx~F7mvv4FO#l*gs?`7h

literal 0
HcmV?d00001

diff --git a/test_rendering/spec/ol/expected/render-polygon-linedashoffset.png b/test_rendering/spec/ol/expected/render-polygon-linedashoffset.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9c9f1b3de950d1af791e96bfd117f4383456505
GIT binary patch
literal 403
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$}jSV2tu~aSW-L^Y+d`-@^_ft{3CE
zSeMveVk|i_Ni}z)d#6bvQ(c{v`>DQ(HGh{@NO;d=1Zo9?2RVAipZERP*|Prc&+_FZ
zb7!8PSsDA|&Mrgk*Z-2=9zV0^?=!X~JN?`}yxn~f_;}2+<nl|G7z@;N@9))>HQhaV
zTHmY*2)uT})#MLz7k>+7Gy2~DZhqyJe<!v|oH%wX-Fw$GT{fX(4u@2DQ=adCJF8LU
zZp&TS_@ft3_AO~NU=up-@UJ1=W5$x%6Sh3I_6h1}^a+FDo^+2nP|-^cWh$|!#h5vh
z6%xzXKbhWJX@B)x^Ot+OKPlf^d0l2M!yJ#(<@w(3XWuPZx>yZAew^lUOaJKFHEShL
qtW|Db65myw^7eF<87y=dIQKFB^FQe+(p32$B<AVr=d#Wzp$Pya8MWI0

literal 0
HcmV?d00001

diff --git a/test_rendering/spec/ol/render.test.js b/test_rendering/spec/ol/render.test.js
index 1c2796512d..b9d5c1d583 100644
--- a/test_rendering/spec/ol/render.test.js
+++ b/test_rendering/spec/ol/render.test.js
@@ -135,6 +135,49 @@ describe('ol.render', function() {
 
     });
 
+    it('supports lineDash styles', function(done) {
+      var vectorContext = ol.render.toContext(context, {size: [100, 100]});
+
+      var style = new ol.style.Style({
+        stroke: new ol.style.Stroke({
+          lineDash: [10, 5]
+        })
+      });
+
+      vectorContext.setStyle(style);
+
+      vectorContext.drawGeometry(new ol.geom.Polygon([
+        [[25, 25], [75, 25], [75, 75], [25, 75], [25, 25]],
+        [[40, 40], [40, 60], [60, 60], [60, 40], [40, 40]]
+      ]));
+
+      resembleCanvas(context.canvas,
+          'spec/ol/expected/render-polygon-linedash.png', IMAGE_TOLERANCE, done);
+
+    });
+
+    it('supports lineDashOffset', function(done) {
+      var vectorContext = ol.render.toContext(context, {size: [100, 100]});
+
+      var style = new ol.style.Style({
+        stroke: new ol.style.Stroke({
+          lineDash: [10, 5],
+          lineDashOffset: 5
+        })
+      });
+
+      vectorContext.setStyle(style);
+
+      vectorContext.drawGeometry(new ol.geom.Polygon([
+        [[25, 25], [75, 25], [75, 75], [25, 75], [25, 25]],
+        [[40, 40], [40, 60], [60, 60], [60, 40], [40, 40]]
+      ]));
+
+      resembleCanvas(context.canvas,
+          'spec/ol/expected/render-polygon-linedashoffset.png', IMAGE_TOLERANCE, done);
+
+    });
+
   });
 
 });
diff --git a/test_rendering/spec/ol/style/expected/regularshape-canvas-linedash.png b/test_rendering/spec/ol/style/expected/regularshape-canvas-linedash.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0d7f51993446fd3a23bf6bd026235ab2a6290a2
GIT binary patch
literal 819
zcmV-31I+x1P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&0008|Nkl<ZXo2n7
zO^DT17{~F?%sBZH>iB|blvE4bXbf1QU?G?m1v*+VK^D3*6Cnv~RVr=_OcFOLwFwH^
z3_-bYt001_2qeXwU@uU)Zc&Tp3^QEsb^ibVJ?F~E{lekQ+;h(JoF8+}bD#4JeP#!P
zSW>YK7Vtlu`jvR58$-MCSH(7tTUgMILk!_*Jc}`Wif{0XF2&U0A1rRTb`US&Bb>&M
z_#9v0h!C@?j=>>((r`0XgbazJIE3XbW1Ddjui+IuAq1YnXLUETIBlp2orFAwrPzWu
zaTX`=Mw_|wP2CMb%t`EO`Fuul3z>rhIEU}>6+XaQ6>V<DPk65GW=i};w&GvBgQtYJ
zDhy-0xHGHkZl;6~BC6fP%Qfshjx+dJ+^JfW5<-aiTSTWSjEIZA3j=jGQ&I?V*$-5-
zw;ey=$tIgAEu<=gBC37u{xDsMZiHOIyoPJru>+$`7k4A1314Dk3B!v-?$j&B)Q@JB
zSy#g7185hTYlqvJIHy|n`=^GNGBI7uGI2i^bz$#5=BoA{$>DTT%s4J!QwEz4jd79A
zoEM4atmajGD6-~RPu0Y-Pdl#4mzqrH=K?l6vKH5|w}9>c3fSz(C48Iu-1JPy3h`yQ
zJoPIw+wYl>gQ83$^#?QC@0pOx;-Mt<mowWhB4i=fV0~)a@Q0}q&2ajCTN-~pgU=#D
zPT{7AP?POY%bY{g#;ywSMEUbr1E1N2?7_~4Ysc^#_BU9YUC1bIi#lx8YTt00e;Y40
z^jqX;jbK6?nVE`ZtJA!Rw62vKVv|)`m9;nONr~FhVf-%MAnjO^#t&;yi)x{0_+2WB
z6P>Ch^U`>Zw?t7P?};PxASUpB246*me2;zU=K)b!zmxjOqqHy0>y~0d=9<c>R^cM9
z;q}yCOrMY7-3<PU2^qx|@y&e~M@_xt=7|3)-NoCP{1p>2ATIMtywG9J2K<WS8T|G1
xJ<^T^A}{Nfhb|-+kBpF>zS;Zq>C>n8{10!wsp$IrzG?sf002ovPDHLkV1lSUk+=W=

literal 0
HcmV?d00001

diff --git a/test_rendering/spec/ol/style/expected/regularshape-canvas-linedashoffset.png b/test_rendering/spec/ol/style/expected/regularshape-canvas-linedashoffset.png
new file mode 100644
index 0000000000000000000000000000000000000000..3723123e3d2052c5439767c69ab93889115142d2
GIT binary patch
literal 831
zcmV-F1Hk-=P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00099Nkl<ZXo2n7
zPpFke7{~F?@!qRt;=fYsMunGZVYJYsBq@r_B8p7X3oS0WQxX@s(47lcr6>_Z1-6NT
z+SH<gS_Lj5XyryK?z$kk*vf^A+u|AV^!lE2&pYq?o}+cXFdUe7o@eIwo_U{nW`;30
zH><F&Pgz!Izbw_SYIqz|>9>OoRgG8T3Ksg5*@Dg9RDUJe*I@$pVKeq%KX%}I++W4f
z8eGmC#N}jPmAi1a82H;bi*N8QPGJ{L<DM!`SBtlsLscQqV-BC-Yn;LRcmYpilbBYg
za3W_wkLDQZEo8#=`F@Qj@fp6r8+Z|GaYv!;CcJ~!N_@0NnUF~w!cMH{s$YwZxYLcn
zqnjQ07BkHab7_9SZ6)>3;cqcrs?ZTH<`qoW8(MSB3NcSrw41{1IUP>mc#h!!<ci6n
zPWT;!s$x319knfl!NqJAi(tQC(33hsemD5azLc2tB0Rs8IhLWW?6bHaQj#JY@VQtV
zvlw=YvZY7;UVJEmPZp!dwTevQAU+UTbr!|!_b-vub@P$(thkBncLw+399|ZpvgzKB
ztS))JLis+W?tWye2pIdt_wj5^e<NiUSMjlkT(>m4@D`SjdLT_u>)ZHWvj)FuChQiu
z(1OpN%wZ94w%~iQ1)n{61SiEQN7D>d2(bt*h^=dr3|$C(Dne$Hj6}#2VnuF}#)Ndl
zrhg`thw)e{&)`@e+i5)1Wjn3<Zm%&R`;xN-%!@GlOIJD4$M&Sio92`KV)9poMyJ+c
z{D}uM?e`@6!x^@Xe<Kh0_u<+gOo=1Vd2G+@cO)NskstAuI8iKeQ4F%XTr6o<Y}2ch
z*$%`}OJ}Cr)HupXwEB;%7hBq@Q!R&9h0KX5GYnc4@+A%w>ZZljz_qE=5!VKFX-&v-
z<vG<x{EY9!t<t*GuI}_}O~`Kigjd~oMKCFDmHxo%son0H{k10KJzT=CB7HC8@$~#s
zYF~%egq#<LW=ox2txWCC*X-}6SP+}wKO<zQd-gG7#*7(0{{U?npOk~qh$H|2002ov
JPDHLkV1l}UoH76a

literal 0
HcmV?d00001

diff --git a/test_rendering/spec/ol/style/regularshape.test.js b/test_rendering/spec/ol/style/regularshape.test.js
index 595421301d..5f65b15f69 100644
--- a/test_rendering/spec/ol/style/regularshape.test.js
+++ b/test_rendering/spec/ol/style/regularshape.test.js
@@ -119,6 +119,23 @@ describe('ol.rendering.style.RegularShape', function() {
       expectResemble(map, 'spec/ol/style/expected/regularshape-canvas.png', 9.4, done);
     });
 
+    it('supports lineDash', function(done) {
+      map = createMap('canvas');
+      createFeatures(new ol.style.Stroke({
+        lineDash: [10, 5]
+      }));
+      expectResemble(map, 'spec/ol/style/expected/regularshape-canvas-linedash.png', 5, done);
+    });
+
+    it('supports lineDashOffset', function(done) {
+      map = createMap('canvas');
+      createFeatures(new ol.style.Stroke({
+        lineDash: [10, 5],
+        lineDashOffset: 5
+      }));
+      expectResemble(map, 'spec/ol/style/expected/regularshape-canvas-linedashoffset.png', 5, done);
+    });
+
     it('tests the WebGL renderer', function(done) {
       assertWebGL();
       map = createMap('webgl');