From 362a283c933a30ceb86ce090759d499bd9afebcc Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Mon, 17 Dec 2012 13:50:17 +0300
Subject: [android] Replace country name with country index in downloading
 routine.

---
 map/framework.cpp | 5 ++---
 map/framework.hpp | 7 ++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'map')

diff --git a/map/framework.cpp b/map/framework.cpp
index 7edaf2b81a..b07715efef 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1346,10 +1346,9 @@ void Framework::DeleteOldMaps()
 }
 */
 
-string Framework::GetCountryCodeByPosition(double lat, double lon) const
+string Framework::GetCountryCode(m2::PointD const & pt) const
 {
-  return GetSearchEngine()->GetCountryCode(m2::PointD(
-                           MercatorBounds::LonToX(lon), MercatorBounds::LatToY(lat)));
+  return GetSearchEngine()->GetCountryCode(pt);
 }
 
 gui::Controller * Framework::GetGuiController() const
diff --git a/map/framework.hpp b/map/framework.hpp
index 1d3fc661d7..23e23be2f8 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -271,15 +271,16 @@ public:
                             double lat, double lon, double north,
                             string & distance, double & azimut);
 
-private:
+ //@{
   storage::TIndex GetCountryIndex(m2::PointD const & pt) const;
-public:
+
   string GetCountryName(m2::PointD const & pt) const;
   /// @param[in] id Country file name without an extension.
   string GetCountryName(string const & id) const;
 
   /// @return country code in ISO 3166-1 alpha-2 format (two small letters) or empty string
-  string GetCountryCodeByPosition(double lat, double lon) const;
+  string GetCountryCode(m2::PointD const & pt) const;
+  //@}
 
   void SetMaxWorldRect();
 
-- 
cgit v1.2.3