Skip to content

Commit c7c0d07

Browse files
nick-knowlesnick-knowles
committed
FIX : ROLLING STOCK ITEM should inherit from VEHICLE
Refix access rightParm,ter support so ROmanian exampel works
1 parent 1fd5559 commit c7c0d07

File tree

3 files changed

+37
-22
lines changed

3 files changed

+37
-22
lines changed

‎xsd/netex_framework/netex_reusableComponents/netex_vehicle_support.xsd‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
<Contributor>Nicholas Knowles</Contributor>
1212
<Coverage>Europe</Coverage>
1313
<Creator>First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles.</Creator>
14-
<Date><Created>2024-02-11</Created>Factor out from vehicleType_support package
14+
<Date>
15+
<Created>2024-02-11</Created>Factor out from vehicleType_support package
1516
</Date>
16-
<Date><Modified>2024-02-11</Modified>Add RollinhgSTockInvenotry, RollingSTock item etc
17+
<Date>
18+
<Modified>2024-02-11</Modified>Add RollinhgSTockInvenotry, RollingSTock item etc
1719
</Date>
1820
<Description>
1921
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
@@ -111,9 +113,9 @@ Rail transport, Roads and Road transport
111113
<xsd:annotation>
112114
<xsd:documentation>Type for identifier of a ROLLING STOCK ITEM.</xsd:documentation>
113115
</xsd:annotation>
114-
<xsd:restriction base="ObjectIdType"/>
116+
<xsd:restriction base="VehicleIdType"/>
115117
</xsd:simpleType>
116-
<xsd:element name="RollingStockItemRef" type="RollingStockItemRefStructure" abstract="true" substitutionGroup="VersionOfObjectRef">
118+
<xsd:element name="RollingStockItemRef" type="RollingStockItemRefStructure" abstract="true" substitutionGroup="VehicleRef">
117119
<xsd:annotation>
118120
<xsd:documentation>Reference to a ROLLING STOCK ITEM. +v2.0</xsd:documentation>
119121
</xsd:annotation>
@@ -123,7 +125,7 @@ Rail transport, Roads and Road transport
123125
<xsd:documentation>Type for a reference to a ROLLING STOCK ITEM.</xsd:documentation>
124126
</xsd:annotation>
125127
<xsd:simpleContent>
126-
<xsd:restriction base="VersionOfObjectRefStructure">
128+
<xsd:restriction base="VehicleRefStructure">
127129
<xsd:attribute name="ref" type="RollingStockItemIdType" use="required">
128130
<xsd:annotation>
129131
<xsd:documentation>Identifier of a ROLLING STOCK ITEM.</xsd:documentation>

‎xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,36 @@
1818
<Date>
1919
<Created>2010-09-04</Created>
2020
</Date>
21-
<Date><Modified>2011-02-05</Modified>Name Space changes
21+
<Date>
22+
<Modified>2011-02-05</Modified>Name Space changes
2223
</Date>
23-
<Date><Modified>2017-03-27</Modified>CR0001 - Vehicle Dimensions added.
24+
<Date>
25+
<Modified>2017-03-27</Modified>CR0001 - Vehicle Dimensions added.
2426
</Date>
25-
<Date><Modified>2019-03-25</Modified>NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType.
27+
<Date>
28+
<Modified>2019-03-25</Modified>NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType.
2629
NJSK Review correct data types of new attributes to be of LengthType
2730
</Date>
28-
<Date><Modified>2021-07-07</Modified>NewModes-Power Description attribute to NVehicleEquipmentProfile
31+
<Date>
32+
<Modified>2021-07-07</Modified>NewModes-Power Description attribute to NVehicleEquipmentProfile
2933
</Date>
30-
<Date><Modified>2020-10-05</Modified> New Modes: Add Vehicle mode to VehicleType
34+
<Date>
35+
<Modified>2020-10-05</Modified> New Modes: Add Vehicle mode to VehicleType
3136
Refactor VehicleType into TarnsportType, VehicleType and PesonalVehicleType
3237
Replace Vehicle OperatorRef with TransportOrganisationRef.
3338
Add VehicleModelRef to Vehicle.
3439
Add ModelProfileRef to VehicleModel
3540
Add Description to Vehicle.
3641
Add PropulsionType . and MaximumRange to TransportType
3742
</Date>
38-
<Date><Modified>2021-07-08</Modified>NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel
43+
<Date>
44+
<Modified>2021-07-08</Modified>NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel
3945
</Date>
40-
<Date><Modified>2023-01-30</Modified>TM CR: Enhancement Add Accepted Driver Permit
46+
<Date>
47+
<Modified>2023-01-30</Modified>TM CR: Enhancement Add Accepted Driver Permit
4148
</Date>
42-
<Date><Modified>2024-02-07</Modified>Fix - allow default DEck Plan or TRANSPORT TYPE, move VehiclesInFramegroup her
49+
<Date>
50+
<Modified>2024-02-07</Modified>Fix - allow default DEck Plan or TRANSPORT TYPE, move VehiclesInFramegroup her
4351
</Date>
4452
<Description>
4553
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
@@ -276,6 +284,9 @@ Rail transport, Roads and Road transport
276284
<xsd:sequence>
277285
<xsd:group ref="DataManagedObjectGroup"/>
278286
</xsd:sequence>
287+
<xsd:sequence>
288+
<xsd:group ref="VehicleGroup"/>
289+
</xsd:sequence>
279290
<xsd:sequence>
280291
<xsd:group ref="RollingStockItemGroup"/>
281292
</xsd:sequence>
@@ -294,7 +305,7 @@ Rail transport, Roads and Road transport
294305
<xsd:documentation>Type for a ROLLING STOCK ITEM.</xsd:documentation>
295306
</xsd:annotation>
296307
<xsd:complexContent>
297-
<xsd:extension base="DataManagedObjectStructure">
308+
<xsd:extension base="Vehicle_VersionStructure">
298309
<xsd:sequence>
299310
<xsd:group ref="RollingStockItemGroup"/>
300311
</xsd:sequence>
@@ -306,9 +317,6 @@ Rail transport, Roads and Road transport
306317
<xsd:documentation>Elements for ROLLING STOCK ITEM.</xsd:documentation>
307318
</xsd:annotation>
308319
<xsd:sequence>
309-
<xsd:group ref="VehicleRequirementGroup"/>
310-
<xsd:element ref="TransportOrganisationRef" minOccurs="0"/>
311-
<xsd:element ref="VehicleModelRef" minOccurs="0"/>
312320
<xsd:element name="RollingStockType" type="TrainElementTypeTypeEnumeration" minOccurs="0">
313321
<xsd:annotation>
314322
<xsd:documentation>Fixed classication of ROLLING STOCK ITEM.</xsd:documentation>
@@ -320,11 +328,6 @@ Rail transport, Roads and Road transport
320328
<xsd:documentation>Faciliies found in ROLLING STOCK ITEM.</xsd:documentation>
321329
</xsd:annotation>
322330
</xsd:element>
323-
<xsd:element name="actualEquipments" type="equipments_RelStructure" minOccurs="0">
324-
<xsd:annotation>
325-
<xsd:documentation>ACTUAL EQUIPMENT found in ROLLING STOCK ITEM.</xsd:documentation>
326-
</xsd:annotation>
327-
</xsd:element>
328331
</xsd:sequence>
329332
</xsd:group>
330333
<!-- ==== TRAILING ROLLING STOCK ITEM ===================================================== -->
@@ -342,6 +345,9 @@ Rail transport, Roads and Road transport
342345
<xsd:sequence>
343346
<xsd:group ref="DataManagedObjectGroup"/>
344347
</xsd:sequence>
348+
<xsd:sequence>
349+
<xsd:group ref="VehicleGroup"/>
350+
</xsd:sequence>
345351
<xsd:sequence>
346352
<xsd:group ref="RollingStockItemGroup"/>
347353
</xsd:sequence>
@@ -393,6 +399,9 @@ Rail transport, Roads and Road transport
393399
<xsd:sequence>
394400
<xsd:group ref="DataManagedObjectGroup"/>
395401
</xsd:sequence>
402+
<xsd:sequence>
403+
<xsd:group ref="VehicleGroup"/>
404+
</xsd:sequence>
396405
<xsd:sequence>
397406
<xsd:group ref="RollingStockItemGroup"/>
398407
</xsd:sequence>

‎xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_route_support.xsd"/>
1919
<!-- ====Timetables ========================================================= -->
2020
<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd"/>
21+
<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd"/>
2122
<!-- ====Fares ========================================================= -->
2223
<xsd:include schemaLocation="netex_validableElement_support.xsd"/>
2324
<xsd:include schemaLocation="netex_qualityStructureFactor_support.xsd"/>
@@ -607,6 +608,9 @@ Rail transport, Roads and Road transport
607608
</xsd:annotation>
608609
<xsd:sequence>
609610
<xsd:element ref="ServiceJourneyRef" minOccurs="0"/>
611+
<xsd:element ref="SpecialServiceRef" minOccurs="0"/>
612+
<xsd:element ref="DatedVehicleJourneyRef" minOccurs="0"/>
613+
<xsd:element ref="NormalDatedVehicleJourneyRef" minOccurs="0"/>
610614
<xsd:element ref="TrainNumberRef" minOccurs="0"/>
611615
<xsd:element ref="GroupOfServicesRef" minOccurs="0"/>
612616
</xsd:sequence>

0 commit comments

Comments
 (0)