Skip to content

rest from #123 #622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ue71603 wants to merge 4 commits into from
Closed

rest from #123 #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d8f74e
rest from #123
ue71603 Dec 21, 2023
1fc01cb
Apply suggestions from code review
skinkie Dec 21, 2023
a5677ef
Apply suggestions from code review
skinkie Dec 21, 2023
a8ecee4
Apply suggestions from code review
skinkie Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,32 @@ Rail transport, Roads and Road transport
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
<!-- ==== ACTUAL VEHICLE EQUIPMENT================================================ -->
<xsd:simpleType name="ActualVehicleEquipmentIdType">
<xsd:annotation>
<xsd:documentation>Type for identifier of an ACTUAL VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="ObjectIdType"/>
</xsd:simpleType>
<xsd:element name="ActualVehicleEquipmentRef" type="ActualVehicleEquipmentRefStructure" substitutionGroup="VersionOfObjectRef">
<xsd:annotation>
<xsd:documentation>Reference to an ACTUAL VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="ActualVehicleEquipmentRefStructure">
<xsd:annotation>
<xsd:documentation>Type for a reference to a ACTUAL VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="VersionOfObjectRefStructure">
<xsd:attribute name="ref" type="ActualVehicleEquipmentIdType" use="required">
<xsd:annotation>
<xsd:documentation>Identifier of a ACTUAL VEHICLE EQUIPMENT</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
<!-- ======VEHICLE EQUIPMENT PROFILE ====================================================== -->
<xsd:complexType name="vehicleEquipmentProfileRefs_RelStructure">
<xsd:annotation>
Expand Down
16 changes: 15 additions & 1 deletion xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,7 +981,7 @@ Rail transport, Roads and Road transport
<xsd:element ref="TransportTypeRef" minOccurs="0"/>
<xsd:element ref="VehicleModelRef" minOccurs="0"/>
<xsd:element ref="VehicleModelProfileRef" minOccurs="0"/>
<xsd:element name="actualVehicleEquipments" type="equipments_RelStructure" minOccurs="0">
<xsd:element name="actualVehicleEquipments" type="actualVehicleEquipments_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>ACTUAL EQUIPMENT found in VEHICLE.</xsd:documentation>
</xsd:annotation>
Expand All @@ -1001,6 +1001,20 @@ Rail transport, Roads and Road transport
<xsd:element ref="PrivateCode" minOccurs="0"/>
</xsd:sequence>
</xsd:group>
<!-- ======================================================================= -->
<xsd:complexType name="actualVehicleEquipments_RelStructure">
<xsd:annotation>
<xsd:documentation>List of ACTUAL VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="containmentAggregationStructure">
<xsd:choice maxOccurs="unbounded">
<xsd:element ref="ActualVehicleEquipmentRef"/>
<xsd:element ref="ActualVehicleEquipment"/>
</xsd:choice>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<!-- ====== VEHICLE MODEL ====================================================== -->
<xsd:element name="VehicleModel" substitutionGroup="DataManagedObject">
<xsd:annotation>
Expand Down