change geometry type enum to match C++ enum and strings to match strings returned from server
Merge branch 'master' of github.com:IMQS/idata