Skip to content

Commit

Permalink
Merge branch 'next' into DeckplanRevisions
Browse files Browse the repository at this point in the history
  • Loading branch information
@skinkie
skinkie authored Jul 25, 2024
2 parents 836741d + 4d95205 commit b7d1c90
Show file tree
Hide file tree
Showing 14 changed files with 64 additions and 42 deletions.
13 changes: 7 additions & 6 deletions examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080-full.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51985,7 +51985,8 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML
<ToDate>2099-12-31T24:00:00Z</ToDate>
</ValidBetween>
<Name lang="de">Online Ticket nicht gueltig</Name>
<TypeOfNoticeRef version="any" ref="TCVM"/>
<TypeOfNoticeRef version="any" ref="M"/>
<!--all ref="TCVM" changed to ref="M" to match the TypeOfNotice - v2.0-->
<variants>
<DeliveryVariant order="1">
<VariantText lang="fr">billets online pas valide </VariantText>
Expand All @@ -52004,7 +52005,7 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML
<ToDate>2099-12-31T24:00:00Z</ToDate>
</ValidBetween>
<Name lang="de">Für die Busstrecke Nürnberg - Praha gelten die gesetzlichen Vorschriften der jeweiligen Länder für die Personen- beförderung auf der Straße.</Name>
<TypeOfNoticeRef version="any" ref="TCVM"/>
<TypeOfNoticeRef version="any" ref="M"/>
<variants>
<DeliveryVariant order="1">
<VariantText lang="fr">Pour les lignes de bus Nürnberg - Praha, les dispositions légales de chaque pays pour le transport de voyageurs sur la route s'appliquent. </VariantText>
Expand All @@ -52023,7 +52024,7 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML
<ToDate>2099-12-31T24:00:00Z</ToDate>
</ValidBetween>
<Name lang="de">Kinder von 6 bis inklusive 11 Jahren Die Mitnahme von Reisegepäck ist nicht möglich. RAILPLUS nicht zugelassen</Name>
<TypeOfNoticeRef version="any" ref="TCVM"/>
<TypeOfNoticeRef version="any" ref="M"/>
<variants>
<DeliveryVariant order="1">
<VariantText lang="fr">Les enfants âgés de 6 à 11 ans inclus L'emport de bagages n'est pas possible. RAILplus pas autorisé </VariantText>
Expand All @@ -52042,7 +52043,7 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML
<ToDate>2099-12-31T24:00:00Z</ToDate>
</ValidBetween>
<Name lang="de">Kinder von 4 bis inklusive 14 Jahren Reservierungspflicht Servicetelefon +49 461 864 602 verkehrt voraussichtlich von April bis Oktober</Name>
<TypeOfNoticeRef version="any" ref="TCVM"/>
<TypeOfNoticeRef version="any" ref="M"/>
<variants>
<DeliveryVariant order="1">
<VariantText lang="fr">Les enfants âgés de 4 à 14 ans inclus Réservation obligatoire téléphone de service +49 461 864 602 ne circule qu'à partir d'avril jusqu'au octobre </VariantText>
Expand All @@ -52061,7 +52062,7 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML
<ToDate>2099-12-31T24:00:00Z</ToDate>
</ValidBetween>
<Name lang="de">Kinder von 4 bis inklusive 14 Jahren RAILPLUS nicht zugelassen</Name>
<TypeOfNoticeRef version="any" ref="TCVM"/>
<TypeOfNoticeRef version="any" ref="M"/>
<variants>
<DeliveryVariant order="1">
<VariantText lang="fr">Les enfants âgés de 4 à 14 ans inclusRAILplus pas autorisé </VariantText>
Expand All @@ -52080,7 +52081,7 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML
<ToDate>2099-12-31T24:00:00Z</ToDate>
</ValidBetween>
<Name lang="de">keine Kinderermäßigung RAILPLUS nicht zugelassen</Name>
<TypeOfNoticeRef version="any" ref="TCVM"/>
<TypeOfNoticeRef version="any" ref="M"/>
<variants>
<DeliveryVariant order="1">
<VariantText lang="fr">Pas de réduction pour les enfantsRAILplus pas autorisé </VariantText>
Expand Down
13 changes: 7 additions & 6 deletions examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59108,7 +59108,8 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML
</ValidBetween>
</validityConditions>
<Name lang="de">Online Ticket nicht gueltig</Name>
<TypeOfNoticeRef version="any" ref="TCVM"/>
<TypeOfNoticeRef version="any" ref="M"/>
<!--All ref="TCVM" replaced by ref="M" since ther is no TypeOfNotice with if="TCVM" - v2.0-->
<variants>
<DeliveryVariant order="1">
<VariantText lang="fr">billets online pas valide </VariantText>
Expand All @@ -59129,7 +59130,7 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML
</ValidBetween>
</validityConditions>
<Name lang="de">Für die Busstrecke Nürnberg - Praha gelten die gesetzlichen Vorschriften der jeweiligen Länder für die Personen- beförderung auf der Straße.</Name>
<TypeOfNoticeRef version="any" ref="TCVM"/>
<TypeOfNoticeRef version="any" ref="M"/>
<variants>
<DeliveryVariant order="1">
<VariantText lang="fr">Pour les lignes de bus Nürnberg - Praha, les dispositions légales de chaque pays pour le transport de voyageurs sur la route s'appliquent. </VariantText>
Expand All @@ -59150,7 +59151,7 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML
</ValidBetween>
</validityConditions>
<Name lang="de">Kinder von 6 bis inklusive 11 Jahren Die Mitnahme von Reisegepäck ist nicht möglich. RAILPLUS nicht zugelassen</Name>
<TypeOfNoticeRef version="any" ref="TCVM"/>
<TypeOfNoticeRef version="any" ref="M"/>
<variants>
<DeliveryVariant order="1">
<VariantText lang="fr">Les enfants âgés de 6 à 11 ans inclus L'emport de bagages n'est pas possible. RAILplus pas autorisé </VariantText>
Expand All @@ -59171,7 +59172,7 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML
</ValidBetween>
</validityConditions>
<Name lang="de">Kinder von 4 bis inklusive 14 Jahren Reservierungspflicht Servicetelefon +49 461 864 602 verkehrt voraussichtlich von April bis Oktober</Name>
<TypeOfNoticeRef version="any" ref="TCVM"/>
<TypeOfNoticeRef version="any" ref="M"/>
<variants>
<DeliveryVariant order="1">
<VariantText lang="fr">Les enfants âgés de 4 à 14 ans inclus Réservation obligatoire téléphone de service +49 461 864 602 ne circule qu'à partir d'avril jusqu'au octobre </VariantText>
Expand All @@ -59192,7 +59193,7 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML
</ValidBetween>
</validityConditions>
<Name lang="de">Kinder von 4 bis inklusive 14 Jahren RAILPLUS nicht zugelassen</Name>
<TypeOfNoticeRef version="any" ref="TCVM"/>
<TypeOfNoticeRef version="any" ref="M"/>
<variants>
<DeliveryVariant order="1">
<VariantText lang="fr">Les enfants âgés de 4 à 14 ans inclusRAILplus pas autorisé </VariantText>
Expand All @@ -59213,7 +59214,7 @@ This example provides an example of encodeing TAP TSI NRT fares in NeTEx XML
</ValidBetween>
</validityConditions>
<Name lang="de">keine Kinderermäßigung RAILPLUS nicht zugelassen</Name>
<TypeOfNoticeRef version="any" ref="TCVM"/>
<TypeOfNoticeRef version="any" ref="M"/>
<variants>
<DeliveryVariant order="1">
<VariantText lang="fr">Pas de réduction pour les enfantsRAILplus pas autorisé </VariantText>
Expand Down
3 changes: 2 additions & 1 deletion examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,8 @@ V1.1 Extensively revised with improved ids and use of tarifffs.
<!-- === TARIFFS === -->
<tariffs>
<Tariff id="tap:NRT_Standard" version="1.0">
<ValidBetween id="tap:Tariff01" version="1.0">
<ValidBetween id="tap:Tariff02" version="1.0">
<!--ID changed from id="tap:Tariff01" to id="tap:Tariff02" since it has to be unique - v2.0-->
<FromDate>2011-01-01T00:00:00Z</FromDate>
<ToDate>2014-01-01T00:00:00Z</ToDate>
</ValidBetween>
Expand Down
21 changes: 14 additions & 7 deletions examples/standards/tap_tsi/TAP-TSDUPD-example1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,11 @@ TapTsi B.4.7009
</SiteFrame>
<ServiceFrame version="any" id="TSDUPD-example">
<Name>Location / STation TSDUPD example </Name>
<directions>
<Direction version="uic" id="54"/>
<Direction version="uic" id="68"/>
<Direction version="uic" id="84"/>
</directions>
<scheduledStopPoints>
<ScheduledStopPoint version="any" id="uic:007300101">
<!-- Narrative: Declares the timetable stop -->
Expand Down Expand Up @@ -473,11 +478,13 @@ TapTsi B.4.7009
<MinimumTransferTime>PT8M</MinimumTransferTime>
<DistributorFilter>
<OperatorRef versionRef="EXTERNAL" ref="uic:54"/>
<LineInDirectionRef>
<ExternalDirectionRef type="uicType" ref="54"/>
<!-- TapTsi B.4.7009 54 Talgo ! -->
<!-- NB Work around to handle this case NeTEX needs to add additional filter -->
</LineInDirectionRef>
<linesInDirectionRefs>
<LineInDirectionRef>
<DirectionRef ref="54" version="uic"/>
<!-- TapTsi B.4.7009 54 Talgo ! -->
<!-- NB Work around to handle this case NeTEX needs to add additional filter -->
</LineInDirectionRef>
</linesInDirectionRefs>
<ScheduledStopPointRef version="any" ref="uic:007300101"/>
</DistributorFilter>
</InterchangeRule>
Expand Down Expand Up @@ -512,7 +519,7 @@ TapTsi B.4.7009
<TransportMode>rail</TransportMode>
<OperatorRef versionRef="EXTERNAL" ref="uic:1073"/>
<LineInDirectionRef>
<ExternalDirectionRef type="uicType" ref="68"/>
<DirectionRef version="uic" ref="68"/>
<!-- TapTsi B.4.7009 68 Internationa; -->
<!-- NB Work around to handle this case GAP NeTEX needs to add additional filter for Product /service type-->
</LineInDirectionRef>
Expand All @@ -522,7 +529,7 @@ TapTsi B.4.7009
<TransportMode>rail</TransportMode>
<OperatorRef versionRef="EXTERNAL" ref="uic:1180"/>
<LineInDirectionRef>
<ExternalDirectionRef type="uicType" ref="84"/>
<DirectionRef version="uic" ref="84"/>
<!-- TapTsi B.4.7009 84 Regional Train; -->
<!-- NB Work around to handle this case GAP NeTEX needs to add additional filter for Product /service type-->
</LineInDirectionRef>
Expand Down
20 changes: 16 additions & 4 deletions examples/standards/vdv452/timetable/NeTEx VDV Example.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2377,16 +2377,25 @@
</InfrastructureFrame>
<ServiceFrame id="dummy" version="any">
<directions>
<Direction version="ext" id="VAG009A"/>
<Direction id="DIR_1" version="1">
<keyList>
<KeyValue>
<Key>ExternalDirectionRef</Key>
<!-- or with PrivateCode like in the second Direction -->
<Value>1</Value>
</KeyValue>
</keyList>
<Name>Direction A</Name>
<ShortName>A</ShortName>
<ExternalDirectionRef ref="1"/>
<DirectionType>inbound</DirectionType>
</Direction>
<Direction id="DIR_2" version="1">
<privateCodes>
<PrivateCode>2</PrivateCode>
</privateCodes>
<Name>Direction B</Name>
<ShortName>B</ShortName>
<ExternalDirectionRef ref="2"/>
<DirectionType>outbound</DirectionType>
</Direction>
</directions>
Expand Down Expand Up @@ -3436,6 +3445,9 @@
</Route>
</routes>
<lines>
<Line version="ext" id="VAG009">
<Name>VAG009</Name>
</Line>
<Line id="LI_2" version="1">
<privateCodes>
<PrivateCode>3</PrivateCode>
Expand Down Expand Up @@ -108122,8 +108134,8 @@
</timings>
<FeederFilter>
<LineInDirectionRef>
<ExternalLineRef ref="VAG009"/>
<ExternalDirectionRef ref="VAG009A"/>
<LineRef version="ext" ref="VAG009"/>
<DirectionRef version="ext" ref="VAG009A"/>
</LineInDirectionRef>
</FeederFilter>
<DistributorFilter>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="ExternalOperatorRef" type="ExternalObjectRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>An alternative code that uniquely identifies the OPERATOR. Specifically for use in AVMS systems. For VDV compatibility.</xsd:documentation>
<xsd:documentation>An alternative code that uniquely identifies the OPERATOR. Specifically for use in AVMS systems. For VDV compatibility. DEPRECATED - use PrivateCode -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="lessor"/>
<xsd:enumeration value="dataRegistrar"/>
<xsd:enumeration value="other"/>
<!-- DEPRECATED Upper case now lowercase -->
<!-- DEPRECATED VALUES from v2.0 -->
<xsd:enumeration value="Planning"/>
<xsd:enumeration value="Operation"/>
<xsd:enumeration value="Control"/>
Expand Down
4 changes: 2 additions & 2 deletions xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -609,12 +609,12 @@ Rail transport, Roads and Road transport
</xsd:complexType>
<xsd:group name="TypeOfProductCategoryGroup">
<xsd:annotation>
<xsd:documentation>Elements for a TYPE OF PRODUCT CATEGORY.</xsd:documentation>
<xsd:documentation>Elements for a TYPE OF PRODUCT CATEGORY.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="ExternalProductCategoryRef" type="ExternalObjectRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>An alternative code that uniquely identifies the PRODUCT CATEGORY. Specifically for use in AVMS systems that require an alias, if code is different from main identifier. For VDV compatibility.</xsd:documentation>
<xsd:documentation>An alternative code that uniquely identifies the PRODUCT CATEGORY. Specifically for use in AVMS systems that require an alias, if code is different from main identifier. For VDV compatibility. DEPRECATED - use privateCodes -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Presentation" type="PresentationStructure" minOccurs="0">
Expand Down
8 changes: 4 additions & 4 deletions xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="ExternalLineRef" type="ExternalObjectRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>An alternative code that uniquely identifies the LINE specifically for use in AVMS systems. For VDV compatibility.</xsd:documentation>
<xsd:documentation>An alternative code that uniquely identifies the LINE specifically for use in AVMS systems. For VDV compatibility. DEPRECATED - use privateCodes -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down Expand Up @@ -473,7 +473,7 @@ Rail transport, Roads and Road transport
<xsd:element ref="TypeOfLineRef" minOccurs="0"/>
<xsd:element name="ExternalProductCategoryRef" type="ExternalObjectRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>An default product classification for all journeys of the lin e for use in AVMS systems. For VDV compatibility. +v1.1</xsd:documentation>
<xsd:documentation>An default product classification for all journeys of the lin e for use in AVMS systems. For VDV compatibility. +v1.1. DEPRECATED - use privateCodes -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="TypeOfProductCategoryRef" minOccurs="0"/>
Expand Down Expand Up @@ -976,12 +976,12 @@ Rail transport, Roads and Road transport
<xsd:element ref="DirectionRef" minOccurs="0"/>
<xsd:element name="ExternalLineRef" type="ExternalObjectRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Alternative LINE Reference for AVMS system.</xsd:documentation>
<xsd:documentation>Alternative LINE Reference for AVMS system. DEPRECATED - v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExternalDirectionRef" type="ExternalObjectRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Alternative DIRECTION Reference for AVMS system.</xsd:documentation>
<xsd:documentation>Alternative DIRECTION Reference for AVMS system. DEPRECATED -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:element name="ExternalDirectionRef" type="ExternalObjectRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>An alternative code that uniquely identifies the DIRECTION specifically for use in AVMS systems. For VDV compatibility.</xsd:documentation>
<xsd:documentation>An alternative code that uniquely identifies the DIRECTION specifically for use in AVMS systems. For VDV compatibility. DEPRECATED - use privateCodes. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="DirectionType" minOccurs="0"/>
Expand Down
4 changes: 2 additions & 2 deletions xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="ExternalStopPointRef" type="ExternalObjectRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>An alternative code that uniquely identifies the STOP POINT. pecifically for use in AVMS systems that require an alias, if. For VDV compatibility.</xsd:documentation>
<xsd:documentation>An alternative code that uniquely identifies the STOP POINT. pecifically for use in AVMS systems that require an alias, if. For VDV compatibility. DEPRECATED - use privateCodes. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down Expand Up @@ -555,7 +555,7 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:element name="ExternalConnectionLinkRef" type="ExternalObjectRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>An alternative code that uniquely identifies the CONNECTION link Specifically for use in AVMS systems that require an alias, if. For VDV compatibility.</xsd:documentation>
<xsd:documentation>An alternative code that uniquely identifies the CONNECTION link Specifically for use in AVMS systems that require an alias, if. For VDV compatibility. DEPRECATED - use privateCodes. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="From" type="ConnectionEndStructure" minOccurs="0">
Expand Down
6 changes: 3 additions & 3 deletions xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,12 +205,12 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element ref="UicOperatingPeriod" minOccurs="0">
<xsd:annotation>
<xsd:documentation>** DEPRECATED ** not to be used - left available only to avoid breaking compatibility with old rail datasets</xsd:documentation>
<xsd:documentation>** DEPRECATED ** not to be used - left available only to avoid breaking compatibility with old rail datasets -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExternalDatedVehicleJourneyRef" type="ExternalObjectRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>An alternative code that uniquely identifies theDATED VEHICLE JOURNEY. Specifically for use in AVMS systems. For VDV compatibility.</xsd:documentation>
<xsd:documentation>An alternative code that uniquely identifies theDATED VEHICLE JOURNEY. Specifically for use in AVMS systems. For VDV compatibility. DEPRECATED. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="DatedJourneyPatternRef" type="JourneyPatternRefStructure" minOccurs="0">
Expand All @@ -220,7 +220,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element ref="DriverRef" minOccurs="0">
<xsd:annotation>
<xsd:documentation>** DEPRECATED ** not to be used - It is expected that the driver's DUTY refer the DatedJourneyPattern, not the way arround !</xsd:documentation>
<xsd:documentation>** DEPRECATED ** not to be used - It is expected that the driver's DUTY refer the DatedJourneyPattern, not the way arround ! -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
Loading

0 comments on commit b7d1c90

Please sign in to comment.