Skip to content

Reject directionally illegal route fallbacks #104

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

Merged
pfeiferj merged 1 commit into from
Aug 9, 2026
Merged

Reject directionally illegal route fallbacks #104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 10 additions & 19 deletions maps/way.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,6 +779,16 @@ func (w *Way) NextWay(offlineMaps *Offline, isForward bool) (NextWayResult, erro
return NextWayResult{StartPosition: matchNode}, errors.Wrap(err, "could not check for next ways")
}

legalWays := []Way{}
for _, mWay := range matchingWays {
isForward := mWay.IsForwardFrom(matchNode)
if !isForward && mWay.OneWay() {
continue
}
legalWays = append(legalWays, mWay)
}
matchingWays = legalWays

if len(matchingWays) == 0 {
return NextWayResult{StartPosition: matchNode}, nil
}
Expand Down Expand Up @@ -812,11 +822,6 @@ func (w *Way) NextWay(offlineMaps *Offline, isForward bool) (NextWayResult, erro
for _, mWay := range matchingWays {
mName := mWay.WayName()
if mName == name {
isForward := mWay.IsForwardFrom(matchNode)
if !isForward && mWay.OneWay() {
continue
}

if len(nodes) > 1 && mWay.isValidConnection(matchNode, matchBearingNode, curvatureThreshold) {
candidates = append(candidates, mWay)
}
Expand All @@ -842,11 +847,6 @@ func (w *Way) NextWay(offlineMaps *Offline, isForward bool) (NextWayResult, erro
for _, mWay := range matchingWays {
mRef := mWay.WayRef()
if mRef == ref {
isForward := mWay.IsForwardFrom(matchNode)
if !isForward && mWay.OneWay() {
continue
}

if len(nodes) > 1 && mWay.isValidConnection(matchNode, matchBearingNode, curvatureThreshold) {
candidates = append(candidates, mWay)
}
Expand Down Expand Up @@ -879,11 +879,6 @@ func (w *Way) NextWay(offlineMaps *Offline, isForward bool) (NextWayResult, erro
}
}
if hasMatch {
isForward := mWay.IsForwardFrom(matchNode)
if !isForward && mWay.OneWay() {
continue
}

if len(nodes) > 1 && mWay.isValidConnection(matchNode, matchBearingNode, curvatureThreshold) {
candidates = append(candidates, mWay)
}
Expand All @@ -905,10 +900,6 @@ func (w *Way) NextWay(offlineMaps *Offline, isForward bool) (NextWayResult, erro

validWays := []Way{}
for _, mWay := range matchingWays {
isForward := mWay.IsForwardFrom(matchNode)
if !isForward && mWay.OneWay() {
continue
}
if len(nodes) > 1 && mWay.isValidConnection(matchNode, matchBearingNode, curvatureThreshold) {
validWays = append(validWays, mWay)
}
Expand Down