Skip to content

Commit ba5aa42

Browse files
TuThoThaiTuThoThai
authored
Merge pull request #976 from NeTEx-CEN/fix_complex_ref
Undoing restriction attributes for some complex xxxRefStructure, fixing problems in the spp (XMLSpy project), fixing a missing include in two files for VehicleRef, fixes problem with WSDL generation
2 parents 904e903 + 06f94c2 commit ba5aa42

File tree

6 files changed

+12
-110
lines changed

6 files changed

+12
-110
lines changed

‎NeTEx.spp‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,6 @@
475475
<File FilePath="xsd\netex_part_3\part3_parkingTariff\netex_parkingTariff_version.xsd" HomeFolder="Yes"/>
476476
</Folder>
477477
<Folder FolderName="netex_part_3_PiQuery">
478-
<File FilePath="xsd\netex_part_3\part3_PiQuery\netex_all_objects_part3_piQuery.xsd" HomeFolder="Yes"/>
479478
<File FilePath="xsd\netex_part_3\part3_PiQuery\netex_piRequest_support.xsd" HomeFolder="Yes"/>
480479
</Folder>
481480
</Folder>
@@ -578,8 +577,6 @@
578577
<Folder FolderName="netex_part_5_NM_ND">
579578
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_mobilityServiceConstraintZone_support.xsd" HomeFolder="Yes"/>
580579
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_mobilityServiceConstraintZone_version.xsd" HomeFolder="Yes"/>
581-
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_ParkingCapacityAssignment_support.xsd" HomeFolder="Yes"/>
582-
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_ParkingCapacityAssignment_version.xsd" HomeFolder="Yes"/>
583580
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_vehicleMeetingPlace_support.xsd" HomeFolder="Yes"/>
584581
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_vehicleMeetingPlace_version.xsd" HomeFolder="Yes"/>
585582
<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_vehicleMeetingPoint_support.xsd" HomeFolder="Yes"/>
@@ -613,10 +610,6 @@
613610
<File FilePath="xsd\netex_part_5\part5_frames\netex_nm_mobilityJourneyFrame_version.xsd" HomeFolder="Yes"/>
614611
<File FilePath="xsd\netex_part_5\part5_frames\netex_nm_mobilityServiceFrame_version.xsd" HomeFolder="Yes"/>
615612
</Folder>
616-
<Folder FolderName="netec_part5_NM_OC">
617-
<File FilePath="xsd\netex_part_5\part5_oc\netex_oc_occupancy_support.xsd" HomeFolder="Yes"/>
618-
<File FilePath="xsd\netex_part_5\part5_oc\netex_oc_occupancy_version.xsd" HomeFolder="Yes"/>
619-
</Folder>
620613
<File FilePath="xsd\netex_part_5\netex_all_objects_part5_newModes.xsd" HomeFolder="Yes"/>
621614
</Folder>
622615
<Folder FolderName="netex_service">

‎xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,11 +307,11 @@ Rail transport, Roads and Road transport
307307
</xsd:element>
308308
<xsd:complexType name="AllOrganisationsRefStructure">
309309
<xsd:annotation>
310-
<xsd:documentation>Type for a reference tto all oranisationsORGANISATION.</xsd:documentation>
310+
<xsd:documentation>Type for a reference to all ORGANISATIONs.</xsd:documentation>
311311
</xsd:annotation>
312312
<xsd:simpleContent>
313313
<xsd:restriction base="VersionOfObjectRefStructure">
314-
<xsd:attribute name="ref" type="OrganisationIdType" use="required" fixed="All">
314+
<xsd:attribute name="ref" type="OrganisationIdType" use="required">
315315
<xsd:annotation>
316316
<xsd:documentation>Identifier of an ORGANISATION.</xsd:documentation>
317317
</xsd:annotation>

‎xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,13 +1383,7 @@ Rail transport, Roads and Road transport
13831383
</xsd:annotation>
13841384
<xsd:complexType>
13851385
<xsd:simpleContent>
1386-
<xsd:restriction base="AllCountriesRefStructure">
1387-
<xsd:attribute name="ref" type="TypeOfValueIdType" use="required">
1388-
<xsd:annotation>
1389-
<xsd:documentation>Iso 3166-1 Two Character country code.</xsd:documentation>
1390-
</xsd:annotation>
1391-
</xsd:attribute>
1392-
</xsd:restriction>
1386+
<xsd:restriction base="AllCountriesRefStructure"/>
13931387
</xsd:simpleContent>
13941388
</xsd:complexType>
13951389
</xsd:element>

‎xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd‎

Lines changed: 7 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
<Language>[ISO 639-2/B] ENG</Language>
3333
<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
3434
<Rights>Unclassified
35-
<Copyright>CEN, Crown Copyright 2009-2020</Copyright>
36-
</Rights>
35+
<Copyright>CEN, Crown Copyright 2009-2020</Copyright></Rights>
3736
<Source>
3837
<ul>
3938
<li>Derived from the SIRI standards.</li>
@@ -67,34 +66,7 @@ Rail transport, Roads and Road transport
6766
<xsd:documentation>Type for a reference to all TRANSPORT ORGANISATIONs.</xsd:documentation>
6867
</xsd:annotation>
6968
<xsd:simpleContent>
70-
<xsd:restriction base="AllOrganisationsRefStructure">
71-
<xsd:attribute name="nameOfRefClass" type="NameOfClass" use="optional">
72-
<xsd:annotation>
73-
<xsd:documentation>Name of Class of the referenced entity. Allows reflection. Fixed for each entity type.</xsd:documentation>
74-
</xsd:annotation>
75-
</xsd:attribute>
76-
<xsd:attribute name="modification" type="ModificationEnumeration" use="optional">
77-
<xsd:annotation>
78-
<xsd:documentation>Nature of last modification: new, revise, delete, unchanged.</xsd:documentation>
79-
</xsd:annotation>
80-
</xsd:attribute>
81-
<xsd:attribute name="ref" type="OrganisationIdType" use="required">
82-
<xsd:annotation>
83-
<xsd:documentation>Identifier of referenced entity.</xsd:documentation>
84-
</xsd:annotation>
85-
</xsd:attribute>
86-
<xsd:attribute name="versionRef" type="VersionIdType" use="optional">
87-
<xsd:annotation>
88-
<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>
89-
</xsd:annotation>
90-
</xsd:attribute>
91-
<xsd:attribute name="uri" type="xsd:anyURI" use="optional">
92-
<xsd:annotation>
93-
<xsd:documentation>Location of the external entity. +v2.0</xsd:documentation>
94-
</xsd:annotation>
95-
</xsd:attribute>
96-
<xsd:attributeGroup ref="ReferenceModificationDetailsGroup"/>
97-
</xsd:restriction>
69+
<xsd:extension base="AllOrganisationsRefStructure"/>
9870
</xsd:simpleContent>
9971
</xsd:complexType>
10072
<xsd:group name="OneOrAllTransportOrganisationsRefGroup">
@@ -176,34 +148,7 @@ Rail transport, Roads and Road transport
176148
<xsd:documentation>Type for a reference to all TRANSPORT ORGANISATIONs.</xsd:documentation>
177149
</xsd:annotation>
178150
<xsd:simpleContent>
179-
<xsd:restriction base="AllTransportOrganisationsRefStructure">
180-
<xsd:attribute name="nameOfRefClass" type="NameOfClass" use="optional">
181-
<xsd:annotation>
182-
<xsd:documentation>Name of Class of the referenced entity. Allows reflection. Fixed for each entity type.</xsd:documentation>
183-
</xsd:annotation>
184-
</xsd:attribute>
185-
<xsd:attribute name="modification" type="ModificationEnumeration" use="optional">
186-
<xsd:annotation>
187-
<xsd:documentation>Nature of last modification: new, revise, delete, unchanged.</xsd:documentation>
188-
</xsd:annotation>
189-
</xsd:attribute>
190-
<xsd:attribute name="ref" type="OrganisationIdType" use="required">
191-
<xsd:annotation>
192-
<xsd:documentation>Identifier of referenced entity.</xsd:documentation>
193-
</xsd:annotation>
194-
</xsd:attribute>
195-
<xsd:attribute name="versionRef" type="VersionIdType" use="optional">
196-
<xsd:annotation>
197-
<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>
198-
</xsd:annotation>
199-
</xsd:attribute>
200-
<xsd:attribute name="uri" type="xsd:anyURI" use="optional">
201-
<xsd:annotation>
202-
<xsd:documentation>Location of the external entity. +v2.0</xsd:documentation>
203-
</xsd:annotation>
204-
</xsd:attribute>
205-
<xsd:attributeGroup ref="ReferenceModificationDetailsGroup"/>
206-
</xsd:restriction>
151+
<xsd:extension base="AllTransportOrganisationsRefStructure"/>
207152
</xsd:simpleContent>
208153
</xsd:complexType>
209154
<xsd:simpleType name="OperatorIdType">
@@ -262,34 +207,7 @@ Rail transport, Roads and Road transport
262207
<xsd:documentation>Type for a reference to all OPERATORss.</xsd:documentation>
263208
</xsd:annotation>
264209
<xsd:simpleContent>
265-
<xsd:restriction base="AllAuthoritiesRefStructure">
266-
<xsd:attribute name="nameOfRefClass" type="NameOfClass" use="optional">
267-
<xsd:annotation>
268-
<xsd:documentation>Name of Class of the referenced entity. Allows reflection. Fixed for each entity type.</xsd:documentation>
269-
</xsd:annotation>
270-
</xsd:attribute>
271-
<xsd:attribute name="modification" type="ModificationEnumeration" use="optional">
272-
<xsd:annotation>
273-
<xsd:documentation>Nature of last modification: new, revise, delete, unchanged.</xsd:documentation>
274-
</xsd:annotation>
275-
</xsd:attribute>
276-
<xsd:attribute name="ref" type="OrganisationIdType" use="required">
277-
<xsd:annotation>
278-
<xsd:documentation>Identifier of referenced entity.</xsd:documentation>
279-
</xsd:annotation>
280-
</xsd:attribute>
281-
<xsd:attribute name="versionRef" type="VersionIdType" use="optional">
282-
<xsd:annotation>
283-
<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>
284-
</xsd:annotation>
285-
</xsd:attribute>
286-
<xsd:attribute name="uri" type="xsd:anyURI" use="optional">
287-
<xsd:annotation>
288-
<xsd:documentation>Location of the external entity. +v2.0</xsd:documentation>
289-
</xsd:annotation>
290-
</xsd:attribute>
291-
<xsd:attributeGroup ref="ReferenceModificationDetailsGroup"/>
292-
</xsd:restriction>
210+
<xsd:extension base="AllAuthoritiesRefStructure"/>
293211
</xsd:simpleContent>
294212
</xsd:complexType>
295213
<xsd:group name="OneOrAllOperatorsRefGroup">
@@ -315,7 +233,7 @@ Rail transport, Roads and Road transport
315233
<xsd:complexType>
316234
<xsd:simpleContent>
317235
<xsd:restriction base="AuthorityRefStructure">
318-
<xsd:attribute name="nameOfRefClass" type="NameOfClassAuthorityRefStructureType" default="Authority" use="optional">
236+
<xsd:attribute name="nameOfRefClass" type="NameOfClassAuthorityRefStructureType" use="optional" default="Authority">
319237
<xsd:annotation>
320238
<xsd:documentation>Name of Class of the referenced entity. Allows reflection. Fixed for each entity type.</xsd:documentation>
321239
</xsd:annotation>
@@ -401,11 +319,6 @@ Rail transport, Roads and Road transport
401319
<xsd:documentation>Nature of last modification: new, revise, delete, unchanged.</xsd:documentation>
402320
</xsd:annotation>
403321
</xsd:attribute>
404-
<xsd:attribute name="ref" type="OrganisationIdType" use="required">
405-
<xsd:annotation>
406-
<xsd:documentation>Identifier of referenced entity.</xsd:documentation>
407-
</xsd:annotation>
408-
</xsd:attribute>
409322
<xsd:attribute name="versionRef" type="VersionIdType" use="optional">
410323
<xsd:annotation>
411324
<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>
@@ -653,9 +566,9 @@ Rail transport, Roads and Road transport
653566
<xsd:documentation>Reference to a TRANSPORT ADMINISTRATIVE ZONE.</xsd:documentation>
654567
</xsd:annotation>
655568
<xsd:complexType>
656-
<xsd:complexContent>
569+
<xsd:simpleContent>
657570
<xsd:extension base="TransportAdministrativeZoneRefStructure"/>
658-
</xsd:complexContent>
571+
</xsd:simpleContent>
659572
</xsd:complexType>
660573
</xsd:element>
661574
<xsd:complexType name="TransportAdministrativeZoneRefStructure">

‎xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_version.xsd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<xsd:include schemaLocation="../part5_rc/netex_nm_mobilityService_support.xsd"/>
55
<xsd:include schemaLocation="../part5_nd/netex_nm_vehicleMeetingPlace_support.xsd"/>
66
<xsd:include schemaLocation="../../netex_part_3/part3_salesTransactions/netex_mediumApplication_support.xsd"/>
7+
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicle_support.xsd"/>
78
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd"/>
89
<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
910
<xsd:include schemaLocation="../../netex_part_3/part3_salesTransactions/netex_travelDocument_version.xsd"/>

‎xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_version.xsd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<xsd:include schemaLocation="netex_nm_individualTraveller_support.xsd"/>
44
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
55
<xsd:include schemaLocation="../../netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd"/>
6+
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicle_support.xsd"/>
67
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd"/>
78
<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
89
<!-- ======================================================================= -->

0 commit comments

Comments
 (0)