Fix geo normalization for ranges and points

See [issue #1997](https://github.com/elasticsearch/elasticsearch/issues/1997).