[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 2 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
9 changes: 9 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,15 @@ The Calendar is shown coded as
</Arrival>
<Departure>
<Time>14:20:00.0Z</Time>
<ExpectedDepartureOccupancy>
<OccupancyLevel>fewSeatsAvailable</OccupancyLevel>
<OccupancyPercentage>40</OccupancyPercentage>
<WheelchairsOnboardCount>1</WheelchairsOnboardCount>
<GroupReservation>
<NameOfGroup>a group</NameOfGroup>
<NumberOfReservedSeats>4</NumberOfReservedSeats>
</GroupReservation>
</ExpectedDepartureOccupancy>
</Departure>
</Call>
<Call version="any" id="acs:sj_24o_01_002" order="2">
Expand Down
7 changes: 3 additions & 4 deletions xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
</Relation>
<Rights>Unclassified
<Copyright>CEN, Crown Copyright 2009-2014</Copyright>
</Rights>
<Copyright>CEN, Crown Copyright 2009-2014</Copyright></Rights>
<Source>
<ul>
<li>Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.</li>
Expand Down Expand Up @@ -96,9 +95,9 @@ Rail transport, Roads and Road transport
<xsd:documentation>Reference to a COMPOUND TRAIN.</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:simpleContent>
ue71603 marked this conversation as resolved.
Show resolved Hide resolved
ue71603 marked this conversation as resolved.
Show resolved Hide resolved
<xsd:extension base="CompoundTrainRefStructure"/>
</xsd:complexContent>
</xsd:simpleContent>
ue71603 marked this conversation as resolved.
Show resolved Hide resolved
</xsd:complexType>
</xsd:element>
<xsd:complexType name="CompoundTrainRefStructure">
Expand Down
2 changes: 2 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_5/part5_oc/netex_oc_occupancy_version.xsd"/>
<xsd:include schemaLocation="netex_interchangeRule_version.xsd"/>
<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
<xsd:include schemaLocation="netex_call_support.xsd"/>
Expand Down Expand Up @@ -279,6 +280,7 @@ Rail transport, Roads and Road transport
</xsd:annotation>
</xsd:element>
<xsd:group ref="CallPartGroup"/>
<xsd:element name="ExpectedDepartureOccupancy" type="VehicleOccupancyStructure" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:group name="CallPartGroup">
Expand Down
74 changes: 74 additions & 0 deletions xsd/netex_part_5/part5_oc/netex_oc_occupancy_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<?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>TPEG Pts45_0, unknown</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="empty">
<xsd:annotation>
<xsd:documentation>GTFS-R "EMPTY"
The vehicle is considered empty by most measures, and has few or no passengers onboard, but is still accepting passengers.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="manySeatsAvailable">
<xsd:annotation>
<xsd:documentation>GTFS-R "MANY_SEATS_AVAILABLE" / TPEG Pts45_1, many seats available
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.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="fewSeatsAvailable">
<xsd:annotation>
<xsd:documentation>GTFS-R "FEW_SEATS_AVAILABLE" / TPEG Pts45_2, few seats available
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.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="standingRoomOnly">
<xsd:annotation>
<xsd:documentation>GTFS-R "STANDING_ROOM_ONLY" / TPEG Pts45_4, standing room only (and TPEG Pts45_3, no seats available)
The vehicle can currently accommodate only standing passengers.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="crushedStandingRoomOnly">
<xsd:annotation>
<xsd:documentation>GTFS-R "CRUSHED_STANDING_ROOM_ONLY"
The vehicle can currently accommodate only standing passengers and has limited space for them.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="full">
<xsd:annotation>
<xsd:documentation>GTFS-R "FULL" / TPEG Pts45_5, full</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="notAcceptingPassengers">
<xsd:annotation>
<xsd:documentation>GTFS-R "NOT_ACCEPTING_PASSENGERS"
The vehicle cannot accept passengers.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="undefined">
<xsd:annotation>
<xsd:documentation>TPEG Pts45_255, undefined occupancy</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>
122 changes: 122 additions & 0 deletions xsd/netex_part_5/part5_oc/netex_oc_occupancy_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.10" id="netex_occupancy_version">
<xsd:include schemaLocation="netex_oc_occupancy_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version.xsd"/>
<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../../siri/siri_base-v2.0.xsd"/>
<xsd:group name="OccupancyScopeFilterGroup">
<xsd:annotation>
<xsd:documentation>The intersection of supplied elements describes the extent that the Occupancy values applies to. (since SIRI 2.1)
Only vehicle-centric filter (measurement in a part or at an entrance of a TRAIN) are available here, but a stop-centric filtering (measurement in a sector or at a position on a QUAY) can be achieved indirectly via Arrival-/DepartureFormationAssignment.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="TrainComponentGroup" minOccurs="0"/>
<xsd:element name="FareClass" type="FareClassEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Fare class in VEHICLE for which occupancy or capacities are specified.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PassengerCategory" type="siri:NaturalLanguageStringStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Adult, child, wheelchair etc.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<xsd:group name="OccupancyValuesGroup">
<xsd:annotation>
<xsd:documentation>Occupancy values applying to indicated scope. (since SIRI 2.1)</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="OccupancyLevel" type="OccupancyEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>An approximate figure of how occupied or full a VEHICLE and its parts are, e.g. 'manySeatsAvailable' or 'standingRoomOnly'.
More accurate data can be provided by the individual occupancies or capacities below.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="OccupancyPercentage" type="PercentageType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Utilised percentage of maximum payload after departing the STOP POINT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="AlightingCount" type="NumberOfPassengers" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Total number of alighting passengers for this vehicle journey at this STOP POINT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="BoardingCount" type="NumberOfPassengers" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Total number of boarding passengers for this vehicle journey at this STOP POINT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="OnboardCount" type="NumberOfPassengers" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Total number of passengers on-board after departing the STOP POINT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="SpecialPlacesOccupied" type="NumberOfPassengers" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Total number of special places, e.g. seats for the disabled or lounge seats, that are occupied after departing the STOP POINT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PushchairsOnboardCount" type="NumberOfPassengers" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Total number of pushchairs on-board after departing the STOP POINT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="WheelchairsOnboardCount" type="NumberOfPassengers" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Total number of wheelchairs on-board after departing the STOP POINT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PramsOnboardCount" type="xsd:nonNegativeInteger" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Total number of prams on-board after departing the STOP POINT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="BicycleOnboardCount" type="xsd:nonNegativeInteger" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Total number of bicycles on-board, i.e., number of bicycle racks that are occupied after departing the STOP POINT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<xsd:complexType name="GroupReservationStructure">
<xsd:annotation>
<xsd:documentation>Used to specify that a travel group has booked a section of the vehicle for a part of the journey, and if so under what name. (since SIRI 2.1)</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="NameOfGroup" type="siri:NaturalLanguageStringStructure">
<xsd:annotation>
<xsd:documentation>Name for which the travel group has made the reservation.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="NumberOfReservedSeats" type="NumberOfPassengers">
<xsd:annotation>
<xsd:documentation>Number of seats that the group has booked.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="VehicleOccupancyStructure">
<xsd:annotation>
<xsd:documentation>Real-time occupancies of a VEHICLE (by fare class). Could be feedback from an automatic passenger counting system (APC) or estimated values from statistics. (since SIRI 2.1)</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="OccupancyScopeFilterGroup"/>
<xsd:group ref="OccupancyValuesGroup"/>
<xsd:element name="TotalNumberOfReservedSeats" type="NumberOfPassengers" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Total number of booked seats from individual and group reservations.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="GroupReservation" type="GroupReservationStructure" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>Reservations of travel groups, i.e., name of group and number of seats booked.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:complexType>
</xsd:schema>