-
Notifications
You must be signed in to change notification settings - Fork 736
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.
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
Added the geo_centroid aggregation #1150
Conversation
LGTM. Would be nice to have at least one integration test added to confirm it works as expected. Best is having a look at the existing integration tests and then do mostly copy / paste :-) |
@ruflin Added integration test and added the class to the Changelog. Not sure how I can see the merge conflict though. |
Best is to rebase on top of master. Probably it is a conflict in CHANGELOG.md |
@@ -9,7 +9,7 @@ All notable changes to this project will be documented in this file based on the | |||
### Bugfixes | |||
|
|||
### Added | |||
|
|||
- `Elastica\Aggregations\GeoCentroid` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you add a newline afterwards?
Changes LGTM, only minor comment. |
Apparently I couldn't find a way to use rebase, my commits were on the master branch of my fork. Not that experienced with rebasing, so I did a merge upstream from the origin master, that indeed showed that the changelog had some differences before I changed it. Looks good now I think :) |
@@ -38,6 +39,7 @@ All notable changes to this project will be documented in this file based on the | |||
- Fix php notice on `\Elastica\Index::getAliases()` if index has no aliases [#1078](https://github.com/ruflin/Elastica/issues/1078) | |||
|
|||
### Added | |||
- `Elastica\Aggregations\GeoCentroid` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like your merge now caused it to be added twice. This one should be removed.
Yeah, if you work in master directly rebasing on master is hard ;-) Merging cause a small issue above. |
You were right, I added it to the wrong version. Should be ok now I think. |
Thanks for the contribution. I squashed to commits and put it into master. |
You're very welcome, loving the library so I'm glad I can give back (small as it may be ;) ) Edit: Any idea on when a new release is coming out, because now to enjoy the GeoCentroid I'll have to put my version number to dev-master afaik. |
No exact plans for the next as there are already a few changes in an no BC breaks I could do a release quite soonish. One thing I wanted to fix is the httpproxy vulnerability before the next release: https://httpoxy.org/ Unfortunately Elastica is also affected here (in case you use HHVM_VERSION) and Guzzle Transport:
|
Ok, thanks for the info, I'm afraid I have too little time to dive into that one :) |
No description provided.