Merge pull request #204 from HSLdevcom/develop

1.3.24
HSLdevcom · Jun 28, 2021 · fc1cbe6 · fc1cbe6
2 parents 7edad0c + 0552cb0
commit fc1cbe6
Show file tree

Hide file tree

Showing 5 changed files with 1,579 additions and 496 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.hsl</groupId>
     <artifactId>transitdata-common</artifactId>
-    <version>1.3.23</version>
+    <version>1.3.24</version>
     <packaging>jar</packaging>
     <name>Common utilities for Transitdata projects</name>
     <properties>

diff --git a/protos/internal-messages.proto b/protos/internal-messages.proto
@@ -193,7 +193,7 @@ message StopEstimate {
     required int32 SchemaVersion = 1 [default = 1];
     required TripInfo trip_info = 2;
 
-    required string stop_id = 3;
+    required string stop_id = 3; //The stop where the vehicle is scheduled to stop
     required uint32 stop_sequence = 4;
 
     enum Status {
@@ -213,6 +213,9 @@ message StopEstimate {
     optional int64 scheduled_time_utc_ms = 8;
     required int64 last_modified_utc_ms = 9;
     optional bool observed_time = 10 [default = false]; //True if the estimated time was observed (i.e. true if the vehicle has already passed the stop)
+
+
+    optional string targeted_stop_id = 11; //The stop where the vehicle is targeted to stop (e.g. train using a different track than scheduled)
 }
 
 message Bulletin {

diff --git a/protos/pubtrans-tables.proto b/protos/pubtrans-tables.proto
@@ -34,7 +34,10 @@ message DOITripInfo {
     required string route_id = 3;
     required uint32 direction_id = 4;
     required string start_time = 5;
+
+    //These fields are used for stop ID of the stop estimate
     required string stop_id = 6;
+    optional string targeted_stop_id = 7;
 }
 
 message ROIArrival {