Moved location code to LocationMap.java