[editor] Implemented search of a category for a newly added object.

1 files changed, 1 insertions, 30 deletions

diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp
index 11cca69a57..868a108f90 100644
--- a/indexer/osm_editor.cpp
+++ b/indexer/osm_editor.cpp
@@ -894,36 +894,7 @@ Editor::Stats Editor::GetStats() const
 
 NewFeatureCategories Editor::GetNewFeatureCategories() const
 {
-  // TODO(mgsergio): Load types user can create from XML file.
-  // TODO: Not every editable type can be created by user.
-  CategoriesHolder const & cats = GetDefaultCategories();
-  int8_t const locale = CategoriesHolder::MapLocaleToInteger(languages::GetCurrentOrig());
-  Classificator const & cl = classif();
-  NewFeatureCategories res;
-  for (auto const & classificatorType : m_config.GetTypesThatCanBeAdded())
-  {
-    uint32_t const type = cl.GetTypeByReadableObjectName(classificatorType);
-    if (type == 0)
-    {
-      LOG(LWARNING, ("Unknown type in Editor's config:", classificatorType));
-      continue;
-    }
-    res.m_allSorted.emplace_back(type, cats.GetReadableFeatureType(type, locale));
-  }
-  sort(res.m_allSorted.begin(), res.m_allSorted.end(), [](Category const & c1, Category const & c2)
-  {
-    return c1.m_name < c2.m_name;
-  });
-  // TODO(mgsergio): Store in Settings:: recent history of created types and use them here.
-  // Max history items count shoud be set in the config.
-  uint32_t const cafe = cl.GetTypeByPath({"amenity", "cafe"});
-  res.m_lastUsed.emplace_back(cafe, cats.GetReadableFeatureType(cafe, locale));
-  uint32_t const restaurant = cl.GetTypeByPath({"amenity", "restaurant"});
-  res.m_lastUsed.emplace_back(restaurant, cats.GetReadableFeatureType(restaurant, locale));
-  uint32_t const atm = cl.GetTypeByPath({"amenity", "atm"});
-  res.m_lastUsed.emplace_back(atm, cats.GetReadableFeatureType(atm, locale));
-
-  return res;
+  return NewFeatureCategories(m_config);
 }
 
 FeatureID Editor::GenerateNewFeatureId(MwmSet::MwmId const & id)