Create DisallowedNextLinks attributes for turn restrictions #202
Conversation
|
When #204 has been merged, I will update these tests to JUnit 5, too. |
| @@ -65,6 +67,9 @@ public class OsmConverterConfigGroup extends ReflectiveConfigGroup { | |||
| private boolean keepTagsAsAttributes = true; | |||
| private boolean keepWaysWithPublicTransit = true; | |||
|
|
|||
| @Parameter | |||
| @Comment("If true: OSM turn restrictions are parsed and written as disallowedNextLinks attribute to the first link.") | |||
There was a problem hiding this comment.
I'm not familiar with this syntax, I assume there is no issue with mixing @Comment and map.put(...) in getComments()?
There was a problem hiding this comment.
Yes, you can mix it. It was introduced here matsim-org/matsim-libs#2201
I kept migrating to the new @Parameter annotation for future PRs.
| @@ -111,6 +152,9 @@ public void convert(OsmConverterConfigGroup config) { | |||
| readWayParams(); | |||
| convertToNetwork(transformation); | |||
| cleanNetwork(); | |||
| if (config.parseTurnRestrictions) { | |||
There was a problem hiding this comment.
All other config values are accessed with get methods, is this part of the new ReflectiveConfigGroup class?
There was a problem hiding this comment.
Yes, fields annotated with @Parameter can be accessed directly, read and write.
| @@ -36,6 +36,7 @@ public static void convertGerasdorfArtificialLanesAndMaxspeed() { | |||
| osmConfig.setOsmFile("test/osm/GerasdorfArtificialLanesAndMaxspeed.osm"); | |||
| osmConfig.setOutputNetworkFile("test/osm/GerasdorfArtificialLanesAndMaxspeed.xml.gz"); | |||
| osmConfig.setMaxLinkLength(1000); | |||
| osmConfig.parseTurnRestrictions = true; | |||
There was a problem hiding this comment.
I guess this is to ensure no unintended side effects or regressions are happening. Please add a comment "turnRestrictions are not explicitly tested in this test" or something along those lines.
There was a problem hiding this comment.
The default is off, so I had to set it to true explicitly here. The testDisallowedNextLinks() method further down checks whether the DisallowedNextLinks object for a selected link is generated correctly. Could you rephrase what you mean?
Sorry, mistook this comment to be meant for the other test, sure, I'll add a comment!
|
The version bump PRs are ok 👍 and probably long overdue |
|
Thanks for your comments, they should be addressed so far. |
This enables the
OsmMultimodalNetworkConverterto attachDisallowedNextLinks(matsim-org/matsim-libs#2855) attributes to links containing OSM turn restriction information.This is part of an effort in supporting turn restrictions in MATSim, see matsim-org/matsim-libs#2829 and thus might fix #75.
Enable this feature with