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.

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

Add ['heatmap-density'] expression #5350

Merged
merged 2 commits into from
Sep 28, 2017
Merged

Conversation

anandthakker
Copy link
Contributor

@anandthakker anandthakker commented Sep 25, 2017

This adds a ["heatmap-density"] expression and special-case handling when converting stop functions to use that instead of ["zoom"] for the heatmap-color style property.

@anandthakker
Copy link
Contributor Author

cc @mourner

@mourner mourner mentioned this pull request Sep 26, 2017
36 tasks
Copy link
Member

@mourner mourner left a comment

Choose a reason for hiding this comment

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

Looks good! Can you please fix the build so that I could merge to my branch? Also, do you want to look at the default values hack in a different PR or maybe look at it here if it's not too much work?

@anandthakker
Copy link
Contributor Author

Oops, yep will fix.

Re: default values hack -- I sorta think the existing hack is alright / involves the minimal amount of special-case code. Can we keep that as is?

@mourner
Copy link
Member

mourner commented Sep 28, 2017

Re: default values hack -- I sorta think the existing hack is alright / involves the minimal amount of special-case code. Can we keep that as is?

I mean, the requirement to have default in the stops function provided (otherwise the code breaks).

@anandthakker
Copy link
Contributor Author

Oh, right, sorry! Yeah, let me try to tack on a fix here.

@anandthakker
Copy link
Contributor Author

@mourner when I remove the default: from the stops function for heatmap-color in heatmap.html, it still works for me.

@mourner
Copy link
Member

mourner commented Sep 28, 2017

Heh, maybe you or me accidentally fixed this somehow in other commits :)

@mourner mourner merged commit 77fe319 into heatmaps Sep 28, 2017
@mourner mourner deleted the heatmap-density-expression branch September 28, 2017 15:54
mourner pushed a commit that referenced this pull request Sep 29, 2017
* Add ['heatmap-density'] expression

* Fix lint
anandthakker added a commit that referenced this pull request Oct 2, 2017
* Add ['heatmap-density'] expression

* Fix lint
anandthakker added a commit that referenced this pull request Oct 5, 2017
* Add ['heatmap-density'] expression

* Fix lint
mourner pushed a commit that referenced this pull request Oct 6, 2017
* Add ['heatmap-density'] expression

* Fix lint
mourner added a commit that referenced this pull request Oct 6, 2017
* WIP dump heatmap layer

* remove redundant heatmap attributes

* cleanup heatmap style reference

* stop-based heatmap color ramps

* simplify heatmap debug page; remove weight scale

* optimize heatmap texture caching logic

* make sure no-data areas are always transparent

* faster heatmap kernel calculation

* fix heatmap blending issues around edges

* saner heatmap color ramp defaults

* introduce heatmap-intensity property

* use texture class for heatmaps

* fix bug with heatmap resizing

* cache color ramp texture

* hack to get rid of heatmap flicker

* cache viewport buffer/vao

* heatmap fallback when no half-floats available

* fix flow errors and some caught bugs

* update error message fixtures

* Scale mesh to ensure it's large enough for kernel to drop to zero

Also change kernel bandwidth from 5.0 to 3.0

* use a smaller heatmap zero for less artifacts

* nicer heatmap debug page

* add more heatmap code comments

* more heatmap code cleanup

* gracefully fallback on bad half-float framebuffer support

* fix infinite loop in heatmap code

* Add ['heatmap-density'] expression (#5350)

* Add ['heatmap-density'] expression

* Fix lint

* better heatmap docs

* fix heatmap docs generation

* add heatmap render tests

* clarify heatmap-density description

* add a comment about overriding setPaintProperty

* Special case handling for heatmap-color expression default values

* add a test for heatmap color expression
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants