From b200093ef859896e428b7345a6e683a7f29f2ada Mon Sep 17 00:00:00 2001 From: Lyn Long Date: Tue, 29 Sep 2026 13:42:02 +1000 Subject: [PATCH 1/2] fix tile compile error --- tile/pom.xml | 329 +++++++++--------- .../main/resources/schema/tile/api/README.md | 3 + .../schema/tile/api/all-collections.json | 20 +- .../schema/tile/api/coverage-collections.json | 12 +- .../resources/schema/tile/api/styles.json | 8 +- .../schema/tile/api/tileMatrixSets.json | 14 +- .../tile/api/vectorTiles-collections.json | 10 +- .../tile/parameters/common-geodata/bbox.yaml | 2 +- .../parameters/maps-core/transparent.yaml | 2 +- .../schemas/common-geodata/numberMatched.yaml | 2 +- .../common-geodata/numberReturned.yaml | 2 +- 11 files changed, 204 insertions(+), 200 deletions(-) create mode 100644 tile/src/main/resources/schema/tile/api/README.md diff --git a/tile/pom.xml b/tile/pom.xml index a46fbf67..642a0118 100644 --- a/tile/pom.xml +++ b/tile/pom.xml @@ -1,175 +1,176 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - - au.org.aodn.ogcapi - ogcapi-java - 0.0.0 - ../pom.xml - - 4.0.0 - ogcapi-tile-java - ogcapi-tile-java - REST API that implements OGC Tile API - + + au.org.aodn.ogcapi + ogcapi-java + 0.0.0 + ../pom.xml + + 4.0.0 + ogcapi-tile-java + ogcapi-tile-java + REST API that implements OGC Tile API + true - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - - - org.springframework.boot - spring-boot-starter-web - - - org.projectlombok - lombok - true - - - jakarta.annotation - jakarta.annotation-api - - - jakarta.validation - jakarta.validation-api - - - com.github.joschi.jackson - jackson-datatype-threetenbp - + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + + + org.springframework.boot + spring-boot-starter-web + + + org.projectlombok + lombok + true + + + jakarta.annotation + jakarta.annotation-api + + + jakarta.validation + jakarta.validation-api + + + com.github.joschi.jackson + jackson-datatype-threetenbp + org.openapitools jackson-databind-nullable - - org.springframework.boot - spring-boot-starter-test - test - - + + org.springframework.boot + spring-boot-starter-test + test + + - - - - - io.swagger.codegen.v3 - swagger-codegen-maven-plugin - ${swagger.codegen.version} - - - generate-ogcapi-tile - generate-sources - - generate - - - - spring - ${project.groupId}.tile.model - ${project.groupId}.tile.api - ${project.groupId}.tile.invoker - ${project.basedir}/src/main/resources/schema/tile/ogcapi-tiles-1.yaml - true - ${project.build.directory}/generated-sources - - - VectorTilesCollections=java.lang.String - AllCollections=java.lang.String - AllOftileSetItemCrs=java.lang.String - CoverageCollections=java.lang.String - - - true - true - java11-localdatetime - true - - - - - - - com.google.code.maven-replacer-plugin - replacer - 1.5.3 - - - - replace-line-in-files - generate-sources - - replace - - - - ${project.build.directory}/generated-sources/src/main/**/*.java - - - - import au\.org\.aodn\.ogcapi\.tile\.model\.TimeStamp; - - - - - ResponseEntity<String> datasetVectorGetTile - ResponseEntity<?> datasetVectorGetTile - - - - - - - replace-tile-set-itme - generate-sources - - replace - - - - ${project.build.directory}/generated-sources/src/main/**/TileSetItem.java - - - - AllOftileSetItemDataType - String - - - AllOftileSetItemCrs - String - - - - - - - - + + + + + io.swagger.codegen.v3 + swagger-codegen-maven-plugin + ${swagger.codegen.version} + + + generate-ogcapi-tile + generate-sources + + generate + + + + spring + ${project.groupId}.tile.model + ${project.groupId}.tile.api + ${project.groupId}.tile.invoker + ${project.basedir}/src/main/resources/schema/tile/ogcapi-tiles-1.yaml + false + ${project.build.directory}/generated-sources + + + VectorTilesCollections=java.lang.String + AllCollections=java.lang.String + AllOftileSetItemCrs=java.lang.String + CoverageCollections=java.lang.String + + + true + true + java11-localdatetime + true + + + + + + + com.google.code.maven-replacer-plugin + replacer + 1.5.3 + + + + replace-line-in-files + generate-sources + + replace + + + + ${project.build.directory}/generated-sources/src/main/**/*.java + + + + import au\.org\.aodn\.ogcapi\.tile\.model\.TimeStamp; + + + + + ResponseEntity<String> datasetVectorGetTile + ResponseEntity<?> datasetVectorGetTile + + + + + + + replace-tile-set-itme + generate-sources + + replace + + + + ${project.build.directory}/generated-sources/src/main/**/TileSetItem.java + + + + + AllOftileSetItemDataType + String + + + AllOftileSetItemCrs + String + + + + + + + + diff --git a/tile/src/main/resources/schema/tile/api/README.md b/tile/src/main/resources/schema/tile/api/README.md new file mode 100644 index 00000000..6bd949f8 --- /dev/null +++ b/tile/src/main/resources/schema/tile/api/README.md @@ -0,0 +1,3 @@ +These stand-in API resources are intended to dynamically enumerate specific types of implementation/deployment-dependent available resources in responses to `/api/*`. + +Alternatively, those resources could be directly enumerated in `schemas/dynamic/*` diff --git a/tile/src/main/resources/schema/tile/api/all-collections.json b/tile/src/main/resources/schema/tile/api/all-collections.json index 4d645310..988ab7a3 100644 --- a/tile/src/main/resources/schema/tile/api/all-collections.json +++ b/tile/src/main/resources/schema/tile/api/all-collections.json @@ -1,12 +1,12 @@ { - "type" : "string", - "enum" : [ - "blueMarble", - "NaturalEarth:raster:HYP_HR_SR_OB_DR", - "NaturalEarth:cultural:ne_10m_admin_0_countries", - "NaturalEarth:physical:bathymetry", - "SRTM_ViewFinderPanorama", - "HRDEM-Ottawa", - "HRDEM-RedRiver" - ] + "type" : "string", + "enum" : [ + "blueMarble", + "NaturalEarth:raster:HYP_HR_SR_OB_DR", + "NaturalEarth:cultural:ne_10m_admin_0_countries", + "NaturalEarth:physical:bathymetry", + "SRTM_ViewFinderPanorama", + "HRDEM-Ottawa", + "HRDEM-RedRiver" + ] } diff --git a/tile/src/main/resources/schema/tile/api/coverage-collections.json b/tile/src/main/resources/schema/tile/api/coverage-collections.json index e2b299a0..cfb2da17 100644 --- a/tile/src/main/resources/schema/tile/api/coverage-collections.json +++ b/tile/src/main/resources/schema/tile/api/coverage-collections.json @@ -1,8 +1,8 @@ { - "type" : "string", - "enum" : [ - "SRTM_ViewFinderPanorama", - "HRDEM-Ottawa", - "HRDEM-RedRiver" - ] + "type" : "string", + "enum" : [ + "SRTM_ViewFinderPanorama", + "HRDEM-Ottawa", + "HRDEM-RedRiver" + ] } diff --git a/tile/src/main/resources/schema/tile/api/styles.json b/tile/src/main/resources/schema/tile/api/styles.json index 101ac002..8d5045af 100644 --- a/tile/src/main/resources/schema/tile/api/styles.json +++ b/tile/src/main/resources/schema/tile/api/styles.json @@ -1,6 +1,6 @@ { - "type" : "string", - "enum" : [ - "default" - ] + "type" : "string", + "enum" : [ + "default" + ] } diff --git a/tile/src/main/resources/schema/tile/api/tileMatrixSets.json b/tile/src/main/resources/schema/tile/api/tileMatrixSets.json index f74600bf..412825f7 100644 --- a/tile/src/main/resources/schema/tile/api/tileMatrixSets.json +++ b/tile/src/main/resources/schema/tile/api/tileMatrixSets.json @@ -1,9 +1,9 @@ { - "type" : "string", - "enum" : [ - "WebMercatorQuad", - "WorldCRS84Quad", - "GNOSISGlobalGrid", - "WorldMercatorWGS84Quad" - ] + "type" : "string", + "enum" : [ + "WebMercatorQuad", + "WorldCRS84Quad", + "GNOSISGlobalGrid", + "WorldMercatorWGS84Quad" + ] } diff --git a/tile/src/main/resources/schema/tile/api/vectorTiles-collections.json b/tile/src/main/resources/schema/tile/api/vectorTiles-collections.json index 21eff666..ff036ff7 100644 --- a/tile/src/main/resources/schema/tile/api/vectorTiles-collections.json +++ b/tile/src/main/resources/schema/tile/api/vectorTiles-collections.json @@ -1,7 +1,7 @@ { - "type" : "string", - "enum" : [ - "NaturalEarth:cultural:ne_10m_admin_0_countries", - "NaturalEarth:physical:bathymetry" - ] + "type" : "string", + "enum" : [ + "NaturalEarth:cultural:ne_10m_admin_0_countries", + "NaturalEarth:physical:bathymetry" + ] } diff --git a/tile/src/main/resources/schema/tile/parameters/common-geodata/bbox.yaml b/tile/src/main/resources/schema/tile/parameters/common-geodata/bbox.yaml index f7353abe..d63edbda 100644 --- a/tile/src/main/resources/schema/tile/parameters/common-geodata/bbox.yaml +++ b/tile/src/main/resources/schema/tile/parameters/common-geodata/bbox.yaml @@ -1,6 +1,6 @@ name: bbox in: query -description: >- +description: |- Only features that have a geometry that intersects the bounding box are selected. The bounding box is provided as four or six numbers, depending on whether the coordinate reference system includes a vertical axis (height or depth): diff --git a/tile/src/main/resources/schema/tile/parameters/maps-core/transparent.yaml b/tile/src/main/resources/schema/tile/parameters/maps-core/transparent.yaml index a66bc401..804295d9 100644 --- a/tile/src/main/resources/schema/tile/parameters/maps-core/transparent.yaml +++ b/tile/src/main/resources/schema/tile/parameters/maps-core/transparent.yaml @@ -1,6 +1,6 @@ name: transparent in: query -description: Background transparency of map (default=true). +description: Background transparency of map (defaults to `true` without a `bgcolor` specified, but to `false` when a `bgcolor` is used). required: false style: form explode: false diff --git a/tile/src/main/resources/schema/tile/schemas/common-geodata/numberMatched.yaml b/tile/src/main/resources/schema/tile/schemas/common-geodata/numberMatched.yaml index feb63abf..54e16aa2 100644 --- a/tile/src/main/resources/schema/tile/schemas/common-geodata/numberMatched.yaml +++ b/tile/src/main/resources/schema/tile/schemas/common-geodata/numberMatched.yaml @@ -3,4 +3,4 @@ description: |- parameters like `bbox`. type: integer minimum: 0 -example: 127 +example: 127 \ No newline at end of file diff --git a/tile/src/main/resources/schema/tile/schemas/common-geodata/numberReturned.yaml b/tile/src/main/resources/schema/tile/schemas/common-geodata/numberReturned.yaml index cbe9a364..7efb4093 100644 --- a/tile/src/main/resources/schema/tile/schemas/common-geodata/numberReturned.yaml +++ b/tile/src/main/resources/schema/tile/schemas/common-geodata/numberReturned.yaml @@ -6,4 +6,4 @@ description: |- of items in the "features" array. type: integer minimum: 0 -example: 10 +example: 10 \ No newline at end of file From 49e031520eed02570ad323e669cc031b4a095c65 Mon Sep 17 00:00:00 2001 From: Lyn Long Date: Tue, 29 Sep 2026 13:46:29 +1000 Subject: [PATCH 2/2] fix pre commit --- .../schema/tile/schemas/common-geodata/numberMatched.yaml | 2 +- .../schema/tile/schemas/common-geodata/numberReturned.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tile/src/main/resources/schema/tile/schemas/common-geodata/numberMatched.yaml b/tile/src/main/resources/schema/tile/schemas/common-geodata/numberMatched.yaml index 54e16aa2..feb63abf 100644 --- a/tile/src/main/resources/schema/tile/schemas/common-geodata/numberMatched.yaml +++ b/tile/src/main/resources/schema/tile/schemas/common-geodata/numberMatched.yaml @@ -3,4 +3,4 @@ description: |- parameters like `bbox`. type: integer minimum: 0 -example: 127 \ No newline at end of file +example: 127 diff --git a/tile/src/main/resources/schema/tile/schemas/common-geodata/numberReturned.yaml b/tile/src/main/resources/schema/tile/schemas/common-geodata/numberReturned.yaml index 7efb4093..cbe9a364 100644 --- a/tile/src/main/resources/schema/tile/schemas/common-geodata/numberReturned.yaml +++ b/tile/src/main/resources/schema/tile/schemas/common-geodata/numberReturned.yaml @@ -6,4 +6,4 @@ description: |- of items in the "features" array. type: integer minimum: 0 -example: 10 \ No newline at end of file +example: 10