pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] fix not a feature assert in debug mode.

Browse source
This commit is contained in:
Arsentiy Milchakov 2018-02-20 13:12:31 +03:00 • committed by Aleksandr Zatsepin
parent 101a50ff73
commit ef9cf2faba
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
android/jni/com/mapswithme/maps/SearchEngine.cpp
View file

@ -309,6 +309,8 @@ private:
bool m_initialized = false;
} g_bookingAvailabilityParamsBuilder;
FeatureID const kEmptyFeatureId;
// This cache is needed only for showing a specific result on the map after click on the list item.
// Don't use it with another intentions!
Results g_results;
@ -372,7 +374,10 @@ jobject ToJavaResult(Result & result, search::ProductInfo const & productInfo, b
return ret;
}
jni::TScopedLocalRef featureId(env, usermark_helper::CreateFeatureId(env, result.GetFeatureID()));
auto const isFeature = result.GetResultType() == Result::Type::Feature;
jni::TScopedLocalRef featureId(env, usermark_helper::CreateFeatureId(env, isFeature ?
result.GetFeatureID() :
kEmptyFeatureId));
jni::TScopedLocalRef featureType(env, jni::ToJavaString(env, result.GetFeatureTypeName()));
jni::TScopedLocalRef address(env, jni::ToJavaString(env, result.GetAddress()));
jni::TScopedLocalRef dist(env, jni::ToJavaString(env, distance));