Skip to content

Comment NL27 #58

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

Closed
Aurige wants to merge 4 commits into from
Closed

Comment NL27 #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
222eb63
Merge pull request #1 from NeTEx-CEN/master
Aurige Feb 20, 2019
5cbfb69
Comment-NL27
Aurige Mar 1, 2019
270417c
Merge branch 'master' into Comment-NL27
skinkie May 5, 2021
6de12ab
Remove extra whitespace
skinkie May 5, 2021
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
77 changes: 77 additions & 0 deletions xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,4 +381,81 @@ Rail transport, Roads and Road transport
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
<!-- ======================================================================= -->
<xsd:simpleType name="TypeOfServiceIdType">
Copy link
Copy Markdown
Contributor

@ue71603 ue71603 Apr 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first 4 elements are all defined in netex_serviceRestrictions_support.xsd => don't do those here.

<xsd:annotation>
<xsd:documentation>Type for identifier of a TYPE OF SERVICE.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="TypeOfValueIdType"/>
</xsd:simpleType>
<xsd:element name="TypeOfServiceRef" type="TypeOfServiceRefStructure" abstract="false" substitutionGroup="TypeOfEntityRef">
<xsd:annotation>
<xsd:documentation>Reference to a TYPE OF SERVICE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="TypeOfServiceRefStructure">
<xsd:annotation>
<xsd:documentation>Type for a reference to a TYPE OF SERVICE.</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="TypeOfValueRefStructure">
<xsd:attribute name="ref" type="TypeOfServiceIdType" use="required">
<xsd:annotation>
<xsd:documentation>Reference to a TYPE OF SERVICE.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
<xsd:complexType name="typeOfServiceRefs_RelStructure">
<xsd:annotation>
<xsd:documentation>Type for a list of TYPEs OF SERVICE.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="oneToManyRelationshipStructure">
<xsd:sequence>
<xsd:element ref="TypeOfServiceRef" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<!-- ======================================================================= -->
<xsd:simpleType name="TypeOfProductCategoryIdType">
Copy link
Copy Markdown
Contributor

@ue71603 ue71603 Apr 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those are also all in netex_serviceRestrictions_support.xsd. First file already integrated in master.

Copy link
Copy Markdown
Contributor

@ue71603 ue71603 Apr 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those are also all in netex_serviceRestrictions_support.xsd. First file already integrated in master.

<xsd:annotation>
<xsd:documentation>Type for identifier of a TYPE OF PRODUCT CATEGORY.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="TypeOfValueIdType"/>
</xsd:simpleType>
<xsd:element name="TypeOfProductCategoryRef" type="TypeOfProductCategoryRefStructure" abstract="false" substitutionGroup="TypeOfValueRef">
<xsd:annotation>
<xsd:documentation>Reference to a TYPE OF PRODUCT CATEGORY. Product of a LINE or JOURNEY. e.g. ICS, Thales etc
See ERA B.4 7037 Characteristic description code.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:complexType name="TypeOfProductCategoryRefStructure">
<xsd:annotation>
<xsd:documentation>Type for a reference to a TYPE OF PRODUCT CATEGORY.</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="TypeOfValueRefStructure">
<xsd:attribute name="ref" type="TypeOfProductCategoryIdType" use="required">
<xsd:annotation>
<xsd:documentation>Reference to a TYPE OF PRODUCT CATEGORY.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
<xsd:complexType name="typeOfProductCategoryRefs_RelStructure">
<xsd:annotation>
<xsd:documentation>Type for a list of TYPEs OF PRODUCT CATEGORY.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="oneToManyRelationshipStructure">
<xsd:sequence>
<xsd:element ref="TypeOfProductCategoryRef" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:schema>
104 changes: 104 additions & 0 deletions xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>DESTINATION DISPLAYs in frame.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="typesOfServices" type="typesOfServiceInFrame_RelStructure" minOccurs="0">
Copy link
Copy Markdown
Contributor

@ue71603 ue71603 Apr 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part is not found.... If needed it stands. @Aurige

Copy link
Copy Markdown
Contributor

@ue71603 ue71603 Apr 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part is not found.... If needed it stands. @Aurige

<xsd:annotation>
<xsd:documentation>TYPE OF SERVICEs in frame.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<xsd:complexType name="groupsOfLinesInFrame_RelStructure">
Expand Down Expand Up @@ -181,6 +186,18 @@ Rail transport, Roads and Road transport
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<xsd:complexType name="typesOfServiceInFrame_RelStructure">
Copy link
Copy Markdown
Contributor

@ue71603 ue71603 Apr 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in netex_serviceRestrictions_version

<xsd:annotation>
<xsd:documentation>Type for containment in frame of TYPE OF SERVICE.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="containmentAggregationStructure">
<xsd:sequence>
<xsd:element ref="TypeOfService" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<!-- ==GROUP OF LINES============================================================ -->
<xsd:element name="GroupOfLines" abstract="false" substitutionGroup="GroupOfEntities">
<xsd:annotation>
Expand Down Expand Up @@ -428,6 +445,8 @@ Rail transport, Roads and Road transport
<xsd:documentation>Additional transport MODEs for LINE.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="TypeOfProductCategoryRef" minOccurs="0"/>
Copy link
Copy Markdown
Contributor

@ue71603 ue71603 Apr 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part is also not in master currently.

<xsd:element ref="TypeOfServiceRef" minOccurs="0"/>
<xsd:element ref="OperationalContextRef" minOccurs="0"/>
<xsd:group ref="LineClassificationGroup">
<xsd:annotation>
Expand Down Expand Up @@ -1130,4 +1149,89 @@ Rail transport, Roads and Road transport
</xsd:complexContent>
</xsd:complexType>
<!-- ======================================================================= -->
<xsd:element name="TypeOfProductCategory" abstract="false" substitutionGroup="TypeOfValue">
Copy link
Copy Markdown
Contributor

@ue71603 ue71603 Apr 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TypeOfProductCategory already in master in netex_serviceRestrictions_version.xd

Copy link
Copy Markdown
Contributor

@ue71603 ue71603 Apr 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TypeOfProductCategory already in master in netex_serviceRestrictions_version.xd

<xsd:annotation>
<xsd:documentation>Classification of a PRODUCT CATEGORY.</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:restriction base="TypeOfProductCategoryStructure">
<xsd:sequence>
<xsd:sequence>
<xsd:group ref="DataManagedObjectGroup"/>
</xsd:sequence>
<xsd:sequence>
<xsd:group ref="TypeOfValueGroup"/>
</xsd:sequence>
<xsd:sequence>
<xsd:group ref="TypeOfProductCategoryGroup"/>
</xsd:sequence>
</xsd:sequence>
<xsd:attribute name="id" type="TypeOfProductCategoryIdType">
<xsd:annotation>
<xsd:documentation>Reference to a TYPE OF PRODUCT CATEGORY.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:restriction>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:complexType name="TypeOfProductCategoryStructure" abstract="false">
<xsd:annotation>
<xsd:documentation>Type for a TYPE OF PRODUCT CATEGORY.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="TypeOfEntity_VersionStructure">
<xsd:sequence>
<xsd:group ref="TypeOfProductCategoryGroup"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<xsd:group name="TypeOfProductCategoryGroup">
<xsd:annotation>
<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:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<!-- ======================================================================= -->
<xsd:element name="TypeOfService" abstract="false" substitutionGroup="TypeOfEntity">
<xsd:annotation>
<xsd:documentation>Classification of a Service.</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:restriction base="TypeOfServiceStructure">
<xsd:sequence>
<xsd:sequence>
Copy link
Copy Markdown
Contributor

@ue71603 ue71603 Apr 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TypeOfService is in master in netex_serviceRestrictions_version and even with more content:
At this place the version here is missing:
xsd:sequence
<xsd:group ref="EntityInVersionGroup" minOccurs="0"/>
</xsd:sequence>

Copy link
Copy Markdown
Contributor

@ue71603 ue71603 Apr 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TypeOfService is in master in netex_serviceRestrictions_version and even with more content:
At this place the version here is missing:
xsd:sequence
<xsd:group ref="EntityInVersionGroup" minOccurs="0"/>
</xsd:sequence>

<xsd:group ref="DataManagedObjectGroup"/>
</xsd:sequence>
<xsd:sequence>
<xsd:group ref="TypeOfValueGroup"/>
</xsd:sequence>
</xsd:sequence>
<xsd:attribute name="id" type="TypeOfServiceIdType">
<xsd:annotation>
<xsd:documentation>Reference to a TYPE OF SERVICE.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:restriction>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:complexType name="TypeOfServiceStructure" abstract="false">
Copy link
Copy Markdown
Contributor

@ue71603 ue71603 Apr 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

exists already in master TypeOfServiceStructure

Copy link
Copy Markdown
Contributor

@ue71603 ue71603 Apr 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

exists already in master TypeOfServiceStructure

<xsd:annotation>
<xsd:documentation>Type for a TYPE OF SERVICE.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="TypeOfEntity_VersionStructure"/>
</xsd:complexContent>
</xsd:complexType>
<!-- ======================================================================= -->
</xsd:schema>
1 change: 1 addition & 0 deletions xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
<xsd:include schemaLocation="netex_journeyAccounting_version.xsd"/>
<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
Copy link
Copy Markdown
Contributor

@ue71603 ue71603 Apr 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't find it in master. But it seed to have worked just fine. Even also without netex_serviceRestrictions_support.xsd. At least this needs to be rechecked, if it should stay in the pull request.

Copy link
Copy Markdown
Contributor

@ue71603 ue71603 Apr 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't find it in master. But it seed to have worked just fine. Even also without netex_serviceRestrictions_support.xsd. At least this needs to be rechecked, if it should stay in the pull request.

<!-- ======================================================================= -->
<xsd:annotation>
<xsd:appinfo>
Expand Down