summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkevin <kevin.li@mapbox.com>2020-02-24 11:05:00 +0800
committerkevin <kevin.li@mapbox.com>2020-02-24 11:06:42 +0800
commitcdddc35abd47ebd551dec97035c4e7743a0448ac (patch)
treec7ecce6f8ba6cc0f153c4608641bb0bf51f7bb77
parentbf56a0a173d42a21e6d58b0f2048dde131e56ca2 (diff)
downloadqtlocation-mapboxgl-upstream/kl-source-zoom-delta.tar.gz
-rw-r--r--platform/android/src/style/sources/source.cpp11
-rw-r--r--platform/android/src/style/sources/source.hpp4
2 files changed, 7 insertions, 8 deletions
diff --git a/platform/android/src/style/sources/source.cpp b/platform/android/src/style/sources/source.cpp
index bbe8c82d3b..fda0f0084c 100644
--- a/platform/android/src/style/sources/source.cpp
+++ b/platform/android/src/style/sources/source.cpp
@@ -93,21 +93,20 @@ namespace android {
return attribution ? jni::Make<jni::String>(env, attribution.value()) : jni::Make<jni::String>(env,"");
}
- void Source::setPrefetchZoomDelta(jni::JNIEnv& env, jni::String& delta) {
+ void Source::setPrefetchZoomDelta(jni::JNIEnv& env, jni::Integer& delta) {
if (!delta) {
source.setPrefetchZoomDelta(nullopt);
} else {
- const std::string deltaString = jni::Make<std::string>(env, delta);
- source.setPrefetchZoomDelta(stoi(deltaString));
+ source.setPrefetchZoomDelta(jni::Unbox(env, delta));
}
}
- jni::Local<jni::String> Source::getPrefetchZoomDelta(jni::JNIEnv& env) {
+ jni::Local<jni::Integer> Source::getPrefetchZoomDelta(jni::JNIEnv& env) {
auto delta = source.getPrefetchZoomDelta();
if (delta.has_value()) {
- return jni::Make<jni::String>(env, std::to_string(delta.value()));
+ return jni::Box(env, jni::jint(delta.value()));
}
- return jni::Make<jni::String>(env, "");
+ return jni::Local<jni::Integer>(env, nullptr);
}
void Source::addToMap(JNIEnv& env, const jni::Object<Source>& obj, mbgl::Map& map, AndroidRendererFrontend& frontend) {
diff --git a/platform/android/src/style/sources/source.hpp b/platform/android/src/style/sources/source.hpp
index 409e8260c7..91e31ea8e2 100644
--- a/platform/android/src/style/sources/source.hpp
+++ b/platform/android/src/style/sources/source.hpp
@@ -43,9 +43,9 @@ public:
jni::Local<jni::String> getAttribution(jni::JNIEnv&);
- void setPrefetchZoomDelta(jni::JNIEnv& env, jni::String& delta);
+ void setPrefetchZoomDelta(jni::JNIEnv& env, jni::Integer& delta);
- jni::Local<jni::String> getPrefetchZoomDelta(jni::JNIEnv&);
+ jni::Local<jni::Integer> getPrefetchZoomDelta(jni::JNIEnv&);
protected:
// Set on newly created sources until added to the map.