From 9a5786aa88f9eba20f6bb0ee04f0cf220c8a0b08 Mon Sep 17 00:00:00 2001 From: ClemensLinnhoff Date: Mon, 12 Feb 2024 16:23:23 +0100 Subject: [PATCH 01/13] Fix typos in proto files Signed-off-by: ClemensLinnhoff --- osi_common.proto | 6 +++--- osi_detectedobject.proto | 4 ++-- osi_featuredata.proto | 18 +++++++++--------- osi_hostvehicledata.proto | 2 +- osi_lane.proto | 8 ++++---- osi_logicallane.proto | 10 +++++----- osi_object.proto | 8 ++++---- osi_referenceline.proto | 2 +- osi_sensorview.proto | 4 ++-- osi_streamingupdate.proto | 2 +- osi_trafficcommand.proto | 22 +++++++++++----------- osi_trafficlight.proto | 2 +- osi_trafficupdate.proto | 2 +- 13 files changed, 45 insertions(+), 45 deletions(-) diff --git a/osi_common.proto b/osi_common.proto index ec84ed522..74e148c3f 100644 --- a/osi_common.proto +++ b/osi_common.proto @@ -159,7 +159,7 @@ message Dimension3d // \f$ Rotation_{yaw,pitch,roll} = // Rotation_{yaw}*Rotation_{pitch}*Rotation_{roll} \f$ // -// \f$ vector_{gobal coord system} := Rotation_{yaw, pitch, roll} * vector_{local coord system} +local_{origin::position} \f$ +// \f$ vector_{global coord system} := Rotation_{yaw, pitch, roll} * vector_{local coord system} +local_{origin::position} \f$ // // \attention This definition changed in OSI version 3.0.0. Previous OSI // versions (V2.xx) had an other definition. @@ -195,7 +195,7 @@ message Orientation3d // truth, the identifier of an item (object, lane, sign, etc.) must remain // stable over its lifetime. \c Identifier values may be only be reused if the // available address space is exhausted and the specific values have not been in -// use for several timesteps. Sensor specific tracking IDs have no restrictions +// use for several time steps. Sensor specific tracking IDs have no restrictions // and should behave according to the sensor specifications. // // The value MAX(uint64) = 2^(64) -1 = @@ -250,7 +250,7 @@ message ExternalReference // The external identifier reference value. // // The repeated string is chosen as a common description of the external - // identifier, because a variety of identificatier types could be + // identifier, because a variety of identifier types could be // involved . // // For example, referencing a unique lane in OpenDRIVE requires the diff --git a/osi_detectedobject.proto b/osi_detectedobject.proto index 030747f06..fb4e4e62b 100644 --- a/osi_detectedobject.proto +++ b/osi_detectedobject.proto @@ -80,11 +80,11 @@ message DetectedItemHeader // MEASUREMENT_STATE_OTHER = 1; - // Entity has been measured by the sensor in the current timestep. + // Entity has been measured by the sensor in the current time step. // MEASUREMENT_STATE_MEASURED = 2; - // Entity has not been measured by the sensor in the current timestep. + // Entity has not been measured by the sensor in the current time step. // Values provided by tracking only. // MEASUREMENT_STATE_PREDICTED = 3; diff --git a/osi_featuredata.proto b/osi_featuredata.proto index 69b4fcd62..c4079fe21 100644 --- a/osi_featuredata.proto +++ b/osi_featuredata.proto @@ -36,7 +36,7 @@ message FeatureData // // \note Required for ultrasonic sensors: Detections will be send by the // emitting ultrasonic sensor, including all indirect detections received - // by neighbouring sensors. + // by neighboring sensors. // repeated UltrasonicDetectionData ultrasonic_sensor = 4; @@ -332,7 +332,7 @@ message RadarDetection // // \note Unambiguous measurements have the ambiguity ID 0. // - // \note Multiple seperate detections, from e.g. a large object, do not + // \note Multiple separate detections, from e.g. a large object, do not // necessarily on their own create any ambiguity. Therefore they do not // usually share an ambiguity ID. They can however be ambiguous // with other detections. @@ -509,7 +509,7 @@ message UltrasonicDetectionSpecificHeader // // \image html OSI_USSensor.svg // -// \note Direct detecions lies on circles with the sending sensor as centre. +// \note Direct detections lie on circles with the sending sensor as centre. // message UltrasonicDetectionData { @@ -544,7 +544,7 @@ message UltrasonicDetectionData // // \image html OSI_USSensor_direct.svg // -// \note Direct detecions lies on circles with the sensor as centre. +// \note Direct detections lie on circles with the sensor as centre. // message UltrasonicDetection { @@ -594,7 +594,7 @@ message UltrasonicDetection // // \image html OSI_USSensor_indirect.svg // -// \note Indirect detecions lies on ellipses with the sending resp. receiving +// \note Indirect detections lie on ellipses with the sending resp. receiving // sensor in the focal points. // message UltrasonicIndirectDetection @@ -730,7 +730,7 @@ message CameraDetection // optional bool shape_classification_background = 5; - // The defined shape is foregroud. + // The defined shape is foreground. // The probability for this classification is at least // \c #shape_classification_probability. // @@ -856,7 +856,7 @@ message CameraDetection // optional bool shape_classification_pedestrian_rear = 26; - // This probability defines the mininimum probability for each selected + // This probability defines the minimum probability for each selected // shape classification. // // \rules @@ -989,7 +989,7 @@ message CameraDetection // Allowed number of referenced points: 2 or 3 // // Allowed number of referenced points = 2: first and third corner of - // the box. Box is alligned horizontal resp. vertical. + // the box. Box is aligned horizontal resp. vertical. // // Allowed number of referenced points = 3: first, second and third // corner of the box. fourth corner is calculated by first+third-second @@ -1057,7 +1057,7 @@ message CameraPoint // optional double existence_probability = 1; - // Measured point refered by one camera detection given in spherical + // Measured point referred by one camera detection given in spherical // coordinates in the sensor coordinate system. // optional Spherical3d point = 2; diff --git a/osi_hostvehicledata.proto b/osi_hostvehicledata.proto index 9467b72a8..18762a14f 100644 --- a/osi_hostvehicledata.proto +++ b/osi_hostvehicledata.proto @@ -144,7 +144,7 @@ message HostVehicleData // OPERATING_STATE_BOARDING = 4; - // Entertainment, navigation or similiar systems can be used by the driver. + // Entertainment, navigation or similar systems can be used by the driver. // The vehicle can not be driven. // Usually the driver sits in the vehicle before or after a drive. // diff --git a/osi_lane.proto b/osi_lane.proto index 702a088d9..975a108b2 100644 --- a/osi_lane.proto +++ b/osi_lane.proto @@ -58,7 +58,7 @@ message Lane // // For example, to reference a lane defined in an OpenDRIVE map // the items should be set as follows: - // * reference = URI to map, can remain empty if identical with definiton + // * reference = URI to map, can remain empty if identical with definition // in \c GroundTruth::map_reference // * type = "net.asam.opendrive" // * identifier[0] = id of t_road @@ -209,8 +209,8 @@ message Lane // cl: center line // lb: lane boundary // - // \attention The points desribing the center line must be set in the - // same ordering (ascending or descending) as the points desribing the + // \attention The points describing the center line must be set in the + // same ordering (ascending or descending) as the points describing the // lane boundaries. Example: If the points are deducted from a map format, // the order of points is recommended to be in line with the road coordinate // (e.g. s-coordinate in OpenDRIVE). @@ -441,7 +441,7 @@ message Lane // SUBTYPE_NORMAL = 2; - // A lane that is designated for bicylists. + // A lane that is designated for bicycles. // // Since it is not intended to be used for normal automotive // driving, it should be used in combination with TYPE_NONDRIVING. diff --git a/osi_logicallane.proto b/osi_logicallane.proto index 5d3828673..35f58b51d 100644 --- a/osi_logicallane.proto +++ b/osi_logicallane.proto @@ -318,7 +318,7 @@ message LogicalLaneBoundary // - The red area is the area where \c l1 overlaps \c l2. This is recorded in // #overlapping_lane of \c l1. // -// As can be seen in the images, the two highlighted lanes are neighbours for +// As can be seen in the images, the two highlighted lanes are neighbors for // part of their length, but it makes no sense for them to have the same // reference line, since they diverge significantly. // @@ -347,7 +347,7 @@ message LogicalLane // // For example, to reference a lane defined in an OpenDRIVE map // the items should be set as follows: - // * reference = URI to map, can remain empty if identical with definiton + // * reference = URI to map, can remain empty if identical with definition // in \c GroundTruth::map_reference // * type = "net.asam.opendrive" // * identifier[0] = id of t_road @@ -420,10 +420,10 @@ message LogicalLane // not required that the reference line has the same direction as the // driving direction of the lane. // - // Neighbouring lanes (i.e. lanes that are neighbours and whose directions + // Neighboring lanes (i.e. lanes that are neighbors and whose directions // do not diverge significantly) are strongly encouraged to reference the // same ReferenceLine, so that vehicles that are next to each other on - // neighbouring lanes have comparable S positions. + // neighboring lanes have comparable S positions. // // The S coordinate of the reference line makes it easy to find e.g. which // object is next on a lane, using the LogicalLaneAssignment of the @@ -616,7 +616,7 @@ message LogicalLane // TYPE_NORMAL = 2; - // A lane that is designated for bicylists. + // A lane that is designated for bicycles // Note that biking lanes that cross the road (e.g. on an intersection) // are also labeled with this type. // diff --git a/osi_object.proto b/osi_object.proto index fa879188a..3fcc79fe0 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -252,7 +252,7 @@ message StationaryObject // MATERIAL_STONE = 6; - // Glas structure. + // Glass structure. // MATERIAL_GLAS = 7; @@ -609,7 +609,7 @@ message MovingObject repeated WheelData wheel_data = 7; // Angle of the steering wheel. - // Zero means the steering wheel is in its center postion, a positive value + // Zero means the steering wheel is in its center position, a positive value // means the steering wheel is turned to the left and a negative value // means the steering wheel is turned to the right of the center position. // @@ -752,7 +752,7 @@ message MovingObject // TYPE_MEDIUM_CAR in OSI. // // \note Vehicle type classification is a complex area and there are no - // universally recognised standards. As such, the boundaries between some of the + // universally recognized standards. As such, the boundaries between some of the // OSI vehicle types are not well-defined. It is left to the implementor to // decide how to distinguish between them and agree that with any applications which // make use of that specific interface instance. For example, how to distinguish @@ -782,7 +782,7 @@ message MovingObject // Vehicle is a medium car. // - // Definition: Hatchback or sedan with lenght between 4.5 and 5 m. + // Definition: Hatchback or sedan with length between 4.5 and 5 m. // TYPE_MEDIUM_CAR = 4; diff --git a/osi_referenceline.proto b/osi_referenceline.proto index 72fa312a8..f4c246371 100644 --- a/osi_referenceline.proto +++ b/osi_referenceline.proto @@ -53,7 +53,7 @@ message ReferenceLine // ReferenceLine is a polyline, where the coordinates of points are // calculated by projection onto the nearest point on the line. // - // \attention DEPRECATED: Due to the shortcomings documenten below, this + // \attention DEPRECATED: Due to the shortcomings documented below, this // type will be removed in 4.0.0. // TYPE_POLYLINE = 0; diff --git a/osi_sensorview.proto b/osi_sensorview.proto index 863a5c2bb..26f0d5883 100644 --- a/osi_sensorview.proto +++ b/osi_sensorview.proto @@ -301,7 +301,7 @@ message LidarSensorView // normal to surface angle. // - // The normal of the transmitted beam to the object, roadmarking etc + // The normal of the transmitted beam to the object, road marking etc // encounter. \note data is in Lidar coordinate system // // Unit: unit vector @@ -309,7 +309,7 @@ message LidarSensorView optional Vector3d normal_to_surface = 5; // ID of the detected object this reflection is associated to. - // can be used for raytracing debug + // can be used for ray tracing debug // // \note ID = MAX(uint64) indicates no reference to an object. optional Identifier object_id = 6; diff --git a/osi_streamingupdate.proto b/osi_streamingupdate.proto index f3006fee9..ceafb05cd 100644 --- a/osi_streamingupdate.proto +++ b/osi_streamingupdate.proto @@ -23,7 +23,7 @@ package osi3; // // \note The receiver of partial streaming update messages can only rely on the // most up-to-date information at the corresponding timestamp. E.g. omitting -// objects does not indicate static behaviour but it may be sufficient for the +// objects does not indicate static behavior but it may be sufficient for the // use case to update certain objects at a later point in time. // message StreamingUpdate diff --git a/osi_trafficcommand.proto b/osi_trafficcommand.proto index 5baef7731..d2861475a 100644 --- a/osi_trafficcommand.proto +++ b/osi_trafficcommand.proto @@ -67,7 +67,7 @@ message TrafficCommand // // \note This message is notionally a multiple choice selection, that is, only // certain combinations of atomic traffic actions shall be transmitted within -// certain time intervals, for example, for plausibity reasons. The restrictions +// certain time intervals, for example, for plausibility reasons. The restrictions // regarding that are not part of this message, yet are seen as a task of the // scenario description, for example, OpenSCENARIO. // @@ -197,19 +197,19 @@ message TrafficAction // message DynamicConstraints { - // Maximum acceleration the distance contoller is allowed to use for keeping distance. + // Maximum acceleration the distance controller is allowed to use for keeping distance. // // Unit: m/s^2 // optional double max_acceleration = 1; - // Maximum deceleration the distance contoller is allowed to use for keeping distance. + // Maximum deceleration the distance controller is allowed to use for keeping distance. // // Unit: m/s^2 // optional double max_deceleration = 2; - // Maximum speed the distance contoller is allowed to use for keeping distance. + // Maximum speed the distance controller is allowed to use for keeping distance. // // Unit: m/s // @@ -465,7 +465,7 @@ message TrafficAction // \brief End actions action. // - // This action tells a traffic participant that the exection of the + // This action tells a traffic participant that the execution of the // referenced actions is regarded as successfully performed. The // termination of the referenced actions is allowed to be performed // gracefully. @@ -552,11 +552,11 @@ message TrafficAction // participant receiving this action and the reference traffic // participant. // True: Longitudinal distance is measured using the distance between closest bounding box points. - // False: Longitudinal distance is mesasured using the distance between the center of each object's bounding box. + // False: Longitudinal distance is measured using the distance between the center of each object's bounding box. // optional bool freespace = 4; - // Define wheather the traffic participant should only reach the distance once + // Define whether the traffic participant should only reach the distance once // or if it should also keep the distance after having reached it. // True: the traffic participant shall approach the reference participant // and follow with the distance specified until the action is aborted (communicate with AbortActionsAction). @@ -565,7 +565,7 @@ message TrafficAction // optional bool follow = 5; - // Parameter that assings either unlimited dynamics (if omitted) + // Parameter that assigns either unlimited dynamics (if omitted) // or limited maxAcceleration/maxDeceleration/maxSpeed to the action. // optional DynamicConstraints dynamic_constraints = 6; @@ -605,11 +605,11 @@ message TrafficAction // participant receiving this action and the reference traffic // participant. // True: Lateral distance is measured using the distance between closest bounding box points. - // False: Lateral distance is mesasured using the distance between the center of each object's bounding box. + // False: Lateral distance is measured using the distance between the center of each object's bounding box. // optional bool freespace = 4; - // Define wheather the traffic participant should only reach the distance once + // Define whether the traffic participant should only reach the distance once // or if it should also keep the distance after having reached it. // True: the traffic participant shall approach the reference participant // and follow with the distance specified until the action is aborted (communicate with AbortActionsAction). @@ -618,7 +618,7 @@ message TrafficAction // optional bool follow = 5; - // Parameter that assings either unlimited dynamics (if omitted) + // Parameter that assigns either unlimited dynamics (if omitted) // or limited maxAcceleration/maxDeceleration/maxSpeed to the action. // optional DynamicConstraints dynamic_constraints = 6; diff --git a/osi_trafficlight.proto b/osi_trafficlight.proto index fe90fd4b4..6dfba2929 100644 --- a/osi_trafficlight.proto +++ b/osi_trafficlight.proto @@ -124,7 +124,7 @@ message TrafficLight // Boolean flag to indicate that the traffic light is taken out of service. // This can be achieved by visibly crossing the light, covering it completely - // or swiching the traffic light off. + // or switching the traffic light off. // optional bool is_out_of_service = 6; diff --git a/osi_trafficupdate.proto b/osi_trafficupdate.proto index 45a87d6fb..277766121 100644 --- a/osi_trafficupdate.proto +++ b/osi_trafficupdate.proto @@ -20,7 +20,7 @@ package osi3; // information is provided as a MovingObject. Certain fields of this // sub-message are not required to be set and will be ignored by the // simulation environment, because they are static information. -// Instead of creating a seperate message type for only the non-static +// Instead of creating a separate message type for only the non-static // information, re-use existing message. // message TrafficUpdate From 54064e103bbe1a7acdd58a097ce4a3a060992f15 Mon Sep 17 00:00:00 2001 From: ClemensLinnhoff Date: Wed, 14 Feb 2024 16:30:09 +0100 Subject: [PATCH 02/13] Add spellchecking action Signed-off-by: ClemensLinnhoff --- .github/.pyspelling.yml | 19 +++ .github/spelling_custom_words_en_US.txt | 203 ++++++++++++++++++++++++ .github/workflows/protobuf.yml | 10 ++ 3 files changed, 232 insertions(+) create mode 100644 .github/.pyspelling.yml create mode 100644 .github/spelling_custom_words_en_US.txt diff --git a/.github/.pyspelling.yml b/.github/.pyspelling.yml new file mode 100644 index 000000000..5670d5b6e --- /dev/null +++ b/.github/.pyspelling.yml @@ -0,0 +1,19 @@ +matrix: +- name: Proto + aspell: + lang: en + d: en_US + camel-case: true + sources: + - ./*.proto + dictionary: + wordlists: + - .github/spelling_custom_words_en_US.txt + output: build/dictionary/proto.dic + pipeline: + - pyspelling.filters.context: + context_visible_first: false + escapes: '\\[\\`~]' + delimiters: + - open: '(?s)^(?P *\/\/)' + close: '^(?P=open)$' diff --git a/.github/spelling_custom_words_en_US.txt b/.github/spelling_custom_words_en_US.txt new file mode 100644 index 000000000..103df1e0d --- /dev/null +++ b/.github/spelling_custom_words_en_US.txt @@ -0,0 +1,203 @@ +adas +agbl +al +Anglais +arg +asam +atsc +bbcenter +Beauce +Begriffe +Beleuchtung +Bereich +bgbl +bggr +Biblio +bool +boolean +Botts +br +britannica +candela +cartesian +cd +centerline +Cianciaruso +CIE +cie +clothoid +cmyk +coord +courtneystrong +Crabb +css +customizable +dBm +de +delineator +der +detections +Deutsches +discretized +dms +doi +doppler +drivable +dt +easting +edn +edu +egm +eilvterm +Einheiten +Elsevier +endcode +endlink +endrules +engl +enum +enums +eoas +epochconverter +et +euler +executability +Fahrverhalten +Fahrzeugdynamik +fcm +fmu +Formelsammlung +Formelzeichen +fov +fp +Frei +fuer +fullreports +Gedeon +Geospatial +github +GNSS +gridded +Groessen +GroundTruthInit +Hagen +href +hsv +htm +html +http +https +hypot +ietf +illuminance +ilv +im +incrementing +Institut +Intl +io +iso +itu +jpg +kfz +Lambertian +Laperriere +latencies +Lichttechnik +lidar +lidar's +lm +lte +luminance +luv +lx +Meteorologische +metoffice +milliwatt +nd +Nicolaus +noao +Normung +northing +ns +num +oktas +onlinepubs +opengroup +optischen +Ordnung +osi +osmp +parametrization +Paulat +pdf +png +polyline +POSIX +powertrain +pre +priori +proj +proto +protobuf +pubrec +px +QLTkit +rbd +rcs +README +rfc +rgb +rgbir +rggb +rmse +Rosenberger +SAE +sae +Schlupf +SEMITRACTOR +signalway +sl +snr +sr +sslnet +steradian +Strahlungsphysik +Strassenfahrzeuge +Strassenverkehrs +strassenverkehrsordnung +StVO +StVZO +subtype +svg +Tait +tf +tf +th +Thibodeau +todo +trilateration +tupel +ubc +ubc +uint +uk +und +unix +uri +vda +vzkat +wa +Wernli +wgs +wikipedia +wp +wsdot +www +www +xrat +xy +xyz +xz +Zeitschrift +Zou \ No newline at end of file diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml index da70a5db3..8bd4c37cc 100644 --- a/.github/workflows/protobuf.yml +++ b/.github/workflows/protobuf.yml @@ -11,6 +11,16 @@ on: branches: [ master ] jobs: + spellcheck: + name: Spellcheck + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: rojopolis/spellcheck-github-actions@0.36.0 + name: Spellcheck + with: + config_path: .github/.pyspelling.yml + build-proto2-linux64: name: Build Proto2 Linux 64 From 2c30254c2446f5c1e1ea68710d0234965fab6168 Mon Sep 17 00:00:00 2001 From: ClemensLinnhoff Date: Wed, 14 Feb 2024 16:58:30 +0100 Subject: [PATCH 03/13] Add German words for traffic signs Signed-off-by: ClemensLinnhoff --- .github/spelling_custom_words_en_US.txt | 178 +++++++++++++++++++++++- 1 file changed, 177 insertions(+), 1 deletion(-) diff --git a/.github/spelling_custom_words_en_US.txt b/.github/spelling_custom_words_en_US.txt index 103df1e0d..97baf1426 100644 --- a/.github/spelling_custom_words_en_US.txt +++ b/.github/spelling_custom_words_en_US.txt @@ -1,41 +1,80 @@ +abc +absteigen adas +ADR agbl al +Allgemeine +Altenheim +Anfang Anglais +anlage +Anlieger arg asam atsc +au +auch +auf +auml +Ausfahrt +Baugebiet +Baustelle +Baustellen +Baustellenausfahrt bbcenter Beauce +befahrbar +befahren Begriffe +bei Beleuchtung +Benrath Bereich +berholt +Besondere +Bewohner bgbl bggr Biblio +bicyclesback +bildgebendes bool boolean Botts +bp br britannica candela cartesian +Cattles +cattles cd +cellpadding +cellspacing centerline +chen Cianciaruso CIE cie clothoid cmyk +CNG +colspan +CONNECTINGRAMP +contraints coord courtneystrong Crabb css customizable +daytimes dBm de delineator +dem der +des detections Deutsches discretized @@ -44,44 +83,81 @@ doi doppler drivable dt +Duesseldorf +Durchgangsverkehr +dvr easting +EBIKES edn edu egm eilvterm +ein Einheiten +Elektrotechnik +ellpadding Elsevier endcode +Ende +Endeninch endlink endrules engl +enschaden enum enums eoas epochconverter +erlaubt et euler +EV executability +Fachthemen +Fahrbahn +Fahrbahnbelag +Fahrbahnmarkierung Fahrverhalten Fahrzeugdynamik +Fak fcm +fehlende +Feiertagen fmu Formelsammlung Formelzeichen fov fp Frei +frei fuer fullreports +ge +geb Gedeon +Gefahrenzeichen +gekennzeichneten +gekennzeichneter +Gelegenheitsverkehr Geospatial +gesetze github +glichkeit GNSS gridded Groessen GroundTruthInit +gulleys +haben +Hafengebiet Hagen +halten +hier +Hochwasser href +hrend +hrenpflichtig +hrung hsv htm html @@ -92,76 +168,142 @@ ietf illuminance ilv im +Immission incrementing +Industriegebiet +innerhalb Institut Intl io +IRI iso itu jpg +Karamihas +Karlsruhe +keine kfz +Krankenhaus +Kreis +kreuzt +Kuppe +Ladevorgangs +Ladezone Lambertian Laperriere latencies Lichttechnik lidar lidar's +Linksabbieger lm +lspur lte luminance luv lx +Mainz Meteorologische metoffice milliwatt +mit +Modellierung +MULTITRACK nd +nde +ndert +ne +NEBEL +Nebenstrecke +neuer +nicht Nicolaus noao +NONDRIVING Normung northing +Nr ns num +Nur +nur +oder +OFFRAMP oktas +ONEWAY onlinepubs +ONRAMP opengroup optischen Ordnung osi osmp +Ouml +ouml parametrization +Parkausweis +Parken +Parkfl +Parkschein +Parkst Paulat pdf png +Polizeikontrolle polyline +positionally POSIX powertrain pre +preannouncement priori proj proto protobuf +publikationen pubrec px QLTkit +Rauch rbd rcs +rdquo README +Rei rfc +rfen rgb rgbir rggb +Richtzeichen +rmschutz rmse +Rollsplitt Rosenberger +Sa SAE sae +samstags +Schienenfahrzeuge +Schleudergefahr Schlupf +Schulbus +Schule +Schulweg +Seitenstreifen SEMITRACTOR signalway sl snr +Sonn +specular +Sprengarbeiten +Spurrinnen sr sslnet +Steinburg steradian +Stra Strahlungsphysik Strassenfahrzeuge Strassenverkehrs @@ -169,35 +311,69 @@ strassenverkehrsordnung StVO StVZO subtype +subtypes svg +szlig Tait +td tf tf th Thibodeau +tml todo trilateration +tt tupel ubc ubc uint uk +umen +umich +umtri und +Unfall +UNGATED +Universitaet unix uri +uuml vda +verkehr +Verkehrseinrichtungen +Verkehrsf +Verkehrstechnik +verkehrszeichen +verschluss +Verschmutzte +Vorfahrt +Vorschriftzeichen +Vorweg +vz vzkat +VzKat wa +Welle +Wellenausbreitung +Wendem +werden +werktags Wernli wgs +Wiesbaden wikipedia +Wilster wp wsdot www www xrat +XXXX xy xyz xz Zeitschrift -Zou \ No newline at end of file +Zou +Zufahrt +Zuflussregelung From c2f15096bb5ce3476f661af7530ccdfc9662acea Mon Sep 17 00:00:00 2001 From: ClemensLinnhoff Date: Wed, 14 Feb 2024 17:23:33 +0100 Subject: [PATCH 04/13] More spelling fixes Signed-off-by: ClemensLinnhoff --- .github/spelling_custom_words_en_US.txt | 14 ++++++++++++-- osi_common.proto | 2 +- osi_environment.proto | 6 +++--- osi_featuredata.proto | 8 ++++---- osi_hostvehicledata.proto | 2 +- osi_lane.proto | 2 +- osi_logicaldetectiondata.proto | 2 +- osi_logicallane.proto | 2 +- osi_object.proto | 10 +++++----- osi_referenceline.proto | 10 +++++----- osi_roadmarking.proto | 2 +- osi_sensorviewconfiguration.proto | 2 +- osi_trafficcommand.proto | 6 +++--- osi_trafficsign.proto | 22 +++++++++++----------- 14 files changed, 50 insertions(+), 40 deletions(-) diff --git a/.github/spelling_custom_words_en_US.txt b/.github/spelling_custom_words_en_US.txt index 97baf1426..7f7f5fa70 100644 --- a/.github/spelling_custom_words_en_US.txt +++ b/.github/spelling_custom_words_en_US.txt @@ -28,13 +28,13 @@ befahrbar befahren Begriffe bei -Beleuchtung +beleuchtung Benrath Bereich berholt Besondere Bewohner -bgbl +BGBl bggr Biblio bicyclesback @@ -68,6 +68,7 @@ courtneystrong Crabb css customizable +dataset daytimes dBm de @@ -97,6 +98,7 @@ Einheiten Elektrotechnik ellpadding Elsevier +Encyclopaedia endcode Ende Endeninch @@ -173,6 +175,7 @@ incrementing Industriegebiet innerhalb Institut +interoperable Intl io IRI @@ -234,6 +237,8 @@ ONEWAY onlinepubs ONRAMP opengroup +opendrive +openscenario optischen Ordnung osi @@ -241,6 +246,7 @@ osmp Ouml ouml parametrization +parametrize Parkausweis Parken Parkfl @@ -264,6 +270,7 @@ publikationen pubrec px QLTkit +radiocommunication Rauch rbd rcs @@ -309,12 +316,15 @@ Strassenfahrzeuge Strassenverkehrs strassenverkehrsordnung StVO +stvo StVZO subtype subtypes +superelevation svg szlig Tait +TBD td tf tf diff --git a/osi_common.proto b/osi_common.proto index 74e148c3f..b0e0bcd6c 100644 --- a/osi_common.proto +++ b/osi_common.proto @@ -204,7 +204,7 @@ message Orientation3d // message Identifier { - // The identifier's value. + // The value of the identifier. // // \rules // is_greater_than_or_equal_to: 0 diff --git a/osi_environment.proto b/osi_environment.proto index fb77438fc..43db20453 100644 --- a/osi_environment.proto +++ b/osi_environment.proto @@ -40,7 +40,7 @@ message EnvironmentalConditions // sorted by languages](https://www.epochconverter.com/#code). // // \par References: - // [1] ITU Radiocommunication Assembly. (2002). Recommondation ITU-R TF.460-6 Standard-frequency and time-signal emissions. (Rec. ITU-R TF.460-6). Retrieved January 25, 2020, from http://www.itu.int/dms_pubrec/itu-r/rec/tf/R-REC-TF.460-6-200202-I!!PDF-E.pdf \n + // [1] ITU Radiocommunication Assembly. (2002). Recommendation ITU-R TF.460-6 Standard-frequency and time-signal emissions. (Rec. ITU-R TF.460-6). Retrieved January 25, 2020, from http://www.itu.int/dms_pubrec/itu-r/rec/tf/R-REC-TF.460-6-200202-I!!PDF-E.pdf \n // [2] The Open Group. (2018). POSIX.1-2017 The Open Group Base Specifications Issue 7, 2018 edition. IEEE Std 1003.1-2017 (Revision of IEEE Std 1003.1-2008). Retrieved January 25, 2020, from https://pubs.opengroup.org/onlinepubs/9699919799/xrat/contents.html // optional int64 unix_timestamp = 8; @@ -176,7 +176,7 @@ message EnvironmentalConditions // \par References: // [1] Shepard, F. D. (1996). Reduced visibility due to fog on the highway. Transportation Research Board, National Research Council (Ed.). National Academy Press. Washington, D.C., USA. ISBN 0-309-06006-0. \n // [2] Strassenverkehrs-Ordnung (StVO) as of dated March 06, 2013 (BGBl. I S. 367), lastly changed by article 4a of the order from June 06, 2019 (BGBl. I S. 756). \n - // [3] stvo.de. (2013, April 01). StVO Par. 17 Beleuchtung. Retrieved January 25, 2020, from https://www.stvo.de/strassenverkehrsordnung/101-17-beleuchtung \n + // [3] StVO.de. (2013, April 01). StVO Par. 17 Beleuchtung. Retrieved January 25, 2020, from https://www.StVO.de/strassenverkehrsordnung/101-17-beleuchtung \n // [4] Meteorological Office UK. (2020). Homepage of the Meteorological Office - How we measure visibility. Retrieved January 25, 2020, from http://www.metoffice.gov.uk/guide/weather/observations-guide/how-we-measure-visibility // enum Fog @@ -358,7 +358,7 @@ message EnvironmentalConditions // 8 oktas means that the sky is completely covered with clouds and no sky blue can be recognized. // // \par References: - // [1] CIE engl. International Commission on Illumination. (2020). CIE S017:2020 ILV: Intl. Lighitng Vocabulary, 2nd edn.. Retrieved March 8, 2022, from https://cie.co.at/eilvterm/17-29-116 \n + // [1] CIE engl. International Commission on Illumination. (2020). CIE S017:2020 ILV: Intl. Lighting Vocabulary, 2nd edn.. Retrieved March 8, 2022, from https://cie.co.at/eilvterm/17-29-116 \n // [2] UBC The University of British Columbia. (2018). ATSC 113 Weather for Sailing, Flying & Snow Sports. Retrieved March 8, 2022, from https://www.eoas.ubc.ca/courses/atsc113/flying/met_concepts/01-met_concepts/01c-cloud_coverage/index.html // enum FractionalCloudCover diff --git a/osi_featuredata.proto b/osi_featuredata.proto index c4079fe21..5856e1f87 100644 --- a/osi_featuredata.proto +++ b/osi_featuredata.proto @@ -222,7 +222,7 @@ message SensorDetectionHeader // EXTENDED_QUALIFIER_INPUT_NOT_AVAILABLE = 9; - // Internal reason (e.g. an internal HW or SW error has occurred). + // Internal reason (e.g. an internal hardware or software error has occurred). // EXTENDED_QUALIFIER_INTERNAL_REASON = 10; @@ -459,7 +459,7 @@ message LidarDetection // \endrules // // \par Reference: - // [1] Rosenberger, P., Holder, M.F., Cianciaruso, N. et al. (2020). Sequential lidar sensor system simulation: a modular approach for simulation-based safety validation of automated driving Automot. Engine Technol. 5, Fig 7, Fig 8. Retrieved May 10, 2021, from https://doi.org/10.1007/s41104-020-00066-x + // [1] Rosenberger, P., Holder, M.F., Cianciaruso, N. et al. (2020). Sequential lidar sensor system simulation: a modular approach for simulation-based safety validation of automated driving Automotive Engine Technology 5, Fig 7, Fig 8. Retrieved May 10, 2021, from https://doi.org/10.1007/s41104-020-00066-x // optional double echo_pulse_width = 11; @@ -509,7 +509,7 @@ message UltrasonicDetectionSpecificHeader // // \image html OSI_USSensor.svg // -// \note Direct detections lie on circles with the sending sensor as centre. +// \note Direct detections lie on circles with the sending sensor as center. // message UltrasonicDetectionData { @@ -544,7 +544,7 @@ message UltrasonicDetectionData // // \image html OSI_USSensor_direct.svg // -// \note Direct detections lie on circles with the sensor as centre. +// \note Direct detections lie on circles with the sensor as center. // message UltrasonicDetection { diff --git a/osi_hostvehicledata.proto b/osi_hostvehicledata.proto index 18762a14f..9594e8e68 100644 --- a/osi_hostvehicledata.proto +++ b/osi_hostvehicledata.proto @@ -568,7 +568,7 @@ message HostVehicleData // STATE_OTHER = 1; - // The function has errored in some way that renders it ineffective. + // The function has thrown an error in some way that renders it ineffective. // STATE_ERRORED = 2; diff --git a/osi_lane.proto b/osi_lane.proto index 975a108b2..2ac6b0094 100644 --- a/osi_lane.proto +++ b/osi_lane.proto @@ -189,7 +189,7 @@ message Lane // Indicates that the host vehicle travels on this particular lane. // The host vehicle may travel on more than one lane at once. This does - // also apply for the \c CanditateLane in the \c DetectedLane . + // also apply for the \c CandidateLane in the \c DetectedLane . // optional bool is_host_vehicle_lane = 2; diff --git a/osi_logicaldetectiondata.proto b/osi_logicaldetectiondata.proto index 353abd407..fb7d09f11 100644 --- a/osi_logicaldetectiondata.proto +++ b/osi_logicaldetectiondata.proto @@ -223,7 +223,7 @@ message LogicalDetection // \endrules // // \par Reference: - // [1] Rosenberger, P., Holder, M.F., Cianciaruso, N. et al. (2020). Sequential lidar sensor system simulation: a modular approach for simulation-based safety validation of automated driving Automot. Engine Technol. 5, Fig 7, Fig 8. Retrieved May 10, 2021, from https://doi.org/10.1007/s41104-020-00066-x + // [1] Rosenberger, P., Holder, M.F., Cianciaruso, N. et al. (2020). Sequential lidar sensor system simulation: a modular approach for simulation-based safety validation of automated driving Automotive Engine Technology 5, Fig 7, Fig 8. Retrieved May 10, 2021, from https://doi.org/10.1007/s41104-020-00066-x // optional double echo_pulse_width = 12; } diff --git a/osi_logicallane.proto b/osi_logicallane.proto index 35f58b51d..e55437011 100644 --- a/osi_logicallane.proto +++ b/osi_logicallane.proto @@ -590,7 +590,7 @@ message LogicalLane // // Definition of available lane types. // - // This is mostly aligned with OpenDRIVE, except that lane types modelling + // This is mostly aligned with OpenDRIVE, except that lane types modeling // access restrictions (e.g. "taxi") are not made available here. These are // already deprecated in OpenDRIVE. To support this, access restrictions // should be added later, in alignment with OpenDRIVE. diff --git a/osi_object.proto b/osi_object.proto index 3fcc79fe0..cf59d6bc7 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -48,7 +48,7 @@ message StationaryObject // // For example, to reference an object defined in an OpenDRIVE map // the items should be set as follows: - // * reference = URI to map, can remain empty if identical with definiton + // * reference = URI to map, can remain empty if identical with definition // in \c GroundTruth::map_reference // * type = "net.asam.opendrive" // * identifier[0] = "object" for t_road_objects_object and @@ -690,7 +690,7 @@ message MovingObject // optional string model_reference = 9; - // The value describes the kinetic friction of the tyre's contact point. + // The value describes the kinetic friction of the tire's contact point. // If different friction coefficients due to more than one contact points are available, // this value contains the average. // @@ -746,14 +746,14 @@ message MovingObject // other OpenX standards (in particular, OpenScenario 1.x and 2.x, and OpenLabel). // This is primarily for historical reasons. Where a single type from a // different standard can map to multiple OSI types it is left up to the - // discretion of the OSI implementor how that mapping is achieved. For example, + // discretion of the OSI implementer how that mapping is achieved. For example, // a simulator may use the dimensions of a provided 3d model of a vehicle with type // "car" in OpenScenario, to determine whether it should be a TYPE_SMALL_CAR or // TYPE_MEDIUM_CAR in OSI. // // \note Vehicle type classification is a complex area and there are no // universally recognized standards. As such, the boundaries between some of the - // OSI vehicle types are not well-defined. It is left to the implementor to + // OSI vehicle types are not well-defined. It is left to the implementer to // decide how to distinguish between them and agree that with any applications which // make use of that specific interface instance. For example, how to distinguish // between a HEAVY_TRUCK and a DELIVERY_VAN, or a TRAILER and a SEMITRAILER. @@ -853,7 +853,7 @@ message MovingObject // TYPE_WHEELCHAIR = 15; - // Vehicle is a stand-up or kickboard scooter, including + // Vehicle is a stand-up scooter, including // motorized versions. // TYPE_STANDUP_SCOOTER = 17; diff --git a/osi_referenceline.proto b/osi_referenceline.proto index f4c246371..e49faac7d 100644 --- a/osi_referenceline.proto +++ b/osi_referenceline.proto @@ -158,12 +158,12 @@ message ReferenceLine // point on the polyline. The resulting ST coordinate uniquely maps back // to \c P1. // - \c P2 has multiple points "nearest points" on the polyline. - // As can be seen here, two ST coordinates map to \c P2 (red and grey + // As can be seen here, two ST coordinates map to \c P2 (red and gray // dotted line). Following the rules above, the one with the smallest S // value is chosen (the red dotted line). // - \c P3 has a unique "nearest point" on the polyline. However, multiple // points map to the same ST coordinate as that of \c P3, e.g. \c P4 - // (drawn in grey). + // (drawn in gray). // - Finally, \c P5 shows how the reference line is extended infinitely for // points that are "outside" the reference line. // @@ -269,10 +269,10 @@ message ReferenceLine // in OSI. There are a few difficulties with this: // - The T coordinate is nearly the same as for OpenDRIVE, but // unfortunately not perfectly. In OpenDRIVE, if the road is tilted using - // superElevation, then the t coordinate system is tilted along, so the T + // superelevation, then the t coordinate system is tilted along, so the T // coordinate is no longer calculated in the XY plane (as proposed for - // OSI). It doesn't seem feasable to implement the same tilting for OSI, - // so simulation tools will have to consider superElevation and convert + // OSI). It doesn't seem feasible to implement the same tilting for OSI, + // so simulation tools will have to consider superelevation and convert // the T coordinate accordingly: t_OSI = t_OpenDRIVE * // cos(alpha), where alpha is the superelevation angle. // - The angle will not be perfectly the same, due to the use of line diff --git a/osi_roadmarking.proto b/osi_roadmarking.proto index f002f9bb5..ea1b85912 100644 --- a/osi_roadmarking.proto +++ b/osi_roadmarking.proto @@ -67,7 +67,7 @@ message RoadMarking // // For example, to reference a signal defined in an OpenDRIVE map // the items should be set as follows: - // * reference = URI to map, can remain empty if identical with definiton + // * reference = URI to map, can remain empty if identical with definition // in \c GroundTruth::map_reference // * type = "net.asam.opendrive" // * identifier[0] = id of t_road_signals_signal diff --git a/osi_sensorviewconfiguration.proto b/osi_sensorviewconfiguration.proto index 1419c9312..4601d1bc6 100644 --- a/osi_sensorviewconfiguration.proto +++ b/osi_sensorviewconfiguration.proto @@ -184,7 +184,7 @@ message SensorViewConfiguration // update to the sensor input should happen at 0.048s, or 0.018s // after simulation start. This convention is needed to ensure // stable phase position of the offset in the case of changing - // simulation start times, e.g. for partial resimulation. + // simulation start times, e.g. for partial re-simulation. // // Unit: s optional Timestamp update_cycle_offset = 9; diff --git a/osi_trafficcommand.proto b/osi_trafficcommand.proto index d2861475a..61c62a9b6 100644 --- a/osi_trafficcommand.proto +++ b/osi_trafficcommand.proto @@ -77,7 +77,7 @@ message TrafficCommand // model that certain actions must or shall be terminated, there are // explicit actions nested inside this message (AbortActionsAction, // EndActionsAction), which hold a reference to the respective actions. -// Futhermore, there exists a \c TrafficCommandUpdate message for the +// Furthermore, there exists a \c TrafficCommandUpdate message for the // traffic participant to report back on potentially dismissed actions. // message TrafficAction @@ -524,7 +524,7 @@ message TrafficAction // relative to a target traffic participant. The longitudinal distance is defined as the distance // along the centerline of the lane, on which the (host) traffic participant is currently located. // The interpolation strategy between centerline points for calculating - // that distance along the centerline is open to the traffic participant modeller. + // that distance along the centerline is open to the traffic participant modeler. // // \note This action is aligned with LongitudinalDistanceAction of OpenSCENARIO 1.0 // defining the reference traffic participant and the distance. @@ -577,7 +577,7 @@ message TrafficAction // a target traffic participant. The lateral distance is defined along an imaginative perpendicular line // with respect to the centerline of the current (host) traffic participant's lane. // The interpolation strategy between centerline points for calculating that distance along the imaginative - // perpendicular line is open to the traffic participant modeller. + // perpendicular line is open to the traffic participant modeler. // // \note This action is aligned with LateralDistanceAction of OpenSCENARIO 1.0 // defining the reference traffic participant and the distance. diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index 11e600d4d..fa3a0e4d3 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -3447,7 +3447,7 @@ message TrafficSign // --> // // - // StVO 353 - Valid only until october 2022. + // StVO 353 - Valid only until October 2022. // // // @@ -3817,7 +3817,7 @@ message TrafficSign // --> // // - // StVO 380 - Valid only until october 2022. + // StVO 380 - Valid only until October 2022. // // // @@ -3836,7 +3836,7 @@ message TrafficSign // --> // // - // StVO 381 - Valid only until october 2022 + // StVO 381 - Valid only until October 2022 // // // @@ -3923,7 +3923,7 @@ message TrafficSign // --> // // - // StVO 388 - Valid only until october 2022 + // StVO 388 - Valid only until October 2022 // // // @@ -3940,7 +3940,7 @@ message TrafficSign // --> // // - // StVO 389 - Valid only until october 2022 + // StVO 389 - Valid only until October 2022 // // // @@ -5374,7 +5374,7 @@ message TrafficSign // // // - // \note Additional traffic signs are modelled as separate main + // \note Additional traffic signs are modeled as separate main // signs. // TYPE_MOBILE_LANE_CLOSURE = 139; @@ -6761,7 +6761,7 @@ message TrafficSign // [\c rules above](\ref TYPE_TIME). //
// See also: [\c Two time ranges](\ref StVO_1040-31), - // [\c Working days except saturdays](\ref StVO_1042-38). + // [\c Working days except Saturdays](\ref StVO_1042-38). // // // @@ -6790,7 +6790,7 @@ message TrafficSign // ”werktags außer samstags” // // - // Working days except saturdays. + // Working days except Saturdays. // // // @@ -8198,7 +8198,7 @@ message TrafficSign // \c #ACTOR_BUSES // // - // Except buses in ocasional service. + // Except buses in occasional service. //
// Set \c TrafficSignValue::text as "im Gelegenheitsverkehr". // @@ -9454,7 +9454,7 @@ message TrafficSign // DIRECTION_DIRECT_135_DEG_LEFT = 9; - // A straight arrow pointing oposite to the direction of + // A straight arrow pointing opposite to the direction of // driving. // DIRECTION_DIRECT_180_DEG = 10; @@ -9540,7 +9540,7 @@ message TrafficSign DIRECTION_CIRCLE_135_DEG_LEFT = 25; // An arrow that includes a fraction of a circle and points - // in the oposite to the direction of driving. Can be used + // in the opposite to the direction of driving. Can be used // in detours in roundabouts. // DIRECTION_CIRCLE_180_DEG = 26; From 619c82070fbf3b0ce841de7995b3855f98996b03 Mon Sep 17 00:00:00 2001 From: ClemensLinnhoff Date: Wed, 14 Feb 2024 17:45:52 +0100 Subject: [PATCH 05/13] Revert svto correction in url Signed-off-by: ClemensLinnhoff --- osi_environment.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osi_environment.proto b/osi_environment.proto index 43db20453..d5c252ebc 100644 --- a/osi_environment.proto +++ b/osi_environment.proto @@ -176,7 +176,7 @@ message EnvironmentalConditions // \par References: // [1] Shepard, F. D. (1996). Reduced visibility due to fog on the highway. Transportation Research Board, National Research Council (Ed.). National Academy Press. Washington, D.C., USA. ISBN 0-309-06006-0. \n // [2] Strassenverkehrs-Ordnung (StVO) as of dated March 06, 2013 (BGBl. I S. 367), lastly changed by article 4a of the order from June 06, 2019 (BGBl. I S. 756). \n - // [3] StVO.de. (2013, April 01). StVO Par. 17 Beleuchtung. Retrieved January 25, 2020, from https://www.StVO.de/strassenverkehrsordnung/101-17-beleuchtung \n + // [3] StVO.de. (2013, April 01). StVO Par. 17 Beleuchtung. Retrieved January 25, 2020, from https://www.stvo.de/strassenverkehrsordnung/101-17-beleuchtung \n // [4] Meteorological Office UK. (2020). Homepage of the Meteorological Office - How we measure visibility. Retrieved January 25, 2020, from http://www.metoffice.gov.uk/guide/weather/observations-guide/how-we-measure-visibility // enum Fog From 0236f6568f2c8447db4f00aa3d117c5023cbfa85 Mon Sep 17 00:00:00 2001 From: Clemens Linnhoff Date: Mon, 26 Feb 2024 10:12:59 +0100 Subject: [PATCH 06/13] Update osi_sensorview.proto Co-authored-by: Pierre R. Mai Signed-off-by: Clemens Linnhoff --- osi_sensorview.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osi_sensorview.proto b/osi_sensorview.proto index 26f0d5883..84e4cf4c3 100644 --- a/osi_sensorview.proto +++ b/osi_sensorview.proto @@ -301,7 +301,7 @@ message LidarSensorView // normal to surface angle. // - // The normal of the transmitted beam to the object, road marking etc + // The normal of the transmitted beam to the object, road marking, etc. // encounter. \note data is in Lidar coordinate system // // Unit: unit vector From 9171f90b16b856fe43b6ea902be8b94b43fce7d6 Mon Sep 17 00:00:00 2001 From: Clemens Linnhoff Date: Mon, 26 Feb 2024 10:13:27 +0100 Subject: [PATCH 07/13] Update osi_environment.proto Co-authored-by: Pierre R. Mai Signed-off-by: Clemens Linnhoff --- osi_environment.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osi_environment.proto b/osi_environment.proto index d5c252ebc..ae3c55011 100644 --- a/osi_environment.proto +++ b/osi_environment.proto @@ -176,7 +176,7 @@ message EnvironmentalConditions // \par References: // [1] Shepard, F. D. (1996). Reduced visibility due to fog on the highway. Transportation Research Board, National Research Council (Ed.). National Academy Press. Washington, D.C., USA. ISBN 0-309-06006-0. \n // [2] Strassenverkehrs-Ordnung (StVO) as of dated March 06, 2013 (BGBl. I S. 367), lastly changed by article 4a of the order from June 06, 2019 (BGBl. I S. 756). \n - // [3] StVO.de. (2013, April 01). StVO Par. 17 Beleuchtung. Retrieved January 25, 2020, from https://www.stvo.de/strassenverkehrsordnung/101-17-beleuchtung \n + // [3] stvo.de. (2013, April 01). StVO Par. 17 Beleuchtung. Retrieved January 25, 2020, from https://www.stvo.de/strassenverkehrsordnung/101-17-beleuchtung \n // [4] Meteorological Office UK. (2020). Homepage of the Meteorological Office - How we measure visibility. Retrieved January 25, 2020, from http://www.metoffice.gov.uk/guide/weather/observations-guide/how-we-measure-visibility // enum Fog From 0cf00c05ba77484d68baea5c7092f01826bbbd92 Mon Sep 17 00:00:00 2001 From: ClemensLinnhoff Date: Mon, 26 Feb 2024 10:17:55 +0100 Subject: [PATCH 08/13] Change FCW to forward collision warning Signed-off-by: ClemensLinnhoff --- osi_hostvehicledata.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osi_hostvehicledata.proto b/osi_hostvehicledata.proto index 9594e8e68..026de2a7e 100644 --- a/osi_hostvehicledata.proto +++ b/osi_hostvehicledata.proto @@ -584,7 +584,7 @@ message HostVehicleData STATE_AVAILABLE = 4; // The function is available but conditions have not caused it to be - // triggered, for example, no vehicles in front to trigger a FCW. + // triggered, for example, no vehicles in front to trigger a forward collision warning. // STATE_STANDBY = 5; From 78ac176d9efa5264707b6c40349e4db47bd8813e Mon Sep 17 00:00:00 2001 From: ClemensLinnhoff Date: Mon, 26 Feb 2024 10:19:54 +0100 Subject: [PATCH 09/13] Change grey to gray in comments Signed-off-by: ClemensLinnhoff --- osi_common.proto | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/osi_common.proto b/osi_common.proto index b0e0bcd6c..73c1f464c 100644 --- a/osi_common.proto +++ b/osi_common.proto @@ -673,7 +673,7 @@ message SpatialSignalStrength // message ColorDescription { - // Greyscale color model + // Grayscale color model // optional ColorGrey grey = 1; @@ -699,13 +699,13 @@ message ColorDescription } // -// \brief Greyscale color model +// \brief Grayscale color model // -// ColorGrey defines a greyscale. +// ColorGrey defines a grayscale. // message ColorGrey { - // Definition of a greyscale + // Definition of a grayscale // // Range: [0,1] // From 5608a4927d5a035d690c569db3386ddb343c4473 Mon Sep 17 00:00:00 2001 From: ClemensLinnhoff Date: Mon, 26 Feb 2024 10:20:30 +0100 Subject: [PATCH 10/13] Fixed another grey Signed-off-by: ClemensLinnhoff --- osi_featuredata.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osi_featuredata.proto b/osi_featuredata.proto index 5856e1f87..402869366 100644 --- a/osi_featuredata.proto +++ b/osi_featuredata.proto @@ -929,7 +929,7 @@ message CameraDetection // COLOR_BLACK = 2; - // Shape with grey color. + // Shape with gray color. // COLOR_GREY = 3; From 750ca988b04b5723e189a218866aa2c4745a0843 Mon Sep 17 00:00:00 2001 From: ClemensLinnhoff Date: Mon, 26 Feb 2024 10:24:23 +0100 Subject: [PATCH 11/13] Added grayscale to custom words Signed-off-by: ClemensLinnhoff --- .github/spelling_custom_words_en_US.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/spelling_custom_words_en_US.txt b/.github/spelling_custom_words_en_US.txt index 7f7f5fa70..9d00d4057 100644 --- a/.github/spelling_custom_words_en_US.txt +++ b/.github/spelling_custom_words_en_US.txt @@ -146,6 +146,7 @@ gesetze github glichkeit GNSS +grayscale gridded Groessen GroundTruthInit From 8a25677b8ccfb52acf04743a4d2fe3445b011fe9 Mon Sep 17 00:00:00 2001 From: ClemensLinnhoff Date: Mon, 26 Feb 2024 11:32:13 +0100 Subject: [PATCH 12/13] Added antecessor to custom word list Signed-off-by: ClemensLinnhoff --- .github/spelling_custom_words_en_US.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/spelling_custom_words_en_US.txt b/.github/spelling_custom_words_en_US.txt index 9d00d4057..a88e44be9 100644 --- a/.github/spelling_custom_words_en_US.txt +++ b/.github/spelling_custom_words_en_US.txt @@ -10,6 +10,7 @@ Anfang Anglais anlage Anlieger +antecessor arg asam atsc From 0f6d42401043886968e84799c0150148d3e7ecf4 Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Mon, 26 Feb 2024 12:37:37 +0100 Subject: [PATCH 13/13] Add aliases for typos in enum values Signed-off-by: Pierre R. Mai --- osi_featuredata.proto | 10 ++++++++++ osi_object.proto | 22 +++++++++++++++++++++- tests/test_invalid_enum.py | 6 ++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/osi_featuredata.proto b/osi_featuredata.proto index 402869366..c82c3c727 100644 --- a/osi_featuredata.proto +++ b/osi_featuredata.proto @@ -916,6 +916,10 @@ message CameraDetection // enum Color { + // Allow aliases in enum + // + option allow_alias = true; + // Color of the shape is unknown (must not be used in ground // truth). // @@ -931,6 +935,12 @@ message CameraDetection // Shape with gray color. // + COLOR_GRAY = 3; + + // Shape with gray color. + // + // \note Deprecated variant spelling of COLOR_GRAY + // COLOR_GREY = 3; // Shape with white color. diff --git a/osi_object.proto b/osi_object.proto index cf59d6bc7..a40873785 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -223,6 +223,10 @@ message StationaryObject // enum Material { + // Allow aliases in enum + // + option allow_alias = true; + // Type of the material is unknown (must not be used in ground // truth). // @@ -254,6 +258,12 @@ message StationaryObject // Glass structure. // + MATERIAL_GLASS = 7; + + // Glass structure. + // + // \note Deprecated variant spelling of MATERIAL_GLASS + // MATERIAL_GLAS = 7; // Mud structure. @@ -303,6 +313,10 @@ message StationaryObject // enum Color { + // Allow aliases in enum + // + option allow_alias = true; + // Color is unknown (must not be used in ground truth). // COLOR_UNKNOWN = 0; @@ -339,7 +353,13 @@ message StationaryObject // COLOR_BLACK = 8; - // GREY. + // GRAY. + // + COLOR_GRAY = 9; + + // GRAY. + // + // \note Deprecated variant spelling of COLOR_GRAY // COLOR_GREY = 9; diff --git a/tests/test_invalid_enum.py b/tests/test_invalid_enum.py index 01d9ff9e9..7e7823f0f 100644 --- a/tests/test_invalid_enum.py +++ b/tests/test_invalid_enum.py @@ -25,6 +25,9 @@ def test_correct_enum_name(self): if matchComment is not None: statement = line[: matchComment.start()] comment = line[matchComment.end() :] + elif re.search("option allow_alias", line): + statement = "" + comment = "" else: statement = line comment = "" @@ -123,6 +126,9 @@ def test_invalid_enum(self): if matchComment is not None: statement = line[: matchComment.start()] comment = line[matchComment.end() :] + elif re.search("option allow_alias", line): + statement = "" + comment = "" else: statement = line comment = ""