diff --git a/NeTEx.spp b/NeTEx.spp index bdda1e5bc..f057db15b 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -511,8 +511,6 @@ - - @@ -521,6 +519,8 @@ + + diff --git a/NeTEx.xpr b/NeTEx.xpr index 6b029cff3..82621f3fe 100644 --- a/NeTEx.xpr +++ b/NeTEx.xpr @@ -499,8 +499,8 @@ - - + + diff --git a/README.md b/README.md index c026506f1..68bbf84fc 100644 --- a/README.md +++ b/README.md @@ -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__ @@ -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 diff --git a/examples/functions/newModes/NewModes-CycleSharingExample.xml b/examples/functions/newModes/NewModes-CycleSharingExample.xml index 13cdf52c4..cc80c1e78 100644 --- a/examples/functions/newModes/NewModes-CycleSharingExample.xml +++ b/examples/functions/newModes/NewModes-CycleSharingExample.xml @@ -342,11 +342,11 @@ - + true dock - + electricity @@ -354,17 +354,17 @@ true - + - + - + true dock - + electricity @@ -389,7 +389,7 @@ roadside - 10 + 05 @@ -578,6 +578,11 @@ + + http:metrobike.eu/info + http:metrobike.eu/ios + http:metrobike.eu/android + false false @@ -1283,6 +1288,143 @@ This Shows sample Purchases + + + + + Before Checkout + 2020-10-08T11:06:55 + + true + true + true + 5 + 2 + 3 + 2 + + + 2020-10-08T11:07:00 + + inUse + + + 2020-10-08T11:07:00 + + inUse + + + 2020-10-08T11:07:00 + + available + + + 2020-10-08T11:07:00 + + available + + + 2020-10-08T11:07:00 + + available + + + 2020-10-08T11:07:00 + + inUse + + + 2020-10-08T11:07:00 + + inUse + + + 2020-10-08T11:07:00 + + outOfService + + + 2020-10-08T11:07:00 + + outOfService + + + 2020-10-08T11:07:00 + + inUse + + + + After Checkout + 2020-10-08T11:07:20 + + true + true + true + 4 + 2 + 4 + 2 + + + 2020-10-08T11:07:20 + + available + + + + Before Return + 2020-10-08T13:10:00 + + true + true + true + 3 + 2 + + + 2020-10-08T13:10:00 + + inUse + + + 2020-10-08T13:10:00 + + inUse + + + 2020-10-08T13:10:00 + + available + + + 2020-10-08T13:10:00 + + available + + + 2020-10-08T13:10:00 + + available + + + + After Return + 2020-10-08T13:10:05 + + true + true + true + 4 + 1 + + + After Return + 2020-10-08T13:10:05 + + inUse + + Metrobike Sample Transactions @@ -1484,9 +1626,9 @@ This Shows sample Purchases - + - + diff --git a/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml b/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml index e0be0a739..52416b49a 100644 --- a/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml +++ b/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml @@ -1748,7 +1748,7 @@ This Example shows an extract of real Irish Operator data encoded in NeT Youghal Co.Cork - other + bus Silver Dawn Travel Services @@ -1874,7 +1874,7 @@ This Example shows an extract of real Irish Operator data encoded in NeT Ballinakill Co.Laois - other + bus New Grange Tours @@ -2930,7 +2930,7 @@ This Example shows an extract of real Irish Operator data encoded in NeT Monamolin Co.Wexford - other + bus Casteldermot Coaches @@ -3660,7 +3660,7 @@ This Example shows an extract of real Irish Operator data encoded in NeT Naas Co.Kildare - other + bus Bailieboro Call A Cab @@ -3675,7 +3675,7 @@ This Example shows an extract of real Irish Operator data encoded in NeT Leitrim Co.Cavan - other + bus Raphael Murray @@ -3799,7 +3799,7 @@ This Example shows an extract of real Irish Operator data encoded in NeT Kilpedder Co.Wicklow - other + bus ABUS @@ -4040,7 +4040,7 @@ This Example shows an extract of real Irish Operator data encoded in NeT Morristown Biller Co.Kildare - other + bus Richard Lueders @@ -4253,7 +4253,7 @@ This Example shows an extract of real Irish Operator data encoded in NeT Fairhill Co.Cork - other + bus Gerard & Mary Flynn @@ -4726,7 +4726,7 @@ This Example shows an extract of real Irish Operator data encoded in NeT Pinecroft Co.Cork - other + bus Patrick Marron @@ -6405,7 +6405,7 @@ This Example shows an extract of real Irish Operator data encoded in NeT Guardwell Co.Cork - other + bus David Allman @@ -6439,7 +6439,7 @@ This Example shows an extract of real Irish Operator data encoded in NeT Ballinvounig Co.Kerry - other + bus Kierans' Mini Bus Hire @@ -6457,7 +6457,7 @@ This Example shows an extract of real Irish Operator data encoded in NeT Drogheda Co.Louth - other + bus Brian Callinan Coach Hire @@ -6545,7 +6545,7 @@ This Example shows an extract of real Irish Operator data encoded in NeT Abbeydorney Co.Kerry - other + bus Foley Minibus Hire Ltd @@ -6688,7 +6688,7 @@ This Example shows an extract of real Irish Operator data encoded in NeT Clynagh CO.Galway - other + bus Selnec Limited diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 8da64b013..0a3bfe6f9 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -16,6 +16,9 @@ CEN TC278 WG3 SG9 Team. Europe First Drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2021-10-03Add PARKING BAY CONDITION and RENTAL AVAILABILITY + 2021-01-08NewModes: drop MobilityServiceElement, MobilityServiceElementPrice, add constraint fro ModerRestriction assessment @@ -194,7 +197,7 @@ Correct COnstraints for PointOnRoute http://www.netex.org.uk/schemas/1.0/netex_all_objects.xsd Unclassified - CEN, Crown Copyright 2009-2019 + CEN, Crown Copyright 2009-2021
    @@ -4465,6 +4468,29 @@ Correct COnstraints for PointOnRoute + + + + + + + Every [Contract Id + Version] must be unique within document. + + + + + + + + + + + + + + + + @@ -4528,6 +4554,31 @@ Correct COnstraints for PointOnRoute + + + + + + + + Every [Contract Id + Version] must be unique within document. + + + + + + + + + + + + + + + + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd index 81ce97b45..e7dcfb021 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd @@ -16,6 +16,9 @@ 2011-12-16 + + 2021-01-29BUG Issue #143: Correct data type on GapToPlatform +

    NeTEx - Network Exchange. This subschema defines passenger vehicle EQUIPMENT

    @@ -30,7 +33,7 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2019 + CEN, Crown Copyright 2009-2021
      @@ -220,7 +223,7 @@ Rail transport, Roads and Road transport Maximum step height to board. - + Normal gap between VEHICLE and platform. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd index 11f990b03..87f818902 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd @@ -467,7 +467,7 @@ Rail transport, Roads and Road transport - + Allowed values for Personal Vehicle Categories _v1.2.2 diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd index 8d01e5f54..30fb28b43 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd @@ -458,7 +458,7 @@ Rail transport, Roads and Road transport Licence requirements to use. - + Category of vehicle. diff --git a/xsd/netex_framework/netex_utility/netex_utility_types.xsd b/xsd/netex_framework/netex_utility/netex_utility_types.xsd index b94ad7ccd..a59bab38d 100644 --- a/xsd/netex_framework/netex_utility/netex_utility_types.xsd +++ b/xsd/netex_framework/netex_utility/netex_utility_types.xsd @@ -40,11 +40,14 @@ 2019-03-30Fi - NJSK revie: Add dataLicence to infoLink enum values + NJSK review: Add dataLicence to infoLink enum values 2020-10-14New modes: add mobileAppDOwnload value to infoLinkTypes + + 2021-10-03New modes: add target platform to attributes of infoLinkType +

      NeTEx - Network Exchange. This subschema defines utility base types.

       @@ -464,10 +467,18 @@ Rail transport, Roads and Road transport + + Functional classifcation of infolink + + + + Software platform for which link is targeted, eg ios, android + + diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd index e5f77ec50..0a8be4c57 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd @@ -50,6 +50,9 @@ 2020-10-05NewModes - add reference to MediumAPplicationRef and MediuamACcessDeviceRef to Customer purchase package + + + 2021-10-03Add PARKING BAY CONDITION and RENTAL AVAILABILITY

      NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

      @@ -797,7 +800,7 @@ Rail transport, Roads and Road transport       - Access number of instance. + Access number of instance +V1.2.2. diff --git a/xsd/netex_part_5/netex_all_objects_part5_newModes.xsd b/xsd/netex_part_5/netex_all_objects_part5_newModes.xsd index bf86898e2..9df295c3e 100644 --- a/xsd/netex_part_5/netex_all_objects_part5_newModes.xsd +++ b/xsd/netex_part_5/netex_all_objects_part5_newModes.xsd @@ -22,8 +22,8 @@ - - + + diff --git a/xsd/netex_part_5/part5_frames/netex_nm_mobilityJourneyFrame_version.xsd b/xsd/netex_part_5/part5_frames/netex_nm_mobilityJourneyFrame_version.xsd index d0485bb43..92b939308 100644 --- a/xsd/netex_part_5/part5_frames/netex_nm_mobilityJourneyFrame_version.xsd +++ b/xsd/netex_part_5/part5_frames/netex_nm_mobilityJourneyFrame_version.xsd @@ -6,6 +6,7 @@ + @@ -22,6 +23,9 @@ 2020-10-21Add Individual Travellers + + 2021-10-03Add PARKING BAY CONDITION and RENTAL AVAILABILITY +

      NeTEx Network Exchange MOBILITY JOURNEY FRAME

      @@ -38,7 +42,7 @@ http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx.xsd Unclassified - CEN, Crown Copyright 2009-2017 + CEN, Crown Copyright 2009-2021
        @@ -132,6 +136,7 @@ Rail transport, Roads and Road transport + @@ -160,7 +165,7 @@ Rail transport, Roads and Road transport - Serive Information related elements in frame. + Service Information related elements in frame. @@ -171,4 +176,17 @@ Rail transport, Roads and Road transport + + + Rental Parking status elements in frame. + + + + + VEHICLE MEETING POINTs in frame. + + + + + diff --git a/xsd/netex_part_5/part5_nd/netex_nm_parkingBayStatus_support.xsd b/xsd/netex_part_5/part5_nd/netex_nm_vehicleParkingAreaInformation_support.xsd similarity index 68% rename from xsd/netex_part_5/part5_nd/netex_nm_parkingBayStatus_support.xsd rename to xsd/netex_part_5/part5_nd/netex_nm_vehicleParkingAreaInformation_support.xsd index 79554e153..4998b7a80 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_parkingBayStatus_support.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_vehicleParkingAreaInformation_support.xsd @@ -1,6 +1,7 @@ + @@ -17,6 +18,9 @@ 2020-10-05Add elements + + 2022-10-3Add PARKING BAY CONDITION, RENTAL AVAILABILITY +

        NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

        This sub-schema describes the VEHICLE PARKING BAY STATUS identifier Types.

        @@ -33,7 +37,7 @@ http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd Unclassified - CEN, Crown Copyright 2019-2020 + CEN, Crown Copyright 2019-2021
          @@ -85,7 +89,7 @@ Rail transport, Roads and Road transport - + Type for identifier of a PARKING BAY STATUS. @@ -123,5 +127,57 @@ Rail transport, Roads and Road transport + + + + Type for identifier of a RENTAL AVAILABILITY. + + + + + + Reference to a RENTAL AVAILABILITY. +v1.2.2 + + + + + Type for a reference to a RENTAL AVAILABILITY. + + + + + + Reference to a RENTAL AVAILABILITY. + + + + + + + + + Type for identifier of a PARKING BAY CONDITION. + + + + + + Reference to a PARKING BAY CONDITION. +v1.2.2 + + + + + Type for a reference to a PPARKING BAY CONDITION. + + + + + + Reference to a PARKING BAY CONDITION. + + + + + diff --git a/xsd/netex_part_5/part5_nd/netex_nm_parkingBayStatus_version.xsd b/xsd/netex_part_5/part5_nd/netex_nm_vehicleParkingAreaInformation_version.xsd similarity index 50% rename from xsd/netex_part_5/part5_nd/netex_nm_parkingBayStatus_version.xsd rename to xsd/netex_part_5/part5_nd/netex_nm_vehicleParkingAreaInformation_version.xsd index e77bc1f1f..5d32d9926 100644 --- a/xsd/netex_part_5/part5_nd/netex_nm_parkingBayStatus_version.xsd +++ b/xsd/netex_part_5/part5_nd/netex_nm_vehicleParkingAreaInformation_version.xsd @@ -1,7 +1,8 @@ - + + @@ -18,6 +19,9 @@ 2020-10-06 + + 2021-10-3Add PARKING BAY CONDITION and RENTRAL AVAILABILITY +

          NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

          This sub-schema describes the VEHICLE MEETING PLACE types.

          @@ -59,6 +63,29 @@ Rail transport, Roads and Road transport           NeTEx NM PARKING BAY STATUS data types           + + + Dummy type for Parking Log ENTRY. + + + + + Type for a list of PARKING LOG ENTRYs. + + + + + + + + + Dummy type for Parking Log ENTRY. +v1.2.2 + + + + + + @@ -141,7 +168,7 @@ Rail transport, Roads and Road transport - A categorisation of the the change of availability of the parking spot, such as being temporarily closed, unavailable, available. + A categorisation of the availability of the parking spot, such as being temporarily closed, unavailable, available. +v1.2.2 . +v1.2.2 @@ -176,5 +203,144 @@ Rail transport, Roads and Road transport + + + + A summary of the status of the rental at a SITE at a given point on time. +v1.2.2 + + + + + + + + + + + + + + + + + + + Identifier of RENTAL AVAILABILITYS. + + + + + + + + + Type for a RENTAL AVAILABILITY. + + + + + + + + + + Elements for a PRENTAL AVAILABILITY. + + + + + + Whether the parking is zurrently operational. + + + + + Whether the parking is currently renting out vehicles. + + + + + Whether the parking is currently accepting returned vehicles. + + + + + Number of vehicles available for rental at the site. + + + + + Number of disabled vehicles not available for rental at the site. + + + + + Number of docks available to accept vehicle returns. + + + + + Number of empty but disabled dock points at the site. + + + + + + + + A record of the status of the PARKING BAY at a given moment in time. +v1.2.2 + + + + + + + + + + + + + + + + + + + + + Identifier of PARKING BAY STATUS. + + + + + + + + + Type for a PARKING BAY CONDITION.. + + + + + + + + + + + + Elements for a PARKING BAY CONDITION.. + + + + + + Current status + + + + +