ready to merge mapview drag fix