From 9b3920b52cf15ed7a1b604af15157be8543a01f9 Mon Sep 17 00:00:00 2001
From: Nicholas Knize <nknize@gmail.com>
Date: Fri, 13 Nov 2015 09:32:31 -0600
Subject: [PATCH] Removing pole restriction on GeoDistanceRangeQueryTests

This commit corrects the maxRadialDistance computation for points at the poles to half the distance of the meridian.
---
 .../main/java/org/elasticsearch/common/geo/GeoUtils.java   | 3 +++
 .../index/query/GeoDistanceRangeQueryTests.java            | 7 ++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/elasticsearch/common/geo/GeoUtils.java b/core/src/main/java/org/elasticsearch/common/geo/GeoUtils.java
index 0d8fdfa2be7..83a8adab1e0 100644
--- a/core/src/main/java/org/elasticsearch/common/geo/GeoUtils.java
+++ b/core/src/main/java/org/elasticsearch/common/geo/GeoUtils.java
@@ -68,6 +68,9 @@ public class GeoUtils {
 
     /** Returns the maximum distance/radius from the point 'center' before overlapping */
     public static double maxRadialDistance(GeoPoint center) {
+        if (Math.abs(center.lat()) == 90.0) {
+            return SloppyMath.haversin(center.lat(), center.lon(), 0, center.lon())*1000.0;
+        }
         return SloppyMath.haversin(center.lat(), center.lon(), center.lat(), (180.0 + center.lon()) % 360)*1000.0;
     }
 
diff --git a/core/src/test/java/org/elasticsearch/index/query/GeoDistanceRangeQueryTests.java b/core/src/test/java/org/elasticsearch/index/query/GeoDistanceRangeQueryTests.java
index fb84bb669a0..00a68010358 100644
--- a/core/src/test/java/org/elasticsearch/index/query/GeoDistanceRangeQueryTests.java
+++ b/core/src/test/java/org/elasticsearch/index/query/GeoDistanceRangeQueryTests.java
@@ -47,7 +47,7 @@ public class GeoDistanceRangeQueryTests extends AbstractQueryTestCase<GeoDistanc
         if (randomBoolean()) {
             builder = new GeoDistanceRangeQueryBuilder(GEO_POINT_FIELD_NAME, randomGeohash(3, 12));
         } else {
-            GeoPoint point = RandomGeoGenerator.randomPointIn(random(), -179, -89, 89, 179);
+            GeoPoint point = RandomGeoGenerator.randomPoint(random());
             if (randomBoolean()) {
                 builder = new GeoDistanceRangeQueryBuilder(GEO_POINT_FIELD_NAME, point);
             } else {
@@ -55,10 +55,7 @@ public class GeoDistanceRangeQueryTests extends AbstractQueryTestCase<GeoDistanc
             }
         }
         GeoPoint point = builder.point();
-        // todo remove the following pole hack when LUCENE-6846 lands
-        final double distToPole = SloppyMath.haversin(point.lat(), point.lon(), (point.lat()<0) ? -90.0 : 90.0, point.lon());
-        final double maxRadius = GeoUtils.maxRadialDistance(point, distToPole);
-
+        final double maxRadius = GeoUtils.maxRadialDistance(point);
         final int fromValueMeters = randomInt((int)(maxRadius*0.5));
         final int toValueMeters = randomIntBetween(fromValueMeters + 1, (int)maxRadius);
         DistanceUnit fromToUnits = randomFrom(DistanceUnit.values());