-
Notifications
You must be signed in to change notification settings - Fork 24.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[GeoPoint] Grid aggregations with bounds should exclude touching tiles (
- Loading branch information
Showing
15 changed files
with
375 additions
and
207 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 0 additions & 38 deletions
38
...src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/BoundedCellValues.java
This file was deleted.
Oops, something went wrong.
72 changes: 0 additions & 72 deletions
72
server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/CellIdSource.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
108 changes: 108 additions & 0 deletions
108
...c/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashCellIdSource.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
| * in compliance with, at your election, the Elastic License 2.0 or the Server | ||
| * Side Public License, v 1. | ||
| */ | ||
| package org.elasticsearch.search.aggregations.bucket.geogrid; | ||
|
|
||
| import org.apache.lucene.index.LeafReaderContext; | ||
| import org.apache.lucene.index.SortedNumericDocValues; | ||
| import org.elasticsearch.common.geo.GeoBoundingBox; | ||
| import org.elasticsearch.geometry.Rectangle; | ||
| import org.elasticsearch.geometry.utils.Geohash; | ||
| import org.elasticsearch.index.fielddata.MultiGeoPointValues; | ||
| import org.elasticsearch.index.fielddata.SortedBinaryDocValues; | ||
| import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; | ||
| import org.elasticsearch.search.aggregations.support.ValuesSource; | ||
|
|
||
| /** | ||
| * Class to help convert {@link MultiGeoPointValues} | ||
| * to GeoHash bucketing. | ||
| */ | ||
| public class GeoHashCellIdSource extends ValuesSource.Numeric { | ||
| private final GeoPoint valuesSource; | ||
| private final int precision; | ||
| private final GeoBoundingBox geoBoundingBox; | ||
|
|
||
| public GeoHashCellIdSource(GeoPoint valuesSource, int precision, GeoBoundingBox geoBoundingBox) { | ||
| this.valuesSource = valuesSource; | ||
| this.precision = precision; | ||
| this.geoBoundingBox = geoBoundingBox; | ||
| } | ||
|
|
||
| public int precision() { | ||
| return precision; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isFloatingPoint() { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public SortedNumericDocValues longValues(LeafReaderContext ctx) { | ||
| return geoBoundingBox.isUnbounded() ? | ||
| new UnboundedCellValues(valuesSource.geoPointValues(ctx), precision) : | ||
| new BoundedCellValues(valuesSource.geoPointValues(ctx), precision, geoBoundingBox); | ||
| } | ||
|
|
||
| @Override | ||
| public SortedNumericDoubleValues doubleValues(LeafReaderContext ctx) { | ||
| throw new UnsupportedOperationException(); | ||
| } | ||
|
|
||
| @Override | ||
| public SortedBinaryDocValues bytesValues(LeafReaderContext ctx) { | ||
| throw new UnsupportedOperationException(); | ||
| } | ||
|
|
||
| private static class UnboundedCellValues extends CellValues { | ||
|
|
||
| UnboundedCellValues(MultiGeoPointValues geoValues, int precision) { | ||
| super(geoValues, precision); | ||
| } | ||
|
|
||
| @Override | ||
| int advanceValue(org.elasticsearch.common.geo.GeoPoint target, int valuesIdx) { | ||
| values[valuesIdx] = Geohash.longEncode(target.getLon(), target.getLat(), precision); | ||
| return valuesIdx + 1; | ||
| } | ||
| } | ||
|
|
||
| private static class BoundedCellValues extends CellValues { | ||
|
|
||
| private final GeoBoundingBox bbox; | ||
| private final boolean crossesDateline; | ||
|
|
||
| BoundedCellValues(MultiGeoPointValues geoValues, int precision, GeoBoundingBox bbox) { | ||
| super(geoValues, precision); | ||
| this.bbox = bbox; | ||
| this.crossesDateline = bbox.right() < bbox.left(); | ||
| } | ||
|
|
||
| @Override | ||
| int advanceValue(org.elasticsearch.common.geo.GeoPoint target, int valuesIdx) { | ||
| final String hash = Geohash.stringEncode(target.getLon(), target.getLat(), precision); | ||
| if (validHash(hash)) { | ||
| values[valuesIdx] = Geohash.longEncode(hash); | ||
| return valuesIdx + 1; | ||
| } | ||
| return valuesIdx; | ||
| } | ||
|
|
||
| private boolean validHash(String hash) { | ||
| final Rectangle rectangle = Geohash.toBoundingBox(hash); | ||
| // touching hashes are excluded | ||
| if (bbox.top() > rectangle.getMinY() && bbox.bottom() < rectangle.getMaxY()) { | ||
| if (crossesDateline) { | ||
| return bbox.left() < rectangle.getMaxX() || bbox.right() > rectangle.getMinX(); | ||
| } else { | ||
| return bbox.left() < rectangle.getMaxX() && bbox.right() > rectangle.getMinX(); | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.