Modified intended route intersection calculations to calculate speed based on waypoints instead of leg speed