This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
Add heatmap color property #11220
Merged
Add heatmap color property #11220
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
CI is failing on update: for an expression value, the easiest way would be with #11156, for non expressions values we should be able to hook into the already existing |
|
Thanks to 👀 from @ivovandongen, we don't need to support non expressions: Going to remove the generated tests and will pick up getter support with #10721 |
tobrun
force-pushed
the
tvn-heatmap-color-property
branch
from
e7e1390
to
366051e
Compare
| jni::Object<jni::ObjectTag> HeatmapLayer::getHeatmapColor(jni::JNIEnv& env) { | ||
| using namespace mbgl::android::conversion; | ||
| Result<jni::jobject*> converted = convert<jni::jobject*>(env, layer.as<mbgl::style::HeatmapLayer>()->HeatmapLayer::getHeatmapColor()); | ||
| return jni::Object<jni::ObjectTag>(*converted); |
There was a problem hiding this comment.
@tobrun Note that in https://github.com/mapbox/mapbox-gl-native/pull/11074/files#diff-c48bbf0fbc172c9c08815dbfc04e4c66R78 (which I think is the iOS analogue to this), there's a check for whether layer.as<mbgl::style::HeatmapLayer>()->HeatmapLayer::getHeatmapColor() is undefined, and if so, it uses getDefaultHeatmapColor() instead.
There was a problem hiding this comment.
thanks for flagging, addressed with e5ce57b
ivovandongen
approved these changes
Feb 23, 2018
|
Should this be targeted at the boba branch too? |
tobrun
force-pushed
the
tvn-heatmap-color-property
branch
from
e5ce57b
to
c745b12
Compare
23 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds heatmap color support to the android binding:
@ivovandongen to make this conversion possible I had to add support for the custom
mbgl::style::HeatmapColorPropertyValue. Isproperty_value.hppthe correct place to do this?Closes #11172
cc @mourner @anandthakker