added support for geo_shape query

Author: Mpdreamz

src/Nest/DSL/Query/GeoShapeQueryDescriptor.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using Nest.Resolvers;
+using Newtonsoft.Json;
+using Elasticsearch.Net;
+
+namespace Nest
+{
+	public class GeoShapeQueryDescriptor<T> : IQuery 
+		where T : class
+	{
+		internal PropertyPathMarker _Field { get; set; }
+		bool IQuery.IsConditionless
+		{
+			get
+			{
+				return this._Field.IsConditionless() || (this._Shape == null || !this._Shape.Coordinates.HasAny());
+			}
+
+		}
+		public GeoShapeQueryDescriptor<T> OnField(string field)
+		{
+			this._Field = field;
+			return this;
+		}
+		public GeoShapeQueryDescriptor<T> OnField(Expression<Func<T, object>> objectPath)
+		{
+			this._Field = objectPath;
+			return this;
+		}
+		[JsonProperty("shape")]
+		internal GeoShapeVector _Shape { get; set; }
+
+		public GeoShapeQueryDescriptor<T> Type(string type)
+		{
+			if (this._Shape == null)
+				this._Shape = new GeoShapeVector();
+			this._Shape.Type = type;
+			return this;
+		}
+
+		public GeoShapeQueryDescriptor<T> Coordinates(IEnumerable<IEnumerable<double>> coordinates)
+		{
+			if (this._Shape == null)
+				this._Shape = new GeoShapeVector();
+			this._Shape.Coordinates = coordinates;
+			return this;
+		}
+
+	}
+
+}

src/Nest/DSL/QueryDescriptor.cs

@@ -66,6 +66,9 @@ internal QueryDescriptor(bool forceConditionless)
 		[JsonConverter(typeof(DictionaryKeysAreNotPropertyNamesJsonConverter))]
 		[JsonProperty(PropertyName = "fuzzy")]
 		internal IDictionary<PropertyPathMarker, object> FuzzyQueryDescriptor { get; set; }
+		[JsonProperty(PropertyName = "geo_shape")]
+		[JsonConverter(typeof(DictionaryKeysAreNotPropertyNamesJsonConverter))]
+		internal IDictionary<PropertyPathMarker, object> GeoShapeQueryDescriptor { get; set; }
 		[JsonProperty(PropertyName = "terms")]
 		[JsonConverter(typeof(DictionaryKeysAreNotPropertyNamesJsonConverter))]
 		internal IDictionary<PropertyPathMarker, object> TermsQueryDescriptor { get; set; }
@@ -433,6 +436,23 @@ public BaseQuery MoreLikeThis(Action<MoreLikeThisQueryDescriptor<T>> selector)
 
 			return this.New(query, q => q.MoreLikeThisDescriptor = query);
 		}
+		
+		/// <summary>
+		/// The geo_shape Filter uses the same grid square representation as the geo_shape mapping to find documents 
+		/// that have a shape that intersects with the query shape. 
+		/// It will also use the same PrefixTree configuration as defined for the field mapping.
+		/// </summary>
+		public BaseQuery GeoShape(Action<GeoShapeQueryDescriptor<T>> selector)
+		{
+			var query = new GeoShapeQueryDescriptor<T>();
+			selector(query);
+			var shape = new Dictionary<PropertyPathMarker, object>
+			{
+				{ query._Field, query }
+			};
+			return this.New(query, q => q.GeoShapeQueryDescriptor = shape);
+		}
+
 		/// <summary>
 		/// The has_child query works the same as the has_child filter, by automatically wrapping the filter with a 
 		/// constant_score.

src/Nest/Domain/DSL/Query.cs

@@ -134,7 +134,11 @@ public static BaseQuery SimpleQueryString(Action<SimpleQueryStringQueryDescripto
 		{
 			return new QueryDescriptor<T>().SimpleQueryString(selector);
 		}
-
+		
+		public static BaseQuery GeoShape(Action<GeoShapeQueryDescriptor<T>> selector)
+		{
+			return new QueryDescriptor<T>().GeoShape(selector);
+		}
 		public static BaseQuery QueryString(Action<QueryStringDescriptor<T>> selector)
 		{
 			return new QueryDescriptor<T>().QueryString(selector);

src/Nest/Nest.csproj

@@ -170,6 +170,7 @@
     <Compile Include="DSL\Facets\Ip4Range.cs" />
     <Compile Include="DSL\Facets\DateExpressionRange.cs" />
     <Compile Include="DSL\Paths\BasePathDescriptor.cs" />
+    <Compile Include="DSL\Query\GeoShapeQueryDescriptor.cs" />
     <Compile Include="DSL\Query\SimpeQueryStringQueryDescriptor.cs" />
     <Compile Include="DSL\SourceDescriptor.cs" />
     <Compile Include="DSL\NodesStatsDescriptor.cs" />

src/Tests/Nest.Tests.Unit/Search/Query/Singles/GeoShape/GeoShapeFull.json

@@ -0,0 +1,16 @@
+  {
+  "from": 0,
+  "size": 10,
+  "query": {
+    "geo_shape": {
+      "myGeoShape": {
+        "shape": {
+          "type": "enveloppe",
+          "coordinates": [
+            [ 13.0, 53.0 ], [ 14.0, 52.0 ]
+          ]
+        }
+      }
+    }
+  }
+}

src/Tests/Nest.Tests.Unit/Search/Query/Singles/GeoShape/GeoShapeQueryJson.cs

@@ -0,0 +1,27 @@
+using System.Reflection;
+using Nest.Tests.MockData.Domain;
+using NUnit.Framework;
+
+namespace Nest.Tests.Unit.Search.Query.Singles.GeoShape
+{
+	[TestFixture]
+	public class GeoShapeQueryJson : BaseJsonTests
+	{
+		[Test]
+		public void GeoShapeFull()
+		{
+			var s = new SearchDescriptor<ElasticsearchProject>()
+				.From(0)
+				.Size(10)
+				.Query(q=>q
+					.GeoShape(qs=>qs
+						.OnField(p=>p.MyGeoShape)
+						.Coordinates(new [] { new [] {13.0, 53.0}, new [] { 14.0, 52.0} })
+						.Type("enveloppe")
+					)
+			);
+				
+			this.JsonEquals(s, MethodInfo.GetCurrentMethod());
+		}
+	}
+}