From 560469c9f9ec766c98eabb3d011451760059469c Mon Sep 17 00:00:00 2001 From: Thomas Sedlmayer Date: Fri, 22 Mar 2024 12:24:53 +0100 Subject: [PATCH 1/6] Add pyspelling html filter Signed-off-by: Thomas Sedlmayer --- .github/.pyspelling.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/.pyspelling.yml b/.github/.pyspelling.yml index 5670d5b6e..512d9a26d 100644 --- a/.github/.pyspelling.yml +++ b/.github/.pyspelling.yml @@ -17,3 +17,8 @@ matrix: delimiters: - open: '(?s)^(?P *\/\/)' close: '^(?P=open)$' + - pyspelling.filters.html: + comments: true + attributes: + - title + - alt From 213f4de4fc4b67b93de0262e8fd6005a2710fbb6 Mon Sep 17 00:00:00 2001 From: Thomas Sedlmayer Date: Mon, 25 Mar 2024 14:28:57 +0100 Subject: [PATCH 2/6] Update spellchecker whitelist Signed-off-by: Thomas Sedlmayer --- .github/spelling_custom_words_en_US.txt | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/spelling_custom_words_en_US.txt b/.github/spelling_custom_words_en_US.txt index 592d59468..af03471c5 100644 --- a/.github/spelling_custom_words_en_US.txt +++ b/.github/spelling_custom_words_en_US.txt @@ -20,6 +20,7 @@ auch auf auml Ausfahrt +außer Baugebiet Baustelle Baustellen @@ -89,6 +90,7 @@ dt Duesseldorf Durchgangsverkehr dvr +dürfen easting EBIKES edn @@ -127,6 +129,8 @@ Fak fcm fehlende Feiertagen +Flächen +flächen fmu Formelsammlung Formelzeichen @@ -138,6 +142,7 @@ fuer fullreports ge geb +gebührenpflichtig Gedeon Gefahrenzeichen gekennzeichneten @@ -145,6 +150,7 @@ gekennzeichneter Gelegenheitsverkehr Geospatial gesetze +geändert github glichkeit GNSS @@ -152,6 +158,7 @@ grayscale gridded Groessen GroundTruthInit +Grüne gulleys haben Hafengebiet @@ -208,6 +215,7 @@ lte luminance luv lx +Lärmschutz Mainz Meteorologische metoffice @@ -239,8 +247,8 @@ oktas ONEWAY onlinepubs ONRAMP -opengroup opendrive +opengroup openscenario optischen Ordnung @@ -254,8 +262,10 @@ parametrize Parkausweis Parken Parkfl +Parkflächen Parkschein Parkst +Parkstände Paulat pdf png @@ -281,6 +291,7 @@ rcs rdquo README Rei +Reißverschluss rfc rfen rgb @@ -291,6 +302,7 @@ rmschutz rmse Rollsplitt Rosenberger +räumen Sa SAE sae @@ -319,6 +331,7 @@ Strahlungsphysik Strassenfahrzeuge Strassenverkehrs strassenverkehrsordnung +Straßenschaden StVO stvo StVZO @@ -357,6 +370,7 @@ vda verkehr Verkehrseinrichtungen Verkehrsf +Verkehrsführung Verkehrstechnik verkehrszeichen verschluss @@ -365,12 +379,13 @@ Vorfahrt Vorschriftzeichen Vorweg vz -vzkat VzKat +vzkat wa Welle Wellenausbreitung Wendem +Wendemöglichkeit werden werktags Wernli @@ -382,6 +397,7 @@ wp wsdot www www +während xrat XXXX xy @@ -391,3 +407,5 @@ Zeitschrift Zou Zufahrt Zuflussregelung +Ölspur +überholt From 66abe1275772dbcce8aa3c5fa3eee0cf6e2e2a46 Mon Sep 17 00:00:00 2001 From: Thomas Sedlmayer Date: Tue, 26 Mar 2024 08:55:37 +0100 Subject: [PATCH 3/6] Remove partial words from spellchecker whitelist Signed-off-by: Thomas Sedlmayer --- .github/spelling_custom_words_en_US.txt | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/.github/spelling_custom_words_en_US.txt b/.github/spelling_custom_words_en_US.txt index af03471c5..ee6e0358f 100644 --- a/.github/spelling_custom_words_en_US.txt +++ b/.github/spelling_custom_words_en_US.txt @@ -15,7 +15,6 @@ antecessor arg asam atsc -au auch auf auml @@ -34,7 +33,6 @@ bei beleuchtung Benrath Bereich -berholt Besondere Bewohner BGBl @@ -56,7 +54,6 @@ cd cellpadding cellspacing centerline -chen Cianciaruso CIE cie @@ -109,7 +106,6 @@ Endeninch endlink endrules engl -enschaden enum enums eoas @@ -152,7 +148,6 @@ Geospatial gesetze geändert github -glichkeit GNSS grayscale gridded @@ -167,9 +162,6 @@ halten hier Hochwasser href -hrend -hrenpflichtig -hrung hsv htm html @@ -210,7 +202,6 @@ lidar lidar's Linksabbieger lm -lspur lte luminance luv @@ -225,8 +216,6 @@ Modellierung MULTITRACK nd nde -ndert -ne NEBEL Nebenstrecke neuer @@ -261,10 +250,8 @@ parametrization parametrize Parkausweis Parken -Parkfl Parkflächen Parkschein -Parkst Parkstände Paulat pdf @@ -290,15 +277,12 @@ rbd rcs rdquo README -Rei Reißverschluss rfc -rfen rgb rgbir rggb Richtzeichen -rmschutz rmse Rollsplitt Rosenberger @@ -326,7 +310,6 @@ sr sslnet Steinburg steradian -Stra Strahlungsphysik Strassenfahrzeuge Strassenverkehrs @@ -356,7 +339,6 @@ ubc ubc uint uk -umen umich umtri und @@ -373,7 +355,6 @@ Verkehrsf Verkehrsführung Verkehrstechnik verkehrszeichen -verschluss Verschmutzte Vorfahrt Vorschriftzeichen @@ -384,7 +365,6 @@ vzkat wa Welle Wellenausbreitung -Wendem Wendemöglichkeit werden werktags @@ -396,7 +376,6 @@ Wilster wp wsdot www -www während xrat XXXX From 6c20ed43e9a4f22b0315b2b0d84f2b56802add86 Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Fri, 8 Mar 2024 11:31:09 +0100 Subject: [PATCH 4/6] Deprecate various car types in favor of new alias TYPE_CAR This is a result of the harmonization effort across ASAM Open standards Signed-off-by: Pierre R. Mai --- osi_object.proto | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/osi_object.proto b/osi_object.proto index db248768f..8e1d8a1a1 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -764,10 +764,12 @@ 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 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. + // discretion of the OSI implementer how that mapping is achieved. In previous + // versions, for example, a simulator might have used 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. As part of the harmonization + // effort, it should now map to TYPE_CAR, which is an alias of the old TYPE_MEDIUM_CAR, + // and all other car type enums have been deprecated in favor of TYPE_CAR. // // \note Vehicle type classification is a complex area and there are no // universally recognized standards. As such, the boundaries between some of the @@ -778,6 +780,10 @@ message MovingObject // enum Type { + // Allow aliases in enum + // + option allow_alias = true; + // Type of vehicle is unknown (must not be used in ground truth). // TYPE_UNKNOWN = 0; @@ -790,24 +796,39 @@ message MovingObject // // Definition: Hatchback car with maximum length 4 m. // + // \note Deprecated differentiation, use TYPE_CAR instead + // TYPE_SMALL_CAR = 2; // Vehicle is a compact car. // // Definition: Hatchback car with length between 4 and 4.5 m. // + // \note Deprecated differentiation, use TYPE_CAR instead + // TYPE_COMPACT_CAR = 3; + // Vehicle is a car. + // + // This is to be used for all car-like vehicles, without any + // further differentiated type available. + // + TYPE_CAR = 4; + // Vehicle is a medium car. // // Definition: Hatchback or sedan with length between 4.5 and 5 m. // + // \note Deprecated differentiation, use TYPE_CAR instead, which is an alias + // TYPE_MEDIUM_CAR = 4; // Vehicle is a luxury car. // // Definition: Sedan or coupe that is longer then 5 m. // + // \note Deprecated differentiation, use TYPE_CAR instead + // TYPE_LUXURY_CAR = 5; // Vehicle is a delivery van. From 7b38bedad805448f5e78245ef89ae91efd6ee051 Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Fri, 22 Mar 2024 16:50:11 +0100 Subject: [PATCH 5/6] Review feedback rewording Co-authored-by: jakobkaths <54845080+jakobkaths@users.noreply.github.com> Signed-off-by: Pierre R. Mai --- osi_object.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osi_object.proto b/osi_object.proto index 8e1d8a1a1..fb0c518b3 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -819,7 +819,7 @@ message MovingObject // // Definition: Hatchback or sedan with length between 4.5 and 5 m. // - // \note Deprecated differentiation, use TYPE_CAR instead, which is an alias + // \note Deprecated differentiation, use the alias TYPE_CAR instead // TYPE_MEDIUM_CAR = 4; From 427d7a6a72c80052e55b7763fe2fa4b8c4644fd7 Mon Sep 17 00:00:00 2001 From: Thomas Sedlmayer Date: Wed, 24 Jan 2024 09:49:46 +0100 Subject: [PATCH 6/6] Rename streaming update image to lowercase Signed-off-by: Thomas Sedlmayer --- ...ng-principle.PNG => osi-streaming-principle.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/images/{osi-streaming-principle.PNG => osi-streaming-principle.png} (100%) diff --git a/doc/images/osi-streaming-principle.PNG b/doc/images/osi-streaming-principle.png similarity index 100% rename from doc/images/osi-streaming-principle.PNG rename to doc/images/osi-streaming-principle.png