Skip to content

Revert "Extended-DatedVehicleJourney+Replace-PR368" #505

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

Merged
skinkie merged 1 commit into from
Sep 27, 2023
Merged

Revert "Extended-DatedVehicleJourney+Replace-PR368" #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions xsd/NeTEx_publication.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6921,7 +6921,7 @@ Correct COnstraints for PointOnRoute
<xsd:annotation>
<xsd:documentation>Every [VehicleJourney Id + Version] must be unique within document.</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath=".//netex:VehicleJourney | .//netex:DatedVehicleJourney | .//netex:NormalDatedJourney"/>
<xsd:selector xpath=".//netex:VehicleJourney"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:unique>
Expand Down Expand Up @@ -6951,12 +6951,12 @@ Correct COnstraints for PointOnRoute
</xsd:unique>
<!-- =====Journey Key ========================== -->
<xsd:keyref name="Journey_KeyRef" refer="netex:Journey_AnyVersionedKey">
<xsd:selector xpath=".//netex:ServiceJourneyRef | .//netex:VehicleJourneyRef | .//netex:TemplateServiceJourneyRef | .//netex:JourneyRef | .//netex:DeadRunRef | .//netex:FromJourneyRef | .//netex:ToJourneyRef | .//netex:DatedVehicleJourneyRef | .//netex:NormalDatedJourneyRef"/>
<xsd:selector xpath=".//netex:ServiceJourneyRef | .//netex:VehicleJourneyRef | .//netex:TemplateServiceJourneyRef | .//netex:JourneyRef | .//netex:DeadRunRef | .//netex:FromJourneyRef | .//netex:ToJourneyRef"/>
<xsd:field xpath="@ref"/>
<xsd:field xpath="@version"/>
</xsd:keyref>
<xsd:key name="Journey_AnyVersionedKey">
<xsd:selector xpath=".//netex:ServiceJourney | .//netex:VehicleJourney | .//netex:DeadRun | .//netex:SpecialService | .//netex:TemplateServiceJourney | .//netex:DatedVehicleJourney | .//netex:NormalDatedJourney | .//netex:DatedServiceJourney"/>
<xsd:selector xpath=".//netex:ServiceJourney | .//netex:VehicleJourney | .//netex:DeadRun | .//netex:SpecialService | .//netex:TemplateServiceJourney | .//netex:DatedServiceJourney"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:key>
Expand Down
6 changes: 3 additions & 3 deletions xsd/NeTEx_publication_timetable.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5594,7 +5594,7 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
<xsd:annotation>
<xsd:documentation>Every [VehicleJourney Id + Version] must be unique within document.</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath=".//netex:VehicleJourney | .//netex:DatedVehicleJourney | .//netex:NormalDatedJourney"/>
<xsd:selector xpath=".//netex:VehicleJourney"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:unique>
Expand Down Expand Up @@ -5624,12 +5624,12 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
</xsd:unique>
<!-- =====Journey Key ========================== -->
<xsd:keyref name="Journey_KeyRef" refer="netex:Journey_AnyVersionedKey">
<xsd:selector xpath=".//netex:ServiceJourneyRef | .//netex:VehicleJourneyRef | .//netex:TemplateServiceJourneyRef| .//netex:JourneyRef | .//netex:DeadRunRef | .//netex:FromJourneyRef | .//netex:ToJourneyRef | .//netex:DatedVehicleJourneyRef | .//netex:NormalDatedJourneyRef"/>
<xsd:selector xpath=".//netex:ServiceJourneyRef | .//netex:VehicleJourneyRef | .//netex:TemplateServiceJourneyRef| .//netex:JourneyRef | .//netex:DeadRunRef | .//netex:FromJourneyRef | .//netex:ToJourneyRef"/>
<xsd:field xpath="@ref"/>
<xsd:field xpath="@version"/>
</xsd:keyref>
<xsd:key name="Journey_AnyVersionedKey">
<xsd:selector xpath=".//netex:ServiceJourney | .//netex:VehicleJourney| .//netex:DeadRun | .//netex:SpecialService | .//netex:TemplateServiceJourney | .//netex:DatedVehicleJourney | .//netex:NormalDatedJourney | .//netex:DatedServiceJourney"/>
<xsd:selector xpath=".//netex:ServiceJourney | .//netex:VehicleJourney| .//netex:DeadRun | .//netex:SpecialService | .//netex:TemplateServiceJourney | .//netex:DatedServiceJourney"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:key>
Expand Down
19 changes: 0 additions & 19 deletions xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,25 +91,6 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:restriction base="DatedVehicleJourneyIdType"/>
</xsd:simpleType>
<xsd:element name="NormalDatedVehicleJourneyRef" type="VehicleJourneyRefStructure" substitutionGroup="JourneyRef">
<xsd:annotation>
<xsd:documentation>Reference to a NORMAL DATED VEHICLE JOURNEY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="NormalDatedVehicleJourneyRefStructure">
<xsd:annotation>
<xsd:documentation>Type for a reference to a NORMAL DATED VEHICLE JOURNEY.</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="VehicleJourneyRefStructure">
<xsd:attribute name="ref" type="NormalDatedVehicleJourneyIdType" use="required">
<xsd:annotation>
<xsd:documentation>Identifier of NORMAL DATED VEHICLE JOURNEY.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
<xsd:simpleType name="NormalDatedVehicleJourneyTypeEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for type of NORMAL DATED JOURNEY.</xsd:documentation>
Expand Down
58 changes: 25 additions & 33 deletions xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,6 @@ Rail transport, Roads and Road transport
<xsd:documentation>DATED CALLs for JOURNEY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ServiceAlterationType" type="ServiceAlterationEnumeration" default="planned" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Type of Service alteration. Default is planned.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<xsd:group name="DatedVehicleJourneyReferencesGroup">
Expand All @@ -193,11 +188,6 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:sequence>
<xsd:element ref="JourneyRef" minOccurs="0"/>
<xsd:element name="replacedJourneys" type="replacedJourneys_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DATED VEHICLE JOURNEYs for which current VEHICLE JOURNEY is an alteration (i.e. change, replacement, supplement)</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="OperatingDayRef"/>
<xsd:element name="ExternalDatedVehicleJourneyRef" type="ExternalObjectRefStructure" minOccurs="0">
<xsd:annotation>
Expand All @@ -209,30 +199,13 @@ Rail transport, Roads and Road transport
<xsd:documentation>Reference to a JOURNEY PATTERN.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="DriverRef" minOccurs="0">
<xsd:annotation>
<xsd:documentation>** DEPRECATED ** not to be used - It is expected that the driver's DUTY refer the DatedJourneyPattern, not the way arround !</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="DriverRef" minOccurs="0"/>
</xsd:sequence>
</xsd:group>
<xsd:complexType name="replacedJourneys_RelStructure">
<xsd:annotation>
<xsd:documentation>Type for a list of (NORMAL) DATED VEHICLE JOURNEY references.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="containmentAggregationStructure">
<xsd:choice maxOccurs="unbounded">
<xsd:element ref="DatedVehicleJourneyRef" maxOccurs="1"/>
<xsd:element ref="NormalDatedVehicleJourneyRef" maxOccurs="1"/>
</xsd:choice>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<!-- ====DATED SERVICE JOURNEY====================================-->
<xsd:element name="DatedServiceJourney" abstract="false" substitutionGroup="ServiceJourney_">
<xsd:annotation>
<xsd:documentation>A particular SERVICE JOURNEY of a vehicle on a particular OPERATING DAY including all modifications possibly decided by the control staff.
<xsd:documentation>A particular journey of a vehicle on a particular OPERATING DAY including all modifications possibly decided by the control staff.

The VIEW includes derived ancillary data from referenced entities.</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -277,7 +250,11 @@ The VIEW includes derived ancillary data from referenced entities.</xsd:document
<xsd:documentation>If the journey is an alteration to a timetable, indicates the original journey, and the nature of the difference.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="DatedVehicleJourneyReferencesGroup"/>
<xsd:choice minOccurs="0">
<xsd:element ref="OperatingDayRef"/>
<xsd:element ref="UicOperatingPeriod"/>
</xsd:choice>
<xsd:element ref="DriverRef" minOccurs="0"/>
</xsd:sequence>
</xsd:group>
<!-- ======================================================================= -->
Expand Down Expand Up @@ -305,8 +282,11 @@ The VIEW includes derived ancillary data from referenced entities.</xsd:document
<xsd:sequence>
<xsd:group ref="DatedVehicleJourneyGroup"/>
</xsd:sequence>
<xsd:sequence>
<xsd:group ref="NormalDatedVehicleJourneyGroup"/>
</xsd:sequence>
</xsd:sequence>
<xsd:attribute name="id" type="NormalDatedVehicleJourneyIdType" use="required">
<xsd:attribute name="id" type="NormalDatedVehicleJourneyIdType" use="optional">
<xsd:annotation>
<xsd:documentation>Identifier of NORMAL DATED VEHICLE JORUNEY.</xsd:documentation>
</xsd:annotation>
Expand All @@ -320,13 +300,25 @@ The VIEW includes derived ancillary data from referenced entities.</xsd:document
<xsd:documentation>Type for NORMAL DATED VEHICLE JOURNEY.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="VehicleJourney_VersionStructure">
<xsd:extension base="DatedVehicleJourney_VersionStructure">
<xsd:sequence>
<xsd:group ref="DatedVehicleJourneyGroup"/>
<xsd:group ref="NormalDatedVehicleJourneyGroup"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<xsd:group name="NormalDatedVehicleJourneyGroup">
<xsd:annotation>
<xsd:documentation>Elements for NORMAL DATED VEHICLE JOURNEY.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="ServiceAlterationType" type="ServiceAlterationEnumeration" default="planned" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Type of Service alteration. Default is planned.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<!-- ======================================================================= -->
<xsd:element name="DatedSpecialService" abstract="false" substitutionGroup="Journey_">
<xsd:annotation>
Expand Down