Remove IgnoreUnmapped on GeometryCollection

This commit removes IgnoreUnmapped on GeometryCollection. The property
was included on the cherry-pick in previous commit
9bdd82b but should not have been.

Explicitly call IgnoreUnmapped(true) on fluent GeoShapeEnvelopeQueryDescriptor
as default parameter value is false

Author: russcam

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

@@ -84,9 +84,9 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			var relation = jo["relation"]?.Value<string>().ToEnum<GeoShapeRelation>();
 			query.Boost = boost;
 			query.Name = name;
-			query.IgnoreUnmapped = ignoreUnmapped;
 			query.Field = field;
 			query.Relation = relation;
+			query.IgnoreUnmapped = ignoreUnmapped;
 			return query;
 		}
 
@@ -98,49 +98,24 @@ private static IGeoShapeQuery ParseShapeQuery(JToken shape, JsonSerializer seria
 			var type = shape["type"];
 			var typeName = type?.Value<string>();
 			var geometry = GeoShapeConverter.ReadJToken(shape, serializer);
-
 			switch (typeName)
 			{
 				case "circle":
-					return new GeoShapeCircleQuery
-					{
-						Shape = geometry as ICircleGeoShape
-					};
+					return new GeoShapeCircleQuery { Shape = geometry as ICircleGeoShape };
 				case "envelope":
-					return new GeoShapeEnvelopeQuery
-					{
-						Shape = geometry as IEnvelopeGeoShape
-					};
+					return new GeoShapeEnvelopeQuery { Shape = geometry as IEnvelopeGeoShape };
 				case "linestring":
-					return new GeoShapeLineStringQuery
-					{
-						Shape = geometry as ILineStringGeoShape
-					};
+					return new GeoShapeLineStringQuery { Shape = geometry as ILineStringGeoShape };
 				case "multilinestring":
-					return new GeoShapeMultiLineStringQuery
-					{
-						Shape = geometry as IMultiLineStringGeoShape
-					};
+					return new GeoShapeMultiLineStringQuery { Shape = geometry as IMultiLineStringGeoShape };
 				case "point":
-					return new GeoShapePointQuery
-					{
-						Shape = geometry as IPointGeoShape
-					};
+					return new GeoShapePointQuery { Shape = geometry as IPointGeoShape };
 				case "multipoint":
-					return new GeoShapeMultiPointQuery
-					{
-						Shape = geometry as IMultiPointGeoShape
-					};
+					return new GeoShapeMultiPointQuery { Shape = geometry as IMultiPointGeoShape };
 				case "polygon":
-					return new GeoShapePolygonQuery
-					{
-						Shape = geometry as IPolygonGeoShape
-					};
+					return new GeoShapePolygonQuery { Shape = geometry as IPolygonGeoShape };
 				case "multipolygon":
-					return new GeoShapeMultiPolygonQuery
-					{
-						Shape = geometry as IMultiPolygonGeoShape
-					};
+					return new GeoShapeMultiPolygonQuery { Shape = geometry as IMultiPolygonGeoShape };
 				case "geometrycollection":
 					return new GeoShapeGeometryCollectionQuery { Shape = geometry as IGeometryCollection };
 				default:

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

@@ -22,7 +22,6 @@ public interface IGeometryCollection
 		IEnumerable<IGeoShape> Geometries { get; set; }
 	}
 
-	// TODO: IGeometryCollection should implement IGeoShape
 	/// <inheritdoc cref="IGeometryCollection"/>
 	public class GeometryCollection : IGeometryCollection, IGeoShape
 	{
@@ -32,9 +31,6 @@ public class GeometryCollection : IGeometryCollection, IGeoShape
 		/// <inheritdoc />
 		string IGeoShape.Type => this.Type;
 
-		/// <inheritdoc />
-		public bool? IgnoreUnmapped { get; set; }
-
 		/// <inheritdoc />
 		public IEnumerable<IGeoShape> Geometries { get; set; }
 	}

src/Tests/QueryDsl/Geo/GeoShapeQueryUsageTests.cs

@@ -77,6 +77,9 @@ protected override LazyResponses ClientUsage() => Calls(
 			{
 				geo_shape = new
 				{
+					_name="named_query",
+					boost = 1.1,
+					ignore_unmapped = true,
 					envelope = new
 					{
 						relation = "intersects",
@@ -99,18 +102,24 @@ protected override LazyResponses ClientUsage() => Calls(
 		{
 			Query = new GeoShapeEnvelopeQuery
 			{
+				Name = "named_query",
+				Boost = 1.1,
 				Field = Infer.Field<Framework.MockData.Shape>(p => p.Envelope),
 				Shape = new EnvelopeGeoShape(this._coordinates),
-				Relation = GeoShapeRelation.Intersects
+				Relation = GeoShapeRelation.Intersects,
+				IgnoreUnmapped = true
 			}
 		};
 
 		protected override Func<SearchDescriptor<Framework.MockData.Shape>, ISearchRequest> Fluent => s => s
 			.Query(q => q
 				.GeoShapeEnvelope(c => c
+					.Name("named_query")
+					.Boost(1.1)
 					.Field(p => p.Envelope)
 					.Coordinates(this._coordinates)
 					.Relation(GeoShapeRelation.Intersects)
+					.IgnoreUnmapped(true)
 				)
 			);