updated geometry api
Merge pull request #1317 from naylor-b/geom_api

updated geometry api