AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[platform] Remove RESOURCES_METASERVER_URL artifact

Browse source 
Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2021-08-23 09:08:57 +03:00 • committed by Alexander Borsuk
parent d88ff6e9b5
commit 9c2d9205f6
4 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/jni/com/mapswithme/maps/DownloadResourcesLegacyActivity.cpp
View file

@ -215,7 +215,7 @@ extern "C"
Callback onFinish(std::bind(&DownloadFileFinished, jni::make_global_ref(listener), _1));
Callback onProgress(std::bind(&DownloadFileProgress, jni::make_global_ref(listener), _1));
g_currentRequest.reset(HttpRequest::PostJson(GetPlatform().ResourcesMetaServerUrl(), curFile.m_fileName,
g_currentRequest.reset(HttpRequest::Get(GetPlatform().MetaServerUrl(),
std::bind(&DownloadURLListFinished, _1, onFinish, onProgress)));
return ERR_FILE_IN_PROGRESS;
}

5
platform/platform.cpp
View file

@ -150,11 +150,6 @@ string Platform::ReadPathForFile(string const & file, string searchScope) const
"Have been looking in:\n", possiblePaths));
}
string Platform::ResourcesMetaServerUrl() const
{
return RESOURCES_METASERVER_URL;
}
string Platform::MetaServerUrl() const
{
return METASERVER_URL;

1
platform/platform.hpp
View file

@ -263,7 +263,6 @@ public:
/// @return url for clients to download maps
//@{
std::string MetaServerUrl() const;
std::string ResourcesMetaServerUrl() const;
//@}
/// @return JSON-encoded list of urls if metaserver is unreachable

1
private_default.h
View file

@ -3,7 +3,6 @@
#define OSM_CONSUMER_KEY "zz16eUusTr4TcVhoKQrgOJaRzZAeI2ktbVx6e3yn"
#define OSM_CONSUMER_SECRET "7g4XrlhFkiOG1I3Zpqh8ajo94P9cNNXaU2YCMgL7"
#define MWM_GEOLOCATION_SERVER ""
#define RESOURCES_METASERVER_URL ""
#define METASERVER_URL ""
#define DIFF_LIST_URL ""
#define DEFAULT_URLS_JSON "[ \"https://cdn.organicmaps.app/\" ]"