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

[editor] Correctly initialize edited feature before patching it.

Browse source
This commit is contained in:
Alex Zolotarev 2016-03-15 15:07:20 +03:00 • committed by Sergey Yershov
parent 97fcd3e2f5
commit cd5283a19d
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
indexer/osm_editor.cpp
View file

@ -369,13 +369,15 @@ Editor::SaveResult Editor::SaveEditedFeature(EditableMapObject const & emo)
FeatureID const & fid = emo.GetID();
FeatureTypeInfo fti;
bool const isCreated = IsCreatedFeature(fid);
fti.m_feature.ReplaceBy(emo);
if (isCreated)
{
fti.m_status = FeatureStatus::Created;
fti.m_feature.ReplaceBy(emo);
}
else
{
fti.m_feature = *m_getOriginalFeatureFn(fid);
fti.m_feature.ReplaceBy(emo);
if (AreFeaturesEqualButStreet(fti.m_feature, *m_getOriginalFeatureFn(fid)) &&
m_getOriginalFeatureStreetFn(fti.m_feature) == emo.GetStreet())
{