Skip to content

Undoing restriction attributes for some complex xxxRefStructure, fixing problems in the spp,fixing a missing include in two files for VehicleRef, fixes problem with WSDL generation #976

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
TuThoThai merged 13 commits into from
Nov 12, 2025
Merged

Undoing restriction attributes for some complex xxxRefStructure, fixing problems in the spp,fixing a missing include in two files for VehicleRef, fixes problem with WSDL generation #976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7159ec9
AllCountriesRef restriction
TuThoThai Oct 23, 2025
aeaf130
Undo restrictions for xxxRefStructure
TuThoThai Oct 23, 2025
213c50e
fixed="All" needed for one more example
ue71603 Oct 24, 2025
6d076b7
fixing problem with VehicleRef
ue71603 Oct 24, 2025
e5ae91d
fixing files that were not removed from project
ue71603 Oct 24, 2025
58a9b51
Update netex_transportOrganisation_support.xsd
ue71603 Oct 24, 2025
ac6be78
Lint and update documentation tables
github-actions[bot] Oct 24, 2025
e0ac59e
align the way it is done to the other files fo rref="VehicleRef"
ue71603 Oct 24, 2025
ea0523b
Merge branch 'fix_complex_ref' of https://github.com/NeTEx-CEN/NeTEx …
ue71603 Oct 24, 2025
ce9990b
Apply suggestion from @skinkie
skinkie Oct 25, 2025
5e123ee
making Stefan happy
ue71603 Oct 25, 2025
9a793ce
Update netex_transportOrganisation_support.xsd
ue71603 Oct 27, 2025
06f94c2
Lint and update documentation tables
github-actions[bot] Oct 27, 2025
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
7 changes: 0 additions & 7 deletions NeTEx.spp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,6 @@
<File FilePath="xsd\netex_part_3\part3_parkingTariff\netex_parkingTariff_version.xsd" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="netex_part_3_PiQuery">
<File FilePath="xsd\netex_part_3\part3_PiQuery\netex_all_objects_part3_piQuery.xsd" HomeFolder="Yes"/>
Comment thread
ue71603 marked this conversation as resolved.
<File FilePath="xsd\netex_part_3\part3_PiQuery\netex_piRequest_support.xsd" HomeFolder="Yes"/>
</Folder>
</Folder>
Expand Down Expand Up @@ -578,8 +577,6 @@
<Folder FolderName="netex_part_5_NM_ND">
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_mobilityServiceConstraintZone_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_mobilityServiceConstraintZone_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_ParkingCapacityAssignment_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_ParkingCapacityAssignment_version.xsd" HomeFolder="Yes"/>
Comment thread
ue71603 marked this conversation as resolved.
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_vehicleMeetingPlace_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_vehicleMeetingPlace_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_vehicleMeetingPoint_support.xsd" HomeFolder="Yes"/>
Expand Down Expand Up @@ -613,10 +610,6 @@
<File FilePath="xsd\netex_part_5\part5_frames\netex_nm_mobilityJourneyFrame_version.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_frames\netex_nm_mobilityServiceFrame_version.xsd" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="netec_part5_NM_OC">
<File FilePath="xsd\netex_part_5\part5_oc\netex_oc_occupancy_support.xsd" HomeFolder="Yes"/>
<File FilePath="xsd\netex_part_5\part5_oc\netex_oc_occupancy_version.xsd" HomeFolder="Yes"/>
</Folder>
Comment thread
ue71603 marked this conversation as resolved.
<File FilePath="xsd\netex_part_5\netex_all_objects_part5_newModes.xsd" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="netex_service">
Expand Down
4 changes: 2 additions & 2 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 @@ -307,11 +307,11 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:complexType name="AllOrganisationsRefStructure">
<xsd:annotation>
<xsd:documentation>Type for a reference tto all oranisationsORGANISATION.</xsd:documentation>
<xsd:documentation>Type for a reference to all ORGANISATIONs.</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="VersionOfObjectRefStructure">
<xsd:attribute name="ref" type="OrganisationIdType" use="required" fixed="All">
<xsd:attribute name="ref" type="OrganisationIdType" use="required">
<xsd:annotation>
<xsd:documentation>Identifier of an ORGANISATION.</xsd:documentation>
</xsd:annotation>
Expand Down
8 changes: 1 addition & 7 deletions xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1383,13 +1383,7 @@ Rail transport, Roads and Road transport
</xsd:annotation>
<xsd:complexType>
<xsd:simpleContent>
<xsd:restriction base="AllCountriesRefStructure">
<xsd:attribute name="ref" type="TypeOfValueIdType" use="required">
<xsd:annotation>
<xsd:documentation>Iso 3166-1 Two Character country code.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:restriction>
<xsd:restriction base="AllCountriesRefStructure"/>
</xsd:simpleContent>
</xsd:complexType>
</xsd:element>
Expand Down
101 changes: 7 additions & 94 deletions xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,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>
</Rights>
<Copyright>CEN, Crown Copyright 2009-2020</Copyright></Rights>
<Source>
<ul>
<li>Derived from the SIRI standards.</li>
Expand Down Expand Up @@ -67,34 +66,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Type for a reference to all TRANSPORT ORGANISATIONs.</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="AllOrganisationsRefStructure">
<xsd:attribute name="nameOfRefClass" type="NameOfClass" use="optional">
<xsd:annotation>
<xsd:documentation>Name of Class of the referenced entity. Allows reflection. Fixed for each entity type.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="modification" type="ModificationEnumeration" use="optional">
<xsd:annotation>
<xsd:documentation>Nature of last modification: new, revise, delete, unchanged.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="ref" type="OrganisationIdType" use="required">
<xsd:annotation>
<xsd:documentation>Identifier of referenced entity.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="versionRef" type="VersionIdType" use="optional">
<xsd:annotation>
<xsd:documentation>Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="uri" type="xsd:anyURI" use="optional">
<xsd:annotation>
<xsd:documentation>Location of the external entity. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attributeGroup ref="ReferenceModificationDetailsGroup"/>
</xsd:restriction>
<xsd:extension base="AllOrganisationsRefStructure"/>
</xsd:simpleContent>
</xsd:complexType>
<xsd:group name="OneOrAllTransportOrganisationsRefGroup">
Expand Down Expand Up @@ -176,34 +148,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Type for a reference to all TRANSPORT ORGANISATIONs.</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="AllTransportOrganisationsRefStructure">
<xsd:attribute name="nameOfRefClass" type="NameOfClass" use="optional">
<xsd:annotation>
<xsd:documentation>Name of Class of the referenced entity. Allows reflection. Fixed for each entity type.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="modification" type="ModificationEnumeration" use="optional">
<xsd:annotation>
<xsd:documentation>Nature of last modification: new, revise, delete, unchanged.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="ref" type="OrganisationIdType" use="required">
<xsd:annotation>
<xsd:documentation>Identifier of referenced entity.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="versionRef" type="VersionIdType" use="optional">
<xsd:annotation>
<xsd:documentation>Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="uri" type="xsd:anyURI" use="optional">
<xsd:annotation>
<xsd:documentation>Location of the external entity. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attributeGroup ref="ReferenceModificationDetailsGroup"/>
</xsd:restriction>
<xsd:extension base="AllTransportOrganisationsRefStructure"/>
</xsd:simpleContent>
</xsd:complexType>
<xsd:simpleType name="OperatorIdType">
Expand Down Expand Up @@ -262,34 +207,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Type for a reference to all OPERATORss.</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="AllAuthoritiesRefStructure">
<xsd:attribute name="nameOfRefClass" type="NameOfClass" use="optional">
<xsd:annotation>
<xsd:documentation>Name of Class of the referenced entity. Allows reflection. Fixed for each entity type.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="modification" type="ModificationEnumeration" use="optional">
<xsd:annotation>
<xsd:documentation>Nature of last modification: new, revise, delete, unchanged.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="ref" type="OrganisationIdType" use="required">
<xsd:annotation>
<xsd:documentation>Identifier of referenced entity.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="versionRef" type="VersionIdType" use="optional">
<xsd:annotation>
<xsd:documentation>Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="uri" type="xsd:anyURI" use="optional">
<xsd:annotation>
<xsd:documentation>Location of the external entity. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attributeGroup ref="ReferenceModificationDetailsGroup"/>
</xsd:restriction>
<xsd:extension base="AllAuthoritiesRefStructure"/>
</xsd:simpleContent>
</xsd:complexType>
<xsd:group name="OneOrAllOperatorsRefGroup">
Expand All @@ -315,7 +233,7 @@ Rail transport, Roads and Road transport
<xsd:complexType>
<xsd:simpleContent>
<xsd:restriction base="AuthorityRefStructure">
<xsd:attribute name="nameOfRefClass" type="NameOfClassAuthorityRefStructureType" default="Authority" use="optional">
<xsd:attribute name="nameOfRefClass" type="NameOfClassAuthorityRefStructureType" use="optional" default="Authority">
<xsd:annotation>
<xsd:documentation>Name of Class of the referenced entity. Allows reflection. Fixed for each entity type.</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -401,11 +319,6 @@ Rail transport, Roads and Road transport
<xsd:documentation>Nature of last modification: new, revise, delete, unchanged.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="ref" type="OrganisationIdType" use="required">
<xsd:annotation>
<xsd:documentation>Identifier of referenced entity.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="versionRef" type="VersionIdType" use="optional">
<xsd:annotation>
<xsd:documentation>Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version</xsd:documentation>
Expand Down Expand Up @@ -653,9 +566,9 @@ Rail transport, Roads and Road transport
<xsd:documentation>Reference to a TRANSPORT ADMINISTRATIVE ZONE.</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:simpleContent>
<xsd:extension base="TransportAdministrativeZoneRefStructure"/>
</xsd:complexContent>
</xsd:simpleContent>
</xsd:complexType>
</xsd:element>
<xsd:complexType name="TransportAdministrativeZoneRefStructure">
Expand Down
1 change: 1 addition & 0 deletions xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<xsd:include schemaLocation="../part5_rc/netex_nm_mobilityService_support.xsd"/>
<xsd:include schemaLocation="../part5_nd/netex_nm_vehicleMeetingPlace_support.xsd"/>
<xsd:include schemaLocation="../../netex_part_3/part3_salesTransactions/netex_mediumApplication_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicle_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
<xsd:include schemaLocation="../../netex_part_3/part3_salesTransactions/netex_travelDocument_version.xsd"/>
Expand Down
1 change: 1 addition & 0 deletions xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<xsd:include schemaLocation="netex_nm_individualTraveller_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
<xsd:include schemaLocation="../../netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicle_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
<!-- ======================================================================= -->
Expand Down