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

review fixes

Browse source
This commit is contained in:
ExMix 2014-10-05 08:24:40 +03:00 • committed by Alex Zolotarev
parent 4a32bc33e6
commit 8e7b437136
9 changed files with 88 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,8 +32,6 @@
#include "../../../../../base/math.hpp"
#include "../../../../../base/logging.hpp"
using storage::TStatus;
namespace
{
const unsigned LONG_TOUCH_MS = 1000;
@ -43,6 +41,7 @@ const double DOUBLE_TOUCH_S = SHORT_TOUCH_MS / 1000.0;
android::Framework * g_framework = 0;
using namespace storage;
namespace android
{
@ -175,7 +174,7 @@ namespace android
return true;
}
storage::Storage & Framework::Storage()
Storage & Framework::Storage()
{
return m_work.Storage();
}
@ -185,7 +184,7 @@ namespace android
return m_work.GetCountryStatusDisplay();
}
void Framework::ShowCountry(storage::TIndex const & idx, bool zoomToDownloadButton)
void Framework::ShowCountry(TIndex const & idx, bool zoomToDownloadButton)
{
m_doLoadState = false;
@ -200,14 +199,14 @@ namespace android
m_work.ShowCountry(idx);
}
storage::TStatus Framework::GetCountryStatus(storage::TIndex const & idx) const
TStatus Framework::GetCountryStatus(TIndex const & idx) const
{
return m_work.GetCountryStatus(idx);
}
void Framework::DeleteCountry(storage::TIndex const & idx)
void Framework::DeleteCountry(TIndex const & idx)
{
m_work.DeleteCountry(idx, storage::TMapOptions::EMapOnly);
m_work.DeleteCountry(idx, TMapOptions::EMapWithCarRouting);
}
void Framework::Resize(int w, int h)
@ -540,7 +539,7 @@ namespace android
}
}
storage::TIndex Framework::GetCountryIndex(double lat, double lon) const
TIndex Framework::GetCountryIndex(double lat, double lon) const
{
return m_work.GetCountryIndex(MercatorBounds::FromLatLon(lat, lon));
}
@ -552,8 +551,6 @@ namespace android
string Framework::GetCountryNameIfAbsent(m2::PointD const & pt) const
{
using namespace storage;
TIndex const idx = m_work.GetCountryIndex(pt);
TStatus const status = m_work.GetCountryStatus(idx);
if (status != TStatus::EOnDisk && status != TStatus::EOnDiskOutOfDate)
@ -632,7 +629,7 @@ namespace android
string Framework::GetOutdatedCountriesString()
{
vector<storage::Country const *> countries;
vector<Country const *> countries;
Storage().GetOutdatedCountries(countries);
string res;
@ -954,7 +951,7 @@ extern "C"
Java_com_mapswithme_maps_Framework_getGuideInfoForIndex(JNIEnv * env, jclass clazz, jobject index)
{
guides::GuideInfo info;
if (g_framework->NativeFramework()->GetGuideInfo(storage::ToNative(index), info))
if (g_framework->NativeFramework()->GetGuideInfo(ToNative(index), info))
return GuideNative2Java(env).GetGuide(info);
return NULL;
@ -1206,11 +1203,11 @@ extern "C"
Java_com_mapswithme_maps_Framework_nativeGetCountryIndex(JNIEnv * env, jobject thiz,
jdouble lat, jdouble lon)
{
storage::TIndex const idx = g_framework->GetCountryIndex(lat, lon);
TIndex const idx = g_framework->GetCountryIndex(lat, lon);
// Return 0 if no any country.
if (idx.IsValid())
return storage::ToJava(idx);
return ToJava(idx);
else
return 0;
}
@ -1218,6 +1215,6 @@ extern "C"
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_Framework_nativeShowCountry(JNIEnv * env, jobject thiz, jobject idx, jboolean zoomToDownloadButton)
{
g_framework->ShowCountry(storage::ToNative(idx), (bool) zoomToDownloadButton);
g_framework->ShowCountry(ToNative(idx), (bool) zoomToDownloadButton);
}
}

27
android/jni/com/mapswithme/maps/MapStorage.cpp
View file

@ -3,6 +3,8 @@
#include "../../../../../coding/internal/file_data.hpp"
using namespace storage;
extern "C"
{
class IndexBinding
@ -41,12 +43,17 @@ extern "C"
return jni::GetEnv()->GetIntField(object(), m_regionID);
}
storage::TIndex const toNative() const
TIndex const toNative() const
{
return storage::TIndex(group(), country(), region());
return TIndex(group(), country(), region());
}
};
::Framework * frm()
{
return g_framework->NativeFramework();
}
JNIEXPORT jint JNICALL
Java_com_mapswithme_maps_MapStorage_countriesCount(JNIEnv * env, jobject thiz, jobject idx)
{
@ -88,13 +95,13 @@ extern "C"
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_MapStorage_downloadCountry(JNIEnv * env, jobject thiz, jobject idx)
{
g_framework->NativeFramework()->DownloadCountry(IndexBinding(idx).toNative(), storage::TMapOptions::EMapOnly);
frm()->DownloadCountry(IndexBinding(idx).toNative(), TMapOptions::EMapOnly);
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_MapStorage_deleteCountry(JNIEnv * env, jobject thiz, jobject idx)
{
g_framework->NativeFramework()->DeleteCountry(IndexBinding(idx).toNative(), storage::TMapOptions::EMapOnly);
g_framework->DeleteCountry(IndexBinding(idx).toNative());
}
JNIEXPORT jobject JNICALL
@ -104,22 +111,22 @@ extern "C"
if (s == 0)
return 0;
storage::TIndex const idx = g_framework->Storage().FindIndexByFile(s);
TIndex const idx = g_framework->Storage().FindIndexByFile(s);
if (idx.IsValid())
return storage::ToJava(idx);
return ToJava(idx);
else
return 0;
}
void ReportChangeCountryStatus(shared_ptr<jobject> const & obj, storage::TIndex const & idx)
void ReportChangeCountryStatus(shared_ptr<jobject> const & obj, TIndex const & idx)
{
JNIEnv * env = jni::GetEnv();
jmethodID methodID = jni::GetJavaMethodID(env, *obj.get(), "onCountryStatusChanged", "(Lcom/mapswithme/maps/MapStorage$Index;)V");
env->CallVoidMethod(*obj.get(), methodID, storage::ToJava(idx));
env->CallVoidMethod(*obj.get(), methodID, ToJava(idx));
}
void ReportCountryProgress(shared_ptr<jobject> const & obj, storage::TIndex const & idx, pair<int64_t, int64_t> const & p)
void ReportCountryProgress(shared_ptr<jobject> const & obj, TIndex const & idx, pair<int64_t, int64_t> const & p)
{
jlong const current = p.first;
jlong const total = p.second;
@ -127,7 +134,7 @@ extern "C"
JNIEnv * env = jni::GetEnv();
jmethodID methodID = jni::GetJavaMethodID(env, *obj.get(), "onCountryProgress", "(Lcom/mapswithme/maps/MapStorage$Index;JJ)V");
env->CallVoidMethod(*obj.get(), methodID, storage::ToJava(idx), current, total);
env->CallVoidMethod(*obj.get(), methodID, ToJava(idx), current, total);
}
JNIEXPORT jint JNICALL

2
iphone/Maps/Classes/LocalNotificationManager.mm
View file

@ -118,7 +118,7 @@ typedef void (^CompletionHandler)(UIBackgroundFetchResult);
{
//TODO: zoom in to country correctly to show download progress
Framework & f = GetFramework();
f.DownloadCountry(index, storage::TMapOptions::EMapOnly);
f.DownloadCountry(index, TMapOptions::EMapOnly);
m2::RectD const rect = f.GetCountryBounds(index);
double const lon = MercatorBounds::XToLon(rect.Center().x);
double const lat = MercatorBounds::YToLat(rect.Center().y);

17
iphone/Maps/Settings/CountriesViewController.mm
View file

@ -58,7 +58,7 @@ static bool IsOurIndex(TIndex const & theirs, TIndex const & ours)
return ours == theirsFixed;
}
static bool getGuideName(string & name, storage::TIndex const & index)
static bool getGuideName(string & name, TIndex const & index)
{
guides::GuideInfo info;
Framework & f = GetFramework();
@ -166,7 +166,7 @@ static bool getGuideName(string & name, storage::TIndex const & index)
// do not show status for parent categories
if (![cell.reuseIdentifier isEqual:@"ParentCell"])
{
storage::TStatus const st = frm.GetCountryStatus(countryIndex);
TStatus const st = frm.GetCountryStatus(countryIndex);
switch (st)
{
case TStatus::EOnDisk:
@ -205,8 +205,9 @@ static bool getGuideName(string & name, storage::TIndex const & index)
break;
}
case TStatus::EDownloadFailed:
case TStatus::EOutOfMemFailed:
/// @TODO show specific message for EOutOfMemFailed
case TStatus::EDownloadFailed:
cell.textLabel.textColor = [UIColor redColor];
cell.detailTextLabel.text = NSLocalizedString(@"download_has_failed", nil);
break;
@ -236,7 +237,7 @@ static bool getGuideName(string & name, storage::TIndex const & index)
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
TIndex index = CalculateIndex(m_index, indexPath);
storage::Storage & s = GetFramework().Storage();
Storage & s = GetFramework().Storage();
bool const hasChildren = s.CountriesCount(index) != 0;
NSString * cellId = hasChildren ? @"ParentCell" : @"DetailCell";
@ -291,7 +292,7 @@ static bool getGuideName(string & name, storage::TIndex const & index)
[self TryDownloadCountry];
else if ([title isEqualToString:NSLocalizedString(@"cancel_download", nil)] || [title isEqualToString:NSLocalizedString(@"delete", nil)])
{
f.DeleteCountry(m_clickedIndex, storage::TMapOptions::EMapOnly);
f.DeleteCountry(m_clickedIndex, TMapOptions::EMapWithCarRouting);
m_clickedCell.accessoryType = UITableViewCellAccessoryNone;
}
else
@ -301,7 +302,7 @@ static bool getGuideName(string & name, storage::TIndex const & index)
- (void)DoDownloadCountry
{
GetFramework().DownloadCountry(m_clickedIndex, storage::TMapOptions::EMapOnly);
GetFramework().DownloadCountry(m_clickedIndex, TMapOptions::EMapOnly);
}
// 3G warning confirmation handler
@ -409,7 +410,7 @@ static bool getGuideName(string & name, storage::TIndex const & index)
m_clickedIndex = CalculateIndex(m_index, indexPath);
m_countryStatus = frm.GetCountryStatus(m_clickedIndex);
m_clickedCell = cell;
storage::Storage & s = GetFramework().Storage();
Storage & s = GetFramework().Storage();
m_downloadSize = s.CountrySizeInBytes(m_clickedIndex).second;
NSMutableArray * buttonNames = [[NSMutableArray alloc] init];
@ -455,7 +456,7 @@ static bool getGuideName(string & name, storage::TIndex const & index)
case TStatus::EInQueue:
{
frm.DeleteCountry(m_clickedIndex, storage::TMapOptions::EMapOnly);
frm.DeleteCountry(m_clickedIndex, TMapOptions::EMapOnly);
return;
}

2
map/active_maps_layout.hpp
View file

@ -36,7 +36,7 @@ public:
storage::TMapOptions GetCountryOptions(TGroup const & group, int position) const;
/// set to nullptr when go out from ActiveMaps activity
void SetActiveMapsListener(ActiveMapsListener * listener);
void SetListener(ActiveMapsListener * listener);
void ChangeCountryOptions(TGroup const & group, int position, storage::TMapOptions const & options);
void ResumeDownloading(TGroup const & group, int position);

3
map/country_status_display.cpp
View file

@ -14,8 +14,7 @@
#include "../std/bind.hpp"
#include "../std/sstream.hpp"
using storage::TStatus;
using storage::TIndex;
using namespace storage;
CountryStatusDisplay::Params::Params()
: m_storage(0)

55
map/country_tree.cpp
View file

@ -42,21 +42,8 @@ inline TIndex GetIndexParent(TIndex const & index)
CountryTree::CountryTree(Framework * framework)
: m_framework(framework)
{
auto statusChangedFn = [this](TIndex const & index)
{
int childPosition = GetChildPosition(index);
if (childPosition != -1)
m_itemCallback(childPosition);
};
auto progressChangedFn = [this](TIndex const & index, LocalAndRemoteSizeT const & progress)
{
int childPosition = GetChildPosition(index);
if (childPosition != -1)
m_progressCallback(childPosition, progress);
};
m_subscribeSlotID = m_framework->Storage().Subscribe(statusChangedFn, progressChangedFn);
m_subscribeSlotID = m_framework->Storage().Subscribe(bind(&CountryTree::NotifyStatusChanged, this, _1),
bind(&CountryTree::NotifyProgressChanged, this, _1, _2));
}
CountryTree::~CountryTree()
@ -147,14 +134,14 @@ void CountryTree::CancelDownloading(int childPosition)
m_framework->Storage().DeleteFromDownloader(GetChild(childPosition));
}
void CountryTree::SetItemChangedListener(TItemChangedFn const & callback)
void CountryTree::SetListener(CountryTreeListener * listener)
{
m_itemCallback = callback;
m_listener = listener;
}
void CountryTree::SetItemProgressListener(TItemProgressChangedFn const & callback)
void CountryTree::ResetListener()
{
m_progressCallback = callback;
m_listener = nullptr;
}
TIndex const & CountryTree::GetCurrentRoot() const
@ -180,17 +167,35 @@ TIndex const & CountryTree::GetChild(int childPosition) const
return m_levelItems[ChildItemsOffset + childPosition];
}
int CountryTree::GetChildPosition(const TIndex & index)
int CountryTree::GetChildPosition(TIndex const & index)
{
int result = -1;
if (HasRoot())
{
for (size_t i = ChildItemsOffset; i < m_levelItems.size(); ++i)
{
if (m_levelItems[i] == index)
result = i;
}
auto iter = find(m_levelItems.begin(), m_levelItems.end(), index);
if (iter != m_levelItems.end())
result = distance(m_levelItems.begin(), iter) - ChildItemsOffset - 1;
}
return result;
}
void CountryTree::NotifyStatusChanged(TIndex const & index)
{
if (m_listener != nullptr)
{
int position = GetChildPosition(index);
if (position != -1)
m_listener->ItemStatusChanged(position);
}
}
void CountryTree::NotifyProgressChanged(TIndex const & index, LocalAndRemoteSizeT const & sizes)
{
if (m_listener != nullptr)
{
int position = GetChildPosition(index);
if (position != -1)
m_listener->ItemProgressChanged(position, sizes);
}
}

23
map/country_tree.hpp
View file

@ -15,6 +15,13 @@ class Framework;
class CountryTree
{
public:
class CountryTreeListener
{
public:
virtual void ItemStatusChanged(int childPosition) = 0;
virtual void ItemProgressChanged(int childPosition, storage::LocalAndRemoteSizeT const & sizes) = 0;
};
CountryTree(Framework * framework);
~CountryTree();
@ -41,14 +48,8 @@ public:
///@}
void CancelDownloading(int childPosition);
/// int - child position for current root
typedef function<void (int)> TItemChangedFn;
void SetItemChangedListener(TItemChangedFn const & callback);
/// int - child position for current root
/// LocalAndRemoteSizeT - progress change info
typedef function<void (int, storage::LocalAndRemoteSizeT const &)> TItemProgressChangedFn;
void SetItemProgressListener(TItemProgressChangedFn const & callback);
void SetListener(CountryTreeListener * listener);
void ResetListener();
private:
storage::TIndex const & GetCurrentRoot() const;
@ -56,6 +57,9 @@ private:
storage::TIndex const & GetChild(int childPosition) const;
int GetChildPosition(storage::TIndex const & index);
void NotifyStatusChanged(storage::TIndex const & index);
void NotifyProgressChanged(storage::TIndex const & index, storage::LocalAndRemoteSizeT const & sizes);
private:
Framework * m_framework = nullptr;
int m_subscribeSlotID = 0;
@ -63,6 +67,5 @@ private:
buffer_vector<storage::TIndex, 16> m_levelItems;
TItemChangedFn m_itemCallback;
TItemProgressChangedFn m_progressCallback;
CountryTreeListener * m_listener = nullptr;
};

9
storage/storage_defines.hpp
View file

@ -6,7 +6,7 @@
namespace storage
{
/// Used in GUI
enum class TStatus : int
enum class TStatus : uint8_t
{
EOnDisk = 0,
ENotDownloaded,
@ -15,10 +15,10 @@ namespace storage
EInQueue,
EUnknown,
EOnDiskOutOfDate,
EOutOfMemFailed // EDownloadFailed because not enougth memory
EOutOfMemFailed // EDownloadFailed because not enough memory
};
enum class TMapOptions : int
enum class TMapOptions : uint8_t
{
EMapOnly = 0x1,
ECarRouting = 0x2,
@ -32,8 +32,7 @@ namespace storage
inline TMapOptions & operator |= (TMapOptions & lhs, TMapOptions rhs)
{
lhs = static_cast<TMapOptions>(static_cast<int>(lhs) | static_cast<int>(rhs));
return lhs;
return lhs = static_cast<TMapOptions>(static_cast<int>(lhs) | static_cast<int>(rhs));
}
inline bool operator & (TMapOptions const & testedFlags, TMapOptions const & match)