Skip to content

New modes Area Information corrections #158

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
skinkie merged 5 commits into from
Apr 7, 2021
Merged

New modes Area Information corrections #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
59ec7f3
NewModes: revise name of SimpleModeTypesENumeration
nick-knowles Jan 29, 2021
625102c
FIX: Issue143 Correct data type on Gap toPlatform
nick-knowles Jan 29, 2021
fb0ab38
NewModes - Updated VehicleParkingAreaInformation to include GBFS attr…
nick-knowles Mar 11, 2021
a38768d
NewModes- Infolink
nick-knowles Mar 12, 2021
c2d0a57
Fix broken example
nick-knowles Mar 23, 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
4 changes: 2 additions & 2 deletions NeTEx.spp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,8 +511,6 @@
<Folder FolderName="netex_part_5_NM_ND">
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_mobilityServiceConstraintZone_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_mobilityServiceConstraintZone_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_parkingBayStatus_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_parkingBayStatus_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_ParkingCapacityAssignment_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_ParkingCapacityAssignment_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_vehicleMeetingPlace_support.xsd" HomeFolder="Yes"/>
Expand All @@ -521,6 +519,8 @@
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_vehicleMeetingPoint_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_vehicleMeetingPointAssignment_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_vehicleMeetingPointAssignment_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_vehicleParkingAreaInformation_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_vehicleParkingAreaInformation_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_vehicleServicePlaceAssignment_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_vehicleServicePlaceAssignment_version.xsd" HomeFolder="Yes"/>
</Folder>
Expand Down
4 changes: 2 additions & 2 deletions NeTEx.xpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,8 +499,8 @@
<folder name="netex_part5_NM_ND">
<file name="xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_support.xsd"/>
<file name="xsd/netex_part_5/part5_nd/netex_nm_mobilityServiceConstraintZone_version.xsd"/>
<file name="xsd/netex_part_5/part5_nd/netex_nm_parkingBayStatus_support.xsd"/>
<file name="xsd/netex_part_5/part5_nd/netex_nm_parkingBayStatus_version.xsd"/>
<file name="xsd/netex_part_5/part5_nd/netex_nm_vehicleParkingAreaInformation_support.xsd"/>
<file name="xsd/netex_part_5/part5_nd/netex_nm_vehicleParkingAreaInformation_version.xsd"/>
<file name="xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPlace_support.xsd"/>
<file name="xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPlace_version.xsd"/>
<file name="xsd/netex_part_5/part5_nd/netex_nm_vehicleMeetingPoint_support.xsd"/>
Expand Down
21 changes: 20 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,25 @@ There is also an _Oxygen_ project file:
=======
Version 1.2.2 - New modes Revised changes with e examples and constraints.

### 2021.03.10 NewModes: Revisions to support GBS. add _targetPlatform_ attribute to _InfoLink_
* _Updates to xml schema_:
* netex_utilityTypes.xsd
New modes: add target platform to attributes of infoLinkType
### 2021.03.10 NewModes: Revisions to support GBS. add _RentalAvailability_ and _ParkingBayCondition_
* _Updates to xml schema_:
* rename parkingBayStatus to netex_nm_vehicleParkingAreaInformation_support.xsd
* rename nm_mobilityJourneyFrame_version.xsd
* netex_nm_publication_version.xsd
* netex_all_objects_part5_newModes.xsd
* netex_nm_mobilityJourneyFrame_version.xsd
* NeTEx.SPP, NeTEx.xpr
* _Updates to xml examples_:
* NewModes-CyclePoolingExample.xsd

### 2021.01.29 Bug Issue #143 COrerct data type of __GapToPlatform__
* _Updates to xml schema_:
* netex_equipmentVehiclePassenger_version.xsd.xsd

### 2021.01.10 NewModes: Revisions
PlaceRef
* Add constraint for __ModeRestrictionAssessment__
Expand All @@ -50,7 +69,7 @@ Version 1.2.2 - New modes Revised changes with e examples and constraints.
* NewModes-CyclePoolingExample.xsd
* _Updates to xml schema_:
* netex_mobilityService_version.xsd
* netex_msalesContract_support.xsd
* netex_salesContract_support.xsd
* netex_salesContract_version.xsd
* netex_nm_publication_version.xsd

Expand Down
160 changes: 151 additions & 9 deletions examples/functions/newModes/NewModes-CycleSharingExample.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,29 +342,29 @@
</MonitoredVehicleSharingParkingBay>
<MonitoredVehicleSharingParkingBay version="any" id="bike_station_alpha_A1@09">
<placeEquipments>
<VehicleReleaseEquipment version="any" id="bike_station_alpha_A1@rack@09">
<VehicleReleaseEquipment version="any" id="bike_station_alpha_A109">
<LocalControl>true</LocalControl>
<LockingMechanism>dock</LockingMechanism>
</VehicleReleaseEquipment>
<RefuellingEquipment version="any" id="bike_station_alpha_A1@rack@09">
<RefuellingEquipment version="any" id="bike_station_alpha_A1@09">
<FuelType>electricity</FuelType>
</RefuellingEquipment>
</placeEquipments>
<ParkingVehicleType>pedalCycle</ParkingVehicleType>
<SimpleVehicleTypeRef version="any" ref="electric_cycle"/>
<RechargingAvailable>true</RechargingAvailable>
</MonitoredVehicleSharingParkingBay>
<MonitoredVehicleSharingParkingBay version="any" id="bike_station_alpha_A1@rack@10">
<MonitoredVehicleSharingParkingBay version="any" id="bike_station_alpha_A1@10">
<equipmentPlaces>
<EquipmentPlace version="any" id="bike_station_alpha_A1@rack@10">
<EquipmentPlace version="any" id="bike_station_alpha_A1@10">
</EquipmentPlace>
</equipmentPlaces>
<placeEquipments>
<VehicleReleaseEquipment version="any" id="bike_station_alpha_A1@rack@10">
<VehicleReleaseEquipment version="any" id="bike_station_alpha_A1k@10">
<LocalControl>true</LocalControl>
<LockingMechanism>dock</LockingMechanism>
</VehicleReleaseEquipment>
<RefuellingEquipment version="any" id="bike_station_alpha_A1@rack@10">
<RefuellingEquipment version="any" id="bike_station_alpha_A1@10">
<FuelType>electricity</FuelType>
</RefuellingEquipment>
</placeEquipments>
Expand All @@ -389,7 +389,7 @@
<SimpleVehicleTypeRef version="any" ref="pedal_cycle"/>
</vehicleTypes>
<ParkingLayout>roadside</ParkingLayout>
<TotalCapacity>10</TotalCapacity>
<TotalCapacity>05</TotalCapacity>
<parkingAreas>
<VehicleSharingParkingArea version="any" id="bike_station_beta_B1">
<equipmentPlaces>
Expand Down Expand Up @@ -578,6 +578,11 @@
<mobilityServices>
<VehicleSharingService version="any" id="metrobike">
<BrandingRef version="any" ref="myBrand"/>
<infoLinks>
<InfoLink typeOfInfoLink="info">http:metrobike.eu/info</InfoLink>
<InfoLink typeOfInfoLink="mobileAppDownload" targetPlatform="ios">http:metrobike.eu/ios</InfoLink>
<InfoLink typeOfInfoLink="mobileAppDownload" targetPlatform="android">http:metrobike.eu/android</InfoLink>
</infoLinks>
<OperatorRef version="any" ref="noc:MBIKE"/>
<BookingRequired>false</BookingRequired>
<RegistrationRequired>false</RegistrationRequired>
Expand Down Expand Up @@ -1283,6 +1288,143 @@ This Shows sample Purchases
<ServiceAccessCodeRef version="any" ref="mbt:Cust444@trans005@purchase_day_pass"/>
</VehicleAccessCredentialsAssignment>
</vehicleAccessCredentials>
<parkingLogEntries>
<!-- Example log of changes from real time updates. -->
<!-- Parking alpha before checkout -->
<RentalAvailability id="bike_station_alpha@2020-10-08T11:07:00" version="any">
<Name>Before Checkout </Name>
<Date>2020-10-08T11:06:55</Date>
<ParkingRef version="any" ref="bike_station_alpha"/>
<IsOperational>true</IsOperational>
<IsRenting>true</IsRenting>
<IsAcceptingReturns>true</IsAcceptingReturns>
<AvailableVehicles>5</AvailableVehicles>
<DisabledVehicles>2</DisabledVehicles>
<AvailableDocks>3</AvailableDocks>
<DisabledDocks>2</DisabledDocks>
</RentalAvailability>
<ParkingBayCondition id="bike_station_alpha_A1@01@2020-10-08T11:07:00" version="any">
<Date>2020-10-08T11:07:00</Date>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_alpha_A1@01"/>
<Status>inUse</Status>
</ParkingBayCondition>
<ParkingBayCondition id="bike_station_alpha_A1@02@2020-10-08T11:07:00" version="any">
<Date>2020-10-08T11:07:00</Date>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_alpha_A1@02"/>
<Status>inUse</Status>
</ParkingBayCondition>
<ParkingBayCondition id="bike_station_alpha_A1@03@2020-10-08T11:07:00" version="any">
<Date>2020-10-08T11:07:00</Date>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_alpha_A1@03"/>
<Status>available</Status>
</ParkingBayCondition>
<ParkingBayCondition id="bike_station_alpha_A1@04@2020-10-08T11:07:00" version="any">
<Date>2020-10-08T11:07:00</Date>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_alpha_A1@04"/>
<Status>available</Status>
</ParkingBayCondition>
<ParkingBayCondition id="bike_station_alpha_A1@05@2020-10-08T11:07:00" version="any">
<Date>2020-10-08T11:07:00</Date>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_alpha_A1@05"/>
<Status>available</Status>
</ParkingBayCondition>
<ParkingBayCondition id="bike_station_alpha_A1@06@2020-10-08T11:07:00" version="any">
<Date>2020-10-08T11:07:00</Date>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_alpha_A1@06"/>
<Status>inUse</Status>
</ParkingBayCondition>
<ParkingBayCondition id="bike_station_alpha_A1@07@2020-10-08T11:07:00" version="any">
<Date>2020-10-08T11:07:00</Date>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_alpha_A1@07"/>
<Status>inUse</Status>
</ParkingBayCondition>
<ParkingBayCondition id="bike_station_alpha_A1@08@2020-10-08T11:07:00" version="any">
<Date>2020-10-08T11:07:00</Date>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_alpha_A1@08"/>
<Status>outOfService</Status>
</ParkingBayCondition>
<ParkingBayCondition id="bike_station_alpha_A1@09@2020-10-08T11:07:00" version="any">
<Date>2020-10-08T11:07:00</Date>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_alpha_A1@09"/>
<Status>outOfService</Status>
</ParkingBayCondition>
<ParkingBayCondition id="bike_station_alpha_A1@10@2020-10-08T11:07:00" version="any">
<Date>2020-10-08T11:07:00</Date>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_alpha_A1@10"/>
<Status>inUse</Status>
</ParkingBayCondition>
<!-- Parking alpha after checkout -->
<RentalAvailability id="bike_station_alpha@2020-10-08T11:07:20" version="any">
<Name>After Checkout </Name>
<Date>2020-10-08T11:07:20</Date>
<ParkingRef version="any" ref="bike_station_alpha"/>
<IsOperational>true</IsOperational>
<IsRenting>true</IsRenting>
<IsAcceptingReturns>true</IsAcceptingReturns>
<AvailableVehicles>4</AvailableVehicles>
<DisabledVehicles>2</DisabledVehicles>
<AvailableDocks>4</AvailableDocks>
<DisabledDocks>2</DisabledDocks>
</RentalAvailability>
<ParkingBayCondition id="bike_station_alpha_A1@10@2020-10-08T11:07:20" version="any">
<Date>2020-10-08T11:07:20</Date>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_alpha_A1@10"/>
<Status>available</Status>
</ParkingBayCondition>
<!-- Parking beta before return -->
<RentalAvailability id="bike_station_beta@2020-10-08T13:10:00" version="any">
<Name>Before Return</Name>
<Date>2020-10-08T13:10:00</Date>
<ParkingRef version="any" ref="bike_station_beta"/>
<IsOperational>true</IsOperational>
<IsRenting>true</IsRenting>
<IsAcceptingReturns>true</IsAcceptingReturns>
<AvailableVehicles>3</AvailableVehicles>
<AvailableDocks>2</AvailableDocks>
</RentalAvailability>
<ParkingBayCondition id="bike_station_beta_B1@01@2020-10-08T13:10:00" version="any">
<Date>2020-10-08T13:10:00</Date>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_beta_B1@01"/>
<Status>inUse</Status>
</ParkingBayCondition>
<ParkingBayCondition id="bike_station_beta_B1@02@2020-10-08T13:10:00" version="any">
<Date>2020-10-08T13:10:00</Date>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_beta_B1@02"/>
<Status>inUse</Status>
</ParkingBayCondition>
<ParkingBayCondition id="bike_station_beta_B1@03@2020-10-08T13:10:00" version="any">
<Date>2020-10-08T13:10:00</Date>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_beta_B1@03"/>
<Status>available</Status>
</ParkingBayCondition>
<ParkingBayCondition id="bike_station_beta_B1@04@2020-10-08T13:10:00" version="any">
<Date>2020-10-08T13:10:00</Date>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_beta_B1@04"/>
<Status>available</Status>
</ParkingBayCondition>
<ParkingBayCondition id="bike_station_beta_B1@05@2020-10-08T13:10:00" version="any">
<Date>2020-10-08T13:10:00</Date>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_beta_B1@05"/>
<Status>available</Status>
</ParkingBayCondition>
<!-- Parking beta after return -->
<RentalAvailability id="bike_station_beta@2020-10-08T13:10:05" version="any">
<Name>After Return</Name>
<Date>2020-10-08T13:10:05</Date>
<ParkingRef version="any" ref="bike_station_beta"/>
<IsOperational>true</IsOperational>
<IsRenting>true</IsRenting>
<IsAcceptingReturns>true</IsAcceptingReturns>
<AvailableVehicles>4</AvailableVehicles>
<AvailableDocks>1</AvailableDocks>
</RentalAvailability>
<ParkingBayCondition id="bike_station_beta_B1@04@2020-10-08T13:10:05" version="any">
<Name>After Return</Name>
<Date>2020-10-08T13:10:05</Date>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_beta_B1@04"/>
<Status>inUse</Status>
</ParkingBayCondition>
</parkingLogEntries>
</MobilityJourneyFrame>
<SalesTransactionFrame version="1.2" id="mbt:sample_transactions">
<Name>Metrobike Sample Transactions</Name>
Expand Down Expand Up @@ -1484,9 +1626,9 @@ This Shows sample Purchases
<VehicleSharingServiceRef version="any" ref="metrobike"/>
<VehicleRef version="any" ref="C01"/>
<VehicleSharingParkingAreaRef version="any" ref="bike_station_alpha_A1"/>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_alpha_A1@rack@10"/>
<MonitoredVehicleSharingParkingBayRef version="any" ref="bike_station_alpha_A1@10"/>
</validityParameters>
<TimeIntervalRef version="any" ref="metrobike@M0+M45"/>
<TimeIntervalRef version="any" ref="metrobike@M0+M45"/>
</SpecificParameterAssignment>
</specificParameterAssignments>
</OfferedTravelSpecification>
Expand Down
Loading