diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index fba0c89bb8..6125b535b9 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -27,9 +27,12 @@ #include "../../../../../platform/location.hpp" #include "../../../../../platform/preferred_languages.hpp" +#include "../../../../../storage/storage_defines.hpp" + #include "../../../../../base/math.hpp" #include "../../../../../base/logging.hpp" +using storage::TStatus; namespace { @@ -204,7 +207,7 @@ namespace android void Framework::DeleteCountry(storage::TIndex const & idx) { - m_work.DeleteCountry(idx); + m_work.DeleteCountry(idx, storage::TMapOptions::EMapOnly); } void Framework::Resize(int w, int h) @@ -553,7 +556,7 @@ namespace android TIndex const idx = m_work.GetCountryIndex(pt); TStatus const status = m_work.GetCountryStatus(idx); - if (status != EOnDisk && status != EOnDiskOutOfDate) + if (status != TStatus::EOnDisk && status != TStatus::EOnDiskOutOfDate) return m_work.GetCountryName(idx); else return string(); diff --git a/android/jni/com/mapswithme/maps/MapStorage.cpp b/android/jni/com/mapswithme/maps/MapStorage.cpp index cd39d25624..4032fec6cc 100644 --- a/android/jni/com/mapswithme/maps/MapStorage.cpp +++ b/android/jni/com/mapswithme/maps/MapStorage.cpp @@ -88,13 +88,13 @@ extern "C" JNIEXPORT void JNICALL Java_com_mapswithme_maps_MapStorage_downloadCountry(JNIEnv * env, jobject thiz, jobject idx) { - g_framework->Storage().DownloadCountry(IndexBinding(idx).toNative()); + g_framework->NativeFramework()->DownloadCountry(IndexBinding(idx).toNative(), storage::TMapOptions::EMapOnly); } JNIEXPORT void JNICALL Java_com_mapswithme_maps_MapStorage_deleteCountry(JNIEnv * env, jobject thiz, jobject idx) { - g_framework->DeleteCountry(IndexBinding(idx).toNative()); + g_framework->NativeFramework()->DeleteCountry(IndexBinding(idx).toNative(), storage::TMapOptions::EMapOnly); } JNIEXPORT jobject JNICALL diff --git a/iphone/Maps/Classes/LocalNotificationManager.mm b/iphone/Maps/Classes/LocalNotificationManager.mm index cef0c5efcc..0adab0f5b0 100644 --- a/iphone/Maps/Classes/LocalNotificationManager.mm +++ b/iphone/Maps/Classes/LocalNotificationManager.mm @@ -8,6 +8,8 @@ #import "Statistics.h" #import "UIKitCategories.h" +#include "../../../storage/storage_defines.hpp" + #define DOWNLOAD_MAP_ACTION_NAME @"DownloadMapAction" #define FLAGS_KEY @"DownloadMapNotificationFlags" @@ -52,7 +54,7 @@ typedef void (^CompletionHandler)(UIBackgroundFetchResult); if (index.IsValid() && [self shouldShowNotificationForIndex:index]) { TStatus const status = f.GetCountryStatus(index); - if (status == ENotDownloaded) + if (status == TStatus::ENotDownloaded) { [self markNotificationShowingForIndex:index]; @@ -116,7 +118,7 @@ typedef void (^CompletionHandler)(UIBackgroundFetchResult); { //TODO: zoom in to country correctly to show download progress Framework & f = GetFramework(); - f.Storage().DownloadCountry(index); + f.DownloadCountry(index, storage::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); diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 4da3dc0825..1231ec2ef8 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -17,7 +17,7 @@ #include "Framework.h" -#include "../../../storage/storage.hpp" +#include "../../../storage/storage_defines.hpp" #include "../../../platform/settings.hpp" #include "../../../platform/platform.hpp" @@ -431,7 +431,7 @@ void InitLocalizedStrings() { Framework const & f = GetFramework(); guides::GuideInfo guide; - if (f.GetCountryStatus(index) == storage::EOnDisk && f.GetGuideInfo(index, guide)) + if (f.GetCountryStatus(index) == storage::TStatus::EOnDisk && f.GetGuideInfo(index, guide)) [self ShowNotificationWithGuideInfo:guide]; } diff --git a/iphone/Maps/Settings/CountriesViewController.mm b/iphone/Maps/Settings/CountriesViewController.mm index 8e30210cc2..e1f947cdc3 100644 --- a/iphone/Maps/Settings/CountriesViewController.mm +++ b/iphone/Maps/Settings/CountriesViewController.mm @@ -11,6 +11,8 @@ #include "Framework.h" +#include "../../storage/storage_defines.hpp" + #include "../../platform/platform.hpp" #include "../../platform/preferred_languages.hpp" @@ -22,7 +24,6 @@ using namespace storage; - static TIndex CalculateIndex(TIndex const & parentIndex, NSIndexPath * indexPath) { TIndex index = parentIndex; @@ -110,8 +111,8 @@ static bool getGuideName(string & name, storage::TIndex const & index) TIndex const index = CalculateIndex(m_index, indexPath); Framework & frm = GetFramework(); - storage::TStatus const status = frm.GetCountryStatus(index); - if (status == EOnDisk || status == EOnDiskOutOfDate) + TStatus const status = frm.GetCountryStatus(index); + if (status == TStatus::EOnDisk || status == TStatus::EOnDiskOutOfDate) { frm.ShowCountry(index); [[[MapsAppDelegate theApp] settingsManager] hide]; @@ -168,7 +169,7 @@ static bool getGuideName(string & name, storage::TIndex const & index) storage::TStatus const st = frm.GetCountryStatus(countryIndex); switch (st) { - case EOnDisk: + case TStatus::EOnDisk: cell.textLabel.textColor = [UIColor colorWithRed:0.f/255.f green:161.f/255.f blue:68.f/255.f @@ -179,7 +180,7 @@ static bool getGuideName(string & name, storage::TIndex const & index) cell.accessoryType = [self getZoomIconType]; break; - case EOnDiskOutOfDate: + case TStatus::EOnDiskOutOfDate: cell.textLabel.textColor = [UIColor colorWithRed:1.f green:105.f/255.f blue:180.f/255.f @@ -190,7 +191,7 @@ static bool getGuideName(string & name, storage::TIndex const & index) cell.accessoryType = [self getZoomIconType]; break; - case EDownloading: + case TStatus::EDownloading: { cell.textLabel.textColor = [UIColor colorWithRed:52.f/255.f green:43.f/255.f @@ -204,12 +205,13 @@ static bool getGuideName(string & name, storage::TIndex const & index) break; } - case EDownloadFailed: + case TStatus::EDownloadFailed: + case TStatus::EOutOfMemFailed: cell.textLabel.textColor = [UIColor redColor]; cell.detailTextLabel.text = NSLocalizedString(@"download_has_failed", nil); break; - case EInQueue: + case TStatus::EInQueue: { cell.textLabel.textColor = [UIColor colorWithRed:91.f/255.f green:148.f/255.f @@ -219,12 +221,12 @@ static bool getGuideName(string & name, storage::TIndex const & index) } break; - case ENotDownloaded: + case TStatus::ENotDownloaded: cell.textLabel.textColor = [UIColor blackColor]; cell.detailTextLabel.text = NSLocalizedString(@"touch_to_download", nil); break; - case EUnknown: + case TStatus::EUnknown: break; } } @@ -289,7 +291,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); + f.DeleteCountry(m_clickedIndex, storage::TMapOptions::EMapOnly); m_clickedCell.accessoryType = UITableViewCellAccessoryNone; } else @@ -299,7 +301,7 @@ static bool getGuideName(string & name, storage::TIndex const & index) - (void)DoDownloadCountry { - GetFramework().Storage().DownloadCountry(m_clickedIndex); + GetFramework().DownloadCountry(m_clickedIndex, storage::TMapOptions::EMapOnly); } // 3G warning confirmation handler @@ -416,25 +418,26 @@ static bool getGuideName(string & name, storage::TIndex const & index) switch (m_countryStatus) { - case EOnDisk: + case TStatus::EOnDisk: { canDelete = YES; break; } - case EOnDiskOutOfDate: + case TStatus::EOnDiskOutOfDate: canDelete = YES; [buttonNames addObject:[NSString stringWithFormat:NSLocalizedString(@"update_mb_or_kb", nil), [self GetStringForSize:m_downloadSize]]]; break; - case ENotDownloaded: + case TStatus::ENotDownloaded: [buttonNames addObject:[NSString stringWithFormat:NSLocalizedString(@"download_mb_or_kb", nil), [self GetStringForSize:m_downloadSize]]]; break; - case EDownloadFailed: + case TStatus::EDownloadFailed: + case TStatus::EOutOfMemFailed: [self DoDownloadCountry]; return; - case EDownloading: + case TStatus::EDownloading: { // special one, with destructive button string guideAdevertiseString; @@ -450,9 +453,9 @@ static bool getGuideName(string & name, storage::TIndex const & index) return; } - case EInQueue: + case TStatus::EInQueue: { - frm.DeleteCountry(m_clickedIndex); + frm.DeleteCountry(m_clickedIndex, storage::TMapOptions::EMapOnly); return; } diff --git a/map/country_status_display.cpp b/map/country_status_display.cpp index b758933c01..3389ece33d 100644 --- a/map/country_status_display.cpp +++ b/map/country_status_display.cpp @@ -6,6 +6,7 @@ #include "../graphics/overlay_renderer.hpp" #include "../graphics/display_list.hpp" +#include "../storage/storage_defines.hpp" #include "../platform/platform.hpp" #include "../base/string_format.hpp" @@ -13,6 +14,8 @@ #include "../std/bind.hpp" #include "../std/sstream.hpp" +using storage::TStatus; +using storage::TIndex; CountryStatusDisplay::Params::Params() : m_storage(0) @@ -76,20 +79,20 @@ void CountryStatusDisplay::cache() { switch (m_countryStatus) { - case storage::EInQueue: + case TStatus::EInQueue: { SetStatusMessage("country_status_added_to_queue", &dn); break; } - case storage::EDownloading: + case TStatus::EDownloading: { int const percent = m_countryProgress.first * 100 / m_countryProgress.second; SetStatusMessage("country_status_downloading", &dn, &percent); break; } - case storage::ENotDownloaded: + case TStatus::ENotDownloaded: if (m_notEnoughSpace) SetStatusMessage("not_enough_free_space_on_sdcard"); else @@ -100,7 +103,7 @@ void CountryStatusDisplay::cache() } break; - case storage::EDownloadFailed: + case TStatus::EDownloadFailed: { m_downloadButton->setIsVisible(true); m_downloadButton->setText(m_controller->GetStringsBundle()->GetString("try_again")); @@ -118,7 +121,7 @@ void CountryStatusDisplay::cache() setIsVisible(m_statusMsg->isVisible() || m_downloadButton->isVisible()); } -void CountryStatusDisplay::CountryStatusChanged(storage::TIndex const & idx) +void CountryStatusDisplay::CountryStatusChanged(TIndex const & idx) { if (idx == m_countryIdx) { @@ -129,9 +132,9 @@ void CountryStatusDisplay::CountryStatusChanged(storage::TIndex const & idx) } } -void CountryStatusDisplay::CountryProgress(storage::TIndex const & idx, pair const & progress) +void CountryStatusDisplay::CountryProgress(TIndex const & idx, pair const & progress) { - if ((m_countryIdx == idx) && (m_countryStatus == storage::EDownloading)) + if ((m_countryIdx == idx) && (m_countryStatus == TStatus::EDownloading)) { m_countryProgress = progress; @@ -178,8 +181,8 @@ CountryStatusDisplay::CountryStatusDisplay(Params const & p) setIsVisible(false); - m_countryIdx = storage::TIndex(); - m_countryStatus = storage::EUnknown; + m_countryIdx = TIndex(); + m_countryStatus = TStatus::EUnknown; m_notEnoughSpace = false; } @@ -198,7 +201,7 @@ void CountryStatusDisplay::downloadCountry() invalidate(); } else - m_storage->DownloadCountry(m_countryIdx); + m_storage->DownloadCountry(m_countryIdx, storage::TMapOptions::EMapOnly); } void CountryStatusDisplay::setDownloadListener(gui::Button::TOnClickListener const & l) @@ -217,16 +220,16 @@ void CountryStatusDisplay::UpdateStatusAndProgress() m_countryProgress = m_storage->CountrySizeInBytes(m_countryIdx); m_countryStatus = m_storage->CountryStatus(m_countryIdx); - if (m_countryStatus == EUnknown) + if (m_countryStatus == TStatus::EUnknown) { if (m_countryProgress.first > 0) - m_countryStatus = EOnDisk; + m_countryStatus = TStatus::EOnDisk; else - m_countryStatus = ENotDownloaded; + m_countryStatus = TStatus::ENotDownloaded; } } -void CountryStatusDisplay::setCountryIndex(storage::TIndex const & idx) +void CountryStatusDisplay::setCountryIndex(TIndex const & idx) { if (m_countryIdx != idx) { @@ -279,7 +282,7 @@ void CountryStatusDisplay::setController(gui::Controller * controller) void CountryStatusDisplay::setPivot(m2::PointD const & pv) { - if (m_countryStatus == storage::EDownloadFailed) + if (m_countryStatus == TStatus::EDownloadFailed) { size_t const buttonHeight = m_downloadButton->GetBoundRect().SizeY(); size_t const statusHeight = m_statusMsg->GetBoundRect().SizeY(); diff --git a/map/framework.cpp b/map/framework.cpp index 41781dd1aa..dd98afaca0 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -276,8 +276,13 @@ double Framework::GetVisualScale() const return m_scales.GetVisualScale(); } -void Framework::DeleteCountry(TIndex const & index) +void Framework::DeleteCountry(TIndex const & index, TMapOptions const & options) { + TMapOptions validOptions = options; + if (validOptions & TMapOptions::EMapOnly) + validOptions |= TMapOptions::EMapWithCarRouting; + + ///@TODO for vng. Use validOptions if (!m_storage.DeleteFromDownloader(index)) { string const & file = m_storage.CountryByIndex(index).GetFile().m_fileName; @@ -288,6 +293,17 @@ void Framework::DeleteCountry(TIndex const & index) m_storage.NotifyStatusChanged(index); } +void Framework::DownloadCountry(TIndex const & index, TMapOptions const & options) +{ + TMapOptions validOptions = TMapOptions::EMapOnly | options; + if (validOptions == TMapOptions::EMapOnly || GetPlatform().IsPro()) + m_storage.DownloadCountry(index, options); + else + { + /// @TODO Show BuyProToRouting Dialog + } +} + TStatus Framework::GetCountryStatus(TIndex const & index) const { return m_storage.CountryStatusEx(index); diff --git a/map/framework.hpp b/map/framework.hpp index 9958717c57..3edcd2dff6 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -160,7 +160,10 @@ public: /// @name This functions is used by Downloader UI. //@{ - void DeleteCountry(storage::TIndex const & index); + /// options - flags that signal about parts of map that must be deleted + void DeleteCountry(storage::TIndex const & index, storage::TMapOptions const & options); + /// options - flags that signal about parts of map that must be downloaded + void DownloadCountry(storage::TIndex const & index, storage::TMapOptions const & options); storage::TStatus GetCountryStatus(storage::TIndex const & index) const; string GetCountryName(storage::TIndex const & index) const; diff --git a/qt/update_dialog.cpp b/qt/update_dialog.cpp index 73f1c2c6d7..219a4bca5c 100644 --- a/qt/update_dialog.cpp +++ b/qt/update_dialog.cpp @@ -1,6 +1,8 @@ #include "update_dialog.hpp" #include "info_dialog.hpp" +#include "../storage/storage_defines.hpp" + #include "../platform/settings.hpp" #include "../base/assert.hpp" @@ -131,7 +133,7 @@ namespace qt switch (m_framework.GetCountryStatus(countryIndex)) { - case EOnDiskOutOfDate: + case TStatus::EOnDiskOutOfDate: { // map is already downloaded, so ask user about deleting! QMessageBox ask(this); @@ -148,14 +150,14 @@ namespace qt QAbstractButton * res = ask.clickedButton(); if (res == btns[0]) - st.DownloadCountry(countryIndex); + m_framework.DownloadCountry(countryIndex, storage::TMapOptions::EMapOnly); if (res == btns[1]) - m_framework.DeleteCountry(countryIndex); + m_framework.DeleteCountry(countryIndex, storage::TMapOptions::EMapOnly); } break; - case EOnDisk: + case TStatus::EOnDisk: { // map is already downloaded, so ask user about deleting! QMessageBox ask(this); @@ -165,18 +167,18 @@ namespace qt ask.setDefaultButton(QMessageBox::No); if (ask.exec() == QMessageBox::Yes) - m_framework.DeleteCountry(countryIndex); + m_framework.DeleteCountry(countryIndex, storage::TMapOptions::EMapOnly); } break; - case ENotDownloaded: - case EDownloadFailed: - st.DownloadCountry(countryIndex); + case TStatus::ENotDownloaded: + case TStatus::EDownloadFailed: + m_framework.DownloadCountry(countryIndex, storage::TMapOptions::EMapOnly); break; - case EInQueue: - case EDownloading: - m_framework.DeleteCountry(countryIndex); + case TStatus::EInQueue: + case TStatus::EDownloading: + m_framework.DeleteCountry(countryIndex, storage::TMapOptions::EMapOnly); break; default: @@ -248,37 +250,37 @@ namespace qt Storage const & st = GetStorage(); switch (m_framework.GetCountryStatus(index)) { - case ENotDownloaded: + case TStatus::ENotDownloaded: size = st.CountrySizeInBytes(index); if (size.second > 0) statusString = tr("Click to download"); rowColor = COLOR_NOTDOWNLOADED; break; - case EOnDisk: + case TStatus::EOnDisk: statusString = tr("Installed (click to delete)"); rowColor = COLOR_ONDISK; size = st.CountrySizeInBytes(index); break; - case EOnDiskOutOfDate: + case TStatus::EOnDiskOutOfDate: statusString = tr("Out of date (click to update or delete)"); rowColor = COLOR_OUTOFDATE; size = st.CountrySizeInBytes(index); break; - case EDownloadFailed: + case TStatus::EDownloadFailed: statusString = tr("Download has failed"); rowColor = COLOR_DOWNLOADFAILED; size = st.CountrySizeInBytes(index); break; - case EDownloading: + case TStatus::EDownloading: statusString = tr("Downloading ..."); rowColor = COLOR_INPROGRESS; break; - case EInQueue: + case TStatus::EInQueue: statusString = tr("Marked for download"); rowColor = COLOR_INQUEUE; size = st.CountrySizeInBytes(index); diff --git a/storage/country.hpp b/storage/country.hpp index 7073c883ec..1faa970995 100644 --- a/storage/country.hpp +++ b/storage/country.hpp @@ -1,5 +1,6 @@ #pragma once +#include "storage_defines.hpp" #include "simple_tree.hpp" #include "country_decl.hpp" @@ -34,7 +35,6 @@ namespace storage }; typedef buffer_vector FilesContainerT; - typedef pair LocalAndRemoteSizeT; /// Serves as a proxy between GUI and downloaded files class Country diff --git a/storage/storage.cpp b/storage/storage.cpp index e43632a776..9d605ca37a 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -68,8 +68,6 @@ namespace storage for (size_t j = 0; j < files.size(); ++j) FileWriter::DeleteFileX(dir + files[j]); } - - UpdateDownloadedCountriesState(); } //////////////////////////////////////////////////////////////////////////// @@ -93,73 +91,6 @@ namespace storage } } - TIndex const & Storage::GetDownloadedCountryAt(size_t const & i) const - { - return m_downloadedCountries[i]; - } - - TIndex const & Storage::GetOutOfDateCountryAt(size_t const & i) const - { - return m_outOfDateCountries[i]; - } - - void Storage::UpdateDownloadedCountriesState(TIndex const index) - { - size_t const count = CountriesCount(index); - for (size_t i = 0; i < count; ++i) - { - TIndex indexCopy = index; - if (index.m_group == TIndex::INVALID) - indexCopy.m_group = i; - else if (index.m_country == TIndex::INVALID) - indexCopy.m_country = i; - else - indexCopy.m_region = i; - - UpdateDownloadedCountriesState(indexCopy); - - TStatus const status = CountryStatusEx(indexCopy); - if (status != EUnknown && status != ENotDownloaded) - { - m_downloadedCountries.push_back(indexCopy); - if (status == EOnDiskOutOfDate) - m_outOfDateCountries.push_back(indexCopy); - } - } - } - - void Storage::UpdateDownloadedCountriesState() - { - m_downloadedCountries.clear(); - m_outOfDateCountries.clear(); - - UpdateDownloadedCountriesState(TIndex()); - - auto predicate = [this](TIndex const & l, TIndex const & r) - { - return CountryFileName(l) == CountryFileName(r); - }; - unique(m_downloadedCountries.begin(), m_downloadedCountries.end(), predicate); - unique(m_outOfDateCountries.begin(), m_outOfDateCountries.end(), predicate); - - auto comparator = [this](TIndex const & l, TIndex const & r) - { - return CountryName(l) < CountryName(r); - }; - sort(m_downloadedCountries.begin(), m_downloadedCountries.end(), comparator); - sort(m_outOfDateCountries.begin(), m_outOfDateCountries.end(), comparator); - } - - size_t Storage::GetDownloadedCountriesCount() const - { - return m_downloadedCountries.size(); - } - - size_t Storage::GetOutOfDateCountriesCount() const - { - return m_outOfDateCountries.size(); - } - Country const & Storage::CountryByIndex(TIndex const & index) const { return NodeFromIndex(m_countries, index).Value(); @@ -197,6 +128,12 @@ namespace storage return CountryByIndex(index).Size(); } + LocalAndRemoteSizeT Storage::CountrySizeInBytesEx(const TIndex & index, const TMapOptions & options) const + { + ///@TODO for vng + return CountryByIndex(index).Size(); + } + TStatus Storage::CountryStatus(TIndex const & index) const { // first, check if we already downloading this country or have in in the queue @@ -204,33 +141,33 @@ namespace storage if (found != m_queue.end()) { if (found == m_queue.begin()) - return EDownloading; + return TStatus::EDownloading; else - return EInQueue; + return TStatus::EInQueue; } // second, check if this country has failed while downloading if (m_failedCountries.count(index) > 0) - return EDownloadFailed; + return TStatus::EDownloadFailed; - return EUnknown; + return TStatus::EUnknown; } TStatus Storage::CountryStatusEx(TIndex const & index) const { TStatus res = CountryStatus(index); - if (res == EUnknown) + if (res == TStatus::EUnknown) { Country const & c = CountryByIndex(index); LocalAndRemoteSizeT const size = c.Size(); if (size.first == 0) - return ENotDownloaded; + return TStatus::ENotDownloaded; if (size.second == 0) - return EUnknown; + return TStatus::EUnknown; - res = EOnDisk; + res = TStatus::EOnDisk; if (size.first != size.second) { /// @todo Do better version check, not just size comparison. @@ -242,15 +179,26 @@ namespace storage uint64_t sz = 0; if (!pl.GetFileSizeByFullPath(fName, sz) || sz != size.second) - res = EOnDiskOutOfDate; + res = TStatus::EOnDiskOutOfDate; } } return res; } - void Storage::DownloadCountry(TIndex const & index) + void Storage::CountryStatusEx(TIndex const & index, TStatus & status, TMapOptions & options) const { + ///@TODO for vng + status = CountryStatusEx(index); + } + + void Storage::DownloadCountry(TIndex const & index, TMapOptions const & options) + { +#ifdef DEBUG + if (options & TMapOptions::EMapWithCarRouting) + ASSERT(options & TMapOptions::EMapOnly, ()); +#endif + ///@TODO for vng. Process options // check if we already downloading this country TQueue::const_iterator found = find(m_queue.begin(), m_queue.end(), index); if (found != m_queue.end()) @@ -280,7 +228,6 @@ namespace storage void Storage::NotifyStatusChanged(TIndex const & index) { - UpdateDownloadedCountriesState(); for (list::const_iterator it = m_observers.begin(); it != m_observers.end(); ++it) it->m_changeCountryFn(index); } @@ -518,7 +465,7 @@ namespace storage IsNotOutdatedFilter(Storage const & storage) : m_storage(storage) {} bool operator() (string const & file) const { - return (m_storage.CountryStatusEx(m_storage.FindIndexByFile(file)) != EOnDiskOutOfDate); + return (m_storage.CountryStatusEx(m_storage.FindIndexByFile(file)) != TStatus::EOnDiskOutOfDate); } }; } diff --git a/storage/storage.hpp b/storage/storage.hpp index 1167a2335f..388d8fd13b 100644 --- a/storage/storage.hpp +++ b/storage/storage.hpp @@ -1,5 +1,6 @@ #pragma once +#include "storage_defines.hpp" #include "country.hpp" #include "index.hpp" #include "guides.hpp" @@ -16,18 +17,6 @@ namespace storage { - /// Used in GUI - enum TStatus - { - EOnDisk = 0, - ENotDownloaded, - EDownloadFailed, - EDownloading, - EInQueue, - EUnknown, - EOnDiskOutOfDate - }; - /// Can be used to store local maps and/or maps available for download class Storage { @@ -57,7 +46,7 @@ namespace storage /// @name Communicate with GUI //@{ typedef function TChangeCountryFunction; - typedef function const &)> TProgressFunction; + typedef function TProgressFunction; int m_currentSlotId; @@ -106,27 +95,24 @@ namespace storage //@} Country const & CountryByIndex(TIndex const & index) const; - TIndex const & GetDownloadedCountryAt(size_t const & i) const; - TIndex const & GetOutOfDateCountryAt(size_t const & i) const; - TIndex FindIndexByFile(string const & name) const; void GetGroupAndCountry(TIndex const & index, string & group, string & country) const; size_t CountriesCount(TIndex const & index) const; - size_t GetDownloadedCountriesCount() const; - size_t GetOutOfDateCountriesCount() const; string const & CountryName(TIndex const & index) const; string const & CountryFlag(TIndex const & index) const; /// @return Country file name without extension. string const & CountryFileName(TIndex const & index) const; LocalAndRemoteSizeT CountrySizeInBytes(TIndex const & index) const; + LocalAndRemoteSizeT CountrySizeInBytesEx(TIndex const & index, TMapOptions const & options) const; /// Fast version, doesn't check if country is out of date TStatus CountryStatus(TIndex const & index) const; /// Slow version, but checks if country is out of date TStatus CountryStatusEx(TIndex const & index) const; + void CountryStatusEx(TIndex const & index, TStatus & status, TMapOptions & options) const; //m2::RectD CountryBounds(TIndex const & index) const; - void DownloadCountry(TIndex const & index); + void DownloadCountry(TIndex const & index, TMapOptions const & options); bool DeleteFromDownloader(TIndex const & index); bool IsDownloadInProgress() const; @@ -143,9 +129,6 @@ namespace storage private: guides::GuidesManager m_guideManager; - void UpdateDownloadedCountriesState(); - void UpdateDownloadedCountriesState(TIndex const index); - public: guides::GuidesManager const & GetGuideManager() const { return m_guideManager; } guides::GuidesManager & GetGuideManager() { return m_guideManager; } diff --git a/storage/storage.pro b/storage/storage.pro index c3cb3a2009..68bfca9d88 100644 --- a/storage/storage.pro +++ b/storage/storage.pro @@ -19,6 +19,7 @@ HEADERS += \ country_decl.hpp \ index.hpp \ guides.hpp \ + storage_defines.hpp \ SOURCES += \ country.cpp \ diff --git a/storage/storage_defines.hpp b/storage/storage_defines.hpp new file mode 100644 index 0000000000..454663cf64 --- /dev/null +++ b/storage/storage_defines.hpp @@ -0,0 +1,45 @@ +#pragma once + +#include "../std/stdint.hpp" +#include "../std/utility.hpp" + +namespace storage +{ + /// Used in GUI + enum class TStatus : int + { + EOnDisk = 0, + ENotDownloaded, + EDownloadFailed, + EDownloading, + EInQueue, + EUnknown, + EOnDiskOutOfDate, + EOutOfMemFailed // EDownloadFailed because not enougth memory + }; + + enum class TMapOptions : int + { + EMapOnly = 0x1, + ECarRouting = 0x2, + EMapWithCarRouting = 0x3 + }; + + inline TMapOptions operator | (TMapOptions const & lhs, TMapOptions const & rhs) + { + return static_cast(static_cast(lhs) | static_cast(rhs)); + } + + inline TMapOptions & operator |= (TMapOptions & lhs, TMapOptions rhs) + { + lhs = static_cast(static_cast(lhs) | static_cast(rhs)); + return lhs; + } + + inline bool operator & (TMapOptions const & testedFlags, TMapOptions const & match) + { + return (static_cast(testedFlags) & static_cast(match)) != 0; + } + + typedef pair LocalAndRemoteSizeT; +}