drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-02 02:53:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '211e3fb4' into traffic

Browse Source 
# Conflicts:
#	android/app/src/main/cpp/CMakeLists.txt
#	android/app/src/main/java/app/organicmaps/sdk/util/Config.java
#	android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
#	android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java
#	android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
#	indexer/ftypes_matcher.hpp
#	iphone/Maps/Maps.xcodeproj/project.pbxproj
This commit is contained in:
mvglasow
2025-08-16 18:04:14 +03:00
parent 3a6f21dbd1 211e3fb4f0
commit 90d7cadc3f
1752 changed files with 25177 additions and 870703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
xcode/base/base.xcodeproj/project.pbxproj
View File

@@ -145,6 +145,8 @@
E1B7FFC221FA19FE00F094DC /* thread_pool_delayed.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E1B7FFBE21FA19FD00F094DC /* thread_pool_delayed.hpp */; };
E1B7FFC321FA19FE00F094DC /* thread_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E1B7FFBF21FA19FD00F094DC /* thread_utils.hpp */; };
E1B7FFC421FA19FE00F094DC /* thread_pool_delayed.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1B7FFC021FA19FE00F094DC /* thread_pool_delayed.cpp */; };
FAB54F592E053C17007B540E /* fast_math.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAB54F582E053C17007B540E /* fast_math.cpp */; };
FAB54F5A2E053C17007B540E /* fast_math.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAB54F582E053C17007B540E /* fast_math.cpp */; settings = {COMPILER_FLAGS = "-fno-finite-math-only"; }; };
FACB768326B8738F00810C9C /* linked_map_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D08987A24810A1300837783 /* linked_map_tests.cpp */; };
FACB768426B8739300810C9C /* checked_cast_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7B94240FB11200ED9FE8 /* checked_cast_tests.cpp */; };
FACB768526B873A000810C9C /* lru_cache_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56290B8B206D0937003892E0 /* lru_cache_tests.cpp */; };
@@ -298,6 +300,7 @@
E1B7FFC521FA1A2100F094DC /* thread_pool_computational_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thread_pool_computational_tests.cpp; sourceTree = "<group>"; };
E1B7FFC621FA1A2200F094DC /* thread_pool_delayed_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thread_pool_delayed_tests.cpp; sourceTree = "<group>"; };
F61B9796229BFDF1000E878B /* non_intersecting_intervals_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = non_intersecting_intervals_tests.cpp; sourceTree = "<group>"; };
FAB54F582E053C17007B540E /* fast_math.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = fast_math.cpp; sourceTree = "<group>"; };
FAF23E20274E3F1000684735 /* exception_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = exception_tests.cpp; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -403,95 +406,96 @@
675341851A3F57E400A0A8C3 /* array_adapters.hpp */,
675341861A3F57E400A0A8C3 /* assert.hpp */,
3D1BE645212D775500ACD94A /* atomic_shared_ptr.hpp */,
675341871A3F57E400A0A8C3 /* base.cpp */,
675341881A3F57E400A0A8C3 /* base.hpp */,
675341871A3F57E400A0A8C3 /* base.cpp */,
39F1E52E21C961A800D961DC /* beam.hpp */,
397DC50B22BB8EBF007126DB /* bidirectional_map.hpp */,
675341891A3F57E400A0A8C3 /* bits.hpp */,
6753418A1A3F57E400A0A8C3 /* buffer_vector.hpp */,
6753418B1A3F57E400A0A8C3 /* cache.hpp */,
3901B744235F02B2006ABD43 /* cancellable.cpp */,
672DD4B01E04255F0078E13C /* cancellable.hpp */,
3901B744235F02B2006ABD43 /* cancellable.cpp */,
67C79B9E1E2929DB00C40034 /* checked_cast.hpp */,
3917FA52211E008C00937DF4 /* clustering_map.hpp */,
672DD4B11E04255F0078E13C /* collection_cast.hpp */,
39BC0FCF1FD057F900B6C276 /* control_flow.hpp */,
67A609AC1C88642E001E641A /* deferred_task.cpp */,
67A609AD1C88642E001E641A /* deferred_task.hpp */,
67A609AC1C88642E001E641A /* deferred_task.cpp */,
3446C66C1DDCA96300146687 /* dfa_helpers.hpp */,
675341941A3F57E400A0A8C3 /* exception.cpp */,
675341951A3F57E400A0A8C3 /* exception.hpp */,
675341941A3F57E400A0A8C3 /* exception.cpp */,
FAB54F582E053C17007B540E /* fast_math.cpp */,
564BB444206E89ED00BDD211 /* fifo_cache.hpp */,
390F1C0C2294298E00EA58E3 /* file_name_utils.cpp */,
390F1C0B2294298E00EA58E3 /* file_name_utils.hpp */,
3917FA54211E009700937DF4 /* geo_object_id.cpp */,
390F1C0C2294298E00EA58E3 /* file_name_utils.cpp */,
3917FA55211E009700937DF4 /* geo_object_id.hpp */,
671182EE1C807C0A00CB8177 /* gmtime.cpp */,
3917FA54211E009700937DF4 /* geo_object_id.cpp */,
671182EF1C807C0A00CB8177 /* gmtime.hpp */,
671182EE1C807C0A00CB8177 /* gmtime.cpp */,
675345381A3F6F5E00A0A8C3 /* internal */,
3446C66D1DDCA96300146687 /* levenshtein_dfa.cpp */,
3446C66E1DDCA96300146687 /* levenshtein_dfa.hpp */,
3446C66D1DDCA96300146687 /* levenshtein_dfa.cpp */,
675341991A3F57E400A0A8C3 /* limited_priority_queue.hpp */,
3D08987824810A0B00837783 /* linked_map.hpp */,
6753419A1A3F57E400A0A8C3 /* logging.cpp */,
6753419B1A3F57E400A0A8C3 /* logging.hpp */,
6753419A1A3F57E400A0A8C3 /* logging.cpp */,
6753419C1A3F57E400A0A8C3 /* lower_case.cpp */,
56290B89206D0887003892E0 /* lru_cache.hpp */,
6753419D1A3F57E400A0A8C3 /* macros.hpp */,
ACB634A2274D65F000F91940 /* math.cpp */,
6753419E1A3F57E400A0A8C3 /* math.hpp */,
ACB634A2274D65F000F91940 /* math.cpp */,
6753419F1A3F57E400A0A8C3 /* matrix.hpp */,
672DD4B51E04255F0078E13C /* mem_trie.hpp */,
672DD4B61E04255F0078E13C /* newtype.hpp */,
397DC50C22BB8EBF007126DB /* non_intersecting_intervals.hpp */,
675341A21A3F57E400A0A8C3 /* normalize_unicode.cpp */,
672DD4B71E04255F0078E13C /* observer_list.hpp */,
3917FA5A211E00BA00937DF4 /* pprof.cpp */,
3917FA5B211E00BB00937DF4 /* pprof.hpp */,
3917FA5A211E00BA00937DF4 /* pprof.cpp */,
56B1A0721E69DE4D00395022 /* random.hpp */,
672DD4B81E0425600078E13C /* range_iterator.hpp */,
672DD4B91E0425600078E13C /* ref_counted.hpp */,
675341AA1A3F57E400A0A8C3 /* rolling_hash.hpp */,
675341AF1A3F57E400A0A8C3 /* scope_guard.hpp */,
675341B01A3F57E400A0A8C3 /* set_operations.hpp */,
675341B11A3F57E400A0A8C3 /* shared_buffer_manager.cpp */,
675341B21A3F57E400A0A8C3 /* shared_buffer_manager.hpp */,
675341B11A3F57E400A0A8C3 /* shared_buffer_manager.cpp */,
56B1A0731E69DE4D00395022 /* small_set.hpp */,
675341B41A3F57E400A0A8C3 /* src_point.cpp */,
675341B51A3F57E400A0A8C3 /* src_point.hpp */,
675341B41A3F57E400A0A8C3 /* src_point.cpp */,
675341B61A3F57E400A0A8C3 /* stats.hpp */,
675341B71A3F57E400A0A8C3 /* std_serialization.hpp */,
672DD4BA1E0425600078E13C /* stl_helpers.hpp */,
675341B91A3F57E400A0A8C3 /* stl_iterator.hpp */,
675341BC1A3F57E400A0A8C3 /* string_utils.cpp */,
675341BD1A3F57E400A0A8C3 /* string_utils.hpp */,
675341BE1A3F57E400A0A8C3 /* strings_bundle.cpp */,
675341BC1A3F57E400A0A8C3 /* string_utils.cpp */,
675341BF1A3F57E400A0A8C3 /* strings_bundle.hpp */,
3D74EF0B1F8B902B0081202C /* suffix_array.cpp */,
675341BE1A3F57E400A0A8C3 /* strings_bundle.cpp */,
3917FA5E211E00C300937DF4 /* suffix_array.hpp */,
670E39421C46C76900E9C0A6 /* sunrise_sunset.cpp */,
3D74EF0B1F8B902B0081202C /* suffix_array.cpp */,
670E39431C46C76900E9C0A6 /* sunrise_sunset.hpp */,
670E39421C46C76900E9C0A6 /* sunrise_sunset.cpp */,
3D7815711F3A145F0068B6AC /* task_loop.hpp */,
67B52B5E1AD3C84E00664C17 /* thread_checker.cpp */,
675341C41A3F57E400A0A8C3 /* thread.hpp */,
675341C31A3F57E400A0A8C3 /* thread.cpp */,
67B52B5F1AD3C84E00664C17 /* thread_checker.hpp */,
E1B7FFBD21FA19FD00F094DC /* thread_pool_computational.hpp */,
E1B7FFC021FA19FE00F094DC /* thread_pool_delayed.cpp */,
E1B7FFBE21FA19FD00F094DC /* thread_pool_delayed.hpp */,
675341C11A3F57E400A0A8C3 /* thread_pool.cpp */,
67B52B5E1AD3C84E00664C17 /* thread_checker.cpp */,
675341C21A3F57E400A0A8C3 /* thread_pool.hpp */,
675341C11A3F57E400A0A8C3 /* thread_pool.cpp */,
E1B7FFBD21FA19FD00F094DC /* thread_pool_computational.hpp */,
E1B7FFBE21FA19FD00F094DC /* thread_pool_delayed.hpp */,
E1B7FFC021FA19FE00F094DC /* thread_pool_delayed.cpp */,
3989E363230302EA00D63F84 /* thread_safe_queue.hpp */,
E1B7FFBF21FA19FD00F094DC /* thread_utils.hpp */,
675341C31A3F57E400A0A8C3 /* thread.cpp */,
675341C41A3F57E400A0A8C3 /* thread.hpp */,
675341C51A3F57E400A0A8C3 /* threaded_container.cpp */,
675341C61A3F57E400A0A8C3 /* threaded_container.hpp */,
675341C51A3F57E400A0A8C3 /* threaded_container.cpp */,
675341C71A3F57E400A0A8C3 /* threaded_list.hpp */,
674A7E2C1C0DB03D003D48E1 /* timegm.cpp */,
674A7E2D1C0DB03D003D48E1 /* timegm.hpp */,
675341C91A3F57E400A0A8C3 /* timer.cpp */,
674A7E2C1C0DB03D003D48E1 /* timegm.cpp */,
675341CA1A3F57E400A0A8C3 /* timer.hpp */,
3446C66F1DDCA96300146687 /* uni_string_dfa.cpp */,
675341C91A3F57E400A0A8C3 /* timer.cpp */,
3446C6701DDCA96300146687 /* uni_string_dfa.hpp */,
3446C66F1DDCA96300146687 /* uni_string_dfa.cpp */,
3D74EF0C1F8B902B0081202C /* visitor.hpp */,
3D78157A1F3D89EC0068B6AC /* waiter.hpp */,
);
@@ -695,6 +699,7 @@
3975D20B235F2738004D84D3 /* cancellable_tests.cpp in Sources */,
39FD27381CC65AD000AFF551 /* timegm_test.cpp in Sources */,
39FD272C1CC65AD000AFF551 /* range_iterator_test.cpp in Sources */,
FAB54F592E053C17007B540E /* fast_math.cpp in Sources */,
FAF23E21274E3F1000684735 /* exception_tests.cpp in Sources */,
39FD27261CC65AD000AFF551 /* containers_test.cpp in Sources */,
397DC51122BB8ED2007126DB /* bidirectional_map_tests.cpp in Sources */,
@@ -748,6 +753,7 @@
675342011A3F57E400A0A8C3 /* string_utils.cpp in Sources */,
674A7E2E1C0DB03D003D48E1 /* timegm.cpp in Sources */,
E1B7FFC421FA19FE00F094DC /* thread_pool_delayed.cpp in Sources */,
FAB54F5A2E053C17007B540E /* fast_math.cpp in Sources */,
6753420A1A3F57E400A0A8C3 /* threaded_container.cpp in Sources */,
3917FA5C211E00BB00937DF4 /* pprof.cpp in Sources */,
67A609AE1C88642E001E641A /* deferred_task.cpp in Sources */,