Skip to content

Commit 52b405e

Browse files
committed
Model origin as GeoCoordinate and not GeoLocation
1 parent d7c2e83 commit 52b405e

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/Nest/QueryDsl/Specialized/DistanceFeature/DistanceFeatureQuery.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public interface IDistanceFeatureQuery : IFieldNameQuery
2121
// If the field value is a geo_point field, the origin value must be a geopoint.
2222
/// </summary>
2323
[DataMember(Name = "origin")]
24-
Union<GeoLocation, DateMath> Origin { get; set; }
24+
Union<GeoCoordinate, DateMath> Origin { get; set; }
2525

2626
/// <summary>
2727
/// Distance from the origin at which relevance scores receive half of the boost value.
@@ -42,7 +42,7 @@ public class DistanceFeatureQuery : FieldNameQueryBase, IDistanceFeatureQuery
4242
internal override void InternalWrapInContainer(IQueryContainer container) => container.DistanceFeature = this;
4343

4444
/// <inheritdoc />
45-
public Union<GeoLocation, DateMath> Origin { get; set; }
45+
public Union<GeoCoordinate, DateMath> Origin { get; set; }
4646

4747
/// <inheritdoc />
4848
public Union<Distance, Time> Pivot { get; set; }
@@ -52,7 +52,7 @@ public class DistanceFeatureQueryDescriptor<T>
5252
: FieldNameQueryDescriptorBase<DistanceFeatureQueryDescriptor<T>, IDistanceFeatureQuery, T>
5353
, IDistanceFeatureQuery where T : class
5454
{
55-
Union<GeoLocation, DateMath> IDistanceFeatureQuery.Origin { get; set; }
55+
Union<GeoCoordinate, DateMath> IDistanceFeatureQuery.Origin { get; set; }
5656

5757
Union<Distance, Time> IDistanceFeatureQuery.Pivot { get; set; }
5858

@@ -63,7 +63,7 @@ public DistanceFeatureQueryDescriptor<T> Origin(DateMath origin) =>
6363
Assign(origin, (a, v) => a.Origin = v);
6464

6565
/// <inheritdoc cref="IDistanceFeatureQuery.Origin" />
66-
public DistanceFeatureQueryDescriptor<T> Origin(GeoLocation origin) =>
66+
public DistanceFeatureQueryDescriptor<T> Origin(GeoCoordinate origin) =>
6767
Assign(origin, (a, v) => a.Origin = v);
6868

6969
/// <inheritdoc cref="IDistanceFeatureQuery.Pivot" />
@@ -77,7 +77,7 @@ public DistanceFeatureQueryDescriptor<T> Pivot(Distance pivot) =>
7777

7878
internal class DistanceFeatureQueryFormatter : IJsonFormatter<IDistanceFeatureQuery>
7979
{
80-
private static readonly UnionFormatter<GeoLocation, DateMath> OriginUnionFormatter = new UnionFormatter<GeoLocation, DateMath> ();
80+
private static readonly UnionFormatter<GeoCoordinate, DateMath> OriginUnionFormatter = new UnionFormatter<GeoCoordinate, DateMath> ();
8181
private static readonly UnionFormatter<Distance, Time> PivotUnionFormatter = new UnionFormatter<Distance, Time>();
8282

8383
public void Serialize(ref JsonWriter writer, IDistanceFeatureQuery value, IJsonFormatterResolver formatterResolver)

src/Tests/Tests/QueryDsl/Specialized/DistanceFeature/DistanceFeatureTimeQueryUsageTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ public DistanceFeatureDistanceQueryUsageTests(ReadOnlyCluster i, EndpointUsage u
6767
protected override QueryContainer QueryInitializer => new DistanceFeatureQuery()
6868
{
6969
Boost = 1.1,
70-
Field = Infer.Field<Project>(f => f.StartedOn),
71-
Origin = new GeoLocation(70, -70),
70+
Field = Infer.Field<Project>(f => f.LeadDeveloper.Location),
71+
Origin = new GeoCoordinate(70, -70),
7272
Pivot = new Distance(100, DistanceUnit.Miles)
7373
};
7474

@@ -78,8 +78,8 @@ public DistanceFeatureDistanceQueryUsageTests(ReadOnlyCluster i, EndpointUsage u
7878
protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
7979
.DistanceFeature(rf => rf
8080
.Boost(1.1)
81-
.Field(f => f.StartedOn)
82-
.Origin(new GeoLocation(70, -70))
81+
.Field(f => f.LeadDeveloper.Location)
82+
.Origin(new GeoCoordinate(70, -70))
8383
.Pivot(new Distance(100, DistanceUnit.Miles))
8484
);
8585
}

0 commit comments

Comments
 (0)