Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 3 deletions examples/functions/newModes/IXSI Service 1 - Static Data.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,11 @@
</VehicleSharingService>
<OnlineService version="any" id="GE:OnlineServiceRef:12">
<Name>Stadtmobil</Name>
<ServiceBookingArrangements>
<BookingUrl>https://www.stadtmobil.de/</BookingUrl>
</ServiceBookingArrangements>
<serviceBookingArrangements>
<ServiceBookingArrangement>
<BookingUrl>https://www.stadtmobil.de/</BookingUrl>
</ServiceBookingArrangement>
</serviceBookingArrangements>
<LogInRequired>true</LogInRequired>
</OnlineService>
<VehicleSharing version="any" id="GE:VehicleSharing:12">
Expand Down
30 changes: 16 additions & 14 deletions examples/functions/newModes/NewModes-CarPoolingExample.xml
Original file line number Diff line number Diff line change
Expand Up @@ -447,20 +447,22 @@ In addition CUSTOMER PURCHASE PACKAGES showing the parameters that might be held
<Name>Ryde car scharing scheme.</Name>
<StartDate>2018-01-01</StartDate>
<OperatorRef version="any" ref="noc:XRYD"/>
<ServiceBookingArrangements>
<BookingContact>
<Url>https://www.ryde.eu/booking</Url>
</BookingContact>
<BookingMethods>mobileApp online</BookingMethods>
<BookingAccess>authorisedPublic</BookingAccess>
<BookWhen>advanceAndDayOfTravel</BookWhen>
<BuyWhen>onCheckOut</BuyWhen>
<MinimumBookingPeriod>PT2H</MinimumBookingPeriod>
<BookingUrl>https://www.ryde.eu/booking</BookingUrl>
<BookingNote>Booklings made using app. Bookings can be made up to two hour before travel. </BookingNote>
<DepositRequired>false</DepositRequired>
<BookingChargeType>none</BookingChargeType>
</ServiceBookingArrangements>
<serviceBookingArrangements>
<ServiceBookingArrangement>
<BookingContact>
<Url>https://www.ryde.eu/booking</Url>
</BookingContact>
<BookingMethods>mobileApp online</BookingMethods>
<BookingAccess>authorisedPublic</BookingAccess>
<BookWhen>advanceAndDayOfTravel</BookWhen>
<BuyWhen>onCheckOut</BuyWhen>
<MinimumBookingPeriod>PT2H</MinimumBookingPeriod>
<BookingUrl>https://www.ryde.eu/booking</BookingUrl>
<BookingNote>Bookings made using app. Bookings can be made up to two hour before travel.</BookingNote>
<DepositRequired>false</DepositRequired>
<BookingChargeType>none</BookingChargeType>
</ServiceBookingArrangement>
</serviceBookingArrangements>
<BookingRequired>true</BookingRequired>
<RegistrationRequired>true</RegistrationRequired>
<proposedByServices>
Expand Down
72 changes: 55 additions & 17 deletions examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,13 @@
</Parking>
</parkings>
</SiteFrame>
<ServiceFrame version="1.0" id="hjm:dummy_line" responsibilitySetRef="hjm:network_data">
<lines>
<Line id="dontcompetewiththisline" version="1">
<Name>A classical public transport line</Name>
</Line>
</lines>
</ServiceFrame>
<!--==== Mobility Service ==== -->
<MobilityServiceFrame version="1.0" id="hjm:chauffeured_taxi_example" responsibilitySetRef="hjm:network_data">
<prerequisites>
Expand Down Expand Up @@ -485,23 +492,54 @@
<BrandingRef version="any" ref="myBrand"/>
<Name>Home James Cars.</Name>
<OperatorRef version="any" ref="noc:HJM"/>
<ServiceBookingArrangements>
<BookingContact>
<Phone>=31666777</Phone>
<Url>https://www.homeJames.eu/booking</Url>
</BookingContact>
<BookingMethods>mobileApp online</BookingMethods>
<BookingAccess>authorisedPublic</BookingAccess>
<BookWhen>advanceOnly</BookWhen>
<BuyWhen>onCheckOut</BuyWhen>
<LatestBookingTime>20:00:00</LatestBookingTime>
<MinimumBookingPeriod>P1D</MinimumBookingPeriod>
<BookingUrl>https://www.homeJames.eu/booking</BookingUrl>
<BookingNote>Booklings made online or by pyone Bookings can be made up to two hour before travel. </BookingNote>
<MinimumBookingDuration>PT2H</MinimumBookingDuration>
<DepositRequired>true</DepositRequired>
<BookingChargeType>none</BookingChargeType>
</ServiceBookingArrangements>
<serviceBookingArrangements>
<ServiceBookingArrangement>
<BookingContact>
<Phone>=31666777</Phone>
<Url>https://www.homeJames.eu/booking</Url>
</BookingContact>
<BookingMethods>mobileApp online</BookingMethods>
<BookingAccess>authorisedPublic</BookingAccess>
<BookWhen>advanceOnly</BookWhen>
<BuyWhen>onCheckOut</BuyWhen>
<LatestBookingTime>20:00:00</LatestBookingTime>
<MinimumBookingPeriod>P1D</MinimumBookingPeriod>
<BookingUrl>https://www.homeJames.eu/booking</BookingUrl>
<BookingNote>Bookings made online or by phone. Bookings must be made before 20:00 of the previous day.</BookingNote>
<MinimumBookingDuration>PT2H</MinimumBookingDuration>
<DepositRequired>true</DepositRequired>
<BookingChargeType>none</BookingChargeType>
</ServiceBookingArrangement>
<ServiceCompetitiveCondition>
<InterchangeBetweenFlexibleServicesAllowed>true</InterchangeBetweenFlexibleServicesAllowed>
<InterchangeWithContentionalServicesAllowed>true</InterchangeWithContentionalServicesAllowed>
</ServiceCompetitiveCondition>
<ServiceCompetitiveCondition>
<LineRef ref="dontcompetewiththisline" version="1"/>
<TemporalDistance>PT15M</TemporalDistance>
<Distance>500</Distance>
</ServiceCompetitiveCondition>
<ServiceEligibilityArrangement>
<UserProfile id="UP1" version="1">
<MinimumAge>65</MinimumAge>
</UserProfile>
</ServiceEligibilityArrangement>
<ServiceEligibilityArrangement>
<CommercialProfile id="CP1" version="1">
<ConsumptionUnits>20</ConsumptionUnits>
</CommercialProfile>
</ServiceEligibilityArrangement>
<ServiceEligibilityArrangement>
<ResidentialQualification id="RQ1" version="1">
<MustReside>true</MustReside>
</ResidentialQualification>
</ServiceEligibilityArrangement>
<ServiceEligibilityArrangement>
<CompanionProfile id="CP2" version="1">
<MinimumNumberOfPersons>2</MinimumNumberOfPersons>
</CompanionProfile>
</ServiceEligibilityArrangement>
</serviceBookingArrangements>
<BookingRequired>true</BookingRequired>
<RegistrationRequired>true</RegistrationRequired>
<proposedByServices>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
<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.2.2" id="netex_serviceRestrictions_version">
<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_support.xsd"/>
<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
<xsd:include schemaLocation="netex_serviceRestrictions_support.xsd"/>
<!--xxx verschieben -->
<xsd:include schemaLocation="../../netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd"/>
<!--xxx verschieben -->
<!-- ======================================================================= -->
<xsd:annotation>
<xsd:appinfo>
Expand Down Expand Up @@ -232,6 +236,96 @@ Rail transport, Roads and Road transport
</xsd:element>
</xsd:sequence>
</xsd:group>
<xsd:complexType name="ServiceCompetitiveConditionStructure" abstract="false">
<xsd:annotation>
<xsd:documentation>Type for SERVICE COMPETITIVE CONDITION.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="BookingArrangementsStructure">
<xsd:group ref="ServiceCompetitiveConditionGroup"/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<xsd:group name="ServiceCompetitiveConditionGroup">
<xsd:annotation>
<xsd:documentation>Elements for SERVICE COMPETITIVE CONDITION.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:choice>
<xsd:sequence>
<xsd:element ref="LineRef">
<xsd:annotation>
<xsd:documentation>Line that is not to be competed with.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="TemporalDistance" type="xsd:duration">
<xsd:annotation>
<xsd:documentation>Temporal distance to the line.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Distance" type="xsd:integer" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Distance in metres to the line.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
<xsd:sequence>
<xsd:element name="InterchangeBetweenFlexibleServicesAllowed" type="xsd:boolean" default="false" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Interchange between different flexible services is allowed.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="InterchangeWithContentionalServicesAllowed" type="xsd:boolean" default="false" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Interchange between the flexible service and conventional services is allowed</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:choice>
</xsd:sequence>
</xsd:group>
<xsd:complexType name="ServiceEligibilityArrangementsStructure" abstract="false">
<xsd:annotation>
<xsd:documentation>Type for SERVICE ELIGIBILITY ARRANGEMENTs.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="BookingArrangementsStructure">
<xsd:group ref="ServiceEligibilityArrangementsGroup"/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<xsd:group name="ServiceEligibilityArrangementsGroup">
<xsd:annotation>
<xsd:documentation>Elements for SERVICE ELIGIBILITY ARRANGEMENTs.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:choice>
<xsd:element ref="UserProfile"/>
<xsd:element ref="CommercialProfile"/>
<xsd:element ref="ResidentialQualification"/>
<xsd:element ref="CompanionProfile"/>
</xsd:choice>
</xsd:sequence>
</xsd:group>
<xsd:element name="BookingArrangement" type="BookingArrangementsStructure" abstract="false" id="BookingArrangement"/>
<xsd:element name="ServiceBookingArrangement" type="ServiceBookingArrangementsStructure" substitutionGroup="BookingArrangement" abstract="false" id="ServiceBookingArrangement"/>
<xsd:element name="ServiceEligibilityArrangement" type="ServiceEligibilityArrangementsStructure" substitutionGroup="BookingArrangement" abstract="false" id="ServiceEligibilityArrangement"/>
<xsd:element name="ServiceCompetitiveCondition" type="ServiceCompetitiveConditionStructure" substitutionGroup="BookingArrangement" abstract="false" id="ServiceCompetitiveCondition"/>
<xsd:complexType name="bookingArrangementsInFrame_RelStructure">
<xsd:annotation>
<xsd:documentation>Type for containment in frame of BOOKING ARRANGEMENTs</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="containmentAggregationStructure">
<xsd:choice maxOccurs="unbounded">
<xsd:element ref="BookingArrangement"/>
<!-- xsd:element ref="ServiceBookingArrangement"/>
<xsd:element ref="ServiceEligibilityArrangement"/>
<xsd:element ref="ServiceCompetitiveCondition"/> -->
</xsd:choice>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<!-- ======================================================================= -->
<xsd:element name="TypeOfPaymentMethod" substitutionGroup="TypeOfValue">
<xsd:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ Rail transport, Roads and Road transport
<!-- ==== ELIGIBILITY CHANGE POLICY QUALIFICATION. ================================================== -->
<xsd:element name="EligibilityChangePolicy" abstract="false" substitutionGroup="UsageParameter_">
<xsd:annotation>
<xsd:documentation>The policy to apply if ta user's eligibility as a USER PROFILE changes.</xsd:documentation>
<xsd:documentation>The policy to apply if a user's eligibility as a USER PROFILE changes.</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ Rail transport, Roads and Road transport
<xsd:element ref="TypeOfMobilityServiceRef" minOccurs="0"/>
<xsd:element ref="OrganisationRef_" minOccurs="0"/>
<xsd:element ref="TopographicPlaceRef" minOccurs="0"/>
<xsd:element name="ServiceBookingArrangements" type="ServiceBookingArrangementsStructure" minOccurs="0">
<xsd:element name="serviceBookingArrangements" type="bookingArrangementsInFrame_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Booking Arrangements for service.</xsd:documentation>
<xsd:documentation>BOOKING ARRANGEMENTs for SERVICE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down