Skip to content

A few fixes #895

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
skinkie merged 2 commits into from
May 6, 2025
Merged

A few fixes #895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53df698
Various corrections
trurlurl May 4, 2025
cb27f79
Update xsd/netex_framework/netex_genericFramework/netex_zoneProjectio…
trurlurl May 4, 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
28 changes: 14 additions & 14 deletions xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,37 +89,37 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="Lang" type="xsd:language" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Language of the names.</xsd:documentation>
<xsd:documentation>Language of the ALTERNATIVE NAME.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="NameType" type="NameTypeEnumeration" default="alias" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Type of Name - fixed value. Default is Alias.</xsd:documentation>
<xsd:documentation>Type of Name - fixed value. Default is alias.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="TypeOfName" type="xsd:normalizedString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Type of Nam - open.</xsd:documentation>
<xsd:documentation>Type of Name - open value.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Name" type="MultilingualString">
<xsd:annotation>
<xsd:documentation>Name of the entity.</xsd:documentation>
<xsd:documentation>ALTERNATIVE NAME of the ENTITY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ShortName" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Short Name of the entity.</xsd:documentation>
<xsd:documentation>Short Name of the ENTITY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Abbreviation" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Abbreviation of the entity.</xsd:documentation>
<xsd:documentation>Abbreviation of the ENTITY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="QualifierName" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Additional Qualifier of the ENTITY name.</xsd:documentation>
<xsd:documentation>Additional Qualifier of the ENTITY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down Expand Up @@ -158,37 +158,37 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="Lang" type="xsd:language" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Language of the names.</xsd:documentation>
<xsd:documentation>Language of the ALTERNATIVE NAME.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="NameType" type="NameTypeEnumeration" default="alias" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Type of Name - fixed value. Default is Alias.</xsd:documentation>
<xsd:documentation>Type of Name - fixed value. Default is alias.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="TypeOfName" type="xsd:normalizedString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Type of Nam - open.</xsd:documentation>
<xsd:documentation>Type of Name - open value.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Name" type="MultilingualString">
<xsd:annotation>
<xsd:documentation>Name of the entity.</xsd:documentation>
<xsd:documentation>ALTERNATIVE NAME of the ENTITY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ShortName" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Short Name of the entity.</xsd:documentation>
<xsd:documentation>Short Name of the ENTITY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Abbreviation" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Abbreviation of the entity.</xsd:documentation>
<xsd:documentation>Abbreviation of the ENTITY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="QualifierName" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Additional Qualifier of the ENTITY name.</xsd:documentation>
<xsd:documentation>Additional Qualifier of the ENTITY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
22 changes: 13 additions & 9 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 @@ -387,22 +387,22 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:element name="Name" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Name of ORGANISATION PART.</xsd:documentation>
<xsd:documentation>NAME of ORGANISATION PART.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ShortName" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Name of DEPARTMENT.</xsd:documentation>
<xsd:documentation>SHORT NAME of ORGANISATION PART.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Description" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Description of ORGANISATIONAL UNIT.</xsd:documentation>
<xsd:documentation>Description of ORGANISATION PART.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="PublicCode" type="PublicCodeStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Additional public code used for department.</xsd:documentation>
<xsd:documentation>Additional public code used for ORGANISATION PART.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="PrivateCode" minOccurs="0">
Expand All @@ -412,12 +412,12 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="ContactDetails" type="ContactStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Contact details for ORGANISATION PART for Public use.</xsd:documentation>
<xsd:documentation>Contact details for ORGANISATION PART for public use.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Location" type="LocationStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Coordinates of ORGANISATIONAL UNIT.</xsd:documentation>
<xsd:documentation>Coordinates of ORGANISATION PART.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="OrganisationRef_" minOccurs="0"/>
Expand Down Expand Up @@ -490,7 +490,7 @@ Rail transport, Roads and Road transport
<xsd:element ref="TypeOfOperationRef" minOccurs="0"/>
<xsd:element name="units" type="organisationalUnitRefs_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Name of DEPARTMENT.</xsd:documentation>
<xsd:documentation>ORGANISATIONAL UNITs.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down Expand Up @@ -697,7 +697,7 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:element name="PublicCode" type="PublicCodeStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Public Code assosociated with Zone</xsd:documentation>
<xsd:documentation>Public Code assosociated with ADMINISTRATIVE ZONE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="OrganisationRef_" minOccurs="0"/>
Expand Down Expand Up @@ -814,7 +814,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Description of CODESPACE ASSIGNMENT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="TypeOfCodespaceAssignmentRef" minOccurs="0"/>
<xsd:element ref="TypeOfCodespaceAssignmentRef" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Reference to a TYPE OF CODESPACE ASSIGNMENT. +v1.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<xsd:group name="CodeRangeGroup">
Expand Down
6 changes: 3 additions & 3 deletions xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="Distance" type="LengthType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Distance along link to which point p[projects.</xsd:documentation>
<xsd:documentation>Distance along link to which point projects.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down Expand Up @@ -325,7 +325,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="Distance" type="DistanceType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Distance Travelled.</xsd:documentation>
<xsd:documentation>Length of line along LINKs in LINK SEQUENCE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:group ref="LinkSequenceProjectionGroup" minOccurs="0"/>
Expand Down Expand Up @@ -421,7 +421,7 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:element name="ProjectedFeartureRef" type="ComplexFeatureRefStructure">
<xsd:annotation>
<xsd:documentation>COMPLEX FEATURE which is being projetced.</xsd:documentation>
<xsd:documentation>COMPLEX FEATURE which is being projected.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="OntoFeatureRef" type="ComplexFeatureRefStructure" minOccurs="0">
Expand Down
4 changes: 2 additions & 2 deletions xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:element name="ProjectedZoneRef" type="ZoneRefStructure">
<xsd:annotation>
<xsd:documentation>Reference to ZONE to which ZONE projects.</xsd:documentation>
<xsd:documentation>Reference to ZONE being projected.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ProjectToZoneRef" type="ZoneRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Reference to ZONE onto to which ZONE projects.</xsd:documentation>
<xsd:documentation>Reference to ZONE onto which the ZONE projects.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ProjectToPointRef" type="PointRefStructure" minOccurs="0">
Expand Down
6 changes: 3 additions & 3 deletions xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,12 +225,12 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:element name="Name" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Explanation of RESPONSIBILITY ROLE.</xsd:documentation>
<xsd:documentation>Name of RESPONSIBILITY ROLE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Description" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Explanation of REsponsibility RoleSET.</xsd:documentation>
<xsd:documentation>Description of RESPONSIBILITY ROLE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="TypeOfResponsibilityRoleRef" minOccurs="0"/>
Expand Down Expand Up @@ -301,7 +301,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Responsible ORGANISATION PART.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ResponsibleAreaRef" type="VersionOfObjectRefStructure" minOccurs="0">
<xsd:element name="ResponsibleAreaRef" type="AdministrativeZoneRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Administrative area to which this RESPONSIBILITY SET is assigned.</xsd:documentation>
</xsd:annotation>
Expand Down
4 changes: 2 additions & 2 deletions xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Rail transport, Roads and Road transport
</xsd:complexContent>
</xsd:complexType>
<!-- ======================================================================= -->
<xsd:complexType name="typesOfValueStructure">
<xsd:complexType name="typesOfValue_RelStructure">
<xsd:annotation>
<xsd:documentation>Type for a list of TYPEs OF VALUE.</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -211,7 +211,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Name of Value.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="values" type="typesOfValueStructure" minOccurs="0">
<xsd:element name="values" type="typesOfValue_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Values in Set.</xsd:documentation>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Rail transport, Roads and Road transport
<xsd:element ref="CountryRef" minOccurs="0"/>
<xsd:element name="CountryName" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Name of Counntry, derivedable from Country Ref.</xsd:documentation>
<xsd:documentation>Name of Counntry, deriveable from CountryRef.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ Rail transport, Roads and Road transport
<xsd:sequence>
<xsd:element name="authorityTypes" type="typeOfOrganisationRefs_RelStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Classification of Zone. Used for arbitrary documentation -.</xsd:documentation>
<xsd:documentation>Classification of AUTHORITY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="RegistrationNumber" type="xsd:normalizedString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Licence plate of VEHICLE.</xsd:documentation>
<xsd:documentation>Registration number of VEHICLE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="RegistrationDate" type="xsd:date" minOccurs="0">
Expand Down
15 changes: 10 additions & 5 deletions xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,17 +610,22 @@ contained within its parent QUAY.</xsd:documentation>
</xsd:element>
<xsd:element name="Lang" type="xsd:language" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Language of the names.</xsd:documentation>
<xsd:documentation>Language of the ALTERNATIVE NAME.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="TypeOfName" type="xsd:normalizedString">
<xsd:element name="NameType" type="NameTypeEnumeration" default="alias" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Type of Name.</xsd:documentation>
<xsd:documentation>Type of Name - fixed value. Default is alias.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="TypeOfName" type="xsd:normalizedString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Type of Name - open value.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Name" type="MultilingualString">
<xsd:annotation>
<xsd:documentation>Name of the entity.</xsd:documentation>
<xsd:documentation>ALTERNATIVE NAME of the entity.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ShortName" type="MultilingualString" minOccurs="0">
Expand All @@ -635,7 +640,7 @@ contained within its parent QUAY.</xsd:documentation>
</xsd:element>
<xsd:element name="QualifierName" type="MultilingualString" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Additional Qualifier of the ENTITY name.</xsd:documentation>
<xsd:documentation>Additional Qualifier of the ENTITY.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down