[Aero] Add separate flight ID + waypoint types to mark as redispatch,

ETOPS, etc.

Author: alexrobin

sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/IFlightIdentification.java

@@ -27,6 +27,12 @@
  */
 public interface IFlightIdentification
 {
+    /**
+     * @return Full flight identifier
+     */
+    String getFlightID();
+    
+    
     /**
      * @return ICAO flight number (3 letters airline code + 1-4 numbers, e.g. DAL123)
      */

sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/IWaypoint.java

@@ -16,6 +16,15 @@
 
 public interface IWaypoint
 {
+    public enum WaypointType
+    {
+        AIRPORT,
+        REDISPATCH,
+        ETOPS_ENTRY,
+        ETOPS_EXIT,
+        ALTERNATE
+    }
+    
     /**
      * @return Waypoint code (3 to 5 letters ICAO code) 
      */

sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/impl/AeroUtils.java

@@ -353,6 +353,7 @@ public static IFlightIdentification parseFlightIdentification(String flightId)
 
         return new IFlightIdentification()
         {
+            public String getFlightID() { return flightId; }
             public String getFlightNumber() { return tokens[0]; }                        
             public String getOriginAirport() { return null; }            
             public String getDestinationAirport() { return tokens[1]; }

sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/impl/FlightPlanRecord.java

@@ -51,17 +51,18 @@ public static DataRecord getSchema(String name)
             .definition(DEF_FLIGHTPLAN_REC)
             .label("Flight Plan")
             .addField("time", fac.createIssueTime())
+            .addField("flightId", fac.createFlightID())
             .addField("source", fac.createMessageSource()
                 .addAllowedValues(FlightPlanSource.class))
-            .addField("flightNum", fac.createFlightNumber())
+            .addField("flightNumber", fac.createFlightNumber())
             .addField("flightDate", fac.createFlightDate())
             .addField("origAirport", fac.createOriginAirport())
             .addField("destAirport", fac.createDestinationAirport())
             .addField("altAirports", fac.createAlternateAirports())
             .addField("departTime", fac.createDepartureTime())
             .addField("arrivalTime", fac.createArrivalTime())
             .addField("tailNum", fac.createTailNumber())
-            .addField("acType", fac.createAircraftType())
+            .addField("aircraftType", fac.createAircraftType())
             .addField("cruiseAlt", fac.createBaroAlt()
                 .label("Cruise Altitude"))
             .addField("cruiseSpeed", fac.createTrueAirspeed()
@@ -71,7 +72,7 @@ public static DataRecord getSchema(String name)
             .addField("costIndex", fac.createCostIndex())
             .addField("fuelFactor", fac.createFuelFactor())
             .addField("codedRoute", fac.createCodedRoute())
-            .addField("numWpts", fac.createCount()
+            .addField("numPoints", fac.createCount()
                 .definition(SWEConstants.DEF_NUM_POINTS)
                 .id(numWptsCompId)
                 .label("Number of Waypoints"))
@@ -103,6 +104,13 @@ public static FlightPlanRecord create(DataBlock dblk)
     @SweMapping(path="time")
     void setIssueTime(Instant val);
 
+    @Override
+    @SweMapping(path="flightId")
+    String getFlightID();
+
+    @SweMapping(path="flightId")
+    void setFlightID(String val);
+    
     @Override
     @SweMapping(path="source")
     String getSource();
@@ -111,10 +119,10 @@ public static FlightPlanRecord create(DataBlock dblk)
     void setSource(String val);
 
     @Override
-    @SweMapping(path="flightNum")
+    @SweMapping(path="flightNumber")
     String getFlightNumber();
 
-    @SweMapping(path="flightNum")
+    @SweMapping(path="flightNumber")
     void setFlightNumber(String val);
 
     @SweMapping(path="flightDate")
@@ -178,10 +186,10 @@ default void setFlightDate(LocalDate date)
     void setTailNumber(String val);
 
     @Override
-    @SweMapping(path="acType")
+    @SweMapping(path="aircraftType")
     String getAircraftType();
 
-    @SweMapping(path="acType")
+    @SweMapping(path="aircraftType")
     void setAircraftType(String val);
 
     @Override
@@ -233,13 +241,4 @@ default void setFlightDate(LocalDate date)
     @SweMapping(path="waypoints")
     WaypointRecord addWaypoint();
 
-    
-    /**
-     * @return Unique flight identifier composed of flight number, destination and flight date
-     */
-    default String getFlightID()
-    {
-        return AeroUtils.getFlightID(this);
-    }
-    
 }

sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/impl/WaypointRecord.java

@@ -52,10 +52,10 @@ static DataRecordBuilder getRecordBuilder(String name)
             .definition(DEF_WAYPOINT_REC) 
             .label("Waypoint")
             .addField("code", fac.createWaypointCode())
-            /*.addField("type", fac.createCategory()
+            .addField("type", fac.createCategory()
                 .definition(AeroHelper.DEF_WAYPOINT_TYPE)
                 .label("Waypoint Type")
-                .description("Type of navigation point (airport, waypoint, VOR, VORTAC, DME, etc."))*/
+                .addAllowedValues(WaypointType.class))
             .addField("lat", fac.createLatitude())
             .addField("lon", fac.createLongitude())
             .addField("alt", fac.createBaroAlt());
@@ -83,16 +83,12 @@ public static WaypointRecord create(DataBlock dblk)
     @SweMapping(path="code")
     void setCode(String val);
 
-    /*@Override
+    @Override
     @SweMapping(path="type")
     String getType();
 
     @SweMapping(path="type")
-    void setType(String val);*/
-    default String getType()
-    {
-        return null;
-    }
+    void setType(String val);
 
     @Override
     @SweMapping(path="lat")