diff options
author | Alex Zolotarev <alex@maps.me> | 2015-12-21 01:45:06 +0300 |
---|---|---|
committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:04:00 +0300 |
commit | 832bc08ab4d2b1c8422a9f00566469c971c26709 (patch) | |
tree | f202569be2d6871c75462c75e324fba0779ca02d /indexer/index.cpp | |
parent | f56b9b156c5b0f081f6bc798baa493f7859cc488 (diff) |
[editor] Changed interface and internal storage for faster access and easier serialization. Introduced additional information about edits.
Diffstat (limited to 'indexer/index.cpp')
-rw-r--r-- | indexer/index.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indexer/index.cpp b/indexer/index.cpp index 17a0c426e2..33d55bb8c5 100644 --- a/indexer/index.cpp +++ b/indexer/index.cpp @@ -119,11 +119,12 @@ bool Index::FeaturesLoaderGuard::IsWorld() const void Index::FeaturesLoaderGuard::GetFeatureByIndex(uint32_t index, FeatureType & ft) const { - FeatureID const fid(m_handle.GetId(), index); - ASSERT(!m_editor.IsFeatureDeleted(fid), ("Deleted feature was cached. Please review your code.")); - if (!m_editor.Instance().GetEditedFeature(fid, ft)) + MwmId const & id = m_handle.GetId(); + ASSERT_NOT_EQUAL(osm::Editor::EDeleted, m_editor.GetFeatureStatus(id, index), + ("Deleted feature was cached. Please review your code.")); + if (!m_editor.Instance().GetEditedFeature(id, index, ft)) { m_vector.GetByIndex(index, ft); - ft.SetID(fid); + ft.SetID(FeatureID(id, index)); } } |