diff --git a/xcode/coding/coding.xcodeproj/project.pbxproj b/xcode/coding/coding.xcodeproj/project.pbxproj index e733dbb284..8478a972a5 100644 --- a/xcode/coding/coding.xcodeproj/project.pbxproj +++ b/xcode/coding/coding.xcodeproj/project.pbxproj @@ -18,7 +18,6 @@ 675342811A3F588C00A0A8C3 /* arithmetic_codec.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753422A1A3F588B00A0A8C3 /* arithmetic_codec.hpp */; }; 675342821A3F588C00A0A8C3 /* base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753422B1A3F588B00A0A8C3 /* base64.cpp */; }; 675342831A3F588C00A0A8C3 /* base64.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753422C1A3F588B00A0A8C3 /* base64.hpp */; }; - 675342851A3F588C00A0A8C3 /* bit_streams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753422E1A3F588B00A0A8C3 /* bit_streams.cpp */; }; 675342861A3F588C00A0A8C3 /* bit_streams.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753422F1A3F588B00A0A8C3 /* bit_streams.hpp */; }; 675342871A3F588C00A0A8C3 /* blob_indexer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675342301A3F588B00A0A8C3 /* blob_indexer.cpp */; }; 675342881A3F588C00A0A8C3 /* blob_indexer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675342311A3F588B00A0A8C3 /* blob_indexer.hpp */; }; @@ -114,7 +113,6 @@ 6753422A1A3F588B00A0A8C3 /* arithmetic_codec.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = arithmetic_codec.hpp; sourceTree = ""; }; 6753422B1A3F588B00A0A8C3 /* base64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = base64.cpp; sourceTree = ""; }; 6753422C1A3F588B00A0A8C3 /* base64.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = base64.hpp; sourceTree = ""; }; - 6753422E1A3F588B00A0A8C3 /* bit_streams.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bit_streams.cpp; sourceTree = ""; }; 6753422F1A3F588B00A0A8C3 /* bit_streams.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = bit_streams.hpp; sourceTree = ""; }; 675342301A3F588B00A0A8C3 /* blob_indexer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = blob_indexer.cpp; sourceTree = ""; }; 675342311A3F588B00A0A8C3 /* blob_indexer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = blob_indexer.hpp; sourceTree = ""; }; @@ -256,7 +254,6 @@ 6753422A1A3F588B00A0A8C3 /* arithmetic_codec.hpp */, 6753422B1A3F588B00A0A8C3 /* base64.cpp */, 6753422C1A3F588B00A0A8C3 /* base64.hpp */, - 6753422E1A3F588B00A0A8C3 /* bit_streams.cpp */, 6753422F1A3F588B00A0A8C3 /* bit_streams.hpp */, 675342301A3F588B00A0A8C3 /* blob_indexer.cpp */, 675342311A3F588B00A0A8C3 /* blob_indexer.hpp */, @@ -473,7 +470,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 675342851A3F588C00A0A8C3 /* bit_streams.cpp in Sources */, 675342A51A3F588C00A0A8C3 /* gzip_compressor.cpp in Sources */, 675342D11A3F588C00A0A8C3 /* zip_creator.cpp in Sources */, 675342B61A3F588C00A0A8C3 /* reader_streambuf.cpp in Sources */, diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj index 539d6d5d63..26677d5739 100644 --- a/xcode/indexer/indexer.xcodeproj/project.pbxproj +++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj @@ -46,6 +46,8 @@ 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 */; }; + 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 */; }; 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 */; }; @@ -188,6 +190,8 @@ 670D04A91B0BA8580013A7AC /* feature_loader_101.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = feature_loader_101.hpp; sourceTree = ""; }; 670D04AA1B0BA8580013A7AC /* interval_index_101.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = interval_index_101.hpp; sourceTree = ""; }; 670D05AB1B0E07040013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; 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 = ""; }; 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 = ""; }; @@ -442,6 +446,7 @@ 675340D11A3F540F00A0A8C3 /* feature.cpp */, 675340D21A3F540F00A0A8C3 /* feature.hpp */, 675340D31A3F540F00A0A8C3 /* feature.proto */, + 670EE56A1B60033A001E8064 /* features_vector.cpp */, 675340D41A3F540F00A0A8C3 /* features_vector.hpp */, 675340D51A3F540F00A0A8C3 /* ftypes_matcher.cpp */, 675340D61A3F540F00A0A8C3 /* ftypes_matcher.hpp */, @@ -481,6 +486,7 @@ 675340FA1A3F540F00A0A8C3 /* tree_structure.hpp */, 675340FB1A3F540F00A0A8C3 /* types_mapping.cpp */, 675340FC1A3F540F00A0A8C3 /* types_mapping.hpp */, + 670EE56B1B60033A001E8064 /* unique_index.hpp */, ); name = indexer; path = ../../indexer; @@ -513,6 +519,7 @@ 6753414C1A3F540F00A0A8C3 /* tree_structure.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 */, 6753413A1A3F540F00A0A8C3 /* mwm_version.hpp in Headers */, 6753412B1A3F540F00A0A8C3 /* geometry_coding.hpp in Headers */, @@ -672,6 +679,7 @@ 675341251A3F540F00A0A8C3 /* feature.cpp in Sources */, 675341091A3F540F00A0A8C3 /* data_header.cpp in Sources */, 6753412C1A3F540F00A0A8C3 /* geometry_serialization.cpp in Sources */, + 670EE56C1B60033A001E8064 /* features_vector.cpp in Sources */, 6726C1D11A49DAAC005EEA39 /* feature_meta.cpp in Sources */, 6753411C1A3F540F00A0A8C3 /* feature_loader_base.cpp in Sources */, 675341071A3F540F00A0A8C3 /* data_factory.cpp in Sources */, diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index 977fb8f3e7..a8c195c651 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -93,8 +93,6 @@ 6753467E1A4054E800A0A8C3 /* qgl_render_context.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753460F1A4054E800A0A8C3 /* qgl_render_context.hpp */; }; 675346831A4054E800A0A8C3 /* rotate_screen_task.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675346141A4054E800A0A8C3 /* rotate_screen_task.cpp */; }; 675346841A4054E800A0A8C3 /* rotate_screen_task.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346151A4054E800A0A8C3 /* rotate_screen_task.hpp */; }; - 675346851A4054E800A0A8C3 /* routing_session.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675346161A4054E800A0A8C3 /* routing_session.cpp */; }; - 675346861A4054E800A0A8C3 /* routing_session.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346171A4054E800A0A8C3 /* routing_session.hpp */; }; 675346871A4054E800A0A8C3 /* ruler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675346181A4054E800A0A8C3 /* ruler.cpp */; }; 675346881A4054E800A0A8C3 /* ruler.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346191A4054E800A0A8C3 /* ruler.hpp */; }; 6753469B1A4054E800A0A8C3 /* track.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753462C1A4054E800A0A8C3 /* track.cpp */; }; @@ -217,8 +215,6 @@ 6753460F1A4054E800A0A8C3 /* qgl_render_context.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = qgl_render_context.hpp; sourceTree = ""; }; 675346141A4054E800A0A8C3 /* rotate_screen_task.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rotate_screen_task.cpp; sourceTree = ""; }; 675346151A4054E800A0A8C3 /* rotate_screen_task.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = rotate_screen_task.hpp; sourceTree = ""; }; - 675346161A4054E800A0A8C3 /* routing_session.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = routing_session.cpp; sourceTree = ""; }; - 675346171A4054E800A0A8C3 /* routing_session.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = routing_session.hpp; sourceTree = ""; }; 675346181A4054E800A0A8C3 /* ruler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ruler.cpp; sourceTree = ""; }; 675346191A4054E800A0A8C3 /* ruler.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ruler.hpp; sourceTree = ""; }; 6753462C1A4054E800A0A8C3 /* track.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = track.cpp; sourceTree = ""; }; @@ -416,8 +412,6 @@ 6753460F1A4054E800A0A8C3 /* qgl_render_context.hpp */, 675346141A4054E800A0A8C3 /* rotate_screen_task.cpp */, 675346151A4054E800A0A8C3 /* rotate_screen_task.hpp */, - 675346161A4054E800A0A8C3 /* routing_session.cpp */, - 675346171A4054E800A0A8C3 /* routing_session.hpp */, 675346181A4054E800A0A8C3 /* ruler.cpp */, 675346191A4054E800A0A8C3 /* ruler.hpp */, 6753462C1A4054E800A0A8C3 /* track.cpp */, @@ -469,7 +463,6 @@ 675346391A4054E800A0A8C3 /* active_maps_layout.hpp in Headers */, 6753463E1A4054E800A0A8C3 /* anim_phase_chain.hpp in Headers */, 674A29C81B26F844001A525C /* navigator_utils.hpp in Headers */, - 675346861A4054E800A0A8C3 /* routing_session.hpp in Headers */, 675346A01A4054E800A0A8C3 /* user_mark_dl_cache.hpp in Headers */, 675346651A4054E800A0A8C3 /* framework.hpp in Headers */, 675346531A4054E800A0A8C3 /* country_tree.hpp in Headers */, @@ -594,7 +587,6 @@ 675346381A4054E800A0A8C3 /* active_maps_layout.cpp in Sources */, 67D1C8111AE50EEF00A239E3 /* route_track.cpp in Sources */, 675346721A4054E800A0A8C3 /* move_screen_task.cpp in Sources */, - 675346851A4054E800A0A8C3 /* routing_session.cpp in Sources */, 6753464A1A4054E800A0A8C3 /* bookmark.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/xcode/routing/routing.xcodeproj/project.pbxproj b/xcode/routing/routing.xcodeproj/project.pbxproj index eea66cebfb..fed67ac578 100644 --- a/xcode/routing/routing.xcodeproj/project.pbxproj +++ b/xcode/routing/routing.xcodeproj/project.pbxproj @@ -13,6 +13,11 @@ 670C62141AC5A15700C38A8C /* routing_mapping.h in Headers */ = {isa = PBXBuildFile; fileRef = 670C62121AC5A15700C38A8C /* routing_mapping.h */; }; 670D049E1B0B4A970013A7AC /* nearest_edge_finder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670D049C1B0B4A970013A7AC /* nearest_edge_finder.cpp */; }; 670D049F1B0B4A970013A7AC /* nearest_edge_finder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670D049D1B0B4A970013A7AC /* nearest_edge_finder.hpp */; }; + 670EE55D1B6001E7001E8064 /* routing_session.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670EE55A1B6001E7001E8064 /* routing_session.cpp */; }; + 670EE55E1B6001E7001E8064 /* routing_session.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670EE55B1B6001E7001E8064 /* routing_session.hpp */; }; + 670EE55F1B6001E7001E8064 /* routing_settings.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670EE55C1B6001E7001E8064 /* routing_settings.hpp */; }; + 670EE5681B600295001E8064 /* pedestrian_turns_genetator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670EE5661B600295001E8064 /* pedestrian_turns_genetator.cpp */; }; + 670EE5691B600295001E8064 /* pedestrian_turns_genetator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670EE5671B600295001E8064 /* pedestrian_turns_genetator.hpp */; }; 674A28B11B1605D2001A525C /* osrm_engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A28AF1B1605D2001A525C /* osrm_engine.cpp */; }; 674A28B21B1605D2001A525C /* osrm_engine.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674A28B01B1605D2001A525C /* osrm_engine.hpp */; }; 674F9BCA1B0A580E00704FFA /* async_router.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674F9BBA1B0A580E00704FFA /* async_router.cpp */; }; @@ -68,6 +73,11 @@ 670D049C1B0B4A970013A7AC /* nearest_edge_finder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nearest_edge_finder.cpp; sourceTree = ""; }; 670D049D1B0B4A970013A7AC /* nearest_edge_finder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = nearest_edge_finder.hpp; sourceTree = ""; }; 670D05A61B0E02560013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; + 670EE55A1B6001E7001E8064 /* routing_session.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = routing_session.cpp; sourceTree = ""; }; + 670EE55B1B6001E7001E8064 /* routing_session.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = routing_session.hpp; sourceTree = ""; }; + 670EE55C1B6001E7001E8064 /* routing_settings.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = routing_settings.hpp; sourceTree = ""; }; + 670EE5661B600295001E8064 /* pedestrian_turns_genetator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pedestrian_turns_genetator.cpp; sourceTree = ""; }; + 670EE5671B600295001E8064 /* pedestrian_turns_genetator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pedestrian_turns_genetator.hpp; sourceTree = ""; }; 674A28AF1B1605D2001A525C /* osrm_engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osrm_engine.cpp; sourceTree = ""; }; 674A28B01B1605D2001A525C /* osrm_engine.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osrm_engine.hpp; sourceTree = ""; }; 674F9BBA1B0A580E00704FFA /* async_router.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = async_router.cpp; sourceTree = ""; }; @@ -147,23 +157,15 @@ 675343FA1A3F640D00A0A8C3 /* routing */ = { isa = PBXGroup; children = ( + A120B3521B4A7C1C002F3808 /* astar_algorithm.hpp */, 67C7D4211B4EB48F00FE41AA /* car_model.cpp */, 67C7D4221B4EB48F00FE41AA /* car_model.hpp */, - 67C7D4231B4EB48F00FE41AA /* pedestrian_model.cpp */, - 67C7D4241B4EB48F00FE41AA /* pedestrian_model.hpp */, - 67C7D4251B4EB48F00FE41AA /* turns_sound_settings.cpp */, - 67C7D4261B4EB48F00FE41AA /* turns_sound_settings.hpp */, - 67C7D4271B4EB48F00FE41AA /* turns_sound.cpp */, - 67C7D4281B4EB48F00FE41AA /* turns_sound.hpp */, - A120B3521B4A7C1C002F3808 /* astar_algorithm.hpp */, - A120B34A1B4A7C0A002F3808 /* online_absent_fetcher.cpp */, - A120B34B1B4A7C0A002F3808 /* online_absent_fetcher.hpp */, - A120B34C1B4A7C0A002F3808 /* routing_algorithm.cpp */, - A120B34D1B4A7C0A002F3808 /* routing_algorithm.hpp */, A120B3411B4A7BE5002F3808 /* cross_mwm_road_graph.cpp */, A120B3421B4A7BE5002F3808 /* cross_mwm_road_graph.hpp */, A120B3431B4A7BE5002F3808 /* cross_mwm_router.cpp */, A120B3441B4A7BE5002F3808 /* cross_mwm_router.hpp */, + 670B84BE1A9381D900CE4492 /* cross_routing_context.cpp */, + 670B84BF1A9381D900CE4492 /* cross_routing_context.hpp */, 674A28AF1B1605D2001A525C /* osrm_engine.cpp */, 674A28B01B1605D2001A525C /* osrm_engine.hpp */, 670D049C1B0B4A970013A7AC /* nearest_edge_finder.cpp */, @@ -172,18 +174,31 @@ 674F9BBB1B0A580E00704FFA /* async_router.hpp */, 674F9BBC1B0A580E00704FFA /* features_road_graph.cpp */, 674F9BBD1B0A580E00704FFA /* features_road_graph.hpp */, + A120B34A1B4A7C0A002F3808 /* online_absent_fetcher.cpp */, + A120B34B1B4A7C0A002F3808 /* online_absent_fetcher.hpp */, 674F9BC01B0A580E00704FFA /* online_cross_fetcher.cpp */, 674F9BC11B0A580E00704FFA /* online_cross_fetcher.hpp */, + 67C7D4231B4EB48F00FE41AA /* pedestrian_model.cpp */, + 67C7D4241B4EB48F00FE41AA /* pedestrian_model.hpp */, + 670EE5661B600295001E8064 /* pedestrian_turns_genetator.cpp */, + 670EE5671B600295001E8064 /* pedestrian_turns_genetator.hpp */, 674F9BC21B0A580E00704FFA /* road_graph_router.cpp */, 674F9BC31B0A580E00704FFA /* road_graph_router.hpp */, 674F9BC41B0A580E00704FFA /* road_graph.cpp */, 674F9BC51B0A580E00704FFA /* road_graph.hpp */, + A120B34C1B4A7C0A002F3808 /* routing_algorithm.cpp */, + A120B34D1B4A7C0A002F3808 /* routing_algorithm.hpp */, + 670EE55A1B6001E7001E8064 /* routing_session.cpp */, + 670EE55B1B6001E7001E8064 /* routing_session.hpp */, + 670EE55C1B6001E7001E8064 /* routing_settings.hpp */, 674F9BC61B0A580E00704FFA /* turns_generator.cpp */, 674F9BC71B0A580E00704FFA /* turns_generator.hpp */, + 67C7D4251B4EB48F00FE41AA /* turns_sound_settings.cpp */, + 67C7D4261B4EB48F00FE41AA /* turns_sound_settings.hpp */, + 67C7D4271B4EB48F00FE41AA /* turns_sound.cpp */, + 67C7D4281B4EB48F00FE41AA /* turns_sound.hpp */, 670C62111AC5A15700C38A8C /* routing_mapping.cpp */, 670C62121AC5A15700C38A8C /* routing_mapping.h */, - 670B84BE1A9381D900CE4492 /* cross_routing_context.cpp */, - 670B84BF1A9381D900CE4492 /* cross_routing_context.hpp */, 675344061A3F644F00A0A8C3 /* osrm_data_facade.hpp */, 675344071A3F644F00A0A8C3 /* osrm_online_router.cpp */, 675344081A3F644F00A0A8C3 /* osrm_online_router.hpp */, @@ -226,8 +241,11 @@ 6753441C1A3F644F00A0A8C3 /* route.hpp in Headers */, 67C7D4301B4EB48F00FE41AA /* turns_sound.hpp in Headers */, 67C7D42E1B4EB48F00FE41AA /* turns_sound_settings.hpp in Headers */, + 670EE55E1B6001E7001E8064 /* routing_session.hpp in Headers */, + 670EE55F1B6001E7001E8064 /* routing_settings.hpp in Headers */, 675344161A3F644F00A0A8C3 /* osrm_online_router.hpp in Headers */, 67C7D42C1B4EB48F00FE41AA /* pedestrian_model.hpp in Headers */, + 670EE5691B600295001E8064 /* pedestrian_turns_genetator.hpp in Headers */, 674F9BCD1B0A580E00704FFA /* features_road_graph.hpp in Headers */, 6753441D1A3F644F00A0A8C3 /* router.hpp in Headers */, 67C7D42A1B4EB48F00FE41AA /* car_model.hpp in Headers */, @@ -305,8 +323,10 @@ 675344191A3F644F00A0A8C3 /* osrm2feature_map.cpp in Sources */, 670D049E1B0B4A970013A7AC /* nearest_edge_finder.cpp in Sources */, 674F9BD61B0A580E00704FFA /* turns_generator.cpp in Sources */, + 670EE5681B600295001E8064 /* pedestrian_turns_genetator.cpp in Sources */, 675344171A3F644F00A0A8C3 /* osrm_router.cpp in Sources */, 674F9BD21B0A580E00704FFA /* road_graph_router.cpp in Sources */, + 670EE55D1B6001E7001E8064 /* routing_session.cpp in Sources */, A120B3451B4A7BE5002F3808 /* cross_mwm_road_graph.cpp in Sources */, 67C7D4291B4EB48F00FE41AA /* car_model.cpp in Sources */, 674A28B11B1605D2001A525C /* osrm_engine.cpp in Sources */, diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj index 32dd3a6f13..ae2a6afb24 100644 --- a/xcode/search/search.xcodeproj/project.pbxproj +++ b/xcode/search/search.xcodeproj/project.pbxproj @@ -7,6 +7,9 @@ objects = { /* Begin PBXBuildFile section */ + 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 */; }; 671C621C1AE9227C00076BD0 /* algos_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C62131AE9227C00076BD0 /* algos_tests.cpp */; }; 671C621D1AE9227C00076BD0 /* house_detector_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C62141AE9227C00076BD0 /* house_detector_tests.cpp */; }; 671C621E1AE9227C00076BD0 /* keyword_lang_matcher_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C62151AE9227C00076BD0 /* keyword_lang_matcher_test.cpp */; }; @@ -72,6 +75,9 @@ /* Begin PBXFileReference section */ 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 = ""; }; + 670EE5621B600255001E8064 /* search_query_params.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_query_params.hpp; sourceTree = ""; }; 671C620C1AE9225100076BD0 /* search_tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = search_tests; sourceTree = BUILT_PRODUCTS_DIR; }; 671C62131AE9227C00076BD0 /* algos_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = algos_tests.cpp; sourceTree = ""; }; 671C62141AE9227C00076BD0 /* house_detector_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = house_detector_tests.cpp; sourceTree = ""; }; @@ -240,6 +246,9 @@ 675346D71A40560D00A0A8C3 /* search_engine.hpp */, 675346D81A40560D00A0A8C3 /* search_query.cpp */, 675346D91A40560D00A0A8C3 /* search_query.hpp */, + 670EE5601B600255001E8064 /* search_query_factory.hpp */, + 670EE5611B600255001E8064 /* search_query_params.cpp */, + 670EE5621B600255001E8064 /* search_query_params.hpp */, 675346DA1A40560D00A0A8C3 /* search_string_intersection.hpp */, ); name = search; @@ -255,6 +264,7 @@ files = ( 675346F01A40560D00A0A8C3 /* params.hpp in Headers */, 675346F81A40560D00A0A8C3 /* search_string_intersection.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 */, @@ -264,6 +274,7 @@ 675346EE1A40560D00A0A8C3 /* locality_finder.hpp in Headers */, 675346EC1A40560D00A0A8C3 /* latlon_match.hpp in Headers */, 675346EA1A40560D00A0A8C3 /* keyword_matcher.hpp in Headers */, + 670EE5651B600255001E8064 /* search_query_params.hpp in Headers */, 675346DF1A40560D00A0A8C3 /* feature_offset_match.hpp in Headers */, 675346F51A40560D00A0A8C3 /* search_engine.hpp in Headers */, 675346E41A40560D00A0A8C3 /* indexed_value.hpp in Headers */, @@ -369,6 +380,7 @@ 675346DD1A40560D00A0A8C3 /* approximate_string_match.cpp in Sources */, 675346E51A40560D00A0A8C3 /* intermediate_result.cpp in Sources */, 675346EF1A40560D00A0A8C3 /* params.cpp in Sources */, + 670EE5641B600255001E8064 /* search_query_params.cpp in Sources */, 675346E01A40560D00A0A8C3 /* geometry_utils.cpp in Sources */, 675346F11A40560D00A0A8C3 /* result.cpp in Sources */, 675346E21A40560D00A0A8C3 /* house_detector.cpp in Sources */,