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

Try decoding geo URL coordinates before giving up on parsing

Browse source 
Signed-off-by: Nic Pottier <nicpottier@gmail.com>
This commit is contained in:
Nic Pottier 2024-08-16 09:32:36 -07:00 • committed by Alexander Borsuk
parent 4d07de2b85
commit b39c0e0529
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ge0/ge0_tests/geo_url_tests.cpp
View file

@ -96,6 +96,12 @@ UNIT_TEST(GeoUrl_Geo)
TEST_ALMOST_EQUAL_ABS(info.m_lat, 53.666, kEps, ());
TEST_ALMOST_EQUAL_ABS(info.m_lon, 0.0, kEps, ());
// URL Encoded comma (%2C) as delimiter
TEST(parser.Parse("geo:-18.9151863%2C-48.28712359999999?q=-18.9151863%2C-48.28712359999999", info), ());
TEST(info.IsLatLonValid(), ());
TEST_ALMOST_EQUAL_ABS(info.m_lat, -18.9151863, kEps, ());
TEST_ALMOST_EQUAL_ABS(info.m_lon, -48.28712359999999, kEps, ());
// Invalid coordinates.
TEST(!parser.Parse("geo:0,0garbage", info), ());
TEST(!parser.Parse("geo:garbage0,0", info), ());

8
ge0/geo_url_parser.cpp
View file

@ -205,8 +205,12 @@ bool GeoParser::Parse(std::string const & raw, GeoURLInfo & info) const
std::smatch m;
if (!std::regex_match(coordinates, m, m_latlonRe) || m.size() < 3)
{
LOG(LWARNING, ("Missing coordinates in", raw));
return false;
// no match? try URL decoding before giving up
coordinates = url::UrlDecode(coordinates);
if (!std::regex_match(coordinates, m, m_latlonRe) || m.size() < 3){
LOG(LWARNING, ("Missing coordinates in", raw));
return false;
}
}
double lat, lon;