Skip to content
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

Jump to bottom

[Maps] Enable gridding/clustering/heatmaps for geo_shape fields #67886

Merged
merged 21 commits into from
Jun 8, 2020
Merged

[Maps] Enable gridding/clustering/heatmaps for geo_shape fields #67886

merged 21 commits into from
Jun 8, 2020

Conversation

thomasneirynck
Copy link
Contributor

@thomasneirynck thomasneirynck commented Jun 1, 2020 •
edited
Loading

Closes #2576, #56876

This does not include support for point-to-point sources. Will create follow-up issue for that.

@thomasneirynck thomasneirynck added release_note:enhancement WIP Work in progress [Deprecated-Use Team:Presentation]Team:Geo Former Team Label for Geo Team. Now use Team:Presentation v8.0.0 v7.9.0 labels Jun 1, 2020
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-gis (Team:Geo)

@thomasneirynck thomasneirynck changed the title [Maps] Add geo_shape aggregations [Maps] Enable gridding/clustering for geo_shape fields Jun 1, 2020
@thomasneirynck thomasneirynck marked this pull request as ready for review June 1, 2020 23:47
@thomasneirynck thomasneirynck requested a review from a team as a code owner June 1, 2020 23:47
@thomasneirynck thomasneirynck requested review from nreese and kindsun June 1, 2020 23:47
nreese
nreese reviewed Jun 2, 2020
View reviewed changes
x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.js Outdated Show resolved Hide resolved
x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.js Outdated Show resolved Hide resolved
x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.js Show resolved Hide resolved
x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/es_pew_pew_source.js Outdated
@@ -16,6 +16,7 @@ import { convertToLines } from './convert_to_lines';
import { AbstractESAggSource } from '../es_agg_source';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we even want pew-pew source to support geo_shape geo_tile_grid aggregations? I think since the source is point to point it should not.

Copy link
Contributor Author

@thomasneirynck thomasneirynck Jun 3, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

geo_shape can contain points. Ideally, users would not have to know if they should be using geo_point or geo_shape. geo_shape should always be the safe default choice imho. I think this is fine, but can remove.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

discussed in person. removed support for pew-pew sources. There's some edge-cases with regard to how pewpew sources collapse source-fields that are not being handled. Will add in separate PR.

x-pack/plugins/maps/public/elasticsearch_geo_utils.js Outdated Show resolved Hide resolved
x-pack/plugins/maps/public/index_pattern_util.js Outdated Show resolved Hide resolved
@thomasneirynck thomasneirynck requested a review from nreese June 3, 2020 18:31
@thomasneirynck thomasneirynck changed the title [Maps] Enable gridding/clustering for geo_shape fields [Maps] Enable gridding/clustering/heatmsp for geo_shape fields Jun 3, 2020
@thomasneirynck thomasneirynck mentioned this pull request Jun 3, 2020
Closed
@thomasneirynck thomasneirynck changed the title [Maps] Enable gridding/clustering/heatmsp for geo_shape fields [Maps] Enable gridding/clustering/heatmaps for geo_shape fields Jun 3, 2020
@thomasneirynck thomasneirynck requested a review from nreese June 3, 2020 19:38
@thomasneirynck thomasneirynck requested a review from nreese June 3, 2020 21:27
nreese
nreese reviewed Jun 4, 2020
View reviewed changes
Copy link
Contributor

@nreese nreese left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a functional test to https://github.com/elastic/kibana/blob/master/x-pack/test/functional/apps/maps/es_geo_grid_source.js to test geo_grid on geo_shape field

x-pack/plugins/maps/public/elasticsearch_geo_utils.js Outdated Show resolved Hide resolved
nreese
nreese approved these changes Jun 5, 2020
View reviewed changes
Copy link
Contributor

@nreese nreese left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a great feature

LGTM
code review, tested in chrome

@thomasneirynck thomasneirynck removed the WIP Work in progress label Jun 8, 2020
@thomasneirynck
Copy link
Contributor Author

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@thomasneirynck thomasneirynck merged commit 0189ae5 into elastic:master Jun 8, 2020
@thomasneirynck thomasneirynck mentioned this pull request Jun 8, 2020
Merged
thomasneirynck added a commit to thomasneirynck/kibana that referenced this pull request Jun 8, 2020
@thomasneirynck
[Maps] Enable gridding/clustering/heatmaps for geo_shape fields (elas…
1277f18 
…tic#67886)

Enables heatmap, clusters, and grid layers for index-patterns with geo_shape field. This feature is only available for Gold+ users.
thomasneirynck added a commit that referenced this pull request Jun 8, 2020
@thomasneirynck
[Maps] Enable gridding/clustering/heatmaps for geo_shape fields (#67886…
b7c38f5 
…) (#68537)

Enables heatmap, clusters, and grid layers for index-patterns with geo_shape field. This feature is only available for Gold+ users.
@nreese nreese mentioned this pull request Jun 9, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nreese nreese nreese approved these changes

@kindsun kindsun Awaiting requested review from kindsun

Assignees
No one assigned
Labels
[Deprecated-Use Team:Presentation]Team:Geo Former Team Label for Geo Team. Now use Team:Presentation release_note:enhancement v7.9.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Maps] Geo_shape aggregation support
4 participants
@thomasneirynck @elasticmachine @kibanamachine @nreese