Decode all integral value types in GeoJson decoders

JAVA-3646

Author: jyemin

driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeometryDecoderHelper.java

@@ -392,10 +392,7 @@ private static Position decodePosition(final BsonReader reader) {
         reader.readStartArray();
         List<Double> values = new ArrayList<Double>();
         while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
-            if (reader.getCurrentBsonType() != BsonType.DOUBLE) {
-                throw new CodecConfigurationException("Invalid position");
-            }
-            values.add(reader.readDouble());
+            values.add(readAsDouble(reader));
         }
         reader.readEndArray();
 
@@ -406,6 +403,19 @@ private static Position decodePosition(final BsonReader reader) {
         }
     }
 
+    private static double readAsDouble(final BsonReader reader) {
+        if (reader.getCurrentBsonType() == BsonType.DOUBLE) {
+           return reader.readDouble();
+        } else if (reader.getCurrentBsonType() == BsonType.INT32) {
+            return reader.readInt32();
+        } else if (reader.getCurrentBsonType() == BsonType.INT64) {
+            return reader.readInt64();
+        }
+
+        throw new CodecConfigurationException("A GeoJSON position value must be a numerical type, but the value is of type "
+                + reader.getCurrentBsonType());
+    }
+
     @Nullable
     static CoordinateReferenceSystem decodeCoordinateReferenceSystem(final BsonReader reader) {
         String crsName = null;

driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/GeometryCollectionCodecSpecification.groovy

@@ -31,6 +31,7 @@ import org.bson.BsonDocumentWriter
 import org.bson.codecs.DecoderContext
 import org.bson.codecs.EncoderContext
 import org.bson.codecs.configuration.CodecConfigurationException
+import org.bson.json.JsonReader
 import spock.lang.Specification
 
 import static com.mongodb.client.model.geojson.NamedCoordinateReferenceSystem.EPSG_4326_STRICT_WINDING
@@ -154,6 +155,19 @@ class GeometryCollectionCodecSpecification extends Specification {
         geometryCollection == decodedGeometryCollection
     }
 
+    def 'should decode integral value types'() {
+        given:
+        def jsonRepresentation = '{type: "LineString", coordinates: [ [101.0, 0], [102.0, 2147483648] ] }'
+        def expectedGeometry = new LineString([new Position(101d, 0d), new Position(102d, 2147483648d)])
+        def codec = registry.get(LineString)
+
+        when:
+        def decodedGeometry = codec.decode(new JsonReader(jsonRepresentation), DecoderContext.builder().build())
+
+        then:
+        decodedGeometry == expectedGeometry
+    }
+
     def 'should throw when decoding invalid documents'() {
         when:
         codec.decode(new BsonDocumentReader(parse(invalidJson)), DecoderContext.builder().build())