diff options
Diffstat (limited to 'platform/android/src/jni.cpp')
| -rwxr-xr-x | platform/android/src/jni.cpp | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp index 18a22cb8b3..3a7963f11e 100755 --- a/platform/android/src/jni.cpp +++ b/platform/android/src/jni.cpp @@ -18,7 +18,6 @@ #include <mbgl/map/camera.hpp> #include <mbgl/annotation/annotation.hpp> #include <mbgl/style/layer.hpp> -#include <mbgl/style/layers/custom_layer.hpp> #include <mbgl/sprite/sprite_image.hpp> #include <mbgl/platform/event.hpp> #include <mbgl/platform/log.hpp> @@ -102,13 +101,6 @@ jni::jfieldID* rectFTopId = nullptr; jni::jfieldID* rectFRightId = nullptr; jni::jfieldID* rectFBottomId = nullptr; -jni::jclass* customLayerClass = nullptr; -jni::jfieldID* customLayerIdId = nullptr; -jni::jfieldID* customLayerContextId = nullptr; -jni::jfieldID* customLayerInitializeFunctionId = nullptr; -jni::jfieldID* customLayerRenderFunctionId = nullptr; -jni::jfieldID* customLayerDeinitializeFunctionId = nullptr; - // Offline declarations start jni::jfieldID* offlineManagerClassPtrId = nullptr; @@ -1069,26 +1061,6 @@ void nativeFlyTo(JNIEnv *env, jni::jobject* obj, jlong nativeMapViewPtr, jdouble nativeMapView->getMap().flyTo(cameraOptions, animationOptions); } -void nativeAddCustomLayer(JNIEnv *env, jni::jobject* obj, jlong nativeMapViewPtr, jni::jobject* customLayer, jni::jstring* before) { - mbgl::Log::Debug(mbgl::Event::JNI, "nativeAddCustomLayer"); - assert(nativeMapViewPtr != 0); - NativeMapView *nativeMapView = reinterpret_cast<NativeMapView *>(nativeMapViewPtr); - nativeMapView->getMap().addLayer(std::make_unique<mbgl::style::CustomLayer>( - std_string_from_jstring(env, reinterpret_cast<jni::jstring*>(jni::GetField<jni::jobject*>(*env, customLayer, *customLayerIdId))), - reinterpret_cast<mbgl::style::CustomLayerInitializeFunction>(jni::GetField<jlong>(*env, customLayer, *customLayerInitializeFunctionId)), - reinterpret_cast<mbgl::style::CustomLayerRenderFunction>(jni::GetField<jlong>(*env, customLayer, *customLayerRenderFunctionId)), - reinterpret_cast<mbgl::style::CustomLayerDeinitializeFunction>(jni::GetField<jlong>(*env, customLayer, *customLayerDeinitializeFunctionId)), - reinterpret_cast<void*>(jni::GetField<jlong>(*env, customLayer, *customLayerContextId))), - before ? mbgl::optional<std::string>(std_string_from_jstring(env, before)) : mbgl::optional<std::string>()); -} - -void nativeRemoveCustomLayer(JNIEnv *env, jni::jobject* obj, jlong nativeMapViewPtr, jni::jstring* id) { - mbgl::Log::Debug(mbgl::Event::JNI, "nativeRemoveCustomLayer"); - assert(nativeMapViewPtr != 0); - NativeMapView *nativeMapView = reinterpret_cast<NativeMapView *>(nativeMapViewPtr); - nativeMapView->getMap().removeLayer(std_string_from_jstring(env, id)); -} - jni::jobject* nativeGetLayer(JNIEnv *env, jni::jobject* obj, jlong nativeMapViewPtr, jni::jstring* layerId) { mbgl::Log::Debug(mbgl::Event::JNI, "nativeGetLayer"); @@ -1693,14 +1665,6 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) { rectFTopId = &jni::GetFieldID(env, *rectFClass, "top", "F"); rectFBottomId = &jni::GetFieldID(env, *rectFClass, "bottom", "F"); - customLayerClass = &jni::FindClass(env, "com/mapbox/mapboxsdk/layers/CustomLayer"); - customLayerClass = jni::NewGlobalRef(env, customLayerClass).release(); - customLayerIdId = &jni::GetFieldID(env, *customLayerClass, "mID", "Ljava/lang/String;"); - customLayerContextId = &jni::GetFieldID(env, *customLayerClass, "mContext", "J"); - customLayerInitializeFunctionId = &jni::GetFieldID(env, *customLayerClass, "mInitializeFunction", "J"); - customLayerRenderFunctionId = &jni::GetFieldID(env, *customLayerClass, "mRenderFunction", "J"); - customLayerDeinitializeFunctionId = &jni::GetFieldID(env, *customLayerClass, "mDeinitializeFunction", "J"); - jni::jclass& nativeMapViewClass = jni::FindClass(env, "com/mapbox/mapboxsdk/maps/NativeMapView"); onInvalidateId = &jni::GetMethodID(env, nativeMapViewClass, "onInvalidate", "()V"); @@ -1779,8 +1743,6 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) { MAKE_NATIVE_METHOD(nativeJumpTo, "(JDDDDD)V"), MAKE_NATIVE_METHOD(nativeEaseTo, "(JDDDJDDZ)V"), MAKE_NATIVE_METHOD(nativeFlyTo, "(JDDDJDD)V"), - MAKE_NATIVE_METHOD(nativeAddCustomLayer, "(JLcom/mapbox/mapboxsdk/layers/CustomLayer;Ljava/lang/String;)V"), - MAKE_NATIVE_METHOD(nativeRemoveCustomLayer, "(JLjava/lang/String;)V"), MAKE_NATIVE_METHOD(nativeGetLayer, "(JLjava/lang/String;)Lcom/mapbox/mapboxsdk/style/layers/Layer;"), MAKE_NATIVE_METHOD(nativeAddLayer, "(JJLjava/lang/String;)V"), MAKE_NATIVE_METHOD(nativeRemoveLayer, "(JLjava/lang/String;)V"), |