Skip to content

Commit

Permalink
changes 2023-11-10
Browse files Browse the repository at this point in the history
  • Loading branch information
@ue71603
ue71603 committed Nov 10, 2023
1 parent 4c1c385 commit 68c8564
Show file tree
Hide file tree
Showing 12 changed files with 69 additions and 69 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ The releases can be found at https://github.com/VDVde/OJP/releases
[#83](https://github.com/VDVde/OJP/pull/83)
* Added parameter `NoSight` to `BaseTripMobilityFilterGroup` to allow requesting a trip for a blind user.
[#36](https://github.com/VDVde/OJP/pull/36)
* Added a `TripStatusGroup` consisting of parameters which describe the current status of a trip, e.g. `Cancelled` / `Delayed` / `Infeasible`.
* Added a `TripStatusGroup` consisting of parameters which describe the current status of a trip, e.g., `Cancelled` / `Delayed` / `Infeasible`.
[#116](https://github.com/VDVde/OJP/pull/116)
* Added an optional `ProductCategory` of a `Service`. As defined in NeTEx and SIRI, a product category is a classification for VEHICLE JOURNEYs
to express some common properties of journeys for marketing and fare products.
Expand Down
6 changes: 3 additions & 3 deletions OJP/OJP_Common.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
<xs:sequence>
<xs:element name="Line" type="siri:LineDirectionStructure" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>Reference to a GROUP of DIRECTIONs of the ROUTEs belonging to the same LINE created for the purpose of filtering and organising timetables.</xs:documentation>
<xs:documentation>Reference to a GROUP of DIRECTIONs of the ROUTEs belonging to the same LINE created for the purpose of filtering and organising timetables.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Exclude" type="xs:boolean" default="true" minOccurs="0">
Expand Down Expand Up @@ -368,7 +368,7 @@
</xs:element>
<xs:element name="Pattern" type="ValidDayBitType">
<xs:annotation>
<xs:documentation>Bit pattern for operating days between start date and end date. The length of the pattern is equal to the number of days from start date to end date. A bit value of "1" indicates that an event actually happens on the day that is represented by the bit position.</xs:documentation>
<xs:documentation>Bit pattern for operating days between start date and end date. The length of the pattern is equal to the number of days from start date to end date. A bit value of "1" indicates that an event happens on the day that is represented by the bit position.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
Expand All @@ -385,7 +385,7 @@
</xs:element>
<xs:element name="OperatingDaysDescription" type="InternationalTextStructure" minOccurs="0">
<xs:annotation>
<xs:documentation>Textual description of the operation days, e.g., "monday to friday" or "not on holidays".</xs:documentation>
<xs:documentation>Textual description of the operation days, e.g., "Monday to Friday" or "not on holidays".</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
Expand Down
2 changes: 1 addition & 1 deletion OJP/OJP_Fare.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@
<xs:sequence>
<xs:element name="Place" type="PlaceStructure">
<xs:annotation>
<xs:documentation>The involved PLACE. Usually a StopPoint, StopPlace or PointOfInterest.</xs:documentation>
<xs:documentation>The involved PLACE. Usually,a StopPoint, StopPlace or PointOfInterest.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="FareProduct" type="FareProductStructure" minOccurs="0" maxOccurs="unbounded">
Expand Down
2 changes: 1 addition & 1 deletion OJP/OJP_FareSupport.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@
</xs:element>
<xs:element name="FareProduct" type="FareProductStructure" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>One ore more FareProducts that are valid for this part of the trip.</xs:documentation>
<xs:documentation>One or more FareProducts that are valid for this part of the trip.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="StaticInfoUrl" type="WebLinkStructure" minOccurs="0" maxOccurs="unbounded">
Expand Down
12 changes: 6 additions & 6 deletions OJP/OJP_JourneySupport.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,12 +376,12 @@
<xs:group ref="StopPointGroup"/>
<xs:element name="ServiceArrival" type="ServiceArrivalStructure" minOccurs="0">
<xs:annotation>
<xs:documentation>Arrival times of the service at this stop ( group of attributes of TIMETABLED PASSING TIME, ESTIMATED PASSING TIME, OBSERVED PASSING TIME).</xs:documentation>
<xs:documentation>Arrival times of the service at this stop (group of attributes of TIMETABLED PASSING TIME, ESTIMATED PASSING TIME, OBSERVED PASSING TIME).</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="ServiceDeparture" type="ServiceDepartureStructure" minOccurs="0">
<xs:annotation>
<xs:documentation>Departure times of the service at this stop ( group of attributes of TIMETABLED PASSING TIME, ESTIMATED PASSING TIME, OBSERVED PASSING TIME).</xs:documentation>
<xs:documentation>Departure times of the service at this stop (group of attributes of TIMETABLED PASSING TIME, ESTIMATED PASSING TIME, OBSERVED PASSING TIME).</xs:documentation>
</xs:annotation>
</xs:element>
<xs:group ref="StopCallStatusGroup"/>
Expand Down Expand Up @@ -435,7 +435,7 @@
</xs:element>
<xs:element ref="siri:ExpectedDepartureCapacities" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>The Capacity structure also will probably rarely be used and parsed. When used, then it mainly show elements that are important for accessibility.</xs:documentation>
<xs:documentation>The Capacity structure also will probably rarely be used and parsed. When used, then it mainly shows elements that are important for accessibility.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
Expand All @@ -448,7 +448,7 @@
</xs:group>
<xs:group name="ServiceStatusGroup">
<xs:annotation>
<xs:documentation>parameters which describe the current status of a DATED VEHICLE JOURNEY</xs:documentation>
<xs:documentation>parameters which describe the status of a DATED VEHICLE JOURNEY</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="Unplanned" type="xs:boolean" default="false" minOccurs="0">
Expand Down Expand Up @@ -644,7 +644,7 @@
<xs:choice minOccurs="0">
<xs:element name="NumberOfResults" type="xs:positiveInteger" minOccurs="0">
<xs:annotation>
<xs:documentation>The number of trip results that the user wants to see at least (TRIP REQUEST POLICY.maximumNumberofJourneys). Be aware that some implementations will deliver one of the TripResults before the indicated departure time. This means one always has to check the results against the parameters before using them.</xs:documentation>
<xs:documentation>The number of trip results that the user wants to see at least (TRIP REQUEST POLICY.maximumNumberofJourneys). Be aware that some implementations will deliver one of the TripResults before the indicated departure time. This means one always must check the results against the parameters before using them.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:group ref="NumberOfResultsGroup" minOccurs="0"/>
Expand Down Expand Up @@ -836,7 +836,7 @@
<xs:sequence>
<xs:element name="TrackSection" type="TrackSectionStructure" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>A geographical view of a Transmodel LEG TRACK together with duration and length that can be used for representing the leg on a map. The points may be STOP PLACE, SCHEDULED STOP POINT, coordinates or ADDRESSes. Specialisation of SECTION.</xs:documentation>
<xs:documentation>A geographical view of a Transmodel LEG TRACK together with duration and length that can be used for representing the leg on a map. The points may be STOP PLACE, SCHEDULED STOP POINT, coordinates, or ADDRESSes. Specialisation of SECTION.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
Expand Down
8 changes: 4 additions & 4 deletions OJP/OJP_Locations.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</xs:element>
<xs:element name="PlaceRef" type="PlaceRefStructure">
<xs:annotation>
<xs:documentation>LOCATION / PLACE for further refinement. If a Place in a previous response was marked as not "complete" it can be refined by putting it here. If Places are organised hierarchically it may be reasonable to identify the Place in a top-down approach with several steps of refining a Place on each level of hierarchy. Following this approach an initial request retrieves a first list of top-level Places (e.g., streets) which are to be refined in a subsequent request to the next level (e.g., house number intervals). The objects of the current level are presented to the user for selection. The object reference of the selected object is then sent in the next request for further refinement.</xs:documentation>
<xs:documentation>LOCATION / PLACE for further refinement. If a Place in a previous response was marked as not "complete" it can be refined by putting it here. If Places are organised hierarchically, it may be reasonable to identify the Place in a top-down approach with several steps of refining a Place on each level of hierarchy. Following this approach an initial request retrieves a first list of top-level Places (e.g., streets) which are to be refined in a subsequent request to the next level (e.g., house number intervals). The objects of the current level are presented to the user for selection. The object reference of the selected object is then sent in the next request for further refinement.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:choice>
Expand Down Expand Up @@ -161,7 +161,7 @@
</xs:element>
<xs:element name="Complete" type="xs:boolean">
<xs:annotation>
<xs:documentation>States whether the included location/place is complete or needs further refinement. Only complete locations/places are fully resolved and can be used in e.g., trip requests. Incomplete locations/places have to be refined entering them once again into a LocationInformationRequest.</xs:documentation>
<xs:documentation>States whether the included location/place is complete or needs further refinement. Only complete locations/places are fully resolved and can be used in e.g., trip requests. Incomplete locations/places must be refined entering them once again into a LocationInformationRequest.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Probability" minOccurs="0">
Expand Down Expand Up @@ -254,7 +254,7 @@
<xs:sequence>
<xs:element name="SortingMethod" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:documentation>If there are multiple sorting methods supported by the system, the client can choose one of the existing. Which methods are available needs to be known to the client and may differ from system to system. Therefore use with care.</xs:documentation>
<xs:documentation>If there are multiple sorting methods supported by the system, the client can choose one of the existing. Which methods are available needs to be known to the client and may differ from system to system. Therefore, use with care.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="GeoPosition" type="siri:LocationStructure" minOccurs="0">
Expand Down Expand Up @@ -418,7 +418,7 @@
</xs:element>
<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: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 must take care, that feeding arrival and fetching departure are at least this duration apart.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="BorderPoint" type="xs:boolean" default="false" minOccurs="0">
Expand Down
Loading

0 comments on commit 68c8564

Please sign in to comment.