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

Merge pull request #2330 from MapQuest/jh-min-distance-test

Browse source 
Test case for minimum distance
This commit is contained in:
Dane Springmeyer 2014-08-03 12:39:40 -07:00
commit a7586b28a0
14 changed files with 256 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/visual_tests/data/repeat-labels.csv Normal file
View file

@ -0,0 +1,10 @@
wkt,type,name,ref
"POINT(-3 -0.40)",poi,,
"POINT(3 -0.40)",poi,,
"POINT(-3 -3.6)",poi,,
"POINT(3 -3.6)",poi,,
"LINESTRING(-12 2, 12 2)",motorway,First Hwy,1
"LINESTRING(-12 1, 12 1)",motorway,First Hwy,1
"LINESTRING(-12 3, 12 3)",motorway,Second Hwy,2
"LINESTRING(-12 -1, 8 -1, 8 -2, -8 -2, -8 -3, 12 -3)",secondary,Main Street,
1 wkt type name ref
2 POINT(-3 -0.40) poi
3 POINT(3 -0.40) poi
4 POINT(-3 -3.6) poi
5 POINT(3 -3.6) poi
6 LINESTRING(-12 2, 12 2) motorway First Hwy 1
7 LINESTRING(-12 1, 12 1) motorway First Hwy 1
8 LINESTRING(-12 3, 12 3) motorway Second Hwy 2
9 LINESTRING(-12 -1, 8 -1, 8 -2, -8 -2, -8 -3, 12 -3) secondary Main Street

79
tests/visual_tests/grids/repeat-labels-1-750-250-1.0-grid-reference.json Normal file
View file

@ -0,0 +1,79 @@
{
"keys": [
"",
"7",
"5",
"6",
"1",
"2",
"8",
"3",
"4"
],
"data": {},
"grid": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",
" !!!! ! !!!! ! !!!!! ! !!!! !!!! !!!!! ",
" ",
" ",
" ",
" ",
" #### #### ##### #### #### #### ",
"############################################################################################################################################################################################",
"############################################################################################################################################################################################",
" #### # #### # ##### # #### # #### #### ",
" ",
" ",
" ",
" ",
" $$$$ $$$$ $ $$$$$ $$$$ $ $$$$ $ $$$$ ",
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
" $ $ $ $ ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" % & ",
" %%% &&& ",
" %%% &&& ",
" ",
" ",
"'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' ",
"'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' ",
"'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' ",
" '' ",
" '' ",
" '' ",
" '' ",
" '' ",
" ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' ",
" ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' ",
" '' ",
" '' ",
" '' ",
" '' ",
" '' ",
" '' ",
" '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''",
" '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''",
" ",
" ",
" ( ) ",
" ((( ))) ",
" ((( ))) ",
" ",
" "
]
}

79
tests/visual_tests/grids/repeat-labels-2-750-250-1.0-grid-reference.json Normal file
View file

@ -0,0 +1,79 @@
{
"keys": [
"",
"7",
"5",
"6",
"1",
"2",
"8",
"3",
"4"
],
"data": {},
"grid": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",
" ",
" ",
" ",
" ",
" ",
" #### #### ##### #### #### #### ",
"############################################################################################################################################################################################",
"############################################################################################################################################################################################",
" #### #### ##### #### #### #### ",
" ",
" ",
" ",
" ",
" ",
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" % & ",
" %%% &&& ",
" %%% &&& ",
" ",
" ",
"'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' ",
"'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' ",
"'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' ",
" '' ",
" '' ",
" '' ",
" '' ",
" '' ",
" ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' ",
" ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' ",
" '' ",
" '' ",
" '' ",
" '' ",
" '' ",
" '' ",
" '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''",
" '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''",
" ",
" ",
" ( ) ",
" ((( ))) ",
" ((( ))) ",
" ",
" "
]
}

BIN
tests/visual_tests/images/repeat-labels-1-750-250-1.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.3 KiB

BIN
tests/visual_tests/images/repeat-labels-1-750-250-1.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5 KiB

BIN
tests/visual_tests/images/repeat-labels-1-750-250-2.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
tests/visual_tests/images/repeat-labels-1-750-250-2.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
tests/visual_tests/images/repeat-labels-2-750-250-1.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
tests/visual_tests/images/repeat-labels-2-750-250-1.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
tests/visual_tests/images/repeat-labels-2-750-250-2.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3 KiB

BIN
tests/visual_tests/images/repeat-labels-2-750-250-2.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.1 KiB

43
tests/visual_tests/styles/repeat-labels-1.xml Normal file
View file

@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map>
<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<Style name="line">
<Rule>
<LineSymbolizer stroke-width="8" stroke="orange"/>
</Rule>
</Style>
<Style name="marker">
<Rule>
<Filter>[type] = 'poi'</Filter>
<MarkersSymbolizer />
</Rule>
</Style>
<Style name="shield">
<Rule>
<Filter>[type] = 'motorway'</Filter>
<ShieldSymbolizer minimum-distance="0" spacing="120" placement="line" face-name="DejaVu Sans Book" size="10" fill="white" file="../../data/svg/rect.svg" transform="scale(0.75)">[ref]</ShieldSymbolizer>
</Rule>
</Style>
<Style name="text">
<Rule>
<Filter>[type] != 'poi'</Filter>
<TextSymbolizer minimum-distance="0" spacing="70" placement="line" face-name="DejaVu Sans Book" size="12">[name]</TextSymbolizer>
</Rule>
</Style>
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>line</StyleName>
<StyleName>marker</StyleName>
<StyleName>shield</StyleName>
<StyleName>text</StyleName>
<Datasource>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/repeat-labels.csv</Parameter>
</Datasource>
</Layer>
</Map>

43
tests/visual_tests/styles/repeat-labels-2.xml Normal file
View file

@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map>
<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<Style name="line">
<Rule>
<LineSymbolizer stroke-width="8" stroke="orange"/>
</Rule>
</Style>
<Style name="marker">
<Rule>
<Filter>[type] = 'poi'</Filter>
<MarkersSymbolizer />
</Rule>
</Style>
<Style name="shield">
<Rule>
<Filter>[type] = 'motorway'</Filter>
<ShieldSymbolizer minimum-distance="60" spacing="120" placement="line" face-name="DejaVu Sans Book" size="10" fill="white" file="../../data/svg/rect.svg" transform="scale(0.75)">[ref]</ShieldSymbolizer>
</Rule>
</Style>
<Style name="text">
<Rule>
<Filter>[type] != 'poi'</Filter>
<TextSymbolizer minimum-distance="50" spacing="70" placement="line" face-name="DejaVu Sans Book" size="12">[name]</TextSymbolizer>
</Rule>
</Style>
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>line</StyleName>
<StyleName>marker</StyleName>
<StyleName>shield</StyleName>
<StyleName>text</StyleName>
<Datasource>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/repeat-labels.csv</Parameter>
</Datasource>
</Layer>
</Map>

2
tests/visual_tests/test.py
View file

@ -159,6 +159,8 @@ files = {
'rtl-point': {'sizes': [(200, 200)],'bbox':default_text_box},
'jalign-auto': {'sizes': [(200, 200)],'bbox':default_text_box},
'line-offset': {'sizes':[(900, 250)],'bbox': mapnik.Box2d(-5.192, 50.189, -5.174, 50.195)},
'repeat-labels-1': {'sizes': [(750,250)],'bbox':mapnik.Box2d(-12, -4, 12, 4)},
'repeat-labels-2': {'sizes': [(750,250)],'bbox':mapnik.Box2d(-12, -4, 12, 4)},
'text-bug1532': {'sizes': [(600, 165)]},
'text-bug1533': {'sizes': [(600, 600)]},
'text-bug1820-1': {'sizes': [(600, 300)], 'bbox': default_text_box},