diff --git a/geojson/bbox.go b/geojson/bbox.go index 947855b6..de4fdc0e 100644 --- a/geojson/bbox.go +++ b/geojson/bbox.go @@ -170,7 +170,7 @@ func (b BBox) Sparse(amount byte) []BBox { // BBoxesFromCenter calculates the bounding box surrounding a circle. func BBoxesFromCenter(lat, lon, meters float64) (outer BBox) { - outer.Min.Y, outer.Min.X, outer.Max.Y, outer.Max.X = BBoxBounds(lat, lon, meters) + outer.Min.Y, outer.Min.X, outer.Max.Y, outer.Max.X = BoundsFromCenter(lat, lon, meters) if outer.Min.X == outer.Max.X { switch outer.Min.X { case -180: @@ -183,7 +183,8 @@ func BBoxesFromCenter(lat, lon, meters float64) (outer BBox) { return outer } -func BBoxBounds(lat, lon, meters float64) (latMin, lonMin, latMax, lonMax float64) { +// BoundsFromCenter calculates the bounding box surrounding a circle. +func BoundsFromCenter(lat, lon, meters float64) (latMin, lonMin, latMax, lonMax float64) { // see http://janmatuschek.de/LatitudeLongitudeBoundingCoordinates#Latitude lat = toRadians(lat) diff --git a/geojson/feature_test.go b/geojson/feature_test.go index 168efdf6..1e68bcb2 100644 --- a/geojson/feature_test.go +++ b/geojson/feature_test.go @@ -116,7 +116,7 @@ func TestComplexFeature(t *testing.T) { if err != nil { t.Fatal(err) } - o = o + _ = o } func TestIssue245(t *testing.T) { diff --git a/geojson/object.go b/geojson/object.go index 9278ea77..11fba864 100644 --- a/geojson/object.go +++ b/geojson/object.go @@ -31,11 +31,11 @@ var ( // json errors fmtErrTypeIsUnknown = "The type '%s' is unknown" errInvalidTypeMember = errors.New("Type member is invalid. Expecting a string") errInvalidCoordinates = errors.New("Coordinates member is invalid. Expecting an array") - errCoordinatesRequired = errors.New("Coordinates member is required.") + errCoordinatesRequired = errors.New("Coordinates member is required") errInvalidGeometries = errors.New("Geometries member is invalid. Expecting an array") - errGeometriesRequired = errors.New("Geometries member is required.") + errGeometriesRequired = errors.New("Geometries member is required") errInvalidGeometryMember = errors.New("Geometry member is invalid. Expecting an object") - errGeometryMemberRequired = errors.New("Geometry member is required.") + errGeometryMemberRequired = errors.New("Geometry member is required") errInvalidFeaturesMember = errors.New("Features member is invalid. Expecting an array") errFeaturesMemberRequired = errors.New("Features member is required") errInvalidFeature = errors.New("Invalid feature in collection")