From ec02716e9556cd8f05eb87083722231c238375e8 Mon Sep 17 00:00:00 2001 From: rng Date: Mon, 5 Jan 2026 16:42:33 +1100 Subject: [PATCH 1/2] Fix to use EPSG:3857 which match with mapbox --- server/src/main/resources/application.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/main/resources/application.yaml b/server/src/main/resources/application.yaml index 54a3b29e..94cfe602 100644 --- a/server/src/main/resources/application.yaml +++ b/server/src/main/resources/application.yaml @@ -48,7 +48,7 @@ wms-default-param: REQUEST: "GetFeatureInfo" STYLES: "" QUERYABLE: "true" - SRS: "EPSG:4326" # This is the support from Geoserver which matches mapbox coordinate + SRS: "EPSG:3857" # This is the support from Geoserver which matches mapbox coordinate INFO_FORMAT: "text/html" FEATURE_COUNT: 100 BUFFER: 10 @@ -62,8 +62,8 @@ wms-default-param: REQUEST: "GetFeatureInfo" STYLES: "" QUERYABLE: "true" - CRS: "EPSG:4326" - SRS: "EPSG:4326" + CRS: "EPSG:3857" # This is the support from Geoserver which matches mapbox coordinate + SRS: "EPSG:3857" # This is the support from Geoserver which matches mapbox coordinate INFO_FORMAT: "text/xml" FEATURE_COUNT: 100 BUFFER: 10 From 93953eacaf8c9dd2d32704c5b83fee0b36728034 Mon Sep 17 00:00:00 2001 From: rng Date: Mon, 5 Jan 2026 16:48:49 +1100 Subject: [PATCH 2/2] Fit test --- .../aodn/ogcapi/server/core/service/wms/WmsServerTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/test/java/au/org/aodn/ogcapi/server/core/service/wms/WmsServerTest.java b/server/src/test/java/au/org/aodn/ogcapi/server/core/service/wms/WmsServerTest.java index cd9581f6..d6ad334f 100644 --- a/server/src/test/java/au/org/aodn/ogcapi/server/core/service/wms/WmsServerTest.java +++ b/server/src/test/java/au/org/aodn/ogcapi/server/core/service/wms/WmsServerTest.java @@ -171,7 +171,7 @@ public void verifyWfsUrlGenCorrect() { assertEquals(2, urls.size()); // First url will be cache one - String expectedUrl = "https://tilecache.aodn.org.au/geowebcache/service/wms?LAYERS=imos:argo_profile_map&TRANSPARENT=TRUE&VERSION=1.1.1&FORMAT=text/html&EXCEPTIONS=application/vnd.ogc.se_xml&TILED=true&SERVICE=WMS&REQUEST=GetFeatureInfo&STYLES=&QUERYABLE=true&SRS=EPSG:4326&INFO_FORMAT=text/html&FEATURE_COUNT=100&BUFFER=10&WIDTH=637&HEIGHT=550&I=474&J=252&X=474&Y=252&QUERY_LAYERS=imos:argo_profile_map&BBOX=-111.86719179153421,-69.03714171275249,111.8671917915342,69.03714171275138"; + String expectedUrl = "https://tilecache.aodn.org.au/geowebcache/service/wms?LAYERS=imos:argo_profile_map&TRANSPARENT=TRUE&VERSION=1.1.1&FORMAT=text/html&EXCEPTIONS=application/vnd.ogc.se_xml&TILED=true&SERVICE=WMS&REQUEST=GetFeatureInfo&STYLES=&QUERYABLE=true&SRS=EPSG:3857&INFO_FORMAT=text/html&FEATURE_COUNT=100&BUFFER=10&WIDTH=637&HEIGHT=550&I=474&J=252&X=474&Y=252&QUERY_LAYERS=imos:argo_profile_map&BBOX=-111.86719179153421,-69.03714171275249,111.8671917915342,69.03714171275138"; UriComponents expected = UriComponentsBuilder.fromUriString(expectedUrl).build(); UriComponents cached = UriComponentsBuilder.fromUriString(urls.get(0)).build(); @@ -185,7 +185,7 @@ public void verifyWfsUrlGenCorrect() { ); // The second url will be the original without cache - expectedUrl = "http://geoserver-123.aodn.org.au/geoserver/wms?LAYERS=imos:argo_profile_map&TRANSPARENT=TRUE&VERSION=1.1.1&FORMAT=text/html&EXCEPTIONS=application/vnd.ogc.se_xml&TILED=true&SERVICE=WMS&REQUEST=GetFeatureInfo&STYLES=&QUERYABLE=true&SRS=EPSG:4326&INFO_FORMAT=text/html&FEATURE_COUNT=100&BUFFER=10&WIDTH=637&HEIGHT=550&I=474&J=252&X=474&Y=252&QUERY_LAYERS=imos:argo_profile_map&BBOX=-111.86719179153421,-69.03714171275249,111.8671917915342,69.03714171275138"; + expectedUrl = "http://geoserver-123.aodn.org.au/geoserver/wms?LAYERS=imos:argo_profile_map&TRANSPARENT=TRUE&VERSION=1.1.1&FORMAT=text/html&EXCEPTIONS=application/vnd.ogc.se_xml&TILED=true&SERVICE=WMS&REQUEST=GetFeatureInfo&STYLES=&QUERYABLE=true&SRS=EPSG:3857&INFO_FORMAT=text/html&FEATURE_COUNT=100&BUFFER=10&WIDTH=637&HEIGHT=550&I=474&J=252&X=474&Y=252&QUERY_LAYERS=imos:argo_profile_map&BBOX=-111.86719179153421,-69.03714171275249,111.8671917915342,69.03714171275138"; UriComponents expected2 = UriComponentsBuilder.fromUriString(expectedUrl).build(); UriComponents nonCache = UriComponentsBuilder.fromUriString(urls.get(1)).build(); @@ -219,7 +219,7 @@ public void verifyNcwmsUrlGenCorrect() { assertEquals(1, urls.size()); - String expectedUrl = "https://geoserver-123.aodn.org.au/geoserver/ncwms?LAYERS=srs_ghrsst_l4_gamssa_url/analysed_sst&TRANSPARENT=TRUE&VERSION=1.3.0&FORMAT=text/xml&EXCEPTIONS=application/vnd.ogc.se_xml&TILED=true&SERVICE=ncwms&REQUEST=GetFeatureInfo&STYLES=&QUERYABLE=true&CRS=EPSG:4326&INFO_FORMAT=text/xml&FEATURE_COUNT=100&BUFFER=10&WIDTH=637&HEIGHT=550&I=254&J=191&X=254&Y=191&QUERY_LAYERS=srs_ghrsst_l4_gamssa_url/analysed_sst&BBOX=-111.86719179153421,-69.03714171275249,111.8671917915342,69.03714171275138"; + String expectedUrl = "https://geoserver-123.aodn.org.au/geoserver/ncwms?LAYERS=srs_ghrsst_l4_gamssa_url/analysed_sst&TRANSPARENT=TRUE&VERSION=1.3.0&FORMAT=text/xml&EXCEPTIONS=application/vnd.ogc.se_xml&TILED=true&SERVICE=ncwms&REQUEST=GetFeatureInfo&STYLES=&QUERYABLE=true&CRS=EPSG:3857&INFO_FORMAT=text/xml&FEATURE_COUNT=100&BUFFER=10&WIDTH=637&HEIGHT=550&I=254&J=191&X=254&Y=191&QUERY_LAYERS=srs_ghrsst_l4_gamssa_url/analysed_sst&BBOX=-111.86719179153421,-69.03714171275249,111.8671917915342,69.03714171275138"; UriComponents expected = UriComponentsBuilder.fromUriString(expectedUrl).build(); UriComponents result = UriComponentsBuilder.fromUriString(urls.get(0)).build();