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

Fixing typos and minor changes coming from todays merging frenzy #303

Merged
merged 3 commits into from
Jan 20, 2023
Merged

Fixing typos and minor changes coming from todays merging frenzy #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd495ce
Update OJP_Trips.xsd
ue71603 Jan 20, 2023
52d44fc
Lint and update documentation tables
github-actions[bot] Jan 20, 2023
56cf7e0
reintegrate #286
ue71603 Jan 20, 2023
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
2 changes: 1 addition & 1 deletion OJP/OJP_Places.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@
<xs:documentation>Rough estimate of the travel duration from the specified reference place to this exchange point.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="WaitDuration" type="xs:duration" minOccurs="0" default="PT0M">
<xs:element name="WaitDuration" type="xs:duration" default="PT0M" minOccurs="0">
<xs:annotation>
<xs:documentation>Duration needed at this exchange point to change from one service to another. If a journey planning orchestrator puts together a trip at this exchange point, it has to take care, that feeding arrival and fetching departure are at least this duration apart.</xs:documentation>
</xs:annotation>
Expand Down
16 changes: 8 additions & 8 deletions OJP/OJP_Trips.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@
</xs:element>
<xs:element name="TurnAction" type="TurnActionEnumeration" minOccurs="0">
<xs:annotation>
<xs:documentation>The range of alternative turns that can be described.</xs:documentation>
<xs:documentation>The range of possible turns that can be described.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="RoadName" type="InternationalTextStructure" minOccurs="0">
Expand Down Expand Up @@ -854,7 +854,6 @@
<xs:annotation>
<xs:documentation>Various types of guidance advice given to traveller. Suitable values may differ by MODE (e.g. a car driver needs different advice than a person walking for a transfer.</xs:documentation>
</xs:annotation>
<!-- the classic values from OJP 1.0 with explanations -->
<xs:restriction base="xs:string">
<xs:enumeration value="origin">
<xs:annotation>
Expand All @@ -868,12 +867,12 @@
</xs:enumeration>
<xs:enumeration value="continue">
<xs:annotation>
<xs:documentation>continue on the same street/road/path.</xs:documentation>
<xs:documentation>Continue on the same street/road/path.</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="keep">
<xs:annotation>
<xs:documentation>keep going on the same street/road/path.</xs:documentation>
<xs:documentation>Keep going on the same street/road/path.</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="turn">
Expand All @@ -891,7 +890,6 @@
<xs:documentation>Can be something like an elevator or a vehicle.</xs:documentation>
</xs:annotation>
</xs:enumeration>
<!-- additional enum values for individual vehicles -->
<xs:enumeration value="enter_roundabout">
<xs:annotation>
<xs:documentation>Entering a roundabout.</xs:documentation>
Expand Down Expand Up @@ -922,7 +920,6 @@
<xs:documentation>Access lane to highway or the like.</xs:documentation>
</xs:annotation>
</xs:enumeration>
<!-- lane choice -->
<xs:enumeration value="unknown_lane_choice">
<xs:annotation>
<xs:documentation>If it is unclear which lane to choose.</xs:documentation>
Expand All @@ -943,13 +940,16 @@
<xs:documentation>If there are more than 2 lanes, then TurnAction half_right,right,sharp_right may help decide</xs:documentation>
</xs:annotation>
</xs:enumeration>
<!-- undefined values -->
<xs:enumeration value="unknown_turning_kind"/>
<!-- additional enum values for individual vehicles -->
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you move those comments on purpose?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no, I think this is something that the post processing in the script does. It doesn't like style comments within xs:enumeration. Perhaps we should remove them.

<!-- lane choice -->
<!-- undefined values -->
</xs:restriction>
<!-- the classic values from OJP 1.0 with explanations -->
</xs:simpleType>
<xs:simpleType name="TurnActionEnumeration">
<xs:annotation>
<xs:documentation>The range of alternative turns that can be described</xs:documentation>
<xs:documentation>The range of possible turns that can be described.</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string">
<xs:enumeration value="straight_on">
Expand Down
Loading