Skip to content

Commit

Permalink
Remove datedCalls, and when it is valid, make it Calls (#596)
Browse files Browse the repository at this point in the history
  • Loading branch information
@skinkie
skinkie authored Dec 14, 2023
1 parent cfca152 commit 18b48c6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 88 deletions.
6 changes: 0 additions & 6 deletions xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,6 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:restriction base="PointInJourneyPatternIdType"/>
</xsd:simpleType>
<xsd:simpleType name="DatedCallIdType">
<xsd:annotation>
<xsd:documentation>Type for identifier of a DATED CALL.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="CallIdType"/>
</xsd:simpleType>
<!-- ======================================================================= -->
<xsd:simpleType name="DeadRunCallIdType">
<xsd:annotation>
Expand Down
78 changes: 0 additions & 78 deletions xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,84 +400,6 @@ Rail transport, Roads and Road transport
<xsd:element ref="DutyPartRef" minOccurs="0"/>
</xsd:sequence>
</xsd:group>
<!-- ==== DatedCall=========================================-->
<xsd:complexType name="datedCalls_RelStructure">
<xsd:annotation>
<xsd:documentation>DatedCALLs associated with entity.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="strictContainmentAggregationStructure">
<xsd:sequence>
<xsd:element ref="DatedCall" minOccurs="2" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>A CALL that is part of a DATED JOURNEY and so takes place on a specified date.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<xsd:element name="DatedCall" substitutionGroup="Call_">
<xsd:annotation>
<xsd:documentation>A visit to a SCHEDULED STOP POINT as part of a VEHICLE JOURNEY. A CALL is a view of a POINT IN JOURNEY PATTERN that adds in derived data.</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:restriction base="DatedCall_VersionedChildStructure">
<xsd:sequence>
<xsd:sequence>
<xsd:group ref="EntityInVersionGroup" minOccurs="0"/>
</xsd:sequence>
<xsd:sequence>
<xsd:group ref="VersionedChildGroup"/>
</xsd:sequence>
<xsd:sequence>
<xsd:group ref="CallGroup"/>
<!-- The FacilityChangeElement has bee removed here in Siri 1.1, but it is still available at the same place through the AimedCallGroup->DisruptionGroup
(DisruptionGroup has been added to AimedCallGroup)
<xsd:element ref="FacilityChangeElement" minOccurs="0"/>
-->
</xsd:sequence>
<xsd:sequence>
<xsd:group ref="DatedCallGroup"/>
</xsd:sequence>
</xsd:sequence>
<xsd:attribute name="id" type="DatedCallIdType" use="optional"/>
</xsd:restriction>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:complexType name="DatedCall_VersionedChildStructure">
<xsd:annotation>
<xsd:documentation>Data type for DATED CALL.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="Call_VersionedChildStructure">
<xsd:sequence>
<xsd:group ref="DatedCallGroup"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<xsd:group name="DatedCallGroup">
<xsd:annotation>
<xsd:documentation>Elements describing the DATED CALL.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element ref="DriverRef" minOccurs="0" maxOccurs="1"/>
<xsd:element name="ArrivalDate" type="xsd:date" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Date of departure.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="DepartureDate" type="xsd:date" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Date of departure.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<!-- ====Junk=========================================================== -->
<!-- ======================================================================= -->
<xsd:group name="CallDetailsGroup">
<xsd:annotation>
Expand Down
8 changes: 4 additions & 4 deletions xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,9 @@ Rail transport, Roads and Road transport
<xsd:documentation>PASSING TIMEs for JOURNEY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="datedCalls" type="datedCalls_RelStructure" minOccurs="0">
<xsd:element name="datedCalls" type="calls_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DATED CALLs for JOURNEY.</xsd:documentation>
<xsd:documentation>CALLs for JOURNEY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ServiceAlterationType" type="ServiceAlterationEnumeration" default="planned" minOccurs="0">
Expand Down Expand Up @@ -366,9 +366,9 @@ The VIEW includes derived ancillary data from referenced entities.</xsd:document
<xsd:documentation>PASSING TIMEs for JOURNEY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="datedCalls" type="datedCalls_RelStructure" minOccurs="0">
<xsd:element name="datedCalls" type="calls_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DATED CALLs for JOURNEY.</xsd:documentation>
<xsd:documentation>CALLs for JOURNEY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down

0 comments on commit 18b48c6

Please sign in to comment.