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

Fix all reference to points.shp.

Browse source 
Add new character spacing test.
This commit is contained in:
Hermann Kraus 2012-09-13 23:35:42 +02:00
parent 0615609e67
commit 6d9c808b6d
10 changed files with 50 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
tests/visual_tests/images/charspacing-200-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

33
tests/visual_tests/styles/charspacing.xml Normal file
View file

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map>
<Map background-color="white" srs="+proj=latlong +datum=WGS84">
<Layer name="layer" srs="+proj=latlong +datum=WGS84">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<Filter>[nr] = "6"</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="-90" character-spacing="0.0">"Char spacing 0.0"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="-80" character-spacing="0.1">"Char spacing 0.1"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="-70" character-spacing="0.2">"Char spacing 0.2"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="-60" character-spacing="0.3">"Char spacing 0.3"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="-50" character-spacing="0.4">"Char spacing 0.4"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="-40" character-spacing="0.5">"Char spacing 0.5"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="-30" character-spacing="0.6">"Char spacing 0.6"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="-20" character-spacing="0.7">"Char spacing 0.7"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="-10" character-spacing="0.8">"Char spacing 0.8"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="0" character-spacing="0.9">"Char spacing 0.9"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="10" character-spacing="1.0">"Char spacing 1.0"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="20" character-spacing="1.5">"Char spacing 1.5"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="30" character-spacing="2">"Char spacing 2.0"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="40" character-spacing="2.5">"Char spacing 2.5"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="50" character-spacing="4">"Char spacing 4"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="60" character-spacing="6">"Char spacing 6"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="70" character-spacing="8">"Char spacing 8"</TextSymbolizer>
</Rule>
</Style>
</Map>

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

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

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

@ -4,8 +4,8 @@
<Layer name="layer" srs="+proj=latlong +datum=WGS84">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
</Datasource>
</Layer>

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

@ -4,8 +4,8 @@
<Layer name="layer" srs="+proj=latlong +datum=WGS84">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
</Datasource>
</Layer>
<Style name="My Style">

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

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

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

@ -6,8 +6,8 @@
<Layer name="layer" srs="+proj=latlong +datum=WGS84">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
</Datasource>
</Layer>

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

@ -6,8 +6,8 @@
<Layer name="layer" srs="+proj=latlong +datum=WGS84">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
</Datasource>
</Layer>

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

@ -6,8 +6,8 @@
<Layer name="layer" srs="+proj=latlong +datum=WGS84">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
</Datasource>
</Layer>

6
tests/visual_tests/test.py
View file

@ -53,7 +53,8 @@ files = [
{'name': "line-offset", 'sizes':[(900, 250)],
'bbox': mapnik.Box2d(-5.192, 50.189, -5.174, 50.195)},
{'name': "orientation", 'sizes': [(800, 200)]},
{'name': "hb-fontsets", 'sizes': [(800, 200)]}
{'name': "hb-fontsets", 'sizes': [(800, 200)]},
{'name': "charspacing", 'sizes': [(200, 400)]},
]
def render(filename, width, height, bbox, quiet=False):
@ -86,7 +87,6 @@ if __name__ == "__main__":
else:
quiet = False
print len(sys.argv)
if len(sys.argv) <= 1:
active = files
elif len(sys.argv) == 2:
@ -103,7 +103,7 @@ if __name__ == "__main__":
active.append({"name": name})
if 'osm' in mapnik.DatasourceCache.plugin_names():
for f in files:
for f in active:
config = dict(defaults)
config.update(f)
for size in config['sizes']: