CDRIVER-360 add additional geo index options

Changes here also resolve CDRIVER-452
No, stick with the layout used globally in the library.