From b275ae0ff082b51f126a3bdebb521a3d7a02c351 Mon Sep 17 00:00:00 2001
From: tatiana-yan <tatiana.kondakova@gmail.com>
Date: Wed, 4 Dec 2019 15:31:47 +0300
Subject: [PATCH] [indexer] Remove FeatureBuilderParams::GetStreet().

---
 .../booking_quality_check.cpp                 | 15 +---------
 .../generator_tests/feature_builder_test.cpp  | 28 +++++++------------
 indexer/feature_data.cpp                      | 13 +++++++--
 indexer/feature_data.hpp                      |  3 --
 indexer/feature_meta.cpp                      |  9 ++++++
 indexer/feature_meta.hpp                      |  1 +
 6 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/generator/booking_quality_check/booking_quality_check.cpp b/generator/booking_quality_check/booking_quality_check.cpp
index a4f5292683..e7db2ba425 100644
--- a/generator/booking_quality_check/booking_quality_check.cpp
+++ b/generator/booking_quality_check/booking_quality_check.cpp
@@ -56,20 +56,7 @@ string PrintBuilder(FeatureBuilder const & fb)
   s << "Id: " << DebugPrint(fb.GetMostGenericOsmId()) << '\t'
     << "Name: " << fb.GetName(StringUtf8Multilang::kDefaultCode) << '\t';
 
-  auto const & params = fb.GetParams();
-  auto const street = params.GetStreet();
-  auto const house = params.house.Get();
-
-  string address = street;
-  if (!house.empty())
-  {
-    if (!street.empty())
-      address += ", ";
-    address += house;
-  }
-
-  if (!address.empty())
-    s << "Address: " << address << '\t';
+  s << "Params: " << DebugPrint(fb.GetParams()) << '\t';
 
   auto const center = mercator::ToLatLon(fb.GetKeyPoint());
   s << "lat: " << center.m_lat << " lon: " << center.m_lon << '\t';
diff --git a/generator/generator_tests/feature_builder_test.cpp b/generator/generator_tests/feature_builder_test.cpp
index 0168846e26..6314313442 100644
--- a/generator/generator_tests/feature_builder_test.cpp
+++ b/generator/generator_tests/feature_builder_test.cpp
@@ -201,27 +201,19 @@ UNIT_CLASS_TEST(TestWithClassificator, FBuilder_RemoveUselessNames)
 
 UNIT_CLASS_TEST(TestWithClassificator, FeatureBuilderParams_Parsing)
 {
-  {
-    FeatureBuilderParams params;
-    params.AddStreet("Embarcadero\nstreet");
-    TEST_EQUAL(params.GetStreet(), "Embarcadero street", ());
-  }
+  FeatureBuilderParams params;
 
-  {
-    FeatureBuilderParams params;
+  params.MakeZero();
+  TEST(params.AddHouseNumber("123"), ());
+  TEST_EQUAL(params.house.Get(), "123", ());
 
-    params.MakeZero();
-    TEST(params.AddHouseNumber("123"), ());
-    TEST_EQUAL(params.house.Get(), "123", ());
+  params.MakeZero();
+  TEST(params.AddHouseNumber("0000123"), ());
+  TEST_EQUAL(params.house.Get(), "123", ());
 
-    params.MakeZero();
-    TEST(params.AddHouseNumber("0000123"), ());
-    TEST_EQUAL(params.house.Get(), "123", ());
-
-    params.MakeZero();
-    TEST(params.AddHouseNumber("000000"), ());
-    TEST_EQUAL(params.house.Get(), "0", ());
-  }
+  params.MakeZero();
+  TEST(params.AddHouseNumber("000000"), ());
+  TEST_EQUAL(params.house.Get(), "0", ());
 }
 
 UNIT_CLASS_TEST(TestWithClassificator, FeatureBuilder_SerializeLocalityObjectForBuildingPoint)
diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp
index 4b6de5daee..596e6c5486 100644
--- a/indexer/feature_data.cpp
+++ b/indexer/feature_data.cpp
@@ -13,6 +13,7 @@
 
 #include <algorithm>
 #include <functional>
+#include <sstream>
 #include <vector>
 
 using namespace feature;
@@ -548,8 +549,6 @@ void FeatureBuilderParams::AddPostcode(string const & s)
   m_addrTags.Add(AddressData::Type::Postcode, s);
 }
 
-string FeatureBuilderParams::GetStreet() const { return m_addrTags.Get(AddressData::Type::Street); }
-
 string DebugPrint(FeatureParams const & p)
 {
   Classificator const & c = classif();
@@ -561,4 +560,12 @@ string DebugPrint(FeatureParams const & p)
   return (res + p.DebugString());
 }
 
-string DebugPrint(FeatureBuilderParams const & p) { return DebugPrint(FeatureParams(p)); }
+string DebugPrint(FeatureBuilderParams const & p)
+{
+  ostringstream oss;
+  oss << "ReversedGeometry: " << (p.GetReversedGeometry() ? "true" : "false") << "; ";
+  oss << DebugPrint(p.GetMetadata()) << "; ";
+  oss << DebugPrint(p.GetAddressData()) << "; ";
+  oss << DebugPrint(FeatureParams(p));
+  return oss.str();
+}
diff --git a/indexer/feature_data.hpp b/indexer/feature_data.hpp
index 8f60a00790..20f4165225 100644
--- a/indexer/feature_data.hpp
+++ b/indexer/feature_data.hpp
@@ -309,9 +309,6 @@ public:
   void AddStreet(std::string s);
   void AddPostcode(std::string const & s);
 
-  /// Used for generator/booking_quality_check.
-  std::string GetStreet() const;
-
   feature::AddressData const & GetAddressData() const { return m_addrTags; }
   feature::Metadata const & GetMetadata() const { return m_metadata; }
   feature::Metadata & GetMetadata() { return m_metadata; }
diff --git a/indexer/feature_meta.cpp b/indexer/feature_meta.cpp
index 31c2a5f08c..dbdec0cfb8 100644
--- a/indexer/feature_meta.cpp
+++ b/indexer/feature_meta.cpp
@@ -222,4 +222,13 @@ string DebugPrint(Metadata const & metadata)
   oss << "]";
   return oss.str();
 }
+
+string DebugPrint(feature::AddressData const & addressData)
+{
+  ostringstream oss;
+  oss << "AddressData [";
+  oss << "Street = \"" << addressData.Get(AddressData::Type::Street) << "\"; ";
+  oss << "Postcode = \"" << addressData.Get(AddressData::Type::Postcode) << "\"]";
+  return oss.str();
+}
 }  // namespace feature
diff --git a/indexer/feature_meta.hpp b/indexer/feature_meta.hpp
index 2f4183277e..15c07945c5 100644
--- a/indexer/feature_meta.hpp
+++ b/indexer/feature_meta.hpp
@@ -248,4 +248,5 @@ std::string ToString(feature::Metadata::EType type);
 inline std::string DebugPrint(feature::Metadata::EType type) { return ToString(type); }
 
 std::string DebugPrint(feature::Metadata const & metadata);
+std::string DebugPrint(feature::AddressData const & addressData);
 }  // namespace feature