Skip to content

Commit c228fa5

Browse files
caspar-aiadrianschultz
authored andcommitted
Remove direct comparisons to OSC
Signed-off-by: Caspar de Haes <caspar.dehaes@five.ai> Signed-off-by: Adrian Vernickel <adrian.vernickel@hexagon.com>
1 parent 0bbd14e commit c228fa5

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
@@ -765,68 +765,45 @@ message MovingObject
765765
//
766766
// Definition: Hatchback car with maximum length 4 m.
767767
//
768-
// This is one of the OSI types which map from "car" in both
769-
// OpenScenario 1.x and 2.x.
770-
//
771768
TYPE_SMALL_CAR = 2;
772769

773770
// Vehicle is a compact car.
774771
//
775772
// Definition: Hatchback car with length between 4 and 4.5 m.
776773
//
777-
// This is one of the OSI types which map from "car" in both
778-
// OpenScenario 1.x and 2.x.
779-
//
780774
TYPE_COMPACT_CAR = 3;
781775

782776
// Vehicle is a medium car.
783777
//
784778
// Definition: Hatchback or sedan with lenght between 4.5 and 5 m.
785779
//
786-
// This is one of the OSI types which map from "car" in both
787-
// OpenScenario 1.x and 2.x.
788-
//
789780
TYPE_MEDIUM_CAR = 4;
790781

791782
// Vehicle is a luxury car.
792783
//
793784
// Definition: Sedan or coupe that is longer then 5 m.
794785
//
795-
// This is one of the OSI types which map from "car" in both
796-
// OpenScenario 1.x and 2.x.
797-
//
798786
TYPE_LUXURY_CAR = 5;
799787

800788
// Vehicle is a delivery van.
801789
//
802790
// This corresponds to "van" in OpenScenario 1.x.
803791
//
804-
// This is one of the OSI types which map from "truck" in
805-
// OpenScenario 2.x.
806-
//
807792
TYPE_DELIVERY_VAN = 6;
808793

809794
// Vehicle is a (heavy) truck.
810795
//
811-
// This is one of the OSI types which map from "truck" in
812-
// both OpenScenario 1.x and 2.x.
813-
//
814796
TYPE_HEAVY_TRUCK = 7;
815797

816798
// Vehicle is a tractor capable of pulling a semi-trailer.
817799
//
818-
// This is one of the OSI types which map from "truck" in
819-
// both OpenScenario 1.x and 2.x.
820-
//
821800
TYPE_SEMITRACTOR = 16;
822801

823802
// This vehicle is a semi-trailer that can be pulled by a
824803
// semi-tractor.
825804
//
826-
// This corresponds to "semitrailer" in OpenScenario 1.x.
827-
//
828-
// This is one of the OSI types which map from "trailer" in
829-
// OpenScenario 2.x.
805+
// \note The vehicle can be, but doesn't need to be,
806+
// attached to another vehicle.
830807
//
831808
TYPE_SEMITRAILER = 8;
832809

@@ -835,56 +812,30 @@ message MovingObject
835812
// \note The vehicle can be, but doesn't need to be,
836813
// attached to another vehicle.
837814
//
838-
// This corresponds to "trailer" in OpenScenario 1.x.
839-
//
840-
// This is one of the OSI types which map from "trailer" in
841-
// OpenScenario 2.x.
842-
//
843815
TYPE_TRAILER = 9;
844816

845817
// Vehicle is a motorbike or moped.
846818
//
847-
// This corresponds to "motorbike" in OpenScenario 1.x.
848-
//
849-
// This is one of the OSI types which map from "VRU_vehicle" in
850-
// OpenScenario 2.x.
851-
//
852819
TYPE_MOTORBIKE = 10;
853820

854821
// Vehicle is a bicycle (without motor and specific lights).
855822
//
856-
// This corresponds to "bicycle" in OpenScenario 1.x.
857-
//
858-
// This is one of the OSI types which map from "VRU_vehicle" in
859-
// OpenScenario 2.x.
860-
//
861823
TYPE_BICYCLE = 11;
862824

863825
// Vehicle is a bus.
864826
//
865-
// This corresponds to "bus" in both OpenScenario 1.x and 2.x.
866-
//
867827
TYPE_BUS = 12;
868828

869829
// Vehicle is a tram.
870830
//
871-
// This corresponds to "tram" in OpenScenario 1.x.
872-
//
873831
TYPE_TRAM = 13;
874832

875833
// Vehicle is a train.
876834
//
877-
// This corresponds to "train" in OpenScenario 1.x.
878-
//
879835
TYPE_TRAIN = 14;
880836

881837
// Vehicle is a wheelchair.
882838
//
883-
// This has no equivalent in OpenScenario 1.x.
884-
//
885-
// This is one of the OSI types which map from "VRU_vehicle" in
886-
// OpenScenario 2.x.
887-
//
888839
TYPE_WHEELCHAIR = 15;
889840
}
890841

0 commit comments

Comments
 (0)