From 3e2ce338fb12a44917f40593bc17804752a2d7de Mon Sep 17 00:00:00 2001 From: Dmitrijs Lancovs Date: Fri, 25 Nov 2022 10:25:04 +0200 Subject: [PATCH] Release 4.13 (#28) Added support of WPML export with AMSL; changed some request mappings --- pom.xml | 2 +- ucs-api/pom.xml | 2 +- .../ucs/proto/mapping/HciMessageMapping.java | 7 +++++-- ucs-api/src/main/proto/Domain.proto | 17 +++++++++++------ ucs-api/src/main/proto/Messages.proto | 18 +++++++++++++++++- ucs-client/pom.xml | 2 +- ucs-common/pom.xml | 11 ++++++++++- ucs-messaging/pom.xml | 2 +- 8 files changed, 47 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 03c726c..d14e342 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.ugcs ugcs-java-sdk UgCS Server Java SDK - 4.12 + 4.13 pom ucs-messaging diff --git a/ucs-api/pom.xml b/ucs-api/pom.xml index 240ec9f..1ad7ac9 100644 --- a/ucs-api/pom.xml +++ b/ucs-api/pom.xml @@ -4,7 +4,7 @@ com.ugcs ugcs-java-sdk - 4.12 + 4.13 ucs-api UCS API diff --git a/ucs-api/src/main/java/com/ugcs/ucs/proto/mapping/HciMessageMapping.java b/ucs-api/src/main/java/com/ugcs/ucs/proto/mapping/HciMessageMapping.java index 5e08dcd..2668144 100644 --- a/ucs-api/src/main/java/com/ugcs/ucs/proto/mapping/HciMessageMapping.java +++ b/ucs-api/src/main/java/com/ugcs/ucs/proto/mapping/HciMessageMapping.java @@ -163,9 +163,12 @@ public HciMessageMapping() { putMapping(165, ExportRouteToKmlResponse.class); putMapping(168, GetTelemetrySnapshotRequest.class); putMapping(169, GetTelemetrySnapshotResponse.class); - putMapping(170, SplitRouteByCorridorPointRequest.class); - putMapping(171, SplitRouteByCorridorPointResponse.class); + putMapping(170, GetElevationTilesV2Request.class); + putMapping(171, GetElevationTilesV2Response.class); putMapping(172, ExportRouteToWpmlRequest.class); putMapping(173, ExportRouteToWpmlResponse.class); + putMapping(174, SplitRouteByCorridorPointRequest.class); + putMapping(175, SplitRouteByCorridorPointResponse.class); + } } diff --git a/ucs-api/src/main/proto/Domain.proto b/ucs-api/src/main/proto/Domain.proto index 0e305d4..a4f0e2c 100644 --- a/ucs-api/src/main/proto/Domain.proto +++ b/ucs-api/src/main/proto/Domain.proto @@ -392,6 +392,11 @@ enum KmlExportAltitudeMode { E_RELATIVE_TO_FIRST_WP = 2; } +enum WpmlExportAltitudeMode { + W_AMSL = 1; + W_RELATIVE_TO_FIRST_WP = 2; +} + //***************************************************************************** // Generic CRUD services //***************************************************************************** @@ -1448,14 +1453,14 @@ message ElevationData { } message ElevationSourceMetadata { - option (ugcs_class_package) = "com.ugcs.geoserver.dto"; optional string access = 1; - optional double originLatitude = 2; - optional double originLongitude = 3; - optional int32 wgsTileMinEasting = 4; - optional int32 wgsTileMaxEasting = 5; - optional int32 wgsTileResolution = 6; + optional double originLatitude = 2 [deprecated = true]; + optional double originLongitude = 3 [deprecated = true]; + optional int32 wgsTileMinEasting = 4 [deprecated = true]; + optional int32 wgsTileMaxEasting = 5 [deprecated = true]; + optional int32 wgsTileResolution = 6 [deprecated = true]; optional int64 version = 7; + optional int32 pyramidBaseLevel = 8; } message Tile { diff --git a/ucs-api/src/main/proto/Messages.proto b/ucs-api/src/main/proto/Messages.proto index 884a427..dd3ddd7 100644 --- a/ucs-api/src/main/proto/Messages.proto +++ b/ucs-api/src/main/proto/Messages.proto @@ -3,7 +3,7 @@ syntax = "proto2"; option java_package = "com.ugcs.ucs.proto"; option java_outer_classname = "MessagesProto"; option (ugcs_protocol_major_version) = 1; -option (ugcs_protocol_minor_version) = 8; +option (ugcs_protocol_minor_version) = 9; import "Options.proto"; import "Domain.proto"; @@ -539,6 +539,7 @@ message GetRasterGridResponse { //Request for elevation tiles in specified rectangle message GetElevationTilesRequest { + option deprecated = true; required int32 clientId = 1; required double minLatitude = 3; required double minLongitude = 4; @@ -547,6 +548,20 @@ message GetElevationTilesRequest { } message GetElevationTilesResponse { + option deprecated = true; + repeated ElevationData data = 1; +} + +//Request for elevation tiles in specified rectangle +message GetElevationTilesV2Request { + required int32 clientId = 1; + required double minLatitude = 3; + required double minLongitude = 4; + required double maxLatitude = 5; + required double maxLongitude = 6; +} + +message GetElevationTilesV2Response { repeated ElevationData data = 1; } @@ -1173,6 +1188,7 @@ message GetTelemetrySnapshotResponse { message ExportRouteToWpmlRequest { required int32 clientId = 1; required ProcessedRoute route = 2; + required WpmlExportAltitudeMode altitudeMode = 3; } message ExportRouteToWpmlResponse { diff --git a/ucs-client/pom.xml b/ucs-client/pom.xml index d189b53..efe72ec 100644 --- a/ucs-client/pom.xml +++ b/ucs-client/pom.xml @@ -4,7 +4,7 @@ com.ugcs ugcs-java-sdk - 4.12 + 4.13 ucs-client UCS Client diff --git a/ucs-common/pom.xml b/ucs-common/pom.xml index 1a82a44..7a7a075 100644 --- a/ucs-common/pom.xml +++ b/ucs-common/pom.xml @@ -4,7 +4,7 @@ com.ugcs ugcs-java-sdk - 4.12 + 4.13 ucs-common UCS Common Data Types and Utilities @@ -43,4 +43,13 @@ mockito-core + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.1 + + + diff --git a/ucs-messaging/pom.xml b/ucs-messaging/pom.xml index 9af8a40..ab78177 100644 --- a/ucs-messaging/pom.xml +++ b/ucs-messaging/pom.xml @@ -4,7 +4,7 @@ com.ugcs ugcs-java-sdk - 4.12 + 4.13 ucs-messaging UCS Messaging Library