diff --git a/xcode/coding/coding.xcodeproj/project.pbxproj b/xcode/coding/coding.xcodeproj/project.pbxproj index e00ff59f95..1dbf81974b 100644 --- a/xcode/coding/coding.xcodeproj/project.pbxproj +++ b/xcode/coding/coding.xcodeproj/project.pbxproj @@ -7,6 +7,12 @@ objects = { /* Begin PBXBuildFile section */ + 347F33371C4540F0009758CC /* compressed_bit_vector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33311C4540F0009758CC /* compressed_bit_vector.cpp */; }; + 347F33381C4540F0009758CC /* compressed_bit_vector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33321C4540F0009758CC /* compressed_bit_vector.hpp */; }; + 347F33391C4540F0009758CC /* fixed_bits_ddvector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33331C4540F0009758CC /* fixed_bits_ddvector.hpp */; }; + 347F333A1C4540F0009758CC /* simple_dense_coding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33341C4540F0009758CC /* simple_dense_coding.cpp */; }; + 347F333B1C4540F0009758CC /* simple_dense_coding.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33351C4540F0009758CC /* simple_dense_coding.hpp */; }; + 347F333C1C4540F0009758CC /* succinct_mapper.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33361C4540F0009758CC /* succinct_mapper.hpp */; }; 394916BF1BAC3A82002A8C4F /* arithmetic_codec_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 394916961BAC3A82002A8C4F /* arithmetic_codec_test.cpp */; }; 394916E41BAC3ACF002A8C4F /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6753421B1A3F586300A0A8C3 /* libcoding.a */; }; 394917201BAC3BE0002A8C4F /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3949171F1BAC3BE0002A8C4F /* testingmain.cpp */; }; @@ -77,9 +83,6 @@ 675342BF1A3F588C00A0A8C3 /* streams_common.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675342691A3F588B00A0A8C3 /* streams_common.hpp */; }; 675342C01A3F588C00A0A8C3 /* streams_sink.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753426A1A3F588B00A0A8C3 /* streams_sink.hpp */; }; 675342C11A3F588C00A0A8C3 /* streams.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753426B1A3F588B00A0A8C3 /* streams.hpp */; }; - 675342C21A3F588C00A0A8C3 /* trie_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753426D1A3F588B00A0A8C3 /* trie_builder.hpp */; }; - 675342C31A3F588C00A0A8C3 /* trie_reader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753426E1A3F588B00A0A8C3 /* trie_reader.hpp */; }; - 675342C41A3F588C00A0A8C3 /* trie.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753426F1A3F588B00A0A8C3 /* trie.hpp */; }; 675342C51A3F588C00A0A8C3 /* uri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675342701A3F588B00A0A8C3 /* uri.cpp */; }; 675342C61A3F588C00A0A8C3 /* uri.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675342711A3F588B00A0A8C3 /* uri.hpp */; }; 675342C71A3F588C00A0A8C3 /* url_encode.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675342721A3F588B00A0A8C3 /* url_encode.hpp */; }; @@ -150,13 +153,17 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 347F33311C4540F0009758CC /* compressed_bit_vector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = compressed_bit_vector.cpp; sourceTree = ""; }; + 347F33321C4540F0009758CC /* compressed_bit_vector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = compressed_bit_vector.hpp; sourceTree = ""; }; + 347F33331C4540F0009758CC /* fixed_bits_ddvector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fixed_bits_ddvector.hpp; sourceTree = ""; }; + 347F33341C4540F0009758CC /* simple_dense_coding.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = simple_dense_coding.cpp; sourceTree = ""; }; + 347F33351C4540F0009758CC /* simple_dense_coding.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = simple_dense_coding.hpp; sourceTree = ""; }; + 347F33361C4540F0009758CC /* succinct_mapper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = succinct_mapper.hpp; sourceTree = ""; }; 3949168F1BAC3A5F002A8C4F /* coding_tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = coding_tests; sourceTree = BUILT_PRODUCTS_DIR; }; 394916961BAC3A82002A8C4F /* arithmetic_codec_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = arithmetic_codec_test.cpp; sourceTree = ""; }; 3949171F1BAC3BE0002A8C4F /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; 394917221BAC3C2F002A8C4F /* huffman.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = huffman.cpp; sourceTree = ""; }; 394917231BAC3C2F002A8C4F /* huffman.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = huffman.hpp; sourceTree = ""; }; - 394917241BAC3C2F002A8C4F /* succinct_trie_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = succinct_trie_builder.hpp; sourceTree = ""; }; - 394917251BAC3C2F002A8C4F /* succinct_trie_reader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = succinct_trie_reader.hpp; sourceTree = ""; }; 394917271BAC3CAC002A8C4F /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "../../../omim-xcode-build/Debug/libbase.a"; sourceTree = ""; }; 394917281BAC3CAC002A8C4F /* libminizip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libminizip.a; path = "../../../omim-xcode-build/Debug/libminizip.a"; sourceTree = ""; }; 394917291BAC3CAC002A8C4F /* libsuccinct.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsuccinct.a; path = "../../../omim-xcode-build/Debug/libsuccinct.a"; sourceTree = ""; }; @@ -223,9 +230,6 @@ 675342691A3F588B00A0A8C3 /* streams_common.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = streams_common.hpp; sourceTree = ""; }; 6753426A1A3F588B00A0A8C3 /* streams_sink.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = streams_sink.hpp; sourceTree = ""; }; 6753426B1A3F588B00A0A8C3 /* streams.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = streams.hpp; sourceTree = ""; }; - 6753426D1A3F588B00A0A8C3 /* trie_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = trie_builder.hpp; sourceTree = ""; }; - 6753426E1A3F588B00A0A8C3 /* trie_reader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = trie_reader.hpp; sourceTree = ""; }; - 6753426F1A3F588B00A0A8C3 /* trie.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = trie.hpp; sourceTree = ""; }; 675342701A3F588B00A0A8C3 /* uri.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uri.cpp; sourceTree = ""; }; 675342711A3F588B00A0A8C3 /* uri.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = uri.hpp; sourceTree = ""; }; 675342721A3F588B00A0A8C3 /* url_encode.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = url_encode.hpp; sourceTree = ""; }; @@ -393,11 +397,15 @@ 6753421D1A3F586300A0A8C3 /* coding */ = { isa = PBXGroup; children = ( + 347F33311C4540F0009758CC /* compressed_bit_vector.cpp */, + 347F33321C4540F0009758CC /* compressed_bit_vector.hpp */, + 347F33331C4540F0009758CC /* fixed_bits_ddvector.hpp */, + 347F33341C4540F0009758CC /* simple_dense_coding.cpp */, + 347F33351C4540F0009758CC /* simple_dense_coding.hpp */, + 347F33361C4540F0009758CC /* succinct_mapper.hpp */, 670D04B21B0BA9050013A7AC /* internal */, 394917221BAC3C2F002A8C4F /* huffman.cpp */, 394917231BAC3C2F002A8C4F /* huffman.hpp */, - 394917241BAC3C2F002A8C4F /* succinct_trie_builder.hpp */, - 394917251BAC3C2F002A8C4F /* succinct_trie_reader.hpp */, 675342291A3F588B00A0A8C3 /* arithmetic_codec.cpp */, 6753422A1A3F588B00A0A8C3 /* arithmetic_codec.hpp */, 6753422B1A3F588B00A0A8C3 /* base64.cpp */, @@ -454,9 +462,6 @@ 675342691A3F588B00A0A8C3 /* streams_common.hpp */, 6753426A1A3F588B00A0A8C3 /* streams_sink.hpp */, 6753426B1A3F588B00A0A8C3 /* streams.hpp */, - 6753426D1A3F588B00A0A8C3 /* trie_builder.hpp */, - 6753426E1A3F588B00A0A8C3 /* trie_reader.hpp */, - 6753426F1A3F588B00A0A8C3 /* trie.hpp */, 675342701A3F588B00A0A8C3 /* uri.cpp */, 675342711A3F588B00A0A8C3 /* uri.hpp */, 675342721A3F588B00A0A8C3 /* url_encode.hpp */, @@ -503,8 +508,10 @@ 675342CE1A3F588C00A0A8C3 /* varint.hpp in Headers */, 675342D01A3F588C00A0A8C3 /* writer.hpp in Headers */, 675342CA1A3F588C00A0A8C3 /* var_serial_vector.hpp in Headers */, + 347F33391C4540F0009758CC /* fixed_bits_ddvector.hpp in Headers */, 67E8DB321BBC16C70053C5BA /* coder_test.hpp in Headers */, 6753429D1A3F588C00A0A8C3 /* file_name_utils.hpp in Headers */, + 347F33381C4540F0009758CC /* compressed_bit_vector.hpp in Headers */, 675342B21A3F588C00A0A8C3 /* parse_xml.hpp in Headers */, 675342AF1A3F588C00A0A8C3 /* mmap_reader.hpp in Headers */, 675342901A3F588C00A0A8C3 /* coder.hpp in Headers */, @@ -516,35 +523,29 @@ 675342961A3F588C00A0A8C3 /* dd_vector.hpp in Headers */, 675342C91A3F588C00A0A8C3 /* var_record_reader.hpp in Headers */, 675342991A3F588C00A0A8C3 /* endianness.hpp in Headers */, + 347F333C1C4540F0009758CC /* succinct_mapper.hpp in Headers */, 675342811A3F588C00A0A8C3 /* arithmetic_codec.hpp in Headers */, 675342951A3F588C00A0A8C3 /* constants.hpp in Headers */, - 396CE9F11BAAC0F10031A50E /* compressed_bit_vector.hpp in Headers */, 675342B71A3F588C00A0A8C3 /* reader_streambuf.hpp in Headers */, - 396CE9A11BAABFD70031A50E /* reader_test.hpp in Headers */, 675342CF1A3F588C00A0A8C3 /* write_to_sink.hpp in Headers */, 675342C11A3F588C00A0A8C3 /* streams.hpp in Headers */, 675342B41A3F588C00A0A8C3 /* read_write_utils.hpp in Headers */, 675342981A3F588C00A0A8C3 /* diff.hpp in Headers */, - 675342C41A3F588C00A0A8C3 /* trie.hpp in Headers */, 670D04C01B0BA92D0013A7AC /* file_data.hpp in Headers */, - 396CE9F31BAAC0F10031A50E /* huffman.hpp in Headers */, 6753428B1A3F588C00A0A8C3 /* buffer_reader.hpp in Headers */, 675342831A3F588C00A0A8C3 /* base64.hpp in Headers */, - 675342C21A3F588C00A0A8C3 /* trie_builder.hpp in Headers */, 675342BA1A3F588C00A0A8C3 /* reader_writer_ops.hpp in Headers */, - 396CE9F51BAAC0F10031A50E /* simple_dense_coding.hpp in Headers */, 675342C61A3F588C00A0A8C3 /* uri.hpp in Headers */, 6753429B1A3F588C00A0A8C3 /* file_container.hpp in Headers */, 670D04BD1B0BA92D0013A7AC /* expat_impl.h in Headers */, 675342A81A3F588C00A0A8C3 /* hex.hpp in Headers */, - 396CE9F81BAAC0F10031A50E /* succinct_trie_reader.hpp in Headers */, 6753428C1A3F588C00A0A8C3 /* byte_stream.hpp in Headers */, 675342BF1A3F588C00A0A8C3 /* streams_common.hpp in Headers */, 6753428F1A3F588C00A0A8C3 /* coder_util.hpp in Headers */, 67E8DB461BBC16C70053C5BA /* reader_test.hpp in Headers */, - 675342C31A3F588C00A0A8C3 /* trie_reader.hpp in Headers */, + 347F333B1C4540F0009758CC /* simple_dense_coding.hpp in Headers */, 67E8DB361BBC16C70053C5BA /* compressor_test_utils.hpp in Headers */, - 675342921A3F588C00A0A8C3 /* compressed_bit_vector.hpp in Headers */, + 675342921A3F588C00A0A8C3 /* old_compressed_bit_vector.hpp in Headers */, 670D04BE1B0BA92D0013A7AC /* file64_api.hpp in Headers */, 675342A11A3F588C00A0A8C3 /* file_sort.hpp in Headers */, 675342971A3F588C00A0A8C3 /* diff_patch_common.hpp in Headers */, @@ -560,10 +561,8 @@ 675342A41A3F588C00A0A8C3 /* file_writer.hpp in Headers */, 675342941A3F588C00A0A8C3 /* compressed_varnum_vector.hpp in Headers */, 675342C01A3F588C00A0A8C3 /* streams_sink.hpp in Headers */, - 396CE9F71BAAC0F10031A50E /* succinct_trie_builder.hpp in Headers */, 6753428A1A3F588C00A0A8C3 /* blob_storage.hpp in Headers */, 670D04C11B0BA92D0013A7AC /* xmlparser.hpp in Headers */, - 396CE9901BAABFD70031A50E /* compressor_test_utils.hpp in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -690,17 +689,16 @@ buildActionMask = 2147483647; files = ( 67E8DB2E1BBC16C70053C5BA /* base64_for_user_id_test.cpp in Sources */, + 347F333A1C4540F0009758CC /* simple_dense_coding.cpp in Sources */, 675342D11A3F588C00A0A8C3 /* zip_creator.cpp in Sources */, 675342B61A3F588C00A0A8C3 /* reader_streambuf.cpp in Sources */, 675342B01A3F588C00A0A8C3 /* multilang_utf8_string.cpp in Sources */, 675342821A3F588C00A0A8C3 /* base64.cpp in Sources */, - 396CE9F41BAAC0F10031A50E /* simple_dense_coding.cpp in Sources */, 675342871A3F588C00A0A8C3 /* blob_indexer.cpp in Sources */, 675342D31A3F588C00A0A8C3 /* zip_reader.cpp in Sources */, 675342931A3F588C00A0A8C3 /* compressed_varnum_vector.cpp in Sources */, - 396CE9F21BAAC0F10031A50E /* huffman.cpp in Sources */, + 347F33371C4540F0009758CC /* compressed_bit_vector.cpp in Sources */, 675342911A3F588C00A0A8C3 /* old_compressed_bit_vector.cpp in Sources */, - 396CE9F01BAAC0F10031A50E /* compressed_bit_vector.cpp in Sources */, 6753429F1A3F588C00A0A8C3 /* file_reader.cpp in Sources */, 675342C51A3F588C00A0A8C3 /* uri.cpp in Sources */, 675342BB1A3F588C00A0A8C3 /* reader.cpp in Sources */, diff --git a/xcode/drape/drape.xcodeproj/project.pbxproj b/xcode/drape/drape.xcodeproj/project.pbxproj index d70256523e..5af494e83c 100644 --- a/xcode/drape/drape.xcodeproj/project.pbxproj +++ b/xcode/drape/drape.xcodeproj/project.pbxproj @@ -7,8 +7,8 @@ objects = { /* Begin PBXBuildFile section */ - 3413E33F1C0DCA4100D14D24 /* debug_rect_renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3413E33D1C0DCA4100D14D24 /* debug_rect_renderer.cpp */; }; - 3413E3401C0DCA4100D14D24 /* debug_rect_renderer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3413E33E1C0DCA4100D14D24 /* debug_rect_renderer.hpp */; }; + 347F32F91C45383E009758CC /* debug_rect_renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F32F71C45383E009758CC /* debug_rect_renderer.cpp */; }; + 347F32FA1C45383E009758CC /* debug_rect_renderer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F32F81C45383E009758CC /* debug_rect_renderer.hpp */; }; 670947231BDF9A4F005014C0 /* data_buffer_impl.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670947151BDF9A4F005014C0 /* data_buffer_impl.hpp */; }; 670947241BDF9A4F005014C0 /* depth_constants.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670947161BDF9A4F005014C0 /* depth_constants.hpp */; }; 670947251BDF9A4F005014C0 /* fribidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670947171BDF9A4F005014C0 /* fribidi.cpp */; }; @@ -120,8 +120,8 @@ /* End PBXBuildRule section */ /* Begin PBXFileReference section */ - 3413E33D1C0DCA4100D14D24 /* debug_rect_renderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debug_rect_renderer.cpp; sourceTree = ""; }; - 3413E33E1C0DCA4100D14D24 /* debug_rect_renderer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = debug_rect_renderer.hpp; sourceTree = ""; }; + 347F32F71C45383E009758CC /* debug_rect_renderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debug_rect_renderer.cpp; sourceTree = ""; }; + 347F32F81C45383E009758CC /* debug_rect_renderer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = debug_rect_renderer.hpp; sourceTree = ""; }; 670947151BDF9A4F005014C0 /* data_buffer_impl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = data_buffer_impl.hpp; sourceTree = ""; }; 670947161BDF9A4F005014C0 /* depth_constants.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = depth_constants.hpp; sourceTree = ""; }; 670947171BDF9A4F005014C0 /* fribidi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fribidi.cpp; sourceTree = ""; }; @@ -301,6 +301,8 @@ 6729A50F1A69213A007D5872 /* data_buffer.cpp */, 6729A5101A69213A007D5872 /* data_buffer.hpp */, 6729A5111A69213A007D5872 /* drape_global.hpp */, + 347F32F71C45383E009758CC /* debug_rect_renderer.cpp */, + 347F32F81C45383E009758CC /* debug_rect_renderer.hpp */, 6729A5121A69213A007D5872 /* dynamic_texture.hpp */, 6729A5131A69213A007D5872 /* font_texture.cpp */, 6729A5141A69213A007D5872 /* font_texture.hpp */, @@ -418,6 +420,7 @@ 6729A56C1A69213A007D5872 /* binding_info.hpp in Headers */, 6729A5971A69213A007D5872 /* overlay_tree.hpp in Headers */, 6729A5751A69213A007D5872 /* drape_global.hpp in Headers */, + 347F32FA1C45383E009758CC /* debug_rect_renderer.hpp in Headers */, 6729A5701A69213A007D5872 /* color.hpp in Headers */, 6729A5801A69213A007D5872 /* glsl_func.hpp in Headers */, 6729A5761A69213A007D5872 /* dynamic_texture.hpp in Headers */, @@ -455,7 +458,6 @@ 6729A5AB1A69213A007D5872 /* texture.hpp in Headers */, 6729A57F1A69213A007D5872 /* glIncludes.hpp in Headers */, 6729A5A91A69213A007D5872 /* texture_of_colors.hpp in Headers */, - 3413E3401C0DCA4100D14D24 /* debug_rect_renderer.hpp in Headers */, 6729A5871A69213A007D5872 /* gpu_buffer.hpp in Headers */, 6729A56E1A69213A007D5872 /* buffer_base.hpp in Headers */, 6729A58F1A69213A007D5872 /* index_buffer.hpp in Headers */, @@ -521,7 +523,6 @@ files = ( 670D059D1B0CC8A70013A7AC /* shader_index.txt in Sources */, 6729A5711A69213A007D5872 /* cpu_buffer.cpp in Sources */, - 3413E33F1C0DCA4100D14D24 /* debug_rect_renderer.cpp in Sources */, 6729A5631A69213A007D5872 /* attribute_buffer_mutator.cpp in Sources */, 6729A56B1A69213A007D5872 /* binding_info.cpp in Sources */, 6729A5791A69213A007D5872 /* glconstants.cpp in Sources */, @@ -550,6 +551,7 @@ 6709472B1BDF9A4F005014C0 /* hw_texture.cpp in Sources */, 6729A5AA1A69213A007D5872 /* texture.cpp in Sources */, 6729A5771A69213A007D5872 /* font_texture.cpp in Sources */, + 347F32F91C45383E009758CC /* debug_rect_renderer.cpp in Sources */, 6729A58E1A69213A007D5872 /* index_buffer.cpp in Sources */, 6729A5A61A69213A007D5872 /* texture_manager.cpp in Sources */, 6729A5821A69213A007D5872 /* glstate.cpp in Sources */, diff --git a/xcode/geometry/geometry.xcodeproj/project.pbxproj b/xcode/geometry/geometry.xcodeproj/project.pbxproj index 3b99a61f20..ca573c0822 100644 --- a/xcode/geometry/geometry.xcodeproj/project.pbxproj +++ b/xcode/geometry/geometry.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 347F33701C454205009758CC /* triangle2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F336E1C454205009758CC /* triangle2d.cpp */; }; + 347F33711C454205009758CC /* triangle2d.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F336F1C454205009758CC /* triangle2d.hpp */; }; 670F296A1BA9D3C200F2ABF4 /* equality.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29291BA9D2E700F2ABF4 /* equality.hpp */; }; 670F296C1BA9D3C200F2ABF4 /* large_polygon.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F292B1BA9D2E700F2ABF4 /* large_polygon.hpp */; }; 670F297A1BA9D3C200F2ABF4 /* test_regions.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29391BA9D2E700F2ABF4 /* test_regions.hpp */; }; @@ -89,6 +91,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 347F336E1C454205009758CC /* triangle2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = triangle2d.cpp; sourceTree = ""; }; + 347F336F1C454205009758CC /* triangle2d.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = triangle2d.hpp; sourceTree = ""; }; 670D05A51B0E01FF0013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; 670F29221BA9D2E700F2ABF4 /* angle_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = angle_test.cpp; sourceTree = ""; }; 670F29231BA9D2E700F2ABF4 /* anyrect_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = anyrect_test.cpp; sourceTree = ""; }; @@ -250,6 +254,8 @@ 675344931A3F684600A0A8C3 /* geometry */ = { isa = PBXGroup; children = ( + 347F336E1C454205009758CC /* triangle2d.cpp */, + 347F336F1C454205009758CC /* triangle2d.hpp */, E92D8BD21C15AFAA00A98D17 /* mercator.cpp */, E92D8BD31C15AFAA00A98D17 /* mercator.hpp */, 6741AA9E1BF35476002C974C /* latlon.cpp */, @@ -319,6 +325,7 @@ 675344CA1A3F687400A0A8C3 /* polygon.hpp in Headers */, 675344C11A3F687400A0A8C3 /* covering_utils.hpp in Headers */, 675344C51A3F687400A0A8C3 /* distance.hpp in Headers */, + 347F33711C454205009758CC /* triangle2d.hpp in Headers */, 675344D71A3F687400A0A8C3 /* tree4d.hpp in Headers */, 675344CD1A3F687400A0A8C3 /* rect2d.hpp in Headers */, 675344C91A3F687400A0A8C3 /* pointu_to_uint64.hpp in Headers */, @@ -450,6 +457,7 @@ 675344CF1A3F687400A0A8C3 /* robust_orientation.cpp in Sources */, 675344D41A3F687400A0A8C3 /* spline.cpp in Sources */, 675344D11A3F687400A0A8C3 /* screenbase.cpp in Sources */, + 347F33701C454205009758CC /* triangle2d.cpp in Sources */, 675344BC1A3F687400A0A8C3 /* angles.cpp in Sources */, 6741AAA01BF35476002C974C /* latlon.cpp in Sources */, E92D8BD41C15AFAA00A98D17 /* mercator.cpp in Sources */, diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj index 4872e39dee..5abf1997e2 100644 --- a/xcode/indexer/indexer.xcodeproj/project.pbxproj +++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj @@ -9,7 +9,15 @@ /* Begin PBXBuildFile section */ 340DF9D01C1FF04D00B5C7EC /* osm_editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340DF9CF1C1FF04D00B5C7EC /* osm_editor.cpp */; }; 340DF9D21C1FF09400B5C7EC /* osm_editor.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 340DF9D11C1FF09400B5C7EC /* osm_editor.hpp */; }; - 670C610C1AB065B100C38A8C /* categories_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C60F91AB065B100C38A8C /* categories_test.cpp */; }; + 347F337B1C454242009758CC /* rank_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33721C454242009758CC /* rank_table.cpp */; }; + 347F337C1C454242009758CC /* rank_table.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33731C454242009758CC /* rank_table.hpp */; }; + 347F337D1C454242009758CC /* succinct_trie_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33741C454242009758CC /* succinct_trie_builder.hpp */; }; + 347F337E1C454242009758CC /* succinct_trie_reader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33751C454242009758CC /* succinct_trie_reader.hpp */; }; + 347F337F1C454242009758CC /* trie_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33761C454242009758CC /* trie_builder.hpp */; }; + 347F33801C454242009758CC /* trie_reader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33771C454242009758CC /* trie_reader.hpp */; }; + 347F33811C454242009758CC /* trie.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33781C454242009758CC /* trie.hpp */; }; + 347F33821C454242009758CC /* types_skipper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33791C454242009758CC /* types_skipper.cpp */; }; + 347F33831C454242009758CC /* types_skipper.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F337A1C454242009758CC /* types_skipper.hpp */; }; 670C610D1AB065B100C38A8C /* cell_coverer_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C60FA1AB065B100C38A8C /* cell_coverer_test.cpp */; }; 670C610E1AB065B100C38A8C /* cell_id_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C60FB1AB065B100C38A8C /* cell_id_test.cpp */; }; 670C610F1AB065B100C38A8C /* checker_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C60FC1AB065B100C38A8C /* checker_test.cpp */; }; @@ -19,7 +27,6 @@ 670C61131AB065B100C38A8C /* index_builder_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61001AB065B100C38A8C /* index_builder_test.cpp */; }; 670C61141AB065B100C38A8C /* index_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61011AB065B100C38A8C /* index_test.cpp */; }; 670C61151AB065B100C38A8C /* interval_index_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61021AB065B100C38A8C /* interval_index_test.cpp */; }; - 670C61161AB065B100C38A8C /* mercator_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61031AB065B100C38A8C /* mercator_test.cpp */; }; 670C61171AB065B100C38A8C /* mwm_set_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61041AB065B100C38A8C /* mwm_set_test.cpp */; }; 670C61181AB065B100C38A8C /* point_to_int64_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61051AB065B100C38A8C /* point_to_int64_test.cpp */; }; 670C61191AB065B100C38A8C /* scales_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61061AB065B100C38A8C /* scales_test.cpp */; }; @@ -42,9 +49,7 @@ 670C61561AB0689F00C38A8C /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C61551AB0689F00C38A8C /* libgeometry.a */; }; 670C615B1AB0691900C38A8C /* features_offsets_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61581AB0691900C38A8C /* features_offsets_table.cpp */; }; 670C615C1AB0691900C38A8C /* features_offsets_table.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670C61591AB0691900C38A8C /* features_offsets_table.hpp */; }; - 670C615D1AB0691900C38A8C /* search_index_values.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670C615A1AB0691900C38A8C /* search_index_values.hpp */; }; 670C620B1AC3550F00C38A8C /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C620A1AC3550F00C38A8C /* libopening_hours.a */; }; - 670C620D1AC59E6300C38A8C /* opening_hours_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C615E1AB0B02B00C38A8C /* opening_hours_test.cpp */; }; 670D04AB1B0BA8580013A7AC /* feature_loader_101.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670D04A81B0BA8580013A7AC /* feature_loader_101.cpp */; }; 670D04AC1B0BA8580013A7AC /* feature_loader_101.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670D04A91B0BA8580013A7AC /* feature_loader_101.hpp */; }; 670D04AD1B0BA8580013A7AC /* interval_index_101.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670D04AA1B0BA8580013A7AC /* interval_index_101.hpp */; }; @@ -55,8 +60,6 @@ 674125131B4C02F100A3E828 /* map_style_reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674125101B4C02F100A3E828 /* map_style_reader.cpp */; }; 674125141B4C02F100A3E828 /* map_style_reader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674125111B4C02F100A3E828 /* map_style_reader.hpp */; }; 674125151B4C02F100A3E828 /* map_style.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674125121B4C02F100A3E828 /* map_style.hpp */; }; - 675340FD1A3F540F00A0A8C3 /* categories_holder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340A81A3F540F00A0A8C3 /* categories_holder.cpp */; }; - 675340FE1A3F540F00A0A8C3 /* categories_holder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340A91A3F540F00A0A8C3 /* categories_holder.hpp */; }; 675340FF1A3F540F00A0A8C3 /* cell_coverer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340AA1A3F540F00A0A8C3 /* cell_coverer.hpp */; }; 675341001A3F540F00A0A8C3 /* cell_id.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340AB1A3F540F00A0A8C3 /* cell_id.hpp */; }; 675341011A3F540F00A0A8C3 /* classificator_loader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340AC1A3F540F00A0A8C3 /* classificator_loader.cpp */; }; @@ -111,8 +114,6 @@ 675341321A3F540F00A0A8C3 /* interval_index_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340DF1A3F540F00A0A8C3 /* interval_index_builder.hpp */; }; 675341331A3F540F00A0A8C3 /* interval_index_iface.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340E01A3F540F00A0A8C3 /* interval_index_iface.hpp */; }; 675341341A3F540F00A0A8C3 /* interval_index.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340E11A3F540F00A0A8C3 /* interval_index.hpp */; }; - 675341351A3F540F00A0A8C3 /* mercator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340E21A3F540F00A0A8C3 /* mercator.cpp */; }; - 675341361A3F540F00A0A8C3 /* mercator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340E31A3F540F00A0A8C3 /* mercator.hpp */; }; 675341371A3F540F00A0A8C3 /* mwm_set.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340E41A3F540F00A0A8C3 /* mwm_set.cpp */; }; 675341381A3F540F00A0A8C3 /* mwm_set.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340E51A3F540F00A0A8C3 /* mwm_set.hpp */; }; 6753413B1A3F540F00A0A8C3 /* point_to_int64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340E91A3F540F00A0A8C3 /* point_to_int64.cpp */; }; @@ -121,23 +122,15 @@ 6753413F1A3F540F00A0A8C3 /* scale_index.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340ED1A3F540F00A0A8C3 /* scale_index.hpp */; }; 675341401A3F540F00A0A8C3 /* scales.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340EE1A3F540F00A0A8C3 /* scales.cpp */; }; 675341411A3F540F00A0A8C3 /* scales.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340EF1A3F540F00A0A8C3 /* scales.hpp */; }; - 675341421A3F540F00A0A8C3 /* search_delimiters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340F01A3F540F00A0A8C3 /* search_delimiters.cpp */; }; - 675341431A3F540F00A0A8C3 /* search_delimiters.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340F11A3F540F00A0A8C3 /* search_delimiters.hpp */; }; - 675341441A3F540F00A0A8C3 /* search_index_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340F21A3F540F00A0A8C3 /* search_index_builder.cpp */; }; - 675341451A3F540F00A0A8C3 /* search_index_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340F31A3F540F00A0A8C3 /* search_index_builder.hpp */; }; - 675341461A3F540F00A0A8C3 /* search_string_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340F41A3F540F00A0A8C3 /* search_string_utils.cpp */; }; - 675341471A3F540F00A0A8C3 /* search_string_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340F51A3F540F00A0A8C3 /* search_string_utils.hpp */; }; - 675341481A3F540F00A0A8C3 /* search_trie.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340F61A3F540F00A0A8C3 /* search_trie.hpp */; }; - 6753414A1A3F540F00A0A8C3 /* string_file.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340F81A3F540F00A0A8C3 /* string_file.hpp */; }; 6753414B1A3F540F00A0A8C3 /* tesselator_decl.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340F91A3F540F00A0A8C3 /* tesselator_decl.hpp */; }; 6753414C1A3F540F00A0A8C3 /* tree_structure.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340FA1A3F540F00A0A8C3 /* tree_structure.hpp */; }; 6753414D1A3F540F00A0A8C3 /* types_mapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340FB1A3F540F00A0A8C3 /* types_mapping.cpp */; }; 6753414E1A3F540F00A0A8C3 /* types_mapping.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340FC1A3F540F00A0A8C3 /* types_mapping.hpp */; }; - 6758AED11BB4413000C26E27 /* drules_selector_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6758AECD1BB4413000C26E27 /* drules_selector_parser.cpp */; settings = {ASSET_TAGS = (); }; }; - 6758AED21BB4413000C26E27 /* drules_selector_parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6758AECE1BB4413000C26E27 /* drules_selector_parser.hpp */; settings = {ASSET_TAGS = (); }; }; - 6758AED31BB4413000C26E27 /* drules_selector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6758AECF1BB4413000C26E27 /* drules_selector.cpp */; settings = {ASSET_TAGS = (); }; }; - 6758AED41BB4413000C26E27 /* drules_selector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6758AED01BB4413000C26E27 /* drules_selector.hpp */; settings = {ASSET_TAGS = (); }; }; - 67F183731BD4FCF500AB1840 /* map_style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67F183721BD4FCF500AB1840 /* map_style.cpp */; settings = {ASSET_TAGS = (); }; }; + 6758AED11BB4413000C26E27 /* drules_selector_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6758AECD1BB4413000C26E27 /* drules_selector_parser.cpp */; }; + 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 */; }; + 67F183731BD4FCF500AB1840 /* map_style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67F183721BD4FCF500AB1840 /* map_style.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -155,7 +148,15 @@ /* Begin PBXFileReference section */ 340DF9CF1C1FF04D00B5C7EC /* osm_editor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = osm_editor.cpp; sourceTree = ""; }; 340DF9D11C1FF09400B5C7EC /* osm_editor.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = osm_editor.hpp; path = ../../indexer/osm_editor.hpp; sourceTree = ""; }; - 670C60F91AB065B100C38A8C /* categories_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = categories_test.cpp; sourceTree = ""; }; + 347F33721C454242009758CC /* rank_table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rank_table.cpp; sourceTree = ""; }; + 347F33731C454242009758CC /* rank_table.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = rank_table.hpp; sourceTree = ""; }; + 347F33741C454242009758CC /* succinct_trie_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = succinct_trie_builder.hpp; sourceTree = ""; }; + 347F33751C454242009758CC /* succinct_trie_reader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = succinct_trie_reader.hpp; sourceTree = ""; }; + 347F33761C454242009758CC /* trie_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = trie_builder.hpp; sourceTree = ""; }; + 347F33771C454242009758CC /* trie_reader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = trie_reader.hpp; sourceTree = ""; }; + 347F33781C454242009758CC /* trie.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = trie.hpp; sourceTree = ""; }; + 347F33791C454242009758CC /* types_skipper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = types_skipper.cpp; sourceTree = ""; }; + 347F337A1C454242009758CC /* types_skipper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = types_skipper.hpp; sourceTree = ""; }; 670C60FA1AB065B100C38A8C /* cell_coverer_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cell_coverer_test.cpp; sourceTree = ""; }; 670C60FB1AB065B100C38A8C /* cell_id_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cell_id_test.cpp; sourceTree = ""; }; 670C60FC1AB065B100C38A8C /* checker_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = checker_test.cpp; sourceTree = ""; }; @@ -165,7 +166,6 @@ 670C61001AB065B100C38A8C /* index_builder_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = index_builder_test.cpp; sourceTree = ""; }; 670C61011AB065B100C38A8C /* index_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = index_test.cpp; sourceTree = ""; }; 670C61021AB065B100C38A8C /* interval_index_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = interval_index_test.cpp; sourceTree = ""; }; - 670C61031AB065B100C38A8C /* mercator_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mercator_test.cpp; sourceTree = ""; }; 670C61041AB065B100C38A8C /* mwm_set_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_set_test.cpp; sourceTree = ""; }; 670C61051AB065B100C38A8C /* point_to_int64_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = point_to_int64_test.cpp; sourceTree = ""; }; 670C61061AB065B100C38A8C /* scales_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scales_test.cpp; sourceTree = ""; }; @@ -189,8 +189,6 @@ 670C61551AB0689F00C38A8C /* libgeometry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgeometry.a; path = "../../../Library/Developer/Xcode/DerivedData/omim-baysrswfihipzadzzkpyheldfppg/Build/Products/Debug/libgeometry.a"; sourceTree = ""; }; 670C61581AB0691900C38A8C /* features_offsets_table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_offsets_table.cpp; sourceTree = ""; }; 670C61591AB0691900C38A8C /* features_offsets_table.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_offsets_table.hpp; sourceTree = ""; }; - 670C615A1AB0691900C38A8C /* search_index_values.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_index_values.hpp; sourceTree = ""; }; - 670C615E1AB0B02B00C38A8C /* opening_hours_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = opening_hours_test.cpp; sourceTree = ""; }; 670C620A1AC3550F00C38A8C /* libopening_hours.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopening_hours.a; path = ../opening_hours/build/Debug/libopening_hours.a; sourceTree = ""; }; 670D04A81B0BA8580013A7AC /* feature_loader_101.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_loader_101.cpp; sourceTree = ""; }; 670D04A91B0BA8580013A7AC /* feature_loader_101.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = feature_loader_101.hpp; sourceTree = ""; }; @@ -204,8 +202,6 @@ 674125111B4C02F100A3E828 /* map_style_reader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = map_style_reader.hpp; sourceTree = ""; }; 674125121B4C02F100A3E828 /* map_style.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = map_style.hpp; sourceTree = ""; }; 6753409A1A3F53CB00A0A8C3 /* libindexer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libindexer.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 675340A81A3F540F00A0A8C3 /* categories_holder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = categories_holder.cpp; sourceTree = ""; }; - 675340A91A3F540F00A0A8C3 /* categories_holder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = categories_holder.hpp; sourceTree = ""; }; 675340AA1A3F540F00A0A8C3 /* cell_coverer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cell_coverer.hpp; sourceTree = ""; }; 675340AB1A3F540F00A0A8C3 /* cell_id.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cell_id.hpp; sourceTree = ""; }; 675340AC1A3F540F00A0A8C3 /* classificator_loader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = classificator_loader.cpp; sourceTree = ""; }; @@ -261,8 +257,6 @@ 675340DF1A3F540F00A0A8C3 /* interval_index_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = interval_index_builder.hpp; sourceTree = ""; }; 675340E01A3F540F00A0A8C3 /* interval_index_iface.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = interval_index_iface.hpp; sourceTree = ""; }; 675340E11A3F540F00A0A8C3 /* interval_index.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = interval_index.hpp; sourceTree = ""; }; - 675340E21A3F540F00A0A8C3 /* mercator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mercator.cpp; sourceTree = ""; }; - 675340E31A3F540F00A0A8C3 /* mercator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mercator.hpp; sourceTree = ""; }; 675340E41A3F540F00A0A8C3 /* mwm_set.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_set.cpp; sourceTree = ""; }; 675340E51A3F540F00A0A8C3 /* mwm_set.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_set.hpp; sourceTree = ""; }; 675340E91A3F540F00A0A8C3 /* point_to_int64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = point_to_int64.cpp; sourceTree = ""; }; @@ -271,14 +265,6 @@ 675340ED1A3F540F00A0A8C3 /* scale_index.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = scale_index.hpp; sourceTree = ""; }; 675340EE1A3F540F00A0A8C3 /* scales.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scales.cpp; sourceTree = ""; }; 675340EF1A3F540F00A0A8C3 /* scales.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = scales.hpp; sourceTree = ""; }; - 675340F01A3F540F00A0A8C3 /* search_delimiters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_delimiters.cpp; sourceTree = ""; }; - 675340F11A3F540F00A0A8C3 /* search_delimiters.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_delimiters.hpp; sourceTree = ""; }; - 675340F21A3F540F00A0A8C3 /* search_index_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_index_builder.cpp; sourceTree = ""; }; - 675340F31A3F540F00A0A8C3 /* search_index_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_index_builder.hpp; sourceTree = ""; }; - 675340F41A3F540F00A0A8C3 /* search_string_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_string_utils.cpp; sourceTree = ""; }; - 675340F51A3F540F00A0A8C3 /* search_string_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_string_utils.hpp; sourceTree = ""; }; - 675340F61A3F540F00A0A8C3 /* search_trie.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_trie.hpp; sourceTree = ""; }; - 675340F81A3F540F00A0A8C3 /* string_file.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = string_file.hpp; sourceTree = ""; }; 675340F91A3F540F00A0A8C3 /* tesselator_decl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = tesselator_decl.hpp; sourceTree = ""; }; 675340FA1A3F540F00A0A8C3 /* tree_structure.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = tree_structure.hpp; sourceTree = ""; }; 675340FB1A3F540F00A0A8C3 /* types_mapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = types_mapping.cpp; sourceTree = ""; }; @@ -324,7 +310,6 @@ children = ( 670C61571AB068C100C38A8C /* Libs */, 670C611F1AB065E100C38A8C /* testingmain.cpp */, - 670C60F91AB065B100C38A8C /* categories_test.cpp */, 670C60FA1AB065B100C38A8C /* cell_coverer_test.cpp */, 670C60FB1AB065B100C38A8C /* cell_id_test.cpp */, 670C60FC1AB065B100C38A8C /* checker_test.cpp */, @@ -334,7 +319,6 @@ 670C61001AB065B100C38A8C /* index_builder_test.cpp */, 670C61011AB065B100C38A8C /* index_test.cpp */, 670C61021AB065B100C38A8C /* interval_index_test.cpp */, - 670C61031AB065B100C38A8C /* mercator_test.cpp */, 670C61041AB065B100C38A8C /* mwm_set_test.cpp */, 670C61051AB065B100C38A8C /* point_to_int64_test.cpp */, 670C61061AB065B100C38A8C /* scales_test.cpp */, @@ -343,7 +327,6 @@ 670C61091AB065B100C38A8C /* test_polylines.hpp */, 670C610A1AB065B100C38A8C /* test_type.cpp */, 670C610B1AB065B100C38A8C /* visibility_test.cpp */, - 670C615E1AB0B02B00C38A8C /* opening_hours_test.cpp */, ); name = indexer_tests; path = ../../indexer/indexer_tests; @@ -401,6 +384,15 @@ 6753409C1A3F53CB00A0A8C3 /* indexer */ = { isa = PBXGroup; children = ( + 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 */, + 347F33791C454242009758CC /* types_skipper.cpp */, + 347F337A1C454242009758CC /* types_skipper.hpp */, 670D04A71B0BA8410013A7AC /* old */, 6758AECD1BB4413000C26E27 /* drules_selector_parser.cpp */, 6758AECE1BB4413000C26E27 /* drules_selector_parser.hpp */, @@ -412,9 +404,6 @@ 67F183721BD4FCF500AB1840 /* map_style.cpp */, 670C61581AB0691900C38A8C /* features_offsets_table.cpp */, 670C61591AB0691900C38A8C /* features_offsets_table.hpp */, - 670C615A1AB0691900C38A8C /* search_index_values.hpp */, - 675340A81A3F540F00A0A8C3 /* categories_holder.cpp */, - 675340A91A3F540F00A0A8C3 /* categories_holder.hpp */, 675340AA1A3F540F00A0A8C3 /* cell_coverer.hpp */, 675340AB1A3F540F00A0A8C3 /* cell_id.hpp */, 675340AC1A3F540F00A0A8C3 /* classificator_loader.cpp */, @@ -473,8 +462,6 @@ 675340DF1A3F540F00A0A8C3 /* interval_index_builder.hpp */, 675340E01A3F540F00A0A8C3 /* interval_index_iface.hpp */, 675340E11A3F540F00A0A8C3 /* interval_index.hpp */, - 675340E21A3F540F00A0A8C3 /* mercator.cpp */, - 675340E31A3F540F00A0A8C3 /* mercator.hpp */, 675340E41A3F540F00A0A8C3 /* mwm_set.cpp */, 675340E51A3F540F00A0A8C3 /* mwm_set.hpp */, 340DF9CF1C1FF04D00B5C7EC /* osm_editor.cpp */, @@ -484,14 +471,6 @@ 675340ED1A3F540F00A0A8C3 /* scale_index.hpp */, 675340EE1A3F540F00A0A8C3 /* scales.cpp */, 675340EF1A3F540F00A0A8C3 /* scales.hpp */, - 675340F01A3F540F00A0A8C3 /* search_delimiters.cpp */, - 675340F11A3F540F00A0A8C3 /* search_delimiters.hpp */, - 675340F21A3F540F00A0A8C3 /* search_index_builder.cpp */, - 675340F31A3F540F00A0A8C3 /* search_index_builder.hpp */, - 675340F41A3F540F00A0A8C3 /* search_string_utils.cpp */, - 675340F51A3F540F00A0A8C3 /* search_string_utils.hpp */, - 675340F61A3F540F00A0A8C3 /* search_trie.hpp */, - 675340F81A3F540F00A0A8C3 /* string_file.hpp */, 675340F91A3F540F00A0A8C3 /* tesselator_decl.hpp */, 675340FA1A3F540F00A0A8C3 /* tree_structure.hpp */, 675340FB1A3F540F00A0A8C3 /* types_mapping.cpp */, @@ -509,8 +488,8 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 675341361A3F540F00A0A8C3 /* mercator.hpp in Headers */, 6753414E1A3F540F00A0A8C3 /* types_mapping.hpp in Headers */, + 347F33831C454242009758CC /* types_skipper.hpp in Headers */, 6753411F1A3F540F00A0A8C3 /* feature_loader.hpp in Headers */, 675341151A3F540F00A0A8C3 /* feature_covering.hpp in Headers */, 674125151B4C02F100A3E828 /* map_style.hpp in Headers */, @@ -518,19 +497,15 @@ 675341201A3F540F00A0A8C3 /* feature_processor.hpp in Headers */, 675341341A3F540F00A0A8C3 /* interval_index.hpp in Headers */, 675341241A3F540F00A0A8C3 /* feature_visibility.hpp in Headers */, - 6753414A1A3F540F00A0A8C3 /* string_file.hpp in Headers */, 6753411D1A3F540F00A0A8C3 /* feature_loader_base.hpp in Headers */, - 675340FE1A3F540F00A0A8C3 /* categories_holder.hpp in Headers */, - 675341471A3F540F00A0A8C3 /* search_string_utils.hpp in Headers */, 675341131A3F540F00A0A8C3 /* feature_algo.hpp in Headers */, - 675341431A3F540F00A0A8C3 /* search_delimiters.hpp in Headers */, 6726C1D21A49DAAC005EEA39 /* feature_meta.hpp in Headers */, + 347F337F1C454242009758CC /* trie_builder.hpp in Headers */, 6753412D1A3F540F00A0A8C3 /* geometry_serialization.hpp in Headers */, 6753414C1A3F540F00A0A8C3 /* tree_structure.hpp in Headers */, + 347F337D1C454242009758CC /* succinct_trie_builder.hpp in Headers */, 675341381A3F540F00A0A8C3 /* mwm_set.hpp in Headers */, - 675341451A3F540F00A0A8C3 /* search_index_builder.hpp in Headers */, 670EE56D1B60033A001E8064 /* unique_index.hpp in Headers */, - 675341481A3F540F00A0A8C3 /* search_trie.hpp in Headers */, 6753412B1A3F540F00A0A8C3 /* geometry_coding.hpp in Headers */, 675340FF1A3F540F00A0A8C3 /* cell_coverer.hpp in Headers */, 6753410C1A3F540F00A0A8C3 /* drawing_rule_def.hpp in Headers */, @@ -547,14 +522,17 @@ 6758AED41BB4413000C26E27 /* drules_selector.hpp in Headers */, 675341061A3F540F00A0A8C3 /* coding_params.hpp in Headers */, 6753412F1A3F540F00A0A8C3 /* index_builder.hpp in Headers */, - 670C615D1AB0691900C38A8C /* search_index_values.hpp in Headers */, 675341411A3F540F00A0A8C3 /* scales.hpp in Headers */, 675341321A3F540F00A0A8C3 /* interval_index_builder.hpp in Headers */, + 347F337C1C454242009758CC /* rank_table.hpp in Headers */, 6753414B1A3F540F00A0A8C3 /* tesselator_decl.hpp in Headers */, + 347F33801C454242009758CC /* trie_reader.hpp in Headers */, 675341191A3F540F00A0A8C3 /* feature_decl.hpp in Headers */, 674125141B4C02F100A3E828 /* map_style_reader.hpp in Headers */, 675341221A3F540F00A0A8C3 /* feature_utils.hpp in Headers */, + 347F337E1C454242009758CC /* succinct_trie_reader.hpp in Headers */, 675341171A3F540F00A0A8C3 /* feature_data.hpp in Headers */, + 347F33811C454242009758CC /* trie.hpp in Headers */, 6753410F1A3F540F00A0A8C3 /* drules_include.hpp in Headers */, 675341311A3F540F00A0A8C3 /* index.hpp in Headers */, 670C611C1AB065B100C38A8C /* test_polylines.hpp in Headers */, @@ -646,7 +624,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 670C620D1AC59E6300C38A8C /* opening_hours_test.cpp in Sources */, 670C612C1AB0663400C38A8C /* testingmain.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -657,17 +634,12 @@ files = ( 340DF9D21C1FF09400B5C7EC /* osm_editor.hpp in Sources */, 340DF9D01C1FF04D00B5C7EC /* osm_editor.cpp in Sources */, - 670C610C1AB065B100C38A8C /* categories_test.cpp in Sources */, 67F183731BD4FCF500AB1840 /* map_style.cpp in Sources */, - 675341461A3F540F00A0A8C3 /* search_string_utils.cpp in Sources */, 670D04AB1B0BA8580013A7AC /* feature_loader_101.cpp in Sources */, 6758AED31BB4413000C26E27 /* drules_selector.cpp in Sources */, 6753411A1A3F540F00A0A8C3 /* feature_impl.cpp in Sources */, 670C61111AB065B100C38A8C /* geometry_coding_test.cpp in Sources */, - 675341351A3F540F00A0A8C3 /* mercator.cpp in Sources */, 6753410D1A3F540F00A0A8C3 /* drawing_rules.cpp in Sources */, - 670C61161AB065B100C38A8C /* mercator_test.cpp in Sources */, - 675341421A3F540F00A0A8C3 /* search_delimiters.cpp in Sources */, 670C611E1AB065B100C38A8C /* visibility_test.cpp in Sources */, 675341301A3F540F00A0A8C3 /* index.cpp in Sources */, 6753414D1A3F540F00A0A8C3 /* types_mapping.cpp in Sources */, @@ -678,7 +650,9 @@ 670C61151AB065B100C38A8C /* interval_index_test.cpp in Sources */, 670C61121AB065B100C38A8C /* geometry_serialization_test.cpp in Sources */, 675341231A3F540F00A0A8C3 /* feature_visibility.cpp in Sources */, + 347F337B1C454242009758CC /* rank_table.cpp in Sources */, 670C610F1AB065B100C38A8C /* checker_test.cpp in Sources */, + 347F33821C454242009758CC /* types_skipper.cpp in Sources */, 675341161A3F540F00A0A8C3 /* feature_data.cpp in Sources */, 675341031A3F540F00A0A8C3 /* classificator.cpp in Sources */, 670C61201AB065E100C38A8C /* testingmain.cpp in Sources */, @@ -711,9 +685,7 @@ 670C61141AB065B100C38A8C /* index_test.cpp in Sources */, 670C615B1AB0691900C38A8C /* features_offsets_table.cpp in Sources */, 675341281A3F540F00A0A8C3 /* ftypes_matcher.cpp in Sources */, - 675341441A3F540F00A0A8C3 /* search_index_builder.cpp in Sources */, 675341101A3F540F00A0A8C3 /* drules_struct.pb.cc in Sources */, - 675340FD1A3F540F00A0A8C3 /* categories_holder.cpp in Sources */, 6758AED11BB4413000C26E27 /* drules_selector_parser.cpp in Sources */, 6753413B1A3F540F00A0A8C3 /* point_to_int64.cpp in Sources */, ); diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj index 743209ffa8..06d64bd8bb 100644 --- a/xcode/search/search.xcodeproj/project.pbxproj +++ b/xcode/search/search.xcodeproj/project.pbxproj @@ -7,6 +7,57 @@ objects = { /* Begin PBXBuildFile section */ + 347F33161C4540A8009758CC /* cancel_exception.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F32FB1C4540A8009758CC /* cancel_exception.hpp */; }; + 347F33171C4540A8009758CC /* categories_holder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F32FC1C4540A8009758CC /* categories_holder.cpp */; }; + 347F33181C4540A8009758CC /* categories_holder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F32FD1C4540A8009758CC /* categories_holder.hpp */; }; + 347F33191C4540A8009758CC /* dummy_rank_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F32FE1C4540A8009758CC /* dummy_rank_table.cpp */; }; + 347F331A1C4540A8009758CC /* dummy_rank_table.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F32FF1C4540A8009758CC /* dummy_rank_table.hpp */; }; + 347F331B1C4540A8009758CC /* interval_set.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33001C4540A8009758CC /* interval_set.hpp */; }; + 347F331C1C4540A8009758CC /* locality.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33011C4540A8009758CC /* locality.cpp */; }; + 347F331D1C4540A8009758CC /* locality.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33021C4540A8009758CC /* locality.hpp */; }; + 347F331E1C4540A8009758CC /* mwm_traits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33031C4540A8009758CC /* mwm_traits.cpp */; }; + 347F331F1C4540A8009758CC /* mwm_traits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33041C4540A8009758CC /* mwm_traits.hpp */; }; + 347F33201C4540A8009758CC /* projection_on_street.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33051C4540A8009758CC /* projection_on_street.cpp */; }; + 347F33211C4540A8009758CC /* projection_on_street.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33061C4540A8009758CC /* projection_on_street.hpp */; }; + 347F33221C4540A8009758CC /* region.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33071C4540A8009758CC /* region.cpp */; }; + 347F33231C4540A8009758CC /* region.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33081C4540A8009758CC /* region.hpp */; }; + 347F33241C4540A8009758CC /* retrieval.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33091C4540A8009758CC /* retrieval.cpp */; }; + 347F33251C4540A8009758CC /* retrieval.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F330A1C4540A8009758CC /* retrieval.hpp */; }; + 347F33261C4540A8009758CC /* reverse_geocoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F330B1C4540A8009758CC /* reverse_geocoder.cpp */; }; + 347F33271C4540A8009758CC /* reverse_geocoder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F330C1C4540A8009758CC /* reverse_geocoder.hpp */; }; + 347F33281C4540A8009758CC /* search_delimiters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F330D1C4540A8009758CC /* search_delimiters.cpp */; }; + 347F33291C4540A8009758CC /* search_delimiters.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F330E1C4540A8009758CC /* search_delimiters.hpp */; }; + 347F332A1C4540A8009758CC /* search_index_values.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F330F1C4540A8009758CC /* search_index_values.hpp */; }; + 347F332B1C4540A8009758CC /* search_query_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33101C4540A8009758CC /* search_query_base.cpp */; }; + 347F332C1C4540A8009758CC /* search_query_base.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33111C4540A8009758CC /* search_query_base.hpp */; }; + 347F332D1C4540A8009758CC /* search_string_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33121C4540A8009758CC /* search_string_utils.cpp */; }; + 347F332E1C4540A8009758CC /* search_string_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33131C4540A8009758CC /* search_string_utils.hpp */; }; + 347F332F1C4540A8009758CC /* search_trie.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33141C4540A8009758CC /* search_trie.hpp */; }; + 347F33301C4540A8009758CC /* suggest.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33151C4540A8009758CC /* suggest.hpp */; }; + 347F33561C45413C009758CC /* features_filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F333E1C45413C009758CC /* features_filter.cpp */; }; + 347F33571C45413C009758CC /* features_filter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F333F1C45413C009758CC /* features_filter.hpp */; }; + 347F33581C45413C009758CC /* features_layer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33401C45413C009758CC /* features_layer.cpp */; }; + 347F33591C45413C009758CC /* features_layer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33411C45413C009758CC /* features_layer.hpp */; }; + 347F335A1C45413C009758CC /* features_layer_matcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33421C45413C009758CC /* features_layer_matcher.cpp */; }; + 347F335B1C45413C009758CC /* features_layer_matcher.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33431C45413C009758CC /* features_layer_matcher.hpp */; }; + 347F335C1C45413C009758CC /* features_layer_path_finder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33441C45413C009758CC /* features_layer_path_finder.cpp */; }; + 347F335D1C45413C009758CC /* features_layer_path_finder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33451C45413C009758CC /* features_layer_path_finder.hpp */; }; + 347F335E1C45413C009758CC /* geocoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33461C45413C009758CC /* geocoder.cpp */; }; + 347F335F1C45413C009758CC /* geocoder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33471C45413C009758CC /* geocoder.hpp */; }; + 347F33601C45413C009758CC /* house_numbers_matcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33481C45413C009758CC /* house_numbers_matcher.cpp */; }; + 347F33611C45413C009758CC /* house_numbers_matcher.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33491C45413C009758CC /* house_numbers_matcher.hpp */; }; + 347F33621C45413C009758CC /* house_to_street_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F334A1C45413C009758CC /* house_to_street_table.cpp */; }; + 347F33631C45413C009758CC /* house_to_street_table.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F334B1C45413C009758CC /* house_to_street_table.hpp */; }; + 347F33641C45413C009758CC /* mwm_context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F334C1C45413C009758CC /* mwm_context.cpp */; }; + 347F33651C45413C009758CC /* mwm_context.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F334D1C45413C009758CC /* mwm_context.hpp */; }; + 347F33661C45413C009758CC /* rank_table_cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F334E1C45413C009758CC /* rank_table_cache.cpp */; }; + 347F33671C45413C009758CC /* rank_table_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F334F1C45413C009758CC /* rank_table_cache.hpp */; }; + 347F33681C45413C009758CC /* search_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33501C45413C009758CC /* search_model.cpp */; }; + 347F33691C45413C009758CC /* search_model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33511C45413C009758CC /* search_model.hpp */; }; + 347F336A1C45413C009758CC /* search_query_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33521C45413C009758CC /* search_query_v2.cpp */; }; + 347F336B1C45413C009758CC /* search_query_v2.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33531C45413C009758CC /* search_query_v2.hpp */; }; + 347F336C1C45413C009758CC /* street_vicinity_loader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33541C45413C009758CC /* street_vicinity_loader.cpp */; }; + 347F336D1C45413C009758CC /* street_vicinity_loader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33551C45413C009758CC /* street_vicinity_loader.hpp */; }; 670EE5631B600255001E8064 /* search_query_factory.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670EE5601B600255001E8064 /* search_query_factory.hpp */; }; 670EE5641B600255001E8064 /* search_query_params.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670EE5611B600255001E8064 /* search_query_params.cpp */; }; 670EE5651B600255001E8064 /* search_query_params.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670EE5621B600255001E8064 /* search_query_params.hpp */; }; @@ -77,6 +128,57 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 347F32FB1C4540A8009758CC /* cancel_exception.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cancel_exception.hpp; sourceTree = ""; }; + 347F32FC1C4540A8009758CC /* categories_holder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = categories_holder.cpp; sourceTree = ""; }; + 347F32FD1C4540A8009758CC /* categories_holder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = categories_holder.hpp; sourceTree = ""; }; + 347F32FE1C4540A8009758CC /* dummy_rank_table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dummy_rank_table.cpp; sourceTree = ""; }; + 347F32FF1C4540A8009758CC /* dummy_rank_table.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = dummy_rank_table.hpp; sourceTree = ""; }; + 347F33001C4540A8009758CC /* interval_set.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = interval_set.hpp; sourceTree = ""; }; + 347F33011C4540A8009758CC /* locality.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locality.cpp; sourceTree = ""; }; + 347F33021C4540A8009758CC /* locality.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = locality.hpp; sourceTree = ""; }; + 347F33031C4540A8009758CC /* mwm_traits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_traits.cpp; sourceTree = ""; }; + 347F33041C4540A8009758CC /* mwm_traits.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_traits.hpp; sourceTree = ""; }; + 347F33051C4540A8009758CC /* projection_on_street.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = projection_on_street.cpp; sourceTree = ""; }; + 347F33061C4540A8009758CC /* projection_on_street.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = projection_on_street.hpp; sourceTree = ""; }; + 347F33071C4540A8009758CC /* region.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = region.cpp; sourceTree = ""; }; + 347F33081C4540A8009758CC /* region.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = region.hpp; sourceTree = ""; }; + 347F33091C4540A8009758CC /* retrieval.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = retrieval.cpp; sourceTree = ""; }; + 347F330A1C4540A8009758CC /* retrieval.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = retrieval.hpp; sourceTree = ""; }; + 347F330B1C4540A8009758CC /* reverse_geocoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = reverse_geocoder.cpp; sourceTree = ""; }; + 347F330C1C4540A8009758CC /* reverse_geocoder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = reverse_geocoder.hpp; sourceTree = ""; }; + 347F330D1C4540A8009758CC /* search_delimiters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_delimiters.cpp; sourceTree = ""; }; + 347F330E1C4540A8009758CC /* search_delimiters.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_delimiters.hpp; sourceTree = ""; }; + 347F330F1C4540A8009758CC /* search_index_values.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_index_values.hpp; sourceTree = ""; }; + 347F33101C4540A8009758CC /* search_query_base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_query_base.cpp; sourceTree = ""; }; + 347F33111C4540A8009758CC /* search_query_base.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_query_base.hpp; sourceTree = ""; }; + 347F33121C4540A8009758CC /* search_string_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_string_utils.cpp; sourceTree = ""; }; + 347F33131C4540A8009758CC /* search_string_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_string_utils.hpp; sourceTree = ""; }; + 347F33141C4540A8009758CC /* search_trie.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_trie.hpp; sourceTree = ""; }; + 347F33151C4540A8009758CC /* suggest.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = suggest.hpp; sourceTree = ""; }; + 347F333E1C45413C009758CC /* features_filter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_filter.cpp; sourceTree = ""; }; + 347F333F1C45413C009758CC /* features_filter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_filter.hpp; sourceTree = ""; }; + 347F33401C45413C009758CC /* features_layer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_layer.cpp; sourceTree = ""; }; + 347F33411C45413C009758CC /* features_layer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_layer.hpp; sourceTree = ""; }; + 347F33421C45413C009758CC /* features_layer_matcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_layer_matcher.cpp; sourceTree = ""; }; + 347F33431C45413C009758CC /* features_layer_matcher.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_layer_matcher.hpp; sourceTree = ""; }; + 347F33441C45413C009758CC /* features_layer_path_finder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_layer_path_finder.cpp; sourceTree = ""; }; + 347F33451C45413C009758CC /* features_layer_path_finder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_layer_path_finder.hpp; sourceTree = ""; }; + 347F33461C45413C009758CC /* geocoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = geocoder.cpp; sourceTree = ""; }; + 347F33471C45413C009758CC /* geocoder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = geocoder.hpp; sourceTree = ""; }; + 347F33481C45413C009758CC /* house_numbers_matcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = house_numbers_matcher.cpp; sourceTree = ""; }; + 347F33491C45413C009758CC /* house_numbers_matcher.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = house_numbers_matcher.hpp; sourceTree = ""; }; + 347F334A1C45413C009758CC /* house_to_street_table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = house_to_street_table.cpp; sourceTree = ""; }; + 347F334B1C45413C009758CC /* house_to_street_table.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = house_to_street_table.hpp; sourceTree = ""; }; + 347F334C1C45413C009758CC /* mwm_context.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_context.cpp; sourceTree = ""; }; + 347F334D1C45413C009758CC /* mwm_context.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_context.hpp; sourceTree = ""; }; + 347F334E1C45413C009758CC /* rank_table_cache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rank_table_cache.cpp; sourceTree = ""; }; + 347F334F1C45413C009758CC /* rank_table_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = rank_table_cache.hpp; sourceTree = ""; }; + 347F33501C45413C009758CC /* search_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_model.cpp; sourceTree = ""; }; + 347F33511C45413C009758CC /* search_model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_model.hpp; sourceTree = ""; }; + 347F33521C45413C009758CC /* search_query_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_query_v2.cpp; sourceTree = ""; }; + 347F33531C45413C009758CC /* search_query_v2.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_query_v2.hpp; sourceTree = ""; }; + 347F33541C45413C009758CC /* street_vicinity_loader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = street_vicinity_loader.cpp; sourceTree = ""; }; + 347F33551C45413C009758CC /* street_vicinity_loader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = street_vicinity_loader.hpp; sourceTree = ""; }; 670D05A31B0DF3C30013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; 670EE5601B600255001E8064 /* search_query_factory.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_query_factory.hpp; sourceTree = ""; }; 670EE5611B600255001E8064 /* search_query_params.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_query_params.cpp; sourceTree = ""; }; @@ -166,6 +268,37 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 347F333D1C45413C009758CC /* v2 */ = { + isa = PBXGroup; + children = ( + 347F333E1C45413C009758CC /* features_filter.cpp */, + 347F333F1C45413C009758CC /* features_filter.hpp */, + 347F33401C45413C009758CC /* features_layer.cpp */, + 347F33411C45413C009758CC /* features_layer.hpp */, + 347F33421C45413C009758CC /* features_layer_matcher.cpp */, + 347F33431C45413C009758CC /* features_layer_matcher.hpp */, + 347F33441C45413C009758CC /* features_layer_path_finder.cpp */, + 347F33451C45413C009758CC /* features_layer_path_finder.hpp */, + 347F33461C45413C009758CC /* geocoder.cpp */, + 347F33471C45413C009758CC /* geocoder.hpp */, + 347F33481C45413C009758CC /* house_numbers_matcher.cpp */, + 347F33491C45413C009758CC /* house_numbers_matcher.hpp */, + 347F334A1C45413C009758CC /* house_to_street_table.cpp */, + 347F334B1C45413C009758CC /* house_to_street_table.hpp */, + 347F334C1C45413C009758CC /* mwm_context.cpp */, + 347F334D1C45413C009758CC /* mwm_context.hpp */, + 347F334E1C45413C009758CC /* rank_table_cache.cpp */, + 347F334F1C45413C009758CC /* rank_table_cache.hpp */, + 347F33501C45413C009758CC /* search_model.cpp */, + 347F33511C45413C009758CC /* search_model.hpp */, + 347F33521C45413C009758CC /* search_query_v2.cpp */, + 347F33531C45413C009758CC /* search_query_v2.hpp */, + 347F33541C45413C009758CC /* street_vicinity_loader.cpp */, + 347F33551C45413C009758CC /* street_vicinity_loader.hpp */, + ); + path = v2; + sourceTree = ""; + }; 670D04A61B0B94F90013A7AC /* libs */ = { isa = PBXGroup; children = ( @@ -225,6 +358,34 @@ 675346B21A4055CF00A0A8C3 /* search */ = { isa = PBXGroup; children = ( + 347F333D1C45413C009758CC /* v2 */, + 347F32FB1C4540A8009758CC /* cancel_exception.hpp */, + 347F32FC1C4540A8009758CC /* categories_holder.cpp */, + 347F32FD1C4540A8009758CC /* categories_holder.hpp */, + 347F32FE1C4540A8009758CC /* dummy_rank_table.cpp */, + 347F32FF1C4540A8009758CC /* dummy_rank_table.hpp */, + 347F33001C4540A8009758CC /* interval_set.hpp */, + 347F33011C4540A8009758CC /* locality.cpp */, + 347F33021C4540A8009758CC /* locality.hpp */, + 347F33031C4540A8009758CC /* mwm_traits.cpp */, + 347F33041C4540A8009758CC /* mwm_traits.hpp */, + 347F33051C4540A8009758CC /* projection_on_street.cpp */, + 347F33061C4540A8009758CC /* projection_on_street.hpp */, + 347F33071C4540A8009758CC /* region.cpp */, + 347F33081C4540A8009758CC /* region.hpp */, + 347F33091C4540A8009758CC /* retrieval.cpp */, + 347F330A1C4540A8009758CC /* retrieval.hpp */, + 347F330B1C4540A8009758CC /* reverse_geocoder.cpp */, + 347F330C1C4540A8009758CC /* reverse_geocoder.hpp */, + 347F330D1C4540A8009758CC /* search_delimiters.cpp */, + 347F330E1C4540A8009758CC /* search_delimiters.hpp */, + 347F330F1C4540A8009758CC /* search_index_values.hpp */, + 347F33101C4540A8009758CC /* search_query_base.cpp */, + 347F33111C4540A8009758CC /* search_query_base.hpp */, + 347F33121C4540A8009758CC /* search_string_utils.cpp */, + 347F33131C4540A8009758CC /* search_string_utils.hpp */, + 347F33141C4540A8009758CC /* search_trie.hpp */, + 347F33151C4540A8009758CC /* suggest.hpp */, A1347D4F1B8758C3009050FF /* query_saver.cpp */, A1347D501B8758C3009050FF /* query_saver.hpp */, 675346BE1A40560D00A0A8C3 /* algos.hpp */, @@ -271,26 +432,54 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 347F332C1C4540A8009758CC /* search_query_base.hpp in Headers */, 675346F01A40560D00A0A8C3 /* params.hpp in Headers */, + 347F331D1C4540A8009758CC /* locality.hpp in Headers */, 675346F81A40560D00A0A8C3 /* search_string_intersection.hpp in Headers */, + 347F33671C45413C009758CC /* rank_table_cache.hpp in Headers */, + 347F332F1C4540A8009758CC /* search_trie.hpp in Headers */, 670EE5631B600255001E8064 /* search_query_factory.hpp in Headers */, 675346F71A40560D00A0A8C3 /* search_query.hpp in Headers */, 675346E11A40560D00A0A8C3 /* geometry_utils.hpp in Headers */, 675346E31A40560D00A0A8C3 /* house_detector.hpp in Headers */, 675346E61A40560D00A0A8C3 /* intermediate_result.hpp in Headers */, + 347F336B1C45413C009758CC /* search_query_v2.hpp in Headers */, + 347F335D1C45413C009758CC /* features_layer_path_finder.hpp in Headers */, + 347F33611C45413C009758CC /* house_numbers_matcher.hpp in Headers */, + 347F33231C4540A8009758CC /* region.hpp in Headers */, + 347F33691C45413C009758CC /* search_model.hpp in Headers */, + 347F33301C4540A8009758CC /* suggest.hpp in Headers */, + 347F332A1C4540A8009758CC /* search_index_values.hpp in Headers */, + 347F33161C4540A8009758CC /* cancel_exception.hpp in Headers */, + 347F33631C45413C009758CC /* house_to_street_table.hpp in Headers */, + 347F335B1C45413C009758CC /* features_layer_matcher.hpp in Headers */, + 347F33291C4540A8009758CC /* search_delimiters.hpp in Headers */, 675346DE1A40560D00A0A8C3 /* approximate_string_match.hpp in Headers */, 675346F31A40560D00A0A8C3 /* search_common.hpp in Headers */, 675346EE1A40560D00A0A8C3 /* locality_finder.hpp in Headers */, 675346EC1A40560D00A0A8C3 /* latlon_match.hpp in Headers */, + 347F33591C45413C009758CC /* features_layer.hpp in Headers */, + 347F336D1C45413C009758CC /* street_vicinity_loader.hpp in Headers */, A1347D521B8758C3009050FF /* query_saver.hpp in Headers */, 675346EA1A40560D00A0A8C3 /* keyword_matcher.hpp in Headers */, + 347F33211C4540A8009758CC /* projection_on_street.hpp in Headers */, + 347F331B1C4540A8009758CC /* interval_set.hpp in Headers */, 670EE5651B600255001E8064 /* search_query_params.hpp in Headers */, + 347F331F1C4540A8009758CC /* mwm_traits.hpp in Headers */, + 347F332E1C4540A8009758CC /* search_string_utils.hpp in Headers */, 675346DF1A40560D00A0A8C3 /* feature_offset_match.hpp in Headers */, + 347F33181C4540A8009758CC /* categories_holder.hpp in Headers */, 675346F51A40560D00A0A8C3 /* search_engine.hpp in Headers */, + 347F331A1C4540A8009758CC /* dummy_rank_table.hpp in Headers */, + 347F335F1C45413C009758CC /* geocoder.hpp in Headers */, + 347F33571C45413C009758CC /* features_filter.hpp in Headers */, 675346E41A40560D00A0A8C3 /* indexed_value.hpp in Headers */, + 347F33651C45413C009758CC /* mwm_context.hpp in Headers */, 675346DC1A40560D00A0A8C3 /* algos.hpp in Headers */, 675346E81A40560D00A0A8C3 /* keyword_lang_matcher.hpp in Headers */, + 347F33271C4540A8009758CC /* reverse_geocoder.hpp in Headers */, 675346F21A40560D00A0A8C3 /* result.hpp in Headers */, + 347F33251C4540A8009758CC /* retrieval.hpp in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -387,17 +576,40 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 347F331E1C4540A8009758CC /* mwm_traits.cpp in Sources */, + 347F331C1C4540A8009758CC /* locality.cpp in Sources */, 675346DD1A40560D00A0A8C3 /* approximate_string_match.cpp in Sources */, 675346E51A40560D00A0A8C3 /* intermediate_result.cpp in Sources */, 675346EF1A40560D00A0A8C3 /* params.cpp in Sources */, + 347F335C1C45413C009758CC /* features_layer_path_finder.cpp in Sources */, + 347F33261C4540A8009758CC /* reverse_geocoder.cpp in Sources */, 670EE5641B600255001E8064 /* search_query_params.cpp in Sources */, A1347D511B8758C3009050FF /* query_saver.cpp in Sources */, + 347F33561C45413C009758CC /* features_filter.cpp in Sources */, + 347F336A1C45413C009758CC /* search_query_v2.cpp in Sources */, 675346E01A40560D00A0A8C3 /* geometry_utils.cpp in Sources */, + 347F336C1C45413C009758CC /* street_vicinity_loader.cpp in Sources */, + 347F33201C4540A8009758CC /* projection_on_street.cpp in Sources */, + 347F33601C45413C009758CC /* house_numbers_matcher.cpp in Sources */, + 347F33191C4540A8009758CC /* dummy_rank_table.cpp in Sources */, 675346F11A40560D00A0A8C3 /* result.cpp in Sources */, + 347F332D1C4540A8009758CC /* search_string_utils.cpp in Sources */, + 347F33581C45413C009758CC /* features_layer.cpp in Sources */, + 347F33221C4540A8009758CC /* region.cpp in Sources */, + 347F33281C4540A8009758CC /* search_delimiters.cpp in Sources */, + 347F33641C45413C009758CC /* mwm_context.cpp in Sources */, + 347F335A1C45413C009758CC /* features_layer_matcher.cpp in Sources */, + 347F332B1C4540A8009758CC /* search_query_base.cpp in Sources */, 675346E21A40560D00A0A8C3 /* house_detector.cpp in Sources */, + 347F33621C45413C009758CC /* house_to_street_table.cpp in Sources */, + 347F33661C45413C009758CC /* rank_table_cache.cpp in Sources */, 675346F41A40560D00A0A8C3 /* search_engine.cpp in Sources */, + 347F33241C4540A8009758CC /* retrieval.cpp in Sources */, + 347F33171C4540A8009758CC /* categories_holder.cpp in Sources */, A1347D551B8758E9009050FF /* query_saver_tests.cpp in Sources */, + 347F335E1C45413C009758CC /* geocoder.cpp in Sources */, 675346ED1A40560D00A0A8C3 /* locality_finder.cpp in Sources */, + 347F33681C45413C009758CC /* search_model.cpp in Sources */, 675346F61A40560D00A0A8C3 /* search_query.cpp in Sources */, 675346EB1A40560D00A0A8C3 /* latlon_match.cpp in Sources */, 675346E91A40560D00A0A8C3 /* keyword_matcher.cpp in Sources */,