kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] Fixed route type selection for poi when transit mode enabled, opt click inner classes, replaced on lambdas

Browse source
This commit is contained in:
Dmitry Donskoy 2018-06-29 17:25:30 +03:00 • committed by Aleksandr Zatsepin
parent 00bfc7b3cb
commit 1024b8fbdb
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/jni/com/mapswithme/maps/TrafficState.cpp
View file

@ -13,35 +13,35 @@ static void TrafficStateChanged(TrafficManager::TrafficState state, std::shared_
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_traffic_TrafficState_nativeSetListener(JNIEnv * env, jclass clazz, jobject listener)
Java_com_mapswithme_maps_maplayer_traffic_TrafficState_nativeSetListener(JNIEnv * env, jclass clazz, jobject listener)
{
CHECK(g_framework, ("Framework isn't created yet!"));
g_framework->SetTrafficStateListener(std::bind(&TrafficStateChanged, std::placeholders::_1, jni::make_global_ref(listener)));
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_traffic_TrafficState_nativeRemoveListener(JNIEnv * env, jclass clazz)
Java_com_mapswithme_maps_maplayer_traffic_TrafficState_nativeRemoveListener(JNIEnv * env, jclass clazz)
{
CHECK(g_framework, ("Framework isn't created yet!"));
g_framework->SetTrafficStateListener(TrafficManager::TrafficStateChangedFn());
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_traffic_TrafficState_nativeEnable(JNIEnv * env, jclass clazz)
Java_com_mapswithme_maps_maplayer_traffic_TrafficState_nativeEnable(JNIEnv * env, jclass clazz)
{
CHECK(g_framework, ("Framework isn't created yet!"));
g_framework->EnableTraffic();
}
JNIEXPORT jboolean JNICALL
Java_com_mapswithme_maps_traffic_TrafficState_nativeIsEnabled(JNIEnv * env, jclass clazz)
Java_com_mapswithme_maps_maplayer_traffic_TrafficState_nativeIsEnabled(JNIEnv * env, jclass clazz)
{
CHECK(g_framework, ("Framework isn't created yet!"));
return static_cast<jboolean>(g_framework->IsTrafficEnabled());
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_traffic_TrafficState_nativeDisable(JNIEnv * env, jclass clazz)
Java_com_mapswithme_maps_maplayer_traffic_TrafficState_nativeDisable(JNIEnv * env, jclass clazz)
{
CHECK(g_framework, ("Framework isn't created yet!"));
g_framework->DisableTraffic();

4
android/jni/com/mapswithme/maps/subway/SubwayManager.cpp
View file

@ -15,7 +15,7 @@ static void TransitSchemeStateChanged(TransitReadManager::TransitSchemeState sta
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_subway_SubwayManager_nativeAddListener(JNIEnv *env, jclass clazz, jobject listener)
Java_com_mapswithme_maps_maplayer_subway_SubwayManager_nativeAddListener(JNIEnv *env, jclass clazz, jobject listener)
{
CHECK(g_framework, ("Framework isn't created yet!"));
g_framework->SetTransitSchemeListener(std::bind(&TransitSchemeStateChanged,
@ -24,7 +24,7 @@ Java_com_mapswithme_maps_subway_SubwayManager_nativeAddListener(JNIEnv *env, jcl
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_subway_SubwayManager_nativeRemoveListener(JNIEnv * env, jclass clazz)
Java_com_mapswithme_maps_maplayer_subway_SubwayManager_nativeRemoveListener(JNIEnv * env, jclass clazz)
{
CHECK(g_framework, ("Framework isn't created yet!"));
g_framework->SetTransitSchemeListener(TransitReadManager::TransitStateChangedFn());