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

Code style fix

Browse source
This commit is contained in:
Sergey Yershov 2015-01-15 20:21:44 +03:00 • committed by Alex Zolotarev
parent 91b3570052
commit 007b5266b6
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
generator/xml_element.cpp
View file

@ -23,13 +23,13 @@ void BaseOSMParser::AddAttr(string const & key, string const & value)
if (m_current)
{
if (key == "id")
VERIFY ( strings::to_uint64(value, m_current->id), ("Unknown element with invalid id : ", value) );
CHECK ( strings::to_uint64(value, m_current->id), ("Unknown element with invalid id : ", value) );
else if (key == "lon")
VERIFY ( strings::to_double(value, m_current->lng), ("Bad node lon : ", value) );
CHECK ( strings::to_double(value, m_current->lng), ("Bad node lon : ", value) );
else if (key == "lat")
VERIFY ( strings::to_double(value, m_current->lat), ("Bad node lon : ", value) );
CHECK ( strings::to_double(value, m_current->lat), ("Bad node lon : ", value) );
else if (key == "ref")
VERIFY ( strings::to_uint64(value, m_current->ref), ("Bad node ref in way : ", value) );
CHECK ( strings::to_uint64(value, m_current->ref), ("Bad node ref in way : ", value) );
else if (key == "k")
m_current->k = value;
else if (key == "v")
@ -44,8 +44,9 @@ void BaseOSMParser::AddAttr(string const & key, string const & value)
bool BaseOSMParser::MatchTag(string const & tagName, XMLElement::ETag & tagKey)
{
/// as tagKey we use first two char of tag name
tagKey = XMLElement::ETag(*((uint16_t *)tagName.data()));
switch (tagKey) {
tagKey = XMLElement::ETag(*reinterpret_cast<uint16_t const *>(tagName.data()));
switch (tagKey)
{
/// this tags will ignored in Push function
case XMLElement::ET_MEMBER:
case XMLElement::ET_TAG:

5
generator/xml_element.hpp
View file

@ -7,7 +7,8 @@
struct XMLElement
{
enum ETag {
enum ETag
{
ET_UNKNOWN = 0,
ET_OSM = 'so',
ET_NODE = 'on',
@ -40,8 +41,6 @@ class BaseOSMParser
size_t m_depth;
typedef struct { char const * tagName; XMLElement::ETag tagKey; bool allowed;} TagT;
protected:
XMLElement * m_current;