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

[core]parse gx:Tracks

Browse source
This commit is contained in:
Kirill Zhdanovich 2013-09-06 11:18:20 +03:00 • committed by Alex Zolotarev
parent cc678cf07e
commit a25a68c5f9
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
map/bookmark.cpp
View file

@ -193,16 +193,16 @@ namespace
}
}
void ParseLineCoordinates(string const & s)
void ParseLineCoordinates(string const & s, string const & blockSeparator, string const & coordSeparator)
{
double lon, lat;
strings::SimpleTokenizer cortegeIter(s, " \n\r\t");
strings::SimpleTokenizer cortegeIter(s, blockSeparator.c_str());
LOG(LDEBUG,("Start Parsing", m_name, s));
while (cortegeIter)
{
string const token = *cortegeIter;
strings::SimpleTokenizer coordIter(token, ",");
strings::SimpleTokenizer coordIter(token, coordSeparator.c_str());
if (coordIter)
{
if (strings::to_double(*coordIter, lon) && MercatorBounds::ValidLon(lon) && ++coordIter)
@ -325,9 +325,15 @@ namespace
}
else if (prevTag == "LineString")
{
LOG(LINFO,(prevTag, currTag));
m_geometryType = LINE;
if (currTag == "coordinates")
ParseLineCoordinates(value);
ParseLineCoordinates(value, " \n\r\t", ",");
}
else if (prevTag == "gx:Track")
{
if (currTag == "gx:coord")
ParseLineCoordinates(value, "\n\r\t", " ");
}
else if (prevTag == "ExtendedData")
{