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

[android] Process MWMs without search index for this last release. Actually, this routine is obsolete for a long time ago.

Browse source
This commit is contained in:
vng 2015-07-23 15:24:34 +03:00 • committed by Alex Zolotarev
parent 2255412064
commit 0115223450
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,6 @@
#include "../platform/Platform.hpp"
#include "map/framework.hpp"
#include "map/information_display.hpp"
#include "map/user_mark.hpp"
@ -30,8 +29,7 @@
#include "platform/measurement_utils.hpp"
#include "platform/platform.hpp"
#include "platform/preferred_languages.hpp"
#include "storage/storage_defines.hpp"
#include "platform/settings.hpp"
#include "base/math.hpp"
#include "base/logging.hpp"
@ -559,6 +557,11 @@ namespace android
void Framework::GetMapsWithoutSearch(vector<string> & out) const
{
// Actually, this routing is obsolete and comes from ancient times
// when mwm was without search index.
if (!Settings::IsFirstLaunchForDate(150101))
return;
ASSERT(out.empty(), ());
::Platform const & pl = GetPlatform();

20
android/jni/com/mapswithme/maps/Framework.hpp
View file

@ -2,22 +2,22 @@
#include <jni.h>
#include "../../../../../map/framework.hpp"
#include "map/framework.hpp"
#include "../../../../../search/result.hpp"
#include "search/result.hpp"
#include "../../../../../platform/country_defines.hpp"
#include "platform/country_defines.hpp"
#include "../../../../../geometry/avg_vector.hpp"
#include "geometry/avg_vector.hpp"
#include "../../../../../base/deferred_task.hpp"
#include "../../../../../base/strings_bundle.hpp"
#include "../../../../../base/timer.hpp"
#include "base/deferred_task.hpp"
#include "base/timer.hpp"
#include "../../../../../indexer/map_style.hpp"
#include "indexer/map_style.hpp"
#include "../../../../../std/shared_ptr.hpp"
#include "../../../../../std/map.hpp"
#include "std/map.hpp"
#include "std/shared_ptr.hpp"
#include "std/unique_ptr.hpp"
#include "../../../nv_event/nv_event.hpp"