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

[android] Removed akward/redundant showing search results from the local cache

Browse source
This commit is contained in:
Александр Зацепин 2018-01-12 14:07:18 +03:00 • committed by Roman Kuznetsov
parent 50430decdd
commit 0939e31a98
4 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -305,10 +305,8 @@ private:
bool m_initialized = false;
} g_bookingAvailabilityParamsBuilder;
// TODO yunitsky
// Do not cache search results here, after new search will be implemented.
// Currently we cannot serialize FeatureID of search result properly.
// Cache is needed to show results on the map after click in the list of results.
// 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;
// Timestamp of last search query. Results with older stamps are ignored.
@ -581,12 +579,6 @@ extern "C"
g_framework->NativeFramework()->ShowSearchResult(g_results[index]);
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_search_SearchEngine_nativeShowAllResults(JNIEnv * env, jclass clazz)
{
g_framework->NativeFramework()->ShowSearchResults(g_results);
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_search_SearchEngine_nativeCancelInteractiveSearch(JNIEnv * env, jclass clazz)
{

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

@ -593,7 +593,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
false /* isMapAndTable */,
mFilterController != null ? mFilterController.getFilter() : null,
mFilterController != null ? mFilterController.getBookingFilterParams() : null);
SearchEngine.showAllResults(mSearchController.getQuery());
SearchEngine.setQuery(mSearchController.getQuery());
}
private void initPositionChooser()

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

@ -1,6 +1,7 @@
package com.mapswithme.maps.search;
import java.io.UnsupportedEncodingException;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.api.ParsedMwmRequest;
@ -9,8 +10,7 @@ import com.mapswithme.util.Language;
import com.mapswithme.util.Listeners;
import com.mapswithme.util.concurrency.UiThread;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import java.io.UnsupportedEncodingException;
public enum SearchEngine implements NativeSearchListener,
NativeMapSearchListener,
@ -19,6 +19,7 @@ public enum SearchEngine implements NativeSearchListener,
INSTANCE;
// Query, which results are shown on the map.
@Nullable
private static String sSavedQuery;
@Override
@ -145,6 +146,12 @@ public enum SearchEngine implements NativeSearchListener,
} catch (UnsupportedEncodingException ignored) { }
}
public static void setQuery(@Nullable String query)
{
sSavedQuery = query;
}
@Nullable
public static String getQuery()
{
return sSavedQuery;
@ -181,12 +188,6 @@ public enum SearchEngine implements NativeSearchListener,
nativeShowResult(index);
}
public static void showAllResults(String query)
{
sSavedQuery = query;
nativeShowAllResults();
}
/**
* @param bytes utf-8 formatted bytes of query.
*/
@ -209,8 +210,6 @@ public enum SearchEngine implements NativeSearchListener,
private static native void nativeShowResult(int index);
private static native void nativeShowAllResults();
public static native void nativeCancelInteractiveSearch();
public static native void nativeCancelEverywhereSearch();

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

@ -591,7 +591,7 @@ public class SearchFragment extends BaseMwmFragment
? mInitialLocale : com.mapswithme.util.Language.getKeyboardLocale(),
mLastQueryTimestamp, false /* isMapAndTable */,
hotelsFilter, bookingFilterParams);
SearchEngine.showAllResults(query);
SearchEngine.setQuery(query);
Utils.navigateToParent(getActivity());
Statistics.INSTANCE.trackEvent(Statistics.EventName.SEARCH_ON_MAP_CLICKED);