diff --git a/editor/editor_tests/CMakeLists.txt b/editor/editor_tests/CMakeLists.txt index dab75909d2..cd19f462cf 100644 --- a/editor/editor_tests/CMakeLists.txt +++ b/editor/editor_tests/CMakeLists.txt @@ -8,6 +8,8 @@ set( feature_matcher_test.cpp match_by_geometry_test.cpp opening_hours_ui_test.cpp + osm_editor_test.cpp + osm_editor_test.hpp ui2oh_test.cpp user_stats_test.cpp xml_feature_test.cpp @@ -19,6 +21,19 @@ omim_link_libraries( ${PROJECT_NAME} editor platform_tests_support + generator_tests_support + generator + indexer_tests_support + indexer + routing + routing_common + search + succinct + storage + tess2 + jansson + icu + protobuf platform geometry coding diff --git a/indexer/indexer_tests/osm_editor_test.cpp b/editor/editor_tests/osm_editor_test.cpp similarity index 99% rename from indexer/indexer_tests/osm_editor_test.cpp rename to editor/editor_tests/osm_editor_test.cpp index c27e9bcac2..49f3d6eec8 100644 --- a/indexer/indexer_tests/osm_editor_test.cpp +++ b/editor/editor_tests/osm_editor_test.cpp @@ -1,6 +1,6 @@ #include "testing/testing.hpp" -#include "indexer/indexer_tests/osm_editor_test.hpp" +#include "editor/editor_tests/osm_editor_test.hpp" #include "search/editor_delegate.hpp" @@ -844,7 +844,7 @@ void EditorTest::LoadMapEditsTest() builder.Add(TestCafe(m2::PointD(4.0, 4.0), "Moscow Cafe3", "en")); builder.Add(TestCafe(m2::PointD(6.0, 6.0), "Moscow Cafe4", "en")); - builder.Add(TestPOI(m2::PointD(100, 100), "Corner Post", "default")); + builder.Add(TestPOI(m2::PointD(100, 100), "Corner Post", "default")); }); vector features; @@ -878,7 +878,7 @@ void EditorTest::LoadMapEditsTest() editor.DeleteFeature(ft.GetID()); features.emplace_back(ft.GetID()); }); - + ForEachCafeAtPoint(m_index, m2::PointD(6.0, 6.0), [&features](FeatureType & ft) { SetBuildingLevelsToOne(ft); @@ -951,7 +951,7 @@ void EditorTest::LoadMapEditsTest() m_index.DeregisterMap(m_mwmFiles.back().GetCountryFile()); TEST(RemoveMwm(gbMwmId), ()); - + auto const newGbMwmId = BuildMwm("GB", [](TestMwmBuilder & builder) { builder.Add(TestCafe(m2::PointD(0.0, 0.0), "London Cafe", "en")); @@ -972,7 +972,7 @@ void EditorTest::SaveEditedFeatureTest() { builder.Add(TestCafe(m2::PointD(1.0, 1.0), "London Cafe1", "en")); - builder.Add(TestPOI(m2::PointD(10, 10), "Corner Post", "default")); + builder.Add(TestPOI(m2::PointD(10, 10), "Corner Post", "default")); }); osm::EditableMapObject emo; diff --git a/indexer/indexer_tests/osm_editor_test.hpp b/editor/editor_tests/osm_editor_test.hpp similarity index 100% rename from indexer/indexer_tests/osm_editor_test.hpp rename to editor/editor_tests/osm_editor_test.hpp diff --git a/indexer/indexer_tests/CMakeLists.txt b/indexer/indexer_tests/CMakeLists.txt index 1bd0d5a765..fc980f55c0 100644 --- a/indexer/indexer_tests/CMakeLists.txt +++ b/indexer/indexer_tests/CMakeLists.txt @@ -22,8 +22,6 @@ set( interval_index_test.cpp locality_index_test.cpp mwm_set_test.cpp - osm_editor_test.cpp - osm_editor_test.hpp postcodes_matcher_tests.cpp rank_table_test.cpp scale_index_reading_tests.cpp diff --git a/xcode/editor/editor.xcodeproj/project.pbxproj b/xcode/editor/editor.xcodeproj/project.pbxproj index d071738b68..0ff48b2e54 100644 --- a/xcode/editor/editor.xcodeproj/project.pbxproj +++ b/xcode/editor/editor.xcodeproj/project.pbxproj @@ -53,6 +53,19 @@ 3D3058751D707DBE004AC712 /* config_loader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D3058731D707DBE004AC712 /* config_loader.hpp */; }; 3D489BEF1D4F67E10052AA38 /* editor_storage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D489BED1D4F67E10052AA38 /* editor_storage.cpp */; }; 3D489BF01D4F67E10052AA38 /* editor_storage.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D489BEE1D4F67E10052AA38 /* editor_storage.hpp */; }; + 671555E820BDC5D3002BA3B4 /* osm_editor_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671555E620BDC5D3002BA3B4 /* osm_editor_test.cpp */; }; + 671555EA20BDC649002BA3B4 /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671555E920BDC649002BA3B4 /* libicu.a */; }; + 671555EC20BDC649002BA3B4 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671555EB20BDC649002BA3B4 /* libjansson.a */; }; + 671555EE20BDC649002BA3B4 /* libprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671555ED20BDC649002BA3B4 /* libprotobuf.a */; }; + 671555F020BDC68A002BA3B4 /* libindexer_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671555EF20BDC68A002BA3B4 /* libindexer_tests_support.a */; }; + 671555F220BDC690002BA3B4 /* libgenerator_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671555F120BDC690002BA3B4 /* libgenerator_tests_support.a */; }; + 671555F420BDC6D1002BA3B4 /* libgenerator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671555F320BDC6D1002BA3B4 /* libgenerator.a */; }; + 671555F620BDC6D1002BA3B4 /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671555F520BDC6D1002BA3B4 /* libsearch.a */; }; + 671555F820BDC6D1002BA3B4 /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671555F720BDC6D1002BA3B4 /* libstorage.a */; }; + 671555FA20BDC6FA002BA3B4 /* librouting.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671555F920BDC6FA002BA3B4 /* librouting.a */; }; + 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 */; }; 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 */ @@ -107,6 +120,20 @@ 3D3058731D707DBE004AC712 /* config_loader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = config_loader.hpp; sourceTree = ""; }; 3D489BED1D4F67E10052AA38 /* editor_storage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editor_storage.cpp; sourceTree = ""; }; 3D489BEE1D4F67E10052AA38 /* editor_storage.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = editor_storage.hpp; sourceTree = ""; }; + 671555E620BDC5D3002BA3B4 /* osm_editor_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_editor_test.cpp; sourceTree = ""; }; + 671555E720BDC5D3002BA3B4 /* osm_editor_test.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_editor_test.hpp; sourceTree = ""; }; + 671555E920BDC649002BA3B4 /* libicu.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libicu.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 671555EB20BDC649002BA3B4 /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 671555ED20BDC649002BA3B4 /* libprotobuf.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libprotobuf.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 671555EF20BDC68A002BA3B4 /* libindexer_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libindexer_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 671555F120BDC690002BA3B4 /* libgenerator_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgenerator_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 671555F320BDC6D1002BA3B4 /* libgenerator.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgenerator.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 671555F520BDC6D1002BA3B4 /* libsearch.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsearch.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 671555F720BDC6D1002BA3B4 /* libstorage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libstorage.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 671555F920BDC6FA002BA3B4 /* librouting.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = librouting.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 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; }; 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 */ @@ -123,6 +150,18 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 6715560020BDC741002BA3B4 /* libsuccinct.a in Frameworks */, + 671555FE20BDC728002BA3B4 /* librouting_common.a in Frameworks */, + 671555FA20BDC6FA002BA3B4 /* librouting.a in Frameworks */, + 671555FC20BDC6FA002BA3B4 /* libtess2.a in Frameworks */, + 671555F420BDC6D1002BA3B4 /* libgenerator.a in Frameworks */, + 671555F620BDC6D1002BA3B4 /* libsearch.a in Frameworks */, + 671555F820BDC6D1002BA3B4 /* libstorage.a in Frameworks */, + 671555F220BDC690002BA3B4 /* libgenerator_tests_support.a in Frameworks */, + 671555F020BDC68A002BA3B4 /* libindexer_tests_support.a in Frameworks */, + 671555EA20BDC649002BA3B4 /* libicu.a in Frameworks */, + 671555EC20BDC649002BA3B4 /* libjansson.a in Frameworks */, + 671555EE20BDC649002BA3B4 /* libprotobuf.a in Frameworks */, 3496AC071DC204D000C5DDBA /* libz.tbd in Frameworks */, 3496ABFC1DC2045600C5DDBA /* libcoding.a in Frameworks */, 3496ABFD1DC2045600C5DDBA /* libindexer.a in Frameworks */, @@ -166,31 +205,31 @@ 341138731C15AE02002E3B3E /* Editor */ = { isa = PBXGroup; children = ( - 3D052486200F62ED00F24998 /* feature_matcher.cpp */, - 3D052485200F62ED00F24998 /* feature_matcher.hpp */, - 3D3058721D707DBE004AC712 /* config_loader.cpp */, - 3D3058731D707DBE004AC712 /* config_loader.hpp */, - 3D489BED1D4F67E10052AA38 /* editor_storage.cpp */, - 3D489BEE1D4F67E10052AA38 /* editor_storage.hpp */, - 3441CE461CFC1D3C00CF30D4 /* user_stats.cpp */, - 3441CE471CFC1D3C00CF30D4 /* user_stats.hpp */, - F60F02EC1C92CBF1003A0AF6 /* editor_notes.cpp */, - F60F02ED1C92CBF1003A0AF6 /* editor_notes.hpp */, - 34527C4F1C89B1770015050E /* editor_config.cpp */, - 34527C501C89B1770015050E /* editor_config.hpp */, - 34583BBE1C8854C100F94664 /* yes_no_unknown.hpp */, 340DC8271C4E71E500EAA2CC /* changeset_wrapper.cpp */, 340DC8281C4E71E500EAA2CC /* changeset_wrapper.hpp */, - 340C20DC1C3E4DFD00111D22 /* osm_auth.cpp */, - 340C20DD1C3E4DFD00111D22 /* osm_auth.hpp */, - 347C71261C295B1100BE9208 /* xml_feature.cpp */, - 34FFB34A1C316A7600BFF6C3 /* server_api.cpp */, - 34FFB34B1C316A7600BFF6C3 /* server_api.hpp */, - 347C71271C295B1100BE9208 /* xml_feature.hpp */, + 3D3058721D707DBE004AC712 /* config_loader.cpp */, + 3D3058731D707DBE004AC712 /* config_loader.hpp */, + 34527C4F1C89B1770015050E /* editor_config.cpp */, + 34527C501C89B1770015050E /* editor_config.hpp */, + F60F02EC1C92CBF1003A0AF6 /* editor_notes.cpp */, + F60F02ED1C92CBF1003A0AF6 /* editor_notes.hpp */, + 3D489BED1D4F67E10052AA38 /* editor_storage.cpp */, + 3D489BEE1D4F67E10052AA38 /* editor_storage.hpp */, + 3D052486200F62ED00F24998 /* feature_matcher.cpp */, + 3D052485200F62ED00F24998 /* feature_matcher.hpp */, 341138741C15AE42002E3B3E /* opening_hours_ui.cpp */, 341138751C15AE42002E3B3E /* opening_hours_ui.hpp */, + 340C20DC1C3E4DFD00111D22 /* osm_auth.cpp */, + 340C20DD1C3E4DFD00111D22 /* osm_auth.hpp */, + 34FFB34A1C316A7600BFF6C3 /* server_api.cpp */, + 34FFB34B1C316A7600BFF6C3 /* server_api.hpp */, 341138761C15AE42002E3B3E /* ui2oh.cpp */, 341138771C15AE42002E3B3E /* ui2oh.hpp */, + 3441CE461CFC1D3C00CF30D4 /* user_stats.cpp */, + 3441CE471CFC1D3C00CF30D4 /* user_stats.hpp */, + 347C71261C295B1100BE9208 /* xml_feature.cpp */, + 347C71271C295B1100BE9208 /* xml_feature.hpp */, + 34583BBE1C8854C100F94664 /* yes_no_unknown.hpp */, ); name = Editor; path = ../../editor; @@ -199,13 +238,15 @@ 3496ABD01DC2032800C5DDBA /* editor_tests */ = { isa = PBXGroup; children = ( - 3D052489200F630000F24998 /* feature_matcher_test.cpp */, - 3D05248A200F630000F24998 /* match_by_geometry_test.cpp */, - 3496AC011DC2047D00C5DDBA /* testingmain.cpp */, 3496ABD11DC2034900C5DDBA /* config_loader_test.cpp */, 3496ABD21DC2034900C5DDBA /* editor_config_test.cpp */, 3496ABD31DC2034900C5DDBA /* editor_notes_test.cpp */, + 3D052489200F630000F24998 /* feature_matcher_test.cpp */, + 3D05248A200F630000F24998 /* match_by_geometry_test.cpp */, 3496ABD41DC2034900C5DDBA /* opening_hours_ui_test.cpp */, + 671555E620BDC5D3002BA3B4 /* osm_editor_test.cpp */, + 671555E720BDC5D3002BA3B4 /* osm_editor_test.hpp */, + 3496AC011DC2047D00C5DDBA /* testingmain.cpp */, 3496ABD61DC2034900C5DDBA /* ui2oh_test.cpp */, 3496ABD71DC2034900C5DDBA /* user_stats_test.cpp */, 3496ABD81DC2034900C5DDBA /* xml_feature_test.cpp */, @@ -217,6 +258,18 @@ 3496ABEA1DC2041800C5DDBA /* Frameworks */ = { isa = PBXGroup; children = ( + 671555FF20BDC741002BA3B4 /* libsuccinct.a */, + 671555FD20BDC728002BA3B4 /* librouting_common.a */, + 671555F920BDC6FA002BA3B4 /* librouting.a */, + 671555FB20BDC6FA002BA3B4 /* libtess2.a */, + 671555F320BDC6D1002BA3B4 /* libgenerator.a */, + 671555F520BDC6D1002BA3B4 /* libsearch.a */, + 671555F720BDC6D1002BA3B4 /* libstorage.a */, + 671555F120BDC690002BA3B4 /* libgenerator_tests_support.a */, + 671555EF20BDC68A002BA3B4 /* libindexer_tests_support.a */, + 671555E920BDC649002BA3B4 /* libicu.a */, + 671555EB20BDC649002BA3B4 /* libjansson.a */, + 671555ED20BDC649002BA3B4 /* libprotobuf.a */, 3496AC061DC204D000C5DDBA /* libz.tbd */, 3496ABF91DC2045600C5DDBA /* libcoding.a */, 3496ABFA1DC2045600C5DDBA /* libindexer.a */, @@ -367,6 +420,7 @@ buildActionMask = 2147483647; files = ( 3496ABE11DC2035800C5DDBA /* config_loader_test.cpp in Sources */, + 671555E820BDC5D3002BA3B4 /* osm_editor_test.cpp in Sources */, 3496ABE21DC2035800C5DDBA /* editor_config_test.cpp in Sources */, 3496ABE31DC2035800C5DDBA /* editor_notes_test.cpp in Sources */, 3496ABE41DC2035800C5DDBA /* opening_hours_ui_test.cpp in Sources */, diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj index 2ee32db842..ce449cfeb7 100644 --- a/xcode/indexer/indexer.xcodeproj/project.pbxproj +++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 340DF9D01C1FF04D00B5C7EC /* osm_editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340DF9CF1C1FF04D00B5C7EC /* osm_editor.cpp */; }; 34583BC71C88552100F94664 /* cuisines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34583BC11C88552100F94664 /* cuisines.cpp */; }; 34583BC81C88552100F94664 /* cuisines.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34583BC21C88552100F94664 /* cuisines.hpp */; }; 34583BC91C88552100F94664 /* editable_map_object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34583BC31C88552100F94664 /* editable_map_object.cpp */; }; @@ -54,17 +53,12 @@ 3D489BC61D3D220F0052AA38 /* editable_map_object_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D489BA71D3D1F8A0052AA38 /* editable_map_object_test.cpp */; }; 3D489BC71D3D22150052AA38 /* features_vector_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D489BA81D3D1F8A0052AA38 /* features_vector_test.cpp */; }; 3D489BC81D3D22190052AA38 /* string_slice_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D489BA91D3D1F8A0052AA38 /* string_slice_tests.cpp */; }; - 3D489BF31D4F87740052AA38 /* osm_editor_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D489BF11D4F87740052AA38 /* osm_editor_test.cpp */; }; - 3D489BF41D4F87740052AA38 /* osm_editor_test.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D489BF21D4F87740052AA38 /* osm_editor_test.hpp */; }; - 3D51BC311D5E4B7300F1FA8D /* osm_editor_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D489BF11D4F87740052AA38 /* osm_editor_test.cpp */; }; - 3D51BC331D5E4BB000F1FA8D /* osm_editor_test.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D489BF21D4F87740052AA38 /* osm_editor_test.hpp */; }; 3D51BC351D5E4BF600F1FA8D /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D51BC341D5E4BF600F1FA8D /* libsearch.a */; }; 3D51BC371D5E4C3900F1FA8D /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D51BC361D5E4C3900F1FA8D /* libstorage.a */; }; 3D51BC3B1D5E4C5D00F1FA8D /* libplatform_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D51BC3A1D5E4C5D00F1FA8D /* libplatform_tests_support.a */; }; 3D51BC3D1D5E4C6400F1FA8D /* libgenerator_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D51BC3C1D5E4C6400F1FA8D /* libgenerator_tests_support.a */; }; 3D51BC3F1D5E4C8800F1FA8D /* librouting.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D51BC3E1D5E4C8800F1FA8D /* librouting.a */; }; 3D51BC411D5E4CFA00F1FA8D /* libtess2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D51BC401D5E4CFA00F1FA8D /* libtess2.a */; }; - 3D51BC421D5E4D3800F1FA8D /* libgenerator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D51BC381D5E4C4300F1FA8D /* libgenerator.a */; }; 3D51BC431D5E4E2B00F1FA8D /* test_mwm_set.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56C74C2D1C749E8100B71B9F /* test_mwm_set.hpp */; }; 3D51BC451D5E4EBF00F1FA8D /* libsearch_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D51BC441D5E4EBF00F1FA8D /* libsearch_tests_support.a */; }; 3D74ABBC1EA67C1E0063A898 /* ftypes_mapping.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D74ABBB1EA67C1E0063A898 /* ftypes_mapping.hpp */; }; @@ -124,7 +118,6 @@ 670BAAA41D0B06E1000302DA /* visibility_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C610B1AB065B100C38A8C /* visibility_test.cpp */; }; 670BAAAB1D0B07AA000302DA /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAA51D0B07AA000302DA /* libbase.a */; }; 670BAAAC1D0B07AA000302DA /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAA61D0B07AA000302DA /* libcoding.a */; }; - 670BAAAD1D0B07AA000302DA /* libeditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAA71D0B07AA000302DA /* libeditor.a */; }; 670BAAAE1D0B07AA000302DA /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAA81D0B07AA000302DA /* liboauthcpp.a */; }; 670BAAAF1D0B07AA000302DA /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAA91D0B07AA000302DA /* libopening_hours.a */; }; 670BAAB01D0B07AA000302DA /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAAA1D0B07AA000302DA /* libpugixml.a */; }; @@ -145,6 +138,9 @@ 670C615C1AB0691900C38A8C /* features_offsets_table.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670C61591AB0691900C38A8C /* features_offsets_table.hpp */; }; 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 */; }; 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 */; }; @@ -289,8 +285,6 @@ 3D489BA71D3D1F8A0052AA38 /* editable_map_object_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editable_map_object_test.cpp; sourceTree = ""; }; 3D489BA81D3D1F8A0052AA38 /* features_vector_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_vector_test.cpp; sourceTree = ""; }; 3D489BA91D3D1F8A0052AA38 /* string_slice_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_slice_tests.cpp; sourceTree = ""; }; - 3D489BF11D4F87740052AA38 /* osm_editor_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_editor_test.cpp; sourceTree = ""; }; - 3D489BF21D4F87740052AA38 /* osm_editor_test.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_editor_test.hpp; sourceTree = ""; }; 3D51BC341D5E4BF600F1FA8D /* libsearch.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsearch.a; path = "../../../omim-xcode-build/Debug/libsearch.a"; sourceTree = ""; }; 3D51BC361D5E4C3900F1FA8D /* libstorage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libstorage.a; path = "../../../omim-xcode-build/Debug/libstorage.a"; sourceTree = ""; }; 3D51BC381D5E4C4300F1FA8D /* libgenerator.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgenerator.a; path = "../../../omim-xcode-build/Debug/libgenerator.a"; sourceTree = ""; }; @@ -378,6 +372,8 @@ 670C61591AB0691900C38A8C /* features_offsets_table.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_offsets_table.hpp; sourceTree = ""; }; 670EE56A1B60033A001E8064 /* features_vector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_vector.cpp; sourceTree = ""; }; 670EE56B1B60033A001E8064 /* unique_index.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = unique_index.hpp; sourceTree = ""; }; + 671555E120BDA63C002BA3B4 /* libgenerator.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgenerator.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 671555E420BDC523002BA3B4 /* libeditor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libeditor.a; sourceTree = BUILT_PRODUCTS_DIR; }; 6726C1CF1A49DAAC005EEA39 /* feature_meta.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_meta.cpp; sourceTree = ""; }; 6726C1D01A49DAAC005EEA39 /* feature_meta.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = feature_meta.hpp; sourceTree = ""; }; 674125101B4C02F100A3E828 /* map_style_reader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map_style_reader.cpp; sourceTree = ""; }; @@ -474,11 +470,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 671555E520BDC523002BA3B4 /* libeditor.a in Frameworks */, + 671555E220BDA63C002BA3B4 /* libgenerator.a in Frameworks */, 45C108BF1E9D008D000FE1F6 /* librouting_common.a in Frameworks */, 45C108BD1E9D0067000FE1F6 /* libicu.a in Frameworks */, 34AF87E71DBE567C00E5E7DC /* libindexer_tests_support.a in Frameworks */, 3D51BC451D5E4EBF00F1FA8D /* libsearch_tests_support.a in Frameworks */, - 3D51BC421D5E4D3800F1FA8D /* libgenerator.a in Frameworks */, 3D51BC411D5E4CFA00F1FA8D /* libtess2.a in Frameworks */, 3D51BC3F1D5E4C8800F1FA8D /* librouting.a in Frameworks */, 3D51BC3D1D5E4C6400F1FA8D /* libgenerator_tests_support.a in Frameworks */, @@ -497,7 +494,6 @@ 670BAAB31D0B07BF000302DA /* libplatform.a in Frameworks */, 670BAAB41D0B07BF000302DA /* libprotobuf.a in Frameworks */, 670BAAAB1D0B07AA000302DA /* libbase.a in Frameworks */, - 670BAAAD1D0B07AA000302DA /* libeditor.a in Frameworks */, 670BAAAE1D0B07AA000302DA /* liboauthcpp.a in Frameworks */, 670BAAAF1D0B07AA000302DA /* libopening_hours.a in Frameworks */, 670BAAB01D0B07AA000302DA /* libpugixml.a in Frameworks */, @@ -561,6 +557,8 @@ 45C108BB1E9D0067000FE1F6 /* Frameworks */ = { isa = PBXGroup; children = ( + 671555E420BDC523002BA3B4 /* libeditor.a */, + 671555E120BDA63C002BA3B4 /* libgenerator.a */, 45C108BE1E9D008D000FE1F6 /* librouting_common.a */, 45C108BC1E9D0067000FE1F6 /* libicu.a */, ); @@ -603,42 +601,40 @@ isa = PBXGroup; children = ( 406B37F6207FBAC7000F3648 /* borders_test.cpp */, - 39F376C1207D324E0058E8E0 /* scale_index_reading_tests.cpp */, - 39F376BE207D32410058E8E0 /* cities_boundaries_serdes_tests.cpp */, 40C3C090205BF9F400CED188 /* bounds.hpp */, - 40A1C309202B321000F71672 /* locality_index_test.cpp */, - 3D74EF231F8F559D0081202C /* ugc_types_test.cpp */, - 3D452AF71EE6D9F5009EAB9B /* wheelchair_tests.cpp */, - 3D452AF81EE6D9F5009EAB9B /* feature_names_test.cpp */, - 3D452AF91EE6D9F5009EAB9B /* centers_table_test.cpp */, - 3D489BF11D4F87740052AA38 /* osm_editor_test.cpp */, - 3D489BF21D4F87740052AA38 /* osm_editor_test.hpp */, - 3D489BA71D3D1F8A0052AA38 /* editable_map_object_test.cpp */, - 3D489BA81D3D1F8A0052AA38 /* features_vector_test.cpp */, - 3D489BA91D3D1F8A0052AA38 /* string_slice_tests.cpp */, - E906DE371CF44917004C4F5E /* postcodes_matcher_tests.cpp */, 56C74C261C749E8100B71B9F /* categories_test.cpp */, - 56C74C271C749E8100B71B9F /* drules_selector_parser_test.cpp */, - 56C74C281C749E8100B71B9F /* feature_metadata_test.cpp */, - 56C74C291C749E8100B71B9F /* feature_xml_test.cpp */, - 56C74C2A1C749E8100B71B9F /* rank_table_test.cpp */, - 56C74C2B1C749E8100B71B9F /* search_string_utils_test.cpp */, - 56C74C2C1C749E8100B71B9F /* succinct_trie_test.cpp */, - 56C74C2D1C749E8100B71B9F /* test_mwm_set.hpp */, - 56C74C2E1C749E8100B71B9F /* trie_test.cpp */, - 670C611F1AB065E100C38A8C /* testingmain.cpp */, 670C60FA1AB065B100C38A8C /* cell_coverer_test.cpp */, 670C60FB1AB065B100C38A8C /* cell_id_test.cpp */, + 3D452AF91EE6D9F5009EAB9B /* centers_table_test.cpp */, 670C60FC1AB065B100C38A8C /* checker_test.cpp */, + 39F376BE207D32410058E8E0 /* cities_boundaries_serdes_tests.cpp */, + 56C74C271C749E8100B71B9F /* drules_selector_parser_test.cpp */, + 3D489BA71D3D1F8A0052AA38 /* editable_map_object_test.cpp */, + 56C74C281C749E8100B71B9F /* feature_metadata_test.cpp */, + 3D452AF81EE6D9F5009EAB9B /* feature_names_test.cpp */, + 56C74C291C749E8100B71B9F /* feature_xml_test.cpp */, 670C60FD1AB065B100C38A8C /* features_offsets_table_test.cpp */, + 3D489BA81D3D1F8A0052AA38 /* features_vector_test.cpp */, 670C61001AB065B100C38A8C /* index_builder_test.cpp */, 670C61011AB065B100C38A8C /* index_test.cpp */, 670C61021AB065B100C38A8C /* interval_index_test.cpp */, + 40A1C309202B321000F71672 /* locality_index_test.cpp */, 670C61041AB065B100C38A8C /* mwm_set_test.cpp */, + E906DE371CF44917004C4F5E /* postcodes_matcher_tests.cpp */, + 56C74C2A1C749E8100B71B9F /* rank_table_test.cpp */, + 39F376C1207D324E0058E8E0 /* scale_index_reading_tests.cpp */, 670C61061AB065B100C38A8C /* scales_test.cpp */, + 56C74C2B1C749E8100B71B9F /* search_string_utils_test.cpp */, 670C61071AB065B100C38A8C /* sort_and_merge_intervals_test.cpp */, + 3D489BA91D3D1F8A0052AA38 /* string_slice_tests.cpp */, + 56C74C2C1C749E8100B71B9F /* succinct_trie_test.cpp */, + 56C74C2D1C749E8100B71B9F /* test_mwm_set.hpp */, 670C610A1AB065B100C38A8C /* test_type.cpp */, + 670C611F1AB065E100C38A8C /* testingmain.cpp */, + 56C74C2E1C749E8100B71B9F /* trie_test.cpp */, + 3D74EF231F8F559D0081202C /* ugc_types_test.cpp */, 670C610B1AB065B100C38A8C /* visibility_test.cpp */, + 3D452AF71EE6D9F5009EAB9B /* wheelchair_tests.cpp */, ); name = indexer_tests; path = ../../indexer/indexer_tests; @@ -673,93 +669,54 @@ 6753409C1A3F53CB00A0A8C3 /* indexer */ = { isa = PBXGroup; children = ( - 406B37F2207FBABA000F3648 /* borders.cpp */, - 406B37F3207FBABA000F3648 /* borders.hpp */, - 4095DEB12020AC0000C591A3 /* locality_index.hpp */, - 4000905D201F5CAF00963E18 /* cell_value_pair.hpp */, - 40009061201F5CB000963E18 /* locality_index_builder.cpp */, - 4000905F201F5CAF00963E18 /* locality_index_builder.hpp */, - 4000905E201F5CAF00963E18 /* locality_object.cpp */, - 40009060201F5CB000963E18 /* locality_object.hpp */, - 456E1B141F90E5B6009C32E1 /* cities_boundaries_serdes.hpp */, - 456E1B171F90E5B7009C32E1 /* city_boundary.hpp */, - 456E1B151F90E5B6009C32E1 /* ftypes_sponsored.cpp */, - 456E1B161F90E5B6009C32E1 /* ftypes_sponsored.hpp */, - F6F1DABD1F13D8B4006A69B7 /* ftraits.hpp */, - 456B3FB31EDEEB65009B3D1F /* scales_patch.hpp */, - 3D74ABBB1EA67C1E0063A898 /* ftypes_mapping.hpp */, - 3D928F651D50F9FE001670E0 /* index_helpers.cpp */, - 3D928F661D50F9FE001670E0 /* index_helpers.hpp */, 34664CEE1D49FEC1003D7096 /* altitude_loader.cpp */, 34664CEF1D49FEC1003D7096 /* altitude_loader.hpp */, - 4099F6471FC71429002A7B05 /* fake_feature_ids.cpp */, - 4099F6481FC7142A002A7B05 /* fake_feature_ids.hpp */, - 34664CF01D49FEC1003D7096 /* feature_altitude.hpp */, - 34664CF11D49FEC1003D7096 /* centers_table.cpp */, - 34664CF21D49FEC1003D7096 /* centers_table.hpp */, - 67BC92EE1D21476500A4A378 /* osm_editor.hpp */, - 67BC92EF1D21476500A4A378 /* string_set.hpp */, - 67BC92F01D21476500A4A378 /* string_slice.cpp */, - 67BC92F11D21476500A4A378 /* string_slice.hpp */, - E906DE391CF44934004C4F5E /* postcodes_matcher.cpp */, - E906DE3A1CF44934004C4F5E /* postcodes_matcher.hpp */, - F6381BF71CD26C9C004CA943 /* new_feature_categories.cpp */, - F6381BF81CD26C9C004CA943 /* new_feature_categories.hpp */, - F6DF5F301CD0FD9A00A87154 /* categories_index.hpp */, - F6DF5F2C1CD0FC9D00A87154 /* categories_index.cpp */, - 34583BC11C88552100F94664 /* cuisines.cpp */, - 34583BC21C88552100F94664 /* cuisines.hpp */, - 34583BC31C88552100F94664 /* editable_map_object.cpp */, - 34583BC41C88552100F94664 /* editable_map_object.hpp */, - 34583BC51C88552100F94664 /* map_object.cpp */, - 34583BC61C88552100F94664 /* map_object.hpp */, + 406B37F2207FBABA000F3648 /* borders.cpp */, + 406B37F3207FBABA000F3648 /* borders.hpp */, 56C74C121C749E4700B71B9F /* categories_holder_loader.cpp */, 56C74C131C749E4700B71B9F /* categories_holder.cpp */, 56C74C141C749E4700B71B9F /* categories_holder.hpp */, - 56C74C151C749E4700B71B9F /* displacement_manager.hpp */, - 56C74C161C749E4700B71B9F /* edits_migration.cpp */, - 56C74C171C749E4700B71B9F /* edits_migration.hpp */, - 56C74C181C749E4700B71B9F /* search_delimiters.cpp */, - 56C74C191C749E4700B71B9F /* search_delimiters.hpp */, - 56C74C1A1C749E4700B71B9F /* search_string_utils.cpp */, - 56C74C1B1C749E4700B71B9F /* search_string_utils.hpp */, - 347F33721C454242009758CC /* rank_table.cpp */, - 347F33731C454242009758CC /* rank_table.hpp */, - 347F33741C454242009758CC /* succinct_trie_builder.hpp */, - 347F33751C454242009758CC /* succinct_trie_reader.hpp */, - 347F33761C454242009758CC /* trie_builder.hpp */, - 347F33771C454242009758CC /* trie_reader.hpp */, - 347F33781C454242009758CC /* trie.hpp */, - 6758AECD1BB4413000C26E27 /* drules_selector_parser.cpp */, - 6758AECE1BB4413000C26E27 /* drules_selector_parser.hpp */, - 6758AECF1BB4413000C26E27 /* drules_selector.cpp */, - 6758AED01BB4413000C26E27 /* drules_selector.hpp */, - 674125101B4C02F100A3E828 /* map_style_reader.cpp */, - 674125111B4C02F100A3E828 /* map_style_reader.hpp */, - 674125121B4C02F100A3E828 /* map_style.hpp */, - 67F183721BD4FCF500AB1840 /* map_style.cpp */, - 670C61581AB0691900C38A8C /* features_offsets_table.cpp */, - 670C61591AB0691900C38A8C /* features_offsets_table.hpp */, + F6DF5F2C1CD0FC9D00A87154 /* categories_index.cpp */, + F6DF5F301CD0FD9A00A87154 /* categories_index.hpp */, 675340AA1A3F540F00A0A8C3 /* cell_coverer.hpp */, 675340AB1A3F540F00A0A8C3 /* cell_id.hpp */, + 4000905D201F5CAF00963E18 /* cell_value_pair.hpp */, + 34664CF11D49FEC1003D7096 /* centers_table.cpp */, + 34664CF21D49FEC1003D7096 /* centers_table.hpp */, + 456E1B141F90E5B6009C32E1 /* cities_boundaries_serdes.hpp */, + 456E1B171F90E5B7009C32E1 /* city_boundary.hpp */, 675340AC1A3F540F00A0A8C3 /* classificator_loader.cpp */, 675340AD1A3F540F00A0A8C3 /* classificator_loader.hpp */, 675340AE1A3F540F00A0A8C3 /* classificator.cpp */, 675340AF1A3F540F00A0A8C3 /* classificator.hpp */, + 34583BC11C88552100F94664 /* cuisines.cpp */, + 34583BC21C88552100F94664 /* cuisines.hpp */, 675340B21A3F540F00A0A8C3 /* data_factory.cpp */, 675340B31A3F540F00A0A8C3 /* data_factory.hpp */, 675340B41A3F540F00A0A8C3 /* data_header.cpp */, 675340B51A3F540F00A0A8C3 /* data_header.hpp */, + 56C74C151C749E4700B71B9F /* displacement_manager.hpp */, 675340B61A3F540F00A0A8C3 /* drawing_rule_def.cpp */, 675340B71A3F540F00A0A8C3 /* drawing_rule_def.hpp */, 675340B81A3F540F00A0A8C3 /* drawing_rules.cpp */, 675340B91A3F540F00A0A8C3 /* drawing_rules.hpp */, 675340BA1A3F540F00A0A8C3 /* drules_include.hpp */, + 6758AECD1BB4413000C26E27 /* drules_selector_parser.cpp */, + 6758AECE1BB4413000C26E27 /* drules_selector_parser.hpp */, + 6758AECF1BB4413000C26E27 /* drules_selector.cpp */, + 6758AED01BB4413000C26E27 /* drules_selector.hpp */, 675340BB1A3F540F00A0A8C3 /* drules_struct.pb.cc */, 675340BC1A3F540F00A0A8C3 /* drules_struct.pb.h */, 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 */, 675340BF1A3F540F00A0A8C3 /* feature_algo.hpp */, + 34664CF01D49FEC1003D7096 /* feature_altitude.hpp */, 675340C01A3F540F00A0A8C3 /* feature_covering.cpp */, 675340C11A3F540F00A0A8C3 /* feature_covering.hpp */, 675340C21A3F540F00A0A8C3 /* feature_data.cpp */, @@ -781,29 +738,68 @@ 675340D01A3F540F00A0A8C3 /* feature_visibility.hpp */, 675340D11A3F540F00A0A8C3 /* feature.cpp */, 675340D21A3F540F00A0A8C3 /* feature.hpp */, + 670C61581AB0691900C38A8C /* features_offsets_table.cpp */, + 670C61591AB0691900C38A8C /* features_offsets_table.hpp */, 670EE56A1B60033A001E8064 /* features_vector.cpp */, 675340D41A3F540F00A0A8C3 /* features_vector.hpp */, + F6F1DABD1F13D8B4006A69B7 /* ftraits.hpp */, + 3D74ABBB1EA67C1E0063A898 /* ftypes_mapping.hpp */, 675340D51A3F540F00A0A8C3 /* ftypes_matcher.cpp */, 675340D61A3F540F00A0A8C3 /* ftypes_matcher.hpp */, + 456E1B151F90E5B6009C32E1 /* ftypes_sponsored.cpp */, + 456E1B161F90E5B6009C32E1 /* ftypes_sponsored.hpp */, 675340DB1A3F540F00A0A8C3 /* index_builder.cpp */, 675340DC1A3F540F00A0A8C3 /* index_builder.hpp */, + 3D928F651D50F9FE001670E0 /* index_helpers.cpp */, + 3D928F661D50F9FE001670E0 /* index_helpers.hpp */, 675340DD1A3F540F00A0A8C3 /* index.cpp */, 675340DE1A3F540F00A0A8C3 /* index.hpp */, 675340DF1A3F540F00A0A8C3 /* interval_index_builder.hpp */, 675340E11A3F540F00A0A8C3 /* interval_index.hpp */, + 40009061201F5CB000963E18 /* locality_index_builder.cpp */, + 4000905F201F5CAF00963E18 /* locality_index_builder.hpp */, + 4095DEB12020AC0000C591A3 /* locality_index.hpp */, + 4000905E201F5CAF00963E18 /* locality_object.cpp */, + 40009060201F5CB000963E18 /* locality_object.hpp */, + 34583BC51C88552100F94664 /* map_object.cpp */, + 34583BC61C88552100F94664 /* map_object.hpp */, + 674125101B4C02F100A3E828 /* map_style_reader.cpp */, + 674125111B4C02F100A3E828 /* map_style_reader.hpp */, + 67F183721BD4FCF500AB1840 /* map_style.cpp */, + 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 */, + 347F33731C454242009758CC /* rank_table.hpp */, + F61F83041E4B187500B37B7A /* road_shields_parser.cpp */, + F61F83051E4B187500B37B7A /* road_shields_parser.hpp */, 675340EB1A3F540F00A0A8C3 /* scale_index_builder.hpp */, 675340ED1A3F540F00A0A8C3 /* scale_index.hpp */, + 456B3FB31EDEEB65009B3D1F /* scales_patch.hpp */, 675340EE1A3F540F00A0A8C3 /* scales.cpp */, 675340EF1A3F540F00A0A8C3 /* scales.hpp */, + 56C74C181C749E4700B71B9F /* search_delimiters.cpp */, + 56C74C191C749E4700B71B9F /* search_delimiters.hpp */, + 56C74C1A1C749E4700B71B9F /* search_string_utils.cpp */, + 56C74C1B1C749E4700B71B9F /* search_string_utils.hpp */, + 67BC92EF1D21476500A4A378 /* string_set.hpp */, + 67BC92F01D21476500A4A378 /* string_slice.cpp */, + 67BC92F11D21476500A4A378 /* string_slice.hpp */, + 347F33741C454242009758CC /* succinct_trie_builder.hpp */, + 347F33751C454242009758CC /* succinct_trie_reader.hpp */, 675340FA1A3F540F00A0A8C3 /* tree_structure.hpp */, + 347F33761C454242009758CC /* trie_builder.hpp */, + 347F33771C454242009758CC /* trie_reader.hpp */, + 347F33781C454242009758CC /* trie.hpp */, 675340FB1A3F540F00A0A8C3 /* types_mapping.cpp */, 675340FC1A3F540F00A0A8C3 /* types_mapping.hpp */, 670EE56B1B60033A001E8064 /* unique_index.hpp */, - F61F83041E4B187500B37B7A /* road_shields_parser.cpp */, - F61F83051E4B187500B37B7A /* road_shields_parser.hpp */, ); name = indexer; path = ../../indexer; @@ -824,7 +820,6 @@ buildActionMask = 2147483647; files = ( 3D51BC431D5E4E2B00F1FA8D /* test_mwm_set.hpp in Headers */, - 3D51BC331D5E4BB000F1FA8D /* osm_editor_test.hpp in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -870,7 +865,6 @@ 675341271A3F540F00A0A8C3 /* features_vector.hpp in Headers */, 6753413D1A3F540F00A0A8C3 /* scale_index_builder.hpp in Headers */, 675341021A3F540F00A0A8C3 /* classificator_loader.hpp in Headers */, - 3D489BF41D4F87740052AA38 /* osm_editor_test.hpp in Headers */, 456B3FB41EDEEB65009B3D1F /* scales_patch.hpp in Headers */, 6758AED21BB4413000C26E27 /* drules_selector_parser.hpp in Headers */, 670BAACA1D0B0BBB000302DA /* string_slice.hpp in Headers */, @@ -1050,7 +1044,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 3D51BC311D5E4B7300F1FA8D /* osm_editor_test.cpp in Sources */, 670BAA9D1D0B06E1000302DA /* interval_index_test.cpp in Sources */, 670BAAA31D0B06E1000302DA /* test_type.cpp in Sources */, 670BAA961D0B06E1000302DA /* cell_id_test.cpp in Sources */, @@ -1088,7 +1081,6 @@ 56C74C241C749E4700B71B9F /* search_string_utils.cpp in Sources */, 3D928F671D50F9FE001670E0 /* index_helpers.cpp in Sources */, 3D0AEAFA1FBAF9E900AD042B /* test_with_custom_mwms.cpp in Sources */, - 340DF9D01C1FF04D00B5C7EC /* osm_editor.cpp in Sources */, 40009066201F5CB000963E18 /* locality_index_builder.cpp in Sources */, 67F183731BD4FCF500AB1840 /* map_style.cpp in Sources */, 6758AED31BB4413000C26E27 /* drules_selector.cpp in Sources */, @@ -1141,11 +1133,11 @@ 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 */, E906DE3B1CF44934004C4F5E /* postcodes_matcher.cpp in Sources */, - 3D489BF31D4F87740052AA38 /* osm_editor_test.cpp in Sources */, 406B37F7207FBAC7000F3648 /* borders_test.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0;