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

base/mem_trie.hpp

@@ -15,6 +15,12 @@ class MemTrie
 public:
   MemTrie() = default;
 
+  MemTrie(MemTrie && other) : m_root(move(other.m_root))
+  {
+    m_numNodes = other.m_numNodes;
+    other.m_numNodes = 0;
+  }
+
   // Adds a key-value pair to the trie.
   void Add(TString const & key, TValue const & value)
   {
@@ -53,6 +59,8 @@ private:
 
     Node() = default;
 
+    Node(Node && other) = default;
+
     ~Node()
     {
       for (auto const & move : m_moves)
@@ -76,7 +84,7 @@ private:
     map<TChar, Node *> m_moves;
     vector<TValue> m_values;
 
-    DISALLOW_COPY_AND_MOVE(Node);
+    DISALLOW_COPY(Node);
   };
 
   Node const * MoveTo(TString const & key) const
@@ -112,6 +120,6 @@ private:
   Node m_root;
   size_t m_numNodes = 0;
 
-  DISALLOW_COPY_AND_MOVE(MemTrie);
+  DISALLOW_COPY(MemTrie);
 };  // class MemTrie
 }  // namespace my

editor/editor.pro

@@ -12,6 +12,7 @@ SOURCES += \
   changeset_wrapper.cpp \
   editor_config.cpp \
   editor_notes.cpp \
+  new_feature_categories.cpp \
   opening_hours_ui.cpp \
   osm_auth.cpp \
   osm_feature_matcher.cpp \

editor/new_feature_categories.cpp

@@ -0,0 +1,65 @@
+#include "new_feature_categories.hpp"
+
+#include "indexer/categories_holder.hpp"
+#include "indexer/classificator.hpp"
+
+#include "base/stl_helpers.hpp"
+
+#include "std/algorithm.hpp"
+
+namespace osm
+{
+NewFeatureCategories::NewFeatureCategories(editor::EditorConfig const & config)
+{
+  // TODO(mgsergio): Load types user can create from XML file.
+  // TODO: Not every editable type can be created by user.
+  // TODO(mgsergio): Store in Settings:: recent history of created types and use them here.
+  // Max history items count shoud be set in the config.
+  Classificator const & cl = classif();
+  for (auto const & classificatorType : config.GetTypesThatCanBeAdded())
+  {
+    uint32_t const type = cl.GetTypeByReadableObjectName(classificatorType);
+    if (type == 0)
+    {
+      LOG(LWARNING, ("Unknown type in Editor's config:", classificatorType));
+      continue;
+    }
+    m_types.push_back(type);
+  }
+}
+
+void NewFeatureCategories::AddLanguage(string const & lang)
+{
+  auto const langCode = CategoriesHolder::MapLocaleToInteger(lang);
+  vector<string> names;
+  names.reserve(m_types.size());
+  for (auto const & type : m_types)
+  {
+    m_index.AddCategoryByTypeAndLang(type, langCode);
+    names.push_back(m_index.GetCategoriesHolder().GetReadableFeatureType(type, langCode));
+  }
+  my::SortUnique(names);
+  m_categoryNames[lang] = names;
+}
+
+vector<string> NewFeatureCategories::Search(string const & query, string const & lang) const
+{
+  auto const langCode = CategoriesHolder::MapLocaleToInteger(lang);
+  vector<uint32_t> resultTypes;
+  m_index.GetAssociatedTypes(query, resultTypes);
+
+  vector<string> result(resultTypes.size());
+  for (size_t i = 0; i < result.size(); ++i)
+    result[i] = m_index.GetCategoriesHolder().GetReadableFeatureType(resultTypes[i], langCode);
+  my::SortUnique(result);
+  return result;
+}
+
+vector<string> NewFeatureCategories::GetAllCategoryNames(string const & lang)
+{
+  auto const it = m_categoryNames.find(lang);
+  if (it == m_categoryNames.end())
+    return {};
+  return it->second;
+}
+}  // namespace osm

editor/new_feature_categories.hpp

@@ -1,25 +1,50 @@
 #pragma once
 
+#include "editor/editor_config.hpp"
+
+#include "indexer/categories_index.hpp"
+
+#include "base/macros.hpp"
+
 #include "std/cstdint.hpp"
+#include "std/map.hpp"
 #include "std/string.hpp"
 #include "std/utility.hpp"
 #include "std/vector.hpp"
 
 namespace osm
 {
-/// Category is an UI synonym to our internal "classificator type".
-struct Category
+// This class holds an index of categories that can be set for a newly added feature.
+class NewFeatureCategories
 {
-  Category(uint32_t type, string const & name) : m_type(type), m_name(name) {}
-  /// Feature type from classificator.
-  uint32_t m_type;
-  /// Localized category name. English is used by default.
-  string m_name;
-};
+public:
+  NewFeatureCategories(editor::EditorConfig const & config);
 
-struct NewFeatureCategories
-{
-  vector<Category> m_lastUsed;
-  vector<Category> m_allSorted;
+  NewFeatureCategories(NewFeatureCategories && other)
+    : m_index(move(other.m_index))
+    , m_types(move(other.m_types))
+    , m_categoryNames(move(other.m_categoryNames))
+  {
+  }
+
+  // Adds all known synonyms in language |lang| for all categories that
+  // can be applied to a newly added feature.
+  void AddLanguage(string const & lang);
+
+  // Returns names (in language |lang|) of categories that have a synonym containing
+  // the substring |query| (in any language that was added before).
+  // The returned list is sorted.
+  vector<string> Search(string const & query, string const & lang) const;
+
+  // Returns all registered names of categories in language |lang|.
+  // The returned list is sorted.
+  vector<string> GetAllCategoryNames(string const & lang);
+
+private:
+  indexer::CategoriesIndex m_index;
+  vector<uint32_t> m_types;
+  map<string, vector<string>> m_categoryNames;
+
+  DISALLOW_COPY(NewFeatureCategories);
 };
 }  // namespace osm

indexer/categories_index.cpp

@@ -27,11 +27,12 @@ void AddAllNonemptySubstrings(my::MemTrie<string, uint32_t> & trie, string const
   }
 }
 
-template<typename TF>
+template <typename TF>
 void ForEachToken(string const & s, TF && fn)
 {
   vector<strings::UniString> tokens;
-  SplitUniString(search::NormalizeAndSimplifyString(s), MakeBackInsertFunctor(tokens), search::Delimiters());
+  SplitUniString(search::NormalizeAndSimplifyString(s), MakeBackInsertFunctor(tokens),
+                 search::Delimiters());
   for (auto const & token : tokens)
     fn(strings::ToUtf8(token));
 }
@@ -101,7 +102,7 @@ void CategoriesIndex::GetAssociatedTypes(string const & query, vector<uint32_t>
 {
   bool first = true;
   set<uint32_t> intersection;
-  ForEachToken(query, [&](string const & token)
+  auto processToken = [&](string const & token)
   {
     set<uint32_t> types;
     auto fn = [&](string const &, uint32_t type)
@@ -109,6 +110,7 @@ void CategoriesIndex::GetAssociatedTypes(string const & query, vector<uint32_t>
       types.insert(type);
     };
     m_trie.ForEachInSubtree(token, fn);
+
     if (first)
     {
       intersection.swap(types);
@@ -116,12 +118,14 @@ void CategoriesIndex::GetAssociatedTypes(string const & query, vector<uint32_t>
     else
     {
       set<uint32_t> tmp;
-      set_intersection(intersection.begin(),intersection.end(),types.begin(),types.end(),inserter(tmp,tmp.begin()));
+      set_intersection(intersection.begin(), intersection.end(), types.begin(), types.end(),
+                       inserter(tmp, tmp.begin()));
       intersection.swap(tmp);
     }
     first = false;
-  });
-  
+  };
+  ForEachToken(query, processToken);
+
   result.insert(result.end(), intersection.begin(), intersection.end());
 }
 }  // namespace indexer

indexer/categories_index.hpp

@@ -22,6 +22,13 @@ public:
 
   CategoriesIndex(CategoriesHolder const & catHolder) : m_catHolder(catHolder) {}
 
+  CategoriesIndex(CategoriesIndex && other)
+    : m_catHolder(other.m_catHolder), m_trie(move(other.m_trie))
+  {
+  }
+
+  CategoriesHolder const & GetCategoriesHolder() const { return m_catHolder; }
+
   // Adds all categories that match |type|. Only synonyms
   // in language |lang| are added. See indexer/categories_holder.cpp
   // for language enumeration.

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)

qt/create_feature_dialog.cpp

@@ -9,33 +9,40 @@
 CreateFeatureDialog::CreateFeatureDialog(QWidget * parent, osm::NewFeatureCategories const & cats)
   : QDialog(parent)
 {
-  QListWidget * lastUsedList = new QListWidget();
-  for (auto const & cat : cats.m_lastUsed)
-  {
-    QListWidgetItem * lwi = new QListWidgetItem(cat.m_name.c_str(), lastUsedList);
-    lwi->setData(Qt::UserRole, cat.m_type);
-  }
-  connect(lastUsedList, SIGNAL(clicked(QModelIndex const &)), this, SLOT(OnListItemSelected(QModelIndex const &)));
+  // todo(@m) Fix this.
+  /*
+    QListWidget * lastUsedList = new QListWidget();
 
-  QListWidget * allSortedList = new QListWidget();
-  for (auto const & cat : cats.m_allSorted)
-  {
-    QListWidgetItem * lwi = new QListWidgetItem(cat.m_name.c_str(), allSortedList);
-    lwi->setData(Qt::UserRole, cat.m_type);
-  }
-  connect(allSortedList, SIGNAL(clicked(QModelIndex const &)), this, SLOT(OnListItemSelected(QModelIndex const &)));
+    for (auto const & cat : cats.m_lastUsed)
+    {
+      QListWidgetItem * lwi = new QListWidgetItem(cat.m_name.c_str(), lastUsedList);
+      lwi->setData(Qt::UserRole, cat.m_type);
+    }
+    connect(lastUsedList, SIGNAL(clicked(QModelIndex const &)), this,
+    SLOT(OnListItemSelected(QModelIndex const &)));
 
-  QVBoxLayout * vBox = new QVBoxLayout();
-  vBox->addWidget(lastUsedList);
-  vBox->addWidget(allSortedList);
+    QListWidget * allSortedList = new QListWidget();
+    for (auto const & cat : cats.m_allSorted)
+    {
+      QListWidgetItem * lwi = new QListWidgetItem(cat.m_name.c_str(), allSortedList);
+      lwi->setData(Qt::UserRole, cat.m_type);
+    }
+    connect(allSortedList, SIGNAL(clicked(QModelIndex const &)), this,
+    SLOT(OnListItemSelected(QModelIndex const &)));
 
-  QDialogButtonBox * dbb = new QDialogButtonBox();
-  dbb->addButton(QDialogButtonBox::Close);
-  connect(dbb, SIGNAL(clicked(QAbstractButton*)), this, SLOT(reject()));
-  vBox->addWidget(dbb);
+    QVBoxLayout * vBox = new QVBoxLayout();
+    vBox->addWidget(lastUsedList);
+    vBox->addWidget(allSortedList);
 
-  setLayout(vBox);
-  setWindowTitle("OSM Editor");
+
+    QDialogButtonBox * dbb = new QDialogButtonBox();
+    dbb->addButton(QDialogButtonBox::Close);
+    connect(dbb, SIGNAL(clicked(QAbstractButton*)), this, SLOT(reject()));
+    vBox->addWidget(dbb);
+
+    setLayout(vBox);
+    setWindowTitle("OSM Editor");
+  */
 }
 
 void CreateFeatureDialog::OnListItemSelected(QModelIndex const & i)

qt/create_feature_dialog.hpp

@@ -5,7 +5,7 @@
 class QModelIndex;
 namespace osm
 {
-struct NewFeatureCategories;
+class NewFeatureCategories;
 }  // namespace osm
 
 class CreateFeatureDialog : public QDialog