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

[generator] Small refact of tests support

Browse source
This commit is contained in:
Mikhail Gorbushin 2019-09-16 19:43:29 +03:00 • committed by Tatiana Yan
parent 90a16ae27d
commit 2d7d44fcd7
1 changed files with 0 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
generator/generator_tests/common.cpp
View file

@ -1,7 +1,6 @@
#include "generator/generator_tests/common.hpp"
#include "generator/borders.hpp"
#include "generator/osm2type.hpp"
#include "indexer/classificator.hpp"
@ -10,10 +9,6 @@
#include "base/file_name_utils.hpp"
#include "base/string_utils.hpp"
#include <fstream>
#include "defines.hpp"
namespace generator_tests
{
OsmElement MakeOsmElement(uint64_t id, Tags const & tags, OsmElement::EntityType t)
@ -46,47 +41,4 @@ bool MakeFakeBordersFile(std::string const & intemediatePath, std::string const
borders::DumpBorderToPolyFile(borderPath, filename, {m2::RegionD{points}});
return true;
}
OsmElement MakeOsmElement(OsmElementData const & elementData)
{
OsmElement el;
el.m_id = elementData.m_id;
el.m_type = elementData.m_polygon.size() > 1 ? OsmElement::EntityType::Relation
: OsmElement::EntityType::Node;
for (auto const & tag : elementData.m_tags)
el.AddTag(tag.m_key, tag.m_value);
el.m_members = elementData.m_members;
return el;
}
feature::FeatureBuilder FeatureBuilderFromOmsElementData(OsmElementData const & elementData)
{
auto el = MakeOsmElement(elementData);
feature::FeatureBuilder fb;
CHECK(elementData.m_polygon.size() == 1 || elementData.m_polygon.size() == 2, ());
if (elementData.m_polygon.size() == 1)
{
fb.SetCenter(elementData.m_polygon[0]);
}
else if (elementData.m_polygon.size() == 2)
{
auto const & p1 = elementData.m_polygon[0];
auto const & p2 = elementData.m_polygon[1];
vector<m2::PointD> poly = {
{p1.x, p1.y}, {p1.x, p2.y}, {p2.x, p2.y}, {p2.x, p1.y}, {p1.x, p1.y}};
fb.AddPolygon(poly);
fb.SetHoles({});
fb.SetArea();
}
auto osmId = el.m_type == OsmElement::EntityType::Relation ? base::MakeOsmRelation(el.m_id)
: base::MakeOsmNode(el.m_id);
fb.SetOsmId(osmId);
ftype::GetNameAndType(&el, fb.GetParams(),
[](uint32_t type) { return classif().IsTypeValid(type); });
return fb;
}
} // namespace generator_tests