Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/map
diff options
context:
space:
mode:
authorArsentiy Milchakov <milcars@mapswithme.com>2018-09-05 17:45:27 +0300
committerRoman Kuznetsov <r.kuznetsow@gmail.com>2018-09-05 17:56:51 +0300
commit4c14c4b3fa399ff79e83e0f043ccd592c92a8339 (patch)
treedaaf147340f4d3a74b26e5c49ab44f307d615c9d /map
parent2ac5023f787ec9f801b57de0fdb6eba6ae2aecb0 (diff)
[eye][tips] review fixes
Diffstat (limited to 'map')
-rw-r--r--map/map_tests/tips_tests.cpp4
-rw-r--r--map/tips_api.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/map/map_tests/tips_tests.cpp b/map/map_tests/tips_tests.cpp
index 35ca5f9d5b..3885f999ca 100644
--- a/map/map_tests/tips_tests.cpp
+++ b/map/map_tests/tips_tests.cpp
@@ -29,7 +29,7 @@ public:
// TipsApi::Delegate overrides:
boost::optional<m2::PointD> GetCurrentPosition() const override
{
- return boost::optional<m2::PointD>();
+ return {};
}
bool IsCountryLoaded(m2::PointD const & pt) const override { return false; }
@@ -65,7 +65,7 @@ boost::optional<eye::Tip::Type> GetTipForTesting(TipsApi::Duration showAnyTipPer
[] (eye::Info const & info) { return true; },
// Condition for Tips::Type::DiscoverButton type.
[] (eye::Info const & info) { return true; },
- // Condition for Tips::Type::MapsLayers type.
+ // Condition for Tips::Type::PublicTransport type.
[] (eye::Info const & info) { return true; }
}};
return TipsApi::GetTipForTesting(showAnyTipPeriod, showSameTipPeriod, delegate, conditions);
diff --git a/map/tips_api.cpp b/map/tips_api.cpp
index 5f04b9db30..07a3a16941 100644
--- a/map/tips_api.cpp
+++ b/map/tips_api.cpp
@@ -159,12 +159,12 @@ TipsApi::TipsApi(Delegate const & delegate)
return m_delegate.IsCountryLoaded(pos.get());
},
- // Condition for Tips::Type::MapsLayers type.
+ // Condition for Tips::Type::PublicTransport type.
[this] (eye::Info const & info)
{
for (auto const & layer : info.m_layers)
{
- if (layer.m_type == Layer::PublicTransport &&
+ if (layer.m_type == Layer::Type::PublicTransport &&
layer.m_lastTimeUsed.time_since_epoch().count() != 0)
{
return false;