Integrated location API and routing
Fixed routing bug