Merge pull request pdssp#14 from Geomatys/chore/upgrade-dependencies

Fix pdssp#10 + global dependency update + minor API improvements

Author: J-Christophe

build.gradle.kts

@@ -31,7 +31,7 @@ dependencies {
     compileOnly("org.jspecify:jspecify:1.0.0")
 
     // Referencing engine
-    implementation("org.apache.sis.core:sis-referencing:1.5.0-ALPHA-1")
+    implementation(libs.apache.sis.referencing)
     implementation("org.apache.sis.non-free:sis-embedded-data:1.3")
     implementation("org.apache.sis.non-free:sis-epsg:1.3")
     implementation("org.apache.derby:derby")
@@ -41,7 +41,7 @@ dependencies {
     // For client
     testFixturesImplementation(platform(libs.geomatys.backend.bom))
     testFixturesImplementation("org.springframework:spring-core")
-    testFixturesApi("org.apache.sis.core:sis-referencing:1.5.0-ALPHA-1")
+    testFixturesApi(libs.apache.sis.referencing)
     testFixturesImplementation("org.graalvm.js:js:24.1.1")
     testFixturesImplementation("org.graalvm.js:js-scriptengine:24.1.1")
     testFixturesImplementation("org.python:jython-slim:2.7.4")
@@ -50,9 +50,9 @@ dependencies {
     testImplementation("org.iogp:gigs:1.0-GEOMATYS-ALPHA-1")
 
     // For Swagger UI
-    implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0")
-    implementation("com.github.therapi:therapi-runtime-javadoc:0.15.0")
-    annotationProcessor("com.github.therapi:therapi-runtime-javadoc-scribe:0.13.0")
+    implementation(libs.springdoc.starter)
+    implementation(libs.therapi.runtime)
+    annotationProcessor(libs.therapi.processor)
 }
 
 tasks.withType<AsciidoctorTask> {

gradle/libs.versions.toml

@@ -1,8 +1,15 @@
 [versions]
-geomatys-backend = "2024.5"
+geomatys-backend = "2025.1"
+springdoc = "2.8.9"
+therapi = "0.15.0"
+apache-sis = "1.5.0-ALPHA-2"
 
 [libraries]
+apache-sis-referencing = { module = "org.apache.sis.core:sis-referencing", version.ref = "apache-sis" }
 geomatys-backend-bom = { module = "com.geomatys.backend:downstream-bom", version.ref = "geomatys-backend" }
+springdoc-starter = { module = "org.springdoc:springdoc-openapi-starter-webmvc-ui", version.ref = "springdoc" }
+therapi-runtime = { module = "com.github.therapi:therapi-runtime-javadoc", version.ref = "therapi" }
+therapi-processor = { module = "com.github.therapi:therapi-runtime-javadoc-scribe", version.ref = "therapi" }
 
 [plugins]
 geomatys-boot-convention = { id = "com.geomatys.spring-boot-convention", version.ref = "geomatys-backend" }

src/main/java/com/geomatys/crsservice/rest/CRSOperationController.java

@@ -24,6 +24,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.time.OffsetDateTime;
 import org.springframework.core.io.Resource;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -53,7 +54,7 @@ public CRSOperationController(CrsOperationService service) {
     @CrossOrigin
     @RequestMapping(path = "define", method = RequestMethod.GET)
     @Parameter(name = "source", example = "EPSG:3395")
-    @Parameter(name = "format", schema = @Schema(type = "string", allowableValues = {"application/json"}))
+    @Parameter(name = "format", schema = @Schema(type = "string", allowableValues = {"application/json", "application/wkt"}))
     public ResponseEntity<Resource> getCRS(
                                  @RequestParam String source,
                                  @RequestParam(required = false, defaultValue = "false") boolean longitudeFirst,
@@ -107,7 +108,7 @@ public ResponseEntity<Resource> getOperation(
      * Parameters should be passed in json.
      */
     @CrossOrigin
-    @RequestMapping(path = "operation", method = RequestMethod.POST)
+    @RequestMapping(path = "operation", method = RequestMethod.POST, consumes = { MediaType.APPLICATION_JSON_VALUE, MediaType.APPLICATION_YAML_VALUE })
     public ResponseEntity<Resource> getOperation(@RequestBody CrsOperationService.OperationParameters parameters) {
         var result = service.getOperation(parameters);
         return ResponseEntity.ok()

src/main/java/com/geomatys/crsservice/service/DefaultCrsOperationService.java

@@ -97,7 +97,10 @@ public SourceCode getCRS(CRSParameters request) throws IllegalArgumentException,
             );
 
         } else if (FORMAT_WKT.equals(format)) {
-            throw new UnsupportedOperationException("TODO");
+            return new SourceCode(
+                    MediaType.parseMediaType(FORMAT_WKT + "; charset=utf-8"),
+                    new ByteArrayResource(crs.toWKT().getBytes(StandardCharsets.UTF_8))
+            );
         } else {
             throw new IllegalArgumentException("Format not supported " + format);
         }
@@ -475,6 +478,8 @@ private static String toPythonClass(MathTransform trs) {
         pythonCode = pythonCode.replaceAll("β", "beta");
         //replace ρ
         pythonCode = pythonCode.replaceAll("ρ", "rho");
+        //replace Ω
+        pythonCode = pythonCode.replaceAll("Ω", "omega");
 
         {//replace NaN
             final Pattern objPattern = Pattern.compile("(Number.math.NaN|Number.NaN|NaN)");

src/test/java/com/geomatys/crsservice/client/ClientTest.java

@@ -17,7 +17,7 @@
 
 /**
  *
- * @author jsorel
+ * @author Johann Sorel (Geomatys)
  */
 public class ClientTest extends AbstractIntegrationTest {
 
@@ -43,6 +43,41 @@ public void operationTest() throws Exception {
         testTransform(factory, "EPSG:4326", "EPSG:2154", new double[]{48, 2}, true, cartTolerance, geogTolerance);
         //Geocentric
         testTransform(factory, "EPSG:4326", "EPSG:4978", new double[]{48, 2}, true, cartTolerance, geogTolerance);
+        //Spherical to projection
+        final String mars1 =
+                "GEODCRS[\"Mars (2015) / Ocentric\",\n" +
+                "  DATUM[\"Mars (2015)\",\n" +
+                "    ELLIPSOID[\"Mars (2015)\", 3396190, 169.8944472236118,\n" +
+                "      LENGTHUNIT[\"metre\", 1, ID[\"EPSG\", 9001]]],\n" +
+                "    ANCHOR[\"Viking 1 lander : 47.95137 W\"]],\n" +
+                "    PRIMEM[\"Reference Meridian\", 0,\n" +
+                "      ANGLEUNIT[\"degree\", 0.0174532925199433, ID[\"EPSG\", 9122]]],\n" +
+                "  CS[spherical, 2],\n" +
+                "    AXIS[\"planetocentric latitude (U)\", north,\n" +
+                "      ANGLEUNIT[\"degree\", 0.0174532925199433]],\n" +
+                "    AXIS[\"planetocentric longitude (V)\", east,\n" +
+                "      ANGLEUNIT[\"degree\", 0.0174532925199433]],\n" +
+                "  ID[\"IAU\", 49902, 2015],\n" +
+                "  REMARK[\"Source of IAU Coordinate systems: doi:10.1007/s10569-017-9805-5\"]]";
+        final String mars2 =
+                "PROJCRS[\"Mars (2015) / Ocentric / Equirectangular, clon = 0\",\n" +
+                "  BASEGEODCRS[\"Mars (2015) / Ocentric\",\n" +
+                "    DATUM[\"Mars (2015)\",\n" +
+                "      ELLIPSOID[\"Mars (2015)\", 3396190, 169.8944472236118,\n" +
+                "        LENGTHUNIT[\"metre\", 1, ID[\"EPSG\", 9001]]],\n" +
+                "      ANCHOR[\"Viking 1 lander : 47.95137 W\"]],\n" +
+                "      PRIMEM[\"Reference Meridian\", 0,\n" +
+                "        ANGLEUNIT[\"degree\", 0.0174532925199433, ID[\"EPSG\", 9122]]],\n" +
+                "    ID[\"IAU\", 49902, 2015]],\n" +
+                "  CONVERSION[\"Equirectangular, clon = 0\",\n" +
+                "    METHOD[\"Equidistant Cylindrical\", ID[\"EPSG\", 1028]]],\n" +
+                "  CS[Cartesian, 2],\n" +
+                "    AXIS[\"Easting (E)\", east,\n" +
+                "      LENGTHUNIT[\"metre\", 1]],\n" +
+                "    AXIS[\"Northing (N)\", north,\n" +
+                "      LENGTHUNIT[\"metre\", 1]],\n" +
+                "  ID[\"IAU\", 49912, 2015]]";
+        testTransform(factory, mars1, mars2, new double[]{40, 120}, true, cartTolerance, geogTolerance);
 
         //test PassThroughTransform : Not working yet
         CoordinateReferenceSystem crs1 = CRS.compound(CRS.forCode("CRS:84"));