In CartesianPoint, store coordinates as doubles.

This gives more predictable values when parsing and formatting a point. It
matches the behavior for GeoPoint and the Point geometry.

Author: jtibshirani

x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/common/CartesianPoint.java

@@ -37,18 +37,18 @@ public class CartesianPoint implements ToXContentFragment {
     private static final ParseField Y_FIELD = new ParseField("y");
     private static final ParseField Z_FIELD = new ParseField("z");
 
-    protected float x;
-    protected float y;
+    protected double x;
+    protected double y;
 
     public CartesianPoint() {
     }
 
-    public CartesianPoint(float x, float y) {
+    public CartesianPoint(double x, double y) {
         this.x = x;
         this.y = y;
     }
 
-    public CartesianPoint reset(float x, float y) {
+    public CartesianPoint reset(double x, double y) {
         this.x = x;
         this.y = y;
         return this;
@@ -69,11 +69,11 @@ public CartesianPoint resetFromCoordinates(String value, final boolean ignoreZVa
             throw new ElasticsearchParseException("failed to parse [{}], expected 2 or 3 coordinates "
                 + "but found: [{}]", vals, vals.length);
         }
-        final float x;
-        final float y;
+        final double x;
+        final double y;
         try {
-            x = Float.parseFloat(vals[0].trim());
-            if (Float.isFinite(x) == false) {
+            x = Double.parseDouble(vals[0].trim());
+            if (Double.isFinite(x) == false) {
                 throw new ElasticsearchParseException("invalid [{}] value [{}]; " +
                     "must be between -3.4028234663852886E38 and 3.4028234663852886E38",
                     X_FIELD.getPreferredName(),
@@ -83,8 +83,8 @@ public CartesianPoint resetFromCoordinates(String value, final boolean ignoreZVa
             throw new ElasticsearchParseException("[{}]] must be a number", X_FIELD.getPreferredName());
         }
         try {
-            y = Float.parseFloat(vals[1].trim());
-            if (Float.isFinite(y) == false) {
+            y = Double.parseDouble(vals[1].trim());
+            if (Double.isFinite(y) == false) {
                 throw new ElasticsearchParseException("invalid [{}] value [{}]; " +
                     "must be between -3.4028234663852886E38 and 3.4028234663852886E38",
                     Y_FIELD.getPreferredName(),
@@ -95,7 +95,7 @@ public CartesianPoint resetFromCoordinates(String value, final boolean ignoreZVa
         }
         if (vals.length > 2) {
             try {
-                CartesianPoint.assertZValue(ignoreZValue, Float.parseFloat(vals[2].trim()));
+                CartesianPoint.assertZValue(ignoreZValue, Double.parseDouble(vals[2].trim()));
             } catch (NumberFormatException ex) {
                 throw new ElasticsearchParseException("[{}]] must be a number", Y_FIELD.getPreferredName());
             }
@@ -116,14 +116,14 @@ private CartesianPoint resetFromWKT(String value, boolean ignoreZValue) {
                 "but found {}", PointFieldMapper.CONTENT_TYPE, geometry.type());
         }
         org.elasticsearch.geometry.Point point = (org.elasticsearch.geometry.Point) geometry;
-        return reset((float) point.getX(), (float) point.getY());
+        return reset(point.getX(), point.getY());
     }
 
-    public float getX() {
+    public double getX() {
         return this.x;
     }
 
-    public float getY() {
+    public double getY() {
         return this.y;
     }
 
@@ -134,8 +134,8 @@ public boolean equals(Object o) {
 
         CartesianPoint point = (CartesianPoint) o;
 
-        if (Float.compare(point.x, x) != 0) return false;
-        if (Float.compare(point.y, y) != 0) return false;
+        if (Double.compare(point.x, x) != 0) return false;
+        if (Double.compare(point.y, y) != 0) return false;
 
         return true;
     }
@@ -157,8 +157,8 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
 
     public static CartesianPoint parsePoint(XContentParser parser, CartesianPoint point, boolean ignoreZvalue)
         throws IOException, ElasticsearchParseException {
-        float x = Float.NaN;
-        float y = Float.NaN;
+        double x = Double.NaN;
+        double y = Double.NaN;
         NumberFormatException numberFormatException = null;
 
         if(parser.currentToken() == XContentParser.Token.START_OBJECT) {
@@ -172,7 +172,7 @@ public static CartesianPoint parsePoint(XContentParser parser, CartesianPoint po
                                 case VALUE_NUMBER:
                                 case VALUE_STRING:
                                     try {
-                                        x = subParser.floatValue(true);
+                                        x = subParser.doubleValue(true);
                                     } catch (NumberFormatException e) {
                                         numberFormatException = e;
                                     }
@@ -187,7 +187,7 @@ public static CartesianPoint parsePoint(XContentParser parser, CartesianPoint po
                                 case VALUE_NUMBER:
                                 case VALUE_STRING:
                                     try {
-                                        y = subParser.floatValue(true);
+                                        y = subParser.doubleValue(true);
                                     } catch (NumberFormatException e) {
                                         numberFormatException = e;
                                     }
@@ -202,7 +202,7 @@ public static CartesianPoint parsePoint(XContentParser parser, CartesianPoint po
                                 case VALUE_NUMBER:
                                 case VALUE_STRING:
                                     try {
-                                         CartesianPoint.assertZValue(ignoreZvalue, subParser.floatValue(true));
+                                         CartesianPoint.assertZValue(ignoreZvalue, subParser.doubleValue(true));
                                     } catch (NumberFormatException e) {
                                         numberFormatException = e;
                                     }
@@ -222,12 +222,12 @@ public static CartesianPoint parsePoint(XContentParser parser, CartesianPoint po
                 }
             }
            if (numberFormatException != null) {
-                throw new ElasticsearchParseException("[{}] and [{}] must be valid float values", numberFormatException,
+                throw new ElasticsearchParseException("[{}] and [{}] must be valid double values", numberFormatException,
                     X_FIELD.getPreferredName(),
                     Y_FIELD.getPreferredName());
-            } else if (Float.isNaN(x)) {
+            } else if (Double.isNaN(x)) {
                 throw new ElasticsearchParseException("field [{}] missing", X_FIELD.getPreferredName());
-            } else if (Float.isNaN(y)) {
+            } else if (Double.isNaN(y)) {
                 throw new ElasticsearchParseException("field [{}] missing", Y_FIELD.getPreferredName());
             } else {
                 return point.reset(x, y);
@@ -240,9 +240,9 @@ public static CartesianPoint parsePoint(XContentParser parser, CartesianPoint po
                     if (subParser.currentToken() == XContentParser.Token.VALUE_NUMBER) {
                         element++;
                         if (element == 1) {
-                            x = subParser.floatValue();
+                            x = subParser.doubleValue();
                         } else if (element == 2) {
-                            y = subParser.floatValue();
+                            y = subParser.doubleValue();
                         } else {
                             throw new ElasticsearchParseException("[{}}] field type does not accept > 2 dimensions",
                                 PointFieldMapper.CONTENT_TYPE);
@@ -277,12 +277,12 @@ public static CartesianPoint parsePoint(Object value, CartesianPoint point, bool
         }
     }
 
-    public static double assertZValue(final boolean ignoreZValue, float zValue) {
+    public static double assertZValue(final boolean ignoreZValue, double zValue) {
         if (ignoreZValue == false) {
             throw new ElasticsearchParseException("Exception parsing coordinates: found Z value [{}] but [{}] "
                 + "parameter is [{}]", zValue, IGNORE_Z_VALUE, ignoreZValue);
         }
-        if (Float.isFinite(zValue) == false) {
+        if (Double.isFinite(zValue) == false) {
             throw new ElasticsearchParseException("invalid [{}] value [{}]; " +
                 "must be between -3.4028234663852886E38 and 3.4028234663852886E38",
                 Z_FIELD.getPreferredName(),

x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java

@@ -71,10 +71,10 @@ protected ParsedPoint parseNullValue(Object nullValue, boolean ignoreZValue, boo
             ParsedCartesianPoint point = new ParsedCartesianPoint();
             CartesianPoint.parsePoint(nullValue, point, ignoreZValue);
             if (ignoreMalformed == false) {
-                if (Float.isFinite(point.getX()) == false) {
+                if (Double.isFinite(point.getX()) == false) {
                     throw new IllegalArgumentException("illegal x value [" + point.getX() + "]");
                 }
-                if (Float.isFinite(point.getY()) == false) {
+                if (Double.isFinite(point.getY()) == false) {
                     throw new IllegalArgumentException("illegal y value [" + point.getY() + "]");
                 }
             }
@@ -108,7 +108,7 @@ protected void addStoredFields(ParseContext context, List<? extends CartesianPoi
     protected void addDocValuesFields(String name, List<? extends CartesianPoint> points, List<IndexableField> fields,
                                       ParseContext context) {
         for (CartesianPoint point : points) {
-            context.doc().add(new XYDocValuesField(fieldType().name(), point.getX(), point.getY()));
+            context.doc().add(new XYDocValuesField(fieldType().name(), (float) point.getX(), (float) point.getY()));
         }
     }
 
@@ -143,10 +143,10 @@ public String typeName() {
     protected static class ParsedCartesianPoint extends CartesianPoint implements AbstractPointGeometryFieldMapper.ParsedPoint {
         @Override
         public void validate(String fieldName) {
-            if (Float.isFinite(getX()) == false) {
+            if (Double.isFinite(getX()) == false) {
                 throw new IllegalArgumentException("illegal x value [" + getX() + "] for " + fieldName);
             }
-            if (Float.isFinite(getY()) == false) {
+            if (Double.isFinite(getY()) == false) {
                 throw new IllegalArgumentException("illegal y value [" + getY() + "] for " + fieldName);
             }
         }
@@ -163,7 +163,7 @@ public boolean isNormalizable(double coord) {
 
         @Override
         public void resetCoords(double x, double y) {
-            this.reset((float)x, (float)y);
+            this.reset(x, y);
         }
 
         @Override
@@ -223,7 +223,7 @@ public Class<List<? extends CartesianPoint>> processedClass() {
         public List<IndexableField> indexShape(ParseContext context, List<? extends CartesianPoint> points) {
             ArrayList<IndexableField> fields = new ArrayList<>(1);
             for (CartesianPoint point : points) {
-                fields.add(new XYPointField(fieldType.name(), point.getX(), point.getY()));
+                fields.add(new XYPointField(fieldType.name(), (float) point.getX(), (float) point.getY()));
             }
             return fields;
         }

x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapperTests.java

@@ -312,8 +312,8 @@ public void testParseSourceValue() {
         AbstractGeometryFieldMapper<?, ?> mapper = new PointFieldMapper.Builder("field").build(context);
         SourceLookup sourceLookup = new SourceLookup();
 
-        Map<String, Object> jsonPoint = Map.of("type", "Point", "coordinates", List.of(42.0, 27.100000381469727));
-        String wktPoint = "POINT (42.0 27.100000381469727)";
+        Map<String, Object> jsonPoint = Map.of("type", "Point", "coordinates", List.of(42.0, 27.1));
+        String wktPoint = "POINT (42.0 27.1)";
         Map<String, Object> otherJsonPoint = Map.of("type", "Point", "coordinates", List.of(30.0, 50.0));
         String otherWktPoint = "POINT (30.0 50.0)";