Base class for geoshape filter and query converters

Author: gmarz

src/Nest/Nest.csproj

@@ -676,6 +676,7 @@
     <Compile Include="DSL\Filter\LimitFilterDescriptor.cs" />
     <Compile Include="DSL\Filter\IdsFilterDescriptor.cs" />
     <Compile Include="DSL\Filter\ExistsFilterDescriptor.cs" />
+    <Compile Include="Resolvers\Converters\GeoShapeConverterBase.cs" />
     <Compile Include="Resolvers\Converters\Queries\GeoShapeQueryJsonReader.cs" />
     <Compile Include="Resolvers\Converters\SimilarityCollectionConverter.cs" />
     <Compile Include="Resolvers\Converters\FuzzinessConverter.cs" />

src/Nest/Resolvers/Converters/Filters/GeoShapeFilterJsonReader.cs

@@ -8,7 +8,7 @@
 
 namespace Nest.Resolvers.Converters.Filters
 {
-	public class GeoShapeFilterJsonReader : JsonConverter
+	public class GeoShapeFilterJsonReader : GeoShapeConverterBase
 	{
 		public override bool CanRead { get { return true; } }
 		public override bool CanWrite { get { return false; } }
@@ -57,82 +57,66 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 								{
 									IGeoShapeCircleFilter f = new GeoShapeCircleFilterDescriptor();
 									f.Shape = new CircleGeoShape();
+									f.Shape.Coordinates = GetCoordinates<IEnumerable<double>>(shape);
 									var radius = shape["radius"];
 									if (radius != null)
 										f.Shape.Radius = radius.Value<string>();
-									var coordinates = shape["coordinates"];
-									if (coordinates != null)
-										f.Shape.Coordinates = coordinates.Values<double>();
 									filter = f;
 									break;
 								}
 								else if (typeName == "envelope")
 								{
 									IGeoShapeEnvelopeFilter f = new GeoShapeEnvelopeFilterDescriptor();
 									f.Shape = new EnvelopeGeoShape();
-									var coordinates = shape["coordinates"];
-									if (coordinates != null)
-										f.Shape.Coordinates = coordinates.Values<double[]>();
+									f.Shape.Coordinates = GetCoordinates<IEnumerable<IEnumerable<double>>>(shape);
 									filter = f;
 									break;
 								}
 								else if (typeName == "linestring")
 								{
 									IGeoShapeLineStringFilter f = new GeoShapeLineStringFilterDescriptor();
 									f.Shape = new LineStringGeoShape();
-									var coordinates = shape["coordinates"];
-									if (coordinates != null)
-										f.Shape.Coordinates = coordinates.Values<double[]>();
+									f.Shape.Coordinates = GetCoordinates<IEnumerable<IEnumerable<double>>>(shape);
 									filter = f;
 									break;
 								}
 								else if (typeName == "multilinestring")
 								{
 									IGeoShapeMultiLineStringFilter f = new GeoShapeMultiLineStringFilterDescriptor();
 									f.Shape = new MultiLineStringGeoShape();
-									var coordinates = shape["coordinates"];
-									if (coordinates != null)
-										f.Shape.Coordinates = coordinates.Values<double[][]>();
+									f.Shape.Coordinates = GetCoordinates<IEnumerable<IEnumerable<IEnumerable<double>>>>(shape);
 									filter = f;
 									break;
 								}
 								else if (typeName == "point")
 								{
 									IGeoShapePointFilter f = new GeoShapePointFilterDescriptor();
 									f.Shape = new PointGeoShape();
-									var coordinates = shape["coordinates"];
-									if (coordinates != null)
-										f.Shape.Coordinates = coordinates.Values<double>();
+									f.Shape.Coordinates = GetCoordinates<IEnumerable<double>>(shape);
 									filter = f;
 									break;
 								}
 								else if (typeName == "multipoint")
 								{
 									IGeoShapeMultiPointFilter f = new GeoShapeMultiPointFilterDescriptor();
 									f.Shape = new MultiPointGeoShape();
-									var coordinates = shape["coordinates"];
-									if (coordinates != null)
-										f.Shape.Coordinates = coordinates.Values<double[]>();
+									f.Shape.Coordinates = GetCoordinates<IEnumerable<IEnumerable<double>>>(shape);
 									filter = f;
 									break;
 								}
 								else if (typeName == "polygon")
 								{
 									IGeoShapePolygonFilter f = new GeoShapePolygonFilterDescriptor();
 									f.Shape = new PolygonGeoShape();
-									var coordinates = shape["coordinates"];
-									if (coordinates != null)
-										f.Shape.Coordinates = coordinates.Values<double[][]>();
+									f.Shape.Coordinates = GetCoordinates<IEnumerable<IEnumerable<IEnumerable<double>>>>(shape);
 									filter = f;
 									break;
 								}
 								else if (typeName == "multipolygon")
 								{
 									IGeoShapeMultiPolygonFilter f = new GeoShapeMultiPolygonFilterDescriptor();
 									f.Shape = new MultiPolygonGeoShape();
-									var coordinates = shape["coordinates"];
-									if (coordinates != null)
-										f.Shape.Coordinates = coordinates.Values<double[][][]>();
+									f.Shape.Coordinates = GetCoordinates<IEnumerable<IEnumerable<IEnumerable<IEnumerable<double>>>>>(shape);
 									filter = f;
 									break;
 								}

src/Nest/Resolvers/Converters/GeoShapeConverterBase.cs

@@ -0,0 +1,20 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest.Resolvers.Converters
+{
+	public abstract class GeoShapeConverterBase : JsonConverter
+	{
+		public virtual T GetCoordinates<T>(JToken shape)
+		{
+			var coordinates = shape["coordinates"];
+			if (coordinates != null)
+				return coordinates.ToObject<T>();
+			return default(T);
+		}
+	}
+}

src/Nest/Resolvers/Converters/Queries/GeoShapeQueryJsonReader.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using Nest.Resolvers.Converters;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
@@ -7,7 +8,7 @@
 
 namespace Nest
 {
-	public class GeoShapeQueryJsonReader : JsonConverter
+	public class GeoShapeQueryJsonReader : GeoShapeConverterBase
 	{
 		public override bool CanConvert(Type objectType)
 		{
@@ -106,14 +107,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			return query;
 		}
 
-		private T GetCoordinates<T>(JToken shape)
-		{
-			var coordinates = shape["coordinates"];
-			if (coordinates != null)
-				return coordinates.ToObject<T>();
-			return default(T);
-		}
-
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
 		}