From c1ee243c976fc9adfbb71dc4cdf46dfc1333ec4f Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Wed, 30 May 2018 20:06:37 +0300 Subject: [PATCH] [indexer][editor] Move some code from indexer to editor --- android/jni/CMakeLists.txt | 2 +- .../jni/com/mapswithme/maps/editor/Editor.cpp | 9 +- drape_frontend/apply_feature_functors.cpp | 3 +- editor/CMakeLists.txt | 7 + editor/editor_tests/CMakeLists.txt | 18 +-- .../new_feature_categories_test.cpp | 67 +++++++++ editor/editor_tests/osm_editor_test.cpp | 15 +-- editor/editor_tests_support/CMakeLists.txt | 9 ++ .../editor_tests_support}/helpers.cpp | 6 +- .../editor_tests_support}/helpers.hpp | 7 +- {indexer => editor}/edits_migration.cpp | 11 +- {indexer => editor}/edits_migration.hpp | 6 +- .../new_feature_categories.cpp | 0 .../new_feature_categories.hpp | 4 +- {indexer => editor}/osm_editor.cpp | 14 +- {indexer => editor}/osm_editor.hpp | 16 +-- feature_list/CMakeLists.txt | 2 +- .../booking_quality_check/CMakeLists.txt | 2 +- generator/generator_tests/CMakeLists.txt | 2 +- .../generator_tests_support/test_feature.cpp | 3 +- generator/generator_tool/CMakeLists.txt | 2 +- generator/restaurants_info/CMakeLists.txt | 2 +- indexer/CMakeLists.txt | 6 - indexer/feature.cpp | 3 +- indexer/index.hpp | 6 +- indexer/indexer_tests/categories_test.cpp | 53 -------- indexer/indexer_tests_support/CMakeLists.txt | 2 - iphone/Maps/Core/Editor/MWMEditorHelper.mm | 4 +- .../Maps/UI/Editor/MWMEditorViewController.mm | 2 +- .../MWMObjectsCategorySelectorController.mm | 2 +- map/benchmark_tool/CMakeLists.txt | 2 +- map/framework.cpp | 3 +- map/framework.hpp | 6 +- map/map_tests/CMakeLists.txt | 3 +- map/mwm_tests/CMakeLists.txt | 2 +- map/place_page_info.cpp | 3 +- map/place_page_info.hpp | 3 +- .../openlr_assessment_tool/CMakeLists.txt | 2 +- openlr/openlr_stat/CMakeLists.txt | 2 +- openlr/openlr_tests/CMakeLists.txt | 4 +- qt/CMakeLists.txt | 2 +- qt/create_feature_dialog.cpp | 2 +- routing/routing_benchmarks/CMakeLists.txt | 2 +- .../routing_consistency_tests/CMakeLists.txt | 2 +- .../routing_integration_tests/CMakeLists.txt | 3 +- routing/routing_tests/CMakeLists.txt | 2 +- search/editor_delegate.hpp | 2 +- search/retrieval.cpp | 3 +- .../search_integration_tests/CMakeLists.txt | 3 +- search/search_integration_tests/helpers.hpp | 2 - .../assessment_tool/CMakeLists.txt | 2 +- .../features_collector_tool/CMakeLists.txt | 2 +- .../search_quality_tool/CMakeLists.txt | 2 +- search/search_tests/CMakeLists.txt | 2 +- .../test_with_custom_mwms.hpp | 9 +- .../storage_integration_tests/CMakeLists.txt | 6 +- storage/storage_tests/CMakeLists.txt | 6 +- track_analyzing/track_analyzer/CMakeLists.txt | 2 +- ugc/ugc_tests/CMakeLists.txt | 2 +- xcode/editor/editor.xcodeproj/project.pbxproj | 127 +++++++++++++++++- .../indexer/indexer.xcodeproj/project.pbxproj | 40 +----- xcode/search/search.xcodeproj/project.pbxproj | 29 +++- 62 files changed, 362 insertions(+), 205 deletions(-) create mode 100644 editor/editor_tests/new_feature_categories_test.cpp create mode 100644 editor/editor_tests_support/CMakeLists.txt rename {indexer/indexer_tests_support => editor/editor_tests_support}/helpers.cpp (84%) rename {indexer/indexer_tests_support => editor/editor_tests_support}/helpers.hpp (89%) rename {indexer => editor}/edits_migration.cpp (99%) rename {indexer => editor}/edits_migration.hpp (95%) rename {indexer => editor}/new_feature_categories.cpp (100%) rename {indexer => editor}/new_feature_categories.hpp (100%) rename {indexer => editor}/osm_editor.cpp (99%) rename {indexer => editor}/osm_editor.hpp (99%) diff --git a/android/jni/CMakeLists.txt b/android/jni/CMakeLists.txt index cf1aa2530e..550b7d7da3 100644 --- a/android/jni/CMakeLists.txt +++ b/android/jni/CMakeLists.txt @@ -112,9 +112,9 @@ target_link_libraries( ugc drape kml + editor indexer platform - editor partners_api local_ads mwm_diff diff --git a/android/jni/com/mapswithme/maps/editor/Editor.cpp b/android/jni/com/mapswithme/maps/editor/Editor.cpp index f95e9a6565..0409d123ad 100644 --- a/android/jni/com/mapswithme/maps/editor/Editor.cpp +++ b/android/jni/com/mapswithme/maps/editor/Editor.cpp @@ -3,16 +3,17 @@ #include "com/mapswithme/core/jni_helper.hpp" #include "com/mapswithme/maps/Framework.hpp" +#include "editor/osm_editor.hpp" + +#include "indexer/cuisines.hpp" +#include "indexer/editable_map_object.hpp" + #include "coding/multilang_utf8_string.hpp" #include "base/assert.hpp" #include "base/logging.hpp" #include "base/string_utils.hpp" -#include "indexer/cuisines.hpp" -#include "indexer/editable_map_object.hpp" -#include "indexer/osm_editor.hpp" - #include "std/target_os.hpp" #include diff --git a/drape_frontend/apply_feature_functors.cpp b/drape_frontend/apply_feature_functors.cpp index 9affc9a142..40944aafbb 100644 --- a/drape_frontend/apply_feature_functors.cpp +++ b/drape_frontend/apply_feature_functors.cpp @@ -11,10 +11,11 @@ #include "drape_frontend/text_shape.hpp" #include "drape_frontend/visual_params.hpp" +#include "editor/osm_editor.hpp" + #include "indexer/drawing_rules.hpp" #include "indexer/drules_include.hpp" #include "indexer/map_style_reader.hpp" -#include "indexer/osm_editor.hpp" #include "indexer/road_shields_parser.hpp" #include "geometry/clipping.hpp" diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt index 7d8b0691eb..022b278d50 100644 --- a/editor/CMakeLists.txt +++ b/editor/CMakeLists.txt @@ -12,12 +12,18 @@ set( editor_notes.hpp editor_storage.cpp editor_storage.hpp + edits_migration.cpp + edits_migration.hpp feature_matcher.cpp feature_matcher.hpp + new_feature_categories.cpp + new_feature_categories.hpp opening_hours_ui.cpp opening_hours_ui.hpp osm_auth.cpp osm_auth.hpp + osm_editor.cpp + osm_editor.hpp server_api.cpp server_api.hpp ui2oh.cpp @@ -32,4 +38,5 @@ set( add_library(${PROJECT_NAME} ${SRC}) omim_add_test_subdirectory(editor_tests) +omim_add_test_subdirectory(editor_tests_support) omim_add_test_subdirectory(osm_auth_tests) diff --git a/editor/editor_tests/CMakeLists.txt b/editor/editor_tests/CMakeLists.txt index cd19f462cf..dd3b5965ed 100644 --- a/editor/editor_tests/CMakeLists.txt +++ b/editor/editor_tests/CMakeLists.txt @@ -7,6 +7,7 @@ set( editor_notes_test.cpp feature_matcher_test.cpp match_by_geometry_test.cpp + new_feature_categories_test.cpp opening_hours_ui_test.cpp osm_editor_test.cpp osm_editor_test.hpp @@ -19,21 +20,17 @@ omim_add_test(${PROJECT_NAME} ${SRC}) omim_link_libraries( ${PROJECT_NAME} - editor + editor_tests_support platform_tests_support generator_tests_support - generator indexer_tests_support - indexer + generator routing routing_common search - succinct + editor + indexer storage - tess2 - jansson - icu - protobuf platform geometry coding @@ -41,6 +38,11 @@ omim_link_libraries( stats_client opening_hours pugixml + tess2 + jansson + succinct + icu + protobuf oauthcpp ${LIBZ} ${Qt5Widgets_LIBRARIES} diff --git a/editor/editor_tests/new_feature_categories_test.cpp b/editor/editor_tests/new_feature_categories_test.cpp new file mode 100644 index 0000000000..19ebad64a9 --- /dev/null +++ b/editor/editor_tests/new_feature_categories_test.cpp @@ -0,0 +1,67 @@ +#include "testing/testing.hpp" + +#include "editor/editor_config.hpp" +#include "editor/new_feature_categories.hpp" + +#include "indexer/classificator.hpp" +#include "indexer/classificator_loader.hpp" + +#include "std/transform_iterator.hpp" + +#include +#include +#include +#include +#include + +UNIT_TEST(NewFeatureCategories_UniqueNames) +{ + using namespace std; + + classificator::Load(); + auto const & cl = classif(); + + editor::EditorConfig config; + osm::NewFeatureCategories categories(config); + + auto const & disabled = CategoriesHolder::kDisabledLanguages; + + bool noDuplicates = true; + for (auto const & locale : CategoriesHolder::kLocaleMapping) + { + string const lang(locale.m_name); + if (find(disabled.begin(), disabled.end(), lang) != disabled.end()) + continue; + categories.AddLanguage(lang); + auto const & names = categories.GetAllCategoryNames(lang); + + auto firstFn = bind(&pair::first, placeholders::_1); + set uniqueNames(make_transform_iterator(names.begin(), firstFn), + make_transform_iterator(names.end(), firstFn)); + if (uniqueNames.size() == names.size()) + continue; + + LOG(LWARNING, ("Invalid category translations", lang)); + + map> typesByName; + for (auto const & entry : names) + typesByName[entry.first].push_back(entry.second); + + for (auto const & entry : typesByName) + { + if (entry.second.size() <= 1) + continue; + noDuplicates = false; + ostringstream str; + str << entry.first << ":"; + for (auto const & type : entry.second) + str << " " << cl.GetReadableObjectName(type); + LOG(LWARNING, (str.str())); + } + + LOG(LWARNING, + ("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++")); + }; + + TEST(noDuplicates, ()); +} diff --git a/editor/editor_tests/osm_editor_test.cpp b/editor/editor_tests/osm_editor_test.cpp index 49f3d6eec8..e89454fe0a 100644 --- a/editor/editor_tests/osm_editor_test.cpp +++ b/editor/editor_tests/osm_editor_test.cpp @@ -1,6 +1,9 @@ #include "testing/testing.hpp" +#include "editor/editor_storage.hpp" #include "editor/editor_tests/osm_editor_test.hpp" +#include "editor/editor_tests_support/helpers.hpp" +#include "editor/osm_editor.hpp" #include "search/editor_delegate.hpp" @@ -8,10 +11,6 @@ #include "indexer/classificator_loader.hpp" #include "indexer/ftypes_matcher.hpp" #include "indexer/index_helpers.hpp" -#include "indexer/indexer_tests_support/helpers.hpp" -#include "indexer/osm_editor.hpp" - -#include "editor/editor_storage.hpp" #include "platform/platform_tests_support/scoped_file.hpp" @@ -20,7 +19,7 @@ #include "std/unique_ptr.hpp" using namespace generator::tests_support; -using namespace indexer::tests_support; +using namespace editor::tests_support; using platform::tests_support::ScopedFile; namespace @@ -147,13 +146,13 @@ EditorTest::EditorTest() LOG(LERROR, ("Classificator read error: ", e.what())); } - indexer::tests_support::SetUpEditorForTesting(make_unique(m_index)); + editor::tests_support::SetUpEditorForTesting(make_unique(m_index)); } EditorTest::~EditorTest() { - indexer::tests_support::TearDownEditorForTesting(); + editor::tests_support::TearDownEditorForTesting(); for (auto const & file : m_mwmFiles) Cleanup(file); @@ -174,7 +173,7 @@ void EditorTest::GetFeatureTypeInfoTest() builder.Add(cafe); }); - ForEachCafeAtPoint(m_index, m2::PointD(1.0, 1.0), [&editor, &mwmId](FeatureType & ft) + ForEachCafeAtPoint(m_index, m2::PointD(1.0, 1.0), [&editor](FeatureType & ft) { TEST(!editor.GetFeatureTypeInfo(ft.GetID().m_mwmId, ft.GetID().m_index), ()); diff --git a/editor/editor_tests_support/CMakeLists.txt b/editor/editor_tests_support/CMakeLists.txt new file mode 100644 index 0000000000..4a9c959137 --- /dev/null +++ b/editor/editor_tests_support/CMakeLists.txt @@ -0,0 +1,9 @@ +project(editor_tests_support) + +set( + SRC + helpers.cpp + helpers.hpp +) + +add_library(${PROJECT_NAME} ${SRC}) diff --git a/indexer/indexer_tests_support/helpers.cpp b/editor/editor_tests_support/helpers.cpp similarity index 84% rename from indexer/indexer_tests_support/helpers.cpp rename to editor/editor_tests_support/helpers.cpp index 9e3b04a9e1..bd86cad2bd 100644 --- a/indexer/indexer_tests_support/helpers.cpp +++ b/editor/editor_tests_support/helpers.cpp @@ -1,8 +1,8 @@ -#include "indexer/indexer_tests_support/helpers.hpp" +#include "editor/editor_tests_support/helpers.hpp" #include "editor/editor_storage.hpp" -namespace indexer +namespace editor { namespace tests_support { @@ -22,4 +22,4 @@ void TearDownEditorForTesting() editor.SetDefaultStorage(); } } // namespace tests_support -} // namespace indexer +} // namespace editor diff --git a/indexer/indexer_tests_support/helpers.hpp b/editor/editor_tests_support/helpers.hpp similarity index 89% rename from indexer/indexer_tests_support/helpers.hpp rename to editor/editor_tests_support/helpers.hpp index 1a26a3a327..046d431881 100644 --- a/indexer/indexer_tests_support/helpers.hpp +++ b/editor/editor_tests_support/helpers.hpp @@ -1,13 +1,14 @@ #pragma once +#include "editor/osm_editor.hpp" + #include "indexer/editable_map_object.hpp" -#include "indexer/osm_editor.hpp" #include "base/assert.hpp" #include "std/unique_ptr.hpp" -namespace indexer +namespace editor { namespace tests_support { @@ -28,4 +29,4 @@ void EditFeature(FeatureType const & ft, TFn && fn) CHECK_EQUAL(editor.SaveEditedFeature(emo), osm::Editor::SaveResult::SavedSuccessfully, ()); } } // namespace tests_support -} // namespace indexer +} // namespace editor diff --git a/indexer/edits_migration.cpp b/editor/edits_migration.cpp similarity index 99% rename from indexer/edits_migration.cpp rename to editor/edits_migration.cpp index 1dd0f9f11f..4f3e825558 100644 --- a/indexer/edits_migration.cpp +++ b/editor/edits_migration.cpp @@ -1,11 +1,12 @@ -#include "geometry/algorithm.hpp" -#include "geometry/mercator.hpp" - -#include "indexer/edits_migration.hpp" -#include "indexer/feature.hpp" +#include "editor/edits_migration.hpp" #include "editor/feature_matcher.hpp" +#include "indexer/feature.hpp" + +#include "geometry/algorithm.hpp" +#include "geometry/mercator.hpp" + #include "base/logging.hpp" #include "std/algorithm.hpp" diff --git a/indexer/edits_migration.hpp b/editor/edits_migration.hpp similarity index 95% rename from indexer/edits_migration.hpp rename to editor/edits_migration.hpp index 26e1232c1e..3306e55dfb 100644 --- a/indexer/edits_migration.hpp +++ b/editor/edits_migration.hpp @@ -1,10 +1,10 @@ #pragma once -#include "indexer/feature_decl.hpp" -#include "indexer/osm_editor.hpp" - +#include "editor/osm_editor.hpp" #include "editor/xml_feature.hpp" +#include "indexer/feature_decl.hpp" + #include "base/exception.hpp" #include "std/functional.hpp" diff --git a/indexer/new_feature_categories.cpp b/editor/new_feature_categories.cpp similarity index 100% rename from indexer/new_feature_categories.cpp rename to editor/new_feature_categories.cpp diff --git a/indexer/new_feature_categories.hpp b/editor/new_feature_categories.hpp similarity index 100% rename from indexer/new_feature_categories.hpp rename to editor/new_feature_categories.hpp index f236e0802f..9f6d9c74b8 100644 --- a/indexer/new_feature_categories.hpp +++ b/editor/new_feature_categories.hpp @@ -1,9 +1,9 @@ #pragma once -#include "indexer/categories_index.hpp" - #include "editor/editor_config.hpp" +#include "indexer/categories_index.hpp" + #include "base/macros.hpp" #include "std/cstdint.hpp" diff --git a/indexer/osm_editor.cpp b/editor/osm_editor.cpp similarity index 99% rename from indexer/osm_editor.cpp rename to editor/osm_editor.cpp index bb6b7b2c8a..1b4c47759d 100644 --- a/indexer/osm_editor.cpp +++ b/editor/osm_editor.cpp @@ -1,8 +1,13 @@ -#include "indexer/osm_editor.hpp" +#include "editor/osm_editor.hpp" + +#include "editor/changeset_wrapper.hpp" +#include "editor/edits_migration.hpp" +#include "editor/osm_auth.hpp" +#include "editor/server_api.hpp" +#include "editor/xml_feature.hpp" #include "indexer/categories_holder.hpp" #include "indexer/classificator.hpp" -#include "indexer/edits_migration.hpp" #include "indexer/fake_feature_ids.hpp" #include "indexer/feature_algo.hpp" #include "indexer/feature_decl.hpp" @@ -16,11 +21,6 @@ #include "platform/platform.hpp" #include "platform/preferred_languages.hpp" -#include "editor/changeset_wrapper.hpp" -#include "editor/osm_auth.hpp" -#include "editor/server_api.hpp" -#include "editor/xml_feature.hpp" - #include "coding/internal/file_data.hpp" #include "geometry/algorithm.hpp" diff --git a/indexer/osm_editor.hpp b/editor/osm_editor.hpp similarity index 99% rename from indexer/osm_editor.hpp rename to editor/osm_editor.hpp index 299bb427e5..ff3feebba7 100644 --- a/indexer/osm_editor.hpp +++ b/editor/osm_editor.hpp @@ -1,19 +1,19 @@ #pragma once -#include "geometry/rect2d.hpp" - -#include "indexer/editable_map_object.hpp" -#include "indexer/feature.hpp" -#include "indexer/feature_meta.hpp" -#include "indexer/mwm_set.hpp" -#include "indexer/new_feature_categories.hpp" - #include "editor/config_loader.hpp" #include "editor/editor_config.hpp" #include "editor/editor_notes.hpp" #include "editor/editor_storage.hpp" +#include "editor/new_feature_categories.hpp" #include "editor/xml_feature.hpp" +#include "indexer/editable_map_object.hpp" +#include "indexer/feature.hpp" +#include "indexer/feature_meta.hpp" +#include "indexer/mwm_set.hpp" + +#include "geometry/rect2d.hpp" + #include "base/timer.hpp" #include "std/ctime.hpp" diff --git a/feature_list/CMakeLists.txt b/feature_list/CMakeLists.txt index d87550912a..caf7c3432f 100644 --- a/feature_list/CMakeLists.txt +++ b/feature_list/CMakeLists.txt @@ -15,9 +15,9 @@ omim_link_libraries( storage ugc kml + editor indexer platform - editor mwm_diff bsdiff geometry diff --git a/generator/booking_quality_check/CMakeLists.txt b/generator/booking_quality_check/CMakeLists.txt index be304abcf0..f312bfe5fb 100644 --- a/generator/booking_quality_check/CMakeLists.txt +++ b/generator/booking_quality_check/CMakeLists.txt @@ -18,8 +18,8 @@ omim_link_libraries( search routing routing_common - indexer editor + indexer geometry platform coding diff --git a/generator/generator_tests/CMakeLists.txt b/generator/generator_tests/CMakeLists.txt index 35ba4e00b7..8d81bbff84 100644 --- a/generator/generator_tests/CMakeLists.txt +++ b/generator/generator_tests/CMakeLists.txt @@ -45,8 +45,8 @@ omim_link_libraries( routing_common transit kml - indexer editor + indexer platform geometry coding diff --git a/generator/generator_tests_support/test_feature.cpp b/generator/generator_tests_support/test_feature.cpp index 1b78213746..29a610d82c 100644 --- a/generator/generator_tests_support/test_feature.cpp +++ b/generator/generator_tests_support/test_feature.cpp @@ -2,6 +2,8 @@ #include "generator/feature_builder.hpp" +#include "editor/osm_editor.hpp" + #include "indexer/classificator.hpp" #include "indexer/editable_map_object.hpp" #include "indexer/feature.hpp" @@ -10,7 +12,6 @@ #include "indexer/feature_meta.hpp" #include "indexer/ftypes_matcher.hpp" #include "indexer/mwm_set.hpp" -#include "indexer/osm_editor.hpp" #include "coding/multilang_utf8_string.hpp" diff --git a/generator/generator_tool/CMakeLists.txt b/generator/generator_tool/CMakeLists.txt index b3f0ca7158..a06c28ba4c 100644 --- a/generator/generator_tool/CMakeLists.txt +++ b/generator/generator_tool/CMakeLists.txt @@ -20,8 +20,8 @@ omim_link_libraries( ugc search storage - indexer editor + indexer platform geometry coding diff --git a/generator/restaurants_info/CMakeLists.txt b/generator/restaurants_info/CMakeLists.txt index 961c316421..9cec0c38f0 100644 --- a/generator/restaurants_info/CMakeLists.txt +++ b/generator/restaurants_info/CMakeLists.txt @@ -18,8 +18,8 @@ omim_link_libraries( search routing routing_common - indexer editor + indexer geometry platform coding diff --git a/indexer/CMakeLists.txt b/indexer/CMakeLists.txt index c217ea1e49..a9babaeb14 100644 --- a/indexer/CMakeLists.txt +++ b/indexer/CMakeLists.txt @@ -43,8 +43,6 @@ set( drules_struct.pb.h editable_map_object.cpp editable_map_object.hpp - edits_migration.cpp - edits_migration.hpp fake_feature_ids.cpp fake_feature_ids.hpp feature_algo.cpp @@ -101,10 +99,6 @@ set( map_style.hpp mwm_set.cpp mwm_set.hpp - new_feature_categories.cpp # it's in indexer because of CategoriesHolder dependency. - new_feature_categories.hpp # it's in indexer because of CategoriesHolder dependency. - osm_editor.cpp - osm_editor.hpp postcodes_matcher.cpp # it's in indexer due to editor which is in indexer and depends on postcodes_marcher postcodes_matcher.hpp # it's in indexer due to editor which is in indexer and depends on postcodes_marcher rank_table.cpp diff --git a/indexer/feature.cpp b/indexer/feature.cpp index 6a1d6d07ee..059b2136e7 100644 --- a/indexer/feature.cpp +++ b/indexer/feature.cpp @@ -6,7 +6,8 @@ #include "indexer/feature_loader_base.hpp" #include "indexer/feature_utils.hpp" #include "indexer/feature_visibility.hpp" -#include "indexer/osm_editor.hpp" + +#include "editor/osm_editor.hpp" #include "platform/preferred_languages.hpp" diff --git a/indexer/index.hpp b/indexer/index.hpp index 2de961d7f9..3713dc007e 100644 --- a/indexer/index.hpp +++ b/indexer/index.hpp @@ -6,10 +6,14 @@ #include "indexer/features_offsets_table.hpp" #include "indexer/features_vector.hpp" #include "indexer/mwm_set.hpp" -#include "indexer/osm_editor.hpp" #include "indexer/scale_index.hpp" #include "indexer/unique_index.hpp" +// todo(@syershov) In general, including editor files in indexer may introduce +// a circular dependency. We are currently working on proper separation and +// there are no actual dependencies now, so this include is ok. +#include "editor/osm_editor.hpp" + #include "coding/file_container.hpp" #include "defines.hpp" diff --git a/indexer/indexer_tests/categories_test.cpp b/indexer/indexer_tests/categories_test.cpp index 6467e70bf2..2474432aab 100644 --- a/indexer/indexer_tests/categories_test.cpp +++ b/indexer/indexer_tests/categories_test.cpp @@ -4,9 +4,6 @@ #include "indexer/categories_index.hpp" #include "indexer/classificator.hpp" #include "indexer/classificator_loader.hpp" -#include "indexer/new_feature_categories.hpp" - -#include "editor/editor_config.hpp" #include "coding/multilang_utf8_string.hpp" #include "coding/reader.hpp" @@ -421,53 +418,3 @@ UNIT_TEST(CategoriesIndex_AllCategoriesEnglishName) TEST_LESS(index.GetNumTrieNodes(), 6000, ()); } #endif - -UNIT_TEST(CategoriesIndex_UniqueNames) -{ - classificator::Load(); - auto const & cl = classif(); - - editor::EditorConfig config; - osm::NewFeatureCategories categories(config); - - auto const & disabled = CategoriesHolder::kDisabledLanguages; - - bool noDuplicates = true; - for (auto const & locale : CategoriesHolder::kLocaleMapping) - { - string const lang(locale.m_name); - if (find(disabled.begin(), disabled.end(), lang) != disabled.end()) - continue; - categories.AddLanguage(lang); - auto const & names = categories.GetAllCategoryNames(lang); - - auto firstFn = bind(&pair::first, _1); - set uniqueNames(make_transform_iterator(names.begin(), firstFn), - make_transform_iterator(names.end(), firstFn)); - if (uniqueNames.size() == names.size()) - continue; - - LOG(LWARNING, ("Invalid category translations", lang)); - - map> typesByName; - for (auto const & entry : names) - typesByName[entry.first].push_back(entry.second); - - for (auto const & entry : typesByName) - { - if (entry.second.size() <= 1) - continue; - noDuplicates = false; - ostringstream str; - str << entry.first << ":"; - for (auto const & type : entry.second) - str << " " << cl.GetReadableObjectName(type); - LOG(LWARNING, (str.str())); - } - - LOG(LWARNING, - ("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++")); - }; - - TEST(noDuplicates, ()); -} diff --git a/indexer/indexer_tests_support/CMakeLists.txt b/indexer/indexer_tests_support/CMakeLists.txt index 099d504c9a..cc2c7d12ca 100644 --- a/indexer/indexer_tests_support/CMakeLists.txt +++ b/indexer/indexer_tests_support/CMakeLists.txt @@ -2,8 +2,6 @@ project(indexer_tests_support) set( SRC - helpers.cpp - helpers.hpp test_with_classificator.cpp test_with_classificator.hpp test_with_custom_mwms.cpp diff --git a/iphone/Maps/Core/Editor/MWMEditorHelper.mm b/iphone/Maps/Core/Editor/MWMEditorHelper.mm index 6c57b972ac..131482f786 100644 --- a/iphone/Maps/Core/Editor/MWMEditorHelper.mm +++ b/iphone/Maps/Core/Editor/MWMEditorHelper.mm @@ -2,9 +2,9 @@ #import "AppInfo.h" #import "MWMAuthorizationCommon.h" -#include "platform/platform.hpp" +#include "editor/osm_editor.hpp" -#include "indexer/osm_editor.hpp" +#include "platform/platform.hpp" @implementation MWMEditorHelper diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm index 22111d4040..ce23aa428a 100644 --- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm +++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm @@ -25,7 +25,7 @@ #include "Framework.h" -#include "indexer/osm_editor.hpp" +#include "editor/osm_editor.hpp" namespace { diff --git a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm index ba42021fcf..0f7e374a2b 100644 --- a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm +++ b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm @@ -13,7 +13,7 @@ #include "Framework.h" -#include "indexer/new_feature_categories.hpp" +#include "editor/new_feature_categories.hpp" using namespace osm; diff --git a/map/benchmark_tool/CMakeLists.txt b/map/benchmark_tool/CMakeLists.txt index 44cbb122ac..e72371250b 100644 --- a/map/benchmark_tool/CMakeLists.txt +++ b/map/benchmark_tool/CMakeLists.txt @@ -20,8 +20,8 @@ omim_link_libraries( map ugc kml - indexer editor + indexer geometry platform coding diff --git a/map/framework.cpp b/map/framework.cpp index c7ebf0e1f4..111de86e31 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -39,6 +39,8 @@ #include "drape/constants.hpp" +#include "editor/osm_editor.hpp" + #include "indexer/categories_holder.hpp" #include "indexer/classificator.hpp" #include "indexer/classificator_loader.hpp" @@ -48,7 +50,6 @@ #include "indexer/feature_visibility.hpp" #include "indexer/ftypes_sponsored.hpp" #include "indexer/map_style_reader.hpp" -#include "indexer/osm_editor.hpp" #include "indexer/scales.hpp" /// @todo Probably it's better to join this functionality. diff --git a/map/framework.hpp b/map/framework.hpp index 193ae54288..bce8c42efd 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -29,12 +29,12 @@ #include "ugc/api.hpp" +#include "editor/new_feature_categories.hpp" +#include "editor/user_stats.hpp" + #include "indexer/data_header.hpp" #include "indexer/index_helpers.hpp" #include "indexer/map_style.hpp" -#include "indexer/new_feature_categories.hpp" - -#include "editor/user_stats.hpp" #include "search/city_finder.hpp" #include "search/displayed_categories.hpp" diff --git a/map/map_tests/CMakeLists.txt b/map/map_tests/CMakeLists.txt index 0484b8056b..30a27473ff 100644 --- a/map/map_tests/CMakeLists.txt +++ b/map/map_tests/CMakeLists.txt @@ -29,6 +29,7 @@ omim_add_test(${PROJECT_NAME} ${SRC}) omim_link_libraries( ${PROJECT_NAME} search_tests_support + editor_tests_support indexer_tests_support generator_tests_support generator @@ -48,8 +49,8 @@ omim_link_libraries( partners_api local_ads kml - indexer editor + indexer platform geometry coding diff --git a/map/mwm_tests/CMakeLists.txt b/map/mwm_tests/CMakeLists.txt index 6534a1f853..f99933c8be 100644 --- a/map/mwm_tests/CMakeLists.txt +++ b/map/mwm_tests/CMakeLists.txt @@ -14,8 +14,8 @@ omim_link_libraries( search storage kml - indexer editor + indexer platform geometry coding diff --git a/map/place_page_info.cpp b/map/place_page_info.cpp index df4f0a2a11..4301401a6b 100644 --- a/map/place_page_info.cpp +++ b/map/place_page_info.cpp @@ -6,9 +6,10 @@ #include "partners_api/banner.hpp" #include "partners_api/partners.hpp" +#include "editor/osm_editor.hpp" + #include "indexer/feature_utils.hpp" #include "indexer/ftypes_sponsored.hpp" -#include "indexer/osm_editor.hpp" #include "platform/measurement_utils.hpp" #include "platform/preferred_languages.hpp" diff --git a/map/place_page_info.hpp b/map/place_page_info.hpp index c3affe558f..9c69c9c9b7 100644 --- a/map/place_page_info.hpp +++ b/map/place_page_info.hpp @@ -10,11 +10,12 @@ #include "storage/index.hpp" +#include "editor/osm_editor.hpp" + #include "indexer/feature_data.hpp" #include "indexer/feature_meta.hpp" #include "indexer/ftypes_matcher.hpp" #include "indexer/map_object.hpp" -#include "indexer/osm_editor.hpp" #include "geometry/latlon.hpp" #include "geometry/mercator.hpp" diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt b/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt index 07c5c7ddb5..130a3425f8 100644 --- a/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt +++ b/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt @@ -48,9 +48,9 @@ omim_link_libraries( partners_api local_ads kml + editor indexer platform - editor mwm_diff bsdiff geometry diff --git a/openlr/openlr_stat/CMakeLists.txt b/openlr/openlr_stat/CMakeLists.txt index 7b304f5f55..ba57cd36c7 100644 --- a/openlr/openlr_stat/CMakeLists.txt +++ b/openlr/openlr_stat/CMakeLists.txt @@ -13,8 +13,8 @@ omim_link_libraries(${PROJECT_NAME} routing routing_common storage - indexer editor + indexer platform geometry coding diff --git a/openlr/openlr_tests/CMakeLists.txt b/openlr/openlr_tests/CMakeLists.txt index d32866c97a..18ece14f37 100644 --- a/openlr/openlr_tests/CMakeLists.txt +++ b/openlr/openlr_tests/CMakeLists.txt @@ -9,16 +9,16 @@ omim_add_test(${PROJECT_NAME} ${SRC}) omim_link_libraries( ${PROJECT_NAME} + platform_tests_support generator_tests_support platform_tests_support generator routing search openlr + editor indexer routing_common - editor - platform_tests_support platform coding geometry diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index c0b95c89b9..638b333097 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -75,9 +75,9 @@ omim_link_libraries( partners_api local_ads kml + editor indexer platform - editor geometry coding base diff --git a/qt/create_feature_dialog.cpp b/qt/create_feature_dialog.cpp index 8a0d7f8bf2..630f45b89b 100644 --- a/qt/create_feature_dialog.cpp +++ b/qt/create_feature_dialog.cpp @@ -2,7 +2,7 @@ #include "platform/preferred_languages.hpp" -#include "indexer/new_feature_categories.hpp" +#include "editor/new_feature_categories.hpp" #include #include diff --git a/routing/routing_benchmarks/CMakeLists.txt b/routing/routing_benchmarks/CMakeLists.txt index b882a53819..ef9ae89d41 100644 --- a/routing/routing_benchmarks/CMakeLists.txt +++ b/routing/routing_benchmarks/CMakeLists.txt @@ -24,9 +24,9 @@ omim_link_libraries( mwm_diff traffic kml + editor indexer platform - editor oauthcpp opening_hours geometry diff --git a/routing/routing_consistency_tests/CMakeLists.txt b/routing/routing_consistency_tests/CMakeLists.txt index 84f859e597..cffdc4682c 100644 --- a/routing/routing_consistency_tests/CMakeLists.txt +++ b/routing/routing_consistency_tests/CMakeLists.txt @@ -25,9 +25,9 @@ omim_link_libraries( storage mwm_diff kml + editor indexer platform - editor geometry oauthcpp opening_hours diff --git a/routing/routing_integration_tests/CMakeLists.txt b/routing/routing_integration_tests/CMakeLists.txt index a1623a0406..ed27b2be0a 100644 --- a/routing/routing_integration_tests/CMakeLists.txt +++ b/routing/routing_integration_tests/CMakeLists.txt @@ -26,6 +26,7 @@ omim_add_test(${PROJECT_NAME} ${SRC}) omim_link_libraries( ${PROJECT_NAME} + editor_tests_support map routing search @@ -35,8 +36,8 @@ omim_link_libraries( routing_common transit kml - indexer editor + indexer platform oauthcpp geometry diff --git a/routing/routing_tests/CMakeLists.txt b/routing/routing_tests/CMakeLists.txt index ce8748ddc1..8f75320e38 100644 --- a/routing/routing_tests/CMakeLists.txt +++ b/routing/routing_tests/CMakeLists.txt @@ -43,8 +43,8 @@ omim_link_libraries( routing_common transit kml - indexer editor + indexer platform oauthcpp geometry diff --git a/search/editor_delegate.hpp b/search/editor_delegate.hpp index 5e86785d9c..a02669df81 100644 --- a/search/editor_delegate.hpp +++ b/search/editor_delegate.hpp @@ -1,6 +1,6 @@ #pragma once -#include "indexer/osm_editor.hpp" +#include "editor/osm_editor.hpp" class Index; diff --git a/search/retrieval.cpp b/search/retrieval.cpp index 5c33fc3d3d..ac86b8d175 100644 --- a/search/retrieval.cpp +++ b/search/retrieval.cpp @@ -8,12 +8,13 @@ #include "search/search_trie.hpp" #include "search/token_slice.hpp" +#include "editor/osm_editor.hpp" + #include "indexer/classificator.hpp" #include "indexer/feature.hpp" #include "indexer/feature_algo.hpp" #include "indexer/feature_data.hpp" #include "indexer/index.hpp" -#include "indexer/osm_editor.hpp" #include "indexer/scales.hpp" #include "indexer/search_delimiters.hpp" #include "indexer/search_string_utils.hpp" diff --git a/search/search_integration_tests/CMakeLists.txt b/search/search_integration_tests/CMakeLists.txt index 4e089a4277..03c5edc2ed 100644 --- a/search/search_integration_tests/CMakeLists.txt +++ b/search/search_integration_tests/CMakeLists.txt @@ -20,6 +20,7 @@ omim_add_test(${PROJECT_NAME} ${SRC}) omim_link_libraries( ${PROJECT_NAME} search_tests_support + editor_tests_support indexer_tests_support generator_tests_support generator @@ -28,8 +29,8 @@ omim_link_libraries( search storage stats_client - indexer editor + indexer platform mwm_diff bsdiff diff --git a/search/search_integration_tests/helpers.hpp b/search/search_integration_tests/helpers.hpp index b2456918cd..a14996c91b 100644 --- a/search/search_integration_tests/helpers.hpp +++ b/search/search_integration_tests/helpers.hpp @@ -5,8 +5,6 @@ #include "search/search_tests_support/test_search_request.hpp" #include "search/search_tests_support/test_with_custom_mwms.hpp" -#include "indexer/indexer_tests_support/helpers.hpp" - #include "generator/generator_tests_support/test_feature.hpp" #include "geometry/rect2d.hpp" diff --git a/search/search_quality/assessment_tool/CMakeLists.txt b/search/search_quality/assessment_tool/CMakeLists.txt index 8e9b387c3c..85399db1d4 100644 --- a/search/search_quality/assessment_tool/CMakeLists.txt +++ b/search/search_quality/assessment_tool/CMakeLists.txt @@ -53,9 +53,9 @@ omim_link_libraries( partners_api local_ads kml + editor indexer platform - editor mwm_diff bsdiff geometry diff --git a/search/search_quality/features_collector_tool/CMakeLists.txt b/search/search_quality/features_collector_tool/CMakeLists.txt index 4889eb81a7..df78b98f24 100644 --- a/search/search_quality/features_collector_tool/CMakeLists.txt +++ b/search/search_quality/features_collector_tool/CMakeLists.txt @@ -12,8 +12,8 @@ omim_link_libraries( search search_quality storage - indexer editor + indexer platform mwm_diff bsdiff diff --git a/search/search_quality/search_quality_tool/CMakeLists.txt b/search/search_quality/search_quality_tool/CMakeLists.txt index 6c2eacb4c0..67b72f6a95 100644 --- a/search/search_quality/search_quality_tool/CMakeLists.txt +++ b/search/search_quality/search_quality_tool/CMakeLists.txt @@ -13,8 +13,8 @@ omim_link_libraries( search search_quality storage - indexer editor + indexer platform mwm_diff bsdiff diff --git a/search/search_tests/CMakeLists.txt b/search/search_tests/CMakeLists.txt index 29bf341186..752876a55f 100644 --- a/search/search_tests/CMakeLists.txt +++ b/search/search_tests/CMakeLists.txt @@ -35,8 +35,8 @@ omim_link_libraries( indexer_tests_support generator_tests_support search - indexer editor + indexer storage platform geometry diff --git a/search/search_tests_support/test_with_custom_mwms.hpp b/search/search_tests_support/test_with_custom_mwms.hpp index f557c70b77..b5ebc6e1df 100644 --- a/search/search_tests_support/test_with_custom_mwms.hpp +++ b/search/search_tests_support/test_with_custom_mwms.hpp @@ -1,6 +1,7 @@ #pragma once -#include "indexer/indexer_tests_support/helpers.hpp" +#include "editor/editor_tests_support/helpers.hpp" + #include "indexer/indexer_tests_support/test_with_custom_mwms.hpp" #include "search/editor_delegate.hpp" @@ -22,10 +23,10 @@ class TestWithCustomMwms : public indexer::tests_support::TestWithCustomMwms public: TestWithCustomMwms() { - indexer::tests_support::SetUpEditorForTesting(my::make_unique(m_index)); + editor::tests_support::SetUpEditorForTesting(my::make_unique(m_index)); } - ~TestWithCustomMwms() override { indexer::tests_support::TearDownEditorForTesting(); } + ~TestWithCustomMwms() override { editor::tests_support::TearDownEditorForTesting(); } template void EditFeature(FeatureID const & id, EditorFn && fn) @@ -33,7 +34,7 @@ public: Index::FeaturesLoaderGuard loader(m_index, id.m_mwmId); FeatureType ft; CHECK(loader.GetFeatureByIndex(id.m_index, ft), ()); - indexer::tests_support::EditFeature(ft, std::forward(fn)); + editor::tests_support::EditFeature(ft, std::forward(fn)); } }; } // namespace tests_support diff --git a/storage/storage_integration_tests/CMakeLists.txt b/storage/storage_integration_tests/CMakeLists.txt index 2007c20ec5..59eb9320fc 100644 --- a/storage/storage_integration_tests/CMakeLists.txt +++ b/storage/storage_integration_tests/CMakeLists.txt @@ -19,6 +19,7 @@ omim_add_test(${PROJECT_NAME} ${SRC}) omim_link_libraries( ${PROJECT_NAME} + platform_tests_support map drape_frontend routing @@ -33,10 +34,9 @@ omim_link_libraries( partners_api local_ads kml - indexer - platform_tests_support - platform editor + indexer + platform opening_hours mwm_diff bsdiff diff --git a/storage/storage_tests/CMakeLists.txt b/storage/storage_tests/CMakeLists.txt index 34e6c2d679..e4680591b3 100644 --- a/storage/storage_tests/CMakeLists.txt +++ b/storage/storage_tests/CMakeLists.txt @@ -23,21 +23,21 @@ omim_add_test(${PROJECT_NAME} ${SRC}) omim_link_libraries( ${PROJECT_NAME} + platform_tests_support + generator_tests_support drape_frontend map traffic storage drape - generator_tests_support generator search routing routing_common ugc kml - indexer - platform_tests_support editor + indexer oauthcpp platform opening_hours diff --git a/track_analyzing/track_analyzer/CMakeLists.txt b/track_analyzing/track_analyzer/CMakeLists.txt index 7b71a68c3b..6ab2fcf87b 100644 --- a/track_analyzing/track_analyzer/CMakeLists.txt +++ b/track_analyzing/track_analyzer/CMakeLists.txt @@ -24,8 +24,8 @@ omim_link_libraries( routing_common storage kml - indexer editor + indexer platform mwm_diff bsdiff diff --git a/ugc/ugc_tests/CMakeLists.txt b/ugc/ugc_tests/CMakeLists.txt index 5b30f69892..c876856140 100644 --- a/ugc/ugc_tests/CMakeLists.txt +++ b/ugc/ugc_tests/CMakeLists.txt @@ -21,9 +21,9 @@ omim_link_libraries( routing routing_common ugc + editor indexer storage - editor platform coding geometry diff --git a/xcode/editor/editor.xcodeproj/project.pbxproj b/xcode/editor/editor.xcodeproj/project.pbxproj index 0ff48b2e54..c9d98cd8d5 100644 --- a/xcode/editor/editor.xcodeproj/project.pbxproj +++ b/xcode/editor/editor.xcodeproj/project.pbxproj @@ -66,6 +66,15 @@ 671555FC20BDC6FA002BA3B4 /* libtess2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671555FB20BDC6FA002BA3B4 /* libtess2.a */; }; 671555FE20BDC728002BA3B4 /* librouting_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671555FD20BDC728002BA3B4 /* librouting_common.a */; }; 6715560020BDC741002BA3B4 /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671555FF20BDC741002BA3B4 /* libsuccinct.a */; }; + 6715560520BEC332002BA3B4 /* osm_editor.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6715560120BEC330002BA3B4 /* osm_editor.hpp */; }; + 6715560620BEC332002BA3B4 /* edits_migration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6715560220BEC331002BA3B4 /* edits_migration.cpp */; }; + 6715560720BEC332002BA3B4 /* osm_editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6715560320BEC331002BA3B4 /* osm_editor.cpp */; }; + 6715560820BEC332002BA3B4 /* edits_migration.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6715560420BEC331002BA3B4 /* edits_migration.hpp */; }; + 6715560A20BEF0A4002BA3B4 /* new_feature_categories_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6715560920BEF0A4002BA3B4 /* new_feature_categories_test.cpp */; }; + 6715564D20BF0292002BA3B4 /* helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6715560C20BF01EE002BA3B4 /* helpers.cpp */; }; + 6715565120BF0F47002BA3B4 /* libeditor_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6715564120BF0267002BA3B4 /* libeditor_tests_support.a */; }; + 6715565420BF0F87002BA3B4 /* new_feature_categories.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6715565220BF0F86002BA3B4 /* new_feature_categories.cpp */; }; + 6715565520BF0F87002BA3B4 /* new_feature_categories.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6715565320BF0F87002BA3B4 /* new_feature_categories.hpp */; }; F60F02EE1C92CBF1003A0AF6 /* editor_notes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F60F02EC1C92CBF1003A0AF6 /* editor_notes.cpp */; }; F60F02EF1C92CBF1003A0AF6 /* editor_notes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F60F02ED1C92CBF1003A0AF6 /* editor_notes.hpp */; }; /* End PBXBuildFile section */ @@ -134,6 +143,16 @@ 671555FB20BDC6FA002BA3B4 /* libtess2.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtess2.a; sourceTree = BUILT_PRODUCTS_DIR; }; 671555FD20BDC728002BA3B4 /* librouting_common.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = librouting_common.a; sourceTree = BUILT_PRODUCTS_DIR; }; 671555FF20BDC741002BA3B4 /* libsuccinct.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsuccinct.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 6715560120BEC330002BA3B4 /* osm_editor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_editor.hpp; sourceTree = ""; }; + 6715560220BEC331002BA3B4 /* edits_migration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = edits_migration.cpp; sourceTree = ""; }; + 6715560320BEC331002BA3B4 /* osm_editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_editor.cpp; sourceTree = ""; }; + 6715560420BEC331002BA3B4 /* edits_migration.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = edits_migration.hpp; sourceTree = ""; }; + 6715560920BEF0A4002BA3B4 /* new_feature_categories_test.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = new_feature_categories_test.cpp; sourceTree = ""; }; + 6715560C20BF01EE002BA3B4 /* helpers.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = helpers.cpp; sourceTree = ""; }; + 6715560D20BF01EE002BA3B4 /* helpers.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = helpers.hpp; sourceTree = ""; }; + 6715564120BF0267002BA3B4 /* libeditor_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libeditor_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 6715565220BF0F86002BA3B4 /* new_feature_categories.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = new_feature_categories.cpp; sourceTree = ""; }; + 6715565320BF0F87002BA3B4 /* new_feature_categories.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = new_feature_categories.hpp; sourceTree = ""; }; F60F02EC1C92CBF1003A0AF6 /* editor_notes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editor_notes.cpp; sourceTree = ""; }; F60F02ED1C92CBF1003A0AF6 /* editor_notes.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = editor_notes.hpp; sourceTree = ""; }; /* End PBXFileReference section */ @@ -150,6 +169,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 6715565120BF0F47002BA3B4 /* libeditor_tests_support.a in Frameworks */, 6715560020BDC741002BA3B4 /* libsuccinct.a in Frameworks */, 671555FE20BDC728002BA3B4 /* librouting_common.a in Frameworks */, 671555FA20BDC6FA002BA3B4 /* librouting.a in Frameworks */, @@ -177,6 +197,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 6715563E20BF0267002BA3B4 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -186,10 +213,11 @@ 3496AC041DC204B700C5DDBA /* editor.config */, 34F5586E1DBF49B200A4FC11 /* common-debug.xcconfig */, 34F5586F1DBF49B200A4FC11 /* common-release.xcconfig */, - 3496ABD01DC2032800C5DDBA /* editor_tests */, 341138731C15AE02002E3B3E /* Editor */, - 3411386C1C15AD97002E3B3E /* Products */, + 3496ABD01DC2032800C5DDBA /* editor_tests */, + 6715560B20BF00C8002BA3B4 /* editor_tests_support */, 3496ABEA1DC2041800C5DDBA /* Frameworks */, + 3411386C1C15AD97002E3B3E /* Products */, ); sourceTree = ""; }; @@ -198,6 +226,7 @@ children = ( 3411386B1C15AD97002E3B3E /* libeditor.a */, 3496ABB91DC2031900C5DDBA /* editor_tests.app */, + 6715564120BF0267002BA3B4 /* libeditor_tests_support.a */, ); name = Products; sourceTree = ""; @@ -215,12 +244,18 @@ F60F02ED1C92CBF1003A0AF6 /* editor_notes.hpp */, 3D489BED1D4F67E10052AA38 /* editor_storage.cpp */, 3D489BEE1D4F67E10052AA38 /* editor_storage.hpp */, + 6715560220BEC331002BA3B4 /* edits_migration.cpp */, + 6715560420BEC331002BA3B4 /* edits_migration.hpp */, 3D052486200F62ED00F24998 /* feature_matcher.cpp */, 3D052485200F62ED00F24998 /* feature_matcher.hpp */, + 6715565220BF0F86002BA3B4 /* new_feature_categories.cpp */, + 6715565320BF0F87002BA3B4 /* new_feature_categories.hpp */, 341138741C15AE42002E3B3E /* opening_hours_ui.cpp */, 341138751C15AE42002E3B3E /* opening_hours_ui.hpp */, 340C20DC1C3E4DFD00111D22 /* osm_auth.cpp */, 340C20DD1C3E4DFD00111D22 /* osm_auth.hpp */, + 6715560320BEC331002BA3B4 /* osm_editor.cpp */, + 6715560120BEC330002BA3B4 /* osm_editor.hpp */, 34FFB34A1C316A7600BFF6C3 /* server_api.cpp */, 34FFB34B1C316A7600BFF6C3 /* server_api.hpp */, 341138761C15AE42002E3B3E /* ui2oh.cpp */, @@ -250,6 +285,7 @@ 3496ABD61DC2034900C5DDBA /* ui2oh_test.cpp */, 3496ABD71DC2034900C5DDBA /* user_stats_test.cpp */, 3496ABD81DC2034900C5DDBA /* xml_feature_test.cpp */, + 6715560920BEF0A4002BA3B4 /* new_feature_categories_test.cpp */, ); name = editor_tests; path = ../../editor/editor_tests; @@ -285,6 +321,16 @@ name = Frameworks; sourceTree = ""; }; + 6715560B20BF00C8002BA3B4 /* editor_tests_support */ = { + isa = PBXGroup; + children = ( + 6715560C20BF01EE002BA3B4 /* helpers.cpp */, + 6715560D20BF01EE002BA3B4 /* helpers.hpp */, + ); + name = editor_tests_support; + path = ../../editor/editor_tests_support; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -299,8 +345,11 @@ 347C71291C295B1100BE9208 /* xml_feature.hpp in Headers */, 34583BC01C8854C100F94664 /* yes_no_unknown.hpp in Headers */, 340C20DF1C3E4DFD00111D22 /* osm_auth.hpp in Headers */, + 6715560520BEC332002BA3B4 /* osm_editor.hpp in Headers */, 3D3058751D707DBE004AC712 /* config_loader.hpp in Headers */, 34527C521C89B1770015050E /* editor_config.hpp in Headers */, + 6715565520BF0F87002BA3B4 /* new_feature_categories.hpp in Headers */, + 6715560820BEC332002BA3B4 /* edits_migration.hpp in Headers */, 3D052487200F62EE00F24998 /* feature_matcher.hpp in Headers */, 3411387B1C15AE42002E3B3E /* ui2oh.hpp in Headers */, 3441CE491CFC1D3C00CF30D4 /* user_stats.hpp in Headers */, @@ -308,6 +357,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 6715563F20BF0267002BA3B4 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -345,6 +401,23 @@ productReference = 3496ABB91DC2031900C5DDBA /* editor_tests.app */; productType = "com.apple.product-type.application"; }; + 6715564020BF0267002BA3B4 /* editor_tests_support */ = { + isa = PBXNativeTarget; + buildConfigurationList = 6715564920BF0267002BA3B4 /* Build configuration list for PBXNativeTarget "editor_tests_support" */; + buildPhases = ( + 6715563D20BF0267002BA3B4 /* Sources */, + 6715563E20BF0267002BA3B4 /* Frameworks */, + 6715563F20BF0267002BA3B4 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = editor_tests_support; + productName = editor_tests_support; + productReference = 6715564120BF0267002BA3B4 /* libeditor_tests_support.a */; + productType = "com.apple.product-type.library.static"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -361,6 +434,9 @@ CreatedOnToolsVersion = 8.0; ProvisioningStyle = Automatic; }; + 6715564020BF0267002BA3B4 = { + CreatedOnToolsVersion = 9.3.1; + }; }; }; buildConfigurationList = 341138661C15AD97002E3B3E /* Build configuration list for PBXProject "editor" */; @@ -378,6 +454,7 @@ targets = ( 3411386A1C15AD97002E3B3E /* editor */, 3496ABB81DC2031900C5DDBA /* editor_tests */, + 6715564020BF0267002BA3B4 /* editor_tests_support */, ); }; /* End PBXProject section */ @@ -402,16 +479,19 @@ 347C71281C295B1100BE9208 /* xml_feature.cpp in Sources */, 341138781C15AE42002E3B3E /* opening_hours_ui.cpp in Sources */, 340C20DE1C3E4DFD00111D22 /* osm_auth.cpp in Sources */, + 6715560720BEC332002BA3B4 /* osm_editor.cpp in Sources */, 3D052488200F62EE00F24998 /* feature_matcher.cpp in Sources */, 3D489BEF1D4F67E10052AA38 /* editor_storage.cpp in Sources */, 3411387A1C15AE42002E3B3E /* ui2oh.cpp in Sources */, 340DC8291C4E71E500EAA2CC /* changeset_wrapper.cpp in Sources */, 3D3058741D707DBE004AC712 /* config_loader.cpp in Sources */, 3441CE481CFC1D3C00CF30D4 /* user_stats.cpp in Sources */, + 6715560620BEC332002BA3B4 /* edits_migration.cpp in Sources */, 34527C511C89B1770015050E /* editor_config.cpp in Sources */, 34FFB34C1C316A7600BFF6C3 /* server_api.cpp in Sources */, 3D05248C200F630000F24998 /* match_by_geometry_test.cpp in Sources */, F60F02EE1C92CBF1003A0AF6 /* editor_notes.cpp in Sources */, + 6715565420BF0F87002BA3B4 /* new_feature_categories.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -422,6 +502,7 @@ 3496ABE11DC2035800C5DDBA /* config_loader_test.cpp in Sources */, 671555E820BDC5D3002BA3B4 /* osm_editor_test.cpp in Sources */, 3496ABE21DC2035800C5DDBA /* editor_config_test.cpp in Sources */, + 6715560A20BEF0A4002BA3B4 /* new_feature_categories_test.cpp in Sources */, 3496ABE31DC2035800C5DDBA /* editor_notes_test.cpp in Sources */, 3496ABE41DC2035800C5DDBA /* opening_hours_ui_test.cpp in Sources */, 3496AC031DC2048E00C5DDBA /* testingmain.cpp in Sources */, @@ -431,6 +512,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 6715563D20BF0267002BA3B4 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 6715564D20BF0292002BA3B4 /* helpers.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ @@ -482,6 +571,30 @@ }; name = Release; }; + 6715564A20BF0267002BA3B4 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 6715564B20BF0267002BA3B4 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; + 6715564C20BF0267002BA3B4 /* Production Full */ = { + isa = XCBuildConfiguration; + buildSettings = { + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = "Production Full"; + }; A8E541471F9FBD8400A1B8FA /* Production Full */ = { isa = XCBuildConfiguration; baseConfigurationReference = 34F5586F1DBF49B200A4FC11 /* common-release.xcconfig */; @@ -539,6 +652,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 6715564920BF0267002BA3B4 /* Build configuration list for PBXNativeTarget "editor_tests_support" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 6715564A20BF0267002BA3B4 /* Debug */, + 6715564B20BF0267002BA3B4 /* Release */, + 6715564C20BF0267002BA3B4 /* Production Full */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = 341138631C15AD97002E3B3E /* Project object */; diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj index ce449cfeb7..a4218bdd60 100644 --- a/xcode/indexer/indexer.xcodeproj/project.pbxproj +++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj @@ -38,14 +38,10 @@ 3496ABAC1DC1FA9E00C5DDBA /* countries_obsolete.txt in Resources */ = {isa = PBXBuildFile; fileRef = 3496ABA71DC1FA9E00C5DDBA /* countries_obsolete.txt */; }; 3496ABAD1DC1FA9E00C5DDBA /* countries.txt in Resources */ = {isa = PBXBuildFile; fileRef = 3496ABA81DC1FA9E00C5DDBA /* countries.txt */; }; 3496ABAF1DC1FAC900C5DDBA /* minsk-pass.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 3496ABAE1DC1FAC900C5DDBA /* minsk-pass.mwm */; }; - 34AF87E61DBE565F00E5E7DC /* helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34AF87E41DBE565F00E5E7DC /* helpers.hpp */; }; 34AF87E71DBE567C00E5E7DC /* libindexer_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34AF87D71DBE561400E5E7DC /* libindexer_tests_support.a */; }; - 34AF87E81DBE570200E5E7DC /* helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34AF87E31DBE565F00E5E7DC /* helpers.cpp */; }; 39F376C0207D32450058E8E0 /* cities_boundaries_serdes_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39F376BE207D32410058E8E0 /* cities_boundaries_serdes_tests.cpp */; }; 39F376C3207D32510058E8E0 /* scale_index_reading_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39F376C1207D324E0058E8E0 /* scale_index_reading_tests.cpp */; }; - 3D0AEAF81FBAF9E900AD042B /* test_with_classificator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D0AEAF41FBAF9E900AD042B /* test_with_classificator.cpp */; }; 3D0AEAF91FBAF9E900AD042B /* test_with_custom_mwms.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D0AEAF51FBAF9E900AD042B /* test_with_custom_mwms.hpp */; }; - 3D0AEAFA1FBAF9E900AD042B /* test_with_custom_mwms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D0AEAF61FBAF9E900AD042B /* test_with_custom_mwms.cpp */; }; 3D0AEAFB1FBAF9E900AD042B /* test_with_classificator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D0AEAF71FBAF9E900AD042B /* test_with_classificator.hpp */; }; 3D452AFA1EE6D9F5009EAB9B /* wheelchair_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D452AF71EE6D9F5009EAB9B /* wheelchair_tests.cpp */; }; 3D452AFB1EE6D9F5009EAB9B /* feature_names_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D452AF81EE6D9F5009EAB9B /* feature_names_test.cpp */; }; @@ -89,8 +85,6 @@ 56C74C1D1C749E4700B71B9F /* categories_holder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C131C749E4700B71B9F /* categories_holder.cpp */; }; 56C74C1E1C749E4700B71B9F /* categories_holder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56C74C141C749E4700B71B9F /* categories_holder.hpp */; }; 56C74C1F1C749E4700B71B9F /* displacement_manager.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56C74C151C749E4700B71B9F /* displacement_manager.hpp */; }; - 56C74C201C749E4700B71B9F /* edits_migration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C161C749E4700B71B9F /* edits_migration.cpp */; }; - 56C74C211C749E4700B71B9F /* edits_migration.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56C74C171C749E4700B71B9F /* edits_migration.hpp */; }; 56C74C221C749E4700B71B9F /* search_delimiters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C181C749E4700B71B9F /* search_delimiters.cpp */; }; 56C74C231C749E4700B71B9F /* search_delimiters.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56C74C191C749E4700B71B9F /* search_delimiters.hpp */; }; 56C74C241C749E4700B71B9F /* search_string_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C1A1C749E4700B71B9F /* search_string_utils.cpp */; }; @@ -139,8 +133,9 @@ 670EE56C1B60033A001E8064 /* features_vector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670EE56A1B60033A001E8064 /* features_vector.cpp */; }; 670EE56D1B60033A001E8064 /* unique_index.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670EE56B1B60033A001E8064 /* unique_index.hpp */; }; 671555E220BDA63C002BA3B4 /* libgenerator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671555E120BDA63C002BA3B4 /* libgenerator.a */; }; - 671555E320BDC40B002BA3B4 /* osm_editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340DF9CF1C1FF04D00B5C7EC /* osm_editor.cpp */; }; 671555E520BDC523002BA3B4 /* libeditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671555E420BDC523002BA3B4 /* libeditor.a */; }; + 6715564F20BF0EFE002BA3B4 /* test_with_classificator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D0AEAF41FBAF9E900AD042B /* test_with_classificator.cpp */; }; + 6715565020BF0F04002BA3B4 /* test_with_custom_mwms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D0AEAF61FBAF9E900AD042B /* test_with_custom_mwms.cpp */; }; 6726C1D11A49DAAC005EEA39 /* feature_meta.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1CF1A49DAAC005EEA39 /* feature_meta.cpp */; }; 6726C1D21A49DAAC005EEA39 /* feature_meta.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6726C1D01A49DAAC005EEA39 /* feature_meta.hpp */; }; 674125131B4C02F100A3E828 /* map_style_reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674125101B4C02F100A3E828 /* map_style_reader.cpp */; }; @@ -206,7 +201,6 @@ 6758AED21BB4413000C26E27 /* drules_selector_parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6758AECE1BB4413000C26E27 /* drules_selector_parser.hpp */; }; 6758AED31BB4413000C26E27 /* drules_selector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6758AECF1BB4413000C26E27 /* drules_selector.cpp */; }; 6758AED41BB4413000C26E27 /* drules_selector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6758AED01BB4413000C26E27 /* drules_selector.hpp */; }; - 67BC92F21D21476500A4A378 /* osm_editor.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BC92EE1D21476500A4A378 /* osm_editor.hpp */; }; 67BC92F31D21476500A4A378 /* string_set.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BC92EF1D21476500A4A378 /* string_set.hpp */; }; 67BC92F41D21476500A4A378 /* string_slice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67BC92F01D21476500A4A378 /* string_slice.cpp */; }; 67BC92F51D21476500A4A378 /* string_slice.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BC92F11D21476500A4A378 /* string_slice.hpp */; }; @@ -215,8 +209,6 @@ E906DE3C1CF44934004C4F5E /* postcodes_matcher.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E906DE3A1CF44934004C4F5E /* postcodes_matcher.hpp */; }; F61F83061E4B187500B37B7A /* road_shields_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F61F83041E4B187500B37B7A /* road_shields_parser.cpp */; }; F61F83071E4B187500B37B7A /* road_shields_parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F61F83051E4B187500B37B7A /* road_shields_parser.hpp */; }; - F6381BF91CD26C9C004CA943 /* new_feature_categories.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6381BF71CD26C9C004CA943 /* new_feature_categories.cpp */; }; - F6381BFA1CD26C9C004CA943 /* new_feature_categories.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6381BF81CD26C9C004CA943 /* new_feature_categories.hpp */; }; F6DF5F2D1CD0FC9D00A87154 /* categories_index.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6DF5F2C1CD0FC9D00A87154 /* categories_index.cpp */; }; F6DF5F311CD0FD9A00A87154 /* categories_index.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6DF5F301CD0FD9A00A87154 /* categories_index.hpp */; }; F6F1DABE1F13D8B4006A69B7 /* ftraits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6F1DABD1F13D8B4006A69B7 /* ftraits.hpp */; }; @@ -235,7 +227,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 340DF9CF1C1FF04D00B5C7EC /* osm_editor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = osm_editor.cpp; sourceTree = ""; }; 34583BC11C88552100F94664 /* cuisines.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cuisines.cpp; sourceTree = ""; }; 34583BC21C88552100F94664 /* cuisines.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cuisines.hpp; sourceTree = ""; }; 34583BC31C88552100F94664 /* editable_map_object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editable_map_object.cpp; sourceTree = ""; }; @@ -271,8 +262,6 @@ 34AF87D11DBE540700E5E7DC /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; 34AF87D21DBE540700E5E7DC /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; 34AF87D71DBE561400E5E7DC /* libindexer_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libindexer_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 34AF87E31DBE565F00E5E7DC /* helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = helpers.cpp; sourceTree = ""; }; - 34AF87E41DBE565F00E5E7DC /* helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = helpers.hpp; sourceTree = ""; }; 39F376BE207D32410058E8E0 /* cities_boundaries_serdes_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cities_boundaries_serdes_tests.cpp; sourceTree = ""; }; 39F376C1207D324E0058E8E0 /* scale_index_reading_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scale_index_reading_tests.cpp; sourceTree = ""; }; 3D0AEAF41FBAF9E900AD042B /* test_with_classificator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_with_classificator.cpp; sourceTree = ""; }; @@ -321,8 +310,6 @@ 56C74C131C749E4700B71B9F /* categories_holder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = categories_holder.cpp; sourceTree = ""; }; 56C74C141C749E4700B71B9F /* categories_holder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = categories_holder.hpp; sourceTree = ""; }; 56C74C151C749E4700B71B9F /* displacement_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = displacement_manager.hpp; sourceTree = ""; }; - 56C74C161C749E4700B71B9F /* edits_migration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = edits_migration.cpp; sourceTree = ""; }; - 56C74C171C749E4700B71B9F /* edits_migration.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = edits_migration.hpp; sourceTree = ""; }; 56C74C181C749E4700B71B9F /* search_delimiters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_delimiters.cpp; sourceTree = ""; }; 56C74C191C749E4700B71B9F /* search_delimiters.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_delimiters.hpp; sourceTree = ""; }; 56C74C1A1C749E4700B71B9F /* search_string_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_string_utils.cpp; sourceTree = ""; }; @@ -441,7 +428,6 @@ 6758AECE1BB4413000C26E27 /* drules_selector_parser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = drules_selector_parser.hpp; sourceTree = ""; }; 6758AECF1BB4413000C26E27 /* drules_selector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drules_selector.cpp; sourceTree = ""; }; 6758AED01BB4413000C26E27 /* drules_selector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = drules_selector.hpp; sourceTree = ""; }; - 67BC92EE1D21476500A4A378 /* osm_editor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_editor.hpp; sourceTree = ""; }; 67BC92EF1D21476500A4A378 /* string_set.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = string_set.hpp; sourceTree = ""; }; 67BC92F01D21476500A4A378 /* string_slice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_slice.cpp; sourceTree = ""; }; 67BC92F11D21476500A4A378 /* string_slice.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = string_slice.hpp; sourceTree = ""; }; @@ -451,8 +437,6 @@ E906DE3A1CF44934004C4F5E /* postcodes_matcher.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = postcodes_matcher.hpp; sourceTree = ""; }; F61F83041E4B187500B37B7A /* road_shields_parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = road_shields_parser.cpp; sourceTree = ""; }; F61F83051E4B187500B37B7A /* road_shields_parser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = road_shields_parser.hpp; sourceTree = ""; }; - F6381BF71CD26C9C004CA943 /* new_feature_categories.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = new_feature_categories.cpp; sourceTree = ""; }; - F6381BF81CD26C9C004CA943 /* new_feature_categories.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = new_feature_categories.hpp; sourceTree = ""; }; F6DF5F2C1CD0FC9D00A87154 /* categories_index.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = categories_index.cpp; sourceTree = ""; }; F6DF5F301CD0FD9A00A87154 /* categories_index.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = categories_index.hpp; sourceTree = ""; }; F6F1DABD1F13D8B4006A69B7 /* ftraits.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ftraits.hpp; sourceTree = ""; }; @@ -539,8 +523,6 @@ 3D0AEAF71FBAF9E900AD042B /* test_with_classificator.hpp */, 3D0AEAF61FBAF9E900AD042B /* test_with_custom_mwms.cpp */, 3D0AEAF51FBAF9E900AD042B /* test_with_custom_mwms.hpp */, - 34AF87E31DBE565F00E5E7DC /* helpers.cpp */, - 34AF87E41DBE565F00E5E7DC /* helpers.hpp */, ); name = indexer_tests_support; path = ../../indexer/indexer_tests_support; @@ -710,8 +692,6 @@ 675340BD1A3F540F00A0A8C3 /* drules_struct.proto */, 34583BC31C88552100F94664 /* editable_map_object.cpp */, 34583BC41C88552100F94664 /* editable_map_object.hpp */, - 56C74C161C749E4700B71B9F /* edits_migration.cpp */, - 56C74C171C749E4700B71B9F /* edits_migration.hpp */, 4099F6471FC71429002A7B05 /* fake_feature_ids.cpp */, 4099F6481FC7142A002A7B05 /* fake_feature_ids.hpp */, 675340BE1A3F540F00A0A8C3 /* feature_algo.cpp */, @@ -769,10 +749,6 @@ 674125121B4C02F100A3E828 /* map_style.hpp */, 675340E41A3F540F00A0A8C3 /* mwm_set.cpp */, 675340E51A3F540F00A0A8C3 /* mwm_set.hpp */, - F6381BF71CD26C9C004CA943 /* new_feature_categories.cpp */, - F6381BF81CD26C9C004CA943 /* new_feature_categories.hpp */, - 340DF9CF1C1FF04D00B5C7EC /* osm_editor.cpp */, - 67BC92EE1D21476500A4A378 /* osm_editor.hpp */, E906DE391CF44934004C4F5E /* postcodes_matcher.cpp */, E906DE3A1CF44934004C4F5E /* postcodes_matcher.hpp */, 347F33721C454242009758CC /* rank_table.cpp */, @@ -841,7 +817,6 @@ 34664CF51D49FEC1003D7096 /* feature_altitude.hpp in Headers */, 675341241A3F540F00A0A8C3 /* feature_visibility.hpp in Headers */, 6753411D1A3F540F00A0A8C3 /* feature_loader_base.hpp in Headers */, - F6381BFA1CD26C9C004CA943 /* new_feature_categories.hpp in Headers */, 56C74C231C749E4700B71B9F /* search_delimiters.hpp in Headers */, 675341131A3F540F00A0A8C3 /* feature_algo.hpp in Headers */, 40009064201F5CB000963E18 /* locality_index_builder.hpp in Headers */, @@ -875,7 +850,6 @@ 6758AED41BB4413000C26E27 /* drules_selector.hpp in Headers */, 3D0AEAF91FBAF9E900AD042B /* test_with_custom_mwms.hpp in Headers */, 3D0AEAFB1FBAF9E900AD042B /* test_with_classificator.hpp in Headers */, - 56C74C211C749E4700B71B9F /* edits_migration.hpp in Headers */, 6753412F1A3F540F00A0A8C3 /* index_builder.hpp in Headers */, 456E1B1A1F90E5B7009C32E1 /* ftypes_sponsored.hpp in Headers */, 675341411A3F540F00A0A8C3 /* scales.hpp in Headers */, @@ -902,11 +876,9 @@ 34583BCC1C88552100F94664 /* map_object.hpp in Headers */, 456E1B1B1F90E5B7009C32E1 /* city_boundary.hpp in Headers */, 34664CF41D49FEC1003D7096 /* altitude_loader.hpp in Headers */, - 67BC92F21D21476500A4A378 /* osm_editor.hpp in Headers */, 675341081A3F540F00A0A8C3 /* data_factory.hpp in Headers */, 6753410A1A3F540F00A0A8C3 /* data_header.hpp in Headers */, 6753411B1A3F540F00A0A8C3 /* feature_impl.hpp in Headers */, - 34AF87E61DBE565F00E5E7DC /* helpers.hpp in Headers */, 675341111A3F540F00A0A8C3 /* drules_struct.pb.h in Headers */, 4099F64A1FC7142A002A7B05 /* fake_feature_ids.hpp in Headers */, ); @@ -1036,7 +1008,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 34AF87E81DBE570200E5E7DC /* helpers.cpp in Sources */, + 6715565020BF0F04002BA3B4 /* test_with_custom_mwms.cpp in Sources */, + 6715564F20BF0EFE002BA3B4 /* test_with_classificator.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1080,7 +1053,6 @@ files = ( 56C74C241C749E4700B71B9F /* search_string_utils.cpp in Sources */, 3D928F671D50F9FE001670E0 /* index_helpers.cpp in Sources */, - 3D0AEAFA1FBAF9E900AD042B /* test_with_custom_mwms.cpp in Sources */, 40009066201F5CB000963E18 /* locality_index_builder.cpp in Sources */, 67F183731BD4FCF500AB1840 /* map_style.cpp in Sources */, 6758AED31BB4413000C26E27 /* drules_selector.cpp in Sources */, @@ -1092,7 +1064,6 @@ 6753410D1A3F540F00A0A8C3 /* drawing_rules.cpp in Sources */, 675341301A3F540F00A0A8C3 /* index.cpp in Sources */, 34664CF61D49FEC1003D7096 /* centers_table.cpp in Sources */, - 56C74C201C749E4700B71B9F /* edits_migration.cpp in Sources */, 6753414D1A3F540F00A0A8C3 /* types_mapping.cpp in Sources */, 34583BC71C88552100F94664 /* cuisines.cpp in Sources */, 3D452AFA1EE6D9F5009EAB9B /* wheelchair_tests.cpp in Sources */, @@ -1116,14 +1087,12 @@ 3D452AFC1EE6D9F5009EAB9B /* centers_table_test.cpp in Sources */, 34664CF31D49FEC1003D7096 /* altitude_loader.cpp in Sources */, 6726C1D11A49DAAC005EEA39 /* feature_meta.cpp in Sources */, - 3D0AEAF81FBAF9E900AD042B /* test_with_classificator.cpp in Sources */, 6753411C1A3F540F00A0A8C3 /* feature_loader_base.cpp in Sources */, 67BC92F41D21476500A4A378 /* string_slice.cpp in Sources */, 675341071A3F540F00A0A8C3 /* data_factory.cpp in Sources */, 34583BCB1C88552100F94664 /* map_object.cpp in Sources */, 6753412E1A3F540F00A0A8C3 /* index_builder.cpp in Sources */, 675341011A3F540F00A0A8C3 /* classificator_loader.cpp in Sources */, - F6381BF91CD26C9C004CA943 /* new_feature_categories.cpp in Sources */, 456E1B191F90E5B7009C32E1 /* ftypes_sponsored.cpp in Sources */, F6DF5F2D1CD0FC9D00A87154 /* categories_index.cpp in Sources */, 674125131B4C02F100A3E828 /* map_style_reader.cpp in Sources */, @@ -1133,7 +1102,6 @@ 675341181A3F540F00A0A8C3 /* feature_decl.cpp in Sources */, 6753410B1A3F540F00A0A8C3 /* drawing_rule_def.cpp in Sources */, 670C615B1AB0691900C38A8C /* features_offsets_table.cpp in Sources */, - 671555E320BDC40B002BA3B4 /* osm_editor.cpp in Sources */, 675341281A3F540F00A0A8C3 /* ftypes_matcher.cpp in Sources */, 675341101A3F540F00A0A8C3 /* drules_struct.pb.cc in Sources */, 6758AED11BB4413000C26E27 /* drules_selector_parser.cpp in Sources */, diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj index afe3a66f81..834ba85901 100644 --- a/xcode/search/search.xcodeproj/project.pbxproj +++ b/xcode/search/search.xcodeproj/project.pbxproj @@ -28,6 +28,12 @@ 3453BD591DAF91C100380ECB /* emitter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3453BD561DAF91C100380ECB /* emitter.hpp */; }; 3453BD5A1DAF91C100380ECB /* hotels_filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3453BD571DAF91C100380ECB /* hotels_filter.cpp */; }; 3453BD5B1DAF91C100380ECB /* hotels_filter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3453BD581DAF91C100380ECB /* hotels_filter.hpp */; }; + 34586B891DCB1E8300CF7FC9 /* hotels_filter_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34586B821DCB1E8300CF7FC9 /* hotels_filter_test.cpp */; }; + 34586B8A1DCB1E8300CF7FC9 /* house_numbers_matcher_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34586B831DCB1E8300CF7FC9 /* house_numbers_matcher_test.cpp */; }; + 34586B8B1DCB1E8300CF7FC9 /* interval_set_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34586B841DCB1E8300CF7FC9 /* interval_set_test.cpp */; }; + 34586B8C1DCB1E8300CF7FC9 /* locality_scorer_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34586B851DCB1E8300CF7FC9 /* locality_scorer_test.cpp */; }; + 34586B8D1DCB1E8300CF7FC9 /* locality_selector_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34586B861DCB1E8300CF7FC9 /* locality_selector_test.cpp */; }; + 34586B8F1DCB1E8300CF7FC9 /* ranking_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34586B881DCB1E8300CF7FC9 /* ranking_tests.cpp */; }; 3459A7A71E4C4D0200ED235F /* geocoder_locality.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3459A7A51E4C4D0200ED235F /* geocoder_locality.cpp */; }; 3459A7A81E4C4D0200ED235F /* geocoder_locality.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3459A7A61E4C4D0200ED235F /* geocoder_locality.hpp */; }; 345C8DAF1D2D15A50037E3A6 /* cbv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 345C8DA91D2D15A50037E3A6 /* cbv.cpp */; }; @@ -150,6 +156,9 @@ 39B2B9831FB469ED00AB85A1 /* libminizip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 39B2B9841FB469ED00AB85A1 /* libminizip.a */; }; 39BBC13B1F9FD65C009D1687 /* highlighting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39BBC1391F9FD65C009D1687 /* highlighting.cpp */; }; 39BBC13C1F9FD65C009D1687 /* highlighting.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 39BBC13A1F9FD65C009D1687 /* highlighting.hpp */; }; + 39BBC13E1F9FD679009D1687 /* segment_tree_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39BBC13D1F9FD679009D1687 /* segment_tree_tests.cpp */; }; + 39BBC1401F9FD683009D1687 /* point_rect_matcher_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39BBC13F1F9FD683009D1687 /* point_rect_matcher_tests.cpp */; }; + 39BBC1421F9FD68C009D1687 /* highlighting_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39BBC1411F9FD68C009D1687 /* highlighting_tests.cpp */; }; 3D0AEB021FBB102C00AD042B /* libgenerator_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0AEB041FBB102C00AD042B /* libgenerator_tests_support.a */; }; 3D0AEB031FBB102C00AD042B /* libindexer_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0AEB051FBB102C00AD042B /* libindexer_tests_support.a */; }; 3DF37FAA1EA11B380012CB31 /* everywhere_search_callback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DF37FA81EA11B380012CB31 /* everywhere_search_callback.cpp */; }; @@ -169,6 +178,8 @@ 56D5456F1C74A48C00E3719C /* mode.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56D5456D1C74A48C00E3719C /* mode.hpp */; }; 670F88741CE4C032003F68BA /* types_skipper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F88721CE4C032003F68BA /* types_skipper.cpp */; }; 670F88751CE4C032003F68BA /* types_skipper.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670F88731CE4C032003F68BA /* types_skipper.hpp */; }; + 6715565720BF1019002BA3B4 /* libeditor_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6715565620BF1019002BA3B4 /* libeditor_tests_support.a */; }; + 6715565920BF1019002BA3B4 /* libopen_location_code.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6715565820BF1019002BA3B4 /* libopen_location_code.a */; }; 671C621C1AE9227C00076BD0 /* algos_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C62131AE9227C00076BD0 /* algos_tests.cpp */; }; 671C621D1AE9227C00076BD0 /* house_detector_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C62141AE9227C00076BD0 /* house_detector_tests.cpp */; }; 671C621E1AE9227C00076BD0 /* keyword_lang_matcher_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C62151AE9227C00076BD0 /* keyword_lang_matcher_test.cpp */; }; @@ -214,6 +225,7 @@ 67BC92F91D22E45900A4A378 /* ranker.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BC92F71D22E45900A4A378 /* ranker.hpp */; }; A1347D511B8758C3009050FF /* query_saver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1347D4F1B8758C3009050FF /* query_saver.cpp */; }; A1347D521B8758C3009050FF /* query_saver.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A1347D501B8758C3009050FF /* query_saver.hpp */; }; + A1347D551B8758E9009050FF /* query_saver_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1347D541B8758E9009050FF /* query_saver_tests.cpp */; }; F63CE2BB1FBB206800716AD3 /* city_finder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F63CE2BA1FBB206800716AD3 /* city_finder.cpp */; }; F652D8BE1CFDE1E800FC29A0 /* common.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F652D8BA1CFDE1E800FC29A0 /* common.hpp */; }; F652D8BF1CFDE1E800FC29A0 /* engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F652D8BB1CFDE1E800FC29A0 /* engine.cpp */; }; @@ -421,6 +433,8 @@ 56D5456D1C74A48C00E3719C /* mode.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mode.hpp; sourceTree = ""; }; 670F88721CE4C032003F68BA /* types_skipper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = types_skipper.cpp; sourceTree = ""; }; 670F88731CE4C032003F68BA /* types_skipper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = types_skipper.hpp; sourceTree = ""; }; + 6715565620BF1019002BA3B4 /* libeditor_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libeditor_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 6715565820BF1019002BA3B4 /* libopen_location_code.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libopen_location_code.a; sourceTree = BUILT_PRODUCTS_DIR; }; 671C620C1AE9225100076BD0 /* search_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = search_tests.app; sourceTree = BUILT_PRODUCTS_DIR; }; 671C62131AE9227C00076BD0 /* algos_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = algos_tests.cpp; sourceTree = ""; }; 671C62141AE9227C00076BD0 /* house_detector_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = house_detector_tests.cpp; sourceTree = ""; }; @@ -526,6 +540,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 6715565720BF1019002BA3B4 /* libeditor_tests_support.a in Frameworks */, + 6715565920BF1019002BA3B4 /* libopen_location_code.a in Frameworks */, 39AEF86C1FB45E1600943FC9 /* libz.tbd in Frameworks */, 39B2B9831FB469ED00AB85A1 /* libminizip.a in Frameworks */, 39B2B9741FB4687500AB85A1 /* libgflags.a in Frameworks */, @@ -628,7 +644,8 @@ 34F558391DBF2E0E00A4FC11 /* Frameworks */ = { isa = PBXGroup; children = ( - 3925B85520B2FB1B00CEFE4D /* libstorage.a */, + 6715565620BF1019002BA3B4 /* libeditor_tests_support.a */, + 6715565820BF1019002BA3B4 /* libopen_location_code.a */, 1D4E79A92076190D006B7856 /* libopen_location_code.a */, 3D0AEB041FBB102C00AD042B /* libgenerator_tests_support.a */, 3D0AEB051FBB102C00AD042B /* libindexer_tests_support.a */, @@ -1192,9 +1209,11 @@ F652D8FA1CFDE21900FC29A0 /* locality_scorer.cpp in Sources */, 349B65891D4F21E5001798E2 /* lazy_centers_table.cpp in Sources */, F652D8FE1CFDE21900FC29A0 /* mwm_context.cpp in Sources */, + 39BBC13E1F9FD679009D1687 /* segment_tree_tests.cpp in Sources */, F652D8F01CFDE21900FC29A0 /* geocoder.cpp in Sources */, F652D8F21CFDE21900FC29A0 /* geometry_cache.cpp in Sources */, 39B2B9401FB461F800AB85A1 /* interactive_search_test.cpp in Sources */, + 34586B8C1DCB1E8300CF7FC9 /* locality_scorer_test.cpp in Sources */, 34EEAD721E55AE5C00E95575 /* utils.cpp in Sources */, 345C8DB11D2D15A50037E3A6 /* geocoder_context.cpp in Sources */, 39B2B9491FB4620200AB85A1 /* pre_ranker_test.cpp in Sources */, @@ -1202,6 +1221,7 @@ 39BBC13B1F9FD65C009D1687 /* highlighting.cpp in Sources */, F652D8BF1CFDE1E800FC29A0 /* engine.cpp in Sources */, 675346DD1A40560D00A0A8C3 /* approximate_string_match.cpp in Sources */, + 34586B8B1DCB1E8300CF7FC9 /* interval_set_test.cpp in Sources */, 0810EC361D6D9D2E00ABFEE7 /* displayed_categories.cpp in Sources */, 675346E51A40560D00A0A8C3 /* intermediate_result.cpp in Sources */, F652D9021CFDE21900FC29A0 /* pre_ranking_info.cpp in Sources */, @@ -1224,11 +1244,13 @@ F652D8C11CFDE1E800FC29A0 /* features_filter.cpp in Sources */, 39B2B94A1FB4620200AB85A1 /* processor_test.cpp in Sources */, F652D8F81CFDE21900FC29A0 /* intersection_result.cpp in Sources */, + 34586B891DCB1E8300CF7FC9 /* hotels_filter_test.cpp in Sources */, 453C623C2004BABE00467120 /* region_info_getter.cpp in Sources */, F63CE2BB1FBB206800716AD3 /* city_finder.cpp in Sources */, F652D9061CFDE21900FC29A0 /* ranking_info.cpp in Sources */, 39B2B94B1FB4620200AB85A1 /* ranker_test.cpp in Sources */, F652D9001CFDE21900FC29A0 /* nested_rects_cache.cpp in Sources */, + 34586B8D1DCB1E8300CF7FC9 /* locality_selector_test.cpp in Sources */, 344A71381F3DA03200B8DDB8 /* segment_tree.cpp in Sources */, 39B2B94F1FB4620800AB85A1 /* tracer_tests.cpp in Sources */, 3441CE501CFC1D7000CF30D4 /* processor.cpp in Sources */, @@ -1237,12 +1259,16 @@ F652D8EE1CFDE21900FC29A0 /* features_layer.cpp in Sources */, 675346E21A40560D00A0A8C3 /* house_detector.cpp in Sources */, 345C8DAF1D2D15A50037E3A6 /* cbv.cpp in Sources */, + 34586B8A1DCB1E8300CF7FC9 /* house_numbers_matcher_test.cpp in Sources */, F659FC6D1CF4A30B000A06B1 /* pre_ranker.cpp in Sources */, + 34586B8F1DCB1E8300CF7FC9 /* ranking_tests.cpp in Sources */, + 39BBC1401F9FD683009D1687 /* point_rect_matcher_tests.cpp in Sources */, 39B2B94C1FB4620200AB85A1 /* search_edited_features_test.cpp in Sources */, F652D9081CFDE21900FC29A0 /* ranking_utils.cpp in Sources */, 3465B2821D5DE71A0021E14D /* search_params.cpp in Sources */, 347F33241C4540A8009758CC /* retrieval.cpp in Sources */, 3913DA511F9FCC88004AA681 /* suggest.cpp in Sources */, + A1347D551B8758E9009050FF /* query_saver_tests.cpp in Sources */, F652D90B1CFDE21900FC29A0 /* street_vicinity_loader.cpp in Sources */, 3459A7A71E4C4D0200ED235F /* geocoder_locality.cpp in Sources */, 675346ED1A40560D00A0A8C3 /* locality_finder.cpp in Sources */, @@ -1267,6 +1293,7 @@ 3453BD5A1DAF91C100380ECB /* hotels_filter.cpp in Sources */, 345C8DB31D2D15A50037E3A6 /* streets_matcher.cpp in Sources */, 456E1B3E1F9A3C8E009C32E1 /* cities_boundaries_table.cpp in Sources */, + 39BBC1421F9FD68C009D1687 /* highlighting_tests.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };