diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index dcb2c3672f..10d0f4567a 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -690,6 +690,8 @@ F696CCBB1C2816FB00150DFD /* MyTrackerSDKCorp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F696CCBA1C2816FB00150DFD /* MyTrackerSDKCorp.framework */; }; F6A750B91BE8C74400981B41 /* MWMSearchHistoryMyPositionCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6A750B81BE8C74400981B41 /* MWMSearchHistoryMyPositionCell.mm */; }; F6A750BB1BE8C7BA00981B41 /* MWMSearchHistoryMyPositionCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6A750BA1BE8C7BA00981B41 /* MWMSearchHistoryMyPositionCell.xib */; }; + F6B283151C1B23680081957A /* MWMTTSLanguageViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F63BA3701BCD5B520044C504 /* MWMTTSLanguageViewController.mm */; }; + F6B283161C1B23EB0081957A /* MWMSegue.mm in Sources */ = {isa = PBXBuildFile; fileRef = F607C18D1C047FDC00B53A87 /* MWMSegue.mm */; }; F6BB6CBE1BB15A5E00DF1DF2 /* MWMRoutePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6BB6CBD1BB15A5E00DF1DF2 /* MWMRoutePreview.xib */; }; F6BB6CC01BB17D7000DF1DF2 /* MWMRoutePointCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6BB6CBF1BB17D7000DF1DF2 /* MWMRoutePointCell.xib */; }; F6BB6CC31BB1860D00DF1DF2 /* MWMRoutePointLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BB6CC21BB1860D00DF1DF2 /* MWMRoutePointLayout.mm */; }; @@ -3619,7 +3621,7 @@ F6D5822F1BFDCA03009409E8 /* MWMPageController.mm in Sources */, 6741A9D81BF340DE002C974C /* RouteState.mm in Sources */, 6741A9D91BF340DE002C974C /* MWMLanesPanel.mm in Sources */, - 676507631C1055BB00830BB3 /* MWMTTSLanguageViewController.mm in Sources */, + F6B283151C1B23680081957A /* MWMTTSLanguageViewController.mm in Sources */, 6741A9DA1BF340DE002C974C /* UIKitCategories.mm in Sources */, 6741A9DB1BF340DE002C974C /* MWMRoutePreview.mm in Sources */, 6741A9DC1BF340DE002C974C /* MWMRoutePointLayout.mm in Sources */, @@ -3703,6 +3705,7 @@ 6741AA271BF340DE002C974C /* MWMBasePlacePageView.mm in Sources */, 6741AA281BF340DE002C974C /* MWMAlert.mm in Sources */, 6741AA291BF340DE002C974C /* ColorPickerView.mm in Sources */, + F6B283161C1B23EB0081957A /* MWMSegue.mm in Sources */, 6741AA2A1BF340DE002C974C /* MWMWatchEventInfo.mm in Sources */, 6741AA2B1BF340DE002C974C /* CircleView.mm in Sources */, 6741AA2C1BF340DE002C974C /* MWMSearchBookmarksManager.mm in Sources */, diff --git a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj index cf8adb1e78..3649bdc72d 100644 --- a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj +++ b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj @@ -179,6 +179,11 @@ 67E91C7C1BDFC85E005CEE88 /* selection_shape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670947701BDF9BE0005014C0 /* selection_shape.cpp */; }; 67E91C7D1BDFC85E005CEE88 /* user_marks_provider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6709478B1BDF9BE0005014C0 /* user_marks_provider.cpp */; }; 67E91C7E1BDFC85E005CEE88 /* visual_params.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6709478F1BDF9BE1005014C0 /* visual_params.cpp */; }; + F6B283101C1B04680081957A /* gps_track_point.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6B2830B1C1B04680081957A /* gps_track_point.hpp */; }; + F6B283111C1B04680081957A /* gps_track_renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6B2830C1C1B04680081957A /* gps_track_renderer.cpp */; }; + F6B283121C1B04680081957A /* gps_track_renderer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6B2830D1C1B04680081957A /* gps_track_renderer.hpp */; }; + F6B283131C1B04680081957A /* gps_track_shape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6B2830E1C1B04680081957A /* gps_track_shape.cpp */; }; + F6B283141C1B04680081957A /* gps_track_shape.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6B2830F1C1B04680081957A /* gps_track_shape.hpp */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -357,6 +362,11 @@ 675D218B1BFB871D00717E4F /* text_engine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = text_engine.h; sourceTree = ""; }; 677A2DE31C0DD55D00635A00 /* requested_tiles.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = requested_tiles.cpp; sourceTree = ""; }; 677A2DE41C0DD55D00635A00 /* requested_tiles.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = requested_tiles.hpp; sourceTree = ""; }; + F6B2830B1C1B04680081957A /* gps_track_point.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = gps_track_point.hpp; sourceTree = ""; }; + F6B2830C1C1B04680081957A /* gps_track_renderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gps_track_renderer.cpp; sourceTree = ""; }; + F6B2830D1C1B04680081957A /* gps_track_renderer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = gps_track_renderer.hpp; sourceTree = ""; }; + F6B2830E1C1B04680081957A /* gps_track_shape.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gps_track_shape.cpp; sourceTree = ""; }; + F6B2830F1C1B04680081957A /* gps_track_shape.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = gps_track_shape.hpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -396,6 +406,11 @@ 6743D36A1C3A9F090095054B /* framebuffer.hpp */, 6743D36B1C3A9F090095054B /* transparent_layer.cpp */, 6743D36C1C3A9F090095054B /* transparent_layer.hpp */, + F6B2830B1C1B04680081957A /* gps_track_point.hpp */, + F6B2830C1C1B04680081957A /* gps_track_renderer.cpp */, + F6B2830D1C1B04680081957A /* gps_track_renderer.hpp */, + F6B2830E1C1B04680081957A /* gps_track_shape.cpp */, + F6B2830F1C1B04680081957A /* gps_track_shape.hpp */, 677A2DE31C0DD55D00635A00 /* requested_tiles.cpp */, 677A2DE41C0DD55D00635A00 /* requested_tiles.hpp */, 670948511BDF9C5F005014C0 /* watch */, @@ -619,9 +634,11 @@ 670947F91BDF9BF5005014C0 /* area_shape.hpp in Headers */, 670947991BDF9BE1005014C0 /* map_data_provider.hpp in Headers */, 670947BC1BDF9BE1005014C0 /* route_shape.hpp in Headers */, + F6B283121C1B04680081957A /* gps_track_renderer.hpp in Headers */, 670948721BDF9C7F005014C0 /* feature_styler.hpp in Headers */, 6709484E1BDF9C48005014C0 /* shape.hpp in Headers */, 6743D3721C3A9F090095054B /* transparent_layer.hpp in Headers */, + F6B283101C1B04680081957A /* gps_track_point.hpp in Headers */, 670947B61BDF9BE1005014C0 /* render_node.hpp in Headers */, 6709484C1BDF9C48005014C0 /* ruler.hpp in Headers */, 670947AE1BDF9BE1005014C0 /* poi_symbol_shape.hpp in Headers */, @@ -642,6 +659,7 @@ 670947E51BDF9BEC005014C0 /* engine_context.hpp in Headers */, 6743D3701C3A9F090095054B /* framebuffer.hpp in Headers */, 670947D11BDF9BE1005014C0 /* tile_tree_builder.hpp in Headers */, + F6B283141C1B04680081957A /* gps_track_shape.hpp in Headers */, 670947BE1BDF9BE1005014C0 /* rule_drawer.hpp in Headers */, 6709487C1BDF9C7F005014C0 /* pen_info.hpp in Headers */, 6709487D1BDF9C7F005014C0 /* point.h in Headers */, @@ -789,6 +807,7 @@ 670947C41BDF9BE1005014C0 /* text_handle.cpp in Sources */, 670947BD1BDF9BE1005014C0 /* rule_drawer.cpp in Sources */, 6709481E1BDF9C39005014C0 /* show_hide_animation.cpp in Sources */, + F6B283131C1B04680081957A /* gps_track_shape.cpp in Sources */, 6709483D1BDF9C48005014C0 /* copyright_label.cpp in Sources */, 670947C81BDF9BE1005014C0 /* text_shape.cpp in Sources */, 670947CC1BDF9BE1005014C0 /* tile_info.cpp in Sources */, @@ -827,6 +846,7 @@ 6709479B1BDF9BE1005014C0 /* memory_feature_index.cpp in Sources */, 670947E61BDF9BEC005014C0 /* frontend_renderer.cpp in Sources */, 670947D41BDF9BE1005014C0 /* tile_utils.cpp in Sources */, + F6B283111C1B04680081957A /* gps_track_renderer.cpp in Sources */, 670947C61BDF9BE1005014C0 /* text_layout.cpp in Sources */, 670948161BDF9C39005014C0 /* interpolation_holder.cpp in Sources */, 670947B71BDF9BE1005014C0 /* route_builder.cpp in Sources */, diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index 575b112f59..084e5b4b61 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -79,6 +79,14 @@ 67F183831BD5049500AB1840 /* libminizip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F1837F1BD5049500AB1840 /* libminizip.a */; }; 67F183841BD5049500AB1840 /* libtess2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F183801BD5049500AB1840 /* libtess2.a */; }; 67F183881BD5050900AB1840 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F183871BD5050900AB1840 /* SystemConfiguration.framework */; }; + F6B283031C1B03320081957A /* gps_track_collection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6B282FB1C1B03320081957A /* gps_track_collection.cpp */; }; + F6B283041C1B03320081957A /* gps_track_collection.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6B282FC1C1B03320081957A /* gps_track_collection.hpp */; }; + F6B283051C1B03320081957A /* gps_track_filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6B282FD1C1B03320081957A /* gps_track_filter.cpp */; }; + F6B283061C1B03320081957A /* gps_track_filter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6B282FE1C1B03320081957A /* gps_track_filter.hpp */; }; + F6B283071C1B03320081957A /* gps_track_storage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6B282FF1C1B03320081957A /* gps_track_storage.cpp */; }; + F6B283081C1B03320081957A /* gps_track_storage.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6B283001C1B03320081957A /* gps_track_storage.hpp */; }; + F6B283091C1B03320081957A /* gps_track.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6B283011C1B03320081957A /* gps_track.cpp */; }; + F6B2830A1C1B03320081957A /* gps_track.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6B283021C1B03320081957A /* gps_track.hpp */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -173,6 +181,14 @@ 67F183801BD5049500AB1840 /* libtess2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtess2.a; path = "../../../omim-xcode-build/Debug/libtess2.a"; sourceTree = ""; }; 67F183851BD504ED00AB1840 /* libsystem_configuration.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsystem_configuration.tbd; path = usr/lib/system/libsystem_configuration.tbd; sourceTree = SDKROOT; }; 67F183871BD5050900AB1840 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; + F6B282FB1C1B03320081957A /* gps_track_collection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gps_track_collection.cpp; sourceTree = ""; }; + F6B282FC1C1B03320081957A /* gps_track_collection.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = gps_track_collection.hpp; sourceTree = ""; }; + F6B282FD1C1B03320081957A /* gps_track_filter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gps_track_filter.cpp; sourceTree = ""; }; + F6B282FE1C1B03320081957A /* gps_track_filter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = gps_track_filter.hpp; sourceTree = ""; }; + F6B282FF1C1B03320081957A /* gps_track_storage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gps_track_storage.cpp; sourceTree = ""; }; + F6B283001C1B03320081957A /* gps_track_storage.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = gps_track_storage.hpp; sourceTree = ""; }; + F6B283011C1B03320081957A /* gps_track.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gps_track.cpp; sourceTree = ""; }; + F6B283021C1B03320081957A /* gps_track.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = gps_track.hpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -305,6 +321,14 @@ 675345BD1A4054AD00A0A8C3 /* map */ = { isa = PBXGroup; children = ( + F6B282FB1C1B03320081957A /* gps_track_collection.cpp */, + F6B282FC1C1B03320081957A /* gps_track_collection.hpp */, + F6B282FD1C1B03320081957A /* gps_track_filter.cpp */, + F6B282FE1C1B03320081957A /* gps_track_filter.hpp */, + F6B282FF1C1B03320081957A /* gps_track_storage.cpp */, + F6B283001C1B03320081957A /* gps_track_storage.hpp */, + F6B283011C1B03320081957A /* gps_track.cpp */, + F6B283021C1B03320081957A /* gps_track.hpp */, 674C385D1BFF3095000D603B /* storage_bridge.cpp */, 674C385E1BFF3095000D603B /* storage_bridge.hpp */, 674C385F1BFF3095000D603B /* user_mark.cpp */, @@ -351,8 +375,10 @@ buildActionMask = 2147483647; files = ( 6753466B1A4054E800A0A8C3 /* geourl_process.hpp in Headers */, + F6B283081C1B03320081957A /* gps_track_storage.hpp in Headers */, 675346671A4054E800A0A8C3 /* ge0_parser.hpp in Headers */, 675346A21A4054E800A0A8C3 /* user_mark.hpp in Headers */, + F6B283061C1B03320081957A /* gps_track_filter.hpp in Headers */, 34921F661BFA0A6900737D6E /* api_mark_point.hpp in Headers */, 675346751A4054E800A0A8C3 /* mwm_url.hpp in Headers */, 6753464B1A4054E800A0A8C3 /* bookmark.hpp in Headers */, @@ -360,6 +386,7 @@ 6753469E1A4054E800A0A8C3 /* user_mark_container.hpp in Headers */, 34921F651BFA0A6900737D6E /* api_mark_container.hpp in Headers */, 675346491A4054E800A0A8C3 /* bookmark_manager.hpp in Headers */, + F6B2830A1C1B03320081957A /* gps_track.hpp in Headers */, 675346631A4054E800A0A8C3 /* feature_vec_model.hpp in Headers */, 6753469C1A4054E800A0A8C3 /* track.hpp in Headers */, 675346391A4054E800A0A8C3 /* active_maps_layout.hpp in Headers */, @@ -367,6 +394,7 @@ 675346531A4054E800A0A8C3 /* country_tree.hpp in Headers */, 674C38611BFF3095000D603B /* storage_bridge.hpp in Headers */, 674A2A381B2715FB001A525C /* osm_opening_hours.hpp in Headers */, + F6B283041C1B03320081957A /* gps_track_collection.hpp in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -462,9 +490,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + F6B283051C1B03320081957A /* gps_track_filter.cpp in Sources */, 675346481A4054E800A0A8C3 /* bookmark_manager.cpp in Sources */, 675346741A4054E800A0A8C3 /* mwm_url.cpp in Sources */, 675346521A4054E800A0A8C3 /* country_tree.cpp in Sources */, + F6B283091C1B03320081957A /* gps_track.cpp in Sources */, + F6B283031C1B03320081957A /* gps_track_collection.cpp in Sources */, 6753469B1A4054E800A0A8C3 /* track.cpp in Sources */, 675346621A4054E800A0A8C3 /* feature_vec_model.cpp in Sources */, 6753469D1A4054E800A0A8C3 /* user_mark_container.cpp in Sources */, @@ -474,6 +505,7 @@ 6753466A1A4054E800A0A8C3 /* geourl_process.cpp in Sources */, 674C38601BFF3095000D603B /* storage_bridge.cpp in Sources */, 675346661A4054E800A0A8C3 /* ge0_parser.cpp in Sources */, + F6B283071C1B03320081957A /* gps_track_storage.cpp in Sources */, 6753463A1A4054E800A0A8C3 /* address_finder.cpp in Sources */, 675346381A4054E800A0A8C3 /* active_maps_layout.cpp in Sources */, 6753464A1A4054E800A0A8C3 /* bookmark.cpp in Sources */,