Merge pull request #2187 from elastic/fix/2.x-georelation

gmarz · web-flow · commit 03d5ac4d2625 · 2016-08-05T12:23:29.000-04:00
Add relation to geo_shape queries
diff --git a/src/Nest/CommonAbstractions/Extensions/Extensions.cs b/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;
diff --git a/src/Nest/CommonOptions/Geo/GeoShapeRelation.cs b/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
 	}
 }
diff --git a/src/Nest/QueryDsl/Geo/Shape/Circle/GeoShapeCircleQuery.cs b/src/Nest/QueryDsl/Geo/Shape/Circle/GeoShapeCircleQuery.cs
@@ -9,17 +9,18 @@ public interface IGeoShapeCircleQuery : IGeoShapeQuery
 		ICircleGeoShape Shape { get; set; }
 	}
 
-	public class GeoShapeCircleQuery : FieldNameQueryBase, IGeoShapeCircleQuery
+	public class GeoShapeCircleQuery : GeoShapeQueryBase, IGeoShapeCircleQuery
 	{
 		protected override bool Conditionless => IsConditionless(this);
 		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;
 	}
 
-	public class GeoShapeCircleQueryDescriptor<T> 
-		: FieldNameQueryDescriptorBase<GeoShapeCircleQueryDescriptor<T>, IGeoShapeCircleQuery, T>
+	public class GeoShapeCircleQueryDescriptor<T>
+		: GeoShapeQueryDescriptorBase<GeoShapeCircleQueryDescriptor<T>, IGeoShapeCircleQuery, T>
 		, IGeoShapeCircleQuery where T : class
 	{
 		protected override bool Conditionless => GeoShapeCircleQuery.IsConditionless(this);
diff --git a/src/Nest/QueryDsl/Geo/Shape/Envelope/GeoShapeEnvelopeQuery.cs b/src/Nest/QueryDsl/Geo/Shape/Envelope/GeoShapeEnvelopeQuery.cs
@@ -10,7 +10,7 @@ public interface IGeoShapeEnvelopeQuery : IGeoShapeQuery
 		IEnvelopeGeoShape Shape { get; set; }
 	}
 
-	public class GeoShapeEnvelopeQuery : FieldNameQueryBase, IGeoShapeEnvelopeQuery
+	public class GeoShapeEnvelopeQuery : GeoShapeQueryBase, IGeoShapeEnvelopeQuery
 	{
 		protected override bool Conditionless => IsConditionless(this);
 		public IEnvelopeGeoShape Shape { get; set; }
@@ -19,8 +19,8 @@ public class GeoShapeEnvelopeQuery : FieldNameQueryBase, IGeoShapeEnvelopeQuery
 		internal static bool IsConditionless(IGeoShapeEnvelopeQuery q) => q.Field.IsConditionless() || q.Shape == null || !q.Shape.Coordinates.HasAny();
 	}
 
-	public class GeoShapeEnvelopeQueryDescriptor<T> 
-		: FieldNameQueryDescriptorBase<GeoShapeEnvelopeQueryDescriptor<T>, IGeoShapeEnvelopeQuery, T>
+	public class GeoShapeEnvelopeQueryDescriptor<T>
+		: GeoShapeQueryDescriptorBase<GeoShapeEnvelopeQueryDescriptor<T>, IGeoShapeEnvelopeQuery, T>
 		, IGeoShapeEnvelopeQuery where T : class
 	{
 		protected override bool Conditionless => GeoShapeEnvelopeQuery.IsConditionless(this);
diff --git a/src/Nest/QueryDsl/Geo/Shape/GeoShapeQueryJsonConverter.cs b/src/Nest/QueryDsl/Geo/Shape/GeoShapeQueryJsonConverter.cs
@@ -37,6 +37,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))
@@ -45,9 +46,11 @@ 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>();
 			query.Boost = boost;
 			query.Name = name;
 			query.Field = field;
+			query.Relation = relation;
 			return query;
 		}
 
diff --git a/src/Nest/QueryDsl/Geo/Shape/IGeoShapeQuery.cs b/src/Nest/QueryDsl/Geo/Shape/IGeoShapeQuery.cs
@@ -3,8 +3,26 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[JsonConverter(typeof (CompositeJsonConverter<GeoShapeQueryJsonConverter, FieldNameQueryJsonConverter<GeoShapeCircleQuery>>))]
+	[JsonConverter(typeof(CompositeJsonConverter<GeoShapeQueryJsonConverter, FieldNameQueryJsonConverter<GeoShapeCircleQuery>>))]
 	public interface IGeoShapeQuery : IFieldNameQuery
 	{
+		[JsonProperty("relation")]
+		GeoShapeRelation? Relation { get; set; }
 	}
-}
+
+	public abstract class GeoShapeQueryBase : FieldNameQueryBase, IGeoShapeQuery
+	{
+		public GeoShapeRelation? Relation { get; set; }
+	}
+
+	public abstract class GeoShapeQueryDescriptorBase<TDescriptor, TInterface, T>
+		: FieldNameQueryDescriptorBase<TDescriptor, TInterface, T>, IGeoShapeQuery
+		where TDescriptor : FieldNameQueryDescriptorBase<TDescriptor, TInterface, T>, TInterface
+		where TInterface : class, IGeoShapeQuery
+		where T : class
+	{
+		GeoShapeRelation? IGeoShapeQuery.Relation { get; set; }
+
+		public TDescriptor Relation(GeoShapeRelation relation) => Assign(a => a.Relation = relation);
+	}
+}
diff --git a/src/Nest/QueryDsl/Geo/Shape/IndexedShape/GeoIndexedShapeQuery.cs b/src/Nest/QueryDsl/Geo/Shape/IndexedShape/GeoIndexedShapeQuery.cs
@@ -10,20 +10,20 @@ public interface IGeoIndexedShapeQuery : IGeoShapeQuery
 		IFieldLookup IndexedShape { get; set; }
 	}
 
-	public class GeoIndexedShapeQuery : FieldNameQueryBase, IGeoIndexedShapeQuery
+	public class GeoIndexedShapeQuery : GeoShapeQueryBase, IGeoIndexedShapeQuery
 	{
 		protected override bool Conditionless => IsConditionless(this);
 		public IFieldLookup IndexedShape { get; set; }
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoShape = this;
 
-		internal static bool IsConditionless(IGeoIndexedShapeQuery q) => 
+		internal static bool IsConditionless(IGeoIndexedShapeQuery q) =>
 			q.Field.IsConditionless() || q.IndexedShape == null
 			|| q.IndexedShape.Id == null | q.IndexedShape.Index == null || q.IndexedShape.Type == null
 			|| q.IndexedShape.Path == null;
 	}
 
-	public class GeoIndexedShapeQueryDescriptor<T> : FieldNameQueryDescriptorBase<GeoIndexedShapeQueryDescriptor<T>, IGeoIndexedShapeQuery, T>
+	public class GeoIndexedShapeQueryDescriptor<T> : GeoShapeQueryDescriptorBase<GeoIndexedShapeQueryDescriptor<T>, IGeoIndexedShapeQuery, T>
 		, IGeoIndexedShapeQuery where T : class
 	{
 		protected override bool Conditionless => GeoIndexedShapeQuery.IsConditionless(this);
diff --git a/src/Nest/QueryDsl/Geo/Shape/LineString/GeoShapeLineStringQuery.cs b/src/Nest/QueryDsl/Geo/Shape/LineString/GeoShapeLineStringQuery.cs
@@ -10,7 +10,7 @@ public interface IGeoShapeLineStringQuery : IGeoShapeQuery
 		ILineStringGeoShape Shape { get; set; }
 	}
 
-	public class GeoShapeLineStringQuery : FieldNameQueryBase, IGeoShapeLineStringQuery
+	public class GeoShapeLineStringQuery : GeoShapeQueryBase, IGeoShapeLineStringQuery
 	{
 		protected override bool Conditionless => IsConditionless(this);
 		public ILineStringGeoShape Shape { get; set; }
@@ -19,8 +19,8 @@ public class GeoShapeLineStringQuery : FieldNameQueryBase, IGeoShapeLineStringQu
 		internal static bool IsConditionless(IGeoShapeLineStringQuery q) => q.Field.IsConditionless() || q.Shape == null || !q.Shape.Coordinates.HasAny();
 	}
 
-	public class GeoShapeLineStringQueryDescriptor<T> 
-		: FieldNameQueryDescriptorBase<GeoShapeLineStringQueryDescriptor<T>, IGeoShapeLineStringQuery, T>
+	public class GeoShapeLineStringQueryDescriptor<T>
+		: GeoShapeQueryDescriptorBase<GeoShapeLineStringQueryDescriptor<T>, IGeoShapeLineStringQuery, T>
 		, IGeoShapeLineStringQuery where T : class
 	{
 		protected override bool Conditionless => GeoShapeLineStringQuery.IsConditionless(this);
diff --git a/src/Nest/QueryDsl/Geo/Shape/MultiLineString/GeoShapeMultiLineStringQuery.cs b/src/Nest/QueryDsl/Geo/Shape/MultiLineString/GeoShapeMultiLineStringQuery.cs
@@ -10,7 +10,7 @@ public interface IGeoShapeMultiLineStringQuery : IGeoShapeQuery
 		IMultiLineStringGeoShape Shape { get; set; }
 	}
 
-	public class GeoShapeMultiLineStringQuery : FieldNameQueryBase, IGeoShapeMultiLineStringQuery
+	public class GeoShapeMultiLineStringQuery : GeoShapeQueryBase, IGeoShapeMultiLineStringQuery
 	{
 		protected override bool Conditionless => IsConditionless(this);
 		public IMultiLineStringGeoShape Shape { get; set; }
@@ -19,8 +19,8 @@ public class GeoShapeMultiLineStringQuery : FieldNameQueryBase, IGeoShapeMultiLi
 		internal static bool IsConditionless(IGeoShapeMultiLineStringQuery q) => q.Field.IsConditionless() || q.Shape == null || !q.Shape.Coordinates.HasAny();
 	}
 
-	public class GeoShapeMultiLineStringQueryDescriptor<T> 
-		: FieldNameQueryDescriptorBase<GeoShapeMultiLineStringQueryDescriptor<T>, IGeoShapeMultiLineStringQuery, T>
+	public class GeoShapeMultiLineStringQueryDescriptor<T>
+		: GeoShapeQueryDescriptorBase<GeoShapeMultiLineStringQueryDescriptor<T>, IGeoShapeMultiLineStringQuery, T>
 		, IGeoShapeMultiLineStringQuery where T : class
 	{
 		protected override bool Conditionless => GeoShapeMultiLineStringQuery.IsConditionless(this);
diff --git a/src/Nest/QueryDsl/Geo/Shape/MultiPoint/GeoShapeMultiPointQuery.cs b/src/Nest/QueryDsl/Geo/Shape/MultiPoint/GeoShapeMultiPointQuery.cs
@@ -10,17 +10,17 @@ public interface IGeoShapeMultiPointQuery : IGeoShapeQuery
 		IMultiPointGeoShape Shape { get; set; }
 	}
 
-	public class GeoShapeMultiPointQuery : FieldNameQueryBase, IGeoShapeMultiPointQuery
+	public class GeoShapeMultiPointQuery : GeoShapeQueryBase, IGeoShapeMultiPointQuery
 	{
 		protected override bool Conditionless => IsConditionless(this);
 		public IMultiPointGeoShape Shape { get; set; }
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoShape = this;
 		internal static bool IsConditionless(IGeoShapeMultiPointQuery q) => q.Field.IsConditionless() || q.Shape == null || !q.Shape.Coordinates.HasAny();
 	}
-	
-	public class GeoShapeMultiPointQueryDescriptor<T> 
-		: FieldNameQueryDescriptorBase<GeoShapeMultiPointQueryDescriptor<T>, IGeoShapeMultiPointQuery, T>
+
+	public class GeoShapeMultiPointQueryDescriptor<T>
+		: GeoShapeQueryDescriptorBase<GeoShapeMultiPointQueryDescriptor<T>, IGeoShapeMultiPointQuery, T>
 		, IGeoShapeMultiPointQuery where T : class
 	{
 		protected override bool Conditionless => GeoShapeMultiPointQuery.IsConditionless(this);
diff --git a/src/Nest/QueryDsl/Geo/Shape/MultiPolygon/GeoShapeMultiPolygonQuery.cs b/src/Nest/QueryDsl/Geo/Shape/MultiPolygon/GeoShapeMultiPolygonQuery.cs
@@ -10,7 +10,7 @@ public interface IGeoShapeMultiPolygonQuery : IGeoShapeQuery
 		IMultiPolygonGeoShape Shape { get; set; }
 	}
 
-	public class GeoShapeMultiPolygonQuery : FieldNameQueryBase, IGeoShapeMultiPolygonQuery
+	public class GeoShapeMultiPolygonQuery : GeoShapeQueryBase, IGeoShapeMultiPolygonQuery
 	{
 		protected override bool Conditionless => IsConditionless(this);
 		public IMultiPolygonGeoShape Shape { get; set; }
@@ -19,14 +19,16 @@ public class GeoShapeMultiPolygonQuery : FieldNameQueryBase, IGeoShapeMultiPolyg
 		internal static bool IsConditionless(IGeoShapeMultiPolygonQuery q) => q.Field.IsConditionless() || q.Shape == null || !q.Shape.Coordinates.HasAny();
 	}
 
-	public class GeoShapeMultiPolygonQueryDescriptor<T> 
-		: FieldNameQueryDescriptorBase<GeoShapeMultiPolygonQueryDescriptor<T>, IGeoShapeMultiPolygonQuery, T>
+	public class GeoShapeMultiPolygonQueryDescriptor<T>
+		: GeoShapeQueryDescriptorBase<GeoShapeMultiPolygonQueryDescriptor<T>, IGeoShapeMultiPolygonQuery, T>
 		, IGeoShapeMultiPolygonQuery where T : class
 	{
 		protected override bool Conditionless => GeoShapeMultiPolygonQuery.IsConditionless(this);
 		IMultiPolygonGeoShape IGeoShapeMultiPolygonQuery.Shape { get; set; }
 
 		public GeoShapeMultiPolygonQueryDescriptor<T> Coordinates(IEnumerable<IEnumerable<IEnumerable<GeoCoordinate>>> coordinates) =>
 			Assign(a => a.Shape = new MultiPolygonGeoShape { Coordinates = coordinates });
+
+
 	}
 }
diff --git a/src/Nest/QueryDsl/Geo/Shape/Point/GeoShapePointQuery.cs b/src/Nest/QueryDsl/Geo/Shape/Point/GeoShapePointQuery.cs
@@ -9,7 +9,7 @@ public interface IGeoShapePointQuery : IGeoShapeQuery
 		IPointGeoShape Shape { get; set; }
 	}
 
-	public class GeoShapePointQuery : FieldNameQueryBase, IGeoShapePointQuery
+	public class GeoShapePointQuery : GeoShapeQueryBase, IGeoShapePointQuery
 	{
 		protected override bool Conditionless => IsConditionless(this);
 		public IPointGeoShape Shape { get; set; }
@@ -18,8 +18,8 @@ public class GeoShapePointQuery : FieldNameQueryBase, IGeoShapePointQuery
 		internal static bool IsConditionless(IGeoShapePointQuery q) => q.Field.IsConditionless() || q.Shape?.Coordinates == null;
 	}
 
-	public class GeoShapePointQueryDescriptor<T> 
-		: FieldNameQueryDescriptorBase<GeoShapePointQueryDescriptor<T>, IGeoShapePointQuery, T>
+	public class GeoShapePointQueryDescriptor<T>
+		: GeoShapeQueryDescriptorBase<GeoShapePointQueryDescriptor<T>, IGeoShapePointQuery, T>
 		, IGeoShapePointQuery where T : class
 	{
 		protected override bool Conditionless => GeoShapePointQuery.IsConditionless(this);
diff --git a/src/Nest/QueryDsl/Geo/Shape/Polygon/GeoShapePolygonQuery.cs b/src/Nest/QueryDsl/Geo/Shape/Polygon/GeoShapePolygonQuery.cs
@@ -10,7 +10,7 @@ public interface IGeoShapePolygonQuery : IGeoShapeQuery
 		IPolygonGeoShape Shape { get; set; }
 	}
 
-	public class GeoShapePolygonQuery : FieldNameQueryBase, IGeoShapePolygonQuery
+	public class GeoShapePolygonQuery : GeoShapeQueryBase, IGeoShapePolygonQuery
 	{
 		protected override bool Conditionless => IsConditionless(this);
 		public IPolygonGeoShape Shape { get; set; }
@@ -19,8 +19,8 @@ public class GeoShapePolygonQuery : FieldNameQueryBase, IGeoShapePolygonQuery
 		internal static bool IsConditionless(IGeoShapePolygonQuery q) => q.Field.IsConditionless() || q.Shape == null || !q.Shape.Coordinates.HasAny();
 	}
 
-	public class GeoShapePolygonQueryDescriptor<T> 
-		: FieldNameQueryDescriptorBase<GeoShapePolygonQueryDescriptor<T>, IGeoShapePolygonQuery, T>
+	public class GeoShapePolygonQueryDescriptor<T>
+		: GeoShapeQueryDescriptorBase<GeoShapePolygonQueryDescriptor<T>, IGeoShapePolygonQuery, T>
 		, IGeoShapePolygonQuery where T : class
 	{
 		protected override bool Conditionless => GeoShapePolygonQuery.IsConditionless(this);
diff --git a/src/Tests/QueryDsl/Geo/Shape/Circle/GeoShapeCircleUsageTests.cs b/src/Tests/QueryDsl/Geo/Shape/Circle/GeoShapeCircleUsageTests.cs
@@ -23,7 +23,8 @@ public GeoShapeCircleUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i
 			Name = "named_query",
 			Boost = 1.1,
 			Field = Field<Project>(p=>p.Location),
-			Shape = new CircleGeoShape(this._coordinates) { Radius = "100m" }
+			Shape = new CircleGeoShape(this._coordinates) { Radius = "100m" },
+			Relation = GeoShapeRelation.Intersects
 		};
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
@@ -33,6 +34,7 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Field(p=>p.Location)
 				.Coordinates(this._coordinates)
 				.Radius("100m")
+				.Relation(GeoShapeRelation.Intersects)
 			);
 
 		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoShapeCircleQuery>(a => a.GeoShape as IGeoShapeCircleQuery)
diff --git a/src/Tests/QueryDsl/Geo/Shape/Envelope/GeoEnvelopeUsageTests.cs b/src/Tests/QueryDsl/Geo/Shape/Envelope/GeoEnvelopeUsageTests.cs
@@ -27,7 +27,8 @@ public GeoEnvelopeUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, u
 			Name = "named_query",
 			Boost = 1.1,
 			Field = Field<Project>(p=>p.Location),
-			Shape = new EnvelopeGeoShape(this._coordinates)
+			Shape = new EnvelopeGeoShape(this._coordinates),
+			Relation = GeoShapeRelation.Intersects
 		};
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
@@ -36,6 +37,7 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Boost(1.1)
 				.Field(p=>p.Location)
 				.Coordinates(this._coordinates)
+				.Relation(GeoShapeRelation.Intersects)
 			);
 
 		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoShapeEnvelopeQuery>(a => a.GeoShape as IGeoShapeEnvelopeQuery)
diff --git a/src/Tests/QueryDsl/Geo/Shape/IndexedShape/GeoIndexedShapeUsageTests.cs b/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)
diff --git a/src/Tests/QueryDsl/Geo/Shape/LineString/GeoLineStringUsageTests.cs b/src/Tests/QueryDsl/Geo/Shape/LineString/GeoLineStringUsageTests.cs
@@ -27,7 +27,8 @@ public GeoLineStringUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i,
 			Name = "named_query",
 			Boost = 1.1,
 			Field = Field<Project>(p=>p.Location),
-			Shape = new LineStringGeoShape(this._coordinates)
+			Shape = new LineStringGeoShape(this._coordinates),
+			Relation = GeoShapeRelation.Intersects
 		};
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
@@ -36,6 +37,7 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Boost(1.1)
 				.Field(p=>p.Location)
 				.Coordinates(this._coordinates)
+				.Relation(GeoShapeRelation.Intersects)
 			);
 
 		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoShapeLineStringQuery>(a => a.GeoShape as IGeoShapeLineStringQuery)
diff --git a/src/Tests/QueryDsl/Geo/Shape/MultiLineString/GeoMultiLineStringUsageTests.cs b/src/Tests/QueryDsl/Geo/Shape/MultiLineString/GeoMultiLineStringUsageTests.cs
@@ -28,7 +28,8 @@ public GeoMultiLineStringUsageTests(ReadOnlyCluster i, EndpointUsage usage) : ba
 			Name = "named_query",
 			Boost = 1.1,
 			Field = Field<Project>(p=>p.Location),
-			Shape = new MultiLineStringGeoShape(this._coordinates)
+			Shape = new MultiLineStringGeoShape(this._coordinates),
+			Relation = GeoShapeRelation.Intersects
 		};
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
@@ -37,6 +38,7 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Boost(1.1)
 				.Field(p=>p.Location)
 				.Coordinates(this._coordinates)
+				.Relation(GeoShapeRelation.Intersects)
 			);
 
 		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoShapeMultiLineStringQuery>(a => a.GeoShape as IGeoShapeMultiLineStringQuery)
diff --git a/src/Tests/QueryDsl/Geo/Shape/MultiPoint/GeoMultiPointUsageTests.cs b/src/Tests/QueryDsl/Geo/Shape/MultiPoint/GeoMultiPointUsageTests.cs
@@ -27,7 +27,8 @@ public GeoMultiPointUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i,
 			Name = "named_query",
 			Boost = 1.1,
 			Field = Field<Project>(p=>p.Location),
-			Shape = new MultiPointGeoShape(this._coordinates)
+			Shape = new MultiPointGeoShape(this._coordinates),
+			Relation = GeoShapeRelation.Intersects
 		};
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
@@ -36,6 +37,7 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Boost(1.1)
 				.Field(p=>p.Location)
 				.Coordinates(this._coordinates)
+				.Relation(GeoShapeRelation.Intersects)
 			);
 
 		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IGeoShapeMultiPointQuery>(a => a.GeoShape as IGeoShapeMultiPointQuery)
diff --git a/src/Tests/QueryDsl/Geo/Shape/Point/GeoPointUsageTests.cs b/src/Tests/QueryDsl/Geo/Shape/Point/GeoPointUsageTests.cs
diff --git a/src/Tests/QueryDsl/Geo/Shape/Polygon/GeoPolygonUsageTests.cs b/src/Tests/QueryDsl/Geo/Shape/Polygon/GeoPolygonUsageTests.cs
diff --git a/src/Tests/QueryDsl/Geo/Shape/ShapeQueryUsageTestsBase.cs b/src/Tests/QueryDsl/Geo/Shape/ShapeQueryUsageTestsBase.cs

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,8 @@ internal static IEnumerable<T> DistinctBy<T, TKey>(this IEnumerable<T> items, Fu`
`58`	`58`	`internal static ConcurrentDictionary<string, object> _enumCache = new ConcurrentDictionary<string, object>();`
`59`	`59`	`internal static T? ToEnum<T>(this string str, StringComparison comparison = StringComparison.OrdinalIgnoreCase) where T : struct`
`60`	`60`	`{`
	`61`	`+ if (str == null) return null;`
	`62`	`+`
`61`	`63`	`var enumType = typeof(T);`
`62`	`64`	`var key = $"{enumType.Name}.{str}";`
`63`	`65`	`object value;`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ public enum GeoShapeRelation`
`12`	`12`	`[EnumMember(Value = "disjoint")]`
`13`	`13`	`Disjoint,`
`14`	`14`	`[EnumMember(Value = "within")]`
`15`		`- Within`
	`15`	`+ Within,`
	`16`	`+ [EnumMember(Value = "contains")]`
	`17`	`+ Contains`
`16`	`18`	`}`
`17`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,17 +9,18 @@ public interface IGeoShapeCircleQuery : IGeoShapeQuery`
`9`	`9`	`ICircleGeoShape Shape { get; set; }`
`10`	`10`	`}`
`11`	`11`
`12`		`- public class GeoShapeCircleQuery : FieldNameQueryBase, IGeoShapeCircleQuery`
	`12`	`+ public class GeoShapeCircleQuery : GeoShapeQueryBase, IGeoShapeCircleQuery`
`13`	`13`	`{`
`14`	`14`	`protected override bool Conditionless => IsConditionless(this);`
`15`	`15`	`public ICircleGeoShape Shape { get; set; }`
`16`	`16`
`17`	`17`	`internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoShape = this;`
	`18`	`+`
`18`	`19`	`internal static bool IsConditionless(IGeoShapeCircleQuery q) => q.Field.IsConditionless() \|\| q.Shape == null \|\| q.Shape.Coordinates == null;`
`19`	`20`	`}`
`20`	`21`
`21`		`- public class GeoShapeCircleQueryDescriptor<T>`
`22`		`- : FieldNameQueryDescriptorBase<GeoShapeCircleQueryDescriptor<T>, IGeoShapeCircleQuery, T>`
	`22`	`+ public class GeoShapeCircleQueryDescriptor<T>`
	`23`	`+ : GeoShapeQueryDescriptorBase<GeoShapeCircleQueryDescriptor<T>, IGeoShapeCircleQuery, T>`
`23`	`24`	`, IGeoShapeCircleQuery where T : class`
`24`	`25`	`{`
`25`	`26`	`protected override bool Conditionless => GeoShapeCircleQuery.IsConditionless(this);`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public interface IGeoShapeEnvelopeQuery : IGeoShapeQuery`
`10`	`10`	`IEnvelopeGeoShape Shape { get; set; }`
`11`	`11`	`}`
`12`	`12`
`13`		`- public class GeoShapeEnvelopeQuery : FieldNameQueryBase, IGeoShapeEnvelopeQuery`
	`13`	`+ public class GeoShapeEnvelopeQuery : GeoShapeQueryBase, IGeoShapeEnvelopeQuery`
`14`	`14`	`{`
`15`	`15`	`protected override bool Conditionless => IsConditionless(this);`
`16`	`16`	`public IEnvelopeGeoShape Shape { get; set; }`
`@@ -19,8 +19,8 @@ public class GeoShapeEnvelopeQuery : FieldNameQueryBase, IGeoShapeEnvelopeQuery`
`19`	`19`	`internal static bool IsConditionless(IGeoShapeEnvelopeQuery q) => q.Field.IsConditionless() \|\| q.Shape == null \|\| !q.Shape.Coordinates.HasAny();`
`20`	`20`	`}`
`21`	`21`
`22`		`- public class GeoShapeEnvelopeQueryDescriptor<T>`
`23`		`- : FieldNameQueryDescriptorBase<GeoShapeEnvelopeQueryDescriptor<T>, IGeoShapeEnvelopeQuery, T>`
	`22`	`+ public class GeoShapeEnvelopeQueryDescriptor<T>`
	`23`	`+ : GeoShapeQueryDescriptorBase<GeoShapeEnvelopeQueryDescriptor<T>, IGeoShapeEnvelopeQuery, T>`
`24`	`24`	`, IGeoShapeEnvelopeQuery where T : class`
`25`	`25`	`{`
`26`	`26`	`protected override bool Conditionless => GeoShapeEnvelopeQuery.IsConditionless(this);`
Original file line number	Diff line number	Diff line change
`@@ -10,20 +10,20 @@ public interface IGeoIndexedShapeQuery : IGeoShapeQuery`
`10`	`10`	`IFieldLookup IndexedShape { get; set; }`
`11`	`11`	`}`
`12`	`12`
`13`		`- public class GeoIndexedShapeQuery : FieldNameQueryBase, IGeoIndexedShapeQuery`
	`13`	`+ public class GeoIndexedShapeQuery : GeoShapeQueryBase, IGeoIndexedShapeQuery`
`14`	`14`	`{`
`15`	`15`	`protected override bool Conditionless => IsConditionless(this);`
`16`	`16`	`public IFieldLookup IndexedShape { get; set; }`
`17`	`17`
`18`	`18`	`internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoShape = this;`
`19`	`19`
`20`		`- internal static bool IsConditionless(IGeoIndexedShapeQuery q) =>`
	`20`	`+ internal static bool IsConditionless(IGeoIndexedShapeQuery q) =>`
`21`	`21`	`q.Field.IsConditionless() \|\| q.IndexedShape == null`
`22`	`22`	`\|\| q.IndexedShape.Id == null \| q.IndexedShape.Index == null \|\| q.IndexedShape.Type == null`
`23`	`23`	`\|\| q.IndexedShape.Path == null;`
`24`	`24`	`}`
`25`	`25`
`26`		`- public class GeoIndexedShapeQueryDescriptor<T> : FieldNameQueryDescriptorBase<GeoIndexedShapeQueryDescriptor<T>, IGeoIndexedShapeQuery, T>`
	`26`	`+ public class GeoIndexedShapeQueryDescriptor<T> : GeoShapeQueryDescriptorBase<GeoIndexedShapeQueryDescriptor<T>, IGeoIndexedShapeQuery, T>`
`27`	`27`	`, IGeoIndexedShapeQuery where T : class`
`28`	`28`	`{`
`29`	`29`	`protected override bool Conditionless => GeoIndexedShapeQuery.IsConditionless(this);`
Original file line number	Diff line number	Diff line change
`@@ -10,17 +10,17 @@ public interface IGeoShapeMultiPointQuery : IGeoShapeQuery`
`10`	`10`	`IMultiPointGeoShape Shape { get; set; }`
`11`	`11`	`}`
`12`	`12`
`13`		`- public class GeoShapeMultiPointQuery : FieldNameQueryBase, IGeoShapeMultiPointQuery`
	`13`	`+ public class GeoShapeMultiPointQuery : GeoShapeQueryBase, IGeoShapeMultiPointQuery`
`14`	`14`	`{`
`15`	`15`	`protected override bool Conditionless => IsConditionless(this);`
`16`	`16`	`public IMultiPointGeoShape Shape { get; set; }`
`17`	`17`
`18`	`18`	`internal override void InternalWrapInContainer(IQueryContainer c) => c.GeoShape = this;`
`19`	`19`	`internal static bool IsConditionless(IGeoShapeMultiPointQuery q) => q.Field.IsConditionless() \|\| q.Shape == null \|\| !q.Shape.Coordinates.HasAny();`
`20`	`20`	`}`
`21`		`-`
`22`		`- public class GeoShapeMultiPointQueryDescriptor<T>`
`23`		`- : FieldNameQueryDescriptorBase<GeoShapeMultiPointQueryDescriptor<T>, IGeoShapeMultiPointQuery, T>`
	`21`	`+`
	`22`	`+ public class GeoShapeMultiPointQueryDescriptor<T>`
	`23`	`+ : GeoShapeQueryDescriptorBase<GeoShapeMultiPointQueryDescriptor<T>, IGeoShapeMultiPointQuery, T>`
`24`	`24`	`, IGeoShapeMultiPointQuery where T : class`
`25`	`25`	`{`
`26`	`26`	`protected override bool Conditionless => GeoShapeMultiPointQuery.IsConditionless(this);`