summaryrefslogtreecommitdiff
path: root/platform/android/src/style
diff options
context:
space:
mode:
authorMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2018-07-04 23:12:58 +0300
committerMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2018-07-05 15:11:14 +0300
commit514485502db8ecacf2b11abad4599d7af09b0cf8 (patch)
tree21a76d2fda8b5ec5e19624f5eedf609a545b59b4 /platform/android/src/style
parent32dce870d756063167e000302afb553714f1f0cb (diff)
downloadqtlocation-mapboxgl-514485502db8ecacf2b11abad4599d7af09b0cf8.tar.gz
Rename `HeatmapColorPropertyValue` to `ColorRampPropertyValue`
Based on patch from @lbud (Lauren Budorick). Give `HeatmapColorPropertyValue` a more generic name, since the same value type will be used for both `heatmap-color` and `line-gradient` properties.
Diffstat (limited to 'platform/android/src/style')
-rw-r--r--platform/android/src/style/conversion/property_value.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/platform/android/src/style/conversion/property_value.hpp b/platform/android/src/style/conversion/property_value.hpp
index 902d1e80b2..e6fbe42179 100644
--- a/platform/android/src/style/conversion/property_value.hpp
+++ b/platform/android/src/style/conversion/property_value.hpp
@@ -1,8 +1,8 @@
#pragma once
-#include <mbgl/style/property_value.hpp>
+#include <mbgl/style/color_ramp_property_value.hpp>
#include <mbgl/style/data_driven_property_value.hpp>
-#include <mbgl/style/heatmap_color_property_value.hpp>
+#include <mbgl/style/property_value.hpp>
#include "../../conversion/conversion.hpp"
#include "../../conversion/constant.hpp"
#include "types.hpp"
@@ -75,10 +75,10 @@ struct Converter<jni::jobject*, mbgl::style::DataDrivenPropertyValue<T>> {
* Convert core heat map color property value to java
*/
template <>
-struct Converter<jni::jobject*, mbgl::style::HeatmapColorPropertyValue> {
+struct Converter<jni::jobject*, mbgl::style::ColorRampPropertyValue> {
- Result<jni::jobject*> operator()(jni::JNIEnv& env, const mbgl::style::HeatmapColorPropertyValue value) const {
- PropertyValueEvaluator<mbgl::style::HeatmapColorPropertyValue> evaluator(env);
+ Result<jni::jobject*> operator()(jni::JNIEnv& env, const mbgl::style::ColorRampPropertyValue value) const {
+ PropertyValueEvaluator<mbgl::style::ColorRampPropertyValue> evaluator(env);
return *convert<jni::jobject*>(env, value.evaluate(evaluator));
}
};