From 311c9f949df32012740c2c6940272d4c920fcb03 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 30 Nov 2017 12:10:43 -0800
Subject: [PATCH] Fix cross-fading of *-pattern and line-dasharray

---
 src/style/evaluation_parameters.js            |   8 ++
 src/style/properties.js                       |   3 +-
 src/ui/map.js                                 |  12 ++-
 .../mapbox-gl-js#5740/expected.png            | Bin 0 -> 11496 bytes
 .../regressions/mapbox-gl-js#5740/style.json  |  72 ++++++++++++++++++
 test/suite_implementation.js                  |   2 +-
 6 files changed, 93 insertions(+), 4 deletions(-)
 create mode 100644 test/integration/render-tests/regressions/mapbox-gl-js#5740/expected.png
 create mode 100644 test/integration/render-tests/regressions/mapbox-gl-js#5740/style.json

diff --git a/src/style/evaluation_parameters.js b/src/style/evaluation_parameters.js
index 26cc2d375c9..78c83e7f6ce 100644
--- a/src/style/evaluation_parameters.js
+++ b/src/style/evaluation_parameters.js
@@ -24,6 +24,14 @@ class EvaluationParameters {
             this.transition = {};
         }
     }
+
+    crossFadingFactor() {
+        if (this.fadeDuration === 0) {
+            return 1;
+        } else {
+            return Math.min((this.now - this.zoomHistory.lastIntegerZoomTime) / this.fadeDuration, 1);
+        }
+    }
 }
 
 module.exports = EvaluationParameters;
diff --git a/src/style/properties.js b/src/style/properties.js
index 0ba5774239e..44efd4e1ed2 100644
--- a/src/style/properties.js
+++ b/src/style/properties.js
@@ -607,8 +607,7 @@ class CrossFadedProperty<T> implements Property<T, ?CrossFaded<T>> {
     _calculate(min: T, mid: T, max: T, parameters: EvaluationParameters): ?CrossFaded<T> {
         const z = parameters.zoom;
         const fraction = z - Math.floor(z);
-        const d = parameters.fadeDuration;
-        const t = d !== 0 ? Math.min((parameters.now - parameters.zoomHistory.lastIntegerZoomTime) / d, 1) : 1;
+        const t = parameters.crossFadingFactor();
         return z > parameters.zoomHistory.lastIntegerZoom ?
             { from: min, to: mid, fromScale: 2, toScale: 1, t: fraction + (1 - fraction) * t } :
             { from: max, to: mid, fromScale: 0.5, toScale: 1, t: 1 - (1 - t) * fraction };
diff --git a/src/ui/map.js b/src/ui/map.js
index 10472067dc3..db970383bc5 100755
--- a/src/ui/map.js
+++ b/src/ui/map.js
@@ -243,6 +243,7 @@ class Map extends Camera {
     _hash: Hash;
     _delegatedListeners: any;
     _fadeDuration: number;
+    _crossFadingFactor: number;
 
     scrollZoom: ScrollZoomHandler;
     boxZoom: BoxZoomHandler;
@@ -270,6 +271,7 @@ class Map extends Camera {
         this._bearingSnap = options.bearingSnap;
         this._refreshExpiredTiles = options.refreshExpiredTiles;
         this._fadeDuration = options.fadeDuration;
+        this._crossFadingFactor = 1;
 
         const transformRequestFn = options.transformRequest;
         this._transformRequest = transformRequestFn ?  (url, type) => transformRequestFn(url, type) || ({ url }) : (url) => ({ url });
@@ -1459,6 +1461,8 @@ class Map extends Camera {
             this._updateEase();
         }
 
+        let crossFading = false;
+
         // If the style has changed, the map is being zoomed, or a transition or fade is in progress:
         //  - Apply style changes (in a batch)
         //  - Recalculate paint properties.
@@ -1476,6 +1480,12 @@ class Map extends Camera {
                 transition: util.extend({ duration: 300, delay: 0 }, this.style.stylesheet.transition)
             });
 
+            const factor = parameters.crossFadingFactor();
+            if (factor !== 1 || factor !== this._crossFadingFactor) {
+                crossFading = true;
+                this._crossFadingFactor = factor;
+            }
+
             this.style.update(parameters);
         }
 
@@ -1505,7 +1515,7 @@ class Map extends Camera {
             this.fire('load');
         }
 
-        if (this.style && this.style.hasTransitions()) {
+        if (this.style && (this.style.hasTransitions() || crossFading)) {
             this._styleDirty = true;
         }
 
diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#5740/expected.png b/test/integration/render-tests/regressions/mapbox-gl-js#5740/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..c86291d37b329589cd6519931e9c194adb02fbdb
GIT binary patch
literal 11496
zcmXY12RzjO|F>QCxQw$ST^xxsviHhJA!KG<b~4Z2AtYa9kNYAdD<pe`uRV@rhwQzJ
z^Ly+6_u%f_!^gcp@Aqpw$1D1gjv6Hyj0_JCk5WTj`7wBwzy5)cfX9*-FXzA$frhez
zz7PHuEN~PL50Q8M+jg6`hmCj0o!`5=h5tPuHP9$Pc=CJX&$fxh6WPD1Y_l<15bC3e
z<f0&CXR@=izk{gev39a%S$a+HC1u?(T{fuTP*bH@`7c=ss|z-6H)TDrNH?d=^<=j$
zhZ=VkFF%Hzni7!`7cX;g(~*G2Tx_2<A9iH8G%ng<+AMqRU)gZ6cmHr8h(i-XRoa|t
zI49VZkP{^FOaJIgX8rzc5wOW$-gNT2FWI5y%_~-_sKb+Km!?Ch`QN`zGj)n$%dsE2
z&IlNOEq%Z`1d}nnA^EJ#jf(5CtTah}T(5t2+;n=iVc+uQ&z*G-$>>)S@ng=+>_1Kx
zTz3MHOpr5MV>`pt6xy5|H7<)_MDKzJYhxhCkLUM&{LKxZD!A=LCD)*1$Dreth_0>&
zror+`$PyAp&U808^!%tucE4Uq4&8mn#H5`TrEky`0pa2dU)W2;L|x&!uRJF6xYei(
zOR;2vKP#rQCQSpde_C)g<^HeSEG-`y7<?#+A*WT8hqN8__aDu+d_84s3EEii9!=BI
z#4ZqgENm%vUFeqkx*4=J)#P`tyE3z+<O@wmB#n)5+R@mM^yzre#nI{&gN4!iC!$~Q
z+8T0^Bw=k#R8b~^Ek~pLu3vCr;*?ZW6dBsQ)gODEoNVU&UtMh`NaH#?=<V+eLLU}{
ze$W&B0vTD8&{=hFn0Xc%RX6XoDNwgN+py}Mfpy?ce_U@Wi9Y(iI4^g(wG>6o@!-8y
z!MiwB%qP@djwRBrdTMlfZ1yTI!}a%G@>BDd&Js|HYFPHFW73ncq<dR_>-A5~1Gc-m
z3c7sCzD?Rt3brqp!P6aTOnO%j>K_-I(h=!Bx~bCjpsMiG^*jD~Z<CN`BKq1*BOg`|
zBmB86dL}pHBJ<lG#1xLuz*Mx&I}ZIRcNIsWWD)*isY4SE{@N+GHL&uS4<&pKeCejL
zIsB>owinDqyY1WVzOrX+r}I7?o*a#p4GpE!;2kaAq_l|-Fuf;mhQoCaUeB%X`_?VZ
zyW-xuS~~IKusBJ<=fY|IQnk+0zN_6kXUluT3l-f<`#+ovSuptWHpVHM1@14bt+_=4
zPqxnJb!CsgXSi+$H9bQ7dP!?SAE*4I`6y!O>NHDgzFLHdBAnH$L8*u<{83DPkEpg-
zYTvgd^22*A2R|Mr$n7t4_v$-PGUnyoh*C^+FL>NeJmXS#`YPx0h*9paSJ&Ug&CRkj
ze#yVL^J}1&U1ZGAK;lZ5?Yr3?Vb!p<nIEuYZ;#L2Xtdw&)RYv4(RB~a(FNAnDW|62
z8>MrnajyQy(|+E&U&mKGJ}-+^6{Z!xKnHrIAOsL^m(lMEA+{7mmpeuXhV`ADotw&f
zrbb3@CO19VS1Zy#4Gzu)o$XU!tprS(AL7&{X3R^+onrSTq{KxY3Vd6#aTZm$5f?eQ
z;vxCmxh(I~&L@|I?j;$KK(CLFi~o6v4@<u~AG$hA8Y}A7G2lzCDtXypnmrV7GG=k{
zUCs5%M`&SJ>*GiFG5RF+kDs1%Co6DS$QK(aS3XkaN>$@citJb)_WoQK)v@@<M>Nq$
zyI@p9<DGJB*Yl>6AEk18EB68x`8x<RyrBogOJ{3Lh775RIt7n<R`vLxdVDG1MdIvt
zyl!_>9@u_ujp{QZ1?VrZ>Bs1-Rb)UwQ%1|5?G_wP^r^+MtTD7~31i>$TsnUFhot)y
zBIf*-X4kEl2m<h$NWqezEx4%~!~MK^iq+cwn_4N>fp~Rzc*bw&9tVwRcYKZnUrfH+
zbd>AmT9Mp&^bj#2Zm=Li1?`0<VOgi((F+}MitO7CX+tSv%+>1k6^kD!mzhLhT`*Eo
zQtg@X*7kOGMPut)4y%4%TfZ;t<qo?}x4t)vXAHX0FD)58{Fpa5+2+nFZO(x(WZ}_J
zu6e8g{zJjz5S?zlMD@<?eV@!;8;1b2ot-cZB>ZpGb(Pi4TqL5)3OS@aVf?WV;i>=S
zqF`Q8<X%yPP_7RKj__1X@crm!#2I1W6F)yh`=k#JR4Q(XsK{TW^M7{aI)D85VeYfv
zB{vLJ30m3=IxlMr8F)s=UpljOL;*JDjVk>uXXmw@UA2E}D4Q*5#G>d!Idct*b4~e_
zXkdH48?}(I<D9Ham@aS9rnqU)>_FX&|B|zRjh(ENZ2S?L45{70L6+xjiC4DG1_@Vm
zLrdf7@72KgR>*v^qk5eRZ<Xnh4jp2b?&z@X?rzQ=4Y>MmPpdY~-ADg~rZA>*J`~Pm
zr<U~d8=1pKJbFkzBP%D7MMasdR`6K0<}tB~9uHj{%s+h<x7RLWm(*)ohAlxNEq-6D
z?vN1?))p71^*$0Bckj~{pUYn|nm_8~5gTP5Muxc|V?xTNX&?~_A{1J7A_R*<M<j$3
zhK8IE>HaGa-l8JCXbXN}&7JYwIK^*wCDm+X7W<$PYSGzl${J2%wC&~8uuS*a+cT^X
zzD7ZEro?6R(GcqHt6zF^+`+(&l{~1moKPL}_8v4clBCYm@7RDttE|lWX#6g`ia@8R
zV_^d9=sZzU7lC0>Sl?3Q*mfi*q{qIR21W^qBk{+V+ur{YHzraoQdw)%eKu8%K_bP?
zPTLw31+3gyi#FHSH?}u6wsby~ZPN3XqQ+S&j1X&U+bVE61<B;jnPr}sa{^YKJ2U1S
z@1lwLR_LHA_<4{Sc5ws)IZO2C&nF(<r+iggZ-xdirhH*565$v<r@5+|$&YW)+kbm&
zZUIgua(Yt*1n~XTFgS#hQ|KAOt={bO^!CBY@yUtb%%{EOsT-iepbpM1nSL}AhSPM~
z+gE)34EYe;w~fz5#IlY&Goj?ei(guxCW#)g6ms3zojv-#q$}GmUtOCXTvEcs%F1MT
zQ$;jQ>(|ydk~0TNZPjXK-fH4FG@Bzozr?EzXg>pgV+da8qR@=_y$Sl#U<7y4f4PH`
zBNG!p*eT9BRFiruYO7-W1*3RVY!}_W=E8-=gkQYLk)>2gv8s^*Fu<yMI&X~SQK_LG
zU-BaabeMkQmFx6ZThhL&H*ih$Pi2eJMbm_lR*w+N_r*mcJcMuPL9M*&Erpn@DyQBK
z*>OP#9&c(;P*7J+*E&z>;1N&~YGdZ)lcsEhm6RNn6@n3csCTz-RPlrqzF^Ykl`s_q
zk8Z4_ANXK#B)KIhIwJg-eEIUR^#>^{Op$rE8lmtQ)MJC2`JBPQ^5x>Kiyn%4P$miz
znwU^H<dF@t_B$R0y4w|qzW1U??I-?ak*b)G!*Er?nEc=+2_q-5*ZGj7DFU$GBwO|T
z*SrRL!zc(R3>1GZ7>Wr6k5Nqe7@|tdqzKOsDJg;9jO}rD$}K3PtQ-`SFm(~4Agr5=
zl^n8mwq>qDV50Nk!FVyM?`*+~{Ja}nC<i1=y{ug69nV>)!q(S|rbh-hUCJ4?S=ONr
zHGJvU@J1fn18WQmrXdS{Q#k$u=78nPbP<oN+m&xJkHXr8&E<Cgr^tTp#IULdRY>~y
zcTN3<<mtjJEX>CAWRamH7`^Ta1h^k?!kf_sK7@hcxAcfQtN<E9XLa{?8vjE^3|{kM
zdLiH*`I2K-H0ytQNU$Qhr;bSoOIFBiG!(tK!_L?5dYl|{(~#w9yyHO(4sc~@DME>m
z>mIBgXtpzSQ?^c#2s#e?{Kk6$JCKja<cBJq_Jw(4>kDr6@{o{Qed@O-E2}<3nhllc
zwa0|g1|A`cJtT=~koSi>e^>()Hz0o6Vm>+JKNeR<6pC-bo2FPhB0u(fgU`m8M4l#I
zb>ze3eNowXYts2|5sHgKTD<h}tWvU)0OwW*Oi!>mkF1H64@E_|6Kng|#BjT|P|}c@
zH8pWUBf8FgS>=$SkMn{LGX)uE%&8|PC+N$s_TwfA@q-pFcN<QAP1K5I4z9eMTiaiH
zq<{00FihxKnfmP{CYeCizI}<oF_xp(%G@+WdHeqXWUP)H78+Kzb_Q!s?9TC#$mv`4
z+MTOuXsGU}L)G2N=~K{yB5mJkum=3Wb7x^$a1_my2_R$4XNI+<&`_vypKwT={c27%
zpX(N;5J5^*46L47`C8F}=+HnR-PQ)gTPGcI;biu@If^xp+kBzgZR=ibD_%>>Yu{%A
zsHHuI7FvJhv6Q#${8E1gU9z@*t9)ZME=M|AwTY^sBRaW@n1}vGrWzz<#6}T58fsGZ
zZT_@X>69i|zC*s_Wv2UC&j^N|p5Ff8Tyf`n<x+Qhp5?y{<&%O)n9(z{u#yrGff1%u
zMe*z)njb-lL0Cn!33RyC&%V#f%7C%4NXa~S;QMQNee6#8*Mpb>O9|-q&TiN8nem61
z7+#HcLg)*obRNA<-|$-~$Amo5iO4u7G2fq^y-P_+NlQ>Jo1^}-wL)BT8(V|d&$S*a
z_55&N0|VNeY?3^9PZfoM!H6;>WNf>$b&nHjutLot<7MOS?#>Fpfd5W)4(_M;)$az2
zjI^vQI?>JEWwfrYu7#SP-*<<)k<elJ0{zIpHxPqR(t~EIi6A5EoE7}+Ns06jms^Z2
z7YR=-{w(#axYz$P#CTvAJ0&cQlvr@Dmq;&6obFLHFhJg|qEJbB$*%GQwYw#+8^qy(
zmbp6UE8l52ZT_<hBD`2~Xp%fa5m(iBV!m^XKITojF%?JI^X?6=ie7Gyu)cu`eI7(w
z_8v(j>Ea2xp#J=9>ojQ3d*0Z@+*}_yJUomLC`UATF0`@$R8OTXm@^~*zQQ~5-0bbu
zzHc511N0Dniv~sjH6R`k5_%@^+S9}GaF0__K!8TM@~HgkBq=EHpty+RA@7sTk`g|w
zNm<p`bR#`{Pahvt_2lXb2ycma6;K*(@pD3nn?{0DP(%S4;#?CWRFSsltJ(9X<M#r6
zPlL3yhqQWN;B1d=+ygv4Jy%9$8cxyD>{*k$+^QH_P!iwSAYV$dHOk)m`UgFNohHnf
z71Ytu&Z^&x3c6}iib`Pp2PqLHZ!MOFxaNuEOh@RB!K~e>SJz0s)8MJ;%eYyW!-*1u
z@pDPg1tG0M6d+|m_}kg97P9-S)t$;6_gCxk&^hwIBUuI2*VEI>Bj{{`dNy#njN_{e
z-HT`}xVS{Lr|J!FOraGLW+?<q)GT^>wRh2M&k?Y-AEnkknCXOaqbdOF{KWF9VJBrM
zXh+0iZF75yCz|eAsUcU)Eqwz3R2DoW-)pJv9itZ)dh!TceD~^3FZbibEy}PC2ByIa
zW}q2ZtNDF=g>rNA={|9m@&?$jx~#0m3^b9O+Qs^U*~}aqvq1|B85nEpBHb)@nfl7g
z#6(-;b`_(P6$1PqHy@N+UrOF$S%bHQ`-`BUdETTE6oI@?cKJYmzfJ<H?7_)C{hfp?
zb~c&%#>T2~6mkRb!0%3Ce*oo~XbTC+lWFialSE1gZMi>~MQV$Lav}|%((`xgWJ;hx
z!X}Q4R6YSDj~?q#6B;Yz!zev8Irt`r?f>xlvYQ0-2FZn0yzK*xlmhnx)3mg#jH%Pn
zzCXNo?hL8JE|~M-WPN@7u`Dc8T7nrv#9<+Bh>3~3$#n|lj>*mAmE`1tx)TncS2oMT
zA&QmnyL0j!$Uu<CiO-`2Dr>XdB)2}H9C_?&Ot!*lO1L13d|5hda)AfmAKq*EdM{D^
z<HAtxz951j*7F)(e_i~&=@R%CxsA=vZn{4(`xrSYgw$q1E?NpLANyXO1EN`m<%=O<
z99j4Hz4Pf)HjpN8N}vv>pHfq~u%Gxg$!0}5<iF7DekoZF_~4%ad<{S$$@57V^N{Qb
z-QG)-le6xZq;hUc@odxHswO74cqu!;N9aLID;-1egL-nOhR0a|y;RJ7DZx7EFPqar
zjIgU-Nq78&YXz*Rr`x;P{*Pdo`7WFx=7T=pTiY8%M6BIyc6A*Nbyl{Xp8IL`S9{}O
zEdgh^`ucNbJt%P|W|D%6!s+}h%iDh=VAAvuzr34`kKrNwCOM7DjbO4!E30eZW2^^H
z8Fk&6zv_+(I$aARRioN22SJvp<aiMnwD%<E%VBlh?C-qkXU{O({x#pAu`0+7Pk0GI
zdcGAh&9Zu$lV9`vXzhEi8b{E9x30`(|5DfU%3yL({C+2KTwPrF``3=3#`Eq2^j2El
zym4uP8)a-h$Yz^9J;0{>-fez;Uhj+OAF#50!R#1KB)m>hg5?9PUp8k*R$3Z~CvOJ6
z?m}ZgPS|AW6mhV_W`0i%`EQWd&AA`4QD{F%WnicjV(gyjrvL<?qBdP#GEEtv(Z5hb
z^!WJ1>&uLwy-9Vp)+c}hMv(*Ip=~MGicC@SNovqOWy36k`p1vM<cH+%Gt#<7+X(=h
zQU6rVox=|RWNYO|!3lQqQx9)XhJy%2f2)_~G~pzJd3nAY(P~#T3HSPk1_p-Is}S2$
zO`D^x{+Ffm?CjqgxdBPD@9qZ6QUk0*TSN#JXURn3*&IKk%CH$NN<$!FCg=jH->b53
zPgj4f+Q)W1&TA+wU9HYJKVo!kS}B~~ly-fe{=Ty_?IrZU7mr94!z`IamCu=P1m~>D
z281!H>$xo&{q@;4RfBV&tZZFvZSBVR47zWC<9tHA1t*T^Gx=3$-}Aj!&t~+ldOlIp
z9A1+-wThnJ-PA;l0zCvYcWm>6`oq}jpeGi){{B{hc3xg&pkZCC?FR1Yvawah%QaT)
zG8-RewctuyW~==s=M<YQGnqKl&@#l4R+iq9v@Xsn$O)>{Zo>3DE;0geVk~JCsPsrs
z&`mHS!&A}G`^m}JmA`qyarIqIu50+8R}RnV4n?Z}as-I#t=FDj?TnDnv30IKI&gi2
zKYl*EeWyYM&{u=<Nk_GKcBz@MS?r(7mdgwd-=^&0t#RZxoj8EunBJ)R5Gs7Gt>gYa
zN>JTJaFb72K^`#Rdi}^=oBVbGt5-ra5ZTNAS1tC&DfFTgNdGcbN-7Ep7iRXklp#hk
zB_*W}M2FF;y*<zdMwU;`g(^H*O!D<WH>U}ewWV1q(p@|n!Mx?U@nnhK%}@HZvdQxf
zrH*ISQ~oYKC{*m^64ijt5T~pZ>4)Gpo6gpWvNaagP@Wjn1`BKF#Sv6BfkRC;qif@U
z4B%QZYD#ou6iJ;E`0(1|7S~ta_V&5}o{l6H0lo@PS5?!c7Nd3znL~w_zyTpov!S!T
zqigwqUG2U_>v$(oBYsQZb(!zm+Y=*rOGrxHtfBO3dO&=3<@j74@<IDDfG{j9gY*@P
z@z{Sqh0kErVI!|UH3xc}oaCGGS$X>2sL>=Aiz38XLi)&Gj{CA-lLRA)Or5nONxC>?
z6H-!f>S~J3XYXS%Z->IHjEUN<wi=IwUxx-4oJk+lBPe+3{X;m(>ZM~Mq<Qp+w8sE{
ztS~9-T=)1ANkSU=%%q*I`iY2o*_{!aR}vMQRee@MX>YZ7-fG-dfD@#4lPf|-H#Y%S
zrBTckXIj`tL;8eg78Y7l<fO0K$0(5GhcAz)oxaUA`3XKnij`tzr5;3R7QErjn8j}x
zi#Dl=N$b6lDT#*K#okOc4-f?$uYJUD`PBn>OlYSAL1jGE(dnskOxF)dP%R&T+~Cbp
zOwuU|lVb|a?=dnnZ+}+aM52;X`KRe=E~bHny`0gJzYjIO*|X~2<KmQyDUxzqN#1RW
zv^F+`5+MWxe>Pe^BsYrhP?d~Wic)>6!#h&_f}W(-C9Lat#Mrh%fvIX%xiu(NW-_xg
z*Lo)9pjB=$)&W&zTqcHM(gvByqv1n}51Aw8k|=MR<mwaFQpISLk1-pi*z)KpV@6tY
zXlNAo>}d%ILV5LQxR69{u&CLcT%>0<sYU6cG(o7h5=0>>AO7J``t>)L>ZxcF7>PFD
zoC5O8+ZgYE$W%Z*2!Hkrpc_)KL)V;{D3_0nuJ7SBE9Apj{Ck6u7Uucy#AM|QAErfh
zXsVf~D1dly7;(`USB3`0q%2pXD~IOd1{V?IGhH4|G6F#SYt5?2YaDLsB#<(c-kkD)
z)yGi`J~3zv%Os>EjB7*5KPfg9ybDVO#K=Q3#g0imACg_pRi7eXahn3rVoWcQB19g-
zu)6wo{(Epf95uS`3Bnlkd%&?=#4@xgI^IjfD`j0%MyG$D7@3(UOZ<qLIPpT>N5n3h
z5Ud~bfb7>s^o6b%LGs}Y4-4qJs}LPRR84Kc4)vjh&t;=lB8WYXj#@d$6bzul$hgOq
zuWPV3_4#iiL7Qt*pf-4dNRE++3N5@11A>BD0=ty|-a;NB0L{zCzb%E+hX3Uwn|Nv{
z<n@!NDviP@9#96O_Zc0PiL|ftUmsqC;Jr~Lv;%S*H9PB6OI2f)Q>DqGd&9`TC477<
z!tn`jENx%XQh?=2T+<XuccQ5{3b3b111@15>mcAX*rX+@g0}k4;C)q)n$HW;#wqu`
z4v2mg7J}_HidU+9)Y`cQXRx!+gOjCuNV0|IaT4i4=K}p~uG+$)r~t_sgT;o>g#MM#
zRR#*RFEc_FS{!YCZxlSIEh)(#L0vB(CZBU+ia2}q{(Us8KoNgc4;f)8K?HI=u|sVx
z(D5on+_h!9!+XYUmK5C-$T30h2&hmDf;*#k;Vh39C`Is?_T{wuAT+q5Z>59u8QTu+
zTlxk-9wU3;a%B{{p~3HTXDYz=vuMouIy1nqg__0T`(s6%F$7Ltq=u=f70?9C;34W(
zc&nxGE!Mc)Pv^6k1R3SMI}}KUQiHVYv@{w2v!1p_yNj(U5&V{W<3A?sJ{dUnINRiv
z@WGBHfr$dN6(E|C)w2$ALlr(^*vxYni#^cCXVFRBs;X3MYdafT%^thi`~-Qq;&qiF
zK+pbALZ+hkR=emvAZhXta3$dO^jt*E!5oX~<QvDTfgW4^>xqd<q?!efU%v45<zj+-
z_B=hcL_a61;=vT_!!6PNtRHovObQ5^4LhVDK<pWwo5Ii1xs%DxmLVbGzJ}M90~%jf
zYRg&b6|Mz$+R_~0W)oEK_%44;zL&T6v1&eTIS^H)hr(8U<%t2cw<yaWJd{YtzuPJK
zV`OZe6tI*#fmcVEp_Yo>shXN&1C6D_^NXe?88(L4WLg#4mB-BB6r;<rtxroI-6Ylq
z4i*PRZfPAURq7K7^j2q&67|(iNb&l5b!epZgV_`3XLa>6E;@S9e>87jAA>3ezu6=L
zbQiGmc6FHQ2J*yO!w1QOA8|+aEoZ$W*4<QC03DIY>-xFBpw!Y-r!UB8pe>wc%BZa8
z<QP}0e2caYsHYO~#P}gR8h|cCRTNx@J62D*e@w&-X1lB%p>g%Ar!vQ_VbrryA|g_^
z`>ON-d<94jaLr5^nb|V0s4S}oR7h<lsLF>JG8zI<dOR9v;%jr8O6jlf!xMe9cS$XM
zws}cP)eHbPh6@r`b9^kSQ#3|RO?lEV<C3x@QGp;gPQ1<nqsS1fi;@tlGKhh^6b4`J
z470DhIMSfY@4z!@2Nn*%B3fEHSpzo0cMS-y-JW|0#5ZCEs5E<m$SBMc2-I0q&qJ_w
z5q;YLa;R`Zl^y*k$|{-uTlw#IUwPx#UB;HiKXTsy<8VRc(*EV$Cf45HodLGE8Lg_t
z5KC+q%dC@14jKY3mt&;X@N;dqJS17}`Z)gHMyh$>afExlX{hQ5G`6d~zklnWDW}?S
zMK0aXWmu=W>ATfa6b&8t3EhOQtx;|~p|vMWAI1EfWo6~|*MN5Ee&x#k<xWPQ^8x`9
z`IiEXZ+ZsGHVfrw6;AkOmlOO8D$JTXGM~IAJo?_kQ!T@X0vQ7Wta82wJ>-APFFKk|
zXM;}1kNU%N+lZA1(8Bd%avV9Olben3m`1F_Z4dzg@KHr#MFs4RJ6R1Z=l%Ok>C27H
zApi3`fa6<ngrxKE)V|xM@*_}DjJ3Vap=a~pp}$J`WM7-xYscu%!)<O5!GvdzL*gR3
z3ZgGvIsBKR@8qD5dclJScgDcNE#w>^<*P;ZcD%Zo5}wjI_n<Q_sguAXL#5j(>-{sD
zK571EiT?_hl!NON8InD<k<8NQg<ag?(V&~0m@rIWmGOeJTfCOaqIxRC1bKxhO|mt<
z3;eMTwRqOAt8;&LakJbBvPe;x07C$(ar7mHAZn@EWZm7IF1DDP%<cEi{qd7}Q6%yu
zH73r_-4C{`6Xec&WKQRTPTN4jJ4jn}1ciQUSU`rzbB<3=HoQQg+#XuEy0#2$9s?tn
z3Xk@-1|nIr3)qPIqMq61v7oEMOv4Lbd;__*v%$v7!~}z}GP&G{GC6|9<iGxSH<f?o
zaiu==Hc-PT6;N>S$EY`|m|_g3$<gw#5NJwD&#WtJy<)KrwoH*gl3sN5FVp9{d5+FX
zy>0wcv<mU?3nV0RNg|6ALTMU|Jvu&i!7X?1Ui8O_n|fCdZBoXB;_3a9TSA6M5L4Lt
zl2sz5Yb|Ym<mz%P=jsp8>2Qz5G6vu<z`YdPEc+-YExZqb@l$*?F*`NI{h9y>$)LU7
zf)c0Lw!LIcNl9g7_g&tfm&Gmba-=16+ux=f<bqZA+DtXr53K|p$CU^AZKf<b6NTR-
z!mqkTSVE=<VT#1>dkK2%)Kd$;%aw-R`qR}rx>=IEC^z8Cu}#;Sz0)j80&e8+a5|v5
zbGw0m%7ffC1;l6VhBw)IYdp2y=vp2vYiPa6>Dn5n09*-BNpustfPmGNZR&QDbY(gK
zUB+g=MDg@B=_!cXy#u%6bptmuEUs9}C+YuNsd}H4-qvf~{nBfT!j8A7;&a7olLA0R
z7mj_|rt6$%3&%E(fS2(^C9VYA%9K;R$L`!IZeu5BcAh=f^PmRS#FSvYH4emk_O9_x
zo}Y&=mtXnP&`7X)SzB1RdV`;<^^wZ4G%en;4<(_mP$=BlkB6l5=*?E3Bsi&#e6FeW
zy68v<I+H7}|6Ss^S(6@k)Oq(!wj{8N$u-{PmhkDTC}gcBnpkvS%&_*`(My|`2kvIi
z`q4$#bhiKe>2J2Q@8h3y-d}{9e%f-tIB#h@AuJ^tmv~9~)<jnk1qmht9ZP{Galpy)
zZZn>7;(~iaeO_K$V0Et(Gn>?_uOP;Oj<#Oa<X3)%ot0}CT6g<G$Iowb#WCM{&`wv9
z%m-BgGUnUcH@Xz@OZ)f%P<4~Y^7z;^+v2&o7hgBe{-7dpz|M_|azGAurgk+m$G+*0
zi(t$tb8P;T<$AdQOxepoU|m`l=~(-|yb<#;*w*-qv^gM49XoFMb03tTM4<T}*NDE?
z;`NbcH{+qZp{u2pZDwj3b8Us!`7a*kT)vyNBk$K9dRzGf^Y%9LUlR)$SRI?EN+~=5
zO4t~y3TA}m!-2%=1cx5%c{T^G?Inh>v2B~l;YQ4^W@uwQc?}JFdT@0k3oM}Ds3zSI
z7%?R35U@02h*Kqe$CGDLoUe~)U-TGmlW&DV&cbx%4!4pdqC!+tZ0&}2X8ruoU;nt*
z`|rHV+O6+&5R=knmkOy#CW0D=bgU@OFK|B3GRu7dD=7(Gb(9D=g4^A>!xc@ZlOu5>
zc0ltt+E477?%kf4pnnz>Rac{m+2()v(8k@Lpo&MKXe_U^g(GabHq43%sZkYPTq*J%
zCKskz|K@B)8mN6hJXD&lbDbW+VzCXyEkTyoIfT`WU}b(ll*c7+VDK3ToR-sG-`S`D
zr-73JSmSnbboUx_C-yG%7wc{L?%IBnY4F+xzS{=AJV2JbFHo|9f7Eu|{bW399v2^-
z935@XdG=<T6xcm`)2%0%+_vtqwzaM>-^vMqrC<ZT9*vc^<l_E$1#5y53dyNK_ePZ)
zI00pFP40zL;%l*Q%%!?UaPS^yk`C~cd@cg7otWYE<L~N4z{RqvH3C|0;?U|NK?W|e
zTSh4nvo1wP=%$a8n-pM%qxR(VnDSmHV?|>Hk%56#l~KiERUf!O@9s@KzMF0C2w<Xu
zb?_!%yG{5;Weh*vzJ35QGO4&LJ9??C&b%nk_sZbu9Cl)ks&v3^ckQ(&2?4J4x%43K
z<OG)n9jl=D4@oJjS`*rwthQcmHNXWI-Rdptq^{lfAv*v7cr-$XcB8tN?niJhqW&$o
z{rGOO)?sxua3_aZC{UYg$`6q-<0b@Ab7=BDa&n=Jfr<xNfDs)`ApnlFQHcbpEX4ZL
zU)F+?!O?MY^C-UZNztP+{SoMk*u17v@)}L%qIkBB{?5PgvQETB1pEPDS(cRGaiZdC
z^r)gbX0h0j%TkN^(^n+vip{}=Zg3_;QAzCr(-2PNaAySt*fT`m2ZPdUqm`I8loKx;
z7;$*vxy8WBhN^rq)v3ceRBn1m3g!&t8<yoq=c53K`tV4vd@^xp1?cL)uP%WvNU$-b
zD?G_6#~3bIjVf~s=%rhsG@w9#amzL@Csom-A;MpIP7ACstUU8Oo)9Z0H`XZNNPs~F
zdB^<36gXg)iMN@xKa#){Aq8+@eHE1_WhP2BCMvlF#BC`MFh!tK9@ViPUQz;3HXwrO
zHpakC$bFFxW=cM*8bCp&^McRoS&`R6&amGTqoh<Y&_5%<7ed6kSH4DL;;&5rJ~B9E
zY2J(Ucc4okmKsg33!!Dr)X2yfxdrEIc{mYf<n?pGDEH!U?+?J*Ql&5bYuQP#Me%|`
zo|uvniVh>DNLzS%D5Cd+!GAqGle96PTQ^TTp4Wr|%bSwq-=t0TqQ`)aT$8+fI3yI<
zk)f7ICJLzb7)6KtTjJOG!CHLLPP~Mv-C?*8g%5bZW!H=#7%k?3Nhk0|7AlA!c{JWR
zN?TYnM{<Q%Ai5P&e2^=`%r@^d!k=M)j->dG2W&t1Hy(V^;Kq0rArkQsCB^#yNIn|&
zxs;{ByPh{%TCyJ+M^Y6Ll7!&{3)RZm^JX=D5^%eWoW-t}IXQXX>q26q26oNv##V@m
z#;iO=D}`kPy%1T0{{k=IqnK1WfX;x>r6t{YJN-R)${_-4r&Mp$37D15*o$l7KdFl%
z78|3O_nw18PKp6Ygd!A#36rshV0MW2n`&ik73g+gcR8bP0Y+Gfl%v*zj&!=SnzD=Y
z44j=!RqpRs+vi&4zKHF@Q`~EBPR%Yw<tM7g%F$GOD&qw)4!9K98av)QpjYK@Z-cDh
z?fwR+*^;y(ZMaFhP}-aCrw7rP?t~oa6WpoUpOD!GFV%p+dw}`s8$`e%M(?wT<%i`Y
zAc}hL)84lNwQ2+Gu_7c>@D6bO?N*l_0ugtMzOr`W1cz(RLp|fC>*K#ZJK(i*hKC~h
zDt<T_S(tSJ8+KVtY>$fI|HtW2fC7o=($E0!JFa`xKqUR|U>6v;YPeR{8<%CK!*G`J
zPX&`773<^Ogfqszmz0WElqJpMvh;jGyGpAFw4p`vv$o022!Igd8;=f3|6By-T)oSZ
zIyoc6f9USaR_{brQUZ>;Ut3#|PK74M((@(A%mp^0iXYB<q=dQ5wPN=lc%GaG+>;fr
z@Eu#|mIZ@%7x*oG97o*sDd7M+X(H|^r0_5e@Y;wlLl1p3izYW0sYxuoCH@5?XjsOR
zrX$w2oJYg2^LylgdZ;TPDDaIwx)WHa&A$&!glk|g91TpYorTi0I6);aEasFI3Bwks
zTw9mG|0`@85K7njd5uj~)w*?V(?ut9t0l0(K->Rs$6a&wvZ><17PwHuzyJu|w`4^K
z6=;Tmb%=FPQG0sFKO|UMTu!_x2r&8U&m12=>MRA2P<TM7ePKdi@2oMG8Mb<RlJ50T
zfA0ICB{rgAmLrH7_u9s~;ll#=o%&S^A2Hx;eB`C$2d>=~=r09w7k`2-0`081%N$Zt
zQW#~}>*_EVnV-~WfP>O1(BRz!*0FXtjS%8m#Az6d&jYThU(;yk@_1Sf?jlw0f!9SR
zEpXf@;}HDrPoF-u=NbKpOw-mcGbH2!P&Al~Mp1qYNuf&kQH<p)x`FnEbFv7_RDl|Y
z-%oE{9Im(<VDu%?=$aa3S6AI2KfnH6w+HJcWs$rp1|W<fcrp2{>mC(G0;p)!;jzim
z5_ueUa^C0I0(U%r1w1UqmjLA?a(7b+AOr{bVJJSV!+HPN)cuBm4OBu+ow5mrBxhc?
znl+X;e#sJ<2B6l+>||KTqSYFuYM_@(;IG}lv(tIMS63l&6JRz0d8~?Iw=l}Qhx+~d
z54r=W#Q%!^2aGf@W)ryrtUAkA-)T43S_|{=zsRt2CF_*WTxF031^_14Xb%{XJa=E!
zKZ7=pF&OKjIv2J%S_qMV^Y;CT=QVVSc<EqnU=#Q$wDF&FU0=!NSBe#XJDi%d2wKAK
zUM=i4SEs8ZmI%Pq;p!pr&RLJMci?jEvt4i(T^?W%!Iminm8*vY7Mjn%B8ZubzLv}K
zAW7eiqkVMK;L<II*e>)`0YHogsm*)yQ6!{Mlq5|dV>Fb=5>*<NyiaMFndx7y#Hr{0
zTr@N00JoUs3q*TN%U(_Gbl(5;+5CL9<D_}1YSEI%XA+nJ_X}9M@^k0o>xemd3Z@$w
zOG``pzChZ7LME5?&3wE3%Imi~IKEm>PY6i$!;F(Oi=LD>9{h+smDwAXx%R~0kz8>A
zV)Oz?(kHrs7nq#pga7zHRZcs3<pYM-1wiW5RRf5EwQKXT>-qhJtI$t?O(e|X5_SC-
z2zMJ~VK1Vq(qTiB-@1q5FLCSk**;eD4~Ia?+`M3h;`$)?KvC>@fQSEr0D_~YLDCXX
zJ|KmS5(O_@QE(B3FR&?x$$@8@3ya;2D}1TD8y~XyOf|viGM<Ktj`Al(%h3M;IUpqF

literal 0
HcmV?d00001

diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#5740/style.json b/test/integration/render-tests/regressions/mapbox-gl-js#5740/style.json
new file mode 100644
index 00000000000..2ab02ada1c6
--- /dev/null
+++ b/test/integration/render-tests/regressions/mapbox-gl-js#5740/style.json
@@ -0,0 +1,72 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "fadeDuration": 1000,
+      "width": 64,
+      "height": 64,
+      "description": "Tests that fill-pattern cross-fading completes, by checking the rendering after the fade duration has elapsed.",
+      "operations": [
+        [
+          "wait"
+        ],
+        [
+          "setZoom",
+          1.1
+        ],
+        [
+          "wait",
+          0
+        ],
+        [
+          "wait",
+          1000
+        ]
+      ]
+    }
+  },
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [
+              -10,
+              -10
+            ],
+            [
+              -10,
+              10
+            ],
+            [
+              10,
+              10
+            ],
+            [
+              10,
+              -10
+            ],
+            [
+              -10,
+              -10
+            ]
+          ]
+        ]
+      }
+    }
+  },
+  "sprite": "local://sprites/emerald",
+  "layers": [
+    {
+      "id": "fill",
+      "type": "fill",
+      "source": "geojson",
+      "paint": {
+        "fill-antialias": false,
+        "fill-pattern": "generic_icon"
+      }
+    }
+  ]
+}
diff --git a/test/suite_implementation.js b/test/suite_implementation.js
index 1ca5a62dbe5..91e52088fa0 100644
--- a/test/suite_implementation.js
+++ b/test/suite_implementation.js
@@ -38,7 +38,7 @@ module.exports = function(style, options, _callback) {
         preserveDrawingBuffer: true,
         axonometric: options.axonometric || false,
         skew: options.skew || [0, 0],
-        fadeDuration: 0
+        fadeDuration: options.fadeDuration || 0
     });
 
     // Configure the map to never stop the render loop