diff --git a/editor/editor_tests/osm_editor_test.hpp b/editor/editor_tests/osm_editor_test.hpp index c896b47ce6..385fd6e72b 100644 --- a/editor/editor_tests/osm_editor_test.hpp +++ b/editor/editor_tests/osm_editor_test.hpp @@ -1,6 +1,6 @@ #pragma once -#include "map/feature_vec_model.hpp" +#include "map/features_fetcher.hpp" #include "generator/generator_tests_support/test_feature.hpp" #include "generator/generator_tests_support/test_mwm_builder.hpp" diff --git a/map/CMakeLists.txt b/map/CMakeLists.txt index b0fa983361..d97e691d28 100644 --- a/map/CMakeLists.txt +++ b/map/CMakeLists.txt @@ -53,8 +53,8 @@ set( everywhere_search_params.hpp extrapolation/extrapolator.cpp extrapolation/extrapolator.hpp - feature_vec_model.cpp - feature_vec_model.hpp + features_fetcher.cpp + features_fetcher.hpp framework.cpp framework.hpp framework_light.cpp diff --git a/map/benchmark_tool/features_loading.cpp b/map/benchmark_tool/features_loading.cpp index 1821ee7766..266d936ecb 100644 --- a/map/benchmark_tool/features_loading.cpp +++ b/map/benchmark_tool/features_loading.cpp @@ -1,6 +1,6 @@ #include "map/benchmark_tool/api.hpp" -#include "map/feature_vec_model.hpp" +#include "map/features_fetcher.hpp" #include "indexer/feature_visibility.hpp" #include "indexer/scales.hpp" diff --git a/map/feature_vec_model.cpp b/map/features_fetcher.cpp similarity index 98% rename from map/feature_vec_model.cpp rename to map/features_fetcher.cpp index d4374697dd..787efd8d85 100644 --- a/map/feature_vec_model.cpp +++ b/map/features_fetcher.cpp @@ -1,4 +1,4 @@ -#include "map/feature_vec_model.hpp" +#include "map/features_fetcher.hpp" #include "platform/platform.hpp" diff --git a/map/feature_vec_model.hpp b/map/features_fetcher.hpp similarity index 100% rename from map/feature_vec_model.hpp rename to map/features_fetcher.hpp diff --git a/map/framework.hpp b/map/framework.hpp index aaabb0ceee..345b1b2e37 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -8,7 +8,7 @@ #include "map/caching_address_getter.hpp" #include "map/discovery/discovery_manager.hpp" #include "map/displacement_mode_manager.hpp" -#include "map/feature_vec_model.hpp" +#include "map/features_fetcher.hpp" #include "map/local_ads_manager.hpp" #include "map/mwm_url.hpp" #include "map/notifications/notification_manager.hpp" diff --git a/map/map_tests/check_mwms.cpp b/map/map_tests/check_mwms.cpp index 255de93b24..7baf40177a 100644 --- a/map/map_tests/check_mwms.cpp +++ b/map/map_tests/check_mwms.cpp @@ -1,6 +1,6 @@ #include "testing/testing.hpp" -#include "map/feature_vec_model.hpp" +#include "map/features_fetcher.hpp" #include "indexer/data_header.hpp" #include "indexer/interval_index.hpp" diff --git a/map/mwm_tests/multithread_mwm_test.cpp b/map/mwm_tests/multithread_mwm_test.cpp index c7b0051eb5..774b57cb7b 100644 --- a/map/mwm_tests/multithread_mwm_test.cpp +++ b/map/mwm_tests/multithread_mwm_test.cpp @@ -1,6 +1,6 @@ #include "testing/testing.hpp" -#include "map/feature_vec_model.hpp" +#include "map/features_fetcher.hpp" #include "indexer/scales.hpp" diff --git a/map/mwm_tests/mwm_foreach_test.cpp b/map/mwm_tests/mwm_foreach_test.cpp index 43869a4a09..7697b53ebb 100644 --- a/map/mwm_tests/mwm_foreach_test.cpp +++ b/map/mwm_tests/mwm_foreach_test.cpp @@ -1,6 +1,6 @@ #include "testing/testing.hpp" -#include "map/feature_vec_model.hpp" +#include "map/features_fetcher.hpp" #include "indexer/data_header.hpp" #include "indexer/scales.hpp" diff --git a/map/mwm_tests/mwm_index_test.cpp b/map/mwm_tests/mwm_index_test.cpp index 797867c16b..912ffca9b3 100644 --- a/map/mwm_tests/mwm_index_test.cpp +++ b/map/mwm_tests/mwm_index_test.cpp @@ -1,6 +1,6 @@ #include "testing/testing.hpp" -#include "map/feature_vec_model.hpp" +#include "map/features_fetcher.hpp" #include "indexer/scales.hpp" #include "indexer/classificator_loader.hpp" diff --git a/routing/routing_integration_tests/routing_test_tools.cpp b/routing/routing_integration_tests/routing_test_tools.cpp index 47421e4489..82a9543eb0 100644 --- a/routing/routing_integration_tests/routing_test_tools.cpp +++ b/routing/routing_integration_tests/routing_test_tools.cpp @@ -4,7 +4,7 @@ #include "testing/testing.hpp" -#include "map/feature_vec_model.hpp" +#include "map/features_fetcher.hpp" #include "storage/routing_helpers.hpp" diff --git a/routing/routing_integration_tests/routing_test_tools.hpp b/routing/routing_integration_tests/routing_test_tools.hpp index ca18a7dcd8..13ab4ed3db 100644 --- a/routing/routing_integration_tests/routing_test_tools.hpp +++ b/routing/routing_integration_tests/routing_test_tools.hpp @@ -5,7 +5,7 @@ #include "storage/country_info_getter.hpp" -#include "map/feature_vec_model.hpp" +#include "map/features_fetcher.hpp" #include "platform/local_country_file.hpp" diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index 67b9fb9e57..209bdcfd9a 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -21,6 +21,8 @@ 34921F661BFA0A6900737D6E /* api_mark_point.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34921F611BFA0A6900737D6E /* api_mark_point.hpp */; }; 34DDA1811DBE5DF40088A609 /* libpartners_api.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34DDA17F1DBE5DF40088A609 /* libpartners_api.a */; }; 34DDA1821DBE5DF40088A609 /* libtracking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34DDA1801DBE5DF40088A609 /* libtracking.a */; }; + 393623A2233131CF00907D2E /* features_fetcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 393623A0233131CE00907D2E /* features_fetcher.cpp */; }; + 393623A3233131CF00907D2E /* features_fetcher.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 393623A1233131CF00907D2E /* features_fetcher.hpp */; }; 3D0AEAFC1FBB0FF400AD042B /* libgenerator_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0AEAFF1FBB0FF400AD042B /* libgenerator_tests_support.a */; }; 3D0AEAFE1FBB0FF400AD042B /* libsearch_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0AEB011FBB0FF400AD042B /* libsearch_tests_support.a */; }; 3D1775A42317E2FD00F8889C /* promo_catalog_poi_checker.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D1775A22317E2FD00F8889C /* promo_catalog_poi_checker.hpp */; }; @@ -173,8 +175,6 @@ 675346491A4054E800A0A8C3 /* bookmark_manager.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345DA1A4054E800A0A8C3 /* bookmark_manager.hpp */; }; 6753464A1A4054E800A0A8C3 /* bookmark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345DB1A4054E800A0A8C3 /* bookmark.cpp */; }; 6753464B1A4054E800A0A8C3 /* bookmark.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345DC1A4054E800A0A8C3 /* bookmark.hpp */; }; - 675346621A4054E800A0A8C3 /* feature_vec_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345F31A4054E800A0A8C3 /* feature_vec_model.cpp */; }; - 675346631A4054E800A0A8C3 /* feature_vec_model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345F41A4054E800A0A8C3 /* feature_vec_model.hpp */; }; 675346641A4054E800A0A8C3 /* framework.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345F51A4054E800A0A8C3 /* framework.cpp */; }; 675346651A4054E800A0A8C3 /* framework.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675345F61A4054E800A0A8C3 /* framework.hpp */; }; 675346661A4054E800A0A8C3 /* ge0_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345F71A4054E800A0A8C3 /* ge0_parser.cpp */; }; @@ -273,6 +273,8 @@ 34AF87EA1DBE5AD000E5E7DC /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; 34DDA17F1DBE5DF40088A609 /* libpartners_api.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpartners_api.a; path = "/Users/igrechuhin/Repo/omim/xcode/partners_api/../../../omim-xcode-build/Debug/libpartners_api.a"; sourceTree = ""; }; 34DDA1801DBE5DF40088A609 /* libtracking.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtracking.a; path = "/Users/igrechuhin/Repo/omim/xcode/tracking/../../../omim-xcode-build/Debug/libtracking.a"; sourceTree = ""; }; + 393623A0233131CE00907D2E /* features_fetcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_fetcher.cpp; sourceTree = ""; }; + 393623A1233131CF00907D2E /* features_fetcher.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_fetcher.hpp; sourceTree = ""; }; 3D0AEAFF1FBB0FF400AD042B /* libgenerator_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgenerator_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; 3D0AEB001FBB0FF400AD042B /* libindexer_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libindexer_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; 3D0AEB011FBB0FF400AD042B /* libsearch_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsearch_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -438,8 +440,6 @@ 675345DA1A4054E800A0A8C3 /* bookmark_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = bookmark_manager.hpp; sourceTree = ""; }; 675345DB1A4054E800A0A8C3 /* bookmark.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bookmark.cpp; sourceTree = ""; }; 675345DC1A4054E800A0A8C3 /* bookmark.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = bookmark.hpp; sourceTree = ""; }; - 675345F31A4054E800A0A8C3 /* feature_vec_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_vec_model.cpp; sourceTree = ""; }; - 675345F41A4054E800A0A8C3 /* feature_vec_model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = feature_vec_model.hpp; sourceTree = ""; }; 675345F51A4054E800A0A8C3 /* framework.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = framework.cpp; sourceTree = ""; }; 675345F61A4054E800A0A8C3 /* framework.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = framework.hpp; sourceTree = ""; }; 675345F71A4054E800A0A8C3 /* ge0_parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ge0_parser.cpp; sourceTree = ""; }; @@ -817,6 +817,8 @@ 675345BD1A4054AD00A0A8C3 /* map */ = { isa = PBXGroup; children = ( + 393623A0233131CE00907D2E /* features_fetcher.cpp */, + 393623A1233131CF00907D2E /* features_fetcher.hpp */, 3D1775AA2319848500F8889C /* crown.cpp */, 3D1775A92319848500F8889C /* crown.hpp */, 3D1775A22317E2FD00F8889C /* promo_catalog_poi_checker.hpp */, @@ -860,8 +862,6 @@ 3D4E99801FB462B60025B48C /* everywhere_search_params.hpp */, 56C1165E2090E5670068BBC0 /* extrapolator.cpp */, 56C1165F2090E5670068BBC0 /* extrapolator.hpp */, - 675345F31A4054E800A0A8C3 /* feature_vec_model.cpp */, - 675345F41A4054E800A0A8C3 /* feature_vec_model.hpp */, 3DF54F8921AEA04900D12E37 /* framework_light.cpp */, F6D67CE22063F4980032FD38 /* framework_light.hpp */, 675345F51A4054E800A0A8C3 /* framework.cpp */, @@ -974,6 +974,7 @@ 675346671A4054E800A0A8C3 /* ge0_parser.hpp in Headers */, 675346A21A4054E800A0A8C3 /* user_mark.hpp in Headers */, 454649F21F2728CE00EF4064 /* local_ads_mark.hpp in Headers */, + 393623A3233131CF00907D2E /* features_fetcher.hpp in Headers */, BBA014AE2073C784007402E4 /* bookmark_helpers.hpp in Headers */, F6B283061C1B03320081957A /* gps_track_filter.hpp in Headers */, 3DD1166821888AAC007A2ED4 /* notification_queue_storage.hpp in Headers */, @@ -1016,7 +1017,6 @@ F6FC3CB51FC323430001D929 /* discovery_client_params.hpp in Headers */, 0831F23C200E53600034C365 /* bookmarks_search_params.hpp in Headers */, 0C2B73DF1E92AB9900530BB8 /* local_ads_manager.hpp in Headers */, - 675346631A4054E800A0A8C3 /* feature_vec_model.hpp in Headers */, F6FC3CB71FC323430001D929 /* discovery_manager.hpp in Headers */, 6753469C1A4054E800A0A8C3 /* track.hpp in Headers */, 675346651A4054E800A0A8C3 /* framework.hpp in Headers */, @@ -1206,7 +1206,6 @@ F6B283031C1B03320081957A /* gps_track_collection.cpp in Sources */, 3D4E99A31FB4A6410025B48C /* booking_filter_cache.cpp in Sources */, 6753469B1A4054E800A0A8C3 /* track.cpp in Sources */, - 675346621A4054E800A0A8C3 /* feature_vec_model.cpp in Sources */, 454523A9202A0068009275C1 /* cloud.cpp in Sources */, 3DF54F8A21AEA04A00D12E37 /* framework_light.cpp in Sources */, 674C38621BFF3095000D603B /* user_mark.cpp in Sources */, @@ -1221,6 +1220,7 @@ 56C116602090E5670068BBC0 /* extrapolator.cpp in Sources */, 3D1775AC2319848500F8889C /* crown.cpp in Sources */, 40ACC79723191C2600238E21 /* check_mwms.cpp in Sources */, + 393623A2233131CF00907D2E /* features_fetcher.cpp in Sources */, 6753466A1A4054E800A0A8C3 /* geourl_process.cpp in Sources */, 3DD1166621888AAC007A2ED4 /* notification_queue_serdes.cpp in Sources */, 348AB57C1D7EE0C6009F8301 /* chart_generator.cpp in Sources */,