From b556f22b986ff6dd72449a1a20125192f55c6e10 Mon Sep 17 00:00:00 2001 From: Sergey Magidovich Date: Tue, 16 Feb 2016 14:01:01 +0300 Subject: [PATCH] Add TODO and put editor:: to MigrateFeatureIndex --- indexer/osm_editor.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp index d670491211..a39103e941 100644 --- a/indexer/osm_editor.cpp +++ b/indexer/osm_editor.cpp @@ -335,10 +335,14 @@ void Editor::LoadMapEdits() try { XMLFeature const xml(nodeOrWay.node()); - auto const fid = needMigrateEdits - ? MigrateFeatureIndex(m_forEachFeatureAtPointFn, xml) - : FeatureID(mwmId, xml.GetMWMFeatureIndex()); + // TODO(mgsergio): + // if (needMigrateEdits && TimestampOf(mwm) >= UploadTimestamp(xml)) + // remove that fature from edits.xml. + + auto const fid = needMigrateEdits + ? editor::MigrateFeatureIndex(m_forEachFeatureAtPointFn, xml) + : FeatureID(mwmId, xml.GetMWMFeatureIndex()); FeatureTypeInfo & fti = m_features[fid.m_mwmId][fid.m_index]; if (section.first == FeatureStatus::Created)