added geoshape filter

Author: Mpdreamz

src/Nest.Tests.Unit/Nest.Tests.Unit.csproj

@@ -107,6 +107,7 @@
     <Compile Include="Internals\Inferno\HostNameWithPathTests.cs" />
     <Compile Include="Internals\Inferno\MapTypeNamesTests.cs" />
     <Compile Include="Internals\Serialize\OptOutTests.cs" />
+    <Compile Include="Search\Filter\Singles\GeoShapeFilterJson.cs" />
     <Compile Include="Search\Filter\Singles\RegexpFilterJson.cs" />
     <Compile Include="Search\Query\BoolQueryMerges\BoolQueryMergesTests.cs" />
     <Compile Include="Search\Filter\BoolFilterMerges\BoolFilterMergesTests.cs" />

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

@@ -17,7 +17,7 @@ public void GeoPolygonFilter()
 				.Filter(filter => filter
 					.GeoPolygon("origin", "drn5x1g8cu2y", "30, -80", "20, -90")
 				);
-
+			 
 			var json = TestElasticClient.Serialize(s);
 			var expected = @"{ from: 0, size: 10, 
 				filter : {

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

@@ -0,0 +1,44 @@
+using NUnit.Framework;
+using Nest.Tests.MockData.Domain;
+
+namespace Nest.Tests.Unit.Search.Filter.Singles
+{
+	[TestFixture]
+	public class GeoShapeFilterJson
+	{
+		[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")
+					.GeoShape(f=>f.Origin, d=>d
+						.Type("envelope")
+						.Coordinates(new[] { new[] { 13.0, 53.0 }, new[] { 14.0, 52.0 } })
+					)
+				);
+
+			var json = TestElasticClient.Serialize(s);
+			var expected = @"{ from: 0, size: 10, 
+				filter : {
+					geo_shape: {
+						origin: {
+							shape: {
+								type: ""envelope"",
+								coordinates: [[13.0, 53.0], [14.0, 52.0]]
+							}
+						},
+						_cache: true,
+						_name: ""my_geo_filter""
+					}
+				}
+			}";
+			Assert.True(json.JsonEquals(expected), json);
+		}
+		
+	}
+}

src/Nest/DSL/Filter/GeoShapeFilterDescriptor.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Newtonsoft.Json;
+
+namespace Nest
+{
+	public class GeoShapeFilterDescriptor : FilterBase
+	{
+		internal override bool IsConditionless
+		{
+			get
+			{
+				return this._Shape == null || !this._Shape.Coordinates.HasAny();
+			}
+
+		}
+
+		[JsonProperty("shape")]
+		internal GeoShapeVector _Shape { get; set; }
+
+
+		public GeoShapeFilterDescriptor Type(string type)
+		{
+			if (this._Shape == null)
+				this._Shape = new GeoShapeVector();
+			this._Shape.Type = type;
+			return this;
+		}
+
+		public GeoShapeFilterDescriptor Coordinates(IEnumerable<IEnumerable<double>> coordinates)
+		{
+			if (this._Shape == null)
+				this._Shape = new GeoShapeVector();
+			this._Shape.Coordinates = coordinates;
+			return this;
+		}
+
+	}
+
+}

src/Nest/DSL/FilterDescriptor.cs

@@ -71,6 +71,10 @@ public FilterDescriptor<T> Cache(bool cache)
 		[JsonConverter(typeof(DictionaryKeysAreNotPropertyNamesJsonConverter))]
 		internal Dictionary<string, object> GeoPolygonFilter { get; set; }
 
+		[JsonProperty(PropertyName = "geo_shape")]
+		[JsonConverter(typeof(DictionaryKeysAreNotPropertyNamesJsonConverter))]
+		internal Dictionary<string, object> GeoShapeFilter { get; set; }
+
 		[JsonProperty(PropertyName = "limit")]
 		internal LimitFilter LimitFilter { get; set; }
 
@@ -409,6 +413,7 @@ public BaseFilter GeoDistance(string field, Action<GeoDistanceFilterDescriptor>
 			});
 
 		}
+		
 		/// <summary>
 		/// Filters documents that exists within a range from a specific point:
 		/// </summary>
@@ -424,17 +429,11 @@ public BaseFilter GeoDistanceRange(string field, Action<GeoDistanceRangeFilterDe
 		{
 			var filter = new GeoDistanceRangeFilterDescriptor();
 			if (filterDescriptor == null)
-				return CreateConditionlessFilterDescriptor("geo_distance", filter);
+				return CreateConditionlessFilterDescriptor("geo_distance_range", filter);
 
 			filterDescriptor(filter);
-			if (this.IsStrict && filter._FromDistance == null)
-				throw new DslException("Missing from distance, Distance should be set when using the geo distance range DSL in strict mode");
-
-			if (this.IsStrict && filter._ToDistance == null)
-				throw new DslException("Missing to distance, Distance should be set when using the geo distance range DSL in strict mode");
-
 			if (filter.IsConditionless)
-				return CreateConditionlessFilterDescriptor("geo_distance", filter);
+				return CreateConditionlessFilterDescriptor("geo_distance_range", filter);
 
 			return this.SetDictionary("geo_distance_range", field, filter._Location, (d, b) =>
 			{
@@ -451,8 +450,36 @@ public BaseFilter GeoDistanceRange(string field, Action<GeoDistanceRangeFilterDe
 				d.ForEachWithIndex((kv, i) => dd.Add(kv.Key, kv.Value));
 				b.GeoDistanceRangeFilter = dd;
 			});
+		}
+
+		/// <summary>
+		/// Filters documents that exists within a range from a specific point:
+		/// </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:
+		/// </summary>
+		public BaseFilter GeoShape(string field, Action<GeoShapeFilterDescriptor> filterDescriptor)
+		{
+			var filter = new GeoShapeFilterDescriptor();
+			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. 
 		/// </summary>

src/Nest/Domain/DSL/GeoShapeVector.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Newtonsoft.Json;
+
+namespace Nest
+{
+	/// <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 GeoShapeVector
+	{
+		[JsonProperty("type")]
+		public string Type { get; set; }
+
+		[JsonProperty("coordinates")]
+		public IEnumerable<IEnumerable<double>> Coordinates { get; set; }
+	}
+}

src/Nest/Nest.csproj

@@ -70,9 +70,11 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Domain\Connection\AsyncRequestOperation.cs" />
+    <Compile Include="Domain\DSL\GeoShapeVector.cs" />
     <Compile Include="Domain\Mapping\Descriptors\CompletionMappingDescriptor.cs" />
     <Compile Include="Domain\Mapping\Types\CompletionMapping.cs" />
     <Compile Include="Domain\Responses\RootVersionInfoResponse.cs" />
+    <Compile Include="DSL\Filter\GeoShapeFilterDescriptor.cs" />
     <Compile Include="DSL\Suggest\FuzzySuggestDescriptor.cs" />
     <Compile Include="DSL\Filter\RegexpFilterDescriptor.cs" />
     <Compile Include="DSL\Query\RegexpQueryDescriptor.cs" />

src/RawClientGenerator/Views/Enums.Generated.cshtml

@@ -1,6 +1,14 @@
 @using System.Collections.Generic
 @using System.Linq
 @using RawClientGenerator
+
+@functions {
+	private string CreateEnum
+   (string o)
+	{
+		return string.Format("[EnumMember(Value = \"{0}\")]\r\n\t\t{1}", o, o.ToPascalCase());
+	}
+}
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -21,8 +29,8 @@ namespace Nest
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum @e.Name 
 	{
-		@Raw(string.Join(",\r\n\t\t", e.Options.Select(o=> string.Format("[EnumMember(Value = \"{0}\")]\r\n\t\t{1}", o, o.ToPascalCase()))))
-	}
+	  @Raw(string.Join(",\r\n\t\t", e.Options.Select(CreateEnum)))
+	  }
 	</text>
 	}
 }