some refactoring so the route has all the waypoints
fix all waypoints on map