Skip to content

Commit

Permalink
Merge branch 'next' into Remove_datedcalls
Browse files Browse the repository at this point in the history
  • Loading branch information
@skinkie
skinkie committed Dec 14, 2023
2 parents 218d448 + cfca152 commit 7964216
Show file tree
Hide file tree
Showing 9 changed files with 299 additions and 66 deletions.
4 changes: 2 additions & 2 deletions examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@
<Name>Strech limo</Name>
<ReversingDirection>true</ReversingDirection>
<SelfPropelled>true</SelfPropelled>
<PropulsionType>combustion</PropulsionType>
<FuelType>petrol</FuelType>
<PropulsionType>combustion electric</PropulsionType>
<FuelType>petrol battery</FuelType>
<TransportMode>selfDrive</TransportMode>
<PassengerCapacity version="any" id="stretch_limo">
<SeatingCapacity>7</SeatingCapacity>
Expand Down
188 changes: 188 additions & 0 deletions examples/functions/timetable/NeTEx_50_JourneyFrequencyGroup.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
<?xml version="1.0" encoding="UTF-8"?>
<PublicationDelivery xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" 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="hde:01">
<FromDate>2010-11-01T00:00:00Z</FromDate>
</AvailabilityCondition>
</selectionValidityConditions>
<TimetableFrameRef ref="hde:TIM_24o_FS_Outbound">REQUEST</TimetableFrameRef>
</NetworkFrameTopic>
</topics>
</PublicationRequest>
<PublicationRefreshInterval>P1M</PublicationRefreshInterval>
<Description>Example of simple Headwayal template timetable with three journeys</Description>
<!--- =============== RESULTS =========== -->
<dataObjects>
<CompositeFrame version="1" id="hde:CF_1">
<!--- ======= CODESPACEs======== -->
<codespaces>
<Codespace id="mybus">
<Xmlns>mybus</Xmlns>
<XmlnsUrl>http://www.mybuses.eu/stuff</XmlnsUrl>
<Description>My buses</Description>
</Codespace>
<Codespace id="hde">
<Xmlns>hde</Xmlns>
<XmlnsUrl>http://www.halt.de/</XmlnsUrl>
<Description>Stop data data</Description>
</Codespace>
</codespaces>
<!--- =======FRAME DEFAULTS======== -->
<FrameDefaults>
<DefaultCodespaceRef ref="mybus"/>
</FrameDefaults>
<frames>
<!-- ======Timetable ======= -->
<ServiceCalendarFrame version="any" id="hde:TIM_24o_FS_Outbound">
<Name/>
<ServiceCalendar version="any" id="hde:TIM_24o_FS_Outbound">
<dayTypes>
<DayType version="any" id="hde:DT_01MTWTFSS">
<Name>Everyday</Name>
<properties>
<PropertyOfDay>
<DaysOfWeek>Everyday</DaysOfWeek>
</PropertyOfDay>
</properties>
</DayType>
<DayType version="any" id="hde:DT_01MTWTF">
<Name>Weekdays</Name>
<properties>
<PropertyOfDay>
<DaysOfWeek>Monday Tuesday Wednesday Thursday Friday</DaysOfWeek>
</PropertyOfDay>
</properties>
</DayType>
</dayTypes>
</ServiceCalendar>
</ServiceCalendarFrame>
<TimetableFrame version="001" id="hde:TIM_24o_FS_Outbound">
<validityConditions>
<AvailabilityCondition version="any" id="hde:TIM_24o_FS_Outbound">
<Description>Sept to March</Description>
<FromDate>2010-11-01T00:00:00Z</FromDate>
<ToDate>2011-03-31T00:00:00Z</ToDate>
</AvailabilityCondition>
</validityConditions>
<Name>Winter timetable for route 234 outbound</Name>
<VehicleModes>bus</VehicleModes>
<vehicleJourneys>
<TemplateServiceJourney version="any" id="hde:tvjh_24o_01">
<DepartureTime>10:00:00.0Z</DepartureTime>
<dayTypes>
<DayTypeRef version="any" ref="hde:DT_01MTWTFSS"/>
</dayTypes>
<ServicePatternRef ref="hde:svp_24o">EXTERNAL</ServicePatternRef>
<LineRef version="any" ref="mybus:LN_234"/>
<calls>
<Call id="hde:tvjh_24o_02_001" version="any" order="1">
<ScheduledStopPointRef version="any" ref="mybus:SSP_001"/>
<Arrival>
<ForAlighting>false</ForAlighting>
</Arrival>
<Departure>
<Time>10:20:00.0Z</Time>
</Departure>
</Call>
<Call id="hde:tvjh_24o_02_002" version="any" order="2">
<ScheduledStopPointRef version="any" ref="mybus:SSP_002"/>
<Arrival>
<Time>11:20:00.0Z</Time>
</Arrival>
<Departure>
<Time>11:22:00.0Z</Time>
<WaitTime>PT2M</WaitTime>
</Departure>
</Call>
<Call id="hde:tvjh_24o_02_003" version="any" order="3">
<ScheduledStopPointRef version="any" ref="mybus:SSP_077"/>
<Arrival>
<Time>12:20:00.0Z</Time>
</Arrival>
<Departure>
<ForBoarding>false</ForBoarding>
</Departure>
</Call>
</calls>
<frequencyGroups>
<HeadwayJourneyGroup version="any" id="hde:hjg_24o_01">
<Name>Regular Interval service between 10am and 12:00 pm</Name>
<Description>About every 12 minutes</Description>
<FirstArrivalTime>10:00:00</FirstArrivalTime>
<LastArrivalTime>12:00:00</LastArrivalTime>
<ScheduledHeadwayInterval>PT12M</ScheduledHeadwayInterval>
<HeadwayDisplay>DisplayInsteadOfPassingTimes</HeadwayDisplay>
</HeadwayJourneyGroup>
<HeadwayJourneyGroup version="any" id="hde:hjg_24o_02">
<Name>Regular Interval service between 12am and 18:00 pm</Name>
<Description>About every 20 minutes</Description>
<FirstDepartureTime>12:00:00</FirstDepartureTime>
<LastDepartureTime>18:00:00</LastDepartureTime>
<ScheduledHeadwayInterval>PT20M</ScheduledHeadwayInterval>
<HeadwayDisplay>DisplayInsteadOfPassingTimes</HeadwayDisplay>
</HeadwayJourneyGroup>
</frequencyGroups>
</TemplateServiceJourney>
</vehicleJourneys>
</TimetableFrame>
<ServiceFrame id="mybus:svf_12" version="any">
<Name>Stops for Winter timetable for route 234</Name>
<lines>
<Line version="any" id="mybus:LN_234">
<Name>Line 234 Alpha to Charley Green</Name>
<ShortName>Line 234</ShortName>
<TransportMode>bus</TransportMode>
<PublicCode>234</PublicCode>
</Line>
</lines>
<scheduledStopPoints>
<ScheduledStopPoint version="any" id="mybus:SSP_001">
<Name>Alpha &amp; Castle</Name>
<Location>
<Longitude>53.0000</Longitude>
<Latitude>0.1000</Latitude>
</Location>
<TimingPointStatus>timingPoint</TimingPointStatus>
<ShortName>Alpha</ShortName>
<PublicCode>EANDC</PublicCode>
<StopType>onstreetBus</StopType>
<VehicleModes>bus</VehicleModes>
</ScheduledStopPoint>
<ScheduledStopPoint version="any" id="mybus:SSP_002">
<Name>Bravo Arch</Name>
<Location>
<Longitude>53.2000</Longitude>
<Latitude>0.2000</Latitude>
</Location>
<TimingPointStatus>timingPoint</TimingPointStatus>
<ShortName>Bravo Arch</ShortName>
<PublicCode>BRAV</PublicCode>
<StopType>onstreetBus</StopType>
<VehicleModes>bus</VehicleModes>
</ScheduledStopPoint>
<ScheduledStopPoint version="any" id="mybus:SSP_077">
<Name>Charley Green</Name>
<Location>
<Longitude>53.3000</Longitude>
<Latitude>0.3000</Latitude>
</Location>
<TimingPointStatus>timingPoint</TimingPointStatus>
<ShortName>Charley</ShortName>
<PublicCode>CHAS</PublicCode>
<StopType>onstreetBus</StopType>
<VehicleModes>bus</VehicleModes>
</ScheduledStopPoint>
</scheduledStopPoints>
</ServiceFrame>
</frames>
</CompositeFrame>
</dataObjects>
</PublicationDelivery>
34 changes: 30 additions & 4 deletions xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,11 @@ Service transporting passenger's motor vehicle passengers are admitted either wi
Service mode</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="largeVehicleTransportRailService">
<xsd:annotation>
<xsd:documentation>carTransportRailService that allows for bigger vehicles than normal cars (e.g. truck, bus).</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="touristRailway">
<xsd:annotation>
<xsd:documentation>See ERA B.4.7009 - Name: Item description code: (16 Historic train).</xsd:documentation>
Expand Down Expand Up @@ -408,12 +413,33 @@ Local train adapted for running in mountain railway lines.</xsd:documentation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="unknown"/>
<xsd:enumeration value="undefined"/>
<xsd:enumeration value="telecabin"/>
<xsd:enumeration value="cableCar"/>
<xsd:enumeration value="lift"/>
<xsd:enumeration value="telecabin">
<xsd:annotation>
<xsd:documentation>A telecabin or gondola has lots of small cabins.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="cableCar">
<xsd:annotation>
<xsd:documentation>A cableCar has few and bog cabins.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="lift">
<xsd:annotation>
<xsd:documentation>Lift is the most general term and does also contain vertical elevators.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="chairLift"/>
<xsd:enumeration value="dragLift"/>
<xsd:enumeration value="telecabinLink"/>
<xsd:enumeration value="paternoster">
<xsd:annotation>
<xsd:documentation>Paternoster lift is a passenger lift which consists of a chain of open compartments.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="telecabinLink">
<xsd:annotation>
<xsd:documentation>Horizontal telecabines.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>
<!-- ======================================================================= -->
Expand Down
1 change: 1 addition & 0 deletions xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="carriage"/>
<xsd:enumeration value="engine"/>
<xsd:enumeration value="carTransporter"/>
<xsd:enumeration value="largeVehicleTransporter"/>
<xsd:enumeration value="sleeperCarriage"/>
<xsd:enumeration value="luggageVan"/>
<xsd:enumeration value="restaurantCarriage"/>
Expand Down
12 changes: 12 additions & 0 deletions xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,12 @@ 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>
Expand All @@ -449,6 +455,12 @@ Rail transport, Roads and Road transport
<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>
</xsd:annotation>
<xsd:list itemType="PropulsionTypeEnumeration"/>
</xsd:simpleType>
<xsd:simpleType name="PropulsionTypeEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for type of power +v1/2/2</xsd:documentation>
Expand Down
10 changes: 5 additions & 5 deletions xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,20 +194,20 @@ Rail transport, Roads and Road transport
<xsd:documentation>Whether vehicles of the type are self-propelled.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PropulsionType" type="PropulsionTypeEnumeration" minOccurs="0">
<xsd:element name="PropulsionType" type="PropulsionTypeListOfEnumerations" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Type of power used +v1.2.2</xsd:documentation>
<xsd:documentation>List of types of power used +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:choice>
<xsd:element name="FuelType" type="FuelTypeEnumeration" minOccurs="0">
<xsd:element name="FuelType" type="FuelTypeListOfEnumerations" minOccurs="0">
<xsd:annotation>
<xsd:documentation>The type of fuel used by a vehicle of the type. +1.2.2</xsd:documentation>
<xsd:documentation>The list of types of fuel used by a vehicle of the type. +1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="TypeOfFuel" type="FuelTypeEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>The type of fuel used by a vehicle of the type. DEPRECATED NAME 1.2.2</xsd:documentation>
<xsd:documentation>The type of fuel used by a vehicle of the type. DEPRECATED NAME 1.2.2. Use FuelType.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
Expand Down
32 changes: 0 additions & 32 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 @@ -114,37 +114,6 @@ Rail transport, Roads and Road transport
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:element name="Call-Z" 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. No Constraints</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:restriction base="Call_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:attribute name="id" type="CallIdType" use="optional">
<xsd:annotation>
<xsd:documentation>Identifier of ENTITY.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:restriction>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:complexType name="Call_VersionedChildStructure">
<xsd:annotation>
<xsd:documentation>Data type for CALL.</xsd:documentation>
Expand Down Expand Up @@ -431,7 +400,6 @@ Rail transport, Roads and Road transport
<xsd:element ref="DutyPartRef" minOccurs="0"/>
</xsd:sequence>
</xsd:group>
<!-- ====Junk=========================================================== -->
<!-- ======================================================================= -->
<xsd:group name="CallDetailsGroup">
<xsd:annotation>
Expand Down
18 changes: 15 additions & 3 deletions xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,21 @@ Rail transport, Roads and Road transport
<xsd:documentation>Allowed values for headway use.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:normalizedString">
<xsd:enumeration value="DisplayPassingTimesOnly"/>
<xsd:enumeration value="DisplayAsWellAsPassingTimes"/>
<xsd:enumeration value="DisplayInsteadOfPassingTimes"/>
<xsd:enumeration value="DisplayPassingTimesOnly">
<xsd:annotation>
<xsd:documentation>You have a headway service but still display passing times only.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="DisplayAsWellAsPassingTimes">
<xsd:annotation>
<xsd:documentation>You have a headway service and display both passing times and frequency.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="DisplayInsteadOfPassingTimes">
<xsd:annotation>
<xsd:documentation>You have a headway service and only display frequency.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="HeadwayJourneyGroupIdType">
Expand Down
Loading

0 comments on commit 7964216

Please sign in to comment.