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

Split way and node validation for XMLFeature.

Browse source
This commit is contained in:
Alex Zolotarev 2016-01-09 21:59:18 +03:00 • committed by Sergey Yershov
parent c29a7615bf
commit 9965e0757e
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
editor/xml_feature.cpp
View file

@ -57,6 +57,16 @@ void ValidateNode(pugi::xml_node const & node)
if (!node.attribute(kTimestamp))
MYTHROW(editor::XMLFeatureNoTimestampError, ("Node has no timestamp attribute"));
}
void ValidateWay(pugi::xml_node const & way)
{
if (!way)
MYTHROW(editor::XMLFeatureNoNodeError, ("Document has no node"));
if (!way.attribute(kTimestamp))
MYTHROW(editor::XMLFeatureNoTimestampError, ("Way has no timestamp attribute"));
}
} // namespace
namespace editor
@ -73,20 +83,23 @@ XMLFeature::XMLFeature(Type const type)
XMLFeature::XMLFeature(string const & xml)
{
m_document.load(xml.data());
ValidateNode(GetRootNode());
auto const r = GetRootNode();
r.name() == kNodeType ? ValidateNode(r) : ValidateWay(r);
}
XMLFeature::XMLFeature(pugi::xml_document const & xml)
{
m_document.reset(xml);
ValidateNode(GetRootNode());
auto const r = GetRootNode();
r.name() == kNodeType ? ValidateNode(r) : ValidateWay(r);
}
XMLFeature::XMLFeature(pugi::xml_node const & xml)
{
m_document.reset();
m_document.append_copy(xml);
ValidateNode(GetRootNode());
auto const r = GetRootNode();
r.name() == kNodeType ? ValidateNode(r) : ValidateWay(r);
}
XMLFeature::Type XMLFeature::GetType() const