From 5b554417beff8bf7989bafdcfefd6ef0822afc51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 18 Aug 2023 13:45:39 +0200 Subject: [PATCH 01/20] Create TR_ParallelService_OeBB.xml --- .../trip/TR_ParallelService_OeBB.xml | 213 ++++++++++++++++++ 1 file changed, 213 insertions(+) create mode 100644 examples/functions/trip/TR_ParallelService_OeBB.xml diff --git a/examples/functions/trip/TR_ParallelService_OeBB.xml b/examples/functions/trip/TR_ParallelService_OeBB.xml new file mode 100644 index 000000000..c3de76c80 --- /dev/null +++ b/examples/functions/trip/TR_ParallelService_OeBB.xml @@ -0,0 +1,213 @@ + + + + + + 2023-08-15T20:09:36Z + EFAController10.5.23.52-OJP-EFA01-P + true + + 2023-08-15T20:09:35Z + true + 762 + + ID-48D1A6A7-2659-4433-9795-F0A0840A4938 + + ID-48D1A6A7-2659-4433-9795-F0A0840A4938 + PT48M + 2023-08-15T18:08:00Z + 2023-08-15T18:56:00Z + 0 + 0 + + 1 + + + 1 + + Wien Hbf + + + 2023-08-15T20:13:00Z + + 1 + + + 2 + + Wien Meidling + + + 2023-08-15T20:18:00Z + + + 2023-08-15T20:21:00Z + + 2 + + + 3 + + Linz Hbf + + + 2023-08-15T21:34:00Z + + + 2023-08-15T21:36:00Z + + 3 + + + 4 + + Wels + + + 2023-08-15T21:48:00Z + + + 2023-08-15T21:50:00Z + + 4 + + + 5 + + Passau Hbf + + + 2023-08-15T22:35:00Z + + + 2023-08-15T22:53:00Z + + 5 + + + 6 + + Regensburg Hbf + + + 2023-08-15T23:54:00Z + + + 2023-08-15T23:56:00Z + + 6 + + + 7 + + Nürnberg Hbf + + + 2023-08-16T00:56:00Z + + + 2023-08-15T01:51:00Z + + 7 + + + + 20 + + Hamburg Altona + + + 2023-08-16T09:03:00Z + + 12 + + + 2023-08-15 + NJ-OeBB-1230123-123111 + OeBB:NJ12311 + H + + rail + nightRail + + Zug + + + NJ + + + + NJ 490 + + 123123 + + at:oebb + + + + Hamburg Altona + + + + 1 + 5 + NJ-OeBB-120123-123112 + OeBB:NJ12312 + H + + rail + + + NJ 40490 + + 1231012 + + Amsterdam + + + + 5 + 12 + NJ-OeBB-120123-1231122 + OeBB:NJ12312 + H + + rail + + + NJ 590 + + 123123 + + Hamburg Altona + + + + 5 + 7 + DB:123111-12388 + DB:123112311-123 + + rail + + + NJ 50490 + + 1231012 + + Amsterdam + + + + + + + + + + \ No newline at end of file From 1b9a1c632a361b4b0ca708abd9a3901853b624f1 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 11:47:36 +0000 Subject: [PATCH 02/20] Lint and update documentation tables --- .../functions/trip/TR_ParallelService_OeBB.xml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/examples/functions/trip/TR_ParallelService_OeBB.xml b/examples/functions/trip/TR_ParallelService_OeBB.xml index c3de76c80..39e8d31aa 100644 --- a/examples/functions/trip/TR_ParallelService_OeBB.xml +++ b/examples/functions/trip/TR_ParallelService_OeBB.xml @@ -148,12 +148,12 @@ All the rest of the information is minimalized and is not necessary accurate. at:oebb - Hamburg Altona - + + 1 5 NJ-OeBB-120123-123112 @@ -170,7 +170,8 @@ All the rest of the information is minimalized and is not necessary accurate. Amsterdam - + + 5 12 NJ-OeBB-120123-1231122 @@ -186,8 +187,9 @@ All the rest of the information is minimalized and is not necessary accurate. Hamburg Altona - - + + + 5 7 DB:123111-12388 @@ -198,11 +200,11 @@ All the rest of the information is minimalized and is not necessary accurate. NJ 50490 - 1231012 + 1231012 Amsterdam - + @@ -210,4 +212,4 @@ All the rest of the information is minimalized and is not necessary accurate. - \ No newline at end of file + From 4bb4ff2d465726290828061a6126fe36e5ef8bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 24 Aug 2023 10:35:06 +0200 Subject: [PATCH 03/20] update --- .../trip/TR_ParallelService_OeBB.xml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/examples/functions/trip/TR_ParallelService_OeBB.xml b/examples/functions/trip/TR_ParallelService_OeBB.xml index 39e8d31aa..6f6041f9d 100644 --- a/examples/functions/trip/TR_ParallelService_OeBB.xml +++ b/examples/functions/trip/TR_ParallelService_OeBB.xml @@ -145,6 +145,7 @@ All the rest of the information is minimalized and is not necessary accurate. NJ 490 123123 + A at:oebb @@ -152,6 +153,28 @@ All the rest of the information is minimalized and is not necessary accurate. Hamburg Altona + + 1 + 5 + NJ-OeBB-1230123-123111 + OeBB:NJ12311 + H + + rail + nightRail + + Zug + + + NJ + + + + NJ 490 + + 123123 + A + 1 @@ -166,6 +189,7 @@ All the rest of the information is minimalized and is not necessary accurate. NJ 40490 1231012 + B Amsterdam @@ -184,6 +208,8 @@ All the rest of the information is minimalized and is not necessary accurate. NJ 590 123123 + A + Hamburg Altona @@ -197,10 +223,12 @@ All the rest of the information is minimalized and is not necessary accurate. rail + NJ 50490 1231012 + B Amsterdam From c70de1034796206e8ad11611a166ec22054b2c1f Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Aug 2023 08:35:54 +0000 Subject: [PATCH 04/20] Lint and update documentation tables --- examples/functions/trip/TR_ParallelService_OeBB.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/examples/functions/trip/TR_ParallelService_OeBB.xml b/examples/functions/trip/TR_ParallelService_OeBB.xml index 6f6041f9d..9ef2832c3 100644 --- a/examples/functions/trip/TR_ParallelService_OeBB.xml +++ b/examples/functions/trip/TR_ParallelService_OeBB.xml @@ -209,7 +209,6 @@ All the rest of the information is minimalized and is not necessary accurate. 123123 A - Hamburg Altona @@ -223,12 +222,11 @@ All the rest of the information is minimalized and is not necessary accurate. rail - NJ 50490 1231012 - B + B Amsterdam From 152cccd80d28f150be5804b48eb91a5f5da51a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 14 Sep 2023 19:19:12 +0200 Subject: [PATCH 05/20] version with remainInVehicle --- ....xml => TR_ParallelService_OeBB_wrong.xml} | 3 +- ...eBB_wrong_right_with_remain_in_vehicle.xml | 250 ++++++++++++++++++ 2 files changed, 252 insertions(+), 1 deletion(-) rename examples/functions/trip/{TR_ParallelService_OeBB.xml => TR_ParallelService_OeBB_wrong.xml} (97%) create mode 100644 examples/functions/trip/TR_ParallelService_OeBB_wrong_right_with_remain_in_vehicle.xml diff --git a/examples/functions/trip/TR_ParallelService_OeBB.xml b/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml similarity index 97% rename from examples/functions/trip/TR_ParallelService_OeBB.xml rename to examples/functions/trip/TR_ParallelService_OeBB_wrong.xml index 9ef2832c3..1d35553bd 100644 --- a/examples/functions/trip/TR_ParallelService_OeBB.xml +++ b/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml @@ -142,7 +142,8 @@ All the rest of the information is minimalized and is not necessary accurate. - NJ 490 + NJ 490 123123 A diff --git a/examples/functions/trip/TR_ParallelService_OeBB_wrong_right_with_remain_in_vehicle.xml b/examples/functions/trip/TR_ParallelService_OeBB_wrong_right_with_remain_in_vehicle.xml new file mode 100644 index 000000000..55d8c18b7 --- /dev/null +++ b/examples/functions/trip/TR_ParallelService_OeBB_wrong_right_with_remain_in_vehicle.xml @@ -0,0 +1,250 @@ + + + + + + 2023-08-15T20:09:36Z + EFAController10.5.23.52-OJP-EFA01-P + true + + 2023-08-15T20:09:35Z + true + 762 + + ID-48D1A6A7-2659-4433-9795-F0A0840A4938 + + ID-48D1A6A7-2659-4433-9795-F0A0840A4938 + PT48M + 2023-08-15T18:08:00Z + 2023-08-15T18:56:00Z + 1 + + + + 1 + + + spp:1 + + Wien Hbf + + + 2023-08-15T20:13:00Z + + 1 + + + spp:2 + + Wien Meidling + + + 2023-08-15T20:18:00Z + + + 2023-08-15T20:21:00Z + + 2 + + + spp:3 + + Linz Hbf + + + 2023-08-15T21:34:00Z + + + 2023-08-15T21:36:00Z + + 3 + + + spp:4 + + Wels + + + 2023-08-15T21:48:00Z + + + 2023-08-15T21:50:00Z + + 4 + + + spp:5 + + Passau Hbf + + + 2023-08-15T22:35:00Z + + 5 + + + 2023-08-15 + NJ-OeBB-1230123-123111 + OeBB:NJ12311 + H + + rail + nightRail + + Zug + + + NJ + + + + NJ 490 + + 123123 + A + + at:oebb + + + Hamburg Altona + + + + + 1 + 5 + NJ-OeBB-120123-123112 + OeBB:NJ12312 + H + + rail + + + NJ 40490 + + 1231012 + B + + Amsterdam + + + + + + + 2 + + remainInVehicle + + spp:5 + + Passau Hbf + + + + spp5: + + Passau Hbf + + + PT3M + + + + 3 + + + spp: + + Passau Hbf + + + 2023-08-15T22:53:00Z + + 1 + + + spp:6 + + Regensburg Hbf + + + 2023-08-15T23:54:00Z + + + 2023-08-15T23:56:00Z + + 2 + + + spp:7 + + Nürnberg Hbf + + + 2023-08-16T00:56:00Z + + + 2023-08-15T01:51:00Z + + 3 + + + + spp:5 + + Hamburg Altona + + + 2023-08-16T09:03:00Z + + 12 + + + 2023-08-15 + NJ-OeBB-120123-1231122 + OeBB:NJ12312 + H + + rail + + + NJ 590 + + 123123 + A + + Hamburg Altona + + + + + 1 + 4 + DB:123111-12388 + DB:123112311-123 + + rail + + + NJ 50490 + + 1231012 + B + + Amsterdam + + + + + + + + + + \ No newline at end of file From 9d045e1c563cb64dc3c196b246129b70e3cf2d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 14 Sep 2023 19:20:02 +0200 Subject: [PATCH 06/20] fixed file name --- ...l => TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename examples/functions/trip/{TR_ParallelService_OeBB_wrong_right_with_remain_in_vehicle.xml => TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml} (100%) diff --git a/examples/functions/trip/TR_ParallelService_OeBB_wrong_right_with_remain_in_vehicle.xml b/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml similarity index 100% rename from examples/functions/trip/TR_ParallelService_OeBB_wrong_right_with_remain_in_vehicle.xml rename to examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml From c5e55995b6b60fad3e7349d20166a378965f2bd1 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Sep 2023 17:19:51 +0000 Subject: [PATCH 07/20] Lint and update documentation tables --- .../TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml | 2 +- examples/functions/trip/TR_ParallelService_OeBB_wrong.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml b/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml index 55d8c18b7..d085f17d9 100644 --- a/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml +++ b/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml @@ -247,4 +247,4 @@ All the rest of the information is minimalized and is not necessary accurate. - \ No newline at end of file + diff --git a/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml b/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml index 1d35553bd..75317d722 100644 --- a/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml +++ b/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml @@ -142,7 +142,8 @@ All the rest of the information is minimalized and is not necessary accurate. - NJ 490 123123 From 3c0298a0960cdafa2ef8da6a6f70f7c5ef8d0c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 19 Sep 2023 11:27:07 +0200 Subject: [PATCH 08/20] LegIntrmediates to LegIntermediate --- OJP/OJP_Trips.xsd | 2 +- docs/generated/index.html | 2 +- .../2023.06.16.eus.ojp.mptr.response.xml | 180 +++++++++--------- .../2023.06.16.eus.ojp.t.response.xml | 68 +++---- ..._02_response_geoposition_2_geoposition.xml | 76 ++++---- ...se_search_by_StopPointName_many_params.xml | 48 ++--- .../trip/TR_07_response_Delemont_normal.xml | 28 +-- .../functions/trip/TR_08_response_dog.xml | 28 +-- .../trip/TR_09_response_restricted_lines.xml | 28 +-- .../functions/trip/TR_ParallelService.xml | 44 ++--- ...vice_OeBB_right_with_remain_in_vehicle.xml | 20 +- .../trip/TR_ParallelService_OeBB_wrong.xml | 24 +-- .../linking_alps/LA_Active_TR_Response.xml | 108 +++++------ 13 files changed, 328 insertions(+), 328 deletions(-) diff --git a/OJP/OJP_Trips.xsd b/OJP/OJP_Trips.xsd index cf36b93d6..c6113ca2f 100644 --- a/OJP/OJP_Trips.xsd +++ b/OJP/OJP_Trips.xsd @@ -633,7 +633,7 @@ Stop/Station where boarding is done - + information about the intermediate passed stop points. diff --git a/docs/generated/index.html b/docs/generated/index.html index cb7c6c6d9..f3b7ea84e 100644 --- a/docs/generated/index.html +++ b/docs/generated/index.html @@ -882,7 +882,7 @@

OJP - Open API for distributed Journey

Infeasible

0:1

xs:boolean

Whether this trip cannot be used, due to operational delays and impossible transfers. Default is false.

Feasibility

0:*

Feasibility

Information about the feasibility of the TRIP, in particular with respect to the access features used.

SituationFullRefs

0:1

+SituationRefList

A list of references to SITUATIONs.

Extension

0:1

xs:anyType

11.15. The complex type LegStructure

-

LegStructure

a single stage of a TRIP that is made without change of MODE or service (ie: between each interchange)

The element contains a sequence of the following elements:

Id

1:1

LegObjectId

Id of this leg. Unique within trip result.

ParticipantRef

0:1

siri:ParticipantRefStructure

[equivalent of PARTICIPANT in SIRI] IT system that is participating in a communication with other participant(s)

Duration

0:1

xs:duration

The duration of the leg (e.g. from Transmodel PT RIDE LEG.Duration)

Then, the element contains one of the following elements:

a

ContinuousLeg

-1:1

+ContinuousLeg

Leg by a continuously available service or mode of transport.

b

TimedLeg

-1:1

+TimedLeg

Timetabled Leg.

c

TransferLeg

-1:1

+TransferLeg

Leg to connect between different services or modes of transport (interchanges).

Sustainability

EmissionCO2

0:1

+EmissionCO2

Estimation of CO2 emissions.

Changed

0:1

xs:boolean

TRUE if leg got changed by TripChange-Request.

11.16. The complex type TimedLegStructure

+

TimedLegStructure

passenger LEG with timetabled schedule. Corresponds to a RIDE.

The element contains a sequence of the following elements:

LegBoard

1:1

+LegBoard

Stop/Station where boarding is done

LegIntermediates

0:*

+LegIntermediate

information about the intermediate passed stop points.

LegAlight

1:1

+LegAlight

Stop/Station to alight

Service

1:1

+DatedJourney

Service that is used for this leg.

LegAttribute

0:*

+LegAttribute

Attributes that are not valid on the whole service, but only on parts of the journey leg.

Changed

0:1

xs:boolean

TRUE if leg got changed by TripChange-Request.

11.16. The complex type TimedLegStructure

diff --git a/examples/eu_spirit/2023.06.16.eus.ojp.mptr.response.xml b/examples/eu_spirit/2023.06.16.eus.ojp.mptr.response.xml index 219e8e73d..9e97c26ab 100644 --- a/examples/eu_spirit/2023.06.16.eus.ojp.mptr.response.xml +++ b/examples/eu_spirit/2023.06.16.eus.ojp.mptr.response.xml @@ -3020,7 +3020,7 @@ 2023-06-17T12:15:00+02:00 - + U3xBPTFATz1Qb3RzZGFtLCBWb2xrc3BhcmtAWD0xMzA1MDQ3NkBZPTUyNDE4OTMyQFU9ODZATD0yMzAyMTQwMkB8UG90c2RhbSwgVm9sa3NwYXJrfDEzLjA1MDQ3Nnw1Mi40MTg5MzJ8ZmFsc2U- Potsdam, Volkspark @@ -3033,8 +3033,8 @@ 27 false - - + + U3xBPTFATz1Qb3RzZGFtLCBFcmljaC1BcmVuZHQtU3RyLkBYPTEzMDUwNjI5QFk9NTI0MjI3ODBAVT04NkBMPTIzMDIxMjAyQHxQb3RzZGFtLCBFcmljaC1BcmVuZHQtU3RyLnwxMy4wNTA2Mjl8NTIuNDIyNzh8ZmFsc2U- Potsdam, Erich-Arendt-Str. @@ -3047,8 +3047,8 @@ 28 false - - + + U3xBPTFATz1Qb3RzZGFtLCBSb3RlIEthc2VybmVAWD0xMzA1Mzc3NUBZPTUyNDI0OTE5QFU9ODZATD0yMzAxNTkwMUB8UG90c2RhbSwgUm90ZSBLYXNlcm5lfDEzLjA1Mzc3NXw1Mi40MjQ5MTl8ZmFsc2U- Potsdam, Rote Kaserne @@ -3061,7 +3061,7 @@ 29 false - + U3xBPTFATz1Qb3RzZGFtLCBDYW1wdXMgSnVuZ2Zlcm5zZWVAWD0xMzA1NDU1OEBZPTUyNDMyNDQzQFU9ODZATD0yMzAyMDAwMkB8UG90c2RhbSwgQ2FtcHVzIEp1bmdmZXJuc2VlfDEzLjA1NDU1OHw1Mi40MzI0NDN8ZmFsc2U- @@ -3109,7 +3109,7 @@ 2023-06-17T12:23:00+02:00 - + U3xBPTFATz1Qb3RzZGFtLCBBbXVuZHNlbnN0ci4vTmVkbGl0emVyIFN0ci5AWD0xMzA1MjE0OEBZPTUyNDM1MzgzQFU9ODZATD0yMzAxNzEwMkB8UG90c2RhbSwgQW11bmRzZW5zdHIuL05lZGxpdHplciBTdHIufDEzLjA1MjE0OHw1Mi40MzUzODN8ZmFsc2U- Potsdam, Amundsenstr./Nedlitzer Str. @@ -3122,8 +3122,8 @@ 1 false - - + + U3xBPTFATz1Qb3RzZGFtLCBSw7ZtZXJzY2hhbnplQFg9MTMwNTAyMTZAWT01MjQzODY3M0BVPTg2QEw9MjIwMzAwMDJAfFBvdHNkYW0sIFLDtm1lcnNjaGFuemV8MTMuMDUwMjE2fDUyLjQzODY3M3xmYWxzZQ-- Potsdam, Römerschanze @@ -3136,8 +3136,8 @@ 2 false - - + + U3xBPTFATz1Qb3RzZGFtLCBIZWlucmljaC1IZWluZS1XZWdAWD0xMzA0Njg2M0BZPTUyNDQzMzc0QFU9ODZATD0yMjAzMDEwMkB8UG90c2RhbSwgSGVpbnJpY2gtSGVpbmUtV2VnfDEzLjA0Njg2M3w1Mi40NDMzNzR8ZmFsc2U- Potsdam, Heinrich-Heine-Weg @@ -3150,8 +3150,8 @@ 3 false - - + + U3xBPTFATz1Qb3RzZGFtLCBCYXNzZXdpdHpAWD0xMzA0NjEyNkBZPTUyNDQ4MzE4QFU9ODZATD0yMjAzMDIwMkB8UG90c2RhbSwgQmFzc2V3aXR6fDEzLjA0NjEyNnw1Mi40NDgzMTh8ZmFsc2U- Potsdam, Bassewitz @@ -3164,8 +3164,8 @@ 4 false - - + + U3xBPTFATz1Qb3RzZGFtLCBLcmFtcG5pdHpzZWVAWD0xMzA1MTQ0N0BZPTUyNDU4ODQ0QFU9ODZATD0yMjAzMTQwMkB8UG90c2RhbSwgS3JhbXBuaXR6c2VlfDEzLjA1MTQ0N3w1Mi40NTg4NDR8ZmFsc2U- Potsdam, Krampnitzsee @@ -3178,8 +3178,8 @@ 5 false - - + + U3xBPTFATz1Qb3RzZGFtLCBCdWxsZW53aW5rZWxAWD0xMzA4MDA3OEBZPTUyNDYzMjEzQFU9ODZATD0yMjAzMzEwMkB8UG90c2RhbSwgQnVsbGVud2lua2VsfDEzLjA4MDA3OHw1Mi40NjMyMTN8ZmFsc2U- Potsdam, Bullenwinkel @@ -3192,8 +3192,8 @@ 6 false - - + + U3xBPTFATz1Qb3RzZGFtLCBBbSBTY2hsYWhuQFg9MTMwOTQyNzJAWT01MjQ2NzkwNkBVPTg2QEw9MjIwMzMyMDJAfFBvdHNkYW0sIEFtIFNjaGxhaG58MTMuMDk0MjcyfDUyLjQ2NzkwNnxmYWxzZQ-- Potsdam, Am Schlahn @@ -3206,8 +3206,8 @@ 7 false - - + + U3xBPTFATz1Qb3RzZGFtLCBCaXJrZW53ZWdAWD0xMzEwMTc3OEBZPTUyNDY5NjQwQFU9ODZATD0yMjAzMzMwMkB8UG90c2RhbSwgQmlya2Vud2VnfDEzLjEwMTc3OHw1Mi40Njk2NHxmYWxzZQ-- Potsdam, Birkenweg @@ -3220,8 +3220,8 @@ 8 false - - + + U3xBPTFATz1Qb3RzZGFtLCBIZWNodHNwcnVuZ0BYPTEzMTAxNTA4QFk9NTI0NjU5NzNAVT04NkBMPTIyMDMzOTAyQHxQb3RzZGFtLCBIZWNodHNwcnVuZ3wxMy4xMDE1MDh8NTIuNDY1OTczfGZhbHNl Potsdam, Hechtsprung @@ -3234,8 +3234,8 @@ 9 false - - + + U3xBPTFATz1Qb3RzZGFtLCBTYWNyb3dlciBBbGxlZS9SLi1XYWduZXItU3RyLkBYPTEzMTAxNjA3QFk9NTI0NjE1NjhAVT04NkBMPTIxMDMzNDAyQHxQb3RzZGFtLCBTYWNyb3dlciBBbGxlZS9SLi1XYWduZXItU3RyLnwxMy4xMDE2MDd8NTIuNDYxNTY4fGZhbHNl Potsdam, Sacrower Allee/R.-Wagner-Str. @@ -3248,8 +3248,8 @@ 10 false - - + + U3xBPTFATz1Qb3RzZGFtLCBGLi1Hw7xudGhlci1QYXJrQFg9MTMxMDY0NTJAWT01MjQ2MTkyOEBVPTg2QEw9MjIwMzM1MDJAfFBvdHNkYW0sIEYuLUfDvG50aGVyLVBhcmt8MTMuMTA2NDUyfDUyLjQ2MTkyOHxmYWxzZQ-- Potsdam, F.-Günther-Park @@ -3262,8 +3262,8 @@ 11 false - - + + U3xBPTFATz1Qb3RzZGFtLCBBbSBBbmdlckBYPTEzMTA3MDk5QFk9NTI0NjYyMTZAVT04NkBMPTIyMDM0MjAyQHxQb3RzZGFtLCBBbSBBbmdlcnwxMy4xMDcwOTl8NTIuNDY2MjE2fGZhbHNl Potsdam, Am Anger @@ -3276,8 +3276,8 @@ 12 false - - + + U3xBPTFATz1Qb3RzZGFtLCBLaXJjaGUgR3Jvw58gR2xpZW5pY2tlQFg9MTMxMDg3MjdAWT01MjQ2OTI5OUBVPTg2QEw9MjIwMzM3MDJAfFBvdHNkYW0sIEtpcmNoZSBHcm.DnyBHbGllbmlja2V8MTMuMTA4NzI3fDUyLjQ2OTI5OXxmYWxzZQ-- Potsdam, Kirche Groß Glienicke @@ -3290,8 +3290,8 @@ 13 false - - + + U3xBPTFATz1Qb3RzZGFtLCBBbSBQYXJrQFg9MTMxMTE2ODRAWT01MjQ3MzgyOUBVPTg2QEw9MjIwMzM4MDJAfFBvdHNkYW0sIEFtIFBhcmt8MTMuMTExNjg0fDUyLjQ3MzgyOXxmYWxzZQ-- Potsdam, Am Park @@ -3304,8 +3304,8 @@ 14 false - - + + U3xBPTFATz1SaXR0ZXJmZWxkZGFtbS9Qb3RzZGFtZXIgQ2hhdXNzZWUgKEJlcmxpbilAWD0xMzEyMDE3MEBZPTUyNDc3NTQyQFU9ODZATD0zMDY5NTYwMDJAfFJpdHRlcmZlbGRkYW1tL1BvdHNkYW1lciBDaGF1c3NlZSAoQmVybGluKXwxMy4xMjAxN3w1Mi40Nzc1NDJ8ZmFsc2U- Ritterfelddamm/Potsdamer Chaussee (Berlin) @@ -3318,8 +3318,8 @@ 15 false - - + + U3xBPTFATz1BdcOfZW53ZWcgKEJlcmxpbilAWD0xMzEzNTU0MUBZPTUyNDg1MjI4QFU9ODZATD0zMDUxMTkwMDJAfEF1w59lbndlZyAoQmVybGluKXwxMy4xMzU1NDF8NTIuNDg1MjI4fGZhbHNl Außenweg (Berlin) @@ -3332,8 +3332,8 @@ 16 false - - + + U3xBPTFATz1MYW5kc2NoYWZ0c2ZyaWVkaG9mIEdhdG93IChCZXJsaW4pQFg9MTMxNTI4OTFAWT01MjQ5ODI5OEBVPTg2QEw9MzA2Njk3MDAyQHxMYW5kc2NoYWZ0c2ZyaWVkaG9mIEdhdG93IChCZXJsaW4pfDEzLjE1Mjg5MXw1Mi40OTgyOTh8ZmFsc2U- Landschaftsfriedhof Gatow (Berlin) @@ -3346,8 +3346,8 @@ 17 false - - + + U3xBPTFATz1LYXJvbGluZW5ow7ZoZSAoQmVybGluKUBYPTEzMTY4MTk5QFk9NTI1MDg3MjZAVT04NkBMPTMwNjUyNjAwMkB8S2Fyb2xpbmVuaMO2aGUgKEJlcmxpbil8MTMuMTY4MTk5fDUyLjUwODcyNnxmYWxzZQ-- Karolinenhöhe (Berlin) @@ -3360,8 +3360,8 @@ 18 false - - + + U3xBPTFATz1XZWlubWVpc3Rlcmhvcm53ZWcgKEJlcmxpbilAWD0xMzE3MTk5M0BZPTUyNTExMzMyQFU9ODZATD0zMDU5NzEwMDFAfFdlaW5tZWlzdGVyaG9ybndlZyAoQmVybGluKXwxMy4xNzE5OTN8NTIuNTExMzMyfGZhbHNl Weinmeisterhornweg (Berlin) @@ -3374,8 +3374,8 @@ 19 false - - + + U3xBPTFATz1Sb2RlbnN0ZWluc3RyLiAoQmVybGluKUBYPTEzMTc0NzcwQFk9NTI1MTM2MzRAVT04NkBMPTMwNjk2NzAwMkB8Um9kZW5zdGVpbnN0ci4gKEJlcmxpbil8MTMuMTc0Nzd8NTIuNTEzNjM0fGZhbHNl Rodensteinstr. (Berlin) @@ -3388,8 +3388,8 @@ 20 false - - + + U3xBPTFATz1IZWVyc3RyLi9XaWxoZWxtc3RyLiAoQmVybGluKUBYPTEzMTc4NTM3QFk9NTI1MTYyMzJAVT04NkBMPTMwMDQwNDAwMkB8SGVlcnN0ci4vV2lsaGVsbXN0ci4gKEJlcmxpbil8MTMuMTc4NTM3fDUyLjUxNjIzMnxmYWxzZQ-- Heerstr./Wilhelmstr. (Berlin) @@ -3402,8 +3402,8 @@ 21 false - - + + U3xBPTFATz1BbSBPbW5pYnVzaG9mIChCZXJsaW4pQFg9MTMxODU3MzdAWT01MjUxNzcyNEBVPTg2QEw9MzAwMzkxMDAzQHxBbSBPbW5pYnVzaG9mIChCZXJsaW4pfDEzLjE4NTczN3w1Mi41MTc3MjR8ZmFsc2U- Am Omnibushof (Berlin) @@ -3416,8 +3416,8 @@ 22 false - - + + U3xBPTFATz1NZWxhbmNodGhvbnBsYXR6IChCZXJsaW4pQFg9MTMxODk2MTFAWT01MjUyMTkyMkBVPTg2QEw9MzAwMzg5MDAzQHxNZWxhbmNodGhvbnBsYXR6IChCZXJsaW4pfDEzLjE4OTYxMXw1Mi41MjE5MjJ8ZmFsc2U- Melanchthonplatz (Berlin) @@ -3430,8 +3430,8 @@ 23 false - - + + U3xBPTFATz1NZXR6ZXIgU3RyLiAoQmVybGluKUBYPTEzMTkzODAwQFk9NTI1MjUyMDNAVT04NkBMPTMwNjc2ODAwMUB8TWV0emVyIFN0ci4gKEJlcmxpbil8MTMuMTkzOHw1Mi41MjUyMDN8ZmFsc2U- Metzer Str. (Berlin) @@ -3444,8 +3444,8 @@ 24 false - - + + U3xBPTFATz1aaWVnZWxob2YgKEJlcmxpbilAWD0xMzE5NTcwNkBZPTUyNTI4Nzk4QFU9ODZATD0zMDAzODYwMDNAfFppZWdlbGhvZiAoQmVybGluKXwxMy4xOTU3MDZ8NTIuNTI4Nzk4fGZhbHNl Ziegelhof (Berlin) @@ -3458,8 +3458,8 @@ 25 false - - + + U3xBPTFATz1CcnVuc2LDvHR0ZWxlciBEYW1tL1J1aGxlYmVuZXIgU3RyLiAoQmVybGluKUBYPTEzMTk4MjU5QFk9NTI1MzI0MzlAVT04NkBMPTMwMDM3NjAwNEB8QnJ1bnNiw7x0dGVsZXIgRGFtbS9SdWhsZWJlbmVyIFN0ci4gKEJlcmxpbil8MTMuMTk4MjU5fDUyLjUzMjQzOXxmYWxzZQ-- Brunsbütteler Damm/Ruhlebener Str. (Berlin) @@ -3472,7 +3472,7 @@ 26 false - + U3xBPTFATz1TK1UgUmF0aGF1cyBTcGFuZGF1IChCZXJsaW4pQFg9MTMyMDAwNTdAWT01MjUzNTEwMEBVPTg2QEw9MzAwMTY0MDEzQHxTK1UgUmF0aGF1cyBTcGFuZGF1IChCZXJsaW4pfDEzLjIwMDA1N3w1Mi41MzUxfGZhbHNl @@ -3545,7 +3545,7 @@ 2023-06-17T13:17:00+02:00 - + U3xBPTFATz1XaXR0ZW5iZXJnZSwgQmFobmhvZiAoQnVzKUBYPTExNzYyMTY5QFk9NTMwMDAwMDRAVT04NkBMPTEwMjQ3MjM2QHxXaXR0ZW5iZXJnZSwgQmFobmhvZiAoQnVzKXwxMS43NjIxNjl8NTMuMDAwMDA0fGZhbHNl Wittenberge, Bahnhof (Bus) @@ -3558,8 +3558,8 @@ 11 false - - + + U3xBPTFATz1MdWR3aWdzbHVzdCBCYWhuaG9mQFg9MTE0OTQwMzBAWT01MzMzNDkxNUBVPTg2QEw9MTA0NzgyMDNAfEx1ZHdpZ3NsdXN0IEJhaG5ob2Z8MTEuNDk0MDN8NTMuMzM0OTE1fGZhbHNl Ludwigslust Bahnhof @@ -3572,8 +3572,8 @@ 12 false - - + + U3xBPTFATz1Cw7xjaGVuQFg9MTA2MjI5MzBAWT01MzQ3NTIzN0BVPTg2QEw9MTA0OTI1NTVAfELDvGNoZW58MTAuNjIyOTN8NTMuNDc1MjM3fGZhbHNl Büchen @@ -3586,7 +3586,7 @@ 13 false - + U3xBPTFATz1IYW1idXJnIEhiZkBYPTEwMDA3NDkzQFk9NTM1NTIzODJAVT04NkBMPTExMDk1MDAzQHxIYW1idXJnIEhiZnwxMC4wMDc0OTN8NTMuNTUyMzgyfGZhbHNl @@ -3661,7 +3661,7 @@ 2023-06-17T15:15:00+02:00 - + U3xBPTFATz1IYW1idXJnLUhhcmJ1cmdAWD05OTkwOTUzQFk9NTM0NTYzODZAVT04NkBMPTEwNDk0MDgxQHxIYW1idXJnLUhhcmJ1cmd8OS45OTA5NTN8NTMuNDU2Mzg2fGZhbHNl Hamburg-Harburg @@ -3674,8 +3674,8 @@ 1 false - - + + U3xBPTFATz1CdWNoaG9seiAoTm9yZGhlaWRlKUBYPTk4NzU3MDJAWT01MzMyNDczOUBVPTg2QEw9MTAwMDA3MDRAfEJ1Y2hob2x6IChOb3JkaGVpZGUpfDkuODc1NzAyfDUzLjMyNDczOXxmYWxzZQ-- Buchholz (Nordheide) @@ -3688,8 +3688,8 @@ 2 false - - + + U3xBPTFATz1Ub3N0ZWR0QFg9OTczMTYwNUBZPTUzMjcxODgzQFU9ODZATD0xMDAwODEwMUB8VG9zdGVkdHw5LjczMTYwNXw1My4yNzE4ODN8ZmFsc2U- Tostedt @@ -3702,8 +3702,8 @@ 3 false - - + + U3xBPTFATz1Sb3RlbmJ1cmcoV8O8bW1lKUBYPTkzOTA2ODBAWT01MzExMjUwNEBVPTg2QEw9MTA0OTQwNzlAfFJvdGVuYnVyZyhXw7xtbWUpfDkuMzkwNjh8NTMuMTEyNTA0fGZhbHNl Rotenburg(Wümme) @@ -3716,7 +3716,7 @@ 4 false - + U3xBPTFATz1CcmVtZW4gSGJmQFg9ODgxMzcxN0BZPTUzMDgzNDYwQFU9ODZATD0xMDQ5MjY4NUB8QnJlbWVuIEhiZnw4LjgxMzcxN3w1My4wODM0Nnx0cnVl @@ -3791,7 +3791,7 @@ 2023-06-17T16:36:00+02:00 - + U3xBPTFATz1CcmVtZW4gSGVyZGVudG9yQFg9ODgwOTg0MkBZPTUzMDc5NTUwQFU9ODZATD0xMDQyMDU4N0B8QnJlbWVuIEhlcmRlbnRvcnw4LjgwOTg0Mnw1My4wNzk1NXxmYWxzZQ-- Bremen Herdentor @@ -3804,8 +3804,8 @@ 14 false - - + + U3xBPTFATz1CcmVtZW4gU2Now7xzc2Vsa29yYkBYPTg4MDk0NTZAWT01MzA3NzI1N0BVPTg2QEw9MTA0MjEyNTRAfEJyZW1lbiBTY2jDvHNzZWxrb3JifDguODA5NDU2fDUzLjA3NzI1N3xmYWxzZQ-- Bremen Schüsselkorb @@ -3818,8 +3818,8 @@ 15 false - - + + U3xBPTFATz1CcmVtZW4gRG9tc2hlaWRlQFg9ODgwNzkzNkBZPTUzMDc0MzgxQFU9ODZATD0xMDQyMDE4OEB8QnJlbWVuIERvbXNoZWlkZXw4LjgwNzkzNnw1My4wNzQzODF8ZmFsc2U- Bremen Domsheide @@ -3832,8 +3832,8 @@ 16 false - - + + U3xBPTFATz1CcmVtZW4gV2lsaGVsbS1LYWlzZW4tQnLDvGNrZUBYPTg4MDMzMDdAWT01MzA3MjEyNEBVPTg2QEw9MTA0MjE2MTVAfEJyZW1lbiBXaWxoZWxtLUthaXNlbi1CcsO8Y2tlfDguODAzMzA3fDUzLjA3MjEyNHxmYWxzZQ-- Bremen Wilhelm-Kaisen-Brücke @@ -3846,8 +3846,8 @@ 17 false - - + + U3xBPTFATz1CcmVtZW4gVGhlYXRlciBhbSBMZWlibml6cGxhdHpAWD04Nzk5MTkwQFk9NTMwNjk3NDJAVT04NkBMPTEwNDIxNDI4QHxCcmVtZW4gVGhlYXRlciBhbSBMZWlibml6cGxhdHp8OC43OTkxOXw1My4wNjk3NDJ8ZmFsc2U- Bremen Theater am Leibnizplatz @@ -3860,8 +3860,8 @@ 18 false - - + + U3xBPTFATz1CcmVtZW4gR2FzdGZlbGRzdHJhw59lQFg9ODc5NDI0NkBZPTUzMDY2Nzk0QFU9ODZATD0xMDQyMDM4NUB8QnJlbWVuIEdhc3RmZWxkc3RyYcOfZXw4Ljc5NDI0Nnw1My4wNjY3OTR8ZmFsc2U- Bremen Gastfeldstraße @@ -3874,8 +3874,8 @@ 19 false - - + + U3xBPTFATz1CcmVtZW4gU2NobGVpZXJtYWNoZXJzdHJhw59lQFg9ODc4OTI2NkBZPTUzMDYzNjY2QFU9ODZATD0xMDQyMTIyMUB8QnJlbWVuIFNjaGxlaWVybWFjaGVyc3RyYcOfZXw4Ljc4OTI2Nnw1My4wNjM2NjZ8ZmFsc2U- Bremen Schleiermacherstraße @@ -3888,8 +3888,8 @@ 20 false - - + + U3xBPTFATz1CcmVtZW4gQlNBRy1aZW50cnVtQFg9ODc4NTI3NUBZPTUzMDYxMDk1QFU9ODZATD0xMDQxOTg4OUB8QnJlbWVuIEJTQUctWmVudHJ1bXw4Ljc4NTI3NXw1My4wNjEwOTV8ZmFsc2U- Bremen BSAG-Zentrum @@ -3902,8 +3902,8 @@ 21 false - - + + U3xBPTFATz1CcmVtZW4gTmV1ZW5sYW5kZXIgS8OkbXBlQFg9ODc4NDEwNkBZPTUzMDU2NTE5QFU9ODZATD0xMDQyMDk4M0B8QnJlbWVuIE5ldWVubGFuZGVyIEvDpG1wZXw4Ljc4NDEwNnw1My4wNTY1MTl8ZmFsc2U- Bremen Neuenlander Kämpe @@ -3916,7 +3916,7 @@ 22 false - + U3xBPTFATz1CcmVtZW4gRmx1Z2hhZmVuQFg9ODc4NjQzNEBZPTUzMDUyNzI2QFU9ODZATD0xMDQyMDMyOEB8QnJlbWVuIEZsdWdoYWZlbnw4Ljc4NjQzNHw1My4wNTI3MjZ8dHJ1ZQ-- diff --git a/examples/eu_spirit/2023.06.16.eus.ojp.t.response.xml b/examples/eu_spirit/2023.06.16.eus.ojp.t.response.xml index d5c362a21..705aeed50 100644 --- a/examples/eu_spirit/2023.06.16.eus.ojp.t.response.xml +++ b/examples/eu_spirit/2023.06.16.eus.ojp.t.response.xml @@ -1420,7 +1420,7 @@ 2023-06-22T12:14:00+02:00 - + U3xBPTFATz1Qb3RzZGFtLCBBbSBTY2hyYWdlbkBYPTEzMDU0NDg2QFk9NTI0MTMxMDdAVT04NkBMPTIzMDE1NzAyQHxQb3RzZGFtLCBBbSBTY2hyYWdlbnwxMy4wNTQ0ODZ8NTIuNDEzMTA3fGZhbHNl Potsdam, Am Schragen @@ -1433,8 +1433,8 @@ 4 false - - + + U3xBPTFATz1Qb3RzZGFtLCBQdXNjaGtpbmFsbGVlQFg9MTMwNTkwMDdAWT01MjQxMTY5NkBVPTg2QEw9MjMwMDc2MDFAfFBvdHNkYW0sIFB1c2Noa2luYWxsZWV8MTMuMDU5MDA3fDUyLjQxMTY5NnxmYWxzZQ-- Potsdam, Puschkinallee @@ -1447,8 +1447,8 @@ 5 false - - + + U3xBPTFATz1Qb3RzZGFtLCBSZWl0ZXJ3ZWcvQWxsZWVzdHIuQFg9MTMwNTg1MzFAWT01MjQwODM5N0BVPTg2QEw9MjMwMDI0MDFAfFBvdHNkYW0sIFJlaXRlcndlZy9BbGxlZXN0ci58MTMuMDU4NTMxfDUyLjQwODM5N3xmYWxzZQ-- Potsdam, Reiterweg/Alleestr. @@ -1461,8 +1461,8 @@ 6 false - - + + U3xBPTFATz1Qb3RzZGFtLCBSYXRoYXVzQFg9MTMwNTgwMDlAWT01MjQwNTIyNEBVPTg2QEw9MzAxMDQyMDAxQHxQb3RzZGFtLCBSYXRoYXVzfDEzLjA1ODAwOXw1Mi40MDUyMjR8ZmFsc2U- Potsdam, Rathaus @@ -1475,8 +1475,8 @@ 7 false - - + + U3xBPTFATz1Qb3RzZGFtLCBOYXVlbmVyIFRvckBYPTEzMDU3ODM5QFk9NTI0MDI4MjRAVT04NkBMPTIzMDAyMjAxQHxQb3RzZGFtLCBOYXVlbmVyIFRvcnwxMy4wNTc4Mzl8NTIuNDAyODI0fGZhbHNl Potsdam, Nauener Tor @@ -1489,8 +1489,8 @@ 8 false - - + + U3xBPTFATz1Qb3RzZGFtLCBCcmFuZGVuYnVyZ2VyIFN0ci5AWD0xMzA1NzY5NUBZPTUyNDAwOTU0QFU9ODZATD0yMzAyMDUwMUB8UG90c2RhbSwgQnJhbmRlbmJ1cmdlciBTdHIufDEzLjA1NzY5NXw1Mi40MDA5NTR8ZmFsc2U- Potsdam, Brandenburger Str. @@ -1503,8 +1503,8 @@ 9 false - - + + U3xBPTFATz1Qb3RzZGFtLCBQbGF0eiBkZXIgRWluaGVpdC9XZXN0QFg9MTMwNTc5NzNAWT01MjM5ODU3MkBVPTg2QEw9MjMwMDE0MDFAfFBvdHNkYW0sIFBsYXR6IGRlciBFaW5oZWl0L1dlc3R8MTMuMDU3OTczfDUyLjM5ODU3MnxmYWxzZQ-- Potsdam, Platz der Einheit/West @@ -1517,8 +1517,8 @@ 10 false - - + + U3xBPTFATz1Qb3RzZGFtLCBBbHRlciBNYXJrdC9MYW5kdGFnQFg9MTMwNTkyMzJAWT01MjM5NDg0MUBVPTg2QEw9MjMwMDE4MDFAfFBvdHNkYW0sIEFsdGVyIE1hcmt0L0xhbmR0YWd8MTMuMDU5MjMyfDUyLjM5NDg0MXxmYWxzZQ-- Potsdam, Alter Markt/Landtag @@ -1531,8 +1531,8 @@ 11 false - - + + U3xBPTFATz1Qb3RzZGFtLCBMYW5nZSBCcsO8Y2tlQFg9MTMwNjM3MjdAWT01MjM5MjAzN0BVPTg2QEw9MjMwMDk3MDJAfFBvdHNkYW0sIExhbmdlIEJyw7xja2V8MTMuMDYzNzI3fDUyLjM5MjAzN3xmYWxzZQ-- Potsdam, Lange Brücke @@ -1545,7 +1545,7 @@ 12 false - + U3xBPTFATz1TIFBvdHNkYW0gSGF1cHRiYWhuaG9mQFg9MTMwNjYzNjlAWT01MjM5MDkzMUBVPTg2QEw9MjMwOTk5MDFAfFMgUG90c2RhbSBIYXVwdGJhaG5ob2Z8MTMuMDY2MzY5fDUyLjM5MDkzMXx0cnVl @@ -1618,7 +1618,7 @@ 2023-06-22T12:31:00+02:00 - + U3xBPTFATz1XZXJkZXIgKEhhdmVsKSwgQmFobmhvZkBYPTEyOTI2ODMwQFk9NTIzOTI5OThAVT04NkBMPTMwMDU2NjAwMkB8V2VyZGVyIChIYXZlbCksIEJhaG5ob2Z8MTIuOTI2ODN8NTIuMzkyOTk4fGZhbHNl Werder (Havel), Bahnhof @@ -1631,8 +1631,8 @@ 3 false - - + + U3xBPTFATz1CcmFuZGVuYnVyZywgSGF1cHRiYWhuaG9mQFg9MTI1NjUyNTdAWT01MjQwMDQzMkBVPTg2QEw9Mjc1MTEwNTBAfEJyYW5kZW5idXJnLCBIYXVwdGJhaG5ob2Z8MTIuNTY1MjU3fDUyLjQwMDQzMnx0cnVl Brandenburg, Hauptbahnhof @@ -1645,8 +1645,8 @@ 4 false - - + + U3xBPTFATz1CcmFuZGVuYnVyZywgS2lyY2htw7ZzZXIgQmhmQFg9MTI0MjE3ODlAWT01MjM3NTY0MEBVPTg2QEw9Mjc1NzE5NTBAfEJyYW5kZW5idXJnLCBLaXJjaG3DtnNlciBCaGZ8MTIuNDIxNzg5fDUyLjM3NTY0fGZhbHNl Brandenburg, Kirchmöser Bhf @@ -1659,8 +1659,8 @@ 5 false - - + + U3xBPTFATz1XdXN0ZXJ3aXR6LCBCYWhuaG9mQFg9MTIzNzEzMTRAWT01MjM4NTUzN0BVPTg2QEw9MjIwMjQ5NTFAfFd1c3RlcndpdHosIEJhaG5ob2Z8MTIuMzcxMzE0fDUyLjM4NTUzN3xmYWxzZQ-- Wusterwitz, Bahnhof @@ -1673,8 +1673,8 @@ 6 false - - + + U3xBPTFATz1HZW50aGluQFg9MTIxNTcxMTBAWT01MjQwMzIxOUBVPTg2QEw9MTAwODkxNzRAfEdlbnRoaW58MTIuMTU3MTF8NTIuNDAzMjE5fGZhbHNl Genthin @@ -1687,8 +1687,8 @@ 7 false - - + + U3xBPTFATz1Hw7xzZW4oYiBHZW50aGluKUBYPTExOTc3ODU3QFk9NTIzMzQ4OTJAVT04NkBMPTEwMDg5MTc5QHxHw7xzZW4oYiBHZW50aGluKXwxMS45Nzc4NTd8NTIuMzM0ODkyfGZhbHNl Güsen(b Genthin) @@ -1701,8 +1701,8 @@ 8 false - - + + U3xBPTFATz1CdXJnKE1hZ2RlYnVyZylAWD0xMTg0MDM0OUBZPTUyMjc0NDEzQFU9ODZATD0xMDA4OTMxMUB8QnVyZyhNYWdkZWJ1cmcpfDExLjg0MDM0OXw1Mi4yNzQ0MTN8ZmFsc2U- Burg(Magdeburg) @@ -1715,8 +1715,8 @@ 9 false - - + + U3xBPTFATz1NYWdkZWJ1cmctTmV1c3RhZHRAWD0xMTY0MTY5NkBZPTUyMTQ4ODQyQFU9ODZATD0xMDA4OTIwOEB8TWFnZGVidXJnLU5ldXN0YWR0fDExLjY0MTY5Nnw1Mi4xNDg4NDJ8ZmFsc2U- Magdeburg-Neustadt @@ -1729,7 +1729,7 @@ 10 false - + U3xBPTFATz1NYWdkZWJ1cmcgSGJmQFg9MTE2MjY4OTFAWT01MjEzMDM1MkBVPTg2QEw9MTAwODkyMDdAfE1hZ2RlYnVyZyBIYmZ8MTEuNjI2ODkxfDUyLjEzMDM1Mnx0cnVl diff --git a/examples/functions/trip/TR_02_response_geoposition_2_geoposition.xml b/examples/functions/trip/TR_02_response_geoposition_2_geoposition.xml index d5a1b8cf6..fd07e1476 100644 --- a/examples/functions/trip/TR_02_response_geoposition_2_geoposition.xml +++ b/examples/functions/trip/TR_02_response_geoposition_2_geoposition.xml @@ -207,7 +207,7 @@ 1 - + 8591165 Zürich, Grimselstrasse @@ -219,8 +219,8 @@ 2020-12-01T12:01:00Z 2 - - + + 8591222 Zürich, Kappeli @@ -232,8 +232,8 @@ 2020-12-01T12:03:00Z 3 - - + + 8591138 Zürich, Freihofstrasse @@ -245,8 +245,8 @@ 2020-12-01T12:04:00Z 4 - - + + 8591252 Zürich, Letzigrund @@ -258,8 +258,8 @@ 2020-12-01T12:05:00Z 5 - - + + 8591038 Zürich, Albisriederplatz @@ -271,8 +271,8 @@ 2020-12-01T12:06:00Z 6 - - + + 8591448 Zürich, Zypressenstrasse @@ -284,8 +284,8 @@ 2020-12-01T12:08:00Z 7 - - + + 8591259 Zürich, Lochergut @@ -297,8 +297,8 @@ 2020-12-01T12:09:00Z 8 - - + + 8591218 Zürich,Kalkbreite/Bhf.Wiedikon @@ -310,8 +310,8 @@ 2020-12-01T12:10:00Z 9 - - + + 8591079 Zürich, Bezirksgebäude @@ -323,8 +323,8 @@ 2020-12-01T12:11:00Z 10 - - + + 8591381 Zürich, Stauffacher @@ -336,8 +336,8 @@ 2020-12-01T12:14:00Z 11 - - + + 8591369 Zürich, Sihlstrasse @@ -349,8 +349,8 @@ 2020-12-01T12:16:00Z 12 - - + + 8591299 Zürich, Paradeplatz @@ -362,8 +362,8 @@ 2020-12-01T12:18:00Z 13 - - + + 8591093 Zürich, Kantonalbank @@ -375,8 +375,8 @@ 2020-12-01T12:19:00Z 14 - - + + 8591105 Zürich, Bürkliplatz @@ -388,7 +388,7 @@ 2020-12-01T12:21:00Z 15 - + 8576193 @@ -500,7 +500,7 @@ 1 - + 8503059 Zürich Stadelhofen FB @@ -512,8 +512,8 @@ 2020-12-01T12:26:00Z 2 - - + + 8530813 Zürich Kreuzplatz @@ -525,7 +525,7 @@ 2020-12-01T12:28:00Z 3 - + 8591364 @@ -1097,7 +1097,7 @@ 1 - + 8503020 Zürich Hardbrücke @@ -1112,8 +1112,8 @@ 2020-12-01T12:11:00Z 2 - - + + 8503000 Zürich HB @@ -1128,7 +1128,7 @@ 2020-12-01T12:16:00Z 3 - + 8503003 @@ -1365,7 +1365,7 @@ 1 - + 8530813 Zürich Kreuzplatz @@ -1377,7 +1377,7 @@ 2020-12-01T12:28:00Z 2 - + 8591364 diff --git a/examples/functions/trip/TR_03_response_search_by_StopPointName_many_params.xml b/examples/functions/trip/TR_03_response_search_by_StopPointName_many_params.xml index 7584c139a..133649671 100644 --- a/examples/functions/trip/TR_03_response_search_by_StopPointName_many_params.xml +++ b/examples/functions/trip/TR_03_response_search_by_StopPointName_many_params.xml @@ -74,7 +74,7 @@ 1 - + 8503015 Zürich Wipkingen @@ -89,8 +89,8 @@ 2020-12-01T11:47:00Z 2 - - + + 8503006 Zürich Oerlikon @@ -105,8 +105,8 @@ 2020-12-01T11:52:00Z 3 - - + + 8503016 Zürich Flughafen @@ -121,8 +121,8 @@ 2020-12-01T11:57:00Z 4 - - + + 8503307 Bassersdorf @@ -137,8 +137,8 @@ 2020-12-01T12:01:00Z 5 - - + + 8503305 Effretikon @@ -153,8 +153,8 @@ 2020-12-01T12:08:00Z 6 - - + + 8506000 Winterthur @@ -169,8 +169,8 @@ 2020-12-01T12:19:00Z 7 - - + + 8506047 Andelfingen @@ -185,8 +185,8 @@ 2020-12-01T12:30:00Z 8 - - + + 8503423 Neuhausen @@ -201,7 +201,7 @@ 2020-12-01T12:42:00Z 9 - + 8503424 @@ -314,7 +314,7 @@ 1 - + 8503003 Zürich Stadelhofen @@ -329,8 +329,8 @@ 2020-12-01T11:50:00Z 2 - - + + 8503147 Stettbach @@ -345,7 +345,7 @@ 2020-12-01T11:56:00Z 3 - + 8506000 @@ -465,7 +465,7 @@ 1 - + 8506047 Andelfingen @@ -480,8 +480,8 @@ 2020-12-01T12:30:00Z 2 - - + + 8503423 Neuhausen @@ -496,7 +496,7 @@ 2020-12-01T12:42:00Z 3 - + 8503424 diff --git a/examples/functions/trip/TR_07_response_Delemont_normal.xml b/examples/functions/trip/TR_07_response_Delemont_normal.xml index 6e735145a..fa98f1631 100644 --- a/examples/functions/trip/TR_07_response_Delemont_normal.xml +++ b/examples/functions/trip/TR_07_response_Delemont_normal.xml @@ -58,7 +58,7 @@ 1 - + 8581218 Delémont, La Promenade @@ -70,8 +70,8 @@ 2023-09-13T14:12:00Z 2 - - + + 8510379 Delémont, Château-Musée @@ -83,8 +83,8 @@ 2023-09-13T14:12:00Z 3 - - + + 8510378 Delémont, Hôtel de Ville @@ -96,8 +96,8 @@ 2023-09-13T14:13:00Z 4 - - + + 8583087 Delémont, Théâtre @@ -109,8 +109,8 @@ 2023-09-13T14:14:00Z 5 - - + + 8571983 Delémont, Le Ticle @@ -122,8 +122,8 @@ 2023-09-13T14:15:00Z 6 - - + + 8571982 Delémont, Av. de la gare @@ -135,7 +135,7 @@ 2023-09-13T14:16:00Z 7 - + 8571965 @@ -227,7 +227,7 @@ 1 - + 8571996 Delémont, ch. du Puits @@ -239,7 +239,7 @@ 2023-09-13T14:23:00Z 2 - + 8510185 diff --git a/examples/functions/trip/TR_08_response_dog.xml b/examples/functions/trip/TR_08_response_dog.xml index d4341f85f..4f32b0e24 100644 --- a/examples/functions/trip/TR_08_response_dog.xml +++ b/examples/functions/trip/TR_08_response_dog.xml @@ -68,7 +68,7 @@ 1 - + 8581218 Delémont, La Promenade @@ -80,8 +80,8 @@ 2023-09-13T14:12:00Z 2 - - + + 8510379 Delémont, Château-Musée @@ -93,8 +93,8 @@ 2023-09-13T14:12:00Z 3 - - + + 8510378 Delémont, Hôtel de Ville @@ -106,8 +106,8 @@ 2023-09-13T14:13:00Z 4 - - + + 8583087 Delémont, Théâtre @@ -119,8 +119,8 @@ 2023-09-13T14:14:00Z 5 - - + + 8571983 Delémont, Le Ticle @@ -132,8 +132,8 @@ 2023-09-13T14:15:00Z 6 - - + + 8571982 Delémont, Av. de la gare @@ -145,7 +145,7 @@ 2023-09-13T14:16:00Z 7 - + 8571965 @@ -237,7 +237,7 @@ 1 - + 8571996 Delémont, ch. du Puits @@ -249,7 +249,7 @@ 2023-09-13T14:23:00Z 2 - + 8510185 diff --git a/examples/functions/trip/TR_09_response_restricted_lines.xml b/examples/functions/trip/TR_09_response_restricted_lines.xml index 475a3e20b..298a01e71 100644 --- a/examples/functions/trip/TR_09_response_restricted_lines.xml +++ b/examples/functions/trip/TR_09_response_restricted_lines.xml @@ -59,7 +59,7 @@ 1 - + 8581218 Delémont, La Promenade @@ -71,8 +71,8 @@ 2023-09-13T14:12:00Z 2 - - + + 8510379 Delémont, Château-Musée @@ -84,8 +84,8 @@ 2023-09-13T14:12:00Z 3 - - + + 8510378 Delémont, Hôtel de Ville @@ -97,8 +97,8 @@ 2023-09-13T14:13:00Z 4 - - + + 8583087 Delémont, Théâtre @@ -110,8 +110,8 @@ 2023-09-13T14:14:00Z 5 - - + + 8571983 Delémont, Le Ticle @@ -123,8 +123,8 @@ 2023-09-13T14:15:00Z 6 - - + + 8571982 Delémont, Av. de la gare @@ -136,7 +136,7 @@ 2023-09-13T14:16:00Z 7 - + 8571965 @@ -228,7 +228,7 @@ 1 - + 8571996 Delémont, ch. du Puits @@ -240,7 +240,7 @@ 2023-09-13T14:23:00Z 2 - + 8510185 diff --git a/examples/functions/trip/TR_ParallelService.xml b/examples/functions/trip/TR_ParallelService.xml index f7b93dd73..2c669dde6 100644 --- a/examples/functions/trip/TR_ParallelService.xml +++ b/examples/functions/trip/TR_ParallelService.xml @@ -98,7 +98,7 @@ 1 - + 8504489 Bern Bümpliz Nord @@ -113,8 +113,8 @@ 2023-08-15T18:12:00Z 2 - - + + 8516154 Bern Brünnen Westside @@ -129,8 +129,8 @@ 2023-08-15T18:14:00Z 3 - - + + 8504487 Rosshäusern @@ -145,8 +145,8 @@ 2023-08-15T18:19:00Z 4 - - + + 8504486 Gümmenen @@ -161,8 +161,8 @@ 2023-08-15T18:24:00Z 5 - - + + 8504400 Kerzers @@ -177,8 +177,8 @@ 2023-08-15T18:31:00Z 6 - - + + 8504484 Müntschemier @@ -193,8 +193,8 @@ 2023-08-15T18:34:00Z 7 - - + + 8504483 Ins @@ -209,8 +209,8 @@ 2023-08-15T18:40:00Z 8 - - + + 8504482 Gampelen @@ -225,8 +225,8 @@ 2023-08-15T18:42:00Z 9 - - + + 8504490 Zihlbrücke @@ -238,8 +238,8 @@ 2023-08-15T18:44:00Z 10 - - + + 8504481 Marin-Epagnier @@ -254,8 +254,8 @@ 2023-08-15T18:47:00Z 11 - - + + 8504480 St-Blaise-Lac @@ -267,7 +267,7 @@ 2023-08-15T18:49:00Z 12 - + 8504221 diff --git a/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml b/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml index d085f17d9..316054842 100644 --- a/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml +++ b/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml @@ -38,7 +38,7 @@ All the rest of the information is minimalized and is not necessary accurate. 1 - + spp:2 Wien Meidling @@ -50,8 +50,8 @@ All the rest of the information is minimalized and is not necessary accurate. 2023-08-15T20:21:00Z 2 - - + + spp:3 Linz Hbf @@ -63,8 +63,8 @@ All the rest of the information is minimalized and is not necessary accurate. 2023-08-15T21:36:00Z 3 - - + + spp:4 Wels @@ -76,7 +76,7 @@ All the rest of the information is minimalized and is not necessary accurate. 2023-08-15T21:50:00Z 4 - + spp:5 @@ -168,7 +168,7 @@ All the rest of the information is minimalized and is not necessary accurate. 1 - + spp:6 Regensburg Hbf @@ -180,8 +180,8 @@ All the rest of the information is minimalized and is not necessary accurate. 2023-08-15T23:56:00Z 2 - - + + spp:7 Nürnberg Hbf @@ -193,7 +193,7 @@ All the rest of the information is minimalized and is not necessary accurate. 2023-08-15T01:51:00Z 3 - + spp:5 diff --git a/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml b/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml index 75317d722..369e1f93d 100644 --- a/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml +++ b/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml @@ -37,7 +37,7 @@ All the rest of the information is minimalized and is not necessary accurate. 1 - + 2 Wien Meidling @@ -49,8 +49,8 @@ All the rest of the information is minimalized and is not necessary accurate. 2023-08-15T20:21:00Z 2 - - + + 3 Linz Hbf @@ -62,8 +62,8 @@ All the rest of the information is minimalized and is not necessary accurate. 2023-08-15T21:36:00Z 3 - - + + 4 Wels @@ -75,8 +75,8 @@ All the rest of the information is minimalized and is not necessary accurate. 2023-08-15T21:50:00Z 4 - - + + 5 Passau Hbf @@ -88,8 +88,8 @@ All the rest of the information is minimalized and is not necessary accurate. 2023-08-15T22:53:00Z 5 - - + + 6 Regensburg Hbf @@ -101,8 +101,8 @@ All the rest of the information is minimalized and is not necessary accurate. 2023-08-15T23:56:00Z 6 - - + + 7 Nürnberg Hbf @@ -114,7 +114,7 @@ All the rest of the information is minimalized and is not necessary accurate. 2023-08-15T01:51:00Z 7 - + 20 diff --git a/examples/linking_alps/LA_Active_TR_Response.xml b/examples/linking_alps/LA_Active_TR_Response.xml index 7127822b6..5e18e13fc 100644 --- a/examples/linking_alps/LA_Active_TR_Response.xml +++ b/examples/linking_alps/LA_Active_TR_Response.xml @@ -8817,7 +8817,7 @@ 1 - + at:47:64809:0:1 Nauders, Norbertshöhe @@ -8829,8 +8829,8 @@ 2023-06-14T05:12:00Z 2 - - + + at:47:61112:0:2 Nauders, Mühle @@ -8842,8 +8842,8 @@ 2023-06-14T05:16:00Z 3 - - + + at:47:61095:0:2 Bergkastel @@ -8855,8 +8855,8 @@ 2023-06-14T05:18:00Z 4 - - + + at:47:61115:0:1 Nauders, Reschenpass @@ -8868,8 +8868,8 @@ 2023-06-14T05:19:00Z 5 - - + + it:22021:5:0:59 Passo Resia @@ -8881,8 +8881,8 @@ 2023-06-14T05:20:00Z 6 - - + + it:22021:6:0:1210 Resia, Paese Vecchio @@ -8894,8 +8894,8 @@ 2023-06-14T05:22:00Z 7 - - + + it:22021:7:0:60 Resia, Casa Culturale @@ -8907,8 +8907,8 @@ 2023-06-14T05:23:00Z 8 - - + + it:22021:8:0:61 Arlund @@ -8920,8 +8920,8 @@ 2023-06-14T05:25:00Z 9 - - + + it:22021:9:0:62 Curon, Lago @@ -8933,8 +8933,8 @@ 2023-06-14T05:28:00Z 10 - - + + it:22021:27:0:6905 Zona Artigianale S. Valentino @@ -8946,8 +8946,8 @@ 2023-06-14T05:31:00Z 11 - - + + it:22021:28:0:6903 S. Valentino, Rauten @@ -8959,8 +8959,8 @@ 2023-06-14T05:32:00Z 12 - - + + it:22021:29:0:63 S. Valentino, Caserma Vigili del Fuoco @@ -8972,8 +8972,8 @@ 2023-06-14T05:33:00Z 13 - - + + it:22021:31:0:64 S. Valentino, Posta @@ -8985,8 +8985,8 @@ 2023-06-14T05:33:00Z 14 - - + + it:22021:32:0:65 Case dei Pescatori @@ -8998,8 +8998,8 @@ 2023-06-14T05:35:00Z 15 - - + + it:22021:33:0:66 Haidepark @@ -9011,8 +9011,8 @@ 2023-06-14T05:40:00Z 16 - - + + it:22021:34:0:43 Burgusio, Rotatoria @@ -9024,8 +9024,8 @@ 2023-06-14T05:42:00Z 17 - - + + it:22021:164:0:1918 Malles, Bivio Clusio @@ -9037,7 +9037,7 @@ 2023-06-14T05:46:00Z 18 - + it:22021:36:1:40020 @@ -9120,7 +9120,7 @@ 1 - + it:22021:60:0:148 Glorenza, Porta Tubre @@ -9132,8 +9132,8 @@ 2023-06-14T06:25:00Z 2 - - + + it:22021:69:0:149 Montechiaro, Rotonda @@ -9145,8 +9145,8 @@ 2023-06-14T06:30:00Z 3 - - + + it:22021:70:0:190 Agumes @@ -9158,8 +9158,8 @@ 2023-06-14T06:33:00Z 4 - - + + it:22021:3097:0:3018 Prato allo Stelvio, Municipio @@ -9171,7 +9171,7 @@ 2023-06-14T06:35:00Z 5 - + it:22021:71:0:151 @@ -9254,7 +9254,7 @@ 1 - + it:22021:2500:0:40885 Prato allo Stelvio, Fonderia @@ -9266,8 +9266,8 @@ 2023-06-14T06:44:00Z 2 - - + + it:22021:1286:0:2047 Geierhof @@ -9279,8 +9279,8 @@ 2023-06-14T06:48:00Z 3 - - + + it:22021:77:0:154 Ponte Stelvio @@ -9292,8 +9292,8 @@ 2023-06-14T06:50:00Z 4 - - + + it:22021:78:0:6928 Masutt @@ -9305,8 +9305,8 @@ 2023-06-14T06:51:00Z 5 - - + + it:22021:2634:0:6929 Bivio Stelvio @@ -9318,8 +9318,8 @@ 2023-06-14T06:54:00Z 6 - - + + it:22021:80:0:157 Stelvio, Paese @@ -9331,7 +9331,7 @@ 2023-06-14T06:59:00Z 7 - + it:22021:81:0:158 From 6d0bb82fa7f37fd7e16d3ee7097d033056c4c8fd Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 09:27:52 +0000 Subject: [PATCH 09/20] Lint and update documentation tables --- docs/generated/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/generated/index.html b/docs/generated/index.html index f3b7ea84e..2f9034828 100644 --- a/docs/generated/index.html +++ b/docs/generated/index.html @@ -882,7 +882,7 @@

OJP - Open API for distributed Journey

TimedLegStructure

passenger LEG with timetabled schedule. Corresponds to a RIDE.

The element contains a sequence of the following elements:

LegBoard

1:1

+LegBoard

Stop/Station where boarding is done

LegIntermediate

0:*

+LegIntermediate

information about the intermediate passed stop points.

LegAlight

1:1

+LegAlight

Stop/Station to alight

Service

1:1

+DatedJourney

Service that is used for this leg.

LegAttribute

0:*

+LegAttribute

Attributes that are not valid on the whole service, but only on parts of the journey leg.

OperatingDays

OperatingDays

0:1

+OperatingDays

Bit string definition of operating days.

OperatingDaysDescription

0:1

+InternationalText

Textual description of the operation days, e.g. "monday to friday" or "not on holidays".

LegTrack

0:1

+LegTrack

Geographic embedding of this leg.

ParallelService

0:*

+ParallelService

Services running combined with at least parts of this journey, e.g. wing trains. The contained stop sequence interval refers to the original journey.

Infeasible

0:1

xs:boolean

Whether this trip cannot be used, due to operational delays and impossible transfers. Default is false.

Feasibility

0:*

Feasibility

Information about the feasibility of the TRIP, in particular with respect to the access features used.

SituationFullRefs

0:1

+SituationRefList

A list of references to SITUATIONs.

Extension

0:1

xs:anyType

11.15. The complex type LegStructure

-

LegStructure

a single stage of a TRIP that is made without change of MODE or service (ie: between each interchange)

The element contains a sequence of the following elements:

Id

1:1

LegObjectId

Id of this leg. Unique within trip result.

ParticipantRef

0:1

siri:ParticipantRefStructure

[equivalent of PARTICIPANT in SIRI] IT system that is participating in a communication with other participant(s)

Duration

0:1

xs:duration

The duration of the leg (e.g. from Transmodel PT RIDE LEG.Duration)

Then, the element contains one of the following elements:

a

ContinuousLeg

-1:1

+ContinuousLeg

Leg by a continuously available service or mode of transport.

b

TimedLeg

-1:1

+TimedLeg

Timetabled Leg.

c

TransferLeg

-1:1

+TransferLeg

Leg to connect between different services or modes of transport (interchanges).

Sustainability

EmissionCO2

0:1

+EmissionCO2

Estimation of CO2 emissions.

Changed

0:1

xs:boolean

TRUE if leg got changed by TripChange-Request.

11.16. The complex type TimedLegStructure

+

TimedLegStructure

passenger LEG with timetabled schedule. Corresponds to a RIDE.

The element contains a sequence of the following elements:

LegBoard

1:1

+LegBoard

Stop/Station where boarding is done

LegIntermediate

0:*

+LegIntermediate

information about the intermediate passed stop points.

LegAlight

1:1

+LegAlight

Stop/Station to alight

Service

1:1

+DatedJourney

Service that is used for this leg.

LegAttribute

0:*

+LegAttribute

Attributes that are not valid on the whole service, but only on parts of the journey leg.

Changed

0:1

xs:boolean

TRUE if leg got changed by TripChange-Request.

11.16. The complex type TimedLegStructure

From 28f5fe8d306850a302870acc41ab3b1daea2734f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 19 Sep 2023 11:28:27 +0200 Subject: [PATCH 10/20] Update examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml b/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml index 316054842..f34b8de1d 100644 --- a/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml +++ b/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml @@ -225,7 +225,7 @@ All the rest of the information is minimalized and is not necessary accurate. 1 - 4 + 3 DB:123111-12388 DB:123112311-123 From 1aa0774ee8f7a84f8904b0444f7b4eae0a40cbed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Gro=C3=9Fberndt?= Date: Tue, 19 Sep 2023 12:59:36 +0200 Subject: [PATCH 11/20] Update OJP_Trips.xsd Updated documentation --- OJP/OJP_Trips.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OJP/OJP_Trips.xsd b/OJP/OJP_Trips.xsd index c6113ca2f..e1803bd5c 100644 --- a/OJP/OJP_Trips.xsd +++ b/OJP/OJP_Trips.xsd @@ -635,7 +635,7 @@ - information about the intermediate passed stop points. + Information about the intermediate passed stop points. From 663e36ecb9ef47c041c180dbfe18c7bd8ff1c69e Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 11:00:16 +0000 Subject: [PATCH 12/20] Lint and update documentation tables --- docs/generated/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/generated/index.html b/docs/generated/index.html index 2f9034828..b69a8764d 100644 --- a/docs/generated/index.html +++ b/docs/generated/index.html @@ -882,7 +882,7 @@

OJP - Open API for distributed Journey

TimedLegStructure

passenger LEG with timetabled schedule. Corresponds to a RIDE.

The element contains a sequence of the following elements:

LegBoard

1:1

+LegBoard

Stop/Station where boarding is done

LegIntermediate

0:*

+LegIntermediate

information about the intermediate passed stop points.

LegAlight

1:1

+LegAlight

Stop/Station to alight

Service

1:1

+DatedJourney

Service that is used for this leg.

LegAttribute

0:*

+LegAttribute

Attributes that are not valid on the whole service, but only on parts of the journey leg.

OperatingDays

OperatingDays

0:1

+OperatingDays

Bit string definition of operating days.

OperatingDaysDescription

0:1

+InternationalText

Textual description of the operation days, e.g. "monday to friday" or "not on holidays".

LegTrack

0:1

+LegTrack

Geographic embedding of this leg.

ParallelService

0:*

+ParallelService

Services running combined with at least parts of this journey, e.g. wing trains. The contained stop sequence interval refers to the original journey.

Infeasible

0:1

xs:boolean

Whether this trip cannot be used, due to operational delays and impossible transfers. Default is false.

Feasibility

0:*

Feasibility

Information about the feasibility of the TRIP, in particular with respect to the access features used.

SituationFullRefs

0:1

+SituationRefList

A list of references to SITUATIONs.

Extension

0:1

xs:anyType

11.15. The complex type LegStructure

-

LegStructure

a single stage of a TRIP that is made without change of MODE or service (ie: between each interchange)

The element contains a sequence of the following elements:

Id

1:1

LegObjectId

Id of this leg. Unique within trip result.

ParticipantRef

0:1

siri:ParticipantRefStructure

[equivalent of PARTICIPANT in SIRI] IT system that is participating in a communication with other participant(s)

Duration

0:1

xs:duration

The duration of the leg (e.g. from Transmodel PT RIDE LEG.Duration)

Then, the element contains one of the following elements:

a

ContinuousLeg

-1:1

+ContinuousLeg

Leg by a continuously available service or mode of transport.

b

TimedLeg

-1:1

+TimedLeg

Timetabled Leg.

c

TransferLeg

-1:1

+TransferLeg

Leg to connect between different services or modes of transport (interchanges).

Sustainability

EmissionCO2

0:1

+EmissionCO2

Estimation of CO2 emissions.

Changed

0:1

xs:boolean

TRUE if leg got changed by TripChange-Request.

11.16. The complex type TimedLegStructure

+

TimedLegStructure

passenger LEG with timetabled schedule. Corresponds to a RIDE.

The element contains a sequence of the following elements:

LegBoard

1:1

+LegBoard

Stop/Station where boarding is done

LegIntermediate

0:*

+LegIntermediate

information about the intermediate passed stop points.

LegAlight

1:1

+LegAlight

Stop/Station to alight

Service

1:1

+DatedJourney

Service that is used for this leg.

LegAttribute

0:*

+LegAttribute

Attributes that are not valid on the whole service, but only on parts of the journey leg.

Changed

0:1

xs:boolean

TRUE if leg got changed by TripChange-Request.

11.16. The complex type TimedLegStructure

From ee6b23a41e8a659c8e6f2bb96f4eeb8680fd0fa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 19 Sep 2023 18:54:48 +0200 Subject: [PATCH 13/20] Update examples/functions/trip/TR_ParallelService_OeBB_wrong.xml --- examples/functions/trip/TR_ParallelService_OeBB_wrong.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml b/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml index 369e1f93d..88a3208db 100644 --- a/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml +++ b/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml @@ -2,7 +2,9 @@ From c71ca0427684422ae16da6f7c1682c695e336d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 19 Sep 2023 18:54:56 +0200 Subject: [PATCH 14/20] Update examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml --- .../TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml b/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml index f34b8de1d..486fbbadf 100644 --- a/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml +++ b/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml @@ -136,7 +136,7 @@ All the rest of the information is minimalized and is not necessary accurate. - + 2 remainInVehicle From 7ba181de8e3af946846ca182e08a376b62580fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 19 Sep 2023 18:55:11 +0200 Subject: [PATCH 15/20] Update examples/functions/trip/TR_ParallelService_OeBB_wrong.xml --- examples/functions/trip/TR_ParallelService_OeBB_wrong.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml b/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml index 88a3208db..633b8b76c 100644 --- a/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml +++ b/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml @@ -218,7 +218,7 @@ All the rest of the information is minimalized and is not necessary accurate. - + 5 7 DB:123111-12388 From f856b083420787928271a3a431ea2f62b2d882d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 19 Sep 2023 18:56:00 +0200 Subject: [PATCH 16/20] Update examples/functions/trip/TR_ParallelService_OeBB_wrong.xml --- examples/functions/trip/TR_ParallelService_OeBB_wrong.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml b/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml index 633b8b76c..d15cae3e7 100644 --- a/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml +++ b/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml @@ -146,7 +146,7 @@ All the rest of the information is minimalized and is not necessary accurate. NJ 490 + for the whole Leg would be misleading. See correct example in the folder. --> 123123 A From 7dee064bfbd1d4397f7a380e0a24f1ed250b7bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 19 Sep 2023 18:56:09 +0200 Subject: [PATCH 17/20] Update examples/functions/trip/TR_ParallelService_OeBB_wrong.xml --- examples/functions/trip/TR_ParallelService_OeBB_wrong.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml b/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml index d15cae3e7..c814c7e6e 100644 --- a/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml +++ b/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml @@ -145,7 +145,7 @@ All the rest of the information is minimalized and is not necessary accurate. NJ 490 - 123123 From 36fd1f52779c26e4e59b95781111b6fd9bd90ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Gro=C3=9Fberndt?= Date: Tue, 19 Sep 2023 21:32:31 +0200 Subject: [PATCH 18/20] Update TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml Update documentation comment in example --- ...lelService_OeBB_right_with_remain_in_vehicle.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml b/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml index 486fbbadf..74c2e2d90 100644 --- a/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml +++ b/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml @@ -1,11 +1,11 @@ + All the rest of the information is minimalized and is not necessary accurate. + --> 2023-08-15T20:09:36Z @@ -223,7 +223,10 @@ All the rest of the information is minimalized and is not necessary accurate. - + 1 3 DB:123111-12388 From e52c5e7a448f6e5666c7ca96b44a3c6276bab80a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Gro=C3=9Fberndt?= Date: Tue, 19 Sep 2023 21:35:19 +0200 Subject: [PATCH 19/20] Update TR_ParallelService_OeBB_wrong.xml --- .../trip/TR_ParallelService_OeBB_wrong.xml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml b/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml index c814c7e6e..38bb87fcb 100644 --- a/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml +++ b/examples/functions/trip/TR_ParallelService_OeBB_wrong.xml @@ -1,13 +1,15 @@ + All the rest of the information is minimalized and is not necessary accurate. + --> 2023-08-15T20:09:36Z @@ -218,7 +220,10 @@ All the rest of the information is minimalized and is not necessary accurate. - + 5 7 DB:123111-12388 From 5731226a19d56e7c2541d679482e6c2657b9134b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 20 Sep 2023 16:56:41 +0200 Subject: [PATCH 20/20] Update examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml --- .../TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml b/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml index 74c2e2d90..8b8298ce3 100644 --- a/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml +++ b/examples/functions/trip/TR_ParallelService_OeBB_right_with_remain_in_vehicle.xml @@ -22,8 +22,8 @@ PT48M 2023-08-15T18:08:00Z 2023-08-15T18:56:00Z - 1 - + 0 + 1

TimedLegStructure

passenger LEG with timetabled schedule. Corresponds to a RIDE.

The element contains a sequence of the following elements:

LegBoard

1:1

+LegBoard

Stop/Station where boarding is done

LegIntermediate

0:*

+LegIntermediate

Information about the intermediate passed stop points.

LegAlight

1:1

+LegAlight

Stop/Station to alight

Service

1:1

+DatedJourney

Service that is used for this leg.

LegAttribute

0:*

+LegAttribute

Attributes that are not valid on the whole service, but only on parts of the journey leg.

OperatingDays

OperatingDays

0:1

+OperatingDays

Bit string definition of operating days.

OperatingDaysDescription

0:1

+InternationalText

Textual description of the operation days, e.g. "monday to friday" or "not on holidays".

LegTrack

0:1

+LegTrack

Geographic embedding of this leg.

ParallelService

0:*

+ParallelService

Services running combined with at least parts of this journey, e.g. wing trains. The contained stop sequence interval refers to the original journey.