Add relation to geoshape filters

gmarz · gmarz · commit 1ff2e68fdaaf · 2014-12-09T15:50:38.000-05:00
Closes #1090
diff --git a/src/Nest/DSL/Filter/GeoIndexedShapeFilterDescriptor.cs b/src/Nest/DSL/Filter/GeoIndexedShapeFilterDescriptor.cs
@@ -24,6 +24,8 @@ protected internal override void WrapInContainer(IFilterContainer container)
 		public PropertyPathMarker Field { get; set; }
 
 		public IndexedGeoShape IndexedShape { get; set; }
+
+		public GeoShapeRelation? Relation { get; set; }
 	}
 
 	public class GeoIndexedShapeFilterDescriptor : FilterBase, IGeoIndexedShapeFilter
@@ -38,6 +40,7 @@ bool IFilter.IsConditionless
 		}
 
 		PropertyPathMarker IFieldNameFilter.Field { get; set; }
+		GeoShapeRelation? IGeoShapeBaseFilter.Relation { get; set; }
 		IndexedGeoShape IGeoIndexedShapeFilter.IndexedShape { get; set; }
 
 		public GeoIndexedShapeFilterDescriptor Lookup<T>(string field, string id, string index = null, string type = null)
@@ -62,6 +65,11 @@ public GeoIndexedShapeFilterDescriptor Lookup<T>(Expression<Func<T, object>> fie
 			return _SetShape<T>(field, id, index, type);
 		}
 		
+		public GeoIndexedShapeFilterDescriptor Relation<T>(GeoShapeRelation relation)
+		{
+			((IGeoIndexedShapeFilter)this).Relation = relation;
+			return this;
+		}
 	}
 
 }
diff --git a/src/Nest/DSL/Filter/GeoShapeCircleFilterDescriptor.cs b/src/Nest/DSL/Filter/GeoShapeCircleFilterDescriptor.cs
@@ -27,6 +27,8 @@ protected internal override void WrapInContainer(IFilterContainer container)
 		public PropertyPathMarker Field { get; set; }
 
 		public ICircleGeoShape Shape { get; set; }
+
+		public GeoShapeRelation? Relation { get; set; }
 	}
 
 	public class GeoShapeCircleFilterDescriptor : FilterBase, IGeoShapeCircleFilter
@@ -42,6 +44,7 @@ bool IFilter.IsConditionless
 		}
 
 		PropertyPathMarker IFieldNameFilter.Field { get; set; }
+		GeoShapeRelation? IGeoShapeBaseFilter.Relation { get; set; }
 		ICircleGeoShape IGeoShapeCircleFilter.Shape { get; set; }
 
 		public GeoShapeCircleFilterDescriptor Coordinates(IEnumerable<double> coordinates)
@@ -59,6 +62,12 @@ public GeoShapeCircleFilterDescriptor Radius(string radius)
 			this.Self.Shape.Radius = radius;
 			return this;
 		}
+
+		public GeoShapeCircleFilterDescriptor Relation(GeoShapeRelation relation)
+		{
+			this.Self.Relation = relation;
+			return this;
+		}
 	}
 
 }
diff --git a/src/Nest/DSL/Filter/GeoShapeEnvelopeFilterDescriptor.cs b/src/Nest/DSL/Filter/GeoShapeEnvelopeFilterDescriptor.cs
@@ -13,6 +13,8 @@ namespace Nest
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public interface IGeoShapeBaseFilter : IFieldNameFilter
 	{
+		[JsonProperty("relation")]
+		GeoShapeRelation? Relation { get; set; }
 	}
 
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
@@ -32,6 +34,8 @@ protected internal override void WrapInContainer(IFilterContainer container)
 		public PropertyPathMarker Field { get; set; }
 
 		public IEnvelopeGeoShape Shape { get; set; }
+
+		public GeoShapeRelation? Relation { get; set; }
 	}
 
 	public class GeoShapeEnvelopeFilterDescriptor : FilterBase, IGeoShapeEnvelopeFilter
@@ -47,6 +51,7 @@ bool IFilter.IsConditionless
 		}
 
 		PropertyPathMarker IFieldNameFilter.Field { get; set; }
+		GeoShapeRelation? IGeoShapeBaseFilter.Relation { get; set; }
 		IEnvelopeGeoShape IGeoShapeEnvelopeFilter.Shape { get; set; }
 
 		public GeoShapeEnvelopeFilterDescriptor Coordinates(IEnumerable<IEnumerable<double>> coordinates)
@@ -56,6 +61,12 @@ public GeoShapeEnvelopeFilterDescriptor Coordinates(IEnumerable<IEnumerable<doub
 			this.Self.Shape.Coordinates = coordinates;
 			return this;
 		}
+
+		public GeoShapeEnvelopeFilterDescriptor Relation(GeoShapeRelation relation)
+		{
+			this.Self.Relation = relation;
+			return this;
+		}
 	}
 
 }
diff --git a/src/Nest/DSL/Filter/GeoShapeLineStringFilterDescriptor.cs b/src/Nest/DSL/Filter/GeoShapeLineStringFilterDescriptor.cs
@@ -25,7 +25,7 @@ protected internal override void WrapInContainer(IFilterContainer container)
 		}
 
 		public PropertyPathMarker Field { get; set; }
-
+		public GeoShapeRelation? Relation { get; set; }
 		public ILineStringGeoShape Shape { get; set; }
 	}
 
@@ -42,6 +42,7 @@ bool IFilter.IsConditionless
 		}
 
 		PropertyPathMarker IFieldNameFilter.Field { get; set; }
+		GeoShapeRelation? IGeoShapeBaseFilter.Relation { get; set; }
 		ILineStringGeoShape IGeoShapeLineStringFilter.Shape { get; set; }
 
 		public GeoShapeLineStringFilterDescriptor Coordinates(IEnumerable<IEnumerable<double>> coordinates)
@@ -51,6 +52,12 @@ public GeoShapeLineStringFilterDescriptor Coordinates(IEnumerable<IEnumerable<do
 			this.Self.Shape.Coordinates = coordinates;
 			return this;
 		}
+
+		public GeoShapeLineStringFilterDescriptor Relation(GeoShapeRelation relation)
+		{
+			this.Self.Relation = relation;
+			return this;
+		}
 	}
 
 }
diff --git a/src/Nest/DSL/Filter/GeoShapeMultiLineStringFilterDescriptor.cs b/src/Nest/DSL/Filter/GeoShapeMultiLineStringFilterDescriptor.cs
@@ -26,6 +26,8 @@ protected internal override void WrapInContainer(IFilterContainer container)
 
 		public PropertyPathMarker Field { get; set; }
 
+		public GeoShapeRelation? Relation { get; set; }
+
 		public IMultiLineStringGeoShape Shape { get; set; }
 	}
 
@@ -42,6 +44,7 @@ bool IFilter.IsConditionless
 		}
 
 		PropertyPathMarker IFieldNameFilter.Field { get; set; }
+		GeoShapeRelation? IGeoShapeBaseFilter.Relation { get; set; }
 		IMultiLineStringGeoShape IGeoShapeMultiLineStringFilter.Shape { get; set; }
 
 		public GeoShapeMultiLineStringFilterDescriptor Coordinates(IEnumerable<IEnumerable<IEnumerable<double>>> coordinates)
@@ -51,6 +54,12 @@ public GeoShapeMultiLineStringFilterDescriptor Coordinates(IEnumerable<IEnumerab
 			this.Self.Shape.Coordinates = coordinates;
 			return this;
 		}
+
+		public GeoShapeMultiLineStringFilterDescriptor Relation(GeoShapeRelation relation)
+		{
+			this.Self.Relation = relation;
+			return this;
+		}
 	}
 
 }
diff --git a/src/Nest/DSL/Filter/GeoShapeMultiPointFilterDescriptor.cs b/src/Nest/DSL/Filter/GeoShapeMultiPointFilterDescriptor.cs
@@ -26,6 +26,8 @@ protected internal override void WrapInContainer(IFilterContainer container)
 
 		public PropertyPathMarker Field { get; set; }
 
+		public GeoShapeRelation? Relation { get; set; }
+
 		public IMultiPointGeoShape Shape { get; set; }
 	}
 
@@ -42,6 +44,7 @@ bool IFilter.IsConditionless
 		}
 
 		PropertyPathMarker IFieldNameFilter.Field { get; set; }
+		GeoShapeRelation? IGeoShapeBaseFilter.Relation { get; set; }
 		IMultiPointGeoShape IGeoShapeMultiPointFilter.Shape { get; set; }
 
 		public GeoShapeMultiPointFilterDescriptor Coordinates(IEnumerable<IEnumerable<double>> coordinates)
@@ -51,6 +54,12 @@ public GeoShapeMultiPointFilterDescriptor Coordinates(IEnumerable<IEnumerable<do
 			this.Self.Shape.Coordinates = coordinates;
 			return this;
 		}
+
+		public GeoShapeMultiPointFilterDescriptor Relation(GeoShapeRelation relation)
+		{
+			this.Self.Relation = relation;
+			return this;
+		}
 	}
 
 }
diff --git a/src/Nest/DSL/Filter/GeoShapeMultiPolygonFilterDescriptor.cs b/src/Nest/DSL/Filter/GeoShapeMultiPolygonFilterDescriptor.cs
@@ -26,6 +26,8 @@ protected internal override void WrapInContainer(IFilterContainer container)
 
 		public PropertyPathMarker Field { get; set; }
 
+		public GeoShapeRelation? Relation { get; set; }
+
 		public IMultiPolygonGeoShape Shape { get; set; }
 	}
 
@@ -42,6 +44,7 @@ bool IFilter.IsConditionless
 		}
 
 		PropertyPathMarker IFieldNameFilter.Field { get; set; }
+		GeoShapeRelation? IGeoShapeBaseFilter.Relation { get; set; }
 		IMultiPolygonGeoShape IGeoShapeMultiPolygonFilter.Shape { get; set; }
 
 		public GeoShapeMultiPolygonFilterDescriptor Coordinates(IEnumerable<IEnumerable<IEnumerable<IEnumerable<double>>>> coordinates)
@@ -51,6 +54,12 @@ public GeoShapeMultiPolygonFilterDescriptor Coordinates(IEnumerable<IEnumerable<
 			this.Self.Shape.Coordinates = coordinates;
 			return this;
 		}
+
+		public GeoShapeMultiPolygonFilterDescriptor Relation(GeoShapeRelation relation)
+		{
+			this.Self.Relation = relation;
+			return this;
+		}
 	}
 
 }
diff --git a/src/Nest/DSL/Filter/GeoShapePointFilterDescriptor.cs b/src/Nest/DSL/Filter/GeoShapePointFilterDescriptor.cs
@@ -25,7 +25,7 @@ protected internal override void WrapInContainer(IFilterContainer container)
 		}
 
 		public PropertyPathMarker Field { get; set; }
-
+		public GeoShapeRelation? Relation { get; set; }
 		public IPointGeoShape Shape { get; set; }
 	}
 
@@ -42,6 +42,7 @@ bool IFilter.IsConditionless
 		}
 
 		PropertyPathMarker IFieldNameFilter.Field { get; set; }
+		GeoShapeRelation? IGeoShapeBaseFilter.Relation { get; set; }
 		IPointGeoShape IGeoShapePointFilter.Shape { get; set; }
 
 		public GeoShapePointFilterDescriptor Coordinates(IEnumerable<double> coordinates)
@@ -51,6 +52,12 @@ public GeoShapePointFilterDescriptor Coordinates(IEnumerable<double> coordinates
 			this.Self.Shape.Coordinates = coordinates;
 			return this;
 		}
+
+		public GeoShapePointFilterDescriptor Relation(GeoShapeRelation relation)
+		{
+			this.Self.Relation = relation;
+			return this;
+		}
 	}
 
 }
diff --git a/src/Nest/DSL/Filter/GeoShapePolygonFilterDescriptor.cs b/src/Nest/DSL/Filter/GeoShapePolygonFilterDescriptor.cs
@@ -25,7 +25,7 @@ protected internal override void WrapInContainer(IFilterContainer container)
 		}
 
 		public PropertyPathMarker Field { get; set; }
-
+		public GeoShapeRelation? Relation { get; set; }
 		public IPolygonGeoShape Shape { get; set; }
 	}
 
@@ -42,6 +42,7 @@ bool IFilter.IsConditionless
 		}
 
 		PropertyPathMarker IFieldNameFilter.Field { get; set; }
+		GeoShapeRelation? IGeoShapeBaseFilter.Relation { get; set; }
 		IPolygonGeoShape IGeoShapePolygonFilter.Shape { get; set; }
 
 		public GeoShapePolygonFilterDescriptor Coordinates(IEnumerable<IEnumerable<IEnumerable<double>>> coordinates)
@@ -51,6 +52,12 @@ public GeoShapePolygonFilterDescriptor Coordinates(IEnumerable<IEnumerable<IEnum
 			this.Self.Shape.Coordinates = coordinates;
 			return this;
 		}
+
+		public GeoShapePolygonFilterDescriptor Relation(GeoShapeRelation relation)
+		{
+			this.Self.Relation = relation;
+			return this;
+		}
 	}
 
 }
diff --git a/src/Nest/Enums/GeoShapeRelation.cs b/src/Nest/Enums/GeoShapeRelation.cs
@@ -0,0 +1,21 @@
+﻿using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+
+namespace Nest
+{
+	[JsonConverter(typeof(StringEnumConverter))]
+	public enum GeoShapeRelation
+	{
+		[EnumMember(Value = "intersects")]
+		Intersects,
+		[EnumMember(Value = "disjoint")]
+		Disjoint,
+		[EnumMember(Value = "within")]
+		Within
+	}
+}
diff --git a/src/Nest/Nest.csproj b/src/Nest/Nest.csproj
@@ -369,6 +369,7 @@
     <Compile Include="Enums\FieldDataLoading.cs" />
     <Compile Include="Enums\FieldDataNonStringFormat.cs" />
     <Compile Include="Enums\FieldDataStringFormat.cs" />
+    <Compile Include="Enums\GeoShapeRelation.cs" />
     <Compile Include="Enums\HighlighterType.cs" />
     <Compile Include="Enums\NormsLoading.cs" />
     <Compile Include="Enums\RoutingAllocationEnableOption.cs" />
diff --git a/src/Tests/Nest.Tests.Unit/Search/Filter/Singles/GeoShapeFilterJson.cs b/src/Tests/Nest.Tests.Unit/Search/Filter/Singles/GeoShapeFilterJson.cs

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ protected internal override void WrapInContainer(IFilterContainer container)`
`24`	`24`	`public PropertyPathMarker Field { get; set; }`
`25`	`25`
`26`	`26`	`public IndexedGeoShape IndexedShape { get; set; }`
	`27`	`+`
	`28`	`+ public GeoShapeRelation? Relation { get; set; }`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`public class GeoIndexedShapeFilterDescriptor : FilterBase, IGeoIndexedShapeFilter`
`@@ -38,6 +40,7 @@ bool IFilter.IsConditionless`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`PropertyPathMarker IFieldNameFilter.Field { get; set; }`
	`43`	`+ GeoShapeRelation? IGeoShapeBaseFilter.Relation { get; set; }`
`41`	`44`	`IndexedGeoShape IGeoIndexedShapeFilter.IndexedShape { get; set; }`
`42`	`45`
`43`	`46`	`public GeoIndexedShapeFilterDescriptor Lookup<T>(string field, string id, string index = null, string type = null)`
`@@ -62,6 +65,11 @@ public GeoIndexedShapeFilterDescriptor Lookup<T>(Expression<Func<T, object>> fie`
`62`	`65`	`return _SetShape<T>(field, id, index, type);`
`63`	`66`	`}`
`64`	`67`
	`68`	`+ public GeoIndexedShapeFilterDescriptor Relation<T>(GeoShapeRelation relation)`
	`69`	`+ {`
	`70`	`+ ((IGeoIndexedShapeFilter)this).Relation = relation;`
	`71`	`+ return this;`
	`72`	`+ }`
`65`	`73`	`}`
`66`	`74`
`67`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ protected internal override void WrapInContainer(IFilterContainer container)`
`27`	`27`	`public PropertyPathMarker Field { get; set; }`
`28`	`28`
`29`	`29`	`public ICircleGeoShape Shape { get; set; }`
	`30`	`+`
	`31`	`+ public GeoShapeRelation? Relation { get; set; }`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`public class GeoShapeCircleFilterDescriptor : FilterBase, IGeoShapeCircleFilter`
`@@ -42,6 +44,7 @@ bool IFilter.IsConditionless`
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`PropertyPathMarker IFieldNameFilter.Field { get; set; }`
	`47`	`+ GeoShapeRelation? IGeoShapeBaseFilter.Relation { get; set; }`
`45`	`48`	`ICircleGeoShape IGeoShapeCircleFilter.Shape { get; set; }`
`46`	`49`
`47`	`50`	`public GeoShapeCircleFilterDescriptor Coordinates(IEnumerable<double> coordinates)`
`@@ -59,6 +62,12 @@ public GeoShapeCircleFilterDescriptor Radius(string radius)`
`59`	`62`	`this.Self.Shape.Radius = radius;`
`60`	`63`	`return this;`
`61`	`64`	`}`
	`65`	`+`
	`66`	`+ public GeoShapeCircleFilterDescriptor Relation(GeoShapeRelation relation)`
	`67`	`+ {`
	`68`	`+ this.Self.Relation = relation;`
	`69`	`+ return this;`
	`70`	`+ }`
`62`	`71`	`}`
`63`	`72`
`64`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ namespace Nest`
`13`	`13`	`[JsonObject(MemberSerialization = MemberSerialization.OptIn)]`
`14`	`14`	`public interface IGeoShapeBaseFilter : IFieldNameFilter`
`15`	`15`	`{`
	`16`	`+ [JsonProperty("relation")]`
	`17`	`+ GeoShapeRelation? Relation { get; set; }`
`16`	`18`	`}`
`17`	`19`
`18`	`20`	`[JsonObject(MemberSerialization = MemberSerialization.OptIn)]`
`@@ -32,6 +34,8 @@ protected internal override void WrapInContainer(IFilterContainer container)`
`32`	`34`	`public PropertyPathMarker Field { get; set; }`
`33`	`35`
`34`	`36`	`public IEnvelopeGeoShape Shape { get; set; }`
	`37`	`+`
	`38`	`+ public GeoShapeRelation? Relation { get; set; }`
`35`	`39`	`}`
`36`	`40`
`37`	`41`	`public class GeoShapeEnvelopeFilterDescriptor : FilterBase, IGeoShapeEnvelopeFilter`
`@@ -47,6 +51,7 @@ bool IFilter.IsConditionless`
`47`	`51`	`}`
`48`	`52`
`49`	`53`	`PropertyPathMarker IFieldNameFilter.Field { get; set; }`
	`54`	`+ GeoShapeRelation? IGeoShapeBaseFilter.Relation { get; set; }`
`50`	`55`	`IEnvelopeGeoShape IGeoShapeEnvelopeFilter.Shape { get; set; }`
`51`	`56`
`52`	`57`	`public GeoShapeEnvelopeFilterDescriptor Coordinates(IEnumerable<IEnumerable<double>> coordinates)`
`@@ -56,6 +61,12 @@ public GeoShapeEnvelopeFilterDescriptor Coordinates(IEnumerable<IEnumerable<doub`
`56`	`61`	`this.Self.Shape.Coordinates = coordinates;`
`57`	`62`	`return this;`
`58`	`63`	`}`
	`64`	`+`
	`65`	`+ public GeoShapeEnvelopeFilterDescriptor Relation(GeoShapeRelation relation)`
	`66`	`+ {`
	`67`	`+ this.Self.Relation = relation;`
	`68`	`+ return this;`
	`69`	`+ }`
`59`	`70`	`}`
`60`	`71`
`61`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ protected internal override void WrapInContainer(IFilterContainer container)`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public PropertyPathMarker Field { get; set; }`
`28`		`-`
	`28`	`+ public GeoShapeRelation? Relation { get; set; }`
`29`	`29`	`public ILineStringGeoShape Shape { get; set; }`
`30`	`30`	`}`
`31`	`31`
`@@ -42,6 +42,7 @@ bool IFilter.IsConditionless`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`PropertyPathMarker IFieldNameFilter.Field { get; set; }`
	`45`	`+ GeoShapeRelation? IGeoShapeBaseFilter.Relation { get; set; }`
`45`	`46`	`ILineStringGeoShape IGeoShapeLineStringFilter.Shape { get; set; }`
`46`	`47`
`47`	`48`	`public GeoShapeLineStringFilterDescriptor Coordinates(IEnumerable<IEnumerable<double>> coordinates)`
`@@ -51,6 +52,12 @@ public GeoShapeLineStringFilterDescriptor Coordinates(IEnumerable<IEnumerable<do`
`51`	`52`	`this.Self.Shape.Coordinates = coordinates;`
`52`	`53`	`return this;`
`53`	`54`	`}`
	`55`	`+`
	`56`	`+ public GeoShapeLineStringFilterDescriptor Relation(GeoShapeRelation relation)`
	`57`	`+ {`
	`58`	`+ this.Self.Relation = relation;`
	`59`	`+ return this;`
	`60`	`+ }`
`54`	`61`	`}`
`55`	`62`
`56`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ protected internal override void WrapInContainer(IFilterContainer container)`
`26`	`26`
`27`	`27`	`public PropertyPathMarker Field { get; set; }`
`28`	`28`
	`29`	`+ public GeoShapeRelation? Relation { get; set; }`
	`30`	`+`
`29`	`31`	`public IMultiLineStringGeoShape Shape { get; set; }`
`30`	`32`	`}`
`31`	`33`
`@@ -42,6 +44,7 @@ bool IFilter.IsConditionless`
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`PropertyPathMarker IFieldNameFilter.Field { get; set; }`
	`47`	`+ GeoShapeRelation? IGeoShapeBaseFilter.Relation { get; set; }`
`45`	`48`	`IMultiLineStringGeoShape IGeoShapeMultiLineStringFilter.Shape { get; set; }`
`46`	`49`
`47`	`50`	`public GeoShapeMultiLineStringFilterDescriptor Coordinates(IEnumerable<IEnumerable<IEnumerable<double>>> coordinates)`
`@@ -51,6 +54,12 @@ public GeoShapeMultiLineStringFilterDescriptor Coordinates(IEnumerable<IEnumerab`
`51`	`54`	`this.Self.Shape.Coordinates = coordinates;`
`52`	`55`	`return this;`
`53`	`56`	`}`
	`57`	`+`
	`58`	`+ public GeoShapeMultiLineStringFilterDescriptor Relation(GeoShapeRelation relation)`
	`59`	`+ {`
	`60`	`+ this.Self.Relation = relation;`
	`61`	`+ return this;`
	`62`	`+ }`
`54`	`63`	`}`
`55`	`64`
`56`	`65`	`}`