Geo: extract dateline handling logic from ShapeBuilders (#44187)

Extracts dateline decomposition logic from ShapeBuilder into a separate utility class that is used on the indexing side. The search side will be handled as part of another PR at this time we will remove the decomposition logic from ShapeBuilders as well. This PR also doesn't change any existing logic including bugs. Relates to #40908
elastic · Jul 16, 2019 · 33ad792 · 33ad792
1 parent f16ec49
commit 33ad792
Show file tree

Hide file tree

Showing 10 changed files with 1,269 additions and 73 deletions.
diff --git a/server/src/main/java/org/elasticsearch/common/geo/GeoJson.java b/server/src/main/java/org/elasticsearch/common/geo/GeoJson.java
@@ -228,8 +228,12 @@ private XContentBuilder coordinatesToXContent(Polygon polygon) throws IOExceptio
 
     private static Geometry createGeometry(String type, List<Geometry> geometries, CoordinateNode coordinates, Boolean orientation,
                                            boolean defaultOrientation, boolean coerce, DistanceUnit.Distance radius) {
-
-        ShapeType shapeType = ShapeType.forName(type);
+        ShapeType shapeType;
+        if ("bbox".equalsIgnoreCase(type)) {
+            shapeType = ShapeType.ENVELOPE;
+        } else {
+            shapeType = ShapeType.forName(type);
+        }
         if (shapeType == ShapeType.GEOMETRYCOLLECTION) {
             if (geometries == null) {
                 throw new ElasticsearchParseException("geometries not included");
@@ -484,7 +488,7 @@ public MultiPoint asMultiPoint() {
             return new MultiPoint(points);
         }
 
-        private double[][] asLineComponents(boolean orientation, boolean coerce) {
+        private double[][] asLineComponents(boolean orientation, boolean coerce, boolean close) {
             if (coordinate != null) {
                 throw new ElasticsearchException("expected a list of points but got a point");
             }
@@ -495,7 +499,7 @@ private double[][] asLineComponents(boolean orientation, boolean coerce) {
 
             boolean needsClosing;
             int resultSize;
-            if (coerce && children.get(0).asPoint().equals(children.get(children.size() - 1).asPoint()) == false) {
+            if (close && coerce && children.get(0).asPoint().equals(children.get(children.size() - 1).asPoint()) == false) {
                 needsClosing = true;
                 resultSize = children.size() + 1;
             } else {
@@ -531,12 +535,12 @@ private double[][] asLineComponents(boolean orientation, boolean coerce) {
         }
 
         public Line asLineString(boolean coerce) {
-            double[][] components = asLineComponents(true, coerce);
+            double[][] components = asLineComponents(true, coerce, false);
             return new Line(components[0], components[1], components[2]);
         }
 
         public LinearRing asLinearRing(boolean orientation, boolean coerce) {
-            double[][] components = asLineComponents(orientation, coerce);
+            double[][] components = asLineComponents(orientation, coerce, true);
             return new LinearRing(components[0], components[1], components[2]);
         }