refactor: libs/feature_helpers merged in libs/indexer

Signed-off-by: Séverin Lemaignan <severin@guakamole.org>

generator/CMakeLists.txt

@@ -251,7 +251,6 @@ target_link_libraries(${PROJECT_NAME}
   storage
   descriptions
   indexer
-  feature_helpers
   cppjansson
   expat::expat
   tess2

generator/osm2meta.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
+#include "indexer/feature_charge_sockets.hpp"
 #include "indexer/feature_data.hpp"
 #include "indexer/validate_and_format_contacts.hpp"
-#include "feature_helpers/feature_charge_sockets.hpp"
 
 #include <string>
 
@@ -46,7 +46,6 @@ struct MetadataTagProcessorImpl
   static std::string ValidateAndFormat_outdoor_seating(std::string v);
 
 protected:
-
   // stores information about charge sockets in charging stations.
   ChargeSocketsHelper m_chargeSockets;
 

libs/CMakeLists.txt

@@ -4,7 +4,6 @@ add_subdirectory(descriptions)
 add_subdirectory(drape)
 add_subdirectory(drape_frontend)
 add_subdirectory(editor)
-add_subdirectory(feature_helpers)
 add_subdirectory(ge0)
 add_subdirectory(mwm_diff)
 add_subdirectory(geometry)

libs/feature_helpers/CMakeLists.txt

@@ -1,14 +0,0 @@
-project(feature_helpers)
-
-set(SRC
-  feature_charge_sockets.cpp
-  feature_charge_sockets.hpp
-)
-
-omim_add_library(${PROJECT_NAME} ${SRC})
-target_link_libraries(${PROJECT_NAME}
-  PRIVATE
-    base
-)
-
-omim_add_test_subdirectory(feature_helpers_tests)

libs/feature_helpers/feature_helpers_tests/CMakeLists.txt

@@ -1,11 +0,0 @@
-project(feature_helpers_tests)
-
-set(SRC
-  feature_charge_sockets_test.cpp
-)
-
-omim_add_test(${PROJECT_NAME} ${SRC})
-
-target_link_libraries(${PROJECT_NAME}
-  feature_helpers
-)

libs/indexer/CMakeLists.txt

@@ -60,6 +60,8 @@ set(SRC
   feature_algo.cpp
   feature_algo.hpp
   feature_altitude.hpp
+  feature_charge_sockets.cpp
+  feature_charge_sockets.hpp
   feature_covering.cpp
   feature_covering.hpp
   feature_data.cpp
@@ -158,7 +160,6 @@ target_link_libraries(${PROJECT_NAME}
   geometry
   protobuf
   coding
-  feature_helpers
 )
 
 omim_add_test_subdirectory(indexer_tests)

libs/indexer/feature_charge_sockets.cpp

@@ -1,5 +1,5 @@
 
-#include "feature_helpers/feature_charge_sockets.hpp"
+#include "indexer/feature_charge_sockets.hpp"
 
 #include "base/logging.hpp"
 #include "base/string_utils.hpp"

libs/indexer/indexer_tests/CMakeLists.txt

@@ -16,6 +16,7 @@ set(SRC
   data_source_test.cpp
   drules_selector_parser_test.cpp
   editable_map_object_test.cpp
+  feature_charge_sockets_test.cpp
   feature_metadata_test.cpp
   feature_names_test.cpp
   feature_to_osm_tests.cpp

libs/indexer/indexer_tests/feature_charge_sockets_test.cpp

@@ -1,6 +1,6 @@
-#include "testing/testing.hpp"
+#include "indexer/feature_charge_sockets.hpp"
 
-#include "feature_helpers/feature_charge_sockets.hpp"
+#include "testing/testing.hpp"
 
 namespace feature_charge_sockets_test
 {

libs/indexer/map_object.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "indexer/feature_charge_sockets.hpp"
 #include "indexer/feature_data.hpp"
 #include "indexer/feature_decl.hpp"
 #include "indexer/feature_meta.hpp"
@@ -10,8 +11,6 @@
 
 #include "coding/string_utf8_multilang.hpp"
 
-#include "feature_helpers/feature_charge_sockets.hpp"
-
 #include <string>
 #include <vector>