From 1fb96d38a0036532ed8d9f5a818d8aabdfa942da Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 2 Jun 2016 14:46:45 -0700 Subject: [PATCH] [tests] Tweak LineAnnotation test so that it reveals a bug; fix the bug --- src/mbgl/annotation/shape_annotation_impl.cpp | 2 +- test/api/annotations.cpp | 2 +- .../annotations/line_annotation/expected.png | Bin 2088 -> 2964 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mbgl/annotation/shape_annotation_impl.cpp b/src/mbgl/annotation/shape_annotation_impl.cpp index a2dc4c809..283e736c6 100644 --- a/src/mbgl/annotation/shape_annotation_impl.cpp +++ b/src/mbgl/annotation/shape_annotation_impl.cpp @@ -27,7 +27,7 @@ struct ToGeoJSONVT { geojsonvt::ProjectedFeature operator()(const LineString& line) const { geojsonvt::ProjectedRings converted; - converted.push_back(convertPoints(geojsonvt::ProjectedFeatureType::Polygon, line)); + converted.push_back(convertPoints(geojsonvt::ProjectedFeatureType::LineString, line)); return convertFeature(geojsonvt::ProjectedFeatureType::LineString, converted); } diff --git a/test/api/annotations.cpp b/test/api/annotations.cpp index 07e169cf9..ce5aaa860 100644 --- a/test/api/annotations.cpp +++ b/test/api/annotations.cpp @@ -46,7 +46,7 @@ TEST(Annotations, SymbolAnnotation) { TEST(Annotations, LineAnnotation) { AnnotationTest test; - LineString line = {{ { 0, 0 }, { 45, 45 } }}; + LineString line = {{ { 0, 0 }, { 45, 45 }, { 30, 0 } }}; LineAnnotation annotation { line }; annotation.color = {{ 255, 0, 0, 1 }}; annotation.width = 5; diff --git a/test/fixtures/annotations/line_annotation/expected.png b/test/fixtures/annotations/line_annotation/expected.png index b86570f990325d18d23b9b627d93119c5aa9348c..4f89e593183142f7129f31ff34e79a2dd2082594 100644 GIT binary patch delta 2162 zcmV-&2#xos5R?~?Fn>icGqh zQP|}q)j=vr5-Y7FyD8la%SyD8N)n?ix~Sbrj55g#yGmjgD=ImbC6ZX#yY&1y?7lfO zv-iwDvu8iTVrI|3*80Bn$U8G`=bYKJ$v*@L5FkK+009C72$MVpl9q2D=UTgI*1$F^PyD?)(4`~?#F%Ll^WJqesM|IYgFV5j~|sz_jd0tx<^ zss7lagZmbbd58dkWf4gDPcB~hyLSLDT9$J<2LS>r1QPsXcMyKR16bkZM*>SDkl=6G zLHOG{fR8TCVI713fqy#$67Hvu2!DG5IQ)(k?hzoc6aoqM<1+p}#uLC@m*T(uw1USZ4wW^yZ9fi(t3#f3iDH?(aQh&Tict zw*&~RBY_0^UVj-s8WQXa2al3DM;G%h9-QMo0RrntAc6jR5$g8J-#-1f>)=uH^H++w zCk)PUp8$b%B9JhDx(IX&|F1J1GzKb7wQ}H z`2H)8kjD-y=3l*Xo}UR2Sa5*^`OQU`yC;BWRPAT}nSaHa)2q22BS2t51rp+;iXeC4 zKXO>xS@XMM-J!$gdz=7)1rtbs4=+O8h5vQK+Rd8%i*+{*o9}S~1Qtvn0d61Ry`>0p zdjfd(j@r%jlZtic?`Vx{1PCmMK*Ia5j6W73Zs9+BRGXP|X|ZH z-1Ca?wpaeEGafi7{=NEgNG|pOc2oRW)Ktg+Z5!@F38#4AAx2?>*so3ZLJ}5Nq ze&!J%Fk^uP_ANzdTlm{JWZd$ZduXxGwd1ZgkADDxo&^%vR~Mn}!vB&<+Q~j2EcQBU zl0D2NK%ggqg!TDFV7u@iJ82u)>sQ5o&z*E1^9c}`u|R_Qq>TR*fo)F!r%YNtYaUhX z)%M?I(!I!(-T*0D(yb64Ko>epZCFh5rka z?tj%P_#Ah1S(1oMa@oL%^jS>yJ%Ezkb%Eo%Jl%R#15!yW_(Oem00KBWj|7yfrlxZTj{ zsqxdI&JjZwxIlowYy}d?_NlyWMKIeFz!}r3p1mGAq{cm`Rl`062uvW5Kt3Sjmw!Wo z`MC+U8aXvJUR%`p=E#L65FjvpfrRl+8J85HY_I$mXY4%9s@d;rMXlqeS;Jlg2#hI^ zFn+!WWDEb#GwwI$He*f8e!C8-^@y=HFo^(x=?Nr^)i?39@L!j)&-5zYzEk$B{wVP; zrd`K=1PF`}NElDfXko9$!6TNh>VI--on6#Bbyb^LM1a8R1QNpP7jfMa!3$Qm>*!Uf z`={awV9lQ@99`KA0t9XoNC014gs=<$%>F2DY93hBy}`d00t9*zNC2N!gs=<$TW8ru z>b|q6ecmi<+M57@?E(qkz8QZjLfD=FJ~V5n)VRE;edMg`+MmFN7fA5-%zvo<^34|h z&&(PqHTKHr-f0Zp?mp|<_9w8R1roenGQKw?fZy%|C$(Qy)W4*U+G-Hk&;kkG7mM(< zSK*&z?A8ZP>U^o_;Z1$iR)fHX6-eklUIed&zy0sHhxY-KI_;yzw`2^y^>6q0?W4XL z1U95V0`{&VbS-%Q%6MX5D1WK-?4plr`l_!Efej~+z#UhFu6qT3UY{W8|HQrl($9WH_;1c*Q~e{x zeVPKAyODB+!-96(68Qoj`!P{@l>%i&f{zH1&b6!2EOJL~)60!@11ntLp z{ND3AaB9E2=`83`OCykgRbQ^r z!ry+&e&DWM(_0^0-j!`$AZ_u>;4+}`Wv3745pfWVFf608UB o=(=mOF$UfNk-$|Mpg)2C0z(uOz`u5TsQ>@~07*qoM6N<$f*zbSF8}}l literal 2088 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G!U;i$lZxy-8q?;3=Hg#JY5_^ zDj471NnA27Rp$6d<5ZuSM$39MHIq+GnP`~mBWVoe1OqXU59H1SVUT?AF_%*_W(a8} zCwVOaimbZt{59#<{ru^#|687WTCmr$PJZ9^$2)9`i}!H|C^$4QFfy@>9LBnd2j&+S zbFaU+{#!Puz>aH7l?*i#Cg;bqaBLCs_?mzA(f{XLr1Etd&oOn@{kMM@|MhcGy7+BQ z9{mXq%40?U?yqNkQup@*1DntbtqBLV`yKh85-z?QB>lnM=g9v*P?-x#9S+%t9;r9`ZobXIV3LD- zBTLY^517988?bCasF`-{J(x@{7t5V9!#>VLO-}&|7;eoyH;wlai#-zBg?-l zE`Oq<6eK(sEOt0_-$L;Jxjr>B;S9wIAHtuBaQte*%uwS5z=CbC!sDeCaOUr}N1E;?<*hOozEuepOn^i+-%1_50^xWr)4? z%RBzhzN7yV8jL@(UH{lWuR970|L-Cn&&PdUCddDKmHz1$?O(y#G?B%MOXY)k*N^?@|89aN zx&z-uKgOT@`wE<_G$tG<7X!u6%^Mewq%rBT2>qA_jFh~_1eL}g8z@+ zxo>LI(8#h2=%nzjANA+|u7bsneK