added geo shape filter

Author: Mpdreamz

src/Nest.Tests.Unit/Search/Filter/Singles/GeoIndexedShapeFilterJson.cs

@@ -0,0 +1,45 @@
+using NUnit.Framework;
+using Nest.Tests.MockData.Domain;
+
+namespace Nest.Tests.Unit.Search.Filter.Singles
+{
+	[TestFixture]
+	public class GeoIndexedShapeFilterJson
+	{
+		[Test]
+		public void GeoShapeFilter()
+		{
+			//[13.0, 53.0], [14.0, 52.0]]
+			var s = new SearchDescriptor<ElasticSearchProject>()
+				.From(0)
+				.Size(10)
+				.Filter(filter => filter
+					.Cache(true) 
+					.Name("my_geo_filter")
+					.GeoIndexedShape(f=>f.Origin, d=>d
+						.Lookup<ElasticSearchProject>(p=>p.MyGeoShape, "1")
+					)
+				);
+
+			var json = TestElasticClient.Serialize(s);
+			var expected = @"{ from: 0, size: 10, 
+				filter : {
+					geo_shape: {
+						origin: {
+							indexed_shape: {
+								id: ""1"",
+								type: ""elasticsearchprojects"",
+								index: ""mydefaultindex"",
+								shape_field_name: ""myGeoShape""
+							}
+						},
+						_cache: true,
+						_name: ""my_geo_filter""
+					}
+				}
+			}";
+			Assert.True(json.JsonEquals(expected), json);
+		}
+		
+	}
+}

src/Nest.Tests.Unit/Search/Filter/Singles/GeoShapeFilterJson.cs

@@ -14,7 +14,7 @@ public void GeoShapeFilter()
 				.From(0)
 				.Size(10)
 				.Filter(filter => filter
-					.Cache(true)
+					.Cache(true) 
 					.Name("my_geo_filter")
 					.GeoShape(f=>f.Origin, d=>d
 						.Type("envelope")

src/Nest.Tests.Unit/TestElasticClient.cs

@@ -11,7 +11,7 @@ public static class TestElasticClient
 		public static ConnectionSettings Settings;
 		static TestElasticClient()
 		{
-			Settings = new ConnectionSettings(Test.Default.Uri);
+			Settings = new ConnectionSettings(Test.Default.Uri).SetDefaultIndex("mydefaultindex");
 			Client = new ElasticClient(Settings);
 		}
 		public static string Serialize<T>(T obj)

src/Nest/DSL/Filter/GeoIndexedShapeFilterDescriptor.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using Nest.Resolvers;
+using Newtonsoft.Json;
+
+namespace Nest
+{
+	public class GeoIndexedShapeFilterDescriptor : FilterBase
+	{
+		internal override bool IsConditionless
+		{
+			get
+			{
+				return this._Shape == null || this._Shape.Id.IsNullOrEmpty();
+			}
+
+		}
+
+		[JsonProperty("indexed_shape")]
+		internal GeoIndexedShapeVector _Shape { get; set; }
+
+
+		public GeoIndexedShapeFilterDescriptor Lookup<T>(string field, string id, string index = null, string type = null)
+		{
+			this._Shape = new GeoIndexedShapeVector
+			{
+				Field = field,
+				Id = id,
+				Type = type ?? new TypeNameMarker { Type = typeof(T) },
+				Index = index ?? new IndexNameMarker { Type = typeof(T) }
+			};
+			return this;
+		}
+
+		public GeoIndexedShapeFilterDescriptor Lookup<T>(Expression<Func<T, object>> field, string id, string index = null, string type = null)
+		{
+			var fieldName = new PropertyNameResolver().Resolve(field);
+			return this.Lookup<T>(fieldName, id, index, type);
+		}
+
+	}
+
+}

src/Nest/DSL/FilterDescriptor.cs

@@ -20,12 +20,6 @@ public class FilterDescriptor : FilterDescriptor<dynamic>
 
 	public class FilterDescriptor<T> : BaseFilter, IFilterDescriptor<T> where T : class
 	{
-		private readonly TypeNameResolver typeNameResolver;
-		public FilterDescriptor()
-		{
-			this.typeNameResolver = new TypeNameResolver();
-		}
-
 		internal string _Name { get; set; }
 		internal string _CacheKey { get; set; }
 		internal bool? _Cache { get; set; }
@@ -453,15 +447,15 @@ public BaseFilter GeoDistanceRange(string field, Action<GeoDistanceRangeFilterDe
 		}
 
 		/// <summary>
-		/// Filters documents that exists within a range from a specific point:
+		/// Filter documents indexed using the geo_shape type.
 		/// </summary>
 		public BaseFilter GeoShape(Expression<Func<T, object>> fieldDescriptor, Action<GeoShapeFilterDescriptor> filterDescriptor)
 		{
 			var field = new PropertyNameResolver().Resolve(fieldDescriptor);
 			return this.GeoShape(field, filterDescriptor);
 		}
 		/// <summary>
-		/// Filters documents that exists within a range from a specific point:
+		/// Filter documents indexed using the geo_shape type.
 		/// </summary>
 		public BaseFilter GeoShape(string field, Action<GeoShapeFilterDescriptor> filterDescriptor)
 		{
@@ -479,6 +473,34 @@ public BaseFilter GeoShape(string field, Action<GeoShapeFilterDescriptor> filter
 			});
 
 		}
+		/// <summary>
+		/// Filter documents indexed using the geo_shape type.
+		/// </summary>
+		public BaseFilter GeoIndexedShape(Expression<Func<T, object>> fieldDescriptor, Action<GeoIndexedShapeFilterDescriptor> filterDescriptor)
+		{
+			var field = new PropertyNameResolver().Resolve(fieldDescriptor);
+			return this.GeoIndexedShape(field, filterDescriptor);
+		}
+		/// <summary>
+		/// Filter documents indexed using the geo_shape type.
+		/// </summary>
+		public BaseFilter GeoIndexedShape(string field, Action<GeoIndexedShapeFilterDescriptor> filterDescriptor)
+		{
+			var filter = new GeoIndexedShapeFilterDescriptor();
+			if (filterDescriptor == null)
+				return CreateConditionlessFilterDescriptor("geo_shape", filter);
+
+			filterDescriptor(filter);
+			if (filter.IsConditionless)
+				return CreateConditionlessFilterDescriptor("geo_shape", filter);
+
+			return this.SetDictionary("geo_shape", field, filter, (d, b) =>
+			{
+				b.GeoShapeFilter = d;
+			});
+
+		}
+
 
 		/// <summary>
 		/// A filter allowing to include hits that only fall within a polygon of points. 

src/Nest/Domain/DSL/GeoShapeVector.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Nest.Resolvers;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -18,4 +19,24 @@ public class GeoShapeVector
 		[JsonProperty("coordinates")]
 		public IEnumerable<IEnumerable<double>> Coordinates { get; set; }
 	}
+
+
+	/// <summary>
+	/// An object to describe a geoshape vetor
+	/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-filter.html
+	/// </summary>
+	public class GeoIndexedShapeVector
+	{
+		[JsonProperty("id")]
+		public string Id { get; set; }
+
+		[JsonProperty("type")]
+		public TypeNameMarker Type { get; set; }
+
+		[JsonProperty("index")]
+		public IndexNameMarker Index { get; set; }
+
+		[JsonProperty("shape_field_name")]
+		public string Field { get; set; }
+	}
 }

src/Nest/Nest.csproj

@@ -74,6 +74,7 @@
     <Compile Include="Domain\Mapping\Descriptors\CompletionMappingDescriptor.cs" />
     <Compile Include="Domain\Mapping\Types\CompletionMapping.cs" />
     <Compile Include="Domain\Responses\RootVersionInfoResponse.cs" />
+    <Compile Include="DSL\Filter\GeoIndexedShapeFilterDescriptor.cs" />
     <Compile Include="DSL\Filter\GeoShapeFilterDescriptor.cs" />
     <Compile Include="DSL\Suggest\FuzzySuggestDescriptor.cs" />
     <Compile Include="DSL\Filter\RegexpFilterDescriptor.cs" />

src/Nest/Resolvers/PropertyNameResolver.cs

@@ -90,6 +90,7 @@ public string Resolve(Expression expression)
 			}
 			return resolved;
 		}
+		
 		public string ResolveToLastToken(Expression expression)
 		{
 			var stack = new Stack<string>();