Localized categories (types) list for Create Feature editor UI.

editor/editor.pro

@@ -19,6 +19,7 @@ SOURCES += \
 
 HEADERS += \
   changeset_wrapper.hpp \
+  new_feature_categories.hpp \
   opening_hours_ui.hpp \
   osm_auth.hpp \
   osm_feature_matcher.hpp \

editor/new_feature_categories.hpp

@@ -0,0 +1,25 @@
+#pragma once
+
+#include "std/cstdint.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
+{
+  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;
+};
+
+struct NewFeatureCategories
+{
+  vector<Category> m_lastUsed;
+  vector<Category> m_allSorted;
+};
+}  // namespace osm

indexer/osm_editor.cpp

@@ -1,3 +1,4 @@
+#include "indexer/categories_holder.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/edits_migration.hpp"
 #include "indexer/feature_algo.hpp"
@@ -10,6 +11,7 @@
 
 #include "platform/local_country_file_utils.hpp"
 #include "platform/platform.hpp"
+#include "platform/preferred_languages.hpp"
 
 #include "editor/changeset_wrapper.hpp"
 #include "editor/osm_auth.hpp"
@@ -831,6 +833,41 @@ Editor::Stats Editor::GetStats() const
   return stats;
 }
 
+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 & elem : gEditableTypes)
+  {
+    uint32_t const type = cl.GetTypeByReadableObjectName(elem.first);
+    if (type == 0)
+    {
+      LOG(LWARNING, ("Unknown type in Editor's config:", elem.first));
+      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)
+  {
+    // TODO(AlexZ): Does it sort correctly?
+    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;
+}
+
 string DebugPrint(Editor::FeatureStatus fs)
 {
   switch (fs)

indexer/osm_editor.hpp

@@ -8,6 +8,7 @@
 #include "indexer/feature_meta.hpp"
 #include "indexer/mwm_set.hpp"
 
+#include "editor/new_feature_categories.hpp"
 #include "editor/xml_feature.hpp"
 
 #include "base/timer.hpp"
@@ -103,6 +104,9 @@ public:
   /// @param[in] tags should provide additional information about client to use in changeset.
   void UploadChanges(string const & key, string const & secret, TChangesetTags tags,
                      TFinishUploadCallback callBack = TFinishUploadCallback());
+  // TODO(mgsergio): Test new types from new config but with old classificator (where these types are absent).
+  // Editor should silently ignore all types in config which are unknown to him.
+  NewFeatureCategories GetNewFeatureCategories() const;
 
   struct Stats
   {

map/framework.cpp

@@ -2331,3 +2331,8 @@ void Framework::DeleteFeature(FeatureID const & fid) const
   // TODO(AlexZ): Use FeatureID in the editor interface.
   osm::Editor::Instance().DeleteFeature(*GetFeatureByID(fid));
 }
+
+osm::NewFeatureCategories Framework::GetEditorCategories() const
+{
+  return osm::Editor::Instance().GetNewFeatureCategories();
+}

map/framework.hpp

@@ -29,6 +29,8 @@
 #include "routing/router.hpp"
 #include "routing/routing_session.hpp"
 
+#include "editor/new_feature_categories.hpp"
+
 #include "geometry/rect2d.hpp"
 #include "geometry/screenbase.hpp"
 
@@ -614,6 +616,7 @@ public:
   bool GetEditableMapObject(FeatureID const & fid, osm:: EditableMapObject & emo) const;
   void SaveEditedMapObject(osm:: EditableMapObject const & emo) const;
   void DeleteFeature(FeatureID const & fid) const;
+  osm::NewFeatureCategories GetEditorCategories() const;
   //@}
 
 private: