diff options
author | Arsentiy Milchakov <a.milchakov@corp.mail.ru> | 2016-07-05 11:02:30 +0300 |
---|---|---|
committer | Arsentiy Milchakov <a.milchakov@corp.mail.ru> | 2016-07-05 11:02:30 +0300 |
commit | fb87588b3efeb0fedb4bad06172ed5171ff36906 (patch) | |
tree | dd0eb298a9fe9d3494b59a248c6f6842ba445c88 /indexer | |
parent | 5015a517216a2e8504b05c2ba2e745d44d3606c1 (diff) |
Remove edits when remove the map
Diffstat (limited to 'indexer')
-rw-r--r-- | indexer/osm_editor.cpp | 19 | ||||
-rw-r--r-- | indexer/osm_editor.hpp | 5 |
2 files changed, 24 insertions, 0 deletions
diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp index ecca7cb813..5f420d07ac 100644 --- a/indexer/osm_editor.cpp +++ b/indexer/osm_editor.cpp @@ -339,6 +339,25 @@ void Editor::ClearAllLocalEdits() Invalidate(); } +void Editor::OnMapDeregistered(platform::LocalCountryFile const & localFile) +{ + // TODO: to add some synchronization mechanism for whole Editor class + lock_guard<mutex> g(m_mapDeregisteredMtx); + + using TFeaturePair = decltype(m_features)::value_type; + // Cannot search by MwmId because country already removed. So, search by country name. + auto const matchedMwm = + find_if(begin(m_features), end(m_features), [&localFile](TFeaturePair const & item) { + return item.first.GetInfo()->GetCountryName() == localFile.GetCountryName(); + }); + + if (m_features.end() != matchedMwm) + { + m_features.erase(matchedMwm); + Save(GetEditorFilePath()); + } +} + Editor::FeatureStatus Editor::GetFeatureStatus(MwmSet::MwmId const & mwmId, uint32_t index) const { // Most popular case optimization. diff --git a/indexer/osm_editor.hpp b/indexer/osm_editor.hpp index e3d3070493..2d5ed2b31d 100644 --- a/indexer/osm_editor.hpp +++ b/indexer/osm_editor.hpp @@ -17,6 +17,7 @@ #include "std/ctime.hpp" #include "std/function.hpp" #include "std/map.hpp" +#include "std/mutex.hpp" #include "std/string.hpp" #include "std/vector.hpp" @@ -71,6 +72,8 @@ public: LoadMapEdits(); } + void OnMapDeregistered(platform::LocalCountryFile const & localFile) override; + using TFeatureIDFunctor = function<void(FeatureID const &)>; void ForEachFeatureInMwmRectAndScale(MwmSet::MwmId const & id, TFeatureIDFunctor const & f, @@ -215,6 +218,8 @@ private: /// Notes to be sent to osm. shared_ptr<editor::Notes> m_notes; + // Mutex which locks OnMapDeregistered method + mutex m_mapDeregisteredMtx; }; // class Editor string DebugPrint(Editor::FeatureStatus fs); |