Skip to content

New modes at# add short name to mobility service #164

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

New modes at# add short name to mobility service #164

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
8aae143
NewModes: Revise AT#8 new modes: AT#8 add _mobileAppInstallCheck
nick-knowles Apr 14, 2021
77c3693
Newmodes: revisions to facility values
nick-knowles Apr 15, 2021
0796a99
Add short name to Mobility service
nick-knowles Apr 15, 2021
23b892f
NewModes-at# corerct commenst
nick-knowles Apr 15, 2021
f686c18
Delete tmp0000.xsd
Aurige Apr 16, 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
20 changes: 18 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,28 @@ There is also an _Oxygen_ project file:
# Change Log

=======
Version 1.2.2 - New modes Revised changes with e examples and constraints.
Version 1.2.2 - New modes Revised changes with examples and constraints.

### 2021.04.15 NewModes: Revise AT#8 Facilities: AT#8 add _scooterHire_ to value to __HireFacility__ enumeration
Align __Hirefacility__ values with spec and add new mode values _scooterHire_, _vehicleHire_, _boatHire_ and _other_.
* _Updates to xml schema_:
* netex_ifopt_localServiceCommercial_support.xsd.xsd
* netex_ifopt_mobilityService_version.xsd.xsd
* netex_facility_support.xsd.xsd
* _Updates to xml examples_:
* NewModes-CycleSharingExample.xml is valid.

### 2021.04.14 NewModes: Revise AT#9 Add missing enum values to __MobilityCOnstraintZone__ __TransportZoneUseEnumeration__: _allUsesAllowed_ and _noPassThrough_ .
### 2021.04.14 NewModes: Revise AT#8 add _mobileAppInstallCheck_ to value to __infoLinkTypes__ enumeration
* _Updates to xml schema_:
* netex_utility_types.xsd
* _Updates to xml examples_:
* NewModes-CycleSharingExample.xml is valid.

### 2021.04.14 NewModes: Revise AT#9 Add missing enum values to __MobilityCOnstraintZone__ __TransportZoneUseEnumeration__: _allUsesAllowed_ and _noPassThrough_ .
* _Updates to xml schema_:
* netex_nm_mobilityServiceConstraintZone_version.xsd
* _Updates to xml examples_:
* NewModes-CycleSharingExample.xml is valid.

### 2021.03.10 NewModes: Revisions to support GBS. add _targetPlatform_ attribute to _InfoLink_
New modes: add target platform to attributes of infoLinkType
Expand Down
8 changes: 7 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 @@ -19,7 +19,7 @@
Deposit required.
SALES PACKAGES (a) mobile app for preregistered users only.

(C) CEN 2020
(C) CEN 2021
-->
<PublicationTimestamp>2020-12-17T09:30:47.0Z</PublicationTimestamp>
<ParticipantRef>SYS001</ParticipantRef>
Expand Down Expand Up @@ -838,6 +838,12 @@
</ThirdPartyProduct>
<PreassignedFareProduct version="any" id="metrobike@single_session">
<Name>One off trip</Name>
<infoLinks>
<InfoLink targetPlatform="ios" typeOfInfoLink="mobileAppInstallCheck">https://metrobike.com/hirecheck_ios.htm</InfoLink>
<InfoLink targetPlatform="android" typeOfInfoLink="mobileAppInstallCheck">https://metrobike.com/hirecheck_android.htm </InfoLink>
<InfoLink targetPlatform="ios" typeOfInfoLink="mobileAppDownload">https://metrobike.com/hire_ios.htm</InfoLink>
<InfoLink targetPlatform="android" typeOfInfoLink="mobileAppDownload">https://metrobike.com/hire_android.htm </InfoLink>
</infoLinks>
<ChargingMomentType>beforeTravelThenAdjustAtEndOfTravel</ChargingMomentType>
<OperatorRef version="any" ref="noc:MBIKE"/>
<ConditionSummary>
Expand Down
16 changes: 14 additions & 2 deletions xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
Fix Add missing animalsAllowed values to NuisanceFacility
Add unspecifed to Gender list
</Date>
<Date>
<Modified>2021-04-15</Modified>New modes: Align Hirefacility values with spec and add values scooterHire, vehicleHire, boatHire and other.
</Date>
<Description>
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
<p>This sub-schema describes the FACILITY subtypes </p>
Expand All @@ -57,7 +60,7 @@
<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
</Relation>
<Rights>Unclassified
<Copyright>CEN, Crown Copyright 2009-2020</Copyright>
<Copyright>CEN, Crown Copyright 2009-2021</Copyright>
</Rights>
<Source>
<ul>
Expand Down Expand Up @@ -381,11 +384,15 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="unknown"/>
<xsd:enumeration value="scooterHire"/>
<xsd:enumeration value="vehicleHire"/>
<xsd:enumeration value="carHire"/>
<xsd:enumeration value="motorCycleHire"/>
<xsd:enumeration value="cycleHire"/>
<xsd:enumeration value="taxi"/>
<xsd:enumeration value="boatHire"/>
<xsd:enumeration value="recreationDeviceHire"/>
<xsd:enumeration value="other"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="LuggageCarriageEnumeration">
Expand Down Expand Up @@ -512,12 +519,17 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="unknown"/>
<xsd:enumeration value="valetParking"/>
<xsd:enumeration value="carWash"/>
<xsd:enumeration value="valetPark"/>
<xsd:enumeration value="valetCarWash"/>
<xsd:enumeration value="carValetClean"/>
<xsd:enumeration value="oilChange"/>
<xsd:enumeration value="engineWarming"/>
<xsd:enumeration value="petrol"/>
<xsd:enumeration value="batteryCare"/>
<xsd:enumeration value="recharging"/>
<xsd:enumeration value="tyreCheck"/>
<xsd:enumeration value="other"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="MedicalFacilityEnumeration">
Expand Down
14 changes: 8 additions & 6 deletions xsd/netex_framework/netex_utility/netex_utility_types.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
</Date>
<Date>
<Modified>2019-03-25</Modified>SBB23 CD #57. Add new BackgroundColour and BackgroundColourName attributes to Presentation and PrintPresentation elements.
Add icon to TypeOfIIfolink enum values
Add icon to TypeOfInfolink enum values
</Date>
<Date>
<Modified>2019-03-30</Modified>FR49 CD #53 Accessibility Changes
NJSK revie: Add FontSizeEnum as a general property
NJSK revise: Add FontSizeEnum as a general property
</Date>
<Date>
<Modified>2019-03-30</Modified>Fi
Expand All @@ -48,9 +48,10 @@
<Date>
<Modified>2021-10-03</Modified>New modes: add target platform to attributes of infoLinkType
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines utility base types.</p>
</Description>
<Date>
<Modified>2021-04-14</Modified>New modes: AT#8 add mobileAppInstallCheck to value to infoLinkTypes
</Date>
<p>NeTEx - Network Exchange. This subschema defines utility base types.</p>
<Format>
<MediaType>text/xml</MediaType>
<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
Expand All @@ -60,7 +61,7 @@
<Language>[ISO 639-2/B] ENG</Language>
<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
<Rights>Unclassified
<Copyright>CEN, Crown Copyright 2009-2020</Copyright>
<Copyright>CEN, Crown Copyright 2009-2021</Copyright>
</Rights>
<Source>
<ul>
Expand Down Expand Up @@ -442,6 +443,7 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="fareSheet"/>
<xsd:enumeration value="dataLicence"/>
<xsd:enumeration value="mobileAppDownload"/>
<xsd:enumeration value="mobileAppInstallCheck"/>
<xsd:enumeration value="map"/>
<xsd:enumeration value="icon"/>
<xsd:enumeration value="other"/>
Expand Down
7 changes: 4 additions & 3 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@ Rail transport, Roads and Road transport
<xsd:documentation>Allowed value for Cycle Storage.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:normalizedString">
<xsd:enumeration value="racks"/>
<xsd:enumeration value="racks"/>
<xsd:enumeration value="docks"/>
<xsd:enumeration value="bars"/>
<xsd:enumeration value="railings"/>
<xsd:enumeration value="cycleScheme"/>
<xsd:enumeration value="lockers"/>
<xsd:enumeration value="freestanding"/>
<xsd:enumeration value="docks"/>
<xsd:enumeration value="other"/>
</xsd:restriction>
</xsd:simpleType>
Expand Down Expand Up @@ -133,7 +133,8 @@ Rail transport, Roads and Road transport
<xsd:annotation>
<xsd:documentation>Allowed value for LOCKING MECHANISM</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:normalizedString">
<xsd:restriction base="xsd:normalizedString">
<xsd:enumeration value="none"/>
<xsd:enumeration value="dock"/>
<xsd:enumeration value="immobilisingLock"/>
<xsd:enumeration value="separateLockingDevice"/>
Expand Down
8 changes: 7 additions & 1 deletion xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
<Date>
<Modified>2007-06-12</Modified>
</Date>
<Date>
<Modified>2007-06-12</Modified>New modes add scooter hire value.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines COMMERCIAL Local Service types </p>
</Description>
Expand All @@ -27,7 +30,7 @@
<Language>[ISO 639-2/B] ENG</Language>
<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
<Rights>Unclassified
<Copyright>CEN, Crown Copyright 2009-2014</Copyright>
<Copyright>CEN, Crown Copyright 2009-2021</Copyright>
</Rights>
<Source>
<ul>
Expand Down Expand Up @@ -111,9 +114,12 @@ Rail transport, Roads and Road transport
<xsd:documentation>Allowed values for HIRE SERVICE.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
<xsd:enumeration value="scooterHire"/>
<xsd:enumeration value="cycleHire"/>
<xsd:enumeration value="motorcycleHire"/>
<xsd:enumeration value="carHire"/>
<xsd:enumeration value="vehicleHire"/>
<xsd:enumeration value="boatHire"/>
<xsd:enumeration value="recreationalDeviceHire"/>
</xsd:restriction>
</xsd:simpleType>
Expand Down
12 changes: 10 additions & 2 deletions xsd/netex_part_5/part5_rc/netex_nm_mobilityService_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
<Audience>e-service developers</Audience>
<Coverage>Europe</Coverage>
<Creator>First drafted for version 1.2.2 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk</Creator>
<Date>
<Created>2020-10-05</Created>NewModes issue AT#
</Date>
<Date>
<Created>2020-10-05</Created>Added for New modes
</Date>
Expand All @@ -29,7 +32,7 @@
<Modified>2021-01-10</Modified>Move topographic place up to mobility service
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines EQUIPMENT types for Place access.</p>
<p>NeTEx - Network Exchange. This subschema defines MOBILITY SERVICE types.</p>
</Description>
<Format>
<MediaType>text/xml</MediaType>
Expand All @@ -40,7 +43,7 @@
<Language>[ISO 639-2/B] ENG</Language>
<Publisher>CEN TC278 WG3 SG9</Publisher>
<Rights>Unclassified
<Copyright>CEN, Crown Copyright 2019-2020</Copyright>
<Copyright>CEN, Crown Copyright 2019-2021</Copyright>
</Rights>
<Source>
<ul>
Expand Down Expand Up @@ -111,6 +114,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Elements for a MOBILITY SERVICE.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="ShortName" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Short Name for service</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="StartDate" type="xsd:date" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Start date from when services are available</xsd:documentation>
Expand Down