AER-4271 Added support for using max speed for NON_URBAN ROADS#379
Merged
Hilbrand merged 4 commits intoaerius:mainfrom Apr 10, 2026
Merged
AER-4271 Added support for using max speed for NON_URBAN ROADS#379Hilbrand merged 4 commits intoaerius:mainfrom
Hilbrand merged 4 commits intoaerius:mainfrom
Conversation
With new road emissions for NON_URBAN_ROAD speed will be relevant. Therefore speed will be read. Because with new data speed determines the emission and not only the road type code, the road type code has been generalized to NON_URBAN_ROAD in the GML. The road type code NON_URBAN_ROAD_NATIONAL and NON_URBAN_ROAD_GENERAL could be used on both SRM1 and SRM2 soruces. But these with the new data they become explicitly for use with a specific SRM version. NON_URBAN_ROAD_NATIONAL is for SRM2 roads, and NON_URBAN_ROAD_GENERAL for SRM1 roads. This was somewhat implicit, as in Calculator UI only NON_URBAN_ROAD_NATIONAL was used, and only SRM2 can be modified in Calculator. But it would be possible to manually use NON_URBAN_ROAD_GENERAL in an SRM2 source. Both NON_URBAN_ROAD_NATIONAL and NON_URBAN_ROAD_GENERAL are still supported to be used in GML, also for backward compatibility.
BertScholten
approved these changes
Apr 3, 2026
Member
BertScholten
left a comment
BertScholten
left a comment
There was a problem hiding this comment.
Not a fan of the temporary bit, but otherwise LGTM
source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/road/v40/GML2SRMRoad.java
Outdated
Show resolved
Hide resolved
source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/road/v40/GML2SRMRoad.java
Outdated
Show resolved
Hide resolved
source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/togml/Road2GML.java
Outdated
Show resolved
Hide resolved
- Simplified GML2SRMRoad v4 implementation by merging specific variables with convertRoadType because specificVariables was only used for road type, and since both methods have a SRM specific implementation the SRM1 case can be moved to the convertRoadTypeCode. - In Road2GML non urban road type conversion inversed check on if 0 speed present from any to all such that no negative check has to be done
…AL/GENERAL) only. When importing always set a road speed for NON_URBAN_ROAD when road is 0 (or not set) to representative speeds.
BertScholten
approved these changes
Apr 7, 2026
source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/road/GML2Road.java
Outdated
Show resolved
Hide resolved
Hilbrand
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
With new road emissions for NON_URBAN_ROAD speed will be relevant. Therefore speed will be read. Because with new data speed determines the emission and not only the road type code a default speed will be set if the speed is null or 0. The speed set is representative for the road type. For NON_URBAN_ROAD_NATIONAL it will be 80, for NON_URBAN_ROAD_GENERAL it will be 60. Calculator 2025 doesn't use these speed values yet, but having set them has no impact, but it also isn't effecting anything.
Simplified GML2SRMRoad v4 implementation by merging specific variables with convertRoadType because specificVariables was only used for road type, and since both methods have a SRM specific implementation the SRM1 case can be moved to the convertRoadTypeCode.