[CR] Completed code review for geomap