Skip to content

Commit 1b5c420

Browse files
nick-knowlesnick-knowles
committed
Add missing attributes from VehcingCHargingEquipment
Also had to fix travel specicationSummary so that exampels validated - Alternatvie modes additions had been lost
1 parent c7c0d07 commit 1b5c420

File tree

6 files changed

+64
-27
lines changed

6 files changed

+64
-27
lines changed

‎examples/functions/newModes/NewModes-CycleSharingExample.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@
288288
</vehicleEquipmentProfileMembers>
289289
</VehicleEquipmentProfile>
290290
<RechargingEquipmentProfile version="any" id="ebike_charging">
291-
<CouplingType>plug</CouplingType>
291+
<PowerCouplingType>plug</PowerCouplingType>
292292
<PlugType>type2</PlugType>
293293
<CurrentType>1-PhaseAC</CurrentType>
294294
<MaximumChargingPower>240</MaximumChargingPower>

‎examples/standards/vdv452/timetable/NeTEx VDV Example.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@
798798
<MinimumUnits>2</MinimumUnits>
799799
</VehicleEquipmentProfileMember>
800800
</vehicleEquipmentProfileMembers>
801-
<CouplingType>plug</CouplingType>
801+
<PowerCouplingType>plug</PowerCouplingType>
802802
<CurrentType>3-PhaseAC</CurrentType>
803803
<ChargingVoltage>240</ChargingVoltage>
804804
<MaximumChargingPower>40</MaximumChargingPower>

‎xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Rail transport, Roads and Road transport
100100
<xsd:documentation>Elements for RECHARGING EQUIPMENT PROFILE.</xsd:documentation>
101101
</xsd:annotation>
102102
<xsd:sequence>
103-
<xsd:element name="CouplingType" type="CouplingTypeEnumeration" minOccurs="0">
103+
<xsd:element name="PowerCouplingType" type="PowerCouplingTypeEnumeration" minOccurs="0">
104104
<xsd:annotation>
105105
<xsd:documentation>Type of coupling. See allowed values.</xsd:documentation>
106106
</xsd:annotation>

‎xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2.2" id="netex_nm_equipmentEnergy_support">
2+
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.02" id="netex_nm_equipmentEnergy_support">
33
<xsd:include schemaLocation="netex_equipment_support.xsd"/>
44
<!-- ======================================================================= -->
55
<xsd:annotation>
@@ -12,11 +12,17 @@
1212
<Date>
1313
<Created>2007-06-12</Created>
1414
</Date>
15-
<Date><Modified>2020-10-07</Modified>Split out from Parking Equipment
15+
<Date>
16+
<Modified>2020-10-07</Modified>Split out from Parking Equipment
1617
</Date>
17-
<Date><Modified>2021-09-02</Modified>New Modes: Add Battery and TypeOfBatteryChemistry, PlugType, etc.
18+
<Date>
19+
<Modified>2021-09-02</Modified>New Modes: Add Battery and TypeOfBatteryChemistry, PlugType, etc.
1820
</Date>
19-
<Date><Modified>2023-11-21</Modified>CR0545 CouplingTypeEnumeration: deprecated pantographAbove.
21+
<Date>
22+
<Modified>2023-11-21</Modified>CR0545 CouplingTypeEnumeration: deprecated pantographAbove.
23+
</Date>
24+
<Date>
25+
<Modified>2025-05-27</Modified>Rename CouplingTypeENumeration to PowerCouplingTypeENumeration to avoid confusion with thrain coupling.
2026
</Date>
2127
<Description>
2228
<p>NeTEx - Network Exchange. This subschema defines ENERGY EQUIPMENT types for Place access.</p>
@@ -209,9 +215,9 @@ Rail transport, Roads and Road transport
209215
<xsd:enumeration value="shockproof"/>
210216
</xsd:restriction>
211217
</xsd:simpleType>
212-
<xsd:simpleType name="CouplingTypeEnumeration">
218+
<xsd:simpleType name="PowerCouplingTypeEnumeration">
213219
<xsd:annotation>
214-
<xsd:documentation>Values for Coupling Types +v1.2.2</xsd:documentation>
220+
<xsd:documentation>Values forPower Coupling Types +v1.2.2</xsd:documentation>
215221
</xsd:annotation>
216222
<xsd:restriction base="xsd:NMTOKEN">
217223
<xsd:enumeration value="undefined"/>

‎xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2.2" id="netex_nm_equipmentEnergy_version">
2+
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.02" id="netex_nm_equipmentEnergy_version">
33
<xsd:include schemaLocation="../netex_utility/netex_units.xsd"/>
44
<xsd:include schemaLocation="netex_vehicleType_support.xsd"/>
55
<xsd:include schemaLocation="netex_nm_equipmentEnergy_support.xsd"/>
@@ -21,9 +21,14 @@
2121
<Date>
2222
<Modified>2011-12-16</Modified>
2323
</Date>
24-
<Date><Modified>2017-05-25</Modified> Definition of CycleStorage number of spaces corrected. Doc change only.
24+
<Date>
25+
<Modified>2017-05-25</Modified> Definition of CycleStorage number of spaces corrected. Doc change only.
26+
</Date>
27+
<Date>
28+
<Modified>2021-09-02</Modified>Add Battery and TypeOfBatteryChemistry
2529
</Date>
26-
<Date><Modified>2021-09-02</Modified>Add Battery and TypeOfBatteryChemistry
30+
<Date>
31+
<Modified>2025-04-29</Modified>Add PlugType, TypeOfPlugRef CurrentType, PowerCOuplingType to VehicleCHargingEqeuipment
2732
</Date>
2833
<Description>
2934
<p>NeTEx - Network Exchange. This subschema defines ENERGY EQUIPMENT base types.</p>
@@ -37,7 +42,7 @@
3742
<Language>[ISO 639-2/B] ENG</Language>
3843
<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
3944
<Rights>Unclassified
40-
<Copyright>CEN, Crown Copyright 2009-2021</Copyright>
45+
<Copyright>CEN, Crown Copyright 2009-2025</Copyright>
4146
</Rights>
4247
<Source>
4348
<ul>
@@ -138,6 +143,22 @@ points cannot exceed this value.</xsd:documentation>
138143
<xsd:documentation>Grid Voltage to the equipment.</xsd:documentation>
139144
</xsd:annotation>
140145
</xsd:element>
146+
<xsd:element name="CurrentType" type="CurrentTypeEnumeration" minOccurs="0">
147+
<xsd:annotation>
148+
<xsd:documentation>Classification of Current as AC, DC, etc +v2.0</xsd:documentation>
149+
</xsd:annotation>
150+
</xsd:element>
151+
<xsd:element name="PlugType" type="PlugTypeEnumeration" minOccurs="0">
152+
<xsd:annotation>
153+
<xsd:documentation>Classification of Plug Type - standard values +v2.0 as AC, DC, etc +v2.</xsd:documentation>
154+
</xsd:annotation>
155+
</xsd:element>
156+
<xsd:element ref="TypeOfPlugRef" minOccurs="0"/>
157+
<xsd:element name="PowerCouplingType" type="PowerCouplingTypeEnumeration" minOccurs="0">
158+
<xsd:annotation>
159+
<xsd:documentation>Classification of Power Coup _v2.0ling.</xsd:documentation>
160+
</xsd:annotation>
161+
</xsd:element>
141162
</xsd:sequence>
142163
</xsd:group>
143164
<!-- === VEHICLE REFUELLING EQUIPMENT ============================================ -->

‎xsd/netex_part_3/part3_salesTransactions/netex_travelSpecificationSummary_version.xsd‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ Rail transport, Roads and Road transport
8787
<xsd:include schemaLocation="../part3_fares/netex_fareConditionSummary_version.xsd"/>
8888
<xsd:include schemaLocation="netex_spotAllocation_version.xsd"/>
8989
<!-- ======================================================================= -->
90+
<xsd:include schemaLocation="../../netex_part_5/part5_rc/netex_nm_mobilityService_support.xsd"/>
9091
<xsd:element name="TravelSpecificationSummaryView" type="TravelSpecificationSummaryViewStructure">
9192
<xsd:annotation>
9293
<xsd:documentation>Summary of key aspects of TRAVEL SPECIFICATION. +V1.1. This data should all be derivable from the PARAMATER ASSIGNMENTs. v+1.1</xsd:documentation>
@@ -114,6 +115,7 @@ Rail transport, Roads and Road transport
114115
</xsd:group>
115116
<xsd:group ref="TravelSpecificationSummaryFareGroup"/>
116117
<xsd:group ref="TravelSpecificationSummarySeatingGroup"/>
118+
<xsd:group ref="TravelSpecificationSummaryAlternateModesGroup"/>
117119
<xsd:element ref="ConditionSummary" minOccurs="0"/>
118120
</xsd:sequence>
119121
</xsd:complexType>
@@ -188,22 +190,14 @@ Rail transport, Roads and Road transport
188190
</xsd:choice>
189191
</xsd:sequence>
190192
</xsd:group>
191-
<xsd:complexType name="travelSpecificationJourneyRefs_RelStructure">
193+
<xsd:group name="TravelSpecificationSummaryAlternateModesGroup">
192194
<xsd:annotation>
193-
<xsd:documentation>Type for a list of JOURNEYs.</xsd:documentation>
195+
<xsd:documentation>Fare elements for TRAVEL SPECIFICATION. Summary View.</xsd:documentation>
194196
</xsd:annotation>
195-
<xsd:complexContent>
196-
<xsd:extension base="oneToManyRelationshipStructure">
197-
<xsd:choice minOccurs="0" maxOccurs="unbounded">
198-
<xsd:sequence>
199-
<xsd:element ref="ServiceJourneyRef" minOccurs="0"/>
200-
<xsd:element ref="SingleJourneyRef" minOccurs="0"/>
201-
<xsd:element ref="TrainNumberRef" minOccurs="0"/>
202-
</xsd:sequence>
203-
</xsd:choice>
204-
</xsd:extension>
205-
</xsd:complexContent>
206-
</xsd:complexType>
197+
<xsd:sequence>
198+
<xsd:element ref="MobilityServiceRef" minOccurs="0"/>
199+
</xsd:sequence>
200+
</xsd:group>
207201
<xsd:group name="TravelSpecificationSummaryFareGroup">
208202
<xsd:annotation>
209203
<xsd:documentation>Fare elements for TRAVEL SPECIFICATION. Summary View.</xsd:documentation>
@@ -222,6 +216,22 @@ Rail transport, Roads and Road transport
222216
</xsd:element>
223217
</xsd:sequence>
224218
</xsd:group>
219+
<xsd:complexType name="travelSpecificationJourneyRefs_RelStructure">
220+
<xsd:annotation>
221+
<xsd:documentation>Type for a list of JOURNEYs.</xsd:documentation>
222+
</xsd:annotation>
223+
<xsd:complexContent>
224+
<xsd:extension base="oneToManyRelationshipStructure">
225+
<xsd:choice minOccurs="0" maxOccurs="unbounded">
226+
<xsd:sequence>
227+
<xsd:element ref="ServiceJourneyRef" minOccurs="0"/>
228+
<xsd:element ref="SingleJourneyRef" minOccurs="0"/>
229+
<xsd:element ref="TrainNumberRef" minOccurs="0"/>
230+
</xsd:sequence>
231+
</xsd:choice>
232+
</xsd:extension>
233+
</xsd:complexContent>
234+
</xsd:complexType>
225235
<xsd:group name="TravelSpecificationSummarySeatingGroup">
226236
<xsd:annotation>
227237
<xsd:documentation>Seating elements for TRAVEL SPECIFICATION. Summary View.</xsd:documentation>

0 commit comments

Comments
 (0)