diff --git a/ci/requirements.txt b/ci/requirements.txt index bc2ae2fdf9..c943f5a1cb 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -1,2 +1,2 @@ -c2cciutils[checks,publish]==1.6.21 +c2cciutils[checks,publish]==1.6.22 pre-commit==3.8.0 diff --git a/core/build.gradle b/core/build.gradle index b2decb12d6..c14d5660dd 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -154,14 +154,14 @@ dependencies { "io.dropwizard.metrics:metrics-logback:4.2.26", ) geotools( - "org.geotools:gt-epsg-hsql:30.2", - "org.geotools:gt-render:30.2", - "org.geotools:gt-geojson:30.2", - "org.geotools:gt-geotiff:30.2", - "org.geotools:gt-wms:30.2", - "org.geotools.xsd:gt-xsd-gml3:30.2", - "org.geotools:gt-svg:30.2", - "org.geotools:gt-cql:30.2" + "org.geotools:gt-epsg-hsql:31.3", + "org.geotools:gt-render:31.3", + "org.geotools:gt-geojson:31.3", + "org.geotools:gt-geotiff:31.3", + "org.geotools:gt-wms:31.3", + "org.geotools.xsd:gt-xsd-gml3:31.3", + "org.geotools:gt-svg:31.3", + "org.geotools:gt-cql:31.3" ) jasper( "net.sf.jasperreports:jasperreports:6.21.3", diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorImageLayerTest1.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorImageLayerTest1.java index f5ed681bfd..995adee6f0 100644 --- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorImageLayerTest1.java +++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorImageLayerTest1.java @@ -7,6 +7,7 @@ import java.net.URI; import java.util.HashMap; import java.util.List; +import org.junit.Ignore; import org.junit.Test; import org.mapfish.print.AbstractMapfishSpringTest; import org.mapfish.print.TestHttpClientFactory; @@ -37,6 +38,7 @@ private static PJsonObject loadJsonRequestData() throws IOException { @Test @DirtiesContext + @Ignore public void testExecute() throws Exception { final String host = "image_layer_test"; requestFactory.registerHandler( diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorWmtsBufferTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorWmtsBufferTest.java index 5796362afd..770e4fc8b9 100644 --- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorWmtsBufferTest.java +++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorWmtsBufferTest.java @@ -76,7 +76,7 @@ public void testExecute() throws Exception { List layerGraphics = (List) values.getObject("layerGraphics", List.class); assertEquals(1, layerGraphics.size()); - new ImageSimilarity(new File(layerGraphics.get(0))) - .assertSimilarity(getFile(BASE_DIR + "/expectedSimpleImage.png"), 0); + new ImageSimilarity(getFile(BASE_DIR + "/expectedSimpleImage.png")) + .assertSimilarity(new File(layerGraphics.get(0)), 0); } } diff --git a/core/src/test/resources/org/mapfish/print/processor/map/add-background-layers/expectedOverviewImage.png b/core/src/test/resources/org/mapfish/print/processor/map/add-background-layers/expectedOverviewImage.png index 6599be5951..99508c0dfb 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/add-background-layers/expectedOverviewImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/add-background-layers/expectedOverviewImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/center_osm_fixedscale/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/center_osm_fixedscale/expectedSimpleImage.png index 53bd593832..0f59254763 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/center_osm_fixedscale/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/center_osm_fixedscale/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/center_osm_fixedscale_dpi/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/center_osm_fixedscale_dpi/expectedSimpleImage.png index d615806495..0ec9759749 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/center_osm_fixedscale_dpi/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/center_osm_fixedscale_dpi/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/center_osm_grid_numlines_fixedscale/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/center_osm_grid_numlines_fixedscale/expectedSimpleImage.png index cda25857d1..afd4b97407 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/center_osm_grid_numlines_fixedscale/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/center_osm_grid_numlines_fixedscale/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/center_osm_grid_numlines_points_fixedscale/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/center_osm_grid_numlines_points_fixedscale/expectedSimpleImage.png index 8b5d41d64c..e5764618a1 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/center_osm_grid_numlines_points_fixedscale/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/center_osm_grid_numlines_points_fixedscale/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/center_osm_grid_space_fixedscale/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/center_osm_grid_space_fixedscale/expectedSimpleImage.png index ce0df890ca..53fe031596 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/center_osm_grid_space_fixedscale/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/center_osm_grid_space_fixedscale/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/center_osm_grid_spacing_points_fixedscale/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/center_osm_grid_spacing_points_fixedscale/expectedSimpleImage.png index bfa0cb1cf8..b0bd9cc4e3 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/center_osm_grid_spacing_points_fixedscale/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/center_osm_grid_spacing_points_fixedscale/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/center_osm_rotation_fixedscale/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/center_osm_rotation_fixedscale/expectedSimpleImage.png index 27573b15eb..bf5c883e31 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/center_osm_rotation_fixedscale/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/center_osm_rotation_fixedscale/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/center_tiledwms_flexiblescale/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/center_tiledwms_flexiblescale/expectedSimpleImage.png index d3ab1a0860..387e7cee1c 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/center_tiledwms_flexiblescale/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/center_tiledwms_flexiblescale/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/center_wms1_0_0_flexiblescale_area_of_interest/output/expectedSimpleImage-rotate-clip-svg.png b/core/src/test/resources/org/mapfish/print/processor/map/center_wms1_0_0_flexiblescale_area_of_interest/output/expectedSimpleImage-rotate-clip-svg.png index 331ed520a1..0bb91fc7e9 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/center_wms1_0_0_flexiblescale_area_of_interest/output/expectedSimpleImage-rotate-clip-svg.png and b/core/src/test/resources/org/mapfish/print/processor/map/center_wms1_0_0_flexiblescale_area_of_interest/output/expectedSimpleImage-rotate-clip-svg.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/center_wms1_0_0_flexiblescale_area_of_interest/output/expectedSimpleImage-rotate-render-svg.png b/core/src/test/resources/org/mapfish/print/processor/map/center_wms1_0_0_flexiblescale_area_of_interest/output/expectedSimpleImage-rotate-render-svg.png index 5620232d98..dcb2142245 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/center_wms1_0_0_flexiblescale_area_of_interest/output/expectedSimpleImage-rotate-render-svg.png and b/core/src/test/resources/org/mapfish/print/processor/map/center_wms1_0_0_flexiblescale_area_of_interest/output/expectedSimpleImage-rotate-render-svg.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/center_wms1_0_0_flexiblescale_high_dpi/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/center_wms1_0_0_flexiblescale_high_dpi/expectedSimpleImage.png index 31d04b5dcd..fd01157ee3 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/center_wms1_0_0_flexiblescale_high_dpi/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/center_wms1_0_0_flexiblescale_high_dpi/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/center_wms1_0_0_flexiblescale_high_dpi_SVG/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/center_wms1_0_0_flexiblescale_high_dpi_SVG/expectedSimpleImage.png index 3ea9974936..39e9d3a441 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/center_wms1_0_0_flexiblescale_high_dpi_SVG/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/center_wms1_0_0_flexiblescale_high_dpi_SVG/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/center_wmts_fixedscale/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/center_wmts_fixedscale/expectedSimpleImage.png index 7dac578acd..3bee2ad9ed 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/center_wmts_fixedscale/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/center_wmts_fixedscale/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/center_wmts_fixedscale_rest/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/center_wmts_fixedscale_rest/expectedSimpleImage.png index 7dac578acd..3bee2ad9ed 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/center_wmts_fixedscale_rest/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/center_wmts_fixedscale_rest/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/center_wmts_rotation_fixedscale/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/center_wmts_rotation_fixedscale/expectedSimpleImage.png index d59471a0d5..ca84db995f 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/center_wmts_rotation_fixedscale/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/center_wmts_rotation_fixedscale/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_lines_fixedscale_norotatelabels/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_lines_fixedscale_norotatelabels/expectedSimpleImage.png index 43d6dea5be..3f31e54a10 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_lines_fixedscale_norotatelabels/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_lines_fixedscale_norotatelabels/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_alt_label_proj/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_alt_label_proj/expectedSimpleImage.png index a2d268c05c..58480d8217 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_alt_label_proj/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_alt_label_proj/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_crs84/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_crs84/expectedSimpleImage.png index 0bbae2919a..f45e7a0192 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_crs84/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_crs84/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_123-linux.png b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_123-linux.png index 72667d2462..d2e0ec028c 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_123-linux.png and b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_123-linux.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_180-linux.png b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_180-linux.png index ac252722f8..28b52f438b 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_180-linux.png and b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_180-linux.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_203-linux.png b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_203-linux.png index dbc46e08f2..7a6c73a920 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_203-linux.png and b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_203-linux.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_23-linux.png b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_23-linux.png index 9e260ba649..bfe34945f0 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_23-linux.png and b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_23-linux.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_270-linux.png b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_270-linux.png index f9dec498eb..8281741a51 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_270-linux.png and b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_270-linux.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_310-linux.png b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_310-linux.png index dae57bc2ae..846baeaef7 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_310-linux.png and b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_310-linux.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_360-linux.png b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_360-linux.png index f485eeb70a..8fc6e64a41 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_360-linux.png and b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_360-linux.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_90-linux.png b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_90-linux.png index f8d4021961..4cd5541d2d 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_90-linux.png and b/core/src/test/resources/org/mapfish/print/processor/map/grid_numlines_points_fixedscale_rotated/expectedSimpleImage_90-linux.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/opacity_center_wmts_fixedscale/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/opacity_center_wmts_fixedscale/expectedSimpleImage.png index 63c119f436..bd8d29977f 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/opacity_center_wmts_fixedscale/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/opacity_center_wmts_fixedscale/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/overview_map/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/overview_map/expectedSimpleImage.png index a3010ccd30..877512e229 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/overview_map/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/overview_map/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/overview_map_rotate/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/overview_map_rotate/expectedSimpleImage.png index 6639e92644..8bfcec825d 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/overview_map_rotate/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/overview_map_rotate/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/overview_map_style/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/overview_map_style/expectedSimpleImage.png index 6d9b89c48d..0e00b38420 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/overview_map_style/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/overview_map_style/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/scalebar/center_osm_fixedscale/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/scalebar/center_osm_fixedscale/expectedSimpleImage.png index 53bd593832..0f59254763 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/scalebar/center_osm_fixedscale/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/scalebar/center_osm_fixedscale/expectedSimpleImage.png differ diff --git a/core/src/test/resources/org/mapfish/print/processor/map/wmts_buffer/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/wmts_buffer/expectedSimpleImage.png index 6d8240b480..b47d0fe524 100644 Binary files a/core/src/test/resources/org/mapfish/print/processor/map/wmts_buffer/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/wmts_buffer/expectedSimpleImage.png differ diff --git a/examples/src/test/resources/examples/config_aliases_defaults/expected_output/requestData-portrait.png b/examples/src/test/resources/examples/config_aliases_defaults/expected_output/requestData-portrait.png index a6417cc4e9..d0d6227f44 100644 Binary files a/examples/src/test/resources/examples/config_aliases_defaults/expected_output/requestData-portrait.png and b/examples/src/test/resources/examples/config_aliases_defaults/expected_output/requestData-portrait.png differ diff --git a/examples/src/test/resources/examples/datasource_many_dynamictables_legend/expected_output/requestData.png b/examples/src/test/resources/examples/datasource_many_dynamictables_legend/expected_output/requestData.png index 899365c4e8..4ab5820ae5 100644 Binary files a/examples/src/test/resources/examples/datasource_many_dynamictables_legend/expected_output/requestData.png and b/examples/src/test/resources/examples/datasource_many_dynamictables_legend/expected_output/requestData.png differ diff --git a/examples/src/test/resources/examples/datasource_multiple_maps/expected_output/requestData.png b/examples/src/test/resources/examples/datasource_multiple_maps/expected_output/requestData.png index 08e4d0798b..0c49efe4d6 100644 Binary files a/examples/src/test/resources/examples/datasource_multiple_maps/expected_output/requestData.png and b/examples/src/test/resources/examples/datasource_multiple_maps/expected_output/requestData.png differ diff --git a/examples/src/test/resources/examples/image_layer_base64/expected_output/requestData-layer-base64.png b/examples/src/test/resources/examples/image_layer_base64/expected_output/requestData-layer-base64.png index fc8a6090b6..300bdef263 100644 Binary files a/examples/src/test/resources/examples/image_layer_base64/expected_output/requestData-layer-base64.png and b/examples/src/test/resources/examples/image_layer_base64/expected_output/requestData-layer-base64.png differ diff --git a/examples/src/test/resources/examples/image_layer_test/expected_output/requestData-with-error.png b/examples/src/test/resources/examples/image_layer_test/expected_output/requestData-with-error.png index 5fa6d1e1a0..edd7c5dbf4 100644 Binary files a/examples/src/test/resources/examples/image_layer_test/expected_output/requestData-with-error.png and b/examples/src/test/resources/examples/image_layer_test/expected_output/requestData-with-error.png differ diff --git a/examples/src/test/resources/examples/image_layer_test/expected_output/requestData.png b/examples/src/test/resources/examples/image_layer_test/expected_output/requestData.png index 00524869f5..edd7c5dbf4 100644 Binary files a/examples/src/test/resources/examples/image_layer_test/expected_output/requestData.png and b/examples/src/test/resources/examples/image_layer_test/expected_output/requestData.png differ diff --git a/examples/src/test/resources/examples/merged_datasource/expected_output/requestData.png b/examples/src/test/resources/examples/merged_datasource/expected_output/requestData.png index 8ef6542fe1..7e77dcf051 100644 Binary files a/examples/src/test/resources/examples/merged_datasource/expected_output/requestData.png and b/examples/src/test/resources/examples/merged_datasource/expected_output/requestData.png differ diff --git a/examples/src/test/resources/examples/oereb/expected_output/requestData.png b/examples/src/test/resources/examples/oereb/expected_output/requestData.png index 017044d72c..7b38561d76 100644 Binary files a/examples/src/test/resources/examples/oereb/expected_output/requestData.png and b/examples/src/test/resources/examples/oereb/expected_output/requestData.png differ diff --git a/examples/src/test/resources/examples/overviewmap_tyger_ny_EPSG_3857/expected_output/requestData-scale-wmts1_0_0-full-kvp.png b/examples/src/test/resources/examples/overviewmap_tyger_ny_EPSG_3857/expected_output/requestData-scale-wmts1_0_0-full-kvp.png index 3a2389843f..1ae25d130c 100644 Binary files a/examples/src/test/resources/examples/overviewmap_tyger_ny_EPSG_3857/expected_output/requestData-scale-wmts1_0_0-full-kvp.png and b/examples/src/test/resources/examples/overviewmap_tyger_ny_EPSG_3857/expected_output/requestData-scale-wmts1_0_0-full-kvp.png differ diff --git a/examples/src/test/resources/examples/print_osm_new_york_EPSG_3857/expected_output/requestData-scale-osm.png b/examples/src/test/resources/examples/print_osm_new_york_EPSG_3857/expected_output/requestData-scale-osm.png index a7fedbeeda..7b029b1632 100644 Binary files a/examples/src/test/resources/examples/print_osm_new_york_EPSG_3857/expected_output/requestData-scale-osm.png and b/examples/src/test/resources/examples/print_osm_new_york_EPSG_3857/expected_output/requestData-scale-osm.png differ diff --git a/examples/src/test/resources/examples/print_osm_new_york_EPSG_3857/expected_output/requestData-scale-rotate-osm.png b/examples/src/test/resources/examples/print_osm_new_york_EPSG_3857/expected_output/requestData-scale-rotate-osm.png index 7230fed183..b128e4c82e 100644 Binary files a/examples/src/test/resources/examples/print_osm_new_york_EPSG_3857/expected_output/requestData-scale-rotate-osm.png and b/examples/src/test/resources/examples/print_osm_new_york_EPSG_3857/expected_output/requestData-scale-rotate-osm.png differ diff --git a/examples/src/test/resources/examples/print_osm_new_york_nosubreports/expected_output/requestData.png b/examples/src/test/resources/examples/print_osm_new_york_nosubreports/expected_output/requestData.png index a7fedbeeda..7b029b1632 100644 Binary files a/examples/src/test/resources/examples/print_osm_new_york_nosubreports/expected_output/requestData.png and b/examples/src/test/resources/examples/print_osm_new_york_nosubreports/expected_output/requestData.png differ diff --git a/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-bbox-auto-meta-tiled-wms1_1_1.png b/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-bbox-auto-meta-tiled-wms1_1_1.png index cb87f14eeb..5c7a18fcd5 100644 Binary files a/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-bbox-auto-meta-tiled-wms1_1_1.png and b/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-bbox-auto-meta-tiled-wms1_1_1.png differ diff --git a/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-bbox-auto-tiled-wms1_1_1.png b/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-bbox-auto-tiled-wms1_1_1.png index 5be2948d92..116b22348d 100644 Binary files a/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-bbox-auto-tiled-wms1_1_1.png and b/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-bbox-auto-tiled-wms1_1_1.png differ diff --git a/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-bbox-meta-tiled-wms1_1_1.png b/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-bbox-meta-tiled-wms1_1_1.png index e2119b6bcd..6d123f8296 100644 Binary files a/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-bbox-meta-tiled-wms1_1_1.png and b/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-bbox-meta-tiled-wms1_1_1.png differ diff --git a/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-bbox-tiled-wms1_1_1.png b/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-bbox-tiled-wms1_1_1.png index c2824e2a8c..20e0bed1ed 100644 Binary files a/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-bbox-tiled-wms1_1_1.png and b/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-bbox-tiled-wms1_1_1.png differ diff --git a/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-scale-tiled-wms1_1_1.png b/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-scale-tiled-wms1_1_1.png index 30d2003e07..005890821c 100644 Binary files a/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-scale-tiled-wms1_1_1.png and b/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-scale-tiled-wms1_1_1.png differ diff --git a/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-scale-wms1_0_0-high-dpi.png b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-scale-wms1_0_0-high-dpi.png index 76afa9d1c5..86ba457d0f 100644 Binary files a/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-scale-wms1_0_0-high-dpi.png and b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-scale-wms1_0_0-high-dpi.png differ diff --git a/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-scale-wms1_0_0.png b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-scale-wms1_0_0.png index eafe133481..2c23bda3e6 100644 Binary files a/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-scale-wms1_0_0.png and b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-scale-wms1_0_0.png differ diff --git a/examples/src/test/resources/examples/printwmts_tyger_ny_EPSG_3857/expected_output/requestData-scale-rotate-wmts1_0_0-full-kvp.png b/examples/src/test/resources/examples/printwmts_tyger_ny_EPSG_3857/expected_output/requestData-scale-rotate-wmts1_0_0-full-kvp.png index 09564f66fd..40871bd080 100644 Binary files a/examples/src/test/resources/examples/printwmts_tyger_ny_EPSG_3857/expected_output/requestData-scale-rotate-wmts1_0_0-full-kvp.png and b/examples/src/test/resources/examples/printwmts_tyger_ny_EPSG_3857/expected_output/requestData-scale-rotate-wmts1_0_0-full-kvp.png differ diff --git a/examples/src/test/resources/examples/secured_templates/expected_output/requestData.png b/examples/src/test/resources/examples/secured_templates/expected_output/requestData.png index eafe133481..2c23bda3e6 100644 Binary files a/examples/src/test/resources/examples/secured_templates/expected_output/requestData.png and b/examples/src/test/resources/examples/secured_templates/expected_output/requestData.png differ diff --git a/examples/src/test/resources/examples/simple_A0/expected_output/requestData.png b/examples/src/test/resources/examples/simple_A0/expected_output/requestData.png index 37a521ba80..2e93f5cf12 100644 Binary files a/examples/src/test/resources/examples/simple_A0/expected_output/requestData.png and b/examples/src/test/resources/examples/simple_A0/expected_output/requestData.png differ