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

[editor] Generate new feature ID for created features.

Browse source
This commit is contained in:
Alex Zolotarev 2016-03-07 09:35:10 +03:00 • committed by Sergey Yershov
parent 121ec7cac0
commit d48b236fb0
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
indexer/osm_editor.cpp
View file

@ -683,16 +683,22 @@ NewFeatureCategories Editor::GetNewFeatureCategories() const
return res;
}
namespace
FeatureID Editor::GenerateNewFeatureId(MwmSet::MwmId const & id)
{
FeatureID GenerateNewFeatureId(FeatureID const & oldFeatureId)
{
// TODO(AlexZ): Stable & unique features ID generation.
// TODO(vng): Looks like new feature indexes should uninterruptedly continue after existing indexes in mwm file.
static uint32_t newIndex = 0x0effffff;
return FeatureID(oldFeatureId.m_mwmId, newIndex++);
// TODO(vng): Double-check if new feature indexes should uninterruptedly continue after existing indexes in mwm file.
uint32_t featureIndex = kStartIndexForCreatedFeatures;
auto const found = m_features.find(id);
if (found != m_features.end())
{
// Scan all already created features and choose next available ID.
for (auto const & feature : found->second)
{
if (feature.second.m_status == FeatureStatus::Created && featureIndex <= feature.first)
featureIndex = feature.first + 1;
}
}
return FeatureID(id, featureIndex);
}
} // namespace
bool Editor::CreatePoint(uint32_t type, m2::PointD const & mercator, MwmSet::MwmId const & id, EditableMapObject & outFeature)
{

1
indexer/osm_editor.hpp
View file

@ -132,6 +132,7 @@ private:
/// Notify framework that something has changed and should be redisplayed.
void Invalidate();
FeatureID GenerateNewFeatureId(MwmSet::MwmId const & id);
EditableProperties GetEditablePropertiesForTypes(feature::TypesHolder const & types) const;
struct FeatureTypeInfo