Skip to content
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

Jump to bottom

Consistent use of WebLinkStructure #123

Merged
merged 1 commit into from
Nov 30, 2020
Merged

Consistent use of WebLinkStructure #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions OJP/OJP_Common.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
</xs:annotation>
<xs:complexType name="GeneralAttributeStructure">
<xs:annotation>
<xs:documentation>Structured attribute classification with associated text.</xs:documentation>
<xs:documentation>Structured attribute classification with associated text. If URL is given, it refers to the whole attribute text.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="Text" type="InternationalTextStructure">
Expand All @@ -358,11 +358,7 @@
<xs:documentation>Importance of the attribute.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="InfoUrl" type="xs:anyURI" minOccurs="0">
<xs:annotation>
<xs:documentation>URL to additional information on this general attribute. If available, the whole attribute text has to be used as the marked link.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:group ref="WebLinkGroup" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:schema>
2 changes: 1 addition & 1 deletion OJP/OJP_Fare.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
<xs:documentation>The set of passed zones.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="StaticInfoUrl" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
<xs:element name="StaticInfoUrl" type="WebLinkStructure" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>URL to Fare information pages on the web.</xs:documentation>
</xs:annotation>
Expand Down
4 changes: 2 additions & 2 deletions OJP/OJP_FareSupport.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,12 @@
<xs:documentation>Name of the booking agency (contractual partner).</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="BookingUrl" type="xs:anyURI" minOccurs="0">
<xs:element name="BookingUrl" type="WebLinkStructure" minOccurs="0">
<xs:annotation>
<xs:documentation>URL to online booking service.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="InfoUrl" type="xs:anyURI" minOccurs="0">
<xs:element name="InfoUrl" type="WebLinkStructure" minOccurs="0">
<xs:annotation>
<xs:documentation>URL to information page.</xs:documentation>
</xs:annotation>
Expand Down
22 changes: 15 additions & 7 deletions OJP/OJP_Utility.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,11 @@
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="WebLinkStructure">
<xs:group name="WebLinkGroup">
<xs:annotation>
<xs:documentation>URL of a web resource with label.</xs:documentation>
<xs:documentation>URL of a web resource including type of resource.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="Label" type="InternationalTextStructure">
<xs:annotation>
<xs:documentation>Label for link description.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Url" type="xs:anyURI">
<xs:annotation>
<xs:documentation>URL to resource on web.</xs:documentation>
Expand All @@ -91,5 +86,18 @@
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:group>
<xs:complexType name="WebLinkStructure">
<xs:annotation>
<xs:documentation>URL of a web resource with label.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="Label" type="InternationalTextStructure">
<xs:annotation>
<xs:documentation>Label for link description.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:group ref="WebLinkGroup"/>
</xs:sequence>
</xs:complexType>
</xs:schema>