Calc route updates and Paint Route

Please review my changes and offer any feedback or suggestions. I tried making the changes Kevin recommended. I'm a little unclear if we should be actually mapping the route in or outside of calcRoute?