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

merge visual test style changes in from master

Browse source
This commit is contained in:
Dane Springmeyer 2013-07-12 20:09:10 -04:00
parent a75f392bca
commit c4649f86d3
25 changed files with 158 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/visual_tests/styles/expressionformat.xml
View file

@ -5,8 +5,8 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/styles/formatting-1.xml
View file

@ -5,8 +5,8 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/styles/formatting-2.xml
View file

@ -5,8 +5,8 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/styles/formatting-3.xml
View file

@ -5,8 +5,8 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/styles/formatting-4.xml
View file

@ -5,8 +5,8 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>

6
tests/visual_tests/styles/jalign-auto.xml
View file

@ -5,14 +5,14 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<Filter>[nr] = '5'</Filter>
<Filter>[nr] = 5</Filter>
<PointSymbolizer/>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dx="-30" dy="-30" justify-alignment="auto">'Text line 1&#10;line 2'</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dx="0" dy="-30" justify-alignment="auto">'Text line 1&#10;line 2'</TextSymbolizer>

10
tests/visual_tests/styles/line-offset.xml
View file

@ -4,8 +4,8 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/line-offset.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/line-offset.csv</Parameter>
</Datasource>
</Layer>
@ -14,15 +14,15 @@
<LineSymbolizer/>
</Rule>
<Rule>
<Filter>[ref]='1' or [ref]='3'</Filter>
<Filter>[ref]=1 or [ref]=3</Filter>
<TextSymbolizer size="14" fill="#000" spacing="1" placement="line" face-name="DejaVu Sans Book" halo-radius="1" dy="-10" vertical-alignment="middle">'Some Text'</TextSymbolizer>
</Rule>
<Rule>
<Filter>[ref]='2' or [ref]='4'</Filter>
<Filter>[ref]=2 or [ref]=4</Filter>
<TextSymbolizer size="14" fill="#000" spacing="1" placement="line" face-name="DejaVu Sans Book" halo-radius="1" dy="10" vertical-alignment="middle">'Some Text'</TextSymbolizer>
</Rule>
<Rule>
<Filter>[name]!=''</Filter>
<Filter>[name]</Filter>
<TextSymbolizer size="10" fill="#000" placement="line" face-name="DejaVu Sans Book" halo-radius="1">[name]</TextSymbolizer>
</Rule>
</Style>

5
tests/visual_tests/styles/lines-1.xml
View file

@ -5,13 +5,14 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/lines.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/lines.csv</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<Filter>[mapnik::geometry_type]=linestring</Filter>
<LineSymbolizer stroke-width="12" stroke="red"/>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="line">[name]</TextSymbolizer>
</Rule>

5
tests/visual_tests/styles/lines-2.xml
View file

@ -5,13 +5,14 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/lines.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/lines.csv</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<Filter>[mapnik::geometry_type]=linestring</Filter>
<LineSymbolizer stroke-width="12" stroke="red"/>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="line">[name]<Format size="8" fill="blue">[name]</Format></TextSymbolizer>
</Rule>

5
tests/visual_tests/styles/lines-3.xml
View file

@ -5,13 +5,14 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/lines.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/lines.csv</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<Filter>[mapnik::geometry_type]=linestring</Filter>
<LineSymbolizer stroke-width="12" stroke="red"/>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="line" spacing="20">[name]</TextSymbolizer>
</Rule>

5
tests/visual_tests/styles/lines-shield.xml
View file

@ -5,13 +5,14 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/lines.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/lines.csv</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<Filter>[mapnik::geometry_type]=linestring</Filter>
<LineSymbolizer stroke-width="1" stroke="blue"/>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="line" file="../../data/svg/crosshair16x16.svg" spacing="30">'X'</ShieldSymbolizer>
</Rule>

4
tests/visual_tests/styles/list.xml
View file

@ -5,8 +5,8 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>

6
tests/visual_tests/styles/rtl-point.xml
View file

@ -5,14 +5,14 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<Filter>[nr]='5'</Filter>
<Filter>[nr]=5</Filter>
<PointSymbolizer/>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" dx="0" dy="16" wrap-width="10">'مخيّم دير البلح'</TextSymbolizer>
</Rule>

24
tests/visual_tests/styles/shieldsymbolizer-1.xml
View file

@ -6,50 +6,50 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<Filter>[nr] = '1'</Filter>
<Filter>[nr] = 1</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '2'</Filter>
<Filter>[nr] = 2</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="middle" dx="5">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '3'</Filter>
<Filter>[nr] = 3</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" vertical-alignment="middle" dy="5">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '4'</Filter>
<Filter>[nr] = 4</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" dy="0" vertical-alignment="bottom">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '5'</Filter>
<Filter>[nr] = 5</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" vertical-alignment="top">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '6'</Filter>
<Filter>[nr] = 6</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="left">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '7'</Filter>
<Filter>[nr] = 7</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="right">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '8'</Filter>
<Filter>[nr] = 8</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg">'X&#10;X&#10;X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '9'</Filter>
<Filter>[nr] = 9</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg">'XXX'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '10'</Filter>
<Filter>[nr] = 10</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/images/crosshair16x16.png">'X'</ShieldSymbolizer>
</Rule>
<Rule>

4
tests/visual_tests/styles/simple-E.xml
View file

@ -5,8 +5,8 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/styles/simple-N.xml
View file

@ -5,8 +5,8 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/styles/simple-NE.xml
View file

@ -5,8 +5,8 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/styles/simple-NW.xml
View file

@ -5,8 +5,8 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/styles/simple-S.xml
View file

@ -5,8 +5,8 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/styles/simple-SE.xml
View file

@ -5,8 +5,8 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/styles/simple-SW.xml
View file

@ -5,8 +5,8 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/styles/simple-W.xml
View file

@ -5,8 +5,8 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/styles/simple-shield.xml
View file

@ -5,8 +5,8 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>

8
tests/visual_tests/styles/simple.xml
View file

@ -5,15 +5,15 @@
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<PointSymbolizer/>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" dx="5" dy="16" placement-type="simple" placements="N,S,E,W,SW,10,5">[name]</TextSymbolizer>
<PointSymbolizer clip="false" />
<TextSymbolizer clip="false" face-name="DejaVu Sans Book" size="16" placement="point" dx="5" dy="16" placement-type="simple" placements="N,S,E,W,SW,10,5">[name]</TextSymbolizer>
</Rule>
</Style>

108
tests/visual_tests/styles/text-halo-rasterizer.xml
View file

@ -2,7 +2,29 @@
<Style name="labels">
<Rule>
<Filter>([id]=0)</Filter>
<Filter>([id]=0.1)</Filter>
<TextSymbolizer
face-name="DejaVu Sans Book"
size="15"
halo-rasterizer="fast"
halo-radius=".1"
>
'fast .1'
</TextSymbolizer>
</Rule>
<Rule>
<Filter>([id]=0.3)</Filter>
<TextSymbolizer
face-name="DejaVu Sans Book"
size="15"
halo-rasterizer="fast"
halo-radius=".3"
>
'fast .3'
</TextSymbolizer>
</Rule>
<Rule>
<Filter>([id]=0.5)</Filter>
<TextSymbolizer
face-name="DejaVu Sans Book"
size="15"
@ -13,7 +35,18 @@
</TextSymbolizer>
</Rule>
<Rule>
<Filter>([id]=1)</Filter>
<Filter>([id]=0.7)</Filter>
<TextSymbolizer
face-name="DejaVu Sans Book"
size="15"
halo-rasterizer="fast"
halo-radius=".7"
>
'fast .7'
</TextSymbolizer>
</Rule>
<Rule>
<Filter>([id]=1.0)</Filter>
<TextSymbolizer
face-name="DejaVu Sans Book"
size="15"
@ -24,7 +57,7 @@
</TextSymbolizer>
</Rule>
<Rule>
<Filter>([id]=2)</Filter>
<Filter>([id]=1.5)</Filter>
<TextSymbolizer
face-name="DejaVu Sans Book"
size="15"
@ -35,7 +68,7 @@
</TextSymbolizer>
</Rule>
<Rule>
<Filter>([id]=3)</Filter>
<Filter>([id]=2.5)</Filter>
<TextSymbolizer
face-name="DejaVu Sans Book"
size="15"
@ -57,7 +90,27 @@
</TextSymbolizer>
</Rule>
<Rule>
<Filter>([id]=5)</Filter>
<Filter>([id]=100.1)</Filter>
<TextSymbolizer
face-name="DejaVu Sans Book"
size="15"
halo-radius=".1"
>
'full .1'
</TextSymbolizer>
</Rule>
<Rule>
<Filter>([id]=100.3)</Filter>
<TextSymbolizer
face-name="DejaVu Sans Book"
size="15"
halo-radius=".3"
>
'full .3'
</TextSymbolizer>
</Rule>
<Rule>
<Filter>([id]=100.5)</Filter>
<TextSymbolizer
face-name="DejaVu Sans Book"
size="15"
@ -67,7 +120,17 @@
</TextSymbolizer>
</Rule>
<Rule>
<Filter>([id]=6)</Filter>
<Filter>([id]=100.7)</Filter>
<TextSymbolizer
face-name="DejaVu Sans Book"
size="15"
halo-radius=".7"
>
'full .7'
</TextSymbolizer>
</Rule>
<Rule>
<Filter>([id]=101)</Filter>
<TextSymbolizer
face-name="DejaVu Sans Book"
size="15"
@ -77,7 +140,7 @@
</TextSymbolizer>
</Rule>
<Rule>
<Filter>([id]=7)</Filter>
<Filter>([id]=101.5)</Filter>
<TextSymbolizer
face-name="DejaVu Sans Book"
size="15"
@ -87,7 +150,7 @@
</TextSymbolizer>
</Rule>
<Rule>
<Filter>([id]=8)</Filter>
<Filter>([id]=102.5)</Filter>
<TextSymbolizer
face-name="DejaVu Sans Book"
size="15"
@ -97,7 +160,7 @@
</TextSymbolizer>
</Rule>
<Rule>
<Filter>([id]=9)</Filter>
<Filter>([id]=104)</Filter>
<TextSymbolizer
face-name="DejaVu Sans Book"
size="15"
@ -114,17 +177,24 @@
<Parameter name="type">csv</Parameter>
<Parameter name="inline">
id,x,y
0,1.5,1
1,1.5,2
2,1.5,3
3,1.5,4
4,1.5,4.5
0.1,1.5,4.5
0.3,1.5,4
0.5,1.5,3.5
0.7,1.5,3
1,1.5,2.5
1.5,1.5,2
2.5,1.5,1.5
4,1.5,1
100.1,3.5,4.5
100.3,3.5,4
100.5,3.5,3.5
100.7,3.5,3
101,3.5,2.5
101.5,3.5,2
102.5,3.5,1.5
104,3.5,1
5,3.5,1
6,3.5,2
7,3.5,3
8,3.5,4
9,3.5,4.5
</Parameter>
</Datasource>
</Layer>