From 3ebcb4b87bbfbc23d64fc76009873767390ba3c5 Mon Sep 17 00:00:00 2001
From: Daria Volvenkova <d.volvenkova@corp.mail.ru>
Date: Tue, 22 Mar 2016 18:23:41 +0300
Subject: [PATCH] Building marks removed.

---
 drape_frontend/apply_feature_functors.cpp |  1 -
 drape_frontend/shape_view_params.hpp      |  1 -
 drape_frontend/stylist.cpp                | 12 ------------
 drape_frontend/stylist.hpp                |  2 --
 drape_frontend/text_shape.cpp             |  4 ----
 5 files changed, 20 deletions(-)

diff --git a/drape_frontend/apply_feature_functors.cpp b/drape_frontend/apply_feature_functors.cpp
index a212e06b29..d2576ad0d7 100644
--- a/drape_frontend/apply_feature_functors.cpp
+++ b/drape_frontend/apply_feature_functors.cpp
@@ -224,7 +224,6 @@ void BaseApplyFeature::ExtractCaptionParams(CaptionDefProto const * primaryProto
   params.m_primaryOffset = GetOffset(primaryProto);
   params.m_primaryOptional = primaryProto->has_is_optional() ? primaryProto->is_optional() : true;
   params.m_secondaryOptional = true;
-  params.m_hasMark = m_captions.HasMark();
 
   if (secondaryProto)
   {
diff --git a/drape_frontend/shape_view_params.hpp b/drape_frontend/shape_view_params.hpp
index f04cba1edd..6792b2ae6a 100644
--- a/drape_frontend/shape_view_params.hpp
+++ b/drape_frontend/shape_view_params.hpp
@@ -68,7 +68,6 @@ struct TextViewParams : CommonViewParams
   m2::PointF m_primaryOffset;
   bool m_primaryOptional = false;
   bool m_secondaryOptional = false;
-  bool m_hasMark = false;
   uint32_t m_extendingSize = 0;
   float m_posZ = 0.0f;
 };
diff --git a/drape_frontend/stylist.cpp b/drape_frontend/stylist.cpp
index b91392d97e..56e7edec63 100644
--- a/drape_frontend/stylist.cpp
+++ b/drape_frontend/stylist.cpp
@@ -203,13 +203,6 @@ void CaptionDescription::Init(FeatureType const & f,
   m_roadNumber = f.GetRoadNumber();
   m_houseNumber = f.GetHouseNumber();
 
-  // Mark houses without names/numbers so user can select them by single tap.
-  if (m_houseNumber.empty() && m_mainText.empty() && ftypes::IsBuildingChecker::Instance()(f))
-  {
-    m_houseNumber = "·";
-    m_hasMark = true;
-  }
-
   SwapCaptions(zoomLevel);
   DiscardLongCaption(zoomLevel);
 }
@@ -269,11 +262,6 @@ bool CaptionDescription::IsNameExists() const
   return !m_mainText.empty() || !m_houseNumber.empty();
 }
 
-bool CaptionDescription::HasMark() const
-{
-  return m_hasMark;
-}
-
 void CaptionDescription::SwapCaptions(int const zoomLevel)
 {
   if (zoomLevel <= scales::GetUpperWorldScale() && !m_auxText.empty())
diff --git a/drape_frontend/stylist.hpp b/drape_frontend/stylist.hpp
index 148e78c3cc..2540c68c39 100644
--- a/drape_frontend/stylist.hpp
+++ b/drape_frontend/stylist.hpp
@@ -30,7 +30,6 @@ struct CaptionDescription
   string const & GetRoadNumber() const;
   string GetPathName() const;
   bool IsNameExists() const;
-  bool HasMark() const;
 
 private:
   void SwapCaptions(int const zoomLevel);
@@ -41,7 +40,6 @@ private:
   string m_auxText;
   string m_roadNumber;
   string m_houseNumber;
-  bool m_hasMark = false;
 };
 
 class Stylist
diff --git a/drape_frontend/text_shape.cpp b/drape_frontend/text_shape.cpp
index 84250d9ecd..e99a9047e7 100644
--- a/drape_frontend/text_shape.cpp
+++ b/drape_frontend/text_shape.cpp
@@ -281,10 +281,6 @@ uint64_t TextShape::GetOverlayPriority() const
   if (m_disableDisplacing)
     return dp::kPriorityMaskAll;
 
-  // Set up minimal priority for marks which substitute texts.
-  if (m_params.m_hasMark)
-    return 0;
-
   // Overlay priority for text shapes considers length of the primary text
   // (the more text length, the more priority) and index of text.
   // [6 bytes - standard overlay priority][1 byte - length][1 byte - text index].