Merge remote-tracking branch 'origin/feature/aggregations-geo-bounds' into develop

Conflicts:
	src/Nest/DSL/Aggregations/AggregationDescriptor.cs
	src/Nest/Nest.csproj
	src/Tests/Nest.Tests.Integration/Aggregations/MetricAggregationTests.cs

Author: Mpdreamz

Diff for: src/Nest/DSL/Aggregations/AggregationDescriptor.cs

@@ -33,6 +33,9 @@ public interface IAggregationContainer
 		[JsonProperty("geohash_grid")]
 		IGeoHashAggregator GeoHash { get; set; }
 
+		[JsonProperty("geo_bounds")]
+		IGeoBoundsAggregator GeoBounds { get; set; }
+
 		[JsonProperty("histogram")]
 		IHistogramAggregator Histogram { get; set; }
 
@@ -92,6 +95,7 @@ public class AggregationContainer : IAggregationContainer
 		private IFilterAggregator _filter;
 		private IGeoDistanceAggregator _geoDistance;
 		private IGeoHashAggregator _geoHash;
+		private IGeoBoundsAggregator _geoBounds;
 		private IHistogramAggregator _histogram;
 		private IGlobalAggregator _global;
 		private IIp4RangeAggregator _ipRange;
@@ -102,6 +106,7 @@ public class AggregationContainer : IAggregationContainer
 		private ITermsAggregator _terms;
 		private ISignificantTermsAggregator _significantTerms;
 		private IPercentileRanksAggregaor _percentileRanks;
+		
 		public IAverageAggregator Average { get; set; }
 		public IValueCountAggregator ValueCount { get; set; }
 		public IMaxAggregator Max { get; set; }
@@ -146,6 +151,12 @@ public IGeoHashAggregator GeoHash
 			set { _geoHash = value; }
 		}
 
+		public IGeoBoundsAggregator GeoBounds
+		{
+			get { return _geoBounds; }
+			set { _geoBounds = value; }
+		}
+
 		public IHistogramAggregator Histogram
 		{
 			get { return _histogram; }
@@ -235,7 +246,9 @@ public class AggregationDescriptor<T> : IAggregationContainer
 		IGeoDistanceAggregator IAggregationContainer.GeoDistance { get; set; }
 
 		IGeoHashAggregator IAggregationContainer.GeoHash { get; set; }
-		
+
+		IGeoBoundsAggregator IAggregationContainer.GeoBounds { get; set; }
+
 		IHistogramAggregator IAggregationContainer.Histogram { get; set; }
 
 		IGlobalAggregator IAggregationContainer.Global { get; set; }
@@ -319,6 +332,12 @@ public AggregationDescriptor<T> GeoHash(string name,
 			return _SetInnerAggregation(name, selector, (a, d) => a.GeoHash = d);
 		}
 
+		public AggregationDescriptor<T> GeoBounds(string name,
+			Func<GeoBoundsAggregationDescriptor<T>, GeoBoundsAggregationDescriptor<T>> selector)
+		{
+			return _SetInnerAggregation(name, selector, (a, d) => a.GeoBounds = d);
+		}
+
 		public AggregationDescriptor<T> Histogram(string name,
 			Func<HistogramAggregationDescriptor<T>, HistogramAggregationDescriptor<T>> selector)
 		{

Diff for: src/Nest/DSL/Aggregations/GeoBoundsAggregationDescriptor.cs

@@ -0,0 +1,36 @@
+using Nest.Resolvers.Converters;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+	[JsonConverter(typeof(ReadAsTypeConverter<GeoBoundsAggregator>))]
+	public interface IGeoBoundsAggregator : IMetricAggregator
+	{
+		[JsonProperty("wrap_longitude")]
+		bool? WrapLongitude { get; set; }
+	}
+
+	public class GeoBoundsAggregator : MetricAggregator, IGeoBoundsAggregator
+	{
+		public bool? WrapLongitude { get; set; }
+	}
+
+	public class GeoBoundsAggregationDescriptor<T> 
+		: MetricAggregationBaseDescriptor<GeoBoundsAggregationDescriptor<T>, T>, IGeoBoundsAggregator
+		where T : class
+	{
+		IGeoBoundsAggregator Self { get { return this; } }
+		bool? IGeoBoundsAggregator.WrapLongitude { get; set; }
+
+		public GeoBoundsAggregationDescriptor<T> WrapLongitude(bool wrapLongitude = true)
+		{
+			this.Self.WrapLongitude = wrapLongitude;
+			return this;
+		}
+	}
+}

Diff for: src/Nest/Domain/Aggregations/AggregationsHelper.cs

@@ -65,6 +65,12 @@ public ExtendedStatsMetric ExtendedStats(string key)
 		{
 			return this.TryGet<ExtendedStatsMetric>(key);
 		}
+
+		public GeoBoundsMetric GeoBounds(string key)
+		{
+			return this.TryGet<GeoBoundsMetric>(key);
+		}
+
 		public PercentilesMetric Percentiles(string key)
 		{
 			return this.TryGet<PercentilesMetric>(key);

Diff for: src/Nest/Domain/Aggregations/GeoBoundsMetric.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	public class GeoBoundsMetric : IMetricAggregation
+	{
+		public GeoBoundsMetric()
+		{
+			Bounds = new GeoBounds();
+		}
+
+		public GeoBounds Bounds { get; set; }
+	}
+
+	public class GeoBounds
+	{
+		public LatLon TopLeft { get; set; }
+		public LatLon BottomRight { get; set; }
+	}
+}

Diff for: src/Nest/Domain/DSL/LatLon.cs

@@ -2,7 +2,7 @@
 {
 	public class LatLon
 	{
-		public double Lat { get; set; }
-		public double Lon { get; set; }
+		public double? Lat { get; set; }
+		public double? Lon { get; set; }
 	}
 }

Diff for: src/Nest/Nest.csproj

@@ -106,6 +106,7 @@
     <Compile Include="Domain\Aggregations\AggregationsHelper.cs" />
     <Compile Include="Domain\Aggregations\Bucket.cs" />
     <Compile Include="Domain\Aggregations\BucketAggregationBase.cs" />
+    <Compile Include="Domain\Aggregations\GeoBoundsMetric.cs" />
     <Compile Include="Domain\Aggregations\HistogramItem.cs" />
     <Compile Include="Domain\Aggregations\ExtendedStatsMetric.cs" />
     <Compile Include="Domain\Aggregations\IAggration.cs" />
@@ -208,6 +209,7 @@
     <Compile Include="Domain\Stats\PluginStats.cs" />
     <Compile Include="Domain\Stats\SegmentsStats.cs" />
     <Compile Include="DSL\Aggregations\PercentileRanksAggregationDescriptor.cs" />
+    <Compile Include="DSL\Aggregations\GeoBoundsAggregationDescriptor.cs" />
     <Compile Include="DSL\CatIndicesDescriptor.cs" />
     <Compile Include="DSL\CatShardsDescriptor.cs" />
     <Compile Include="DSL\CatThreadPoolDescriptor.cs" />

Diff for: src/Nest/Resolvers/Converters/Aggregations/AggregationConverter.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace Nest.Resolvers.Converters.Aggregations
 {
@@ -56,12 +57,40 @@ private IAggregation ReadAggregation(JsonReader reader, JsonSerializer serialize
 					return GetStatsAggregation(reader, serializer);
 				case "doc_count":
 					return GetSingleBucketAggregation(reader, serializer);
+				case "bounds":
+					return GetGeoBoundsMetricAggregation(reader, serializer);
 				default:
 					return null; 
 
 			}
 		}
 
+		private IAggregation GetGeoBoundsMetricAggregation(JsonReader reader, JsonSerializer serializer)
+		{
+			reader.Read();
+			var o = JObject.Load(reader);
+			if (o == null)
+				return null;
+			var geoBoundsMetric = new GeoBoundsMetric();
+			JToken topLeftToken;
+			o.TryGetValue("top_left", out topLeftToken);
+			if (topLeftToken != null)
+			{
+				var topLeft = topLeftToken.ToObject<LatLon>();
+				if (topLeft != null)
+					geoBoundsMetric.Bounds.TopLeft = topLeft;
+			}
+			JToken bottomRightToken;
+			o.TryGetValue("bottom_right", out bottomRightToken);
+			if (bottomRightToken != null)
+			{
+				var bottomRight = bottomRightToken.ToObject<LatLon>();
+				if (bottomRight != null)
+					geoBoundsMetric.Bounds.BottomRight = bottomRight;
+			}
+			return geoBoundsMetric;
+		}
+
 		private IAggregation GetPercentilesMetricAggregation(JsonReader reader, JsonSerializer serializer)
 		{
 			var metric = new PercentilesMetric();

Diff for: src/Tests/Nest.Tests.Integration/Aggregations/MetricAggregationTests.cs

@@ -137,5 +137,30 @@ public void PercentilesRank()
 			percentiles.Should().NotBeNull();
 			percentiles.Items.Count.Should().BeGreaterThan(0);
 		}
+
+		[Test]
+		public void GeoBounds()
+		{
+			var results = this.Client.Search<ElasticsearchProject>(s => s
+				.Size(0)
+				.Aggregations(a => a
+					.GeoBounds("viewport", g => g
+						.Field(p => p.Origin)
+						.WrapLongitude()
+					)
+				)
+			);
+
+			results.IsValid.Should().BeTrue();
+			var geoBoundsMetric = results.Aggs.GeoBounds("viewport");
+			geoBoundsMetric.Should().NotBeNull();
+			geoBoundsMetric.Bounds.Should().NotBeNull();
+			geoBoundsMetric.Bounds.TopLeft.Should().NotBeNull();
+			geoBoundsMetric.Bounds.TopLeft.Lat.Should().NotBe(0);
+			geoBoundsMetric.Bounds.TopLeft.Lon.Should().NotBe(0);
+			geoBoundsMetric.Bounds.BottomRight.Should().NotBeNull();
+			geoBoundsMetric.Bounds.BottomRight.Lat.Should().NotBe(0);
+			geoBoundsMetric.Bounds.BottomRight.Lon.Should().NotBe(0);
+		}
 	}
 }