drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-26 15:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '2601ec854a' into traffic

Browse Source 
# Conflicts:
#	iphone/Maps/Model/Settings.swift
#	iphone/Maps/UI/Settings/SettingsNavigationView.swift
This commit is contained in:
mvglasow
2025-11-05 23:06:07 +02:00
parent d6818786f7 2601ec854a
commit 781d973faa
561 changed files with 7632 additions and 4277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
xcode/indexer/indexer.xcodeproj/project.pbxproj
View File

@@ -7,6 +7,9 @@
objects = {
/* Begin PBXBuildFile section */
27BCD5272E93E625002C50F0 /* feature_charge_sockets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27BCD5262E93E625002C50F0 /* feature_charge_sockets.cpp */; };
27BCD5282E93E625002C50F0 /* feature_charge_sockets.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 27BCD5252E93E625002C50F0 /* feature_charge_sockets.hpp */; };
27BCD52A2E93E670002C50F0 /* feature_charge_sockets_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27BCD5292E93E670002C50F0 /* feature_charge_sockets_test.cpp */; };
34583BC71C88552100F94664 /* cuisines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34583BC11C88552100F94664 /* cuisines.cpp */; };
34583BC81C88552100F94664 /* cuisines.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34583BC21C88552100F94664 /* cuisines.hpp */; };
34583BC91C88552100F94664 /* editable_map_object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34583BC31C88552100F94664 /* editable_map_object.cpp */; };
@@ -227,6 +230,9 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
27BCD5252E93E625002C50F0 /* feature_charge_sockets.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = feature_charge_sockets.hpp; sourceTree = "<group>"; };
27BCD5262E93E625002C50F0 /* feature_charge_sockets.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = feature_charge_sockets.cpp; sourceTree = "<group>"; };
27BCD5292E93E670002C50F0 /* feature_charge_sockets_test.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = feature_charge_sockets_test.cpp; sourceTree = "<group>"; };
34583BC11C88552100F94664 /* cuisines.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cuisines.cpp; sourceTree = "<group>"; };
34583BC21C88552100F94664 /* cuisines.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cuisines.hpp; sourceTree = "<group>"; };
34583BC31C88552100F94664 /* editable_map_object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editable_map_object.cpp; sourceTree = "<group>"; };
@@ -541,6 +547,7 @@
670C61011AB065B100C38A8C /* data_source_test.cpp */,
56C74C271C749E8100B71B9F /* drules_selector_parser_test.cpp */,
3D489BA71D3D1F8A0052AA38 /* editable_map_object_test.cpp */,
27BCD5292E93E670002C50F0 /* feature_charge_sockets_test.cpp */,
56C74C281C749E8100B71B9F /* feature_metadata_test.cpp */,
3D452AF81EE6D9F5009EAB9B /* feature_names_test.cpp */,
391C0C8522BD255E003DC252 /* feature_to_osm_tests.cpp */,
@@ -651,6 +658,8 @@
675340BE1A3F540F00A0A8C3 /* feature_algo.cpp */,
675340BF1A3F540F00A0A8C3 /* feature_algo.hpp */,
34664CF01D49FEC1003D7096 /* feature_altitude.hpp */,
27BCD5262E93E625002C50F0 /* feature_charge_sockets.cpp */,
27BCD5252E93E625002C50F0 /* feature_charge_sockets.hpp */,
675340C01A3F540F00A0A8C3 /* feature_covering.cpp */,
675340C11A3F540F00A0A8C3 /* feature_covering.hpp */,
675340C21A3F540F00A0A8C3 /* feature_data.cpp */,
@@ -754,6 +763,7 @@
buildActionMask = 2147483647;
files = (
E906DE3C1CF44934004C4F5E /* postcodes_matcher.hpp in Headers */,
27BCD5282E93E625002C50F0 /* feature_charge_sockets.hpp in Headers */,
6753414E1A3F540F00A0A8C3 /* types_mapping.hpp in Headers */,
67BC92F31D21476500A4A378 /* string_set.hpp in Headers */,
675341151A3F540F00A0A8C3 /* feature_covering.hpp in Headers */,
@@ -971,6 +981,7 @@
670C612C1AB0663400C38A8C /* testingmain.cpp in Sources */,
3D489BC61D3D220F0052AA38 /* editable_map_object_test.cpp in Sources */,
670BAA8D1D0B069A000302DA /* succinct_trie_test.cpp in Sources */,
27BCD52A2E93E670002C50F0 /* feature_charge_sockets_test.cpp in Sources */,
670BAA951D0B06E1000302DA /* cell_coverer_test.cpp in Sources */,
670BAA8C1D0B0673000302DA /* trie_test.cpp in Sources */,
);
@@ -1007,6 +1018,7 @@
391C0C8322BD2551003DC252 /* feature_to_osm.cpp in Sources */,
675341401A3F540F00A0A8C3 /* scales.cpp in Sources */,
675341251A3F540F00A0A8C3 /* feature.cpp in Sources */,
27BCD5272E93E625002C50F0 /* feature_charge_sockets.cpp in Sources */,
675341091A3F540F00A0A8C3 /* data_header.cpp in Sources */,
F61F83061E4B187500B37B7A /* road_shields_parser.cpp in Sources */,
670EE56C1B60033A001E8064 /* features_vector.cpp in Sources */,

12
xcode/platform/platform.xcodeproj/project.pbxproj
View File

@@ -111,10 +111,7 @@
D5B191CF2386C7E4009CD0D6 /* http_uploader_background.hpp in Headers */ = {isa = PBXBuildFile; fileRef = D5B191CE2386C7E4009CD0D6 /* http_uploader_background.hpp */; };
EB60B4DC204C130300E4953B /* network_policy_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = EB60B4DB204C130300E4953B /* network_policy_ios.mm */; };
EB60B4DE204C175700E4953B /* network_policy_ios.h in Headers */ = {isa = PBXBuildFile; fileRef = EB60B4DD204C175700E4953B /* network_policy_ios.h */; };
ED49D7402CEE438E004AF27E /* products.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED49D73F2CEE438E004AF27E /* products.cpp */; };
ED49D7412CEE438E004AF27E /* products.hpp in Headers */ = {isa = PBXBuildFile; fileRef = ED49D73E2CEE438E004AF27E /* products.hpp */; };
ED49D7442CEE43A4004AF27E /* meta_config_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED49D7422CEE43A4004AF27E /* meta_config_tests.cpp */; };
ED49D7452CEE43A4004AF27E /* products_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED49D7432CEE43A4004AF27E /* products_tests.cpp */; };
ED965B252CD8F72E0049E39E /* duration.hpp in Headers */ = {isa = PBXBuildFile; fileRef = ED965B242CD8F72A0049E39E /* duration.hpp */; };
ED965B272CD8F7810049E39E /* duration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED965B262CD8F77D0049E39E /* duration.cpp */; };
ED965B472CDA52DB0049E39E /* duration_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED965B462CDA4EC00049E39E /* duration_tests.cpp */; };
@@ -257,10 +254,7 @@
D5B191CE2386C7E4009CD0D6 /* http_uploader_background.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = http_uploader_background.hpp; sourceTree = "<group>"; };
EB60B4DB204C130300E4953B /* network_policy_ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = network_policy_ios.mm; sourceTree = "<group>"; };
EB60B4DD204C175700E4953B /* network_policy_ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = network_policy_ios.h; sourceTree = "<group>"; };
ED49D73E2CEE438E004AF27E /* products.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = products.hpp; sourceTree = "<group>"; };
ED49D73F2CEE438E004AF27E /* products.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = products.cpp; sourceTree = "<group>"; };
ED49D7422CEE43A4004AF27E /* meta_config_tests.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = meta_config_tests.cpp; sourceTree = "<group>"; };
ED49D7432CEE43A4004AF27E /* products_tests.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = products_tests.cpp; sourceTree = "<group>"; };
ED965B242CD8F72A0049E39E /* duration.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = duration.hpp; sourceTree = "<group>"; };
ED965B262CD8F77D0049E39E /* duration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = duration.cpp; sourceTree = "<group>"; };
ED965B462CDA4EC00049E39E /* duration_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = duration_tests.cpp; sourceTree = "<group>"; };
@@ -323,7 +317,6 @@
isa = PBXGroup;
children = (
ED49D7422CEE43A4004AF27E /* meta_config_tests.cpp */,
ED49D7432CEE43A4004AF27E /* products_tests.cpp */,
ED965B462CDA4EC00049E39E /* duration_tests.cpp */,
168EFCC12A30EB7400F71EE8 /* distance_tests.cpp */,
675341001C58C4C9002CF0D9 /* apk_test.cpp */,
@@ -465,8 +458,6 @@
6753439E1A3F5D5A00A0A8C3 /* platform_unix_impl.cpp */,
675343A41A3F5D5A00A0A8C3 /* preferred_languages.hpp */,
675343A31A3F5D5A00A0A8C3 /* preferred_languages.cpp */,
ED49D73E2CEE438E004AF27E /* products.hpp */,
ED49D73F2CEE438E004AF27E /* products.cpp */,
4564FA7C2094978C0043CCFB /* remote_file.hpp */,
4564FA7D2094978D0043CCFB /* remote_file.cpp */,
3D78157C1F3D8A0A0068B6AC /* safe_callback.hpp */,
@@ -554,7 +545,6 @@
675343CD1A3F5D5A00A0A8C3 /* platform.hpp in Headers */,
6741250F1B4C00CC00A3E828 /* local_country_file.hpp in Headers */,
3D15ACE2214A707900F725D5 /* localization.hpp in Headers */,
ED49D7412CEE438E004AF27E /* products.hpp in Headers */,
D5B191CF2386C7E4009CD0D6 /* http_uploader_background.hpp in Headers */,
1669C8422A30DCD200530AD1 /* distance.hpp in Headers */,
3DE8B98F1DEC3115000E6083 /* network_policy.hpp in Headers */,
@@ -710,7 +700,6 @@
ED965B272CD8F7810049E39E /* duration.cpp in Sources */,
EB60B4DC204C130300E4953B /* network_policy_ios.mm in Sources */,
6741250E1B4C00CC00A3E828 /* local_country_file.cpp in Sources */,
ED49D7402CEE438E004AF27E /* products.cpp in Sources */,
670E8C761BB318AB00094197 /* platform_ios.mm in Sources */,
67A2526A1BB40E100063F8A8 /* platform_qt.cpp in Sources */,
56EB1EDE1C6B6E6C0022D831 /* mwm_traits.cpp in Sources */,
@@ -748,7 +737,6 @@
files = (
6783389E1C6DE59200FD6263 /* platform_test.cpp in Sources */,
ED49D7442CEE43A4004AF27E /* meta_config_tests.cpp in Sources */,
ED49D7452CEE43A4004AF27E /* products_tests.cpp in Sources */,
678338961C6DE59200FD6263 /* apk_test.cpp in Sources */,
678338991C6DE59200FD6263 /* jansson_test.cpp in Sources */,
ED965B482CDA575B0049E39E /* duration.cpp in Sources */,