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

stop using deprecated marker-type in visual tests

Browse source
This commit is contained in:
Dane Springmeyer 2015-01-09 10:26:20 -08:00
parent 879e9d517b
commit ad3e214beb
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/visual_tests/styles/marker-collide.xml
View file

@ -17,8 +17,8 @@
<Style name="point-placement">
<Rule>
<MarkersSymbolizer placement="line" marker-type="ellipse" fill="blue" transform="scale(1.5,.3)" spacing="1" allow-overlap="false"/>
<MarkersSymbolizer placement="line" marker-type="ellipse" fill="blue" transform="scale(.3,1.5)" spacing="1" allow-overlap="false"/>
<MarkersSymbolizer placement="line" file="shape://ellipse" fill="blue" transform="scale(1.5,.3)" spacing="1" allow-overlap="false"/>
<MarkersSymbolizer placement="line" file="shape://ellipse" fill="blue" transform="scale(.3,1.5)" spacing="1" allow-overlap="false"/>
</Rule>
</Style>

10
tests/visual_tests/styles/marker-on-line-and-line-placement.xml
View file

@ -12,11 +12,11 @@
</Style>
<Style name="point-placement" filter-mode="first" >
<Rule>
<MarkersSymbolizer stroke-width="0" allow-overlap="true" placement="line" marker-type="ellipse" fill="red" />
<MarkersSymbolizer stroke-width="0" offset="-10" transform="translate(0,-10)" allow-overlap="true" placement="line" marker-type="ellipse" fill="darkred" />
<MarkersSymbolizer stroke-width="0" allow-overlap="true" smooth=".5" transform="translate(10,10) translate(-10,-10)" placement="line" marker-type="ellipse" fill="blue" />
<MarkersSymbolizer stroke-width="0" allow-overlap="true" smooth="1" placement="line" marker-type="ellipse" fill="orange" />
<MarkersSymbolizer stroke-width="0" allow-overlap="true" smooth="1" geometry-transform="translate(10,10)" placement="line" marker-type="ellipse" fill="darkgreen" />
<MarkersSymbolizer stroke-width="0" allow-overlap="true" placement="line" file="shape://ellipse" fill="red" />
<MarkersSymbolizer stroke-width="0" offset="-10" transform="translate(0,-10)" allow-overlap="true" placement="line" file="shape://ellipse" fill="darkred" />
<MarkersSymbolizer stroke-width="0" allow-overlap="true" smooth=".5" transform="translate(10,10) translate(-10,-10)" placement="line" file="shape://ellipse" fill="blue" />
<MarkersSymbolizer stroke-width="0" allow-overlap="true" smooth="1" placement="line" file="shape://ellipse" fill="orange" />
<MarkersSymbolizer stroke-width="0" allow-overlap="true" smooth="1" geometry-transform="translate(10,10)" placement="line" file="shape://ellipse" fill="darkgreen" />
</Rule>
</Style>
<Layer name="carto_tests">

2
tests/visual_tests/styles/marker-on-line-and-vertex-first-placement.xml
View file

@ -11,7 +11,7 @@
</Style>
<Style name="markers">
<Rule>
<MarkersSymbolizer marker-type="ellipse" placement="[placement]" />
<MarkersSymbolizer file="shape://ellipse" placement="[placement]" />
<DebugSymbolizer />
</Rule>
</Style>

2
tests/visual_tests/styles/marker-on-line-and-vertex-last-placement.xml
View file

@ -11,7 +11,7 @@
</Style>
<Style name="markers">
<Rule>
<MarkersSymbolizer marker-type="ellipse" placement="[placement]" />
<MarkersSymbolizer file="shape://ellipse" placement="[placement]" />
<DebugSymbolizer />
</Rule>
</Style>

2
tests/visual_tests/styles/marker-on-line.xml
View file

@ -9,7 +9,7 @@
</Style>
<Style name="point-placement" filter-mode="first" >
<Rule>
<MarkersSymbolizer placement="point" marker-type="ellipse" fill="blue" />
<MarkersSymbolizer placement="point" file="shape://ellipse" fill="blue" />
<DebugSymbolizer />
</Rule>
</Style>

6
tests/visual_tests/styles/marker_line_placement_on_points.xml
View file

@ -4,15 +4,15 @@
<Style name="1">
<Rule>
<Filter>[id]=1</Filter>
<MarkersSymbolizer fill="darkgreen" opacity=".7" width="15" height="10" stroke="green" stroke-width="7" stroke-opacity=".2" placement="line" marker-type="ellipse"/>
<MarkersSymbolizer fill="darkgreen" opacity=".7" width="15" height="10" stroke="green" stroke-width="7" stroke-opacity=".2" placement="line" file="shape://ellipse"/>
</Rule>
<Rule>
<Filter>[id]=2</Filter>
<MarkersSymbolizer fill="darkorange" opacity=".7" width="20" height="10" stroke="orange" stroke-width="7" stroke-opacity=".2" placement="line" marker-type="ellipse"/>
<MarkersSymbolizer fill="darkorange" opacity=".7" width="20" height="10" stroke="orange" stroke-width="7" stroke-opacity=".2" placement="line" file="shape://ellipse"/>
</Rule>
<Rule>
<Filter>[id]=3</Filter>
<MarkersSymbolizer fill="darkred" opacity=".7" width="20" height="10" stroke="orange" stroke-width="7" stroke-opacity=".2" placement="line" marker-type="ellipse"/>
<MarkersSymbolizer fill="darkred" opacity=".7" width="20" height="10" stroke="orange" stroke-width="7" stroke-opacity=".2" placement="line" file="shape://ellipse"/>
</Rule>
</Style>
<Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">