new balloon logic

2 files changed, 9 insertions, 5 deletions

diff --git a/map/bookmark_balloon.cpp b/map/bookmark_balloon.cpp
index b68146164b..5ca682ab2c 100644
--- a/map/bookmark_balloon.cpp
+++ b/map/bookmark_balloon.cpp
@@ -206,6 +206,7 @@ void BookmarkBalloon::animTaskEnded(int animIndex)
   }
 
   m_mainTextView->setIsVisible(isVisibleTextAndImage);
+  m_auxTextView->setIsVisible(isVisibleTextAndImage);
   m_imageView->setIsVisible(isVisibleTextAndImage);
 }
 
@@ -245,7 +246,7 @@ void BookmarkBalloon::setGlbPivot(m2::PointD const & pivot)
   m_glbPivot = pivot;
 }
 
-m2::PointD const BookmarkBalloon::glbPivot()
+m2::PointD const & BookmarkBalloon::glbPivot() const
 {
   return m_glbPivot;
 }
@@ -275,7 +276,10 @@ void BookmarkBalloon::setBookmarkCaption(string const & name,
   setText(name, type);
 }
 
-string const & BookmarkBalloon::bookmarkName()
+string BookmarkBalloon::bookmarkName() const
 {
-  return m_bmkName;
+  if (!m_bmkName.empty() && !m_bmkType.empty())
+    return m_bmkName + " (" + m_bmkType + ")";
+
+  return m_bmkName.empty() ? m_bmkType : m_bmkName;
 }
diff --git a/map/bookmark_balloon.hpp b/map/bookmark_balloon.hpp
index 9f2fc05fce..51ed374d35 100644
--- a/map/bookmark_balloon.hpp
+++ b/map/bookmark_balloon.hpp
@@ -46,8 +46,8 @@ public:
   void hide();
 
   void setGlbPivot(m2::PointD const & pivot);
-  m2::PointD const glbPivot();
+  m2::PointD const & glbPivot() const;
 
   void setBookmarkCaption(string const & name, string const & type);
-  string const & bookmarkName();
+  string bookmarkName() const;
 };