Skip to content

NewModes: Countrycomment POOL OF VEHICLES add "must return to same bay" #224

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

Merged
Aurige merged 7 commits into from
Sep 3, 2021
Merged

NewModes: Countrycomment POOL OF VEHICLES add "must return to same bay" #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 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
de19294
NewModes: Add BatteryEquioment and Vehicle CHargingEquipment
nick-knowles Sep 3, 2021
bb5dc63
PoolOfVehicle Add MustReturnTo SameBay
nick-knowles Sep 3, 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
3 changes: 3 additions & 0 deletions NeTEx.spp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_mode_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_modeOfOperation_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_modeOfOperation_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_nm_chargingEquipmentProfile_support.xsd"/>
<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_nm_equipmentEnergy_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_nm_equipmentEnergy_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_notice_support.xsd" HomeFolder="Yes"/>
Expand Down Expand Up @@ -166,6 +167,8 @@
<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_networkInfrastructure_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_networkRestriction_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_networkRestriction_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_nm_chargingEquipmentProfile_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_nm_chargingEquipmentProfile_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_route_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_route_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_routeInstruction_support.xsd" HomeFolder="Yes"/>
Expand Down
10 changes: 8 additions & 2 deletions NeTEx.xpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,21 @@
<file name="xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd"/>netex_nm_chargingEquipmentProfile_version
<file name="xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_support.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_modeOfOperation_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_support.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_nm_chargingEquipmentProfile_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd"/>
<file name="xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
Expand Down
1,351 changes: 1,003 additions & 348 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

117 changes: 110 additions & 7 deletions examples/functions/newModes/NewModes-CycleSharingExample.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,14 @@
</Branding>
</values>
</ValueSet>
<ValueSet version="any" id="BikeEquip" classOfValues="TypeOfEequipment">
<Name>Bike equimebt</Name>
<values>
<TypeOfEquipment version="any" id="battery">
<Name>Battery</Name>
</TypeOfEquipment>
</values>
</ValueSet>
</typesOfValue>
<contacts>
<Contact version="any" id="mbike">
Expand Down Expand Up @@ -229,12 +237,29 @@
<SimpleVehicleTypeRef version="any" ref="pedal_cycle"/>
<CycleModelProfileRef version="any" ref="boneKitA"/>
</VehicleModel>
<VehicleModel version="any" id="boneShaker2">
<VehicleModel version="any" id="electric_boneshaker">
<Name>New Model Bike v2</Name>
<SimpleVehicleTypeRef version="any" ref="electric_cycle"/>
<equipmentProfiles>
<ChargingEquipmentProfileRef version="any" ref="ebike_charging"/>
</equipmentProfiles>
<CycleModelProfileRef version="any" ref="boneKitB"/>
</VehicleModel>
</vehicleModels>
<vehicleEquipmentProfiles>
<VehicleEquipmentProfile version="any" id="ebike">
<Units>2</Units>
<TypeOfEquipmentRef version="any" ref="battery"/>
</VehicleEquipmentProfile>
<ChargingEquipmentProfile version="any" id="ebike_charging">
<CouplingType>plug</CouplingType>
<PlugType>type2</PlugType>
<CurrentType>1-PhaseAC</CurrentType>
<MaximumChargingPower>240</MaximumChargingPower>
<PreparationDuration>PT1M</PreparationDuration>
<FinalisationDuration>PT1M</FinalisationDuration>
</ChargingEquipmentProfile>
</vehicleEquipmentProfiles>
<vehicleModelProfiles>
<CycleModelProfile version="any" id="boneKitA">
<Battery>false</Battery>
Expand All @@ -254,6 +279,15 @@
<Basket>true</Basket>
<Lock>true</Lock>
</CycleModelProfile>
<CycleModelProfile version="any" id="ebike">
<Battery>true</Battery>
<Lamps>true</Lamps>
<Helmet>false</Helmet>
<Pump>false</Pump>
<Locker>false</Locker>
<Basket>true</Basket>
<Lock>true</Lock>
</CycleModelProfile>
</vehicleModelProfiles>
</ResourceFrame>
<!--==== NETWORK ==== -->
Expand Down Expand Up @@ -609,21 +643,81 @@
<Vehicle version="any" id="C01">
<OperatorRef version="any" ref="noc:MBIKE"/>
<SimpleVehicleTypeRef version="any" ref="electric_cycle"/>
<VehicleModelRef version="any" ref="boneShaker2"/>
<VehicleModelRef version="any" ref="electric_boneshaker"/>
<actualVehicleEquipments>
<BatteryEquipment version="any" id="C01_battery_1">
<TypeOfEquipmentRef version="any" ref="battery"/>
<BatteryCapacity>1000</BatteryCapacity>
<MaximumChargingPower>240</MaximumChargingPower>
</BatteryEquipment>
<BatteryEquipment version="any" id="C01_battery_2">
<TypeOfEquipmentRef version="any" ref="battery"/>
<BatteryCapacity>1000</BatteryCapacity>
<MaximumChargingPower>240</MaximumChargingPower>
</BatteryEquipment>
</actualVehicleEquipments>
</Vehicle>
<Vehicle version="any" id="C02">
<OperatorRef version="any" ref="noc:MBIKE"/>
<SimpleVehicleTypeRef version="any" ref="electric_cycle"/>
<VehicleModelRef version="any" ref="boneShaker2"/>
<VehicleModelRef version="any" ref="electric_boneshaker"/>
<actualVehicleEquipments>
<BatteryEquipment version="any" id="C02_battery_1">
<TypeOfEquipmentRef version="any" ref="battery"/>
<BatteryCapacity>1000</BatteryCapacity>
<MaximumChargingPower>240</MaximumChargingPower>
</BatteryEquipment>
<BatteryEquipment version="any" id="C02_battery_2">
<TypeOfEquipmentRef version="any" ref="battery"/>
<BatteryCapacity>1000</BatteryCapacity>
<MaximumChargingPower>240</MaximumChargingPower>
</BatteryEquipment>
</actualVehicleEquipments>
</Vehicle>
<Vehicle version="any" id="C03">
<OperatorRef version="any" ref="noc:MBIKE"/>
<SimpleVehicleTypeRef version="any" ref="electric_cycle"/>
<VehicleModelRef version="any" ref="boneShaker2"/>
<VehicleModelRef version="any" ref="electric_boneshaker"/>
<actualVehicleEquipments>
<BatteryEquipment version="any" id="C03_battery_1">
<TypeOfEquipmentRef version="any" ref="battery"/>
<BatteryCapacity>1000</BatteryCapacity>
<MaximumChargingPower>240</MaximumChargingPower>
</BatteryEquipment>
<BatteryEquipment version="any" id="C03_battery_2">
<TypeOfEquipmentRef version="any" ref="battery"/>
<BatteryCapacity>1000</BatteryCapacity>
<MaximumChargingPower>240</MaximumChargingPower>
</BatteryEquipment>
</actualVehicleEquipments>
</Vehicle>
</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">
Expand All @@ -643,6 +737,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 +814,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 +1639,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 Expand Up @@ -1690,7 +1793,7 @@ This Shows sample Purchases
<TypeOfTravelDocumentRef version="any" ref="printed_ticket"/>
<VehicleSharingRef version="any" ref="cycle_share"/>
<SimpleVehicleTypeRef version="any" ref="electric_cycle"/>
<VehicleModelRef version="any" ref="boneShaker2"/>
<VehicleModelRef version="any" ref="electric_boneshaker"/>
<CycleModelProfileRef version="any" ref="boneKitB"/>
<VehicleSharingServiceRef version="any" ref="metrobike"/>
<VehicleRef version="any" ref="C01"/>
Expand Down Expand Up @@ -1767,7 +1870,7 @@ This Shows sample Purchases
<DistributionChannelRef version="any" ref="online"/>
<VehicleSharingRef version="any" ref="cycle_share"/>
<SimpleVehicleTypeRef version="any" ref="electric_cycle"/>
<VehicleModelRef version="any" ref="boneShaker2"/>
<VehicleModelRef version="any" ref="electric_boneshaker"/>
<CycleModelProfileRef version="any" ref="boneKitB"/>
<VehicleSharingServiceRef version="any" ref="metrobike"/>
<VehicleRef version="any" ref="C01"/>
Expand Down
Loading