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

NewModes - Add POOL OF VEHICLEs, Also fix up merge of Readme & netex_publication files #221

Merged
merged 8 commits into from
Sep 3, 2021
Merged

NewModes - Add POOL OF VEHICLEs, Also fix up merge of Readme & netex_publication files #221

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
64f7ff3
NewModes Add Policy URL
nick-knowles Aug 31, 2021
a3b4025
Merge remote-tracking branch 'upstream/new-modes' into NewModes-Pool-…
nick-knowles Sep 1, 2021
070a951
NewModes: Add a PoolOfVehicles entity
nick-knowles Sep 1, 2021
7bc3fc8
solve alignment issue
Aurige Sep 1, 2021
afb47c8
Taks trailing > correction line 29
Aurige Sep 1, 2021
9aca552
Indentation issues
Aurige Sep 1, 2021
127675c
Typo
Aurige Sep 1, 2021
8f48d82
Attempt for a mergeable version
Aurige Sep 2, 2021
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
1,327 changes: 979 additions & 348 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 35 additions & 1 deletion examples/functions/newModes/NewModes-CycleSharingExample.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,11 +624,36 @@
</members>
</Fleet>
</fleets>
<poolsOfVehicles>
<PoolOfVehicles version="any" id="metrobike_pool_1">
<Name>Restricted Pool -zone</Name>
<VehicleSharingServiceRef version="any" ref="metrobike"/>
<MobilityServiceConstraintZoneRef version="any" ref="bring_back_to_zone"/>
<vehicles>
<VehicleRef version="any" ref="B01"/>
<VehicleRef version="any" ref="B03"/>
<VehicleRef version="any" ref="B05"/>
</vehicles>
</PoolOfVehicles>
<PoolOfVehicles version="any" id="metrobike_pool_2">
<Name>Restricted Pool - parking</Name>
<VehicleSharingServiceRef version="any" ref="metrobike"/>
<ParkingRef version="any" ref="bike_station_beta"/>
<parkingComponents>
<VehicleSharingParkingAreaRef version="any" ref="bike_station_beta_B1"/>
</parkingComponents>
<vehicles>
<VehicleRef version="any" ref="P03"/>
<VehicleRef version="any" ref="P04"/>
</vehicles>
</PoolOfVehicles>
</poolsOfVehicles>
<!-- === Availabels ervices === -->
<mobilityServices>
<VehicleSharingService version="any" id="metrobike">
<BrandingRef version="any" ref="myBrand"/>
<Name>Metro Bike Cycle share scheme</Name>

<infoLinks>
<InfoLink typeOfInfoLink="info">http:metrobike.eu/info</InfoLink>
<InfoLink typeOfInfoLink="mobileAppDownload" targetPlatform="ios">http:metrobike.eu/ios</InfoLink>
Expand All @@ -643,6 +668,7 @@
<OnlineServiceRef version="any" ref="metrobike_online"/>
</proposedByServices>
<VehicleSharingRef version="any" ref="cycle_share"/>
<SharingPolicyUrl>>http:metrobike.eu/policy</SharingPolicyUrl>
<MinimumSharingPeriod>PT30M</MinimumSharingPeriod>
<MaximumSharingPeriod>PT24H</MaximumSharingPeriod>
<fleets>
Expand Down Expand Up @@ -719,6 +745,15 @@
</VehicleTypeZoneRestriction>
</vehicleRestrictions>
</MobilityServiceConstraintZone>
<MobilityServiceConstraintZone version="any" id="bring_back_to_zone">
<Name>Must bring back to same zone</Name>
<VehicleSharingServiceRef version="any" ref="metrobike"/>
<vehicleRestrictions>
<VehicleTypeZoneRestriction version="any" id="bring_back">
<ZoneUse>mustPickUpAndDropOffInSameZone</ZoneUse>
</VehicleTypeZoneRestriction>
</vehicleRestrictions>
</MobilityServiceConstraintZone>
</mobilityServiceConstraintZones>
</MobilityServiceFrame>
<!--==== FARES ==== -->
Expand Down Expand Up @@ -1535,7 +1570,6 @@ This Shows sample Purchases
<TelCountryCode>31</TelCountryCode>
</Phone>
<PhoneVerified>2020-02-28T16:00:00</PhoneVerified>

<customerAccounts>
<CustomerAccount version="any" id="mbt:Cust444@AC7651" created="2020-02-28T13:00:00">
<Name>hotrider</Name>
Expand Down
Loading