using consistently milliseconds, adding references, refs #2

git-svn-id: file:///home/behr_mi/git/sumo_synched/trunk@15942 afbd958f-9f77-42d5-a016-97a22340ccf4
eclipse-sumo · Mar 16, 2014 · 332942a · 332942a
1 parent dc2d6fc
commit 332942a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 23 deletions.
diff --git a/sumo/data/xsd/amitran/network.xsd b/sumo/data/xsd/amitran/network.xsd
@@ -14,6 +14,7 @@
         <xsd:attribute name="id" type="xsd:unsignedInt" use="required"/>
         <xsd:attribute name="type" type="nodeTypeType" use="optional"/>
         <xsd:attribute name="odZone" type="xsd:unsignedInt" use="optional"/>
+        <xsd:attribute name="ref" type="xsd:string" use="optional"/>
     </xsd:complexType>
 
     <xsd:simpleType name="nodeTypeType">
@@ -37,6 +38,7 @@
         <xsd:attribute name="length" type="xsd:unsignedInt" use="required"/>
         <xsd:attribute name="speedLimitKmh" type="xsd:unsignedInt" use="optional"/>
         <xsd:attribute name="laneNr" type="xsd:unsignedInt" use="optional"/>
+        <xsd:attribute name="ref" type="xsd:string" use="optional"/>
     </xsd:complexType>
 
 </xsd:schema>
diff --git a/sumo/data/xsd/amitran/trajectories.xsd b/sumo/data/xsd/amitran/trajectories.xsd
@@ -8,26 +8,28 @@
                 <xsd:element name="vehicle" type="vehicleType" minOccurs="0"/>
                 <xsd:element name="motionState" type="motionStateType" minOccurs="0"/>
             </xsd:choice>
-            <xsd:attribute name="timeStepSize" use="required" type="xsd:double"/> <!-- unit: seconds -->
+            <xsd:attribute name="timeStepSize" use="required" type="xsd:unsignedInt"/> <!-- unit: 0.001s -->
         </xsd:complexType>
     </xsd:element>
 
     <xsd:complexType name="actorConfigType">
         <xsd:attribute name="id" type="xsd:unsignedInt" use="required"/> <!-- unique ID -->
         <xsd:attribute name="emissionClass" type="emissionClassType" use="optional"/>
-        <xsd:attribute name="fuelType" type="fuelTypeType" use="optional"/>
+        <xsd:attribute name="fuel" type="fuelType" use="optional"/>
         <xsd:attribute name="vehicleClass" type="vehicleClassType" use="optional"/>
-        <xsd:attribute name="vehicleLength" type="xsd:unsignedInt" use="optional"/> <!-- unit: 0.01m -->
-        <xsd:attribute name="vehicleWeight" type="xsd:unsignedInt" use="optional"/> <!-- unit: 10kg -->
-        <xsd:attribute name="vehicleAge" type="xsd:unsignedInt" use="optional"/> <!-- unit: years -->
-        <xsd:attribute name="vehicleBrand" type="vehicleBrandType" use="optional"/>
-        <xsd:attribute name="vehicleModel" type="xsd:string" use="optional"/>
+        <xsd:attribute name="length" type="xsd:unsignedInt" use="optional"/> <!-- unit: 0.01m -->
+        <xsd:attribute name="weight" type="xsd:unsignedInt" use="optional"/> <!-- unit: 10kg -->
+        <xsd:attribute name="age" type="xsd:unsignedInt" use="optional"/> <!-- unit: years -->
+        <xsd:attribute name="brand" type="xsd:string" use="optional"/>
+        <xsd:attribute name="model" type="xsd:string" use="optional"/>
+        <xsd:attribute name="ref" type="xsd:string" use="optional"/>
     </xsd:complexType>
 
     <xsd:complexType name="vehicleType">
         <xsd:attribute name="id" type="xsd:unsignedInt" use="required"/> <!-- unique ID -->
         <xsd:attribute name="actorConfig" type="xsd:unsignedInt" use="required"/> <!-- reference to actorConfig id -->
-        <xsd:attribute name="startTime" type="xsd:double" use="required"/> <!-- unit: seconds -->
+        <xsd:attribute name="startTime" type="xsd:unsignedInt" use="required"/> <!-- unit: 0.001s -->
+        <xsd:attribute name="ref" type="xsd:string" use="optional"/>
     </xsd:complexType>
 
     <xsd:complexType name="motionStateType">
@@ -67,42 +69,37 @@
         </xsd:restriction>
     </xsd:simpleType>
 
-    <xsd:simpleType name="fuelTypeType">
+    <xsd:simpleType name="fuelType">
         <xsd:restriction base="xsd:string">
             <xsd:enumeration value="Gasoline" />
             <xsd:enumeration value="Diesel" />
             <xsd:enumeration value="LPG" />
             <xsd:enumeration value="CNG" />
             <xsd:enumeration value="Battery" />
             <xsd:enumeration value="Fuelcell" />
-            <xsd:enumeration value="Hybrid" />
+            <xsd:enumeration value="HybridGasoline" />
+            <xsd:enumeration value="HybridDiesel" />
         </xsd:restriction>
     </xsd:simpleType>
 
     <xsd:simpleType name="vehicleClassType">
         <xsd:restriction base="xsd:string">
             <xsd:enumeration value="Passenger" />
-            <xsd:enumeration value="Bus" />
-            <xsd:enumeration value="Delivery" />
-            <xsd:enumeration value="Transport" />
-            <xsd:enumeration value="Bicycle" />
+            <xsd:enumeration value="TwoWheeler" />
             <xsd:enumeration value="Motorcycle" />
+            <xsd:enumeration value="Delivery" />
+            <xsd:enumeration value="UrbanBus" />
+            <xsd:enumeration value="Coach" />
+            <xsd:enumeration value="Truck" />
+            <xsd:enumeration value="Trailer" />
         </xsd:restriction>
     </xsd:simpleType>
 
-    <xsd:simpleType name="vehicleBrandType">
-        <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="BMW" />
-            <xsd:enumeration value="Opel" />
-            <xsd:enumeration value="Renault" />
-        </xsd:restriction>
-    </xsd:simpleType>
-
     <xsd:simpleType name="roadTypeType">
         <xsd:restriction base="xsd:string">
             <xsd:enumeration value="urban" />
             <xsd:enumeration value="motorway" />
         </xsd:restriction>
     </xsd:simpleType>
 
-</xsd:schema>
+</xsd:schema>