Skip to content

Commit

Permalink
Merge pull request #584 from NeTEx-CEN/Customer-Information-On-Vehicle
Browse files Browse the repository at this point in the history 
Added CustomerServiceContactDetails and updates Vehicle/VehicleRef
  • Loading branch information
@Aurige
Aurige authored Jul 25, 2024
2 parents 05531c3 + c665677 commit 3465eec
Show file tree
Hide file tree
Showing 6 changed files with 159 additions and 26 deletions.
6 changes: 6 additions & 0 deletions examples/functions/newModes/NewModes-CarClubExample.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,11 @@
</ContactDetails>
<ContactType>information</ContactType>
</Contact>
<Contact id="contact1" version="any">
<ContactDetails>
<Phone>+41 1 800 80 80</Phone>
</ContactDetails>
</Contact>
</contacts>
<organisations>
<!-- ==== ORGANISATIONS ==== -->
Expand Down Expand Up @@ -374,6 +379,7 @@
<members>
<Vehicle version="any" id="car_01">
<OperatorRef version="any" ref="coc:MCR"/>
<ContactRef ref="contact1" version="any"/>
<SimpleVehicleTypeRef version="any" ref="small_car"/>
<VehicleModelRef version="any" ref="mini_whiz"/>
<CarModelProfileRef version="any" ref="model_a"/>
Expand Down
112 changes: 112 additions & 0 deletions examples/functions/vehicle/Netex_simpleVehicle_01.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
<?xml version="1.0" encoding="UTF-8"?>
<PublicationDelivery xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../xsd/NeTEx_publication.xsd">
<PublicationTimestamp>2010-12-17T09:30:47.0Z</PublicationTimestamp>
<ParticipantRef>SYS001</ParticipantRef>
<!--- ======WHAT WAS REQUESTED ========== -->
<PublicationRequest version="1.0">
<RequestTimestamp>2010-12-17T09:30:47.0Z</RequestTimestamp>
<ParticipantRef>SYS002</ParticipantRef>
<topics>
<NetworkFrameTopic>
<selectionValidityConditions>
<AvailabilityCondition version="any" id="xj:cf_12">
<FromDate>2010-11-01T00:00:00Z</FromDate>
</AvailabilityCondition>
</selectionValidityConditions>
<TypeOfFrameRef ref="xj:MyVsFrame">REQUEST</TypeOfFrameRef>
</NetworkFrameTopic>
</topics>
</PublicationRequest>
<PublicationRefreshInterval>P1M</PublicationRefreshInterval>
<Description>Example of simple vehicle schedule frame with tblocks</Description>
<!--- =============== RESULTS =========== -->
<dataObjects>
<CompositeFrame version="1" id="xj:cf_12">
<validityConditions>
<AvailabilityCondition version="any" id="xj:Cnd001">
<Description>Sept to March</Description>
<FromDate>2010-11-01T00:00:00Z</FromDate>
<ToDate>2011-03-31T00:00:00Z</ToDate>
</AvailabilityCondition>
</validityConditions>
<TypeOfFrameRef ref="xj:TypeOfFrame:MyVsFrame"/>
<!--- ======= CODESPACEs======== -->
<codespaces>
<Codespace id="mybus">
<Xmlns>mybus</Xmlns>
<XmlnsUrl>http://www.mybuses.eu/stuff</XmlnsUrl>
<Description>My buses</Description>
</Codespace>
<Codespace id="xj">
<Xmlns>xj</Xmlns>
<XmlnsUrl>http://www.borninabahn.de</XmlnsUrl>
<Description> OtherStop data data</Description>
</Codespace>
<Codespace id="kx">
<Xmlns>kx</Xmlns>
<XmlnsUrl>http://www.ksx.com</XmlnsUrl>
</Codespace>
</codespaces>
<!--- =======FRAME DEFAULTS======== -->
<FrameDefaults>
<DefaultCodespaceRef ref="kx"/>
</FrameDefaults>
<frames>
<ResourceFrame id="HAV:ResourceFrame:1" version="1">
<organisations>
<Operator id="HAV:Operator:999523587" version="1"/>
</organisations>
<vehicles>
<Vehicle id="HAV:Vehicle:1" version="1">
<Name>MS Havila Capella</Name>
<OperationalNumber>9865570</OperationalNumber>
<OperatorRef ref="HAV:Operator:999523587" version="1"/>
<VehicleTypeRef ref="HAV:VehicleType:1" version="1"/>
</Vehicle>
<Vehicle id="HAV:Vehicle:2" version="1">
<Name>MS Havila Castor</Name>
<OperationalNumber>9865582</OperationalNumber>
<OperatorRef ref="HAV:Operator:999523587" version="1"/>
<VehicleTypeRef ref="HAV:VehicleType:1" version="1"/>
</Vehicle>
<Vehicle id="HAV:Vehicle:3" version="1">
<Name>MS Havila Polaris</Name>
<OperationalNumber>9873759</OperationalNumber>
<OperatorRef ref="HAV:Operator:999523587" version="1"/>
<VehicleTypeRef ref="HAV:VehicleType:1" version="1"/>
</Vehicle>
<Vehicle id="HAV:Vehicle:4" version="1">
<Name>MS Havila Pollux</Name>
<OperationalNumber>9873761</OperationalNumber>
<OperatorRef ref="HAV:Operator:999523587" version="1"/>
<VehicleTypeRef ref="HAV:VehicleType:1" version="1"/>
</Vehicle>
</vehicles>
</ResourceFrame>
<InfrastructureFrame id="HAV:InfrastructureFrame:1" version="1">
<vehicleTypes>
<VehicleType created="2022-09-21T11:41:00.900" id="HAV:VehicleType:1" version="1">
<Name>Model</Name>
<Description>Hybrid cruise vessel</Description>
<SelfPropelled>true</SelfPropelled>
<PassengerCapacity>
<TotalCapacity>640</TotalCapacity>
</PassengerCapacity>
<LowFloor>true</LowFloor>
<HasLiftOrRamp>true</HasLiftOrRamp>
<Length>124</Length>
<Width>22</Width>
</VehicleType>
</vehicleTypes>
</InfrastructureFrame>
<TimetableFrame id="HAV:TimetableFrame:1" version="1">
<vehicleJourneys>
<ServiceJourney id="SJ1" version="1">
<VehicleRef ref="HAV:Vehicle:4"/>
</ServiceJourney>
</vehicleJourneys>
</TimetableFrame>
</frames>
</CompositeFrame>
</dataObjects>
</PublicationDelivery>
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,7 @@ Rail transport, Roads and Road transport
<xsd:complexContent>
<xsd:extension base="containmentAggregationStructure">
<xsd:sequence>
<xsd:element ref="Contact"/>
<xsd:element ref="Contact" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
Expand Down
36 changes: 28 additions & 8 deletions xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ Rail transport, Roads and Road transport
</xsd:sequence>
<xsd:attribute name="id" type="AcceptedDriverPermitIdType">
<xsd:annotation>
<xsd:documentation>Identifier of VEHICLE EQUIPMENT PROFILE.</xsd:documentation>
<xsd:documentation>Identifier of ACCEPTED DRIVER PERMIT.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:restriction>
Expand Down Expand Up @@ -1119,14 +1119,34 @@ Rail transport, Roads and Road transport
<xsd:documentation>Energy required for a full charge. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:sequence>
<xsd:element name="equipmentProfiles" type="vehicleEquipmentProfileRefs_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Equipment profiles assoicated with model +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
<xsd:element name="equipmentProfiles" type="vehicleEquipmentProfileRefs_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Equipment profiles assoicated with model. +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="VehicleModelProfileRef" minOccurs="0"/>
<xsd:element name="CustomerServiceContactDetails" type="ContactStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Especially very large vehicles and also some ALTERNATIVE MODE OF OPERATION offers need the possibility to contact the VEHICLE directly.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<xsd:group name="VehicleCodeGroup">
<xsd:annotation>
<xsd:documentation>Alternative code elements for VEHICLE.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="OperationalNumber" type="xsd:normalizedString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Operational number of VEHICLE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Private code of the vehicle.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<!-- =======VEHICLE EQUIPMENT ================================================== -->
Expand Down
22 changes: 5 additions & 17 deletions xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,11 @@ Rail transport, Roads and Road transport
<xsd:element ref="ContactRef" minOccurs="0"/>
<xsd:element ref="TransportTypeRef" minOccurs="0"/>
<xsd:element ref="VehicleModelRef" minOccurs="0"/>
<xsd:element name="equipmentProfiles" type="vehicleEquipmentProfileRefs_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Equipment profiles associated with model. +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="VehicleModelProfileRef" minOccurs="0"/>
<xsd:element name="actualVehicleEquipments" type="equipments_RelStructure" minOccurs="0">
<xsd:annotation>
Expand Down Expand Up @@ -229,23 +234,6 @@ Rail transport, Roads and Road transport
</xsd:element>
</xsd:sequence>
</xsd:group>
<xsd:group name="VehicleCodeGroup">
<xsd:annotation>
<xsd:documentation>Alternative Code Elements for VEHICLE.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="OperationalNumber" type="xsd:normalizedString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Operational Number of VEHICLE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<!-- ==== ROLLING STOCK INVENTORY ================================================= -->
<xsd:element name="RollingStockItem_DummyType" type="DataManagedObjectStructure" abstract="true" substitutionGroup="DataManagedObject">
<xsd:annotation>
Expand Down
7 changes: 7 additions & 0 deletions xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicle_support.xsd"/>
<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd"/>
<xsd:include schemaLocation="netex_vehicleJourneyStopAssignment_version.xsd"/>
<xsd:include schemaLocation="netex_journey_version.xsd"/>
<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version.xsd"/>
Expand Down Expand Up @@ -253,6 +255,11 @@ Rail transport, Roads and Road transport
<xsd:element ref="TimingAlgorithmTypeRef" minOccurs="0"/>
<xsd:element ref="JourneyFrequencyGroupRef" minOccurs="0"/>
<xsd:element ref="VehicleTypeRef" minOccurs="0"/>
<xsd:element ref="VehicleRef" minOccurs="0">
<xsd:annotation>
<xsd:documentation>VehicleTypeRef is the normally used field, as in many cases only the VEHICLE TYPE is known in advance. VehicleRef is then the exception and used only when the concrete VEHICLE is known in advance. Then also only one vehicle is possible.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="OperationalContextRef" minOccurs="0"/>
<xsd:element ref="BlockRef" minOccurs="0">
<xsd:annotation>
Expand Down

0 comments on commit 3465eec

Please sign in to comment.