Skip to content

Way prioritization #53

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 2 commits into from
May 1, 2025
Merged

Way prioritization #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee65265
improve way prioritization and extend last match if no match found
pfeiferj May 1, 2025
9e0cc23
linting
pfeiferj May 1, 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
2 changes: 1 addition & 1 deletion mapd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ func loop(state *State) {
logde(errors.Wrap(err, "could not find ways around current location"))
}

state.CurrentWay, err = GetCurrentWay(state.CurrentWay.Way, state.NextWays, offline, pos)
state.CurrentWay, err = GetCurrentWay(state.CurrentWay, state.NextWays, offline, pos)
logde(errors.Wrap(err, "could not get current way"))

state.NextWays, err = NextWays(pos, state.CurrentWay, offline, state.CurrentWay.OnWay.IsForward)
Expand Down
81 changes: 64 additions & 17 deletions way.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type OnWayResult struct {
IsForward bool
}

func OnWay(way Way, pos Position) (OnWayResult, error) {
func OnWay(way Way, pos Position, extended bool) (OnWayResult, error) {
res := OnWayResult{}
if pos.Latitude < way.MaxLat()+PADDING && pos.Latitude > way.MinLat()-PADDING && pos.Longitude < way.MaxLon()+PADDING && pos.Longitude > way.MinLon()-PADDING {
d, err := DistanceToWay(pos, way)
Expand All @@ -30,6 +30,9 @@ func OnWay(way Way, pos Position) (OnWayResult, error) {
}
road_width_estimate := float64(lanes) * LANE_WIDTH
max_dist := 5 + road_width_estimate
if extended {
max_dist = max_dist * 2
}

if d.Distance < max_dist {
res.OnWay = true
Expand Down Expand Up @@ -115,14 +118,14 @@ func GetWayStartEnd(way Way, isForward bool) (Coordinates, Coordinates) {
return nodes.At(nodes.Len() - 1), nodes.At(0)
}

func GetCurrentWay(currentWay Way, nextWays []NextWayResult, offline Offline, pos Position) (CurrentWay, error) {
if currentWay.HasNodes() {
onWay, err := OnWay(currentWay, pos)
func GetCurrentWay(currentWay CurrentWay, nextWays []NextWayResult, offline Offline, pos Position) (CurrentWay, error) {
if currentWay.Way.HasNodes() {
onWay, err := OnWay(currentWay.Way, pos, false)
logde(errors.Wrap(err, "could not check if on current way"))
if onWay.OnWay {
start, end := GetWayStartEnd(currentWay, onWay.IsForward)
start, end := GetWayStartEnd(currentWay.Way, onWay.IsForward)
return CurrentWay{
Way: currentWay,
Way: currentWay.Way,
Distance: onWay.Distance,
OnWay: onWay,
StartPosition: start,
Expand All @@ -133,7 +136,7 @@ func GetCurrentWay(currentWay Way, nextWays []NextWayResult, offline Offline, po

// check the expected next ways
for _, nextWay := range nextWays {
onWay, err := OnWay(nextWay.Way, pos)
onWay, err := OnWay(nextWay.Way, pos, false)
logde(errors.Wrap(err, "could not check if on next way"))
if onWay.OnWay {
start, end := GetWayStartEnd(nextWay.Way, onWay.IsForward)
Expand All @@ -147,19 +150,46 @@ func GetCurrentWay(currentWay Way, nextWays []NextWayResult, offline Offline, po
}
}

// finally check all other ways
ways, err := offline.Ways()
if err != nil {
return CurrentWay{}, errors.Wrap(err, "could not get other ways")
}
for i := 0; i < ways.Len(); i++ {
way := ways.At(i)
onWay, err := OnWay(way, pos)
possibleWays, err := getPossibleWays(offline, pos)
logde(errors.Wrap(err, "Failed to get possible ways"))
if len(possibleWays) > 0 {
preferredWay := possibleWays[0]
preferredOnWay, err := OnWay(preferredWay, pos, false)
logde(errors.Wrap(err, "Could not check if on way"))
for _, way := range possibleWays {
if way.Lanes() < preferredWay.Lanes() {
continue
}

onWay, err := OnWay(preferredWay, pos, false)
logde(errors.Wrap(err, "Could not check if on way"))
if way.Lanes() > preferredWay.Lanes() {
preferredWay = way
preferredOnWay = onWay
}

if onWay.Distance.Distance < preferredOnWay.Distance.Distance {
preferredWay = way
preferredOnWay = onWay
}
}
start, end := GetWayStartEnd(preferredWay, preferredOnWay.IsForward)
return CurrentWay{
Way: preferredWay,
Distance: preferredOnWay.Distance,
OnWay: preferredOnWay,
StartPosition: start,
EndPosition: end,
}, nil
}

if currentWay.Way.HasNodes() { // if we lost all matches, allow a much further match distance for previous match
onWay, err := OnWay(currentWay.Way, pos, true)
logde(errors.Wrap(err, "could not extended check if on current way"))
if onWay.OnWay {
start, end := GetWayStartEnd(way, onWay.IsForward)
start, end := GetWayStartEnd(currentWay.Way, onWay.IsForward)
return CurrentWay{
Way: way,
Way: currentWay.Way,
Distance: onWay.Distance,
OnWay: onWay,
StartPosition: start,
Expand All @@ -171,6 +201,23 @@ func GetCurrentWay(currentWay Way, nextWays []NextWayResult, offline Offline, po
return CurrentWay{}, errors.New("could not find a current way")
}

func getPossibleWays(offline Offline, pos Position) ([]Way, error) {
possibleWays := []Way{}
ways, err := offline.Ways()
if err != nil {
return possibleWays, errors.Wrap(err, "could not get other ways")
}
for i := 0; i < ways.Len(); i++ {
way := ways.At(i)
onWay, err := OnWay(way, pos, false)
logde(errors.Wrap(err, "Could not check if on way"))
if onWay.OnWay {
possibleWays = append(possibleWays, way)
}
}
return possibleWays, nil
}

func IsForward(lineStart Coordinates, lineEnd Coordinates, bearing float64) bool {
startLat := lineStart.Latitude()
startLon := lineStart.Longitude()
Expand Down
Loading