From a63b5b9443ca6dcd813fdb4219d83fbc7bdb8b8b Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Wed, 8 Feb 2012 17:27:26 +0300
Subject: [PATCH] [ios] Added flags to search results when radar mode is not
 enabled

---
 iphone/Maps/Classes/SearchVC.mm | 13 +++++++++++++
 search/result.hpp               |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/iphone/Maps/Classes/SearchVC.mm b/iphone/Maps/Classes/SearchVC.mm
index 7dc92be7de..b65ba6fa0a 100644
--- a/iphone/Maps/Classes/SearchVC.mm
+++ b/iphone/Maps/Classes/SearchVC.mm
@@ -433,6 +433,19 @@ static void OnSearchResultCallback(search::Results const & res, int queryId)
       cell.featureCountry.text = [NSString stringWithUTF8String:r.GetRegionString()];
       cell.featureType.text = [NSString stringWithUTF8String:r.GetFeatureType()];
       cell.featureDistance.text = [SearchVC formatDistance:r.GetDistanceFromCenter()];
+      if (m_radarButton.isSelected)
+        cell.accessoryView = nil;
+      else
+      { // Show flags only when radar mode is disabled
+        char const * flagCode = r.GetRegionFlag();
+        if (flagCode)
+        {
+          UIImage * flagImage = [UIImage imageNamed:[NSString stringWithFormat:@"%s.png", flagCode]];
+          UIImageView * imgView = [[UIImageView alloc] initWithImage:flagImage];
+          cell.accessoryView = imgView;
+          [imgView release];
+        }
+      }
       return cell;
     }
     break;
diff --git a/search/result.hpp b/search/result.hpp
index 5d3146c73d..76bf863970 100644
--- a/search/result.hpp
+++ b/search/result.hpp
@@ -25,7 +25,7 @@ public:
   // String that is displayed in the GUI.
   char const * GetString() const { return m_str.c_str(); }
   char const * GetRegionString() const { return m_region.c_str(); }
-  char const * GetRegionFlag() const { return m_flag.c_str(); }
+  char const * GetRegionFlag() const { return m_flag.empty() ? 0 : m_flag.c_str(); }
   char const * GetFeatureType() const { return m_type.c_str(); }
 
   // Type of the result.