refactor Map: bug fix, consider transform during map drag