diff --git a/.gitignore b/.gitignore index 4798702d9b..3707191733 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,10 @@ **/actual*.png **/diff*.png + +/examples/geoserver-data/logs/ +/examples/geoserver-data/gwc-gs.xml +/examples/geoserver-data/gwc-layers/ +/examples/geoserver-data/security/geoserver.jceks +/examples/geoserver-data/security/version.properties +/examples/geoserver-data/workspaces/default.xml diff --git a/Makefile b/Makefile index 8eb2a26a4f..0ecdc1e90b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,10 @@ GIT_HEAD_ARG = --build-arg=GIT_HEAD=$(shell git rev-parse HEAD) export DOCKER_BUILDKIT = 1 +.PHONY: clean +clean: + rm -rf .env examples/geoserver-data/logs/ + .PHONY: build build: build-builder docker build $(GIT_HEAD_ARG) --target=runner --tag=camptocamp/mapfish_print core @@ -44,15 +48,6 @@ tests: build-builder .PHONY: acceptance-tests-up acceptance-tests-up: build .env - docker-compose down --remove-orphan - - mkdir /tmp/geoserver-data || true - docker run --rm --volume=/tmp/geoserver-data:/mnt/geoserver_datadir camptocamp/geoserver \ - bash -c 'rm -rf /mnt/geoserver_datadir/*' - mkdir /tmp/geoserver-data/www - cp -r examples/geoserver-data/* /tmp/geoserver-data/ - cp -r core/src/test/resources/map-data/* /tmp/geoserver-data/www/ - # Required to avoid root ownership of reports folder mkdir -p examples/build/reports/ || true docker-compose up --detach diff --git a/core/src/main/java/org/mapfish/print/map/image/ImageLayer.java b/core/src/main/java/org/mapfish/print/map/image/ImageLayer.java index 57157585e4..b1a6590f65 100644 --- a/core/src/main/java/org/mapfish/print/map/image/ImageLayer.java +++ b/core/src/main/java/org/mapfish/print/map/image/ImageLayer.java @@ -39,6 +39,8 @@ import org.mapfish.print.map.geotools.StyleSupplier; import org.mapfish.print.parser.HasDefaultValue; import org.opengis.referencing.crs.CoordinateReferenceSystem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpMethod; import org.springframework.http.client.ClientHttpRequest; @@ -50,11 +52,14 @@ */ public final class ImageLayer extends AbstractSingleImageLayer { private final ImageParam params; + private final boolean failOnError; private final StyleSupplier styleSupplier; private final ExecutorService executorService; private final RenderType renderType; private double imageBufferScaling; private BufferedImage image; + private boolean imageLoadError = false; + private static final Logger LOGGER = LoggerFactory.getLogger(ImageLayer.class); /** * Constructor. @@ -73,6 +78,8 @@ protected ImageLayer( @Nonnull final MetricRegistry registry) { super(executorService, styleSupplier, params, registry, configuration); this.params = params; + this.failOnError = params.failOnError; + params.failOnError = true; this.styleSupplier = styleSupplier; this.executorService = executorService; this.renderType = RenderType.fromMimeType(params.imageFormat); @@ -83,7 +90,12 @@ protected BufferedImage loadImage( final MfClientHttpRequestFactory requestFactory, final MapfishMapContext transformer) { final ReferencedEnvelope envelopeOrig = transformer.getBounds().toReferencedEnvelope(transformer.getPaintArea()); - final Rectangle paintArea = calculateNewBounds(image, envelopeOrig); + final Rectangle paintArea; + if (imageLoadError) { + paintArea = transformer.getPaintArea(); + } else { + paintArea = calculateNewBounds(image, envelopeOrig); + } final ReferencedEnvelope envelope = transformer.getBounds().toReferencedEnvelope(paintArea); final BufferedImage bufferedImage = new BufferedImage(paintArea.width, paintArea.height, TYPE_INT_ARGB_PRE); @@ -157,30 +169,41 @@ public double getImageBufferScaling() { public void prepareRender( final MapfishMapContext transformer, final MfClientHttpRequestFactory clientHttpRequestFactory) { - image = fetchImage(transformer, clientHttpRequestFactory); + try { + image = fetchLayerImage(transformer, clientHttpRequestFactory); + } catch (URISyntaxException | IOException | RuntimeException e) { + if (failOnError) { + throw new RuntimeException(e); + } else { + LOGGER.error("Error while fetching image", e); + image = createErrorImage(new Rectangle(1, 1)); + imageLoadError = true; + imageBufferScaling = 1; + return; + } + } + imageLoadError = false; + final ReferencedEnvelope envelopeOrig = transformer.getBounds().toReferencedEnvelope(transformer.getPaintArea()); final Rectangle paintArea = calculateNewBounds(image, envelopeOrig); + double widthImageBufferScaling = paintArea.getWidth() / transformer.getMapSize().getWidth(); + double heightImageBufferScaling = paintArea.getHeight() / transformer.getMapSize().getHeight(); imageBufferScaling = - ((paintArea.getWidth() / transformer.getMapSize().getWidth()) - + (paintArea.getHeight() / transformer.getMapSize().getHeight())) - / 2; + Math.sqrt( + (Math.pow(widthImageBufferScaling, 2) + Math.pow(heightImageBufferScaling, 2)) / 2); } - private BufferedImage fetchImage( + private BufferedImage fetchLayerImage( final MapfishMapContext transformer, - final MfClientHttpRequestFactory clientHttpRequestFactory) { + final MfClientHttpRequestFactory clientHttpRequestFactory) + throws URISyntaxException, IOException { BufferedImage image; - try { - final URI commonUri = new URI(this.params.getBaseUrl()); - final ClientHttpRequest request = - clientHttpRequestFactory.createRequest(commonUri, HttpMethod.GET); - image = fetchImage(request, transformer); - } catch (URISyntaxException | IOException e) { - throw new RuntimeException(e); - } - return image; + final URI commonUri = new URI(this.params.getBaseUrl()); + final ClientHttpRequest request = + clientHttpRequestFactory.createRequest(commonUri, HttpMethod.GET); + return fetchImage(request, transformer); } /** diff --git a/core/src/main/java/org/mapfish/print/test/util/ImageSimilarity.java b/core/src/main/java/org/mapfish/print/test/util/ImageSimilarity.java index 1729c5e65a..b5373f22b7 100644 --- a/core/src/main/java/org/mapfish/print/test/util/ImageSimilarity.java +++ b/core/src/main/java/org/mapfish/print/test/util/ImageSimilarity.java @@ -48,14 +48,14 @@ public final class ImageSimilarity { /** The constructor, which creates the GUI and start the image processing task. */ public ImageSimilarity(final File expectedFile) throws IOException { this.expectedImage = expectedFile.exists() ? ImageIO.read(expectedFile) : null; - if (REGENERATE_EXPECTED_IMAGES) { + if (REGENERATE_EXPECTED_IMAGES || !expectedFile.exists()) { this.expectedPath = new File( expectedFile .toString() .replace("/out/", "/src/") .replace("/build/classes/test/", "/src/test/resources/") - .replace("/src/core/build/resources/test/", "/src/core/src/test/resources/")); + .replace("/build/resources/test/", "/src/test/resources/")); } else { this.expectedPath = expectedFile; } @@ -257,12 +257,18 @@ private File getRelatedFile(final String name) { actualIterator.getPixel(x, y, actualPixel); maskIterator.getPixel(x, y, maskPixel); double squareDist = 0.0; - for (int i = 0; i < this.expectedImage.getSampleModel().getNumBands(); i++) { - double colorDist = (expectedPixel[i] - actualPixel[i]) * (maskPixel[0] / 255.0); - squareDist += colorDist * colorDist; + if (maskPixel[0] == 255) { + for (int i = 0; i < this.expectedImage.getSampleModel().getNumBands(); i++) { + double colorDist = expectedPixel[i] - actualPixel[i]; + squareDist += colorDist * colorDist; + } + } else if (maskPixel[0] != 0) { + throw new RuntimeException( + String.format( + "Mask image must be only black and white (0 and 255), got %s at %s,%s in:\n%s", + maskPixel[0], x, y, this.maskImage)); } - double pxDiff = - Math.sqrt(squareDist) / Math.sqrt(this.expectedImage.getSampleModel().getNumBands()); + double pxDiff = Math.sqrt(squareDist / this.expectedImage.getSampleModel().getNumBands()); dist += pxDiff / 255; diffGraphics.setColor(new Color((int) Math.round(pxDiff), 0, 0)); diffGraphics.drawRect(x, y, 1, 1); @@ -360,7 +366,7 @@ public void assertSimilarity(final File actualFile, final double maxDistance) th * @throws IOException if the image could not be written. */ public void assertSimilarity(final BufferedImage actualImage) throws IOException { - assertSimilarity(actualImage, 1); + assertSimilarity(actualImage, 0); } /** @@ -375,6 +381,7 @@ public void assertSimilarity(final BufferedImage actualImage, final double maxDi throws IOException { if (REGENERATE_EXPECTED_IMAGES || !this.expectedPath.exists()) { ImageIO.write(actualImage, "png", expectedPath); + System.out.println("The expected file has been generated: " + expectedPath.getAbsolutePath()); if (REGENERATE_EXPECTED_IMAGES) { return; } else { diff --git a/core/src/test/resources/map-data/ol-demo.html b/core/src/test/resources/map-data/ol-demo.html index c24fcfdbc9..3f6a92f429 100644 --- a/core/src/test/resources/map-data/ol-demo.html +++ b/core/src/test/resources/map-data/ol-demo.html @@ -79,7 +79,7 @@ // create WMS layer var wms = new OpenLayers.Layer.WMS( 'TOPP States', - 'http://geoserver:8080/wms?', + 'http://geoserver:8080/geoserver/wms?', { layers: 'topp:states', styles: '', diff --git a/docker-compose.yaml b/docker-compose.yaml index 8b5f337d12..85431071bc 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,9 +3,10 @@ version: '2.1' services: geoserver: - image: camptocamp/geoserver:2.17 + image: camptocamp/geoserver:2.22.2 volumes: - - /tmp/geoserver-data:/mnt/geoserver_datadir + - ./examples/geoserver-data/:/mnt/geoserver_datadir + - ./core/src/test/resources/map-data/:/mnt/geoserver_datadir/www/map-data print: image: mapfish_print_tester @@ -25,6 +26,7 @@ services: command: tail --follow /dev/null volumes: - ./examples/src:/src/examples/src:ro + - ./examples/src/test/resources/examples:/src/examples/src/test/resources/examples - ./examples/build/reports:/src/examples/build/reports - ./examples/build/resources:/src/examples/build/resources environment: diff --git a/examples/README.md b/examples/README.md index 8d73ed5cbf..0b6019d8b9 100644 --- a/examples/README.md +++ b/examples/README.md @@ -1,4 +1,4 @@ -# Summary +## Summary This repository is a submodule of mapfish-print and contains e2e tests for the pdf and image generation. It contains the code to start a Geoserver instance and run junit integration tests against the server to test as @@ -13,16 +13,16 @@ understood by referring to: > -# Test client +## Test client The test server includes a client which can be used for testing. To start the server, run: docker-compose up -d -In the docker-comose context GeoServer can be accessed at and +In the docker-comose context GeoServer can be accessed at and MapFish Print can be accessed at -# Writing Tests +## Writing Tests By default the test server is in daemon mode, which mean that the servers will be run in a background thread and be shutdown when the build completes. In order to be able to run the tests in a IDE one can run: @@ -31,3 +31,16 @@ and be shutdown when the build completes. In order to be able to run the tests i This will start the test servers in non-daemon mode allowing one to start the server and then run tests in your IDE against that server for development. + +## Test images used by acceptance tests + +The application config will be loaded from the `src/test/resources/examples//config.yaml` file. + +The spec files will be loaded from the `src/test/resources/examples//requestData.json` file. + +The expected images will be loaded from the `src/test/resources/examples//expected_output/requestData.png` file. + +We can optionally have a mask image that will be used to mask the tested image. +This mask image will be loaded from the `src/test/resources/examples//expected_output/mask-requestData.png` file. +This image should be grayscale with only full black and full white pixel values. +If we create the mask image with Gimp, we can't create indexed image with tow colors because in the Java code we get the values 1 instead of 0 for the black pixel. diff --git a/examples/build.gradle b/examples/build.gradle index 30d5594a79..cda33e8412 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -34,7 +34,7 @@ configurations { tasks.register('geoserver' , Exec) { description 'Run and wait for GeoServer with test data' - commandLine 'curl', 'http://geoserver:8080/web/', '--output', '/dev/null' + commandLine 'curl', 'http://geoserver:8080/geoserver/web/', '--output', '/dev/null' } // prevent that the tests target can be directly called. the integration tests diff --git a/examples/geoserver-data/data/README.md b/examples/geoserver-data/data/README.md new file mode 100644 index 0000000000..0fdb12b3a2 --- /dev/null +++ b/examples/geoserver-data/data/README.md @@ -0,0 +1,3 @@ +# Project used to run the examples + +Originally the project comes from the example project provided by GeoServer. diff --git a/examples/geoserver-data/data/shapefiles/README.md b/examples/geoserver-data/data/shapefiles/README.md new file mode 100644 index 0000000000..11ef501fb0 --- /dev/null +++ b/examples/geoserver-data/data/shapefiles/README.md @@ -0,0 +1,3 @@ +# Shapefiles + +`state.shp` contains the US states, simplified with `ogr2ogr examples/geoserver-data/data/shapefiles/states.shp -update -simplify 0.01` diff --git a/examples/geoserver-data/data/shapefiles/states.dbf b/examples/geoserver-data/data/shapefiles/states.dbf index 45b725f841..149ddccd9a 100644 Binary files a/examples/geoserver-data/data/shapefiles/states.dbf and b/examples/geoserver-data/data/shapefiles/states.dbf differ diff --git a/examples/geoserver-data/data/shapefiles/states.prj b/examples/geoserver-data/data/shapefiles/states.prj index 7a70628b09..f45cbadf00 100644 --- a/examples/geoserver-data/data/shapefiles/states.prj +++ b/examples/geoserver-data/data/shapefiles/states.prj @@ -1 +1 @@ -GEOGCS["GCS_WGS_1984",DATUM["WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]] +GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]] \ No newline at end of file diff --git a/examples/geoserver-data/data/shapefiles/states.qix b/examples/geoserver-data/data/shapefiles/states.qix index b3b87e1ca5..000a0df929 100644 Binary files a/examples/geoserver-data/data/shapefiles/states.qix and b/examples/geoserver-data/data/shapefiles/states.qix differ diff --git a/examples/geoserver-data/data/shapefiles/states.shp b/examples/geoserver-data/data/shapefiles/states.shp index 40aa5edf5c..5ef1cdca03 100644 Binary files a/examples/geoserver-data/data/shapefiles/states.shp and b/examples/geoserver-data/data/shapefiles/states.shp differ diff --git a/examples/geoserver-data/data/shapefiles/states.shx b/examples/geoserver-data/data/shapefiles/states.shx index 820c398e74..2d6ac6843b 100644 Binary files a/examples/geoserver-data/data/shapefiles/states.shx and b/examples/geoserver-data/data/shapefiles/states.shx differ diff --git a/examples/geoserver-data/demo/WFS_transactionInsert.xml b/examples/geoserver-data/demo/WFS_transactionInsert.xml index 9e570d634d..20354afb88 100644 --- a/examples/geoserver-data/demo/WFS_transactionInsert.xml +++ b/examples/geoserver-data/demo/WFS_transactionInsert.xml @@ -10,7 +10,7 @@ xmlns:topp="http://www.openplans.org/topp" xmlns:gml="http://www.opengis.net/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/WFS-transaction.xsd http://www.openplans.org/topp http://geoserver:8080/wfs/DescribeFeatureType?typename=topp:tasmania_roads"> + xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/WFS-transaction.xsd http://www.openplans.org/topp http://geoserver:8080/geoserver/wfs/DescribeFeatureType?typename=topp:tasmania_roads"> diff --git a/examples/geoserver-data/demo/WMS_GetLegendGraphic-SLD.url b/examples/geoserver-data/demo/WMS_GetLegendGraphic-SLD.url index e140e8a541..57da060fb7 100644 --- a/examples/geoserver-data/demo/WMS_GetLegendGraphic-SLD.url +++ b/examples/geoserver-data/demo/WMS_GetLegendGraphic-SLD.url @@ -1 +1 @@ -wms?REQUEST=GetLegendGraphic&VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=topp:states&SLD=http://geoserver:8080/www/styles/green.sld +wms?REQUEST=GetLegendGraphic&VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=topp:states&SLD=http://geoserver:8080/geoserver/www/styles/green.sld diff --git a/examples/geoserver-data/security/filter/anonymous/config.xml b/examples/geoserver-data/security/filter/anonymous/config.xml index 7dc262df0e..bf41a32229 100644 --- a/examples/geoserver-data/security/filter/anonymous/config.xml +++ b/examples/geoserver-data/security/filter/anonymous/config.xml @@ -2,4 +2,4 @@ 52857278:13c7ffd66a8:-7ff7 anonymous org.geoserver.security.filter.GeoServerAnonymousAuthenticationFilter - + \ No newline at end of file diff --git a/examples/geoserver-data/security/filter/basic/config.xml b/examples/geoserver-data/security/filter/basic/config.xml index 8f76d2d978..aeb780b64d 100644 --- a/examples/geoserver-data/security/filter/basic/config.xml +++ b/examples/geoserver-data/security/filter/basic/config.xml @@ -3,4 +3,4 @@ basic org.geoserver.security.filter.GeoServerBasicAuthenticationFilter true - + \ No newline at end of file diff --git a/examples/geoserver-data/security/filter/contextAsc/config.xml b/examples/geoserver-data/security/filter/contextAsc/config.xml index 56a6c1f8b6..8b27b264d2 100644 --- a/examples/geoserver-data/security/filter/contextAsc/config.xml +++ b/examples/geoserver-data/security/filter/contextAsc/config.xml @@ -3,4 +3,4 @@ contextAsc org.geoserver.security.filter.GeoServerSecurityContextPersistenceFilter true - + \ No newline at end of file diff --git a/examples/geoserver-data/security/filter/contextNoAsc/config.xml b/examples/geoserver-data/security/filter/contextNoAsc/config.xml index 1fd551879c..153c3ed626 100644 --- a/examples/geoserver-data/security/filter/contextNoAsc/config.xml +++ b/examples/geoserver-data/security/filter/contextNoAsc/config.xml @@ -3,4 +3,4 @@ contextNoAsc org.geoserver.security.filter.GeoServerSecurityContextPersistenceFilter false - + \ No newline at end of file diff --git a/examples/geoserver-data/security/filter/exception/config.xml b/examples/geoserver-data/security/filter/exception/config.xml index 9b731335c2..d597e08354 100644 --- a/examples/geoserver-data/security/filter/exception/config.xml +++ b/examples/geoserver-data/security/filter/exception/config.xml @@ -2,4 +2,4 @@ 52857278:13c7ffd66a8:-7ff2 exception org.geoserver.security.filter.GeoServerExceptionTranslationFilter - + \ No newline at end of file diff --git a/examples/geoserver-data/security/filter/form/config.xml b/examples/geoserver-data/security/filter/form/config.xml index fc31aa3d14..40355db8d5 100644 --- a/examples/geoserver-data/security/filter/form/config.xml +++ b/examples/geoserver-data/security/filter/form/config.xml @@ -4,4 +4,4 @@ org.geoserver.security.filter.GeoServerUserNamePasswordAuthenticationFilter password username - + \ No newline at end of file diff --git a/examples/geoserver-data/security/filter/formLogout/config.xml b/examples/geoserver-data/security/filter/formLogout/config.xml index 13903a17f3..a5d200f22d 100644 --- a/examples/geoserver-data/security/filter/formLogout/config.xml +++ b/examples/geoserver-data/security/filter/formLogout/config.xml @@ -3,4 +3,4 @@ formLogout org.geoserver.security.filter.GeoServerLogoutFilter /web/ - + \ No newline at end of file diff --git a/examples/geoserver-data/security/filter/interceptor/config.xml b/examples/geoserver-data/security/filter/interceptor/config.xml index 7f25915af6..21e0dda42c 100644 --- a/examples/geoserver-data/security/filter/interceptor/config.xml +++ b/examples/geoserver-data/security/filter/interceptor/config.xml @@ -4,4 +4,4 @@ org.geoserver.security.filter.GeoServerSecurityInterceptorFilter false geoserverMetadataSource - + \ No newline at end of file diff --git a/examples/geoserver-data/security/filter/rememberme/config.xml b/examples/geoserver-data/security/filter/rememberme/config.xml index 8bc576a394..7f0bd2e33d 100644 --- a/examples/geoserver-data/security/filter/rememberme/config.xml +++ b/examples/geoserver-data/security/filter/rememberme/config.xml @@ -2,4 +2,4 @@ 52857278:13c7ffd66a8:-7ff6 rememberme org.geoserver.security.filter.GeoServerRememberMeAuthenticationFilter - + \ No newline at end of file diff --git a/examples/geoserver-data/security/filter/restInterceptor/config.xml b/examples/geoserver-data/security/filter/restInterceptor/config.xml index 76900b4de1..2105487acf 100644 --- a/examples/geoserver-data/security/filter/restInterceptor/config.xml +++ b/examples/geoserver-data/security/filter/restInterceptor/config.xml @@ -4,4 +4,4 @@ org.geoserver.security.filter.GeoServerSecurityInterceptorFilter false restFilterDefinitionMap - + \ No newline at end of file diff --git a/examples/geoserver-data/security/filter/roleFilter/config.xml b/examples/geoserver-data/security/filter/roleFilter/config.xml index 68336f3e4b..10464e4e03 100644 --- a/examples/geoserver-data/security/filter/roleFilter/config.xml +++ b/examples/geoserver-data/security/filter/roleFilter/config.xml @@ -4,4 +4,4 @@ org.geoserver.security.filter.GeoServerRoleFilter roles roleConverter - + \ No newline at end of file diff --git a/examples/geoserver-data/security/filter/sslFilter/config.xml b/examples/geoserver-data/security/filter/sslFilter/config.xml index 37d5ce1642..2cb259ecf2 100644 --- a/examples/geoserver-data/security/filter/sslFilter/config.xml +++ b/examples/geoserver-data/security/filter/sslFilter/config.xml @@ -3,4 +3,4 @@ sslFilter org.geoserver.security.filter.GeoServerSSLFilter 443 - + \ No newline at end of file diff --git a/examples/src/test/resources/examples/add_overlay_layer/expected_output/requestData-one-data-layer.png b/examples/src/test/resources/examples/add_overlay_layer/expected_output/requestData-one-data-layer.png index c64bd69366..9a00cd3183 100644 Binary files a/examples/src/test/resources/examples/add_overlay_layer/expected_output/requestData-one-data-layer.png and b/examples/src/test/resources/examples/add_overlay_layer/expected_output/requestData-one-data-layer.png differ diff --git a/examples/src/test/resources/examples/add_overlay_layer/expected_output/requestData-override-overlay.png b/examples/src/test/resources/examples/add_overlay_layer/expected_output/requestData-override-overlay.png index c64bd69366..9a00cd3183 100644 Binary files a/examples/src/test/resources/examples/add_overlay_layer/expected_output/requestData-override-overlay.png and b/examples/src/test/resources/examples/add_overlay_layer/expected_output/requestData-override-overlay.png differ diff --git a/examples/src/test/resources/examples/add_overlay_layer/requestData-one-data-layer.json b/examples/src/test/resources/examples/add_overlay_layer/requestData-one-data-layer.json index 4c0a212508..38da28fd6b 100644 --- a/examples/src/test/resources/examples/add_overlay_layer/requestData-one-data-layer.json +++ b/examples/src/test/resources/examples/add_overlay_layer/requestData-one-data-layer.json @@ -10,7 +10,7 @@ "scale": 25000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], diff --git a/examples/src/test/resources/examples/add_overlay_layer/requestData-override-overlay.json b/examples/src/test/resources/examples/add_overlay_layer/requestData-override-overlay.json index 4c0a212508..38da28fd6b 100644 --- a/examples/src/test/resources/examples/add_overlay_layer/requestData-override-overlay.json +++ b/examples/src/test/resources/examples/add_overlay_layer/requestData-override-overlay.json @@ -10,7 +10,7 @@ "scale": 25000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], diff --git a/examples/src/test/resources/examples/config_aliases_defaults/config.yaml b/examples/src/test/resources/examples/config_aliases_defaults/config.yaml index 6e1a97a9e9..bda8e6f1cc 100644 --- a/examples/src/test/resources/examples/config_aliases_defaults/config.yaml +++ b/examples/src/test/resources/examples/config_aliases_defaults/config.yaml @@ -18,7 +18,7 @@ templates: rotation: 0 layers: - type: WMS - baseURL: "http://geoserver:8080/wms" + baseURL: "http://geoserver:8080/geoserver/wms" opacity: 1 layers: ["tiger:tiger_roads"] imageFormat: "image/png" @@ -26,7 +26,7 @@ templates: customParams: TRANSPARENT: "true" - type: "OSM" - baseURL: "http://geoserver:8080/www/osm/" + baseURL: "http://geoserver:8080/geoserver/www/map-data/osm/" imageExtension: "png" processors: &PROCESSORS - !restrictUris diff --git a/examples/src/test/resources/examples/config_aliases_defaults/expected_output/requestData-landscape.png b/examples/src/test/resources/examples/config_aliases_defaults/expected_output/requestData-landscape.png index 75bae2631a..5147960087 100644 Binary files a/examples/src/test/resources/examples/config_aliases_defaults/expected_output/requestData-landscape.png and b/examples/src/test/resources/examples/config_aliases_defaults/expected_output/requestData-landscape.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 b4291f78b4..a6417cc4e9 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/config_aliases_defaults/requestData-landscape.json b/examples/src/test/resources/examples/config_aliases_defaults/requestData-landscape.json index 24bebfe392..e095a5e514 100644 --- a/examples/src/test/resources/examples/config_aliases_defaults/requestData-landscape.json +++ b/examples/src/test/resources/examples/config_aliases_defaults/requestData-landscape.json @@ -10,7 +10,7 @@ "scale": 26000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], diff --git a/examples/src/test/resources/examples/crosses_point_grid/expected_output/requestData-all-usa-states-with-crosses-grid.png b/examples/src/test/resources/examples/crosses_point_grid/expected_output/requestData-all-usa-states-with-crosses-grid.png index 2878c09d4f..e9a8f095b3 100644 Binary files a/examples/src/test/resources/examples/crosses_point_grid/expected_output/requestData-all-usa-states-with-crosses-grid.png and b/examples/src/test/resources/examples/crosses_point_grid/expected_output/requestData-all-usa-states-with-crosses-grid.png differ diff --git a/examples/src/test/resources/examples/crosses_point_grid/expected_output/requestData-new-york-with-crosses-grid-22-degree-rotation.png b/examples/src/test/resources/examples/crosses_point_grid/expected_output/requestData-new-york-with-crosses-grid-22-degree-rotation.png index 29f9bb14d5..f4d1e030c2 100644 Binary files a/examples/src/test/resources/examples/crosses_point_grid/expected_output/requestData-new-york-with-crosses-grid-22-degree-rotation.png and b/examples/src/test/resources/examples/crosses_point_grid/expected_output/requestData-new-york-with-crosses-grid-22-degree-rotation.png differ diff --git a/examples/src/test/resources/examples/crosses_point_grid/requestData-all-usa-states-with-crosses-grid.json b/examples/src/test/resources/examples/crosses_point_grid/requestData-all-usa-states-with-crosses-grid.json index f5cf3c64a1..beecd4ea62 100644 --- a/examples/src/test/resources/examples/crosses_point_grid/requestData-all-usa-states-with-crosses-grid.json +++ b/examples/src/test/resources/examples/crosses_point_grid/requestData-all-usa-states-with-crosses-grid.json @@ -35,7 +35,7 @@ { "type": "WMS", "layers": ["topp:states"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.3.0" } diff --git a/examples/src/test/resources/examples/crosses_point_grid/requestData-new-york-with-crosses-grid-22-degree-rotation.json b/examples/src/test/resources/examples/crosses_point_grid/requestData-new-york-with-crosses-grid-22-degree-rotation.json index 7e191ddef4..0d1a831d47 100644 --- a/examples/src/test/resources/examples/crosses_point_grid/requestData-new-york-with-crosses-grid-22-degree-rotation.json +++ b/examples/src/test/resources/examples/crosses_point_grid/requestData-new-york-with-crosses-grid-22-degree-rotation.json @@ -22,7 +22,7 @@ } }, { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger-ny"], diff --git a/examples/src/test/resources/examples/customDynamicReport/requestData.json b/examples/src/test/resources/examples/customDynamicReport/requestData.json index f383e13521..5d01304b8b 100644 --- a/examples/src/test/resources/examples/customDynamicReport/requestData.json +++ b/examples/src/test/resources/examples/customDynamicReport/requestData.json @@ -37,7 +37,7 @@ { "type": "geojson", "style": "polygon", - "geoJson": "http://geoserver:8080/www/test-data/simple-squares-geojson.json" + "geoJson": "http://geoserver:8080/geoserver/www/map-data/test-data/simple-squares-geojson.json" } ] } diff --git a/examples/src/test/resources/examples/data_uri_json/requestData-json-style-v2-not-svg.json b/examples/src/test/resources/examples/data_uri_json/requestData-json-style-v2-not-svg.json index dcac3d0cd0..cd0f9e0f4e 100644 --- a/examples/src/test/resources/examples/data_uri_json/requestData-json-style-v2-not-svg.json +++ b/examples/src/test/resources/examples/data_uri_json/requestData-json-style-v2-not-svg.json @@ -5,7 +5,7 @@ "dpi": 128, "layers": [ { - "geoJson": "http://geoserver:8080/tiger/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=tiger:tiger_roads&maxFeatures=1000000&outputFormat=application%2Fjson&srsName=EPSG:3857", + "geoJson": "http://geoserver:8080/geoserver/tiger/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=tiger:tiger_roads&maxFeatures=1000000&outputFormat=application%2Fjson&srsName=EPSG:3857", "style": { "version": "2", "strokeColor": "gray", 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 b992a029ee..7eebf81433 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_many_dynamictables_legend/requestData.json b/examples/src/test/resources/examples/datasource_many_dynamictables_legend/requestData.json index e6112519dd..41e2f461b5 100644 --- a/examples/src/test/resources/examples/datasource_many_dynamictables_legend/requestData.json +++ b/examples/src/test/resources/examples/datasource_many_dynamictables_legend/requestData.json @@ -22,14 +22,14 @@ "columns": ["icon", "osm_id", "timestamp", "name", "Type"], "data": [ [ - "http://geoserver:8080/www/icons/men-at-work.jpeg", + "http://geoserver:8080/geoserver/www/map-data/icons/men-at-work.jpeg", "629119177", "2010-02-04T18:42:23Z", "Oh! Liban", "restaurant" ], [ - "http://geoserver:8080/www/icons/men-at-work.jpeg", + "http://geoserver:8080/geoserver/www/map-data/icons/men-at-work.jpeg", "1423114737", "2011-09-04T15:05:13Z", "Restaurant Mirabeau", @@ -163,7 +163,7 @@ { "name": "osm", "icons": [ - "http://geoserver:8080/wms?REQUEST=GetLegendGraphic&VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=topp:states" + "http://geoserver:8080/geoserver/wms?REQUEST=GetLegendGraphic&VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=topp:states" ] } ] @@ -174,13 +174,13 @@ { "name": "fluel", "icons": [ - "http://geoserver:8080/wms?REQUEST=GetLegendGraphic&VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=topp:tasmania_cities" + "http://geoserver:8080/geoserver/wms?REQUEST=GetLegendGraphic&VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=topp:tasmania_cities" ] }, { "name": "hotel", "icons": [ - "http://geoserver:8080/wms?REQUEST=GetLegendGraphic&VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=tiger-ny" + "http://geoserver:8080/geoserver/wms?REQUEST=GetLegendGraphic&VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=tiger-ny" ] } ] diff --git a/examples/src/test/resources/examples/datasource_multiple_maps/expected_output/mask-requestData.png b/examples/src/test/resources/examples/datasource_multiple_maps/expected_output/mask-requestData.png index 358b3722a5..cb865a4f23 100644 Binary files a/examples/src/test/resources/examples/datasource_multiple_maps/expected_output/mask-requestData.png and b/examples/src/test/resources/examples/datasource_multiple_maps/expected_output/mask-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 9c334d20e4..08e4d0798b 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/datasource_multiple_maps/requestData.json b/examples/src/test/resources/examples/datasource_multiple_maps/requestData.json index 0cf089dbd4..6add3a02c5 100644 --- a/examples/src/test/resources/examples/datasource_multiple_maps/requestData.json +++ b/examples/src/test/resources/examples/datasource_multiple_maps/requestData.json @@ -48,7 +48,7 @@ } }, { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger-ny"], @@ -103,7 +103,7 @@ } }, { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger-ny"], @@ -158,7 +158,7 @@ } }, { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger-ny"], diff --git a/examples/src/test/resources/examples/geoext/requestData.json b/examples/src/test/resources/examples/geoext/requestData.json index afcbe37716..b51f96b331 100644 --- a/examples/src/test/resources/examples/geoext/requestData.json +++ b/examples/src/test/resources/examples/geoext/requestData.json @@ -11,7 +11,7 @@ { "type": "geojson", "style": "polygon", - "geoJson": "http://geoserver:8080/www/test-data/simple-squares-geojson.json" + "geoJson": "http://geoserver:8080/geoserver/www/map-data/test-data/simple-squares-geojson.json" } ] } diff --git a/examples/src/test/resources/examples/http_processors/config.yaml b/examples/src/test/resources/examples/http_processors/config.yaml index fedbb77d4b..70bd586e62 100644 --- a/examples/src/test/resources/examples/http_processors/config.yaml +++ b/examples/src/test/resources/examples/http_processors/config.yaml @@ -34,7 +34,7 @@ templates: # Add a static header to all http requests - !addHeaders headers: - newHeader: 'headerValue' + newHeader: headerValue # Only allow geoserver requests, any other requests will be rejected - !restrictUris matchers: diff --git a/examples/src/test/resources/examples/http_processors/expected_output/requestData.png b/examples/src/test/resources/examples/http_processors/expected_output/requestData.png index 268a174125..5f85843277 100644 Binary files a/examples/src/test/resources/examples/http_processors/expected_output/requestData.png and b/examples/src/test/resources/examples/http_processors/expected_output/requestData.png differ diff --git a/examples/src/test/resources/examples/http_processors/requestData.json b/examples/src/test/resources/examples/http_processors/requestData.json index a2f969c709..6c2dda7f04 100644 --- a/examples/src/test/resources/examples/http_processors/requestData.json +++ b/examples/src/test/resources/examples/http_processors/requestData.json @@ -12,7 +12,7 @@ { "type": "WMS", "layers": ["topp:states"], - "baseURL": "https://myhost.com:9090/wms", + "baseURL": "https://myhost.com:9090/geoserver/wms", "imageFormat": "image/png", "version": "1.3.0", "customParams": { 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 0f5f2da78b..fc8a6090b6 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 new file mode 100644 index 0000000000..5fa6d1e1a0 Binary files /dev/null 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/requestData-with-error.json b/examples/src/test/resources/examples/image_layer_test/requestData-with-error.json new file mode 100644 index 0000000000..4b083add43 --- /dev/null +++ b/examples/src/test/resources/examples/image_layer_test/requestData-with-error.json @@ -0,0 +1,22 @@ +{ + "layout": "A4 landscape", + "outputFormat": "pdf", + "attributes": { + "map": { + "bbox": [4150836.3839982115, 7600898.092677928, 5703147.34969658, 8257645.039704161], + "dpi": 300, + "layers": [ + { + "baseURL": "http://geoserver:8080/does-not-exist.png", + "extent": [4392836.015549079, 7861166.1739889495, 4481502.968359884, 7888169.291435877], + "name": "image", + "opacity": 1, + "type": "image" + } + ], + "longitudeFirst": true, + "projection": "EPSG:3857", + "rotation": 0 + } + } +} diff --git a/examples/src/test/resources/examples/image_layer_test/requestData.json b/examples/src/test/resources/examples/image_layer_test/requestData.json index eb2ececee6..f254e30ee7 100644 --- a/examples/src/test/resources/examples/image_layer_test/requestData.json +++ b/examples/src/test/resources/examples/image_layer_test/requestData.json @@ -7,7 +7,7 @@ "dpi": 300, "layers": [ { - "baseURL": "http://geoserver:8080/www/GeoServer.png", + "baseURL": "http://geoserver:8080/geoserver/www/GeoServer.png", "extent": [4392836.015549079, 7861166.1739889495, 4481502.968359884, 7888169.291435877], "name": "image", "opacity": 1, diff --git a/examples/src/test/resources/examples/json_styling/expected_output/requestData-json-style-v2-not-svg.png b/examples/src/test/resources/examples/json_styling/expected_output/requestData-json-style-v2-not-svg.png index dbc4c3a1de..3f9296a3f3 100644 Binary files a/examples/src/test/resources/examples/json_styling/expected_output/requestData-json-style-v2-not-svg.png and b/examples/src/test/resources/examples/json_styling/expected_output/requestData-json-style-v2-not-svg.png differ diff --git a/examples/src/test/resources/examples/json_styling/requestData-json-style-v2-not-svg.json b/examples/src/test/resources/examples/json_styling/requestData-json-style-v2-not-svg.json index 7d2c3970ce..e2c1b021f1 100644 --- a/examples/src/test/resources/examples/json_styling/requestData-json-style-v2-not-svg.json +++ b/examples/src/test/resources/examples/json_styling/requestData-json-style-v2-not-svg.json @@ -5,7 +5,7 @@ "dpi": 128, "layers": [ { - "geoJson": "http://geoserver:8080/tiger/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=tiger:tiger_roads&maxFeatures=1000000&outputFormat=application%2Fjson&srsName=EPSG:3857", + "geoJson": "http://geoserver:8080/geoserver/tiger/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=tiger:tiger_roads&maxFeatures=1000000&outputFormat=application%2Fjson&srsName=EPSG:3857", "style": { "version": "2", "strokeColor": "gray", @@ -57,7 +57,7 @@ "[NAME = 'Shubert Aly']": { "symbolizers": [ { - "externalGraphic": "http://geoserver:8080/www/icons/men-at-work.jpeg", + "externalGraphic": "http://geoserver:8080/geoserver/www/icons/men-at-work.jpeg", "graphicWidth": 32, "graphicOpacity": 1, "graphicFormat": "image/jpeg", diff --git a/examples/src/test/resources/examples/legend/expected_output/requestData.png b/examples/src/test/resources/examples/legend/expected_output/requestData.png index 595f575a77..0c0aaab69a 100644 Binary files a/examples/src/test/resources/examples/legend/expected_output/requestData.png and b/examples/src/test/resources/examples/legend/expected_output/requestData.png differ diff --git a/examples/src/test/resources/examples/legend/requestData.json b/examples/src/test/resources/examples/legend/requestData.json index 6e830eed20..f95f0fb29f 100644 --- a/examples/src/test/resources/examples/legend/requestData.json +++ b/examples/src/test/resources/examples/legend/requestData.json @@ -11,7 +11,7 @@ { "type": "geojson", "style": "polygon", - "geoJson": "http://geoserver:8080/www/test-data/simple-squares-geojson.json" + "geoJson": "http://geoserver:8080/geoserver/www/map-data/test-data/simple-squares-geojson.json" } ] }, @@ -20,19 +20,19 @@ "classes": [ { "name": "Arbres", - "icons": ["http://geoserver:8080/www/legends/legend1.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/legend1.png"] }, { "name": "Peturbations", - "icons": ["http://geoserver:8080/www/legends/legend2.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/legend2.png"] }, { "name": "Points de vente", - "icons": ["http://geoserver:8080/www/legends/legend3.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/legend3.png"] }, { "name": "Alea", - "icons": ["http://geoserver:8080/www/legends/legend4.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/legend4.png"] }, { "name": "Data uri test", diff --git a/examples/src/test/resources/examples/legend_cropped/expected_output/requestData.png b/examples/src/test/resources/examples/legend_cropped/expected_output/requestData.png index 750ad8f1fa..370feb5002 100644 Binary files a/examples/src/test/resources/examples/legend_cropped/expected_output/requestData.png and b/examples/src/test/resources/examples/legend_cropped/expected_output/requestData.png differ diff --git a/examples/src/test/resources/examples/legend_cropped/requestData.json b/examples/src/test/resources/examples/legend_cropped/requestData.json index 375bf33e53..8d0f0d16d6 100644 --- a/examples/src/test/resources/examples/legend_cropped/requestData.json +++ b/examples/src/test/resources/examples/legend_cropped/requestData.json @@ -11,7 +11,7 @@ { "type": "geojson", "style": "polygon", - "geoJson": "http://geoserver:8080/www/test-data/simple-squares-geojson.json" + "geoJson": "http://geoserver:8080/geoserver/www/map-data/test-data/simple-squares-geojson.json" } ] }, @@ -20,19 +20,19 @@ "classes": [ { "name": "Arbres", - "icons": ["http://geoserver:8080/www/legends/legend1.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/legend1.png"] }, { "name": "Peturbations", - "icons": ["http://geoserver:8080/www/legends/legend2.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/legend2.png"] }, { "name": "Points de vente", - "icons": ["http://geoserver:8080/www/legends/legend3.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/legend3.png"] }, { "name": "Alea", - "icons": ["http://geoserver:8080/www/legends/legend4.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/legend4.png"] } ] } diff --git a/examples/src/test/resources/examples/legend_dpi/expected_output/requestData.png b/examples/src/test/resources/examples/legend_dpi/expected_output/requestData.png index 863855cfb8..4c284de0bd 100644 Binary files a/examples/src/test/resources/examples/legend_dpi/expected_output/requestData.png and b/examples/src/test/resources/examples/legend_dpi/expected_output/requestData.png differ diff --git a/examples/src/test/resources/examples/legend_dpi/requestData.json b/examples/src/test/resources/examples/legend_dpi/requestData.json index f8bdfa1055..966dc1d9b1 100644 --- a/examples/src/test/resources/examples/legend_dpi/requestData.json +++ b/examples/src/test/resources/examples/legend_dpi/requestData.json @@ -11,7 +11,7 @@ { "type": "geojson", "style": "polygon", - "geoJson": "http://geoserver:8080/www/test-data/simple-squares-geojson.json" + "geoJson": "http://geoserver:8080/geoserver/www/map-data/test-data/simple-squares-geojson.json" } ] }, @@ -21,22 +21,22 @@ { "name": "Arbres", "dpi": "300", - "icons": ["http://geoserver:8080/www/legends/legend1.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/legend1.png"] }, { "name": "Peturbations", "dpi": "300", - "icons": ["http://geoserver:8080/www/legends/legend2.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/legend2.png"] }, { "name": "Points de vente", "dpi": "300", - "icons": ["http://geoserver:8080/www/legends/legend3.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/legend3.png"] }, { "name": "Alea", "dpi": "300", - "icons": ["http://geoserver:8080/www/legends/legend4.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/legend4.png"] } ] } diff --git a/examples/src/test/resources/examples/legend_scaled/expected_output/requestData.png b/examples/src/test/resources/examples/legend_scaled/expected_output/requestData.png index 49b89cd64a..34a8573607 100644 Binary files a/examples/src/test/resources/examples/legend_scaled/expected_output/requestData.png and b/examples/src/test/resources/examples/legend_scaled/expected_output/requestData.png differ diff --git a/examples/src/test/resources/examples/legend_scaled/requestData.json b/examples/src/test/resources/examples/legend_scaled/requestData.json index 375bf33e53..8d0f0d16d6 100644 --- a/examples/src/test/resources/examples/legend_scaled/requestData.json +++ b/examples/src/test/resources/examples/legend_scaled/requestData.json @@ -11,7 +11,7 @@ { "type": "geojson", "style": "polygon", - "geoJson": "http://geoserver:8080/www/test-data/simple-squares-geojson.json" + "geoJson": "http://geoserver:8080/geoserver/www/map-data/test-data/simple-squares-geojson.json" } ] }, @@ -20,19 +20,19 @@ "classes": [ { "name": "Arbres", - "icons": ["http://geoserver:8080/www/legends/legend1.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/legend1.png"] }, { "name": "Peturbations", - "icons": ["http://geoserver:8080/www/legends/legend2.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/legend2.png"] }, { "name": "Points de vente", - "icons": ["http://geoserver:8080/www/legends/legend3.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/legend3.png"] }, { "name": "Alea", - "icons": ["http://geoserver:8080/www/legends/legend4.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/legend4.png"] } ] } diff --git a/examples/src/test/resources/examples/mapexport/expected_output/requestData-jpg.jpeg b/examples/src/test/resources/examples/mapexport/expected_output/requestData-jpg.jpeg index 5a2ec0127b..478c9bf707 100644 Binary files a/examples/src/test/resources/examples/mapexport/expected_output/requestData-jpg.jpeg and b/examples/src/test/resources/examples/mapexport/expected_output/requestData-jpg.jpeg differ diff --git a/examples/src/test/resources/examples/mapexport/expected_output/requestData-tiff.tiff b/examples/src/test/resources/examples/mapexport/expected_output/requestData-tiff.tiff index 71171efe55..058f055cb8 100644 Binary files a/examples/src/test/resources/examples/mapexport/expected_output/requestData-tiff.tiff and b/examples/src/test/resources/examples/mapexport/expected_output/requestData-tiff.tiff differ diff --git a/examples/src/test/resources/examples/mapexport/expected_output/requestData.png b/examples/src/test/resources/examples/mapexport/expected_output/requestData.png index 023dba6a4d..753b728746 100644 Binary files a/examples/src/test/resources/examples/mapexport/expected_output/requestData.png and b/examples/src/test/resources/examples/mapexport/expected_output/requestData.png differ diff --git a/examples/src/test/resources/examples/mapexport/requestData-jpg.json b/examples/src/test/resources/examples/mapexport/requestData-jpg.json index ae6a97b2d7..b8f07fb90b 100644 --- a/examples/src/test/resources/examples/mapexport/requestData-jpg.json +++ b/examples/src/test/resources/examples/mapexport/requestData-jpg.json @@ -12,7 +12,7 @@ "scale": 25000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], diff --git a/examples/src/test/resources/examples/mapexport/requestData-tiff.json b/examples/src/test/resources/examples/mapexport/requestData-tiff.json index b6be335298..fd6d98267b 100644 --- a/examples/src/test/resources/examples/mapexport/requestData-tiff.json +++ b/examples/src/test/resources/examples/mapexport/requestData-tiff.json @@ -12,7 +12,7 @@ "scale": 25000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], diff --git a/examples/src/test/resources/examples/mapexport/requestData.json b/examples/src/test/resources/examples/mapexport/requestData.json index 0c90365b95..5d3e4d98ae 100644 --- a/examples/src/test/resources/examples/mapexport/requestData.json +++ b/examples/src/test/resources/examples/mapexport/requestData.json @@ -35,7 +35,7 @@ } }, { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], diff --git a/examples/src/test/resources/examples/mapexport/requestData_pdf.json b/examples/src/test/resources/examples/mapexport/requestData_pdf.json index 4424bef485..e45be04d09 100644 --- a/examples/src/test/resources/examples/mapexport/requestData_pdf.json +++ b/examples/src/test/resources/examples/mapexport/requestData_pdf.json @@ -35,7 +35,7 @@ } }, { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], 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 15205b5070..8ef6542fe1 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/merged_datasource/requestData.json b/examples/src/test/resources/examples/merged_datasource/requestData.json index c028f08b98..6118918ed7 100644 --- a/examples/src/test/resources/examples/merged_datasource/requestData.json +++ b/examples/src/test/resources/examples/merged_datasource/requestData.json @@ -31,19 +31,19 @@ "classes": [ { "name": "Arbres", - "icons": ["http://geoserver:8080/www/legends/arbres.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/arbres.png"] }, { "name": "Peturbations", - "icons": ["http://geoserver:8080/www/legends/perturbations.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/perturbations.png"] }, { "name": "Points de vente", - "icons": ["http://geoserver:8080/www/legends/points-de-vente.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/points-de-vente.png"] }, { "name": "Stationement", - "icons": ["http://geoserver:8080/www/legends/stationement.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/stationement.png"] } ] }, @@ -56,7 +56,7 @@ { "type": "WMS", "layers": ["tiger-ny"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.1.1", "customParams": { diff --git a/examples/src/test/resources/examples/native_mix/expected_output/requestData.png b/examples/src/test/resources/examples/native_mix/expected_output/requestData.png index f76fd461db..d2ecc3f7dd 100644 Binary files a/examples/src/test/resources/examples/native_mix/expected_output/requestData.png and b/examples/src/test/resources/examples/native_mix/expected_output/requestData.png differ diff --git a/examples/src/test/resources/examples/native_mix/requestData.json b/examples/src/test/resources/examples/native_mix/requestData.json index 16f9aa3a34..615c7d2242 100644 --- a/examples/src/test/resources/examples/native_mix/requestData.json +++ b/examples/src/test/resources/examples/native_mix/requestData.json @@ -10,7 +10,7 @@ "scale": 25000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "serverType": "geoserver", "useNativeAngle": "false", "opacity": 0.5, @@ -23,7 +23,7 @@ } }, { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "serverType": "geoserver", "useNativeAngle": "true", "opacity": 0.5, @@ -36,7 +36,7 @@ } }, { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "serverType": "geoserver", "useNativeAngle": "false", "opacity": 0.5, 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 7e6eca017e..017044d72c 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/oereb/requestData.json b/examples/src/test/resources/examples/oereb/requestData.json index c0fcab48ce..8cf92a1d50 100644 --- a/examples/src/test/resources/examples/oereb/requestData.json +++ b/examples/src/test/resources/examples/oereb/requestData.json @@ -1,7 +1,7 @@ { "attributes": { "BaseData": "Daten der amtlichen Vermessung. Stand der amtlichen Vermessung: 18.05.2020.", - "CantonalLogoRef": "http://geoserver:8080/www/oereb/logo_canton.png", + "CantonalLogoRef": "http://geoserver:8080/geoserver/www/oereb/logo_canton.png", "Certification": "Referenz zur kantonsspezifischen Gesetzesgrundlage bezüglich Beglaubigungen.", "CertificationAtWeb": "https://oereb.bl.ch/certification/de", "ConcernedTheme": [ @@ -36,7 +36,7 @@ } ], "ExtractIdentifier": "19451afe-2d5b-4c06-ad13-3b99b3404b73", - "FederalLogoRef": "http://geoserver:8080/www/oereb/logo_confederation.png", + "FederalLogoRef": "http://geoserver:8080/geoserver/www/oereb/logo_confederation.png", "Footer": "18.05.2020 13:05:05 19451afe-2d5b-4c06-ad13-3b99b3404b73", "GeneralInformation": "Der Inhalt des Katasters wird als bekannt vorausgesetzt. Der Kanton --HIER MUSS DER KANTONSNAME STEHEN--- ist für die Genauigkeit und Verlässlichkeit der gesetzgebenden Dokumenten in elektronischer Form nicht haftbar. Der Auszug hat rein informativen Charakter und begründet insbesondere keine Rechten und Pflichten. Rechtsverbindlich sind diejenigen Dokumente, welche rechtskräftig verabschiedet oder veröffentlicht worden sind. Mit der Beglaubigung des Auszuges wird die Übereinstimmung des Auszuges mit dem Kataster zum Zeitpunkt des Auszuges bestätigt.", "Glossary": [ @@ -113,8 +113,8 @@ "Title": "WaV" } ], - "LogoPLRCadastreRef": "http://geoserver:8080/www/oereb/de.png", - "MunicipalityLogoRef": "http://geoserver:8080/www/oereb/2771.png", + "LogoPLRCadastreRef": "http://geoserver:8080/geoserver/www/oereb/de.png", + "MunicipalityLogoRef": "http://geoserver:8080/geoserver/www/oereb/2771.png", "NotConcernedTheme": [ { "Code": "LandUsePlans", @@ -301,7 +301,7 @@ "Geom_Type": "AreaShare", "Information": "Belastet, untersuchungsbedürftig", "PartInPercent": "32.6%", - "SymbolRef": "http://geoserver:8080/www/oereb/StaoTyp2.png", + "SymbolRef": "http://geoserver:8080/geoserver/www/oereb/StaoTyp2.png", "TypeCode": "StaoTyp2", "TypeCodelist": "" } @@ -327,7 +327,7 @@ "TRANSPARENT": "true" }, "imageFormat": "image/png", - "layers": ["ch.bav.kataster-belasteter-standorte-oev.oereb"], + "layers": ["ch.bav.kataster-belasteter-standorte-oev_v2_0.oereb"], "opacity": 0.75, "styles": "default", "type": "wms" @@ -345,7 +345,7 @@ } ] }, - "legend": "http://wms.geo.admin.ch/?SERVICE=WMS&REQUEST=GetLegendGraphic&VERSION=1.1.1&FORMAT=image/png&LAYER=ch.bav.kataster-belasteter-standorte-oev.oereb" + "legend": "http://wms.geo.admin.ch/?SERVICE=WMS&REQUEST=GetLegendGraphic&VERSION=1.1.1&FORMAT=image/png&LAYER=ch.bav.kataster-belasteter-standorte-oev_v2_0.oereb" }, { "Geom_Type": "LengthShare", @@ -409,7 +409,7 @@ "Geom_Type": "LengthShare", "Information": "Belastet, überwachungsbedürftig", "LengthShare": "164 m", - "SymbolRef": "http://geoserver:8080/www/oereb/StaoTyp3.png", + "SymbolRef": "http://geoserver:8080/geoserver/www/oereb/StaoTyp3.png", "TypeCode": "StaoTyp3", "TypeCodelist": "" } @@ -435,7 +435,7 @@ "TRANSPARENT": "true" }, "imageFormat": "image/png", - "layers": ["ch.bav.kataster-belasteter-standorte-oev.oereb"], + "layers": ["ch.bav.kataster-belasteter-standorte-oev_v2_0.oereb"], "opacity": 0.75, "styles": "default", "type": "wms" @@ -453,7 +453,7 @@ } ] }, - "legend": "http://wms.geo.admin.ch/?SERVICE=WMS&REQUEST=GetLegendGraphic&VERSION=1.1.1&FORMAT=image/png&LAYER=ch.bav.kataster-belasteter-standorte-oev.oereb" + "legend": "http://wms.geo.admin.ch/?SERVICE=WMS&REQUEST=GetLegendGraphic&VERSION=1.1.1&FORMAT=image/png&LAYER=ch.bav.kataster-belasteter-standorte-oev_v2_0.oereb" }, { "Geom_Type": "NrOfPoints", @@ -517,7 +517,7 @@ "Geom_Type": "NrOfPoints", "Information": "Belastet, keine schädlichen oder lästigen Einwirkungen zu erwarten", "NrOfPoints": "2", - "SymbolRef": "http://geoserver:8080/www/oereb/StaoTyp1.png", + "SymbolRef": "http://geoserver:8080/geoserver/www/oereb/StaoTyp1.png", "TypeCode": "StaoTyp1", "TypeCodelist": "" } @@ -543,7 +543,7 @@ "TRANSPARENT": "true" }, "imageFormat": "image/png", - "layers": ["ch.bav.kataster-belasteter-standorte-oev.oereb"], + "layers": ["ch.bav.kataster-belasteter-standorte-oev_v2_0.oereb"], "opacity": 0.75, "styles": "default", "type": "wms" @@ -561,7 +561,7 @@ } ] }, - "legend": "http://wms.geo.admin.ch/?SERVICE=WMS&REQUEST=GetLegendGraphic&VERSION=1.1.1&FORMAT=image/png&LAYER=ch.bav.kataster-belasteter-standorte-oev.oereb" + "legend": "http://wms.geo.admin.ch/?SERVICE=WMS&REQUEST=GetLegendGraphic&VERSION=1.1.1&FORMAT=image/png&LAYER=ch.bav.kataster-belasteter-standorte-oev_v2_0.oereb" }, { "Geom_Type": "AreaShare", @@ -626,7 +626,7 @@ "Geom_Type": "AreaShare", "Information": "Belastet, keine schädlichen oder lästigen Einwirkungen zu erwarten", "PartInPercent": "22.3%", - "SymbolRef": "http://geoserver:8080/www/oereb/StaoTyp2.png", + "SymbolRef": "http://geoserver:8080/geoserver/www/oereb/StaoTyp2.png", "TypeCode": "StaoTyp2", "TypeCodelist": "" } @@ -650,7 +650,7 @@ "TRANSPARENT": "true" }, "imageFormat": "image/png", - "layers": ["ch.bav.kataster-belasteter-standorte-oev.oereb"], + "layers": ["ch.bav.kataster-belasteter-standorte-oev_v2_0.oereb"], "opacity": 1, "styles": "default", "type": "wms" @@ -668,7 +668,7 @@ } ] }, - "legend": "http://wms.geo.admin.ch/?SERVICE=WMS&REQUEST=GetLegendGraphic&VERSION=1.1.1&FORMAT=image/png&LAYER=ch.bav.kataster-belasteter-standorte-oev.oereb" + "legend": "http://wms.geo.admin.ch/?SERVICE=WMS&REQUEST=GetLegendGraphic&VERSION=1.1.1&FORMAT=image/png&LAYER=ch.bav.kataster-belasteter-standorte-oev_v2_0.oereb" }, { "Geom_Type": "LengthShare", @@ -839,7 +839,7 @@ "Geom_Type": "LengthShare", "Information": "Belastet, keine schädlichen oder lästigen Einwirkungen zu erwarten", "LengthShare": "101 m", - "SymbolRef": "http://geoserver:8080/www/oereb/StaoTyp2.png", + "SymbolRef": "http://geoserver:8080/geoserver/www/oereb/StaoTyp2.png", "TypeCode": "StaoTyp2", "TypeCodelist": "" }, @@ -847,7 +847,7 @@ "Geom_Type": "LengthShare", "Information": "Belastet, weder überwachungs- noch sanierungsbedürftig", "LengthShare": "101 m", - "SymbolRef": "http://geoserver:8080/www/oereb/StaoTyp1.png", + "SymbolRef": "http://geoserver:8080/geoserver/www/oereb/StaoTyp1.png", "TypeCode": "StaoTyp1", "TypeCodelist": "" } @@ -871,7 +871,7 @@ "TRANSPARENT": "true" }, "imageFormat": "image/png", - "layers": ["ch.bav.kataster-belasteter-standorte-oev.oereb"], + "layers": ["ch.bav.kataster-belasteter-standorte-oev_v2_0.oereb"], "opacity": 1, "styles": "default", "type": "wms" @@ -889,7 +889,7 @@ } ] }, - "legend": "http://wms.geo.admin.ch/?SERVICE=WMS&REQUEST=GetLegendGraphic&VERSION=1.1.1&FORMAT=image/png&LAYER=ch.bav.kataster-belasteter-standorte-oev.oereb" + "legend": "http://wms.geo.admin.ch/?SERVICE=WMS&REQUEST=GetLegendGraphic&VERSION=1.1.1&FORMAT=image/png&LAYER=ch.bav.kataster-belasteter-standorte-oev_v2_0.oereb" } ], "RealEstate_Type": "RealEstate", 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 76925637e5..3a2389843f 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/overviewmap_tyger_ny_EPSG_3857/requestData-scale-wmts1_0_0-full-kvp.json b/examples/src/test/resources/examples/overviewmap_tyger_ny_EPSG_3857/requestData-scale-wmts1_0_0-full-kvp.json index a6b108bed5..dd678b2d18 100644 --- a/examples/src/test/resources/examples/overviewmap_tyger_ny_EPSG_3857/requestData-scale-wmts1_0_0-full-kvp.json +++ b/examples/src/test/resources/examples/overviewmap_tyger_ny_EPSG_3857/requestData-scale-wmts1_0_0-full-kvp.json @@ -11,7 +11,7 @@ "layers": [ { "type": "WMTS", - "baseURL": "http://geoserver:8080/gwc/service/wmts", + "baseURL": "http://geoserver:8080/geoserver/gwc/service/wmts", "opacity": 1, "layer": "tiger-ny", "version": "1.0.0", @@ -66,7 +66,7 @@ "imageFormat": "image/png" }, { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], diff --git a/examples/src/test/resources/examples/paging/expected_output/requestData-multipoint.png b/examples/src/test/resources/examples/paging/expected_output/requestData-multipoint.png index d610a6247d..7779a91199 100644 Binary files a/examples/src/test/resources/examples/paging/expected_output/requestData-multipoint.png and b/examples/src/test/resources/examples/paging/expected_output/requestData-multipoint.png differ diff --git a/examples/src/test/resources/examples/paging/expected_output/requestData-polygon.png b/examples/src/test/resources/examples/paging/expected_output/requestData-polygon.png index 79fc4b854c..d5ce17392a 100644 Binary files a/examples/src/test/resources/examples/paging/expected_output/requestData-polygon.png and b/examples/src/test/resources/examples/paging/expected_output/requestData-polygon.png differ diff --git a/examples/src/test/resources/examples/paging/requestData-multipoint.json b/examples/src/test/resources/examples/paging/requestData-multipoint.json index 29976c67b0..107290aed4 100644 --- a/examples/src/test/resources/examples/paging/requestData-multipoint.json +++ b/examples/src/test/resources/examples/paging/requestData-multipoint.json @@ -19,7 +19,7 @@ { "type": "WMS", "layers": ["tiger-ny"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.1.1", "customParams": { diff --git a/examples/src/test/resources/examples/paging/requestData-polygon.json b/examples/src/test/resources/examples/paging/requestData-polygon.json index e5e2db5284..ca2bc77f78 100644 --- a/examples/src/test/resources/examples/paging/requestData-polygon.json +++ b/examples/src/test/resources/examples/paging/requestData-polygon.json @@ -35,7 +35,7 @@ { "type": "WMS", "layers": ["tiger-ny"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.1.1", "customParams": { diff --git a/examples/src/test/resources/examples/pdf_a_compliant/expected_output/requestData.png b/examples/src/test/resources/examples/pdf_a_compliant/expected_output/requestData.png index ae3dad2fa7..ef5e5705a6 100644 Binary files a/examples/src/test/resources/examples/pdf_a_compliant/expected_output/requestData.png and b/examples/src/test/resources/examples/pdf_a_compliant/expected_output/requestData.png differ diff --git a/examples/src/test/resources/examples/pdf_a_compliant/requestData.json b/examples/src/test/resources/examples/pdf_a_compliant/requestData.json index 61aa156137..6b4e403465 100644 --- a/examples/src/test/resources/examples/pdf_a_compliant/requestData.json +++ b/examples/src/test/resources/examples/pdf_a_compliant/requestData.json @@ -15,7 +15,7 @@ "renderAsSvg": true }, { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], @@ -26,7 +26,7 @@ } }, { - "baseURL": "http://geoserver:8080/www/osm", + "baseURL": "http://geoserver:8080/geoserver/www/map-data/osm", "type": "OSM", "imageExtension": "png" } 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 d13826fe34..a7fedbeeda 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 7419b0cb75..7230fed183 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_EPSG_3857/requestData-scale-osm.json b/examples/src/test/resources/examples/print_osm_new_york_EPSG_3857/requestData-scale-osm.json index e3418657f0..2ab5b25ad2 100644 --- a/examples/src/test/resources/examples/print_osm_new_york_EPSG_3857/requestData-scale-osm.json +++ b/examples/src/test/resources/examples/print_osm_new_york_EPSG_3857/requestData-scale-osm.json @@ -10,7 +10,7 @@ "scale": 26000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], @@ -21,7 +21,7 @@ } }, { - "baseURL": "http://geoserver:8080/www/osm", + "baseURL": "http://geoserver:8080/geoserver/www/map-data/osm", "type": "OSM", "imageExtension": "png" } diff --git a/examples/src/test/resources/examples/print_osm_new_york_EPSG_3857/requestData-scale-rotate-osm.json b/examples/src/test/resources/examples/print_osm_new_york_EPSG_3857/requestData-scale-rotate-osm.json index 4ba93a85d8..6e3aff1bf4 100644 --- a/examples/src/test/resources/examples/print_osm_new_york_EPSG_3857/requestData-scale-rotate-osm.json +++ b/examples/src/test/resources/examples/print_osm_new_york_EPSG_3857/requestData-scale-rotate-osm.json @@ -10,7 +10,7 @@ "scale": 26000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], @@ -21,7 +21,7 @@ } }, { - "baseURL": "http://geoserver:8080/www/osm", + "baseURL": "http://geoserver:8080/geoserver/www/map-data/osm", "type": "OSM", "imageExtension": "png" } 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 d13826fe34..a7fedbeeda 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/print_osm_new_york_nosubreports/requestData.json b/examples/src/test/resources/examples/print_osm_new_york_nosubreports/requestData.json index e3418657f0..2ab5b25ad2 100644 --- a/examples/src/test/resources/examples/print_osm_new_york_nosubreports/requestData.json +++ b/examples/src/test/resources/examples/print_osm_new_york_nosubreports/requestData.json @@ -10,7 +10,7 @@ "scale": 26000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], @@ -21,7 +21,7 @@ } }, { - "baseURL": "http://geoserver:8080/www/osm", + "baseURL": "http://geoserver:8080/geoserver/www/map-data/osm", "type": "OSM", "imageExtension": "png" } 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 2d6476f46f..cb87f14eeb 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 76edb718ee..5be2948d92 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 9b9285e49a..e2119b6bcd 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 52869c704f..c2824e2a8c 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-bbox-wms1_1_1.png b/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-bbox-wms1_1_1.png index aa6171ff29..0f35b26505 100644 Binary files a/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-bbox-wms1_1_1.png and b/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-bbox-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 1446ef0f93..30d2003e07 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/printtiledwms/expected_output/requestData-scale-wms1_1_1.png b/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-scale-wms1_1_1.png index 06dd21fc46..80c45e3ad5 100644 Binary files a/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-scale-wms1_1_1.png and b/examples/src/test/resources/examples/printtiledwms/expected_output/requestData-scale-wms1_1_1.png differ diff --git a/examples/src/test/resources/examples/printtiledwms/requestData-bbox-auto-meta-tiled-wms1_1_1.json b/examples/src/test/resources/examples/printtiledwms/requestData-bbox-auto-meta-tiled-wms1_1_1.json index 776fd27d32..b986e9b83b 100644 --- a/examples/src/test/resources/examples/printtiledwms/requestData-bbox-auto-meta-tiled-wms1_1_1.json +++ b/examples/src/test/resources/examples/printtiledwms/requestData-bbox-auto-meta-tiled-wms1_1_1.json @@ -12,7 +12,7 @@ { "type": "WMS", "layers": ["topp:states"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.1.1", "customParams": { diff --git a/examples/src/test/resources/examples/printtiledwms/requestData-bbox-auto-tiled-wms1_1_1.json b/examples/src/test/resources/examples/printtiledwms/requestData-bbox-auto-tiled-wms1_1_1.json index 77dd4af516..023a69ec6d 100644 --- a/examples/src/test/resources/examples/printtiledwms/requestData-bbox-auto-tiled-wms1_1_1.json +++ b/examples/src/test/resources/examples/printtiledwms/requestData-bbox-auto-tiled-wms1_1_1.json @@ -12,7 +12,7 @@ { "type": "WMS", "layers": ["topp:states"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.1.1", "customParams": { diff --git a/examples/src/test/resources/examples/printtiledwms/requestData-bbox-meta-tiled-wms1_1_1.json b/examples/src/test/resources/examples/printtiledwms/requestData-bbox-meta-tiled-wms1_1_1.json index b7d9622501..3fbf9e370f 100644 --- a/examples/src/test/resources/examples/printtiledwms/requestData-bbox-meta-tiled-wms1_1_1.json +++ b/examples/src/test/resources/examples/printtiledwms/requestData-bbox-meta-tiled-wms1_1_1.json @@ -12,7 +12,7 @@ { "type": "tiledwms", "layers": ["topp:states"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.1.1", "customParams": { diff --git a/examples/src/test/resources/examples/printtiledwms/requestData-bbox-tiled-wms1_1_1.json b/examples/src/test/resources/examples/printtiledwms/requestData-bbox-tiled-wms1_1_1.json index 5377d5a3c9..059a3e64aa 100644 --- a/examples/src/test/resources/examples/printtiledwms/requestData-bbox-tiled-wms1_1_1.json +++ b/examples/src/test/resources/examples/printtiledwms/requestData-bbox-tiled-wms1_1_1.json @@ -12,7 +12,7 @@ { "type": "tiledwms", "layers": ["topp:states"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.1.1", "customParams": { diff --git a/examples/src/test/resources/examples/printtiledwms/requestData-bbox-wms1_1_1.json b/examples/src/test/resources/examples/printtiledwms/requestData-bbox-wms1_1_1.json index f689fe315c..b2d3c83ca3 100644 --- a/examples/src/test/resources/examples/printtiledwms/requestData-bbox-wms1_1_1.json +++ b/examples/src/test/resources/examples/printtiledwms/requestData-bbox-wms1_1_1.json @@ -12,7 +12,7 @@ { "type": "WMS", "layers": ["topp:states"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.1.1", "customParams": { diff --git a/examples/src/test/resources/examples/printtiledwms/requestData-scale-tiled-wms1_1_1.json b/examples/src/test/resources/examples/printtiledwms/requestData-scale-tiled-wms1_1_1.json index d8356f8d49..b169a07674 100644 --- a/examples/src/test/resources/examples/printtiledwms/requestData-scale-tiled-wms1_1_1.json +++ b/examples/src/test/resources/examples/printtiledwms/requestData-scale-tiled-wms1_1_1.json @@ -13,7 +13,7 @@ { "type": "tiledwms", "layers": ["topp:states"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.1.1", "customParams": { diff --git a/examples/src/test/resources/examples/printtiledwms/requestData-scale-wms1_1_1.json b/examples/src/test/resources/examples/printtiledwms/requestData-scale-wms1_1_1.json index d56ce2d173..4425783a58 100644 --- a/examples/src/test/resources/examples/printtiledwms/requestData-scale-wms1_1_1.json +++ b/examples/src/test/resources/examples/printtiledwms/requestData-scale-wms1_1_1.json @@ -13,7 +13,7 @@ { "type": "WMS", "layers": ["topp:states"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.1.1", "customParams": { diff --git a/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/expected_output/requestData-bbox-wms1_1_1.png b/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/expected_output/requestData-bbox-wms1_1_1.png index 2d9295b7b7..7ad9e11685 100644 Binary files a/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/expected_output/requestData-bbox-wms1_1_1.png and b/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/expected_output/requestData-bbox-wms1_1_1.png differ diff --git a/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/expected_output/requestData-bbox-wms1_3_0.png b/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/expected_output/requestData-bbox-wms1_3_0.png index 2d9295b7b7..7ad9e11685 100644 Binary files a/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/expected_output/requestData-bbox-wms1_3_0.png and b/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/expected_output/requestData-bbox-wms1_3_0.png differ diff --git a/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/expected_output/requestData-scale-wms1_1_1.png b/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/expected_output/requestData-scale-wms1_1_1.png index d27c6b7a4b..0664012a09 100644 Binary files a/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/expected_output/requestData-scale-wms1_1_1.png and b/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/expected_output/requestData-scale-wms1_1_1.png differ diff --git a/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/expected_output/requestData-scale-wms1_3_0.png b/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/expected_output/requestData-scale-wms1_3_0.png index d27c6b7a4b..0664012a09 100644 Binary files a/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/expected_output/requestData-scale-wms1_3_0.png and b/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/expected_output/requestData-scale-wms1_3_0.png differ diff --git a/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/requestData-bbox-wms1_1_1.json b/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/requestData-bbox-wms1_1_1.json index fbd4135e92..f2c1d397bf 100644 --- a/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/requestData-bbox-wms1_1_1.json +++ b/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/requestData-bbox-wms1_1_1.json @@ -11,7 +11,7 @@ { "type": "WMS", "layers": ["sf:streams"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.1.1", "customParams": { diff --git a/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/requestData-bbox-wms1_3_0.json b/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/requestData-bbox-wms1_3_0.json index f1f2347667..ea5096a007 100644 --- a/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/requestData-bbox-wms1_3_0.json +++ b/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/requestData-bbox-wms1_3_0.json @@ -11,7 +11,7 @@ { "type": "WMS", "layers": ["sf:streams"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.3.0", "customParams": { diff --git a/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/requestData-scale-wms1_1_1.json b/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/requestData-scale-wms1_1_1.json index 1bdf149677..348349711d 100644 --- a/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/requestData-scale-wms1_1_1.json +++ b/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/requestData-scale-wms1_1_1.json @@ -12,7 +12,7 @@ { "type": "WMS", "layers": ["sf:streams"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.1.1", "customParams": { diff --git a/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/requestData-scale-wms1_3_0.json b/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/requestData-scale-wms1_3_0.json index 6cb2a268d8..25f84bda3c 100644 --- a/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/requestData-scale-wms1_3_0.json +++ b/examples/src/test/resources/examples/printwms_SpearfishStreams_EPSG_26713/requestData-scale-wms1_3_0.json @@ -12,7 +12,7 @@ { "type": "WMS", "layers": ["sf:streams"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.3.0", "customParams": { diff --git a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-bbox-native-rotate-wms1_3_0.png b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-bbox-native-rotate-wms1_3_0.png index f495fef59b..567de96eda 100644 Binary files a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-bbox-native-rotate-wms1_3_0.png and b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-bbox-native-rotate-wms1_3_0.png differ diff --git a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-bbox-rotate-wms1_3_0.png b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-bbox-rotate-wms1_3_0.png index a6c2551e35..9a294ea414 100644 Binary files a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-bbox-rotate-wms1_3_0.png and b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-bbox-rotate-wms1_3_0.png differ diff --git a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-bbox-wms1_1_1.png b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-bbox-wms1_1_1.png index 268a174125..5f85843277 100644 Binary files a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-bbox-wms1_1_1.png and b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-bbox-wms1_1_1.png differ diff --git a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-bbox-wms1_3_0.png b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-bbox-wms1_3_0.png index 268a174125..5f85843277 100644 Binary files a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-bbox-wms1_3_0.png and b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-bbox-wms1_3_0.png differ diff --git a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-scale-native-rotate-wms1_1_1.png b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-scale-native-rotate-wms1_1_1.png index 96494fd4d7..c656c44366 100644 Binary files a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-scale-native-rotate-wms1_1_1.png and b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-scale-native-rotate-wms1_1_1.png differ diff --git a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-scale-rotate-wms1_1_1.png b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-scale-rotate-wms1_1_1.png index 054d4657b7..73b7cd4d80 100644 Binary files a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-scale-rotate-wms1_1_1.png and b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-scale-rotate-wms1_1_1.png differ diff --git a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-scale-wms1_1_1.png b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-scale-wms1_1_1.png index 0af7c66e9b..a24bfe009f 100644 Binary files a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-scale-wms1_1_1.png and b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-scale-wms1_1_1.png differ diff --git a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-scale-wms1_3_0.png b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-scale-wms1_3_0.png index 0af7c66e9b..a24bfe009f 100644 Binary files a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-scale-wms1_3_0.png and b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/expected_output/requestData-scale-wms1_3_0.png differ diff --git a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-bbox-native-rotate-wms1_3_0.json b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-bbox-native-rotate-wms1_3_0.json index 083e02e458..c8048e9615 100644 --- a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-bbox-native-rotate-wms1_3_0.json +++ b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-bbox-native-rotate-wms1_3_0.json @@ -12,7 +12,7 @@ { "type": "WMS", "layers": ["topp:states"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.3.0", "serverType": "geoserver", diff --git a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-bbox-rotate-wms1_3_0.json b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-bbox-rotate-wms1_3_0.json index c2a6d04202..435dbdc2a9 100644 --- a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-bbox-rotate-wms1_3_0.json +++ b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-bbox-rotate-wms1_3_0.json @@ -12,7 +12,7 @@ { "type": "WMS", "layers": ["topp:states"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.3.0", "customParams": { diff --git a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-bbox-wms1_1_1.json b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-bbox-wms1_1_1.json index ca356a25b0..981249de73 100644 --- a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-bbox-wms1_1_1.json +++ b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-bbox-wms1_1_1.json @@ -12,7 +12,7 @@ { "type": "WMS", "layers": ["topp:states"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.1.1", "customParams": { diff --git a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-bbox-wms1_3_0.json b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-bbox-wms1_3_0.json index 65c88327b0..caa3bd5164 100644 --- a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-bbox-wms1_3_0.json +++ b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-bbox-wms1_3_0.json @@ -12,7 +12,7 @@ { "type": "WMS", "layers": ["topp:states"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.3.0", "customParams": { diff --git a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-scale-native-rotate-wms1_1_1.json b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-scale-native-rotate-wms1_1_1.json index ead3ae660a..e876380e0d 100644 --- a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-scale-native-rotate-wms1_1_1.json +++ b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-scale-native-rotate-wms1_1_1.json @@ -13,7 +13,7 @@ { "type": "WMS", "layers": ["topp:states"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.1.1", "serverType": "geoserver", diff --git a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-scale-rotate-wms1_1_1.json b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-scale-rotate-wms1_1_1.json index 84cc32ddaa..0265c7f7e3 100644 --- a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-scale-rotate-wms1_1_1.json +++ b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-scale-rotate-wms1_1_1.json @@ -13,7 +13,7 @@ { "type": "WMS", "layers": ["topp:states"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.1.1", "customParams": { diff --git a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-scale-wms1_1_1.json b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-scale-wms1_1_1.json index 0201dfd744..62e688da67 100644 --- a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-scale-wms1_1_1.json +++ b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-scale-wms1_1_1.json @@ -13,7 +13,7 @@ { "type": "WMS", "layers": ["topp:states"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.1.1", "customParams": { diff --git a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-scale-wms1_3_0.json b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-scale-wms1_3_0.json index 0da27d3403..0d96979edb 100644 --- a/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-scale-wms1_3_0.json +++ b/examples/src/test/resources/examples/printwms_UsaPopulation_EPSG_4326/requestData-scale-wms1_3_0.json @@ -13,7 +13,7 @@ { "type": "WMS", "layers": ["topp:states"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.3.0", "customParams": { diff --git a/examples/src/test/resources/examples/printwms_archsites_server_type/requestData-scale-wms1_0_0-high-dpi.json b/examples/src/test/resources/examples/printwms_archsites_server_type/requestData-scale-wms1_0_0-high-dpi.json index 947b1638ae..9f944787e2 100644 --- a/examples/src/test/resources/examples/printwms_archsites_server_type/requestData-scale-wms1_0_0-high-dpi.json +++ b/examples/src/test/resources/examples/printwms_archsites_server_type/requestData-scale-wms1_0_0-high-dpi.json @@ -10,7 +10,7 @@ "scale": 258000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "serverType": "geoserver", diff --git a/examples/src/test/resources/examples/printwms_archsites_server_type/requestData-scale-wms1_0_0.json b/examples/src/test/resources/examples/printwms_archsites_server_type/requestData-scale-wms1_0_0.json index f2698013c1..27df04f4c3 100644 --- a/examples/src/test/resources/examples/printwms_archsites_server_type/requestData-scale-wms1_0_0.json +++ b/examples/src/test/resources/examples/printwms_archsites_server_type/requestData-scale-wms1_0_0.json @@ -10,7 +10,7 @@ "scale": 258000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "serverType": "geoserver", diff --git a/examples/src/test/resources/examples/printwms_background_layer/expected_output/requestData-one-data-layer.png b/examples/src/test/resources/examples/printwms_background_layer/expected_output/requestData-one-data-layer.png index 83f25477b1..1c6fb199ef 100644 Binary files a/examples/src/test/resources/examples/printwms_background_layer/expected_output/requestData-one-data-layer.png and b/examples/src/test/resources/examples/printwms_background_layer/expected_output/requestData-one-data-layer.png differ diff --git a/examples/src/test/resources/examples/printwms_background_layer/expected_output/requestData-override-background.png b/examples/src/test/resources/examples/printwms_background_layer/expected_output/requestData-override-background.png index 83f25477b1..1c6fb199ef 100644 Binary files a/examples/src/test/resources/examples/printwms_background_layer/expected_output/requestData-override-background.png and b/examples/src/test/resources/examples/printwms_background_layer/expected_output/requestData-override-background.png differ diff --git a/examples/src/test/resources/examples/printwms_background_layer/requestData-one-data-layer.json b/examples/src/test/resources/examples/printwms_background_layer/requestData-one-data-layer.json index 4c0a212508..38da28fd6b 100644 --- a/examples/src/test/resources/examples/printwms_background_layer/requestData-one-data-layer.json +++ b/examples/src/test/resources/examples/printwms_background_layer/requestData-one-data-layer.json @@ -10,7 +10,7 @@ "scale": 25000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], diff --git a/examples/src/test/resources/examples/printwms_background_layer/requestData-override-background.json b/examples/src/test/resources/examples/printwms_background_layer/requestData-override-background.json index 62a91f8ed9..ca402bda06 100644 --- a/examples/src/test/resources/examples/printwms_background_layer/requestData-override-background.json +++ b/examples/src/test/resources/examples/printwms_background_layer/requestData-override-background.json @@ -10,7 +10,7 @@ "scale": 25000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], diff --git a/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-multi-layer-openlayers-2-compatible-style-wms.png b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-multi-layer-openlayers-2-compatible-style-wms.png index 506528ceb0..594a96974c 100644 Binary files a/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-multi-layer-openlayers-2-compatible-style-wms.png and b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-multi-layer-openlayers-2-compatible-style-wms.png differ diff --git a/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-scale-rotate-wms1_0_0.png b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-scale-rotate-wms1_0_0.png index 8ba9979081..f43288fcbc 100644 Binary files a/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-scale-rotate-wms1_0_0.png and b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-scale-rotate-wms1_0_0.png differ diff --git a/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-scale-wms1_0_0-high-dpi-svg-vector.png b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-scale-wms1_0_0-high-dpi-svg-vector.png index 4554dd5bb1..42c528eb0e 100644 Binary files a/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-scale-wms1_0_0-high-dpi-svg-vector.png and b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/expected_output/requestData-scale-wms1_0_0-high-dpi-svg-vector.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 036fbb9268..76afa9d1c5 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 02f0f684bc..eafe133481 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/printwms_tyger_ny_EPSG_3857/requestData-multi-layer-openlayers-2-compatible-style-wms.json b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/requestData-multi-layer-openlayers-2-compatible-style-wms.json index 19742641aa..4af3cb99cd 100644 --- a/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/requestData-multi-layer-openlayers-2-compatible-style-wms.json +++ b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/requestData-multi-layer-openlayers-2-compatible-style-wms.json @@ -10,7 +10,7 @@ "scale": 25000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["nurc:Img_Sample", "tiger:poly_landmarks", "tiger:tiger_roads", "tiger:poi"], diff --git a/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/requestData-scale-rotate-wms1_0_0.json b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/requestData-scale-rotate-wms1_0_0.json index 5633ce6d31..ea6e0072c3 100644 --- a/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/requestData-scale-rotate-wms1_0_0.json +++ b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/requestData-scale-rotate-wms1_0_0.json @@ -10,7 +10,7 @@ "scale": 25000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], @@ -21,7 +21,7 @@ } }, { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger-ny"], diff --git a/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/requestData-scale-wms1_0_0-high-dpi-svg-vector.json b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/requestData-scale-wms1_0_0-high-dpi-svg-vector.json index a19bf2612a..7d578a7de2 100644 --- a/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/requestData-scale-wms1_0_0-high-dpi-svg-vector.json +++ b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/requestData-scale-wms1_0_0-high-dpi-svg-vector.json @@ -6,11 +6,11 @@ "layers": [ { "type": "geojson", - "geojson": "http://geoserver:8080/www/geojson/ny-roads-3857.json", + "geojson": "http://geoserver:8080/geoserver/www/map-data/geojson/ny-roads-3857.json", "renderAsSvg": true }, { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "customParams": { "TRANSPARENT": "true" }, diff --git a/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/requestData-scale-wms1_0_0-high-dpi.json b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/requestData-scale-wms1_0_0-high-dpi.json index 46000bb36f..e0f35b4cf3 100644 --- a/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/requestData-scale-wms1_0_0-high-dpi.json +++ b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/requestData-scale-wms1_0_0-high-dpi.json @@ -10,7 +10,7 @@ "scale": 25000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], @@ -22,7 +22,7 @@ }, { "type": "WMTS", - "baseURL": "http://geoserver:8080/gwc/service/wmts", + "baseURL": "http://geoserver:8080/geoserver/gwc/service/wmts", "opacity": 1, "layer": "tiger-ny", "version": "1.0.0", diff --git a/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/requestData-scale-wms1_0_0.json b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/requestData-scale-wms1_0_0.json index 10eef3f3d4..ef87c70ecd 100644 --- a/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/requestData-scale-wms1_0_0.json +++ b/examples/src/test/resources/examples/printwms_tyger_ny_EPSG_3857/requestData-scale-wms1_0_0.json @@ -10,7 +10,7 @@ "scale": 25000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], @@ -22,7 +22,7 @@ }, { "type": "WMTS", - "baseURL": "http://geoserver:8080/gwc/service/wmts", + "baseURL": "http://geoserver:8080/geoserver/gwc/service/wmts", "opacity": 1, "layer": "tiger-ny", "version": "1.0.0", 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 ce9a721466..09564f66fd 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/printwmts_tyger_ny_EPSG_3857/expected_output/requestData-scale-wmts1_0_0-full-kvp.png b/examples/src/test/resources/examples/printwmts_tyger_ny_EPSG_3857/expected_output/requestData-scale-wmts1_0_0-full-kvp.png index 66bf4a38e6..5e07a5dfe2 100644 Binary files a/examples/src/test/resources/examples/printwmts_tyger_ny_EPSG_3857/expected_output/requestData-scale-wmts1_0_0-full-kvp.png and b/examples/src/test/resources/examples/printwmts_tyger_ny_EPSG_3857/expected_output/requestData-scale-wmts1_0_0-full-kvp.png differ diff --git a/examples/src/test/resources/examples/printwmts_tyger_ny_EPSG_3857/requestData-scale-rotate-wmts1_0_0-full-kvp.json b/examples/src/test/resources/examples/printwmts_tyger_ny_EPSG_3857/requestData-scale-rotate-wmts1_0_0-full-kvp.json index faee3d756a..db06c0a2c1 100644 --- a/examples/src/test/resources/examples/printwmts_tyger_ny_EPSG_3857/requestData-scale-rotate-wmts1_0_0-full-kvp.json +++ b/examples/src/test/resources/examples/printwmts_tyger_ny_EPSG_3857/requestData-scale-rotate-wmts1_0_0-full-kvp.json @@ -10,7 +10,7 @@ "scale": 25000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], @@ -22,7 +22,7 @@ }, { "type": "WMTS", - "baseURL": "http://geoserver:8080/gwc/service/wmts", + "baseURL": "http://geoserver:8080/geoserver/gwc/service/wmts", "opacity": 1, "layer": "tiger-ny", "version": "1.0.0", diff --git a/examples/src/test/resources/examples/printwmts_tyger_ny_EPSG_3857/requestData-scale-wmts1_0_0-full-kvp.json b/examples/src/test/resources/examples/printwmts_tyger_ny_EPSG_3857/requestData-scale-wmts1_0_0-full-kvp.json index 55244e7029..4714ddf074 100644 --- a/examples/src/test/resources/examples/printwmts_tyger_ny_EPSG_3857/requestData-scale-wmts1_0_0-full-kvp.json +++ b/examples/src/test/resources/examples/printwmts_tyger_ny_EPSG_3857/requestData-scale-wmts1_0_0-full-kvp.json @@ -10,7 +10,7 @@ "scale": 25000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], @@ -21,7 +21,7 @@ } }, { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger-ny"], diff --git a/examples/src/test/resources/examples/report/config.yaml b/examples/src/test/resources/examples/report/config.yaml index 50410e7482..13ee3aed72 100644 --- a/examples/src/test/resources/examples/report/config.yaml +++ b/examples/src/test/resources/examples/report/config.yaml @@ -26,7 +26,7 @@ templates: default: layers: - type: wms - baseURL: 'http://geoserver:8080/wms' + baseURL: 'http://geoserver:8080/geoserver/wms' layers: [tiger-ny] imageFormat: 'image/png' style: !style diff --git a/examples/src/test/resources/examples/report/expected_output/requestData.png b/examples/src/test/resources/examples/report/expected_output/requestData.png index 577a4a4142..772f883313 100644 Binary files a/examples/src/test/resources/examples/report/expected_output/requestData.png and b/examples/src/test/resources/examples/report/expected_output/requestData.png differ diff --git a/examples/src/test/resources/examples/request_rewrite/config.yaml b/examples/src/test/resources/examples/request_rewrite/config.yaml index 5cc4dd36e3..bd6fafe99b 100644 --- a/examples/src/test/resources/examples/request_rewrite/config.yaml +++ b/examples/src/test/resources/examples/request_rewrite/config.yaml @@ -17,5 +17,5 @@ templates: httpProcessors: - !mapUri mapping: - (https?)://lh/(.*): 'http://geoserver:8080/$2' + (https?)://lh/(.*): 'http://geoserver:8080/geoserver/$2' - !createMap {} diff --git a/examples/src/test/resources/examples/request_rewrite/expected_output/requestData.png b/examples/src/test/resources/examples/request_rewrite/expected_output/requestData.png index 0c3882729a..f7a7cbf0b8 100644 Binary files a/examples/src/test/resources/examples/request_rewrite/expected_output/requestData.png and b/examples/src/test/resources/examples/request_rewrite/expected_output/requestData.png differ diff --git a/examples/src/test/resources/examples/request_rewrite/report.jrxml b/examples/src/test/resources/examples/request_rewrite/report.jrxml index e74bf0018d..bf525574b3 100644 --- a/examples/src/test/resources/examples/request_rewrite/report.jrxml +++ b/examples/src/test/resources/examples/request_rewrite/report.jrxml @@ -20,7 +20,7 @@ - + diff --git a/examples/src/test/resources/examples/request_rewrite/requestData.json b/examples/src/test/resources/examples/request_rewrite/requestData.json index 5466b1946d..f4ebeb96c8 100644 --- a/examples/src/test/resources/examples/request_rewrite/requestData.json +++ b/examples/src/test/resources/examples/request_rewrite/requestData.json @@ -19,7 +19,8 @@ "imageFormat": "image/png", "styles": ["line"], "customParams": { - "TRANSPARENT": "true" + "TRANSPARENT": "true", + "EXCEPTIONS": "INIMAGE" } } ] 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 02f0f684bc..eafe133481 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/secured_templates/requestData.json b/examples/src/test/resources/examples/secured_templates/requestData.json index 10eef3f3d4..ef87c70ecd 100644 --- a/examples/src/test/resources/examples/secured_templates/requestData.json +++ b/examples/src/test/resources/examples/secured_templates/requestData.json @@ -10,7 +10,7 @@ "scale": 25000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], @@ -22,7 +22,7 @@ }, { "type": "WMTS", - "baseURL": "http://geoserver:8080/gwc/service/wmts", + "baseURL": "http://geoserver:8080/geoserver/gwc/service/wmts", "opacity": 1, "layer": "tiger-ny", "version": "1.0.0", diff --git a/examples/src/test/resources/examples/simple/expected_output/requestData-fontawesome.png b/examples/src/test/resources/examples/simple/expected_output/requestData-fontawesome.png index 01b683cac6..9fe760fe40 100644 Binary files a/examples/src/test/resources/examples/simple/expected_output/requestData-fontawesome.png and b/examples/src/test/resources/examples/simple/expected_output/requestData-fontawesome.png differ diff --git a/examples/src/test/resources/examples/simple/requestData-fontawesome.json b/examples/src/test/resources/examples/simple/requestData-fontawesome.json index 8786141d01..4d1c7687dc 100644 --- a/examples/src/test/resources/examples/simple/requestData-fontawesome.json +++ b/examples/src/test/resources/examples/simple/requestData-fontawesome.json @@ -2,6 +2,7 @@ "layout": "A4 portrait", "outputFormat": "pdf", "attributes": { + "title": "Font Awesome", "map": { "projection": "EPSG:3857", "rotation": 0, 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 9d99eb95df..37a521ba80 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 diff --git a/examples/src/test/resources/examples/simple_A0/requestData.json b/examples/src/test/resources/examples/simple_A0/requestData.json index 5c091d064f..cdee1896ab 100644 --- a/examples/src/test/resources/examples/simple_A0/requestData.json +++ b/examples/src/test/resources/examples/simple_A0/requestData.json @@ -12,7 +12,7 @@ "layers": [ { "type": "WMTS", - "baseURL": "http://geoserver:8080/gwc/service/wmts", + "baseURL": "http://geoserver:8080/geoserver/gwc/service/wmts", "opacity": 1, "layer": "tiger-ny", "version": "1.0.0", diff --git a/examples/src/test/resources/examples/updatePdfMetadata/expected_output/requestData.png b/examples/src/test/resources/examples/updatePdfMetadata/expected_output/requestData.png index 268a174125..5f85843277 100644 Binary files a/examples/src/test/resources/examples/updatePdfMetadata/expected_output/requestData.png and b/examples/src/test/resources/examples/updatePdfMetadata/expected_output/requestData.png differ diff --git a/examples/src/test/resources/examples/updatePdfMetadata/requestData.json b/examples/src/test/resources/examples/updatePdfMetadata/requestData.json index e5eab5301b..43193e9bca 100644 --- a/examples/src/test/resources/examples/updatePdfMetadata/requestData.json +++ b/examples/src/test/resources/examples/updatePdfMetadata/requestData.json @@ -15,7 +15,7 @@ { "type": "WMS", "layers": ["topp:states"], - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "imageFormat": "image/png", "version": "1.3.0", "customParams": { diff --git a/examples/src/test/resources/examples/verboseExample/requestData.json b/examples/src/test/resources/examples/verboseExample/requestData.json index b60c318792..70a902f775 100644 --- a/examples/src/test/resources/examples/verboseExample/requestData.json +++ b/examples/src/test/resources/examples/verboseExample/requestData.json @@ -40,19 +40,19 @@ "classes": [ { "name": "Arbres", - "icons": ["http://geoserver:8080/www/legends/arbres.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/arbres.png"] }, { "name": "Peturbations", - "icons": ["http://geoserver:8080/www/legends/perturbations.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/perturbations.png"] }, { "name": "Points de vente", - "icons": ["http://geoserver:8080/www/legends/points-de-vente.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/points-de-vente.png"] }, { "name": "Stationement", - "icons": ["http://geoserver:8080/www/legends/stationement.png"] + "icons": ["http://geoserver:8080/geoserver/www/map-data/legends/stationement.png"] } ] }, diff --git a/examples/src/test/resources/examples_to_port/print_tms_tyger_ny_EPSG_3857/requestData-scale-tms1_0_0.json b/examples/src/test/resources/examples_to_port/print_tms_tyger_ny_EPSG_3857/requestData-scale-tms1_0_0.json index 3dedf57d78..010ebf9048 100644 --- a/examples/src/test/resources/examples_to_port/print_tms_tyger_ny_EPSG_3857/requestData-scale-tms1_0_0.json +++ b/examples/src/test/resources/examples_to_port/print_tms_tyger_ny_EPSG_3857/requestData-scale-tms1_0_0.json @@ -10,7 +10,7 @@ "scale": 100000, "layers": [ { - "baseURL": "http://geoserver:8080/gwc/service/tms/", + "baseURL": "http://geoserver:8080/geoserver/gwc/service/tms/", "opacity": 1, "singleTile": false, "type": "TMS", @@ -26,7 +26,7 @@ "format": "png" }, { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger:tiger_roads"], diff --git a/examples/src/test/resources/examples_to_port/print_vector_new_york_EPSG_3857/requestData-scale-vector.json b/examples/src/test/resources/examples_to_port/print_vector_new_york_EPSG_3857/requestData-scale-vector.json index 156e5f443c..e1294ad968 100644 --- a/examples/src/test/resources/examples_to_port/print_vector_new_york_EPSG_3857/requestData-scale-vector.json +++ b/examples/src/test/resources/examples_to_port/print_vector_new_york_EPSG_3857/requestData-scale-vector.json @@ -10,7 +10,7 @@ "scale": 25000, "layers": [ { - "baseURL": "http://geoserver:8080/wms", + "baseURL": "http://geoserver:8080/geoserver/wms", "opacity": 1, "type": "WMS", "layers": ["tiger-ny"],