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

Add more tests for upright="XXX_only".

Browse source 
Refs #1533.
This commit is contained in:
Hermann Kraus 2013-04-14 15:11:28 +02:00
parent 55ce673a8c
commit b42cf19354
6 changed files with 138 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

124
tests/visual_tests/data/bug1533.osm
View file

@ -1,63 +1,75 @@
<?xml version='1.0' encoding='UTF-8'?>
<osm version='0.6' upload='true' generator='JOSM'>
<node id='-374' action='modify' visible='true' lat='0.0686724638310369' lon='0.7038862570076257' />
<node id='-373' action='modify' visible='true' lat='0.06993229486822683' lon='0.6673511302025271' />
<node id='-367' action='modify' visible='true' lat='0.06363313935634328' lon='0.2843622147283897' />
<node id='-366' action='modify' visible='true' lat='0.06363313935634328' lon='0.250346751840884' />
<node id='-206' action='modify' visible='true' lat='-0.11453565911646134' lon='0.5480995047469907' />
<node id='-205' action='modify' visible='true' lat='0.18888875585009277' lon='0.5371560278163559' />
<node id='-181' action='modify' visible='true' lat='-0.11957497643332685' lon='0.3855811820622415' />
<node id='-180' action='modify' visible='true' lat='0.18384945467557984' lon='0.3746377051316065' />
<node id='-163' action='modify' visible='true' lat='0.06685200044593859' lon='0.8763046610034405' />
<node id='-162' action='modify' visible='true' lat='0.23679008943647523' lon='0.6246954179627523' />
<node id='-133' action='modify' visible='true' lat='0.24126789205602248' lon='0.30353263048300844' />
<node id='-132' action='modify' visible='true' lat='0.03717753224242952' lon='0.07873666907188823' />
<node id='-77' action='modify' visible='true' lat='0.3099287889371784' lon='0.8179010492787097' />
<node id='-76' action='modify' visible='true' lat='0.3111886023894954' lon='0.514281547208752' />
<node id='-67' action='modify' visible='true' lat='0.3105586956821123' lon='0.3750701157617382' />
<node id='-66' action='modify' visible='true' lat='0.3118185090592599' lon='0.07145061369178042' />
<node id='-59' action='modify' visible='true' lat='0.38970517055516746' lon='0.012910078084524709' />
<node id='-57' action='modify' visible='true' lat='0.3883099615915542' lon='0.9065895247230221' />
<node id='-55' action='modify' visible='true' lat='-0.21121932961473797' lon='0.9056535149055025' />
<node id='-54' action='modify' visible='true' lat='-0.20982409791135584' lon='0.011974068267005027' />
<way id='-372' action='modify' visible='true'>
<nd ref='-374' />
<nd ref='-373' />
<node id='-93' action='modify' visible='true' lat='0.03967486460801543' lon='0.8511083807156015' />
<node id='-92' action='modify' visible='true' lat='0.2096131480715248' lon='0.5994991376749135' />
<node id='-69' action='modify' visible='true' lat='0.26302812355087024' lon='0.27084293293759165' />
<node id='-68' action='modify' visible='true' lat='0.05893796680132844' lon='0.04604697152647152' />
<node id='-42' action='modify' visible='true' lat='-0.20982409791135584' lon='0.011974068267005027' />
<node id='-40' action='modify' visible='true' lat='-0.21121932961473797' lon='0.9056535149055025' />
<node id='-38' action='modify' visible='true' lat='0.3883099615915542' lon='0.9065895247230221' />
<node id='-36' action='modify' visible='true' lat='0.38970517055516746' lon='0.012910078084524709' />
<node id='-34' action='modify' visible='true' lat='0.3118185090592599' lon='0.07145061369178042' />
<node id='-32' action='modify' visible='true' lat='0.3105586956821123' lon='0.3750701157617382' />
<node id='-30' action='modify' visible='true' lat='0.3111886023894954' lon='0.514281547208752' />
<node id='-28' action='modify' visible='true' lat='0.3099287889371784' lon='0.8179010492787097' />
<node id='-26' action='modify' visible='true' lat='-0.01562962731515521' lon='0.09323275285705514' />
<node id='-24' action='modify' visible='true' lat='0.18846110288315726' lon='0.3180287142681753' />
<node id='-22' action='modify' visible='true' lat='0.27779079174549004' lon='0.6437316506608692' />
<node id='-20' action='modify' visible='true' lat='0.10785306850072697' lon='0.8953408937015574' />
<node id='-18' action='modify' visible='true' lat='0.18384945467557984' lon='0.3746377051316065' />
<node id='-16' action='modify' visible='true' lat='-0.11957497643332685' lon='0.3855811820622415' />
<node id='-14' action='modify' visible='true' lat='0.18888875585009277' lon='0.5371560278163559' />
<node id='-12' action='modify' visible='true' lat='-0.11453565911646134' lon='0.5480995047469907' />
<node id='-10' action='modify' visible='true' lat='0.06363313935634328' lon='0.250346751840884' />
<node id='-8' action='modify' visible='true' lat='0.06363313935634328' lon='0.2843622147283897' />
<node id='-6' action='modify' visible='true' lat='0.06993229486822683' lon='0.6673511302025271' />
<node id='-4' action='modify' visible='true' lat='0.0686724638310369' lon='0.7038862570076257' />
<way id='-91' action='modify' visible='true'>
<nd ref='-93' />
<nd ref='-92' />
</way>
<way id='-368' action='modify' visible='true'>
<nd ref='-366' />
<nd ref='-367' />
<way id='-67' action='modify' visible='true'>
<nd ref='-69' />
<nd ref='-68' />
</way>
<way id='-204' action='modify' visible='true'>
<nd ref='-206' />
<nd ref='-205' />
</way>
<way id='-179' action='modify' visible='true'>
<nd ref='-180' />
<nd ref='-181' />
</way>
<way id='-161' action='modify' visible='true'>
<nd ref='-162' />
<nd ref='-163' />
</way>
<way id='-131' action='modify' visible='true'>
<nd ref='-132' />
<nd ref='-133' />
</way>
<way id='-75' action='modify' visible='true'>
<nd ref='-77' />
<nd ref='-76' />
</way>
<way id='-68' action='modify' visible='true'>
<nd ref='-66' />
<nd ref='-67' />
</way>
<way id='-56' action='modify' visible='true'>
<nd ref='-54' />
<nd ref='-55' />
<nd ref='-57' />
<nd ref='-59' />
<nd ref='-54' />
<way id='-60' action='modify' visible='true'>
<nd ref='-42' />
<nd ref='-40' />
<nd ref='-38' />
<nd ref='-36' />
<nd ref='-42' />
<tag k='type' v='boundary' />
</way>
<way id='-58' action='modify' visible='true'>
<nd ref='-34' />
<nd ref='-32' />
</way>
<way id='-56' action='modify' visible='true'>
<nd ref='-28' />
<nd ref='-30' />
</way>
<way id='-54' action='modify' visible='true'>
<nd ref='-26' />
<nd ref='-24' />
</way>
<way id='-52' action='modify' visible='true'>
<nd ref='-22' />
<nd ref='-20' />
</way>
<way id='-50' action='modify' visible='true'>
<nd ref='-18' />
<nd ref='-16' />
</way>
<way id='-48' action='modify' visible='true'>
<nd ref='-12' />
<nd ref='-14' />
</way>
<way id='-46' action='modify' visible='true'>
<nd ref='-10' />
<nd ref='-8' />
</way>
<way id='-44' action='modify' visible='true'>
<nd ref='-4' />
<nd ref='-6' />
</way>
</osm>

138
tests/visual_tests/grids/text-bug1533-600-600-1.0-grid-reference.json
View file

@ -1,14 +1,16 @@
{
"keys": [
"",
"-68",
"-75",
"-131",
"-161",
"-204",
"-179",
"-372",
"-368"
"-58",
"-56",
"-52",
"-67",
"-91",
"-54",
"-48",
"-50",
"-44",
"-46"
],
"data": {},
"grid": [
@ -56,72 +58,72 @@
" !! ! !! # ## # ## ",
" ! # # ",
" ",
" $ ",
" $ ",
" % $ ",
" % $ ",
" % $ ",
" % $ ",
" % $$ ",
" $ ",
" % $ $ ",
" % $$ $ ",
" %% $$ $$$$ ",
" %% & $$$$ $ ",
" % & $$ ",
" % & $ ",
" % % & $ $$$$ $ ",
" % %% ' ( & $$$ ",
" %% ' ( & $ $$ $ ",
" %% % % ' ) ( & $$ $ ",
" %% %% % ' ) ( & $$$$ $$$ ",
" %% % ' ) ( & & $ ",
" %% %%% ' ) ( & && $$$ ",
" %%% % ' ) ( & & & $$ ",
" %% ' ) ( &&& & $$ ",
" %%% ' ) ( &&& & $ ",
" % % ' ) & && $ ",
" % % ' ) & & & & $ ",
" % '' ' ) && &&& $ ",
" % '' ) (( & & && $ ",
" %% ' )) && && ",
" % ' ' ) &&& && ",
" % ' '' ) && & ",
" % ' '' ' ' '' & & ",
" % '' '' '' && ",
" % ' ' ( & ",
" % ''' ' ( **** & ",
" % '' '' ++++++ ) )) ( (( (( & ",
" ''' '' + ) )) (( ( & ",
" '' ' )) ( & ",
" ' ) (( (( & ",
" '' ) ))) (( (( & ",
" ' ) )) (( (( ",
" ' )) ) )) (( ( ( ",
" ' )) ( ( ( ",
" ) ) ( ( ( ( ",
" ' )) (( ( ( ",
" ' )) )) ) ( ( ",
" ' ) ( ",
" ' ) ( ",
" ' ) ( ",
" ) ( ",
" ) ( ",
" ) ( ",
" ) (( ",
" ) ",
" ) ",
" ) ",
" ) ",
" ) ",
" ) ",
" ",
" ",
" ",
" ",
" ",
" ",
" $ ",
" $ % ",
" $ % ",
" $ % ",
" $ % ",
" $ % ",
" % ",
" $ %% ",
" $$ %% ",
" $ & % %% ",
" $ & % % ",
" $ ' & % % ",
" $$ $ ' & %%% % ",
" $ ' & %%% % ",
" $ $ ' & % ",
" $$ $$ ' & %% % ",
" $$$ $$$ $ ' & % %% ",
" $ $ $$ $$ ' & % % % ",
" $ $$ $ $$$ ' %% % ",
" $$$ ' %%%% %% ",
" $$ $$ ' % % ",
" $$ ' && %% ",
" $ '' %% ",
" $ ' % ",
" $$ ' % ",
" $ % ",
" $ % ",
" $ & % ",
" $ & (((( % ",
" $ )))))) ' '' & && && ",
" $ ) ' '' && & ",
" $ '' & ",
" $ ' && && ",
" $ ' ''' && && ",
" ' '' && && ",
" '' ' '' && & & ",
" '' & & & ",
" ' ' & & & & ",
" '' && & & ",
" '' '' ' & & ",
" ' & ",
" ' & ",
" ' & ",
" ' & ",
" ' & ",
" ' & ",
" ' && ",
" ' ",
" ' ",
" ' ",
" ' ",
" ' ",
" ' ",
" ",
" ",
" ",
" ",
" ",
" ",
" & ",
" ( ",
" ",
" ",
" ",

BIN
tests/visual_tests/images/text-bug1533-600-600-1.0-agg-reference.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
tests/visual_tests/images/text-bug1533-600-600-1.0-cairo-reference.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
tests/visual_tests/images/text-bug1533-600-600-2.0-agg-reference.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 29 KiB

BIN
tests/visual_tests/images/text-bug1533-600-600-2.0-cairo-reference.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 27 KiB