forked from organicmaps/organicmaps
[codereview]
This commit is contained in:
Dmitry Kunin
Alex Zolotarev
parent
fbf23f2a4b
commit
a8b62cff28
4 changed files with 52 additions and 23 deletions
|
|
@ -17,7 +17,7 @@
|
|||
#define BOOKMARKS_FILE_EXTENSION ".kml"
|
||||
|
||||
#define COUNTRIES_FILE "countries.txt"
|
||||
#define GUIDES_DATA_FILE "guidesData.txt"
|
||||
#define GUIDES_DATA_FILE_SUFFIX "guidesData.txt"
|
||||
|
||||
#define WORLD_FILE_NAME "World"
|
||||
#define WORLD_COASTS_FILE_NAME "WorldCoasts"
|
||||
|
|
|
|||
|
|
@ -17,19 +17,17 @@ using namespace guides;
|
|||
|
||||
bool GuidesManager::RestoreFromFile()
|
||||
{
|
||||
string const fileName = GetDataFileName();
|
||||
Platform & p = GetPlatform();
|
||||
|
||||
// At least file in resources must exist
|
||||
if (p.IsFileExistsByFullPath(p.ResourcesDir() + fileName))
|
||||
try
|
||||
{
|
||||
ReaderPtr<Reader> r(GetPlatform().GetReader(GetDataFileName()));
|
||||
string data;
|
||||
ReaderPtr<Reader> r(p.GetReader(fileName));
|
||||
r.ReadAsString(data);
|
||||
|
||||
return ValidateAndParseGuidesData(data);
|
||||
}
|
||||
return false;
|
||||
catch (FileAbsentException e)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
void GuidesManager::UpdateGuidesData()
|
||||
|
|
@ -40,9 +38,9 @@ void GuidesManager::UpdateGuidesData()
|
|||
|
||||
bool GuidesManager::GetGuideInfo(string const & countryId, GuideInfo & appInfo) const
|
||||
{
|
||||
map<string, GuideInfo>::const_iterator const it = m_countryToUrl.find(countryId);
|
||||
map<string, GuideInfo>::const_iterator const it = m_countryToInfoMapping.find(countryId);
|
||||
|
||||
if (it != m_countryToUrl.end())
|
||||
if (it != m_countryToInfoMapping.end())
|
||||
{
|
||||
appInfo = it->second;
|
||||
return true;
|
||||
|
|
@ -52,13 +50,12 @@ bool GuidesManager::GetGuideInfo(string const & countryId, GuideInfo & appInfo)
|
|||
|
||||
string GuidesManager::GetGuidesDataUrl() const
|
||||
{
|
||||
/// @todo add platform parametr
|
||||
return "http://third.server/guides.json";
|
||||
return "http://application.server/" + GetDataFileName();
|
||||
}
|
||||
|
||||
string GuidesManager::GetDataFileName() const
|
||||
{
|
||||
return OMIM_OS_NAME "-" GUIDES_DATA_FILE;
|
||||
return OMIM_OS_NAME "-" GUIDES_DATA_FILE_SUFFIX;
|
||||
}
|
||||
|
||||
void GuidesManager::OnFinish(downloader::HttpRequest & request)
|
||||
|
|
@ -66,7 +63,7 @@ void GuidesManager::OnFinish(downloader::HttpRequest & request)
|
|||
if (request.Status() == downloader::HttpRequest::ECompleted)
|
||||
{
|
||||
string const & data = request.Data();
|
||||
if(ValidateAndParseGuidesData(data))
|
||||
if (ValidateAndParseGuidesData(data))
|
||||
SaveToFile();
|
||||
else
|
||||
LOG(LWARNING, ("Request data is invalid ", request.Data()));
|
||||
|
|
@ -81,6 +78,8 @@ bool GuidesManager::ValidateAndParseGuidesData(string const & jsonData)
|
|||
{
|
||||
my::Json root(jsonData.c_str());
|
||||
void * iter = json_object_iter(root.get());
|
||||
|
||||
map<string, GuideInfo> temp;
|
||||
while (iter)
|
||||
{
|
||||
char const * key = json_object_iter_key(iter);
|
||||
|
|
@ -90,10 +89,12 @@ bool GuidesManager::ValidateAndParseGuidesData(string const & jsonData)
|
|||
info.m_appId = json_string_value(json_object_get(value, "appId"));
|
||||
info.m_appName = json_string_value(json_object_get(value, "name"));
|
||||
info.m_appUrl = json_string_value(json_object_get(value, "url"));
|
||||
m_countryToUrl[key] = info;
|
||||
temp[key] = info;
|
||||
|
||||
iter = json_object_iter_next(root.get(), iter);
|
||||
}
|
||||
|
||||
m_countryToInfoMapping.swap(temp);
|
||||
return true;
|
||||
}
|
||||
catch (my::Json::Exception const &)
|
||||
|
|
@ -111,11 +112,11 @@ void GuidesManager::SaveToFile() const
|
|||
string const closeJson = "}";
|
||||
writer.Write(openJson.data(), openJson.size());
|
||||
|
||||
if (!m_countryToUrl.empty())
|
||||
if (!m_countryToInfoMapping.empty())
|
||||
{
|
||||
bool isFirst = true;
|
||||
map<string, GuideInfo>::const_iterator it;
|
||||
for (it = m_countryToUrl.begin(); it != m_countryToUrl.end(); ++it)
|
||||
for (it = m_countryToInfoMapping.begin(); it != m_countryToInfoMapping.end(); ++it)
|
||||
{
|
||||
ostringstream node;
|
||||
node << (isFirst ? "" : " ,");
|
||||
|
|
|
|||
|
|
@ -7,13 +7,12 @@
|
|||
#include "../platform/http_request.hpp"
|
||||
|
||||
|
||||
namespace guides {
|
||||
namespace guides
|
||||
{
|
||||
|
||||
struct GuideInfo
|
||||
{
|
||||
GuideInfo()
|
||||
: m_appName(""), m_appUrl(""), m_appId("")
|
||||
{}
|
||||
GuideInfo() {}
|
||||
|
||||
GuideInfo(string const & appName, string const & appUrl, string const & appId)
|
||||
: m_appName(appName), m_appUrl(appUrl), m_appId(appId)
|
||||
|
|
@ -47,7 +46,7 @@ private:
|
|||
string GetDataFileName() const;
|
||||
string GetGuidesDataUrl() const;
|
||||
|
||||
map<string, GuideInfo> m_countryToUrl;
|
||||
map<string, GuideInfo> m_countryToInfoMapping;
|
||||
scoped_ptr<downloader::HttpRequest> m_httpRequest;
|
||||
//@}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -26,6 +26,12 @@ UNIT_TEST(ParseDataTest)
|
|||
manager.ValidateAndParseGuidesData(str);
|
||||
TEST(manager.GetGuideInfo(key, info), ("Has info for Guernsey"));
|
||||
TEST(!manager.GetGuideInfo("Minsk", info), ("Has not info for Minsk"));
|
||||
}
|
||||
|
||||
UNIT_TEST(CorrectlyParseData)
|
||||
{
|
||||
guides::GuidesManager manager;
|
||||
guides::GuideInfo info;
|
||||
|
||||
string strLondonIsle = "{\"London\": {\"name\": \"UK Travel Guide with Me\",\"url\": \"https://itunes.apple.com/app/uk-travel-guide-with-me/id687855665\",\"appId\": \"com.guideswithme.uk\"},\"Isle of Man\": {\"name\": \"UK Travel Guide with Me\",\"url\": \"https://play.google.com/store/apps/details?id=com.guidewithme.uk\",\"appId\": \"com.guideswithme.uk\"}}";
|
||||
string validKeys[] = {"London", "Isle of Man"};
|
||||
|
|
@ -57,6 +63,29 @@ UNIT_TEST(ParseDataTest)
|
|||
}
|
||||
}
|
||||
|
||||
UNIT_TEST(ComplexNames)
|
||||
{
|
||||
guides::GuidesManager manager;
|
||||
guides::GuideInfo info;
|
||||
|
||||
string strLondonIsle = "{\"Côte_d'Ivoire\": {\"name\": \"Côte_d'Ivoire Travel Guide with Me\",\"url\": \"https://itunes.apple.com/app/uk-travel-guide-with-me/id687855665\",\"appId\": \"com.guideswithme.uk\"},\"Беларусь\": {\"name\": \"UK Travel Guide with Me\",\"url\": \"https://play.google.com/store/apps/details?id=com.guidewithme.uk\",\"appId\": \"com.guideswithme.uk\"}}";
|
||||
string validKeys[] = {"Côte_d'Ivoire", "Беларусь"};
|
||||
string invalidKeys[] = {"Не Белурусь", "Côte_d'IvoireCôte_d'IvoireCôte_d'Ivoire"};
|
||||
|
||||
TEST(manager.ValidateAndParseGuidesData(strLondonIsle), ("MUST BE PARSED"));
|
||||
for (int i = 0; i < ARRAY_SIZE(validKeys); ++i)
|
||||
{
|
||||
string key = validKeys[i];
|
||||
TEST(manager.GetGuideInfo(key, info), ("Has info for:", key));
|
||||
}
|
||||
|
||||
for (int i = 0; i < ARRAY_SIZE(invalidKeys); ++i)
|
||||
{
|
||||
string key = invalidKeys[i];
|
||||
TEST(!manager.GetGuideInfo(key, info), ("Has no info for:", key));
|
||||
}
|
||||
}
|
||||
|
||||
UNIT_TEST(SaveRestoreFromFile)
|
||||
{
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue