Skip to content

Include unit and distance_type when set #1841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 19, 2016
Merged

Include unit and distance_type when set #1841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Nest/CommonOptions/Sorting/SortJsonConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
break;
case "_geo_distance":
var geo = s as IGeoDistanceSort;
writer.WritePropertyName("_geo_distance");
writer.WritePropertyName(geo.SortKey.Name);
base.Reserialize(writer, s, serializer, w =>
{
writer.WritePropertyName(settings.Inferrer.Field(geo.Field));
Expand Down
5 changes: 5 additions & 0 deletions src/Nest/Search/Search/Sort/SortGeoDistance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq.Expressions;
using Newtonsoft.Json;

namespace Nest
{
public interface IGeoDistanceSort : ISort
{
Field Field { get; set; }
IEnumerable<GeoLocation> Points { get; set; }

[JsonProperty(PropertyName = "unit")]
DistanceUnit? GeoUnit { get; set; }

[JsonProperty(PropertyName = "distance_type")]
GeoDistanceType? DistanceType { get; set; }
}

Expand Down
22 changes: 12 additions & 10 deletions src/Tests/Search/Request/SortUsageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,19 @@ public SortUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(clust
new {
_geo_distance = new {
location = new [] {
new {
lat = 70.0,
lon = -70.0
},
new {
lat = -12.0,
lon = 12.0
}
new {
lat = 70.0,
lon = -70.0
},
new {
lat = -12.0,
lon = 12.0
}
},
order = "asc",
mode = "min"
mode = "min",
distance_type = "arc",
unit = "cm"
}
},
new {
Expand Down Expand Up @@ -84,7 +86,7 @@ public SortUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(clust
)
.GeoDistance(g => g
.Field(p => p.Location)
.DistanceType(GeoDistanceType.SloppyArc)
.DistanceType(GeoDistanceType.Arc)
.Order(SortOrder.Ascending)
.Unit(DistanceUnit.Centimeters)
.Mode(SortMode.Min)
Expand Down