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

Review fixes.

Browse source
This commit is contained in:
Maxim Pimenov 2017-08-29 20:38:37 +03:00 • committed by Vladimir Byko-Ianko
parent 193087b986
commit c99175f05c
5 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -508,6 +508,15 @@ extern "C"
});
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_search_SearchEngine_nativeCancelAllSearches(JNIEnv * env, jclass clazz)
{
GetPlatform().RunOnGuiThread([]()
{
g_framework->NativeFramework()->CancelAllSearches();
});
}
JNIEXPORT jobjectArray JNICALL
Java_com_mapswithme_maps_search_SearchEngine_nativeGetHotelTypes(JNIEnv * env, jclass clazz)
{

2
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -461,7 +461,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
args.putBoolean(DownloaderActivity.EXTRA_OPEN_DOWNLOADED, openDownloaded);
if (mIsFragmentContainer)
{
SearchEngine.cancelInteractiveSearch();
SearchEngine.cancelAllSearches();
mSearchController.refreshToolbar();
replaceFragment(MapManager.nativeIsLegacyMode() ? MigrationFragment.class : DownloaderFragment.class, args, null);
}

8
android/src/com/mapswithme/maps/search/SearchEngine.java
View file

@ -156,6 +156,12 @@ public enum SearchEngine implements NativeSearchListener,
nativeCancelEverywhereSearch();
}
public static void cancelAllSearches()
{
sSavedQuery = "";
nativeCancelAllSearches();
}
public static void showResult(int index)
{
sSavedQuery = "";
@ -191,6 +197,8 @@ public enum SearchEngine implements NativeSearchListener,
public static native void nativeCancelEverywhereSearch();
public static native void nativeCancelAllSearches();
/**
* @return all existing hotel types
*/

2
android/src/com/mapswithme/maps/search/SearchFragment.java
View file

@ -534,7 +534,7 @@ public class SearchFragment extends BaseMwmFragment
private void stopSearch()
{
SearchEngine.cancelApiCall();
SearchEngine.cancelInteractiveSearch();
SearchEngine.cancelAllSearches();
onSearchEnd();
}

3
search/geocoder.cpp
View file

@ -43,6 +43,7 @@
#include "std/algorithm.hpp"
#include "std/bind.hpp"
#include "std/iterator.hpp"
#include "std/random.hpp"
#include "std/sstream.hpp"
#include "std/transform_iterator.hpp"
#include "std/unique_ptr.hpp"
@ -321,7 +322,7 @@ CBV DecimateCianResults(CBV const & cbv)
// Leaving only a fraction of them does not seem
// to worsen the percieved result.
size_t const kMaxCianResults = 10000;
static minstd_rand rng;
minstd_rand rng(0);
auto survivedIds = base::RandomSample(cbv.PopCount(), kMaxCianResults, rng);
sort(survivedIds.begin(), survivedIds.end());
auto it = survivedIds.begin();