diff --git a/android/jni/com/mapswithme/maps/DownloadResourcesLegacyActivity.cpp b/android/jni/com/mapswithme/maps/DownloadResourcesLegacyActivity.cpp index 1561fceccc..cdd9145d21 100644 --- a/android/jni/com/mapswithme/maps/DownloadResourcesLegacyActivity.cpp +++ b/android/jni/com/mapswithme/maps/DownloadResourcesLegacyActivity.cpp @@ -12,12 +12,10 @@ #include "coding/internal/file_data.hpp" #include "coding/reader_streambuf.hpp" -#include "coding/url_encode.hpp" #include "base/file_name_utils.hpp" #include "base/logging.hpp" #include "base/string_utils.hpp" -#include "base/url_helpers.hpp" #include "com/mapswithme/core/jni_helper.hpp" diff --git a/android/jni/com/mapswithme/maps/PrivateVariables.cpp b/android/jni/com/mapswithme/maps/PrivateVariables.cpp index 9a05c95e59..0450bbffc2 100644 --- a/android/jni/com/mapswithme/maps/PrivateVariables.cpp +++ b/android/jni/com/mapswithme/maps/PrivateVariables.cpp @@ -2,7 +2,7 @@ #include "android/jni/com/mapswithme/core/jni_helper.hpp" -#include "base/url_helpers.hpp" +#include "coding/url_helpers.hpp" #include @@ -19,7 +19,7 @@ extern "C" JNIEXPORT jstring JNICALL Java_com_mapswithme_maps_PrivateVariables_alohalyticsRealtimeUrl(JNIEnv * env, jclass clazz) { - return env->NewStringUTF(base::url::Join(ALOHALYTICS_URL, "realtime").c_str()); + return env->NewStringUTF(coding::url::Join(ALOHALYTICS_URL, "realtime").c_str()); } JNIEXPORT jstring JNICALL diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index 913a8fd70f..0e4e8b7584 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -98,8 +98,6 @@ set( timer.hpp uni_string_dfa.cpp uni_string_dfa.hpp - url_helpers.cpp - url_helpers.hpp visitor.hpp ) diff --git a/base/base_tests/CMakeLists.txt b/base/base_tests/CMakeLists.txt index 48b1ff092b..9ff3708ce1 100644 --- a/base/base_tests/CMakeLists.txt +++ b/base/base_tests/CMakeLists.txt @@ -47,7 +47,6 @@ set( timegm_test.cpp timer_test.cpp uni_string_dfa_test.cpp - url_helpers_tests.cpp visitor_tests.cpp ) diff --git a/base/base_tests/url_helpers_tests.cpp b/base/base_tests/url_helpers_tests.cpp deleted file mode 100644 index 6739eb5b34..0000000000 --- a/base/base_tests/url_helpers_tests.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "testing/testing.hpp" - -#include "base/url_helpers.hpp" - -UNIT_TEST(Url_Join) -{ - TEST_EQUAL("", base::url::Join("", ""), ()); - TEST_EQUAL("omim/", base::url::Join("", "omim/"), ()); - TEST_EQUAL("omim/", base::url::Join("omim/", ""), ()); - TEST_EQUAL("omim/strings", base::url::Join("omim", "strings"), ()); - TEST_EQUAL("omim/strings", base::url::Join("omim/", "strings"), ()); - TEST_EQUAL("../../omim/strings", base::url::Join("..", "..", "omim", "strings"), ()); - TEST_EQUAL("../../omim/strings", base::url::Join("../", "..", "omim/", "strings"), ()); - TEST_EQUAL("omim/strings", base::url::Join("omim/", "/strings"), ()); - TEST_EQUAL("../../omim/strings", base::url::Join("../", "/../", "/omim/", "/strings"), ()); - TEST_EQUAL("../omim/strings", base::url::Join("../", "", "/omim/", "/strings"), ()); -} diff --git a/base/url_helpers.cpp b/base/url_helpers.cpp deleted file mode 100644 index e8b6d53aa5..0000000000 --- a/base/url_helpers.cpp +++ /dev/null @@ -1,51 +0,0 @@ -#include "base/url_helpers.hpp" - -#include - -using namespace std; - -namespace base -{ -namespace url -{ -string Make(string const & baseUrl, Params const & params) -{ - ostringstream os; - os << baseUrl; - - bool firstParam = baseUrl.find('?') == string::npos; - for (auto const & param : params) - { - if (firstParam) - { - firstParam = false; - os << "?"; - } - else - { - os << "&"; - } - - os << param.m_name << "=" << param.m_value; - } - - return os.str(); -} - -std::string Join(std::string const & lhs, std::string const & rhs) -{ - if (lhs.empty()) - return rhs; - if (rhs.empty()) - return lhs; - - if (lhs.back() == '/' && rhs.front() == '/') - return lhs + rhs.substr(1); - - if (lhs.back() != '/' && rhs.front() != '/') - return lhs + '/' + rhs; - - return lhs + rhs; -} -} // namespace url -} // namespace base diff --git a/base/url_helpers.hpp b/base/url_helpers.hpp deleted file mode 100644 index 9c0e09beef..0000000000 --- a/base/url_helpers.hpp +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -#include -#include -#include - -namespace base -{ -namespace url -{ -struct Param -{ - Param(std::string const & name, std::string const & value) : m_name(name), m_value(value) {} - - std::string m_name; - std::string m_value; -}; - -using Params = std::vector; - -// Make URL by using base url and vector of params. -std::string Make(std::string const & baseUrl, Params const & params); - -// Joins URL, appends/removes slashes if needed. -std::string Join(std::string const & lhs, std::string const & rhs); - -template -std::string Join(std::string const & lhs, std::string const & rhs, Args &&... args) -{ - return Join(Join(lhs, rhs), std::forward(args)...); -} -} // namespace url -} // namespace base diff --git a/coding/CMakeLists.txt b/coding/CMakeLists.txt index d6df42b679..86c362ef28 100644 --- a/coding/CMakeLists.txt +++ b/coding/CMakeLists.txt @@ -85,9 +85,8 @@ set( traffic.hpp transliteration.cpp transliteration.hpp - uri.cpp - uri.hpp - url_encode.hpp + url_helpers.cpp + url_helpers.hpp value_opt_string.hpp var_record_reader.hpp var_serial_vector.hpp diff --git a/coding/coding_tests/CMakeLists.txt b/coding/coding_tests/CMakeLists.txt index 0769bdeaf2..d0b2ba70fb 100644 --- a/coding/coding_tests/CMakeLists.txt +++ b/coding/coding_tests/CMakeLists.txt @@ -37,8 +37,7 @@ set( test_polylines.hpp text_storage_tests.cpp traffic_test.cpp - uri_test.cpp - url_encode_test.cpp + url_helpers_tests.cpp value_opt_string_test.cpp var_record_reader_test.cpp var_serial_vector_test.cpp diff --git a/coding/coding_tests/uri_test.cpp b/coding/coding_tests/uri_test.cpp deleted file mode 100644 index e2116b571f..0000000000 --- a/coding/coding_tests/uri_test.cpp +++ /dev/null @@ -1,125 +0,0 @@ -#include "testing/testing.hpp" - -#include "coding/uri.hpp" - -#include "base/macros.hpp" - -#include -#include -#include -#include - -using url_scheme::Uri; - -using namespace std; - -namespace -{ - -class TestUri -{ -public: - explicit TestUri(string const & uri) : m_uri(uri) {} - - TestUri & Scheme(string const &scheme) { m_scheme = scheme; return *this; } - TestUri & Path(string const & path) { m_path = path; return *this; } - TestUri & KV(string const & key, string const & value) - { - m_keyValuePairs.push(make_pair(key, value)); - return *this; - } - - ~TestUri() - { - Uri uri(m_uri); - TEST_EQUAL(uri.GetScheme(), m_scheme, ()); - TEST_EQUAL(uri.GetPath(), m_path, ()); - TEST(!m_scheme.empty() || !uri.IsValid(), ("Scheme is empty if and only if uri is invalid!")); - uri.ForEachKeyValue(bind(&TestUri::AddTestValue, this, placeholders::_1, placeholders::_2)); - } - -private: - - bool AddTestValue(string const & key, string const & value) - { - TEST(!m_keyValuePairs.empty(), ("Failed for uri = ", m_uri, "Passed KV = ", key, value)); - TEST_EQUAL(m_keyValuePairs.front().first, key, ()); - TEST_EQUAL(m_keyValuePairs.front().second, value, ()); - m_keyValuePairs.pop(); - return true; - } - - string m_uri, m_scheme, m_path; - queue > m_keyValuePairs; -}; - -} // unnamed namespace - -UNIT_TEST(UriValidScheme) -{ - char const uriS[] = "mapswithme://map?ll=10.3,12.3223&n=Hello%20World"; - Uri uri(uriS, ARRAY_SIZE(uriS) - 1); - TEST_EQUAL(uri.GetScheme(), "mapswithme", ()); -} - -UNIT_TEST(UriInvalidSchemeNoColon) -{ - TEST_EQUAL(Uri("mapswithme:").GetScheme(), "mapswithme", ()); -} - -UNIT_TEST(UriTestValidScheme2) -{ - TestUri("mapswithme://map?ll=10.3,12.3223&n=Hello%20World") - .Scheme("mapswithme") - .Path("map") - .KV("ll", "10.3,12.3223") - .KV("n", "Hello World"); -} - -UNIT_TEST(UriComprehensive) -{ - TestUri(""); - - TestUri("scheme:").Scheme("scheme"); - - TestUri("scheme:/").Scheme("scheme"); - - TestUri("scheme://").Scheme("scheme"); - - TestUri("sometext"); - - TestUri(":noscheme"); - - TestUri("://noscheme?"); - - TestUri("mwm://?").Scheme("mwm"); - - TestUri("http://path/to/something").Scheme("http").Path("path/to/something"); - - TestUri("http://path?").Scheme("http").Path("path"); - - TestUri("maps://path?&&key=&").Scheme("maps").Path("path").KV("key", ""); - - TestUri("mapswithme://map?ll=1.2,3.4&z=15").Scheme("mapswithme").Path("map") - .KV("ll", "1.2,3.4").KV("z", "15"); - - TestUri("nopathnovalues://?key1&key2=val2").Scheme("nopathnovalues").Path("") - .KV("key1", "").KV("key2", "val2"); - - TestUri("s://?key1&key2").Scheme("s").Path("").KV("key1", "").KV("key2", ""); - - TestUri("g://p?key1=val1&key2=").Scheme("g").Path("p").KV("key1", "val1").KV("key2", ""); - - TestUri("g://p?=val1&key2=").Scheme("g").Path("p").KV("", "val1").KV("key2", ""); - - TestUri("g://?k&key2").Scheme("g").KV("k", "").KV("key2", ""); - - TestUri("m:?%26Amp%26%3D%26Amp%26&name=%31%20%30").Scheme("m") - .KV("&Amp&=&Amp&", "").KV("name", "1 0"); - - TestUri("s://?key1=value1&key1=value2&key1=value3&key2&key2&key3=value1&key3&key3=value2") - .Scheme("s") - .KV("key1", "value1").KV("key1", "value2").KV("key1", "value3") - .KV("key2", "").KV("key2", "") - .KV("key3", "value1").KV("key3", "").KV("key3", "value2"); -} diff --git a/coding/coding_tests/url_encode_test.cpp b/coding/coding_tests/url_encode_test.cpp deleted file mode 100644 index 806af555de..0000000000 --- a/coding/coding_tests/url_encode_test.cpp +++ /dev/null @@ -1,38 +0,0 @@ -#include "testing/testing.hpp" - -#include "coding/url_encode.hpp" - -char const * orig1 = "http://google.com/main_index.php"; -char const * enc1 = "http%3A%2F%2Fgoogle.com%2Fmain_index.php"; -char const * orig2 = "Some File Name.ext"; -char const * enc2 = "Some%20File%20Name.ext"; -char const * orig3 = "Wow, two spaces?!"; -char const * enc3 = "Wow%2C%20%20two%20spaces%3F%21"; -char const * orig4 = "#$%^&@~[]{}()|*+`\"\'"; -char const * enc4 = "%23%24%25%5E%26%40~%5B%5D%7B%7D%28%29%7C%2A%2B%60%22%27"; - -UNIT_TEST(UrlEncode) -{ - TEST_EQUAL(UrlEncode(""), "", ()); - TEST_EQUAL(UrlEncode(" "), "%20", ()); - TEST_EQUAL(UrlEncode("%% "), "%25%25%20", ()); - TEST_EQUAL(UrlEncode("20"), "20", ()); - TEST_EQUAL(UrlEncode("Guinea-Bissau"), "Guinea-Bissau", ()); - TEST_EQUAL(UrlEncode(orig1), enc1, ()); - TEST_EQUAL(UrlEncode(orig2), enc2, ()); - TEST_EQUAL(UrlEncode(orig3), enc3, ()); - TEST_EQUAL(UrlEncode(orig4), enc4, ()); -} - -UNIT_TEST(UrlDecode) -{ - TEST_EQUAL(UrlDecode(""), "", ()); - TEST_EQUAL(UrlDecode("%20"), " ", ()); - TEST_EQUAL(UrlDecode("%25%25%20"), "%% ", ()); - TEST_EQUAL(UrlDecode("20"), "20", ()); - TEST_EQUAL(UrlDecode("Guinea-Bissau"), "Guinea-Bissau", ()); - TEST_EQUAL(UrlDecode(enc1), orig1, ()); - TEST_EQUAL(UrlDecode(enc2), orig2, ()); - TEST_EQUAL(UrlDecode(enc3), orig3, ()); - TEST_EQUAL(UrlDecode(enc4), orig4, ()); -} diff --git a/coding/coding_tests/url_helpers_tests.cpp b/coding/coding_tests/url_helpers_tests.cpp new file mode 100644 index 0000000000..c5e954b261 --- /dev/null +++ b/coding/coding_tests/url_helpers_tests.cpp @@ -0,0 +1,226 @@ +#include "testing/testing.hpp" + +#include "coding/url_helpers.hpp" + +#include +#include +#include + +using namespace std; + +namespace +{ +double const kEps = 1e-10; + +class TestUri +{ +public: + explicit TestUri(string const & uri) : m_uri(uri) {} + + TestUri & Scheme(string const & scheme) { m_scheme = scheme; return *this; } + TestUri & Path(string const & path) { m_path = path; return *this; } + TestUri & KV(string const & key, string const & value) + { + m_keyValuePairs.push(make_pair(key, value)); + return *this; + } + + ~TestUri() + { + coding::url::Uri uri(m_uri); + TEST_EQUAL(uri.GetScheme(), m_scheme, ()); + TEST_EQUAL(uri.GetPath(), m_path, ()); + TEST(!m_scheme.empty() || !uri.IsValid(), ("Scheme is empty if and only if uri is invalid!")); + uri.ForEachKeyValue(bind(&TestUri::AddTestValue, this, placeholders::_1, placeholders::_2)); + } + +private: + bool AddTestValue(string const & key, string const & value) + { + TEST(!m_keyValuePairs.empty(), ("Failed for uri = ", m_uri, "Passed KV = ", key, value)); + TEST_EQUAL(m_keyValuePairs.front().first, key, ()); + TEST_EQUAL(m_keyValuePairs.front().second, value, ()); + m_keyValuePairs.pop(); + return true; + } + + string m_uri; + string m_scheme; + string m_path; + queue> m_keyValuePairs; +}; +} // namespace + +namespace url_encode_testdata +{ +char const * orig1 = "http://google.com/main_index.php"; +char const * enc1 = "http%3A%2F%2Fgoogle.com%2Fmain_index.php"; +char const * orig2 = "Some File Name.ext"; +char const * enc2 = "Some%20File%20Name.ext"; +char const * orig3 = "Wow, two spaces?!"; +char const * enc3 = "Wow%2C%20%20two%20spaces%3F%21"; +char const * orig4 = "#$%^&@~[]{}()|*+`\"\'"; +char const * enc4 = "%23%24%25%5E%26%40~%5B%5D%7B%7D%28%29%7C%2A%2B%60%22%27"; +} // namespace url_encode_testdata + +namespace coding::url +{ +UNIT_TEST(Url_Join) +{ + TEST_EQUAL("", Join("", ""), ()); + TEST_EQUAL("omim/", Join("", "omim/"), ()); + TEST_EQUAL("omim/", Join("omim/", ""), ()); + TEST_EQUAL("omim/strings", Join("omim", "strings"), ()); + TEST_EQUAL("omim/strings", Join("omim/", "strings"), ()); + TEST_EQUAL("../../omim/strings", Join("..", "..", "omim", "strings"), ()); + TEST_EQUAL("../../omim/strings", Join("../", "..", "omim/", "strings"), ()); + TEST_EQUAL("omim/strings", Join("omim/", "/strings"), ()); + TEST_EQUAL("../../omim/strings", Join("../", "/../", "/omim/", "/strings"), ()); + TEST_EQUAL("../omim/strings", Join("../", "", "/omim/", "/strings"), ()); +} + +UNIT_TEST(UrlEncode) +{ + using namespace url_encode_testdata; + + TEST_EQUAL(UrlEncode(""), "", ()); + TEST_EQUAL(UrlEncode(" "), "%20", ()); + TEST_EQUAL(UrlEncode("%% "), "%25%25%20", ()); + TEST_EQUAL(UrlEncode("20"), "20", ()); + TEST_EQUAL(UrlEncode("Guinea-Bissau"), "Guinea-Bissau", ()); + TEST_EQUAL(UrlEncode(orig1), enc1, ()); + TEST_EQUAL(UrlEncode(orig2), enc2, ()); + TEST_EQUAL(UrlEncode(orig3), enc3, ()); + TEST_EQUAL(UrlEncode(orig4), enc4, ()); +} + +UNIT_TEST(UrlDecode) +{ + using namespace url_encode_testdata; + + TEST_EQUAL(UrlDecode(""), "", ()); + TEST_EQUAL(UrlDecode("%20"), " ", ()); + TEST_EQUAL(UrlDecode("%25%25%20"), "%% ", ()); + TEST_EQUAL(UrlDecode("20"), "20", ()); + TEST_EQUAL(UrlDecode("Guinea-Bissau"), "Guinea-Bissau", ()); + TEST_EQUAL(UrlDecode(enc1), orig1, ()); + TEST_EQUAL(UrlDecode(enc2), orig2, ()); + TEST_EQUAL(UrlDecode(enc3), orig3, ()); + TEST_EQUAL(UrlDecode(enc4), orig4, ()); +} + +UNIT_TEST(ProcessURL_Smoke) +{ + { + GeoURLInfo info("geo:53.666,27.666"); + TEST(info.IsValid(), ()); + TEST_ALMOST_EQUAL_ABS(info.m_lat, 53.666, kEps, ()); + TEST_ALMOST_EQUAL_ABS(info.m_lon, 27.666, kEps, ()); + } + + { + GeoURLInfo info("geo://point/?lon=27.666&lat=53.666&zoom=10"); + TEST(info.IsValid(), ()); + TEST_ALMOST_EQUAL_ABS(info.m_lat, 53.666, kEps, ()); + TEST_ALMOST_EQUAL_ABS(info.m_lon, 27.666, kEps, ()); + TEST_ALMOST_EQUAL_ABS(info.m_zoom, 10.0, kEps, ()); + } + + { + GeoURLInfo info("geo:53.666"); + TEST(!info.IsValid(), ()); + } + + { + GeoURLInfo info("mapswithme:123.33,32.22/showmethemagic"); + TEST(!info.IsValid(), ()); + } + + { + GeoURLInfo info("mapswithme:32.22, 123.33/showmethemagic"); + TEST(info.IsValid(), ()); + TEST_ALMOST_EQUAL_ABS(info.m_lat, 32.22, kEps, ()); + TEST_ALMOST_EQUAL_ABS(info.m_lon, 123.33, kEps, ()); + } + + { + GeoURLInfo info("model: iphone 7,1"); + TEST(!info.IsValid(), ()); + } +} + +UNIT_TEST(ProcessURL_Instagram) +{ + GeoURLInfo info("geo:0,0?z=14&q=54.683486138,25.289361259 (Forto%20dvaras)"); + TEST(info.IsValid(), ()); + TEST_ALMOST_EQUAL_ABS(info.m_lat, 54.683486138, kEps, ()); + TEST_ALMOST_EQUAL_ABS(info.m_lon, 25.289361259, kEps, ()); + TEST_ALMOST_EQUAL_ABS(info.m_zoom, 14.0, kEps, ()); +} + +UNIT_TEST(ProcessURL_GoogleMaps) +{ + GeoURLInfo info("https://maps.google.com/maps?z=16&q=Mezza9%401.3067198,103.83282"); + TEST(info.IsValid(), ()); + TEST_ALMOST_EQUAL_ABS(info.m_lat, 1.3067198, kEps, ()); + TEST_ALMOST_EQUAL_ABS(info.m_lon, 103.83282, kEps, ()); + TEST_ALMOST_EQUAL_ABS(info.m_zoom, 16.0, kEps, ()); + + info = GeoURLInfo("https://maps.google.com/maps?z=16&q=House+of+Seafood+%40+180%401.356706,103.87591"); + TEST(info.IsValid(), ()); + TEST_ALMOST_EQUAL_ABS(info.m_lat, 1.356706, kEps, ()); + TEST_ALMOST_EQUAL_ABS(info.m_lon, 103.87591, kEps, ()); + TEST_ALMOST_EQUAL_ABS(info.m_zoom, 16.0, kEps, ()); +} + +UNIT_TEST(UriValidScheme) +{ + char const uriS[] = "mapswithme://map?ll=10.3,12.3223&n=Hello%20World"; + Uri uri(uriS, ARRAY_SIZE(uriS) - 1); + TEST_EQUAL(uri.GetScheme(), "mapswithme", ()); +} + +UNIT_TEST(UriInvalidSchemeNoColon) +{ + TEST_EQUAL(Uri("mapswithme:").GetScheme(), "mapswithme", ()); +} + +UNIT_TEST(UriTestValidScheme2) +{ + TestUri("mapswithme://map?ll=10.3,12.3223&n=Hello%20World") + .Scheme("mapswithme") + .Path("map") + .KV("ll", "10.3,12.3223") + .KV("n", "Hello World"); +} + +UNIT_TEST(UriComprehensive) +{ + TestUri(""); + TestUri("scheme:").Scheme("scheme"); + TestUri("scheme:/").Scheme("scheme"); + TestUri("scheme://").Scheme("scheme"); + TestUri("sometext"); + TestUri(":noscheme"); + TestUri("://noscheme?"); + TestUri("mwm://?").Scheme("mwm"); + TestUri("http://path/to/something").Scheme("http").Path("path/to/something"); + TestUri("http://path?").Scheme("http").Path("path"); + TestUri("maps://path?&&key=&").Scheme("maps").Path("path").KV("key", ""); + TestUri("mapswithme://map?ll=1.2,3.4&z=15").Scheme("mapswithme").Path("map") + .KV("ll", "1.2,3.4").KV("z", "15"); + TestUri("nopathnovalues://?key1&key2=val2").Scheme("nopathnovalues").Path("") + .KV("key1", "").KV("key2", "val2"); + TestUri("s://?key1&key2").Scheme("s").Path("").KV("key1", "").KV("key2", ""); + TestUri("g://p?key1=val1&key2=").Scheme("g").Path("p").KV("key1", "val1").KV("key2", ""); + TestUri("g://p?=val1&key2=").Scheme("g").Path("p").KV("", "val1").KV("key2", ""); + TestUri("g://?k&key2").Scheme("g").KV("k", "").KV("key2", ""); + TestUri("m:?%26Amp%26%3D%26Amp%26&name=%31%20%30").Scheme("m") + .KV("&Amp&=&Amp&", "").KV("name", "1 0"); + TestUri("s://?key1=value1&key1=value2&key1=value3&key2&key2&key3=value1&key3&key3=value2") + .Scheme("s") + .KV("key1", "value1").KV("key1", "value2").KV("key1", "value3") + .KV("key2", "").KV("key2", "") + .KV("key3", "value1").KV("key3", "").KV("key3", "value2"); +} +} // namespace coding::url diff --git a/coding/uri.cpp b/coding/uri.cpp deleted file mode 100644 index d9bc4f1874..0000000000 --- a/coding/uri.cpp +++ /dev/null @@ -1,89 +0,0 @@ -#include "coding/uri.hpp" - -#include "coding/url_encode.hpp" - -#include "base/assert.hpp" - -using namespace std; - -namespace url_scheme -{ -void Uri::Init() -{ - if (!Parse()) - { - ASSERT(m_scheme.empty() && m_path.empty() && !IsValid(), ()); - m_queryStart = m_url.size(); - } -} - -bool Uri::Parse() -{ - // get url scheme - size_t pathStart = m_url.find(':'); - if (pathStart == string::npos || pathStart == 0) - return false; - m_scheme.assign(m_url, 0, pathStart); - - // skip slashes - while (++pathStart < m_url.size() && m_url[pathStart] == '/') {} - - // Find query starting point for (key, value) parsing. - m_queryStart = m_url.find('?', pathStart); - size_t pathLength; - if (m_queryStart == string::npos) - { - m_queryStart = m_url.size(); - pathLength = m_queryStart - pathStart; - } - else - { - pathLength = m_queryStart - pathStart; - ++m_queryStart; - } - - // Get path (url without query). - m_path.assign(m_url, pathStart, pathLength); - - return true; -} - -bool Uri::ForEachKeyValue(Callback const & callback) const -{ - // parse query for keys and values - size_t const count = m_url.size(); - size_t const queryStart = m_queryStart; - - // Just a URL without parameters. - if (queryStart == count) - return false; - - for (size_t start = queryStart; start < count; ) - { - size_t end = m_url.find('&', start); - if (end == string::npos) - end = count; - - // Skip empty keys. - if (end != start) - { - size_t const eq = m_url.find('=', start); - - string key, value; - if (eq != string::npos && eq < end) - { - key = UrlDecode(m_url.substr(start, eq - start)); - value = UrlDecode(m_url.substr(eq + 1, end - eq - 1)); - } - else - key = UrlDecode(m_url.substr(start, end - start)); - - if (!callback(key, value)) - return false; - } - - start = end + 1; - } - return true; -} -} // namespace url_scheme diff --git a/coding/uri.hpp b/coding/uri.hpp deleted file mode 100644 index c2a4a2b002..0000000000 --- a/coding/uri.hpp +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once - -#include "base/base.hpp" - -#include -#include - -namespace url_scheme -{ -// Uri in format: 'scheme://path?key1=value1&key2&key3=&key4=value4' -class Uri -{ -public: - using Callback = std::function; - - explicit Uri(std::string const & uri) : m_url(uri) { Init(); } - Uri(char const * uri, size_t size) : m_url(uri, uri + size) { Init(); } - - std::string const & GetScheme() const { return m_scheme; } - std::string const & GetPath() const { return m_path; } - bool IsValid() const { return !m_scheme.empty(); } - bool ForEachKeyValue(Callback const & callback) const; - -private: - void Init(); - bool Parse(); - - std::string m_url; - std::string m_scheme; - std::string m_path; - - size_t m_queryStart; -}; -} // namespace url_scheme diff --git a/coding/url_encode.hpp b/coding/url_encode.hpp deleted file mode 100644 index 06e80996d1..0000000000 --- a/coding/url_encode.hpp +++ /dev/null @@ -1,47 +0,0 @@ -#pragma once - -#include "coding/hex.hpp" - -#include - -inline std::string UrlEncode(std::string const & rawUrl) -{ - size_t const count = rawUrl.size(); - std::string result; - result.reserve(count); - - for (size_t i = 0; i < count; ++i) - { - char const c = rawUrl[i]; - if (c < '-' || c == '/' || (c > '9' && c < 'A') || (c > 'Z' && c < '_') || - c == '`' || (c > 'z' && c < '~') || c > '~') - { - result += '%'; - result += NumToHex(c); - } - else - result += rawUrl[i]; - } - - return result; -} - -inline std::string UrlDecode(std::string const & encodedUrl) -{ - size_t const count = encodedUrl.size(); - std::string result; - result.reserve(count); - - for (size_t i = 0; i < count; ++i) - { - if (encodedUrl[i] == '%') - { - result += FromHex(encodedUrl.substr(i + 1, 2)); - i += 2; - } - else - result += encodedUrl[i]; - } - - return result; -} diff --git a/coding/url_helpers.cpp b/coding/url_helpers.cpp new file mode 100644 index 0000000000..2ff16904c8 --- /dev/null +++ b/coding/url_helpers.cpp @@ -0,0 +1,367 @@ +#include "coding/url_helpers.hpp" + +#include "coding/hex.hpp" + +#include "geometry/mercator.hpp" + +#include +#include +#include + +#include "base/assert.hpp" +#include "base/string_utils.hpp" + +using namespace std; + +namespace +{ +double const kInvalidCoord = -1000.0; + +// Same as scales::GetUpperScale() from indexer/scales.hpp. +// 1. Duplicated here to avoid a dependency on indexer/. +// 2. The value is arbitrary anyway: we want to parse a "z=%f" pair +// from a URL parameter, and different map providers may have different +// maximal zoom levels. +double const kMaxZoom = 17.0; + +class LatLonParser +{ +public: + explicit LatLonParser(coding::url::GeoURLInfo & info) + : m_info(info) + , m_regexp("-?\\d+\\.{1}\\d*, *-?\\d+\\.{1}\\d*") + , m_latPriority(-1) + , m_lonPriority(-1) + { + } + + bool IsValid() const + { + return m_latPriority == m_lonPriority && m_latPriority != -1; + } + + bool operator()(string const & key, string const & value) + { + if (key == "z" || key == "zoom") + { + double x; + if (strings::to_double(value, x)) + m_info.SetZoom(x); + return true; + } + + int const priority = GetCoordinatesPriority(key); + if (priority == -1 || priority < m_latPriority || priority < m_lonPriority) + return false; + + if (priority != kLatLonPriority) + { + strings::ForEachMatched(value, m_regexp, AssignCoordinates(*this, priority)); + return true; + } + + double x; + if (strings::to_double(value, x)) + { + if (key == "lat") + { + if (!m_info.SetLat(x)) + return false; + m_latPriority = priority; + } + else + { + ASSERT_EQUAL(key, "lon", ()); + if (!m_info.SetLon(x)) + return false; + m_lonPriority = priority; + } + } + return true; + } + +private: + class AssignCoordinates + { + public: + AssignCoordinates(LatLonParser & parser, int priority) : m_parser(parser), m_priority(priority) + { + } + + void operator()(string const & token) const + { + double lat, lon; + + string::size_type n = token.find(','); + ASSERT(n != string::npos, ()); + VERIFY(strings::to_double(token.substr(0, n), lat), ()); + + n = token.find_first_not_of(", ", n); + ASSERT(n != string::npos, ()); + VERIFY(strings::to_double(token.substr(n, token.size() - n), lon), ()); + + if (m_parser.m_info.SetLat(lat) && m_parser.m_info.SetLon(lon)) + m_parser.m_latPriority = m_parser.m_lonPriority = m_priority; + } + + private: + LatLonParser & m_parser; + int m_priority; + }; + + inline static int const kLatLonPriority = 5; + + // Priority for accepting coordinates if we have many choices. + // -1 - not initialized + // 0 - coordinates in path; + // x - priority for query type (greater is better) + int GetCoordinatesPriority(string const & token) + { + if (token.empty()) + return 0; + else if (token == "q") + return 1; + else if (token == "daddr") + return 2; + else if (token == "point") + return 3; + else if (token == "ll") + return 4; + else if (token == "lat" || token == "lon") + return kLatLonPriority; + + return -1; + } + + coding::url::GeoURLInfo & m_info; + regex m_regexp; + int m_latPriority; + int m_lonPriority; +}; +} // namespace + +namespace coding::url +{ +void Uri::Init() +{ + if (!Parse()) + { + ASSERT(m_scheme.empty() && m_path.empty() && !IsValid(), ()); + m_queryStart = m_url.size(); + } +} + +bool Uri::Parse() +{ + // get url scheme + size_t pathStart = m_url.find(':'); + if (pathStart == string::npos || pathStart == 0) + return false; + m_scheme.assign(m_url, 0, pathStart); + + // skip slashes + while (++pathStart < m_url.size() && m_url[pathStart] == '/') {} + + // Find query starting point for (key, value) parsing. + m_queryStart = m_url.find('?', pathStart); + size_t pathLength; + if (m_queryStart == string::npos) + { + m_queryStart = m_url.size(); + pathLength = m_queryStart - pathStart; + } + else + { + pathLength = m_queryStart - pathStart; + ++m_queryStart; + } + + // Get path (url without query). + m_path.assign(m_url, pathStart, pathLength); + + return true; +} + +bool Uri::ForEachKeyValue(Callback const & callback) const +{ + // parse query for keys and values + size_t const count = m_url.size(); + size_t const queryStart = m_queryStart; + + // Just a URL without parameters. + if (queryStart == count) + return false; + + for (size_t start = queryStart; start < count; ) + { + size_t end = m_url.find('&', start); + if (end == string::npos) + end = count; + + // Skip empty keys. + if (end != start) + { + size_t const eq = m_url.find('=', start); + + string key, value; + if (eq != string::npos && eq < end) + { + key = UrlDecode(m_url.substr(start, eq - start)); + value = UrlDecode(m_url.substr(eq + 1, end - eq - 1)); + } + else + { + key = UrlDecode(m_url.substr(start, end - start)); + } + + if (!callback(key, value)) + return false; + } + + start = end + 1; + } + return true; +} + +string Make(string const & baseUrl, Params const & params) +{ + ostringstream os; + os << baseUrl; + + bool firstParam = baseUrl.find('?') == string::npos; + for (auto const & param : params) + { + if (firstParam) + { + firstParam = false; + os << "?"; + } + else + { + os << "&"; + } + + os << param.m_name << "=" << param.m_value; + } + + return os.str(); +} + +string Join(string const & lhs, string const & rhs) +{ + if (lhs.empty()) + return rhs; + if (rhs.empty()) + return lhs; + + if (lhs.back() == '/' && rhs.front() == '/') + return lhs + rhs.substr(1); + + if (lhs.back() != '/' && rhs.front() != '/') + return lhs + '/' + rhs; + + return lhs + rhs; +} + +string UrlEncode(string const & rawUrl) +{ + size_t const count = rawUrl.size(); + string result; + result.reserve(count); + + for (size_t i = 0; i < count; ++i) + { + char const c = rawUrl[i]; + if (c < '-' || c == '/' || (c > '9' && c < 'A') || (c > 'Z' && c < '_') || + c == '`' || (c > 'z' && c < '~') || c > '~') + { + result += '%'; + result += NumToHex(c); + } + else + result += rawUrl[i]; + } + + return result; +} + +string UrlDecode(string const & encodedUrl) +{ + size_t const count = encodedUrl.size(); + string result; + result.reserve(count); + + for (size_t i = 0; i < count; ++i) + { + if (encodedUrl[i] == '%') + { + result += FromHex(encodedUrl.substr(i + 1, 2)); + i += 2; + } + else + { + result += encodedUrl[i]; + } + } + + return result; +} + +GeoURLInfo::GeoURLInfo(string const & s) +{ + Uri uri(s); + if (!uri.IsValid()) + { + Reset(); + return; + } + + LatLonParser parser(*this); + parser(string(), uri.GetPath()); + uri.ForEachKeyValue(ref(parser)); + + if (!parser.IsValid()) + { + Reset(); + return; + } +} + +bool GeoURLInfo::IsValid() const +{ + return m_lat != kInvalidCoord && m_lon != kInvalidCoord; +} + +void GeoURLInfo::Reset() +{ + m_lat = kInvalidCoord; + m_lon = kInvalidCoord; + m_zoom = kMaxZoom; +} + +void GeoURLInfo::SetZoom(double x) +{ + if (x >= 0.0 && x <= kMaxZoom) + m_zoom = x; +} + +bool GeoURLInfo::SetLat(double x) +{ + if (mercator::ValidLat(x)) + { + m_lat = x; + return true; + } + return false; +} + +bool GeoURLInfo::SetLon(double x) +{ + if (mercator::ValidLon(x)) + { + m_lon = x; + return true; + } + return false; +} +} // namespace coding::url diff --git a/coding/url_helpers.hpp b/coding/url_helpers.hpp new file mode 100644 index 0000000000..d131d9cb68 --- /dev/null +++ b/coding/url_helpers.hpp @@ -0,0 +1,77 @@ +#pragma once + +#include +#include +#include +#include + +namespace coding::url +{ +// Uri in format: 'scheme://path?key1=value1&key2&key3=&key4=value4' +class Uri +{ +public: + using Callback = std::function; + + explicit Uri(std::string const & uri) : m_url(uri) { Init(); } + Uri(char const * uri, size_t size) : m_url(uri, uri + size) { Init(); } + + std::string const & GetScheme() const { return m_scheme; } + std::string const & GetPath() const { return m_path; } + bool IsValid() const { return !m_scheme.empty(); } + bool ForEachKeyValue(Callback const & callback) const; + +private: + void Init(); + bool Parse(); + + std::string m_url; + std::string m_scheme; + std::string m_path; + + size_t m_queryStart; +}; + +struct Param +{ + Param(std::string const & name, std::string const & value) : m_name(name), m_value(value) {} + + std::string m_name; + std::string m_value; +}; + +using Params = std::vector; + +// Make URL by using base url and vector of params. +std::string Make(std::string const & baseUrl, Params const & params); + +// Joins URL, appends/removes slashes if needed. +std::string Join(std::string const & lhs, std::string const & rhs); + +template +std::string Join(std::string const & lhs, std::string const & rhs, Args &&... args) +{ + return Join(Join(lhs, rhs), std::forward(args)...); +} + +std::string UrlEncode(std::string const & rawUrl); +std::string UrlDecode(std::string const & encodedUrl); + +struct GeoURLInfo +{ + GeoURLInfo() { Reset(); } + + explicit GeoURLInfo(std::string const & s); + + bool IsValid() const; + void Reset(); + + void SetZoom(double x); + bool SetLat(double x); + bool SetLon(double x); + + double m_lat; + double m_lon; + double m_zoom; +}; +} // namespace coding::url diff --git a/editor/osm_auth.cpp b/editor/osm_auth.cpp index a883347353..b210067ee7 100644 --- a/editor/osm_auth.cpp +++ b/editor/osm_auth.cpp @@ -2,7 +2,7 @@ #include "platform/http_client.hpp" -#include "coding/url_encode.hpp" +#include "coding/url_helpers.hpp" #include "base/assert.hpp" #include "base/logging.hpp" @@ -51,7 +51,7 @@ string BuildPostRequest(map const & params) { if (it != params.begin()) result += "&"; - result += it->first + "=" + UrlEncode(it->second); + result += it->first + "=" + coding::url::UrlEncode(it->second); } return result; } diff --git a/editor/server_api.cpp b/editor/server_api.cpp index 2e3410b729..82c84c4197 100644 --- a/editor/server_api.cpp +++ b/editor/server_api.cpp @@ -1,6 +1,6 @@ #include "editor/server_api.hpp" -#include "coding/url_encode.hpp" +#include "coding/url_helpers.hpp" #include "geometry/mercator.hpp" @@ -124,7 +124,7 @@ uint64_t ServerApi06::CreateNote(ms::LatLon const & ll, std::string const & mess CHECK(!message.empty(), ("Note content should not be empty.")); std::string const params = "?lat=" + strings::to_string_dac(ll.m_lat, 7) + "&lon=" + strings::to_string_dac(ll.m_lon, 7) + - "&text=" + UrlEncode(message + " #mapsme"); + "&text=" + coding::url::UrlEncode(message + " #mapsme"); OsmOAuth::Response const response = m_auth.Request("/notes" + params, "POST"); if (response.first != OsmOAuth::HTTP::OK) MYTHROW(ErrorAddingNote, ("Could not post a new note:", response)); @@ -146,7 +146,7 @@ void ServerApi06::CloseNote(uint64_t const id) const bool ServerApi06::TestOSMUser(std::string const & userName) { - std::string const method = "/user/" + UrlEncode(userName); + std::string const method = "/user/" + coding::url::UrlEncode(userName); return m_auth.DirectRequest(method, false).first == OsmOAuth::HTTP::OK; } diff --git a/editor/user_stats.cpp b/editor/user_stats.cpp index 2a102dc4a4..ffdbf6762f 100644 --- a/editor/user_stats.cpp +++ b/editor/user_stats.cpp @@ -4,7 +4,7 @@ #include "platform/platform.hpp" #include "platform/settings.hpp" -#include "coding/url_encode.hpp" +#include "coding/url_helpers.hpp" #include "base/logging.hpp" #include "base/thread.hpp" @@ -90,7 +90,7 @@ bool UserStatsLoader::Update(std::string const & userName) m_userName = userName; } - auto const url = kUserStatsUrl + "&name=" + UrlEncode(userName); + auto const url = kUserStatsUrl + "&name=" + coding::url::UrlEncode(userName); platform::HttpClient request(url); request.SetRawHeader("User-Agent", GetPlatform().GetAppUserAgent()); diff --git a/ge0/parser.cpp b/ge0/parser.cpp index fc2e947751..a3664a097f 100644 --- a/ge0/parser.cpp +++ b/ge0/parser.cpp @@ -4,7 +4,7 @@ #include "geometry/mercator.hpp" -#include "coding/url_encode.hpp" +#include "coding/url_helpers.hpp" #include "base/math.hpp" #include "base/string_utils.hpp" @@ -111,7 +111,7 @@ double Ge0Parser::DecodeLonFromInt(int const lon, int const maxValue) string Ge0Parser::DecodeName(string name) { ValidateName(name); - name = UrlDecode(name); + name = coding::url::UrlDecode(name); SpacesToUnderscore(name); return name; } diff --git a/generator/osm2meta.cpp b/generator/osm2meta.cpp index c957a16ec6..2f1b908d6b 100644 --- a/generator/osm2meta.cpp +++ b/generator/osm2meta.cpp @@ -7,7 +7,7 @@ #include "platform/measurement_utils.hpp" -#include "coding/url_encode.hpp" +#include "coding/url_helpers.hpp" #include "base/logging.hpp" #include "base/math.hpp" @@ -251,7 +251,7 @@ string MetadataTagProcessorImpl::ValidateAndFormat_wikipedia(string v) const if (slashIndex != string::npos && slashIndex + 1 != baseIndex) { // Normalize article title according to OSM standards. - string title = UrlDecode(v.substr(baseIndex + baseSize)); + string title = coding::url::UrlDecode(v.substr(baseIndex + baseSize)); replace(title.begin(), title.end(), '_', ' '); return v.substr(slashIndex + 1, baseIndex - slashIndex - 1) + ":" + title; } diff --git a/local_ads/statistics.cpp b/local_ads/statistics.cpp index 174308eabe..3f20aa2fca 100644 --- a/local_ads/statistics.cpp +++ b/local_ads/statistics.cpp @@ -8,7 +8,7 @@ #include "coding/file_writer.hpp" #include "coding/point_coding.hpp" -#include "coding/url_encode.hpp" +#include "coding/url_helpers.hpp" #include "coding/write_to_sink.hpp" #include "coding/zlib.hpp" @@ -183,9 +183,9 @@ std::string MakeRemoteURL(std::string const & userId, std::string const & name, std::ostringstream ss; ss << kStatisticsServer << "/"; - ss << UrlEncode(userId) << "/"; + ss << coding::url::UrlEncode(userId) << "/"; ss << version << "/"; - ss << UrlEncode(name); + ss << coding::url::UrlEncode(name); return ss.str(); } diff --git a/map/CMakeLists.txt b/map/CMakeLists.txt index deb105c6cb..c11b116f30 100644 --- a/map/CMakeLists.txt +++ b/map/CMakeLists.txt @@ -59,8 +59,6 @@ set( framework_light.cpp framework_light.hpp framework_light_delegate.hpp - geourl_process.cpp - geourl_process.hpp gps_track_collection.cpp gps_track_collection.hpp gps_track_filter.cpp diff --git a/map/bookmark.cpp b/map/bookmark.cpp index c4103f7de2..bd2da0520c 100644 --- a/map/bookmark.cpp +++ b/map/bookmark.cpp @@ -1,7 +1,7 @@ #include "map/bookmark.hpp" #include "map/bookmark_helpers.hpp" -#include "coding/url_encode.hpp" +#include "coding/url_helpers.hpp" #include "base/string_utils.hpp" @@ -360,7 +360,7 @@ std::string BookmarkCategory::GetCatalogDeeplink() const return {}; std::ostringstream ss; - ss << kDeepLinkUrl << "catalogue?id=" << m_serverId << "&name=" << UrlEncode(GetName()); + ss << kDeepLinkUrl << "catalogue?id=" << m_serverId << "&name=" << coding::url::UrlEncode(GetName()); return ss.str(); } diff --git a/map/framework.cpp b/map/framework.cpp index 2756d301bc..6b0faaefb7 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -4,7 +4,6 @@ #include "map/chart_generator.hpp" #include "map/displayed_categories_modifiers.hpp" #include "map/everywhere_search_params.hpp" -#include "map/geourl_process.hpp" #include "map/gps_tracker.hpp" #include "map/notifications/notification_manager_delegate.hpp" #include "map/notifications/notification_queue.hpp" @@ -82,7 +81,7 @@ #include "coding/point_coding.hpp" #include "coding/string_utf8_multilang.hpp" #include "coding/transliteration.hpp" -#include "coding/url_encode.hpp" +#include "coding/url_helpers.hpp" #include "coding/zip_reader.hpp" #include "geometry/angles.hpp" @@ -2157,8 +2156,7 @@ bool Framework::ShowMapForURL(string const & url) } else // Actually, we can parse any geo url scheme with correct coordinates. { - url_scheme::Info info; - ParseGeoURL(url, info); + coding::url::GeoURLInfo info(url); if (info.IsValid()) { point = mercator::FromLatLon(info.m_lat, info.m_lon); @@ -2673,9 +2671,9 @@ string Framework::GenerateApiBackUrl(ApiMarkPoint const & point) const ms::LatLon const ll = point.GetLatLon(); res += "pin?ll=" + strings::to_string(ll.m_lat) + "," + strings::to_string(ll.m_lon); if (!point.GetName().empty()) - res += "&n=" + UrlEncode(point.GetName()); + res += "&n=" + coding::url::UrlEncode(point.GetName()); if (!point.GetApiID().empty()) - res += "&id=" + UrlEncode(point.GetApiID()); + res += "&id=" + coding::url::UrlEncode(point.GetApiID()); } return res; } diff --git a/map/geourl_process.cpp b/map/geourl_process.cpp deleted file mode 100644 index 4525119427..0000000000 --- a/map/geourl_process.cpp +++ /dev/null @@ -1,183 +0,0 @@ -#include "map/geourl_process.hpp" - -#include "geometry/mercator.hpp" -#include "indexer/scales.hpp" - -#include "coding/uri.hpp" - -#include "base/logging.hpp" -#include "base/string_utils.hpp" - -#include - -using namespace std; - -namespace url_scheme -{ - const double INVALID_COORD = -1000.0; - - bool Info::IsValid() const - { - return (m_lat != INVALID_COORD && m_lon != INVALID_COORD); - } - - void Info::Reset() - { - m_lat = m_lon = INVALID_COORD; - m_zoom = scales::GetUpperScale(); - } - - void Info::SetZoom(double x) - { - if (x >= 0.0 && x <= scales::GetUpperScale()) - m_zoom = x; - } - - bool Info::SetLat(double x) - { - if (mercator::ValidLat(x)) - { - m_lat = x; - return true; - } - return false; - } - - bool Info::SetLon(double x) - { - if (mercator::ValidLon(x)) - { - m_lon = x; - return true; - } - return false; - } - - int const LL_PRIORITY = 5; - - /// Priority for accepting coordinates if we have many choices. - /// -1 - not initialized - /// 0 - coordinates in path; - /// x - priority for query type (greater is better) - int GetCoordinatesPriority(string const & token) - { - if (token.empty()) - return 0; - else if (token == "q") - return 1; - else if (token == "daddr") - return 2; - else if (token == "point") - return 3; - else if (token == "ll") - return 4; - else if (token == "lat" || token == "lon") - return LL_PRIORITY; - - return -1; - } - - class LatLonParser - { - regex m_regexp; - Info & m_info; - int m_latPriority, m_lonPriority; - - class AssignCoordinates - { - LatLonParser & m_parser; - int m_priority; - - public: - AssignCoordinates(LatLonParser & parser, int priority) - : m_parser(parser), m_priority(priority) - { - } - - void operator() (string const & token) const - { - double lat, lon; - - string::size_type n = token.find(','); - ASSERT(n != string::npos, ()); - VERIFY(strings::to_double(token.substr(0, n), lat), ()); - - n = token.find_first_not_of(", ", n); - ASSERT(n != string::npos, ()); - VERIFY(strings::to_double(token.substr(n, token.size() - n), lon), ()); - - if (m_parser.m_info.SetLat(lat) && m_parser.m_info.SetLon(lon)) - m_parser.m_latPriority = m_parser.m_lonPriority = m_priority; - } - }; - - public: - explicit LatLonParser(Info & info) - : m_regexp("-?\\d+\\.{1}\\d*, *-?\\d+\\.{1}\\d*") - , m_info(info) - , m_latPriority(-1) - , m_lonPriority(-1) - { - } - - bool IsValid() const - { - return (m_latPriority == m_lonPriority && m_latPriority != -1); - } - - bool operator()(string const & key, string const & value) - { - if (key == "z" || key == "zoom") - { - double x; - if (strings::to_double(value, x)) - m_info.SetZoom(x); - return true; - } - - int const priority = GetCoordinatesPriority(key); - if (priority == -1 || priority < m_latPriority || priority < m_lonPriority) - return false; - - if (priority != LL_PRIORITY) - { - strings::ForEachMatched(value, m_regexp, AssignCoordinates(*this, priority)); - } - else - { - double x; - if (strings::to_double(value, x)) - { - if (key == "lat") - { - if (!m_info.SetLat(x)) - return false; - m_latPriority = priority; - } - else - { - ASSERT_EQUAL(key, "lon", ()); - if (!m_info.SetLon(x)) - return false; - m_lonPriority = priority; - } - } - } - return true; - } - }; - - void ParseGeoURL(string const & s, Info & info) - { - url_scheme::Uri uri(s); - if (!uri.IsValid()) - return; - - LatLonParser parser(info); - parser(string(), uri.GetPath()); - uri.ForEachKeyValue(ref(parser)); - - if (!parser.IsValid()) - info.Reset(); - } -} // namespace url_scheme diff --git a/map/geourl_process.hpp b/map/geourl_process.hpp deleted file mode 100644 index 06a97c6549..0000000000 --- a/map/geourl_process.hpp +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include - -namespace url_scheme -{ - struct Info - { - double m_lat, m_lon, m_zoom; - - bool IsValid() const; - void Reset(); - - Info() - { - Reset(); - } - - void SetZoom(double x); - bool SetLat(double x); - bool SetLon(double x); - }; - - void ParseGeoURL(std::string const & s, Info & info); -} // namespace url_scheme diff --git a/map/local_ads_manager.cpp b/map/local_ads_manager.cpp index ce582b9173..b4c64feaa5 100644 --- a/map/local_ads_manager.cpp +++ b/map/local_ads_manager.cpp @@ -22,10 +22,9 @@ #include "coding/point_coding.hpp" #include "coding/string_utf8_multilang.hpp" -#include "coding/url_encode.hpp" +#include "coding/url_helpers.hpp" #include "base/file_name_utils.hpp" -#include "base/url_helpers.hpp" #include "private.h" @@ -91,7 +90,7 @@ std::string MakeCampaignDownloadingURL(MwmSet::MwmId const & mwmId) ss << kServerUrl << "/" << campaignDataVersion << "/" << mwmId.GetInfo()->GetVersion() << "/" - << UrlEncode(mwmId.GetInfo()->GetCountryName()) << ".ads"; + << coding::url::UrlEncode(mwmId.GetInfo()->GetCountryName()) << ".ads"; return ss.str(); } @@ -149,9 +148,9 @@ std::string MakeCampaignPageURL(FeatureID const & featureId) std::ostringstream ss; ss << kCampaignPageUrl << "/" << featureId.m_mwmId.GetInfo()->GetVersion() << "/" - << UrlEncode(featureId.m_mwmId.GetInfo()->GetCountryName()) << "/" << featureId.m_index; + << coding::url::UrlEncode(featureId.m_mwmId.GetInfo()->GetCountryName()) << "/" << featureId.m_index; - url::Params params; + coding::url::Params params; params.reserve(kMarketingParameters.size()); for (auto const & key : kMarketingParameters) { @@ -162,7 +161,7 @@ std::string MakeCampaignPageURL(FeatureID const & featureId) params.push_back({key, value}); } - return url::Make(ss.str(), params); + return coding::url::Make(ss.str(), params); } } // namespace diff --git a/map/map_tests/CMakeLists.txt b/map/map_tests/CMakeLists.txt index c96ba8489c..1b07a0b0f8 100644 --- a/map/map_tests/CMakeLists.txt +++ b/map/map_tests/CMakeLists.txt @@ -15,7 +15,6 @@ set( extrapolator_tests.cpp feature_getters_tests.cpp framework_light_tests.cpp - geourl_test.cpp gps_track_collection_test.cpp gps_track_storage_test.cpp gps_track_test.cpp diff --git a/map/map_tests/geourl_test.cpp b/map/map_tests/geourl_test.cpp deleted file mode 100644 index 962091877c..0000000000 --- a/map/map_tests/geourl_test.cpp +++ /dev/null @@ -1,67 +0,0 @@ -#include "testing/testing.hpp" - -#include "map/geourl_process.hpp" - - -using namespace url_scheme; - -UNIT_TEST(ProcessURL_Smoke) -{ - Info info; - ParseGeoURL("geo:53.666,27.666", info); - TEST(info.IsValid(), ()); - TEST_ALMOST_EQUAL_ULPS(info.m_lat, 53.666, ()); - TEST_ALMOST_EQUAL_ULPS(info.m_lon, 27.666, ()); - - info.Reset(); - ParseGeoURL("geo://point/?lon=27.666&lat=53.666&zoom=10", info); - TEST(info.IsValid(), ()); - TEST_ALMOST_EQUAL_ULPS(info.m_lat, 53.666, ()); - TEST_ALMOST_EQUAL_ULPS(info.m_lon, 27.666, ()); - TEST_ALMOST_EQUAL_ULPS(info.m_zoom, 10.0, ()); - - info.Reset(); - ParseGeoURL("geo:53.666", info); - TEST(!info.IsValid(), ()); - - info.Reset(); - ParseGeoURL("mapswithme:123.33,32.22/showmethemagic", info); - TEST(!info.IsValid(), ()); - - info.Reset(); - ParseGeoURL("mapswithme:32.22, 123.33/showmethemagic", info); - TEST(info.IsValid(), ()); - TEST_ALMOST_EQUAL_ULPS(info.m_lat, 32.22, ()); - TEST_ALMOST_EQUAL_ULPS(info.m_lon, 123.33, ()); - - info.Reset(); - ParseGeoURL("model: iphone 7,1", info); - TEST(!info.IsValid(), ()); -} - -UNIT_TEST(ProcessURL_Instagram) -{ - Info info; - ParseGeoURL("geo:0,0?z=14&q=54.683486138,25.289361259 (Forto%20dvaras)", info); - TEST(info.IsValid(), ()); - TEST_ALMOST_EQUAL_ULPS(info.m_lat, 54.683486138, ()); - TEST_ALMOST_EQUAL_ULPS(info.m_lon, 25.289361259, ()); - TEST_ALMOST_EQUAL_ULPS(info.m_zoom, 14.0, ()); -} - -UNIT_TEST(ProcessURL_GoogleMaps) -{ - Info info; - ParseGeoURL("https://maps.google.com/maps?z=16&q=Mezza9%401.3067198,103.83282", info); - TEST(info.IsValid(), ()); - TEST_ALMOST_EQUAL_ULPS(info.m_lat, 1.3067198, ()); - TEST_ALMOST_EQUAL_ULPS(info.m_lon, 103.83282, ()); - TEST_ALMOST_EQUAL_ULPS(info.m_zoom, 16.0, ()); - - info.Reset(); - ParseGeoURL("https://maps.google.com/maps?z=16&q=House+of+Seafood+%40+180%401.356706,103.87591", info); - TEST(info.IsValid(), ()); - TEST_ALMOST_EQUAL_ULPS(info.m_lat, 1.356706, ()); - TEST_ALMOST_EQUAL_ULPS(info.m_lon, 103.87591, ()); - TEST_ALMOST_EQUAL_ULPS(info.m_zoom, 16.0, ()); -} diff --git a/map/map_tests/mwm_url_tests.cpp b/map/map_tests/mwm_url_tests.cpp index dfe6bfa629..7333ca177a 100644 --- a/map/map_tests/mwm_url_tests.cpp +++ b/map/map_tests/mwm_url_tests.cpp @@ -9,7 +9,7 @@ #include "platform/settings.hpp" #include "coding/internal/file_data.hpp" -#include "coding/uri.hpp" +#include "coding/url_helpers.hpp" #include "base/macros.hpp" #include "base/string_format.hpp" @@ -123,7 +123,7 @@ bool IsValid(Framework & fm, string const & uriString) UNIT_TEST(MapApiSmoke) { string uriString = "mapswithme://map?ll=38.970559,-9.419289&ignoreThisParam=Yes&z=17&n=Point%20Name"; - TEST(Uri(uriString).IsValid(), ()); + TEST(coding::url::Uri(uriString).IsValid(), ()); ApiTest test(uriString); @@ -139,7 +139,7 @@ UNIT_TEST(RouteApiSmoke) { string const uriString = "mapswithme://route?sll=1,1&saddr=name0&dll=2,2&daddr=name1&type=vehicle"; - TEST(Uri(uriString).IsValid(), ()); + TEST(coding::url::Uri(uriString).IsValid(), ()); ApiTest test(uriString); TEST(test.IsValid(), ()); @@ -151,7 +151,7 @@ UNIT_TEST(RouteApiSmoke) UNIT_TEST(CatalogueApiSmoke) { string const uriString = "mapsme://catalogue?id=440f02e5-ff38-45ed-95c0-44587c9a5fc7&name=CatalogGroupName"; - TEST(Uri(uriString).IsValid(), ()); + TEST(coding::url::Uri(uriString).IsValid(), ()); ApiTest test(uriString); TEST(test.IsValid(), ()); @@ -177,7 +177,7 @@ UNIT_TEST(CatalogueApiInvalidUrl) UNIT_TEST(SearchApiSmoke) { string const uriString = "mapsme://search?query=fff&cll=1,1&locale=ru&map"; - TEST(Uri(uriString).IsValid(), ()); + TEST(coding::url::Uri(uriString).IsValid(), ()); ApiTest test(uriString); TEST(test.IsValid(), ()); @@ -209,7 +209,7 @@ UNIT_TEST(LeadApiSmoke) }); string const uriString = "mapsme://lead?utm_source=a&utm_medium=b&utm_campaign=c&utm_content=d&utm_term=e"; - TEST(Uri(uriString).IsValid(), ()); + TEST(coding::url::Uri(uriString).IsValid(), ()); ApiTest test(uriString); TEST(test.IsValid(), ()); diff --git a/map/mwm_url.cpp b/map/mwm_url.cpp index 677c49685f..307693ee3e 100644 --- a/map/mwm_url.cpp +++ b/map/mwm_url.cpp @@ -11,7 +11,7 @@ #include "platform/marketing_service.hpp" #include "platform/settings.hpp" -#include "coding/uri.hpp" +#include "coding/url_helpers.hpp" #include "base/logging.hpp" #include "base/string_utils.hpp" @@ -127,7 +127,7 @@ enum class ApiURLType std::array const kAvailableSchemes = {{"mapswithme", "mwm", "mapsme"}}; -ApiURLType URLType(Uri const & uri) +ApiURLType URLType(coding::url::Uri const & uri) { if (std::find(kAvailableSchemes.begin(), kAvailableSchemes.end(), uri.GetScheme()) == kAvailableSchemes.end()) return ApiURLType::Incorrect; @@ -191,12 +191,12 @@ ParsedMapApi::ParsingResult ParsedMapApi::SetUriAndParse(string const & url) return ParsingResult::Incorrect; } - ParsingResult const res = Parse(url_scheme::Uri(url)); + ParsingResult const res = Parse(coding::url::Uri(url)); m_isValid = res != ParsingResult::Incorrect; return res; } -ParsedMapApi::ParsingResult ParsedMapApi::Parse(Uri const & uri) +ParsedMapApi::ParsingResult ParsedMapApi::Parse(coding::url::Uri const & uri) { switch (URLType(uri)) { diff --git a/map/mwm_url.hpp b/map/mwm_url.hpp index 1bba8552a7..e1b3e44ff4 100644 --- a/map/mwm_url.hpp +++ b/map/mwm_url.hpp @@ -9,6 +9,11 @@ class ApiMarkPoint; class BookmarkManager; +namespace coding::url +{ +class Uri; +} + namespace url_scheme { struct ApiPoint @@ -58,8 +63,6 @@ namespace lead struct CampaignDescription; } -class Uri; - /// Handles [mapswithme|mwm|mapsme]://map|route|search?params - everything related to displaying info on a map class ParsedMapApi { @@ -98,7 +101,7 @@ public: CatalogPath const & GetCatalogPath() const { return m_catalogPath; } Subscription const & GetSubscription() const { return m_subscription; } private: - ParsingResult Parse(Uri const & uri); + ParsingResult Parse(coding::url::Uri const & uri); bool AddKeyValue(std::string const & key, std::string const & value, std::vector & points); bool RouteKeyValue(std::string const & key, std::string const & value, std::vector & pattern); bool SearchKeyValue(std::string const & key, std::string const & value, SearchRequest & request) const; diff --git a/map/onboarding.cpp b/map/onboarding.cpp index 992bf6b877..81e1fc9185 100644 --- a/map/onboarding.cpp +++ b/map/onboarding.cpp @@ -5,7 +5,7 @@ #include "platform/platform.hpp" #include "platform/preferred_languages.hpp" -#include "base/url_helpers.hpp" +#include "coding/url_helpers.hpp" #include #include @@ -30,9 +30,9 @@ Tip GetTip() { auto const tipIndex = std::time(nullptr) % kTipsCount; auto const link = kTipsLinks[tipIndex]; - auto const catalogUrl = base::url::Join(BOOKMARKS_CATALOG_FRONT_URL, languages::GetCurrentNorm()); + auto const catalogUrl = coding::url::Join(BOOKMARKS_CATALOG_FRONT_URL, languages::GetCurrentNorm()); return {static_cast(tipIndex), - link.empty() ? link : base::url::Join(catalogUrl, link)}; + link.empty() ? link : coding::url::Join(catalogUrl, link)}; } bool CanShowTipButton() { return GetPlatform().IsConnected(); } diff --git a/map/user.cpp b/map/user.cpp index 8de0203649..da82b771bc 100644 --- a/map/user.cpp +++ b/map/user.cpp @@ -9,7 +9,7 @@ #include "coding/file_writer.hpp" #include "coding/internal/file_data.hpp" #include "coding/serdes_json.hpp" -#include "coding/url_encode.hpp" +#include "coding/url_helpers.hpp" #include "coding/writer.hpp" #include "base/file_name_utils.hpp" @@ -125,7 +125,7 @@ std::string UserBindingRequestUrl(std::string const & advertisingId) std::ostringstream ss; ss << kUserBindingRequestUrl << "?vendor=" << kVendor - << "&advertising_id=" << UrlEncode(advertisingId); + << "&advertising_id=" << coding::url::UrlEncode(advertisingId); return ss.str(); } @@ -671,7 +671,7 @@ std::string User::GetPhoneAuthUrl(std::string const & redirectUri) { std::ostringstream os; os << kPassportServerUrl << "/oauth/authorize/?mode=phone_device&response_type=code" - << "&locale=" << languages::GetCurrentOrig() << "&redirect_uri=" << UrlEncode(redirectUri) + << "&locale=" << languages::GetCurrentOrig() << "&redirect_uri=" << coding::url::UrlEncode(redirectUri) << "&client_id=" << kAppName; return os.str(); diff --git a/partners_api/booking_api.cpp b/partners_api/booking_api.cpp index 4b76650779..6e8234be39 100644 --- a/partners_api/booking_api.cpp +++ b/partners_api/booking_api.cpp @@ -4,13 +4,12 @@ #include "platform/http_client.hpp" #include "platform/platform.hpp" -#include "coding/url_encode.hpp" +#include "coding/url_helpers.hpp" #include "coding/sha1.hpp" #include "base/get_time.hpp" #include "base/logging.hpp" #include "base/thread.hpp" -#include "base/url_helpers.hpp" #include #include @@ -66,14 +65,14 @@ std::string FormatTime(system_clock::time_point p) return partners_api::FormatTime(p, "%Y-%m-%d"); } -string MakeUrlForTesting(string const & func, url::Params const & params, string const & divider) +string MakeUrlForTesting(string const & func, coding::url::Params const & params, string const & divider) { ASSERT(!g_BookingUrlForTesting.empty(), ()); auto funcForTesting = func; if (funcForTesting == "hotelAvailability") { - auto const it = find_if(params.cbegin(), params.cend(), [](url::Param const & param) + auto const it = find_if(params.cbegin(), params.cend(), [](coding::url::Param const & param) { return param.m_name == "show_only_deals"; }); @@ -82,24 +81,24 @@ string MakeUrlForTesting(string const & func, url::Params const & params, string funcForTesting = "deals"; } - return url::Make(g_BookingUrlForTesting + divider + funcForTesting, params); + return coding::url::Make(g_BookingUrlForTesting + divider + funcForTesting, params); } -string MakeApiUrlImpl(string const & baseUrl, string const & func, url::Params const & params, +string MakeApiUrlImpl(string const & baseUrl, string const & func, coding::url::Params const & params, string const & divider) { if (!g_BookingUrlForTesting.empty()) return MakeUrlForTesting(func, params, divider); - return url::Make(baseUrl + divider + func, params); + return coding::url::Make(baseUrl + divider + func, params); } -string MakeApiUrlV1(string const & func, url::Params const & params) +string MakeApiUrlV1(string const & func, coding::url::Params const & params) { return MakeApiUrlImpl(kBookingApiBaseUrlV1, func, params, "."); } -string MakeApiUrlV2(string const & func, url::Params const & params) +string MakeApiUrlV2(string const & func, coding::url::Params const & params) { return MakeApiUrlImpl(kBookingApiBaseUrlV2, func, params, "/"); } @@ -375,9 +374,9 @@ string ApplyAvailabilityParamsUniversal(string const & url, AvailabilityParams c auto const pos = url.find('#'); if (pos == string::npos) - return url::Make(url, p); + return coding::url::Make(url, p); - string result = url::Make(url.substr(0, pos), p); + string result = coding::url::Make(url.substr(0, pos), p); result.append(url.substr(pos)); return result; } @@ -392,14 +391,14 @@ string ApplyAvailabilityParamsDeep(string const & url, AvailabilityParams const p.emplace_back("numberOfGuests", std::to_string(sum)); - return url::Make(url, p); + return coding::url::Make(url, p); } string AppendAid(string const & baseUrl) { ASSERT(!baseUrl.empty(), ()); - url::Params p = {{"aid", BOOKING_AFFILIATE_ID}}; - return url::Make(baseUrl, p); + coding::url::Params p = {{"aid", BOOKING_AFFILIATE_ID}}; + return coding::url::Make(baseUrl, p); } string ApplendLabel(string const & baseUrl, string const & labelSource) @@ -409,9 +408,9 @@ string ApplendLabel(string const & baseUrl, string const & labelSource) auto static const kDeviceIdHash = coding::SHA1::CalculateForStringFormatted(GetPlatform().UniqueClientId()); - url::Params const p = {{"label", labelSource + "-" + UrlEncode(kDeviceIdHash)}}; + coding::url::Params const p = {{"label", labelSource + "-" + coding::url::UrlEncode(kDeviceIdHash)}}; - return url::Make(baseUrl, p); + return coding::url::Make(baseUrl, p); } string AppendAidAndLabel(string const & baseUrl, string const & labelSource) @@ -491,8 +490,8 @@ string Api::GetHotelReviewsUrl(string const & hotelId, string const & baseUrl) c ASSERT(!baseUrl.empty(), ()); ASSERT(!hotelId.empty(), ()); - url::Params const p = {{"tab", "4"}}; - return url::Make(AppendAidAndLabel(baseUrl, "ppReviews"), p); + coding::url::Params const p = {{"tab", "4"}}; + return coding::url::Make(AppendAidAndLabel(baseUrl, "ppReviews"), p); } string Api::GetSearchUrl(string const & city, string const & name) const @@ -503,13 +502,13 @@ string Api::GetSearchUrl(string const & city, string const & name) const ostringstream paramStream; paramStream << city << " " << name; - auto const urlEncodedParams = UrlEncode(paramStream.str()); + auto const urlEncodedParams = coding::url::UrlEncode(paramStream.str()); if (urlEncodedParams.empty()) return {}; - url::Params p = {{"&ss=", urlEncodedParams}}; - return url::Make(AppendAidAndLabel(kSearchBaseUrl, "ppActionButtonOSM"), p); + coding::url::Params p = {{"&ss=", urlEncodedParams}}; + return coding::url::Make(AppendAidAndLabel(kSearchBaseUrl, "ppActionButtonOSM"), p); } string Api::ApplyAvailabilityParams(string const & url, AvailabilityParams const & params) const diff --git a/partners_api/booking_availability_params.cpp b/partners_api/booking_availability_params.cpp index 7b04f22188..6612ea0df0 100644 --- a/partners_api/booking_availability_params.cpp +++ b/partners_api/booking_availability_params.cpp @@ -80,9 +80,9 @@ AvailabilityParams AvailabilityParams::MakeDefault() return result; } -url::Params AvailabilityParams::Get(UrlFilter const & filter /* = {} */) const +coding::url::Params AvailabilityParams::Get(UrlFilter const & filter /* = {} */) const { - url::Params result; + coding::url::Params result; if (IsAcceptedByFilter(filter, "hotel_ids")) result.emplace_back("hotel_ids", strings::JoinStrings(m_hotelIds, ',')); diff --git a/partners_api/booking_availability_params.hpp b/partners_api/booking_availability_params.hpp index 7d29c742aa..84f5cab96c 100644 --- a/partners_api/booking_availability_params.hpp +++ b/partners_api/booking_availability_params.hpp @@ -2,7 +2,7 @@ #include "partners_api/booking_params_base.hpp" -#include "base/url_helpers.hpp" +#include "coding/url_helpers.hpp" #include #include @@ -44,7 +44,7 @@ struct AvailabilityParams : public ParamsBase static AvailabilityParams MakeDefault(); using UrlFilter = std::unordered_set; - base::url::Params Get(UrlFilter const & filter = {}) const; + coding::url::Params Get(UrlFilter const & filter = {}) const; // ParamsBase overrides: bool IsEmpty() const override; diff --git a/partners_api/booking_block_params.cpp b/partners_api/booking_block_params.cpp index 561adb0808..47bd517153 100644 --- a/partners_api/booking_block_params.cpp +++ b/partners_api/booking_block_params.cpp @@ -19,9 +19,9 @@ BlockParams BlockParams::MakeDefault() return result; } -url::Params BlockParams::Get() const +coding::url::Params BlockParams::Get() const { - url::Params params = {{"hotel_ids", m_hotelId}, + coding::url::Params params = {{"hotel_ids", m_hotelId}, {"checkin", FormatTime(m_checkin)}, {"checkout", FormatTime(m_checkout)}}; diff --git a/partners_api/booking_block_params.hpp b/partners_api/booking_block_params.hpp index 836cfbfc49..e7db2d7324 100644 --- a/partners_api/booking_block_params.hpp +++ b/partners_api/booking_block_params.hpp @@ -2,7 +2,7 @@ #include "partners_api/booking_params_base.hpp" -#include "base/url_helpers.hpp" +#include "coding/url_helpers.hpp" #include #include @@ -15,7 +15,7 @@ struct BlockParams : public ParamsBase static BlockParams MakeDefault(); - base::url::Params Get() const; + coding::url::Params Get() const; // ParamsBase overrides: bool IsEmpty() const override; diff --git a/partners_api/locals_api.cpp b/partners_api/locals_api.cpp index 53726b6904..357fae495b 100644 --- a/partners_api/locals_api.cpp +++ b/partners_api/locals_api.cpp @@ -5,7 +5,6 @@ #include "platform/preferred_languages.hpp" #include "coding/string_utf8_multilang.hpp" -#include "coding/url_encode.hpp" #include "base/logging.hpp" #include "base/string_utils.hpp" diff --git a/partners_api/promo_api.cpp b/partners_api/promo_api.cpp index 4b66bd1fdb..e140e55b92 100644 --- a/partners_api/promo_api.cpp +++ b/partners_api/promo_api.cpp @@ -5,9 +5,10 @@ #include "platform/preferred_languages.hpp" #include "platform/settings.hpp" +#include "coding/url_helpers.hpp" + #include "base/assert.hpp" #include "base/string_utils.hpp" -#include "base/url_helpers.hpp" #include #include @@ -61,7 +62,7 @@ void ParseCityGallery(std::string const & src, UTM utm, std::string const & utmT auto const obj = json_array_get(dataArray, i); FromJSONObject(obj, "name", item.m_name); FromJSONObject(obj, "url", item.m_url); - item.m_url = InjectUTM(url::Join(BOOKMARKS_CATALOG_FRONT_URL, item.m_url), utm); + item.m_url = InjectUTM(coding::url::Join(BOOKMARKS_CATALOG_FRONT_URL, item.m_url), utm); if (!utmTerm.empty()) item.m_url = InjectUTMTerm(item.m_url, utmTerm); @@ -93,7 +94,7 @@ void ParseCityGallery(std::string const & src, UTM utm, std::string const & utmT auto const meta = json_object_get(root.get(), "meta"); FromJSONObjectOptionalField(meta, "more", result.m_moreUrl); - result.m_moreUrl = InjectUTM(url::Join(BOOKMARKS_CATALOG_FRONT_URL, result.m_moreUrl), utm); + result.m_moreUrl = InjectUTM(coding::url::Join(BOOKMARKS_CATALOG_FRONT_URL, result.m_moreUrl), utm); if (!utmTerm.empty()) result.m_moreUrl = InjectUTMTerm(result.m_moreUrl, utmTerm); FromJSONObjectOptionalField(meta, "category", result.m_category); @@ -117,8 +118,8 @@ std::string MakeCityGalleryUrl(std::string const & baseUrl, std::string const & ASSERT_EQUAL(baseUrl.back(), '/', ()); - url::Params params = {{"city_id", ToSignedId(id)}, {"lang", lang}}; - return url::Make(url::Join(baseUrl, "gallery/v2/search/"), params); + coding::url::Params params = {{"city_id", ToSignedId(id)}, {"lang", lang}}; + return coding::url::Make(coding::url::Join(baseUrl, "gallery/v2/search/"), params); } std::string MakePoiGalleryUrl(std::string const & baseUrl, std::string const & id, @@ -129,7 +130,7 @@ std::string MakePoiGalleryUrl(std::string const & baseUrl, std::string const & i if (baseUrl.empty()) return {}; - url::Params params; + coding::url::Params params; if (!id.empty()) params.emplace_back("city_id", ToSignedId(id)); @@ -145,7 +146,7 @@ std::string MakePoiGalleryUrl(std::string const & baseUrl, std::string const & i params.emplace_back("tags", strings::JoinStrings(tags, ",")); params.emplace_back("lang", lang); - return url::Make(url::Join(baseUrl, "gallery/v2/search/"), params); + return coding::url::Make(coding::url::Join(baseUrl, "gallery/v2/search/"), params); } std::string GetPictureUrl(std::string const & baseUrl, std::string const & id) diff --git a/partners_api/rutaxi_api.cpp b/partners_api/rutaxi_api.cpp index 7a61f128cd..9d86b5ba2f 100644 --- a/partners_api/rutaxi_api.cpp +++ b/partners_api/rutaxi_api.cpp @@ -6,7 +6,7 @@ #include "geometry/latlon.hpp" #include "geometry/mercator.hpp" -#include "coding/url_encode.hpp" +#include "coding/url_helpers.hpp" #include "base/logging.hpp" #include "base/string_utils.hpp" @@ -196,10 +196,10 @@ void MakeProducts(std::string const & src, Object const & from, Object const & t << "&title2=" << to.m_title << "&ob2=" << to.m_id << "&h2=" << to.m_house << "&e1="; #else - productStream << "city=" << city.m_id << "&title1=" << UrlEncode(from.m_title) - << "&ob1=" << from.m_id << "&h1=" << UrlEncode(from.m_house) - << "&title2=" << UrlEncode(to.m_title) << "&ob2=" << to.m_id - << "&h2=" << UrlEncode(to.m_house) << "&e1="; + productStream << "city=" << city.m_id << "&title1=" << coding::url::UrlEncode(from.m_title) + << "&ob1=" << from.m_id << "&h1=" << coding::url::UrlEncode(from.m_house) + << "&title2=" << coding::url::UrlEncode(to.m_title) << "&ob2=" << to.m_id + << "&h2=" << coding::url::UrlEncode(to.m_house) << "&e1="; #endif taxi::Product product; diff --git a/partners_api/utm.hpp b/partners_api/utm.hpp index 110b661c4a..354db71b2f 100644 --- a/partners_api/utm.hpp +++ b/partners_api/utm.hpp @@ -1,6 +1,6 @@ #pragma once -#include "base/url_helpers.hpp" +#include "coding/url_helpers.hpp" #include #include @@ -34,7 +34,7 @@ inline std::string InjectUTM(std::string const & url, UTM utm) if (url.empty()) return {}; - base::url::Params params; + coding::url::Params params; params.emplace_back("utm_source", "maps.me"); switch (utm) { @@ -85,12 +85,12 @@ inline std::string InjectUTM(std::string const & url, UTM utm) case UTM::None: return url; } - return base::url::Make(url, params); + return coding::url::Make(url, params); } inline std::string InjectUTMContent(std::string const & url, UTMContent content) { - base::url::Params params; + coding::url::Params params; switch (content) { case UTMContent::Description: @@ -106,10 +106,10 @@ inline std::string InjectUTMContent(std::string const & url, UTMContent content) params.emplace_back("utm_content", "more"); break; } - return base::url::Make(url, params); + return coding::url::Make(url, params); } inline std::string InjectUTMTerm(std::string const & url, std::string const & value) { - return base::url::Make(url, {{"utm_term", value}}); + return coding::url::Make(url, {{"utm_term", value}}); } diff --git a/routing/routing_quality/api/mapbox/mapbox_api.cpp b/routing/routing_quality/api/mapbox/mapbox_api.cpp index 0ab4f42054..5b8ff5102b 100644 --- a/routing/routing_quality/api/mapbox/mapbox_api.cpp +++ b/routing/routing_quality/api/mapbox/mapbox_api.cpp @@ -4,7 +4,7 @@ #include "coding/file_writer.hpp" #include "coding/serdes_json.hpp" -#include "coding/url_encode.hpp" +#include "coding/url_helpers.hpp" #include "coding/writer.hpp" #include "platform/http_client.hpp" @@ -48,7 +48,7 @@ string LatLonsToString(vector const & coords) } oss << ".json"; - return UrlEncode(oss.str()); + return coding::url::UrlEncode(oss.str()); } } // namespace diff --git a/storage/map_files_downloader.cpp b/storage/map_files_downloader.cpp index 7c7988fc24..cedbd84c88 100644 --- a/storage/map_files_downloader.cpp +++ b/storage/map_files_downloader.cpp @@ -6,11 +6,10 @@ #include "platform/platform.hpp" #include "platform/servers_list.hpp" -#include "coding/url_encode.hpp" +#include "coding/url_helpers.hpp" #include "base/assert.hpp" #include "base/string_utils.hpp" -#include "base/url_helpers.hpp" namespace storage { @@ -65,8 +64,8 @@ void MapFilesDownloader::UnsubscribeAll() std::string MapFilesDownloader::MakeFullUrlLegacy(std::string const & baseUrl, std::string const & fileName, int64_t dataVersion) { - return base::url::Join(baseUrl, OMIM_OS_NAME, strings::to_string(dataVersion), - UrlEncode(fileName)); + return coding::url::Join(baseUrl, OMIM_OS_NAME, strings::to_string(dataVersion), + coding::url::UrlEncode(fileName)); } void MapFilesDownloader::SetServersList(ServersList const & serversList) @@ -89,7 +88,7 @@ std::vector MapFilesDownloader::MakeUrlList(std::string const & rel std::vector urls; urls.reserve(m_serversList.size()); for (auto const & server : m_serversList) - urls.emplace_back(base::url::Join(server, relativeUrl)); + urls.emplace_back(coding::url::Join(server, relativeUrl)); return urls; } diff --git a/storage/queued_country.cpp b/storage/queued_country.cpp index 6cd926fbbc..fce1ff7f58 100644 --- a/storage/queued_country.cpp +++ b/storage/queued_country.cpp @@ -4,10 +4,9 @@ #include "platform/local_country_file_utils.hpp" -#include "coding/url_encode.hpp" +#include "coding/url_helpers.hpp" #include "base/assert.hpp" -#include "base/url_helpers.hpp" namespace { @@ -19,7 +18,7 @@ std::string MakeRelativeUrl(std::string const & fileName, int64_t dataVersion, u else url << OMIM_OS_NAME "/" << dataVersion; - return base::url::Join(url.str(), UrlEncode(fileName)); + return coding::url::Join(url.str(), coding::url::UrlEncode(fileName)); } } // namespace diff --git a/traffic/traffic_info.cpp b/traffic/traffic_info.cpp index 2d085b3a32..6625aec95d 100644 --- a/traffic/traffic_info.cpp +++ b/traffic/traffic_info.cpp @@ -12,7 +12,7 @@ #include "coding/elias_coder.hpp" #include "coding/files_container.hpp" #include "coding/reader.hpp" -#include "coding/url_encode.hpp" +#include "coding/url_helpers.hpp" #include "coding/varint.hpp" #include "coding/write_to_sink.hpp" #include "coding/writer.hpp" @@ -74,7 +74,7 @@ string MakeRemoteURL(string const & name, uint64_t version) ss << TRAFFIC_DATA_BASE_URL; if (version != 0) ss << version << "/"; - ss << UrlEncode(name) << TRAFFIC_FILE_EXTENSION; + ss << coding::url::UrlEncode(name) << TRAFFIC_FILE_EXTENSION; return ss.str(); } diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj index 130ae8cf4a..5401eb25d8 100644 --- a/xcode/base/base.xcodeproj/project.pbxproj +++ b/xcode/base/base.xcodeproj/project.pbxproj @@ -39,7 +39,6 @@ 395FEB3521492F350036395C /* stl_helpers_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 395FEB3321492F320036395C /* stl_helpers_tests.cpp */; }; 3975D20B235F2738004D84D3 /* cancellable_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3975D20A235F2738004D84D3 /* cancellable_tests.cpp */; }; 3975D20C235F2761004D84D3 /* thread_safe_queue_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 395784CE2303034000F2CC07 /* thread_safe_queue_tests.cpp */; }; - 3975D20D235F2761004D84D3 /* url_helpers_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 395784CF2303034000F2CC07 /* url_helpers_tests.cpp */; }; 397DC50D22BB8EBF007126DB /* bidirectional_map.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 397DC50B22BB8EBF007126DB /* bidirectional_map.hpp */; }; 397DC50E22BB8EBF007126DB /* non_intersecting_intervals.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 397DC50C22BB8EBF007126DB /* non_intersecting_intervals.hpp */; }; 397DC51122BB8ED2007126DB /* bidirectional_map_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 397DC50F22BB8ECD007126DB /* bidirectional_map_tests.cpp */; }; @@ -75,8 +74,6 @@ 39FD27391CC65AD000AFF551 /* timer_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39FD26E31CC65A0E00AFF551 /* timer_test.cpp */; }; 39FD273B1CC65B1000AFF551 /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675341771A3F57BF00A0A8C3 /* libbase.a */; }; 3D1BE646212D775500ACD94A /* atomic_shared_ptr.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D1BE645212D775500ACD94A /* atomic_shared_ptr.hpp */; }; - 3D3731FE1F9A445500D2121B /* url_helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D3731FC1F9A445400D2121B /* url_helpers.cpp */; }; - 3D3731FF1F9A445500D2121B /* url_helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D3731FD1F9A445500D2121B /* url_helpers.hpp */; }; 3D74EF111F8B902C0081202C /* suffix_array.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D74EF0B1F8B902B0081202C /* suffix_array.cpp */; }; 3D74EF121F8B902C0081202C /* visitor.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D74EF0C1F8B902B0081202C /* visitor.hpp */; }; 3D7815731F3A145F0068B6AC /* task_loop.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D7815711F3A145F0068B6AC /* task_loop.hpp */; }; @@ -181,7 +178,6 @@ 3917FA5E211E00C300937DF4 /* suffix_array.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = suffix_array.hpp; sourceTree = ""; }; 3917FA60211E00F100937DF4 /* geo_object_id_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = geo_object_id_tests.cpp; sourceTree = ""; }; 395784CE2303034000F2CC07 /* thread_safe_queue_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thread_safe_queue_tests.cpp; sourceTree = ""; }; - 395784CF2303034000F2CC07 /* url_helpers_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = url_helpers_tests.cpp; sourceTree = ""; }; 395FEB3321492F320036395C /* stl_helpers_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stl_helpers_tests.cpp; sourceTree = ""; }; 3975D20A235F2738004D84D3 /* cancellable_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cancellable_tests.cpp; sourceTree = ""; }; 397DC50B22BB8EBF007126DB /* bidirectional_map.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = bidirectional_map.hpp; sourceTree = ""; }; @@ -226,8 +222,6 @@ 39FD27401CC65B2800AFF551 /* libindexer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libindexer.a; path = "../../../omim-xcode-build/Debug/libindexer.a"; sourceTree = ""; }; 39FD27421CC65B4800AFF551 /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "../../../omim-xcode-build/Debug/libcoding.a"; sourceTree = ""; }; 3D1BE645212D775500ACD94A /* atomic_shared_ptr.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = atomic_shared_ptr.hpp; sourceTree = ""; }; - 3D3731FC1F9A445400D2121B /* url_helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = url_helpers.cpp; sourceTree = ""; }; - 3D3731FD1F9A445500D2121B /* url_helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = url_helpers.hpp; sourceTree = ""; }; 3D74EF0B1F8B902B0081202C /* suffix_array.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = suffix_array.cpp; sourceTree = ""; }; 3D74EF0C1F8B902B0081202C /* visitor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = visitor.hpp; sourceTree = ""; }; 3D7815711F3A145F0068B6AC /* task_loop.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = task_loop.hpp; sourceTree = ""; }; @@ -338,7 +332,6 @@ children = ( 3975D20A235F2738004D84D3 /* cancellable_tests.cpp */, 395784CE2303034000F2CC07 /* thread_safe_queue_tests.cpp */, - 395784CF2303034000F2CC07 /* url_helpers_tests.cpp */, 397DC50F22BB8ECD007126DB /* bidirectional_map_tests.cpp */, F61B9796229BFDF1000E878B /* non_intersecting_intervals_tests.cpp */, 390F1C0F2294299A00EA58E3 /* file_name_utils_tests.cpp */, @@ -507,8 +500,6 @@ 675341CA1A3F57E400A0A8C3 /* timer.hpp */, 3446C66F1DDCA96300146687 /* uni_string_dfa.cpp */, 3446C6701DDCA96300146687 /* uni_string_dfa.hpp */, - 3D3731FC1F9A445400D2121B /* url_helpers.cpp */, - 3D3731FD1F9A445500D2121B /* url_helpers.hpp */, 3D74EF0C1F8B902B0081202C /* visitor.hpp */, 3D78157A1F3D89EC0068B6AC /* waiter.hpp */, ); @@ -571,7 +562,6 @@ 3917FA5F211E00C400937DF4 /* suffix_array.hpp in Headers */, 3917FA53211E008C00937DF4 /* clustering_map.hpp in Headers */, 3989E364230302EA00D63F84 /* thread_safe_queue.hpp in Headers */, - 3D3731FF1F9A445500D2121B /* url_helpers.hpp in Headers */, 390F1C0D2294298E00EA58E3 /* file_name_utils.hpp in Headers */, E1B7FFC121FA19FE00F094DC /* thread_pool_computational.hpp in Headers */, 675342071A3F57E400A0A8C3 /* thread_pool.hpp in Headers */, @@ -718,7 +708,6 @@ 3917FA6A211E010400937DF4 /* control_flow_tests.cpp in Sources */, 39FD27321CC65AD000AFF551 /* string_format_test.cpp in Sources */, 39FD272A1CC65AD000AFF551 /* mem_trie_test.cpp in Sources */, - 3975D20D235F2761004D84D3 /* url_helpers_tests.cpp in Sources */, 395FEB3521492F350036395C /* stl_helpers_tests.cpp in Sources */, 3975D20C235F2761004D84D3 /* thread_safe_queue_tests.cpp in Sources */, 3446C67C1DDCAA4600146687 /* levenshtein_dfa_test.cpp in Sources */, @@ -772,7 +761,6 @@ 3D74EF111F8B902C0081202C /* suffix_array.cpp in Sources */, 3917FA57211E009700937DF4 /* geo_object_id.cpp in Sources */, 3901B745235F02B3006ABD43 /* cancellable.cpp in Sources */, - 3D3731FE1F9A445500D2121B /* url_helpers.cpp in Sources */, 675341F91A3F57E400A0A8C3 /* src_point.cpp in Sources */, 675342031A3F57E400A0A8C3 /* strings_bundle.cpp in Sources */, 675341CD1A3F57E400A0A8C3 /* base.cpp in Sources */, diff --git a/xcode/coding/coding.xcodeproj/project.pbxproj b/xcode/coding/coding.xcodeproj/project.pbxproj index e84451522a..a7fbfacf7a 100644 --- a/xcode/coding/coding.xcodeproj/project.pbxproj +++ b/xcode/coding/coding.xcodeproj/project.pbxproj @@ -35,6 +35,12 @@ 39B2B97D1FB4693500AB85A1 /* bwt_coder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 39B2B97C1FB4693400AB85A1 /* bwt_coder.hpp */; }; 39B2B97F1FB4693B00AB85A1 /* elias_coder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 39B2B97E1FB4693B00AB85A1 /* elias_coder.hpp */; }; 39B2B9811FB4694300AB85A1 /* memory_region.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 39B2B9801FB4694300AB85A1 /* memory_region.hpp */; }; + 39C2287A23E1EAE900251321 /* url_helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 39C2287823E1EAE800251321 /* url_helpers.hpp */; }; + 39C2287B23E1EAE900251321 /* url_helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39C2287923E1EAE900251321 /* url_helpers.cpp */; }; + 39C2287D23E1EAF500251321 /* url_helpers_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39C2287C23E1EAF500251321 /* url_helpers_tests.cpp */; }; + 39C2287F23E1EF0000251321 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 39C2287E23E1EF0000251321 /* libjansson.a */; }; + 39C2288123E1EF1700251321 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 39C2288023E1EF1700251321 /* CoreLocation.framework */; }; + 39C2288323E1EF1C00251321 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 39C2288223E1EF1C00251321 /* Security.framework */; }; 39C3C0BC21A43061003B4712 /* point_coding.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 39C3C0BA21A43060003B4712 /* point_coding.hpp */; }; 39C3C0BD21A43061003B4712 /* point_coding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39C3C0BB21A43061003B4712 /* point_coding.cpp */; }; 39C3C0C221A43200003B4712 /* point_coding_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39C3C0BE21A431BF003B4712 /* point_coding_tests.cpp */; }; @@ -105,8 +111,6 @@ 675342BF1A3F588C00A0A8C3 /* streams_common.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675342691A3F588B00A0A8C3 /* streams_common.hpp */; }; 675342C01A3F588C00A0A8C3 /* streams_sink.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753426A1A3F588B00A0A8C3 /* streams_sink.hpp */; }; 675342C11A3F588C00A0A8C3 /* streams.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753426B1A3F588B00A0A8C3 /* streams.hpp */; }; - 675342C51A3F588C00A0A8C3 /* uri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675342701A3F588B00A0A8C3 /* uri.cpp */; }; - 675342C61A3F588C00A0A8C3 /* uri.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675342711A3F588B00A0A8C3 /* uri.hpp */; }; 675342C71A3F588C00A0A8C3 /* url_encode.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675342721A3F588B00A0A8C3 /* url_encode.hpp */; }; 675342C81A3F588C00A0A8C3 /* value_opt_string.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675342731A3F588B00A0A8C3 /* value_opt_string.hpp */; }; 675342C91A3F588C00A0A8C3 /* var_record_reader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675342741A3F588C00A0A8C3 /* var_record_reader.hpp */; }; @@ -136,8 +140,6 @@ 67E8DB681BBC17490053C5BA /* reader_cache_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67E8DB1D1BBC16C70053C5BA /* reader_cache_test.cpp */; }; 67E8DB691BBC17490053C5BA /* reader_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67E8DB1E1BBC16C70053C5BA /* reader_test.cpp */; }; 67E8DB6A1BBC17490053C5BA /* reader_writer_ops_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67E8DB201BBC16C70053C5BA /* reader_writer_ops_test.cpp */; }; - 67E8DB6E1BBC17490053C5BA /* uri_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67E8DB241BBC16C70053C5BA /* uri_test.cpp */; }; - 67E8DB6F1BBC17490053C5BA /* url_encode_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67E8DB251BBC16C70053C5BA /* url_encode_test.cpp */; }; 67E8DB701BBC17490053C5BA /* value_opt_string_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67E8DB261BBC16C70053C5BA /* value_opt_string_test.cpp */; }; 67E8DB711BBC17490053C5BA /* var_record_reader_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67E8DB271BBC16C70053C5BA /* var_record_reader_test.cpp */; }; 67E8DB721BBC17490053C5BA /* var_serial_vector_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67E8DB281BBC16C70053C5BA /* var_serial_vector_test.cpp */; }; @@ -198,6 +200,12 @@ 39B2B97C1FB4693400AB85A1 /* bwt_coder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = bwt_coder.hpp; sourceTree = ""; }; 39B2B97E1FB4693B00AB85A1 /* elias_coder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = elias_coder.hpp; sourceTree = ""; }; 39B2B9801FB4694300AB85A1 /* memory_region.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = memory_region.hpp; sourceTree = ""; }; + 39C2287823E1EAE800251321 /* url_helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = url_helpers.hpp; sourceTree = ""; }; + 39C2287923E1EAE900251321 /* url_helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = url_helpers.cpp; sourceTree = ""; }; + 39C2287C23E1EAF500251321 /* url_helpers_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = url_helpers_tests.cpp; sourceTree = ""; }; + 39C2287E23E1EF0000251321 /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 39C2288023E1EF1700251321 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; + 39C2288223E1EF1C00251321 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; 39C3C0BA21A43060003B4712 /* point_coding.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = point_coding.hpp; sourceTree = ""; }; 39C3C0BB21A43061003B4712 /* point_coding.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = point_coding.cpp; sourceTree = ""; }; 39C3C0BE21A431BF003B4712 /* point_coding_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = point_coding_tests.cpp; sourceTree = ""; }; @@ -267,8 +275,6 @@ 675342691A3F588B00A0A8C3 /* streams_common.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = streams_common.hpp; sourceTree = ""; }; 6753426A1A3F588B00A0A8C3 /* streams_sink.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = streams_sink.hpp; sourceTree = ""; }; 6753426B1A3F588B00A0A8C3 /* streams.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = streams.hpp; sourceTree = ""; }; - 675342701A3F588B00A0A8C3 /* uri.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uri.cpp; sourceTree = ""; }; - 675342711A3F588B00A0A8C3 /* uri.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = uri.hpp; sourceTree = ""; }; 675342721A3F588B00A0A8C3 /* url_encode.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = url_encode.hpp; sourceTree = ""; }; 675342731A3F588B00A0A8C3 /* value_opt_string.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = value_opt_string.hpp; sourceTree = ""; }; 675342741A3F588C00A0A8C3 /* var_record_reader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = var_record_reader.hpp; sourceTree = ""; }; @@ -300,8 +306,6 @@ 67E8DB1E1BBC16C70053C5BA /* reader_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = reader_test.cpp; sourceTree = ""; }; 67E8DB1F1BBC16C70053C5BA /* reader_test.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = reader_test.hpp; sourceTree = ""; }; 67E8DB201BBC16C70053C5BA /* reader_writer_ops_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = reader_writer_ops_test.cpp; sourceTree = ""; }; - 67E8DB241BBC16C70053C5BA /* uri_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uri_test.cpp; sourceTree = ""; }; - 67E8DB251BBC16C70053C5BA /* url_encode_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = url_encode_test.cpp; sourceTree = ""; }; 67E8DB261BBC16C70053C5BA /* value_opt_string_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = value_opt_string_test.cpp; sourceTree = ""; }; 67E8DB271BBC16C70053C5BA /* var_record_reader_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = var_record_reader_test.cpp; sourceTree = ""; }; 67E8DB281BBC16C70053C5BA /* var_serial_vector_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = var_serial_vector_test.cpp; sourceTree = ""; }; @@ -323,6 +327,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 39C2288323E1EF1C00251321 /* Security.framework in Frameworks */, + 39C2288123E1EF1700251321 /* CoreLocation.framework in Frameworks */, + 39C2287F23E1EF0000251321 /* libjansson.a in Frameworks */, F65AFA381F18C7A500979A50 /* libplatform.a in Frameworks */, F65AFA361F18B8AB00979A50 /* libplatform_tests_support.a in Frameworks */, 45C108BA1E9CFF8E000FE1F6 /* libgeometry.a in Frameworks */, @@ -349,6 +356,9 @@ 3496AB6C1DC1F53500C5DDBA /* Frameworks */ = { isa = PBXGroup; children = ( + 39C2288223E1EF1C00251321 /* Security.framework */, + 39C2288023E1EF1700251321 /* CoreLocation.framework */, + 39C2287E23E1EF0000251321 /* libjansson.a */, D57BDA1C2396A48400505BE6 /* liboauthcpp.a */, F65AFA371F18C7A500979A50 /* libplatform.a */, F65AFA351F18B8AB00979A50 /* libplatform_tests_support.a */, @@ -361,6 +371,7 @@ 394916901BAC3A5F002A8C4F /* coding_tests */ = { isa = PBXGroup; children = ( + 39C2287C23E1EAF500251321 /* url_helpers_tests.cpp */, 39D5293A23D60C91006F00DA /* bwt_tests.cpp */, 39D5293B23D60C91006F00DA /* move_to_front_tests.cpp */, 56DAC3632399206A000BC50D /* test_polylines.hpp */, @@ -385,7 +396,6 @@ 67E8DB091BBC16C70053C5BA /* bit_streams_test.cpp */, 67E8DB0D1BBC16C70053C5BA /* compressed_bit_vector_test.cpp */, 67E8DB101BBC16C70053C5BA /* dd_vector_test.cpp */, - 67E8DB241BBC16C70053C5BA /* uri_test.cpp */, F6C269FD1F176FFE00EB6519 /* csv_reader_test.cpp */, 67E8DB111BBC16C70053C5BA /* diff_test.cpp */, 67E8DB121BBC16C70053C5BA /* endianness_test.cpp */, @@ -400,7 +410,6 @@ 67E8DB1E1BBC16C70053C5BA /* reader_test.cpp */, 67E8DB1F1BBC16C70053C5BA /* reader_test.hpp */, 67E8DB201BBC16C70053C5BA /* reader_writer_ops_test.cpp */, - 67E8DB251BBC16C70053C5BA /* url_encode_test.cpp */, 67E8DB261BBC16C70053C5BA /* value_opt_string_test.cpp */, 67E8DB271BBC16C70053C5BA /* var_record_reader_test.cpp */, 3949171F1BAC3BE0002A8C4F /* testingmain.cpp */, @@ -450,6 +459,8 @@ 6753421D1A3F586300A0A8C3 /* coding */ = { isa = PBXGroup; children = ( + 39C2287923E1EAE900251321 /* url_helpers.cpp */, + 39C2287823E1EAE800251321 /* url_helpers.hpp */, 39D5293623D60C78006F00DA /* move_to_front.cpp */, 39D5293723D60C78006F00DA /* move_to_front.hpp */, 39D5293323D60C6F006F00DA /* bwt.cpp */, @@ -520,8 +531,6 @@ 675E889B1DB7B0D000F8EBDA /* traffic.hpp */, BB537C5D1E8490120074D9D3 /* transliteration.cpp */, BB537C5E1E8490120074D9D3 /* transliteration.hpp */, - 675342701A3F588B00A0A8C3 /* uri.cpp */, - 675342711A3F588B00A0A8C3 /* uri.hpp */, 675342721A3F588B00A0A8C3 /* url_encode.hpp */, 675342731A3F588B00A0A8C3 /* value_opt_string.hpp */, 675342741A3F588C00A0A8C3 /* var_record_reader.hpp */, @@ -560,6 +569,7 @@ buildActionMask = 2147483647; files = ( 3973743121C17EFE0003807A /* string_utf8_multilang.hpp in Headers */, + 39C2287A23E1EAE900251321 /* url_helpers.hpp in Headers */, 675342C81A3F588C00A0A8C3 /* value_opt_string.hpp in Headers */, 3954E00F233500E90007FDE4 /* files_container.hpp in Headers */, 675342B51A3F588C00A0A8C3 /* reader_cache.hpp in Headers */, @@ -598,7 +608,6 @@ 6753428B1A3F588C00A0A8C3 /* buffer_reader.hpp in Headers */, 675342831A3F588C00A0A8C3 /* base64.hpp in Headers */, 675342BA1A3F588C00A0A8C3 /* reader_writer_ops.hpp in Headers */, - 675342C61A3F588C00A0A8C3 /* uri.hpp in Headers */, 34A129D41DF99E43001B4531 /* zlib.hpp in Headers */, 670D04BD1B0BA92D0013A7AC /* expat_impl.h in Headers */, 675342A81A3F588C00A0A8C3 /* hex.hpp in Headers */, @@ -705,8 +714,8 @@ 39D5294623D60CA5006F00DA /* map_uint32_to_val_tests.cpp in Sources */, 67E8DB551BBC17490053C5BA /* base64_test.cpp in Sources */, 67E8DB5F1BBC17490053C5BA /* file_data_test.cpp in Sources */, - 67E8DB6E1BBC17490053C5BA /* uri_test.cpp in Sources */, 395D1A98207BBF63001164A5 /* bwt_coder_tests.cpp in Sources */, + 39C2287D23E1EAF500251321 /* url_helpers_tests.cpp in Sources */, 67E8DB711BBC17490053C5BA /* var_record_reader_test.cpp in Sources */, 39D5293D23D60C91006F00DA /* move_to_front_tests.cpp in Sources */, 67E8DB6A1BBC17490053C5BA /* reader_writer_ops_test.cpp in Sources */, @@ -728,7 +737,6 @@ 67E8DB701BBC17490053C5BA /* value_opt_string_test.cpp in Sources */, 67E8DB681BBC17490053C5BA /* reader_cache_test.cpp in Sources */, 39C3C0C221A43200003B4712 /* point_coding_tests.cpp in Sources */, - 67E8DB6F1BBC17490053C5BA /* url_encode_test.cpp in Sources */, 67E8DB721BBC17490053C5BA /* var_serial_vector_test.cpp in Sources */, 67E8DB5B1BBC17490053C5BA /* dd_vector_test.cpp in Sources */, 3973743521C17F1C0003807A /* string_utf8_multilang_tests.cpp in Sources */, @@ -767,10 +775,10 @@ 34A129D31DF99E43001B4531 /* zlib.cpp in Sources */, 3973743221C17EFE0003807A /* string_utf8_multilang.cpp in Sources */, BB537C5F1E8490120074D9D3 /* transliteration.cpp in Sources */, - 675342C51A3F588C00A0A8C3 /* uri.cpp in Sources */, 39D5293523D60C6F006F00DA /* bwt.cpp in Sources */, 39D5293823D60C78006F00DA /* move_to_front.cpp in Sources */, 675342BB1A3F588C00A0A8C3 /* reader.cpp in Sources */, + 39C2287B23E1EAE900251321 /* url_helpers.cpp in Sources */, 670BAACB1D0B0C1E000302DA /* huffman.cpp in Sources */, 675342A71A3F588C00A0A8C3 /* hex.cpp in Sources */, 675342A31A3F588C00A0A8C3 /* file_writer.cpp in Sources */, diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index ffdf96228d..6e7f5e6116 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -183,8 +183,6 @@ 6753464B1A4054E800A0A8C3 /* bookmark.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345DC1A4054E800A0A8C3 /* bookmark.hpp */; }; 675346641A4054E800A0A8C3 /* framework.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345F51A4054E800A0A8C3 /* framework.cpp */; }; 675346651A4054E800A0A8C3 /* framework.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345F61A4054E800A0A8C3 /* framework.hpp */; }; - 6753466A1A4054E800A0A8C3 /* geourl_process.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345FB1A4054E800A0A8C3 /* geourl_process.cpp */; }; - 6753466B1A4054E800A0A8C3 /* geourl_process.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345FC1A4054E800A0A8C3 /* geourl_process.hpp */; }; 675346741A4054E800A0A8C3 /* mwm_url.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675346051A4054E800A0A8C3 /* mwm_url.cpp */; }; 675346751A4054E800A0A8C3 /* mwm_url.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346061A4054E800A0A8C3 /* mwm_url.hpp */; }; 6753469B1A4054E800A0A8C3 /* track.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753462C1A4054E800A0A8C3 /* track.cpp */; }; @@ -206,7 +204,6 @@ 679624B21D1017DB00AE4E3C /* mwm_set_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 679624A51D1017C200AE4E3C /* mwm_set_test.cpp */; }; 67F183751BD5041700AB1840 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F183741BD5041700AB1840 /* libz.tbd */; }; 67F183761BD5045700AB1840 /* bookmarks_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29CB1B26FCFE001A525C /* bookmarks_test.cpp */; }; - 67F183781BD5045700AB1840 /* geourl_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29CD1B26FCFE001A525C /* geourl_test.cpp */; }; 67F183791BD5045700AB1840 /* kmz_unarchive_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29CE1B26FCFE001A525C /* kmz_unarchive_test.cpp */; }; 67F1837A1BD5045700AB1840 /* mwm_url_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29CF1B26FCFE001A525C /* mwm_url_tests.cpp */; }; 67F183811BD5049500AB1840 /* libagg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F1837D1BD5049500AB1840 /* libagg.a */; }; @@ -424,7 +421,6 @@ 671ED39020D4046D00D4317E /* libeditor_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libeditor_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; 674231CA1DF984F600913FEB /* libtraffic.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtraffic.a; path = "../../../omim-build/xcode/Debug/libtraffic.a"; sourceTree = ""; }; 674A29CB1B26FCFE001A525C /* bookmarks_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bookmarks_test.cpp; sourceTree = ""; }; - 674A29CD1B26FCFE001A525C /* geourl_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = geourl_test.cpp; sourceTree = ""; }; 674A29CE1B26FCFE001A525C /* kmz_unarchive_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kmz_unarchive_test.cpp; sourceTree = ""; }; 674A29CF1B26FCFE001A525C /* mwm_url_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_url_tests.cpp; sourceTree = ""; }; 674A29DF1B26FD1C001A525C /* map_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = map_tests.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -462,8 +458,6 @@ 675345DC1A4054E800A0A8C3 /* bookmark.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = bookmark.hpp; sourceTree = ""; }; 675345F51A4054E800A0A8C3 /* framework.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = framework.cpp; sourceTree = ""; }; 675345F61A4054E800A0A8C3 /* framework.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = framework.hpp; sourceTree = ""; }; - 675345FB1A4054E800A0A8C3 /* geourl_process.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = geourl_process.cpp; sourceTree = ""; }; - 675345FC1A4054E800A0A8C3 /* geourl_process.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = geourl_process.hpp; sourceTree = ""; }; 675346051A4054E800A0A8C3 /* mwm_url.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_url.cpp; sourceTree = ""; }; 675346061A4054E800A0A8C3 /* mwm_url.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_url.hpp; sourceTree = ""; }; 6753462C1A4054E800A0A8C3 /* track.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = track.cpp; sourceTree = ""; }; @@ -752,7 +746,6 @@ 454523AB202A00B9009275C1 /* cloud_tests.cpp */, 679624A11D1017C200AE4E3C /* feature_getters_tests.cpp */, 671ED38820D403B300D4317E /* framework_light_tests.cpp */, - 674A29CD1B26FCFE001A525C /* geourl_test.cpp */, 679624A21D1017C200AE4E3C /* gps_track_collection_test.cpp */, 679624A31D1017C200AE4E3C /* gps_track_storage_test.cpp */, 679624A41D1017C200AE4E3C /* gps_track_test.cpp */, @@ -893,8 +886,6 @@ F6D67CE22063F4980032FD38 /* framework_light.hpp */, 675345F51A4054E800A0A8C3 /* framework.cpp */, 675345F61A4054E800A0A8C3 /* framework.hpp */, - 675345FB1A4054E800A0A8C3 /* geourl_process.cpp */, - 675345FC1A4054E800A0A8C3 /* geourl_process.hpp */, F6B282FB1C1B03320081957A /* gps_track_collection.cpp */, F6B282FC1C1B03320081957A /* gps_track_collection.hpp */, F6B282FD1C1B03320081957A /* gps_track_filter.cpp */, @@ -995,7 +986,6 @@ BB4E5F261FCC664A00A77250 /* transit_display.hpp in Headers */, 347B60771DD9926D0050FA24 /* traffic_manager.hpp in Headers */, 45F6EE9E1FB1C77600019892 /* mwm_tree.hpp in Headers */, - 6753466B1A4054E800A0A8C3 /* geourl_process.hpp in Headers */, F6B283081C1B03320081957A /* gps_track_storage.hpp in Headers */, 3DD1166B21888AAD007A2ED4 /* notification_manager.hpp in Headers */, 3D4F44BB21345D270005E765 /* tips_api.hpp in Headers */, @@ -1193,7 +1183,6 @@ BB421D6C1E8C0031005BFA4D /* transliteration_test.cpp in Sources */, 679624B21D1017DB00AE4E3C /* mwm_set_test.cpp in Sources */, 3D4F4582213552AD0005E765 /* tips_tests.cpp in Sources */, - 67F183781BD5045700AB1840 /* geourl_test.cpp in Sources */, 454523AD202A00C3009275C1 /* cloud_tests.cpp in Sources */, 679624AD1D1017DB00AE4E3C /* address_tests.cpp in Sources */, 67F183791BD5045700AB1840 /* kmz_unarchive_test.cpp in Sources */, @@ -1251,7 +1240,6 @@ 56C116602090E5670068BBC0 /* extrapolator.cpp in Sources */, 40ACC79723191C2600238E21 /* check_mwms.cpp in Sources */, 39E3C60423312BA800FB0C37 /* features_fetcher.cpp in Sources */, - 6753466A1A4054E800A0A8C3 /* geourl_process.cpp in Sources */, 3DD1166621888AAC007A2ED4 /* notification_queue_serdes.cpp in Sources */, 348AB57C1D7EE0C6009F8301 /* chart_generator.cpp in Sources */, 342D833A1D5233E8000D8AEA /* displacement_mode_manager.cpp in Sources */,