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

Add AccessFeatureStatus on PathLink #238

Merged
merged 22 commits into from
Jan 20, 2023
Merged

Add AccessFeatureStatus on PathLink #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5f9a9f3
Add AccessFeatureStatus on PathLink
ue71603 Aug 26, 2022
fe757d6
Travis CI update [skip ci]
Aug 26, 2022
8555468
Fix annotation
sgrossberndt Aug 30, 2022
d320016
Update OJP_Trips.xsd
ue71603 Oct 25, 2022
915c4f8
add partiallyAvailable to Status
ue71603 Oct 25, 2022
857f7dd
Travis CI update [skip ci]
Oct 25, 2022
adf6e89
Feasibility added
trurlurl Oct 27, 2022
6cd3cd4
Renamed EquipmentStatusEnumeration to AccessFeatureStatusEnumeration
trurlurl Oct 27, 2022
ee26279
Travis CI update [skip ci]
Oct 27, 2022
b3fe731
Feasibility Enumeration
trurlurl Oct 31, 2022
73429e7
Travis CI update [skip ci]
Oct 27, 2022
df05d2b
Travis CI update [skip ci]
Oct 31, 2022
589dad3
solved merge mess
ue71603 Nov 26, 2022
27f27f8
Travis CI update [skip ci]
Nov 26, 2022
43b6cda
Lint and update documentation tables
github-actions[bot] Dec 22, 2022
11a0a79
Update OJP/OJP_Trips.xsd
ue71603 Dec 22, 2022
26333db
made valid
ue71603 Dec 22, 2022
432f9c4
Lint and update documentation tables
github-actions[bot] Dec 22, 2022
a985384
fixed documentation mix-up
ue71603 Dec 23, 2022
e51fbf8
Lint and update documentation tables
github-actions[bot] Dec 23, 2022
f9b26f0
Lint and update documentation tables
github-actions[bot] Jan 20, 2023
2fec297
Merge branch 'changes_for_v1.1' into AddAccessFeatureStatusOnPathLink
skinkie 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
70 changes: 66 additions & 4 deletions OJP/OJP_Trips.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,11 @@
</xs:annotation>
</xs:element>
<xs:group ref="OperatingDaysGroup" minOccurs="0"/>
<xs:element name="Feasibility" type="FeasibilityEnumeration" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>Information about the feasibility of the TRIP, in particular with respect to the access features used.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="SituationFullRefs" type="SituationRefList" minOccurs="0">
<xs:annotation>
<xs:documentation>A list of references to SITUATIONs.</xs:documentation>
Expand Down Expand Up @@ -471,12 +476,17 @@
</xs:annotation>
</xs:element>
<xs:group ref="OperatingDaysGroup" minOccurs="0"/>
<xs:group ref="TripStatusGroup" minOccurs="0"/>
Copy link
Contributor

Choose a reason for hiding this comment

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

This merge moved the position of TripStatusGroup. Was this on purpose?

Copy link
Contributor

Choose a reason for hiding this comment

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

Please report all collateral damage due to manual merging to @ue71603

Copy link
Contributor

Choose a reason for hiding this comment

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

@sgrossberndt and the fact that this change was not picked up by CI shows we lack examples.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I did it on purpose. In all other examples Situations were the last before Extension. It thought it was a mistake during the change in Situations. Certainly I should not have done it in this PR if that was not the case (as it seems), but from homogenity, I think it is right. I can undo it in an additional PR if you like @sgrossberndt

Copy link
Contributor

Choose a reason for hiding this comment

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

No, don't undo it. But it should not have been part of this PR but handled separately.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I know... I only did it, because I thought it was messed up during the merge by me or during the creation of the PR. Should have checked.

<xs:element name="Feasibility" type="FeasibilityEnumeration" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>Information about the feasibility of the TRIP, in particular with respect to the access features used.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="SituationFullRefs" type="SituationRefList" minOccurs="0">
<xs:annotation>
<xs:documentation>A list of references to SITUATIONs.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:group ref="TripStatusGroup" minOccurs="0"/>
<xs:element name="Extension" type="xs:anyType" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
Expand Down Expand Up @@ -592,6 +602,11 @@
<xs:documentation>Structured model further describing this interchange, its geographic embedding and accessibility.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Feasibility" type="FeasibilityEnumeration" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>Information about the feasibility of the TransferLeg, in particular with respect to the access features used.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="SituationFullRefs" type="SituationRefList" minOccurs="0">
<xs:annotation>
<xs:documentation>A list of references to SITUATIONs.</xs:documentation>
Expand Down Expand Up @@ -646,6 +661,11 @@
<xs:documentation>Structured model further describing this interchange, its geographic embedding and accessibility.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Feasibility" type="FeasibilityEnumeration" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>Information about the feasibility of the ContinuousLeg, in particular with respect to the access features used.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="SituationFullRefs" type="SituationRefList" minOccurs="0">
<xs:annotation>
<xs:documentation>A list of references to SITUATIONs.</xs:documentation>
Expand Down Expand Up @@ -1038,6 +1058,33 @@
<xs:enumeration value="downAndUp"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="AccessFeatureStatusEnumeration">
<xs:annotation>
<xs:documentation>Allowed values for status of the access feature.</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string">
<xs:enumeration value="unknown"/>
<xs:enumeration value="available"/>
<xs:enumeration value="partiallyAvailable">
<xs:annotation>
<xs:documentation>If partiallyAvailable is used, then some note should be provided in one of the descriptive elements of the containing PathLink</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="notAvailable"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="FeasibilityEnumeration">
<xs:annotation>
<xs:documentation>Allowed values for the feasibility of a TRIP or part of a TRIP.</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string">
<xs:enumeration value="allAccessFeaturesAvailable"/>
<xs:enumeration value="accessFeatureNotAvailable"/>
<xs:enumeration value="accessFeaturePartiallyAvailable"/>
<xs:enumeration value="accessFeatureWithUnknownAvailability"/>
<xs:enumeration value="seeSituations"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="AccessibilityFeatureTypesEnumeration">
<xs:annotation>
<xs:documentation>Allowed values for AccessibilityFeature (for mobility and sensory impairments, assistance and important elements to pay attention to).</xs:documentation>
Expand Down Expand Up @@ -1077,12 +1124,12 @@
</xs:simpleType>
<xs:complexType name="PathLinkStructure">
<xs:annotation>
<xs:documentation>[TMv6] a link within a PLACE of or between two PLACEs (that is STOP PLACEs, ACCESS SPACEs or QUAYs,BOARDING POSITIONs,, POINTs OF INTEREST etc or PATH JUNCTIONs) that represents a step in a possible route for pedestrians, cyclists or other out-of-vehicle passengers within or between a PLACE.</xs:documentation>
<xs:documentation>[TMv6] a link within a PLACE of or between two PLACEs (that is STOP PLACEs, ACCESS SPACEs or QUAYs, BOARDING POSITIONs, POINTs OF INTEREST etc or PATH JUNCTIONs) that represents a step in a possible route for pedestrians, cyclists or other out-of-vehicle passengers within or between a PLACE.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="Transition" type="TransitionEnumeration" minOccurs="0">
<xs:annotation>
<xs:documentation>Whether path is up down or level .</xs:documentation>
<xs:documentation>Whether path is up, down or level.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="AccessFeatureType" type="AccessFeatureTypeEnumeration" minOccurs="0">
Expand All @@ -1092,14 +1139,29 @@
</xs:element>
<xs:element name="Count" type="xs:positiveInteger" minOccurs="0">
<xs:annotation>
<xs:documentation>Number how often the access feature occurs in this PathLink</xs:documentation>
<xs:documentation>Number indicating how often the access feature occurs in this PathLink</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="AccessFeatureStatus" type="AccessFeatureStatusEnumeration" minOccurs="0">
<xs:annotation>
<xs:documentation>Whether the access feature is available or out of service.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="AccessFeatureStatusText" type="InternationalTextStructure" minOccurs="0">
<xs:annotation>
<xs:documentation>Textual information about reduced availability of the access feature, in particular if AccessFeatureStatus is partiallyAvailable.</xs:documentation>
</xs:annotation>
</xs:element>
ue71603 marked this conversation as resolved.
Show resolved Hide resolved
<xs:element name="AccessibilityFeature" type="AccessibilityFeatureTypesEnumeration" minOccurs="0" maxOccurs="unbounded">
ue71603 marked this conversation as resolved.
Show resolved Hide resolved
<xs:annotation>
<xs:documentation>Presence of an accessibility feature on the PathLink.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element ref="SituationFullRef" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>Reference to a situation that affects the availability of the access feature.</xs:documentation>
ue71603 marked this conversation as resolved.
Show resolved Hide resolved
</xs:annotation>
</xs:element>
<xs:element name="From" type="PathLinkEndStructure" minOccurs="0">
<xs:annotation>
<xs:documentation>Designations of level and place where this PathLink starts.</xs:documentation>
Expand Down
Loading