Allow multiple FlexibleAreas in a FlexibleStopPlace

[hannesj]

Summary

Currently only the first FlexibleArea in a NeTEX FlexibleStopPlace is parsed. Modify the code to create a GrupStop if multiple areas exist.

[t2gran]

I asked @hannesj if we(me or @vpaturet) should take over this one. I agree with the comments from @jtorin.

[hannesj]

I addressed most of the comments. There is an open question about the location of the type key (see comment).

[leonardehrenfried]

Could you please fix the tests?

[hannesj]

Could you please fix the tests?

No, as the tests should fail with the current behaviour and data. We need to clarify the #4922 (comment) above

[vpaturet]

As suggested by @testower, the key/value pairs should be looked up both at the FlexibleStopPlace level and FlexibleArea level, with precedence at the FlexibleArea level.

[codecov]

Codecov Report

Patch coverage: 72.41% and project coverage change: +0.06 🎉

Comparison is base (3f68cb7) 65.34% compared to head (47290c4) 65.41%.

Additional details and impacted files

@@              Coverage Diff              @@
##             dev-2.x    #4922      +/-   ##
=============================================
+ Coverage      65.34%   65.41%   +0.06%     
- Complexity     14455    14494      +39     
=============================================
  Files           1755     1754       -1     
  Lines          67978    68029      +51     
  Branches        7231     7243      +12     
=============================================
+ Hits           44420    44500      +80     
+ Misses         21091    21063      -28     
+ Partials        2467     2466       -1     

Impacted Files	Coverage Δ
...org/opentripplanner/netex/mapping/NetexMapper.java	80.97% <0.00%> (-1.34%)	⬇️
...pentripplanner/transit/model/site/RegularStop.java	89.74% <ø> (ø)
...opentripplanner/netex/mapping/FlexStopsMapper.java	86.48% <79.16%> (+0.77%)	⬆️
...tripplanner/ext/transmodelapi/model/EnumTypes.java	99.27% <100.00%> (+<0.01%)	⬆️
...tripplanner/netex/mapping/TransportModeMapper.java	70.00% <100.00%> (+18.71%)	⬆️

... and 17 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

[leonardehrenfried]

@testower Can you please click "re-request review" when you think that it's time for it?

[testower]

@testower Can you please click "re-request review" when you think that it's time for it?

Yep will do, there's a couple of outstanding issues that I'm trying to resolve first.

[testower]

I believe I have adressed all outstanding issues. I will create a test dataset based on real data and verify manually before asking for a re-review.

[testower]

I have verified this locally with a semi-fictitious dataset (I have excluded the regular stops from this zip, otherwise GitHub won't let me upload it):

test.zip

The dataset contains a flexible service that uses a single flexible stop place, with two areas. One of the areas is of the type UnrestrictedPublicTransportArea. Here is screenshot from the debug client, show an itinerary from a regular stop within one area to a street edge in the other area:

[testower]

Should be good to go now @leonardehrenfried (I mean, good to go for another review :) )

[leonardehrenfried]

Ok, I see that you've already have reviewers (of which I'm not one, because I don't use Netex :)).

[leonardehrenfried]

@testower Do you have merge permission?

We have other reviewers