RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Ony Framework requires map style persistence

Browse source
This commit is contained in:
Constantin Shalnev 2015-10-26 12:01:20 +03:00
parent 7aa7c7d807
commit 0966eaf482
3 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
indexer/map_style_reader.cpp
View file

@ -5,15 +5,12 @@
#include "coding/file_name_utils.hpp"
#include "platform/platform.hpp"
#include "platform/settings.hpp"
#include "std/string.hpp"
namespace
{
char const * const kMapStyleKey = "MapStyleKeyV1";
const char * const kSuffixLegacyLight = "";
const char * const kSuffixLegacyDark = "_dark";
const char * const kSuffixModernClear = "_clear";
@ -38,22 +35,19 @@ string GetStyleSuffix(MapStyle mapStyle)
} // namespace
StyleReader::StyleReader()
: m_mapStyle(MapStyleLight)
{
}
void StyleReader::SetCurrentStyle(MapStyle mapStyle)
{
Settings::Set(kMapStyleKey, static_cast<int>(mapStyle));
m_mapStyle = mapStyle;
}
MapStyle StyleReader::GetCurrentStyle()
{
int mapStyle = MapStyleLight;
// @TODO(shalnev) It's a hotfix to fix tests generator_tests and map_tests.
// Tests should work with any styles.
#if defined(OMIM_OS_ANDROID) || defined(OMIM_OS_IPHONE)
if (!Settings::Get(kMapStyleKey, mapStyle))
mapStyle = MapStyleClear;
#endif
return static_cast<MapStyle>(mapStyle);
return m_mapStyle;
}
ReaderPtr<Reader> StyleReader::GetDrawingRulesReader()

5
indexer/map_style_reader.hpp
View file

@ -7,12 +7,17 @@
class StyleReader
{
public:
StyleReader();
void SetCurrentStyle(MapStyle mapStyle);
MapStyle GetCurrentStyle();
ReaderPtr<Reader> GetDrawingRulesReader();
ReaderPtr<Reader> GetResourceReader(string const & file, string const & density);
private:
MapStyle m_mapStyle;
};
extern StyleReader & GetStyleReader();

10
map/framework.cpp
View file

@ -102,6 +102,7 @@ namespace
static const int BM_TOUCH_PIXEL_INCREASE = 20;
static const int kKeepPedestrianDistanceMeters = 10000;
char const kRouterTypeKey[] = "router";
char const kMapStyleKey[] = "MapStyleKeyV1";
}
pair<MwmSet::MwmId, MwmSet::RegResult> Framework::RegisterMap(
@ -204,6 +205,12 @@ Framework::Framework()
m_fixedSearchResults(0),
m_locationChangedSlotID(-1)
{
// Restore map style before classificator loading
int mapStyle = MapStyleLight;
if (!Settings::Get(kMapStyleKey, mapStyle))
mapStyle = MapStyleClear;
GetStyleReader().SetCurrentStyle(static_cast<MapStyle>(mapStyle));
// Checking whether we should enable benchmark.
bool isBenchmarkingEnabled = false;
(void)Settings::Get("IsBenchmarking", isBenchmarkingEnabled);
@ -1618,7 +1625,10 @@ void Framework::CreateDrapeEngine(dp::RefPointer<dp::OGLContextFactory> contextF
void Framework::SetMapStyle(MapStyle mapStyle)
{
// Store current map style before classificator reloading
Settings::Set(kMapStyleKey, static_cast<int>(mapStyle));
GetStyleReader().SetCurrentStyle(mapStyle);
classificator::Load();
alohalytics::TStringMap details {{"mapStyle", strings::to_string(static_cast<int>(mapStyle))}};