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
diff options
context:
space:
mode:
authorArsentiy Milchakov <a.milchakov@corp.mail.ru>2016-07-20 22:51:27 +0300
committerArsentiy Milchakov <a.milchakov@corp.mail.ru>2016-07-20 22:51:27 +0300
commit99f189642f6c5ae0139cc36ba5ba5106680d9de5 (patch)
tree6fa3ee843f0d2d3646d0acb619fc9bc788f03f89 /indexer/osm_editor.cpp
parentae5272bc4708f55a946163a4228ad38138af82d0 (diff)
review fixes
Diffstat (limited to 'indexer/osm_editor.cpp')
-rw-r--r--indexer/osm_editor.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp
index 6c9ac30912..549cef66ea 100644
--- a/indexer/osm_editor.cpp
+++ b/indexer/osm_editor.cpp
@@ -426,14 +426,11 @@ bool Editor::IsCreatedFeature(FeatureID const & fid)
return fid.m_index >= kStartIndexForCreatedFeatures;
}
-bool Editor::WasDefaultNameSaved(FeatureID const & fid) const
+bool Editor::OriginalFeatureHasDefaultName(FeatureID const & fid) const
{
if (IsCreatedFeature(fid))
return false;
- if (FeatureStatus::Created == GetFeatureStatus(fid))
- return false;
-
auto const originalFeaturePtr = m_getOriginalFeatureFn(fid);
if (!originalFeaturePtr)
{
@@ -442,7 +439,9 @@ bool Editor::WasDefaultNameSaved(FeatureID const & fid) const
return false;
}
- return originalFeaturePtr->HasName();
+ auto const & names = originalFeaturePtr->GetNames();
+
+ return names.HasString(StringUtf8Multilang::kDefaultCode);
}
/// Several cases should be handled while saving changes: