Improvements to Map.java

made some tweaks to Map to improve draw function and track user
location.

+MapTest to test new ideas for Map.java