diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2018-01-24 15:05:28 -0800 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2018-01-24 15:41:22 -0800 |
commit | 2502a3ab2bf793dcb3a41deb5c93290b3c6ce5fd (patch) | |
tree | 5c52e96803ae64279a02eb4a00857b75490a9279 /platform/android/src | |
parent | 7159a14b35ee380450589d69b1e844282030c19f (diff) | |
download | qtlocation-mapboxgl-2502a3ab2bf793dcb3a41deb5c93290b3c6ce5fd.tar.gz |
[core] update mapbox-gl-js submodule pin
* disables transition render test (transitions are not supported with Still image rendering in Node.js)
* removes support for hillshade-illumniation-direction-transition
Diffstat (limited to 'platform/android/src')
-rw-r--r-- | platform/android/src/style/layers/hillshade_layer.cpp | 15 | ||||
-rw-r--r-- | platform/android/src/style/layers/hillshade_layer.hpp | 2 |
2 files changed, 0 insertions, 17 deletions
diff --git a/platform/android/src/style/layers/hillshade_layer.cpp b/platform/android/src/style/layers/hillshade_layer.cpp index b58bc3b947..d98e3ee074 100644 --- a/platform/android/src/style/layers/hillshade_layer.cpp +++ b/platform/android/src/style/layers/hillshade_layer.cpp @@ -41,19 +41,6 @@ namespace android { return jni::Object<jni::ObjectTag>(*converted); } - jni::Object<TransitionOptions> HillshadeLayer::getHillshadeIlluminationDirectionTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; - mbgl::style::TransitionOptions options = layer.as<mbgl::style::HillshadeLayer>()->HillshadeLayer::getHillshadeIlluminationDirectionTransition(); - return *convert<jni::Object<TransitionOptions>>(env, options); - } - - void HillshadeLayer::setHillshadeIlluminationDirectionTransition(jni::JNIEnv&, jlong duration, jlong delay) { - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); - layer.as<mbgl::style::HillshadeLayer>()->HillshadeLayer::setHillshadeIlluminationDirectionTransition(options); - } - jni::Object<jni::ObjectTag> HillshadeLayer::getHillshadeIlluminationAnchor(jni::JNIEnv& env) { using namespace mbgl::android::conversion; Result<jni::jobject*> converted = convert<jni::jobject*>(env, layer.as<mbgl::style::HillshadeLayer>()->HillshadeLayer::getHillshadeIlluminationAnchor()); @@ -156,8 +143,6 @@ namespace android { std::make_unique<HillshadeLayer, JNIEnv&, jni::String, jni::String>, "initialize", "finalize", - METHOD(&HillshadeLayer::getHillshadeIlluminationDirectionTransition, "nativeGetHillshadeIlluminationDirectionTransition"), - METHOD(&HillshadeLayer::setHillshadeIlluminationDirectionTransition, "nativeSetHillshadeIlluminationDirectionTransition"), METHOD(&HillshadeLayer::getHillshadeIlluminationDirection, "nativeGetHillshadeIlluminationDirection"), METHOD(&HillshadeLayer::getHillshadeIlluminationAnchor, "nativeGetHillshadeIlluminationAnchor"), METHOD(&HillshadeLayer::getHillshadeExaggerationTransition, "nativeGetHillshadeExaggerationTransition"), diff --git a/platform/android/src/style/layers/hillshade_layer.hpp b/platform/android/src/style/layers/hillshade_layer.hpp index 101febb228..4b68251775 100644 --- a/platform/android/src/style/layers/hillshade_layer.hpp +++ b/platform/android/src/style/layers/hillshade_layer.hpp @@ -30,8 +30,6 @@ public: // Properties jni::Object<jni::ObjectTag> getHillshadeIlluminationDirection(jni::JNIEnv&); - void setHillshadeIlluminationDirectionTransition(jni::JNIEnv&, jlong duration, jlong delay); - jni::Object<TransitionOptions> getHillshadeIlluminationDirectionTransition(jni::JNIEnv&); jni::Object<jni::ObjectTag> getHillshadeIlluminationAnchor(jni::JNIEnv&); |