updates mapping functions to rectify marker issue on zoom
Merge branch 'develop'