From 2217db002a32494803e9e8bcff5483f79afea759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9verin=20Lemaignan?= Date: Sun, 5 Oct 2025 21:02:50 +0200 Subject: [PATCH] refactor: libs/feature_helpers merged in libs/indexer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Séverin Lemaignan --- generator/CMakeLists.txt | 1 - generator/osm2meta.hpp | 3 +-- libs/CMakeLists.txt | 1 - libs/feature_helpers/CMakeLists.txt | 14 -------------- .../feature_helpers_tests/CMakeLists.txt | 11 ----------- libs/indexer/CMakeLists.txt | 3 ++- .../feature_charge_sockets.cpp | 2 +- .../feature_charge_sockets.hpp | 0 libs/indexer/indexer_tests/CMakeLists.txt | 1 + .../indexer_tests}/feature_charge_sockets_test.cpp | 4 ++-- libs/indexer/map_object.hpp | 3 +-- 11 files changed, 8 insertions(+), 35 deletions(-) delete mode 100644 libs/feature_helpers/CMakeLists.txt delete mode 100644 libs/feature_helpers/feature_helpers_tests/CMakeLists.txt rename libs/{feature_helpers => indexer}/feature_charge_sockets.cpp (99%) rename libs/{feature_helpers => indexer}/feature_charge_sockets.hpp (100%) rename libs/{feature_helpers/feature_helpers_tests => indexer/indexer_tests}/feature_charge_sockets_test.cpp (99%) diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt index df9b19811..b1af498d3 100644 --- a/generator/CMakeLists.txt +++ b/generator/CMakeLists.txt @@ -251,7 +251,6 @@ target_link_libraries(${PROJECT_NAME} storage descriptions indexer - feature_helpers cppjansson expat::expat tess2 diff --git a/generator/osm2meta.hpp b/generator/osm2meta.hpp index b04fbaf5d..e2dec8d43 100644 --- a/generator/osm2meta.hpp +++ b/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 @@ -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; diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt index 08e961a6a..00a05fa9d 100644 --- a/libs/CMakeLists.txt +++ b/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) diff --git a/libs/feature_helpers/CMakeLists.txt b/libs/feature_helpers/CMakeLists.txt deleted file mode 100644 index 1004c3126..000000000 --- a/libs/feature_helpers/CMakeLists.txt +++ /dev/null @@ -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) diff --git a/libs/feature_helpers/feature_helpers_tests/CMakeLists.txt b/libs/feature_helpers/feature_helpers_tests/CMakeLists.txt deleted file mode 100644 index 7bd4f5e3b..000000000 --- a/libs/feature_helpers/feature_helpers_tests/CMakeLists.txt +++ /dev/null @@ -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 -) diff --git a/libs/indexer/CMakeLists.txt b/libs/indexer/CMakeLists.txt index 81b51ef0a..ae872b59d 100644 --- a/libs/indexer/CMakeLists.txt +++ b/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) diff --git a/libs/feature_helpers/feature_charge_sockets.cpp b/libs/indexer/feature_charge_sockets.cpp similarity index 99% rename from libs/feature_helpers/feature_charge_sockets.cpp rename to libs/indexer/feature_charge_sockets.cpp index 688aa13cc..7f7486f65 100644 --- a/libs/feature_helpers/feature_charge_sockets.cpp +++ b/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" diff --git a/libs/feature_helpers/feature_charge_sockets.hpp b/libs/indexer/feature_charge_sockets.hpp similarity index 100% rename from libs/feature_helpers/feature_charge_sockets.hpp rename to libs/indexer/feature_charge_sockets.hpp diff --git a/libs/indexer/indexer_tests/CMakeLists.txt b/libs/indexer/indexer_tests/CMakeLists.txt index 42877484a..71afc5c25 100644 --- a/libs/indexer/indexer_tests/CMakeLists.txt +++ b/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 diff --git a/libs/feature_helpers/feature_helpers_tests/feature_charge_sockets_test.cpp b/libs/indexer/indexer_tests/feature_charge_sockets_test.cpp similarity index 99% rename from libs/feature_helpers/feature_helpers_tests/feature_charge_sockets_test.cpp rename to libs/indexer/indexer_tests/feature_charge_sockets_test.cpp index 8b97613b2..ad73d0092 100644 --- a/libs/feature_helpers/feature_helpers_tests/feature_charge_sockets_test.cpp +++ b/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 { diff --git a/libs/indexer/map_object.hpp b/libs/indexer/map_object.hpp index d7164fd89..515c8d85e 100644 --- a/libs/indexer/map_object.hpp +++ b/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 #include