Return better feature type than "building" if feature has many choices.

2 files changed, 35 insertions, 0 deletions

diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp
index 6decfe5e83..868c7aeb08 100644
--- a/indexer/feature_data.cpp
+++ b/indexer/feature_data.cpp
@@ -7,6 +7,10 @@
 
 using namespace feature;
 
+////////////////////////////////////////////////////////////////////////////////////
+// TypesHolder implementation
+////////////////////////////////////////////////////////////////////////////////////
+
 TypesHolder::TypesHolder(FeatureBase const & f)
 : m_size(0), m_geoType(f.GetFeatureType())
 {
@@ -33,6 +37,34 @@ void TypesHolder::Remove(uint32_t t)
   }
 }
 
+void TypesHolder::SortBySpec()
+{
+  if (m_size < 2)
+    return;
+
+  // do very simple thing - put "very common" types to the end
+  /// @todo Make this function usefull for many "common" types.
+
+  // initialize common types
+  Classificator const & c = classif();
+  vector<string> path(1);
+  path[0] = "building";
+  uint32_t const buildingT = c.GetTypeByPath(path);
+
+  // do swaps with "common" types
+  size_t end = m_size-1;
+  for (size_t i = 0; i < end; ++i)
+    if (m_types[i] == buildingT)
+    {
+      swap(m_types[i], m_types[end]);
+      ASSERT_NOT_EQUAL(m_types[i], buildingT, ());
+      break;
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////////
+// FeatureParamsBase implementation
+////////////////////////////////////////////////////////////////////////////////////
 
 void FeatureParamsBase::MakeZero()
 {
diff --git a/indexer/feature_data.hpp b/indexer/feature_data.hpp
index 35b70c2a8c..850a0d70f9 100644
--- a/indexer/feature_data.hpp
+++ b/indexer/feature_data.hpp
@@ -89,6 +89,9 @@ namespace feature
 
     void Remove(uint32_t t);
     string DebugPrint() const;
+
+    /// Sort types by it's specification (more detailed type goes first).
+    void SortBySpec();
   };
 
   inline string DebugPrint(TypesHolder const & t)