Geomap: Additional code optimization and cleanup

This PR plus the previous PR reduces the minified JS by about 2 kb with plenty more optimization opportunities available.