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

[editor] Minor functors renaming.

Browse source
This commit is contained in:
Alex Zolotarev 2016-01-23 18:39:34 +03:00 • committed by Sergey Yershov
parent 613bdb2943
commit 1f3107e0ca
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
indexer/osm_editor.cpp
View file

@ -299,7 +299,7 @@ void Editor::LoadMapEdits()
}
else
{
fti.m_feature = *m_featureLoaderFn(fid);
fti.m_feature = *m_getOriginalFeatureFn(fid);
fti.m_feature.ApplyPatch(xml);
}
@ -436,7 +436,7 @@ void Editor::EditFeature(FeatureType const & editedFeature, string const & edite
string const & editedHouseNumber)
{
FeatureID const fid = editedFeature.GetID();
auto const originalFeaturePtr = m_featureLoaderFn(fid);
auto const originalFeaturePtr = m_getOriginalFeatureFn(fid);
FeatureTypeInfo & fti = m_features[fid.m_mwmId][fid.m_index];
fti.m_status = FeatureStatus::Modified;
@ -450,7 +450,7 @@ void Editor::EditFeature(FeatureType const & editedFeature, string const & edite
// TODO(AlexZ): Store edited house number as house name if feature::IsHouseNumber() returned false.
if (AreFeaturesEqualButStreet(fti.m_feature, *originalFeaturePtr) &&
m_featureOriginalStreet(editedFeature) == editedStreet)
m_getOriginalFeatureStreetFn(editedFeature) == editedStreet)
{
// We always have a feature with fid.m_mwmId, fid.m_index at the point.
// Either it was set previously or just now on quering m_features. See code above.

8
indexer/osm_editor.hpp
View file

@ -50,8 +50,8 @@ public:
void SetMwmIdByNameAndVersionFn(TMwmIdByMapNameFn const & fn) { m_mwmIdByMapNameFn = fn; }
void SetInvalidateFn(TInvalidateFn const & fn) { m_invalidateFn = fn; }
void SetFeatureLoaderFn(TFeatureLoaderFn const & fn) { m_featureLoaderFn = fn; }
void SetFeatureOriginalStretFn(TFeatureOriginalStreetFn const & fn) { m_featureOriginalStreet = fn; }
void SetFeatureLoaderFn(TFeatureLoaderFn const & fn) { m_getOriginalFeatureFn = fn; }
void SetFeatureOriginalStretFn(TFeatureOriginalStreetFn const & fn) { m_getOriginalFeatureStreetFn = fn; }
void LoadMapEdits();
@ -127,9 +127,9 @@ private:
/// Invalidate map viewport after edits.
TInvalidateFn m_invalidateFn;
/// Get FeatureType from mwm.
TFeatureLoaderFn m_featureLoaderFn;
TFeatureLoaderFn m_getOriginalFeatureFn;
/// Get feature original street name or empty string.
TFeatureOriginalStreetFn m_featureOriginalStreet;
TFeatureOriginalStreetFn m_getOriginalFeatureStreetFn;
}; // class Editor
inline string DebugPrint(Editor::FeatureStatus fs)