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

point tests at better source files for #1508

Browse source
This commit is contained in:
Dane Springmeyer 2012-10-01 15:05:07 -07:00
parent e2a76e09b3
commit 67d8ee3d40
8 changed files with 47 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
tests/visual_tests/images/tiff-opaque-edge-gdal2-600-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
tests/visual_tests/images/tiff-opaque-edge-raster2-600-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 21 KiB

3
tests/visual_tests/styles/tiff-nodata-edge-raster.xml
View file

@ -11,7 +11,8 @@
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">
<StyleName>style</StyleName>
<Datasource>
<!-- https://github.com/mapnik/mapnik/issues/1471 -->
<!-- https://github.com/mapnik/mapnik/issues/1508 -->
<!-- note: this mis-reports it is premultiplied - it is not -->
<Parameter name="file">../../data/raster/nodata-edge.tif</Parameter>
<Parameter name="type">raster</Parameter>
<Parameter name="extent">-12329035.765216826,4508650.398543958,-12328653.027947057,4508957.346255356</Parameter>

8
tests/visual_tests/styles/tiff-opaque-edge-gdal.xml
View file

@ -1,4 +1,4 @@
<Map srs="+init=EPSG:4326" background-color="white">
<Map srs="+init=epsg:4326" background-color="white">
<Style name="test">
<Rule>
@ -6,10 +6,12 @@
</Rule>
</Style>
<Layer name="test" srs="+init=EPSG:4326">
<Layer name="test" srs="+init=epsg:4326">
<StyleName>test</StyleName>
<Datasource>
<Parameter name="file">../../data/raster/river.tiff</Parameter>
<!-- https://github.com/mapnik/mapnik/issues/1508 -->
<!-- note: this mis-reports it is premultiplied - it is not -->
<Parameter name="file">../../data/raster/river_wgs.tiff</Parameter>
<Parameter name="type">gdal</Parameter>
</Datasource>
</Layer>

17
tests/visual_tests/styles/tiff-opaque-edge-gdal2.xml Normal file
View file

@ -0,0 +1,17 @@
<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" background-color="rgba(255,255,255,1)">
<Style name="testmerc" filter-mode="first" >
<Rule>
<RasterSymbolizer opacity="1" scaling="bilinear" />
</Rule>
</Style>
<Layer name="testmerc"
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">
<StyleName>testmerc</StyleName>
<Datasource>
<!-- https://github.com/mapnik/mapnik/issues/1508 -->
<!-- note: this mis-reports it is premultiplied - it is not -->
<Parameter name="file">../../data/raster/river_merc.tiff</Parameter>
<Parameter name="type">gdal</Parameter>
</Datasource>
</Layer>
</Map>

6
tests/visual_tests/styles/tiff-opaque-edge-raster.xml
View file

@ -1,4 +1,4 @@
<Map srs="+init=EPSG:4326" background-color="white">
<Map srs="+init=epsg:4326" background-color="white">
<Style name="test">
<Rule>
@ -6,10 +6,10 @@
</Rule>
</Style>
<Layer name="test" srs="+init=EPSG:4326">
<Layer name="test" srs="+init=epsg:4326">
<StyleName>test</StyleName>
<Datasource>
<Parameter name="file">../../data/raster/river.tiff</Parameter>
<Parameter name="file">../../data/raster/river_wgs.tiff</Parameter>
<Parameter name="type">raster</Parameter>
<Parameter name="extent">0,0,256,210</Parameter>
</Datasource>

18
tests/visual_tests/styles/tiff-opaque-edge-raster2.xml Normal file
View file

@ -0,0 +1,18 @@
<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" background-color="rgba(255,255,255,1)">
<Style name="testmerc" filter-mode="first" >
<Rule>
<RasterSymbolizer opacity="1" scaling="bilinear" />
</Rule>
</Style>
<Layer name="testmerc"
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">
<StyleName>testmerc</StyleName>
<Datasource>
<!-- https://github.com/mapnik/mapnik/issues/1508 -->
<!-- note: this mis-reports it is premultiplied - it is not -->
<Parameter name="file">../../data/raster/river_merc.tiff</Parameter>
<Parameter name="extent">-8249238.098993212,-486119.1339340762,-8024337.037783274,-302066.9754826002</Parameter>
<Parameter name="type">raster</Parameter>
</Datasource>
</Layer>
</Map>

3
tests/visual_tests/test.py
View file

@ -56,7 +56,8 @@ files = [
{'name': "tiff-nodata-edge-raster", 'sizes':[(600,400)]},
{'name': "tiff-opaque-edge-gdal", 'sizes':[(256,256)]},
{'name': "tiff-opaque-edge-raster", 'sizes':[(256,256)]},
{'name': "tiff-opaque-edge-gdal2", 'sizes':[(600,400)]},
{'name': "tiff-opaque-edge-raster2", 'sizes':[(600,400)]},
]
def render(filename, width, height, bbox, quiet=False):