Change geo_bbox to geo_bounding_box

Close #506
olivere · Apr 10, 2017 · 122fc1c · 122fc1c
1 parent 3b39012
commit 122fc1c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -38,6 +38,7 @@ Guillaume J. Charmes [@creack](https://github.com/creack)
 Guiseppe [@gm42](https://github.com/gm42)
 Han Yu [@MoonighT](https://github.com/MoonighT)
 Harrison Wright [@wright8191](https://github.com/wright8191)
+Henry Clifford [@hcliff](https://github.com/hcliff)
 Igor Dubinskiy [@idubinskiy](https://github.com/idubinskiy)
 initialcontext [@initialcontext](https://github.com/initialcontext)
 Isaac Saldana [@isaldana](https://github.com/isaldana)

diff --git a/search_queries_geo_bounding_box.go b/search_queries_geo_bounding_box.go
@@ -83,7 +83,7 @@ func (q *GeoBoundingBoxQuery) QueryName(queryName string) *GeoBoundingBoxQuery {
 // Source returns JSON for the function score query.
 func (q *GeoBoundingBoxQuery) Source() (interface{}, error) {
 	// {
-	//   "geo_bbox" : {
+	//   "geo_bounding_box" : {
 	//     ...
 	//   }
 	// }
@@ -103,7 +103,7 @@ func (q *GeoBoundingBoxQuery) Source() (interface{}, error) {
 
 	source := make(map[string]interface{})
 	params := make(map[string]interface{})
-	source["geo_bbox"] = params
+	source["geo_bounding_box"] = params
 
 	box := make(map[string]interface{})
 	box["top_left"] = []float64{*q.left, *q.top}

diff --git a/search_queries_geo_bounding_box_test.go b/search_queries_geo_bounding_box_test.go
@@ -37,7 +37,7 @@ func TestGeoBoundingBoxQuery(t *testing.T) {
 		t.Fatalf("marshaling to JSON failed: %v", err)
 	}
 	got := string(data)
-	expected := `{"geo_bbox":{"pin.location":{"bottom_right":[-71.12,40.01],"top_left":[-74.1,40.73]},"type":"memory"}}`
+	expected := `{"geo_bounding_box":{"pin.location":{"bottom_right":[-71.12,40.01],"top_left":[-74.1,40.73]},"type":"memory"}}`
 	if got != expected {
 		t.Errorf("expected\n%s\n,got:\n%s", expected, got)
 	}
@@ -56,7 +56,7 @@ func TestGeoBoundingBoxQueryWithGeoPoint(t *testing.T) {
 		t.Fatalf("marshaling to JSON failed: %v", err)
 	}
 	got := string(data)
-	expected := `{"geo_bbox":{"pin.location":{"bottom_right":[-71.12,40.01],"top_left":[-74.1,40.73]}}}`
+	expected := `{"geo_bounding_box":{"pin.location":{"bottom_right":[-71.12,40.01],"top_left":[-74.1,40.73]}}}`
 	if got != expected {
 		t.Errorf("expected\n%s\n,got:\n%s", expected, got)
 	}