Skip to content

Added a null check to GeoLocation and updated ToString() #1814

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 2 commits into from
Feb 15, 2016
Merged

Added a null check to GeoLocation and updated ToString() #1814

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25e3866
Added a null check to GeoLocation implicit operator and updated ToStr…
niemyjski Feb 9, 2016
0823949
Increased the coordinates to 8 decimal places for precision
niemyjski Feb 9, 2016
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
5 changes: 4 additions & 1 deletion src/Nest/QueryDsl/Geo/GeoLocation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public static GeoLocation TryCreate(double latitude, double longitude)

public override string ToString()
{
return string.Format(CultureInfo.InvariantCulture, "{0},{1}", _latitude, _longitude);
return _latitude.ToString("#0.0#######") + "," + _longitude.ToString("#0.0#######");
}

public bool Equals(GeoLocation other)
Expand Down Expand Up @@ -112,6 +112,9 @@ public override int GetHashCode() =>

public static implicit operator GeoLocation(string latLon)
{
if (string.IsNullOrEmpty(latLon))
throw new ArgumentNullException(nameof(latLon));

var parts = latLon.Split(',');
if (parts.Length != 2) throw new ArgumentException("Invalid format: string must be in the form of lat,lon");
double lat;
Expand Down