pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #3826 from mgsergio/fix-crash-in-editor

Browse source 
[editor] Fix crash in created feature editing.
This commit is contained in:
ygorshenin 2016-07-19 15:27:35 +03:00 • committed by GitHub
commit 0770bcf865
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
indexer/osm_editor.cpp
View file

@ -448,10 +448,20 @@ Editor::SaveResult Editor::SaveEditedFeature(EditableMapObject const & emo)
ASSERT_NOT_EQUAL(featureStatus, FeatureStatus::Obsolete, ("Obsolete feature cannot be modified."));
bool const wasCreatedByUser = IsCreatedFeature(fid);
if (wasCreatedByUser && featureStatus == FeatureStatus::Untouched)
if (wasCreatedByUser)
{
fti.m_status = FeatureStatus::Created;
fti.m_feature.ReplaceBy(emo);
if (featureStatus == FeatureStatus::Created)
{
auto const & editedFeatureInfo = m_features[fid.m_mwmId][fid.m_index];
if (AreFeaturesEqualButStreet(fti.m_feature, editedFeatureInfo.m_feature) &&
emo.GetStreet().m_defaultName == editedFeatureInfo.m_street)
{
return NothingWasChanged;
}
}
}
else
{
@ -469,7 +479,7 @@ Editor::SaveResult Editor::SaveEditedFeature(EditableMapObject const & emo)
? *originalFeaturePtr
: m_features[fid.m_mwmId][fid.m_index].m_feature;
fti.m_feature.ReplaceBy(emo);
bool const sameAsInMWM = featureStatus != FeatureStatus::Created &&
bool const sameAsInMWM =
AreFeaturesEqualButStreet(fti.m_feature, *originalFeaturePtr) &&
emo.GetStreet().m_defaultName == m_getOriginalFeatureStreetFn(fti.m_feature);
@ -506,9 +516,7 @@ Editor::SaveResult Editor::SaveEditedFeature(EditableMapObject const & emo)
return NothingWasChanged;
}
fti.m_status = featureStatus == FeatureStatus::Created
? FeatureStatus::Created
: FeatureStatus::Modified;
fti.m_status = FeatureStatus::Modified;
}
// TODO: What if local client time is absolutely wrong?

12
indexer/osm_editor.hpp
View file

@ -47,11 +47,13 @@ public:
enum class FeatureStatus
{
Untouched,
Deleted,
Obsolete, // The feature is obsolete when is marked for deletion via note.
Modified,
Created
Untouched, // The feature hasn't been saved in the editor.
Deleted, // The feature has been marked as deleted.
Obsolete, // The feature has been marked for deletion via note.
Modified, // The feature has been saved in the editor and differs from the original one.
Created // The feature was created by a user and has been saved in the editor.
// Note: If a feature was created by a user but hasn't been saved in the editor yet
// its status is Untouched.
};
static Editor & Instance();