refactoring leaflet

ang kok jun keith requested to merge feature/leaflet-fix into develop Nov 13, 2018