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

upgrade all 'good' test maps to new syntax for text symbolizer going forward as per #861

Browse source
This commit is contained in:
Dane Springmeyer 2011-10-03 20:24:51 +00:00
parent 4d5439672d
commit a36c365da7
26 changed files with 116 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/data/good_maps/also_and_else_filter.xml
View file

@ -14,4 +14,4 @@
<PointSymbolizer file="../data/images/also.png"/>
</Rule>
</Style>
</Map>
</Map>

14
tests/data/good_maps/bounds_clipping.xml
View file

@ -13,14 +13,7 @@ nik2img.py tests/data/good_maps/bounds_clipping.xml t.png -d 256 256 -e -2003750
+proj=krovak +lat_0=49.5 +lon_0=24.83333333333333 +alpha=30.28813975277778 +k=0.9999 +x_0=0 +y_0=0 +ellps=bessel +units=m +towgs84=498.17,136.89,510.08,6.007,4.343,3.831,3.38 +no_defs
-->
<Map
srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over"
minimum-version="2.0.0"
buffer-size="128"
maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34"
>
--><Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" minimum-version="0.7.2" buffer-size="128" maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34">
<Style name="style">
<Rule>
@ -33,10 +26,7 @@ nik2img.py tests/data/good_maps/bounds_clipping.xml t.png -d 256 256 -e -2003750
spherical mercator makes it prone to feature loss
when using map buffer
-->
<Layer
name="countries"
srs="+proj=merc +lon_0=0 +k=1 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"
>
<Layer name="countries" srs="+proj=merc +lon_0=0 +k=1 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs">
<StyleName>style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>

2
tests/data/good_maps/glyph_symbolizer.xml
View file

@ -5,4 +5,4 @@
</GlyphSymbolizer>
</Rule>
</Style>
</Map>
</Map>

4
tests/data/good_maps/interior_point.xml
View file

@ -8,13 +8,13 @@
<Rule>
<!-- Text using interior point -->
<!-- Using normal centroid algorithm -->
<TextSymbolizer dy="2" name="'interior point'" placement="interior" face-name="DejaVu Sans Book" halo-radius="2" allow-overlap="true"/>
<TextSymbolizer dy="2" placement="interior" face-name="DejaVu Sans Book" halo-radius="2" allow-overlap="true">'interior point'</TextSymbolizer>
<PointSymbolizer placement="interior" allow-overlap="true"/>
</Rule>
<Rule>
<!-- Text using interior point -->
<!-- Using normal centroid algorithm -->
<TextSymbolizer dy="-2" name="'centroid'" face-name="DejaVu Sans Book" halo-radius="2" allow-overlap="true"/>
<TextSymbolizer dy="-2" face-name="DejaVu Sans Book" halo-radius="2" allow-overlap="true">'centroid'</TextSymbolizer>
<PointSymbolizer allow-overlap="true"/>
</Rule>
</Style>

2
tests/data/good_maps/markers_symbolizer_lines.xml
View file

@ -1,5 +1,5 @@
<!DOCTYPE Map>
<Map background-color="white" srs="+init=epsg:4326" minimum-version="2.0.0">
<Map background-color="white" srs="+init=epsg:4326" minimum-version="0.7.2">
<Style name="1">
<Rule title="foo">
<MarkersSymbolizer stroke="green" stroke-width="1.3" fill="yellow"/>

2
tests/data/good_maps/markers_symbolizer_points.xml
View file

@ -1,5 +1,5 @@
<!DOCTYPE Map>
<Map background-color="white" srs="+init=epsg:4326" minimum-version="2.0.0">
<Map background-color="white" srs="+init=epsg:4326" minimum-version="0.7.2">
<Style name="1">
<Rule title="foo">

2
tests/data/good_maps/markers_symbolizer_points_gradient.xml
View file

@ -1,4 +1,4 @@
<Map srs="+init=epsg:4326" minimum-version="2.0.0">
<Map srs="+init=epsg:4326" minimum-version="0.7.2">
<Style name="1">
<Rule>

2
tests/data/good_maps/markers_symbolizer_points_stacked.xml
View file

@ -1,4 +1,4 @@
<Map background-color="lightgrey" srs="+init=epsg:4326" minimum-version="2.0.0">
<Map background-color="lightgrey" srs="+init=epsg:4326" minimum-version="0.7.2">
<Style name="1">
<Rule>

50
tests/data/good_maps/osm-styles.xml
View file

@ -53,7 +53,7 @@
<Rule>
<MaxScaleDenominator>50000000</MaxScaleDenominator>
<MinScaleDenominator>10000000</MinScaleDenominator>
<TextSymbolizer name="[place_name]" size="10" fill="#444" face-name="DejaVu Sans Book" halo-radius="1" wrap-width="0"/>
<TextSymbolizer size="10" fill="#444" face-name="DejaVu Sans Book" halo-radius="1" wrap-width="0">[place_name]</TextSymbolizer>
</Rule>
</Style>
<Style name="text">
@ -61,85 +61,85 @@
<Filter>[place] = 'city'</Filter>
<MaxScaleDenominator>10000000</MaxScaleDenominator>
<MinScaleDenominator>2000000</MinScaleDenominator>
<TextSymbolizer name="[name]" size="10" fill="#000" dy="0" face-name="DejaVu Sans Book" halo-radius="1" wrap-width="0"/>
<TextSymbolizer size="10" fill="#000" dy="0" face-name="DejaVu Sans Book" halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
</Rule>
<Rule>
<Filter>[place] = 'city'</Filter>
<MaxScaleDenominator>2000000</MaxScaleDenominator>
<MinScaleDenominator>20000</MinScaleDenominator>
<TextSymbolizer name="[name]" size="14" fill="#000" dy="0" face-name="DejaVu Sans Book" halo-radius="2" wrap-width="0"/>
<TextSymbolizer size="14" fill="#000" dy="0" face-name="DejaVu Sans Book" halo-radius="2" wrap-width="0">[name]</TextSymbolizer>
</Rule>
<Rule>
<Filter>[place] = 'town'</Filter>
<MaxScaleDenominator>2000000</MaxScaleDenominator>
<MinScaleDenominator>50000</MinScaleDenominator>
<TextSymbolizer name="[name]" size="11" fill="#000" face-name="DejaVu Sans Book" halo-radius="2" wrap-width="20"/>
<TextSymbolizer size="11" fill="#000" face-name="DejaVu Sans Book" halo-radius="2" wrap-width="20">[name]</TextSymbolizer>
</Rule>
<Rule>
<Filter>[place] = 'town'</Filter>
<MaxScaleDenominator>50000</MaxScaleDenominator>
<TextSymbolizer name="[name]" size="14" fill="#777777" face-name="DejaVu Sans Book" halo-radius="1" wrap-width="20"/>
<TextSymbolizer size="14" fill="#777777" face-name="DejaVu Sans Book" halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
</Rule>
<Rule>
<Filter>[place] = 'village'</Filter>
<MaxScaleDenominator>250000</MaxScaleDenominator>
<MinScaleDenominator>50000</MinScaleDenominator>
<TextSymbolizer name="[name]" size="8" fill="#000" face-name="DejaVu Sans Book" halo-radius="2" wrap-width="0"/>
<TextSymbolizer size="8" fill="#000" face-name="DejaVu Sans Book" halo-radius="2" wrap-width="0">[name]</TextSymbolizer>
</Rule>
<Rule>
<Filter>[place] = 'village'</Filter>
<MaxScaleDenominator>50000</MaxScaleDenominator>
<TextSymbolizer name="[name]" size="11" fill="#777777" face-name="DejaVu Sans Book" halo-radius="1" wrap-width="0"/>
<TextSymbolizer size="11" fill="#777777" face-name="DejaVu Sans Book" halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
</Rule>
<Rule>
<Filter>[place] = 'hamlet'</Filter>
<MaxScaleDenominator>125000</MaxScaleDenominator>
<TextSymbolizer name="[name]" size="8" fill="#000" face-name="DejaVu Sans Book" halo-radius="1" wrap-width="0"/>
<TextSymbolizer size="8" fill="#000" face-name="DejaVu Sans Book" halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
</Rule>
<Rule>
<Filter>[amenity] = 'pub'</Filter>
<MaxScaleDenominator>5000</MaxScaleDenominator>
<TextSymbolizer name="[name]" size="10" fill="brown" dy="16" face-name="DejaVu Sans Bold" halo-radius="1" wrap-width="0"/>
<TextSymbolizer size="10" fill="brown" dy="16" face-name="DejaVu Sans Bold" halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
</Rule>
<Rule>
<Filter>[amenity] = 'place_of_worship'</Filter>
<MaxScaleDenominator>5000</MaxScaleDenominator>
<TextSymbolizer name="[name]" size="10" fill="#000033" dy="12" face-name="DejaVu Sans Book" halo-radius="1" wrap-width="20"/>
<TextSymbolizer size="10" fill="#000033" dy="12" face-name="DejaVu Sans Book" halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
</Rule>
<Rule>
<Filter>[leisure] &lt;&gt; '' or [landuse] &lt;&gt; '' </Filter>
<MaxScaleDenominator>20000</MaxScaleDenominator>
<TextSymbolizer name="[name]" size="10" fill="#000" face-name="DejaVu Sans Book" halo-radius="2" wrap-width="10"/>
<TextSymbolizer size="10" fill="#000" face-name="DejaVu Sans Book" halo-radius="2" wrap-width="10">[name]</TextSymbolizer>
</Rule>
<Rule>
<Filter>[natural] = 'wood'</Filter>
<MaxScaleDenominator>20000</MaxScaleDenominator>
<TextSymbolizer name="[name]" size="10" fill="#000" face-name="DejaVu Sans Book" halo-radius="2" wrap-width="10"/>
<TextSymbolizer size="10" fill="#000" face-name="DejaVu Sans Book" halo-radius="2" wrap-width="10">[name]</TextSymbolizer>
</Rule>
<Rule>
<Filter>[natural] = 'peak'</Filter>
<MaxScaleDenominator>100000</MaxScaleDenominator>
<TextSymbolizer name="[name]" size="10" fill="brown" dy="10" face-name="DejaVu Sans Book" halo-radius="1" wrap-width="20"/>
<TextSymbolizer size="10" fill="brown" dy="10" face-name="DejaVu Sans Book" halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
</Rule>
<Rule>
<Filter>[natural] = 'water' or [natural] = 'lake' or [landuse] = 'reservoir'</Filter>
<MaxScaleDenominator>20000</MaxScaleDenominator>
<TextSymbolizer name="[name]" size="10" fill="#6699cc" face-name="DejaVu Sans Book" halo-radius="1" wrap-width="20"/>
<TextSymbolizer size="10" fill="#6699cc" face-name="DejaVu Sans Book" halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
</Rule>
<Rule>
<Filter>[tourism] &lt;&gt; ''</Filter>
<MaxScaleDenominator>10000</MaxScaleDenominator>
<TextSymbolizer name="[name]" size="10" fill="#660033" face-name="DejaVu Sans Book" halo-radius="2" wrap-width="10"/>
<TextSymbolizer size="10" fill="#660033" face-name="DejaVu Sans Book" halo-radius="2" wrap-width="10">[name]</TextSymbolizer>
</Rule>
<Rule>
<Filter>[amenity] = 'school' or [amenity] = 'university'</Filter>
<MaxScaleDenominator>25000</MaxScaleDenominator>
<TextSymbolizer name="[name]" size="8" fill="#000033" face-name="DejaVu Sans Book" halo-radius="2" wrap-width="12"/>
<TextSymbolizer size="8" fill="#000033" face-name="DejaVu Sans Book" halo-radius="2" wrap-width="12">[name]</TextSymbolizer>
</Rule>
<Rule>
<Filter>[amenity] = 'hospital'</Filter>
<MaxScaleDenominator>25000</MaxScaleDenominator>
<TextSymbolizer name="[name]" size="8" fill="#000033" dy="12" face-name="DejaVu Sans Book" halo-radius="2" wrap-width="12"/>
<TextSymbolizer size="8" fill="#000033" dy="12" face-name="DejaVu Sans Book" halo-radius="2" wrap-width="12">[name]</TextSymbolizer>
</Rule>
</Style>
<Style name="water">
@ -175,7 +175,7 @@
<MaxScaleDenominator>100000</MaxScaleDenominator>
<MinScaleDenominator>50000</MinScaleDenominator>
<LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0" stroke-width="4" stroke-linecap="round"/>
<TextSymbolizer name="[name]" size="8" fill="#6699cc" placement="line" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="8" fill="#6699cc" placement="line" face-name="DejaVu Sans Book" halo-radius="1">[name]</TextSymbolizer>
</Rule>
<Rule>
<ElseFilter/>
@ -188,21 +188,21 @@
<MaxScaleDenominator>25000</MaxScaleDenominator>
<MinScaleDenominator>1000</MinScaleDenominator>
<LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0" stroke-width="10" stroke-linecap="round"/>
<TextSymbolizer name="[name]" size="10" fill="#6699cc" placement="line" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="10" fill="#6699cc" placement="line" face-name="DejaVu Sans Book" halo-radius="1">[name]</TextSymbolizer>
</Rule>
<Rule>
<Filter>[waterway]='canal'</Filter>
<MaxScaleDenominator>50000</MaxScaleDenominator>
<MinScaleDenominator>1000</MinScaleDenominator>
<LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0" stroke-width="7" stroke-linecap="round"/>
<TextSymbolizer name="[name]" size="9" fill="#6699cc" placement="line" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="9" fill="#6699cc" placement="line" face-name="DejaVu Sans Book" halo-radius="1">[name]</TextSymbolizer>
</Rule>
<Rule>
<ElseFilter/>
<MaxScaleDenominator>25000</MaxScaleDenominator>
<MinScaleDenominator>1000</MinScaleDenominator>
<LineSymbolizer stroke="#b5d0d0" stroke-width="2"/>
<TextSymbolizer name="[name]" size="8" fill="#6699cc" placement="line" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="8" fill="#6699cc" placement="line" face-name="DejaVu Sans Book" halo-radius="1">[name]</TextSymbolizer>
</Rule>
</Style>
<Style name="minor-roads-casing">
@ -728,25 +728,25 @@
<Filter>[highway] = 'trunk' or [highway] = 'primary' or [highway] = 'secondary'</Filter>
<MaxScaleDenominator>75000</MaxScaleDenominator>
<MinScaleDenominator>50000</MinScaleDenominator>
<TextSymbolizer name="[name]" size="8" fill="black" placement="line" face-name="DejaVu Sans Book" halo-radius="0"/>
<TextSymbolizer size="8" fill="black" placement="line" face-name="DejaVu Sans Book" halo-radius="0">[name]</TextSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'trunk' or [highway] = 'primary' or [highway] = 'secondary'</Filter>
<MaxScaleDenominator>50000</MaxScaleDenominator>
<MinScaleDenominator>1000</MinScaleDenominator>
<TextSymbolizer name="[name]" size="10" fill="black" placement="line" face-name="DejaVu Sans Book" halo-radius="0"/>
<TextSymbolizer size="10" fill="black" placement="line" face-name="DejaVu Sans Book" halo-radius="0">[name]</TextSymbolizer>
</Rule>
<Rule>
<ElseFilter/>
<MaxScaleDenominator>25000</MaxScaleDenominator>
<MinScaleDenominator>5000</MinScaleDenominator>
<TextSymbolizer name="[name]" size="9" fill="#000" placement="line" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="9" fill="#000" placement="line" face-name="DejaVu Sans Book" halo-radius="1">[name]</TextSymbolizer>
</Rule>
<Rule>
<ElseFilter/>
<MaxScaleDenominator>5000</MaxScaleDenominator>
<MinScaleDenominator>100</MinScaleDenominator>
<TextSymbolizer name="[name]" size="11" fill="#000" placement="line" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="11" fill="#000" placement="line" face-name="DejaVu Sans Book" halo-radius="1">[name]</TextSymbolizer>
</Rule>
</Style>
</Map>

8
tests/data/good_maps/point_csv.xml
View file

@ -1,19 +1,19 @@
<!DOCTYPE Map>
<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.0">
<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
<Style name="1">
<Rule title="foo">
<Filter>([x]=0)</Filter>
<TextSymbolizer name="[label]" size="10" dy="-10" face-name="DejaVu Sans Book" halo-radius="1" allow-overlap="true"/>
<TextSymbolizer size="10" dy="-10" face-name="DejaVu Sans Book" halo-radius="1" allow-overlap="true">[label]</TextSymbolizer>
<PointSymbolizer/>
</Rule>
<Rule title="foo">
<Filter>([y]=0)</Filter>
<TextSymbolizer name="[label]" size="10" dy="5" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="10" dy="5" face-name="DejaVu Sans Book" halo-radius="1">[label]</TextSymbolizer>
<PointSymbolizer/>
</Rule>
<Rule title="foo">
<ElseFilter/>
<TextSymbolizer name="[label]" size="10" dy="-5" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="10" dy="-5" face-name="DejaVu Sans Book" halo-radius="1">[label]</TextSymbolizer>
<PointSymbolizer/>
</Rule>

8
tests/data/good_maps/point_json.xml
View file

@ -1,19 +1,19 @@
<!DOCTYPE Map>
<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.0">
<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
<Style name="1">
<Rule title="foo">
<Filter>([x]=0)</Filter>
<TextSymbolizer name="[label]" size="10" dy="-10" face-name="DejaVu Sans Book" halo-radius="1" allow-overlap="true"/>
<TextSymbolizer size="10" dy="-10" face-name="DejaVu Sans Book" halo-radius="1" allow-overlap="true">[label]</TextSymbolizer>
<PointSymbolizer/>
</Rule>
<Rule title="foo">
<Filter>([y]=0)</Filter>
<TextSymbolizer name="[label]" size="10" dy="5" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="10" dy="5" face-name="DejaVu Sans Book" halo-radius="1">[label]</TextSymbolizer>
<PointSymbolizer/>
</Rule>
<Rule title="foo">
<ElseFilter/>
<TextSymbolizer name="[label]" size="10" dy="-5" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="10" dy="-5" face-name="DejaVu Sans Book" halo-radius="1">[label]</TextSymbolizer>
<PointSymbolizer/>
</Rule>

8
tests/data/good_maps/point_json_inline.xml
View file

@ -1,19 +1,19 @@
<!DOCTYPE Map>
<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.0">
<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
<Style name="1">
<Rule title="foo">
<Filter>([x]=0)</Filter>
<TextSymbolizer name="[label]" size="10" dy="-10" face-name="DejaVu Sans Book" halo-radius="1" allow-overlap="true"/>
<TextSymbolizer size="10" dy="-10" face-name="DejaVu Sans Book" halo-radius="1" allow-overlap="true">[label]</TextSymbolizer>
<PointSymbolizer/>
</Rule>
<Rule title="foo">
<Filter>([y]=0)</Filter>
<TextSymbolizer name="[label]" size="10" dy="5" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="10" dy="5" face-name="DejaVu Sans Book" halo-radius="1">[label]</TextSymbolizer>
<PointSymbolizer/>
</Rule>
<Rule title="foo">
<ElseFilter/>
<TextSymbolizer name="[label]" size="10" dy="-5" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="10" dy="-5" face-name="DejaVu Sans Book" halo-radius="1">[label]</TextSymbolizer>
<PointSymbolizer/>
</Rule>

16
tests/data/good_maps/point_symbolizer.xml
View file

@ -1,40 +1,40 @@
<!DOCTYPE Map>
<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.8.0">
<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
<Style name="1">
<Rule title="foo">
<Filter>([name]='CHILE')</Filter>
<TextSymbolizer size="10" name="[name] + ' (default OGC pixel)'" dy="5" face-name="DejaVu Sans Book" text-transform="lowercase" wrap-width="10" wrap-character=" " halo-radius="1"/>
<TextSymbolizer size="10" dy="5" face-name="DejaVu Sans Book" text-transform="lowercase" wrap-width="10" wrap-character=" " halo-radius="1">[name] + ' (default OGC pixel)'</TextSymbolizer>
<PointSymbolizer/>
</Rule>
<Rule title="foo">
<Filter>([name]='Australia')</Filter>
<TextSymbolizer size="10" name="[name] + ' (png)'" dy="20" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="10" dy="20" face-name="DejaVu Sans Book" halo-radius="1">[name] + ' (png)'</TextSymbolizer>
<PointSymbolizer file="../images/dummy.png" allow-overlap="true"/>
</Rule>
<Rule title="foo1">
<Filter>([name]='Brazil')</Filter>
<TextSymbolizer size="10" name="[name] + ' (svg &amp; tif)'" dy="20" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="10" dy="20" face-name="DejaVu Sans Book" halo-radius="1">[name] + ' (svg &amp; tif)'</TextSymbolizer>
<PointSymbolizer file="../images/dummy.tif" allow-overlap="true"/>
<PointSymbolizer file="../svg/ellipses.svg" allow-overlap="true"/>
</Rule>
<Rule title="foo">
<Filter>([name]='Mongolia')</Filter>
<TextSymbolizer size="10" name="[name] + ' (tiff)'" dy="20" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="10" dy="20" face-name="DejaVu Sans Book" halo-radius="1">[name] + ' (tiff)'</TextSymbolizer>
<PointSymbolizer file="../images/dummy.tiff" allow-overlap="true"/>
</Rule>
<Rule title="foo">
<Filter>([name]='Sudan')</Filter>
<TextSymbolizer size="10" name="[name] + ' (jpeg)'" dy="20" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="10" dy="20" face-name="DejaVu Sans Book" halo-radius="1">[name] + ' (jpeg)'</TextSymbolizer>
<PointSymbolizer file="../images/dummy.jpeg"/>
</Rule>
<Rule title="foo">
<Filter>([name]='United States')</Filter>
<TextSymbolizer size="10" name="[name] + ' (jpg)'" dy="20" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="10" dy="20" face-name="DejaVu Sans Book" halo-radius="1">[name] + ' (jpg)'</TextSymbolizer>
<PointSymbolizer file="../images/dummy.jpg"/>
</Rule>
<Rule title="foo">
<ElseFilter/>
<TextSymbolizer size="10" name="[name]" dy="20" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="10" dy="20" face-name="DejaVu Sans Book" halo-radius="1">[name]</TextSymbolizer>
<PointSymbolizer file="../images/bogus_will_fail.png"/>
</Rule>
</Style>

4
tests/data/good_maps/point_symbolizer_ignore_placements.xml
View file

@ -1,5 +1,5 @@
<!DOCTYPE Map>
<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.8.0">
<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
<Style name="1">
<Rule title="foo1">
<Filter>([name]='Brazil' or [name]='Mongolia' or [name]='Sudan')</Filter>
@ -9,7 +9,7 @@
<ElseFilter/>
<PointSymbolizer file="../svg/point_sm.svg" ignore-placement="true"/>
<PointSymbolizer/>
<TextSymbolizer size="10" name="'should be a black square on top of this symbol'" dy="10" face-name="DejaVu Sans Book" halo-radius="1" wrap-width="15" allow-overlap="true"/>
<TextSymbolizer size="10" dy="10" face-name="DejaVu Sans Book" halo-radius="1" wrap-width="15" allow-overlap="true">'should be a black square on top of this symbol'</TextSymbolizer>
</Rule>
</Style>

4
tests/data/good_maps/point_symbolizer_on_polygon_map.xml
View file

@ -1,5 +1,5 @@
<!DOCTYPE Map>
<Map background-color="#b5d0d0" minimum-version="0.8.0">
<Map background-color="#b5d0d0" minimum-version="0.7.2">
<Style name="test">
<Rule title="asia">
<Filter>([REGION]=142)</Filter>
@ -17,7 +17,7 @@
</Rule>
<Rule title="Africa">
<Filter>([REGION]=2)</Filter>
<ShieldSymbolizer name="[NAME]" placement="vertex" size="10" fill="#000000" file="../images/dummy.png" face-name="DejaVu Sans Bold"/>
<ShieldSymbolizer placement="vertex" size="10" fill="#000000" file="../images/dummy.png" face-name="DejaVu Sans Bold">[NAME]</ShieldSymbolizer>
</Rule>
<Rule title="rest">

4
tests/data/good_maps/polygon_pattern_symbolizer.xml
View file

@ -8,13 +8,13 @@
<!-- alignment="local" is default -->
<PolygonPatternSymbolizer alignment="local" file="../images/checker.jpg"/>
<LineSymbolizer stroke="green" stroke-width="2"/>
<TextSymbolizer size="10" name="'local'" dy="20" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="10" dy="20" face-name="DejaVu Sans Book" halo-radius="1">'local'</TextSymbolizer>
</Rule>
<Rule>
<ElseFilter/>
<PolygonPatternSymbolizer alignment="global" file="../images/checker.jpg"/>
<LineSymbolizer stroke="yellow" stroke-width=".5"/>
<TextSymbolizer size="10" name="'global'" dy="20" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="10" dy="20" face-name="DejaVu Sans Book" halo-radius="1">'global'</TextSymbolizer>
</Rule>
</Style>

57
tests/data/good_maps/raster_colorizer.xml
View file

@ -1,18 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Map background-color="white" srs="+init=epsg:32630">
<Map background-color="white" srs="+init=epsg:32630" minimum-version="0.7.2">
<!-- blue yellow orange indigo green red transparent black white -->
<Style name="DISCRETE RAINBOW">
<Rule>
<RasterSymbolizer>
<RasterColorizer default-mode="discrete" default-color="white" >
<stop color="red" value = "0" />
<stop color="orange" value = "5" />
<stop color="yellow" value = "10" />
<stop color="green" value = "15" />
<stop color="blue" value = "20" />
<stop color="indigo" value = "25" />
<RasterColorizer default-mode="discrete" default-color="white">
<stop color="red" value="0"/>
<stop color="orange" value="5"/>
<stop color="yellow" value="10"/>
<stop color="green" value="15"/>
<stop color="blue" value="20"/>
<stop color="indigo" value="25"/>
</RasterColorizer>
</RasterSymbolizer>
</Rule>
@ -21,9 +20,9 @@
<Style name="LINEAR BLEND">
<Rule>
<RasterSymbolizer>
<RasterColorizer default-mode="discrete" default-color="white" >
<stop color="#222222" value = "0" mode = "linear" />
<stop color="#EEEEEE" value = "25" />
<RasterColorizer default-mode="discrete" default-color="white">
<stop color="#222222" value="0" mode="linear"/>
<stop color="#EEEEEE" value="25"/>
</RasterColorizer>
</RasterSymbolizer>
</Rule>
@ -32,14 +31,14 @@
<Style name="BANDED">
<Rule>
<RasterSymbolizer>
<RasterColorizer default-mode="discrete" default-color="white" >
<stop color="red" value = "0" mode = "exact" />
<stop color="orange" value = "2" mode = "exact" />
<stop color="yellow" value = "4" mode = "exact" />
<stop color="green" value = "6" mode = "exact" />
<stop color="blue" value = "8" mode = "exact" />
<stop color="indigo" value = "10" mode = "exact" />
<stop color="violet" value = "12" mode = "exact" />
<RasterColorizer default-mode="discrete" default-color="white">
<stop color="red" value="0" mode="exact"/>
<stop color="orange" value="2" mode="exact"/>
<stop color="yellow" value="4" mode="exact"/>
<stop color="green" value="6" mode="exact"/>
<stop color="blue" value="8" mode="exact"/>
<stop color="indigo" value="10" mode="exact"/>
<stop color="violet" value="12" mode="exact"/>
</RasterColorizer>
</RasterSymbolizer>
</Rule>
@ -48,13 +47,13 @@
<Style name="MIXED">
<Rule>
<RasterSymbolizer>
<RasterColorizer default-mode="discrete" default-color="white" >
<stop color="red" value = "0" />
<stop color="orange" value = "5" />
<stop color="yellow" value = "10" mode = "exact" />
<stop color="green" value = "13" mode = "exact" />
<stop color="#222222" value = "15" mode = "linear" />
<stop color="#EEEEEE" value = "25" />
<RasterColorizer default-mode="discrete" default-color="white">
<stop color="red" value="0"/>
<stop color="orange" value="5"/>
<stop color="yellow" value="10" mode="exact"/>
<stop color="green" value="13" mode="exact"/>
<stop color="#222222" value="15" mode="linear"/>
<stop color="#EEEEEE" value="25"/>
</RasterColorizer>
</RasterSymbolizer>
</Rule>
@ -69,6 +68,4 @@
</Datasource>
</Layer>
</Map>
</Map>

10
tests/data/good_maps/raster_symbolizer.xml
View file

@ -4,8 +4,8 @@
<Rule>
<RasterSymbolizer opacity="1">
<RasterColorizer default-mode="discrete" default-color="#000000">
<stop value="0" color="yellow"></stop>
<stop value="26" color="purple"></stop>
<stop value="0" color="yellow"/>
<stop value="26" color="purple"/>
</RasterColorizer>
</RasterSymbolizer>
</Rule>
@ -15,8 +15,8 @@
<Rule>
<RasterSymbolizer>
<RasterColorizer default-mode="linear" default-color="#000000">
<stop value="0" color="red"></stop>
<stop value="26" color="green"></stop>
<stop value="0" color="red"/>
<stop value="26" color="green"/>
</RasterColorizer>
</RasterSymbolizer>
</Rule>
@ -32,4 +32,4 @@
</Datasource>
</Layer>
</Map>
</Map>

6
tests/data/good_maps/rtl_text_map.xml
View file

@ -1,9 +1,9 @@
<!-- nik2img.py -b 60 46 80 28 rtl_text_map.xml text_styles.png --><Map background-color="#eee" srs="+init=epsg:4326" minimum-version="0.1.1" font-directory="../fonts/">
<!-- nik2img.py -b 60 46 80 28 rtl_text_map.xml text_styles.png --><Map background-color="#eee" srs="+init=epsg:4326" minimum-version="0.7.2" font-directory="../fonts/">
<Style name="custom_font">
<Rule>
<TextSymbolizer name="[NAME_FA]" fill="#000" size="20" dy="-2" face-name="XB Zar Regular" halo-fill="#fff" halo-radius="2" wrap-width="50" line-spacing="3" allow-overlap="true"/>
<TextSymbolizer name="[NAME_EN]" fill="#000" opacity="0.6" size="10" dy="2" face-name="DejaVu Sans Book" text-transform="uppercase" halo-fill="#fff" halo-radius="2" character-spacing="3" wrap-width="50" line-spacing="4" allow-overlap="true"/>
<TextSymbolizer fill="#000" size="20" dy="-2" face-name="XB Zar Regular" halo-fill="#fff" halo-radius="2" wrap-width="50" line-spacing="3" allow-overlap="true">[NAME_FA]</TextSymbolizer>
<TextSymbolizer fill="#000" opacity="0.6" size="10" dy="2" face-name="DejaVu Sans Book" text-transform="uppercase" halo-fill="#fff" halo-radius="2" character-spacing="3" wrap-width="50" line-spacing="4" allow-overlap="true">[NAME_EN]</TextSymbolizer>
</Rule>
</Style>

6
tests/data/good_maps/shield_symbolizer.xml
View file

@ -1,8 +1,8 @@
<!DOCTYPE Map>
<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.0">
<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
<Style name="1">
<Rule>
<ShieldSymbolizer name="[label]" file="../images/dummy.png" size="10" transform="scale(5) translate(15, 15) rotate(20) skewX(20) skewY(5)" dy="-5" dx="-5" opacity=".5" text-opacity=".3" face-name="DejaVu Sans Book" halo-radius="1" shield-dx="10" shield-dy="10" no-text="false" allow-overlap="true" avoid-edges="false"/>
<ShieldSymbolizer file="../images/dummy.png" size="10" transform="scale(5) translate(15, 15) rotate(20) skewX(20) skewY(5)" dy="-5" dx="-5" opacity=".5" text-opacity=".3" face-name="DejaVu Sans Book" halo-radius="1" shield-dx="10" shield-dy="10" no-text="false" allow-overlap="true" avoid-edges="false">[label]</ShieldSymbolizer>
</Rule>
<Rule>
<PointSymbolizer allow-overlap="true"/>
@ -13,7 +13,7 @@
<LineSymbolizer/>
</Rule>
<Rule>
<ShieldSymbolizer name="[label]" file="../svg/ellipses.svg" size="10" opacity=".5" text-opacity=".3" spacing="50" placement="line" allow-overlap="true" face-name="DejaVu Sans Book" no-text="false" line-spacing="10"/>
<ShieldSymbolizer file="../svg/ellipses.svg" size="10" opacity=".5" text-opacity=".3" spacing="50" placement="line" allow-overlap="true" face-name="DejaVu Sans Book" no-text="false" line-spacing="10">[label]</ShieldSymbolizer>
</Rule>
</Style>

2
tests/data/good_maps/sqlite.xml
View file

@ -37,7 +37,7 @@
<Style name="point_style">
<Rule>
<PointSymbolizer file="../svg/point_sm.svg"/>
<TextSymbolizer size="12" name="[name]" dy="-5" face-name="DejaVu Sans Book" halo-fill="rgba(255,255,255,.5)" halo-radius=".5"/>
<TextSymbolizer size="12" dy="-5" face-name="DejaVu Sans Book" halo-fill="rgba(255,255,255,.5)" halo-radius=".5">[name]</TextSymbolizer>
</Rule>
</Style>

5
tests/data/good_maps/sqlite_attachdb.xml
View file

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
<Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" minimum-version="0.7.2">
<Style name="world">
<Rule>
<PolygonSymbolizer fill="green" />
<PolygonSymbolizer fill="green"/>
</Rule>
</Style>

8
tests/data/good_maps/text_breaks.xml
View file

@ -1,14 +1,16 @@
<!DOCTYPE Map>
<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.0">
<Map background-color="#b5d0d0" srs="+init=epsg:4326" minimum-version="0.7.2">
<Style name="1">
<Rule>
<Filter>([label]='center')</Filter>
<TextSymbolizer name="'one&#10;two&#10;three'" size="10" dy="-5" face-name="DejaVu Sans Book" wrap-character="," wrap-width="1" halo-radius="1"/>
<TextSymbolizer size="10" dy="-5" face-name="DejaVu Sans Book" wrap-character="," wrap-width="1" halo-radius="1">'one
two
three'</TextSymbolizer>
<PointSymbolizer/>
</Rule>
<Rule>
<ElseFilter/>
<TextSymbolizer name="[label]" size="10" dy="-5" face-name="DejaVu Sans Book" wrap-character="," wrap-width="1" halo-radius="1"/>
<TextSymbolizer size="10" dy="-5" face-name="DejaVu Sans Book" wrap-character="," wrap-width="1" halo-radius="1">[label]</TextSymbolizer>
<PointSymbolizer/>
</Rule>
</Style>

14
tests/data/good_maps/text_rotation.xml
View file

@ -3,31 +3,31 @@
<Style name="labels">
<Rule title="foo">
<Filter>([name]='CHILE')</Filter>
<TextSymbolizer size="15" name="'45&#730; angle'" orientation="45" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="15" orientation="45" face-name="DejaVu Sans Book" halo-radius="1">'45˚ angle'</TextSymbolizer>
</Rule>
<Rule title="foo">
<Filter>([name]='Australia')</Filter>
<TextSymbolizer size="15" name="'- 45&#730; angle'" orientation="-45" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="15" orientation="-45" face-name="DejaVu Sans Book" halo-radius="1">'- 45˚ angle'</TextSymbolizer>
</Rule>
<Rule title="foo1">
<Filter>([name]='Brazil')</Filter>
<TextSymbolizer size="15" name="'90&#730; angle'" orientation="90" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="15" orientation="90" face-name="DejaVu Sans Book" halo-radius="1">'90˚ angle'</TextSymbolizer>
</Rule>
<Rule title="foo">
<Filter>([name]='Mongolia')</Filter>
<TextSymbolizer size="15" name="'- 90&#730; angle'" orientation="-90" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="15" orientation="-90" face-name="DejaVu Sans Book" halo-radius="1">'- 90˚ angle'</TextSymbolizer>
</Rule>
<Rule title="foo">
<Filter>([name]='South Sudan')</Filter>
<TextSymbolizer size="15" name="'180&#730; angle'" orientation="180" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="15" orientation="180" face-name="DejaVu Sans Book" halo-radius="1">'180&#730; angle'</TextSymbolizer>
</Rule>
<Rule title="foo">
<Filter>([name]='United States')</Filter>
<TextSymbolizer size="15" name="'no rotation of text'" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="15" face-name="DejaVu Sans Book" halo-radius="1">'no rotation of text'</TextSymbolizer>
</Rule>
<Rule title="foo">
<ElseFilter/>
<TextSymbolizer size="15" name="[name]" face-name="DejaVu Sans Book" halo-radius="1"/>
<TextSymbolizer size="15" face-name="DejaVu Sans Book" halo-radius="1">[name]</TextSymbolizer>
</Rule>
</Style>

2
tests/data/good_maps/unique_filter_map.xml
View file

@ -22,4 +22,4 @@
<Parameter name="type">shape</Parameter>
</Datasource>
</Layer>
</Map>
</Map>

2
tests/data/good_maps/whitespace_at_end_of_filter_expression.xml
View file

@ -4,7 +4,7 @@
<Rule>
<Filter>[leisure] &lt;&gt; '' or [landuse] &lt;&gt; '' </Filter>
<MaxScaleDenominator>20000</MaxScaleDenominator>
<TextSymbolizer name="[name]" size="10" fill="#000" face-name="DejaVu Sans Book" halo-radius="2" wrap-width="10"/>
<TextSymbolizer size="10" fill="#000" face-name="DejaVu Sans Book" halo-radius="2" wrap-width="10">[name]</TextSymbolizer>
</Rule>
</Style>
</Map>