Skip to content

fix one way and next speed limits #55

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 2, 2025
Merged

fix one way and next speed limits #55

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
27 changes: 14 additions & 13 deletions mapd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,6 @@ func loop(state *State) {
err = PutParam(ROAD_NAME, []byte(RoadName(state.CurrentWay.Way)))
logwe(errors.Wrap(err, "could not write road name"))

data, err = json.Marshal(state.CurrentWay.Way.MaxSpeed())
logde(errors.Wrap(err, "could not marshal speed limit"))
err = PutParam(MAP_SPEED_LIMIT, data)
logwe(errors.Wrap(err, "could not write speed limit"))

data, err = json.Marshal(state.CurrentWay.Way.AdvisorySpeed())
logde(errors.Wrap(err, "could not marshal advisory speed limit"))
err = PutParam(MAP_ADVISORY_LIMIT, data)
Expand Down Expand Up @@ -232,18 +227,24 @@ func loop(state *State) {
} else if !state.CurrentWay.OnWay.IsForward && state.CurrentWay.Way.MaxSpeedBackward() > 0 {
currentMaxSpeed = state.CurrentWay.Way.MaxSpeedBackward()
}

data, err = json.Marshal(currentMaxSpeed)
logde(errors.Wrap(err, "could not marshal speed limit"))
err = PutParam(MAP_SPEED_LIMIT, data)
logwe(errors.Wrap(err, "could not write speed limit"))

nextMaxSpeed := currentMaxSpeed
nextSpeedWay := state.NextWays[0]
for _, nextWay := range state.NextWays {
if nextMaxSpeed == currentMaxSpeed {
nextMaxSpeed = nextWay.Way.MaxSpeed()
if nextWay.IsForward && nextWay.Way.MaxSpeedForward() > 0 {
nextMaxSpeed = nextWay.Way.MaxSpeedForward()
} else if !nextWay.IsForward && nextWay.Way.MaxSpeedBackward() > 0 {
nextMaxSpeed = nextWay.Way.MaxSpeedBackward()
}
if nextMaxSpeed != currentMaxSpeed {
nextSpeedWay = nextWay
nextMaxSpeed = nextWay.Way.MaxSpeed()
if nextWay.IsForward && nextWay.Way.MaxSpeedForward() > 0 {
nextMaxSpeed = nextWay.Way.MaxSpeedForward()
} else if !nextWay.IsForward && nextWay.Way.MaxSpeedBackward() > 0 {
nextMaxSpeed = nextWay.Way.MaxSpeedBackward()
}

break
}
}
data, err = json.Marshal(NextSpeedLimit{
Expand Down
Loading