Skip to content

Avoid NPE on roundabouts #853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
afischerdev wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Avoid NPE on roundabouts #853

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c949eba
avoid NPE at roundabouts
afischerdev Nov 25, 2025
7b8387d
negative time problem
afischerdev Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 32 additions & 18 deletions brouter-core/src/main/java/btools/router/RoutingEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1053,6 +1053,8 @@ private OsmTrack tryFindTrack(OsmTrack[] refTracks, OsmTrack[] lastTracks) {

OsmTrack getExtraSegment(OsmPathElement start, OsmPathElement end) {

if (start == null || end == null) return null;

List<MatchedWaypoint> wptlist = new ArrayList<>();
MatchedWaypoint wpt1 = new MatchedWaypoint();
wpt1.waypoint = new OsmNode(start.getILon(), start.getILat());
Expand Down Expand Up @@ -1135,21 +1137,22 @@ private int snapRoundaboutConnection(OsmTrack tt, OsmTrack t, int indexStart, in
for (i = indexStartBack + 1; i < tt.nodes.size(); i++) {
OsmPathElement n = tt.nodes.get(i);
OsmTrack.OsmPathElementHolder detours = tt.getFromDetourMap(n.getIdFromPos());
OsmTrack.OsmPathElementHolder h = detours;
while (h != null) {
h = h.nextHolder;
if (detours != null) {
OsmTrack.OsmPathElementHolder h = detours;
while (h != null) {
h = h.nextHolder;
}
}
removeList.add(n);
}

OsmPathElement ttend = null;
OsmPathElement ttend_next = null;
if (!bMeetingIsOnRoundabout && !bMeetsRoundaboutStart) {
ttend = tt.nodes.get(indexStartBack);
ttend_next = tt.nodes.get(indexStartBack + 1);
OsmTrack.OsmPathElementHolder ttend_detours = tt.getFromDetourMap(ttend.getIdFromPos());

tt.registerDetourForId(ttend.getIdFromPos(), null);
if (ttend_detours != null) {
tt.registerDetourForId(ttend.getIdFromPos(), null);
}
}

for (OsmPathElement e : removeList) {
Expand All @@ -1164,9 +1167,11 @@ private int snapRoundaboutConnection(OsmTrack tt, OsmTrack t, int indexStart, in
if (!bMeetingIsOnRoundabout && !bMeetsRoundaboutStart && n.message.isRoundabout()) break;

OsmTrack.OsmPathElementHolder detours = t.getFromDetourMap(n.getIdFromPos());
OsmTrack.OsmPathElementHolder h = detours;
while (h != null) {
h = h.nextHolder;
if (detours != null) {
OsmTrack.OsmPathElementHolder h = detours;
while (h != null) {
h = h.nextHolder;
}
}
removeList.add(n);
}
Expand Down Expand Up @@ -1196,37 +1201,46 @@ private int snapRoundaboutConnection(OsmTrack tt, OsmTrack t, int indexStart, in

if (!bMeetingIsOnRoundabout && !bMeetsRoundaboutStart) {

OsmPathElement tstart = t.nodes.get(0);
OsmPathElement tstart_next = null;
OsmTrack.OsmPathElementHolder tstart_detours = t.getFromDetourMap(tstart.getIdFromPos());
OsmTrack.OsmPathElementHolder ttend_detours = tt.getFromDetourMap(ttend.getIdFromPos());

OsmTrack mid = getExtraSegment(ttend, ttend_detours.node);
OsmTrack mid = null;
if (ttend_detours != null && ttend_detours.node != null) {
mid = getExtraSegment(ttend, ttend_detours.node);
}
OsmPathElement tt_end = tt.nodes.get(tt.nodes.size() - 1);

int last_cost = tt_end.cost;
float last_time = tt_end.getTime();
float last_energy = tt_end.getEnergy();
int tmp_cost = 0;
float tmp_time = 0f;
float tmp_energy = 0f;

if (mid != null) {
boolean start = false;
for (OsmPathElement e : mid.nodes) {
if (start) {
if (e.positionEquals(ttend_detours.node)) {
tmp_cost = e.cost;
tmp_time = e.getTime();
tmp_energy = e.getEnergy();
break;
}
e.cost = last_cost + e.cost;
e.setTime(last_time + e.getTime());
e.setEnergy(last_energy + e.getEnergy());
tt.nodes.add(e);
}
if (e.positionEquals(tt_end)) start = true;
}

ttend_detours.node.cost = last_cost + tmp_cost;
ttend_detours.node.setTime(last_time + tmp_time);
ttend_detours.node.setEnergy(last_energy + tmp_energy);
tt.nodes.add(ttend_detours.node);
t.nodes.add(0, ttend_detours.node);
}

ttend_detours.node.cost = last_cost + tmp_cost;
tt.nodes.add(ttend_detours.node);
t.nodes.add(0, ttend_detours.node);

}

tt.cost = tt.nodes.get(tt.nodes.size()-1).cost;
Expand Down