Moved CategoriesHolder from search into indexer library. Need to access it from Editor.

generator/dumper.cpp

@@ -1,13 +1,13 @@
 #include "generator/dumper.hpp"
 
-#include "search/search_delimiters.hpp"
 #include "search/search_index_values.hpp"
-#include "search/search_string_utils.hpp"
 #include "search/search_trie.hpp"
 
 #include "indexer/classificator.hpp"
 #include "indexer/feature_processor.hpp"
 #include "indexer/trie_reader.hpp"
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "coding/multilang_utf8_string.hpp"
 

generator/search_index_builder.cpp

@@ -1,12 +1,10 @@
 #include "search_index_builder.hpp"
 
-#include "search/categories_holder.hpp"
 #include "search/reverse_geocoder.hpp"
-#include "search/search_delimiters.hpp"
 #include "search/search_index_values.hpp"
-#include "search/search_string_utils.hpp"
 #include "search/search_trie.hpp"
 
+#include "indexer/categories_holder.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/feature_algo.hpp"
 #include "indexer/feature_utils.hpp"
@@ -14,6 +12,8 @@
 #include "indexer/features_vector.hpp"
 #include "indexer/ftypes_matcher.hpp"
 #include "indexer/index.hpp"
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 #include "indexer/trie_builder.hpp"
 #include "indexer/types_skipper.hpp"
 

indexer/categories_holder.cpp

@@ -1,9 +1,7 @@
-#include "categories_holder.hpp"
-
-#include "search_delimiters.hpp"
-#include "search_string_utils.hpp"
-
+#include "indexer/categories_holder.hpp"
 #include "indexer/classificator.hpp"
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "coding/reader.hpp"
 #include "coding/reader_streambuf.hpp"

indexer/indexer.pro

@@ -10,6 +10,7 @@ ROOT_DIR = ..
 include($$ROOT_DIR/common.pri)
 
 SOURCES += \
+    categories_holder.cpp \
     classificator.cpp \
     classificator_loader.cpp \
     coding_params.cpp \
@@ -46,10 +47,13 @@ SOURCES += \
     point_to_int64.cpp \
     rank_table.cpp \
     scales.cpp \
+    search_delimiters.cpp \    # it's in indexer because of CategoriesHolder dependency.
+    search_string_utils.cpp \  # it's in indexer because of CategoriesHolder dependency.
     types_mapping.cpp \
     types_skipper.cpp \
 
 HEADERS += \
+    categories_holder.hpp \
     cell_coverer.hpp \
     cell_id.hpp \
     classificator.hpp \
@@ -96,6 +100,8 @@ HEADERS += \
     scale_index.hpp \
     scale_index_builder.hpp \
     scales.hpp \
+    search_delimiters.hpp \      # it's in indexer because of CategoriesHolder dependency.
+    search_string_utils.hpp \    # it's in indexer because of CategoriesHolder dependency.
     succinct_trie_builder.hpp \
     succinct_trie_reader.hpp \
     tesselator_decl.hpp \

indexer/indexer_tests/categories_test.cpp

@@ -1,7 +1,6 @@
 #include "testing/testing.hpp"
 
-#include "search/categories_holder.hpp"
-
+#include "indexer/categories_holder.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/classificator_loader.hpp"
 

indexer/indexer_tests/indexer_tests.pro

@@ -17,6 +17,7 @@ HEADERS += \
 
 SOURCES += \
     ../../testing/testingmain.cpp \
+    categories_test.cpp \
     cell_coverer_test.cpp \
     cell_id_test.cpp \
     checker_test.cpp \
@@ -33,6 +34,7 @@ SOURCES += \
     point_to_int64_test.cpp \
     rank_table_test.cpp \
     scales_test.cpp \
+    search_string_utils_test.cpp \
     sort_and_merge_intervals_test.cpp \
     succinct_trie_test.cpp \
     test_polylines.cpp \

indexer/indexer_tests/search_string_utils_test.cpp

@@ -1,6 +1,6 @@
 #include "testing/testing.hpp"
 
-#include "search/search_string_utils.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "base/string_utils.hpp"
 

map/address_finder.cpp

@@ -1,11 +1,11 @@
 #include "map/framework.hpp"
 
-#include "search/categories_holder.hpp"
 #include "search/result.hpp"
 #include "search/reverse_geocoder.hpp"
 
 #include "drape_frontend/visual_params.hpp"
 
+#include "indexer/categories_holder.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/feature_algo.hpp"
 #include "indexer/feature_visibility.hpp"

map/framework.cpp

@@ -13,7 +13,6 @@
 #include "routing/route.hpp"
 #include "routing/routing_algorithm.hpp"
 
-#include "search/categories_holder.hpp"
 #include "search/geometry_utils.hpp"
 #include "search/intermediate_result.hpp"
 #include "search/result.hpp"
@@ -29,6 +28,7 @@
 #include "drape_frontend/watch/cpu_drawer.hpp"
 #include "drape_frontend/watch/feature_processor.hpp"
 
+#include "indexer/categories_holder.hpp"
 #include "indexer/classificator_loader.hpp"
 #include "indexer/drawing_rules.hpp"
 #include "indexer/feature.hpp"

map/map_tests/address_tests.cpp

@@ -1,10 +1,10 @@
 #include "testing/testing.hpp"
 
 #include "search/reverse_geocoder.hpp"
-#include "search/search_string_utils.hpp"
 
 #include "indexer/classificator_loader.hpp"
 #include "indexer/index.hpp"
+#include "indexer/search_string_utils.hpp"
 
 
 using namespace search;

search/approximate_string_match.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "search_string_utils.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "base/base.hpp"
 #include "base/buffer_vector.hpp"

search/house_detector.cpp

@@ -2,10 +2,10 @@
 
 #include "search/algos.hpp"
 #include "search/search_common.hpp"
-#include "search/search_string_utils.hpp"
 
 #include "indexer/classificator.hpp"
 #include "indexer/feature_impl.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "geometry/angles.hpp"
 #include "geometry/distance.hpp"

search/intermediate_result.cpp

@@ -1,12 +1,12 @@
-#include "categories_holder.hpp"
 #include "intermediate_result.hpp"
 #include "geometry_utils.hpp"
 
 #include "storage/country_info_getter.hpp"
 
-#include "indexer/ftypes_matcher.hpp"
+#include "indexer/categories_holder.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/feature.hpp"
+#include "indexer/ftypes_matcher.hpp"
 #include "indexer/scales.hpp"
 
 #include "geometry/angles.hpp"

search/keyword_lang_matcher.cpp

@@ -1,7 +1,7 @@
 #include "keyword_lang_matcher.hpp"
 
-#include "search_delimiters.hpp"
-#include "search_string_utils.hpp"
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "base/stl_add.hpp"
 

search/keyword_matcher.cpp

@@ -1,7 +1,7 @@
 #include "keyword_matcher.hpp"
 
-#include "search_delimiters.hpp"
-#include "search_string_utils.hpp"
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "base/stl_add.hpp"
 

search/locality.cpp

@@ -1,7 +1,7 @@
 #include "locality.hpp"
 
-#include "search_delimiters.hpp"
-#include "search_string_utils.hpp"
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "base/assert.hpp"
 

search/retrieval.cpp

@@ -4,7 +4,6 @@
 #include "feature_offset_match.hpp"
 #include "interval_set.hpp"
 #include "search_index_values.hpp"
-#include "search_string_utils.hpp"
 #include "search_trie.hpp"
 
 #include "indexer/feature.hpp"
@@ -12,6 +11,7 @@
 #include "indexer/index.hpp"
 #include "indexer/osm_editor.hpp"
 #include "indexer/scales.hpp"
+#include "indexer/search_string_utils.hpp"
 #include "indexer/trie_reader.hpp"
 
 #include "platform/mwm_traits.hpp"

search/reverse_geocoder.cpp

@@ -1,5 +1,4 @@
 #include "reverse_geocoder.hpp"
-#include "search_string_utils.hpp"
 
 #include "search/v2/mwm_context.hpp"
 
@@ -8,6 +7,7 @@
 #include "indexer/ftypes_matcher.hpp"
 #include "indexer/index.hpp"
 #include "indexer/scales.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "base/stl_helpers.hpp"
 

search/search.pro

@@ -12,7 +12,6 @@ HEADERS += \
     algos.hpp \
     approximate_string_match.hpp \
     cancel_exception.hpp \
-    categories_holder.hpp \
     dummy_rank_table.hpp \
     feature_offset_match.hpp \
     geometry_utils.hpp \
@@ -34,14 +33,12 @@ HEADERS += \
     retrieval.hpp \
     reverse_geocoder.hpp \
     search_common.hpp \
-    search_delimiters.hpp \
     search_engine.hpp \
     search_index_values.hpp \
     search_query.hpp \
     search_query_factory.hpp \
     search_query_params.hpp \
     search_string_intersection.hpp \
-    search_string_utils.hpp \
     search_trie.hpp \
     suggest.hpp \
     v2/cbv_ptr.hpp \
@@ -63,7 +60,6 @@ HEADERS += \
 
 SOURCES += \
     approximate_string_match.cpp \
-    categories_holder.cpp \
     dummy_rank_table.cpp \
     geometry_utils.cpp \
     house_detector.cpp \
@@ -81,11 +77,9 @@ SOURCES += \
     result.cpp \
     retrieval.cpp \
     reverse_geocoder.cpp \
-    search_delimiters.cpp \
     search_engine.cpp \
     search_query.cpp \
     search_query_params.cpp \
-    search_string_utils.cpp \
     v2/cbv_ptr.cpp \
     v2/features_filter.cpp \
     v2/features_layer.cpp \

search/search_engine.cpp

@@ -1,14 +1,14 @@
 #include "search_engine.hpp"
 
-#include "categories_holder.hpp"
 #include "geometry_utils.hpp"
 #include "search_query.hpp"
-#include "search_string_utils.hpp"
 
 #include "storage/country_info_getter.hpp"
 
+#include "indexer/categories_holder.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/scales.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "platform/platform.hpp"
 

search/search_engine.hpp

@@ -1,11 +1,12 @@
 #pragma once
 
-#include "categories_holder.hpp"
 #include "params.hpp"
 #include "result.hpp"
 #include "search_query_factory.hpp"
 #include "suggest.hpp"
 
+#include "indexer/categories_holder.hpp"
+
 #include "geometry/rect2d.hpp"
 
 #include "coding/reader.hpp"

search/search_integration_tests/retrieval_test.cpp

@@ -1,9 +1,7 @@
 #include "testing/testing.hpp"
 
 #include "search/retrieval.hpp"
-#include "search/search_delimiters.hpp"
 #include "search/search_query_params.hpp"
-#include "search/search_string_utils.hpp"
 #include "search/search_tests_support/test_feature.hpp"
 #include "search/search_tests_support/test_mwm_builder.hpp"
 #include "search/search_tests_support/test_results_matching.hpp"
@@ -14,6 +12,8 @@
 #include "indexer/index.hpp"
 #include "indexer/mwm_set.hpp"
 #include "indexer/scales.hpp"
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "storage/country_decl.hpp"
 #include "storage/country_info_getter.hpp"

search/search_query.cpp

@@ -1,6 +1,5 @@
 #include "search_query.hpp"
 
-#include "search/categories_holder.hpp"
 #include "search/dummy_rank_table.hpp"
 #include "search/feature_offset_match.hpp"
 #include "search/geometry_utils.hpp"
@@ -9,14 +8,13 @@
 #include "search/locality.hpp"
 #include "search/region.hpp"
 #include "search/search_common.hpp"
-#include "search/search_delimiters.hpp"
 #include "search/search_index_values.hpp"
 #include "search/search_query_params.hpp"
 #include "search/search_string_intersection.hpp"
-#include "search/search_string_utils.hpp"
 
 #include "storage/country_info_getter.hpp"
 
+#include "indexer/categories_holder.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/feature.hpp"
 #include "indexer/feature_algo.hpp"
@@ -25,6 +23,8 @@
 #include "indexer/features_vector.hpp"
 #include "indexer/index.hpp"
 #include "indexer/scales.hpp"
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 #include "indexer/trie_reader.hpp"
 
 #include "platform/mwm_traits.hpp"

search/search_string_intersection.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "search_delimiters.hpp"
+#include "indexer/search_delimiters.hpp"
 
 
 namespace search

search/search_tests/house_detector_tests.cpp

@@ -1,18 +1,17 @@
 #include "testing/testing.hpp"
 
 #include "search/house_detector.hpp"
-#include "search/search_string_utils.hpp"
 
 #include "indexer/classificator_loader.hpp"
 #include "indexer/data_header.hpp"
 #include "indexer/ftypes_matcher.hpp"
 #include "indexer/index.hpp"
 #include "indexer/scales.hpp"
-
-#include "platform/platform.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "platform/local_country_file.hpp"
 #include "platform/local_country_file_utils.hpp"
+#include "platform/platform.hpp"
 
 #include "geometry/distance_on_sphere.hpp"
 

search/search_tests/keyword_lang_matcher_test.cpp

@@ -1,8 +1,9 @@
 #include "testing/testing.hpp"
 
 #include "search/keyword_lang_matcher.hpp"
-#include "search/search_delimiters.hpp"
-#include "search/search_string_utils.hpp"
+
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "base/stl_add.hpp"
 

search/search_tests/keyword_matcher_test.cpp

@@ -2,8 +2,9 @@
 
 #include "search/keyword_matcher.hpp"
 #include "search/search_common.hpp"
-#include "search/search_delimiters.hpp"
-#include "search/search_string_utils.hpp"
+
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "base/buffer_vector.hpp"
 #include "base/stl_add.hpp"

search/search_tests/locality_scorer_test.cpp

@@ -1,10 +1,11 @@
 #include "testing/testing.hpp"
 
 #include "search/dummy_rank_table.hpp"
-#include "search/search_delimiters.hpp"
-#include "search/search_string_utils.hpp"
 #include "search/v2/locality_scorer.hpp"
 
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
+
 #include "base/assert.hpp"
 #include "base/stl_add.hpp"
 #include "base/stl_helpers.hpp"

search/search_tests/search_tests.pro

@@ -17,7 +17,6 @@ macx-*: LIBS *= "-framework IOKit"
 SOURCES += \
     ../../testing/testingmain.cpp \
     algos_tests.cpp \
-    categories_test.cpp \
     house_detector_tests.cpp \
     house_numbers_matcher_test.cpp \
     interval_set_test.cpp \
@@ -27,7 +26,6 @@ SOURCES += \
     locality_finder_test.cpp \
     locality_scorer_test.cpp \
     query_saver_tests.cpp \
-    search_string_utils_test.cpp \
     string_intersection_test.cpp \
     string_match_test.cpp \
 

search/search_tests/string_match_test.cpp

@@ -1,7 +1,8 @@
 #include "testing/testing.hpp"
 
 #include "search/approximate_string_match.hpp"
-#include "search/search_delimiters.hpp"
+
+#include "indexer/search_delimiters.hpp"
 
 #include "search/search_tests/match_cost_mock.hpp"
 

search/search_tests_support/test_search_engine.cpp

@@ -1,10 +1,10 @@
 #include "search/search_tests_support/test_search_engine.hpp"
 
-#include "search/categories_holder.hpp"
 #include "search/search_query.hpp"
 #include "search/search_query_factory.hpp"
 #include "search/suggest.hpp"
 
+#include "indexer/categories_holder.hpp"
 #include "indexer/scales.hpp"
 
 #include "storage/country_info_getter.hpp"

search/v2/geocoder.cpp

@@ -2,8 +2,6 @@
 
 #include "search/dummy_rank_table.hpp"
 #include "search/retrieval.hpp"
-#include "search/search_delimiters.hpp"
-#include "search/search_string_utils.hpp"
 #include "search/v2/cbv_ptr.hpp"
 #include "search/v2/features_filter.hpp"
 #include "search/v2/features_layer_matcher.hpp"
@@ -16,6 +14,8 @@
 #include "indexer/index.hpp"
 #include "indexer/mwm_set.hpp"
 #include "indexer/rank_table.hpp"
+#include "indexer/search_delimiters.hpp"
+#include "indexer/search_string_utils.hpp"
 
 #include "storage/country_info_getter.hpp"