[go: nahoru, domu]
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

Jump to bottom

Predicted occupation #605

Merged
merged 23 commits into from
Jul 25, 2024
Merged

Predicted occupation #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6b2e6a4
Occupancy solved for Call
ue71603 Dec 13, 2023
6aecbb8
Lint and update documentation tables
github-actions[bot] Dec 13, 2023
9be7179
XML Spy integration
Aurige Dec 14, 2023
5682d13
Update xsd/netex_framework/netex_reusableComponents/netex_trainElemen…
ue71603 Dec 14, 2023
1e88652
Update xsd/netex_framework/netex_reusableComponents/netex_trainElemen…
ue71603 Dec 14, 2023
6aa576b
fixed everything discussed last week
ue71603 Dec 18, 2023
4420558
fix example
ue71603 Dec 18, 2023
2a4248a
Lint and update documentation tables
github-actions[bot] Dec 18, 2023
56d3408
fixed all comments
ue71603 Dec 22, 2023
08005f0
Lint and update documentation tables
github-actions[bot] Dec 22, 2023
cb75852
Update xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
ue71603 Mar 14, 2024
5a22e05
Update xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
ue71603 Mar 14, 2024
cbe7a8b
Update xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
ue71603 Mar 14, 2024
8167ebb
Update xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_versi…
ue71603 Mar 14, 2024
cc4f8e0
Update xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
ue71603 Mar 14, 2024
8451bcb
Update xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version…
ue71603 Mar 14, 2024
1cc688b
Update xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
ue71603 Mar 15, 2024
b3654ba
Merge branch 'next' into Occupancy
ue71603 Jun 21, 2024
37e7000
Occupancy -> OccupancyView
ue71603 Jul 5, 2024
5b883c9
fixing examples with id
ue71603 Jul 5, 2024
be2ff36
Update Netex_51.1_Occupancy.xml
ue71603 Jul 5, 2024
b428089
Lint and update documentation tables
github-actions[bot] Jul 5, 2024
8b3ccad
Merge branch 'next' into Occupancy
skinkie 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
8 changes: 8 additions & 0 deletions NeTEx.spp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,10 @@
<File FilePath="xsd\netex_part_2\part2_vehicleService\netex_duty_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_vehicleService\netex_duty_version.xsd" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="netex_part_2_OC">
<File FilePath="xsd\netex_part_2\part2_occupancy\netex_oc_occupancy_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_2\part2_occupancy\netex_oc_occupancy_version.xsd" HomeFolder="Yes"/>
</Folder>
</Folder>
<Folder FolderName="netex_part_3 Fares">
<Folder FolderName="netex_part_3_FM">
Expand Down Expand Up @@ -606,6 +610,10 @@
<File FilePath="xsd\netex_part_5\part5_frames\netex_nm_mobilityJourneyFrame_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_frames\netex_nm_mobilityServiceFrame_version.xsd" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="netec_part5_NM_OC">
<File FilePath="xsd\netex_part_5\part5_oc\netex_oc_occupancy_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_oc\netex_oc_occupancy_version.xsd" HomeFolder="Yes"/>
</Folder>
<File FilePath="xsd\netex_part_5\netex_all_objects_part5_newModes.xsd" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="netex_service">
Expand Down
11 changes: 11 additions & 0 deletions examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,17 @@ The Calendar is shown coded as
</Arrival>
<Departure>
<Time>14:20:00.0Z</Time>
<occupancies>
<OccupancyView version="any" id="occ1">
<OccupancyLevel>fewSeatsAvailable</OccupancyLevel>
<OccupancyPercentage>40</OccupancyPercentage>
<WheelchairsOnboardCount>1</WheelchairsOnboardCount>
<GroupReservation>
<NameOfGroup>a group</NameOfGroup>
<NumberOfReservedSeats>4</NumberOfReservedSeats>
</GroupReservation>
</OccupancyView>
</occupancies>
</Departure>
</Call>
<Call version="any" id="acs:sj_24o_01_002" order="2">
Expand Down
13 changes: 13 additions & 0 deletions examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,14 @@ The TIMETABLE FRAME groups the servicee elements
<vehicleJourneys>
<ServiceJourney version="any" id="bbd:sj_447">
<Description>447 Amsterdam to Warsaw</Description>
<occupancies>
<OccupancyView version="any" id="occ22">
<TrainRef version="any" ref="bbd:trn_447"/>
<TrainElementRef version="any" ref="bbd:trne_447_02"/>
<FareClass>businessClass</FareClass>
<OccupancyPercentage>20</OccupancyPercentage>
</OccupancyView>
</occupancies>
<DepartureTime>09:00:00Z</DepartureTime>
<ServiceJourneyPatternRef version="any" ref="bbd:JP_447_amsterdam_warsaw"/>
<TrainRef version="any" ref="bbd:trn_447"/>
Expand Down Expand Up @@ -391,6 +399,11 @@ The TIMETABLE FRAME groups the servicee elements
<StartTime>09:00:00Z</StartTime>
<EndTime>12:00:00Z</EndTime>
<PurposeOfJourneyPartitionRef ref="bbd:coupling">coupling</PurposeOfJourneyPartitionRef>
<occupancies>
<OccupancyView version="any" id="bbd:occ:1">
<OccupancyLevel>fewSeatsAvailable</OccupancyLevel>
</OccupancyView>
</occupancies>
</JourneyPart>
<JourneyPart version="any" id="bbd:jpt_447_02">
<Description>Hannover to Berlin</Description>
Expand Down
1,062 changes: 1,062 additions & 0 deletions examples/functions/timetable/Netex_51.1_Occupancy.xml
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 12 additions & 1 deletion xsd/NeTEx_publication.xsd
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<xsd:include schemaLocation="netex_timingPattern_version.xsd"/>
<xsd:include schemaLocation="netex_siteConnection_version.xsd"/>
<xsd:include schemaLocation="../part1_networkDescription/netex_flexibleNetwork_version.xsd"/>
<xsd:include schemaLocation="../../netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd"/>
<!-- ======================================================================= -->
<xsd:annotation>
<xsd:appinfo>
Expand Down
1 change: 1 addition & 0 deletions xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ Rail transport, Roads and Road transport
<xsd:group ref="InterchangeInFrameGroup"/>
<xsd:group ref="VehicleTypeInFrameGroup"/>
<xsd:group ref="JourneyAccountingInFrameGroup"/>
<xsd:group ref="OccupancyViewInFrameGroup"/>
</xsd:sequence>
</xsd:group>
<xsd:group name="TimetableDefaultsGroup">
Expand Down
6 changes: 6 additions & 0 deletions xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd"/>
<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd"/>
<xsd:include schemaLocation="../../netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd"/>
<xsd:include schemaLocation="netex_passengerAtStopTime_version.xsd"/>
<xsd:include schemaLocation="netex_interchangeRule_version.xsd"/>
<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
Expand Down Expand Up @@ -249,6 +250,11 @@ Rail transport, Roads and Road transport
</xsd:annotation>
</xsd:element>
<xsd:group ref="CallPartGroup"/>
<xsd:element name="occupancies" type="OccupancyView_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:complexType>
<xsd:group name="CallPartGroup">
Expand Down
6 changes: 6 additions & 0 deletions xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
<xsd:include schemaLocation="netex_vehicleService_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
<xsd:include schemaLocation="../../netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd"/>
<!-- ======================================================================= -->
<xsd:annotation>
<xsd:appinfo>
Expand Down Expand Up @@ -202,6 +203,11 @@ of the corresponding VEHICLE TYPE. true for forward.</xsd:documentation>
<xsd:documentation>Positions in Train of JOURNEY PART.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="occupancies" type="OccupancyView_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="TypeOfProductCategoryRef" minOccurs="0"/>
</xsd:sequence>
</xsd:group>
Expand Down
6 changes: 6 additions & 0 deletions xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
<xsd:include schemaLocation="../../netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd"/>
<xsd:include schemaLocation="netex_journeyAccounting_version.xsd"/>
<!-- ======================================================================= -->
<xsd:annotation>
Expand Down Expand Up @@ -132,6 +133,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>NOTICEs relevant for the whole GROUP OF SERVICEs.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="occupancies" type="OccupancyView_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<!-- ======================================================================= -->
Expand Down
6 changes: 6 additions & 0 deletions xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_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_vehicleJourney_support.xsd"/>
<xsd:include schemaLocation="netex_passingTimes_support.xsd"/>
<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd"/>
<xsd:include schemaLocation="../../netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd"/>
<!-- ======================================================================= -->
<!-- ==CLOSELY COUPLED ===================================================== -->
<xsd:annotation>
Expand Down Expand Up @@ -202,6 +203,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Number of days after the starting time of the journey if not same calendar day. Default is 0 for same day.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="occupancies" type="OccupancyView_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<!-- ======================================================================= -->
Expand Down
68 changes: 68 additions & 0 deletions xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2.2" id="netex_occupancy_support">
<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support.xsd"/>
<!-- ======================================================================= -->
<!-- ==== INDIVIDUAL TRAVELLER ============================================ -->
<xsd:simpleType name="OccupancyEnumeration">
<xsd:annotation>
<xsd:documentation>Passenger load status of a VEHICLE - GTFS-R / TPEG Pts045</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="unknown">
<xsd:annotation>
<xsd:documentation>Unknown. Maps to TPEG Pts45_0.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="empty">
<xsd:annotation>
<xsd:documentation>The vehicle is considered empty by most measures, and has few or no passengers onboard, but is still accepting passengers. Maps to GTFS-R "EMPTY".</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="manySeatsAvailable">
<xsd:annotation>
<xsd:documentation>The vehicle has a large percentage of seats available. What percentage of free seats out of the total seats available is to be considered large enough to fall into this category is determined at the discretion of the producer. Maps to GTFS-R "MANY_SEATS_AVAILABLE" / TPEG Pts45_1, many seats available.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="fewSeatsAvailable">
<xsd:annotation>
<xsd:documentation>The vehicle has a small percentage of seats available. What percentage of free seats out of the total seats available is to be considered small enough to fall into this category is determined at the discretion of the producer. Maps to GTFS-R "FEW_SEATS_AVAILABLE" / TPEG Pts45_2, few seats available.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="standingRoomOnly">
<xsd:annotation>
<xsd:documentation>The vehicle can currently accommodate only standing passengers. Standing room only (and TPEG Pts45_3, no seats available). Maps to GTFS-R "STANDING_ROOM_ONLY" / TPEG Pts45_4.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="crushedStandingRoomOnly">
<xsd:annotation>
<xsd:documentation>The vehicle can currently accommodate only standing passengers and has limited space for them. Maps to GTFS-R "CRUSHED_STANDING_ROOM_ONLY".</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="full">
<xsd:annotation>
<xsd:documentation>Depends on the MODE and MODE OF OPERATION. In general the vehicle will be at capacity at departure. Maps to GTFS-R "FULL" / TPEG Pts45_5, full.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="notAcceptingPassengers">
<xsd:annotation>
<xsd:documentation>The vehicle cannot accept passengers. Maps to GTFS-R "NOT_ACCEPTING_PASSENGERS"</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="undefined">
<xsd:annotation>
<xsd:documentation>Undefined occupancy- Maps to TPEG Pts45_255.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="seatsAvailable">
<xsd:annotation>
<xsd:documentation>(SIRI 2.1) deprecated - use a more specific value</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="standingAvailable">
<xsd:annotation>
<xsd:documentation>(SIRI 2.1) deprecated - use a more specific value</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>
</xsd:schema>
Loading
Loading