ServerApi returns response directly.

1 files changed, 5 insertions, 10 deletions

diff --git a/editor/server_api.cpp b/editor/server_api.cpp
index 891156e5fc..10d04192df 100644
--- a/editor/server_api.cpp
+++ b/editor/server_api.cpp
@@ -100,7 +100,7 @@ OsmOAuth::ResponseCode ServerApi06::TestUserExists(string const & userName)
   return m_auth.DirectRequest(method, false).first;
 }
 
-string ServerApi06::GetXmlFeaturesInRect(m2::RectD const & latLonRect) const
+OsmOAuth::Response ServerApi06::GetXmlFeaturesInRect(m2::RectD const & latLonRect) const
 {
   using strings::to_string_dac;
 
@@ -111,19 +111,14 @@ string ServerApi06::GetXmlFeaturesInRect(m2::RectD const & latLonRect) const
   string const url = "/map?bbox=" + to_string_dac(lb.x, kDAC) + ',' + to_string_dac(lb.y, kDAC) + ',' +
       to_string_dac(rt.x, kDAC) + ',' + to_string_dac(rt.y, kDAC);
 
-  OsmOAuth::Response const response = m_auth.DirectRequest(url);
-  if (response.first == OsmOAuth::ResponseCode::OK)
-    return response.second;
-
-  LOG(LWARNING, ("GetXmlFeaturesInRect request has failed:", response.first));
-  return string();
+  return m_auth.DirectRequest(url);
 }
 
-string ServerApi06::GetXmlNodeByLatLon(double lat, double lon) const
+OsmOAuth::Response ServerApi06::GetXmlNodeByLatLon(double lat, double lon) const
 {
-  constexpr double const kInflateRadiusDegrees = 1.0e-6; //!< ~1 meter.
+  double const kInflateEpsilon = MercatorBounds::GetCellID2PointAbsEpsilon();
   m2::RectD rect(lon, lat, lon, lat);
-  rect.Inflate(kInflateRadiusDegrees, kInflateRadiusDegrees);
+  rect.Inflate(kInflateEpsilon, kInflateEpsilon);
   return GetXmlFeaturesInRect(rect);
 }