From e4e39289a2fa3c2186a1df929a5cc61461dd762e Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@pobox.com>
Date: Mon, 26 Feb 2018 11:32:18 -0800
Subject: [PATCH] Fix the raw-tiles test and make it a little less fragile

---
 Makefile                                 |   2 +-
 tests/raw-tiles/compare/0/0/0.pbf        | Bin 123 -> 437 bytes
 tests/raw-tiles/compare/1/0/0.pbf        | Bin 123 -> 437 bytes
 tests/raw-tiles/compare/10/163/366.pbf   | Bin 123 -> 437 bytes
 tests/raw-tiles/compare/11/326/732.pbf   | Bin 123 -> 437 bytes
 tests/raw-tiles/compare/12/652/1464.pbf  | Bin 211 -> 330 bytes
 tests/raw-tiles/compare/12/652/1465.pbf  | Bin 131 -> 238 bytes
 tests/raw-tiles/compare/13/1304/2928.pbf | Bin 123 -> 243 bytes
 tests/raw-tiles/compare/13/1304/2930.pbf | Bin 132 -> 239 bytes
 tests/raw-tiles/compare/2/0/1.pbf        | Bin 123 -> 437 bytes
 tests/raw-tiles/compare/3/1/2.pbf        | Bin 123 -> 437 bytes
 tests/raw-tiles/compare/4/2/5.pbf        | Bin 123 -> 437 bytes
 tests/raw-tiles/compare/5/5/11.pbf       | Bin 123 -> 437 bytes
 tests/raw-tiles/compare/6/10/22.pbf      | Bin 123 -> 437 bytes
 tests/raw-tiles/compare/7/20/45.pbf      | Bin 123 -> 437 bytes
 tests/raw-tiles/compare/8/40/91.pbf      | Bin 123 -> 437 bytes
 tests/raw-tiles/compare/9/81/183.pbf     | Bin 123 -> 437 bytes
 17 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 535f4a38..b8fcb3a0 100644
--- a/Makefile
+++ b/Makefile
@@ -134,7 +134,7 @@ parallel-test:
 	rm tests/parallel/*.mbtiles tests/parallel/*.json
 
 raw-tiles-test:	
-	./tippecanoe -f -e tests/raw-tiles/raw-tiles tests/raw-tiles/hackspots.geojson -pC
+	./tippecanoe -f -e tests/raw-tiles/raw-tiles -r1 tests/raw-tiles/hackspots.geojson -pC
 	diff -x '*.DS_Store' -rq tests/raw-tiles/raw-tiles tests/raw-tiles/compare
 	rm -rf tests/raw-tiles/raw-tiles
 
diff --git a/tests/raw-tiles/compare/0/0/0.pbf b/tests/raw-tiles/compare/0/0/0.pbf
index b3335879a4b65975f2e7b0a9686146df0d6ce51d..42e2643f889ffe2f30015c73cbcfcf89d7d6689d 100644
GIT binary patch
literal 437
zcmZvX%}&BV6oqN|lkq2!1xnrAj3G!Qgd#{-7JuS`AVCw?Q|3YmW5>+2V0S)-&*769
zp1_vi!pQQT``vTTvA)vpCMkGqve0ib&=((IWrpk(t-QmzLanXrPzI>!A=!77D-{eR
zpCP>@HM`U7!Vtz%GZ-<o(D1?{fRR*zU_P(I;~09~mffW$Nzo&6;0Sl_$82IttEAGt
zzDf+Xva`gU$2C$7b;yK>zzua&2N?ze0}av#J?99kcoz>MqGzQ1>?uUJS9A2ah8sDZ
zB6>2^NGs&L)wJR14(wLoLHw@%KWm$o$;lv`EFu^%S1}$J?kiluD0Gv~J-d@QJg`;Z
zN#!H-#gaF6`NVy1<qW2qBqAyvpBlwnDrFd^NwbAd@?F|WX(MB1|4KO{zopi{)Sgi=
J$%a~&egI%%bG-ln

delta 29
kcmdnWT+Jj^IgvR{SV&NUQHYI!fsv7kNr{zn2G<8M08*L-2mk;8

diff --git a/tests/raw-tiles/compare/1/0/0.pbf b/tests/raw-tiles/compare/1/0/0.pbf
index aa6b9725d78e086706288f4fd96ac7805eaa4ebb..0365f337cf01848edd3e5a6355f0c5ddfa0e2031 100644
GIT binary patch
literal 437
zcmZvXOHaZ;6oqMd$@oYlCQ9Ahj3Gz_LlGn_i;uV<NYKRfl(|sC*fBFL*quMg_={Zd
zLu?5yj4bcD-#zyn>nr_kl7h#^bNwa*ef|MfX24$2$~&AZ)Y{4pWPqCPlU+x-QbAwx
zDbfp4wcCvj3}7TRgCSFM4KFML7)lig=JOgnj-cCV+8t_=6g?n&j&Nsw%qF(9Ldvb{
ztHfX<I}6-;TqTuIhfIhF+)zg~kYOM&&>(%#Gmfx~ckv)1dP+*qo<f9sHAA0kxRH|y
zq9;R*v`o&L4I7^Bz-|T}#P4eVv$kl79QVWVJc2%R72|Q?p28&zLpSN%wcClq16u~3
zR6asaEcoR%pSbU>oWf+CL`22I6Qh_*r3}L~X}0ir^j+UbX(MB1|4KO{zoAyY)Q(Xw
J$(mZ#e*ko*bY%bl

delta 29
kcmdnWT+Jj^IgvR{SV&NUQHYI!fsv7kNr{zngUAD208<YIF#rGn

diff --git a/tests/raw-tiles/compare/10/163/366.pbf b/tests/raw-tiles/compare/10/163/366.pbf
index f040e004ba8f70a04a78badadfe3ac10cefccbf9..719467042595d447cc12731246cfcd4a3b8f1c4f 100644
GIT binary patch
delta 328
zcmZvX%}T>S6ooq(+t@)wgQC^VWh9hh5EHAV%hn%U6b<SNBxYhlhYZYQ8iI?yf!OzO
zB?#hk_$WSrQL}V;zjOFF_wfzmomadtVw<j#l@SlqEC63JrD&Jf{ga~sTtSUTGq&(I
z=RMNZN(Y>m5NcIAAau@Iu0Uj<(uhG(W!1q;x=T8DiDV2eWXiHg!KsL2#uA|wqc+*|
z4qdoC2iMCJsO%2-LgqZkA_uN-U^wvHKJAdLiN2qfFbP5#L}D&sELj1*4(UGW4c+4(
z#br?BiI5qCF`q>T|B0&q&cp-6zf*W=t#2c%)o37O7_`}bF+OmOFj_L275c<qts1qE
V`PVX^H`Z#ljM@gNYES07^$p**RO0{u

delta 29
kcmdnWT+Jj^IgvR{SV&NUQHYI!fsv7kNr{zn4bv`W08&!~%K!iX

diff --git a/tests/raw-tiles/compare/11/326/732.pbf b/tests/raw-tiles/compare/11/326/732.pbf
index 3d66d80ffbc12fca4f14880650e40948edd09665..fce0c7e632c68349976a705660a60e1d0a7879da 100644
GIT binary patch
delta 328
zcmb>4%FHaaiFqPZnyL~X7ms63Qf6MFLO@Y!aj}v*m#T@GvAKeu0#w+sEOlalXuT$v
zdTDWKVopw_LQ-jQrH(>=X-Q6MNwGqHo<ebEN~%IRP!7n+sZ^5Yk_^cxN=;R8E6PmG
zODR@x&QD8AP0h$JElyQZ<x(~>FjNS3RWLLv$xr~AuA>l;UsRHln3tlX;2)%5X>Md_
zq9n;B?o*naU8&%cm{gRQl3!n>;8c`at`Ja~q@>NIX=!K*GQuOVyd)#PC@)pPDW@z&
z51T<i|GDI+E2M#)l2a)pD8VSi#=yYH$i$??%6Wt38yi%JnURHw6)3cd{RJ;nh>ejQ
XqKa>UhyqlMgOQVo3#e=k-zOCS`jl1K

delta 29
kcmdnWT+Jj^IgvR{SV&NUQHYI!fsv7kNr{#72Fo`#08@koH~;_u

diff --git a/tests/raw-tiles/compare/12/652/1464.pbf b/tests/raw-tiles/compare/12/652/1464.pbf
index 666aceb526b03711bd2e302764b49d8d705219dc..ac5dcea87777733041ab4bf2854c85e7bdd908b9 100644
GIT binary patch
delta 125
zcmcc2c#4Tx>NwLx=5!T4E*{66q|CfTg@B^e;$kIrE>#mVV{-*R1*ouNS?a_<Q7ug_
z_0r<f#GIT;g{0ErN*#s#(vqCil46DYJcZ)SlvIUspd65sQ#mm+Nt#uOmGcVU1!*Bc
U2}U6{1~x`^CMKZJ2H67+04;|jv;Y7A

delta 23
fcmX@bbeWM^>H_0L=Jbi@5;>TZSUESy9&i8vTXhFf

diff --git a/tests/raw-tiles/compare/12/652/1465.pbf b/tests/raw-tiles/compare/12/652/1465.pbf
index d58565a7510596503168426f96fc52d7df01dbae..3bc62f101054f5df188ba78484700b25e535911e 100644
GIT binary patch
delta 136
zcmZo>e8<Qn^?D*xeyx%um$*-9a(1PHPhwJ0VoH9If>Tjyxk5l`l9D!;rlp~&La?iX
zM`C$NMt)IVs)AEaS&E)QKz>n4PGVk)j)H%Xf~C2Up@|Y77mrJRx<Xn}W@=taPNk55
k1fvie0|O%?6O$4P=LT5^AwjSRGb0NVs}d{c4w)yM0Gr?<R{#J2

delta 29
kcmaFI*v!Zz)i9AMUr0zmf>DT#fq{{ciAjltbAzk{09MKbxc~qF

diff --git a/tests/raw-tiles/compare/13/1304/2928.pbf b/tests/raw-tiles/compare/13/1304/2928.pbf
index 8905eadecf9bf7df11bfdfe4cd6c1bb6c4ea4255..f0341261b4663c383b8bc942074a6790bfef2507 100644
GIT binary patch
delta 132
zcmb>a%*ZVDfpH>JnyL~X7ms63Qf6MFLO@Y!aj}v*m#T@GvAKeu0#w+sEOlalXn-b{
zdTDWKVopw_LQ-jQrH(>=X-Q6MNwGqHo<ebEN~%IRP!7n+sT2~FU=(6wU|?iqVp3w|
Wd?a*B8Y;xh$il=56j~*_z#IVh-6FXF

delta 29
kcmey&Sj{9=IgvR{SV&NUQHYI!fsv7kNr{#7k<cw^09t_sg#Z8m

diff --git a/tests/raw-tiles/compare/13/1304/2930.pbf b/tests/raw-tiles/compare/13/1304/2930.pbf
index 48fc1267a10291b364d75d34ec02bfe082ab1fbd..ebca5185a0411daf111b798f7063c9040739c5c4 100644
GIT binary patch
delta 122
zcmZo+e9y=v^=2YdeuR=Fm$*-9a(1PHPhwJ0VoH9If>Tjyxk5l`l9D!;rlp~&La?iX
zM`C$NMt)IVs)AEaS&E)QKz>n4PGVk)j)H%Xf~C2Up@|Y77mrJRx<Xn}W@=taPUXZx
ZVPPRb2}U6{24+SUCRQa@&JPwRgaOvaA_@Qi

delta 30
lcmaFQ*uuyp)i{wUUsy;`f>DT#fq{{ciAjl-^O02pBLH2Y1y29~

diff --git a/tests/raw-tiles/compare/2/0/1.pbf b/tests/raw-tiles/compare/2/0/1.pbf
index 7f5bbcf86d531b3aa90a8982515fd3bc29350b82..33d96a02b61f7cbb1130cbb9bece6cf3ac4f9456 100644
GIT binary patch
literal 437
zcmZvX%}&BV6oqN|lkq2!jZ!u@V+at5p$HO|#h<t!NYKRfl(|sC*fBFL*qzVh6Bt)M
zhVe;k39Mv!zkBYv=U5-<H<J`RHd*Lb8R*(OSeYSvK`ZZYu25?$JCp%xdPw#i<w^wu
z$!AE<N!{)=yD)^Y)C@*UEi^o{2w)^tAehe^@Gyp6w`F&!NmBHP95}+A`>{5$rBzaC
zUtJ~!8|*A`=W(4>Lme_9B5*?;H9&@ez(9laLC-nDD&EC|h-jIVo;-yJcWRD4*KjST
zQ$$aO8fk@`wVF0O-h$l<Jc!>l{%38|5;+-!lSKpr<|@YH!hMA+7=>=qxo3A0hkLdP
zJgIzyzF6{$T|RN&8##mNI*Evi$EQXymr5CiY0_-rr}kOiptO-OvupIVML8qCR{hq#
Nw`k8Om?Tyu=nsH2bh`im

delta 29
kcmdnWT+Jj^IgvR{SV&NUQHYI!fsv7kNr{#7fyM!808_aILjV8(

diff --git a/tests/raw-tiles/compare/3/1/2.pbf b/tests/raw-tiles/compare/3/1/2.pbf
index 80562a7d64a9b6afd2ab65ca30e0f17a94875e8f..9cc9229dc02533bdf1091ef1fdac5f7cc4f7acb2 100644
GIT binary patch
delta 328
zcmZvX%}T>S6oos9t#%M0MbYZ!G7?HLh>6wEW$O<viU#!sCT3!SLk4Ct4Z%ghg=_1h
z2)=-eK9@1HJD2x6hmUh#zfE)h%bXjrO}6mnh=*xLA&^Wd(!=)P{M3hASmM!?&4Zm;
zANRD<l=Biotx5-k&N<5!hzwL3F(|66I(SJAaQ88hjKQ@`Sr#d{5OK^{BD7+}#)saC
z3lCS|dU*ns-GM;JoYO3F;O-uVzUK}|7w=B=(@O~x8cG_8nS`-q1q3=IN4P(9&;ArQ
zw8#@7GX`TmjgJ2lRsUUzXNc=5yzE$esMBgR5HbwXZ2wqq{t}sJ&1lx>eT7<Ry>2b6
RkL?xPKy3q8wT1QR{{rL#RZjo_

delta 29
kcmdnWT+Jj^IgvR{SV&NUQHYI!fsv7kNr{#7kYJNJ08*R;>;M1&

diff --git a/tests/raw-tiles/compare/4/2/5.pbf b/tests/raw-tiles/compare/4/2/5.pbf
index 4fa16a42de60783c0c3bc435d09532e89827a09b..2afba5c9a4b0f503fb76e83a7fbb4bea466fa044 100644
GIT binary patch
delta 328
zcmZvX%}T>S6oos9t#%N>qG)w<nGi}b1QV;J%hn%U6b<SNOw7athYZYQ8iI>%q$?@(
z4P5vHg70T6?at->&f(+Sw;$6y`ZgCvY?B?lJ>+4UQ3xbcigd8uyEyB^9jx$h!WO~)
zw2M1hY07yCp;n~>Lg$?23Pc7fjTjVFRvo+~$GH8JNXFnsrYwsTT#7hmED>5UVq?oc
z_2BUuJU>sMvO5q6nRA*&4%|P$pznJ<(#8j4{rp<On1+%@Vk%)ISpk6#$qDWbyz@WB
zEiLjy$c({=Pa^j}QT5-Ic!791g_o_}L)2>2Y6uwysW;!PnY%(J+A!)Bnpq!f)Igid
T*4+BsTeB_HG;md$TVL)k%@0(y

delta 29
kcmdnWT+Jj^IgvR{SV&NUQHYI!fsv7kNr{!SMY&B608!Zly8r+H

diff --git a/tests/raw-tiles/compare/5/5/11.pbf b/tests/raw-tiles/compare/5/5/11.pbf
index 6cb699e0cf2ba15af3f0aca74ac8f7326b7dce96..bcd097b8951aa260da9625e1d821db45698fa8ec 100644
GIT binary patch
delta 328
zcmZvX%}T>S6oos99qk~3MbT;(myuA4MNF)gE?a+aQ8cJ8FfkJo95OJIX$UU5bs<8x
z(x(vIyY#V)rQNx_-#L7o`|@Smd!P2yiX6H@)(0X;QU<=_TGJMBx@RXnxPb*8jQP~x
zp0r8JXv2gkATYY<fHaxlnFg7HPC^cOnU#kq=ssyY#ENscQVCB(4d*h7IFF^#oI2#d
zJ9gpz5?n8fp|p3vmnsu14Lfjq2mPMsc4>p`jLhS60V5VD7Rrf&q2f9CCZLC;-FHv_
z6xS@zVyRLNLop7I{u7n|UC1Yh=2Jvb-`quYT&W;rS+rVv#c$08veAlFEzvvvSR#y8
U=dBt3-deIXRI^A~o8h14FTjXYc>n+a

delta 29
kcmdnWT+Jj^IgvR{SV&NUQHYI!fsv7kNr{!SgRMsf08xwtmH+?%

diff --git a/tests/raw-tiles/compare/6/10/22.pbf b/tests/raw-tiles/compare/6/10/22.pbf
index 6c462e6208d24dd682bc433d7ddb0763426f4708..24aef73db36ec3d0ec69260fead8a0694e638a02 100644
GIT binary patch
delta 328
zcmZvX%}T>S5P-Xht#%25MbYYISP7+A#KdaNvGoTJMT7bRiP@OYB@4URhTx&TLVFaS
zLQuq~b1m`aalZNZn0fv%&E0o%Zp1cO$JUUAX%>JlsFb9G?f&WU0B)ed!zrEnTeB|i
zD5(O*N(hxKd%#uBXfA<gAk&CKp?7*<CE3I6heS{cS0bfZB;lOLF{KGtk`f#5yGIV(
zUxMT23Fvwcd@gbpWKj=p@4y?lPM@^#_E<emN*D*B2qHccFcP!?UxnlVcRlCiH*p;l
zdBR0TVZ^4<;eR3h-vxhyczFsdTN^v5)u`1FG7M60F09wH3YlodsB83Qeg2^aT3uS-
S*2|_>X=|uyV6A;w3-1Top;ZY0

delta 29
kcmdnWT+Jj^IgvR{SV&NUQHYI!fsv7kNr{zn63;9P08#z~&;S4c

diff --git a/tests/raw-tiles/compare/7/20/45.pbf b/tests/raw-tiles/compare/7/20/45.pbf
index b708e4959a219a2eedf2b5dd1d1a01959b2038cb..a1d06173fab548fafc227bbcf9b252e4d38bc4d8 100644
GIT binary patch
delta 328
zcmZvXO-jQ+6o5O4t#%N>qL}LDF%n8KNE552%hn%U6b<SH5;HNOLk4Ct4Z%gh8}tt1
z0R&xmC~@Hd9827}eBb-{c<=GeG<RRkg%R6i1Fw%*m}UX^f=Wp`*zTVk4d4nYJetvk
zzdi5bj*=>1tb|a>(gCh=Mso=~1DQq?3cb?<E6E;i-z9=lxDYALA_=EFjwwyJl9bqZ
z-|M+>dk(IbC!p&N_*~>H$RY=>Z(um^+&*dJor$`imM{rI5k!10U@T|>z6!|!?hf7K
z-^685<OvrUg)y5&hyR82e`ovw;^ir<Y;9Vo)u`1FG7M60K3ng-3YlodsB83Leg2^a
WT3uS-*3*_(X=|uyV6A;wFWwLQlvXDI

delta 29
kcmdnWT+Jj^IgvR{SV&NUQHYI!fsv7kNr{zniNrPo08*L-0ssI2

diff --git a/tests/raw-tiles/compare/8/40/91.pbf b/tests/raw-tiles/compare/8/40/91.pbf
index da1c3f4883e1bfa9202ef022951509a704e10d46..51b31e8308025c5845037e9d96f9b0a93dd7ba7f 100644
GIT binary patch
delta 328
zcmb>4%FHaaiFqPZnyL~X7ms63Qf6MFLO@Y!aj}v*m#T@GvAKeu0#w+sEOlalXuT$v
zdTDWKVopw_LQ-jQrH(>=X-Q6MNwGqHo<ebEN~%IRP!7n+sZ^5Yk_^cxN=;R8E6PmG
zODR@x&QD8AP0h$JElyQZ<x(~>FjNS3RWLLv$xr~AuA>l;UsRHln3tlX;2)%5X>Md_
zq9n;B?o*naU8&%cm{gRQl3!n>;8c`at`Ja~q@>NIX=!K*GQuOVyd)#PC@)pPDW@z&
z51T<i|GDI+E2M#)l2a)pD8VSi#=yYH$i$??%6ZD*odQ&dnURHw6)5z@;Ep0xh>ejQ
Ytm>6vi--zTjDwMri3_Ogk>NQN03It=<^TWy

delta 29
kcmdnWT+Jj^IgvR{SV&NUQHYI!fsv7kNr{#7l)*a%08`opXaE2J

diff --git a/tests/raw-tiles/compare/9/81/183.pbf b/tests/raw-tiles/compare/9/81/183.pbf
index cc97d0f9bb9db4f49d71d4f8a78de115aca0334e..6110b5759dff946de30cb06b330c4f8b433a1ad9 100644
GIT binary patch
delta 328
zcmb>4%FHaaiFqPZnyL~X7ms63Qf6MFLO@Y!aj}v*m#T@GvAKeu0#w+sEOlalXuT$v
zdTDWKVopw_LQ-jQrH(>=X-Q6MNwGqHo<ebEN~%IRP!7n+sZ^5Yk_^cxN=;R8E6PmG
zODR@x&QD8AP0h$JElyQZ<x(~>FjNS3RWLLv$xr~AuA>l;UsRHln3tlX;2)%5X>Md_
zq9n;B?o*naU8&%cm{gRQl3!n>;8c`at`Ja~q@>NIX=!K*GQuOVyd)#PC@)pPDW@z&
z51T<i|GDI+E2M#)l2a)pD8VSi#=yYH$i$??$~jH(4kJ{EnURHw6)5ydaThaGh>ejQ
Ytm>L_hX@B$jDwMri3_OgnDQJ>0PZ_gXaE2J

delta 29
kcmdnWT+Jj^IgvR{SV&NUQHYI!fsv7kNr{znn&KTs08*L+^Z)<=