Skip to content

Commit

Permalink
Merge branch 'NeTEx-CEN:master' into EPIAP-Accessibility-Equipments-e…
Browse files Browse the repository at this point in the history 
…nhancement
  • Loading branch information
@Aurige
Aurige authored Jan 8, 2024
2 parents ddcf228 + 1336261 commit b44d30b
Show file tree
Hide file tree
Showing 36 changed files with 203 additions and 635 deletions.
12 changes: 11 additions & 1 deletion examples/functions/fares/rail/Netex_era_crossborder_de.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,11 @@ Use separate Composite frames to group
<GenericParameterAssignment id="tlx:Trilex@Tariff@Tagesticket@sections" version="01" order="1">
<ValidityParameterGroupingType>AND</ValidityParameterGroupingType>
<validityParameters>
<VehicleModes>rail</VehicleModes>
<!-- check PR #145 -->
<TransportSubmode>
<RailSubmode>longDistance</RailSubmode>
</TransportSubmode>
<FareSectionRef ref="tlx:Trilex@Dresden-to-Goerlitz" version="01"/>
<FareSectionRef ref="tlx:Trilex@Dresden-to-Liberec" version="01"/>
<FareSectionRef ref="tlx:Trilex@Seifhennersdorf-to-Liberec" version="01"/>
Expand Down Expand Up @@ -455,6 +460,11 @@ Saturdays / Sundays / public holidays: 00:00 to 03:00 the following day</Descrip
<Name>Dresden to Wroclaw section</Name>
<GenericParameterAssignment id="tlx:Trilex@Tariff@Dresden-Wroclaw-Spezial@de_pl" version="01" order="1">
<validityParameters>
<TransportModes>rail</TransportModes>
<!-- check PR #145 -->
<TransportSubmode>
<RailSubmode>highSpeedRail</RailSubmode>
</TransportSubmode>
<FareSectionRef ref="tlx:Trilex@Dresden-to-Wroclaw" version="01"/>
</validityParameters>
</GenericParameterAssignment>
Expand Down Expand Up @@ -1479,7 +1489,7 @@ issued to DB ticket vending machines.</Description>
<dayTypes>
<FareDayType version="any" id="tlx::everyday">
<Name>Every day</Name>
<Description>ANy time</Description>
<Description>Any time</Description>
<EarliestTime>00:00:00</EarliestTime>
<DayLength>P1DT3H</DayLength>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/rail/Netex_era_toc_uk.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9130,7 +9130,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g
<dayTypes>
<FareDayType version="any" id="jsp:everyday">
<Name>Every day</Name>
<Description>ANy time</Description>
<Description>Any time</Description>
<EarliestTime>00:00:00</EarliestTime>
<properties>
<PropertyOfDay>
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/timetable/Netex_01.4_Bus_SimpleTimetable_WithConnection.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1303,7 +1303,7 @@ The Calendar is shown coded as
</Call>
</calls>
<PassengerCarryingRequirementsView>
<PassengerCapacity>
<PassengerCapacity version="any" id="PC1">
<SeatingCapacity>22</SeatingCapacity>
<StandingCapacity>44</StandingCapacity>
<SpecialPlaceCapacity>2</SpecialPlaceCapacity>
Expand Down
2 changes: 1 addition & 1 deletion examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5675,7 +5675,7 @@ Metrobus (including Fastway services), Southdown PSV, Compass Travel
<dayTypes>
<FareDayType version="any" id="jsp:everyday">
<Name>Every day</Name>
<Description>ANy time</Description>
<Description>Any time</Description>
<EarliestTime>00:00:00</EarliestTime>
<properties>
<PropertyOfDay>
Expand Down
2 changes: 1 addition & 1 deletion examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1660,7 +1660,7 @@ C2C, Chiltern Railways, Great Western Railway, Great Northern rail, London Midla
<dayTypes>
<FareDayType version="any" id="jsp:everyday">
<Name>Every day</Name>
<Description>ANy time</Description>
<Description>Any time</Description>
<EarliestTime>00:00:00</EarliestTime>
<properties>
<PropertyOfDay>
Expand Down
2 changes: 1 addition & 1 deletion examples/standards/gtfs/Netex_gtfs_exm1_CalendarDates_1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The data comes from the sample-feed.zip available at http://code.google.com/tr
2. MAPPING
A CALENDAR DATE maps to a VALIDITY CONDITION
The condition can be included as part of a SERVICE CALENDAR FRAME alonfg with the calendar.txts
The condition can be included as part of a SERVICE CALENDAR FRAME along with the calendar.txts
GTFS NeTEx
service_id, <ServiceCalendarFrame #service_id>@id
Expand Down
2 changes: 1 addition & 1 deletion examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ is relevant for supplying an Integrator with partial data from multiple sources.
</Call>
</calls>
<PassengerCarryingRequirementsView>
<PassengerCapacity>
<PassengerCapacity version="any" id="PC1">
<TotalCapacity>90</TotalCapacity>
<SeatingCapacity>50</SeatingCapacity>
<PushchairCapacity>1</PushchairCapacity>
Expand Down
14 changes: 7 additions & 7 deletions xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ Rail transport, Roads and Road transport
<!-- ======================================================================= -->
<xsd:element name="Assignment_" type="DataManagedObjectStructure" abstract="true" substitutionGroup="DataManagedObject">
<xsd:annotation>
<xsd:documentation>Dummy Abstract Assignment An Assignment assigns a property to an assignment element. It has a name and n order.</xsd:documentation>
<xsd:documentation>Dummy Abstract Assignment. An Assignment assigns a property to an other element. It has a name and an order.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="Assignment_VersionStructure_" abstract="true">
<xsd:annotation>
<xsd:documentation>Type for ASSIGNMENT.</xsd:documentation>
<xsd:documentation>Type for ASSIGNMENT.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="DataManagedObjectStructure">
Expand All @@ -74,15 +74,15 @@ Rail transport, Roads and Road transport
</xsd:sequence>
<xsd:attribute name="order" type="xsd:integer">
<xsd:annotation>
<xsd:documentation>Order in which to show ASSIGNMENT,</xsd:documentation>
<xsd:documentation>Order in which to show an ASSIGNMENT.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<xsd:group name="AssignmentGroup">
<xsd:annotation>
<xsd:documentation>Elements for an ASSIGNMENT. An Assignment assignes a property to an aelent element. It has a name and n order.</xsd:documentation>
<xsd:documentation>Elements for an ASSIGNMENT. An ASSIGNMENT assigns a property to an another element. It has a name and an order.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="Name" type="MultilingualString" minOccurs="0">
Expand All @@ -92,14 +92,14 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="Description" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Description of ASSIGNMENT.</xsd:documentation>
<xsd:documentation>Description of ASSIGNMENT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<xsd:element name="Assignment" abstract="true" substitutionGroup="Assignment_">
<xsd:annotation>
<xsd:documentation>A set of properties to be applied to an another element. It has a name and an order.</xsd:documentation>
<xsd:documentation>A set of properties to be applied to an another element. It has a name and an order.</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
Expand All @@ -122,7 +122,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:complexType name="Assignment_VersionStructure" abstract="true">
<xsd:annotation>
<xsd:documentation>Type for ASSIGNMENT.</xsd:documentation>
<xsd:documentation>Type for ASSIGNMENT.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:restriction base="Assignment_VersionStructure_">
Expand Down
5 changes: 5 additions & 0 deletions xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Company registration number including Country prefix.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="VATNumber" type="xsd:normalizedString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Company registered tax number including Country prefix.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExternalOperatorRef" type="ExternalObjectRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>An alternative code that uniquely identifies the OPERATOR. Specifically for use in AVMS systems. For VDV compatibility.</xsd:documentation>
Expand Down
6 changes: 6 additions & 0 deletions xsd/netex_framework/netex_genericFramework/netex_place_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<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" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_place_version">
<xsd:include schemaLocation="netex_place_support.xsd"/>
<xsd:include schemaLocation="../netex_genericFramework/netex_zoneProjection_version.xsd"/>
<xsd:include schemaLocation="../netex_reusableComponents/netex_mode_support.xsd"/>
<!-- ======================================================================= -->
<xsd:annotation>
<xsd:appinfo>
Expand Down Expand Up @@ -158,6 +159,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Whether timings and validity applies to both directions (true) or just to the from-to direction of the TRANSFER.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="TransferMode" type="AccessModeEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>If a special transfer mode is needed. ACCESS MODE enumeration is also used for the TransferMode.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<xsd:element name="TransferDuration" type="TransferDurationStructure">
Expand Down
1 change: 0 additions & 1 deletion xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,6 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="childfreeArea"/>
<xsd:enumeration value="animalsAllowed"/>
<xsd:enumeration value="noAnimals"/>
<xsd:enumeration value="animalsAllowed"/>
<xsd:enumeration value="breastfeedingFriendly"/>
<xsd:enumeration value="mobilePhoneUseZone"/>
<xsd:enumeration value="mobilePhoneFreeZone"/>
Expand Down
11 changes: 9 additions & 2 deletions xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ Rail transport, Roads and Road transport
<xsd:element ref="MobilityFacilityList" minOccurs="0"/>
<xsd:element ref="NuisanceFacilityList" minOccurs="0"/>
<xsd:element ref="PassengerCommsFacilityList" minOccurs="0"/>
<xsd:element name="PassengerInformationEquipmentList" type="PassengerInformationEquipmentEnumeration" minOccurs="0">
<xsd:element name="PassengerInformationEquipmentList" type="PassengerInformationEquipmentListOfEnumerations" minOccurs="0">
<xsd:annotation>
<xsd:documentation>List of PASSENGER INFORMATION Equipments.</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -245,7 +245,7 @@ Rail transport, Roads and Road transport
<xsd:element ref="MobilityFacilityList" minOccurs="0"/>
<xsd:element ref="NuisanceFacilityList" minOccurs="0"/>
<xsd:element ref="PassengerCommsFacilityList" minOccurs="0"/>
<xsd:element name="PassengerInformationEquipmentList" type="PassengerInformationEquipmentEnumeration" minOccurs="0">
<xsd:element name="PassengerInformationEquipmentList" type="PassengerInformationEquipmentListOfEnumerations" minOccurs="0">
<xsd:annotation>
<xsd:documentation>List of PASSENGER INFORMATION Equipments.</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -1099,6 +1099,13 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:list itemType="NuisanceFacilityEnumeration"/>
</xsd:simpleType>
<!-- ===PASSENGER INFORMATION EQUIPMENT ====================================== -->
<xsd:simpleType name="PassengerInformationEquipmentListOfEnumerations">
<xsd:annotation>
<xsd:documentation>List of values for PASSENGER INFORMATION EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:list itemType="PassengerInformationEquipmentEnumeration"/>
</xsd:simpleType>
<!-- ===Parking FACILITY====================================== -->
<xsd:element name="ParkingFacility" type="ParkingFacilityEnumeration">
<xsd:annotation>
Expand Down
112 changes: 89 additions & 23 deletions xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,23 @@ Rail transport, Roads and Road transport
<!--======Out of Vehicle==================================================================================-->
<xsd:element name="AccessMode" type="AccessModeEnumeration">
<xsd:annotation>
<xsd:documentation>Access MODE for SITEs.</xsd:documentation>
<xsd:documentation>Access MODE for SITEs and VEHICLE MEETING POINTs. Also used for TRANSFER and if in OTHER LEG of the TRIP a monomodal non-public transport is used.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:simpleType name="AccessModeEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for Access MODEs for SITEs.</xsd:documentation>
<xsd:documentation>Allowed values for Access MODEs for SITEs, VEHICLE MEETING POINTS and TRANSFER and for monomodal non-public transport OTHER LEG in TRIP.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
<xsd:enumeration value="foot"/>
<xsd:enumeration value="bicycle"/>
<xsd:enumeration value="boat"/>
<xsd:enumeration value="car"/>
<xsd:enumeration value="taxi"/>
<xsd:enumeration value="taxi">
<xsd:annotation>
<xsd:documentation>Taxi can now be modeled as VEHICLE MODE as well.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="shuttle"/>
<xsd:enumeration value="ski"/>
<xsd:enumeration value="skate"/>
Expand Down Expand Up @@ -210,36 +214,98 @@ Rail transport, Roads and Road transport
</xsd:simpleType>
<xsd:simpleType name="AllVehicleModesOfTransportEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for MODES of Transport : TPEG pti_table 01.</xsd:documentation>
<xsd:documentation>Allowed values for MODES of Transport : roughly based on TPEG pti_table 01. AllVehicleModesOfTransportEnumeration is the master list of Vehicle Modes in Transmodel. If a specific value applies, then general values like "other" are not to be used.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="all"/>
<xsd:enumeration value="unknown"/>
<xsd:enumeration value="all">
<xsd:annotation>
<xsd:documentation>If all modes are meant.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="unknown">
<xsd:annotation>
<xsd:documentation>Use only when no other entry applies.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="bus"/>
<xsd:enumeration value="trolleyBus"/>
<xsd:enumeration value="trolleyBus">
<xsd:annotation>
<xsd:documentation>Special type of bus with two overhead wires using spring-loaded trolley poles.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="tram"/>
<xsd:enumeration value="coach"/>
<xsd:enumeration value="coach">
<xsd:annotation>
<xsd:documentation>Bus for longer-distance service. This value specialises from bus through regulation, that the cross multiple metropolitan regions and that all passenger area seating. Also the seating layout is different.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="rail"/>
<xsd:enumeration value="intercityRail"/>
<xsd:enumeration value="urbanRail"/>
<xsd:enumeration value="metro"/>
<xsd:enumeration value="air"/>
<xsd:enumeration value="water"/>
<xsd:enumeration value="cableway"/>
<xsd:enumeration value="funicular"/>
<xsd:enumeration value="snowAndIce"/>
<xsd:enumeration value="intercityRail">
<xsd:annotation>
<xsd:documentation>Deprecated. Use Mode rail with RailSubmode longDistance.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="urbanRail">
<xsd:annotation>
<xsd:documentation>Deprecated. Use Mode metro with MetroSubmode urbanRail (or in some few cases rail with RailSubmode local). </xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="metro">
<xsd:annotation>
<xsd:documentation>Within an urban area. For underground and railway.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="air">
<xsd:annotation>
<xsd:documentation>All air related Mode. No special distinction is done.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="water">
<xsd:annotation>
<xsd:documentation>Most water related modes. The only specialisation is the Mode ferry. In Transmodel also ship was used for this mode.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="cableway">
<xsd:annotation>
<xsd:documentation>Can be only two cabines or multiple.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="funicular">
<xsd:annotation>
<xsd:documentation>cable railway on steep slope using two counterbalanced carriages.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="snowAndIce">
<xsd:annotation>
<xsd:documentation>A collection for all Mode involving snow and ice.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="taxi"/>
<xsd:enumeration value="ferry"/>
<xsd:enumeration value="lift"/>
<xsd:enumeration value="ferry">
<xsd:annotation>
<xsd:documentation>Ferry can be passenger ferries and/or car ferries. The specialisation from water is the detailed schedule and usually the very rigid pattern with only a few stops on the route.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="lift">
<xsd:annotation>
<xsd:documentation>General Mode for elevators and for Modes moved by cable. Especially lifts are not only vertical elevators. If a better specialisation applies (like cableway) use that.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="selfDrive">
<xsd:annotation>
<xsd:documentation>See pti12_x.</xsd:documentation>
<xsd:documentation>For all alternative modes where a vehicle is driven by the user. See pti12_x.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="anyMode">
<xsd:annotation>
<xsd:documentation>To be avoided.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="other">
<xsd:annotation>
<xsd:documentation>Use only when no other entry applies.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="anyMode"/>
<xsd:enumeration value="other"/>
<!-- NOT IN tpeg -->
<!-- NOT IN tpeg -->
</xsd:restriction>
</xsd:simpleType>
<!--========================================================================================-->
Expand Down
9 changes: 7 additions & 2 deletions xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,13 @@ Rail transport, Roads and Road transport
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="undefined"/>
<xsd:enumeration value="plug"/>
<xsd:enumeration value="pantographABove"/>
<xsd:enumeration value="pantographABove"/>
<xsd:enumeration value="pantographAbove">
<xsd:annotation>
<xsd:documentation>depreciated. Will be panthograph.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="pantograph">
</xsd:enumeration>
<xsd:enumeration value="induction"/>
<xsd:enumeration value="other"/>
</xsd:restriction>
Expand Down
12 changes: 10 additions & 2 deletions xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,16 @@ Local train adapted for running in mountain railway lines.</xsd:documentation>
<xsd:enumeration value="unknown"/>
<xsd:enumeration value="undefined"/>
<xsd:enumeration value="metro"/>
<xsd:enumeration value="tube"/>
<xsd:enumeration value="urbanRailway"/>
<xsd:enumeration value="tube">
<xsd:annotation>
<xsd:documentation>Deprecated. Use metro</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="urbanRailway">
<xsd:annotation>
<xsd:documentation>Replaces the Mode urbanRail.</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>
<!-- ======================================================================= -->
Expand Down
Loading

0 comments on commit b44d30b

Please sign in to comment.