map screen touch refactoring completed