From 8aae143f7ce2aa02192a87371b3135df2ef662cc Mon Sep 17 00:00:00 2001 From: Nicholas Knowles Date: Wed, 14 Apr 2021 13:05:16 +0100 Subject: [PATCH 1/2] NewModes: Revise AT#8 new modes: AT#8 add _mobileAppInstallCheck 8 add _mobileAppInstallCheck_ to value to __infoLinkTypes__ enumeration --- README.md | 11 +- .../newModes/NewModes-CycleSharingExample.xml | 8 +- .../netex_utility/netex_utility_types.xsd | 14 +- xsd/netex_framework/netex_utility/tmp0000.xsd | 486 ++++++++++++++++++ 4 files changed, 510 insertions(+), 9 deletions(-) create mode 100644 xsd/netex_framework/netex_utility/tmp0000.xsd diff --git a/README.md b/README.md index b207899c7..bf8ef67a5 100644 --- a/README.md +++ b/README.md @@ -36,12 +36,19 @@ 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.14 NewModes: Revise AT#8 ew modes: 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_: + * _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 diff --git a/examples/functions/newModes/NewModes-CycleSharingExample.xml b/examples/functions/newModes/NewModes-CycleSharingExample.xml index ee373ff82..3b7148d2f 100644 --- a/examples/functions/newModes/NewModes-CycleSharingExample.xml +++ b/examples/functions/newModes/NewModes-CycleSharingExample.xml @@ -19,7 +19,7 @@ Deposit required. SALES PACKAGES (a) mobile app for preregistered users only. -(C) CEN 2020 +(C) CEN 2021 --> 2020-12-17T09:30:47.0Z SYS001 @@ -838,6 +838,12 @@ One off trip + + https://metrobike.com/hirecheck_ios.htm + https://metrobike.com/hirecheck_android.htm + https://metrobike.com/hire_ios.htm + https://metrobike.com/hire_android.htm + beforeTravelThenAdjustAtEndOfTravel diff --git a/xsd/netex_framework/netex_utility/netex_utility_types.xsd b/xsd/netex_framework/netex_utility/netex_utility_types.xsd index a59bab38d..a58014ede 100644 --- a/xsd/netex_framework/netex_utility/netex_utility_types.xsd +++ b/xsd/netex_framework/netex_utility/netex_utility_types.xsd @@ -32,11 +32,11 @@ 2019-03-25SBB23 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 2019-03-30FR49 CD #53 Accessibility Changes - NJSK revie: Add FontSizeEnum as a general property + NJSK revise: Add FontSizeEnum as a general property 2019-03-30Fi @@ -48,9 +48,10 @@ 2021-10-03New modes: add target platform to attributes of infoLinkType - -

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

- + + 2021-04-14New modes: AT#8 add mobileAppInstallCheck to value to infoLinkTypes + +

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

text/xml http://www.w3.org/2001/XMLSchema @@ -60,7 +61,7 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2020 + CEN, Crown Copyright 2009-2021
    @@ -442,6 +443,7 @@ Rail transport, Roads and Road transport + diff --git a/xsd/netex_framework/netex_utility/tmp0000.xsd b/xsd/netex_framework/netex_utility/tmp0000.xsd new file mode 100644 index 000000000..082ea4279 --- /dev/null +++ b/xsd/netex_framework/netex_utility/tmp0000.xsd @@ -0,0 +1,486 @@ + + + + + + + main schema + e-service developers + Europe + First Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk + + 2010-09-04 + + + 2011-02-05 + + + 2010-11-05 + + + 2017-03-27CR0011 Add separate support for Printed coloures and fonts. + + + 2017-03-27CR0016 Add additional values to InfoLinkType. + + + 2017-11-08CR0016 Add additional values to InfoLinkType. + + + 2019-03-25SBB21 CD #56. Add new ColourSystem attribute to Presentationa PrintPresentation. + NJSK Review ColourSystem and ColourName should be type xsd:normalizedString, not xsd:string. + + + 2019-03-25SBB23 CD #57. Add new BackgroundColour and BackgroundColourName attributes to Presentation and PrintPresentation elements. + Add icon to TypeOfIIfolink enum values + + + 2019-03-30FR49 CD #53 Accessibility Changes + NJSK revie: Add FontSizeEnum as a general property + + + 2019-03-30Fi + 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.

    +     + + text/xml + http://www.w3.org/2001/XMLSchema + XML schema, W3C Recommendation 2001 + + {http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_types.xsd + [ISO 639-2/B] ENG + Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX + Unclassified + CEN, Crown Copyright 2009-2020 + + +
      +
    • Derived from the SIRI standards revised for NeTEx.
      • +
    + + Version 1.0 Draft for approval + + Arts, recreation and travel, Tourism, Travel (tourism), Transport, +Air transport, Airports, +Ports and maritime transport, Ferries (marine), +Public transport, Bus services, Coach services, Bus stops and stations, +Rail transport, Railway stations and track, Train services, Underground trains, +Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, +Rail transport, Roads and Road transport + + CEN TC278 WG3 SG9. + + NeTEx Network Exchange - Base utility types. + Standard +     +     + documentation +     + + + + Type for a restriction of W3C XML Schema's string that requires at least one character of text. + + + + + + + + + Type for an International phone number. + Country + MSIDDN e.g. +41 675601 etc. + + + + + + Email address type a@b. + + + + + + + A private code that uniquely identifies the element. May be used for inter-operating with other (legacy) systems. + + + + + Type describing a private code. + + + + + + Nature of code. + + + + + + + + An Accounting code assigned to the Element (TAP TSI) + + + + + + Offset from Greenwich in hours. e.g. +5 ,- 2 + + + + + + Offset in days. + + + + + + Common LOCALE dependent properties. + + + + + Type describing common locale dependent properties. + + + + + Timezone offset from Greenwich at LOCALE. + + + + + Timezone name at LOCALE. + + + + + Summer timezone offset if different from Time zone offset. + + + + + Summer Time zone name at LOCALE. + + + + + Default Language for LOCALE. Assume language use is "normally used" + + + + + Languages supported at LOCALE. + + + + + + Language usage. + + + + + + + + + + List of languages. + + + + + + Enumeration of Uses of language. + + + + + + + + + + + + + + + List of of Uses of language. + + + + + + Type describing language usage properties. + + + + + Language whose usage is described. + + + + + Usages of language supported. Based on UN terms. + + + + + + + + Types describing common presentation properties for Display. + + + + + Default RGB colour value for graphics associated with ENTITY - e.g. for a LINE. + + + + + Name of default colour value for graphics associated with ENTITY. + + + + + Name of colour system used for ColourName and TextColourName: for example, + - RAL, https://en.wikipedia.org/wiki/RAL_colour_standard; + - DIN 6164 http://www.dtpstudio.de/atlas/farbsysteme/DIN%206164_bs00_3.htm; + - Pantone (be aware that Pantone is proprietary), etc. + + + + + Default RGB background colour value for text and graphics associated with ENTITY - e.g. of a LINE. + + + + + Name of the background colour (in ColourSystem) for text and graphics associated with entity. + + + + + Default colour value for text associated with ENTITY. + + + + + Name of default colour value (in ColourSystem) for text associated with ENTITY. + + + + + Identifier of font for text. + + + + + Name of font for text. + + + + + Default language for text. + + + + + Hyperlinks associated with presentation. + + + + + + + + + + + + Type for a Colour Value. + + + + + + + + + Types describing common presentation properties for Print. + + + + + Default colour value for printed graphics associated with ENTITY - e.g. of a LINE, e.g. CMYK. + + + + + Name of default colour value for printed graphics associated with entity., eg Pentone name + + + + + Name of colour system used for printed ColourName and TextColourName: for example, + - RAL, https://en.wikipedia.org/wiki/RAL_colour_standard; + - DIN 6164 http://www.dtpstudio.de/atlas/farbsysteme/DIN%206164_bs00_3.htm; + - Pantone (be aware that Pantone is proprietary), etc. + + + + + Default RGB background colour value for printed text and graphics associated with ENTITY - e.g. of a LINE. + + + + + Name of the backgropund colour value (in ColourSystem) for printed text and graphics associated with entity. + + + + + Default colour value for printed text associated with entity. CMYK. + + + + + Name of default colour value for printed text associated with entity, in specified ColourSystem. + + + + + Identifier of font for printed text. + + + + + Name of font for printed text. + + + + + Default language for printed text. + + + + + Default language for printed text +v1.1. + + + + + + + Type for a PrintColour Value. + + + + + + Allowed values for size of font. +v1.1 + + + + + + + + + + + + + Type for a Currency . Based on ISO 4717 values. + + + + + + + + + + List of Currencies. + + + + + + + Type for a Percentage: 0-100 decimal. + + + + + + + Enumeration of Uses of language. + + + + + + + + + + + + + + + + + + + + Type for collection of info links. + + + + + + + + A hyperlink to an external web resource. + + + + + Type for Info LinK. + + + + + + Functional classifcation of infolink + + + + + + + + Software platform for which link is targeted, eg ios, android + + + + + +     From 6578ccd31f9aeded53552c77e499c993dfe54b6f Mon Sep 17 00:00:00 2001 From: Christophe Duquesne Date: Wed, 14 Apr 2021 16:09:19 +0200 Subject: [PATCH 2/2] Delete tmp0000.xsd This tmp000.xsd file was to dead copy of netex_utility_types.xsd --- xsd/netex_framework/netex_utility/tmp0000.xsd | 486 ------------------ 1 file changed, 486 deletions(-) delete mode 100644 xsd/netex_framework/netex_utility/tmp0000.xsd diff --git a/xsd/netex_framework/netex_utility/tmp0000.xsd b/xsd/netex_framework/netex_utility/tmp0000.xsd deleted file mode 100644 index 082ea4279..000000000 --- a/xsd/netex_framework/netex_utility/tmp0000.xsd +++ /dev/null @@ -1,486 +0,0 @@ - - - - - - - main schema - e-service developers - Europe - First Drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles. mailto:schemer@netex.org.uk - - 2010-09-04 - - - 2011-02-05 - - - 2010-11-05 - - - 2017-03-27CR0011 Add separate support for Printed coloures and fonts. - - - 2017-03-27CR0016 Add additional values to InfoLinkType. - - - 2017-11-08CR0016 Add additional values to InfoLinkType. - - - 2019-03-25SBB21 CD #56. Add new ColourSystem attribute to Presentationa PrintPresentation. - NJSK Review ColourSystem and ColourName should be type xsd:normalizedString, not xsd:string. - - - 2019-03-25SBB23 CD #57. Add new BackgroundColour and BackgroundColourName attributes to Presentation and PrintPresentation elements. - Add icon to TypeOfIIfolink enum values - - - 2019-03-30FR49 CD #53 Accessibility Changes - NJSK revie: Add FontSizeEnum as a general property - - - 2019-03-30Fi - 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.

    -     - - text/xml - http://www.w3.org/2001/XMLSchema - XML schema, W3C Recommendation 2001 - - {http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_types.xsd - [ISO 639-2/B] ENG - Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX - Unclassified - CEN, Crown Copyright 2009-2020 - - -
      -
    • Derived from the SIRI standards revised for NeTEx.
      • -
    - - Version 1.0 Draft for approval - - Arts, recreation and travel, Tourism, Travel (tourism), Transport, -Air transport, Airports, -Ports and maritime transport, Ferries (marine), -Public transport, Bus services, Coach services, Bus stops and stations, -Rail transport, Railway stations and track, Train services, Underground trains, -Business and industry, Transport, Air transport , Ports and maritime transport, Public transport, -Rail transport, Roads and Road transport - - CEN TC278 WG3 SG9. - - NeTEx Network Exchange - Base utility types. - Standard -     -     - documentation -     - - - - Type for a restriction of W3C XML Schema's string that requires at least one character of text. - - - - - - - - - Type for an International phone number. + Country + MSIDDN e.g. +41 675601 etc. - - - - - - Email address type a@b. - - - - - - - A private code that uniquely identifies the element. May be used for inter-operating with other (legacy) systems. - - - - - Type describing a private code. - - - - - - Nature of code. - - - - - - - - An Accounting code assigned to the Element (TAP TSI) - - - - - - Offset from Greenwich in hours. e.g. +5 ,- 2 - - - - - - Offset in days. - - - - - - Common LOCALE dependent properties. - - - - - Type describing common locale dependent properties. - - - - - Timezone offset from Greenwich at LOCALE. - - - - - Timezone name at LOCALE. - - - - - Summer timezone offset if different from Time zone offset. - - - - - Summer Time zone name at LOCALE. - - - - - Default Language for LOCALE. Assume language use is "normally used" - - - - - Languages supported at LOCALE. - - - - - - Language usage. - - - - - - - - - - List of languages. - - - - - - Enumeration of Uses of language. - - - - - - - - - - - - - - - List of of Uses of language. - - - - - - Type describing language usage properties. - - - - - Language whose usage is described. - - - - - Usages of language supported. Based on UN terms. - - - - - - - - Types describing common presentation properties for Display. - - - - - Default RGB colour value for graphics associated with ENTITY - e.g. for a LINE. - - - - - Name of default colour value for graphics associated with ENTITY. - - - - - Name of colour system used for ColourName and TextColourName: for example, - - RAL, https://en.wikipedia.org/wiki/RAL_colour_standard; - - DIN 6164 http://www.dtpstudio.de/atlas/farbsysteme/DIN%206164_bs00_3.htm; - - Pantone (be aware that Pantone is proprietary), etc. - - - - - Default RGB background colour value for text and graphics associated with ENTITY - e.g. of a LINE. - - - - - Name of the background colour (in ColourSystem) for text and graphics associated with entity. - - - - - Default colour value for text associated with ENTITY. - - - - - Name of default colour value (in ColourSystem) for text associated with ENTITY. - - - - - Identifier of font for text. - - - - - Name of font for text. - - - - - Default language for text. - - - - - Hyperlinks associated with presentation. - - - - - - - - - - - - Type for a Colour Value. - - - - - - - - - Types describing common presentation properties for Print. - - - - - Default colour value for printed graphics associated with ENTITY - e.g. of a LINE, e.g. CMYK. - - - - - Name of default colour value for printed graphics associated with entity., eg Pentone name - - - - - Name of colour system used for printed ColourName and TextColourName: for example, - - RAL, https://en.wikipedia.org/wiki/RAL_colour_standard; - - DIN 6164 http://www.dtpstudio.de/atlas/farbsysteme/DIN%206164_bs00_3.htm; - - Pantone (be aware that Pantone is proprietary), etc. - - - - - Default RGB background colour value for printed text and graphics associated with ENTITY - e.g. of a LINE. - - - - - Name of the backgropund colour value (in ColourSystem) for printed text and graphics associated with entity. - - - - - Default colour value for printed text associated with entity. CMYK. - - - - - Name of default colour value for printed text associated with entity, in specified ColourSystem. - - - - - Identifier of font for printed text. - - - - - Name of font for printed text. - - - - - Default language for printed text. - - - - - Default language for printed text +v1.1. - - - - - - - Type for a PrintColour Value. - - - - - - Allowed values for size of font. +v1.1 - - - - - - - - - - - - - Type for a Currency . Based on ISO 4717 values. - - - - - - - - - - List of Currencies. - - - - - - - Type for a Percentage: 0-100 decimal. - - - - - - - Enumeration of Uses of language. - - - - - - - - - - - - - - - - - - - - Type for collection of info links. - - - - - - - - A hyperlink to an external web resource. - - - - - Type for Info LinK. - - - - - - Functional classifcation of infolink - - - - - - - - Software platform for which link is targeted, eg ios, android - - - - - -