Skip to content

Commit 98e3815

Browse files
committed
Remove direct comparisons to OSC
Signed-off-by: Caspar de Haes <caspar.dehaes@five.ai>
1 parent c168ed4 commit 98e3815

File tree

1 file changed

+2
-51
lines changed

1 file changed

+2
-51
lines changed

osi_object.proto

Lines changed: 2 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -761,68 +761,45 @@ message MovingObject
761761
//
762762
// Definition: Hatchback car with maximum length 4 m.
763763
//
764-
// This is one of the OSI types which map from "car" in both
765-
// OpenScenario 1.x and 2.x.
766-
//
767764
TYPE_SMALL_CAR = 2;
768765

769766
// Vehicle is a compact car.
770767
//
771768
// Definition: Hatchback car with length between 4 and 4.5 m.
772769
//
773-
// This is one of the OSI types which map from "car" in both
774-
// OpenScenario 1.x and 2.x.
775-
//
776770
TYPE_COMPACT_CAR = 3;
777771

778772
// Vehicle is a medium car.
779773
//
780774
// Definition: Hatchback or sedan with lenght between 4.5 and 5 m.
781775
//
782-
// This is one of the OSI types which map from "car" in both
783-
// OpenScenario 1.x and 2.x.
784-
//
785776
TYPE_MEDIUM_CAR = 4;
786777

787778
// Vehicle is a luxury car.
788779
//
789780
// Definition: Sedan or coupe that is longer then 5 m.
790781
//
791-
// This is one of the OSI types which map from "car" in both
792-
// OpenScenario 1.x and 2.x.
793-
//
794782
TYPE_LUXURY_CAR = 5;
795783

796784
// Vehicle is a delivery van.
797785
//
798786
// This corresponds to "van" in OpenScenario 1.x.
799787
//
800-
// This is one of the OSI types which map from "truck" in
801-
// OpenScenario 2.x.
802-
//
803788
TYPE_DELIVERY_VAN = 6;
804789

805790
// Vehicle is a (heavy) truck.
806791
//
807-
// This is one of the OSI types which map from "truck" in
808-
// both OpenScenario 1.x and 2.x.
809-
//
810792
TYPE_HEAVY_TRUCK = 7;
811793

812794
// Vehicle is a tractor capable of pulling a semi-trailer.
813795
//
814-
// This is one of the OSI types which map from "truck" in
815-
// both OpenScenario 1.x and 2.x.
816-
//
817796
TYPE_SEMITRACTOR = 16;
818797

819798
// This vehicle is a semi-trailer that can be pulled by a
820799
// semi-tractor.
821800
//
822-
// This corresponds to "semitrailer" in OpenScenario 1.x.
823-
//
824-
// This is one of the OSI types which map from "trailer" in
825-
// OpenScenario 2.x.
801+
// \note The vehicle can be, but doesn't need to be,
802+
// attached to another vehicle.
826803
//
827804
TYPE_SEMITRAILER = 8;
828805

@@ -831,56 +808,30 @@ message MovingObject
831808
// \note The vehicle can be, but doesn't need to be,
832809
// attached to another vehicle.
833810
//
834-
// This corresponds to "trailer" in OpenScenario 1.x.
835-
//
836-
// This is one of the OSI types which map from "trailer" in
837-
// OpenScenario 2.x.
838-
//
839811
TYPE_TRAILER = 9;
840812

841813
// Vehicle is a motorbike or moped.
842814
//
843-
// This corresponds to "motorbike" in OpenScenario 1.x.
844-
//
845-
// This is one of the OSI types which map from "VRU_vehicle" in
846-
// OpenScenario 2.x.
847-
//
848815
TYPE_MOTORBIKE = 10;
849816

850817
// Vehicle is a bicycle (without motor and specific lights).
851818
//
852-
// This corresponds to "bicycle" in OpenScenario 1.x.
853-
//
854-
// This is one of the OSI types which map from "VRU_vehicle" in
855-
// OpenScenario 2.x.
856-
//
857819
TYPE_BICYCLE = 11;
858820

859821
// Vehicle is a bus.
860822
//
861-
// This corresponds to "bus" in both OpenScenario 1.x and 2.x.
862-
//
863823
TYPE_BUS = 12;
864824

865825
// Vehicle is a tram.
866826
//
867-
// This corresponds to "tram" in OpenScenario 1.x.
868-
//
869827
TYPE_TRAM = 13;
870828

871829
// Vehicle is a train.
872830
//
873-
// This corresponds to "train" in OpenScenario 1.x.
874-
//
875831
TYPE_TRAIN = 14;
876832

877833
// Vehicle is a wheelchair.
878834
//
879-
// This has no equivalent in OpenScenario 1.x.
880-
//
881-
// This is one of the OSI types which map from "VRU_vehicle" in
882-
// OpenScenario 2.x.
883-
//
884835
TYPE_WHEELCHAIR = 15;
885836
}
886837

0 commit comments

Comments
 (0)