Skip to content

Commit

Permalink
redid 409 (which also contains 408): Enhancement tMCR Vehicle Equipme…
Browse files Browse the repository at this point in the history 
…nt profile Member, accepted driver permits (#612)

* redid 409 (which also contains 408)

last two commits d57ef6a 7f18bb2 .Did overwrite the existing files.

* Lint and update documentation tables

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>

* Update examples/functions/newModes/NewModes-CycleSharingExample.xml

Co-authored-by: Stefan de Konink <stefan@konink.de>

* Update examples/functions/newModes/NewModes-CycleSharingExample.xml

Co-authored-by: Stefan de Konink <stefan@konink.de>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

* typo

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update examples/functions/newModes/NewModes-CycleSharingExample.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <stefan@konink.de>

* Apply suggestions from code review

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Stefan de Konink <stefan@konink.de>
Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
  • Loading branch information
@ue71603 @github-actions
@skinkie @trurlurl
4 people authored Apr 17, 2024
1 parent 4bf30d8 commit a3ba1e5
Show file tree
Hide file tree
Showing 4 changed files with 686 additions and 290 deletions.
84 changes: 60 additions & 24 deletions examples/functions/newModes/NewModes-CycleSharingExample.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,18 @@
Deposit required.
SALES PACKAGES (a) mobile app for preregistered users only.
(C) CEN 2021
Update
2023.01.30 Add AcceptedDriverPermit and VehicleEquipmentProfile examples
(C) CEN 2023
-->
<PublicationTimestamp>2020-12-17T09:30:47.0Z</PublicationTimestamp>
<ParticipantRef>SYS001</ParticipantRef>
<!-- ======WHAT WAS REQUESTED ========== -->
<PublicationRequest version="1.0">
<RequestTimestamp>2020-12-17T09:30:46.0Z</RequestTimestamp>
<ParticipantRef>SYS002</ParticipantRef>
<Description>Request for Metrobike 1 tariff</Description>
<Description>Request for Metrobike 1 tariff</Description>
<topics>
<NetworkFrameTopic>
<selectionValidityConditions>
Expand All @@ -54,8 +57,8 @@
<FromDate>2020-01-01T00:00:00</FromDate>
<ToDate>2020-12-31T12:00:00</ToDate>
</ValidBetween>
<Name>Cycle Sharing Example</Name>
<Description>This is an example showing how one might encode a cycle sharings scheme " Metrobike" in NeTEx. It includes some prices.</Description>
<Name>Cycle Sharing Example</Name>
<Description>This is an example showing how one might encode a cycle sharings scheme " Metrobike" in NeTEx. It includes some prices.</Description>
<!--==== CODESPACEs ==== -->
<codespaces>
<CodespaceRef ref="mb_data"/>
Expand All @@ -70,7 +73,7 @@
<frames>
<!--==== OPERATOR COMMON RESOURCES==== -->
<ResourceFrame version="1.0" id="mb:cycle_sharing_example" responsibilitySetRef="mb:network_data">
<Name>Metrobike Operator specific common resources</Name>
<Name>Metrobike Operator specific common resources</Name>
<codespaces>
<Codespace id="mb_data">
<Xmlns>mb</Xmlns>
Expand Down Expand Up @@ -117,12 +120,26 @@
</Branding>
</values>
</ValueSet>
<ValueSet version="any" id="BikeEquip" classOfValues="TypeOfEequipment">
<Name>Bike equimebt</Name>
<ValueSet version="any" id="BikeEquip" classOfValues="TypeOfEquipment">
<Name>Bike equipment</Name>
<values>
<TypeOfEquipment version="any" id="battery">
<Name>Battery</Name>
</TypeOfEquipment>
<TypeOfEquipment version="any" id="charger">
<Name>Charger</Name>
</TypeOfEquipment>
</values>
</ValueSet>
<ValueSet version="any" id="DriverPermits" classOfValues="TypeOfDriverPermit">
<Name>Driving licence types</Name>
<values>
<TypeOfDriverPermit version="any" id="ecycle_permit">
<Name>ecycle</Name>
</TypeOfDriverPermit>
<TypeOfDriverPermit version="any" id="car_permit">
<Name>car</Name>
</TypeOfDriverPermit>
</values>
</ValueSet>
</typesOfValue>
Expand Down Expand Up @@ -224,6 +241,14 @@
<LicenceRequirements>none</LicenceRequirements>
<VehicleCategory>cycle</VehicleCategory>
<MinimumAge>14</MinimumAge>
<acceptedDriverPermits>
<AcceptedDriverPermit version="any" id="electric_cycle@scooter">
<TypeOfDriverPermitRef version="any" ref="ecycle_permit"/>
</AcceptedDriverPermit>
<AcceptedDriverPermit version="any" id="electric_cycle@car">
<TypeOfDriverPermitRef version="any" ref="car_permit"/>
</AcceptedDriverPermit>
</acceptedDriverPermits>
</SimpleVehicleType>
</vehicleTypes>
<vehicleModels>
Expand All @@ -249,7 +274,18 @@
<vehicleEquipmentProfiles>
<VehicleEquipmentProfile version="any" id="ebike">
<Units>2</Units>
<TypeOfEquipmentRef version="any" ref="battery"/>
<vehicleEquipmentProfileMembers>
<VehicleEquipmentProfileMember version="any" id="ebike@battery">
<Name>Batteries</Name>
<MinimumUnits>2</MinimumUnits>
<TypeOfEquipmentRef version="any" ref="battery"/>
</VehicleEquipmentProfileMember>
<VehicleEquipmentProfileMember version="any" id="ebike@charger">
<Name>Charger</Name>
<MinimumUnits>1</MinimumUnits>
<TypeOfEquipmentRef version="any" ref="charger"/>
</VehicleEquipmentProfileMember>
</vehicleEquipmentProfileMembers>
</VehicleEquipmentProfile>
<ChargingEquipmentProfile version="any" id="ebike_charging">
<CouplingType>plug</CouplingType>
Expand Down Expand Up @@ -302,7 +338,7 @@
<Location id="Alphaville">
<Longitude>1.35250</Longitude>
<Latitude>52.44692</Latitude>
<gml:pos srsName="UKOS">376748 167119</gml:pos>
<gml:pos srsName="UKOS">376748 167119</gml:pos>
</Location>
</Centroid>
<Descriptor>
Expand Down Expand Up @@ -464,7 +500,7 @@
<CycleStorageType>docks</CycleStorageType>
</CycleStorageEquipment>
<TicketingEquipment version="any" id="bike_station_beta_B1@rack">
<Name>Ticket Machine at Bike Station Beta</Name>
<Name>Ticket Machine at Bike Station Beta</Name>
<TicketMachines>true</TicketMachines>
<NumberOfMachines>1</NumberOfMachines>
<TicketingFacilityList>ticketMachines</TicketingFacilityList>
Expand Down Expand Up @@ -848,15 +884,15 @@
<Duration>PT45M</Duration>
</TimeInterval>
<TimeInterval version="any" id="metrobike@M45+M90">
<Name>45 - 90 minutes</Name>
<Name>45 - 90 minutes</Name>
<Duration>PT45M</Duration>
</TimeInterval>
<TimeInterval version="any" id="metrobike@M90-eachM60">
<Name>90 - 600 minutes, per hour</Name>
<Name>90 - 600 minutes, per hour</Name>
<Duration>PT60M</Duration>
</TimeInterval>
<TimeInterval version="any" id="metrobike@M600+">
<Name>More than 5 hours 600 minutes</Name>
<Name>More than 5 hours 600 minutes</Name>
<Duration>P1D</Duration>
</TimeInterval>
</timeIntervals>
Expand Down Expand Up @@ -1016,7 +1052,7 @@
<!--==== VALIDABLE ELEMENTs ==== -->
<validableElements>
<ValidableElement version="any" id="metrobike@single_session@travel">
<Name>Single ride</Name>
<Name>Single ride</Name>
<fareStructureElements>
<FareStructureElementRef version="any" ref="metrobike@single_session@access"/>
<FareStructureElementRef version="any" ref="metrobike@single_session@durations"/>
Expand Down Expand Up @@ -1102,7 +1138,7 @@
</SalesOfferPackage>
<SalesOfferPackage version="any" id="metrobike@single_session-SOP@p-ticket">
<BrandingRef version="any" ref="myBrand"/>
<Name>Metrobike one-session purchase from ticket machine</Name>
<Name>Metrobike one-session purchase from ticket machine</Name>
<distributionAssignments>
<DistributionAssignment version="any" id="metrobike@single_session-SOP@p-ticket@onStreet" order="1">
<Name>On street ticket machine</Name>
Expand Down Expand Up @@ -1161,7 +1197,7 @@
</salesOfferPackages>
</FareFrame>
<FareFrame version="1.0" id="mb:cycle_sharing_example-day_pass" dataSourceRef="mb:metrobike" responsibilitySetRef="mb:tariffs">
<Name>Metrobike day Pass1</Name>
<Name>Metrobike day Pass1</Name>
<prerequisites>
<MobilityServiceFrameRef version="1.0" ref="mb:cycle_sharing_example"/>
<SiteFrameRef version="1.0" ref="mb:cycle_sharing_example"/>
Expand Down Expand Up @@ -1261,7 +1297,7 @@
<!--==== VALIDABLE ELEMENTs ==== -->
<validableElements>
<ValidableElement version="any" id="metrobike@day_pass@travel">
<Name>Single ride</Name>
<Name>Single ride</Name>
<fareStructureElements>
<FareStructureElementRef version="any" ref="metrobike@day_pass@access"/>
<FareStructureElementRef version="any" ref="metrobike@day_pass@eligibility"/>
Expand Down Expand Up @@ -1344,7 +1380,7 @@
<!--==== Fare Prices ==== -->
<fareTables>
<FareTable version="any" id="metrobike">
<Name>Metrobike prices</Name>
<Name>Metrobike prices</Name>
<OperatorRef version="any" ref="noc:MBIKE"/>
<limitations>
<UserProfileRef version="any" ref="notATot"/>
Expand Down Expand Up @@ -1389,7 +1425,7 @@
<TimeIntervalRef version="any" ref="metrobike@M45+M90"/>
</TimeIntervalPrice>
<TimeIntervalPrice version="any" id="metrobike@M90-eachM60">
<Name>90 to 600 minutes, charge per hour e</Name>
<Name>90 to 600 minutes, charge per hour e</Name>
<Amount>4.00</Amount>
<Units>60</Units>
<TimeIntervalRef version="any" ref="metrobike@M90-eachM60"/>
Expand Down Expand Up @@ -1752,7 +1788,7 @@ This Shows sample Purchases
<CustomerRef versionRef="EXTERNAL" ref="mbt:Anon001"/>
<fareContractEntries>
<SalesTransaction version="any" id="mbt:Anon001@trans069@purchase_single_session@checkout">
<Name>Buy Single ticket Adult</Name>
<Name>Buy Single ticket Adult</Name>
<Date>2020-12-08T12:01:00</Date>
<TypeOfFareContractEntryRef versionRef="EXTERNAL" ref="fxc:product_purchase"/>
<Amount>2.10</Amount>
Expand Down Expand Up @@ -1843,7 +1879,7 @@ This Shows sample Purchases
<AdjustmentAmount>8.00</AdjustmentAmount>
<AdjustmentUnits>120</AdjustmentUnits>
<PricingRuleRef version="any" ref="per_hour"/>
<Narrative>91 minutes to 600 minutes</Narrative>
<Narrative>91 minutes to 600 minutes</Narrative>
</RuleStepResult>
</ruleStepResults>
<EndOfValidity>2020-10-08T13:10:00</EndOfValidity>
Expand Down Expand Up @@ -1971,7 +2007,7 @@ This Shows sample Purchases
<FromDate>2020-12-08T12:01:00</FromDate>
<ToDate>2020-12-08T14:01:00</ToDate>
</ValidBetween>
<Name>Single session cycle use</Name>
<Name>Single session cycle use</Name>
<CustomerRef versionRef="EXTERNAL" ref="mbt:Anon001"/>
<customerPurchasePackageElements>
<CustomerPurchasePackageElement version="any" id="mbt:Anon001@027" order="1" created="2020-12-08T12:01:00">
Expand All @@ -1992,7 +2028,7 @@ This Shows sample Purchases
<MarkedAs>used</MarkedAs>
<validityParameterAssignments>
<CustomerPurchaseParameterAssignment version="any" id="mbt:Anon001@027@002" created="2020-12-08T14:47:00" order="1">
<Name>Check back in to station beta_b1_004</Name>
<Name>Check back in to station beta_b1_004</Name>
<validityParameters>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_beta_B1@04"/>
</validityParameters>
Expand Down Expand Up @@ -2025,7 +2061,7 @@ This Shows sample Purchases
<CustomerPurchasePackageRef version="any" ref="mbt:Anon001@027"/>
</CustomerPurchasePackagePrice>
<CustomerPurchasePackagePrice version="any" id="mbt:Anon001@027" created="2020-12-08T14:47:00">
<Name>Additional charge 3 + 4</Name>
<Name>Additional charge 3 + 4</Name>
<Amount>7.00</Amount>
<CustomerPurchasePackageRef version="any" ref="mbt:Anon001@027"/>
</CustomerPurchasePackagePrice>
Expand Down
Loading

0 comments on commit a3ba1e5

Please sign in to comment.