Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

point tests at better source files for #1508

  • Loading branch information...
commit 67d8ee3d401311077873d6a5a6dfe2e82566edfb 1 parent e2a76e0
@springmeyer springmeyer authored
View
BIN  tests/visual_tests/images/tiff-opaque-edge-gdal2-600-reference.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  tests/visual_tests/images/tiff-opaque-edge-raster2-600-reference.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
3  tests/visual_tests/styles/tiff-nodata-edge-raster.xml
@@ -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>
View
8 tests/visual_tests/styles/tiff-opaque-edge-gdal.xml
@@ -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>
View
17 tests/visual_tests/styles/tiff-opaque-edge-gdal2.xml
@@ -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>
View
6 tests/visual_tests/styles/tiff-opaque-edge-raster.xml
@@ -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>
View
18 tests/visual_tests/styles/tiff-opaque-edge-raster2.xml
@@ -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>
View
3  tests/visual_tests/test.py
@@ -56,7 +56,8 @@
{'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):
Please sign in to comment.
Something went wrong with that request. Please try again.