Added GeoShape mapping options

Fixes #552