diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-31 14:21:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-31 14:21:47 -0700 |
| commit | 9bdd765a02de75851a00ab85223d5d582a104757 (patch) | |
| tree | bcb417a47808a4a94c171b083c7f2e2cce457107 /platform/android/src | |
| parent | 885f6e3c02138398d094e49243817a83349b4d50 (diff) | |
| download | qtlocation-mapboxgl-9bdd765a02de75851a00ab85223d5d582a104757.tar.gz | |
[core] Merge DataDrivenPropertyValue into PropertyValue (#12513)
Diffstat (limited to 'platform/android/src')
| -rw-r--r-- | platform/android/src/style/conversion/property_value.hpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/platform/android/src/style/conversion/property_value.hpp b/platform/android/src/style/conversion/property_value.hpp index feed38b673..256647cddf 100644 --- a/platform/android/src/style/conversion/property_value.hpp +++ b/platform/android/src/style/conversion/property_value.hpp @@ -1,7 +1,6 @@ #pragma once #include <mbgl/style/color_ramp_property_value.hpp> -#include <mbgl/style/data_driven_property_value.hpp> #include <mbgl/style/property_value.hpp> #include "../../conversion/conversion.hpp" #include "../../conversion/constant.hpp" @@ -52,18 +51,6 @@ struct Converter<jni::jobject*, mbgl::style::PropertyValue<T>> { }; /** - * Convert core data driven property values to java - */ -template <class T> -struct Converter<jni::jobject*, mbgl::style::DataDrivenPropertyValue<T>> { - - Result<jni::jobject*> operator()(jni::JNIEnv& env, const mbgl::style::DataDrivenPropertyValue<T>& value) const { - PropertyValueEvaluator<T> evaluator(env); - return value.evaluate(evaluator); - } -}; - -/** * Convert core heat map color property value to java */ template <> |