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

Merge pull request #2461 from mapycz/test-data-binding

Browse source 
add visual test - text data binding
This commit is contained in:
Dane Springmeyer 2014-10-18 10:14:13 -07:00
commit 29c8ba5ef6
10 changed files with 394 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
tests/visual_tests/data/text-data-binding.sqlite Normal file
View file

Binary file not shown.

134
tests/visual_tests/grids/text-data-binding-500-500-1.0-grid-reference.json Normal file
View file

@ -0,0 +1,134 @@
{
"keys": [
"",
"1"
],
"data": {},
"grid": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" !!!!!!! ",
" !!!!!!!!!!!!!!!!!!!!!!!! ",
" !!!!!!!!!!!!!!!!!!!!!!!! ",
" !!!!!!!!!!!!!!!!!!!!!!!! ",
" ! ! !!!!!!!!!!!!!!!!!!!!!!! !! ! ! !! ! ! ! ",
" ! !!!! ! !! !! !!! !!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!! !!!!! ! !! !! ! !! !! !! ",
" !! ! !! !!!! ! !!!!!!!!!!!!!!!!!!!!!!!!!! ! !!!! !! !!!!!!! !!! ! ! !! ! ! !! ! !! ",
" !!!!! ! ! !! ! !!! ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! !!!!!!!!!!! ! !! ! ! ! ! ! ",
" !!!!!!!!!!!!!!!!!!!!!!!! ",
" ! !! ! ! ! !!!!!!!!!!!!!!!!!!!!!!!! ",
" !!! ! ! !! ! !! !!!!! ! !! !!!!! ! ! ",
" ! !!!! ! !! !!!!!! !!!!!!!!!!!!!! !!!!! !!!!! ! !! ! ",
" ! !! ! ",
" ! !!! ! ! ",
" !! !!! !!! ",
" !! !! ",
" !!!! ! ! ! ",
" !! ! ! !! ! ",
" ! !!!!!! ! ! ",
" ! !! !! !! ",
" !!! !! ",
" !! !!! ",
" ! !!! !!! ! ",
" ! !!!!! !!!! ",
" !! !!!! ",
" ! ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" !!! ! ! ! !! ! ! ! ",
" ! !! !!!!! !! !!!!!!!! !!!! ",
" ! ! !! ! ! !! !!! ",
" !! ",
" ! ",
" ! !! !!!!! !! ! ! !!!! ! !! ",
" !! ! !! ! !!! !!!!!!!! ",
" ! !!!! !!!!!! ! !!!!!! ! !! ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
]
}

133
tests/visual_tests/grids/text-data-binding-500-500-2.0-grid-reference.json Normal file
View file

@ -0,0 +1,133 @@
{
"keys": [
""
],
"data": {},
"grid": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
]
}

BIN
tests/visual_tests/images/text-data-binding-500-500-1.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
tests/visual_tests/images/text-data-binding-500-500-1.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
tests/visual_tests/images/text-data-binding-500-500-2.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
tests/visual_tests/images/text-data-binding-500-500-2.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 24 KiB

34
tests/visual_tests/styles/postgis-inline.xml
View file

File diff suppressed because one or more lines are too long

99
tests/visual_tests/styles/text-data-binding.xml Normal file
View file

@ -0,0 +1,99 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map>
<Map background-color="white" srs="+proj=latlong +datum=WGS84">
<Layer name="l1" srs="+proj=latlong +datum=WGS84">
<StyleName>text</StyleName>
<Datasource>
<Parameter name="type">sqlite</Parameter>
<Parameter name="file">../data/text-data-binding.sqlite</Parameter>
<Parameter name="table">text_layer</Parameter>
<Parameter name="extent">-1,-1,1,1</Parameter>
</Datasource>
</Layer>
<Layer name="l2" srs="+proj=latlong +datum=WGS84">
<StyleName>circular</StyleName>
<Datasource>
<Parameter name="type">sqlite</Parameter>
<Parameter name="file">../data/text-data-binding.sqlite</Parameter>
<Parameter name="table">circular_layer</Parameter>
<Parameter name="extent">-1,-1,1,1</Parameter>
</Datasource>
</Layer>
<Style name="circular">
<Rule>
<LineSymbolizer
stroke-width="[double] * 2"
stroke="[color2]" />
<TextSymbolizer
placement="[placement]"
face-name="DejaVu Serif Book"
spacing="[double] * 2"
repeat-distance="[double] * 2"
fill="[color1]"
>
[text1]
</TextSymbolizer>
<TextSymbolizer
geometry-transform="scale(0.7)"
placement="[placement]"
face-name="DejaVu Sans Book"
spacing="[double]"
>
[text1]
</TextSymbolizer>
<LineSymbolizer
stroke-width="[double] * 2"
geometry-transform="scale(0.25) translate(300, 300)"
stroke="[color2]" />
<TextSymbolizer
geometry-transform="scale(0.25) translate(300, 300)"
size="[double] * 2"
placement="[placement]"
face-name="DejaVu Sans Book"
horizontal-alignment="[alignment]"
allow-overlap="[bool]"
max-char-angle-delta="[double] * 0"
fill="[color3]"
>
[text2]
</TextSymbolizer>
</Rule>
</Style>
<Style name="text">
<Rule>
<TextSymbolizer
face-name="DejaVu Serif Book"
size="[double] * 1.5"
placement="[placement1]"
vertical-alignment="[alignment1]"
horizontal-alignment="[alignment1]"
margin="[double] * 5"
upright="[upright]"
>
<Layout wrap-before="[bool]" wrap-width="[double] * 40" justify-alignment="[alignment2]">
<Format line-spacing="[double] * 3">[text1]</Format>" "
<Format fill="[color1]" font-feature-settings="[features]">[text2]</Format>" "
<Format halo-fill="[color2]" halo-radius="[double] * 0.8" size="[double] * 3">[text3]</Format>" "
<Format face-name="DejaVu Serif Bold">[text4]</Format>" "
<Format face-name="DejaVu Sans Mono Bold" character-spacing="[double] * 0.8">[text5]</Format>" "
<Format>[text6]</Format>" "
<Format>[text7]</Format>" "
<Format>[text8]</Format>" "
<Format>[text9]</Format>
</Layout>
<Layout dy="[double] * 5" dx="[double] * 2" rotate-displacement="[bool]" orientation="[double] * 1.25">
<Format>[text10]</Format>" "
<Format face-name="DejaVu Sans Book">[text11]</Format>" "
<Format text-transform="[text_transform]">[text12]</Format>
</Layout>
<Layout dy="[double] * 15" dx="[double] * -5" wrap-width="[double]" wrap-character="[wrap_char]">
<Format>[text13]</Format>" "
</Layout>
<Layout dy="[double] * 15" dx="[double] * 5" wrap-width="[double]" wrap-character="[wrap_char]" repeat-wrap-character="[bool]">
<Format>[text13]</Format>" "
</Layout>
</TextSymbolizer>
</Rule>
</Style>
</Map>

1
tests/visual_tests/test.py
View file

@ -292,6 +292,7 @@ files = {
'marker-recenter-collide':{'sizes':[(256,128)], 'bbox':mapnik.Box2d(-1,-0.5,1,0.5)},
'postgis-inline':{'sizes':[(512,512)]},
'text-line-wrap':{'sizes':[(512,512)]},
'text-data-binding': {'sizes': [(500, 500)]},
}
class Reporting: