From 620a19b0ee33a10375b2c7302e21c835bea172d3 Mon Sep 17 00:00:00 2001 From: "Rosenberger, Philipp" Date: Tue, 21 Jan 2020 19:44:10 +0100 Subject: [PATCH 01/15] referencing work ongoing --- doc/commenting.rst | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/doc/commenting.rst b/doc/commenting.rst index d08f3b998..0dd31060d 100644 --- a/doc/commenting.rst +++ b/doc/commenting.rst @@ -7,9 +7,8 @@ During the building process of open simulation interface (using the `proto2cpp < For any additional comment styles see `list `_ of doxygen commands. -Reference for writing values and units: ISO 80000-1: 2009, Quantities and units – Part 1: General -Nice summary: [Rohde & Schwarz: Der korrekte Umgang mit Größen, Einheiten und Gleichungen ](https://karriere.rohde-schwarz.de/fileadmin/customer/downloads/PDF/Der_korrekte_Umgang_mit_Groessen_Einheiten_und_Gleichungen_bro_de_01.pdf -) +Reference for writing values and units: ISO 80000-1:2013-08, Quantities and units – Part 1: General +Nice summary in German: `Rohde & Schwarz: Der korrekte Umgang mit Größen, Einheiten und Gleichungen `_ Commenting with block syntax @@ -199,7 +198,20 @@ You can optionally add a note to the field to describe the field better. optional double atmospheric_pressure = 1; } -If you want to provide a reference to a DIN or to web page which helps in understanding the field you can add a reference. +If you want to provide a reference to a DIN or to a web page, which helps in understanding the field, you can add a reference. + +Citation style for different sources: + +.. [#] Authorname1, X.; Authorname2, Y.: Book (monograph) title (2009), p. 2. +.. [#] Authorname1, X.: Diss., Thesis title (2013), p. 10–15. +.. [#] Authorname1, X.; Authorname2, Y.: Contribution in a compilation title (2015). +.. [#] Bender, E. et al.: Journal article title, Teil 1 (2007). +.. [#] Andreas Karius: Internet document title (2016), pp. 1–4. +.. [#] KRdL: Norm title (2009). +.. [#] Günther, B.; Denk, R.: DE 41 42 325 C2: Patent title (1991), p. 3. +.. [#] Authorname1, X.; Authorname2, Y.; Authorname3, Z., et al.: Title of the Source, in Editorname, A., et al.: Booktitle, publisher, location, year + +.. important:: Every OSI message should be defined properly and should have a well cited reference. All citations should be primary citations. Sources like Wikipedia et al. are not allowed. .. code-block:: protobuf @@ -220,7 +232,8 @@ If you want to provide a reference to a DIN or to web page which helps in unders // \note 100000 Pa = 1 bar // // \par Reference: - // - [1] [Definition atmospheric pressure](https://en.wikipedia.org/wiki/Atmospheric_pressure) + // [#] Stewart, D.; Simmons, M.: The Business Playground: Where Creativity and Commerce Collide. Berkeley, USA: New Riders Press, 2010. + // [#] [1] [Definition atmospheric pressure](https://en.wikipedia.org/wiki/Atmospheric_pressure) // optional double atmospheric_pressure = 1; } @@ -318,8 +331,8 @@ If you want to reference message fields and enums add '#' to the enum/field name // A reference to a enum e.g. \c #COLOR_GREEN. -Commenting with links ----------------------- +Commenting with links (e.g. in references) +------------------------------------------ With ``[]()`` you can integrate a link to a certain homepage while commenting. Commenting with images From 41d26a75d4116cfd8753cf36c2525e638427966d Mon Sep 17 00:00:00 2001 From: rosenberger Date: Wed, 22 Jan 2020 16:42:35 +0100 Subject: [PATCH 02/15] citation style added for commenting --- doc/commenting.rst | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/doc/commenting.rst b/doc/commenting.rst index 0dd31060d..22b2b2f0c 100644 --- a/doc/commenting.rst +++ b/doc/commenting.rst @@ -198,20 +198,26 @@ You can optionally add a note to the field to describe the field better. optional double atmospheric_pressure = 1; } -If you want to provide a reference to a DIN or to a web page, which helps in understanding the field, you can add a reference. +To help understanding the field, you should add a reference. +Every OSI message should be defined properly and should have a well cited reference. -Citation style for different sources: +**Citation style for different sources:** -.. [#] Authorname1, X.; Authorname2, Y.: Book (monograph) title (2009), p. 2. -.. [#] Authorname1, X.: Diss., Thesis title (2013), p. 10–15. -.. [#] Authorname1, X.; Authorname2, Y.: Contribution in a compilation title (2015). -.. [#] Bender, E. et al.: Journal article title, Teil 1 (2007). -.. [#] Andreas Karius: Internet document title (2016), pp. 1–4. -.. [#] KRdL: Norm title (2009). -.. [#] Günther, B.; Denk, R.: DE 41 42 325 C2: Patent title (1991), p. 3. -.. [#] Authorname1, X.; Authorname2, Y.; Authorname3, Z., et al.: Title of the Source, in Editorname, A., et al.: Booktitle, publisher, location, year +- Find filled-out examples in already existing entries +- All citations should be primary citations. Sources like Wikipedia et al. are not allowed. +- For more than 3 authors, place "et al." after the third one +- For more than 1 editor, place "et al." after the first one +- Naming pages at the end is optional, to ease finding in long texts or for direct citations +- Scheme is as follows (replace tags with corresponding values): + +.. [#] ; ; et al.: , in et al.: , , , , , , . +.. [#] ; ; : , , , , , . +.. [#] ; : , in , , , , . +.. [#] : , Phd. thesis, , , , . +.. [#] : , , , accessed . +.. [#] , , , . +.. [#] : , , , , . -.. important:: Every OSI message should be defined properly and should have a well cited reference. All citations should be primary citations. Sources like Wikipedia et al. are not allowed. .. code-block:: protobuf @@ -232,8 +238,7 @@ Citation style for different sources: // \note 100000 Pa = 1 bar // // \par Reference: - // [#] Stewart, D.; Simmons, M.: The Business Playground: Where Creativity and Commerce Collide. Berkeley, USA: New Riders Press, 2010. - // [#] [1] [Definition atmospheric pressure](https://en.wikipedia.org/wiki/Atmospheric_pressure) + // [1] Rapp, C.: Grundlagen der Physik, in: Hydraulik für Ingenieure und Naturwissenschaftler, Springer Vieweg, Wiesbaden, 2017, p. 105 // optional double atmospheric_pressure = 1; } @@ -259,7 +264,7 @@ Finally you can provide a set of rules which this field needs to be followed. Th // \note 100000 Pa = 1 bar // // \par Reference: - // - [1] [Definition atmospheric pressure](https://en.wikipedia.org/wiki/Atmospheric_pressure) + // [1] Rapp, C.: Grundlagen der Physik, in: Hydraulik für Ingenieure und Naturwissenschaftler, Springer Vieweg, Wiesbaden, 2017, p. 105 // // \rules // is_optional From ef1ca1a8cc822f3cd52571d2058228be3e0c1ee8 Mon Sep 17 00:00:00 2001 From: "Rosenberger, Philipp" Date: Thu, 23 Jan 2020 16:44:32 +0100 Subject: [PATCH 03/15] ongoing work --- doc/commenting.rst | 11 +++++++---- osi_environment.proto | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/commenting.rst b/doc/commenting.rst index 22b2b2f0c..8867faefe 100644 --- a/doc/commenting.rst +++ b/doc/commenting.rst @@ -204,11 +204,14 @@ Every OSI message should be defined properly and should have a well cited refere **Citation style for different sources:** - Find filled-out examples in already existing entries +- Within the text, the number system is used with the number of the source in brackets [#] for mentioning. +- In the references list, the number is then followed by a full citation. - All citations should be primary citations. Sources like Wikipedia et al. are not allowed. -- For more than 3 authors, place "et al." after the third one -- For more than 1 editor, place "et al." after the first one -- Naming pages at the end is optional, to ease finding in long texts or for direct citations -- Scheme is as follows (replace tags with corresponding values): +- Authors are mentioned with , . +- For more than 3 authors, place "et al." after the third one. +- For more than 1 editor, place "et al." after the first one. +- Naming pages at the end is optional, to ease finding in long texts or for direct citations. +- The scheme for the reference list is as follows (replace tags with corresponding values): .. [#] ; ; et al.: , in et al.: , , , , , , . .. [#] ; ; : , , , , , . diff --git a/osi_environment.proto b/osi_environment.proto index fd4d40d1c..f4dd63521 100644 --- a/osi_environment.proto +++ b/osi_environment.proto @@ -129,7 +129,7 @@ message EnvironmentalConditions // contrast of a distant object against its background. // // \par References: - // - [2] SHEPARD, Frank D. Reduced visibility due to fog on the highway. + // - [2] SHEPARD, Frank D. Reduced visibility due to fog on the highway. // Transportation Research Board, 1996. // - [3] [StVO 17 chapter // 3](https://www.stvo.de/strassenverkehrsordnung/101-17-beleuchtung) From 3dc8c3ff8cc74e96f15bac9b1e61c468b1bf7917 Mon Sep 17 00:00:00 2001 From: rosenberger Date: Fri, 24 Jan 2020 12:42:52 +0100 Subject: [PATCH 04/15] Commenting style definition done. --- doc/commenting.rst | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/doc/commenting.rst b/doc/commenting.rst index 8867faefe..608ee8782 100644 --- a/doc/commenting.rst +++ b/doc/commenting.rst @@ -203,23 +203,25 @@ Every OSI message should be defined properly and should have a well cited refere **Citation style for different sources:** -- Find filled-out examples in already existing entries - Within the text, the number system is used with the number of the source in brackets [#] for mentioning. -- In the references list, the number is then followed by a full citation. +- We use the so called "APA style"`link `_ from the American Psychological Association for referencing (). +- In the references list, the number in brackets [#] is followed by a full citation. +- For writing the title in italic, use title +- Author names are written as , like Authorname, A. A. +- Editor names are written as like B. B. Editorname +- Naming pages at the end is optional to enable finding in long texts or for direct citations. - All citations should be primary citations. Sources like Wikipedia et al. are not allowed. -- Authors are mentioned with , . -- For more than 3 authors, place "et al." after the third one. -- For more than 1 editor, place "et al." after the first one. -- Naming pages at the end is optional, to ease finding in long texts or for direct citations. -- The scheme for the reference list is as follows (replace tags with corresponding values): - -.. [#] ; ; et al.: , in et al.: , , , , , , . -.. [#] ; ; : , , , , , . -.. [#] ; : , in , , , , . -.. [#] : , Phd. thesis, , , , . -.. [#] : , , , accessed . -.. [#] , , , . -.. [#] : , , , , . +- Find filled-out examples under `https://apastyle.apa.org `_ and in existing entries. +- The scheme for the reference list of popular sources is as follows (replace tags with corresponding values): + +.. [#] , , & . (). Contribution in a compilation title. . . . . . . . +.. [#] , & . (). . . . . . +.. [#] & . (). . In & (Eds.), (). . . . +.. [#] & . (). . . . . . . +.. [#] . (). . Phd. thesis. . . . . +.. [#] . (, ). . Retrieved , , from . +.. [#] . (). .</em> (<standard identifier>). <location>. +.. [#] <author>. (<year>). <em><patent title and id></em>. <location>. <organisation>. .. code-block:: protobuf From ab3e4a98a051948ff570d312d3cf27b6231d20a9 Mon Sep 17 00:00:00 2001 From: rosenberger <rosenberger@fzd.tu-darmstadt.de> Date: Fri, 24 Jan 2020 16:00:43 +0100 Subject: [PATCH 05/15] Typo-correction on doc/commenting.proto --- doc/commenting.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/commenting.rst b/doc/commenting.rst index 608ee8782..773eac79a 100644 --- a/doc/commenting.rst +++ b/doc/commenting.rst @@ -204,15 +204,15 @@ Every OSI message should be defined properly and should have a well cited refere **Citation style for different sources:** - Within the text, the number system is used with the number of the source in brackets [#] for mentioning. -- We use the so called "APA style"`link <https://apastyle.apa.org/>`_ from the American Psychological Association for referencing (). +- We use the so called `"APA style" <https://apastyle.apa.org/>`_ from the American Psychological Association for referencing. - In the references list, the number in brackets [#] is followed by a full citation. -- For writing the title in italic, use <em>title</em> +- For writing the title in italic, use <em>title</em>. - Author names are written as <surname>, <initial(s)> like Authorname, A. A. -- Editor names are written as <initial(s)> <surname> like B. B. Editorname +- Editor names are written as <initial(s)> <surname> like B. B. Editorname. - Naming pages at the end is optional to enable finding in long texts or for direct citations. - All citations should be primary citations. Sources like Wikipedia et al. are not allowed. - Find filled-out examples under `https://apastyle.apa.org <https://apastyle.apa.org/style-grammar-guidelines/references/examples>`_ and in existing entries. -- The scheme for the reference list of popular sources is as follows (replace tags with corresponding values): +- The scheme of popular sources for the reference list is as follows (replace tags with corresponding values): .. [#] <author1>, <author2>, <author3> & <author4>. (<year>). Contribution in a compilation title. <em><Compilation Title></em>. <edition>. <page(s)>. <publisher>. <location>. <doi>. <page(s)>. .. [#] <author1>, <author2> & <author3>. (<year>). <em><book (monograph) title></em>. <edition>. <publisher>. <doi>. <page(s)>. From 19fcacd855ea6cbd259d25561508818ed0d14c71 Mon Sep 17 00:00:00 2001 From: rosenberger <rosenberger@fzd.tu-darmstadt.de> Date: Fri, 24 Jan 2020 16:11:49 +0100 Subject: [PATCH 06/15] Example citation corrected in doc/commenting.proto --- doc/commenting.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/commenting.rst b/doc/commenting.rst index 773eac79a..3127f3d41 100644 --- a/doc/commenting.rst +++ b/doc/commenting.rst @@ -243,7 +243,7 @@ Every OSI message should be defined properly and should have a well cited refere // \note 100000 Pa = 1 bar // // \par Reference: - // [1] Rapp, C.: Grundlagen der Physik, in: Hydraulik für Ingenieure und Naturwissenschaftler, Springer Vieweg, Wiesbaden, 2017, p. 105 + // [1] Rapp, C. (2017). Grundlagen der Physik. <em>In Hydraulik für Ingenieure und Naturwissenschaftler</em> (pp.23-36). Springer Vieweg. Wiesbaden, Germany. https://doi.org/10.1007/978-3-658-18619-7_3. p. 105. // optional double atmospheric_pressure = 1; } @@ -269,7 +269,7 @@ Finally you can provide a set of rules which this field needs to be followed. Th // \note 100000 Pa = 1 bar // // \par Reference: - // [1] Rapp, C.: Grundlagen der Physik, in: Hydraulik für Ingenieure und Naturwissenschaftler, Springer Vieweg, Wiesbaden, 2017, p. 105 + // [1] Rapp, C. (2017). Grundlagen der Physik. <em>In Hydraulik für Ingenieure und Naturwissenschaftler</em> (pp.23-36). Springer Vieweg. Wiesbaden, Germany. https://doi.org/10.1007/978-3-658-18619-7_3. p. 105. // // \rules // is_optional From 2472d273843610b8480039f152bdf48c68e79e83 Mon Sep 17 00:00:00 2001 From: rosenberger <rosenberger@fzd.tu-darmstadt.de> Date: Fri, 24 Jan 2020 19:49:57 +0100 Subject: [PATCH 07/15] Typos in doc/commenting.rst --- doc/commenting.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/commenting.rst b/doc/commenting.rst index 3127f3d41..99337c0bc 100644 --- a/doc/commenting.rst +++ b/doc/commenting.rst @@ -149,7 +149,7 @@ Then you describe the field by adding an explanation. // message EnvironmentalConditions { - // Atmospheric pressure in Pascal at z=0.0 in world frame (about 101325 Pa). + // Atmospheric pressure in Pascal at z = 0.0 m in world frame (about 101325 Pa). // optional double atmospheric_pressure = 1; } @@ -168,7 +168,7 @@ Next you decide the unit of the field. // message EnvironmentalConditions { - // Atmospheric pressure in Pascal at z=0.0 in world frame (about 101325 Pa). + // Atmospheric pressure in Pascal at z = 0.0 m in world frame (about 101325 Pa). // // Unit: Pa // @@ -189,7 +189,7 @@ You can optionally add a note to the field to describe the field better. // message EnvironmentalConditions { - // Atmospheric pressure in Pascal at z=0.0 in world frame (about 101325 Pa). + // Atmospheric pressure in Pascal at z = 0.0 m in world frame (about 101325 Pa). // // Unit: Pa // @@ -236,14 +236,14 @@ Every OSI message should be defined properly and should have a well cited refere // message EnvironmentalConditions { - // Atmospheric pressure in Pascal at z=0.0 in world frame (about 101325 Pa). + // Atmospheric pressure in Pascal at z = 0.0 m in world frame (about 101325 Pa). // // Unit: Pa // // \note 100000 Pa = 1 bar // // \par Reference: - // [1] Rapp, C. (2017). Grundlagen der Physik. <em>In Hydraulik für Ingenieure und Naturwissenschaftler</em> (pp.23-36). Springer Vieweg. Wiesbaden, Germany. https://doi.org/10.1007/978-3-658-18619-7_3. p. 105. + // [1] Rapp, C. (2017). Grundlagen der Physik. In <em>Hydraulik für Ingenieure und Naturwissenschaftler</em> (pp.23-36). Springer Vieweg. Wiesbaden, Germany. https://doi.org/10.1007/978-3-658-18619-7_3. p. 105. // optional double atmospheric_pressure = 1; } @@ -262,14 +262,14 @@ Finally you can provide a set of rules which this field needs to be followed. Th // message EnvironmentalConditions { - // Atmospheric pressure in Pascal at z=0.0 in world frame (about 101325 Pa). + // Atmospheric pressure in Pascal at z = 0.0 m in world frame (about 101325 Pa). // // Unit: Pa // // \note 100000 Pa = 1 bar // // \par Reference: - // [1] Rapp, C. (2017). Grundlagen der Physik. <em>In Hydraulik für Ingenieure und Naturwissenschaftler</em> (pp.23-36). Springer Vieweg. Wiesbaden, Germany. https://doi.org/10.1007/978-3-658-18619-7_3. p. 105. + // [1] Rapp, C. (2017). Grundlagen der Physik. In <em>Hydraulik für Ingenieure und Naturwissenschaftler</em> (pp.23-36). Springer Vieweg. Wiesbaden, Germany. https://doi.org/10.1007/978-3-658-18619-7_3. p. 105. // // \rules // is_optional From c08a2f220405d48bbeb994735e28e8f2acce8b3a Mon Sep 17 00:00:00 2001 From: rosenberger <rosenberger@fzd.tu-darmstadt.de> Date: Sat, 25 Jan 2020 17:57:10 +0100 Subject: [PATCH 08/15] All existing citations are now correct. --- osi_common.proto | 4 +-- osi_detectedobject.proto | 29 ++++++++-------- osi_environment.proto | 57 +++++++++++++------------------ osi_featuredata.proto | 4 +-- osi_groundtruth.proto | 15 ++++---- osi_lane.proto | 19 ++++------- osi_object.proto | 4 +-- osi_sensordata.proto | 4 +-- osi_sensorview.proto | 4 +-- osi_sensorviewconfiguration.proto | 24 ++++++------- osi_version.proto.in | 7 ++-- 11 files changed, 77 insertions(+), 94 deletions(-) diff --git a/osi_common.proto b/osi_common.proto index 4891a2a9a..e1269149a 100644 --- a/osi_common.proto +++ b/osi_common.proto @@ -145,8 +145,8 @@ message Dimension3d // \attention This definition changed in OSI version 3.0.0. Previous OSI // versions (V2.xx) had an other definition. // -// \par References: -// - [1] DIN ISO 8855:2013-11 +// \par Reference: +// [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // message Orientation3d { diff --git a/osi_detectedobject.proto b/osi_detectedobject.proto index 9dfe0ec3f..a285af7c0 100644 --- a/osi_detectedobject.proto +++ b/osi_detectedobject.proto @@ -15,7 +15,7 @@ package osi3; message DetectedItemHeader { // Specific ID of the detected item as assigned by the sensor internally. - // Need not match with \c #ground_truth_id. + // Needs not to match with \c #ground_truth_id. // optional Identifier tracking_id = 1; @@ -199,28 +199,28 @@ message DetectedMovingObject // Additional data that is specific to radar sensors. // - // \note Field need not be set if simulated sensor is not a radar + // \note Field needs not to be set if simulated sensor is not a radar // sensor. // optional RadarSpecificObjectData radar_specifics = 100; // Additional data that is specific to lidar sensors. // - // \note Field need not be set if simulated sensor is not a lidar + // \note Field needs not to be set if simulated sensor is not a lidar // sensor. // optional LidarSpecificObjectData lidar_specifics = 101; // Additional data that is specific to camera sensors. // - // \note Field need not be set if simulated sensor is not a camera + // \note Field needs not to be set if simulated sensor is not a camera // sensor. // optional CameraSpecificObjectData camera_specifics = 102; // Additional data that is specific to ultrasonic sensors. // - // \note Field need not be set if simulated sensor is not an ultrasonic + // \note Field needs not to be set if simulated sensor is not an ultrasonic // sensor. // optional UltrasonicSpecificObjectData ultrasonic_specifics = 103; @@ -256,9 +256,8 @@ message DetectedMovingObject // Pedestrian head pose for behavior prediction. Describes the head // orientation w.r.t. the host vehicle orientation. // The x-axis of the right-handed head frame is pointing along the - // pedestrian's straight ahead viewing direction and the z-axis is - // pointing upwards (cranial direction [1] i.e. to pedestrian's skull - // cap). + // pedestrian's straight ahead viewing direction (anterior), the y-axis lateral to the left, + // and the z-axis is pointing upwards (superior) [1]. // // ``View_normal_base_coord_system = // Inverse_Rotation(#head_pose)*Unit_vector_x`` @@ -266,17 +265,17 @@ message DetectedMovingObject // \note This field is mandatory if the \c CandidateMovingObject.type is // \c MovingObject::TYPE_PEDESTRIAN // - // \par References: - // - [1] https://en.wikipedia.org/wiki/Anatomical_terms_of_location + // \par Reference: + // [1] Patton, K. T. & Thibodeau, G. A. (2015). <em>Anatomy & Physiology</em>. 9th Edition. Elsevier. Missouri, U.S.A. ISBN 978-0-323-34139-4. p. 1229. // optional Orientation3d head_pose = 4; // Pedestrian upper body pose for behavior prediction. Describes the // upper body orientation w.r.t. the host vehicle orientation. // The x-axis of the right-handed upper body frame is pointing along the - // pedestrian's upper body ventral direction [2] (i.e. usually - // pedestrian's intended moving direction) and the z-axis is pointing - // upwards (to pedestrian's head). + // pedestrian's upper body ventral (anterior) direction (i.e. usually + // pedestrian's intended moving direction), the y-axis lateral to the left, + // and the z-axis is pointing upwards (superior, to the pedestrian's head) [1]. // // ``View_normal_base_coord_system = // Inverse_Rotation(#upper_body_pose)*Unit_vector_x`` @@ -284,8 +283,8 @@ message DetectedMovingObject // \note This field is mandatory if the \c CandidateMovingObject::type // is \c MovingObject::TYPE_PEDESTRIAN // - // \par References: - // - [2] https://en.wikipedia.org/wiki/Anatomical_terms_of_location + // \par Reference: + // [1] Patton, K. T. & Thibodeau, G. A. (2015). <em>Anatomy & Physiology</em>. 9th Edition. Elsevier. Missouri, U.S.A. ISBN 978-0-323-34139-4. p. 1229. // optional Orientation3d upper_body_pose = 5; } diff --git a/osi_environment.proto b/osi_environment.proto index f4dd63521..72eb4dc26 100644 --- a/osi_environment.proto +++ b/osi_environment.proto @@ -23,19 +23,20 @@ message EnvironmentalConditions // The Unix epoch (or Unix time or POSIX time or Unix timestamp) is // the number of seconds that have elapsed since January 1, 1970 - // (midnight UTC/GMT), not counting leap seconds - // (in ISO 8601: 1970-01-01T00:00:00Z). Literally speaking the epoch + // (midnight UTC/GMT [1]), not counting leap seconds [2]. + // Historically, the origin of UNIX system time was referred to as + // "00:00:00 GMT, January 1, 1970" [2]. Literally speaking the epoch // is Unix time 0 (midnight 1/1/1970), but 'epoch' is often used as // a synonym for 'Unix time'. Many Unix systems store epoch dates as // a signed 32-bit integer, which might cause problems on January 19, // 2038 (known as the Year 2038 problem or Y2038). // // \note You can convert the timestamp using the following [routines - // sorted by languages](https://www.epochconverter.com/#code) + // sorted by languages](https://www.epochconverter.com/#code). // // \par References: - // - [1] [Epoch & Unix Timestamp Conversion Tools](https://www.epochconverter.com/) - // - [2] [Wikipedia: Coordinated Universal Time] (https://en.wikipedia.org/wiki/Coordinated_Universal_Time) + // [1] ITU Radiocommunication Assembly. (2002). <em>Recommondation ITU-R TF.460-6 Standard-frequency and time-signal emissions</em>. (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 + // [2] The Open Group. (2018). <em>POSIX.1-2017</em> 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; @@ -72,10 +73,8 @@ message EnvironmentalConditions // Definition of discretized precipitation states according to [1]. // (I = Intensity of precipitation in mm per hour mm/h) // - // \par References: - // - [1] PAULAT, Marcus, et al. A gridded dataset of hourly precipitation - // in Germany: Its construction, climatology and application. - // Meteorologische Zeitschrift, 2008, 17. Jg. Nr. 6, S. 719-732. + // \par Reference: + // [1] Paulat, M., Frei, C., Hagen, M. & Wernli, H. (2008). A gridded dataset of hourly precipitation in Germany: Its construction, climatology and application. <em>Meteorologische Zeitschrift</em>. Vol. 17, No. 6. pp. 719-732. Berlin, Stuttgart, Germany. https://doi.org/10.1127/0941-2948/2008/0332 // enum Precipitation { @@ -117,10 +116,10 @@ message EnvironmentalConditions PRECIPITATION_EXTREME = 8; } - // Definition of discretized fog states according to [2]. + // Definition of discretized fog states according to [1]. // The bandwidth of thick and dense fog was adjusted to fit the German StVO - // regarding rear fog lights [3]. - // (V = Visibility in meters m) + // regarding rear fog lights [2, 3]. + // (V = Visibility in m) // // Visibility is defined as the length of the atmosphere over which a beam // of light travels before its luminous flux is reduced to 5% of its @@ -129,12 +128,10 @@ message EnvironmentalConditions // contrast of a distant object against its background. // // \par References: - // - [2] SHEPARD, Frank D. <em>Reduced visibility due to fog on the highway.</em> - // Transportation Research Board, 1996. - // - [3] [StVO 17 chapter - // 3](https://www.stvo.de/strassenverkehrsordnung/101-17-beleuchtung) - // - [4] [Homepage of the Meteorological - // Office](http://www.metoffice.gov.uk/guide/weather/observations-guide/how-we-measure-visibility) + // [1] Shepard, F. D. (1996). <em>Reduced visibility due to fog on the highway.</em> Transportation Research Board, National Research Council (Ed.). National Academy Press. Washington, D.C., USA. ISBN 0-309-06006-0. + // [2] Straßenverkehrs-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). + // [3] stvo.de. (2013, April 01). <em>StVO §17 Beleuchtung</em>. Retrieved January 25, 2020, from https://www.stvo.de/strassenverkehrsordnung/101-17-beleuchtung + // [4] Meteorological Office UK. (2020). <em>Homepage of the Meteorological Office - How we measure visibility</em>. Retrieved January 25, 2020, from http://www.metoffice.gov.uk/guide/weather/observations-guide/how-we-measure-visibility // enum Fog { @@ -185,30 +182,24 @@ message EnvironmentalConditions // emitted by the vehicle itself. It can include sun/moon light, light from // other cars, street lights etc. // - // lx ("Lux") is the SI unit of luminance or illumination of an area of exact + // lx ("lux") is the SI unit of luminance or illumination of an area of exact // one square meter, which is equal to one lumen per square meter 1 lx = - // 1 lm/m^2 [5]. + // 1 lm/m^2 [1]. // lm ("lumen") is the SI derived unit of luminous flux and a measure of // the total quantity of visible light emitted by a source. The lumen is // defined in relation to cd ("candela") as 1 lm = 1 cd sr, where sr // denotes steradian, the unit of solid angle used in 3D geometry analogous - // to the radian. + // to the radian [1]. // // Categorization is done based on natural day/night time illuminance levels - // [6] and standards for required lighting levels on roads [6, 7, 8, 9]. + // [2] and standards for required lighting levels on roads [2, 3, 4, 5]. // // \par References: - // - [5] [The NIST Reference on Constants, Units, and - // Uncertainty](https://physics.nist.gov/cuu/Units/units.html) - // - [6] [National Optical Astronomy - // Observatory](https://www.noao.edu/education/QLTkit/ACTIVITY_Documents/Safety/LightLevels_outdoor+indoor.pdf) - // - [7] [Standards for required street lighting in the - // USA](http://www.wsdot.wa.gov/research/reports/fullreports/847.1.pdf) - // - [8] [Canadian IES-RP-8 standards for road lighting - municipality of - // Saint-Gedeon-de-. - // Beauce] (http://sslnet.ca/wp-content/uploads/2011/10/LTE-RT-2011-0076-Anglais.pdf) - // - [9] [European standards for road - // lighting] (http://courtneystrong.com/wp-content/uploads/2017/07/css-sl1-class-and-quality-of-street-lighting.pdf) + // [1] DIN Deutsches Institut für Normung e. V. (1982). <em>DIN 5031-3 Strahlungsphysik im optischen Bereich und Lichttechnik - Größen, Formelzeichen und Einheiten der Lichttechnik</em>. (DIN 5031-3:1982-03). Berlin, Germany. + // [2] National Optical Astronomy Observatory. (2015, December 02). <em>Recommended Light Levels</em>. Retrieved January 25, 2020, from https://www.noao.edu/education/QLTkit/ACTIVITY_Documents/Safety/LightLevels_outdoor+indoor.pdf + // [3] Wang, Y. & Zou, Y., (2016, March). <em>Study on Illumination for State Highways</em>. Washington State Department of Transportation. Retrieved January 25, 2020, from http://www.wsdot.wa.gov/research/reports/fullreports/847.1.pdf + // [4] Laperrière, A. (2011, May). <em>LED street lighting in the municipality of Saint-Gédéon-de-Beauce within the framework of advanced lighting technologies</em>. Retrieved January 25, 2020, from http://sslnet.ca/wp-content/uploads/2011/10/LTE-RT-2011-0076-Anglais.pdf + // [5] Crabb, G. I., Beaumont, R. & Webster, D. (2008, October 17). <em>Review of the class and quality of street lighting</em>. Transport Research Laboratory. Retrieved January 25, 2020, from http://courtneystrong.com/wp-content/uploads/2017/07/css-sl1-class-and-quality-of-street-lighting.pdf // enum AmbientIllumination { diff --git a/osi_featuredata.proto b/osi_featuredata.proto index 625ca10bd..6c48bfe73 100644 --- a/osi_featuredata.proto +++ b/osi_featuredata.proto @@ -94,8 +94,8 @@ message SensorDetectionHeader // identical to sensor detection frame's origin. Detections are defined in // the sensor detection frame which uses e.g. spherical coordinates. // - // \par References: - // - [1] DIN ISO 8855:2013-11 + // \par Reference: + // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // optional MountingPosition mounting_position = 3; diff --git a/osi_groundtruth.proto b/osi_groundtruth.proto index 6dcf02d5e..e6e85d49a 100644 --- a/osi_groundtruth.proto +++ b/osi_groundtruth.proto @@ -121,24 +121,21 @@ message GroundTruth optional EnvironmentalConditions environmental_conditions = 12; // The ISO country code in 3 digit numeric format according to: - // ISO Code 3166/1 [1,2]. + // ISO Code 3166/1 [1]. // E.g. Germany = 276, USA = 840. // - // \par References: - // - [1] [International Standard ISO 3166-1: Codes for the representation of - // names of countries and their subdivisions - Part 1: Country codes, third - // ed., 2013] (https://www.iso.org/obp/ui/) - // - [2] [Wikipedia ISO 3166/1] (https://en.wikipedia.org/wiki/ISO_3166-1) + // \par Reference: + // [1] ISO International Organization for Standardization. (2013). <em>ISO 3166-1 Codes for the representation of names of countries and their subdivisions - Part 1: Country codes</em>. (ISO 3166-1:2013). Geneva, Switzerland. // optional uint32 country_code = 13; // Projection string that allows to transform all coordinates in GroundTruth // into a different cartographic projection. // - // The string follows the PROJ.4 project rules for projections [1]. + // The string follows the PROJ rules for projections [1]. // - // \par References: - // - [1] [Proj.4 Projections] (https://proj4.org/usage/projections.html) + // \par Reference: + // [1] PROJ contributors. (2019). <em>PROJ coordinate transformation software library</em>. Open Source Geospatial Foundation. Retrieved January 25, 2019, from https://proj.org/usage/projections.html // optional string proj_string = 14; diff --git a/osi_lane.proto b/osi_lane.proto index f7ab9e37b..cd81fedfc 100644 --- a/osi_lane.proto +++ b/osi_lane.proto @@ -402,28 +402,23 @@ message Lane // // Unit: mm/m // - // \par References: - // - [1] SAYERS, M.W.; KARAMIHAS, S.M. Little Book of Profiling, - // University of Michigan Transportation Research Institute, 1998. + // \par Reference: + // [1] Sayers, M. W. & Karamihas, S. M. (1998). <em>Little Book of Profiling</em>. University of Michigan Transportation Research Institute. Retrieved January 25, 2020, from http://www.umtri.umich.edu/content/LittleBook98R.pdf pp. 45 ff. // optional double surface_roughness = 5; // The surface texture or fine roughness // // Whereas the IRI-based roughness or unevenness measure only takes - // into account road wavelengths around 0.5m - 100m, the surface - // texture or fine roughness [2] measures only wavelengths below - // 0.5m. It is given as the standard height deviation of fine + // into account road wavelengths around 0.5 m - 100 m, the surface + // texture or fine roughness [1] measures only wavelengths below + // 0.5 m. It is given as the standard height deviation of fine // roughness // // Unit: m // - // \par References: - // - [1] SAYERS, M.W.; KARAMIHAS, S.M. Little Book of Profiling, - // University of Michigan Transportation Research Institute, 1998. - // - [2] SCHNEIDER, R.: Modellierung der Wellenausbreitung fuer - // ein bildgebendes Kfz-Radar, Dissertation, Universitaet Karlsruhe, - // Mai 1998. + // \par Reference: + // [1] Schneider, R. (1998). <em>Modellierung der Wellenausbreitung für ein bildgebendes Kfz-Radar</em>. PhD thesis. Karlsruhe, Germany. Universität Karlsruhe, Fak. f. Elektrotechnik. // optional double surface_texture = 6; } diff --git a/osi_object.proto b/osi_object.proto index 42eec7c9d..863c86475 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -368,8 +368,8 @@ message MovingObject // right-handed. Therefore the positive y-axis points to the left of the // vehicle. // - // \par References: - // - [1] DIN ISO 8855:2013-11 + // \par Reference: + // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // message VehicleAttributes { diff --git a/osi_sensordata.proto b/osi_sensordata.proto index ad5909a99..53b30a914 100644 --- a/osi_sensordata.proto +++ b/osi_sensordata.proto @@ -172,8 +172,8 @@ message SensorData // \arg \b y-direction of sensor coordinate system: perpendicular to x and z // right hand system // - // \par References: - // - [1] DIN ISO 8855:2013-11 + // \par Reference: + // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note This field is usually static during the simulation. // \note The origin of vehicle's coordinate system in world frame is diff --git a/osi_sensorview.proto b/osi_sensorview.proto index 98a907fac..f7c8b7cc3 100644 --- a/osi_sensorview.proto +++ b/osi_sensorview.proto @@ -73,8 +73,8 @@ message SensorView // \arg \b y-direction of sensor coordinate system: perpendicular to x and z // right hand system // - // \par References: - // - [1] DIN ISO 8855:2013-11 + // \par Reference: + // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note This field is usually static during the simulation. // \note The origin of vehicle's coordinate system in world frame is diff --git a/osi_sensorviewconfiguration.proto b/osi_sensorviewconfiguration.proto index dda00adec..a95bf9b51 100644 --- a/osi_sensorviewconfiguration.proto +++ b/osi_sensorviewconfiguration.proto @@ -94,8 +94,8 @@ message SensorViewConfiguration // \arg \b y-direction of sensor coordinate system: perpendicular to x and z // right hand system // - // \par References: - // - [1] DIN ISO 8855:2013-11 + // \par Reference: + // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is // ( \c MovingObject::base . \c BaseMoving::position + @@ -248,8 +248,8 @@ message GenericSensorViewConfiguration // \arg \b y-direction of sensor coordinate system: perpendicular to x and z // right hand system // - // \par References: - // - [1] DIN ISO 8855:2013-11 + // \par Reference: + // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is // ( \c MovingObject::base . \c BaseMoving::position + @@ -319,8 +319,8 @@ message RadarSensorViewConfiguration // \arg \b y-direction of sensor coordinate system: perpendicular to x and z // right hand system // - // \par References: - // - [1] DIN ISO 8855:2013-11 + // \par Reference: + // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is // ( \c MovingObject::base . \c BaseMoving::position + @@ -455,8 +455,8 @@ message LidarSensorViewConfiguration // \arg \b y-direction of sensor coordinate system: perpendicular to x and z // right hand system // - // \par References: - // - [1] DIN ISO 8855:2013-11 + // \par Reference: + // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is // ( \c MovingObject::base . \c BaseMoving::position + @@ -575,8 +575,8 @@ message CameraSensorViewConfiguration // \arg \b y-direction of sensor coordinate system: perpendicular to x and z // right hand system // - // \par References: - // - [1] DIN ISO 8855:2013-11 + // \par Reference: + // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is // ( \c MovingObject::base . \c BaseMoving::position + @@ -741,8 +741,8 @@ message UltrasonicSensorViewConfiguration // \arg \b y-direction of sensor coordinate system: perpendicular to x and z // right hand system // - // \par References: - // - [1] DIN ISO 8855:2013-11 + // \par Reference: + // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is // ( \c MovingObject::base . \c BaseMoving::position + diff --git a/osi_version.proto.in b/osi_version.proto.in index c416dc2a7..1170d1e58 100644 --- a/osi_version.proto.in +++ b/osi_version.proto.in @@ -25,10 +25,11 @@ package osi3; // properly set the version components prior to sending. // // Increments will happen as part of changes to the whole interface. -// The meaning of different InterfaceVersions is defined [1]. +// The meaning of different InterfaceVersions is defined in [1]. +// +// \par Reference: +// [1] Open Simulation Interface. (2020, January 25). <em>README</em>. Retrieved January 25, 2020, from https://opensimulationinterface.github.io/osi-documentation/open-simulation-interface/README.html // -// \par References: -// [1] Open Simulation Interface: README.md message InterfaceVersion { // Major version number. From 3a129875bb8deef6f1e0c00d7ff338ef20e3ab25 Mon Sep 17 00:00:00 2001 From: rosenberger <rosenberger@fzd.tu-darmstadt.de> Date: Sun, 26 Jan 2020 13:40:38 +0100 Subject: [PATCH 09/15] Citation in README.md corrected --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 559040129..fba3d70f9 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ In this context, OSI defines generic interfaces to ensure modularity, integrabil For more information on OSI see the [official documentation](https://opensimulationinterface.github.io/osi-documentation/) or the [official reference documentation](https://opensimulationinterface.github.io/open-simulation-interface/) for defined protobuf messages. -[[1]](https://www.hot.ei.tum.de/forschung/automotive-veroeffentlichungen/) *A generic interface for the environment perception of automated driving functions in virtual scenarios.(Dated 03.02.2017) T. Hanke, N. Hirsenkorn, C. van-Driesten, P. Garcia-Ramos, M. Schiementz, S. Schneider, E. Biebl* +[1] Hanke, T., Hirsenkorn, N., van-Driesten, C., Garcia-Ramos, P., Schiementz, M., Schneider, S. & Biebl, E. (2017, February 03). *A generic interface for the environment perception of automated driving functions in virtual scenarios.* Retrieved January 25, 2020, from https://www.hot.ei.tum.de/forschung/automotive-veroeffentlichungen/ ## Usage ##### Example of writing and reading an OSI message in `Python` From e72ff5e8a344af565ad96df27f5143d12894d4fc Mon Sep 17 00:00:00 2001 From: rosenberger <rosenberger@fzd.tu-darmstadt.de> Date: Sun, 26 Jan 2020 14:11:24 +0100 Subject: [PATCH 10/15] References must be line seperated for correct displaying. --- osi_common.proto | 1 + osi_detectedobject.proto | 2 ++ osi_environment.proto | 12 ++++++++++++ osi_featuredata.proto | 1 + osi_groundtruth.proto | 2 ++ osi_lane.proto | 2 ++ osi_object.proto | 1 + osi_sensordata.proto | 1 + osi_sensorview.proto | 1 + osi_sensorviewconfiguration.proto | 6 ++++++ osi_version.proto.in | 1 + 11 files changed, 30 insertions(+) diff --git a/osi_common.proto b/osi_common.proto index e1269149a..2797eacc4 100644 --- a/osi_common.proto +++ b/osi_common.proto @@ -146,6 +146,7 @@ message Dimension3d // versions (V2.xx) had an other definition. // // \par Reference: +// // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // message Orientation3d diff --git a/osi_detectedobject.proto b/osi_detectedobject.proto index a285af7c0..c59788abe 100644 --- a/osi_detectedobject.proto +++ b/osi_detectedobject.proto @@ -266,6 +266,7 @@ message DetectedMovingObject // \c MovingObject::TYPE_PEDESTRIAN // // \par Reference: + // // [1] Patton, K. T. & Thibodeau, G. A. (2015). <em>Anatomy & Physiology</em>. 9th Edition. Elsevier. Missouri, U.S.A. ISBN 978-0-323-34139-4. p. 1229. // optional Orientation3d head_pose = 4; @@ -284,6 +285,7 @@ message DetectedMovingObject // is \c MovingObject::TYPE_PEDESTRIAN // // \par Reference: + // // [1] Patton, K. T. & Thibodeau, G. A. (2015). <em>Anatomy & Physiology</em>. 9th Edition. Elsevier. Missouri, U.S.A. ISBN 978-0-323-34139-4. p. 1229. // optional Orientation3d upper_body_pose = 5; diff --git a/osi_environment.proto b/osi_environment.proto index 72eb4dc26..8493cca9d 100644 --- a/osi_environment.proto +++ b/osi_environment.proto @@ -35,7 +35,9 @@ message EnvironmentalConditions // sorted by languages](https://www.epochconverter.com/#code). // // \par References: + // // [1] ITU Radiocommunication Assembly. (2002). <em>Recommondation ITU-R TF.460-6 Standard-frequency and time-signal emissions</em>. (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 + // // [2] The Open Group. (2018). <em>POSIX.1-2017</em> 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; @@ -74,6 +76,7 @@ message EnvironmentalConditions // (I = Intensity of precipitation in mm per hour mm/h) // // \par Reference: + // // [1] Paulat, M., Frei, C., Hagen, M. & Wernli, H. (2008). A gridded dataset of hourly precipitation in Germany: Its construction, climatology and application. <em>Meteorologische Zeitschrift</em>. Vol. 17, No. 6. pp. 719-732. Berlin, Stuttgart, Germany. https://doi.org/10.1127/0941-2948/2008/0332 // enum Precipitation @@ -128,9 +131,13 @@ message EnvironmentalConditions // contrast of a distant object against its background. // // \par References: + // // [1] Shepard, F. D. (1996). <em>Reduced visibility due to fog on the highway.</em> Transportation Research Board, National Research Council (Ed.). National Academy Press. Washington, D.C., USA. ISBN 0-309-06006-0. + // // [2] Straßenverkehrs-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). + // // [3] stvo.de. (2013, April 01). <em>StVO §17 Beleuchtung</em>. Retrieved January 25, 2020, from https://www.stvo.de/strassenverkehrsordnung/101-17-beleuchtung + // // [4] Meteorological Office UK. (2020). <em>Homepage of the Meteorological Office - How we measure visibility</em>. Retrieved January 25, 2020, from http://www.metoffice.gov.uk/guide/weather/observations-guide/how-we-measure-visibility // enum Fog @@ -195,10 +202,15 @@ message EnvironmentalConditions // [2] and standards for required lighting levels on roads [2, 3, 4, 5]. // // \par References: + // // [1] DIN Deutsches Institut für Normung e. V. (1982). <em>DIN 5031-3 Strahlungsphysik im optischen Bereich und Lichttechnik - Größen, Formelzeichen und Einheiten der Lichttechnik</em>. (DIN 5031-3:1982-03). Berlin, Germany. + // // [2] National Optical Astronomy Observatory. (2015, December 02). <em>Recommended Light Levels</em>. Retrieved January 25, 2020, from https://www.noao.edu/education/QLTkit/ACTIVITY_Documents/Safety/LightLevels_outdoor+indoor.pdf + // // [3] Wang, Y. & Zou, Y., (2016, March). <em>Study on Illumination for State Highways</em>. Washington State Department of Transportation. Retrieved January 25, 2020, from http://www.wsdot.wa.gov/research/reports/fullreports/847.1.pdf + // // [4] Laperrière, A. (2011, May). <em>LED street lighting in the municipality of Saint-Gédéon-de-Beauce within the framework of advanced lighting technologies</em>. Retrieved January 25, 2020, from http://sslnet.ca/wp-content/uploads/2011/10/LTE-RT-2011-0076-Anglais.pdf + // // [5] Crabb, G. I., Beaumont, R. & Webster, D. (2008, October 17). <em>Review of the class and quality of street lighting</em>. Transport Research Laboratory. Retrieved January 25, 2020, from http://courtneystrong.com/wp-content/uploads/2017/07/css-sl1-class-and-quality-of-street-lighting.pdf // enum AmbientIllumination diff --git a/osi_featuredata.proto b/osi_featuredata.proto index 6c48bfe73..33b152549 100644 --- a/osi_featuredata.proto +++ b/osi_featuredata.proto @@ -95,6 +95,7 @@ message SensorDetectionHeader // the sensor detection frame which uses e.g. spherical coordinates. // // \par Reference: + // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // optional MountingPosition mounting_position = 3; diff --git a/osi_groundtruth.proto b/osi_groundtruth.proto index e6e85d49a..6c7c9ef49 100644 --- a/osi_groundtruth.proto +++ b/osi_groundtruth.proto @@ -125,6 +125,7 @@ message GroundTruth // E.g. Germany = 276, USA = 840. // // \par Reference: + // // [1] ISO International Organization for Standardization. (2013). <em>ISO 3166-1 Codes for the representation of names of countries and their subdivisions - Part 1: Country codes</em>. (ISO 3166-1:2013). Geneva, Switzerland. // optional uint32 country_code = 13; @@ -135,6 +136,7 @@ message GroundTruth // The string follows the PROJ rules for projections [1]. // // \par Reference: + // // [1] PROJ contributors. (2019). <em>PROJ coordinate transformation software library</em>. Open Source Geospatial Foundation. Retrieved January 25, 2019, from https://proj.org/usage/projections.html // optional string proj_string = 14; diff --git a/osi_lane.proto b/osi_lane.proto index cd81fedfc..518d0e1f4 100644 --- a/osi_lane.proto +++ b/osi_lane.proto @@ -403,6 +403,7 @@ message Lane // Unit: mm/m // // \par Reference: + // // [1] Sayers, M. W. & Karamihas, S. M. (1998). <em>Little Book of Profiling</em>. University of Michigan Transportation Research Institute. Retrieved January 25, 2020, from http://www.umtri.umich.edu/content/LittleBook98R.pdf pp. 45 ff. // optional double surface_roughness = 5; @@ -418,6 +419,7 @@ message Lane // Unit: m // // \par Reference: + // // [1] Schneider, R. (1998). <em>Modellierung der Wellenausbreitung für ein bildgebendes Kfz-Radar</em>. PhD thesis. Karlsruhe, Germany. Universität Karlsruhe, Fak. f. Elektrotechnik. // optional double surface_texture = 6; diff --git a/osi_object.proto b/osi_object.proto index 863c86475..82aa522e5 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -369,6 +369,7 @@ message MovingObject // vehicle. // // \par Reference: + // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // message VehicleAttributes diff --git a/osi_sensordata.proto b/osi_sensordata.proto index 53b30a914..04c744f9d 100644 --- a/osi_sensordata.proto +++ b/osi_sensordata.proto @@ -173,6 +173,7 @@ message SensorData // right hand system // // \par Reference: + // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note This field is usually static during the simulation. diff --git a/osi_sensorview.proto b/osi_sensorview.proto index f7c8b7cc3..47c35bae4 100644 --- a/osi_sensorview.proto +++ b/osi_sensorview.proto @@ -74,6 +74,7 @@ message SensorView // right hand system // // \par Reference: + // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note This field is usually static during the simulation. diff --git a/osi_sensorviewconfiguration.proto b/osi_sensorviewconfiguration.proto index a95bf9b51..9388ceda7 100644 --- a/osi_sensorviewconfiguration.proto +++ b/osi_sensorviewconfiguration.proto @@ -95,6 +95,7 @@ message SensorViewConfiguration // right hand system // // \par Reference: + // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is @@ -249,6 +250,7 @@ message GenericSensorViewConfiguration // right hand system // // \par Reference: + // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is @@ -320,6 +322,7 @@ message RadarSensorViewConfiguration // right hand system // // \par Reference: + // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is @@ -456,6 +459,7 @@ message LidarSensorViewConfiguration // right hand system // // \par Reference: + // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is @@ -576,6 +580,7 @@ message CameraSensorViewConfiguration // right hand system // // \par Reference: + // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is @@ -742,6 +747,7 @@ message UltrasonicSensorViewConfiguration // right hand system // // \par Reference: + // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is diff --git a/osi_version.proto.in b/osi_version.proto.in index 1170d1e58..56a719d66 100644 --- a/osi_version.proto.in +++ b/osi_version.proto.in @@ -28,6 +28,7 @@ package osi3; // The meaning of different InterfaceVersions is defined in [1]. // // \par Reference: +// // [1] Open Simulation Interface. (2020, January 25). <em>README</em>. Retrieved January 25, 2020, from https://opensimulationinterface.github.io/osi-documentation/open-simulation-interface/README.html // message InterfaceVersion From c478a8843a4348f75d19aea654e81c7546ff8116 Mon Sep 17 00:00:00 2001 From: rosenberger <rosenberger@fzd.tu-darmstadt.de> Date: Sun, 26 Jan 2020 17:15:23 +0100 Subject: [PATCH 11/15] Line break for references-list changed to adding ' \n ' at the end. --- doc/commenting.rst | 17 ++++++++++------- osi_common.proto | 1 - osi_detectedobject.proto | 1 - osi_environment.proto | 28 ++++++++-------------------- osi_featuredata.proto | 1 - osi_groundtruth.proto | 2 -- osi_lane.proto | 2 -- osi_object.proto | 1 - osi_sensordata.proto | 1 - osi_sensorview.proto | 1 - osi_sensorviewconfiguration.proto | 6 ------ osi_version.proto.in | 1 - 12 files changed, 18 insertions(+), 44 deletions(-) diff --git a/doc/commenting.rst b/doc/commenting.rst index 99337c0bc..a7be3a17d 100644 --- a/doc/commenting.rst +++ b/doc/commenting.rst @@ -207,6 +207,7 @@ Every OSI message should be defined properly and should have a well cited refere - We use the so called `"APA style" <https://apastyle.apa.org/>`_ from the American Psychological Association for referencing. - In the references list, the number in brackets [#] is followed by a full citation. - For writing the title in italic, use <em>title</em>. +- If the list contains more than one entry, add " \n " at the end of the line to create a line break within the list. - Author names are written as <surname>, <initial(s)> like Authorname, A. A. - Editor names are written as <initial(s)> <surname> like B. B. Editorname. - Naming pages at the end is optional to enable finding in long texts or for direct citations. @@ -220,7 +221,7 @@ Every OSI message should be defined properly and should have a well cited refere .. [#] <author1> & <author2>. (<year>). <journal article title>. <em><journal title></em>. <page(s)>. <location>. <doi>. <page(s)>. .. [#] <author>. (<year>). <em><Phd thesis title></em>. Phd. thesis. <location>. <university>. <doi or url>. <page(s)>. .. [#] <author>. (<year>, <month> <day>). <em><internet article title></em>. Retrieved <month> <day>, <year>, from <url>. -.. [#] <standarding organisation>. (<year>). <em><title of the standard>.</em> (<standard identifier>). <location>. +.. [#] <standarding organisation>. (<year>). <em><title of the standard></em>. (<standard identifier>). <location>. .. [#] <author>. (<year>). <em><patent title and id></em>. <location>. <organisation>. @@ -236,14 +237,15 @@ Every OSI message should be defined properly and should have a well cited refere // message EnvironmentalConditions { - // Atmospheric pressure in Pascal at z = 0.0 m in world frame (about 101325 Pa). + // Atmospheric pressure in Pascal at z = 0.0 m in world frame (about 101325 Pa) [1, 2]. // // Unit: Pa // // \note 100000 Pa = 1 bar // - // \par Reference: - // [1] Rapp, C. (2017). Grundlagen der Physik. In <em>Hydraulik für Ingenieure und Naturwissenschaftler</em> (pp.23-36). Springer Vieweg. Wiesbaden, Germany. https://doi.org/10.1007/978-3-658-18619-7_3. p. 105. + // \par References: + // [1] DIN Deutsches Institut für Normung e. V. (1982). <em>DIN 5031-3 Strahlungsphysik im optischen Bereich und Lichttechnik - Größen, Formelzeichen und Einheiten der Lichttechnik</em>. (DIN 5031-3:1982-03). Berlin, Germany. \n + // [2] Rapp, C. (2017). Grundlagen der Physik. In <em>Hydraulik für Ingenieure und Naturwissenschaftler</em> (pp.23-36). Springer Vieweg. Wiesbaden, Germany. https://doi.org/10.1007/978-3-658-18619-7_3. p. 105. // optional double atmospheric_pressure = 1; } @@ -262,14 +264,15 @@ Finally you can provide a set of rules which this field needs to be followed. Th // message EnvironmentalConditions { - // Atmospheric pressure in Pascal at z = 0.0 m in world frame (about 101325 Pa). + // Atmospheric pressure in Pascal at z = 0.0 m in world frame (about 101325 Pa) [1, 2]. // // Unit: Pa // // \note 100000 Pa = 1 bar // - // \par Reference: - // [1] Rapp, C. (2017). Grundlagen der Physik. In <em>Hydraulik für Ingenieure und Naturwissenschaftler</em> (pp.23-36). Springer Vieweg. Wiesbaden, Germany. https://doi.org/10.1007/978-3-658-18619-7_3. p. 105. + // \par References: + // [1] DIN Deutsches Institut für Normung e. V. (1982). <em>DIN 5031-3 Strahlungsphysik im optischen Bereich und Lichttechnik - Größen, Formelzeichen und Einheiten der Lichttechnik</em>. (DIN 5031-3:1982-03). Berlin, Germany. \n + // [2] Rapp, C. (2017). Grundlagen der Physik. In <em>Hydraulik für Ingenieure und Naturwissenschaftler</em> (pp.23-36). Springer Vieweg. Wiesbaden, Germany. https://doi.org/10.1007/978-3-658-18619-7_3. p. 105. // // \rules // is_optional diff --git a/osi_common.proto b/osi_common.proto index 2797eacc4..e1269149a 100644 --- a/osi_common.proto +++ b/osi_common.proto @@ -146,7 +146,6 @@ message Dimension3d // versions (V2.xx) had an other definition. // // \par Reference: -// // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // message Orientation3d diff --git a/osi_detectedobject.proto b/osi_detectedobject.proto index c59788abe..32f47217b 100644 --- a/osi_detectedobject.proto +++ b/osi_detectedobject.proto @@ -285,7 +285,6 @@ message DetectedMovingObject // is \c MovingObject::TYPE_PEDESTRIAN // // \par Reference: - // // [1] Patton, K. T. & Thibodeau, G. A. (2015). <em>Anatomy & Physiology</em>. 9th Edition. Elsevier. Missouri, U.S.A. ISBN 978-0-323-34139-4. p. 1229. // optional Orientation3d upper_body_pose = 5; diff --git a/osi_environment.proto b/osi_environment.proto index 8493cca9d..38787862f 100644 --- a/osi_environment.proto +++ b/osi_environment.proto @@ -35,9 +35,7 @@ message EnvironmentalConditions // sorted by languages](https://www.epochconverter.com/#code). // // \par References: - // - // [1] ITU Radiocommunication Assembly. (2002). <em>Recommondation ITU-R TF.460-6 Standard-frequency and time-signal emissions</em>. (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 - // + // [1] ITU Radiocommunication Assembly. (2002). <em>Recommondation ITU-R TF.460-6 Standard-frequency and time-signal emissions</em>. (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). <em>POSIX.1-2017</em> 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; @@ -76,7 +74,6 @@ message EnvironmentalConditions // (I = Intensity of precipitation in mm per hour mm/h) // // \par Reference: - // // [1] Paulat, M., Frei, C., Hagen, M. & Wernli, H. (2008). A gridded dataset of hourly precipitation in Germany: Its construction, climatology and application. <em>Meteorologische Zeitschrift</em>. Vol. 17, No. 6. pp. 719-732. Berlin, Stuttgart, Germany. https://doi.org/10.1127/0941-2948/2008/0332 // enum Precipitation @@ -131,13 +128,9 @@ message EnvironmentalConditions // contrast of a distant object against its background. // // \par References: - // - // [1] Shepard, F. D. (1996). <em>Reduced visibility due to fog on the highway.</em> Transportation Research Board, National Research Council (Ed.). National Academy Press. Washington, D.C., USA. ISBN 0-309-06006-0. - // - // [2] Straßenverkehrs-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). - // - // [3] stvo.de. (2013, April 01). <em>StVO §17 Beleuchtung</em>. Retrieved January 25, 2020, from https://www.stvo.de/strassenverkehrsordnung/101-17-beleuchtung - // + // [1] Shepard, F. D. (1996). <em>Reduced visibility due to fog on the highway.</em> Transportation Research Board, National Research Council (Ed.). National Academy Press. Washington, D.C., USA. ISBN 0-309-06006-0. \n + // [2] Straßenverkehrs-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). <em>StVO §17 Beleuchtung</em>. Retrieved January 25, 2020, from https://www.stvo.de/strassenverkehrsordnung/101-17-beleuchtung \n // [4] Meteorological Office UK. (2020). <em>Homepage of the Meteorological Office - How we measure visibility</em>. Retrieved January 25, 2020, from http://www.metoffice.gov.uk/guide/weather/observations-guide/how-we-measure-visibility // enum Fog @@ -202,15 +195,10 @@ message EnvironmentalConditions // [2] and standards for required lighting levels on roads [2, 3, 4, 5]. // // \par References: - // - // [1] DIN Deutsches Institut für Normung e. V. (1982). <em>DIN 5031-3 Strahlungsphysik im optischen Bereich und Lichttechnik - Größen, Formelzeichen und Einheiten der Lichttechnik</em>. (DIN 5031-3:1982-03). Berlin, Germany. - // - // [2] National Optical Astronomy Observatory. (2015, December 02). <em>Recommended Light Levels</em>. Retrieved January 25, 2020, from https://www.noao.edu/education/QLTkit/ACTIVITY_Documents/Safety/LightLevels_outdoor+indoor.pdf - // - // [3] Wang, Y. & Zou, Y., (2016, March). <em>Study on Illumination for State Highways</em>. Washington State Department of Transportation. Retrieved January 25, 2020, from http://www.wsdot.wa.gov/research/reports/fullreports/847.1.pdf - // - // [4] Laperrière, A. (2011, May). <em>LED street lighting in the municipality of Saint-Gédéon-de-Beauce within the framework of advanced lighting technologies</em>. Retrieved January 25, 2020, from http://sslnet.ca/wp-content/uploads/2011/10/LTE-RT-2011-0076-Anglais.pdf - // + // [1] DIN Deutsches Institut für Normung e. V. (1982). <em>DIN 5031-3 Strahlungsphysik im optischen Bereich und Lichttechnik - Größen, Formelzeichen und Einheiten der Lichttechnik</em>. (DIN 5031-3:1982-03). Berlin, Germany. \n + // [2] National Optical Astronomy Observatory. (2015, December 02). <em>Recommended Light Levels</em>. Retrieved January 25, 2020, from https://www.noao.edu/education/QLTkit/ACTIVITY_Documents/Safety/LightLevels_outdoor+indoor.pdf \n + // [3] Wang, Y. & Zou, Y., (2016, March). <em>Study on Illumination for State Highways</em>. Washington State Department of Transportation. Retrieved January 25, 2020, from http://www.wsdot.wa.gov/research/reports/fullreports/847.1.pdf \n + // [4] Laperrière, A. (2011, May). <em>LED street lighting in the municipality of Saint-Gédéon-de-Beauce within the framework of advanced lighting technologies</em>. Retrieved January 25, 2020, from http://sslnet.ca/wp-content/uploads/2011/10/LTE-RT-2011-0076-Anglais.pdf \n // [5] Crabb, G. I., Beaumont, R. & Webster, D. (2008, October 17). <em>Review of the class and quality of street lighting</em>. Transport Research Laboratory. Retrieved January 25, 2020, from http://courtneystrong.com/wp-content/uploads/2017/07/css-sl1-class-and-quality-of-street-lighting.pdf // enum AmbientIllumination diff --git a/osi_featuredata.proto b/osi_featuredata.proto index 33b152549..6c48bfe73 100644 --- a/osi_featuredata.proto +++ b/osi_featuredata.proto @@ -95,7 +95,6 @@ message SensorDetectionHeader // the sensor detection frame which uses e.g. spherical coordinates. // // \par Reference: - // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // optional MountingPosition mounting_position = 3; diff --git a/osi_groundtruth.proto b/osi_groundtruth.proto index 6c7c9ef49..e6e85d49a 100644 --- a/osi_groundtruth.proto +++ b/osi_groundtruth.proto @@ -125,7 +125,6 @@ message GroundTruth // E.g. Germany = 276, USA = 840. // // \par Reference: - // // [1] ISO International Organization for Standardization. (2013). <em>ISO 3166-1 Codes for the representation of names of countries and their subdivisions - Part 1: Country codes</em>. (ISO 3166-1:2013). Geneva, Switzerland. // optional uint32 country_code = 13; @@ -136,7 +135,6 @@ message GroundTruth // The string follows the PROJ rules for projections [1]. // // \par Reference: - // // [1] PROJ contributors. (2019). <em>PROJ coordinate transformation software library</em>. Open Source Geospatial Foundation. Retrieved January 25, 2019, from https://proj.org/usage/projections.html // optional string proj_string = 14; diff --git a/osi_lane.proto b/osi_lane.proto index 518d0e1f4..cd81fedfc 100644 --- a/osi_lane.proto +++ b/osi_lane.proto @@ -403,7 +403,6 @@ message Lane // Unit: mm/m // // \par Reference: - // // [1] Sayers, M. W. & Karamihas, S. M. (1998). <em>Little Book of Profiling</em>. University of Michigan Transportation Research Institute. Retrieved January 25, 2020, from http://www.umtri.umich.edu/content/LittleBook98R.pdf pp. 45 ff. // optional double surface_roughness = 5; @@ -419,7 +418,6 @@ message Lane // Unit: m // // \par Reference: - // // [1] Schneider, R. (1998). <em>Modellierung der Wellenausbreitung für ein bildgebendes Kfz-Radar</em>. PhD thesis. Karlsruhe, Germany. Universität Karlsruhe, Fak. f. Elektrotechnik. // optional double surface_texture = 6; diff --git a/osi_object.proto b/osi_object.proto index 82aa522e5..863c86475 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -369,7 +369,6 @@ message MovingObject // vehicle. // // \par Reference: - // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // message VehicleAttributes diff --git a/osi_sensordata.proto b/osi_sensordata.proto index 04c744f9d..53b30a914 100644 --- a/osi_sensordata.proto +++ b/osi_sensordata.proto @@ -173,7 +173,6 @@ message SensorData // right hand system // // \par Reference: - // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note This field is usually static during the simulation. diff --git a/osi_sensorview.proto b/osi_sensorview.proto index 47c35bae4..f7c8b7cc3 100644 --- a/osi_sensorview.proto +++ b/osi_sensorview.proto @@ -74,7 +74,6 @@ message SensorView // right hand system // // \par Reference: - // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note This field is usually static during the simulation. diff --git a/osi_sensorviewconfiguration.proto b/osi_sensorviewconfiguration.proto index 9388ceda7..a95bf9b51 100644 --- a/osi_sensorviewconfiguration.proto +++ b/osi_sensorviewconfiguration.proto @@ -95,7 +95,6 @@ message SensorViewConfiguration // right hand system // // \par Reference: - // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is @@ -250,7 +249,6 @@ message GenericSensorViewConfiguration // right hand system // // \par Reference: - // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is @@ -322,7 +320,6 @@ message RadarSensorViewConfiguration // right hand system // // \par Reference: - // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is @@ -459,7 +456,6 @@ message LidarSensorViewConfiguration // right hand system // // \par Reference: - // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is @@ -580,7 +576,6 @@ message CameraSensorViewConfiguration // right hand system // // \par Reference: - // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is @@ -747,7 +742,6 @@ message UltrasonicSensorViewConfiguration // right hand system // // \par Reference: - // // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is diff --git a/osi_version.proto.in b/osi_version.proto.in index 56a719d66..1170d1e58 100644 --- a/osi_version.proto.in +++ b/osi_version.proto.in @@ -28,7 +28,6 @@ package osi3; // The meaning of different InterfaceVersions is defined in [1]. // // \par Reference: -// // [1] Open Simulation Interface. (2020, January 25). <em>README</em>. Retrieved January 25, 2020, from https://opensimulationinterface.github.io/osi-documentation/open-simulation-interface/README.html // message InterfaceVersion From c41f71ddc1a4dd37229d540a7b002191109140f5 Mon Sep 17 00:00:00 2001 From: rosenberger <rosenberger@fzd.tu-darmstadt.de> Date: Fri, 31 Jan 2020 16:42:44 +0100 Subject: [PATCH 12/15] German Umlaute changed for ASCII conformity. --- doc/commenting.rst | 10 +++++----- osi_common.proto | 2 +- osi_environment.proto | 4 ++-- osi_featuredata.proto | 2 +- osi_lane.proto | 2 +- osi_object.proto | 2 +- osi_sensordata.proto | 2 +- osi_sensorview.proto | 2 +- osi_sensorviewconfiguration.proto | 12 ++++++------ 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/doc/commenting.rst b/doc/commenting.rst index a7be3a17d..cb1ec68a9 100644 --- a/doc/commenting.rst +++ b/doc/commenting.rst @@ -8,7 +8,7 @@ During the building process of open simulation interface (using the `proto2cpp < For any additional comment styles see `list <http://www.doxygen.nl/manual/commands.html>`_ of doxygen commands. Reference for writing values and units: ISO 80000-1:2013-08, Quantities and units – Part 1: General -Nice summary in German: `Rohde & Schwarz: Der korrekte Umgang mit Größen, Einheiten und Gleichungen <https://karriere.rohde-schwarz.de/fileadmin/customer/downloads/PDF/Der_korrekte_Umgang_mit_Groessen_Einheiten_und_Gleichungen_bro_de_01.pdf>`_ +Nice summary in German: `Rohde & Schwarz: Der korrekte Umgang mit Groessen, Einheiten und Gleichungen <https://karriere.rohde-schwarz.de/fileadmin/customer/downloads/PDF/Der_korrekte_Umgang_mit_Groessen_Einheiten_und_Gleichungen_bro_de_01.pdf>`_ Commenting with block syntax @@ -244,8 +244,8 @@ Every OSI message should be defined properly and should have a well cited refere // \note 100000 Pa = 1 bar // // \par References: - // [1] DIN Deutsches Institut für Normung e. V. (1982). <em>DIN 5031-3 Strahlungsphysik im optischen Bereich und Lichttechnik - Größen, Formelzeichen und Einheiten der Lichttechnik</em>. (DIN 5031-3:1982-03). Berlin, Germany. \n - // [2] Rapp, C. (2017). Grundlagen der Physik. In <em>Hydraulik für Ingenieure und Naturwissenschaftler</em> (pp.23-36). Springer Vieweg. Wiesbaden, Germany. https://doi.org/10.1007/978-3-658-18619-7_3. p. 105. + // [1] DIN Deutsches Institut fuer Normung e. V. (1982). <em>DIN 5031-3 Strahlungsphysik im optischen Bereich und Lichttechnik - Groessen, Formelzeichen und Einheiten der Lichttechnik</em>. (DIN 5031-3:1982-03). Berlin, Germany. \n + // [2] Rapp, C. (2017). Grundlagen der Physik. In <em>Hydraulik fuer Ingenieure und Naturwissenschaftler</em> (pp.23-36). Springer Vieweg. Wiesbaden, Germany. https://doi.org/10.1007/978-3-658-18619-7_3. p. 105. // optional double atmospheric_pressure = 1; } @@ -271,8 +271,8 @@ Finally you can provide a set of rules which this field needs to be followed. Th // \note 100000 Pa = 1 bar // // \par References: - // [1] DIN Deutsches Institut für Normung e. V. (1982). <em>DIN 5031-3 Strahlungsphysik im optischen Bereich und Lichttechnik - Größen, Formelzeichen und Einheiten der Lichttechnik</em>. (DIN 5031-3:1982-03). Berlin, Germany. \n - // [2] Rapp, C. (2017). Grundlagen der Physik. In <em>Hydraulik für Ingenieure und Naturwissenschaftler</em> (pp.23-36). Springer Vieweg. Wiesbaden, Germany. https://doi.org/10.1007/978-3-658-18619-7_3. p. 105. + // [1] DIN Deutsches Institut fuer Normung e. V. (1982). <em>DIN 5031-3 Strahlungsphysik im optischen Bereich und Lichttechnik - Groessen, Formelzeichen und Einheiten der Lichttechnik</em>. (DIN 5031-3:1982-03). Berlin, Germany. \n + // [2] Rapp, C. (2017). Grundlagen der Physik. In <em>Hydraulik fuer Ingenieure und Naturwissenschaftler</em> (pp.23-36). Springer Vieweg. Wiesbaden, Germany. https://doi.org/10.1007/978-3-658-18619-7_3. p. 105. // // \rules // is_optional diff --git a/osi_common.proto b/osi_common.proto index e1269149a..9cc42f7b8 100644 --- a/osi_common.proto +++ b/osi_common.proto @@ -146,7 +146,7 @@ message Dimension3d // versions (V2.xx) had an other definition. // // \par Reference: -// [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. +// [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Strassenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // message Orientation3d { diff --git a/osi_environment.proto b/osi_environment.proto index 38787862f..5c8e64a4f 100644 --- a/osi_environment.proto +++ b/osi_environment.proto @@ -129,7 +129,7 @@ message EnvironmentalConditions // // \par References: // [1] Shepard, F. D. (1996). <em>Reduced visibility due to fog on the highway.</em> Transportation Research Board, National Research Council (Ed.). National Academy Press. Washington, D.C., USA. ISBN 0-309-06006-0. \n - // [2] Straßenverkehrs-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 + // [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). <em>StVO §17 Beleuchtung</em>. Retrieved January 25, 2020, from https://www.stvo.de/strassenverkehrsordnung/101-17-beleuchtung \n // [4] Meteorological Office UK. (2020). <em>Homepage of the Meteorological Office - How we measure visibility</em>. Retrieved January 25, 2020, from http://www.metoffice.gov.uk/guide/weather/observations-guide/how-we-measure-visibility // @@ -195,7 +195,7 @@ message EnvironmentalConditions // [2] and standards for required lighting levels on roads [2, 3, 4, 5]. // // \par References: - // [1] DIN Deutsches Institut für Normung e. V. (1982). <em>DIN 5031-3 Strahlungsphysik im optischen Bereich und Lichttechnik - Größen, Formelzeichen und Einheiten der Lichttechnik</em>. (DIN 5031-3:1982-03). Berlin, Germany. \n + // [1] DIN Deutsches Institut fuer Normung e. V. (1982). <em>DIN 5031-3 Strahlungsphysik im optischen Bereich und Lichttechnik - Groessen, Formelzeichen und Einheiten der Lichttechnik</em>. (DIN 5031-3:1982-03). Berlin, Germany. \n // [2] National Optical Astronomy Observatory. (2015, December 02). <em>Recommended Light Levels</em>. Retrieved January 25, 2020, from https://www.noao.edu/education/QLTkit/ACTIVITY_Documents/Safety/LightLevels_outdoor+indoor.pdf \n // [3] Wang, Y. & Zou, Y., (2016, March). <em>Study on Illumination for State Highways</em>. Washington State Department of Transportation. Retrieved January 25, 2020, from http://www.wsdot.wa.gov/research/reports/fullreports/847.1.pdf \n // [4] Laperrière, A. (2011, May). <em>LED street lighting in the municipality of Saint-Gédéon-de-Beauce within the framework of advanced lighting technologies</em>. Retrieved January 25, 2020, from http://sslnet.ca/wp-content/uploads/2011/10/LTE-RT-2011-0076-Anglais.pdf \n diff --git a/osi_featuredata.proto b/osi_featuredata.proto index 6c48bfe73..488c8026b 100644 --- a/osi_featuredata.proto +++ b/osi_featuredata.proto @@ -95,7 +95,7 @@ message SensorDetectionHeader // the sensor detection frame which uses e.g. spherical coordinates. // // \par Reference: - // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. + // [1] DIN Deutsches Institut fuer Normung e. V. (2013). <em>DIN ISO 8855 Strassenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // optional MountingPosition mounting_position = 3; diff --git a/osi_lane.proto b/osi_lane.proto index cd81fedfc..3e4b1d955 100644 --- a/osi_lane.proto +++ b/osi_lane.proto @@ -418,7 +418,7 @@ message Lane // Unit: m // // \par Reference: - // [1] Schneider, R. (1998). <em>Modellierung der Wellenausbreitung für ein bildgebendes Kfz-Radar</em>. PhD thesis. Karlsruhe, Germany. Universität Karlsruhe, Fak. f. Elektrotechnik. + // [1] Schneider, R. (1998). <em>Modellierung der Wellenausbreitung fuer ein bildgebendes Kfz-Radar</em>. PhD thesis. Karlsruhe, Germany. Universitaet Karlsruhe, Fak. f. Elektrotechnik. // optional double surface_texture = 6; } diff --git a/osi_object.proto b/osi_object.proto index 863c86475..bd91f827e 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -369,7 +369,7 @@ message MovingObject // vehicle. // // \par Reference: - // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. + // [1] DIN Deutsches Institut fuer Normung e. V. (2013). <em>DIN ISO 8855 Strassenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // message VehicleAttributes { diff --git a/osi_sensordata.proto b/osi_sensordata.proto index 53b30a914..306431e31 100644 --- a/osi_sensordata.proto +++ b/osi_sensordata.proto @@ -173,7 +173,7 @@ message SensorData // right hand system // // \par Reference: - // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. + // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Strassenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note This field is usually static during the simulation. // \note The origin of vehicle's coordinate system in world frame is diff --git a/osi_sensorview.proto b/osi_sensorview.proto index f7c8b7cc3..7669a2d14 100644 --- a/osi_sensorview.proto +++ b/osi_sensorview.proto @@ -74,7 +74,7 @@ message SensorView // right hand system // // \par Reference: - // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. + // [1] DIN Deutsches Institut fuer Normung e. V. (2013). <em>DIN ISO 8855 Strassenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note This field is usually static during the simulation. // \note The origin of vehicle's coordinate system in world frame is diff --git a/osi_sensorviewconfiguration.proto b/osi_sensorviewconfiguration.proto index a95bf9b51..cd9e1c9bd 100644 --- a/osi_sensorviewconfiguration.proto +++ b/osi_sensorviewconfiguration.proto @@ -95,7 +95,7 @@ message SensorViewConfiguration // right hand system // // \par Reference: - // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. + // [1] DIN Deutsches Institut fuer Normung e. V. (2013). <em>DIN ISO 8855 Strassenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is // ( \c MovingObject::base . \c BaseMoving::position + @@ -249,7 +249,7 @@ message GenericSensorViewConfiguration // right hand system // // \par Reference: - // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. + // [1] DIN Deutsches Institut fuer Normung e. V. (2013). <em>DIN ISO 8855 Strassenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is // ( \c MovingObject::base . \c BaseMoving::position + @@ -320,7 +320,7 @@ message RadarSensorViewConfiguration // right hand system // // \par Reference: - // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. + // [1] DIN Deutsches Institut fuer Normung e. V. (2013). <em>DIN ISO 8855 Strassenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is // ( \c MovingObject::base . \c BaseMoving::position + @@ -456,7 +456,7 @@ message LidarSensorViewConfiguration // right hand system // // \par Reference: - // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. + // [1] DIN Deutsches Institut fuer Normung e. V. (2013). <em>DIN ISO 8855 Strassenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is // ( \c MovingObject::base . \c BaseMoving::position + @@ -576,7 +576,7 @@ message CameraSensorViewConfiguration // right hand system // // \par Reference: - // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. + // [1] DIN Deutsches Institut fuer Normung e. V. (2013). <em>DIN ISO 8855 Strassenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is // ( \c MovingObject::base . \c BaseMoving::position + @@ -742,7 +742,7 @@ message UltrasonicSensorViewConfiguration // right hand system // // \par Reference: - // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Straßenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. + // [1] DIN Deutsches Institut fuer Normung e. V. (2013). <em>DIN ISO 8855 Strassenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note The origin of vehicle's coordinate system in world frame is // ( \c MovingObject::base . \c BaseMoving::position + From 57a156f9b6e9a55b3d209ea46aa6f9cccc4e6cf2 Mon Sep 17 00:00:00 2001 From: rosenberger <rosenberger@fzd.tu-darmstadt.de> Date: Fri, 31 Jan 2020 16:55:17 +0100 Subject: [PATCH 13/15] still existing non-ASCII changed. --- osi_common.proto | 2 +- osi_environment.proto | 2 +- osi_sensordata.proto | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osi_common.proto b/osi_common.proto index d14e3790d..e4c22a21b 100644 --- a/osi_common.proto +++ b/osi_common.proto @@ -167,7 +167,7 @@ message Dimension3d // versions (V2.xx) had an other definition. // // \par Reference: -// [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Strassenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. +// [1] DIN Deutsches Institut fuer Normung e. V. (2013). <em>DIN ISO 8855 Strassenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // message Orientation3d { diff --git a/osi_environment.proto b/osi_environment.proto index 9fd4ed33d..5367d9b21 100644 --- a/osi_environment.proto +++ b/osi_environment.proto @@ -146,7 +146,7 @@ message EnvironmentalConditions // \par References: // [1] Shepard, F. D. (1996). <em>Reduced visibility due to fog on the highway.</em> 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). <em>StVO §17 Beleuchtung</em>. Retrieved January 25, 2020, from https://www.stvo.de/strassenverkehrsordnung/101-17-beleuchtung \n + // [3] stvo.de. (2013, April 01). <em>StVO Par. 17 Beleuchtung</em>. Retrieved January 25, 2020, from https://www.stvo.de/strassenverkehrsordnung/101-17-beleuchtung \n // [4] Meteorological Office UK. (2020). <em>Homepage of the Meteorological Office - How we measure visibility</em>. Retrieved January 25, 2020, from http://www.metoffice.gov.uk/guide/weather/observations-guide/how-we-measure-visibility // enum Fog diff --git a/osi_sensordata.proto b/osi_sensordata.proto index 306431e31..2aa70e65f 100644 --- a/osi_sensordata.proto +++ b/osi_sensordata.proto @@ -173,7 +173,7 @@ message SensorData // right hand system // // \par Reference: - // [1] DIN Deutsches Institut für Normung e. V. (2013). <em>DIN ISO 8855 Strassenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. + // [1] DIN Deutsches Institut fuer Normung e. V. (2013). <em>DIN ISO 8855 Strassenfahrzeuge - Fahrzeugdynamik und Fahrverhalten - Begriffe</em>. (DIN ISO 8855:2013-11). Berlin, Germany. // // \note This field is usually static during the simulation. // \note The origin of vehicle's coordinate system in world frame is From 66cc11fe8aff942291150357db047fe26214e11f Mon Sep 17 00:00:00 2001 From: rosenberger <rosenberger@fzd.tu-darmstadt.de> Date: Fri, 31 Jan 2020 17:02:50 +0100 Subject: [PATCH 14/15] Non-ASCII accent changed in citation. --- osi_environment.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osi_environment.proto b/osi_environment.proto index 5367d9b21..204127bb0 100644 --- a/osi_environment.proto +++ b/osi_environment.proto @@ -214,7 +214,7 @@ message EnvironmentalConditions // [1] DIN Deutsches Institut fuer Normung e. V. (1982). <em>DIN 5031-3 Strahlungsphysik im optischen Bereich und Lichttechnik - Groessen, Formelzeichen und Einheiten der Lichttechnik</em>. (DIN 5031-3:1982-03). Berlin, Germany. \n // [2] National Optical Astronomy Observatory. (2015, December 02). <em>Recommended Light Levels</em>. Retrieved January 25, 2020, from https://www.noao.edu/education/QLTkit/ACTIVITY_Documents/Safety/LightLevels_outdoor+indoor.pdf \n // [3] Wang, Y. & Zou, Y., (2016, March). <em>Study on Illumination for State Highways</em>. Washington State Department of Transportation. Retrieved January 25, 2020, from http://www.wsdot.wa.gov/research/reports/fullreports/847.1.pdf \n - // [4] Laperrière, A. (2011, May). <em>LED street lighting in the municipality of Saint-Gédéon-de-Beauce within the framework of advanced lighting technologies</em>. Retrieved January 25, 2020, from http://sslnet.ca/wp-content/uploads/2011/10/LTE-RT-2011-0076-Anglais.pdf \n + // [4] Laperriere, A. (2011, May). <em>LED street lighting in the municipality of Saint-Gédéon-de-Beauce within the framework of advanced lighting technologies</em>. Retrieved January 25, 2020, from http://sslnet.ca/wp-content/uploads/2011/10/LTE-RT-2011-0076-Anglais.pdf \n // [5] Crabb, G. I., Beaumont, R. & Webster, D. (2008, October 17). <em>Review of the class and quality of street lighting</em>. Transport Research Laboratory. Retrieved January 25, 2020, from http://courtneystrong.com/wp-content/uploads/2017/07/css-sl1-class-and-quality-of-street-lighting.pdf // enum AmbientIllumination From 6a514a2901e0e5a471180778918d135aa177a2d9 Mon Sep 17 00:00:00 2001 From: rosenberger <rosenberger@fzd.tu-darmstadt.de> Date: Fri, 31 Jan 2020 17:38:29 +0100 Subject: [PATCH 15/15] Accent character changed --- osi_environment.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osi_environment.proto b/osi_environment.proto index 204127bb0..be5d830a8 100644 --- a/osi_environment.proto +++ b/osi_environment.proto @@ -214,7 +214,7 @@ message EnvironmentalConditions // [1] DIN Deutsches Institut fuer Normung e. V. (1982). <em>DIN 5031-3 Strahlungsphysik im optischen Bereich und Lichttechnik - Groessen, Formelzeichen und Einheiten der Lichttechnik</em>. (DIN 5031-3:1982-03). Berlin, Germany. \n // [2] National Optical Astronomy Observatory. (2015, December 02). <em>Recommended Light Levels</em>. Retrieved January 25, 2020, from https://www.noao.edu/education/QLTkit/ACTIVITY_Documents/Safety/LightLevels_outdoor+indoor.pdf \n // [3] Wang, Y. & Zou, Y., (2016, March). <em>Study on Illumination for State Highways</em>. Washington State Department of Transportation. Retrieved January 25, 2020, from http://www.wsdot.wa.gov/research/reports/fullreports/847.1.pdf \n - // [4] Laperriere, A. (2011, May). <em>LED street lighting in the municipality of Saint-Gédéon-de-Beauce within the framework of advanced lighting technologies</em>. Retrieved January 25, 2020, from http://sslnet.ca/wp-content/uploads/2011/10/LTE-RT-2011-0076-Anglais.pdf \n + // [4] Laperriere, A. (2011, May). <em>LED street lighting in the municipality of Saint-Gedeon-de-Beauce within the framework of advanced lighting technologies</em>. Retrieved January 25, 2020, from http://sslnet.ca/wp-content/uploads/2011/10/LTE-RT-2011-0076-Anglais.pdf \n // [5] Crabb, G. I., Beaumont, R. & Webster, D. (2008, October 17). <em>Review of the class and quality of street lighting</em>. Transport Research Laboratory. Retrieved January 25, 2020, from http://courtneystrong.com/wp-content/uploads/2017/07/css-sl1-class-and-quality-of-street-lighting.pdf // enum AmbientIllumination