Geomap: Additional code optimization and cleanup
Merge pull request #4688 from pjackson28/optimizegeomap

Geomap: Additional code optimization and cleanup