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

[search] Add handling for negative case when using comma separators (#10105)

Browse source 
* Add handling for negative case when using comma separators
* keeping it simple

Signed-off-by: Colin Takushi <takushicolin@gmail.com>
This commit is contained in:
Colin Takushi 2025-01-21 20:55:37 -06:00 • committed by GitHub
parent 082b36b541
commit d8d95674ca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
search/latlon_match.cpp
View file

@ -24,6 +24,11 @@ bool IsDecimalMark(char c)
return kDecimalMarks.find(c) != string::npos;
}
bool IsNegativeSymbol(char c)
{
return c == '-';
}
template <typename Char>
void SkipSpaces(Char *& s)
{
@ -99,6 +104,7 @@ double EatDouble(char const * str, char ** strEnd)
bool gotDigitAfterMark = false;
char const * markPos = nullptr;
char const * p = str;
double modifier = 1.0;
while (true)
{
if (IsDecimalMark(*p))
@ -115,6 +121,10 @@ double EatDouble(char const * str, char ** strEnd)
else
gotDigitBeforeMark = true;
}
else if (IsNegativeSymbol(*p))
{
modifier = -1.0;
}
else
{
break;
@ -129,7 +139,7 @@ double EatDouble(char const * str, char ** strEnd)
*strEnd = const_cast<char *>(p);
auto const x1 = atof(part1.c_str());
auto const x2 = atof(part2.c_str());
return x1 + x2 * pow(10.0, -static_cast<double>(part2.size()));
return x1 + x2 * modifier * pow(10.0, -static_cast<double>(part2.size()));
}
return strtod(str, strEnd);

28
search/search_tests/latlon_match_test.cpp
View file

@ -46,10 +46,38 @@ UNIT_TEST(LatLon_Match_Smoke)
TestAlmostEqual(lat, 10.1);
TestAlmostEqual(lon, 20.2);
TEST(MatchLatLonDegree("-10,10, 20,20", lat, lon), ());
TestAlmostEqual(lat, -10.1);
TestAlmostEqual(lon, 20.2);
TEST(MatchLatLonDegree("10,10, -20,20", lat, lon), ());
TestAlmostEqual(lat, 10.1);
TestAlmostEqual(lon, -20.2);
TEST(MatchLatLonDegree("-10,10, -20,20", lat, lon), ());
TestAlmostEqual(lat, -10.1);
TestAlmostEqual(lon, -20.2);
TEST(MatchLatLonDegree("-10,10 20,20", lat, lon), ());
TestAlmostEqual(lat, -10.1);
TestAlmostEqual(lon, 20.2);
TEST(MatchLatLonDegree("10,10 -20,20", lat, lon), ());
TestAlmostEqual(lat, 10.1);
TestAlmostEqual(lon, -20.2);
TEST(MatchLatLonDegree("-10,10 -20,20", lat, lon), ());
TestAlmostEqual(lat, -10.1);
TestAlmostEqual(lon, -20.2);
TEST(MatchLatLonDegree("-22.3534 -42.7076\n", lat, lon), ());
TestAlmostEqual(lat, -22.3534);
TestAlmostEqual(lon, -42.7076);
TEST(MatchLatLonDegree("-22,3534 -42,7076\n", lat, lon), ());
TestAlmostEqual(lat, -22.3534);
TestAlmostEqual(lon, -42.7076);
// The ".123" form is not accepted, so our best-effort
// parse results in "10" and "20".
TEST(MatchLatLonDegree(".10, ,20", lat, lon), ());