Skip to content

Change organisation ref abstract #686

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
ue71603 merged 5 commits into from
Apr 15, 2024
Merged

Change organisation ref abstract #686

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
5f6e1eb
Make OrganisationRef abstract
skinkie Mar 19, 2024
6c32844
Organisation is abstract
skinkie Mar 19, 2024
1c0e586
Something hidden
skinkie Mar 19, 2024
2c6f4b8
Bring backwards compatibility
skinkie Mar 19, 2024
e9d3b81
Split because of older xmllint
skinkie Mar 19, 2024
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
2 changes: 1 addition & 1 deletion .github/scripts/validate-examples.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set -e

echo "Validating NeTEx XML examples ..."

if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/calendar/*xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then
if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml && xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/deprecation/*.xml examples/functions/calendar/*xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then
echo -e '\033[0;32mValidating NeTEx XML examples succeeded\033[0m'
else
echo -e '\033[0;31mValidating NeTEx XML examples failed\033[0m'
Expand Down
38 changes: 38 additions & 0 deletions examples/functions/deprecation/organisationref.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Deprecated OrganisationRef -->
<PublicationDelivery xmlns:acsb="http://www.ifopt.org.uk/acsb" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" xmlns="http://www.netex.org.uk/netex" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.01" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../xsd/NeTEx_publication.xsd">
<PublicationTimestamp>2015-04-17T09:30:47.0Z</PublicationTimestamp>
<ParticipantRef>AURIGE001</ParticipantRef>
<PublicationRefreshInterval>P1Y</PublicationRefreshInterval>
<Description>Keeps OrganisationRef</Description>
<dataObjects>
<GeneralFrame version="001" id="AURIGE:TypeOfFrame:NETEX_ARRET-Le-Corbusier:LOC">
<Name>Frame NETEX_ARRET Le Corbusier</Name>
<Description>Frame NETEX_ARRET pour l'exemple d'arrêt Le Corbusier</Description>
<members modificationSet="all">
<!-- =========================================== -->
<!-- POLE MONOMODAL Le Corbusier -->
<StopPlace version="001" id="FR:78197:StopPlace:00001:LOC">
<Name>Le Corbusier</Name>
<Description>Pôle monomodal regroupant les arrêts monomodaux Le Corbusier, Lycée de Villaroy et Jules Michelet</Description>
<Centroid>
<Location id="AURIGE:Location:00001:LOC">
<Longitude>2.068554</Longitude>
<Latitude>48.764788</Latitude>
</Location>
</Centroid>
<CrossRoad>Intersection Avenue de l'Europe, Rue Eugène Violet Le Duc et Rue Le Corbusier</CrossRoad>
<Landmark>Lycée Villaroy et Gymnase de l'Aviation</Landmark>
<OrganisationRef version="001" ref="AURIGE:Operator:768:LOC"/>
<TransportMode>bus</TransportMode>
<StopPlaceType>onstreetBus</StopPlaceType>
</StopPlace>
<Operator version="001" id="AURIGE:Operator:768:LOC">
<CompanyNumber>768</CompanyNumber>
<Name>SQYBUS</Name>
<OrganisationType>operator</OrganisationType>
</Operator>
</members>
</GeneralFrame>
</dataObjects>
</PublicationDelivery>
6 changes: 3 additions & 3 deletions ...les/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5753,7 +5753,7 @@ Changes
<TopographicPlaceRef version="001" ref="nptgLocality:E0034695"/>
</TopographicPlaceView>
<OperatingOrganisationView>
<OrganisationRef version="any" ref="tfl:TfL"/>
<AuthorityRef version="any" ref="tfl:TfL"/>
<Name>Transport for London</Name>
</OperatingOrganisationView>
<ParentSiteRef version="001" xsi:type="StopPlaceRefStructure" ref="naptStop:910GWIMBLDN"/>
Expand Down Expand Up @@ -6463,7 +6463,7 @@ Changes
<TopographicPlaceRef version="001" ref="nptgLocality:E0034695"/>
</TopographicPlaceView>
<OperatingOrganisationView>
<OrganisationRef version="any" ref="tfl:TfL"/>
<AuthorityRef version="any" ref="tfl:TfL"/>
<Name>Transport for London</Name>
</OperatingOrganisationView>
<ParentSiteRef version="001" xsi:type="StopPlaceRefStructure" ref="naptStop:490G00272P"/>
Expand Down Expand Up @@ -6599,7 +6599,7 @@ Changes
<TopographicPlaceRef version="001" ref="nptgLocality:E0034695"/>
</TopographicPlaceView>
<OperatingOrganisationView>
<OrganisationRef version="any" ref="tfl:TfL"/>
<AuthorityRef version="any" ref="tfl:TfL"/>
<Name>Transport for London</Name>
</OperatingOrganisationView>
<ParentSiteRef version="001" xsi:type="StopPlaceRefStructure" ref="naptStop:490G00272P"/>
Expand Down
6 changes: 3 additions & 3 deletions examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5854,7 +5854,7 @@ Changes
<TopographicPlaceRef version="001" ref="nptgLocality:E0034695"/>
</TopographicPlaceView>
<OperatingOrganisationView>
<OrganisationRef version="any" ref="tbd:Org_Tfl"/>
<AuthorityRef version="any" ref="tbd:Org_Tfl"/>
<Name>Transport for London</Name>
</OperatingOrganisationView>
<ParentSiteRef version="001" xsi:type="StopPlaceRefStructure" ref="naptStop:910GWIMBLDN"/>
Expand Down Expand Up @@ -6564,7 +6564,7 @@ Changes
<TopographicPlaceRef version="001" ref="nptgLocality:E0034695"/>
</TopographicPlaceView>
<OperatingOrganisationView>
<OrganisationRef version="any" ref="tbd:Org_Tfl"/>
<AuthorityRef version="any" ref="tbd:Org_Tfl"/>
<Name>Transport for London</Name>
</OperatingOrganisationView>
<ParentSiteRef version="001" xsi:type="StopPlaceRefStructure" ref="naptStop:490G00272P"/>
Expand Down Expand Up @@ -6700,7 +6700,7 @@ Changes
<TopographicPlaceRef version="001" ref="nptgLocality:E0034695"/>
</TopographicPlaceView>
<OperatingOrganisationView>
<OrganisationRef version="any" ref="tbd:Org_Tfl"/>
<AuthorityRef version="any" ref="tbd:Org_Tfl"/>
<Name>Transport for London</Name>
</OperatingOrganisationView>
<ParentSiteRef version="001" xsi:type="StopPlaceRefStructure" ref="naptStop:490G00272P"/>
Expand Down
6 changes: 3 additions & 3 deletions examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5840,7 +5840,7 @@ Changes
<TopographicPlaceRef version="001" ref="nptgLocality:E0034695"/>
</TopographicPlaceView>
<OperatingOrganisationView>
<OrganisationRef version="any" ref="nptg:Org_Tfl"/>
<AuthorityRef version="any" ref="nptg:Org_Tfl"/>
<Name>Transport for London</Name>
</OperatingOrganisationView>
<ParentSiteRef version="001" xsi:type="StopPlaceRefStructure" ref="naptStop:910GWIMBLDN"/>
Expand Down Expand Up @@ -6589,7 +6589,7 @@ Changes
<TopographicPlaceRef version="001" ref="nptgLocality:E0034695"/>
</TopographicPlaceView>
<OperatingOrganisationView>
<OrganisationRef version="any" ref="nptg:Org_Tfl"/>
<AuthorityRef version="any" ref="nptg:Org_Tfl"/>
<Name>Transport for London</Name>
</OperatingOrganisationView>
<ParentSiteRef version="001" xsi:type="StopPlaceRefStructure" ref="naptStop:490G00272P"/>
Expand Down Expand Up @@ -6725,7 +6725,7 @@ Changes
<TopographicPlaceRef version="001" ref="nptgLocality:E0034695"/>
</TopographicPlaceView>
<OperatingOrganisationView>
<OrganisationRef version="any" ref="nptg:Org_Tfl"/>
<AuthorityRef version="any" ref="nptg:Org_Tfl"/>
<Name>Transport for London</Name>
</OperatingOrganisationView>
<ParentSiteRef version="001" xsi:type="StopPlaceRefStructure" ref="naptStop:490G00272P"/>
Expand Down
4 changes: 2 additions & 2 deletions examples/functions/timetable/Netex_01.2_Bus_SimpleTimetable_WithTimings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,13 +739,13 @@ The Calendar is shown coded as
<ServiceJourney version="any" id="hde:sj_24o_01">
<journeyAccountings>
<JourneyAccounting version="any" id="mytim:ac02" order="1">
<OrganisationRef xsi:type="AuthorityRefStructure" ref="txc:xshire">EXTERNAL</OrganisationRef>
<AuthorityRef versionRef="EXTERNAL" ref="txc:xshire"/>
<AccountingType>subsidy</AccountingType>
<Partial>false</Partial>
<Distance>20</Distance>
</JourneyAccounting>
<JourneyAccounting version="any" id="mytim:ac03" order="2">
<OrganisationRef xsi:type="AuthorityRefStructure" ref="txc:xshire">EXTERNAL</OrganisationRef>
<AuthorityRef versionRef="EXTERNAL" ref="txc:xshire"/>
<AccountingType>contract</AccountingType>
<Partial>false</Partial>
<Distance>20</Distance>
Expand Down
4 changes: 2 additions & 2 deletions examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,13 +588,13 @@ The Calendar is shown coded as
<ServiceJourney version="any" id="hde:sj_24o@01">
<journeyAccountings>
<JourneyAccounting version="any" id="mytim:sj_24o@01_01" order="1">
<OrganisationRef xsi:type="AuthorityRefStructure" ref="txc:xshire">EXTERNAL</OrganisationRef>
<AuthorityRef versionRef="EXTERNAL" ref="txc:xshire"/>
<AccountingType>subsidy</AccountingType>
<Partial>false</Partial>
<Distance>20</Distance>
</JourneyAccounting>
<JourneyAccounting version="any" id="mytim:sj_24o@01_02" order="2">
<OrganisationRef xsi:type="AuthorityRefStructure" ref="txc:xshire">EXTERNAL</OrganisationRef>
<AuthorityRef versionRef="EXTERNAL" ref="txc:xshire"/>
<AccountingType>contract</AccountingType>
<Partial>false</Partial>
<Distance>20</Distance>
Expand Down
4 changes: 2 additions & 2 deletions examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ Q.4. Public holiday - Services do not run on a christams day -
</languages>
</Locale>
<OperatingOrganisationView>
<OrganisationRef version="any" ref="noc:nr001"/>
<GeneralOrganisationRef version="any" ref="noc:nr001"/>
<Name>Network Rail</Name>
</OperatingOrganisationView>
<levels>
Expand Down Expand Up @@ -1208,7 +1208,7 @@ Q.4. Public holiday - Services do not run on a christams day -
<TimeZone>GMT</TimeZone>
</Locale>
<OperatingOrganisationView>
<OrganisationRef version="any" ref="noc:nr001"/>
<GeneralOrganisationRef version="any" ref="noc:nr001"/>
<Name>Network Rail</Name>
</OperatingOrganisationView>
<levels>
Expand Down
2 changes: 1 addition & 1 deletion examples/standards/neptune/Le Corbusier - SQYBUS-NeTEx-Profil Arret - External Quays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ Pour NETEX_COMMUN les classes présentes sont
</RoadAddress>
<Landmark>Face à l'école maternelle Jeanne Moreau</Landmark>
<TopographicPlaceRef ref="INSEE:TopographicPlace:78297"/>
<OrganisationRef version="001" ref="AURIGE:Operator:768:LOC"/>
<OperatorRef version="001" ref="AURIGE:Operator:768:LOC"/>
<!-- Fait partie du Pôle Monomodal Le Corbusier -->
<ParentSiteRef version="001" ref="FR:78197:StopPlace:00001:LOC"/>
<TransportMode>bus</TransportMode>
Expand Down
8 changes: 4 additions & 4 deletions examples/standards/neptune/Le Corbusier - SQYBUS-NeTEx-Profil Arret.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ Pour NETEX_COMMUN les classes présentes sont
<CrossRoad>Intersection Avenue de l'Europe, Rue Eugène Violet Le Duc et Rue Le Corbusier</CrossRoad>
<Landmark>Lycée Villaroy et Gymnase de l'Aviation</Landmark>
<TopographicPlaceRef ref="INSEE:TopographicPlace:78297"/>
<OrganisationRef version="001" ref="AURIGE:Operator:768:LOC"/>
<OperatorRef version="001" ref="AURIGE:Operator:768:LOC"/>
<TransportMode>bus</TransportMode>
<tariffZones>
<TariffZoneRef ref="AURIGE:TariffZone:4:LOC"/>
Expand Down Expand Up @@ -205,7 +205,7 @@ Pour NETEX_COMMUN les classes présentes sont
</RoadAddress>
<Landmark>Gymnase de l'Aviation</Landmark>
<TopographicPlaceRef ref="INSEE:TopographicPlace:78297"/>
<OrganisationRef version="001" ref="AURIGE:Operator:768:LOC"/>
<OperatorRef version="001" ref="AURIGE:Operator:768:LOC"/>
<ParentSiteRef version="001" ref="FR:78197:StopPlace:00001:LOC"/>
<!-- Fait partie du Pôle Monomodal Le Corbusier -->
<TransportMode>bus</TransportMode>
Expand Down Expand Up @@ -287,7 +287,7 @@ Pour NETEX_COMMUN les classes présentes sont
</RoadAddress>
<Landmark>Entre le Gymnase de l'Aviation et le Lycèe Villaroy</Landmark>
<TopographicPlaceRef ref="INSEE:TopographicPlace:78297"/>
<OrganisationRef version="001" ref="AURIGE:Operator:768:LOC"/>
<OperatorRef version="001" ref="AURIGE:Operator:768:LOC"/>
<!-- Fait partie du Pôle Monomodal Le Corbusier -->
<ParentSiteRef version="001" ref="FR:78197:StopPlace:00001:LOC"/>
<TransportMode>bus</TransportMode>
Expand Down Expand Up @@ -387,7 +387,7 @@ Pour NETEX_COMMUN les classes présentes sont
</RoadAddress>
<Landmark>Face à l'école maternelle Jeanne Moreau</Landmark>
<TopographicPlaceRef ref="INSEE:TopographicPlace:78297"/>
<OrganisationRef version="001" ref="AURIGE:Operator:768:LOC"/>
<OperatorRef version="001" ref="AURIGE:Operator:768:LOC"/>
<!-- Fait partie du Pôle Monomodal Le Corbusier -->
<ParentSiteRef version="001" ref="FR:78197:StopPlace:00001:LOC"/>
<TransportMode>bus</TransportMode>
Expand Down
2 changes: 1 addition & 1 deletion examples/standards/norway/stops/OsloS_station_example.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
</placeTypes>
<Covered>outdoors</Covered>
<Gated>openArea</Gated>
<OrganisationRef ref="org:auth:ruter"/>
<AuthorityRef ref="org:auth:ruter"/>
<TransportMode>bus</TransportMode>
<OtherTransportModes>tram</OtherTransportModes>
<tariffZones>
Expand Down
2 changes: 1 addition & 1 deletion examples/standards/norway/stops/submodel-StationWithEquipment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ This example contains a autogenerated example of a station with two levels, an a
<CrossRoad>y</CrossRoad>
<Landmark>a</Landmark>
<OperatingOrganisationView>
<OrganisationRef ref="or:nsb"/>
<OperatorRef ref="or:nsb"/>
<Name>Norges Statsbaner</Name>
<LegalName>NSB AS</LegalName>
<ContactDetails>
Expand Down
2 changes: 1 addition & 1 deletion xsd/NX.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
<xsd:complexType>
<xsd:sequence>
<xsd:element ref="Organisation_" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="OrganisationRef"/>
<xsd:element ref="OrganisationRef_"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
Expand Down
11 changes: 0 additions & 11 deletions xsd/NeTEx_publication_timetable.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1285,17 +1285,6 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:key>
<!-- =====Organisation============================== -->
Comment thread
ue71603 marked this conversation as resolved.
<xsd:keyref name="Organisation_AnyKeyRef" refer="netex:Organisation_AnyVersionedKey">
<xsd:selector xpath=".//netex:OrganisationRef | .//netex:ResponsibleOrganisationRef | .//netex:ProvidedByRef"/>
<xsd:field xpath="@ref"/>
<xsd:field xpath="@version"/>
</xsd:keyref>
<xsd:key name="Organisation_AnyVersionedKey">
<xsd:selector xpath=".//netex:GeneralOrganisation | .//netex:Authority | .//netex:Operator | .//netex:ServicedOrganisation | .//netex:TravelAgent | .//netex:ManagementAgent | .//netex:RetailConsortium"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:key>
<!-- =====OrganisationPart============================== -->
<!-- =====OrganisationPart unique========================== -->
<xsd:unique name="OrganisationPart_UniqueBy_Id_Version">
Expand Down
8 changes: 4 additions & 4 deletions xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Coordinates of ORGANISATIONAL UNIT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="OrganisationRef" minOccurs="0"/>
<xsd:element ref="OrganisationRef_" minOccurs="0"/>
<xsd:element ref="TypeOfOrganisationPartRef" minOccurs="0"/>
<xsd:element name="administrativeZones" type="administrativeZones_RelStructure" minOccurs="0">
<xsd:annotation>
Expand Down Expand Up @@ -604,7 +604,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Description of the nature pf the Relationship.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="OrganisationRef" minOccurs="0"/>
<xsd:element ref="OrganisationRef_" minOccurs="0"/>
<xsd:element name="OrganisationRoleType" type="OrganisationRoleEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Role of the related Organbisation</xsd:documentation>
Expand Down Expand Up @@ -686,7 +686,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Public Code assosociated with Zone</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="OrganisationRef" minOccurs="0"/>
<xsd:element ref="OrganisationRef_" minOccurs="0"/>
<xsd:element name="responsibilities" type="responsibilitySets_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>RESPONSIBILITY SETs allocated to ADMINISTRATIVE ZONE.</xsd:documentation>
Expand Down Expand Up @@ -988,7 +988,7 @@ Rail transport, Roads and Road transport
<xsd:complexContent>
<xsd:extension base="DerivedViewStructure">
<xsd:sequence>
<xsd:element ref="OrganisationRef" minOccurs="0"/>
<xsd:element ref="OrganisationRef_" minOccurs="0"/>
<xsd:group ref="OrganisationNameGroup"/>
<xsd:element name="ContactDetails" type="ContactStructure" minOccurs="0">
<xsd:annotation>
Expand Down
11 changes: 8 additions & 3 deletions xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ Rail transport, Roads and Road transport
<xsd:complexContent>
<xsd:extension base="oneToManyRelationshipStructure">
<xsd:sequence>
<xsd:element ref="OrganisationRef" maxOccurs="unbounded"/>
<xsd:element ref="OrganisationRef_" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
Expand All @@ -180,11 +180,16 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:restriction base="ObjectIdType"/>
</xsd:simpleType>
<xsd:element name="OrganisationRef" type="OrganisationRefStructure" substitutionGroup="VersionOfObjectRef">
<xsd:element name="OrganisationRef_" type="OrganisationRefStructure" abstract="true" substitutionGroup="VersionOfObjectRef">
<xsd:annotation>
<xsd:documentation>Reference to an ORGANISATION.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="OrganisationRef" type="OrganisationRefStructure" substitutionGroup="OrganisationRef_">
<xsd:annotation>
<xsd:documentation>DEPRECATED reference to any ORGANISATION meeting the substitutiongroup. -v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="OrganisationRefStructure">
<xsd:annotation>
<xsd:documentation>Type for a reference to an ORGANISATION.</xsd:documentation>
Expand Down Expand Up @@ -218,7 +223,7 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:choice>
<xsd:element ref="AllOrganisationsRef"/>
<xsd:element ref="OrganisationRef"/>
<xsd:element ref="OrganisationRef_"/>
</xsd:choice>
</xsd:group>
<!-- ======================================================================= -->
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:restriction base="OrganisationIdType"/>
</xsd:simpleType>
<xsd:element name="OtherOrganisationRef" type="OtherOrganisationRefStructure" substitutionGroup="OrganisationRef">
<xsd:element name="OtherOrganisationRef" type="OtherOrganisationRefStructure" substitutionGroup="OrganisationRef_">
<xsd:annotation>
<xsd:documentation>Reference to an OTHER ORGANISATION.</xsd:documentation>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ Rail transport, Roads and Road transport
</xsd:annotation>
</xsd:element>
<xsd:element ref="TypeOfSecurityListRef" minOccurs="0"/>
<xsd:element ref="OrganisationRef" minOccurs="0"/>
<xsd:element ref="OrganisationRef_" minOccurs="0"/>
<xsd:element name="securityListings" type="securityListings_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Items in SECURITY LIST.</xsd:documentation>
Expand Down
Loading