Add aggregation support for geo_shape fields

libs/geo/src/main/java/org/elasticsearch/geometry/utils/Geohash.java

@@ -53,6 +53,20 @@ public class Geohash {
     /** Bit encoded representation of the latitude of north pole */
     private static final long MAX_LAT_BITS = (0x1L << (PRECISION * 5 / 2)) - 1;
 
+    // Below code is adapted from the spatial4j library (GeohashUtils.java) Apache 2.0 Licensed
+    private static final double[] precisionToLatHeight, precisionToLonWidth;
+    static {
+        precisionToLatHeight = new double[PRECISION + 1];
+        precisionToLonWidth = new double[PRECISION + 1];
+        precisionToLatHeight[0] = 90*2;
+        precisionToLonWidth[0] = 180*2;
+        boolean even = false;
+        for(int i = 1; i <= PRECISION; i++) {
+            precisionToLatHeight[i] = precisionToLatHeight[i-1] / (even ? 8 : 4);
+            precisionToLonWidth[i] = precisionToLonWidth[i-1] / (even ? 4 : 8);
+            even = ! even;
+        }
+    }
 
     // no instance:
     private Geohash() {
@@ -97,6 +111,16 @@ public static Rectangle toBoundingBox(final String geohash) {
         }
     }
 
+    /** Array of geohashes 1 level below the baseGeohash. Sorted. */
+    public static String[] getSubGeohashes(String baseGeohash) {
+        String[] hashes = new String[BASE_32.length];
+        for (int i = 0; i < BASE_32.length; i++) {//note: already sorted
+            char c = BASE_32[i];
+            hashes[i] = baseGeohash+c;
+        }
+        return hashes;
+    }
+
     /**
      * Calculate all neighbors of a given geohash cell.
      *
@@ -201,6 +225,13 @@ public static final String getNeighbor(String geohash, int level, int dx, int dy
         }
     }
 
+    /**
+     * Encode a string geohash to the geohash based long format (lon/lat interleaved, 4 least significant bits = level)
+     */
+    public static final long longEncode(String hash) {
+        return longEncode(hash, hash.length());
+    }
+
     /**
      * Encode lon/lat to the geohash based long format (lon/lat interleaved, 4 least significant bits = level)
      */
@@ -297,7 +328,6 @@ private static long encodeLatLon(final double lat, final double lon) {
         return BitUtil.interleave(latEnc, lonEnc) >>> 2;
     }
 
-
     /** encode latitude to integer */
     public static int encodeLatitude(double latitude) {
         // the maximum possible value cannot be encoded without overflow
@@ -316,6 +346,16 @@ public static int encodeLongitude(double longitude) {
         return (int) Math.floor(longitude / LON_DECODE);
     }
 
+    /** approximate width of geohash tile for a specific precision in degrees */
+    public static double lonWidthInDegrees(int precision) {
+        return precisionToLonWidth[precision];
+    }
+
+    /** approximate height of geohash tile for a specific precision in degrees */
+    public static double latHeightInDegrees(int precision) {
+        return precisionToLatHeight[precision];
+    }
+
     /** returns the latitude value from the string based geohash */
     public static final double decodeLatitude(final String geohash) {
         return decodeLatitude(Geohash.mortonEncode(geohash));

modules/lang-expression/src/main/java/org/elasticsearch/script/expression/GeoEmptyValueSource.java

@@ -27,9 +27,9 @@
 import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
-import org.elasticsearch.index.fielddata.AtomicGeoPointFieldData;
+import org.elasticsearch.index.fielddata.AtomicGeoFieldData;
 import org.elasticsearch.index.fielddata.IndexFieldData;
-import org.elasticsearch.index.fielddata.MultiGeoPointValues;
+import org.elasticsearch.index.fielddata.MultiGeoValues;
 
 /**
  * ValueSource to return non-zero if a field is missing.
@@ -44,8 +44,8 @@ final class GeoEmptyValueSource extends ValueSource {
     @Override
     @SuppressWarnings("rawtypes") // ValueSource uses a rawtype
     public FunctionValues getValues(Map context, LeafReaderContext leaf) throws IOException {
-        AtomicGeoPointFieldData leafData = (AtomicGeoPointFieldData) fieldData.load(leaf);
-        final MultiGeoPointValues values = leafData.getGeoPointValues();
+        AtomicGeoFieldData leafData = (AtomicGeoFieldData) fieldData.load(leaf);
+        final MultiGeoValues values = leafData.getGeoValues();
         return new DoubleDocValues(this) {
             @Override
             public double doubleVal(int doc) throws IOException {

modules/lang-expression/src/main/java/org/elasticsearch/script/expression/GeoLatitudeValueSource.java

@@ -27,9 +27,9 @@
 import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
-import org.elasticsearch.index.fielddata.AtomicGeoPointFieldData;
+import org.elasticsearch.index.fielddata.AtomicGeoFieldData;
 import org.elasticsearch.index.fielddata.IndexFieldData;
-import org.elasticsearch.index.fielddata.MultiGeoPointValues;
+import org.elasticsearch.index.fielddata.MultiGeoValues;
 
 /**
  * ValueSource to return latitudes as a double "stream" for geopoint fields
@@ -44,13 +44,13 @@ final class GeoLatitudeValueSource extends ValueSource {
     @Override
     @SuppressWarnings("rawtypes") // ValueSource uses a rawtype
     public FunctionValues getValues(Map context, LeafReaderContext leaf) throws IOException {
-        AtomicGeoPointFieldData leafData = (AtomicGeoPointFieldData) fieldData.load(leaf);
-        final MultiGeoPointValues values = leafData.getGeoPointValues();
+        AtomicGeoFieldData leafData = (AtomicGeoFieldData) fieldData.load(leaf);
+        final MultiGeoValues values = leafData.getGeoValues();
         return new DoubleDocValues(this) {
             @Override
             public double doubleVal(int doc) throws IOException {
                 if (values.advanceExact(doc)) {
-                    return values.nextValue().getLat();
+                    return values.nextValue().lat();
                 } else {
                     return 0.0;
                 }

modules/lang-expression/src/main/java/org/elasticsearch/script/expression/GeoLongitudeValueSource.java

@@ -27,9 +27,9 @@
 import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
-import org.elasticsearch.index.fielddata.AtomicGeoPointFieldData;
+import org.elasticsearch.index.fielddata.AtomicGeoFieldData;
 import org.elasticsearch.index.fielddata.IndexFieldData;
-import org.elasticsearch.index.fielddata.MultiGeoPointValues;
+import org.elasticsearch.index.fielddata.MultiGeoValues;
 
 /**
  * ValueSource to return longitudes as a double "stream" for geopoint fields
@@ -44,13 +44,13 @@ final class GeoLongitudeValueSource extends ValueSource {
     @Override
     @SuppressWarnings("rawtypes") // ValueSource uses a rawtype
     public FunctionValues getValues(Map context, LeafReaderContext leaf) throws IOException {
-        AtomicGeoPointFieldData leafData = (AtomicGeoPointFieldData) fieldData.load(leaf);
-        final MultiGeoPointValues values = leafData.getGeoPointValues();
+        AtomicGeoFieldData leafData = (AtomicGeoFieldData) fieldData.load(leaf);
+        final MultiGeoValues values = leafData.getGeoValues();
         return new DoubleDocValues(this) {
             @Override
             public double doubleVal(int doc) throws IOException {
                 if (values.advanceExact(doc)) {
-                    return values.nextValue().getLon();
+                    return values.nextValue().lon();
                 } else {
                     return 0.0;
                 }