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

add an ogr2ogr created sqlite file, and update sqlite XML tests to use new, simplified driver functionalities

Browse source
This commit is contained in:
Dane Springmeyer 2011-04-04 04:01:34 +00:00
parent 4dbc58a55b
commit 528d5710c8
11 changed files with 59 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,13 +22,9 @@
<Layer name="multipolygon" srs="+init=epsg:4326">
<StyleName>multipolygon_style</StyleName>
<Datasource>
<Parameter name="extent">-120.714996709,-60.7304861311,140.581413391,86.9753066091</Parameter>
<Parameter name="file">../sqlite/qgis_spatiallite.sqlite</Parameter>
<Parameter name="geometry_field">geometry</Parameter>
<Parameter name="key_field">pkuid</Parameter>
<Parameter name="table">multipolygon</Parameter>
<Parameter name="type">sqlite</Parameter>
<Parameter name="use_spatial_index">1</Parameter>
<Parameter name="file">../sqlite/qgis_spatiallite.sqlite</Parameter>
<Parameter name="table">multipolygon</Parameter>
<Parameter name="wkb_format">spatialite</Parameter>
</Datasource>
</Layer>

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

@ -10,13 +10,9 @@
<Layer name="point" srs="+init=epsg:4326">
<StyleName>1</StyleName>
<Datasource>
<Parameter name="extent">-180,-70,180,70</Parameter>
<Parameter name="file">../sqlite/qgis_spatiallite.sqlite</Parameter>
<Parameter name="geometry_field">geometry</Parameter>
<Parameter name="key_field">pkuid</Parameter>
<Parameter name="table">lines</Parameter>
<Parameter name="type">sqlite</Parameter>
<Parameter name="use_spatial_index">1</Parameter>
<Parameter name="file">../sqlite/qgis_spatiallite.sqlite</Parameter>
<Parameter name="table">lines</Parameter>
<Parameter name="wkb_format">spatialite</Parameter>
</Datasource>
</Layer>

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

@ -34,13 +34,9 @@
<Layer name="point" srs="+init=epsg:4326">
<StyleName>1</StyleName>
<Datasource>
<Parameter name="extent">-180,-70,180,70</Parameter>
<Parameter name="file">../sqlite/qgis_spatiallite.sqlite</Parameter>
<Parameter name="geometry_field">geometry</Parameter>
<Parameter name="key_field">pkuid</Parameter>
<Parameter name="table">point</Parameter>
<Parameter name="type">sqlite</Parameter>
<Parameter name="use_spatial_index">1</Parameter>
<Parameter name="file">../sqlite/qgis_spatiallite.sqlite</Parameter>
<Parameter name="table">point</Parameter>
<Parameter name="wkb_format">spatialite</Parameter>
</Datasource>
</Layer>

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

@ -18,13 +18,9 @@
<Layer name="point" srs="+init=epsg:4326">
<StyleName>1</StyleName>
<Datasource>
<Parameter name="extent">-180,-70,180,70</Parameter>
<Parameter name="file">../sqlite/qgis_spatiallite.sqlite</Parameter>
<Parameter name="geometry_field">geometry</Parameter>
<Parameter name="key_field">pkuid</Parameter>
<Parameter name="table">point</Parameter>
<Parameter name="type">sqlite</Parameter>
<Parameter name="use_spatial_index">1</Parameter>
<Parameter name="file">../sqlite/qgis_spatiallite.sqlite</Parameter>
<Parameter name="table">point</Parameter>
<Parameter name="wkb_format">spatialite</Parameter>
</Datasource>
</Layer>

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

@ -20,13 +20,9 @@
<Layer name="point" srs="+init=epsg:4326">
<StyleName>1</StyleName>
<Datasource>
<Parameter name="extent">-180,-70,180,70</Parameter>
<Parameter name="file">../sqlite/qgis_spatiallite.sqlite</Parameter>
<Parameter name="geometry_field">geometry</Parameter>
<Parameter name="key_field">pkuid</Parameter>
<Parameter name="table">point</Parameter>
<Parameter name="type">sqlite</Parameter>
<Parameter name="use_spatial_index">1</Parameter>
<Parameter name="file">../sqlite/qgis_spatiallite.sqlite</Parameter>
<Parameter name="table">point</Parameter>
<Parameter name="wkb_format">spatialite</Parameter>
</Datasource>
</Layer>

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

@ -42,13 +42,10 @@
<Layer name="point" srs="+init=epsg:4326">
<StyleName>1</StyleName>
<Datasource>
<Parameter name="type">sqlite</Parameter>
<Parameter name="extent">-180,-70,180,70</Parameter>
<Parameter name="file">../sqlite/qgis_spatiallite.sqlite</Parameter>
<Parameter name="geometry_field">geometry</Parameter>
<Parameter name="key_field">pkuid</Parameter>
<Parameter name="table">point</Parameter>
<Parameter name="type">sqlite</Parameter>
<Parameter name="use_spatial_index">1</Parameter>
<Parameter name="wkb_format">spatialite</Parameter>
</Datasource>
</Layer>

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

@ -3,25 +3,23 @@
<Style name="1">
<Rule title="foo1">
<Filter>([name]='Brazil' or [name]='Mongolia' or [name]='Sudan')</Filter>
<PointSymbolizer file="../svg/ellipses.svg" allow-overlap="true"/>
<PointSymbolizer file="../svg/point_sm.svg" allow-overlap="true"/>
</Rule>
<Rule title="foo">
<ElseFilter/>
<PointSymbolizer file="../svg/ellipses.svg" ignore-placement="true"/>
<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"/>
</Rule>
</Style>
<Layer name="point" srs="+init=epsg:4326">
<StyleName>1</StyleName>
<Datasource>
<Parameter name="extent">-180,-70,180,70</Parameter>
<Parameter name="file">../sqlite/qgis_spatiallite.sqlite</Parameter>
<Parameter name="geometry_field">geometry</Parameter>
<Parameter name="key_field">pkuid</Parameter>
<Parameter name="table">point</Parameter>
<Parameter name="type">sqlite</Parameter>
<Parameter name="use_spatial_index">1</Parameter>
<Parameter name="file">../sqlite/qgis_spatiallite.sqlite</Parameter>
<Parameter name="table">point</Parameter>
<Parameter name="wkb_format">spatialite</Parameter>
</Datasource>
</Layer>

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

@ -1,32 +1,54 @@
<Map srs="+init=epsg:4326" background-color="rgb(255,255,255)" minimum-version="0.7.2">
<Style name="world_borders_style1">
<Rule>
<!-- glow underneath continents -->
<LineSymbolizer stroke="green" stroke-width="1.5"/>
</Rule>
</Style>
<!-- layer created by ogr like: ogr2ogr -t_srs EPSG:4326 -f SQLite ../sqlite/world.sqlite world_merc.shp -->
<!-- here we read with the ogr plugin -->
<Layer name="world_borders1" srs="+init=epsg:4326">
<StyleName>world_borders_style1</StyleName>
<Datasource>
<Parameter name="type">ogr</Parameter>
<Parameter name="file">../sqlite/world.sqlite</Parameter>
<Parameter name="layer">world_merc</Parameter>
</Datasource>
</Layer>
<Style name="world_borders_style2">
<Rule>
<PolygonSymbolizer fill="yellow" gamma="0.5"/>
</Rule>
</Style>
<!-- here we read with native sqlite plugin -->
<Layer name="world_borders2" srs="+init=epsg:4326">
<StyleName>world_borders_style2</StyleName>
<Datasource>
<Parameter name="type">sqlite</Parameter>
<Parameter name="extent">-179,-60,179,60</Parameter>
<Parameter name="file">../sqlite/world.sqlite</Parameter>
<Parameter name="table">world_merc</Parameter>
</Datasource>
</Layer>
<Style name="point_style">
<Rule>
<PointSymbolizer file="../svg/point.svg"/>
<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"/>
</Rule>
</Style>
<Style name="world_borders_style">
<Rule>
<PolygonSymbolizer fill="grey" gamma="0.7"/>
</Rule>
</Style>
<Layer name="world_borders" srs="+proj=merc +lon_0=0 +lat_ts=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs">
<StyleName>world_borders_style</StyleName>
<Datasource>
<Parameter name="file">../shp/world_merc.shp</Parameter>
<Parameter name="type">shape</Parameter>
</Datasource>
</Layer>
<!-- file created by QGIS read with native sqlite plugin -->
<Layer name="point" srs="+init=epsg:4326">
<StyleName>point_style</StyleName>
<Datasource>
<Parameter name="extent">-100.276283619,-23.5207203374,136.782396088,45.7946830856</Parameter>
<Parameter name="file">../sqlite/qgis_spatiallite.sqlite</Parameter>
<Parameter name="geometry_field">geometry</Parameter>
<Parameter name="key_field">pkuid</Parameter>
<Parameter name="table">point</Parameter>
<Parameter name="type">sqlite</Parameter>
<Parameter name="use_spatial_index">1</Parameter>
<Parameter name="file">../sqlite/qgis_spatiallite.sqlite</Parameter>
<Parameter name="table">point</Parameter>
<Parameter name="wkb_format">spatialite</Parameter>
</Datasource>
</Layer>

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

@ -34,13 +34,11 @@
<Layer name="point" srs="+init=epsg:4326">
<StyleName>labels</StyleName>
<Datasource>
<Parameter name="type">sqlite</Parameter>
<Parameter name="extent">-180,-70,180,70</Parameter>
<Parameter name="file">../sqlite/qgis_spatiallite.sqlite</Parameter>
<Parameter name="geometry_field">geometry</Parameter>
<Parameter name="key_field">pkuid</Parameter>
<Parameter name="table">point</Parameter>
<Parameter name="type">sqlite</Parameter>
<Parameter name="use_spatial_index">1</Parameter>
<Parameter name="wkb_format">spatialite</Parameter>
</Datasource>
</Layer>

BIN
tests/data/sqlite/qgis_spatiallite.sqlite
View file

Binary file not shown.

BIN
tests/data/sqlite/world.sqlite Normal file
View file

Binary file not shown.