diff options
| -rw-r--r-- | common.pri | 4 | ||||
| -rw-r--r-- | defines.hpp | 7 | ||||
| -rw-r--r-- | integration_tests/routing_test_tools.cpp | 2 | ||||
| -rw-r--r-- | platform/platform.cpp | 8 | ||||
| -rw-r--r-- | platform/wifi_location_service.cpp | 2 | ||||
| -rw-r--r-- | routing/online_absent_fetcher.cpp | 4 |
6 files changed, 14 insertions, 13 deletions
diff --git a/common.pri b/common.pri index c3d0b77944..3a2c78fc81 100644 --- a/common.pri +++ b/common.pri @@ -220,6 +220,10 @@ win32* { QMAKE_MOC = $$[QT_INSTALL_BINS]/moc -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED } +# Include with private variables. +HEADERS += \ + $$ROOT_DIR/private.h + # Standard includes wrappers. HEADERS += \ $$ROOT_DIR/std/algorithm.hpp \ diff --git a/defines.hpp b/defines.hpp index b2e0831065..06ac0198ad 100644 --- a/defines.hpp +++ b/defines.hpp @@ -34,13 +34,6 @@ #define ROUTING_FTSEG_FILE_TAG "ftseg" #define ROUTING_NODEIND_TO_FTSEGIND_FILE_TAG "node2ftseg" -// Switch to a development osrm server for online checking of the absent contries. -#ifdef DEV_OSRM_SERVER -#define OSRM_ONLINE_SERVER_URL "http://osrm.online.dev.server" -#else -#define OSRM_ONLINE_SERVER_URL "http://osrm.online.server" -#endif - #define READY_FILE_EXTENSION ".ready" #define RESUME_FILE_EXTENSION ".resume3" #define DOWNLOADING_FILE_EXTENSION ".downloading3" diff --git a/integration_tests/routing_test_tools.cpp b/integration_tests/routing_test_tools.cpp index d7e37d322f..5712537c39 100644 --- a/integration_tests/routing_test_tools.cpp +++ b/integration_tests/routing_test_tools.cpp @@ -27,6 +27,8 @@ #include "search/search_engine.hpp" #include "search/search_query_factory.hpp" +#include "private.h" + #include <sys/resource.h> diff --git a/platform/platform.cpp b/platform/platform.cpp index 292b75f43f..c34b28a1b9 100644 --- a/platform/platform.cpp +++ b/platform/platform.cpp @@ -11,6 +11,8 @@ #include "std/target_os.hpp" #include "std/thread.hpp" +#include "private.h" + #include <errno.h> // static @@ -71,17 +73,17 @@ string Platform::HashUniqueID(string const & s) string Platform::ResourcesMetaServerUrl() const { - return "http://active.resources.servers.url"; + return RESOURCES_METASERVER_URL; } string Platform::MetaServerUrl() const { - return "http://active.servers.url"; + return METASERVER_URL; } string Platform::DefaultUrlsJSON() const { - return "[\"http://v2s-1.mapswithme.com/\",\"http://v2s-2.mapswithme.com/\",\"http://v2s-3.mapswithme.com/\"]"; + return DEFAULT_URLS_JSON; } void Platform::GetFontNames(FilesList & res) const diff --git a/platform/wifi_location_service.cpp b/platform/wifi_location_service.cpp index 466d214546..cf8c98662a 100644 --- a/platform/wifi_location_service.cpp +++ b/platform/wifi_location_service.cpp @@ -9,7 +9,7 @@ #include "3party/jansson/myjansson.hpp" -#define MWM_GEOLOCATION_SERVER "http://geolocation.server/" +#include "private.h" namespace location diff --git a/routing/online_absent_fetcher.cpp b/routing/online_absent_fetcher.cpp index 557d8027e8..dd707e6dec 100644 --- a/routing/online_absent_fetcher.cpp +++ b/routing/online_absent_fetcher.cpp @@ -1,6 +1,4 @@ #include "online_absent_fetcher.hpp" - -#include "defines.hpp" #include "online_cross_fetcher.hpp" #include "platform/platform.hpp" @@ -9,6 +7,8 @@ #include "std/vector.hpp" +#include "private.h" + using platform::CountryFile; using platform::LocalCountryFile; |