diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-11-06 11:25:09 +0200 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-11-07 16:34:20 +0200 |
commit | 80ec05cf47feb9f225d46222980d6942b9a4038f (patch) | |
tree | e0e2781efbdd9eae40cbde9ddf695fff80efa1ab /platform/android/src/native_map_view.cpp | |
parent | ffdeef3a26306e447f1cc52a8e14d42fb035611d (diff) | |
download | qtlocation-mapboxgl-80ec05cf47feb9f225d46222980d6942b9a4038f.tar.gz |
[core][android] Implement LayerManager for Android
The newly introduced `LayerManagerAndroid` is now responsible
for creating both style layer objects and their java peers on Android.
Diffstat (limited to 'platform/android/src/native_map_view.cpp')
-rwxr-xr-x | platform/android/src/native_map_view.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp index f12c48f938..1c744a6b57 100755 --- a/platform/android/src/native_map_view.cpp +++ b/platform/android/src/native_map_view.cpp @@ -733,7 +733,7 @@ jni::Local<jni::Array<jni::Object<Layer>>> NativeMapView::getLayers(JNIEnv& env) auto jLayers = jni::Array<jni::Object<Layer>>::New(env, layers.size()); int index = 0; for (auto layer : layers) { - jLayers.Set(env, index, createJavaLayerPeer(env, *map, *layer)); + jLayers.Set(env, index, LayerManagerAndroid::get()->createJavaLayerPeer(env, *map, *layer)); index++; } @@ -750,7 +750,7 @@ jni::Local<jni::Object<Layer>> NativeMapView::getLayer(JNIEnv& env, const jni::S } // Create and return the layer's native peer - return createJavaLayerPeer(env, *map, *coreLayer); + return LayerManagerAndroid::get()->createJavaLayerPeer(env, *map, *coreLayer); } void NativeMapView::addLayer(JNIEnv& env, jlong nativeLayerPtr, const jni::String& before) { @@ -830,7 +830,7 @@ void NativeMapView::addLayerAt(JNIEnv& env, jlong nativeLayerPtr, jni::jint inde jni::Local<jni::Object<Layer>> NativeMapView::removeLayerById(JNIEnv& env, const jni::String& id) { std::unique_ptr<mbgl::style::Layer> coreLayer = map->getStyle().removeLayer(jni::Make<std::string>(env, id)); if (coreLayer) { - return createJavaLayerPeer(env, *map, std::move(coreLayer)); + return LayerManagerAndroid::get()->createJavaLayerPeer(env, *map, std::move(coreLayer)); } else { return jni::Local<jni::Object<Layer>>(); } @@ -851,7 +851,7 @@ jni::Local<jni::Object<Layer>> NativeMapView::removeLayerAt(JNIEnv& env, jni::ji std::unique_ptr<mbgl::style::Layer> coreLayer = map->getStyle().removeLayer(layers.at(index)->getID()); if (coreLayer) { - return createJavaLayerPeer(env, *map, std::move(coreLayer)); + return LayerManagerAndroid::get()->createJavaLayerPeer(env, *map, std::move(coreLayer)); } else { return jni::Local<jni::Object<Layer>>(); } |