From 39f858f9c36981fc72ffa7560bc851bc137e2764 Mon Sep 17 00:00:00 2001
From: Russ Cam <russ.cam@elastic.co>
Date: Wed, 29 Aug 2018 13:34:27 +1000
Subject: [PATCH] Include LatLongDetector on DetectorsDescriptor<T>

Closes #3383
---
 src/Nest/XPack/MachineLearning/Job/Detectors/Detector.cs       | 3 +++
 .../XPack/MachineLearning/Job/Detectors/GeographicDetector.cs  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/Nest/XPack/MachineLearning/Job/Detectors/Detector.cs b/src/Nest/XPack/MachineLearning/Job/Detectors/Detector.cs
index 744581a2b68..c5bb1069718 100644
--- a/src/Nest/XPack/MachineLearning/Job/Detectors/Detector.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Detectors/Detector.cs
@@ -285,5 +285,8 @@ public DetectorsDescriptor<T> TimeOfDay(Func<TimeDetectorDescriptor<T>, ITimeDet
 
 		public DetectorsDescriptor<T> TimeOfWeek(Func<TimeDetectorDescriptor<T>, ITimeDetector> selector = null) =>
 			Assign(a => a.AddIfNotNull(selector.InvokeOrDefault(new TimeDetectorDescriptor<T>(TimeFunction.TimeOfWeek))));
+
+		public DetectorsDescriptor<T> LatLong(Func<LatLongDetectorDescriptor<T>, IGeographicDetector> selector = null) =>
+			Assign(a => a.AddIfNotNull(selector.InvokeOrDefault(new LatLongDetectorDescriptor<T>())));
 	}
 }
diff --git a/src/Nest/XPack/MachineLearning/Job/Detectors/GeographicDetector.cs b/src/Nest/XPack/MachineLearning/Job/Detectors/GeographicDetector.cs
index 99e4ea80f99..6dd01ffb28e 100644
--- a/src/Nest/XPack/MachineLearning/Job/Detectors/GeographicDetector.cs
+++ b/src/Nest/XPack/MachineLearning/Job/Detectors/GeographicDetector.cs
@@ -44,8 +44,11 @@ public class LatLongDetectorDescriptor<T> : DetectorDescriptorBase<LatLongDetect
 		Field IPartitionFieldNameDetector.PartitionFieldName { get; set; }
 		Field IFieldNameDetector.FieldName { get; set; }
 
+		[Obsolete("Use parameterless constructor")]
 		public LatLongDetectorDescriptor(string function) : base(function) {}
 
+		public LatLongDetectorDescriptor() : base(GeographicFunction.LatLong.GetStringValue()) {}
+
 		public LatLongDetectorDescriptor<T> FieldName(Field fieldName) => Assign(a => a.FieldName = fieldName);
 
 		public LatLongDetectorDescriptor<T> FieldName(Expression<Func<T, object>> objectPath) => Assign(a => a.FieldName = objectPath);