From 93072665afbdb6bc0ef28cfc46de885324b3a872 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Wed, 26 Oct 2022 17:33:49 +0200
Subject: [PATCH] Review fixes

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 platform/platform.cpp            | 6 ++----
 platform/platform.hpp            | 6 ++----
 storage/map_files_downloader.cpp | 5 +++--
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/platform/platform.cpp b/platform/platform.cpp
index b85cb75251..e14ca2c295 100644
--- a/platform/platform.cpp
+++ b/platform/platform.cpp
@@ -164,14 +164,12 @@ std::string Platform::ReadPathForFile(std::string const & file, std::string sear
       "\nw: ", m_writableDir, "\nr: ", m_resourcesDir, "\ns: ", m_settingsDir));
 }
 
-// static
-std::string Platform::MetaServerUrl()
+std::string Platform::MetaServerUrl() const
 {
   return METASERVER_URL;
 }
 
-// static
-std::string Platform::DefaultUrlsJSON()
+std::string Platform::DefaultUrlsJSON() const
 {
   return DEFAULT_URLS_JSON;
 }
diff --git a/platform/platform.hpp b/platform/platform.hpp
index 965bc99a1a..35a0378c7f 100644
--- a/platform/platform.hpp
+++ b/platform/platform.hpp
@@ -266,12 +266,10 @@ public:
   int32_t IntVersion() const;
 
   /// @return url for clients to download maps
-  //@{
-  static std::string MetaServerUrl() ;
-  //@}
+  std::string MetaServerUrl() const;
 
   /// @return JSON-encoded list of urls if metaserver is unreachable
-  static std::string DefaultUrlsJSON() ;
+  std::string DefaultUrlsJSON() const;
 
   bool IsTablet() const { return m_isTablet; }
 
diff --git a/storage/map_files_downloader.cpp b/storage/map_files_downloader.cpp
index f3b219bdf4..9c29fdd11a 100644
--- a/storage/map_files_downloader.cpp
+++ b/storage/map_files_downloader.cpp
@@ -152,7 +152,8 @@ std::vector<std::string> MapFilesDownloader::MakeUrlList(std::string const & rel
 // static
 MetaConfig MapFilesDownloader::LoadMetaConfig()
 {
-  std::string const metaServerUrl = Platform::MetaServerUrl();
+  Platform & pl = GetPlatform();
+  std::string const metaServerUrl = pl.MetaServerUrl();
   std::string httpResult;
 
   if (!metaServerUrl.empty())
@@ -167,7 +168,7 @@ MetaConfig MapFilesDownloader::LoadMetaConfig()
   std::optional<MetaConfig> metaConfig = downloader::ParseMetaConfig(httpResult);
   if (!metaConfig)
   {
-    metaConfig = downloader::ParseMetaConfig(Platform::DefaultUrlsJSON());
+    metaConfig = downloader::ParseMetaConfig(pl.DefaultUrlsJSON());
     CHECK(metaConfig, ());
     LOG(LWARNING, ("Can't get meta configuration from request, using default servers:", metaConfig->m_serversList));
   }