Skip to content

Commit

Permalink
Recharging point revisions for VVS
Browse files Browse the repository at this point in the history 
Allow VEHICLE JOURNEY to ref a RECHARHING PROFILE. ALLOW RECHARGING PROFIEL to say which VEHCILE CHARGING EQUIPMENT it is compatibel with.
  • Loading branch information
@nick-knowles
nick-knowles committed Oct 28, 2024
1 parent b2bcb57 commit 788cb44
Show file tree
Hide file tree
Showing 8 changed files with 158 additions and 82 deletions.
22 changes: 12 additions & 10 deletions examples/standards/vdv452/timetable/NeTEx VDV Example.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,19 +81,15 @@
</TypeOfJourneyPattern>
</values>
</ValueSet>


<ValueSet version="1" id="ValueSet:TypeOfPlug" classOfValues="TypeOfPlug">
<values>
<TypeOfPlug version="1" id="ToP_special21">
<Name>bus stop</Name>
<ShortName>HP</ShortName>
<PrivateCode>1</PrivateCode>
</TypeOfPlug>
</TypeOfPlug>
</values>
</ValueSet>


</typesOfValue>
<organisations>
<Operator id="OP_1" version="1">
Expand Down Expand Up @@ -802,27 +798,31 @@
<VehicleTypeRef version="1" ref="VT_3"/>
<FullCharge>2000</FullCharge>
<equipmentProfiles>
<RechargingEquipmentProfileRef version="any" ref="VT_electric_bus_A_refuel"/>
<RechargingEquipmentProfileRef version="1" ref="REP_electric_bus_A_recharge"/>
</equipmentProfiles>
</VehicleModel>
</vehicleModels>
<vehicleEquipmentProfiles>
<!-- RCP RECHARGING PLAN ADDED -->
<RechargingEquipmentProfile version="any" id="VT_electric_bus_A_refuel">
<RechargingEquipmentProfile version="1" id="REP_electric_bus_A_recharge">
<Name>On board charging equipment</Name>
<vehicleEquipmentProfileMembers>
<VehicleEquipmentProfileMember version="any" id="VT_electric_bus_battery">
<VehicleEquipmentProfileMember version="any" id="VEPM_electric_bus_battery">
<BatteryEquipmentRef version="any" ref="BEq_1"/>
<MinimumUnits>2</MinimumUnits>
</VehicleEquipmentProfileMember>
</vehicleEquipmentProfileMembers>
<CouplingType>plug</CouplingType>
<TypeOfPlugRef version="1" ref="ToP_special21"/>
<CouplingType>plug</CouplingType>
<TypeOfPlugRef version="1" ref="ToP_special21"/>
<CurrentType>3-PhaseAC</CurrentType>
<ChargingVoltage>240</ChargingVoltage>
<MaximumChargingPower>40</MaximumChargingPower>
<PreparationDuration>PT2M</PreparationDuration>
<FinalisationDuration>PT1M</FinalisationDuration>
<compatibleWith>
<VehicleChargingEquipmentRef version="any" ref="VCEq_1"/>
<VehicleChargingEquipmentRef version="any" ref="VCEq_2"/>
</compatibleWith>
</RechargingEquipmentProfile>
</vehicleEquipmentProfiles>
<vehicles>
Expand Down Expand Up @@ -50224,6 +50224,8 @@
<DayTypeRef ref="DT_24" version="1"/>
</dayTypes>
<ServicePatternRef ref="SP_5549" version="1"/>
<VehicleTypeRef ref="VT_1" version="1"/>
<RechargingEquipmentProfileRef ref="REP_electric_bus_A_recharge" version="1"/>
<BlockRef ref="BL_2" version="1"/>
<CourseOfJourneysRef ref="COFJ_2" version="1"/>
<timeDemandTypes>
Expand Down
5 changes: 3 additions & 2 deletions xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_support.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<Date>
<Created>021-09-02</Created>
</Date>
<Date><Modified>2021-09-02</Modified>Split out from Parking Equipoment
<Date>
<Modified>2021-09-02</Modified>Split out from Parking Equipoment
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines CHARGING PROFILE types for Place access.</p>
Expand Down Expand Up @@ -60,7 +61,7 @@ Rail transport, Roads and Road transport
</xsd:simpleType>
<xsd:element name="RechargingEquipmentProfileRef" type="RechargingEquipmentProfileRefStructure" substitutionGroup="VehicleEquipmentProfileRef">
<xsd:annotation>
<xsd:documentation>Identifier of an RECHARGING EQUIPMENT PROFILE. +v1.2.2</xsd:documentation>
<xsd:documentation>Reference to a RECHARGING EQUIPMENT PROFILE. +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="RechargingEquipmentProfileRefStructure">
Expand Down
5 changes: 5 additions & 0 deletions xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Normal time to decouple after charging.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="compatibleWith" type="compatibleEquipmentRefs_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Compatible equipment. +V2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<!-- ======================================================================= -->
Expand Down
62 changes: 57 additions & 5 deletions xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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.0" id="netex_nm_equipmentEnergy_support">
<xsd:include schemaLocation="netex_equipment_support.xsd"/>
<!-- ======================================================================= -->
<xsd:annotation>
Expand All @@ -12,11 +12,17 @@
<Date>
<Created>2007-06-12</Created>
</Date>
<Date><Modified>2020-10-07</Modified>Split out from Parking Equipment
<Date>
<Modified>2020-10-07</Modified>Split out from Parking Equipment
</Date>
<Date><Modified>2021-09-02</Modified>New Modes: Add Battery and TypeOfBatteryChemistry, PlugType, etc.
<Date>
<Modified>2021-09-02</Modified>New Modes: Add Battery and TypeOfBatteryChemistry, PlugType, etc.
</Date>
<Date><Modified>2023-11-21</Modified>CR0545 CouplingTypeEnumeration: deprecated pantographAbove.
<Date>
<Modified>2023-11-21</Modified>CR0545 CouplingTypeEnumeration: deprecated pantographAbove.
</Date>
<Date>
<Modified>2024-10-24</Modified>Add Compatible with rel.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines ENERGY EQUIPMENT types for Place access.</p>
Expand All @@ -30,7 +36,7 @@
<Language>[ISO 639-2/B] ENG</Language>
<Publisher>CEN TC278 WG3 SG9</Publisher>
<Rights>Unclassified
<Copyright>CEN, Crown Copyright 2009-2021</Copyright>
<Copyright>CEN, Crown Copyright 2009-2024</Copyright>
</Rights>
<Source>
<ul>
Expand All @@ -55,6 +61,20 @@ Rail transport, Roads and Road transport
</xsd:appinfo>
<xsd:documentation>ENERGY EQUIPMENT identifier types for NeTEx.</xsd:documentation>
</xsd:annotation>
<xsd:complexType name="compatibleEquipmentRefs_RelStructure">
<xsd:annotation>
<xsd:documentation>List of VEHICLE CHarging or REFUELLING EQUIPMENT with which is compatible.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="containmentAggregationStructure">
<xsd:choice maxOccurs="unbounded">
<xsd:element ref="VehicleChargingEquipmentRef"/>
<xsd:element ref="RefuellingEquipmentRef"/>
<xsd:element ref="BatteryEquipmentRef"/>
</xsd:choice>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<!-- ==== VEHICLE CHARGING EQUIPMENT =========================================== -->
<xsd:simpleType name="VehicleChargingEquipmentIdType">
<xsd:annotation>
Expand Down Expand Up @@ -186,6 +206,38 @@ Rail transport, Roads and Road transport
</xsd:simpleContent>
</xsd:complexType>
<!-- ======================================================================= -->
<xsd:simpleType name="FuelTypeListOfEnumerations">
<xsd:annotation>
<xsd:documentation>List of allowed values for file type.</xsd:documentation>
</xsd:annotation>
<xsd:list itemType="FuelTypeEnumeration"/>
</xsd:simpleType>
<xsd:simpleType name="FuelTypeEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for type of fuel.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:normalizedString">
<xsd:enumeration value="battery"/>
<xsd:enumeration value="biodiesel"/>
<xsd:enumeration value="diesel"/>
<xsd:enumeration value="dieselBatteryHybrid"/>
<xsd:enumeration value="electricContact"/>
<xsd:enumeration value="electricity"/>
<xsd:enumeration value="ethanol"/>
<xsd:enumeration value="hydrogen"/>
<xsd:enumeration value="liquidGas"/>
<xsd:enumeration value="tpg"/>
<xsd:enumeration value="methane"/>
<xsd:enumeration value="naturalGas"/>
<xsd:enumeration value="petrol"/>
<xsd:enumeration value="petrolBatteryHybrid"/>
<xsd:enumeration value="petrolLeaded"/>
<xsd:enumeration value="petrolUnleaded"/>
<xsd:enumeration value="none"/>
<xsd:enumeration value="other"/>
</xsd:restriction>
</xsd:simpleType>
<!-- ======================================================================= -->
<xsd:simpleType name="PlugTypeEnumeration">
<xsd:annotation>
<xsd:documentation>Values for Plug Types +v1.2.2</xsd:documentation>
Expand Down
20 changes: 15 additions & 5 deletions xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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.0" id="netex_nm_equipmentEnergy_version">
<xsd:include schemaLocation="../netex_utility/netex_units.xsd"/>
<xsd:include schemaLocation="netex_vehicleType_support.xsd"/>
<xsd:include schemaLocation="netex_nm_equipmentEnergy_support.xsd"/>
<xsd:include schemaLocation="netex_equipmentPlace_version.xsd"/>
<xsd:include schemaLocation="netex_equipment_version.xsd"/>
<!-- ======================================================================= -->
<xsd:annotation>
<xsd:appinfo>
Expand All @@ -21,9 +20,14 @@
<Date>
<Modified>2011-12-16</Modified>
</Date>
<Date><Modified>2017-05-25</Modified> Definition of CycleStorage number of spaces corrected. Doc change only.
<Date>
<Modified>2017-05-25</Modified> Definition of CycleStorage number of spaces corrected. Doc change only.
</Date>
<Date>
<Modified>2021-09-02</Modified>Add Battery and TypeOfBatteryChemistry
</Date>
<Date><Modified>2021-09-02</Modified>Add Battery and TypeOfBatteryChemistry
<Date>
<Modified>2024-10-26</Modified>Plug Type and TypeofPlug )open) to Recharging Equipment
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines ENERGY EQUIPMENT base types.</p>
Expand Down Expand Up @@ -125,6 +129,12 @@ Rail transport, Roads and Road transport
<xsd:documentation>Type of storage.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PlugType" type="PlugTypeEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Type of Plug supported (Fixed choice).</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="TypeOfPlugRef" minOccurs="0"/>
<xsd:element name="MaximumPower" type="WattageType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Maximum charging power of the grid
Expand Down
64 changes: 23 additions & 41 deletions xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,43 @@
<Date>
<Created>2010-09-04</Created>
</Date>
<Date><Modified>2011-02-05</Modified>Name Space changes
<Date>
<Modified>2011-02-05</Modified>Name Space changes
</Date>
<Date><Modified>2012-04-15</Modified>Revise Passenger Capacity
<Date>
<Modified>2012-04-15</Modified>Revise Passenger Capacity
</Date>
<Date><Modified>2019-04-09</Modified>Add list of vehicle type refs for PARKING and general use
<Date>
<Modified>2019-04-09</Modified>Add list of vehicle type refs for PARKING and general use
</Date>
<Date><Modified>2020-08-11</Modified>Issue #110 Add missing fuel types
<Date>
<Modified>2020-08-11</Modified>Issue #110 Add missing fuel types
electricContact, battery, dieselBatteryHybrid, petrolBatteryHybrid, biodiesel, hydrogen, liquidGas, methane, ethanol
</Date>
<Date><Modified>2020-10-04</Modified>NewModes: Add list of VEHICLEs.
<Date>
<Modified>2020-10-04</Modified>NewModes: Add list of VEHICLEs.
Add TransportType, SimpleVehicleType
Add fuel types none, other,
ADd Power Tpe enumeration
Add Vehicle PRofile
</Date>
<Date><Modified>2021-04-19</Modified>NewModes: GBFS compatibility Add car to vehicle Types
<Date>
<Modified>2021-04-19</Modified>NewModes: GBFS compatibility Add car to vehicle Types
</Date>
<Date><Modified>2021-07-07</Modified>NewModes: Add extra fuel types from APDS
<Date>
<Modified>2021-07-07</Modified>NewModes: Add extra fuel types from APDS
</Date>
<Date><Modified>2021-07-08</Modified>NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel
<Date>
<Modified>2021-07-08</Modified>NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel
</Date>
<Date><Modified>2023-01-30</Modified>TM CR: Enhancement Add Accepted Driver Permit
<Date>
<Modified>2023-01-30</Modified>TM CR: Enhancement Add Accepted Driver Permit
</Date>
<Date>
<Modified>2024-01-17</Modified>TM CR: Enhancement Add PASSENGER VEHICLE CAPACITY
</Date>
<Date><Modified>2024-01-17</Modified>TM CR: Enhancement Add PASSENGER VEHICLE CAPACITY
<Date>
<Modified>2024-10-26</Modified>Move Type of Fuel to Energy Equipmenyt Support
</Date>
<Description>
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
Expand Down Expand Up @@ -414,37 +427,6 @@ Rail transport, Roads and Road transport
</xsd:simpleContent>
</xsd:complexType>
<!-- ======================================================================= -->
<xsd:simpleType name="FuelTypeListOfEnumerations">
<xsd:annotation>
<xsd:documentation>List of allowed values for file type.</xsd:documentation>
</xsd:annotation>
<xsd:list itemType="FuelTypeEnumeration"/>
</xsd:simpleType>
<xsd:simpleType name="FuelTypeEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for type of fuel.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:normalizedString">
<xsd:enumeration value="battery"/>
<xsd:enumeration value="biodiesel"/>
<xsd:enumeration value="diesel"/>
<xsd:enumeration value="dieselBatteryHybrid"/>
<xsd:enumeration value="electricContact"/>
<xsd:enumeration value="electricity"/>
<xsd:enumeration value="ethanol"/>
<xsd:enumeration value="hydrogen"/>
<xsd:enumeration value="liquidGas"/>
<xsd:enumeration value="tpg"/>
<xsd:enumeration value="methane"/>
<xsd:enumeration value="naturalGas"/>
<xsd:enumeration value="petrol"/>
<xsd:enumeration value="petrolBatteryHybrid"/>
<xsd:enumeration value="petrolLeaded"/>
<xsd:enumeration value="petrolUnleaded"/>
<xsd:enumeration value="none"/>
<xsd:enumeration value="other"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="PropulsionTypeListOfEnumerations">
<xsd:annotation>
<xsd:documentation>List of allowed values for propulsion type.</xsd:documentation>
Expand Down
31 changes: 21 additions & 10 deletions xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" id="netex_vehicleType_version">
<xsd:include schemaLocation="netex_vehicleType_support.xsd"/>
<xsd:include schemaLocation="netex_nm_fleetEquipment_support.xsd"/>
<xsd:include schemaLocation="netex_nm_equipmentEnergy_support.xsd"/>
<xsd:include schemaLocation="netex_nm_fleet_support.xsd"/>
<xsd:include schemaLocation="netex_mode_support.xsd"/>
<xsd:include schemaLocation="netex_transportOrganisation_support.xsd"/>
Expand All @@ -21,32 +22,42 @@
<Date>
<Created>2010-09-04</Created>
</Date>
<Date><Modified>2011-02-05</Modified>Name Space changes
<Date>
<Modified>2011-02-05</Modified>Name Space changes
</Date>
<Date><Modified>2017-03-27</Modified>CR0001 - Vehicle Dimensions added.
<Date>
<Modified>2017-03-27</Modified>CR0001 - Vehicle Dimensions added.
</Date>
<Date><Modified>2019-03-25</Modified>NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType.
<Date>
<Modified>2019-03-25</Modified>NL31 CD #60 Add new attributes BoardingHeight and GapToPlatform attributes to VehicleType.
NJSK Review correct data types of new attributes to be of LengthType
</Date>
<Date><Modified>2021-07-07</Modified>NewModes-Power Description attribute to NVehicleEquipmentProfile
<Date>
<Modified>2021-07-07</Modified>NewModes-Power Description attribute to NVehicleEquipmentProfile
</Date>
<Date><Modified>2020-10-05</Modified> New Modes: Add Vehicle mode to VehicleType
<Date>
<Modified>2020-10-05</Modified> New Modes: Add Vehicle mode to VehicleType
Refactor VehicleType into TarnsportType, VehicleType and PesonalVehicleType
Replace Vehicle OperatorRef with TransportOrganisationRef.
Add VehicleModelRef to Vehicle.
Add ModelProfileRef to VehicleModel
Add Description to Vehicle.
Add PropulsionType . and MaximumRange to TransportType
</Date>
<Date><Modified>2021-07-08</Modified>NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel
<Date>
<Modified>2021-07-08</Modified>NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel
</Date>
<Date><Modified>2023-01-30</Modified>TM CR: Enhancement Add Accepted Driver Permit
<Date>
<Modified>2023-01-30</Modified>TM CR: Enhancement Add Accepted Driver Permit
</Date>
<Date><Modified>2023-11-07</Modified>CR0544 Deprecate PrivateCode.
<Date>
<Modified>2023-11-07</Modified>CR0544 Deprecate PrivateCode.
</Date>
<Date><Modified>2023-11-21</Modified>CR0545 Add AcceptedDriverPermit.
<Date>
<Modified>2023-11-21</Modified>CR0545 Add AcceptedDriverPermit.
</Date>
<Date><Modified>2024-02-07</Modified>Fix - allow default DEck Plan or TRANSPORT TYPE, move VehiclesInFramegroup her
<Date>
<Modified>2024-02-07</Modified>Fix - allow default DEck Plan or TRANSPORT TYPE, move VehiclesInFramegroup her
</Date>
<Description>
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
Expand Down
Loading

0 comments on commit 788cb44

Please sign in to comment.