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

[eye] save mercator pos instead of latlon

Browse source
This commit is contained in:
Arsentiy Milchakov 2018-10-30 18:16:40 +03:00 • committed by Roman Kuznetsov
parent 9308c996d5
commit b415753017
8 changed files with 71 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
coding/serdes_json.hpp
View file

@ -1,6 +1,7 @@
#pragma once
#include "geometry/latlon.hpp"
#include "geometry/point2d.hpp"
#include "base/exception.hpp"
#include "base/scope_guard.hpp"
@ -133,6 +134,14 @@ public:
(*this)(static_cast<std::underlying_type_t<T>>(t), name);
}
void operator()(m2::PointD const & p, char const * name = nullptr)
{
NewScopeWith(base::NewJSONObject(), name, [this, &p] {
(*this)(p.x, "x");
(*this)(p.y, "y");
});
}
void operator()(ms::LatLon const & ll, char const * name = nullptr)
{
NewScopeWith(base::NewJSONObject(), name, [this, &ll] {
@ -325,6 +334,14 @@ public:
t = static_cast<T>(res);
}
void operator()(m2::PointD & p, char const * name = nullptr)
{
json_t * outerContext = SaveContext(name);
(*this)(p.x, "x");
(*this)(p.y, "y");
RestoreContext(outerContext);
}
void operator()(ms::LatLon & ll, char const * name = nullptr)
{
json_t * outerContext = SaveContext(name);

42
metrics/eye.cpp
View file

@ -307,7 +307,7 @@ void Eye::RegisterLayerShown(Layer::Type type)
}
void Eye::RegisterMapObjectEvent(MapObject const & mapObject, MapObject::Event::Type type,
ms::LatLon const & userPos)
m2::PointD const & userPos)
{
auto const info = m_info.Get();
auto editableInfo = std::make_shared<Info>(*info);
@ -400,55 +400,55 @@ void Eye::Event::LayerShown(Layer::Type type)
}
// static
void Eye::Event::PlacePageOpened(std::string const & bestType, ms::LatLon const & latLon,
ms::LatLon const & userPos)
void Eye::Event::PlacePageOpened(std::string const & bestType, m2::PointD const & pos,
m2::PointD const & userPos)
{
GetPlatform().RunTask(Platform::Thread::File, [bestType, latLon, userPos]
GetPlatform().RunTask(Platform::Thread::File, [bestType, pos, userPos]
{
Instance().RegisterMapObjectEvent({bestType, latLon}, MapObject::Event::Type::Open, userPos);
Instance().RegisterMapObjectEvent({bestType, pos}, MapObject::Event::Type::Open, userPos);
});
}
// static
void Eye::Event::UgcEditorOpened(std::string const & bestType, ms::LatLon const & latLon,
ms::LatLon const & userPos)
void Eye::Event::UgcEditorOpened(std::string const & bestType, m2::PointD const & pos,
m2::PointD const & userPos)
{
GetPlatform().RunTask(Platform::Thread::File, [bestType, latLon, userPos]
GetPlatform().RunTask(Platform::Thread::File, [bestType, pos, userPos]
{
Instance().RegisterMapObjectEvent({bestType, latLon}, MapObject::Event::Type::UgcEditorOpened,
Instance().RegisterMapObjectEvent({bestType, pos}, MapObject::Event::Type::UgcEditorOpened,
userPos);
});
}
// static
void Eye::Event::UgcSaved(std::string const & bestType, ms::LatLon const & latLon,
ms::LatLon const & userPos)
void Eye::Event::UgcSaved(std::string const & bestType, m2::PointD const & pos,
m2::PointD const & userPos)
{
GetPlatform().RunTask(Platform::Thread::File, [bestType, latLon, userPos]
GetPlatform().RunTask(Platform::Thread::File, [bestType, pos, userPos]
{
Instance().RegisterMapObjectEvent({bestType, latLon}, MapObject::Event::Type::UgcSaved,
Instance().RegisterMapObjectEvent({bestType, pos}, MapObject::Event::Type::UgcSaved,
userPos);
});
}
// static
void Eye::Event::AddToBookmarkClicked(std::string const & bestType, ms::LatLon const & latLon,
ms::LatLon const & userPos)
void Eye::Event::AddToBookmarkClicked(std::string const & bestType, m2::PointD const & pos,
m2::PointD const & userPos)
{
GetPlatform().RunTask(Platform::Thread::File, [bestType, latLon, userPos]
GetPlatform().RunTask(Platform::Thread::File, [bestType, pos, userPos]
{
Instance().RegisterMapObjectEvent({bestType, latLon}, MapObject::Event::Type::AddToBookmark,
Instance().RegisterMapObjectEvent({bestType, pos}, MapObject::Event::Type::AddToBookmark,
userPos);
});
}
// static
void Eye::Event::RouteCreatedToObject(std::string const & bestType, ms::LatLon const & latLon,
ms::LatLon const & userPos)
void Eye::Event::RouteCreatedToObject(std::string const & bestType, m2::PointD const & pos,
m2::PointD const & userPos)
{
GetPlatform().RunTask(Platform::Thread::File, [bestType, latLon, userPos]
GetPlatform().RunTask(Platform::Thread::File, [bestType, pos, userPos]
{
Instance().RegisterMapObjectEvent({bestType, latLon}, MapObject::Event::Type::RouteToCreated,
Instance().RegisterMapObjectEvent({bestType, pos}, MapObject::Event::Type::RouteToCreated,
userPos);
});
}

22
metrics/eye.hpp
View file

@ -44,16 +44,16 @@ public:
static void DiscoveryShown();
static void DiscoveryItemClicked(Discovery::Event event);
static void LayerShown(Layer::Type type);
static void PlacePageOpened(std::string const & bestType, ms::LatLon const & latLon,
ms::LatLon const & userPos);
static void UgcEditorOpened(std::string const & bestType, ms::LatLon const & latLon,
ms::LatLon const & userPos);
static void UgcSaved(std::string const & bestType, ms::LatLon const & latLon,
ms::LatLon const & userPos);
static void AddToBookmarkClicked(std::string const & bestType, ms::LatLon const & latLon,
ms::LatLon const & userPos);
static void RouteCreatedToObject(std::string const & bestType, ms::LatLon const & latLon,
ms::LatLon const & userPos);
static void PlacePageOpened(std::string const & bestType, m2::PointD const & pos,
m2::PointD const & userPos);
static void UgcEditorOpened(std::string const & bestType, m2::PointD const & pos,
m2::PointD const & userPos);
static void UgcSaved(std::string const & bestType, m2::PointD const & pos,
m2::PointD const & userPos);
static void AddToBookmarkClicked(std::string const & bestType, m2::PointD const & pos,
m2::PointD const & userPos);
static void RouteCreatedToObject(std::string const & bestType, m2::PointD const & pos,
m2::PointD const & userPos);
};
static Eye & Instance();
@ -78,7 +78,7 @@ private:
void IncrementDiscoveryItem(Discovery::Event event);
void RegisterLayerShown(Layer::Type type);
void RegisterMapObjectEvent(MapObject const & mapObject, MapObject::Event::Type type,
ms::LatLon const & userPos);
m2::PointD const & userPos);
base::AtomicSharedPtr<Info> m_info;
std::vector<Subscriber *> m_subscribers;

7
metrics/eye_info.hpp
View file

@ -2,7 +2,6 @@
#include "storage/index.hpp"
#include "geometry/latlon.hpp"
#include "geometry/point2d.hpp"
#include "base/visitor.hpp"
@ -178,7 +177,7 @@ struct MapObject
visitor(m_eventTime, "event_time"));
Type m_type;
ms::LatLon m_userPos;
m2::PointD m_userPos;
Time m_eventTime;
};
@ -188,7 +187,7 @@ struct MapObject
{
size_t operator()(MapObject const & p) const
{
return base::Hash(base::Hash(p.m_pos.lat, p.m_pos.lon),
return base::Hash(base::Hash(p.m_pos.x, p.m_pos.y),
base::Hash(p.m_bestType, p.m_bestType));
}
};
@ -202,7 +201,7 @@ struct MapObject
visitor(m_readableName, "name"));
std::string m_bestType;
ms::LatLon m_pos;
m2::PointD m_pos;
std::string m_readableName;
};

4
metrics/eye_serdes.cpp
View file

@ -5,6 +5,8 @@
#include "coding/write_to_sink.hpp"
#include "coding/writer.hpp"
#include "geometry/point2d.hpp"
#include "base/logging.hpp"
#include <sstream>
@ -19,7 +21,7 @@ struct MapObjectEvent
visitor(m_event, "event"));
std::string m_bestPoiType;
ms::LatLon m_poiPos;
m2::PointD m_poiPos;
eye::MapObject::Event m_event;
};
} // namespace

28
metrics/metrics_tests/eye_tests.cpp
View file

@ -458,8 +458,8 @@ UNIT_CLASS_TEST(ScopedEyeForTesting, TrimExpiredMapObjectEvents)
TEST(it != mapObjects.end(), ());
TEST_EQUAL(it->second.size(), 3, ());
TEST_EQUAL(it->second[0].m_type, MapObject::Event::Type::Open, ());
TEST_EQUAL(it->second[1].m_userPos, ms::LatLon(72.045400, 81.408200), ());
TEST_EQUAL(it->second[2].m_userPos, ms::LatLon(72.045450, 81.408201), ());
TEST_EQUAL(it->second[1].m_userPos, m2::PointD(72.045400, 81.408200), ());
TEST_EQUAL(it->second[2].m_userPos, m2::PointD(72.045450, 81.408201), ());
}
{
@ -472,8 +472,8 @@ UNIT_CLASS_TEST(ScopedEyeForTesting, TrimExpiredMapObjectEvents)
TEST(it != mapObjects.end(), ());
TEST_EQUAL(it->second.size(), 3, ());
TEST_EQUAL(it->second[0].m_type, MapObject::Event::Type::Open, ());
TEST_EQUAL(it->second[1].m_userPos, ms::LatLon(53.016347, 158.683327), ());
TEST_EQUAL(it->second[2].m_userPos, ms::LatLon(53.116347, 158.783327), ());
TEST_EQUAL(it->second[1].m_userPos, m2::PointD(53.016347, 158.683327), ());
TEST_EQUAL(it->second[2].m_userPos, m2::PointD(53.116347, 158.783327), ());
}
}
@ -503,10 +503,10 @@ UNIT_CLASS_TEST(ScopedEyeForTesting, TrimExpiredMapObjectEvents)
TEST(it != mapObjects.end(), ());
TEST_EQUAL(it->second.size(), 2, ());
TEST_EQUAL(it->second[0].m_userPos, ms::LatLon(53.016347, 158.683327), ());
TEST_EQUAL(it->second[0].m_userPos, m2::PointD(53.016347, 158.683327), ());
TEST_EQUAL(it->second[0].m_type, MapObject::Event::Type::UgcEditorOpened, ());
TEST_EQUAL(it->second[1].m_userPos, ms::LatLon(53.116347, 158.783327), ());
TEST_EQUAL(it->second[1].m_userPos, m2::PointD(53.116347, 158.783327), ());
TEST_EQUAL(it->second[1].m_type, MapObject::Event::Type::UgcSaved, ());
}
}
@ -518,7 +518,7 @@ UNIT_CLASS_TEST(ScopedEyeForTesting, RegisterMapObjectEvent)
MapObject poi;
poi.m_bestType = "cafe";
poi.m_pos = {53.652005, 108.143448};
ms::LatLon userPos = {53.016347, 158.683327};
m2::PointD userPos = {53.016347, 158.683327};
EyeForTesting::RegisterMapObjectEvent(poi, MapObject::Event::Type::Open, userPos);
@ -530,7 +530,7 @@ UNIT_CLASS_TEST(ScopedEyeForTesting, RegisterMapObjectEvent)
MapObject poi;
poi.m_bestType = "shop";
poi.m_pos = {53.652005, 108.143448};
ms::LatLon userPos = {0.0, 0.0};
m2::PointD userPos = {0.0, 0.0};
EyeForTesting::RegisterMapObjectEvent(poi, MapObject::Event::Type::RouteToCreated, userPos);
@ -543,7 +543,7 @@ UNIT_CLASS_TEST(ScopedEyeForTesting, RegisterMapObjectEvent)
MapObject poi;
poi.m_bestType = "amenity-bench";
poi.m_pos = {53.652005, 108.143448};
ms::LatLon userPos = {0.0, 0.0};
m2::PointD userPos = {0.0, 0.0};
EyeForTesting::RegisterMapObjectEvent(poi, MapObject::Event::Type::Open, userPos);
}
@ -562,10 +562,10 @@ UNIT_CLASS_TEST(ScopedEyeForTesting, RegisterMapObjectEvent)
TEST(it != mapObjects.end(), ());
TEST_EQUAL(it->second.size(), 2, ());
TEST_EQUAL(it->second[0].m_userPos, ms::LatLon(53.016347, 158.683327), ());
TEST_EQUAL(it->second[0].m_userPos, m2::PointD(53.016347, 158.683327), ());
TEST_EQUAL(it->second[0].m_type, MapObject::Event::Type::Open, ());
TEST_EQUAL(it->second[1].m_userPos, ms::LatLon(53.016345, 158.683329), ());
TEST_EQUAL(it->second[1].m_userPos, m2::PointD(53.016345, 158.683329), ());
TEST_EQUAL(it->second[1].m_type, MapObject::Event::Type::RouteToCreated, ());
}
@ -578,10 +578,10 @@ UNIT_CLASS_TEST(ScopedEyeForTesting, RegisterMapObjectEvent)
TEST(it != mapObjects.end(), ());
TEST_EQUAL(it->second.size(), 2, ());
TEST_EQUAL(it->second[0].m_userPos, ms::LatLon(0.0, 0.0), ());
TEST_EQUAL(it->second[0].m_userPos, m2::PointD(0.0, 0.0), ());
TEST_EQUAL(it->second[0].m_type, MapObject::Event::Type::RouteToCreated, ());
TEST_EQUAL(it->second[1].m_userPos, ms::LatLon(158.016345, 53.683329), ());
TEST_EQUAL(it->second[1].m_userPos, m2::PointD(158.016345, 53.683329), ());
TEST_EQUAL(it->second[1].m_type, MapObject::Event::Type::AddToBookmark, ());
}
@ -594,7 +594,7 @@ UNIT_CLASS_TEST(ScopedEyeForTesting, RegisterMapObjectEvent)
TEST(it != mapObjects.end(), ());
TEST_EQUAL(it->second.size(), 1, ());
TEST_EQUAL(it->second[0].m_userPos, ms::LatLon(0.0, 0.0), ());
TEST_EQUAL(it->second[0].m_userPos, m2::PointD(0.0, 0.0), ());
TEST_EQUAL(it->second[0].m_type, MapObject::Event::Type::Open, ());
}
}

2
metrics/metrics_tests_support/eye_for_testing.cpp
View file

@ -80,7 +80,7 @@ void EyeForTesting::TrimExpiredMapObjectEvents()
// static
void EyeForTesting::RegisterMapObjectEvent(MapObject const & mapObject, MapObject::Event::Type type,
ms::LatLon const & userPos)
m2::PointD const & userPos)
{
Eye::Instance().RegisterMapObjectEvent(mapObject, type, userPos);
}

2
metrics/metrics_tests_support/eye_for_testing.hpp
View file

@ -19,7 +19,7 @@ public:
static void AppendLayer(Layer::Type type);
static void TrimExpiredMapObjectEvents();
static void RegisterMapObjectEvent(MapObject const & mapObject, MapObject::Event::Type type,
ms::LatLon const & userPos);
m2::PointD const & userPos);
};
class ScopedEyeForTesting