update CommonRoad 2020a documentation

2ec25fbc · Sebastian Maierhofer · a9ca4b5d · 2ec25fbc · 2ec25fbc
Commit 2ec25fbc authored Apr 10, 2020 by Sebastian Maierhofer
Showing with 15 additions and 25 deletions

documentation/XML_commonRoad_2020a.pdf documentation/XML_commonRoad_2020a.pdf +0 -0

documentation/XML_commonRoad_XSD_2020a.xsd documentation/XML_commonRoad_XSD_2020a.xsd +15 -25

No files found.
--- a/documentation/XML_commonRoad_2020a.pdf
+++ b/documentation/XML_commonRoad_2020a.pdf
--- a/documentation/XML_commonRoad_XSD_2020a.xsd
+++ b/documentation/XML_commonRoad_XSD_2020a.xsd
@@ -285,7 +285,7 @@ __status__ = "released"
  </xs:complexType>
  <xs:complexType name="stopLine">
    <xs:sequence>
-      <xs:element name="point" type="point" minOccurs="2" maxOccurs="2"/>
+      <xs:element name="point" type="point" minOccurs="0" maxOccurs="2"/>
      <xs:element name="lineMarking" type="lineMarking"/>
      <xs:element name="trafficSignRef" type="trafficSignRef" minOccurs="0" maxOccurs="unbounded"/>
      <xs:element name="trafficLightRef" type="trafficLightRef" minOccurs="0" maxOccurs="1"/>
@@ -294,6 +294,7 @@ __status__ = "released"
  <xs:simpleType name="laneletType">
    <xs:restriction base="xs:string">
      <xs:enumeration value="urban"/>
+      <xs:enumeration value="interstate"/>
      <xs:enumeration value="country"/>
      <xs:enumeration value="highway"/>
      <xs:enumeration value="sidewalk"/>
@@ -305,6 +306,7 @@ __status__ = "released"
      <xs:enumeration value="accessRamp"/>
      <xs:enumeration value="driveWay"/>
      <xs:enumeration value="busStop"/>
+      <xs:enumeration value="unknown"/>
    </xs:restriction>
  </xs:simpleType>
  <xs:simpleType name="vehicleType">
@@ -329,7 +331,7 @@ __status__ = "released"
      <xs:element name="adjacentLeft" type="laneletAdjacentRef" minOccurs="0"/>
      <xs:element name="adjacentRight" type="laneletAdjacentRef" minOccurs="0"/>
      <xs:element name="stopLine" type="stopLine" minOccurs="0"/>
-      <xs:element name="laneletType" type="laneletType"/>
+      <xs:element name="laneletType" type="laneletType" maxOccurs="unbounded"/>
      <xs:element name="userOneWay" type="vehicleType" minOccurs="0" maxOccurs="unbounded"/>
      <xs:element name="userBidirectional" type="vehicleType" minOccurs="0" maxOccurs="unbounded"/>
      <xs:element name="trafficSignRef" type="trafficSignRef" minOccurs="0" maxOccurs="unbounded"/>
@@ -339,14 +341,16 @@ __status__ = "released"
  </xs:complexType>
  <!-- intersections -->
  <xs:simpleType name="trafficSignID">
-  	<xs:restriction base="xs:string">
-      <xs:enumeration value="206"/>
+      <xs:restriction base="xs:string">
+          <xs:enumeration value="206"/>
 	  <xs:enumeration value="205"/>
-      <xs:enumeration value="274"/>
+          <xs:enumeration value="274"/>
+	  <xs:enumeration value="275"/>
+          <xs:enumeration value="276"/>
 	  <xs:enumeration value="301"/>
 	  <xs:enumeration value="306"/>
-      <xs:enumeration value="310"/>
-      <xs:enumeration value="720"/>
+          <xs:enumeration value="310"/>
+          <xs:enumeration value="720"/>
 	  <xs:enumeration value="1002-10"/>
 	  <xs:enumeration value="1002-12"/>
 	  <xs:enumeration value="1002-13"/>
@@ -358,7 +362,7 @@ __status__ = "released"
 	  <xs:enumeration value="1002-21"/>
 	  <xs:enumeration value="1002-24"/>
 	  <xs:enumeration value="102"/>
-	</xs:restriction>
+      </xs:restriction>
  </xs:simpleType>
  <xs:complexType name="trafficSign">
    <xs:sequence>
@@ -533,26 +537,11 @@ __status__ = "released"
      <xs:element name="additionalTransformation" type="additionalTransformation"/>
    </xs:sequence>
  </xs:complexType>
-  <xs:simpleType name="country">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="DEU"/>
-      <xs:enumeration value="ZAM"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="federalState">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="DE-BY"/>
-      <xs:enumeration value="ZA-M"/>
-    </xs:restriction>
-  </xs:simpleType>
  <xs:complexType name="location">
    <xs:sequence minOccurs="1" maxOccurs="1">
-      <xs:element name="country" type="country"/>
-      <xs:element name="federalState" type="federalState"/>
+      <xs:element name="geoNameId" type="xs:integer"/>
      <xs:element name="gpsLatitude" type="xs:decimal"/>
      <xs:element name="gpsLongitude" type="xs:decimal"/>
-      <xs:element name="zipcode" type="xs:string" minOccurs="0"/>
-      <xs:element name="name" type="xs:string" minOccurs="0"/>
      <xs:element name="geoTransformation" type="geoTransformation" minOccurs="0"/>
    </xs:sequence>
  </xs:complexType>
@@ -572,7 +561,7 @@ __status__ = "released"
      <xs:element name="merging_lanes" type="xs:string" minOccurs="0"/>	
      <xs:element name="multi_lane" type="xs:string" minOccurs="0"/>	
      <xs:element name="no_oncoming_traffic" type="xs:string" minOccurs="0"/>	
-      <xs:element name="on_coming_traffic" type="xs:string" minOccurs="0"/>	
+      <xs:element name="oncoming_traffic" type="xs:string" minOccurs="0"/>
      <xs:element name="parallel_lanes" type="xs:string" minOccurs="0"/>
      <xs:element name="race_track" type="xs:string" minOccurs="0"/>
      <xs:element name="roundabout" type="xs:string" minOccurs="0"/>
@@ -585,6 +574,7 @@ __status__ = "released"
      <xs:element name="turn_left" type="xs:string" minOccurs="0"/>
      <xs:element name="turn_right" type="xs:string" minOccurs="0"/>
      <xs:element name="two_lane" type="xs:string" minOccurs="0"/>
+      <xs:element name="emergency_braking" type="xs:string" minOccurs="0"/>
    </xs:all>
  </xs:complexType>
  <!-- %%%%%%%%%%%%%%% root CommonRoad element %%%%%%%%%%%%%%% -->