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

Optimize strings comparison in geo-url parsing.

Browse source
This commit is contained in:
vng 2013-05-17 21:49:35 +03:00 • committed by Alex Zolotarev
parent 54fffdfb1b
commit 9d4f2c6bbe
5 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
base/base_tests/string_utils_test.cpp
View file

@ -365,3 +365,18 @@ UNIT_TEST(UniStringToUtf8)
strings::UniString uniS = strings::MakeUniString(utf8Text);
TEST_EQUAL(string(utf8Text), strings::ToUtf8(uniS), ());
}
UNIT_TEST(StartsWith)
{
using namespace strings;
TEST(StartsWith(string(), ""), ());
string s("xyz");
TEST(StartsWith(s, ""), ());
TEST(StartsWith(s, "x"), ());
TEST(StartsWith(s, "xyz"), ());
TEST(!StartsWith(s, "xyzabc"), ());
TEST(!StartsWith(s, "ayz"), ());
TEST(!StartsWith(s, "axy"), ());
}

5
base/string_utils.cpp
View file

@ -147,4 +147,9 @@ string ToUtf8(UniString const & s)
return result;
}
bool StartsWith(string const & s1, char const * s2)
{
return (s1.compare(0, strlen(s2), s2) == 0);
}
}

2
base/string_utils.hpp
View file

@ -238,6 +238,8 @@ inline string to_string(uint64_t i)
}
//@}
bool StartsWith(string const & s1, char const * s2);
/*
template <typename ItT, typename DelimiterT>
typename ItT::value_type JoinStrings(ItT begin, ItT end, DelimiterT const & delimiter)

4
map/framework.cpp
View file

@ -1425,7 +1425,7 @@ void Framework::AddBookmarkAndSetViewport(Bookmark & bm, m2::RectD const & viewP
bool Framework::SetViewportByURL(string const & url, url_api::Request & request)
{
if (url.find("geo") == 0)
if (strings::StartsWith(url, "geo"))
{
using namespace url_scheme;
@ -1447,7 +1447,7 @@ bool Framework::SetViewportByURL(string const & url, url_api::Request & request)
return true;
}
}
else if (url.find("ge0") == 0)
else if (strings::StartsWith(url, "ge0"))
{
url_api::Ge0Parser parser;
if (parser.Parse(url, request))

12
map/ge0_parser.cpp
View file

@ -1,10 +1,16 @@
#include "ge0_parser.hpp"
#include "url_api.hpp"
#include "../api/internal/c/api-client-internals.h"
#include "../coding/url_encode.hpp"
#include "../base/math.hpp"
#include "../indexer/mercator.hpp"
#include "../coding/url_encode.hpp"
#include "../base/math.hpp"
#include "../base/string_utils.hpp"
static const int ZOOM_POSITION = 6;
url_api::Ge0Parser::Ge0Parser()
@ -29,7 +35,7 @@ bool url_api::Ge0Parser::Parse(string const & url, Request & request)
// ge0://ZCoordba64/Name
request.Clear();
if (url.size() < 16 || url.substr(0, 6) != "ge0://")
if (url.size() < 16 || !strings::StartsWith(url, "ge0://"))
return false;
uint8_t const zoomI = DecodeBase64Char(url[ZOOM_POSITION]);