From 2d7d44fcd79cf21501f0f30b10e49c60a9e7274d Mon Sep 17 00:00:00 2001
From: Mikhail Gorbushin <m.gorbushin@corp.mail.ru>
Date: Mon, 16 Sep 2019 19:43:29 +0300
Subject: [generator] Small refact of tests support

---
 generator/generator_tests/common.cpp | 48 ------------------------------------
 1 file changed, 48 deletions(-)

diff --git a/generator/generator_tests/common.cpp b/generator/generator_tests/common.cpp
index 13b2a465c4..ad9d7521fa 100644
--- a/generator/generator_tests/common.cpp
+++ b/generator/generator_tests/common.cpp
@@ -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
-- 
cgit v1.2.3