Geomap: Rough port to v4.0, not fully functional.
Merge pull request #3496 from pjackson28/feature-geomap

Geomap: Rough port to v4.0, not fully functional.