Skip to content

Shorten name to save space in URL #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
utas-raymondng wants to merge 2 commits into from
Closed

Shorten name to save space in URL #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a34f003
Shorten name to save space in URL
utas-raymondng May 5, 2026
99b1a1d
Merge branch 'main' into feature/8233-shorten-name
utas-raymondng May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions server/src/main/java/au/org/aodn/ogcapi/server/core/parser/elastic/IBoundaryFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ private static Map<String, Geometry> loadStaticMap(String path, String keyField)

static Geometry getGeoJsonFromMap(String mapName, String key) {
return switch (mapName) {
case "CORAL_ATLAS" -> CORAL_ATLAS.get(key);
case "AUSTRALIAN_MARINE_PARKS" -> AUZ_MARINE_PARK.get(key);
case "ACA" -> CORAL_ATLAS.get(key);
case "AMP" -> AUZ_MARINE_PARK.get(key);
case "MEOW" -> MEOW.get(key);
default -> null;
};
Expand Down
4 changes: 2 additions & 2 deletions server/src/test/java/au/org/aodn/ogcapi/server/common/RestApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@ public void verifyIBoundaryFunctionWorks() throws IOException {
"ae86e2f5-eaaf-459e-a405-e654d85adb9c.json"
);
ResponseEntity<Collections> collections = testRestTemplate.exchange(
getBasePath() + "/collections?filter=INTERSECTS(geometry,IBOUNDARY('AUSTRALIAN_MARINE_PARKS','12'))",
getBasePath() + "/collections?filter=INTERSECTS(geometry,IBOUNDARY('AMP','12'))",
HttpMethod.GET,
null,
new ParameterizedTypeReference<>() {});
Expand All @@ -796,7 +796,7 @@ public void verifyIBoundaryFunctionWorks() throws IOException {
assertEquals("ae86e2f5-eaaf-459e-a405-e654d85adb9c", Objects.requireNonNull(collections.getBody()).getCollections().get(0).getId(), "id correct");

collections = testRestTemplate.exchange(
getBasePath() + "/collections?filter=INTERSECTS(geometry,IBOUNDARY('AUSTRALIAN_MARINE_PARKS','15'))",
getBasePath() + "/collections?filter=INTERSECTS(geometry,IBOUNDARY('AMP','15'))",
HttpMethod.GET,
null,
new ParameterizedTypeReference<>() {});
Expand Down
4 changes: 2 additions & 2 deletions ...er/src/test/java/au/org/aodn/ogcapi/server/core/parser/elastic/IBoundaryFunctionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public void testIBoundaryFunction() {
FilterFactory2 ff = CommonFactoryFinder.getFilterFactory2();

Expression func = ff.function("IBOUNDARY",
ff.literal("CORAL_ATLAS"),
ff.literal("ACA"),
ff.literal("1"));

Object geom = func.evaluate(null);
Expand All @@ -34,7 +34,7 @@ public void testIBoundaryFunction() {
@Test
public void testIBoundaryWithCQL() throws Exception {
// Parse full CQL2 string
String cql = "INTERSECTS(geometry, IBOUNDARY('CORAL_ATLAS', '1'))";
String cql = "INTERSECTS(geometry, IBOUNDARY('ACA', '1'))";
CQLToElasticFilterFactory<CQLFields> factory = new CQLToElasticFilterFactory<>(CQLCrsType.EPSG4326, CQLFields.class);
Filter filter = CompilerUtil.parseFilter(Language.ECQL, cql, factory);

Expand Down
Loading