Add relation to geo_shape queries

Add Contains to geoshape relations.
Forward port of PR #2187

Author: russcam

src/Nest/CommonAbstractions/Extensions/Extensions.cs

@@ -58,6 +58,8 @@ internal static IEnumerable<T> DistinctBy<T, TKey>(this IEnumerable<T> items, Fu
 		internal static ConcurrentDictionary<string, object> _enumCache = new ConcurrentDictionary<string, object>();
 		internal static T? ToEnum<T>(this string str, StringComparison comparison = StringComparison.OrdinalIgnoreCase) where T : struct
 		{
+			if (str == null) return null;
+
 			var enumType = typeof(T);
 			var key = $"{enumType.Name}.{str}";
 			object value;

src/Nest/CommonOptions/Geo/GeoShapeRelation.cs

@@ -12,6 +12,8 @@ public enum GeoShapeRelation
 		[EnumMember(Value = "disjoint")]
 		Disjoint,
 		[EnumMember(Value = "within")]
-		Within
+		Within,
+		[EnumMember(Value = "contains")]
+		Contains
 	}
 }

src/Nest/QueryDsl/Geo/Shape/Circle/GeoShapeCircleQuery.cs

@@ -15,6 +15,7 @@ public class GeoShapeCircleQuery : GeoShapeQueryBase, IGeoShapeCircleQuery
 		public ICircleGeoShape Shape { get; set; }
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoShape = this;
+
 		internal static bool IsConditionless(IGeoShapeCircleQuery q) => q.Field.IsConditionless() || q.Shape == null || q.Shape.Coordinates == null;
 	}
 

src/Nest/QueryDsl/Geo/Shape/GeoShapeQueryJsonConverter.cs

@@ -36,6 +36,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			JToken shape;
 			JToken indexedShape;
 			IGeoShapeQuery query = null;
+
 			if (jo.TryGetValue("shape", out shape))
 				query = ParseShape(shape, serializer);
 			else if (jo.TryGetValue("indexed_shape", out indexedShape))
@@ -44,10 +45,12 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			if (query == null) return null;
 			var boost = jo["boost"]?.Value<double>();
 			var name = jo["_name"]?.Value<string>();
+			var relation = jo["relation"]?.Value<string>().ToEnum<GeoShapeRelation>();
 			var ignoreUnmapped = jo["ignore_unmapped"]?.Value<bool>();
 			query.Boost = boost;
 			query.Name = name;
 			query.Field = field;
+			query.Relation = relation;
 			query.IgnoreUnmapped = ignoreUnmapped;
 			return query;
 		}

src/Nest/QueryDsl/Geo/Shape/IGeoShapeQuery.cs

@@ -6,6 +6,12 @@ namespace Nest
 	[JsonConverter(typeof (CompositeJsonConverter<GeoShapeQueryJsonConverter, FieldNameQueryJsonConverter<GeoShapeCircleQuery>>))]
 	public interface IGeoShapeQuery : IFieldNameQuery
 	{
+		/// <summary>
+		/// Controls the spatial relation operator to used at search time.
+		/// </summary>
+		[JsonProperty("relation")]
+		GeoShapeRelation? Relation { get; set; }
+
 		/// <summary>
 		/// Will ignore an unmapped field and will not match any documents for this query.
 		/// This can be useful when querying multiple indexes which might have different mappings.
@@ -16,6 +22,11 @@ public interface IGeoShapeQuery : IFieldNameQuery
 
 	public abstract class GeoShapeQueryBase : FieldNameQueryBase, IGeoShapeQuery
 	{
+		/// <summary>
+		/// Controls the spatial relation operator to used at search time.
+		/// </summary>
+		public GeoShapeRelation? Relation { get; set; }
+
 		/// <summary>
 		/// Will ignore an unmapped field and will not match any documents for this query.
 		/// This can be useful when querying multiple indexes which might have different mappings.
@@ -30,6 +41,12 @@ public abstract class GeoShapeQueryDescriptorBase<TDescriptor, TInterface, T>
 		where T : class
 	{
 		bool? IGeoShapeQuery.IgnoreUnmapped { get; set; }
+		GeoShapeRelation? IGeoShapeQuery.Relation { get; set; }
+
+		/// <summary>
+		/// Controls the spatial relation operator to used at search time.
+		/// </summary>
+		public TDescriptor Relation(GeoShapeRelation relation) => Assign(a => a.Relation = relation);
 
 		/// <summary>
 		/// Will ignore an unmapped field and will not match any documents for this query.

src/Nest/QueryDsl/Geo/Shape/MultiPolygon/GeoShapeMultiPolygonQuery.cs

@@ -28,5 +28,7 @@ public class GeoShapeMultiPolygonQueryDescriptor<T>
 
 		public GeoShapeMultiPolygonQueryDescriptor<T> Coordinates(IEnumerable<IEnumerable<IEnumerable<GeoCoordinate>>> coordinates) =>
 			Assign(a => a.Shape = new MultiPolygonGeoShape { Coordinates = coordinates });
+
+
 	}
 }

src/Tests/QueryDsl/Geo/Shape/Circle/GeoShapeCircleUsageTests.cs

@@ -23,8 +23,9 @@ public GeoShapeCircleUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i
 			Name = "named_query",
 			Boost = 1.1,
 			Field = Field<Project>(p=>p.Location),
-			IgnoreUnmapped = false,
-			Shape = new CircleGeoShape(this._coordinates) { Radius = "100m" }
+			Shape = new CircleGeoShape(this._coordinates) { Radius = "100m" },
+			Relation = GeoShapeRelation.Intersects,
+			IgnoreUnmapped = false
 		};
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
@@ -35,6 +36,7 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.IgnoreUnmapped()
 				.Coordinates(this._coordinates)
 				.Radius("100m")
+				.Relation(GeoShapeRelation.Intersects)
 			);
 
 		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoShapeCircleQuery>(a => a.GeoShape as IGeoShapeCircleQuery)

src/Tests/QueryDsl/Geo/Shape/Envelope/GeoEnvelopeUsageTests.cs

@@ -27,8 +27,9 @@ public GeoEnvelopeUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, u
 			Name = "named_query",
 			Boost = 1.1,
 			Field = Field<Project>(p=>p.Location),
-			IgnoreUnmapped = false,
-			Shape = new EnvelopeGeoShape(this._coordinates)
+			Shape = new EnvelopeGeoShape(this._coordinates),
+			Relation = GeoShapeRelation.Intersects,
+			IgnoreUnmapped = false
 		};
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
@@ -38,6 +39,7 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Field(p=>p.Location)
 				.IgnoreUnmapped()
 				.Coordinates(this._coordinates)
+				.Relation(GeoShapeRelation.Intersects)
 			);
 
 		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoShapeEnvelopeQuery>(a => a.GeoShape as IGeoShapeEnvelopeQuery)

src/Tests/QueryDsl/Geo/Shape/GeoShapeQueryUsageTestsBase.cs

@@ -17,6 +17,7 @@ public GeoShapeQueryUsageTestsBase(ReadOnlyCluster i, EndpointUsage usage) : bas
 					_name="named_query",
 					boost = 1.1,
 					ignore_unmapped = false,
+					relation = "intersects",
 					shape = this.ShapeJson
 				}
 			}

src/Tests/QueryDsl/Geo/Shape/IndexedShape/GeoIndexedShapeUsageTests.cs

@@ -17,13 +17,14 @@ public GeoIndexedShapeUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(
 				{
 					_name="named_query",
 					boost = 1.1,
-					indexed_shape = new 
+					indexed_shape = new
 					{
 						id = 2,
 						type = "project",
 						index = "project",
 						path = "location"
-					}
+					},
+					relation = "intersects"
 				}
 			}
 		};
@@ -38,8 +39,9 @@ public GeoIndexedShapeUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(
 				Id = 2,
 				Index = Index<Project>(),
 				Type = Type<Project>(),
-				Path = Field<Project>(p=>p.Location)
-			}
+				Path = Field<Project>(p=>p.Location),
+			},
+			Relation = GeoShapeRelation.Intersects
 		};
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
@@ -51,6 +53,7 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 					.Id(2)
 					.Path(pp=>pp.Location)
 				)
+				.Relation(GeoShapeRelation.Intersects)
 			);
 
 		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoIndexedShapeQuery>(a => a.GeoShape as IGeoIndexedShapeQuery)