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:
authorSergey Magidovich <mgsergio@mapswithme.com>2016-06-03 13:52:14 +0300
committerSergey Magidovich <mgsergio@mapswithme.com>2016-06-03 15:36:21 +0300
commitce64dac110b8d0e1994b2f46f5bbd5e10142fd67 (patch)
tree787640beba8b925a5786227d485804bfc38e0749 /indexer/osm_editor.cpp
parent47e1a0e317d6ab28e32f4a295f9b9af7697681b1 (diff)
Code review.
Diffstat (limited to 'indexer/osm_editor.cpp')
-rw-r--r--indexer/osm_editor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp
index fa646a62b5..e7c21dc6a2 100644
--- a/indexer/osm_editor.cpp
+++ b/indexer/osm_editor.cpp
@@ -410,7 +410,7 @@ Editor::SaveResult Editor::SaveEditedFeature(EditableMapObject const & emo)
FeatureTypeInfo fti;
auto const featureStatus = GetFeatureStatus(fid.m_mwmId, fid.m_index);
- ASSERT_NOT_EQUAL(featureStatus, FeatureStatus::Obsolete, ("Obsolete feature cannot be modified"));
+ ASSERT_NOT_EQUAL(featureStatus, FeatureStatus::Obsolete, ("Obsolete feature cannot be modified."));
bool const wasCreatedByUser = IsCreatedFeature(fid);
if (wasCreatedByUser && featureStatus == FeatureStatus::Untouched)
@@ -420,7 +420,7 @@ Editor::SaveResult Editor::SaveEditedFeature(EditableMapObject const & emo)
}
else
{
- ASSERT_NOT_EQUAL(featureStatus, FeatureStatus::Deleted, ("Unexpected feature status"));
+ ASSERT_NOT_EQUAL(featureStatus, FeatureStatus::Deleted, ("Unexpected feature status."));
fti.m_feature = featureStatus == FeatureStatus::Untouched
? *m_getOriginalFeatureFn(fid)
@@ -909,7 +909,7 @@ void Editor::MarkFeatureAsObsolete(FeatureID const & fid)
auto const featureStatus = GetFeatureStatus(fid);
ASSERT(featureStatus == FeatureStatus::Untouched ||
featureStatus == FeatureStatus::Modified,
- ("Created or deleted features can't be obsolete"));
+ ("Only untouched and modified features can be made obsolete"));
auto & fti = m_features[fid.m_mwmId][fid.m_index];
// If a feature was modified we can drop all changes since it's now obsolete.