diff --git a/tests/python_tests/raster_colorizer_test.py b/tests/python_tests/raster_colorizer_test.py index 3bdb50941..9b8778d3f 100644 --- a/tests/python_tests/raster_colorizer_test.py +++ b/tests/python_tests/raster_colorizer_test.py @@ -9,22 +9,6 @@ def setup(): # from another directory we need to chdir() os.chdir(execution_path('.')) -def test_gen_map(): - mapxmlfile = '../data/good_maps/raster_colorizer.xml' - mapxmloutputfile = 'raster_colorizer_test_save.xml' - outputfile = 'raster_colorizer_test.png' - - m = mapnik.Map(800, 600) - try: - mapnik.load_map(m, mapxmlfile) - mapnik.save_map(m, mapxmloutputfile) - m.zoom_all() - mapnik.render_to_file(m, outputfile) - except RuntimeError,e: - # only test datasources that we have installed - if not 'Could not create datasource' in str(e): - raise RuntimeError(str(e)) - #test discrete colorizer mode def test_get_color_discrete(): #setup diff --git a/tests/python_tests/raster_symbolizer_test.py b/tests/python_tests/raster_symbolizer_test.py index 826514af1..74ec4d990 100644 --- a/tests/python_tests/raster_symbolizer_test.py +++ b/tests/python_tests/raster_symbolizer_test.py @@ -90,7 +90,7 @@ def test_dataraster_query_point(): def test_load_save_map(): map = mapnik.Map(256,256) - in_map = "../data/good_maps/raster_symbolizer.xml" + in_map = "../visual_tests/styles/raster_symbolizer.xml" try: mapnik.load_map(map, in_map) diff --git a/tests/visual_tests/grids/raster_colorizer-512-512-1.0-grid-reference.json b/tests/visual_tests/grids/raster_colorizer-512-512-1.0-grid-reference.json new file mode 100644 index 000000000..53162f357 --- /dev/null +++ b/tests/visual_tests/grids/raster_colorizer-512-512-1.0-grid-reference.json @@ -0,0 +1,136 @@ +{ + "keys": [ + "" + ], + "data": {}, + "grid": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ] +} \ No newline at end of file diff --git a/tests/visual_tests/grids/raster_symbolizer-512-512-1.0-grid-reference.json b/tests/visual_tests/grids/raster_symbolizer-512-512-1.0-grid-reference.json new file mode 100644 index 000000000..53162f357 --- /dev/null +++ b/tests/visual_tests/grids/raster_symbolizer-512-512-1.0-grid-reference.json @@ -0,0 +1,136 @@ +{ + "keys": [ + "" + ], + "data": {}, + "grid": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ] +} \ No newline at end of file diff --git a/tests/visual_tests/images/raster_colorizer-512-512-1.0-agg-reference.png b/tests/visual_tests/images/raster_colorizer-512-512-1.0-agg-reference.png new file mode 100644 index 000000000..dec77cf5d Binary files /dev/null and b/tests/visual_tests/images/raster_colorizer-512-512-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/raster_colorizer-512-512-2.0-agg-reference.png b/tests/visual_tests/images/raster_colorizer-512-512-2.0-agg-reference.png new file mode 100644 index 000000000..dec77cf5d Binary files /dev/null and b/tests/visual_tests/images/raster_colorizer-512-512-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/raster_symbolizer-512-512-1.0-agg-reference.png b/tests/visual_tests/images/raster_symbolizer-512-512-1.0-agg-reference.png new file mode 100644 index 000000000..a7c34dc22 Binary files /dev/null and b/tests/visual_tests/images/raster_symbolizer-512-512-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/raster_symbolizer-512-512-2.0-agg-reference.png b/tests/visual_tests/images/raster_symbolizer-512-512-2.0-agg-reference.png new file mode 100644 index 000000000..a7c34dc22 Binary files /dev/null and b/tests/visual_tests/images/raster_symbolizer-512-512-2.0-agg-reference.png differ diff --git a/tests/data/good_maps/raster_colorizer.xml b/tests/visual_tests/styles/raster_colorizer.xml similarity index 96% rename from tests/data/good_maps/raster_colorizer.xml rename to tests/visual_tests/styles/raster_colorizer.xml index 970f252aa..8c1c91831 100644 --- a/tests/data/good_maps/raster_colorizer.xml +++ b/tests/visual_tests/styles/raster_colorizer.xml @@ -62,7 +62,7 @@ DISCRETE RAINBOW - ../raster/dataraster.tif + ../../data/raster/dataraster.tif gdal 1 diff --git a/tests/data/good_maps/raster_symbolizer.xml b/tests/visual_tests/styles/raster_symbolizer.xml similarity index 92% rename from tests/data/good_maps/raster_symbolizer.xml rename to tests/visual_tests/styles/raster_symbolizer.xml index 429701ca5..14632b103 100644 --- a/tests/data/good_maps/raster_symbolizer.xml +++ b/tests/visual_tests/styles/raster_symbolizer.xml @@ -26,7 +26,7 @@ ramped - ../raster/dataraster.tif + ../../data/raster/dataraster.tif gdal 1 diff --git a/tests/visual_tests/test.py b/tests/visual_tests/test.py index 846cb3888..7140900d0 100755 --- a/tests/visual_tests/test.py +++ b/tests/visual_tests/test.py @@ -177,6 +177,8 @@ files = { 'tiff_colortable':{'sizes':[(256,256)]}, 'tiff_colortable_custom_nodata':{'sizes':[(256,256)]}, 'vrt_colortable':{'sizes':[(256,256)]}, + 'raster_colorizer':{'sizes':[(512,512)]}, + 'raster_symbolizer':{'sizes':[(512,512)]}, } class Reporting: