sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a few test failures.

Browse source
This commit is contained in:
Hermann Kraus 2013-10-09 22:01:15 +02:00
parent 425863cc82
commit 22aeeaae8b
3 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tests/visual_tests/data/lines2.csv Normal file
View file

@ -0,0 +1,17 @@
WKT
"LINESTRING (0.764185269 -0.313888573,0.751190328 -0.314123131,0.737134133 -0.314376844,0.725222103 -0.314591855,0.702047791 -0.315010149,0.688792951 -0.315249398,0.67553811 -0.315488647,0.661092067 -0.315749397,0.641426389 -0.31610436,0.627370194 -0.316358073,0.597525145 -0.316896774,0.584140356 -0.317138368,0.570885515 -0.317377617,0.549747077 -0.317759164,0.533546717 -0.318051579,0.511866823 -0.318442899)"
"LINESTRING (0.289403766 -0.004374853,0.278998818 -0.012163343,0.267744132 -0.020587892,0.258206263 -0.027727341,0.239650772 -0.041616812,0.229037724 -0.049561069,0.218424677 -0.057505325,0.206857843 -0.066163524,0.191111688 -0.077950096,0.179857002 -0.086374637,0.155960304 -0.104262178,0.145243208 -0.112284308,0.134630161 -0.120228551,0.117704778 -0.132897797,0.104733276 -0.14260742,0.087374354 -0.155601173)"
"LINESTRING (0.374895934 -0.188749064,0.362443535 -0.270566448,0.295784263 -0.319614717,0.213966216 -0.307162504,0.164917295 -0.240503998,0.177369693 -0.158686453,0.244028965 -0.109637668,0.325847013 -0.122090041,0.374895934 -0.188749064)"
"LINESTRING (0.892955147 -0.270397048,0.894000762 0.309916722)"
"LINESTRING (0.055417591 0.248226176,0.059600051 -0.260986614)"
"LINESTRING (0.777676102 0.026948692,0.765128722 0.016492544,0.747353269 0.008127625,0.731669045 0.012310084,0.719121666 0.021720618,0.708665516 0.03740484,0.697163752 0.05099783,0.685661988 0.06040836,0.666840919 0.061453974,0.646974236 0.054134673,0.627107552 0.041587299,0.608286483 0.024857463,0.59260226 0.013878507,0.574826806 0.005513587,0.559142582 0.009696047,0.546595203 0.019106581,0.536139054 0.034790803,0.524637289 0.048383794,0.513135525 0.057794324,0.494314456 0.058839938,0.474447773 0.051520637,0.454581089 0.038973262,0.434191598 0.021459215,0.421644219 0.011003066,0.403868765 0.002638146,0.388184541 0.006820606,0.375637162 0.01623114,0.365181013 0.031915363,0.353679249 0.045508354,0.342177485 0.054918884,0.323356416 0.055964499,0.303489732 0.048645197,0.283623049 0.036097822,0.26480198 0.019367985,0.249117756 0.008389028,0.231342302 0.000024109,0.215658079 0.004206569,0.203110699 0.013617103,0.19265455 0.029301326,0.181152786 0.042894317,0.169651022 0.052304848,0.150829953 0.053350463,0.13096327 0.046031161,0.111096586 0.033483785,0.092275517 0.016753948)"
"LINESTRING (0.093560033 0.138666471,0.112381102 0.155396254,0.132247785 0.167943584,0.152114469 0.175262855,0.170935538 0.174217245,0.182437302 0.164806752,0.193939066 0.15121381,0.204395215 0.135529635,0.216942594 0.126119125,0.232626818 0.121936675,0.250402272 0.130301574,0.266086496 0.1412805,0.284907564 0.158010282,0.304774248 0.170557609,0.324640932 0.17787688,0.343462 0.17683127,0.354963765 0.167420778,0.366465529 0.153827838,0.376921678 0.138143665,0.389469057 0.128733156,0.405153281 0.124550707,0.422928735 0.132915605,0.435476114 0.143371724,0.455865605 0.160885712,0.475732289 0.173433038,0.495598972 0.180752307,0.514420041 0.179706697,0.525921805 0.170296207,0.537423569 0.156703268,0.547879718 0.141019097,0.560427098 0.13160859,0.576111322 0.127426141,0.593886775 0.135791038,0.609570999 0.146769961,0.628392068 0.163499739,0.648258751 0.176047063,0.668125435 0.183366331,0.686946504 0.182320722,0.698448268 0.172910232,0.709950032 0.159317296,0.720406181 0.143633127,0.73295356 0.13422262,0.748637784 0.130040171,0.766413238 0.138405068,0.778960617 0.148861184)"
"LINESTRING (0.848982597 0.288736581,0.754751857 0.220905399,0.657509669 0.293052099,0.548765717 0.208358108,0.429565615 0.301416905,0.295726905 0.205221284,0.170253114 0.303508106,0.083467075 0.248091159)"
"LINESTRING (0.090332128 0.348151688,0.187574317 0.410887204,0.309911263 0.313646971,0.436430669 0.403568084,0.548311466 0.316783769,0.660192263 0.398340138,0.759525681 0.319920565,0.85656627 0.390823271)"
"LINESTRING (0.613502456 -0.015963875,0.790148448 -0.024699116,0.812471843 -0.037316685,0.828971743 -0.062551817,0.830912908 -0.097492748,0.828001161 -0.133404222,0.821207084 -0.172227378,0.807618931 -0.188727197,0.760060395 -0.191638928,0.603796632 -0.185815465)"
"LINESTRING (0.680933124 -0.244990843,0.50407624 -0.24631506,0.481071446 -0.234987473,0.463163199 -0.210731652,0.459238186 -0.175957816,0.460103038 -0.139938937,0.464678354 -0.100792195,0.477306218 -0.0835463,0.52462221 -0.077934757,0.680964265 -0.074862572)"
"LINESTRING (0.345138881 -0.004954418,0.367100653 -0.140842741)"
"LINESTRING (0.41651464 -0.017307915,0.393180257 -0.171040066)"
"LINESTRING (0.45220252 -0.037897074,0.59769926 -0.042014905)"
"LINESTRING (0.72397945 -0.139470135,0.577110099 -0.140842741)"
"LINESTRING (0.820051288 0.095328839,0.850629325 0.095086193,0.850629325 0.072034887,0.735372668 0.072034887)"
1 WKT
2 LINESTRING (0.764185269 -0.313888573,0.751190328 -0.314123131,0.737134133 -0.314376844,0.725222103 -0.314591855,0.702047791 -0.315010149,0.688792951 -0.315249398,0.67553811 -0.315488647,0.661092067 -0.315749397,0.641426389 -0.31610436,0.627370194 -0.316358073,0.597525145 -0.316896774,0.584140356 -0.317138368,0.570885515 -0.317377617,0.549747077 -0.317759164,0.533546717 -0.318051579,0.511866823 -0.318442899)
3 LINESTRING (0.289403766 -0.004374853,0.278998818 -0.012163343,0.267744132 -0.020587892,0.258206263 -0.027727341,0.239650772 -0.041616812,0.229037724 -0.049561069,0.218424677 -0.057505325,0.206857843 -0.066163524,0.191111688 -0.077950096,0.179857002 -0.086374637,0.155960304 -0.104262178,0.145243208 -0.112284308,0.134630161 -0.120228551,0.117704778 -0.132897797,0.104733276 -0.14260742,0.087374354 -0.155601173)
4 LINESTRING (0.374895934 -0.188749064,0.362443535 -0.270566448,0.295784263 -0.319614717,0.213966216 -0.307162504,0.164917295 -0.240503998,0.177369693 -0.158686453,0.244028965 -0.109637668,0.325847013 -0.122090041,0.374895934 -0.188749064)
5 LINESTRING (0.892955147 -0.270397048,0.894000762 0.309916722)
6 LINESTRING (0.055417591 0.248226176,0.059600051 -0.260986614)
7 LINESTRING (0.777676102 0.026948692,0.765128722 0.016492544,0.747353269 0.008127625,0.731669045 0.012310084,0.719121666 0.021720618,0.708665516 0.03740484,0.697163752 0.05099783,0.685661988 0.06040836,0.666840919 0.061453974,0.646974236 0.054134673,0.627107552 0.041587299,0.608286483 0.024857463,0.59260226 0.013878507,0.574826806 0.005513587,0.559142582 0.009696047,0.546595203 0.019106581,0.536139054 0.034790803,0.524637289 0.048383794,0.513135525 0.057794324,0.494314456 0.058839938,0.474447773 0.051520637,0.454581089 0.038973262,0.434191598 0.021459215,0.421644219 0.011003066,0.403868765 0.002638146,0.388184541 0.006820606,0.375637162 0.01623114,0.365181013 0.031915363,0.353679249 0.045508354,0.342177485 0.054918884,0.323356416 0.055964499,0.303489732 0.048645197,0.283623049 0.036097822,0.26480198 0.019367985,0.249117756 0.008389028,0.231342302 0.000024109,0.215658079 0.004206569,0.203110699 0.013617103,0.19265455 0.029301326,0.181152786 0.042894317,0.169651022 0.052304848,0.150829953 0.053350463,0.13096327 0.046031161,0.111096586 0.033483785,0.092275517 0.016753948)
8 LINESTRING (0.093560033 0.138666471,0.112381102 0.155396254,0.132247785 0.167943584,0.152114469 0.175262855,0.170935538 0.174217245,0.182437302 0.164806752,0.193939066 0.15121381,0.204395215 0.135529635,0.216942594 0.126119125,0.232626818 0.121936675,0.250402272 0.130301574,0.266086496 0.1412805,0.284907564 0.158010282,0.304774248 0.170557609,0.324640932 0.17787688,0.343462 0.17683127,0.354963765 0.167420778,0.366465529 0.153827838,0.376921678 0.138143665,0.389469057 0.128733156,0.405153281 0.124550707,0.422928735 0.132915605,0.435476114 0.143371724,0.455865605 0.160885712,0.475732289 0.173433038,0.495598972 0.180752307,0.514420041 0.179706697,0.525921805 0.170296207,0.537423569 0.156703268,0.547879718 0.141019097,0.560427098 0.13160859,0.576111322 0.127426141,0.593886775 0.135791038,0.609570999 0.146769961,0.628392068 0.163499739,0.648258751 0.176047063,0.668125435 0.183366331,0.686946504 0.182320722,0.698448268 0.172910232,0.709950032 0.159317296,0.720406181 0.143633127,0.73295356 0.13422262,0.748637784 0.130040171,0.766413238 0.138405068,0.778960617 0.148861184)
9 LINESTRING (0.848982597 0.288736581,0.754751857 0.220905399,0.657509669 0.293052099,0.548765717 0.208358108,0.429565615 0.301416905,0.295726905 0.205221284,0.170253114 0.303508106,0.083467075 0.248091159)
10 LINESTRING (0.090332128 0.348151688,0.187574317 0.410887204,0.309911263 0.313646971,0.436430669 0.403568084,0.548311466 0.316783769,0.660192263 0.398340138,0.759525681 0.319920565,0.85656627 0.390823271)
11 LINESTRING (0.613502456 -0.015963875,0.790148448 -0.024699116,0.812471843 -0.037316685,0.828971743 -0.062551817,0.830912908 -0.097492748,0.828001161 -0.133404222,0.821207084 -0.172227378,0.807618931 -0.188727197,0.760060395 -0.191638928,0.603796632 -0.185815465)
12 LINESTRING (0.680933124 -0.244990843,0.50407624 -0.24631506,0.481071446 -0.234987473,0.463163199 -0.210731652,0.459238186 -0.175957816,0.460103038 -0.139938937,0.464678354 -0.100792195,0.477306218 -0.0835463,0.52462221 -0.077934757,0.680964265 -0.074862572)
13 LINESTRING (0.345138881 -0.004954418,0.367100653 -0.140842741)
14 LINESTRING (0.41651464 -0.017307915,0.393180257 -0.171040066)
15 LINESTRING (0.45220252 -0.037897074,0.59769926 -0.042014905)
16 LINESTRING (0.72397945 -0.139470135,0.577110099 -0.140842741)
17 LINESTRING (0.820051288 0.095328839,0.850629325 0.095086193,0.850629325 0.072034887,0.735372668 0.072034887)

22
tests/visual_tests/data/points.csv
View file

@ -1,11 +1,11 @@
lat,long,name,nr lat,long,name,nr,color
0,0,Test one,1 0,0,Test one,1,#ff0000
0,0.1,Test two,2 0,0.1,Test two,2,red
0,0.2,Test three,3 0,0.2,Test three,3,#00ff00
0,0.3,Test four,4 0,0.3,Test four,4,green
0,0.4,Test five,5 0,0.4,Test five,5,#0000ff
0,0.5,Test six,6 0,0.5,Test six,6,blue
0,0.6,Test seven,7 0,0.6,Test seven,7,#000000
0,0.7,Test eight,8 0,0.7,Test eight,8,black
0,0.8,Test nine,9 0,0.8,Test nine,9,#ffffff
0,0.9,Test ten,10 0,0.9,Test ten,10,white
1 lat long name nr color
2 0 0 Test one 1 #ff0000
3 0 0.1 Test two 2 red
4 0 0.2 Test three 3 #00ff00
5 0 0.3 Test four 4 green
6 0 0.4 Test five 5 #0000ff
7 0 0.5 Test six 6 blue
8 0 0.6 Test seven 7 #000000
9 0 0.7 Test eight 8 black
10 0 0.8 Test nine 9 #ffffff
11 0 0.9 Test ten 10 white

8
tests/visual_tests/styles/hb-fontsets.xml
View file

@ -22,22 +22,22 @@
<Style name="My Style"> <Style name="My Style">
<Rule> <Rule>
<Filter>[nr] = "2"</Filter> <Filter>[nr] = 2</Filter>
<TextSymbolizer face-name="Khmer OS Regular" size="36" placement="point" dy="-16">"A:ស្ត្រី"</TextSymbolizer> <TextSymbolizer face-name="Khmer OS Regular" size="36" placement="point" dy="-16">"A:ស្ត្រី"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="9" placement="point" dy="16">"Khmer OS Regular"</TextSymbolizer> <TextSymbolizer face-name="DejaVu Sans Book" size="9" placement="point" dy="16">"Khmer OS Regular"</TextSymbolizer>
</Rule> </Rule>
<Rule> <Rule>
<Filter>[nr] = "4"</Filter> <Filter>[nr] = 4</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="36" placement="point" dy="-16">"B:ស្ត្រី"</TextSymbolizer> <TextSymbolizer face-name="DejaVu Sans Book" size="36" placement="point" dy="-16">"B:ស្ត្រី"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="9" placement="point" dy="16">"DejaVu Sans Book"</TextSymbolizer> <TextSymbolizer face-name="DejaVu Sans Book" size="9" placement="point" dy="16">"DejaVu Sans Book"</TextSymbolizer>
</Rule> </Rule>
<Rule> <Rule>
<Filter>[nr] = "6"</Filter> <Filter>[nr] = 6</Filter>
<TextSymbolizer fontset-name="dejavu-first" size="36" placement="point" dy="-16">"C:ស្ត្រី"</TextSymbolizer> <TextSymbolizer fontset-name="dejavu-first" size="36" placement="point" dy="-16">"C:ស្ត្រី"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="9" placement="point" dy="16">"FontSet: DejaVu first"</TextSymbolizer> <TextSymbolizer face-name="DejaVu Sans Book" size="9" placement="point" dy="16">"FontSet: DejaVu first"</TextSymbolizer>
</Rule> </Rule>
<Rule> <Rule>
<Filter>[nr] = "8"</Filter> <Filter>[nr] = 8</Filter>
<TextSymbolizer fontset-name="khmeros-first" size="36" placement="point" dy="-16">"D:ស្ត្រី"</TextSymbolizer> <TextSymbolizer fontset-name="khmeros-first" size="36" placement="point" dy="-16">"D:ស្ត្រី"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="9" placement="point" dy="16">"FontSet: Khmer OS first"</TextSymbolizer> <TextSymbolizer face-name="DejaVu Sans Book" size="9" placement="point" dy="16">"FontSet: Khmer OS first"</TextSymbolizer>
</Rule> </Rule>