From 999c208111e1ac073b0acba5af30fb32a8fe4978 Mon Sep 17 00:00:00 2001
From: tatiana-yan <tatiana.kondakova@gmail.com>
Date: Wed, 4 Dec 2019 15:32:52 +0300
Subject: [PATCH] [generator] Remove FeatureBuilder::AddHouseNumber,
 FeatureBuilder::AddStreet, FeatureBuilder::AddPostcode.

---
 generator/booking_dataset.cpp                      |  6 +++---
 generator/feature_builder.cpp                      | 12 ------------
 generator/feature_builder.hpp                      |  3 ---
 generator/generator_tests_support/test_feature.cpp | 13 ++++++++-----
 4 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/generator/booking_dataset.cpp b/generator/booking_dataset.cpp
index 1553a59893..8295c057c8 100644
--- a/generator/booking_dataset.cpp
+++ b/generator/booking_dataset.cpp
@@ -98,13 +98,13 @@ void BookingDataset::BuildObject(Object const & hotel,
   metadata.Set(Metadata::FMD_STARS, strings::to_string(hotel.m_stars));
   metadata.Set(Metadata::FMD_PRICE_RATE, strings::to_string(hotel.m_priceCategory));
 
+  auto & params = fb.GetParams();
   if (!hotel.m_street.empty())
-    fb.AddStreet(hotel.m_street);
+    params.AddStreet(hotel.m_street);
 
   if (!hotel.m_houseNumber.empty())
-    fb.AddHouseNumber(hotel.m_houseNumber);
+    params.AddHouseNumber(hotel.m_houseNumber);
 
-  auto & params = fb.GetParams();
   if (!hotel.m_translations.empty())
   {
     // TODO(mgsergio): Move parsing to the hotel costruction stage.
diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp
index c8d4215ade..d49e09e70e 100644
--- a/generator/feature_builder.cpp
+++ b/generator/feature_builder.cpp
@@ -124,18 +124,6 @@ void FeatureBuilder::SetRank(uint8_t rank)
   m_params.rank = rank;
 }
 
-void FeatureBuilder::AddHouseNumber(string const & houseNumber)
-{
-  m_params.AddHouseNumber(houseNumber);
-}
-
-void FeatureBuilder::AddStreet(string const & streetName) { m_params.AddStreet(streetName); }
-
-void FeatureBuilder::AddPostcode(string const & postcode)
-{
-  m_params.AddPostcode(postcode);
-}
-
 void FeatureBuilder::AddPoint(m2::PointD const & p)
 {
   m_polygons.front().push_back(p);
diff --git a/generator/feature_builder.hpp b/generator/feature_builder.hpp
index 959d75bd42..ee364089bf 100644
--- a/generator/feature_builder.hpp
+++ b/generator/feature_builder.hpp
@@ -149,9 +149,6 @@ public:
 
   // To work with additional information.
   void SetRank(uint8_t rank);
-  void AddHouseNumber(std::string const & houseNumber);
-  void AddStreet(std::string const & streetName);
-  void AddPostcode(std::string const & postcode);
   bool AddName(std::string const & lang, std::string const & name);
   void SetParams(FeatureBuilderParams const & params) { m_params.SetParams(params); }
 
diff --git a/generator/generator_tests_support/test_feature.cpp b/generator/generator_tests_support/test_feature.cpp
index c9de491c90..540d898727 100644
--- a/generator/generator_tests_support/test_feature.cpp
+++ b/generator/generator_tests_support/test_feature.cpp
@@ -130,8 +130,9 @@ void TestFeature::Serialize(FeatureBuilder & fb) const
       CHECK(fb.AddName(lang, name), ("Can't set feature name:", name, "(", lang, ")"));
     }
   });
+
   if (!m_postcode.empty())
-    fb.AddPostcode(m_postcode);
+    fb.GetParams().AddPostcode(m_postcode);
 }
 
 // TestCountry -------------------------------------------------------------------------------------
@@ -298,10 +299,11 @@ void TestPOI::Serialize(FeatureBuilder & fb) const
   for (auto const & path : m_types)
     fb.AddType(classificator.GetTypeByPath(path));
 
+  auto & params = fb.GetParams();
   if (!m_houseNumber.empty())
-    fb.AddHouseNumber(m_houseNumber);
+    params.AddHouseNumber(m_houseNumber);
   if (!m_streetName.empty())
-    fb.AddStreet(m_streetName);
+    params.AddStreet(m_streetName);
 }
 
 string TestPOI::ToDebugString() const
@@ -383,9 +385,10 @@ void TestBuilding::Serialize(FeatureBuilder & fb) const
 {
   TestFeature::Serialize(fb);
 
-  fb.AddHouseNumber(m_houseNumber);
+  auto & params = fb.GetParams();
+  params.AddHouseNumber(m_houseNumber);
   if (!m_streetName.empty())
-    fb.AddStreet(m_streetName);
+    params.AddStreet(m_streetName);
 
   auto const & classificator = classif();
   fb.AddType(classificator.GetTypeByPath({"building"}));