kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[coding] UrlDecode the plus sign '+' as a space

Browse source 
`123+Main+St,+Seattle,+WA+98101` is equvivalent to
`123%20Main%20St,%20Seattle,%20WA+98101` and should be decoded as
`123 Main St, Seattle, WA 98101`.

Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2023-11-22 09:27:03 +02:00
parent f80200a310
commit 8930a32c20
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
coding/coding_tests/url_tests.cpp
View file

@ -97,6 +97,7 @@ UNIT_TEST(Url_Decode)
TEST_EQUAL(UrlDecode(enc2), orig2, ());
TEST_EQUAL(UrlDecode(enc3), orig3, ());
TEST_EQUAL(UrlDecode(enc4), orig4, ());
TEST_EQUAL(UrlDecode("123+Main+St,+Seattle,+WA+98101"), "123 Main St, Seattle, WA 98101", ());
}
UNIT_TEST(Url_Invalid)

4
coding/url.cpp
View file

@ -174,6 +174,10 @@ string UrlDecode(string_view encodedUrl)
result += FromHex(encodedUrl.substr(i + 1, 2));
i += 2;
}
else if (encodedUrl[i] == '+')
{
result += ' ';
}
else
{
result += encodedUrl[i];

8
map/map_tests/mwm_url_tests.cpp
View file

@ -355,6 +355,14 @@ UNIT_TEST(SearchApiGeoScheme)
TEST_ALMOST_EQUAL_ABS(latlon.m_lat, 35.3381607, kEps, ());
TEST_ALMOST_EQUAL_ABS(latlon.m_lon, 33.3290564, kEps, ());
}
{
ParsedMapApi api("geo:0,0?q=123+Main+St,+Seattle,+WA+98101");
TEST_EQUAL(api.GetRequestType(), UrlType::Search, ());
auto const & request = api.GetSearchRequest();
ms::LatLon latlon = api.GetCenterLatLon();
TEST(!latlon.IsValid(), ());
TEST_EQUAL(request.m_query, "123 Main St, Seattle, WA 98101", ());
}
}
UNIT_TEST(CrosshairApi)