Skip to content

Commit

Permalink
Enhancement-Deckplanetc: Update access right parameters
Browse files Browse the repository at this point in the history 
The access right parameters need updating to include various  new parameters such as deck plan
Some existing parameters eg tariff also need adding
  • Loading branch information
@nick-knowles
nick-knowles committed Dec 10, 2023
1 parent 9b12653 commit 3b2cac2
Showing 1 changed file with 52 additions and 18 deletions.
70 changes: 52 additions & 18 deletions xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<?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.2.2" id="netex_accessRightParameter_version">
<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="2.0" id="netex_accessRightParameter_version">
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleSeating_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_deckPlan_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_seatingPlan_support.xsd"/>
<!-- ====Network ========================================================= -->
<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd"/>
<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
Expand All @@ -18,6 +20,7 @@
<xsd:include schemaLocation="netex_salesDistribution_support.xsd"/>
<xsd:include schemaLocation="netex_salesOfferPackageEntitlement_support.xsd"/>
<xsd:include schemaLocation="netex_salesOfferPackage_support.xsd"/>
<xsd:include schemaLocation="../part3_salesTransactions/netex_mediumApplication_support.xsd"/>
<xsd:include schemaLocation="netex_typeOfTravelDocument_support.xsd"/>
<!-- ====New Modes ========================================================= -->
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_nm_fleetEquipment_support.xsd"/>
Expand All @@ -44,42 +47,55 @@
<Date>
<Created>2010-09-04</Created>
</Date>
<Date><Modified>2011-02-05</Modified>Name Space changes
<Date>
<Modified>2011-02-05</Modified>Name Space changes
</Date>
<Date><Modified>2017-03-28</Modified> CR019 Make ValidityParameter Assignment not abstract and fix ambiguity with Generic Parameter
<Date>
<Modified>2017-03-28</Modified> CR019 Make ValidityParameter Assignment not abstract and fix ambiguity with Generic Parameter
</Date>
<Date><Modified>2017-10-10</Modified> Fix Add TypeOfTravelDocument to ProductValidityParametersGroup.
<Date>
<Modified>2017-10-10</Modified> Fix Add TypeOfTravelDocument to ProductValidityParametersGroup.
* Allow DistanceMatrixElement view so that origin and Destination can be referenced
</Date>
<Date><Modified>2017-10-10</Modified> Fix Add TimeIntervalRef TimeStructureFactorRef to GeographicalIntervalRef GeographicalStructureFactorRef to be referenced
<Date>
<Modified>2017-10-10</Modified> Fix Add TimeIntervalRef TimeStructureFactorRef to GeographicalIntervalRef GeographicalStructureFactorRef to be referenced
</Date>
<Date><Modified>2019-03-01</Modified>EURA-(nk) Add DistanceMatrixInverseRef for backwards direction of reference to a DIstance Matrix Element
<Date>
<Modified>2019-03-01</Modified>EURA-(nk) Add DistanceMatrixInverseRef for backwards direction of reference to a DIstance Matrix Element
</Date>
<Date><Modified>2019-03-01</Modified>Add missing elements to GenericParameterAssignment
<Date>
<Modified>2019-03-01</Modified>Add missing elements to GenericParameterAssignment
* UK-33 Add TariffRef as a GenericParameterAssignment parameter
* UK80 TypeOfConcession, TypeOfUsageParameter, VehicleType TypeOfLineRef as GenericParameterAssignment parameters
</Date>
<Date><Modified>2019-03-01</Modified>EURA-88 Add ServiceMatch Attributes : Exact | next | previous | timebands to GenericParameterAssignmen
<Date>
<Modified>2019-03-01</Modified>EURA-88 Add ServiceMatch Attributes : Exact | next | previous | timebands to GenericParameterAssignmen
</Date>
<Date><Modified>2019-03-01</Modified>UK-41 Add an additional functional operator to GenericParameterAssignment to clarify use of groups : oneOf / someOf/ allOf
<Date>
<Modified>2019-03-01</Modified>UK-41 Add an additional functional operator to GenericParameterAssignment to clarify use of groups : oneOf / someOf/ allOf
</Date>
<Date><Modified>2019-03-09</Modified>EURA-54 Add a PassengerSeatRef to
<Date>
<Modified>2019-03-09</Modified>EURA-54 Add a PassengerSeatRef to
</Date>
<Date><Modified>2019-03-14</Modified>UK-41 Also LimitationSelectionType Add an additional functional operator to GenericParameterAssignment to clarify use of groups : oneOf / someOf/ allOf
<Date>
<Modified>2019-03-14</Modified>UK-41 Also LimitationSelectionType Add an additional functional operator to GenericParameterAssignment to clarify use of groups : oneOf / someOf/ allOf

* Add new ___FareStructureValidityParametersGroup___ to validity paarmaters with new attributes ___TypeOfTariffRef___, ___TypeOfFareStructureFactor___, ___TypeOfFarFresStructureFactorRef___,
* Extend ___FareProduct ValidityParametersGroup___ to validity paramaters with new attributes ___TypeOfPriceingRuleRef___, ___ChargingMethodRef___, ___TypeOfPaymentMethodRef___, ___TypeOfMachineReadability___, ___TypeOfFareTableRef.___ TypeofMachineReadabilityRef.
* Add new ___SeatingValidityParametersGroup___ with new attributes ___TrainElementRef___, ___TrainComponentLabelAssignmentRef___.
* Also add OperatingPeriod Ref to Temporal validity Parameters
* Also Fix change choice of TrainNumber etc to selection,
</Date>
<Date><Modified>2019-03-26</Modified>NL-27 CD #58 Add default TypeOfProductCategory and TypeOfService to Line:
<Date>
<Modified>2019-03-26</Modified>NL-27 CD #58 Add default TypeOfProductCategory and TypeOfService to Line:
Move TypeOfProductCategory amnd TypeOfService from netex_journey_version to Framework reusable components (netex_travelRights_version) so they are visible from part 1
Can therefore drop include of netex_travelRights_version from netex_accessRightParameter_version.xsd .
</Date>
<Date><Modified>2019-04-18</Modified>FIX - SUpport Place to Place travel (ADDRESS and TOPOGRAPHICAL PLACE) : Add AddressRef , TopoographiPlaceRef and PlaceUseEnum.
<Date>
<Modified>2019-04-18</Modified>FIX - SUpport Place to Place travel (ADDRESS and TOPOGRAPHICAL PLACE) : Add AddressRef , TopoographiPlaceRef and PlaceUseEnum.
</Date>
<Date><Modified>2020-10-05</Modified> New Modes:
<Date>
<Modified>2020-10-05</Modified> New Modes:
ValidityParameters
- Modes: Add AccessVeModes and ModeOfOperation
- VehicleTypes: Add ModelProfileType, use Wider TransportType rather than VehicleType
Expand All @@ -94,9 +110,17 @@
- Service add SingleJourney and GroupOfSingleJourneys
- Fare: add MediumAccessDevice and ApplicationInstance
</Date>
<Date><Modified>2021-09-01</Modified>FIX - Post newmodes merge Remove ambigous use of VehicleModes (drop from Organisation validity parameters).
<Date>
<Modified>2021-09-01</Modified>FIX - Post newmodes merge Remove ambigous use of VehicleModes (drop from Organisation validity parameters).
Add MobilityServiceConstraintZone to Network validity parameters.
</Date>
<Date>
<Modified>2023-12-09</Modified>
Fix add ServiceCalendarRef, TimebandRef to Temporal parameter refs
Fix add TarriffRef , TypeOfMediumAccessdeficeRef to Fare Usage Parameter refs
Enhancement add TypeOfProof to Usage Parameter refs.
Enhancement DEek plans - Add DEckPlanRef DeckSpaceRef LocatbleSPotRef TypeOfLocatableSpotRef to Service Parameter refs
</Date>
<Description>
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
<p>This sub-schema describes the FARE ACCESS RIGHT PARAMETER types.</p>
Expand All @@ -113,7 +137,7 @@
<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
</Relation>
<Rights>Unclassified
<Copyright>CEN, Crown Copyright 2009-2021</Copyright>
<Copyright>CEN, Crown Copyright 2009-2023</Copyright>
</Rights>
<Source>
<ul>
Expand Down Expand Up @@ -314,7 +338,7 @@ Rail transport, Roads and Road transport
</xsd:element>
</xsd:sequence>
</xsd:group>
<!-- ====VALIDITY PARAMETER ASSIGNMENT=================================================== -->
<!-- ==== TEMPORAL VALIDITY PARAMETER ASSIGNMENT================================== -->
<xsd:complexType name="temporalValidityParameters_RelStructure">
<xsd:annotation>
<xsd:documentation>One to many Relationship for temporal validity parameters.</xsd:documentation>
Expand All @@ -332,13 +356,16 @@ Rail transport, Roads and Road transport
<xsd:documentation>Temporal validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element ref="ServiceCalendarRef" minOccurs="0"/>
<xsd:element ref="DayTypeRef" minOccurs="0"/>
<xsd:element ref="GroupOfTimebandsRef" minOccurs="0"/>
<xsd:element ref="TimebandRef" minOccurs="0"/>
<xsd:element ref="OperatingDayRef" minOccurs="0"/>
<xsd:element ref="OperatingPeriodRef" minOccurs="0"/>
<xsd:element ref="ValidityConditionRef" minOccurs="0"/>
</xsd:sequence>
</xsd:group>
<!-- ==== SCOPING VALIDITY PARAMETER ASSIGNMENT=================================================== -->
<xsd:complexType name="validityParameters_RelStructure">
<xsd:annotation>
<xsd:documentation>One to many Relationship for scoping validity parameters.</xsd:documentation>
Expand Down Expand Up @@ -547,11 +574,15 @@ Rail transport, Roads and Road transport
</xsd:group>
<xsd:group name="SeatingValidityParametersGroup">
<xsd:annotation>
<xsd:documentation>Seating validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT.</xsd:documentation>
<xsd:documentation>Seating validity parameters for ACCESS RIGHT PARAMETER ASSIGNMENT. NB PAssengerSeatRef is DEPRECATED </xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element ref="TrainElementRef" minOccurs="0"/>
<xsd:element ref="TrainComponentLabelAssignmentRef" minOccurs="0"/>
<xsd:element ref="DeckPlanRef"/>
<xsd:element ref="DeckSpaceRef" minOccurs="0"/>
<xsd:element ref="LocatableSpotRef" minOccurs="0"/>
<xsd:element ref="TypeOfLocatableSpotRef" minOccurs="0"/>
<xsd:element ref="PassengerSeatRef" minOccurs="0"/>
<xsd:element ref="VehicleRef" minOccurs="0"/>
</xsd:sequence>
Expand Down Expand Up @@ -596,6 +627,7 @@ Rail transport, Roads and Road transport
<xsd:element ref="TypeOfFareStructureFactorRef" minOccurs="0"/>
<xsd:element ref="TypeOfFareStructureElementRef" minOccurs="0"/>
<xsd:element ref="TypeOfTariffRef" minOccurs="0"/>
<xsd:element ref="TariffRef" minOccurs="0"/>
</xsd:sequence>
</xsd:group>
<xsd:group name="ProductValidityParametersGroup">
Expand All @@ -609,6 +641,7 @@ Rail transport, Roads and Road transport
<xsd:element ref="TypeOfFareProductRef" minOccurs="0"/>
<xsd:element ref="TypeOfUsageParameterRef" minOccurs="0"/>
<xsd:element ref="TypeOfConcessionRef" minOccurs="0"/>
<xsd:element ref="TypeOfProofRef" minOccurs="0"/>
</xsd:sequence>
</xsd:group>
<xsd:group name="SalesOfferValidityParametersGroup">
Expand All @@ -619,6 +652,7 @@ Rail transport, Roads and Road transport
<xsd:element ref="TypeOfSalesOfferPackageRef" minOccurs="0"/>
<xsd:element ref="TypeOfTravelDocumentRef" minOccurs="0"/>
<xsd:element ref="TypeOfMachineReadabilityRef" minOccurs="0"/>
<xsd:element ref="TypeOfMediumAccessDeviceRef" minOccurs="0"/>
</xsd:sequence>
</xsd:group>
<xsd:group name="DistributionParametersGroup">
Expand Down

0 comments on commit 3b2cac2

Please sign in to comment.