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

[eye] review fixes

Browse source
This commit is contained in:
Arsentiy Milchakov 2018-10-26 14:41:27 +03:00 • committed by Tatiana Yan
parent 424354cf3d
commit 3d481801c1
7 changed files with 101 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
coding/serdes_json.hpp
View file

@ -14,6 +14,7 @@
#include <cstring>
#include <memory>
#include <type_traits>
#include <unordered_set>
#include <utility>
#include <vector>
@ -228,7 +229,7 @@ public:
RestoreContext(outerContext);
}
template <typename T, typename H>
template <typename T, class H = std::hash<T>>
void operator()(std::unordered_set<T, H> & dest, char const * name = nullptr)
{
json_t * outerContext = SaveContext(name);
@ -251,12 +252,6 @@ public:
RestoreContext(outerContext);
}
template <typename T>
void operator()(std::unordered_set<T> & dest, char const * name = nullptr)
{
(*this)<std::unordered_set<T>::key_type, std::unordered_set<T>::hasher>(dest, name);
}
template <typename T, size_t N>
void operator()(std::array<T, N> & dst, char const * name = nullptr)
{

12
map/framework.cpp
View file

@ -30,6 +30,7 @@
#include "search/locality_finder.hpp"
#include "search/reverse_geocoder.hpp"
#include "storage/country_info_getter.hpp"
#include "storage/downloader_search_params.hpp"
#include "storage/routing_helpers.hpp"
#include "storage/storage_helpers.hpp"
@ -49,19 +50,15 @@
#include "indexer/drawing_rules.hpp"
#include "indexer/editable_map_object.hpp"
#include "indexer/feature.hpp"
#include "indexer/feature_algo.hpp"
#include "indexer/feature_source.hpp"
#include "indexer/feature_utils.hpp"
#include "indexer/feature_visibility.hpp"
#include "indexer/ftypes_sponsored.hpp"
#include "indexer/map_style_reader.hpp"
#include "indexer/scales.hpp"
/// @todo Probably it's better to join this functionality.
//@{
#include "indexer/feature_algo.hpp"
#include "indexer/feature_utils.hpp"
//@}
#include "storage/country_info_getter.hpp"
#include "metrics/eye.hpp"
#include "platform/local_country_file_utils.hpp"
#include "platform/measurement_utils.hpp"
@ -536,6 +533,7 @@ Framework::~Framework()
m_user.ClearSubscribers();
// Must be destroyed implicitly, since it stores reference to m_user.
m_bmManager.reset();
eye::Eye::Instance().UnsubscribeAll();
}
booking::Api * Framework::GetBookingApi(platform::NetworkPolicy const & policy)

93
metrics/eye.cpp
View file

@ -90,16 +90,21 @@ Eye::InfoType Eye::GetInfo() const
void Eye::Subscribe(Subscriber * subscriber)
{
GetPlatform().RunTask(Platform::Thread::File, [this, subscriber]
{
m_subscribers.push_back(subscriber);
});
m_subscribers.push_back(subscriber);
}
void Eye::Save(InfoType const & info)
void Eye::UnsubscribeAll()
{
if (::Save(*info))
m_info.Set(info);
m_subscribers.clear();
}
bool Eye::Save(InfoType const & info)
{
if (!::Save(*info))
return false;
m_info.Set(info);
return true;
}
void Eye::RegisterTipClick(Tip::Type type, Tip::Event event)
@ -126,15 +131,19 @@ void Eye::RegisterTipClick(Tip::Type type, Tip::Event event)
tip.m_type = type;
tip.m_eventCounters.Increment(event);
tip.m_lastShownTime = now;
editableTips.emplace_back(tip);
editableTips.push_back(tip);
}
Save(editableInfo);
if (!Save(editableInfo))
return;
for (auto subscriber : m_subscribers)
GetPlatform().RunTask(Platform::Thread::Gui, [this, tip]
{
subscriber->OnTipClicked(tip);
}
for (auto subscriber : m_subscribers)
{
subscriber->OnTipClicked(tip);
}
});
}
void Eye::UpdateBookingFilterUsedTime()
@ -145,12 +154,16 @@ void Eye::UpdateBookingFilterUsedTime()
editableInfo->m_booking.m_lastFilterUsedTime = now;
Save(editableInfo);
if (!Save(editableInfo))
return;
for (auto subscriber : m_subscribers)
GetPlatform().RunTask(Platform::Thread::Gui, [this, now]
{
subscriber->OnBookingFilterUsed(now);
}
for (auto subscriber : m_subscribers)
{
subscriber->OnBookingFilterUsed(now);
}
});
}
void Eye::UpdateBoomarksCatalogShownTime()
@ -161,12 +174,16 @@ void Eye::UpdateBoomarksCatalogShownTime()
editableInfo->m_bookmarks.m_lastOpenedTime = now;
Save(editableInfo);
if (!Save(editableInfo))
return;
for (auto subscriber : m_subscribers)
GetPlatform().RunTask(Platform::Thread::Gui, [this, now]
{
subscriber->OnBookmarksCatalogShown(now);
}
for (auto subscriber : m_subscribers)
{
subscriber->OnBookmarksCatalogShown(now);
}
});
}
void Eye::UpdateDiscoveryShownTime()
@ -177,12 +194,16 @@ void Eye::UpdateDiscoveryShownTime()
editableInfo->m_discovery.m_lastOpenedTime = now;
Save(editableInfo);
if (!Save(editableInfo))
return;
for (auto subscriber : m_subscribers)
GetPlatform().RunTask(Platform::Thread::Gui, [this, now]
{
subscriber->OnDiscoveryShown(now);
}
for (auto subscriber : m_subscribers)
{
subscriber->OnDiscoveryShown(now);
}
});
}
void Eye::IncrementDiscoveryItem(Discovery::Event event)
@ -193,12 +214,16 @@ void Eye::IncrementDiscoveryItem(Discovery::Event event)
editableInfo->m_discovery.m_lastClickedTime = Clock::now();
editableInfo->m_discovery.m_eventCounters.Increment(event);
Save(editableInfo);
if (!Save(editableInfo))
return;
for (auto subscriber : m_subscribers)
GetPlatform().RunTask(Platform::Thread::Gui, [this, event]
{
subscriber->OnDiscoveryItemClicked(event);
}
for (auto subscriber : m_subscribers)
{
subscriber->OnDiscoveryItemClicked(event);
}
});
}
void Eye::RegisterLayerShown(Layer::Type type)
@ -228,12 +253,16 @@ void Eye::RegisterLayerShown(Layer::Type type)
editableLayers.emplace_back(layer);
}
Save(editableInfo);
if (!Save(editableInfo))
return;
for (auto subscriber : m_subscribers)
GetPlatform().RunTask(Platform::Thread::Gui, [this, layer]
{
subscriber->OnLayerUsed(layer);
}
for (auto subscriber : m_subscribers)
{
subscriber->OnLayerShown(layer);
}
});
}
void Eye::RegisterPlacePageOpened()

21
metrics/eye.hpp
View file

@ -12,16 +12,16 @@ namespace eye
class Subscriber
{
public:
virtual ~Subscriber(){};
virtual ~Subscriber() = default;
public:
virtual void OnTipClicked(Tip const & tip){};
virtual void OnBookingFilterUsed(Time const & time){};
virtual void OnBookmarksCatalogShown(Time const & time){};
virtual void OnDiscoveryShown(Time const & time){};
virtual void OnDiscoveryItemClicked(Discovery::Event event){};
virtual void OnLayerUsed(Layer const & layer){};
virtual void OnPlacePageOpened(MapObject const & poi){};
virtual void OnTipClicked(Tip const & tip) {}
virtual void OnBookingFilterUsed(Time const & time) {}
virtual void OnBookmarksCatalogShown(Time const & time) {}
virtual void OnDiscoveryShown(Time const & time) {}
virtual void OnDiscoveryItemClicked(Discovery::Event event) {}
virtual void OnLayerShown(Layer const & layer) {}
virtual void OnPlacePageOpened(MapObject const & poi) {}
};
// Note This class IS thread-safe.
@ -53,12 +53,15 @@ public:
static Eye & Instance();
InfoType GetInfo() const;
// Subscribe/Unsubscribe must be called from main thread only.
void Subscribe(Subscriber * subscriber);
void UnsubscribeAll();
private:
Eye();
void Save(InfoType const & info);
bool Save(InfoType const & info);
// Event processing:
void RegisterTipClick(Tip::Type type, Tip::Event event);

14
metrics/eye_info.hpp
View file

@ -164,7 +164,7 @@ struct MapObject
{
struct Event
{
enum Type
enum class Type : uint8_t
{
Open,
AddToBookmark,
@ -248,4 +248,16 @@ inline std::string DebugPrint(Layer::Type const & type)
case Layer::Type::PublicTransport: return "PublicTransport";
}
}
inline std::string DebugPrint(MapObject::Event::Type const & type)
{
switch (type)
{
case MapObject::Event::Type::Open: return "Open";
case MapObject::Event::Type::AddToBookmark: return "AddToBookmark";
case MapObject::Event::Type::UgcEditorOpened: return "UgcEditorOpened";
case MapObject::Event::Type::UgcSaved: return "UgcSaved";
case MapObject::Event::Type::RouteToCreated: return "RouteToCreated";
}
}
} // namespace eye

5
metrics/eye_storage.cpp
View file

@ -22,8 +22,9 @@ bool Save(std::string const & filename, std::vector<int8_t> const & src)
FileWriter writer(fileName);
writer.Write(src.data(), src.size());
}
catch (FileWriter::Exception const &)
catch (FileWriter::Exception const & ex)
{
LOG(LERROR, (ex.what(), ex.Msg()));
return false;
}
@ -42,7 +43,7 @@ bool Load(std::string const & filename, std::vector<int8_t> & dst)
reader.Read(0, dst.data(), dst.size());
}
catch (FileReader::Exception const & ex)
catch (FileReader::Exception const &)
{
dst.clear();
return false;

5
metrics/metrics_tests_support/eye_for_testing.hpp
View file

@ -2,6 +2,8 @@
#include "metrics/eye_info.hpp"
#include "platform/platform.hpp"
namespace eye
{
class EyeForTesting
@ -22,5 +24,8 @@ class ScopedEyeForTesting
public:
ScopedEyeForTesting() { EyeForTesting::ResetEye(); }
~ScopedEyeForTesting() { EyeForTesting::ResetEye(); }
private:
Platform::ThreadRunner m_runner;
};
} // namespace eye