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

Added min and max mwm version to PW

Browse source
This commit is contained in:
r.kuznetsov 2018-02-20 20:02:54 +03:00 • committed by Aleksandr Zatsepin
parent b16a1df1ef
commit 2c14a06177
4 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
platform/marketing_service.cpp
View file

@ -4,7 +4,8 @@ namespace marketing
{
// Tags.
char const * const kMapVersion = "map_version";
char const * const kMapVersionMin = "map_version_min";
char const * const kMapVersionMax = "map_version_max";
char const * const kMapListing = "map_listing";
char const * const kMapDownloadDiscovered = "map_download_discovered";
char const * const kMapLastDownloaded = "last_map_downloaded";

3
platform/marketing_service.hpp
View file

@ -9,7 +9,8 @@
namespace marketing
{
// Tags.
extern char const * const kMapVersion;
extern char const * const kMapVersionMin;
extern char const * const kMapVersionMax;
extern char const * const kMapListing;
extern char const * const kMapDownloadDiscovered;
extern char const * const kMapLastDownloaded;

3
storage/country.cpp
View file

@ -329,9 +329,6 @@ int64_t LoadCountriesFromBuffer(string const & jsonBuffer, TCountryTree & countr
{
LOG(LERROR, (e.Msg()));
}
stringstream ss;
ss << version;
GetPlatform().GetMarketingService().SendPushWooshTag(marketing::kMapVersion, ss.str());
return version;
}

21
storage/storage.cpp
View file

@ -4,6 +4,7 @@
#include "defines.hpp"
#include "platform/local_country_file_utils.hpp"
#include "platform/marketing_service.hpp"
#include "platform/mwm_version.hpp"
#include "platform/platform.hpp"
#include "platform/preferred_languages.hpp"
@ -27,6 +28,8 @@
#include "std/sstream.hpp"
#include "std/target_os.hpp"
#include <limits>
#include "3party/Alohalytics/src/alohalytics.h"
using namespace downloader;
@ -251,6 +254,9 @@ void Storage::RegisterAllLocalMaps(bool enableDiffs)
sort(localFiles.begin(), localFiles.end(), compareByCountryAndVersion);
int64_t minVersion = std::numeric_limits<int64_t>().max();
int64_t maxVersion = std::numeric_limits<int64_t>().min();
auto i = localFiles.begin();
while (i != localFiles.end())
{
@ -266,6 +272,16 @@ void Storage::RegisterAllLocalMaps(bool enableDiffs)
LocalCountryFile const & localFile = *i;
string const & name = localFile.GetCountryName();
if (name != WORLD_FILE_NAME && name != WORLD_COASTS_FILE_NAME &&
name != WORLD_COASTS_OBSOLETE_FILE_NAME)
{
auto const version = localFile.GetVersion();
if (version < minVersion)
minVersion = version;
if (version > maxVersion)
maxVersion = version;
}
TCountryId countryId = FindCountryIdByFile(name);
if (IsLeaf(countryId))
RegisterCountryFiles(countryId, localFile.GetDirectory(), localFile.GetVersion());
@ -277,6 +293,11 @@ void Storage::RegisterAllLocalMaps(bool enableDiffs)
i = j;
}
GetPlatform().GetMarketingService().SendPushWooshTag(marketing::kMapVersionMin,
strings::to_string(minVersion));
GetPlatform().GetMarketingService().SendPushWooshTag(marketing::kMapVersionMax,
strings::to_string(maxVersion));
FindAllDiffs(m_dataDir, m_notAppliedDiffs);
if (enableDiffs)
LoadDiffScheme();