From 36814bcb2e0c3cfa19bea065a4daa0f7fe95a330 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 28 Jun 2013 15:03:55 -0400 Subject: [PATCH] add expected (currently failing) test for #1931 --- ...-placement-600-400-1.0-grid-reference.json | 109 ++++++++++++++++++ ...ne-placement-600-400-1.0-agg-reference.png | Bin 0 -> 3749 bytes ...-placement-600-400-1.0-cairo-reference.png | Bin 0 -> 3608 bytes ...ne-placement-600-400-2.0-agg-reference.png | Bin 0 -> 3842 bytes ...-placement-600-400-2.0-cairo-reference.png | Bin 0 -> 3742 bytes .../marker-on-line-and-line-placement.xml | 22 ++++ tests/visual_tests/test.py | 2 + 7 files changed, 133 insertions(+) create mode 100644 tests/visual_tests/grids/marker-on-line-and-line-placement-600-400-1.0-grid-reference.json create mode 100644 tests/visual_tests/images/marker-on-line-and-line-placement-600-400-1.0-agg-reference.png create mode 100644 tests/visual_tests/images/marker-on-line-and-line-placement-600-400-1.0-cairo-reference.png create mode 100644 tests/visual_tests/images/marker-on-line-and-line-placement-600-400-2.0-agg-reference.png create mode 100644 tests/visual_tests/images/marker-on-line-and-line-placement-600-400-2.0-cairo-reference.png create mode 100644 tests/visual_tests/styles/marker-on-line-and-line-placement.xml diff --git a/tests/visual_tests/grids/marker-on-line-and-line-placement-600-400-1.0-grid-reference.json b/tests/visual_tests/grids/marker-on-line-and-line-placement-600-400-1.0-grid-reference.json new file mode 100644 index 000000000..13b79ad2e --- /dev/null +++ b/tests/visual_tests/grids/marker-on-line-and-line-placement-600-400-1.0-grid-reference.json @@ -0,0 +1,109 @@ +{ + "keys": [ + "", + "1" + ], + "data": {}, + "grid": [ + " !!! ", + " !!! ", + " !!!! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " !! ! ", + " !! !!! ", + " ! !!! ", + " ! !! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " !! ! ", + " !!! ! ", + " !! !!! ", + " ! !!! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " !! ! ", + " !!! ", + " !!! !!! ", + " ! !!! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ", + " ! ", + " ! ! ! ", + " ! ! ", + " ! ! ! ", + " ! ! ", + " ! ! ! ", + " ! ! ", + " ! ! ! ", + " ! ! ", + " ! ! ! ", + " ! ! ", + " ! ! ! ", + " ! ! ", + " ! ! ! ", + " !!! ! ", + " !!! !! !! ", + " !! !! !!! ", + " ! !! !!! ", + " ! ! ", + " ! ! ! ", + " ! ! ", + " ! ! ! ", + " ! ! ", + " ! ! ! ", + " ! ! ", + " ! !! " + ] +} \ No newline at end of file diff --git a/tests/visual_tests/images/marker-on-line-and-line-placement-600-400-1.0-agg-reference.png b/tests/visual_tests/images/marker-on-line-and-line-placement-600-400-1.0-agg-reference.png new file mode 100644 index 0000000000000000000000000000000000000000..d91c2f035e2350e7257b070bb058c23374c9e0dc GIT binary patch literal 3749 zcmYk9c{o&UAII8vqOdo&W>@5DLIE z01^R610Vx{TmYb}t^$AvKm!2v0JH+o13*6jBLGYRumHfJ@Q4p&0F_7P#ukA6FCkvR zOIOrynnb(Le=fERDL^S=jKmul>=c0c$gUVV>l2Tivx;yYu%!w);gReX@91 zw&mvG)?^6lPz3$cP|xYvG;J}ntxXdWa`)T22-YX5yKgsy5|PnW-PavzQhlRg?3@+f-qmSk6y|j>UQ9u2@{|-hZrOP>&c$z$jG_yH1?U6)4M*FGg zq4=U|&tHObh>Uih!C`?<`wOz><0i;?NG{QIaGTT2hVbA?Gy#c{7S}-W!Bb%u z;T)ER6doLw{Ypm+Su>=cb{msZM5Zhdv@8lcW&}C_epEULiOKrklcr z!~S`{<2hN=FT@DL_Z5sp}r%RNh)2F5uTKJkGlsrS(f z(m&YB5Rma!vS(3z?ZxLf;T%&a>PZ|{s<!0ZJplre6WenfhkaUM_JP>TugHet z3)N(OO4fAsalY|{n@~D%eJSwZ(PnncK{X0JnH5OnaLmRYw4>0pG*+AOxw?PGQ_1?@ z$k59l8|)oVBkK>_$}tofH4a|#{CsISO$e`GVF~M={Z>bv7>QW)yR2+Z|HpLpz0A3q zdj9dPN9p(QggW_Cbd4YTO^e$4NWoN-)wqnW-3Wuvr+7nlQNSi^Ii- zT0y&WmyIBs5Y~r6pPL_-#^IuOh72)yb(by_`uL?}L(K21Bv*KsN-D2~&38TT6tcgu zM>8tf*MApJv`@5?z|Evi2NoeaF1tGrM;jc4MMu^w!jK;oNNt3f|_OyIVhyvk{j18`+=^nBR;}g1p-Aql z(ec*P5#ON`B<8OfPw{PFgt6}Sx$PBs0+~t!DS@!u0IcHF>%A%;Q@8I4>GYExT*|-t z>eb3(b#8#8_b-=7g`h!1=G$@NWVm9KHovQ)xmn>&wc zdw-MsQfG(t&QO8cPHkrko#A#t-r711yE+9IR3g2Nuy=OF$W6Y9EcNQvK9F+3IHS2i zc;F^x=6J8G+ucCpi;sDR0;}b?yt^n|`Q95k$(S)71KP@$SLB;HkKb)P$$B55=YvW< z*7Gc)oVbkmSvakYIlKCA@afXUM25w$JR-wR^(@PR`i}VT>*c-;V;((vY9}m|x1~Ah zVUSE8-R|EFpUPs~mTcSAD5u!cBs#s9N)M+$7cdMYhx;$=Uk{fg;eWsWY^U3oN4;vZ zMXk;>5k!A#&Hk=LGiipsTMX(o0Zq@IS`kgBR@!3(Gi{amH?HF!t zS28RlQ|nqhWE}RE56hfJdZ{bZUlFAN)W(eaV`BdJ)aDk&poLCb&*4eEORe{uxxO~U z-m!LgJ(IUe+4Mm=VgstJTz8Smq{g!&K@%w(ZPsd>e=n}I?O<+UBCl_nw2JZARYnSO zhgiqOOs%$e7%SVyNUNeJr<9e~h-WTrO}u!I4OTcUvA5XTg}pW5CLCe>-xDSys{vx% z!M4u}#VRR7H zZ=B2PqiijzIKJ|4)LGf}l37;`84t=!*=i0`6Dr%Ij_uA|n~7XJFwx0_6)YbH!t|Yg zhzq@ubMIEhE|^_;l~CxXnwEcaO=ejq0mYI-RGF_G1O{7=z&)LmMpZ!y1R;-ilAWxYX>nV$t= z7P7h_wc-~nz1*pCGbM4zrM`l2v=m--xM~HSJHVR0xGJvSD|5+h=j;fN1(8+wh%{+}lar4LoP{Be(c z^whM@<9H3%yCkif`0~ed)prlZt_I~_m}tQ}N%d+^%^dvQpU1<4&z@*rmb7Ly`dRoT z?03C}mOlYaX~iwW;s)faLe2O^T#k+t?ytb3Vh-%n*5D`R|J?$vmvqoa^M59MEUR zOdA_tbJef@kZ1abf+31A_(Zapy|q;;5=SyOnBcupy0AxWgA3tYb||KvC ztkpaVK9hJGm5#s!+*BXDT-<{zmrDKc6Sgs{-=9?48}KqT0RKQYkf5O5R%b3PW|3r{ zH)-#FHbF{}Vir*T$neW~t}TLs6`bW>Lew)VNm<(z(m@_oJR{AGJRla8Ci z=>wSv_LAd$d8jOi?9C-i{#i#FILhaW>X{VHX+>p28J^I^R%BFuE2}MhqMn^(H`ClIsAR!~v zXFwYg{^OxwE_NgoPw2lo65t1^ww=6KUi6~U$9Ire@g>INiWLm~z)WJ$5IW&sm#pGU zdo$~awt7n?=tR*Mfu+y=wVc~d|Fq?riED`yrPSGyp$0nfVIPyA2JcR>dcvUw$Yu#T z3Tp5`GrP15YOogl*~adu0efgw`%wefst4DM$H5?_uxw+OMqNdY4xb|r(j4Twi2X|= zG@dmi3Uiih86dInvoRqe*6k_0%e4Gl87ZQI=o^I3p0s&OCMK1%8_QL}_hD2`RC1C1 znbNeXn(^?_P}^nCx$M7@)U#cdQ$3PaZdAx0CQ;hrBgyPIlD>ts&FeDCN|$JDy{gv94? z$!n#rR;h8ZEyZn1Ju8J{dHa7x%Gp_~)t;JJD=2&O>{{uk(GVihbTW>g&hOLo?f3R< z?9s#i2#;uQKX@&z={#8SL)fl|7i&q1it&nG_vYush0PR23#Kb!em?Wz4J=llSR*BS+b7$B4-X^JaonD7%v_ne_N& zV|SE2X?L0QYH?0K%HE3@CVfWTM~?E!toIS||Gb(Cgx0dbGtZ%=i&n5?b}Q=0?ec3# z;Tz*MG0+9;+bcfghZazkz}?!HQ1;+78P$P~tL(@xi$T8VXR#n?1sf!;BbdasRlm2t hZfadz^>}tZk`k}o_0&n?)zL4Zo|f^Qa!seG{{gm@6I1{I literal 0 HcmV?d00001 diff --git a/tests/visual_tests/images/marker-on-line-and-line-placement-600-400-1.0-cairo-reference.png b/tests/visual_tests/images/marker-on-line-and-line-placement-600-400-1.0-cairo-reference.png new file mode 100644 index 0000000000000000000000000000000000000000..9f027d55663f4bee394385945448ee40032378e6 GIT binary patch literal 3608 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 literal 0 HcmV?d00001 diff --git a/tests/visual_tests/images/marker-on-line-and-line-placement-600-400-2.0-agg-reference.png b/tests/visual_tests/images/marker-on-line-and-line-placement-600-400-2.0-agg-reference.png new file mode 100644 index 0000000000000000000000000000000000000000..4f4fc7526e84f10b6ede0d5b181cbb1d6cff458d GIT binary patch literal 3842 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 literal 0 HcmV?d00001 diff --git a/tests/visual_tests/images/marker-on-line-and-line-placement-600-400-2.0-cairo-reference.png b/tests/visual_tests/images/marker-on-line-and-line-placement-600-400-2.0-cairo-reference.png new file mode 100644 index 0000000000000000000000000000000000000000..a2846c175d01e60a7db69236a9802da9913669c0 GIT binary patch literal 3742 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 N=pKIVqFpTZ{{RTGjZ**s literal 0 HcmV?d00001 diff --git a/tests/visual_tests/styles/marker-on-line-and-line-placement.xml b/tests/visual_tests/styles/marker-on-line-and-line-placement.xml new file mode 100644 index 000000000..3469cc24b --- /dev/null +++ b/tests/visual_tests/styles/marker-on-line-and-line-placement.xml @@ -0,0 +1,22 @@ + + + + + line + point-placement + + csv + ../data/marker-on-line.csv + | + + + diff --git a/tests/visual_tests/test.py b/tests/visual_tests/test.py index d4723d3f7..77edd0166 100755 --- a/tests/visual_tests/test.py +++ b/tests/visual_tests/test.py @@ -96,6 +96,8 @@ files = { 'marker-multi-policy': {'sizes':[(600,400)]}, 'marker-on-line': {'sizes':[(600,400)], 'bbox': mapnik.Box2d(-10, 0, 15, 20)}, + 'marker-on-line-and-line-placement': {'sizes':[(600,400)], + 'bbox': mapnik.Box2d(-10, 0, 15, 20)}, 'marker-on-line-spacing-eq-width': {'sizes':[(600,400)]}, 'marker-on-line-spacing-eq-width-overlap': {'sizes':[(600,400)]}, 'marker_line_placement_on_points':{},