Skip to content

Release 4.13 (#28) #30

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

Open
Ailierynn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Release 4.13 (#28) #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.ugcs</groupId>
<artifactId>ugcs-java-sdk</artifactId>
<name>UgCS Server Java SDK</name>
<version>4.12</version>
<version>4.13</version>
<packaging>pom</packaging>
<modules>
<module>ucs-messaging</module>
Expand Down
2 changes: 1 addition & 1 deletion ucs-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.ugcs</groupId>
<artifactId>ugcs-java-sdk</artifactId>
<version>4.12</version>
<version>4.13</version>
</parent>
<artifactId>ucs-api</artifactId>
<name>UCS API</name>
Expand Down
7 changes: 5 additions & 2 deletions ucs-api/src/main/java/com/ugcs/ucs/proto/mapping/HciMessageMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

}
}
17 changes: 11 additions & 6 deletions ucs-api/src/main/proto/Domain.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
//*****************************************************************************
Expand Down Expand Up @@ -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 {
Expand Down
18 changes: 17 additions & 1 deletion ucs-api/src/main/proto/Messages.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down Expand Up @@ -1173,6 +1188,7 @@ message GetTelemetrySnapshotResponse {
message ExportRouteToWpmlRequest {
required int32 clientId = 1;
required ProcessedRoute route = 2;
required WpmlExportAltitudeMode altitudeMode = 3;
}

message ExportRouteToWpmlResponse {
Expand Down
2 changes: 1 addition & 1 deletion ucs-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.ugcs</groupId>
<artifactId>ugcs-java-sdk</artifactId>
<version>4.12</version>
<version>4.13</version>
</parent>
<artifactId>ucs-client</artifactId>
<name>UCS Client</name>
Expand Down
11 changes: 10 additions & 1 deletion ucs-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.ugcs</groupId>
<artifactId>ugcs-java-sdk</artifactId>
<version>4.12</version>
<version>4.13</version>
</parent>
<artifactId>ucs-common</artifactId>
<name>UCS Common Data Types and Utilities</name>
Expand Down Expand Up @@ -43,4 +43,13 @@
<artifactId>mockito-core</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion ucs-messaging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.ugcs</groupId>
<artifactId>ugcs-java-sdk</artifactId>
<version>4.12</version>
<version>4.13</version>
</parent>
<artifactId>ucs-messaging</artifactId>
<name>UCS Messaging Library</name>
Expand Down