From a64ae410bb2b5218c3dd7a1f514dc1231711953f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 25 Sep 2023 17:43:11 +0200 Subject: [PATCH] ModeFilter adapted to the new reality --- OJP/OJP_ModesSupport.xsd | 2 +- OJP/OJP_Trips.xsd | 2 +- docs/generated/index.html | 10 +++++----- siri/xsd/siri_model/siri_modes.xsd | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/OJP/OJP_ModesSupport.xsd b/OJP/OJP_ModesSupport.xsd index c0477c4a6..377fa9741 100644 --- a/OJP/OJP_ModesSupport.xsd +++ b/OJP/OJP_ModesSupport.xsd @@ -365,7 +365,7 @@ - + List of private mobility offers to include or exclude. diff --git a/OJP/OJP_Trips.xsd b/OJP/OJP_Trips.xsd index 6c54e4523..394659188 100644 --- a/OJP/OJP_Trips.xsd +++ b/OJP/OJP_Trips.xsd @@ -90,7 +90,7 @@ Transport operators to include/exclude. - + Private mobility options to include/exclude. diff --git a/docs/generated/index.html b/docs/generated/index.html index 297948bb1..380253bc0 100644 --- a/docs/generated/index.html +++ b/docs/generated/index.html @@ -686,8 +686,8 @@

OJP - Open API for distributed Journey

11.3. The complex type TripParamStructure

- - + + @@ -782,7 +782,7 @@

OJP - Open API for distributed Journey

- +

TripParamStructure

Trip request parameter structure.

The element contains a sequence of the following elements:

TripDataFilter

PtModeFilter

0:1

+PtModeFilter

Modes to be considered in trip calculation.

LineFilter

0:1

+LineDirectionFilter

Lines/Directions to include/exclude.

OperatorFilter

0:1

+OperatorFilter

Transport operators to include/exclude.

PrivateModeFilter

0:1

+PrivateModeFilter

Private mobility options to include/exclude.

OperatorFilter

0:1

+OperatorFilter

Transport operators to include/exclude.

PrivateModeFilter

0:1

+PrivateModeFilter

Private mobility options to include/exclude.

VehicleFilter

0:1

+VehicleFilter

Filter for VEHICLE and TRAIN NUMBERs.

TariffzoneFilter

0:1

+TariffzoneFilter

Filter for trips using only specific tariff zones.

TripDataFilter

PtModeFilter

0:1

+PtModeFilter

Modes to be considered in trip calculation.

LineFilter

0:1

+LineDirectionFilter

Lines/Directions to include/exclude.

OperatorFilter

0:1

+OperatorFilter

Transport operators to include/exclude.

PrivateModeFilter

0:1

+PrivateModeFilter

Private mobility options to include/exclude.

PrivateModeFilter

0:1

+PrivateModeFilter

Private mobility options to include/exclude.

VehicleFilter

0:1

+VehicleFilter

Filter for VEHICLE and TRAIN NUMBERs.

TariffzoneFilter

0:1

+TariffzoneFilter

Filter for trips using only specific tariff zones.

11.5. The TripPolicyGroup group

@@ -976,7 +976,7 @@

OJP - Open API for distributed Journey

- + @@ -1711,7 +1711,7 @@

OJP - Open API for distributed Journey

TripPolicyGroup

Policies that control the trip search behaviour.

TripDataFilter

PtModeFilter

0:1

+PtModeFilter

Modes to be considered in trip calculation.

LineFilter

0:1

+LineDirectionFilter

Lines/Directions to include/exclude.

OperatorFilter

0:1

+OperatorFilter

Transport operators to include/exclude.

PrivateModeFilter

0:1

+PrivateModeFilter

Private mobility options to include/exclude.

PrivateModeFilter

0:1

+PrivateModeFilter

Private mobility options to include/exclude.

VehicleFilter

0:1

+VehicleFilter

Filter for VEHICLE and TRAIN NUMBERs.

TariffzoneFilter

0:1

+TariffzoneFilter

Filter for trips using only specific tariff zones.

Name

0:1

+InternationalText

Name of the mode.

ShortName

0:1

+InternationalText

Short name or acronym of the mode.

Description

0:1

+InternationalText

Additional text that further describes the mode.

16.4. The ModeGroup group

-

ModeGroup

Elements for a Transport Mode

Mode

PtMode

1:1

siri:VehicleModesOfTransportEnumeration

Categorisation of mode

→‍siri:PtModeChoiceGroup

16.5. The complex type PtModeFilterStructure

PtModeFilterStructure

List of public transport modes ([from SIRI] mode of public transport service, corresponds to VEHICLE MODE) to exclude or include.

The element contains a sequence of the following elements:

Exclude

0:1

xs:boolean

Whether VEHICLE MODEs in list are to be excluded or included from search. Default is to exclude.

PtMode

0:*

siri:VehicleModesOfTransportEnumeration

List of PT Transport modes to include/exclude.

→‍siri:PtModeChoiceGroup

16.6. The complex type PrivateModeFilterStructure

PrivateModeFilterStructure

List of private mobility offers to include or exclude.

The element contains a sequence of the following elements:

Exclude

0:1

xs:boolean

Whether modes in list are to include or exclude from search. Default is exclude.

PersonalModeOfOperation

0:*

PersonalModesOfOperation

List of private mobility offers to include/exclude.

+

16.5. The complex type PtModeFilterStructure

PtModeFilterStructure

List of public transport modes ([from SIRI] mode of public transport service, corresponds to VEHICLE MODE) to exclude or include.

The element contains a sequence of the following elements:

Exclude

0:1

xs:boolean

Whether VEHICLE MODEs in list are to be excluded or included from search. Default is to exclude.

PtMode

0:*

siri:VehicleModesOfTransportEnumeration

List of PT Transport modes to include/exclude.

→‍siri:PtModeChoiceGroup

16.6. The complex type PrivateModeFilterStructure

PrivateModeFilterStructure

List of private mobility offers to include or exclude.

The element contains a sequence of the following elements:

Exclude

0:1

xs:boolean

Whether modes in list are to include or exclude from search. Default is exclude.

PersonalModeOfOperation

0:*

PersonalModesOfOperation

List of private mobility offers to include/exclude.

17. OJP/OJP_SituationSupport.xsd - Supporting definitions for situations containing wrappers for SIRI Situation Exchange service (SIRI SX)

17.1. The complex type SituationsStructure

SituationsStructure

Wrapper type for SIRI PtSituationsElementStructure

The element contains a sequence of the following elements:

PtSituation

0:*

siri:PtSituationElementStructure

SIRI situation details in public transport, see CEN/TS 15531-5.

RoadSituation

0:*

siri:RoadSituationElementStructure

SIRI situation details in individual transport, see CEN/TS 15531-5.

17.2. The toplevel element SituationFullRef

SituationFullRef

+SituationFullRef

Reference to situation message. Message details might be found in response context or through other communication channels.

17.3. The complex type SituationFullRefStructure

SituationFullRefStructure

siri:SituationFullRefStructure

Reference structure for situation message. Situation details might be found in response context or through other communication channels.

17.4. The complex type SituationRefList

SituationRefList

List of references to SITUATIONs.

The element contains only one element:

→‍SituationFullRef

1:*

→‍SituationFullRef

Reference to situation message. Message details might be found in response context or through other communication channels.

diff --git a/siri/xsd/siri_model/siri_modes.xsd b/siri/xsd/siri_model/siri_modes.xsd index d6a230c69..ff4212077 100644 --- a/siri/xsd/siri_model/siri_modes.xsd +++ b/siri/xsd/siri_model/siri_modes.xsd @@ -68,7 +68,7 @@ Rail transport, Roads and road transport - + @@ -87,7 +87,7 @@ Rail transport, Roads and road transport - + Non-PT Road Submodes.