Reorder enum declaration and use for duplicated type names

This is a temporary work-around for a bug in the flatc compiler when
translating protobuf idl to fbs idl, where definition after use will
confuse the compiler when type names are reused in the same file but
different surrounding types.

Signed-off-by: Pierre R. Mai <pmai@pmsf.de>

Author: pmai

osi_lane.proto

@@ -973,27 +973,6 @@ message LaneBoundary
     //
     message Classification
     {
-        // The type of the lane boundary.
-        //
-        optional Type type = 1;
-
-        // The semantic color of the lane boundary in case of lane markings.
-        //
-        // \note The color types represent the semantic classification of
-        // lane markings only. They do not represent an actual visual appearance.
-        //
-        optional Color color = 2;
-
-        // The ids of \c StationaryObject which limit the corresponding lane.
-        // This field must be set if the \c #type is set to
-        // \c #TYPE_STRUCTURE
-        //
-        // \rules
-        // refers_to: StationaryObject
-        // \endrules
-        //
-        repeated Identifier limiting_structure_id = 3;
-
         // The lane boundary type.
         // There is no special representation for double lines, e.g. solid /
         // solid or dashed / solid. In such cases, each lane will define its own
@@ -1070,6 +1049,28 @@ message LaneBoundary
             TYPE_SOUND_BARRIER = 15;
         }
 
+        // The type of the lane boundary.
+        //
+        optional Type type = 1;
+
+        // The semantic color of the lane boundary in case of lane markings.
+        //
+        // \note The color types represent the semantic classification of
+        // lane markings only. They do not represent an actual visual appearance.
+        //
+        optional Color color = 2;
+
+        // The ids of \c StationaryObject which limit the corresponding lane.
+        // This field must be set if the \c #type is set to
+        // \c #TYPE_STRUCTURE
+        //
+        // \rules
+        // refers_to: StationaryObject
+        // \endrules
+        //
+        repeated Identifier limiting_structure_id = 3;
+
+
         // The semantic color of the lane boundary in case of a lane markings.
         // Lane markings that alternate in color must be represented by
         // individual \c LaneBoundary segments.

osi_object.proto

@@ -400,6 +400,31 @@ message MovingObject
     //
     optional BaseMoving base = 2;
 
+    // Definition of object types.
+    //
+    enum Type
+    {
+        // Type of the object is unknown (must not be used in ground truth).
+        //
+        TYPE_UNKNOWN = 0;
+
+        // Other (unspecified but known) type of moving object.
+        //
+        TYPE_OTHER = 1;
+
+        // Object is a vehicle.
+        //
+        TYPE_VEHICLE = 2;
+
+        // Object is a pedestrian.
+        //
+        TYPE_PEDESTRIAN = 3;
+
+        // Object is an animal.
+        //
+        TYPE_ANIMAL = 4;
+    }
+
     // The type of the object.
     //
     optional Type type = 3;
@@ -488,31 +513,6 @@ message MovingObject
     //
     optional ColorDescription color_description = 11;
 
-    // Definition of object types.
-    //
-    enum Type
-    {
-        // Type of the object is unknown (must not be used in ground truth).
-        //
-        TYPE_UNKNOWN = 0;
-
-        // Other (unspecified but known) type of moving object.
-        //
-        TYPE_OTHER = 1;
-
-        // Object is a vehicle.
-        //
-        TYPE_VEHICLE = 2;
-
-        // Object is a pedestrian.
-        //
-        TYPE_PEDESTRIAN = 3;
-
-        // Object is an animal.
-        //
-        TYPE_ANIMAL = 4;
-    }
-
     //
     // \brief The vehicle attributes for \c MovingObject (host or other).
     //
@@ -727,33 +727,6 @@ message MovingObject
     //
     message VehicleClassification
     {
-        // The type of the vehicle.
-        //
-        optional Type type = 1;
-
-        // The light state of the vehicle.
-        //
-        optional LightState light_state = 2;
-
-        // Flag defining whether the vehicle has an attached trailer.
-        //
-        optional bool has_trailer = 3;
-
-        // Id of the attached trailer.
-        //
-        // \note Field need not be set if has_Trailer is set to false or use
-        // value for non valid id.
-        //
-        // \rules
-        // check_if this.has_trailer is_equal_to true else do_check is_set
-        // \endrules
-        //
-        optional Identifier trailer_id = 4;
-
-        // The role of the vehicle.
-        //
-        optional Role role = 5;
-
         // Definition of vehicle types.
         //
         // \note OSI provides a richer set of vehicle types than is supported by some
@@ -873,6 +846,33 @@ message MovingObject
             TYPE_STANDUP_SCOOTER = 17;
         }
 
+        // The type of the vehicle.
+        //
+        optional Type type = 1;
+
+        // The light state of the vehicle.
+        //
+        optional LightState light_state = 2;
+
+        // Flag defining whether the vehicle has an attached trailer.
+        //
+        optional bool has_trailer = 3;
+
+        // Id of the attached trailer.
+        //
+        // \note Field need not be set if has_Trailer is set to false or use
+        // value for non valid id.
+        //
+        // \rules
+        // check_if this.has_trailer is_equal_to true else do_check is_set
+        // \endrules
+        //
+        optional Identifier trailer_id = 4;
+
+        // The role of the vehicle.
+        //
+        optional Role role = 5;
+
         //
         // \brief The state of the lights of a vehicle.
         //