Skip to content
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

Added CustomerServiceContactDetails and updates Vehicle/VehicleRef #584

Merged
merged 20 commits into from
Jul 25, 2024
Merged

Added CustomerServiceContactDetails and updates Vehicle/VehicleRef #584

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7f76c93
Added CustomerServiceContactDetails
ue71603 Dec 12, 2023
7b69a31
added VehicleRef to ServiceJourney
ue71603 Dec 12, 2023
ce54bd5
Lint and update documentation tables
github-actions[bot] Dec 12, 2023
95d15d6
clarification when to use VehicleRef
ue71603 Apr 19, 2024
3f87632
Merge branch 'next' into Customer-Information-On-Vehicle
ue71603 Apr 19, 2024
98afad4
Update netex_vehicleType_version.xsd
ue71603 Apr 19, 2024
f231007
fixing ambiguity and double VehicleCodeGroup
ue71603 Apr 19, 2024
28539cd
typos, fixing import
ue71603 May 10, 2024
93a596a
typos and equipmentProfiles added to VehicleModel
ue71603 May 10, 2024
af51d62
also VehicleModelProfileRef to VehicleModel
ue71603 May 10, 2024
e190c35
Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType…
ue71603 May 22, 2024
c327e7a
Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType…
ue71603 May 23, 2024
8afc953
Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType…
ue71603 May 23, 2024
4ab1889
changed equipmentProfiles
ue71603 Jun 5, 2024
7a7e971
modeled the Contacts correct and corrected that contacts must allow m…
ue71603 Jun 5, 2024
ae93675
Lint and update documentation tables
github-actions[bot] Jun 5, 2024
2f2d932
Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType…
ue71603 Jun 5, 2024
1d7a9a0
Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType…
ue71603 Jun 5, 2024
168b6fd
Lint and update documentation tables
github-actions[bot] Jun 5, 2024
c665677
Merge branch 'next' into Customer-Information-On-Vehicle
ue71603 Jul 25, 2024
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
3 changes: 3 additions & 0 deletions examples/functions/newModes/NewModes-CarClubExample.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,9 @@
<LockingMechanism>immobilisingLock</LockingMechanism>
</VehicleReleaseEquipment>
</actualVehicleEquipments>
<CustomerServiceContactDetails>
<Phone>+41 1 800 80 80</Phone>
</CustomerServiceContactDetails>
</Vehicle>
<Vehicle version="any" id="car_02">
<OperatorRef version="any" ref="coc:MCR"/>
Expand Down
112 changes: 112 additions & 0 deletions examples/functions/vehicle/Netex_simpleVehicle_01.xml
View file
Open in desktop
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>
34 changes: 30 additions & 4 deletions 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 @@ -501,7 +501,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 @@ -1097,15 +1097,41 @@ Rail transport, Roads and Road transport
<xsd:documentation>Range when fully fuelled or charged. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="FullCharge" type="WattHoursType" minOccurs="0">
<xsd:element name="FullCharge" type="WattHoursType" minOccurs="0"/>
ue71603 marked this conversation as resolved.
Show resolved Hide resolved
<xsd:sequence>
ue71603 marked this conversation as resolved.
Show resolved Hide resolved
ue71603 marked this conversation as resolved.
Show resolved Hide resolved
<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:sequence>
ue71603 marked this conversation as resolved.
Show resolved Hide resolved
<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>
ue71603 marked this conversation as resolved.
Show resolved Hide resolved
<xsd:documentation>Energy required for a full charge. +v2.0</xsd:documentation>
<xsd:documentation>Private code of the vehicle.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:sequence>
ue71603 marked this conversation as resolved.
Show resolved Hide resolved
<xsd:element name="equipmentProfiles" type="vehicleEquipmentProfileRefs_RelStructure" minOccurs="0">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't that perhaps superfluous? We already have the equipment profiles for the model by equipmentProfiles in the VehicleModelGroup (and for the specific vehicle we have actualVehicleEquipments).

<xsd:annotation>
<xsd:documentation>Equipment profiles assoicated with model +v1.2.2</xsd:documentation>
<xsd:documentation>Equipment profiles associated with model. +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
18 changes: 0 additions & 18 deletions xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ 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 ref="VehicleModelProfileRef" minOccurs="0"/>
ue71603 marked this conversation as resolved.
Show resolved Hide resolved
<xsd:element name="actualVehicleEquipments" type="equipments_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>ACTUAL EQUIPMENT found in VEHICLE.</xsd:documentation>
Expand Down Expand Up @@ -229,23 +228,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
6 changes: 6 additions & 0 deletions xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<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_journey_version.xsd"/>
<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version.xsd"/>
Expand Down Expand Up @@ -267,6 +268,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
Loading
Loading