code formatting

AircraftReport.proto

@@ -14,12 +14,14 @@ message AircraftReport {
         CENTER    = 5; // Center or FSS reported
     }
 
-    string     reportTime         = 1; // UTC time of the report
+    string     reportTime         =  1; // UTC time of the report
-    Reporter   reportedBy         = 2; // Indicates who reported this aircraft
+    Reporter   reportedBy         =  2; // Indicates who reported this aircraft
-    Aircraft   aircraft           = 3; // aircraft information
+    Aircraft   aircraft           =  3; // aircraft information
-    string     initialApproachFix = 4; // last waypoint of the route
+    string     initialApproachFix =  4; // last waypoint of the route
-    Coordinate position           = 5; // current WGS84 position
+    Coordinate position           =  5; // current WGS84 position
-    Dynamics   dynamics           = 6; // current aircraft dynamics
+    Dynamics   dynamics           =  6; // current aircraft dynamics
-    string     destination        = 7; // the destination airport
+    string     destination        =  7; // the destination airport
-    int32      distanceToIAF      = 8; // distance to IAF in NM
+    int32      distanceToIAF      =  8; // distance to IAF in NM
+    string     plannedGate        =  9; // the planned gate for the inbound
+    string     requestedRunway    = 10; // the requested runway of the pilot
 }

AircraftSchedule.proto

@@ -1,12 +1,13 @@
 syntax = "proto3";
 package aman;
 
-import "Aircraft.proto";
 import "BaseTypes.proto";
 
 message AircraftSchedule {
-    Aircraft aircraft           = 1; // aircraft information
+    string callsign             = 1; // aircraft's callsign
-    string arrivalRoute         = 2; // planned arrival route
+    bool fixed                  = 2; // indicates if the sequence is fixed
-    string arrivalRunway        = 3; // planned arrival runway
+    string arrivalRoute         = 3; // planned arrival route
-    repeated Waypoint waypoints = 4; // contains the planned waypoints with the PTA
+    string arrivalRunway        = 4; // planned arrival runway
+    PerformanceData performance = 5; // used performance data
+    repeated Waypoint waypoints = 6; // contains the planned waypoints with the PTA
 }

BaseTypes.proto

@@ -13,12 +13,23 @@ message WindData {
 }
 
 message Waypoint {
-    string name = 1; // The waypoint's name
+    string name             = 1; // The waypoint's name
-    string pta  = 2; // The planned time of arrival (YYYY-MM-DD HH:MM:SS)
+    string pta              = 2; // The planned time of arrival (YYYY-MM-DD HH:MM:SS)
+    int32 altitude          = 3; // The target altitude
+    int32 indicatedAirspeed = 4; // The target indicated airspeed
+    int32 groundSpeed       = 5; // The target ground speed
+}
+
+message PerformanceData {
+    int32 iasAboveFL240 = 1; // The speed above FL240
+    int32 iasAboveFL100 = 2; // The speed above FL100
+    int32 iasBelowFL100 = 3; // The speed below FL100
+    int32 iasApproach   = 4; // The minimum approach speed
 }
 
 message Dynamics {
     int32 groundSpeed   = 1; // given in knots
-    int32 altitude      = 2; // given in feet
+    int32 heading       = 2; // reported heading
-    int32 verticalSpeed = 3; // given in feet/min
+    int32 altitude      = 3; // given in feet
+    int32 verticalSpeed = 4; // given in feet/min
 }

Communication.proto

@@ -3,12 +3,15 @@ package aman;
 
 import "AircraftReport.proto";
 import "AircraftSchedule.proto";
+import "BaseTypes.proto";
 
 message AircraftUpdate {
-    repeated AircraftReport reports = 1; // Contains all updated aircrafts
+    string                  airport = 1; // Contains the updated airport
+    repeated AircraftReport reports = 2; // Contains all updated aircrafts
 }
 
 message AircraftSequence {
     string                    airport  = 1; // Contains the airport ICAO for an easy filter
-    repeated AircraftSchedule sequence = 2; // Contains the sequence for the airport
+    repeated WindData         windData = 2; // Contains the wind information
+    repeated AircraftSchedule sequence = 3; // Contains the sequence for the airport
 }