From 026f17bb376cb7dfc12f8fd6262d89e2e66b29c7 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Thu, 5 Dec 2019 13:31:10 +0300 Subject: [PATCH] [xcode] Fixing all xcode tests and tools building. --- xcode/base/base.xcodeproj/project.pbxproj | 6 +- xcode/coding/coding.xcodeproj/project.pbxproj | 7 +- xcode/editor/editor.xcodeproj/project.pbxproj | 7 +- .../generator.xcodeproj/project.pbxproj | 376 +++++++++++------- .../generator_tool.xcodeproj/project.pbxproj | 84 ++-- .../geometry.xcodeproj/project.pbxproj | 6 +- .../indexer/indexer.xcodeproj/project.pbxproj | 10 +- xcode/kml/kml.xcodeproj/project.pbxproj | 60 ++- .../local_ads.xcodeproj/project.pbxproj | 15 +- xcode/map/map.xcodeproj/project.pbxproj | 28 +- .../metrics/metrics.xcodeproj/project.pbxproj | 10 +- .../partners_api.xcodeproj/project.pbxproj | 18 +- .../platform.xcodeproj/project.pbxproj | 14 +- .../routing/routing.xcodeproj/project.pbxproj | 30 +- .../routing_common.xcodeproj/project.pbxproj | 11 +- xcode/search/search.xcodeproj/project.pbxproj | 28 +- .../shaders/shaders.xcodeproj/project.pbxproj | 10 +- .../storage/storage.xcodeproj/project.pbxproj | 50 ++- .../traffic/traffic.xcodeproj/project.pbxproj | 19 +- xcode/ugc/ugc.xcodeproj/project.pbxproj | 7 +- 20 files changed, 537 insertions(+), 259 deletions(-) diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj index 8bda1c48fc..191afba5f0 100644 --- a/xcode/base/base.xcodeproj/project.pbxproj +++ b/xcode/base/base.xcodeproj/project.pbxproj @@ -826,7 +826,7 @@ "$(inherited)", "OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1", ); - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = maps.me.base_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -839,7 +839,7 @@ "$(inherited)", "OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1", ); - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = maps.me.base_tests; PRODUCT_NAME = "$(TARGET_NAME)"; VALIDATE_PRODUCT = YES; @@ -901,7 +901,7 @@ "$(inherited)", "OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1", ); - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = maps.me.base_tests; PRODUCT_NAME = "$(TARGET_NAME)"; VALIDATE_PRODUCT = YES; diff --git a/xcode/coding/coding.xcodeproj/project.pbxproj b/xcode/coding/coding.xcodeproj/project.pbxproj index 875170c4a1..275458960c 100644 --- a/xcode/coding/coding.xcodeproj/project.pbxproj +++ b/xcode/coding/coding.xcodeproj/project.pbxproj @@ -59,6 +59,7 @@ 4563B062205909290057556D /* sha1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4563B05F205909280057556D /* sha1.cpp */; }; 4563B063205909290057556D /* sha1.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4563B060205909280057556D /* sha1.hpp */; }; 45C108BA1E9CFF8E000FE1F6 /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 45C108B91E9CFF8E000FE1F6 /* libgeometry.a */; }; + 56DAC3642399206A000BC50D /* test_polylines.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC3632399206A000BC50D /* test_polylines.hpp */; }; 670BAACB1D0B0C1E000302DA /* huffman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 394917221BAC3C2F002A8C4F /* huffman.cpp */; }; 670D04BD1B0BA92D0013A7AC /* expat_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 670D04B31B0BA9050013A7AC /* expat_impl.h */; }; 670D04BE1B0BA92D0013A7AC /* file64_api.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670D04B41B0BA9050013A7AC /* file64_api.hpp */; }; @@ -215,6 +216,7 @@ 4563B05F205909280057556D /* sha1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sha1.cpp; sourceTree = ""; }; 4563B060205909280057556D /* sha1.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = sha1.hpp; sourceTree = ""; }; 45C108B91E9CFF8E000FE1F6 /* libgeometry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgeometry.a; path = "/Users/r.kuznetsov/Dev/Projects/omim/xcode/geometry/../../../omim-build/xcode/Debug/libgeometry.a"; sourceTree = ""; }; + 56DAC3632399206A000BC50D /* test_polylines.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_polylines.hpp; sourceTree = ""; }; 670D04B31B0BA9050013A7AC /* expat_impl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = expat_impl.h; sourceTree = ""; }; 670D04B41B0BA9050013A7AC /* file64_api.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = file64_api.hpp; sourceTree = ""; }; 670D04B51B0BA9050013A7AC /* file_data.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = file_data.cpp; sourceTree = ""; }; @@ -343,6 +345,7 @@ 394916901BAC3A5F002A8C4F /* coding_tests */ = { isa = PBXGroup; children = ( + 56DAC3632399206A000BC50D /* test_polylines.hpp */, 3954E011233500FE0007FDE4 /* files_container_tests.cpp */, BB87BF8322F9E2D1008A8A72 /* serdes_json_test.cpp */, 4098EA6221D12088005612FF /* map_uint32_to_val_tests.cpp */, @@ -592,6 +595,7 @@ 675342D41A3F588C00A0A8C3 /* zip_reader.hpp in Headers */, 675342A41A3F588C00A0A8C3 /* file_writer.hpp in Headers */, 675342C01A3F588C00A0A8C3 /* streams_sink.hpp in Headers */, + 56DAC3642399206A000BC50D /* test_polylines.hpp in Headers */, 670D04C11B0BA92D0013A7AC /* xmlparser.hpp in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -758,7 +762,6 @@ 394916941BAC3A5F002A8C4F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; PRODUCT_BUNDLE_IDENTIFIER = maps.me.coding_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -767,7 +770,6 @@ 394916951BAC3A5F002A8C4F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; PRODUCT_BUNDLE_IDENTIFIER = maps.me.coding_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -857,7 +859,6 @@ A8E541421F9FBD6B00A1B8FA /* Production Full */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; PRODUCT_BUNDLE_IDENTIFIER = maps.me.coding_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; diff --git a/xcode/editor/editor.xcodeproj/project.pbxproj b/xcode/editor/editor.xcodeproj/project.pbxproj index 46f64c2060..83354684eb 100644 --- a/xcode/editor/editor.xcodeproj/project.pbxproj +++ b/xcode/editor/editor.xcodeproj/project.pbxproj @@ -453,6 +453,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -568,7 +569,7 @@ 3496ABCE1DC2031900C5DDBA /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = ru.mail.editor_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -577,7 +578,7 @@ 3496ABCF1DC2031900C5DDBA /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = ru.mail.editor_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -626,7 +627,7 @@ A8E541491F9FBD8400A1B8FA /* Production Full */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = ru.mail.editor_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; diff --git a/xcode/generator/generator.xcodeproj/project.pbxproj b/xcode/generator/generator.xcodeproj/project.pbxproj index 12e570099c..eacf3ad67e 100644 --- a/xcode/generator/generator.xcodeproj/project.pbxproj +++ b/xcode/generator/generator.xcodeproj/project.pbxproj @@ -22,25 +22,17 @@ 391C0C8B22BD257A003DC252 /* cities_ids_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 391C0C8922BD257A003DC252 /* cities_ids_builder.cpp */; }; 391C0C8C22BD257A003DC252 /* cities_ids_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 391C0C8A22BD257A003DC252 /* cities_ids_builder.hpp */; }; 3933ED0E20D7FD4E000B1526 /* intermediate_data.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3933ED0D20D7FD4E000B1526 /* intermediate_data.cpp */; }; - 395784E223030DA800F2CC07 /* place_points_integrator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 395784DA23030DA700F2CC07 /* place_points_integrator.cpp */; }; - 395784E323030DA800F2CC07 /* admin_suburbs_marker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 395784DB23030DA700F2CC07 /* admin_suburbs_marker.cpp */; }; 395784E423030DA800F2CC07 /* locality_point_integrator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 395784DC23030DA800F2CC07 /* locality_point_integrator.hpp */; }; - 395784E523030DA800F2CC07 /* country_specifier_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 395784DD23030DA800F2CC07 /* country_specifier_builder.cpp */; }; 395784E623030DA800F2CC07 /* country_specifier_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 395784DE23030DA800F2CC07 /* country_specifier_builder.hpp */; }; - 395784E723030DA800F2CC07 /* locality_point_integrator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 395784DF23030DA800F2CC07 /* locality_point_integrator.cpp */; }; 395784E823030DA800F2CC07 /* place_points_integrator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 395784E023030DA800F2CC07 /* place_points_integrator.hpp */; }; 395784E923030DA800F2CC07 /* admin_suburbs_marker.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 395784E123030DA800F2CC07 /* admin_suburbs_marker.hpp */; }; 397057C322CB5840001A55CA /* promo_catalog_cities.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 397057C222CB5840001A55CA /* promo_catalog_cities.hpp */; }; 397057C522CB5850001A55CA /* translation.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 397057C422CB5850001A55CA /* translation.hpp */; }; - 397057C722CB589B001A55CA /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 397057C622CB589B001A55CA /* translation.cpp */; }; 397057CC22CB66BA001A55CA /* country_specifier.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 397057CA22CB66BA001A55CA /* country_specifier.hpp */; }; - 397057CD22CB66BA001A55CA /* country_specifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 397057CB22CB66BA001A55CA /* country_specifier.cpp */; }; 39711412229D7E01003915E5 /* collector_camera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3971140B229D7E00003915E5 /* collector_camera.cpp */; }; 39711413229D7E01003915E5 /* collector_camera.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3971140C229D7E01003915E5 /* collector_camera.hpp */; }; 39711414229D7E01003915E5 /* emitter_noop.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3971140D229D7E01003915E5 /* emitter_noop.hpp */; }; - 39711415229D7E01003915E5 /* key_value_storage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3971140E229D7E01003915E5 /* key_value_storage.cpp */; }; 39711416229D7E01003915E5 /* key_value_storage.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3971140F229D7E01003915E5 /* key_value_storage.hpp */; }; - 39711417229D7E01003915E5 /* translator_streets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39711410229D7E01003915E5 /* translator_streets.cpp */; }; 39711418229D7E01003915E5 /* translator_streets.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 39711411229D7E01003915E5 /* translator_streets.hpp */; }; 3989E321230300CD00D63F84 /* affiliation.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3989E31F230300CC00D63F84 /* affiliation.hpp */; }; 3989E322230300CD00D63F84 /* affiliation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3989E320230300CD00D63F84 /* affiliation.cpp */; }; @@ -49,10 +41,8 @@ 3989E33A2303013800D63F84 /* features_processing_helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3989E3352303013800D63F84 /* features_processing_helpers.hpp */; }; 3989E34C2303014A00D63F84 /* place_processor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3989E33E2303014900D63F84 /* place_processor.cpp */; }; 3989E3552303014A00D63F84 /* place_processor.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3989E3472303014A00D63F84 /* place_processor.hpp */; }; - 3989E35F230302CB00D63F84 /* geo_objects_generator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3989E35B230302CB00D63F84 /* geo_objects_generator.cpp */; }; 3989E360230302CB00D63F84 /* geo_objects_maintainer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3989E35C230302CB00D63F84 /* geo_objects_maintainer.hpp */; }; 3989E361230302CB00D63F84 /* geo_objects_generator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3989E35D230302CB00D63F84 /* geo_objects_generator.hpp */; }; - 3989E362230302CB00D63F84 /* geo_objects_maintainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3989E35E230302CB00D63F84 /* geo_objects_maintainer.cpp */; }; 39B2B9781FB468CC00AB85A1 /* cities_boundaries_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39B2B9761FB468CC00AB85A1 /* cities_boundaries_builder.cpp */; }; 39B2B9791FB468CC00AB85A1 /* cities_boundaries_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 39B2B9771FB468CC00AB85A1 /* cities_boundaries_builder.hpp */; }; 39F7E3AA20E1023400DA7A14 /* test_with_classificator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39F7E3A520E1022E00DA7A14 /* test_with_classificator.cpp */; }; @@ -84,13 +74,11 @@ 401E317F225C971400DE7EB8 /* popularity.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 401E3174225C971400DE7EB8 /* popularity.hpp */; }; 401E3180225C971400DE7EB8 /* wiki_url_dumper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 401E3175225C971400DE7EB8 /* wiki_url_dumper.cpp */; }; 401E3181225C971400DE7EB8 /* wiki_url_dumper.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 401E3176225C971400DE7EB8 /* wiki_url_dumper.hpp */; }; - 401E3182225C971400DE7EB8 /* popularity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 401E3177225C971400DE7EB8 /* popularity.cpp */; }; 401E3183225C971400DE7EB8 /* descriptions_section_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 401E3178225C971400DE7EB8 /* descriptions_section_builder.hpp */; }; 401E3184225C971400DE7EB8 /* descriptions_section_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 401E3179225C971400DE7EB8 /* descriptions_section_builder.cpp */; }; 401E3185225C971400DE7EB8 /* platform_helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 401E317A225C971400DE7EB8 /* platform_helpers.cpp */; }; 401E3187225C97D100DE7EB8 /* boost_helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 401E3186225C97D100DE7EB8 /* boost_helpers.hpp */; }; 401E318E225C99A300DE7EB8 /* region_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 401E318A225C99A300DE7EB8 /* region_info.hpp */; }; - 401E3191225C99A300DE7EB8 /* region_info.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 401E318D225C99A300DE7EB8 /* region_info.cpp */; }; 4032E719225D151D00D33617 /* translator_world.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4032E6F3225D151A00D33617 /* translator_world.hpp */; }; 4032E71A225D151D00D33617 /* translator_collection.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4032E6F4225D151A00D33617 /* translator_collection.hpp */; }; 4032E71B225D151D00D33617 /* relation_tags_enricher.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4032E6F5225D151A00D33617 /* relation_tags_enricher.hpp */; }; @@ -98,14 +86,12 @@ 4032E71F225D151D00D33617 /* filter_collection.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4032E6F9225D151B00D33617 /* filter_collection.hpp */; }; 4032E720225D151D00D33617 /* type_helper.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4032E6FA225D151B00D33617 /* type_helper.hpp */; }; 4032E721225D151D00D33617 /* feature_maker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4032E6FB225D151B00D33617 /* feature_maker.cpp */; }; - 4032E722225D151D00D33617 /* emitter_coastline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4032E6FC225D151B00D33617 /* emitter_coastline.cpp */; }; 4032E723225D151D00D33617 /* translator_country.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4032E6FD225D151B00D33617 /* translator_country.cpp */; }; 4032E725225D151D00D33617 /* feature_maker.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4032E6FF225D151B00D33617 /* feature_maker.hpp */; }; 4032E726225D151D00D33617 /* relation_tags_enricher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4032E700225D151B00D33617 /* relation_tags_enricher.cpp */; }; 4032E727225D151D00D33617 /* emitter_world.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4032E701225D151B00D33617 /* emitter_world.hpp */; }; 4032E728225D151D00D33617 /* type_helper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4032E702225D151B00D33617 /* type_helper.cpp */; }; 4032E729225D151D00D33617 /* translator_world.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4032E703225D151B00D33617 /* translator_world.cpp */; }; - 4032E72A225D151D00D33617 /* emitter_world.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4032E704225D151B00D33617 /* emitter_world.cpp */; }; 4032E72B225D151D00D33617 /* feature_processing_layers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4032E705225D151B00D33617 /* feature_processing_layers.hpp */; }; 4032E72C225D151D00D33617 /* translator_country.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4032E706225D151C00D33617 /* translator_country.hpp */; }; 4032E72D225D151D00D33617 /* translator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4032E707225D151C00D33617 /* translator.hpp */; }; @@ -122,13 +108,11 @@ 4032E739225D151D00D33617 /* filter_planet.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4032E713225D151C00D33617 /* filter_planet.hpp */; }; 4032E73A225D151D00D33617 /* translator_coastline.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4032E714225D151C00D33617 /* translator_coastline.hpp */; }; 4032E73B225D151D00D33617 /* translator_coastline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4032E715225D151C00D33617 /* translator_coastline.cpp */; }; - 4032E73C225D151D00D33617 /* emitter_country.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4032E716225D151D00D33617 /* emitter_country.cpp */; }; 4032E73D225D151D00D33617 /* emitter_coastline.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4032E717225D151D00D33617 /* emitter_coastline.hpp */; }; 4032E73E225D151D00D33617 /* filter_interface.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4032E718225D151D00D33617 /* filter_interface.hpp */; }; 40492BC82021DC53008E093A /* locality_sorter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 40492BC32021DC53008E093A /* locality_sorter.hpp */; }; 40492BC92021DC53008E093A /* feature_helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40492BC42021DC53008E093A /* feature_helpers.cpp */; }; 40492BCA2021DC53008E093A /* feature_helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 40492BC52021DC53008E093A /* feature_helpers.hpp */; }; - 40492BCB2021DC53008E093A /* locality_sorter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40492BC62021DC53008E093A /* locality_sorter.cpp */; }; 40492BCC2021DC53008E093A /* geometry_holder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 40492BC72021DC53008E093A /* geometry_holder.hpp */; }; 407E8A122265FEE100C6E668 /* ratings_section_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 407E8A102265FEE000C6E668 /* ratings_section_builder.hpp */; }; 407E8A132265FEE100C6E668 /* ratings_section_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 407E8A112265FEE100C6E668 /* ratings_section_builder.cpp */; }; @@ -137,16 +121,13 @@ 441DB3FD2119D72300D2F324 /* camera_info_collector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 441DB3FA2119D72300D2F324 /* camera_info_collector.hpp */; }; 441DB3FE2119D72300D2F324 /* camera_info_collector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 441DB3FB2119D72300D2F324 /* camera_info_collector.cpp */; }; 56037E4E219AF97200C2193D /* osm_element_helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56037E43219AF97100C2193D /* osm_element_helpers.hpp */; }; - 56037E4F219AF97200C2193D /* emitter_simple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56037E44219AF97100C2193D /* emitter_simple.cpp */; }; 56037E50219AF97200C2193D /* emitter_simple.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56037E45219AF97100C2193D /* emitter_simple.hpp */; }; 56037E51219AF97200C2193D /* filter_elements.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56037E46219AF97100C2193D /* filter_elements.hpp */; }; 56037E52219AF97200C2193D /* translator_geo_objects.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56037E47219AF97100C2193D /* translator_geo_objects.hpp */; }; 56037E53219AF97200C2193D /* osm_element_helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56037E48219AF97100C2193D /* osm_element_helpers.cpp */; }; - 56037E54219AF97200C2193D /* translator_geo_objects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56037E49219AF97100C2193D /* translator_geo_objects.cpp */; }; 56037E55219AF97200C2193D /* collector_interface.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56037E4A219AF97100C2193D /* collector_interface.hpp */; }; 56037E56219AF97200C2193D /* filter_elements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56037E4B219AF97100C2193D /* filter_elements.cpp */; }; 5631B64F219B0C6D009F47D4 /* geo_objects.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 5631B64D219B0C6D009F47D4 /* geo_objects.hpp */; }; - 5631B650219B0C6D009F47D4 /* geo_objects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5631B64E219B0C6D009F47D4 /* geo_objects.cpp */; }; 56829A462134222300A09A28 /* city_roads_generator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56829A422134222100A09A28 /* city_roads_generator.hpp */; }; 56829A482134222300A09A28 /* city_roads_generator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56829A442134222300A09A28 /* city_roads_generator.cpp */; }; 568762601F6A9B18002C22A6 /* transit_generator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5687625E1F6A9B18002C22A6 /* transit_generator.cpp */; }; @@ -158,18 +139,71 @@ 56A1B7AF21A82C3F00246F8C /* maxspeeds_collector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56A1B7A921A82C3F00246F8C /* maxspeeds_collector.cpp */; }; 56A1B7B021A82C3F00246F8C /* maxspeeds_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56A1B7AA21A82C3F00246F8C /* maxspeeds_parser.cpp */; }; 56A6C3D9219B0BDA00A52855 /* collector_region_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56A6C3D7219B0BDA00A52855 /* collector_region_info.hpp */; }; - 56A6C3DA219B0BDA00A52855 /* collector_region_info.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56A6C3D8219B0BDA00A52855 /* collector_region_info.cpp */; }; + 56DAC3042398FA77000BC50D /* processor_country.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2C92398FA73000BC50D /* processor_country.hpp */; }; + 56DAC3052398FA77000BC50D /* processor_factory.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2CA2398FA74000BC50D /* processor_factory.hpp */; }; + 56DAC3062398FA77000BC50D /* filter_world.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2CB2398FA74000BC50D /* filter_world.cpp */; }; + 56DAC3072398FA77000BC50D /* processor_noop.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2CC2398FA74000BC50D /* processor_noop.hpp */; }; + 56DAC3082398FA77000BC50D /* translator_complex.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2CD2398FA74000BC50D /* translator_complex.hpp */; }; + 56DAC3092398FA77000BC50D /* processor_coastline.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2CE2398FA74000BC50D /* processor_coastline.hpp */; }; + 56DAC30A2398FA77000BC50D /* filter_world.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2CF2398FA74000BC50D /* filter_world.hpp */; }; + 56DAC30B2398FA77000BC50D /* processor_booking.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2D02398FA74000BC50D /* processor_booking.hpp */; }; + 56DAC30C2398FA77000BC50D /* postcodes_section_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2D12398FA74000BC50D /* postcodes_section_builder.cpp */; }; + 56DAC30D2398FA77000BC50D /* collector_boundary_postcode.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2D22398FA74000BC50D /* collector_boundary_postcode.hpp */; }; + 56DAC30E2398FA77000BC50D /* postcodes_section_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2D32398FA74000BC50D /* postcodes_section_builder.hpp */; }; + 56DAC30F2398FA77000BC50D /* complex_loader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2D42398FA74000BC50D /* complex_loader.cpp */; }; + 56DAC3102398FA77000BC50D /* filter_complex.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2D52398FA74000BC50D /* filter_complex.hpp */; }; + 56DAC3112398FA77000BC50D /* collector_boundary_postcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2D62398FA74000BC50D /* collector_boundary_postcode.cpp */; }; + 56DAC3122398FA77000BC50D /* processor_world.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2D72398FA74000BC50D /* processor_world.cpp */; }; + 56DAC3132398FA77000BC50D /* collector_mini_roundabout.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2D82398FA74000BC50D /* collector_mini_roundabout.hpp */; }; + 56DAC3142398FA77000BC50D /* hierarchy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2D92398FA74000BC50D /* hierarchy.cpp */; }; + 56DAC3152398FA77000BC50D /* raw_generator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2DA2398FA75000BC50D /* raw_generator.hpp */; }; + 56DAC3162398FA77000BC50D /* cross_mwm_osm_ways_collector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2DB2398FA75000BC50D /* cross_mwm_osm_ways_collector.cpp */; }; + 56DAC3172398FA77000BC50D /* filter_roads.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2DC2398FA75000BC50D /* filter_roads.hpp */; }; + 56DAC3182398FA77000BC50D /* hierarchy_entry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2DD2398FA75000BC50D /* hierarchy_entry.cpp */; }; + 56DAC3192398FA77000BC50D /* collector_building_parts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2DE2398FA75000BC50D /* collector_building_parts.cpp */; }; + 56DAC31A2398FA77000BC50D /* collector_mini_roundabout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2DF2398FA75000BC50D /* collector_mini_roundabout.cpp */; }; + 56DAC31B2398FA77000BC50D /* final_processor_intermediate_mwm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2E02398FA75000BC50D /* final_processor_intermediate_mwm.cpp */; }; + 56DAC31C2398FA77000BC50D /* processor_simple.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2E12398FA75000BC50D /* processor_simple.hpp */; }; + 56DAC31D2398FA77000BC50D /* mini_roundabout_transformer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2E22398FA75000BC50D /* mini_roundabout_transformer.hpp */; }; + 56DAC31E2398FA77000BC50D /* processor_complex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2E32398FA75000BC50D /* processor_complex.cpp */; }; + 56DAC31F2398FA77000BC50D /* hierarchy_entry.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2E42398FA75000BC50D /* hierarchy_entry.hpp */; }; + 56DAC3202398FA77000BC50D /* collector_building_parts.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2E52398FA75000BC50D /* collector_building_parts.hpp */; }; + 56DAC3212398FA77000BC50D /* translator_complex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2E62398FA75000BC50D /* translator_complex.cpp */; }; + 56DAC3222398FA77000BC50D /* final_processor_intermediate_mwm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2E72398FA75000BC50D /* final_processor_intermediate_mwm.hpp */; }; + 56DAC3232398FA77000BC50D /* raw_generator_writer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2E82398FA75000BC50D /* raw_generator_writer.cpp */; }; + 56DAC3242398FA77000BC50D /* processor_complex.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2E92398FA76000BC50D /* processor_complex.hpp */; }; + 56DAC3252398FA77000BC50D /* cells_merger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2EA2398FA76000BC50D /* cells_merger.cpp */; }; + 56DAC3262398FA77000BC50D /* processor_country.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2EB2398FA76000BC50D /* processor_country.cpp */; }; + 56DAC3272398FA77000BC50D /* processor_interface.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2EC2398FA76000BC50D /* processor_interface.hpp */; }; + 56DAC3282398FA77000BC50D /* mini_roundabout_transformer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2ED2398FA76000BC50D /* mini_roundabout_transformer.cpp */; }; + 56DAC3292398FA77000BC50D /* processor_simple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2EE2398FA76000BC50D /* processor_simple.cpp */; }; + 56DAC32A2398FA77000BC50D /* filter_roads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2EF2398FA76000BC50D /* filter_roads.cpp */; }; + 56DAC32B2398FA77000BC50D /* raw_generator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2F02398FA76000BC50D /* raw_generator.cpp */; }; + 56DAC32C2398FA77000BC50D /* translators_pool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2F12398FA76000BC50D /* translators_pool.cpp */; }; + 56DAC32D2398FA77000BC50D /* routing_city_boundaries_processor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2F22398FA76000BC50D /* routing_city_boundaries_processor.cpp */; }; + 56DAC32E2398FA77000BC50D /* composite_id.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2F32398FA76000BC50D /* composite_id.hpp */; }; + 56DAC32F2398FA77000BC50D /* cells_merger.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2F42398FA76000BC50D /* cells_merger.hpp */; }; + 56DAC3302398FA77000BC50D /* translators_pool.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2F52398FA76000BC50D /* translators_pool.hpp */; }; + 56DAC3312398FA77000BC50D /* processor_world.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2F62398FA76000BC50D /* processor_world.hpp */; }; + 56DAC3322398FA77000BC50D /* collector_routing_city_boundaries.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2F72398FA76000BC50D /* collector_routing_city_boundaries.cpp */; }; + 56DAC3332398FA77000BC50D /* collector_routing_city_boundaries.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2F82398FA77000BC50D /* collector_routing_city_boundaries.hpp */; }; + 56DAC3342398FA77000BC50D /* filter_complex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2F92398FA77000BC50D /* filter_complex.cpp */; }; + 56DAC3352398FA77000BC50D /* composite_id.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2FA2398FA77000BC50D /* composite_id.cpp */; }; + 56DAC3362398FA77000BC50D /* mini_roundabout_info.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2FB2398FA77000BC50D /* mini_roundabout_info.cpp */; }; + 56DAC3372398FA77000BC50D /* cross_mwm_osm_ways_collector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2FC2398FA77000BC50D /* cross_mwm_osm_ways_collector.hpp */; }; + 56DAC3382398FA77000BC50D /* gen_mwm_info.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2FD2398FA77000BC50D /* gen_mwm_info.cpp */; }; + 56DAC3392398FA77000BC50D /* raw_generator_writer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2FE2398FA77000BC50D /* raw_generator_writer.hpp */; }; + 56DAC33A2398FA77000BC50D /* complex_loader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2FF2398FA77000BC50D /* complex_loader.hpp */; }; + 56DAC33B2398FA77000BC50D /* routing_city_boundaries_processor.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC3002398FA77000BC50D /* routing_city_boundaries_processor.hpp */; }; + 56DAC33C2398FA77000BC50D /* hierarchy.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC3012398FA77000BC50D /* hierarchy.hpp */; }; + 56DAC33D2398FA77000BC50D /* processor_coastline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC3022398FA77000BC50D /* processor_coastline.cpp */; }; + 56DAC33E2398FA77000BC50D /* mini_roundabout_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC3032398FA77000BC50D /* mini_roundabout_info.hpp */; }; 56E0C4E4213FD56F00541E0F /* cities_boundaries_checker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56E0C4E2213FD56E00541E0F /* cities_boundaries_checker.cpp */; }; 56E0C4E5213FD56F00541E0F /* cities_boundaries_checker.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56E0C4E3213FD56E00541E0F /* cities_boundaries_checker.hpp */; }; 56FB43832164F571002099B3 /* region_base.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56FB43742164F570002099B3 /* region_base.hpp */; }; - 56FB43862164F571002099B3 /* regions_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56FB43772164F570002099B3 /* regions_builder.cpp */; }; 56FB43872164F571002099B3 /* regions_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56FB43782164F570002099B3 /* regions_builder.hpp */; }; - 56FB43882164F571002099B3 /* region.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56FB43792164F570002099B3 /* region.cpp */; }; 56FB43892164F571002099B3 /* node.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56FB437A2164F570002099B3 /* node.hpp */; }; - 56FB438A2164F571002099B3 /* regions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56FB437B2164F570002099B3 /* regions.cpp */; }; - 56FB438B2164F571002099B3 /* region_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56FB437C2164F570002099B3 /* region_base.cpp */; }; 56FB438C2164F571002099B3 /* region.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56FB437D2164F571002099B3 /* region.hpp */; }; - 56FB438E2164F571002099B3 /* node.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56FB437F2164F571002099B3 /* node.cpp */; }; 56FB438F2164F571002099B3 /* regions.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56FB43802164F571002099B3 /* regions.hpp */; }; 670B84BC1A8CDB0000CE4492 /* osm_source.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670B84BA1A8CDB0000CE4492 /* osm_source.cpp */; }; 670B84BD1A8CDB0000CE4492 /* osm_source.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670B84BB1A8CDB0000CE4492 /* osm_source.hpp */; }; @@ -186,20 +220,13 @@ 670E7BCB1EF9C29A00A8E9ED /* ugc_translator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670E7BC91EF9C29A00A8E9ED /* ugc_translator.hpp */; }; 671C2D5A22AFD969008B2B8B /* level_region.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671C2D5622AFD969008B2B8B /* level_region.hpp */; }; 671C2D5B22AFD969008B2B8B /* place_point.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671C2D5722AFD969008B2B8B /* place_point.hpp */; }; - 671C2D5C22AFD969008B2B8B /* region_info_getter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C2D5822AFD969008B2B8B /* region_info_getter.cpp */; }; 671C2D5D22AFD969008B2B8B /* region_info_getter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671C2D5922AFD969008B2B8B /* region_info_getter.hpp */; }; - 671C2D6822AFD983008B2B8B /* street_geometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C2D5E22AFD982008B2B8B /* street_geometry.cpp */; }; 671C2D6922AFD983008B2B8B /* street_regions_tracing.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671C2D5F22AFD982008B2B8B /* street_regions_tracing.hpp */; }; - 671C2D6A22AFD983008B2B8B /* streets_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C2D6022AFD982008B2B8B /* streets_builder.cpp */; }; 671C2D6B22AFD983008B2B8B /* street_geometry.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671C2D6122AFD982008B2B8B /* street_geometry.hpp */; }; 671C2D6C22AFD983008B2B8B /* streets_filter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671C2D6222AFD983008B2B8B /* streets_filter.hpp */; }; - 671C2D6D22AFD983008B2B8B /* streets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C2D6322AFD983008B2B8B /* streets.cpp */; }; 671C2D6E22AFD983008B2B8B /* streets.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671C2D6422AFD983008B2B8B /* streets.hpp */; }; - 671C2D6F22AFD983008B2B8B /* streets_filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C2D6522AFD983008B2B8B /* streets_filter.cpp */; }; 671C2D7022AFD983008B2B8B /* streets_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671C2D6622AFD983008B2B8B /* streets_builder.hpp */; }; - 671C2D7122AFD983008B2B8B /* street_regions_tracing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C2D6722AFD983008B2B8B /* street_regions_tracing.cpp */; }; 671C2D7622AFD995008B2B8B /* geo_objects_filter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671C2D7222AFD994008B2B8B /* geo_objects_filter.hpp */; }; - 671C2D7822AFD995008B2B8B /* geo_objects_filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C2D7422AFD994008B2B8B /* geo_objects_filter.cpp */; }; 671ED3CE20D40ABB00D4317E /* routing_helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671ED3CC20D40ABA00D4317E /* routing_helpers.cpp */; }; 671ED3CF20D40ABB00D4317E /* routing_helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671ED3CD20D40ABB00D4317E /* routing_helpers.hpp */; }; 6726C1D51A4AFEF4005EEA39 /* osm2meta.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1D31A4AFEF4005EEA39 /* osm2meta.cpp */; }; @@ -258,14 +285,11 @@ 9D1B3F1C2034624A00278AC8 /* node_mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9D1B3F1A2034624900278AC8 /* node_mixer.cpp */; }; E162BD27213E8F19007ADEF1 /* factory_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E162BD26213E8F18007ADEF1 /* factory_utils.hpp */; }; E162BD3D213EAEF6007ADEF1 /* emitter_restaurants.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E162BD37213EAEF4007ADEF1 /* emitter_restaurants.hpp */; }; - E162BD40213EAEF6007ADEF1 /* emitter_restaurants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E162BD3A213EAEF5007ADEF1 /* emitter_restaurants.cpp */; }; E162BD49213EAF0A007ADEF1 /* popular_places_section_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E162BD43213EAF09007ADEF1 /* popular_places_section_builder.cpp */; }; - E162BD4A213EAF0A007ADEF1 /* place.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E162BD44213EAF09007ADEF1 /* place.cpp */; }; E162BD4B213EAF0A007ADEF1 /* popular_places_section_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E162BD48213EAF0A007ADEF1 /* popular_places_section_builder.hpp */; }; E162BD51213EAF2D007ADEF1 /* ways_merger.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E162BD4D213EAF2C007ADEF1 /* ways_merger.hpp */; }; E162BD52213EAF2D007ADEF1 /* ways_merger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E162BD4E213EAF2C007ADEF1 /* ways_merger.cpp */; }; E1EC1440211C5F7A00B53061 /* translator_factory.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E1EC1439211C5F7900B53061 /* translator_factory.hpp */; }; - E1EC1441211C5F7A00B53061 /* translator_region.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1EC143A211C5F7900B53061 /* translator_region.cpp */; }; E1EC1442211C5F7A00B53061 /* translator_region.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E1EC143B211C5F7A00B53061 /* translator_region.hpp */; }; E1EC1443211C5F7A00B53061 /* translator_interface.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E1EC143C211C5F7A00B53061 /* translator_interface.hpp */; }; E1EC1454211C5F9100B53061 /* emitter_factory.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E1EC144B211C5F9100B53061 /* emitter_factory.hpp */; }; @@ -298,25 +322,17 @@ 391C0C8922BD257A003DC252 /* cities_ids_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cities_ids_builder.cpp; sourceTree = ""; }; 391C0C8A22BD257A003DC252 /* cities_ids_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cities_ids_builder.hpp; sourceTree = ""; }; 3933ED0D20D7FD4E000B1526 /* intermediate_data.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = intermediate_data.cpp; sourceTree = ""; }; - 395784DA23030DA700F2CC07 /* place_points_integrator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = place_points_integrator.cpp; path = regions/place_points_integrator.cpp; sourceTree = ""; }; - 395784DB23030DA700F2CC07 /* admin_suburbs_marker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = admin_suburbs_marker.cpp; path = regions/admin_suburbs_marker.cpp; sourceTree = ""; }; 395784DC23030DA800F2CC07 /* locality_point_integrator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = locality_point_integrator.hpp; path = regions/locality_point_integrator.hpp; sourceTree = ""; }; - 395784DD23030DA800F2CC07 /* country_specifier_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = country_specifier_builder.cpp; path = regions/country_specifier_builder.cpp; sourceTree = ""; }; 395784DE23030DA800F2CC07 /* country_specifier_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = country_specifier_builder.hpp; path = regions/country_specifier_builder.hpp; sourceTree = ""; }; - 395784DF23030DA800F2CC07 /* locality_point_integrator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = locality_point_integrator.cpp; path = regions/locality_point_integrator.cpp; sourceTree = ""; }; 395784E023030DA800F2CC07 /* place_points_integrator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = place_points_integrator.hpp; path = regions/place_points_integrator.hpp; sourceTree = ""; }; 395784E123030DA800F2CC07 /* admin_suburbs_marker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = admin_suburbs_marker.hpp; path = regions/admin_suburbs_marker.hpp; sourceTree = ""; }; 397057C222CB5840001A55CA /* promo_catalog_cities.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = promo_catalog_cities.hpp; sourceTree = ""; }; 397057C422CB5850001A55CA /* translation.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = translation.hpp; sourceTree = ""; }; - 397057C622CB589B001A55CA /* translation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = translation.cpp; sourceTree = ""; }; 397057CA22CB66BA001A55CA /* country_specifier.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = country_specifier.hpp; path = regions/country_specifier.hpp; sourceTree = ""; }; - 397057CB22CB66BA001A55CA /* country_specifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = country_specifier.cpp; path = regions/country_specifier.cpp; sourceTree = ""; }; 3971140B229D7E00003915E5 /* collector_camera.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collector_camera.cpp; sourceTree = ""; }; 3971140C229D7E01003915E5 /* collector_camera.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = collector_camera.hpp; sourceTree = ""; }; 3971140D229D7E01003915E5 /* emitter_noop.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = emitter_noop.hpp; sourceTree = ""; }; - 3971140E229D7E01003915E5 /* key_value_storage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = key_value_storage.cpp; sourceTree = ""; }; 3971140F229D7E01003915E5 /* key_value_storage.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = key_value_storage.hpp; sourceTree = ""; }; - 39711410229D7E01003915E5 /* translator_streets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = translator_streets.cpp; sourceTree = ""; }; 39711411229D7E01003915E5 /* translator_streets.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = translator_streets.hpp; sourceTree = ""; }; 3989E31F230300CC00D63F84 /* affiliation.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = affiliation.hpp; sourceTree = ""; }; 3989E320230300CD00D63F84 /* affiliation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = affiliation.cpp; sourceTree = ""; }; @@ -325,10 +341,8 @@ 3989E3352303013800D63F84 /* features_processing_helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_processing_helpers.hpp; sourceTree = ""; }; 3989E33E2303014900D63F84 /* place_processor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = place_processor.cpp; sourceTree = ""; }; 3989E3472303014A00D63F84 /* place_processor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = place_processor.hpp; sourceTree = ""; }; - 3989E35B230302CB00D63F84 /* geo_objects_generator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = geo_objects_generator.cpp; path = geo_objects/geo_objects_generator.cpp; sourceTree = ""; }; 3989E35C230302CB00D63F84 /* geo_objects_maintainer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = geo_objects_maintainer.hpp; path = geo_objects/geo_objects_maintainer.hpp; sourceTree = ""; }; 3989E35D230302CB00D63F84 /* geo_objects_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = geo_objects_generator.hpp; path = geo_objects/geo_objects_generator.hpp; sourceTree = ""; }; - 3989E35E230302CB00D63F84 /* geo_objects_maintainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = geo_objects_maintainer.cpp; path = geo_objects/geo_objects_maintainer.cpp; sourceTree = ""; }; 39B2B9761FB468CC00AB85A1 /* cities_boundaries_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cities_boundaries_builder.cpp; sourceTree = ""; }; 39B2B9771FB468CC00AB85A1 /* cities_boundaries_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cities_boundaries_builder.hpp; sourceTree = ""; }; 39F7E3A220E1022E00DA7A14 /* test_with_custom_mwms.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_with_custom_mwms.hpp; sourceTree = ""; }; @@ -369,13 +383,11 @@ 401E3174225C971400DE7EB8 /* popularity.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = popularity.hpp; sourceTree = ""; }; 401E3175225C971400DE7EB8 /* wiki_url_dumper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wiki_url_dumper.cpp; sourceTree = ""; }; 401E3176225C971400DE7EB8 /* wiki_url_dumper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = wiki_url_dumper.hpp; sourceTree = ""; }; - 401E3177225C971400DE7EB8 /* popularity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = popularity.cpp; sourceTree = ""; }; 401E3178225C971400DE7EB8 /* descriptions_section_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = descriptions_section_builder.hpp; sourceTree = ""; }; 401E3179225C971400DE7EB8 /* descriptions_section_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = descriptions_section_builder.cpp; sourceTree = ""; }; 401E317A225C971400DE7EB8 /* platform_helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platform_helpers.cpp; sourceTree = ""; }; 401E3186225C97D100DE7EB8 /* boost_helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = boost_helpers.hpp; sourceTree = ""; }; 401E318A225C99A300DE7EB8 /* region_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = region_info.hpp; path = regions/region_info.hpp; sourceTree = ""; }; - 401E318D225C99A300DE7EB8 /* region_info.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = region_info.cpp; path = regions/region_info.cpp; sourceTree = ""; }; 4032E6F3225D151A00D33617 /* translator_world.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = translator_world.hpp; sourceTree = ""; }; 4032E6F4225D151A00D33617 /* translator_collection.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = translator_collection.hpp; sourceTree = ""; }; 4032E6F5225D151A00D33617 /* relation_tags_enricher.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = relation_tags_enricher.hpp; sourceTree = ""; }; @@ -383,14 +395,12 @@ 4032E6F9225D151B00D33617 /* filter_collection.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = filter_collection.hpp; sourceTree = ""; }; 4032E6FA225D151B00D33617 /* type_helper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = type_helper.hpp; sourceTree = ""; }; 4032E6FB225D151B00D33617 /* feature_maker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_maker.cpp; sourceTree = ""; }; - 4032E6FC225D151B00D33617 /* emitter_coastline.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = emitter_coastline.cpp; sourceTree = ""; }; 4032E6FD225D151B00D33617 /* translator_country.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = translator_country.cpp; sourceTree = ""; }; 4032E6FF225D151B00D33617 /* feature_maker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = feature_maker.hpp; sourceTree = ""; }; 4032E700225D151B00D33617 /* relation_tags_enricher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = relation_tags_enricher.cpp; sourceTree = ""; }; 4032E701225D151B00D33617 /* emitter_world.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = emitter_world.hpp; sourceTree = ""; }; 4032E702225D151B00D33617 /* type_helper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = type_helper.cpp; sourceTree = ""; }; 4032E703225D151B00D33617 /* translator_world.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = translator_world.cpp; sourceTree = ""; }; - 4032E704225D151B00D33617 /* emitter_world.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = emitter_world.cpp; sourceTree = ""; }; 4032E705225D151B00D33617 /* feature_processing_layers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = feature_processing_layers.hpp; sourceTree = ""; }; 4032E706225D151C00D33617 /* translator_country.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = translator_country.hpp; sourceTree = ""; }; 4032E707225D151C00D33617 /* translator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = translator.hpp; sourceTree = ""; }; @@ -407,13 +417,11 @@ 4032E713225D151C00D33617 /* filter_planet.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = filter_planet.hpp; sourceTree = ""; }; 4032E714225D151C00D33617 /* translator_coastline.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = translator_coastline.hpp; sourceTree = ""; }; 4032E715225D151C00D33617 /* translator_coastline.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = translator_coastline.cpp; sourceTree = ""; }; - 4032E716225D151D00D33617 /* emitter_country.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = emitter_country.cpp; sourceTree = ""; }; 4032E717225D151D00D33617 /* emitter_coastline.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = emitter_coastline.hpp; sourceTree = ""; }; 4032E718225D151D00D33617 /* filter_interface.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = filter_interface.hpp; sourceTree = ""; }; 40492BC32021DC53008E093A /* locality_sorter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = locality_sorter.hpp; sourceTree = ""; }; 40492BC42021DC53008E093A /* feature_helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_helpers.cpp; sourceTree = ""; }; 40492BC52021DC53008E093A /* feature_helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = feature_helpers.hpp; sourceTree = ""; }; - 40492BC62021DC53008E093A /* locality_sorter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locality_sorter.cpp; sourceTree = ""; }; 40492BC72021DC53008E093A /* geometry_holder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = geometry_holder.hpp; sourceTree = ""; }; 407E8A102265FEE000C6E668 /* ratings_section_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ratings_section_builder.hpp; sourceTree = ""; }; 407E8A112265FEE100C6E668 /* ratings_section_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ratings_section_builder.cpp; sourceTree = ""; }; @@ -422,16 +430,13 @@ 441DB3FA2119D72300D2F324 /* camera_info_collector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = camera_info_collector.hpp; sourceTree = ""; }; 441DB3FB2119D72300D2F324 /* camera_info_collector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = camera_info_collector.cpp; sourceTree = ""; }; 56037E43219AF97100C2193D /* osm_element_helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_element_helpers.hpp; sourceTree = ""; }; - 56037E44219AF97100C2193D /* emitter_simple.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = emitter_simple.cpp; sourceTree = ""; }; 56037E45219AF97100C2193D /* emitter_simple.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = emitter_simple.hpp; sourceTree = ""; }; 56037E46219AF97100C2193D /* filter_elements.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = filter_elements.hpp; sourceTree = ""; }; 56037E47219AF97100C2193D /* translator_geo_objects.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = translator_geo_objects.hpp; sourceTree = ""; }; 56037E48219AF97100C2193D /* osm_element_helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_element_helpers.cpp; sourceTree = ""; }; - 56037E49219AF97100C2193D /* translator_geo_objects.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = translator_geo_objects.cpp; sourceTree = ""; }; 56037E4A219AF97100C2193D /* collector_interface.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = collector_interface.hpp; sourceTree = ""; }; 56037E4B219AF97100C2193D /* filter_elements.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = filter_elements.cpp; sourceTree = ""; }; 5631B64D219B0C6D009F47D4 /* geo_objects.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = geo_objects.hpp; path = geo_objects/geo_objects.hpp; sourceTree = ""; }; - 5631B64E219B0C6D009F47D4 /* geo_objects.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = geo_objects.cpp; path = geo_objects/geo_objects.cpp; sourceTree = ""; }; 56829A422134222100A09A28 /* city_roads_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = city_roads_generator.hpp; sourceTree = ""; }; 56829A442134222300A09A28 /* city_roads_generator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = city_roads_generator.cpp; sourceTree = ""; }; 5687625E1F6A9B18002C22A6 /* transit_generator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transit_generator.cpp; sourceTree = ""; }; @@ -443,18 +448,71 @@ 56A1B7A921A82C3F00246F8C /* maxspeeds_collector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maxspeeds_collector.cpp; sourceTree = ""; }; 56A1B7AA21A82C3F00246F8C /* maxspeeds_parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maxspeeds_parser.cpp; sourceTree = ""; }; 56A6C3D7219B0BDA00A52855 /* collector_region_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = collector_region_info.hpp; path = regions/collector_region_info.hpp; sourceTree = ""; }; - 56A6C3D8219B0BDA00A52855 /* collector_region_info.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = collector_region_info.cpp; path = regions/collector_region_info.cpp; sourceTree = ""; }; + 56DAC2C92398FA73000BC50D /* processor_country.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = processor_country.hpp; sourceTree = ""; }; + 56DAC2CA2398FA74000BC50D /* processor_factory.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = processor_factory.hpp; sourceTree = ""; }; + 56DAC2CB2398FA74000BC50D /* filter_world.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = filter_world.cpp; sourceTree = ""; }; + 56DAC2CC2398FA74000BC50D /* processor_noop.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = processor_noop.hpp; sourceTree = ""; }; + 56DAC2CD2398FA74000BC50D /* translator_complex.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = translator_complex.hpp; sourceTree = ""; }; + 56DAC2CE2398FA74000BC50D /* processor_coastline.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = processor_coastline.hpp; sourceTree = ""; }; + 56DAC2CF2398FA74000BC50D /* filter_world.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = filter_world.hpp; sourceTree = ""; }; + 56DAC2D02398FA74000BC50D /* processor_booking.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = processor_booking.hpp; sourceTree = ""; }; + 56DAC2D12398FA74000BC50D /* postcodes_section_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = postcodes_section_builder.cpp; sourceTree = ""; }; + 56DAC2D22398FA74000BC50D /* collector_boundary_postcode.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = collector_boundary_postcode.hpp; sourceTree = ""; }; + 56DAC2D32398FA74000BC50D /* postcodes_section_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = postcodes_section_builder.hpp; sourceTree = ""; }; + 56DAC2D42398FA74000BC50D /* complex_loader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = complex_loader.cpp; sourceTree = ""; }; + 56DAC2D52398FA74000BC50D /* filter_complex.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = filter_complex.hpp; sourceTree = ""; }; + 56DAC2D62398FA74000BC50D /* collector_boundary_postcode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collector_boundary_postcode.cpp; sourceTree = ""; }; + 56DAC2D72398FA74000BC50D /* processor_world.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = processor_world.cpp; sourceTree = ""; }; + 56DAC2D82398FA74000BC50D /* collector_mini_roundabout.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = collector_mini_roundabout.hpp; sourceTree = ""; }; + 56DAC2D92398FA74000BC50D /* hierarchy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hierarchy.cpp; sourceTree = ""; }; + 56DAC2DA2398FA75000BC50D /* raw_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = raw_generator.hpp; sourceTree = ""; }; + 56DAC2DB2398FA75000BC50D /* cross_mwm_osm_ways_collector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cross_mwm_osm_ways_collector.cpp; sourceTree = ""; }; + 56DAC2DC2398FA75000BC50D /* filter_roads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = filter_roads.hpp; sourceTree = ""; }; + 56DAC2DD2398FA75000BC50D /* hierarchy_entry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hierarchy_entry.cpp; sourceTree = ""; }; + 56DAC2DE2398FA75000BC50D /* collector_building_parts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collector_building_parts.cpp; sourceTree = ""; }; + 56DAC2DF2398FA75000BC50D /* collector_mini_roundabout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collector_mini_roundabout.cpp; sourceTree = ""; }; + 56DAC2E02398FA75000BC50D /* final_processor_intermediate_mwm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = final_processor_intermediate_mwm.cpp; sourceTree = ""; }; + 56DAC2E12398FA75000BC50D /* processor_simple.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = processor_simple.hpp; sourceTree = ""; }; + 56DAC2E22398FA75000BC50D /* mini_roundabout_transformer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mini_roundabout_transformer.hpp; sourceTree = ""; }; + 56DAC2E32398FA75000BC50D /* processor_complex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = processor_complex.cpp; sourceTree = ""; }; + 56DAC2E42398FA75000BC50D /* hierarchy_entry.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = hierarchy_entry.hpp; sourceTree = ""; }; + 56DAC2E52398FA75000BC50D /* collector_building_parts.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = collector_building_parts.hpp; sourceTree = ""; }; + 56DAC2E62398FA75000BC50D /* translator_complex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = translator_complex.cpp; sourceTree = ""; }; + 56DAC2E72398FA75000BC50D /* final_processor_intermediate_mwm.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = final_processor_intermediate_mwm.hpp; sourceTree = ""; }; + 56DAC2E82398FA75000BC50D /* raw_generator_writer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = raw_generator_writer.cpp; sourceTree = ""; }; + 56DAC2E92398FA76000BC50D /* processor_complex.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = processor_complex.hpp; sourceTree = ""; }; + 56DAC2EA2398FA76000BC50D /* cells_merger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cells_merger.cpp; sourceTree = ""; }; + 56DAC2EB2398FA76000BC50D /* processor_country.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = processor_country.cpp; sourceTree = ""; }; + 56DAC2EC2398FA76000BC50D /* processor_interface.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = processor_interface.hpp; sourceTree = ""; }; + 56DAC2ED2398FA76000BC50D /* mini_roundabout_transformer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mini_roundabout_transformer.cpp; sourceTree = ""; }; + 56DAC2EE2398FA76000BC50D /* processor_simple.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = processor_simple.cpp; sourceTree = ""; }; + 56DAC2EF2398FA76000BC50D /* filter_roads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = filter_roads.cpp; sourceTree = ""; }; + 56DAC2F02398FA76000BC50D /* raw_generator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = raw_generator.cpp; sourceTree = ""; }; + 56DAC2F12398FA76000BC50D /* translators_pool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = translators_pool.cpp; sourceTree = ""; }; + 56DAC2F22398FA76000BC50D /* routing_city_boundaries_processor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = routing_city_boundaries_processor.cpp; sourceTree = ""; }; + 56DAC2F32398FA76000BC50D /* composite_id.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = composite_id.hpp; sourceTree = ""; }; + 56DAC2F42398FA76000BC50D /* cells_merger.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cells_merger.hpp; sourceTree = ""; }; + 56DAC2F52398FA76000BC50D /* translators_pool.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = translators_pool.hpp; sourceTree = ""; }; + 56DAC2F62398FA76000BC50D /* processor_world.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = processor_world.hpp; sourceTree = ""; }; + 56DAC2F72398FA76000BC50D /* collector_routing_city_boundaries.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collector_routing_city_boundaries.cpp; sourceTree = ""; }; + 56DAC2F82398FA77000BC50D /* collector_routing_city_boundaries.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = collector_routing_city_boundaries.hpp; sourceTree = ""; }; + 56DAC2F92398FA77000BC50D /* filter_complex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = filter_complex.cpp; sourceTree = ""; }; + 56DAC2FA2398FA77000BC50D /* composite_id.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = composite_id.cpp; sourceTree = ""; }; + 56DAC2FB2398FA77000BC50D /* mini_roundabout_info.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mini_roundabout_info.cpp; sourceTree = ""; }; + 56DAC2FC2398FA77000BC50D /* cross_mwm_osm_ways_collector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cross_mwm_osm_ways_collector.hpp; sourceTree = ""; }; + 56DAC2FD2398FA77000BC50D /* gen_mwm_info.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gen_mwm_info.cpp; sourceTree = ""; }; + 56DAC2FE2398FA77000BC50D /* raw_generator_writer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = raw_generator_writer.hpp; sourceTree = ""; }; + 56DAC2FF2398FA77000BC50D /* complex_loader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = complex_loader.hpp; sourceTree = ""; }; + 56DAC3002398FA77000BC50D /* routing_city_boundaries_processor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = routing_city_boundaries_processor.hpp; sourceTree = ""; }; + 56DAC3012398FA77000BC50D /* hierarchy.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = hierarchy.hpp; sourceTree = ""; }; + 56DAC3022398FA77000BC50D /* processor_coastline.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = processor_coastline.cpp; sourceTree = ""; }; + 56DAC3032398FA77000BC50D /* mini_roundabout_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mini_roundabout_info.hpp; sourceTree = ""; }; 56E0C4E2213FD56E00541E0F /* cities_boundaries_checker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cities_boundaries_checker.cpp; sourceTree = ""; }; 56E0C4E3213FD56E00541E0F /* cities_boundaries_checker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cities_boundaries_checker.hpp; sourceTree = ""; }; 56FB43742164F570002099B3 /* region_base.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = region_base.hpp; path = regions/region_base.hpp; sourceTree = ""; }; - 56FB43772164F570002099B3 /* regions_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = regions_builder.cpp; path = regions/regions_builder.cpp; sourceTree = ""; }; 56FB43782164F570002099B3 /* regions_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = regions_builder.hpp; path = regions/regions_builder.hpp; sourceTree = ""; }; - 56FB43792164F570002099B3 /* region.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = region.cpp; path = regions/region.cpp; sourceTree = ""; }; 56FB437A2164F570002099B3 /* node.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = node.hpp; path = regions/node.hpp; sourceTree = ""; }; - 56FB437B2164F570002099B3 /* regions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = regions.cpp; path = regions/regions.cpp; sourceTree = ""; }; - 56FB437C2164F570002099B3 /* region_base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = region_base.cpp; path = regions/region_base.cpp; sourceTree = ""; }; 56FB437D2164F571002099B3 /* region.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = region.hpp; path = regions/region.hpp; sourceTree = ""; }; - 56FB437F2164F571002099B3 /* node.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = node.cpp; path = regions/node.cpp; sourceTree = ""; }; 56FB43802164F571002099B3 /* regions.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = regions.hpp; path = regions/regions.hpp; sourceTree = ""; }; 670B84BA1A8CDB0000CE4492 /* osm_source.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_source.cpp; sourceTree = ""; }; 670B84BB1A8CDB0000CE4492 /* osm_source.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_source.hpp; sourceTree = ""; }; @@ -470,20 +528,13 @@ 670E7BC91EF9C29A00A8E9ED /* ugc_translator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ugc_translator.hpp; sourceTree = ""; }; 671C2D5622AFD969008B2B8B /* level_region.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = level_region.hpp; path = regions/level_region.hpp; sourceTree = ""; }; 671C2D5722AFD969008B2B8B /* place_point.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = place_point.hpp; path = regions/place_point.hpp; sourceTree = ""; }; - 671C2D5822AFD969008B2B8B /* region_info_getter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = region_info_getter.cpp; path = regions/region_info_getter.cpp; sourceTree = ""; }; 671C2D5922AFD969008B2B8B /* region_info_getter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = region_info_getter.hpp; path = regions/region_info_getter.hpp; sourceTree = ""; }; - 671C2D5E22AFD982008B2B8B /* street_geometry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = street_geometry.cpp; path = streets/street_geometry.cpp; sourceTree = ""; }; 671C2D5F22AFD982008B2B8B /* street_regions_tracing.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = street_regions_tracing.hpp; path = streets/street_regions_tracing.hpp; sourceTree = ""; }; - 671C2D6022AFD982008B2B8B /* streets_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = streets_builder.cpp; path = streets/streets_builder.cpp; sourceTree = ""; }; 671C2D6122AFD982008B2B8B /* street_geometry.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = street_geometry.hpp; path = streets/street_geometry.hpp; sourceTree = ""; }; 671C2D6222AFD983008B2B8B /* streets_filter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = streets_filter.hpp; path = streets/streets_filter.hpp; sourceTree = ""; }; - 671C2D6322AFD983008B2B8B /* streets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = streets.cpp; path = streets/streets.cpp; sourceTree = ""; }; 671C2D6422AFD983008B2B8B /* streets.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = streets.hpp; path = streets/streets.hpp; sourceTree = ""; }; - 671C2D6522AFD983008B2B8B /* streets_filter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = streets_filter.cpp; path = streets/streets_filter.cpp; sourceTree = ""; }; 671C2D6622AFD983008B2B8B /* streets_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = streets_builder.hpp; path = streets/streets_builder.hpp; sourceTree = ""; }; - 671C2D6722AFD983008B2B8B /* street_regions_tracing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = street_regions_tracing.cpp; path = streets/street_regions_tracing.cpp; sourceTree = ""; }; 671C2D7222AFD994008B2B8B /* geo_objects_filter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = geo_objects_filter.hpp; path = geo_objects/geo_objects_filter.hpp; sourceTree = ""; }; - 671C2D7422AFD994008B2B8B /* geo_objects_filter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = geo_objects_filter.cpp; path = geo_objects/geo_objects_filter.cpp; sourceTree = ""; }; 671ED3CC20D40ABA00D4317E /* routing_helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = routing_helpers.cpp; sourceTree = ""; }; 671ED3CD20D40ABB00D4317E /* routing_helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = routing_helpers.hpp; sourceTree = ""; }; 6726C1D31A4AFEF4005EEA39 /* osm2meta.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm2meta.cpp; sourceTree = ""; }; @@ -546,14 +597,11 @@ 9D1B3F1A2034624900278AC8 /* node_mixer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = node_mixer.cpp; sourceTree = ""; }; E162BD26213E8F18007ADEF1 /* factory_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = factory_utils.hpp; sourceTree = ""; }; E162BD37213EAEF4007ADEF1 /* emitter_restaurants.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = emitter_restaurants.hpp; sourceTree = ""; }; - E162BD3A213EAEF5007ADEF1 /* emitter_restaurants.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = emitter_restaurants.cpp; sourceTree = ""; }; E162BD43213EAF09007ADEF1 /* popular_places_section_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = popular_places_section_builder.cpp; sourceTree = ""; }; - E162BD44213EAF09007ADEF1 /* place.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = place.cpp; sourceTree = ""; }; E162BD48213EAF0A007ADEF1 /* popular_places_section_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = popular_places_section_builder.hpp; sourceTree = ""; }; E162BD4D213EAF2C007ADEF1 /* ways_merger.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ways_merger.hpp; sourceTree = ""; }; E162BD4E213EAF2C007ADEF1 /* ways_merger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ways_merger.cpp; sourceTree = ""; }; E1EC1439211C5F7900B53061 /* translator_factory.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = translator_factory.hpp; sourceTree = ""; }; - E1EC143A211C5F7900B53061 /* translator_region.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = translator_region.cpp; sourceTree = ""; }; E1EC143B211C5F7A00B53061 /* translator_region.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = translator_region.hpp; sourceTree = ""; }; E1EC143C211C5F7A00B53061 /* translator_interface.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = translator_interface.hpp; sourceTree = ""; }; E1EC144B211C5F9100B53061 /* emitter_factory.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = emitter_factory.hpp; sourceTree = ""; }; @@ -631,17 +679,70 @@ 6753401D1A3F2A1B00A0A8C3 /* generator */ = { isa = PBXGroup; children = ( - 395784DB23030DA700F2CC07 /* admin_suburbs_marker.cpp */, + 56DAC2EA2398FA76000BC50D /* cells_merger.cpp */, + 56DAC2F42398FA76000BC50D /* cells_merger.hpp */, + 56DAC2D62398FA74000BC50D /* collector_boundary_postcode.cpp */, + 56DAC2D22398FA74000BC50D /* collector_boundary_postcode.hpp */, + 56DAC2DE2398FA75000BC50D /* collector_building_parts.cpp */, + 56DAC2E52398FA75000BC50D /* collector_building_parts.hpp */, + 56DAC2DF2398FA75000BC50D /* collector_mini_roundabout.cpp */, + 56DAC2D82398FA74000BC50D /* collector_mini_roundabout.hpp */, + 56DAC2F72398FA76000BC50D /* collector_routing_city_boundaries.cpp */, + 56DAC2F82398FA77000BC50D /* collector_routing_city_boundaries.hpp */, + 56DAC2D42398FA74000BC50D /* complex_loader.cpp */, + 56DAC2FF2398FA77000BC50D /* complex_loader.hpp */, + 56DAC2FA2398FA77000BC50D /* composite_id.cpp */, + 56DAC2F32398FA76000BC50D /* composite_id.hpp */, + 56DAC2DB2398FA75000BC50D /* cross_mwm_osm_ways_collector.cpp */, + 56DAC2FC2398FA77000BC50D /* cross_mwm_osm_ways_collector.hpp */, + 56DAC2F92398FA77000BC50D /* filter_complex.cpp */, + 56DAC2D52398FA74000BC50D /* filter_complex.hpp */, + 56DAC2EF2398FA76000BC50D /* filter_roads.cpp */, + 56DAC2DC2398FA75000BC50D /* filter_roads.hpp */, + 56DAC2CB2398FA74000BC50D /* filter_world.cpp */, + 56DAC2CF2398FA74000BC50D /* filter_world.hpp */, + 56DAC2E02398FA75000BC50D /* final_processor_intermediate_mwm.cpp */, + 56DAC2E72398FA75000BC50D /* final_processor_intermediate_mwm.hpp */, + 56DAC2FD2398FA77000BC50D /* gen_mwm_info.cpp */, + 56DAC2DD2398FA75000BC50D /* hierarchy_entry.cpp */, + 56DAC2E42398FA75000BC50D /* hierarchy_entry.hpp */, + 56DAC2D92398FA74000BC50D /* hierarchy.cpp */, + 56DAC3012398FA77000BC50D /* hierarchy.hpp */, + 56DAC2FB2398FA77000BC50D /* mini_roundabout_info.cpp */, + 56DAC3032398FA77000BC50D /* mini_roundabout_info.hpp */, + 56DAC2ED2398FA76000BC50D /* mini_roundabout_transformer.cpp */, + 56DAC2E22398FA75000BC50D /* mini_roundabout_transformer.hpp */, + 56DAC2D12398FA74000BC50D /* postcodes_section_builder.cpp */, + 56DAC2D32398FA74000BC50D /* postcodes_section_builder.hpp */, + 56DAC2D02398FA74000BC50D /* processor_booking.hpp */, + 56DAC3022398FA77000BC50D /* processor_coastline.cpp */, + 56DAC2CE2398FA74000BC50D /* processor_coastline.hpp */, + 56DAC2E32398FA75000BC50D /* processor_complex.cpp */, + 56DAC2E92398FA76000BC50D /* processor_complex.hpp */, + 56DAC2EB2398FA76000BC50D /* processor_country.cpp */, + 56DAC2C92398FA73000BC50D /* processor_country.hpp */, + 56DAC2CA2398FA74000BC50D /* processor_factory.hpp */, + 56DAC2EC2398FA76000BC50D /* processor_interface.hpp */, + 56DAC2CC2398FA74000BC50D /* processor_noop.hpp */, + 56DAC2EE2398FA76000BC50D /* processor_simple.cpp */, + 56DAC2E12398FA75000BC50D /* processor_simple.hpp */, + 56DAC2D72398FA74000BC50D /* processor_world.cpp */, + 56DAC2F62398FA76000BC50D /* processor_world.hpp */, + 56DAC2E82398FA75000BC50D /* raw_generator_writer.cpp */, + 56DAC2FE2398FA77000BC50D /* raw_generator_writer.hpp */, + 56DAC2F02398FA76000BC50D /* raw_generator.cpp */, + 56DAC2DA2398FA75000BC50D /* raw_generator.hpp */, + 56DAC2F22398FA76000BC50D /* routing_city_boundaries_processor.cpp */, + 56DAC3002398FA77000BC50D /* routing_city_boundaries_processor.hpp */, + 56DAC2E62398FA75000BC50D /* translator_complex.cpp */, + 56DAC2CD2398FA74000BC50D /* translator_complex.hpp */, + 56DAC2F12398FA76000BC50D /* translators_pool.cpp */, + 56DAC2F52398FA76000BC50D /* translators_pool.hpp */, 395784E123030DA800F2CC07 /* admin_suburbs_marker.hpp */, - 395784DD23030DA800F2CC07 /* country_specifier_builder.cpp */, 395784DE23030DA800F2CC07 /* country_specifier_builder.hpp */, - 395784DF23030DA800F2CC07 /* locality_point_integrator.cpp */, 395784DC23030DA800F2CC07 /* locality_point_integrator.hpp */, - 395784DA23030DA700F2CC07 /* place_points_integrator.cpp */, 395784E023030DA800F2CC07 /* place_points_integrator.hpp */, - 3989E35B230302CB00D63F84 /* geo_objects_generator.cpp */, 3989E35D230302CB00D63F84 /* geo_objects_generator.hpp */, - 3989E35E230302CB00D63F84 /* geo_objects_maintainer.cpp */, 3989E35C230302CB00D63F84 /* geo_objects_maintainer.hpp */, 3989E33E2303014900D63F84 /* place_processor.cpp */, 3989E3472303014A00D63F84 /* place_processor.hpp */, @@ -650,48 +751,34 @@ 3989E324230300D600D63F84 /* collector_city_area.hpp */, 3989E320230300CD00D63F84 /* affiliation.cpp */, 3989E31F230300CC00D63F84 /* affiliation.hpp */, - 397057CB22CB66BA001A55CA /* country_specifier.cpp */, 397057CA22CB66BA001A55CA /* country_specifier.hpp */, - 397057C622CB589B001A55CA /* translation.cpp */, 397057C422CB5850001A55CA /* translation.hpp */, 397057C222CB5840001A55CA /* promo_catalog_cities.hpp */, 391C0C8922BD257A003DC252 /* cities_ids_builder.cpp */, 391C0C8A22BD257A003DC252 /* cities_ids_builder.hpp */, - 671C2D7422AFD994008B2B8B /* geo_objects_filter.cpp */, 671C2D7222AFD994008B2B8B /* geo_objects_filter.hpp */, - 671C2D5E22AFD982008B2B8B /* street_geometry.cpp */, 671C2D6122AFD982008B2B8B /* street_geometry.hpp */, - 671C2D6722AFD983008B2B8B /* street_regions_tracing.cpp */, 671C2D5F22AFD982008B2B8B /* street_regions_tracing.hpp */, - 671C2D6022AFD982008B2B8B /* streets_builder.cpp */, 671C2D6622AFD983008B2B8B /* streets_builder.hpp */, - 671C2D6522AFD983008B2B8B /* streets_filter.cpp */, 671C2D6222AFD983008B2B8B /* streets_filter.hpp */, - 671C2D6322AFD983008B2B8B /* streets.cpp */, 671C2D6422AFD983008B2B8B /* streets.hpp */, 671C2D5622AFD969008B2B8B /* level_region.hpp */, 671C2D5722AFD969008B2B8B /* place_point.hpp */, - 671C2D5822AFD969008B2B8B /* region_info_getter.cpp */, 671C2D5922AFD969008B2B8B /* region_info_getter.hpp */, 390EA839229F06C700CA55E5 /* borders.cpp */, 390EA838229F06C700CA55E5 /* borders.hpp */, 3971140B229D7E00003915E5 /* collector_camera.cpp */, 3971140C229D7E01003915E5 /* collector_camera.hpp */, 3971140D229D7E01003915E5 /* emitter_noop.hpp */, - 3971140E229D7E01003915E5 /* key_value_storage.cpp */, 3971140F229D7E01003915E5 /* key_value_storage.hpp */, - 39711410229D7E01003915E5 /* translator_streets.cpp */, 39711411229D7E01003915E5 /* translator_streets.hpp */, 407E8A112265FEE100C6E668 /* ratings_section_builder.cpp */, 407E8A102265FEE000C6E668 /* ratings_section_builder.hpp */, 4032E70D225D151C00D33617 /* collection_base.hpp */, 4032E70A225D151C00D33617 /* collector_collection.cpp */, 4032E6F8225D151B00D33617 /* collector_collection.hpp */, - 4032E6FC225D151B00D33617 /* emitter_coastline.cpp */, 4032E717225D151D00D33617 /* emitter_coastline.hpp */, - 4032E716225D151D00D33617 /* emitter_country.cpp */, 4032E70C225D151C00D33617 /* emitter_country.hpp */, - 4032E704225D151B00D33617 /* emitter_world.cpp */, 4032E701225D151B00D33617 /* emitter_world.hpp */, 4032E70F225D151C00D33617 /* feature_maker_base.cpp */, 4032E70E225D151C00D33617 /* feature_maker_base.hpp */, @@ -718,7 +805,6 @@ 4032E707225D151C00D33617 /* translator.hpp */, 4032E702225D151B00D33617 /* type_helper.cpp */, 4032E6FA225D151B00D33617 /* type_helper.hpp */, - 401E318D225C99A300DE7EB8 /* region_info.cpp */, 401E318A225C99A300DE7EB8 /* region_info.hpp */, 401E3186225C97D100DE7EB8 /* boost_helpers.hpp */, 401E3170225C971300DE7EB8 /* collector_tag.cpp */, @@ -728,7 +814,6 @@ 401E3172225C971400DE7EB8 /* place_node.hpp */, 401E317A225C971400DE7EB8 /* platform_helpers.cpp */, 401E3171225C971300DE7EB8 /* platform_helpers.hpp */, - 401E3177225C971400DE7EB8 /* popularity.cpp */, 401E3174225C971400DE7EB8 /* popularity.hpp */, 401E3175225C971400DE7EB8 /* wiki_url_dumper.cpp */, 401E3176225C971400DE7EB8 /* wiki_url_dumper.hpp */, @@ -740,37 +825,26 @@ 56A1B7A521A82C3E00246F8C /* maxspeeds_collector.hpp */, 56A1B7AA21A82C3F00246F8C /* maxspeeds_parser.cpp */, 56A1B7A621A82C3E00246F8C /* maxspeeds_parser.hpp */, - 5631B64E219B0C6D009F47D4 /* geo_objects.cpp */, 5631B64D219B0C6D009F47D4 /* geo_objects.hpp */, - 56A6C3D8219B0BDA00A52855 /* collector_region_info.cpp */, 56A6C3D7219B0BDA00A52855 /* collector_region_info.hpp */, 56037E4A219AF97100C2193D /* collector_interface.hpp */, - 56037E44219AF97100C2193D /* emitter_simple.cpp */, 56037E45219AF97100C2193D /* emitter_simple.hpp */, 56037E4B219AF97100C2193D /* filter_elements.cpp */, 56037E46219AF97100C2193D /* filter_elements.hpp */, 56037E48219AF97100C2193D /* osm_element_helpers.cpp */, 56037E43219AF97100C2193D /* osm_element_helpers.hpp */, - 56037E49219AF97100C2193D /* translator_geo_objects.cpp */, 56037E47219AF97100C2193D /* translator_geo_objects.hpp */, - 56FB437F2164F571002099B3 /* node.cpp */, 56FB437A2164F570002099B3 /* node.hpp */, - 56FB437C2164F570002099B3 /* region_base.cpp */, 56FB43742164F570002099B3 /* region_base.hpp */, - 56FB43792164F570002099B3 /* region.cpp */, 56FB437D2164F571002099B3 /* region.hpp */, - 56FB43772164F570002099B3 /* regions_builder.cpp */, 56FB43782164F570002099B3 /* regions_builder.hpp */, - 56FB437B2164F570002099B3 /* regions.cpp */, 56FB43802164F571002099B3 /* regions.hpp */, 56E0C4E2213FD56E00541E0F /* cities_boundaries_checker.cpp */, 56E0C4E3213FD56E00541E0F /* cities_boundaries_checker.hpp */, E162BD4E213EAF2C007ADEF1 /* ways_merger.cpp */, E162BD4D213EAF2C007ADEF1 /* ways_merger.hpp */, - E162BD44213EAF09007ADEF1 /* place.cpp */, E162BD43213EAF09007ADEF1 /* popular_places_section_builder.cpp */, E162BD48213EAF0A007ADEF1 /* popular_places_section_builder.hpp */, - E162BD3A213EAEF5007ADEF1 /* emitter_restaurants.cpp */, E162BD37213EAEF4007ADEF1 /* emitter_restaurants.hpp */, E162BD26213E8F18007ADEF1 /* factory_utils.hpp */, 441DB3FB2119D72300D2F324 /* camera_info_collector.cpp */, @@ -788,7 +862,6 @@ E1EC144D211C5F9100B53061 /* emitter_interface.hpp */, E1EC1439211C5F7900B53061 /* translator_factory.hpp */, E1EC143C211C5F7A00B53061 /* translator_interface.hpp */, - E1EC143A211C5F7900B53061 /* translator_region.cpp */, E1EC143B211C5F7A00B53061 /* translator_region.hpp */, 3933ED0D20D7FD4E000B1526 /* intermediate_data.cpp */, 9D1B3F1A2034624900278AC8 /* node_mixer.cpp */, @@ -796,7 +869,6 @@ 40492BC42021DC53008E093A /* feature_helpers.cpp */, 40492BC52021DC53008E093A /* feature_helpers.hpp */, 40492BC72021DC53008E093A /* geometry_holder.hpp */, - 40492BC62021DC53008E093A /* locality_sorter.cpp */, 40492BC32021DC53008E093A /* locality_sorter.hpp */, 39B2B9761FB468CC00AB85A1 /* cities_boundaries_builder.cpp */, 39B2B9771FB468CC00AB85A1 /* cities_boundaries_builder.hpp */, @@ -920,6 +992,7 @@ files = ( 56FB438F2164F571002099B3 /* regions.hpp in Headers */, 397057C322CB5840001A55CA /* promo_catalog_cities.hpp in Headers */, + 56DAC32F2398FA77000BC50D /* cells_merger.hpp in Headers */, 671C2D5A22AFD969008B2B8B /* level_region.hpp in Headers */, 40492BC82021DC53008E093A /* locality_sorter.hpp in Headers */, 34F558881DBF4C9600A4FC11 /* opentable_dataset.hpp in Headers */, @@ -929,13 +1002,16 @@ E162BD3D213EAEF6007ADEF1 /* emitter_restaurants.hpp in Headers */, 4032E72D225D151D00D33617 /* translator.hpp in Headers */, 56E0C4E5213FD56F00541E0F /* cities_boundaries_checker.hpp in Headers */, + 56DAC30A2398FA77000BC50D /* filter_world.hpp in Headers */, E1EC1463211C5FBD00B53061 /* place.hpp in Headers */, 6753406B1A3F2A7400A0A8C3 /* feature_emitter_iface.hpp in Headers */, 401E318E225C99A300DE7EB8 /* region_info.hpp in Headers */, + 56DAC33B2398FA77000BC50D /* routing_city_boundaries_processor.hpp in Headers */, E1EC1464211C5FBD00B53061 /* relation_tags.hpp in Headers */, 670E7BCB1EF9C29A00A8E9ED /* ugc_translator.hpp in Headers */, 4032E71F225D151D00D33617 /* filter_collection.hpp in Headers */, 401E3181225C971400DE7EB8 /* wiki_url_dumper.hpp in Headers */, + 56DAC3052398FA77000BC50D /* processor_factory.hpp in Headers */, 675340881A3F2A7400A0A8C3 /* unpack_mwm.hpp in Headers */, 56037E4E219AF97200C2193D /* osm_element_helpers.hpp in Headers */, E1EC1456211C5F9100B53061 /* emitter_interface.hpp in Headers */, @@ -948,6 +1024,8 @@ 39711413229D7E01003915E5 /* collector_camera.hpp in Headers */, E1EC1454211C5F9100B53061 /* emitter_factory.hpp in Headers */, 390EA83A229F06C700CA55E5 /* borders.hpp in Headers */, + 56DAC3082398FA77000BC50D /* translator_complex.hpp in Headers */, + 56DAC3102398FA77000BC50D /* filter_complex.hpp in Headers */, 675340641A3F2A7400A0A8C3 /* intermediate_data.hpp in Headers */, 40492BCA2021DC53008E093A /* feature_helpers.hpp in Headers */, 397057CC22CB66BA001A55CA /* country_specifier.hpp in Headers */, @@ -963,6 +1041,7 @@ E1EC1468211C5FC900B53061 /* holes.hpp in Headers */, 67C79BB41E2CEEAB00C40034 /* restriction_writer.hpp in Headers */, 6753408E1A3F2A7400A0A8C3 /* osm_element.hpp in Headers */, + 56DAC31F2398FA77000BC50D /* hierarchy_entry.hpp in Headers */, 6753406F1A3F2A7400A0A8C3 /* feature_merger.hpp in Headers */, 4032E719225D151D00D33617 /* translator_world.hpp in Headers */, 6753406A1A3F2A7400A0A8C3 /* feature_builder.hpp in Headers */, @@ -974,7 +1053,9 @@ 9D1B3F1B2034624A00278AC8 /* node_mixer.hpp in Headers */, 395784E823030DA800F2CC07 /* place_points_integrator.hpp in Headers */, 568762611F6A9B18002C22A6 /* transit_generator.hpp in Headers */, + 56DAC33A2398FA77000BC50D /* complex_loader.hpp in Headers */, 56037E52219AF97200C2193D /* translator_geo_objects.hpp in Headers */, + 56DAC3242398FA77000BC50D /* processor_complex.hpp in Headers */, 56A1B7AB21A82C3F00246F8C /* maxspeeds_collector.hpp in Headers */, 675340861A3F2A7400A0A8C3 /* tesselator.hpp in Headers */, 4003E3B12112FB2B007721B0 /* emitter_booking.hpp in Headers */, @@ -986,9 +1067,11 @@ 441DB3FD2119D72300D2F324 /* camera_info_collector.hpp in Headers */, 670E7BB41EF9812B00A8E9ED /* metalines_builder.hpp in Headers */, 401E317F225C971400DE7EB8 /* popularity.hpp in Headers */, + 56DAC31D2398FA77000BC50D /* mini_roundabout_transformer.hpp in Headers */, 670E7BBA1EF9812B00A8E9ED /* ugc_db.hpp in Headers */, 0C5FEC711DDE19E50017688C /* routing_index_generator.hpp in Headers */, 67C79BB01E2CEEAB00C40034 /* restriction_collector.hpp in Headers */, + 56DAC3132398FA77000BC50D /* collector_mini_roundabout.hpp in Headers */, 671C2D6922AFD983008B2B8B /* street_regions_tracing.hpp in Headers */, 40492BCC2021DC53008E093A /* geometry_holder.hpp in Headers */, 4032E73D225D151D00D33617 /* emitter_coastline.hpp in Headers */, @@ -1001,18 +1084,32 @@ 395784E923030DA800F2CC07 /* admin_suburbs_marker.hpp in Headers */, 56037E55219AF97200C2193D /* collector_interface.hpp in Headers */, 4032E720225D151D00D33617 /* type_helper.hpp in Headers */, + 56DAC32E2398FA77000BC50D /* composite_id.hpp in Headers */, 675340841A3F2A7400A0A8C3 /* statistics.hpp in Headers */, + 56DAC3312398FA77000BC50D /* processor_world.hpp in Headers */, + 56DAC3072398FA77000BC50D /* processor_noop.hpp in Headers */, + 56DAC33C2398FA77000BC50D /* hierarchy.hpp in Headers */, + 56DAC3272398FA77000BC50D /* processor_interface.hpp in Headers */, 4032E734225D151D00D33617 /* feature_maker_base.hpp in Headers */, E162BD27213E8F19007ADEF1 /* factory_utils.hpp in Headers */, + 56DAC3302398FA77000BC50D /* translators_pool.hpp in Headers */, 56A6C3D9219B0BDA00A52855 /* collector_region_info.hpp in Headers */, + 56DAC30D2398FA77000BC50D /* collector_boundary_postcode.hpp in Headers */, 3DFEBF821EF423FB00317D5C /* sponsored_object_storage.hpp in Headers */, 56FB438C2164F571002099B3 /* region.hpp in Headers */, + 56DAC3392398FA77000BC50D /* raw_generator_writer.hpp in Headers */, + 56DAC30E2398FA77000BC50D /* postcodes_section_builder.hpp in Headers */, + 56DAC3092398FA77000BC50D /* processor_coastline.hpp in Headers */, + 56DAC3172398FA77000BC50D /* filter_roads.hpp in Headers */, 6753406D1A3F2A7400A0A8C3 /* feature_generator.hpp in Headers */, 4032E72C225D151D00D33617 /* translator_country.hpp in Headers */, 675340681A3F2A7400A0A8C3 /* dumper.hpp in Headers */, 5631B64F219B0C6D009F47D4 /* geo_objects.hpp in Headers */, + 56DAC3222398FA77000BC50D /* final_processor_intermediate_mwm.hpp in Headers */, 395784E423030DA800F2CC07 /* locality_point_integrator.hpp in Headers */, + 56DAC3152398FA77000BC50D /* raw_generator.hpp in Headers */, 670E7BB81EF9812B00A8E9ED /* routing_helpers.hpp in Headers */, + 56DAC3332398FA77000BC50D /* collector_routing_city_boundaries.hpp in Headers */, 56829A462134222300A09A28 /* city_roads_generator.hpp in Headers */, 4003E3AC2112FB2B007721B0 /* emitter_factory.hpp in Headers */, 56FB43892164F571002099B3 /* node.hpp in Headers */, @@ -1022,6 +1119,8 @@ 56A1B7AE21A82C3F00246F8C /* maxspeeds_builder.hpp in Headers */, 56A1B7AC21A82C3F00246F8C /* maxspeeds_parser.hpp in Headers */, 407E8A122265FEE100C6E668 /* ratings_section_builder.hpp in Headers */, + 56DAC31C2398FA77000BC50D /* processor_simple.hpp in Headers */, + 56DAC3372398FA77000BC50D /* cross_mwm_osm_ways_collector.hpp in Headers */, 4032E72B225D151D00D33617 /* feature_processing_layers.hpp in Headers */, 56037E51219AF97200C2193D /* filter_elements.hpp in Headers */, 4032E733225D151D00D33617 /* collection_base.hpp in Headers */, @@ -1035,6 +1134,7 @@ 67C79BB61E2CEEAB00C40034 /* traffic_generator.hpp in Headers */, E1EC1443211C5F7A00B53061 /* translator_interface.hpp in Headers */, 3989E33A2303013800D63F84 /* features_processing_helpers.hpp in Headers */, + 56DAC30B2398FA77000BC50D /* processor_booking.hpp in Headers */, 671C2D6E22AFD983008B2B8B /* streets.hpp in Headers */, 675340611A3F2A7400A0A8C3 /* check_model.hpp in Headers */, 6726C1D61A4AFEF4005EEA39 /* osm2meta.hpp in Headers */, @@ -1045,6 +1145,7 @@ 4032E71E225D151D00D33617 /* collector_collection.hpp in Headers */, 401E3183225C971400DE7EB8 /* descriptions_section_builder.hpp in Headers */, 4003E3B92112FB2B007721B0 /* place.hpp in Headers */, + 56DAC3202398FA77000BC50D /* collector_building_parts.hpp in Headers */, 4032E73E225D151D00D33617 /* filter_interface.hpp in Headers */, 4088CE2421AE995D00E2702A /* brands_loader.hpp in Headers */, 671C2D6B22AFD983008B2B8B /* street_geometry.hpp in Headers */, @@ -1054,8 +1155,10 @@ 671C2D5B22AFD969008B2B8B /* place_point.hpp in Headers */, 3989E326230300D600D63F84 /* collector_city_area.hpp in Headers */, 401E317E225C971400DE7EB8 /* collector_tag.hpp in Headers */, + 56DAC33E2398FA77000BC50D /* mini_roundabout_info.hpp in Headers */, 3989E321230300CD00D63F84 /* affiliation.hpp in Headers */, 3989E360230302CB00D63F84 /* geo_objects_maintainer.hpp in Headers */, + 56DAC3042398FA77000BC50D /* processor_country.hpp in Headers */, 397057C522CB5850001A55CA /* translation.hpp in Headers */, E162BD4B213EAF0A007ADEF1 /* popular_places_section_builder.hpp in Headers */, 3D51BC491D5E50F700F1FA8D /* centers_table_builder.hpp in Headers */, @@ -1157,116 +1260,109 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 56037E54219AF97200C2193D /* translator_geo_objects.cpp in Sources */, - 4032E73C225D151D00D33617 /* emitter_country.cpp in Sources */, - 3989E362230302CB00D63F84 /* geo_objects_maintainer.cpp in Sources */, - 671C2D6822AFD983008B2B8B /* street_geometry.cpp in Sources */, - 5631B650219B0C6D009F47D4 /* geo_objects.cpp in Sources */, + 56DAC3382398FA77000BC50D /* gen_mwm_info.cpp in Sources */, + 56DAC3292398FA77000BC50D /* processor_simple.cpp in Sources */, 56037E56219AF97200C2193D /* filter_elements.cpp in Sources */, 56E0C4E4213FD56F00541E0F /* cities_boundaries_checker.cpp in Sources */, 39B2B9781FB468CC00AB85A1 /* cities_boundaries_builder.cpp in Sources */, 56A1B7AD21A82C3F00246F8C /* maxspeeds_builder.cpp in Sources */, - 671C2D6D22AFD983008B2B8B /* streets.cpp in Sources */, 670E7BCA1EF9C29A00A8E9ED /* ugc_translator.cpp in Sources */, 6753406C1A3F2A7400A0A8C3 /* feature_generator.cpp in Sources */, 67C79BB51E2CEEAB00C40034 /* traffic_generator.cpp in Sources */, 0C5FEC701DDE19E50017688C /* routing_index_generator.cpp in Sources */, 391C0C8B22BD257A003DC252 /* cities_ids_builder.cpp in Sources */, - 397057CD22CB66BA001A55CA /* country_specifier.cpp in Sources */, + 56DAC3182398FA77000BC50D /* hierarchy_entry.cpp in Sources */, 56A1B7AF21A82C3F00246F8C /* maxspeeds_collector.cpp in Sources */, 4032E736225D151D00D33617 /* translator.cpp in Sources */, + 56DAC33D2398FA77000BC50D /* processor_coastline.cpp in Sources */, 3D74EF071F86841C0081202C /* ugc_section_builder.cpp in Sources */, 67C79BB11E2CEEAB00C40034 /* restriction_generator.cpp in Sources */, 3D51BC521D5E512500F1FA8D /* altitude_generator.cpp in Sources */, 3933ED0E20D7FD4E000B1526 /* intermediate_data.cpp in Sources */, + 56DAC32D2398FA77000BC50D /* routing_city_boundaries_processor.cpp in Sources */, + 56DAC31E2398FA77000BC50D /* processor_complex.cpp in Sources */, 390EA83B229F06C700CA55E5 /* borders.cpp in Sources */, 4032E730225D151D00D33617 /* collector_collection.cpp in Sources */, 670E7BB31EF9812B00A8E9ED /* metalines_builder.cpp in Sources */, + 56DAC3162398FA77000BC50D /* cross_mwm_osm_ways_collector.cpp in Sources */, 3D51BC581D5E512500F1FA8D /* srtm_parser.cpp in Sources */, 675340871A3F2A7400A0A8C3 /* unpack_mwm.cpp in Sources */, 670B84BC1A8CDB0000CE4492 /* osm_source.cpp in Sources */, 675340701A3F2A7400A0A8C3 /* feature_sorter.cpp in Sources */, 675340621A3F2A7400A0A8C3 /* coastlines_generator.cpp in Sources */, - 56037E4F219AF97200C2193D /* emitter_simple.cpp in Sources */, + 56DAC3192398FA77000BC50D /* collector_building_parts.cpp in Sources */, 4032E73B225D151D00D33617 /* translator_coastline.cpp in Sources */, 670E7BC11EF983E600A8E9ED /* region_meta.cpp in Sources */, - E162BD4A213EAF0A007ADEF1 /* place.cpp in Sources */, + 56DAC3362398FA77000BC50D /* mini_roundabout_info.cpp in Sources */, 675340931C5231BA002CF0D9 /* search_index_builder.cpp in Sources */, - 3989E35F230302CB00D63F84 /* geo_objects_generator.cpp in Sources */, 6753406E1A3F2A7400A0A8C3 /* feature_merger.cpp in Sources */, + 56DAC3142398FA77000BC50D /* hierarchy.cpp in Sources */, 3989E322230300CD00D63F84 /* affiliation.cpp in Sources */, E1EC1461211C5FBD00B53061 /* relation_tags.cpp in Sources */, - 56A6C3DA219B0BDA00A52855 /* collector_region_info.cpp in Sources */, 4032E731225D151D00D33617 /* translator_collection.cpp in Sources */, 34F5587B1DBF4C8300A4FC11 /* feature_segments_checker.cpp in Sources */, 67C79BB31E2CEEAB00C40034 /* restriction_writer.cpp in Sources */, - 56FB438A2164F571002099B3 /* regions.cpp in Sources */, - 395784E523030DA800F2CC07 /* country_specifier_builder.cpp in Sources */, - 401E3191225C99A300DE7EB8 /* region_info.cpp in Sources */, 67A0FEBE1CEB467F008F2A61 /* booking_dataset.cpp in Sources */, 441DB3FE2119D72300D2F324 /* camera_info_collector.cpp in Sources */, + 56DAC31B2398FA77000BC50D /* final_processor_intermediate_mwm.cpp in Sources */, 56037E53219AF97200C2193D /* osm_element_helpers.cpp in Sources */, 401E3185225C971400DE7EB8 /* platform_helpers.cpp in Sources */, + 56DAC3122398FA77000BC50D /* processor_world.cpp in Sources */, 4032E721225D151D00D33617 /* feature_maker.cpp in Sources */, 401E317B225C971400DE7EB8 /* collector_tag.cpp in Sources */, - 671C2D5C22AFD969008B2B8B /* region_info_getter.cpp in Sources */, 3DFEBF7D1EF2D58900317D5C /* utils.cpp in Sources */, - 397057C722CB589B001A55CA /* translation.cpp in Sources */, 6753408D1A3F2A7400A0A8C3 /* osm_element.cpp in Sources */, 6726C1D51A4AFEF4005EEA39 /* osm2meta.cpp in Sources */, 34F5588C1DBF4C9600A4FC11 /* sponsored_scoring.cpp in Sources */, - 40492BCB2021DC53008E093A /* locality_sorter.cpp in Sources */, - 4032E722225D151D00D33617 /* emitter_coastline.cpp in Sources */, 4032E726225D151D00D33617 /* relation_tags_enricher.cpp in Sources */, + 56DAC3212398FA77000BC50D /* translator_complex.cpp in Sources */, 675340691A3F2A7400A0A8C3 /* feature_builder.cpp in Sources */, - 395784E223030DA800F2CC07 /* place_points_integrator.cpp in Sources */, 677E2A171CAACC5F001DC42A /* towns_dumper.cpp in Sources */, 670E7BB71EF9812B00A8E9ED /* routing_helpers.cpp in Sources */, 4032E723225D151D00D33617 /* translator_country.cpp in Sources */, - 395784E323030DA800F2CC07 /* admin_suburbs_marker.cpp in Sources */, 39711412229D7E01003915E5 /* collector_camera.cpp in Sources */, 34F558891DBF4C9600A4FC11 /* opentable_scoring.cpp in Sources */, - 401E3182225C971400DE7EB8 /* popularity.cpp in Sources */, 67C79BAF1E2CEEAB00C40034 /* restriction_collector.cpp in Sources */, 3D51BC481D5E50F700F1FA8D /* centers_table_builder.cpp in Sources */, E162BD49213EAF0A007ADEF1 /* popular_places_section_builder.cpp in Sources */, + 56DAC32C2398FA77000BC50D /* translators_pool.cpp in Sources */, 675340671A3F2A7400A0A8C3 /* dumper.cpp in Sources */, E1EC1467211C5FC900B53061 /* holes.cpp in Sources */, 4032E728225D151D00D33617 /* type_helper.cpp in Sources */, E9502E331D34012200CAB86B /* booking_scoring.cpp in Sources */, + 56DAC32B2398FA77000BC50D /* raw_generator.cpp in Sources */, 40492BC92021DC53008E093A /* feature_helpers.cpp in Sources */, - E1EC1441211C5F7A00B53061 /* translator_region.cpp in Sources */, - 671C2D7822AFD995008B2B8B /* geo_objects_filter.cpp in Sources */, + 56DAC30C2398FA77000BC50D /* postcodes_section_builder.cpp in Sources */, 670E7BB91EF9812B00A8E9ED /* ugc_db.cpp in Sources */, - E162BD40213EAEF6007ADEF1 /* emitter_restaurants.cpp in Sources */, 4032E72F225D151D00D33617 /* filter_planet.cpp in Sources */, - 56FB438E2164F571002099B3 /* node.cpp in Sources */, - 671C2D7122AFD983008B2B8B /* street_regions_tracing.cpp in Sources */, + 56DAC3112398FA77000BC50D /* collector_boundary_postcode.cpp in Sources */, 675340831A3F2A7400A0A8C3 /* statistics.cpp in Sources */, + 56DAC3322398FA77000BC50D /* collector_routing_city_boundaries.cpp in Sources */, 4032E729225D151D00D33617 /* translator_world.cpp in Sources */, E162BD52213EAF2D007ADEF1 /* ways_merger.cpp in Sources */, + 56DAC3282398FA77000BC50D /* mini_roundabout_transformer.cpp in Sources */, 407E8A132265FEE100C6E668 /* ratings_section_builder.cpp in Sources */, - 56FB438B2164F571002099B3 /* region_base.cpp in Sources */, + 56DAC3252398FA77000BC50D /* cells_merger.cpp in Sources */, 4088CE2521AE995D00E2702A /* brands_loader.cpp in Sources */, - 671C2D6F22AFD983008B2B8B /* streets_filter.cpp in Sources */, - 56FB43882164F571002099B3 /* region.cpp in Sources */, 3989E325230300D600D63F84 /* collector_city_area.cpp in Sources */, 4032E735225D151D00D33617 /* feature_maker_base.cpp in Sources */, 56A1B7B021A82C3F00246F8C /* maxspeeds_parser.cpp in Sources */, + 56DAC31A2398FA77000BC50D /* collector_mini_roundabout.cpp in Sources */, 4032E72E225D151D00D33617 /* filter_collection.cpp in Sources */, 670E7BB51EF9812B00A8E9ED /* road_access_generator.cpp in Sources */, - 671C2D6A22AFD983008B2B8B /* streets_builder.cpp in Sources */, 34F558871DBF4C9600A4FC11 /* opentable_dataset.cpp in Sources */, 401E3184225C971400DE7EB8 /* descriptions_section_builder.cpp in Sources */, + 56DAC3262398FA77000BC50D /* processor_country.cpp in Sources */, 401E3180225C971400DE7EB8 /* wiki_url_dumper.cpp in Sources */, - 56FB43862164F571002099B3 /* regions_builder.cpp in Sources */, - 4032E72A225D151D00D33617 /* emitter_world.cpp in Sources */, - 395784E723030DA800F2CC07 /* locality_point_integrator.cpp in Sources */, + 56DAC32A2398FA77000BC50D /* filter_roads.cpp in Sources */, + 56DAC3342398FA77000BC50D /* filter_complex.cpp in Sources */, + 56DAC30F2398FA77000BC50D /* complex_loader.cpp in Sources */, + 56DAC3232398FA77000BC50D /* raw_generator_writer.cpp in Sources */, + 56DAC3352398FA77000BC50D /* composite_id.cpp in Sources */, 6753407E1A3F2A7400A0A8C3 /* osm2type.cpp in Sources */, 3989E34C2303014A00D63F84 /* place_processor.cpp in Sources */, + 56DAC3062398FA77000BC50D /* filter_world.cpp in Sources */, 56829A482134222300A09A28 /* city_roads_generator.cpp in Sources */, - 39711415229D7E01003915E5 /* key_value_storage.cpp in Sources */, - 39711417229D7E01003915E5 /* translator_streets.cpp in Sources */, 568762601F6A9B18002C22A6 /* transit_generator.cpp in Sources */, 675340601A3F2A7400A0A8C3 /* check_model.cpp in Sources */, 4032E737225D151D00D33617 /* feature_processing_layers.cpp in Sources */, diff --git a/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj b/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj index 4d253952b0..7c5cc083be 100644 --- a/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj +++ b/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj @@ -28,11 +28,9 @@ 3462FDAB1DC1E33400906FD7 /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FDA01DC1E29E00906FD7 /* libsuccinct.a */; }; 34F558571DBF3CD800A4FC11 /* libstdc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558561DBF3CD800A4FC11 /* libstdc++.tbd */; }; 395784D5230303E700F2CC07 /* merge_collectors_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 395784D2230303E700F2CC07 /* merge_collectors_tests.cpp */; }; - 395784D6230303E700F2CC07 /* geo_objects_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 395784D3230303E700F2CC07 /* geo_objects_tests.cpp */; }; 395784D7230303E700F2CC07 /* metalines_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 395784D4230303E700F2CC07 /* metalines_tests.cpp */; }; 395784D923030D5000F2CC07 /* booking_addr_match.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 395784D823030D4F00F2CC07 /* booking_addr_match.cpp */; }; 397057C022CB57F9001A55CA /* cities_ids_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 397057BD22CB57F8001A55CA /* cities_ids_tests.cpp */; }; - 397057C122CB57F9001A55CA /* translation_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 397057BE22CB57F9001A55CA /* translation_test.cpp */; }; 39C4345222CE13F00002AEE3 /* booking_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39C4345122CE13F00002AEE3 /* booking_tests.cpp */; }; 401E3189225C988500DE7EB8 /* libdescriptions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 401E3188225C988500DE7EB8 /* libdescriptions.a */; }; 4491F494213D6B470011834F /* speed_cameras_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4491F490213D46380011834F /* speed_cameras_test.cpp */; }; @@ -47,8 +45,19 @@ 56A1B7A421A82BF700246F8C /* maxspeeds_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56A1B7A321A82BF700246F8C /* maxspeeds_tests.cpp */; }; 56A6C3D2219AFDEE00A52855 /* filter_elements_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56A6C3CD219AFDED00A52855 /* filter_elements_tests.cpp */; }; 56A6C3D3219AFDEE00A52855 /* common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56A6C3CF219AFDEE00A52855 /* common.cpp */; }; - 56A6C3D4219AFDEE00A52855 /* regions_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56A6C3D0219AFDEE00A52855 /* regions_tests.cpp */; }; - 56A6C3D5219AFDEE00A52855 /* region_info_collector_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56A6C3D1219AFDEE00A52855 /* region_info_collector_tests.cpp */; }; + 56DAC353239914C2000BC50D /* gen_mwm_info_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC347239914C2000BC50D /* gen_mwm_info_tests.cpp */; }; + 56DAC354239914C2000BC50D /* cluster_finder_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC348239914C2000BC50D /* cluster_finder_tests.cpp */; }; + 56DAC355239914C2000BC50D /* collector_boundary_postcode_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC349239914C2000BC50D /* collector_boundary_postcode_tests.cpp */; }; + 56DAC356239914C2000BC50D /* collector_city_area_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC34A239914C2000BC50D /* collector_city_area_tests.cpp */; }; + 56DAC357239914C2000BC50D /* complex_loader_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC34B239914C2000BC50D /* complex_loader_tests.cpp */; }; + 56DAC358239914C2000BC50D /* collector_routing_city_boundaries_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC34C239914C2000BC50D /* collector_routing_city_boundaries_tests.cpp */; }; + 56DAC359239914C2000BC50D /* hierarchy_entry_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC34D239914C2000BC50D /* hierarchy_entry_tests.cpp */; }; + 56DAC35A239914C2000BC50D /* osm_element_helpers_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC34E239914C2000BC50D /* osm_element_helpers_tests.cpp */; }; + 56DAC35B239914C2000BC50D /* place_processor_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC34F239914C2000BC50D /* place_processor_tests.cpp */; }; + 56DAC35C239914C2000BC50D /* cross_mwm_osm_ways_collector_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC350239914C2000BC50D /* cross_mwm_osm_ways_collector_tests.cpp */; }; + 56DAC35D239914C2000BC50D /* mini_roundabout_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC351239914C2000BC50D /* mini_roundabout_tests.cpp */; }; + 56DAC35E239914C2000BC50D /* cells_merger_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC352239914C2000BC50D /* cells_merger_tests.cpp */; }; + 56DAC360239915E9000BC50D /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC35F239915E9000BC50D /* libstorage.a */; }; 56EE14CD1FE803EA0036F20C /* libtransit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14CE1FE803EA0036F20C /* libtransit.a */; }; 56EE14CF1FE803FE0036F20C /* libtransit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14D01FE803FE0036F20C /* libtransit.a */; }; 670E7BBC1EF9832200A8E9ED /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670E7BBB1EF9832200A8E9ED /* libicu.a */; }; @@ -58,18 +67,14 @@ 670E7BC31EF9853C00A8E9ED /* librouting_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670E7BBD1EF9839C00A8E9ED /* librouting_common.a */; }; 670E7BC51EF9860100A8E9ED /* ugc_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670E7BC41EF9860100A8E9ED /* ugc_test.cpp */; }; 670E7BC71EF992F600A8E9ED /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 670E7BC61EF992F600A8E9ED /* libsqlite3.tbd */; }; - 670F291B1BA6CE4F00F2ABF4 /* check_mwms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1E31A4C28D5005EEA39 /* check_mwms.cpp */; }; 670F291C1BA6CEE400F2ABF4 /* libmap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67AB92C61B73D03500AB5194 /* libmap.a */; }; 670F88791CE4CA81003F68BA /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670F88781CE4CA81003F68BA /* libopening_hours.a */; }; 670F887A1CE4CA9C003F68BA /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670F88781CE4CA81003F68BA /* libopening_hours.a */; }; 6719DD5E1B95AB0F0018166F /* libtess2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6719DD5D1B95AB0F0018166F /* libtess2.a */; }; 6719DD5F1B95AB570018166F /* libtess2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6719DD5D1B95AB0F0018166F /* libtess2.a */; }; - 671C2D8122AFDAB4008B2B8B /* street_geometry_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C2D7A22AFDAB4008B2B8B /* street_geometry_tests.cpp */; }; 671C2D8222AFDAB4008B2B8B /* descriptions_section_builder_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C2D7B22AFDAB4008B2B8B /* descriptions_section_builder_tests.cpp */; }; 671C2D8322AFDAB4008B2B8B /* camera_collector_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C2D7C22AFDAB4008B2B8B /* camera_collector_tests.cpp */; }; - 671C2D8522AFDAB4008B2B8B /* popularity_builder_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C2D7E22AFDAB4008B2B8B /* popularity_builder_tests.cpp */; }; 671C2D8622AFDAB4008B2B8B /* brands_loader_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C2D7F22AFDAB4008B2B8B /* brands_loader_test.cpp */; }; - 671C2D8722AFDAB4008B2B8B /* street_regions_tracing_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C2D8022AFDAB4008B2B8B /* street_regions_tracing_tests.cpp */; }; 671C2D8922AFE250008B2B8B /* libtraffic.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671C2D8822AFE250008B2B8B /* libtraffic.a */; }; 671C2D8B22AFE2F7008B2B8B /* libdescriptions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671C2D8A22AFE2F7008B2B8B /* libdescriptions.a */; }; 671ED3BF20D4098100D4317E /* node_mixer_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671ED3B720D4098000D4317E /* node_mixer_test.cpp */; }; @@ -236,11 +241,9 @@ 34F558541DBF3ACC00A4FC11 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; 34F558561DBF3CD800A4FC11 /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; }; 395784D2230303E700F2CC07 /* merge_collectors_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = merge_collectors_tests.cpp; sourceTree = ""; }; - 395784D3230303E700F2CC07 /* geo_objects_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = geo_objects_tests.cpp; sourceTree = ""; }; 395784D4230303E700F2CC07 /* metalines_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = metalines_tests.cpp; sourceTree = ""; }; 395784D823030D4F00F2CC07 /* booking_addr_match.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = booking_addr_match.cpp; sourceTree = ""; }; 397057BD22CB57F8001A55CA /* cities_ids_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cities_ids_tests.cpp; sourceTree = ""; }; - 397057BE22CB57F9001A55CA /* translation_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = translation_test.cpp; sourceTree = ""; }; 39C4345122CE13F00002AEE3 /* booking_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = booking_tests.cpp; sourceTree = ""; }; 401E3188225C988500DE7EB8 /* libdescriptions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libdescriptions.a; sourceTree = BUILT_PRODUCTS_DIR; }; 4491F490213D46380011834F /* speed_cameras_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = speed_cameras_test.cpp; sourceTree = ""; }; @@ -253,8 +256,19 @@ 56A6C3CD219AFDED00A52855 /* filter_elements_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = filter_elements_tests.cpp; sourceTree = ""; }; 56A6C3CE219AFDED00A52855 /* common.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = common.hpp; sourceTree = ""; }; 56A6C3CF219AFDEE00A52855 /* common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = common.cpp; sourceTree = ""; }; - 56A6C3D0219AFDEE00A52855 /* regions_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = regions_tests.cpp; sourceTree = ""; }; - 56A6C3D1219AFDEE00A52855 /* region_info_collector_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = region_info_collector_tests.cpp; sourceTree = ""; }; + 56DAC347239914C2000BC50D /* gen_mwm_info_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gen_mwm_info_tests.cpp; sourceTree = ""; }; + 56DAC348239914C2000BC50D /* cluster_finder_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cluster_finder_tests.cpp; sourceTree = ""; }; + 56DAC349239914C2000BC50D /* collector_boundary_postcode_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collector_boundary_postcode_tests.cpp; sourceTree = ""; }; + 56DAC34A239914C2000BC50D /* collector_city_area_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collector_city_area_tests.cpp; sourceTree = ""; }; + 56DAC34B239914C2000BC50D /* complex_loader_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = complex_loader_tests.cpp; sourceTree = ""; }; + 56DAC34C239914C2000BC50D /* collector_routing_city_boundaries_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collector_routing_city_boundaries_tests.cpp; sourceTree = ""; }; + 56DAC34D239914C2000BC50D /* hierarchy_entry_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hierarchy_entry_tests.cpp; sourceTree = ""; }; + 56DAC34E239914C2000BC50D /* osm_element_helpers_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_element_helpers_tests.cpp; sourceTree = ""; }; + 56DAC34F239914C2000BC50D /* place_processor_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = place_processor_tests.cpp; sourceTree = ""; }; + 56DAC350239914C2000BC50D /* cross_mwm_osm_ways_collector_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cross_mwm_osm_ways_collector_tests.cpp; sourceTree = ""; }; + 56DAC351239914C2000BC50D /* mini_roundabout_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mini_roundabout_tests.cpp; sourceTree = ""; }; + 56DAC352239914C2000BC50D /* cells_merger_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cells_merger_tests.cpp; sourceTree = ""; }; + 56DAC35F239915E9000BC50D /* libstorage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libstorage.a; sourceTree = BUILT_PRODUCTS_DIR; }; 56EE14CE1FE803EA0036F20C /* libtransit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtransit.a; sourceTree = BUILT_PRODUCTS_DIR; }; 56EE14D01FE803FE0036F20C /* libtransit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtransit.a; sourceTree = BUILT_PRODUCTS_DIR; }; 670E7BBB1EF9832200A8E9ED /* libicu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libicu.a; path = "../../../../Library/Developer/Xcode/DerivedData/omim-gzleizqujktwggdwiejzkgjrsgvp/Build/Products/Debug/libicu.a"; sourceTree = ""; }; @@ -264,12 +278,9 @@ 670E7BC61EF992F600A8E9ED /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; 670F88781CE4CA81003F68BA /* libopening_hours.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopening_hours.a; path = "../../../omim-xcode-build/Release/libopening_hours.a"; sourceTree = ""; }; 6719DD5D1B95AB0F0018166F /* libtess2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtess2.a; path = "../../../omim-xcode-build/Debug/libtess2.a"; sourceTree = ""; }; - 671C2D7A22AFDAB4008B2B8B /* street_geometry_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = street_geometry_tests.cpp; sourceTree = ""; }; 671C2D7B22AFDAB4008B2B8B /* descriptions_section_builder_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = descriptions_section_builder_tests.cpp; sourceTree = ""; }; 671C2D7C22AFDAB4008B2B8B /* camera_collector_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = camera_collector_tests.cpp; sourceTree = ""; }; - 671C2D7E22AFDAB4008B2B8B /* popularity_builder_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = popularity_builder_tests.cpp; sourceTree = ""; }; 671C2D7F22AFDAB4008B2B8B /* brands_loader_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = brands_loader_test.cpp; sourceTree = ""; }; - 671C2D8022AFDAB4008B2B8B /* street_regions_tracing_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = street_regions_tracing_tests.cpp; sourceTree = ""; }; 671C2D8822AFE250008B2B8B /* libtraffic.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtraffic.a; sourceTree = BUILT_PRODUCTS_DIR; }; 671C2D8A22AFE2F7008B2B8B /* libdescriptions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libdescriptions.a; sourceTree = BUILT_PRODUCTS_DIR; }; 671ED3B720D4098000D4317E /* node_mixer_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = node_mixer_test.cpp; sourceTree = ""; }; @@ -284,7 +295,6 @@ 671ED3C820D40A3E00D4317E /* libgenerator_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgenerator_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; 671ED3CA20D40A8C00D4317E /* libminizip.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libminizip.a; sourceTree = BUILT_PRODUCTS_DIR; }; 671F58B71B86109B0032311E /* intermediate_data_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = intermediate_data_test.cpp; sourceTree = ""; }; - 6726C1E31A4C28D5005EEA39 /* check_mwms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = check_mwms.cpp; sourceTree = ""; }; 6726C1E51A4C28D5005EEA39 /* coasts_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = coasts_test.cpp; sourceTree = ""; }; 6726C1E61A4C28D5005EEA39 /* feature_builder_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_builder_test.cpp; sourceTree = ""; }; 6726C1E71A4C28D5005EEA39 /* feature_merger_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_merger_test.cpp; sourceTree = ""; }; @@ -346,6 +356,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 56DAC360239915E9000BC50D /* libstorage.a in Frameworks */, 671C2D8B22AFE2F7008B2B8B /* libdescriptions.a in Frameworks */, 671C2D8922AFE250008B2B8B /* libtraffic.a in Frameworks */, 671ED3CB20D40A8C00D4317E /* libminizip.a in Frameworks */, @@ -504,6 +515,7 @@ 34F558551DBF3CD800A4FC11 /* Frameworks */ = { isa = PBXGroup; children = ( + 56DAC35F239915E9000BC50D /* libstorage.a */, 671C2D8A22AFE2F7008B2B8B /* libdescriptions.a */, 671C2D8822AFE250008B2B8B /* libtraffic.a */, 401E3188225C988500DE7EB8 /* libdescriptions.a */, @@ -536,29 +548,33 @@ 6726C1D71A4C27A5005EEA39 /* generator_tests */ = { isa = PBXGroup; children = ( - 395784D3230303E700F2CC07 /* geo_objects_tests.cpp */, + 56DAC352239914C2000BC50D /* cells_merger_tests.cpp */, + 56DAC348239914C2000BC50D /* cluster_finder_tests.cpp */, + 56DAC349239914C2000BC50D /* collector_boundary_postcode_tests.cpp */, + 56DAC34A239914C2000BC50D /* collector_city_area_tests.cpp */, + 56DAC34C239914C2000BC50D /* collector_routing_city_boundaries_tests.cpp */, + 56DAC34B239914C2000BC50D /* complex_loader_tests.cpp */, + 56DAC350239914C2000BC50D /* cross_mwm_osm_ways_collector_tests.cpp */, + 56DAC347239914C2000BC50D /* gen_mwm_info_tests.cpp */, + 56DAC34D239914C2000BC50D /* hierarchy_entry_tests.cpp */, + 56DAC351239914C2000BC50D /* mini_roundabout_tests.cpp */, + 56DAC34E239914C2000BC50D /* osm_element_helpers_tests.cpp */, + 56DAC34F239914C2000BC50D /* place_processor_tests.cpp */, 395784D2230303E700F2CC07 /* merge_collectors_tests.cpp */, 395784D4230303E700F2CC07 /* metalines_tests.cpp */, 39C4345122CE13F00002AEE3 /* booking_tests.cpp */, 397057BD22CB57F8001A55CA /* cities_ids_tests.cpp */, - 397057BE22CB57F9001A55CA /* translation_test.cpp */, 671C2D7F22AFDAB4008B2B8B /* brands_loader_test.cpp */, 671C2D7C22AFDAB4008B2B8B /* camera_collector_tests.cpp */, 671C2D7B22AFDAB4008B2B8B /* descriptions_section_builder_tests.cpp */, - 671C2D7E22AFDAB4008B2B8B /* popularity_builder_tests.cpp */, - 671C2D7A22AFDAB4008B2B8B /* street_geometry_tests.cpp */, - 671C2D8022AFDAB4008B2B8B /* street_regions_tracing_tests.cpp */, 56A1B7A321A82BF700246F8C /* maxspeeds_tests.cpp */, 56A6C3CF219AFDEE00A52855 /* common.cpp */, 56A6C3CE219AFDED00A52855 /* common.hpp */, 56A6C3CD219AFDED00A52855 /* filter_elements_tests.cpp */, - 56A6C3D1219AFDEE00A52855 /* region_info_collector_tests.cpp */, - 56A6C3D0219AFDEE00A52855 /* regions_tests.cpp */, 4491F490213D46380011834F /* speed_cameras_test.cpp */, 56829A4A2134238700A09A28 /* cities_boundaries_checker_tests.cpp */, 56829A4B2134238800A09A28 /* city_roads_tests.cpp */, 671ED3BC20D4098100D4317E /* altitude_test.cpp */, - 6726C1E31A4C28D5005EEA39 /* check_mwms.cpp */, 6726C1E51A4C28D5005EEA39 /* coasts_test.cpp */, 6726C1E61A4C28D5005EEA39 /* feature_builder_test.cpp */, 6726C1E71A4C28D5005EEA39 /* feature_merger_test.cpp */, @@ -791,47 +807,51 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 56DAC35B239914C2000BC50D /* place_processor_tests.cpp in Sources */, + 56DAC354239914C2000BC50D /* cluster_finder_tests.cpp in Sources */, 671F58B91B8611360032311E /* intermediate_data_test.cpp in Sources */, 4491F496213D6B8E0011834F /* osm2meta_test.cpp in Sources */, 67AB92D51B75157400AB5194 /* osm_type_test.cpp in Sources */, 67AB92D71B75157A00AB5194 /* triangles_tree_coding_test.cpp in Sources */, + 56DAC35A239914C2000BC50D /* osm_element_helpers_tests.cpp in Sources */, 67AB92D01B75156400AB5194 /* coasts_test.cpp in Sources */, - 670F291B1BA6CE4F00F2ABF4 /* check_mwms.cpp in Sources */, 67AB92D91B75158300AB5194 /* osm_o5m_source_test.cpp in Sources */, 56829A4D2134238800A09A28 /* city_roads_tests.cpp in Sources */, 56A6C3D3219AFDEE00A52855 /* common.cpp in Sources */, - 56A6C3D5219AFDEE00A52855 /* region_info_collector_tests.cpp in Sources */, 67AB92D61B75157700AB5194 /* tesselator_test.cpp in Sources */, - 397057C122CB57F9001A55CA /* translation_test.cpp in Sources */, + 56DAC35C239914C2000BC50D /* cross_mwm_osm_ways_collector_tests.cpp in Sources */, 671ED3C420D4098100D4317E /* road_access_test.cpp in Sources */, 39C4345222CE13F00002AEE3 /* booking_tests.cpp in Sources */, 4491F494213D6B470011834F /* speed_cameras_test.cpp in Sources */, 56829A4C2134238800A09A28 /* cities_boundaries_checker_tests.cpp in Sources */, + 56DAC353239914C2000BC50D /* gen_mwm_info_tests.cpp in Sources */, 6726C2411A4C2D9F005EEA39 /* testingmain.cpp in Sources */, 56A6C3D2219AFDEE00A52855 /* filter_elements_tests.cpp in Sources */, 395784D7230303E700F2CC07 /* metalines_tests.cpp in Sources */, 670E7BC51EF9860100A8E9ED /* ugc_test.cpp in Sources */, 56A1B7A421A82BF700246F8C /* maxspeeds_tests.cpp in Sources */, - 671C2D8522AFDAB4008B2B8B /* popularity_builder_tests.cpp in Sources */, + 56DAC357239914C2000BC50D /* complex_loader_tests.cpp in Sources */, + 56DAC359239914C2000BC50D /* hierarchy_entry_tests.cpp in Sources */, + 56DAC35E239914C2000BC50D /* cells_merger_tests.cpp in Sources */, + 56DAC356239914C2000BC50D /* collector_city_area_tests.cpp in Sources */, 67AB92D21B75156B00AB5194 /* feature_merger_test.cpp in Sources */, - 671C2D8722AFDAB4008B2B8B /* street_regions_tracing_tests.cpp in Sources */, 67AB92C31B73C29000AB5194 /* source_to_element_test.cpp in Sources */, 671C2D8622AFDAB4008B2B8B /* brands_loader_test.cpp in Sources */, 671ED3C520D4098100D4317E /* sponsored_storage_tests.cpp in Sources */, - 395784D6230303E700F2CC07 /* geo_objects_tests.cpp in Sources */, + 56DAC358239914C2000BC50D /* collector_routing_city_boundaries_tests.cpp in Sources */, 671C2D8222AFDAB4008B2B8B /* descriptions_section_builder_tests.cpp in Sources */, + 56DAC355239914C2000BC50D /* collector_boundary_postcode_tests.cpp in Sources */, 671ED3C120D4098100D4317E /* srtm_parser_test.cpp in Sources */, + 56DAC35D239914C2000BC50D /* mini_roundabout_tests.cpp in Sources */, 671ED3C220D4098100D4317E /* restriction_collector_test.cpp in Sources */, 677792521C1B2E9700EC9499 /* metadata_parser_test.cpp in Sources */, 671ED3BF20D4098100D4317E /* node_mixer_test.cpp in Sources */, 395784D5230303E700F2CC07 /* merge_collectors_tests.cpp in Sources */, 4491F497213D6BA00011834F /* tag_admixer_test.cpp in Sources */, - 56A6C3D4219AFDEE00A52855 /* regions_tests.cpp in Sources */, 67AB92D11B75156700AB5194 /* feature_builder_test.cpp in Sources */, 671ED3C320D4098100D4317E /* altitude_test.cpp in Sources */, 397057C022CB57F9001A55CA /* cities_ids_tests.cpp in Sources */, 671ED3C020D4098100D4317E /* restriction_test.cpp in Sources */, - 671C2D8122AFDAB4008B2B8B /* street_geometry_tests.cpp in Sources */, 671C2D8322AFDAB4008B2B8B /* camera_collector_tests.cpp in Sources */, 67AB92C21B73C27300AB5194 /* source_data.cpp in Sources */, ); diff --git a/xcode/geometry/geometry.xcodeproj/project.pbxproj b/xcode/geometry/geometry.xcodeproj/project.pbxproj index 52f9fffcca..ba7aac9223 100644 --- a/xcode/geometry/geometry.xcodeproj/project.pbxproj +++ b/xcode/geometry/geometry.xcodeproj/project.pbxproj @@ -610,7 +610,7 @@ "$(inherited)", "OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1", ); - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = maps.me.geometry_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -623,7 +623,7 @@ "$(inherited)", "OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1", ); - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = maps.me.geometry_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -684,7 +684,7 @@ "$(inherited)", "OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1", ); - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = maps.me.geometry_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj index 0fa205a62d..6e6d54c6cc 100644 --- a/xcode/indexer/indexer.xcodeproj/project.pbxproj +++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj @@ -91,6 +91,7 @@ 56C74C231C749E4700B71B9F /* search_delimiters.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56C74C191C749E4700B71B9F /* search_delimiters.hpp */; }; 56C74C241C749E4700B71B9F /* search_string_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C1A1C749E4700B71B9F /* search_string_utils.cpp */; }; 56C74C251C749E4700B71B9F /* search_string_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56C74C1B1C749E4700B71B9F /* search_string_utils.hpp */; }; + 56DAC36823992325000BC50D /* libtraffic.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC36723992325000BC50D /* libtraffic.a */; }; 670BAA8C1D0B0673000302DA /* trie_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C2E1C749E8100B71B9F /* trie_test.cpp */; }; 670BAA8D1D0B069A000302DA /* succinct_trie_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C2C1C749E8100B71B9F /* succinct_trie_test.cpp */; }; 670BAA8E1D0B06A1000302DA /* search_string_utils_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C2B1C749E8100B71B9F /* search_string_utils_test.cpp */; }; @@ -322,6 +323,7 @@ 56C74C2C1C749E8100B71B9F /* succinct_trie_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = succinct_trie_test.cpp; sourceTree = ""; }; 56C74C2D1C749E8100B71B9F /* test_mwm_set.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_mwm_set.hpp; sourceTree = ""; }; 56C74C2E1C749E8100B71B9F /* trie_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = trie_test.cpp; sourceTree = ""; }; + 56DAC36723992325000BC50D /* libtraffic.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtraffic.a; sourceTree = BUILT_PRODUCTS_DIR; }; 670BAAA51D0B07AA000302DA /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "../../../omim-xcode-build/Debug/libbase.a"; sourceTree = ""; }; 670BAAA61D0B07AA000302DA /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "../../../omim-xcode-build/Debug/libcoding.a"; sourceTree = ""; }; 670BAAA71D0B07AA000302DA /* libeditor.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeditor.a; path = "../../../omim-xcode-build/Debug/libeditor.a"; sourceTree = ""; }; @@ -446,6 +448,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 56DAC36823992325000BC50D /* libtraffic.a in Frameworks */, 671555E520BDC523002BA3B4 /* libeditor.a in Frameworks */, 671555E220BDA63C002BA3B4 /* libgenerator.a in Frameworks */, 45C108BF1E9D008D000FE1F6 /* librouting_common.a in Frameworks */, @@ -518,6 +521,7 @@ 45C108BB1E9D0067000FE1F6 /* Frameworks */ = { isa = PBXGroup; children = ( + 56DAC36723992325000BC50D /* libtraffic.a */, 671555E420BDC523002BA3B4 /* libeditor.a */, 671555E120BDA63C002BA3B4 /* libgenerator.a */, 45C108BE1E9D008D000FE1F6 /* librouting_common.a */, @@ -1065,7 +1069,7 @@ buildSettings = { GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "maps.me.indexer-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -1076,7 +1080,7 @@ buildSettings = { GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "maps.me.indexer-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -1147,7 +1151,7 @@ buildSettings = { GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "maps.me.indexer-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; diff --git a/xcode/kml/kml.xcodeproj/project.pbxproj b/xcode/kml/kml.xcodeproj/project.pbxproj index 6f8da71663..a436bd25ce 100644 --- a/xcode/kml/kml.xcodeproj/project.pbxproj +++ b/xcode/kml/kml.xcodeproj/project.pbxproj @@ -13,6 +13,19 @@ 45E4560120584DF200D9F45E /* serdes_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45E455FF20584DEF00D9F45E /* serdes_tests.cpp */; }; 45E4560320584E1C00D9F45E /* libkml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 45E4557D205849A600D9F45E /* libkml.a */; }; 45E456142058509200D9F45E /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45E456122058508C00D9F45E /* testingmain.cpp */; }; + 56C633A6239932DD0003891E /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56C633A5239932DD0003891E /* libcoding.a */; }; + 56C633A8239932E20003891E /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56C633A7239932E20003891E /* libbase.a */; }; + 56C633AA239933050003891E /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56C633A9239933050003891E /* libexpat.a */; }; + 56C633AC239933190003891E /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56C633AB239933190003891E /* libplatform.a */; }; + 56C633AE2399331E0003891E /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56C633AD2399331E0003891E /* libgeometry.a */; }; + 56C633B0239933600003891E /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56C633AF239933600003891E /* libindexer.a */; }; + 56C633B2239933670003891E /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56C633B1239933670003891E /* libalohalitics.a */; }; + 56C633B4239933850003891E /* libprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56C633B3239933850003891E /* libprotobuf.a */; }; + 56C633B62399338A0003891E /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56C633B52399338A0003891E /* liboauthcpp.a */; }; + 56C633B8239933900003891E /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56C633B7239933900003891E /* libicu.a */; }; + 56C633BA239933A70003891E /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56C633B9239933A70003891E /* libjansson.a */; }; + 56C633BC239933AC0003891E /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56C633BB239933AC0003891E /* libsuccinct.a */; }; + 56C633C0239934260003891E /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 56C633BF239934260003891E /* libz.tbd */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -43,6 +56,20 @@ 45E455ED20584DCB00D9F45E /* kml_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = kml_tests.app; sourceTree = BUILT_PRODUCTS_DIR; }; 45E455FF20584DEF00D9F45E /* serdes_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = serdes_tests.cpp; sourceTree = ""; }; 45E456122058508C00D9F45E /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; + 56C633A5239932DD0003891E /* libcoding.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcoding.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56C633A7239932E20003891E /* libbase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbase.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56C633A9239933050003891E /* libexpat.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libexpat.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56C633AB239933190003891E /* libplatform.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libplatform.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56C633AD2399331E0003891E /* libgeometry.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgeometry.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56C633AF239933600003891E /* libindexer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libindexer.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56C633B1239933670003891E /* libalohalitics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libalohalitics.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56C633B3239933850003891E /* libprotobuf.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libprotobuf.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56C633B52399338A0003891E /* liboauthcpp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = liboauthcpp.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56C633B7239933900003891E /* libicu.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libicu.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56C633B9239933A70003891E /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56C633BB239933AC0003891E /* libsuccinct.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsuccinct.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56C633BD239933D00003891E /* libminizip.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libminizip.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56C633BF239934260003891E /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -57,6 +84,19 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 56C633C0239934260003891E /* libz.tbd in Frameworks */, + 56C633BC239933AC0003891E /* libsuccinct.a in Frameworks */, + 56C633BA239933A70003891E /* libjansson.a in Frameworks */, + 56C633B8239933900003891E /* libicu.a in Frameworks */, + 56C633B62399338A0003891E /* liboauthcpp.a in Frameworks */, + 56C633B4239933850003891E /* libprotobuf.a in Frameworks */, + 56C633B2239933670003891E /* libalohalitics.a in Frameworks */, + 56C633B0239933600003891E /* libindexer.a in Frameworks */, + 56C633AE2399331E0003891E /* libgeometry.a in Frameworks */, + 56C633AC239933190003891E /* libplatform.a in Frameworks */, + 56C633AA239933050003891E /* libexpat.a in Frameworks */, + 56C633A8239932E20003891E /* libbase.a in Frameworks */, + 56C633A6239932DD0003891E /* libcoding.a in Frameworks */, 45E4560320584E1C00D9F45E /* libkml.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -115,6 +155,20 @@ 45E4560220584E1C00D9F45E /* Frameworks */ = { isa = PBXGroup; children = ( + 56C633BF239934260003891E /* libz.tbd */, + 56C633BD239933D00003891E /* libminizip.a */, + 56C633BB239933AC0003891E /* libsuccinct.a */, + 56C633B9239933A70003891E /* libjansson.a */, + 56C633B7239933900003891E /* libicu.a */, + 56C633B52399338A0003891E /* liboauthcpp.a */, + 56C633B3239933850003891E /* libprotobuf.a */, + 56C633B1239933670003891E /* libalohalitics.a */, + 56C633AF239933600003891E /* libindexer.a */, + 56C633AD2399331E0003891E /* libgeometry.a */, + 56C633AB239933190003891E /* libplatform.a */, + 56C633A9239933050003891E /* libexpat.a */, + 56C633A7239932E20003891E /* libbase.a */, + 56C633A5239932DD0003891E /* libcoding.a */, ); name = Frameworks; sourceTree = ""; @@ -271,21 +325,21 @@ 45E455FC20584DCC00D9F45E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; }; name = Debug; }; 45E455FD20584DCC00D9F45E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; }; name = Release; }; 45E455FE20584DCC00D9F45E /* Production Full */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; }; name = "Production Full"; }; diff --git a/xcode/local_ads/local_ads.xcodeproj/project.pbxproj b/xcode/local_ads/local_ads.xcodeproj/project.pbxproj index 7b9f72286e..e1fc9aa968 100644 --- a/xcode/local_ads/local_ads.xcodeproj/project.pbxproj +++ b/xcode/local_ads/local_ads.xcodeproj/project.pbxproj @@ -31,6 +31,8 @@ 45FFD6861E96636A00DB854E /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 45FFD6851E96636A00DB854E /* libcoding.a */; }; 45FFD6881E96637C00DB854E /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 45FFD6871E96637C00DB854E /* libalohalitics.a */; }; 45FFD68A1E96639400DB854E /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 45FFD6891E96639400DB854E /* libz.tbd */; }; + 56DAC36A239923C1000BC50D /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC369239923C1000BC50D /* liboauthcpp.a */; }; + 56DAC36C239923E9000BC50D /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC36B239923E9000BC50D /* libjansson.a */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -61,6 +63,8 @@ 45FFD6851E96636A00DB854E /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "/Users/r.kuznetsov/Dev/Projects/omim/xcode/coding/../../../omim-build/xcode/Debug/libcoding.a"; sourceTree = ""; }; 45FFD6871E96637C00DB854E /* libalohalitics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libalohalitics.a; path = "/Users/r.kuznetsov/Dev/Projects/omim/xcode/alohalitics/../../../omim-build/xcode/Debug/libalohalitics.a"; sourceTree = ""; }; 45FFD6891E96639400DB854E /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; + 56DAC369239923C1000BC50D /* liboauthcpp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = liboauthcpp.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56DAC36B239923E9000BC50D /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -75,6 +79,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 56DAC36C239923E9000BC50D /* libjansson.a in Frameworks */, + 56DAC36A239923C1000BC50D /* liboauthcpp.a in Frameworks */, 4580DAC61E9D2C3D00E8BCDE /* libgeometry.a in Frameworks */, 45FFD68A1E96639400DB854E /* libz.tbd in Frameworks */, 45FFD6881E96637C00DB854E /* libalohalitics.a in Frameworks */, @@ -145,6 +151,8 @@ 45FFD6801E96634B00DB854E /* Frameworks */ = { isa = PBXGroup; children = ( + 56DAC36B239923E9000BC50D /* libjansson.a */, + 56DAC369239923C1000BC50D /* liboauthcpp.a */, 4580DAC51E9D2C3D00E8BCDE /* libgeometry.a */, 45812AB41E9781D500D7D3B3 /* libplatform_tests_support.a */, 45FFD6891E96639400DB854E /* libz.tbd */, @@ -234,6 +242,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -332,7 +341,7 @@ 45FFD6771E965EFB00DB854E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "maps.me.local-ads-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -341,7 +350,7 @@ 45FFD6781E965EFB00DB854E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "maps.me.local-ads-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -372,7 +381,7 @@ A8E541031F9FBBDA00A1B8FA /* Production Full */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "maps.me.local-ads-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index 57f2cc92de..d2baa7f805 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -60,7 +60,6 @@ 3DA571F920C1935B007BDE27 /* libeditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DA571F820C1935B007BDE27 /* libeditor.a */; }; 3DA571FB20C1935B007BDE27 /* libgenerator_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DA571FA20C1935B007BDE27 /* libgenerator_tests_support.a */; }; 3DA571FD20C1935B007BDE27 /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DA571FC20C1935B007BDE27 /* libicu.a */; }; - 3DA571FF20C1935B007BDE27 /* libindexer_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DA571FE20C1935B007BDE27 /* libindexer_tests_support.a */; }; 3DA5720120C1935C007BDE27 /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DA5720020C1935C007BDE27 /* libindexer.a */; }; 3DA5720320C1935C007BDE27 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DA5720220C1935C007BDE27 /* libjansson.a */; }; 3DA5720520C1935C007BDE27 /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DA5720420C1935C007BDE27 /* liboauthcpp.a */; }; @@ -140,6 +139,11 @@ 56C116602090E5670068BBC0 /* extrapolator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C1165E2090E5670068BBC0 /* extrapolator.cpp */; }; 56C116612090E5670068BBC0 /* extrapolator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56C1165F2090E5670068BBC0 /* extrapolator.hpp */; }; 56D1C15E20A0AB9D005C689E /* extrapolator_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56D1C15D20A0AB9D005C689E /* extrapolator_tests.cpp */; }; + 56DAC36E23992467000BC50D /* libvulkan_wrapper.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC36D23992467000BC50D /* libvulkan_wrapper.a */; }; + 56DAC3702399248B000BC50D /* libdescriptions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC36F2399248B000BC50D /* libdescriptions.a */; }; + 56DAC37223992491000BC50D /* libweb_api.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC37123992491000BC50D /* libweb_api.a */; }; + 56DAC37423992505000BC50D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC37323992504000BC50D /* Security.framework */; }; + 56DAC37623992556000BC50D /* libtraffic.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC37523992556000BC50D /* libtraffic.a */; }; 56EE14D31FE80E900036F20C /* libtransit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14D41FE80E900036F20C /* libtransit.a */; }; 56EE14D51FE80EBD0036F20C /* libmwm_diff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14D61FE80EBD0036F20C /* libmwm_diff.a */; }; 56EE14D71FE80F290036F20C /* libbsdiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14D81FE80F290036F20C /* libbsdiff.a */; }; @@ -408,6 +412,11 @@ 56C1165E2090E5670068BBC0 /* extrapolator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = extrapolator.cpp; path = extrapolation/extrapolator.cpp; sourceTree = ""; }; 56C1165F2090E5670068BBC0 /* extrapolator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = extrapolator.hpp; path = extrapolation/extrapolator.hpp; sourceTree = ""; }; 56D1C15D20A0AB9D005C689E /* extrapolator_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = extrapolator_tests.cpp; sourceTree = ""; }; + 56DAC36D23992467000BC50D /* libvulkan_wrapper.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libvulkan_wrapper.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56DAC36F2399248B000BC50D /* libdescriptions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libdescriptions.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56DAC37123992491000BC50D /* libweb_api.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libweb_api.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56DAC37323992504000BC50D /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; + 56DAC37523992556000BC50D /* libtraffic.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtraffic.a; sourceTree = BUILT_PRODUCTS_DIR; }; 56EE14D41FE80E900036F20C /* libtransit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtransit.a; sourceTree = BUILT_PRODUCTS_DIR; }; 56EE14D61FE80EBD0036F20C /* libmwm_diff.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libmwm_diff.a; sourceTree = BUILT_PRODUCTS_DIR; }; 56EE14D81FE80F290036F20C /* libbsdiff.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbsdiff.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -538,6 +547,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 56DAC37623992556000BC50D /* libtraffic.a in Frameworks */, 3DA5722720C1951D007BDE27 /* libz.tbd in Frameworks */, 3DA5721E20C194B8007BDE27 /* libgenerator.a in Frameworks */, 3DA5722020C194B8007BDE27 /* libopen_location_code.a in Frameworks */, @@ -553,7 +563,6 @@ 3DA571F920C1935B007BDE27 /* libeditor.a in Frameworks */, 3DA571FB20C1935B007BDE27 /* libgenerator_tests_support.a in Frameworks */, 3DA571FD20C1935B007BDE27 /* libicu.a in Frameworks */, - 3DA571FF20C1935B007BDE27 /* libindexer_tests_support.a in Frameworks */, 3DA5720120C1935C007BDE27 /* libindexer.a in Frameworks */, 3DA5720320C1935C007BDE27 /* libjansson.a in Frameworks */, 3DA5720520C1935C007BDE27 /* liboauthcpp.a in Frameworks */, @@ -573,6 +582,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 56DAC37423992505000BC50D /* Security.framework in Frameworks */, + 56DAC37223992491000BC50D /* libweb_api.a in Frameworks */, + 56DAC3702399248B000BC50D /* libdescriptions.a in Frameworks */, + 56DAC36E23992467000BC50D /* libvulkan_wrapper.a in Frameworks */, 3DD122BB2135708900EDFB53 /* libmetrics_tests_support.a in Frameworks */, 3DD122BD2135708900EDFB53 /* libmetrics.a in Frameworks */, 475BD61B211C5FDC00E298C6 /* libshaders.a in Frameworks */, @@ -638,6 +651,11 @@ 34DDA17E1DBE5DF40088A609 /* Frameworks */ = { isa = PBXGroup; children = ( + 56DAC37523992556000BC50D /* libtraffic.a */, + 56DAC37323992504000BC50D /* Security.framework */, + 56DAC37123992491000BC50D /* libweb_api.a */, + 56DAC36F2399248B000BC50D /* libdescriptions.a */, + 56DAC36D23992467000BC50D /* libvulkan_wrapper.a */, 3DD122BA2135708900EDFB53 /* libmetrics_tests_support.a */, 3DD122BC2135708900EDFB53 /* libmetrics.a */, 3D4F457D21354F720005E765 /* libeye_tests_support.a */, @@ -1317,7 +1335,7 @@ "$(inherited)", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", ); - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = maps.me.map_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -1330,7 +1348,7 @@ "$(inherited)", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", ); - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = maps.me.map_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -1430,7 +1448,7 @@ "$(inherited)", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", ); - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = maps.me.map_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; diff --git a/xcode/metrics/metrics.xcodeproj/project.pbxproj b/xcode/metrics/metrics.xcodeproj/project.pbxproj index 78ee1c2119..df5d290eb2 100644 --- a/xcode/metrics/metrics.xcodeproj/project.pbxproj +++ b/xcode/metrics/metrics.xcodeproj/project.pbxproj @@ -21,6 +21,7 @@ 3D4F457821354E530005E765 /* libmetrics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F44FB21345FC50005E765 /* libmetrics.a */; }; 3D4F457A21354EB70005E765 /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F457921354EB70005E765 /* libalohalitics.a */; }; 3D4F457C21354F150005E765 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F457B21354F150005E765 /* libz.tbd */; }; + 56DAC378239925C4000BC50D /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC377239925C4000BC50D /* libgeometry.a */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -67,6 +68,7 @@ 3D4F457521354E4B0005E765 /* libplatform.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libplatform.a; sourceTree = BUILT_PRODUCTS_DIR; }; 3D4F457921354EB70005E765 /* libalohalitics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libalohalitics.a; sourceTree = BUILT_PRODUCTS_DIR; }; 3D4F457B21354F150005E765 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; + 56DAC377239925C4000BC50D /* libgeometry.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgeometry.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -81,6 +83,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 56DAC378239925C4000BC50D /* libgeometry.a in Frameworks */, 3D4F457721354E530005E765 /* libmetrics_tests_support.a in Frameworks */, 3D4F457821354E530005E765 /* libmetrics.a in Frameworks */, 3D4F457621354E4B0005E765 /* libplatform.a in Frameworks */, @@ -163,6 +166,7 @@ 3D4F456E21354E0C0005E765 /* Frameworks */ = { isa = PBXGroup; children = ( + 56DAC377239925C4000BC50D /* libgeometry.a */, 3D4F457B21354F150005E765 /* libz.tbd */, 3D4F457921354EB70005E765 /* libalohalitics.a */, 3D4F457521354E4B0005E765 /* libplatform.a */, @@ -425,7 +429,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -484,7 +488,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -543,7 +547,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", diff --git a/xcode/partners_api/partners_api.xcodeproj/project.pbxproj b/xcode/partners_api/partners_api.xcodeproj/project.pbxproj index af0be8b05c..747ee5b5fd 100644 --- a/xcode/partners_api/partners_api.xcodeproj/project.pbxproj +++ b/xcode/partners_api/partners_api.xcodeproj/project.pbxproj @@ -73,6 +73,9 @@ 45BABC34229812830060FA53 /* downloader_promo.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 45BABC32229812830060FA53 /* downloader_promo.hpp */; }; 45C380772094C5B400C18D81 /* partners.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45C380752094C5B400C18D81 /* partners.cpp */; }; 45C380782094C5B400C18D81 /* partners.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 45C380762094C5B400C18D81 /* partners.hpp */; }; + 56DAC37A2399261E000BC50D /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC3792399261E000BC50D /* libsuccinct.a */; }; + 56DAC37C23992624000BC50D /* libmwm_diff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC37B23992624000BC50D /* libmwm_diff.a */; }; + 56DAC37E23992684000BC50D /* libbsdiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC37D23992684000BC50D /* libbsdiff.a */; }; BB1956E61F543D7C003ECE6C /* locals_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB1956E41F543D7B003ECE6C /* locals_api.cpp */; }; BB1956E71F543D7C003ECE6C /* locals_api.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BB1956E51F543D7C003ECE6C /* locals_api.hpp */; }; F6539537207FBED70057B97C /* taxi_places_loader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DF9C21A207CAC3B00DA0793 /* taxi_places_loader.cpp */; }; @@ -170,6 +173,9 @@ 45BABC32229812830060FA53 /* downloader_promo.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = downloader_promo.hpp; sourceTree = ""; }; 45C380752094C5B400C18D81 /* partners.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = partners.cpp; sourceTree = ""; }; 45C380762094C5B400C18D81 /* partners.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = partners.hpp; sourceTree = ""; }; + 56DAC3792399261E000BC50D /* libsuccinct.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsuccinct.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56DAC37B23992624000BC50D /* libmwm_diff.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libmwm_diff.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56DAC37D23992684000BC50D /* libbsdiff.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbsdiff.a; sourceTree = BUILT_PRODUCTS_DIR; }; BB1956E41F543D7B003ECE6C /* locals_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locals_api.cpp; sourceTree = ""; }; BB1956E51F543D7C003ECE6C /* locals_api.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = locals_api.hpp; sourceTree = ""; }; F67E75231DB8F06F00D6741F /* opentable_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = opentable_api.cpp; sourceTree = ""; }; @@ -204,6 +210,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 56DAC37E23992684000BC50D /* libbsdiff.a in Frameworks */, + 56DAC37C23992624000BC50D /* libmwm_diff.a in Frameworks */, + 56DAC37A2399261E000BC50D /* libsuccinct.a in Frameworks */, 4566605520D920220085E8C1 /* libstorage.a in Frameworks */, 349FEC5E2010D67B00FE5CA3 /* libopening_hours.a in Frameworks */, 349FEC5C2010D56400FE5CA3 /* libprotobuf.a in Frameworks */, @@ -349,6 +358,9 @@ F6B536701DA523D60067EEA5 /* Frameworks */ = { isa = PBXGroup; children = ( + 56DAC37D23992684000BC50D /* libbsdiff.a */, + 56DAC37B23992624000BC50D /* libmwm_diff.a */, + 56DAC3792399261E000BC50D /* libsuccinct.a */, 4566605420D920220085E8C1 /* libstorage.a */, 349FEC5F2010D67B00FE5CA3 /* libopening_hours.a */, 349FEC5D2010D56400FE5CA3 /* libprotobuf.a */, @@ -581,7 +593,7 @@ "$(inherited)", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", ); - INFOPLIST_FILE = "$(SRCROOT)/../../iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = partners_api_test; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -635,7 +647,7 @@ "$(inherited)", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", ); - INFOPLIST_FILE = "$(SRCROOT)/../../iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = partners_api_test; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -649,7 +661,7 @@ "$(inherited)", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", ); - INFOPLIST_FILE = "$(SRCROOT)/../../iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = partners_api_test; PRODUCT_NAME = "$(TARGET_NAME)"; }; diff --git a/xcode/platform/platform.xcodeproj/project.pbxproj b/xcode/platform/platform.xcodeproj/project.pbxproj index 7463abdb94..1b8fb97ef6 100644 --- a/xcode/platform/platform.xcodeproj/project.pbxproj +++ b/xcode/platform/platform.xcodeproj/project.pbxproj @@ -37,6 +37,8 @@ 45D7ADBB210F48E500160DE3 /* http_user_agent_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 45D7ADB8210F48E400160DE3 /* http_user_agent_ios.mm */; }; 45D7ADBC210F48E500160DE3 /* http_user_agent.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 45D7ADB9210F48E400160DE3 /* http_user_agent.hpp */; }; 5661A5CC20DD57DA00C6B1D1 /* async_gui_thread.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 5661A5CB20DD57DA00C6B1D1 /* async_gui_thread.hpp */; }; + 56DAC380239926EF000BC50D /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC37F239926EF000BC50D /* liboauthcpp.a */; }; + 56DAC38223992707000BC50D /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC38123992707000BC50D /* libgeometry.a */; }; 56EB1EDC1C6B6E6C0022D831 /* file_logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56EB1ED81C6B6E6C0022D831 /* file_logging.cpp */; }; 56EB1EDD1C6B6E6C0022D831 /* file_logging.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56EB1ED91C6B6E6C0022D831 /* file_logging.hpp */; }; 56EB1EDE1C6B6E6C0022D831 /* mwm_traits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56EB1EDA1C6B6E6C0022D831 /* mwm_traits.cpp */; }; @@ -163,6 +165,8 @@ 45D7ADB8210F48E400160DE3 /* http_user_agent_ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = http_user_agent_ios.mm; sourceTree = ""; }; 45D7ADB9210F48E400160DE3 /* http_user_agent.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = http_user_agent.hpp; sourceTree = ""; }; 5661A5CB20DD57DA00C6B1D1 /* async_gui_thread.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = async_gui_thread.hpp; sourceTree = ""; }; + 56DAC37F239926EF000BC50D /* liboauthcpp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = liboauthcpp.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56DAC38123992707000BC50D /* libgeometry.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgeometry.a; sourceTree = BUILT_PRODUCTS_DIR; }; 56EB1ED81C6B6E6C0022D831 /* file_logging.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_logging.cpp; sourceTree = ""; }; 56EB1ED91C6B6E6C0022D831 /* file_logging.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = file_logging.hpp; sourceTree = ""; }; 56EB1EDA1C6B6E6C0022D831 /* mwm_traits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_traits.cpp; sourceTree = ""; }; @@ -274,6 +278,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 56DAC38223992707000BC50D /* libgeometry.a in Frameworks */, + 56DAC380239926EF000BC50D /* liboauthcpp.a in Frameworks */, 67B30B2A2084B7D8008AEBFD /* CoreLocation.framework in Frameworks */, 3496AB711DC1F5AB00C5DDBA /* libalohalitics.a in Frameworks */, 678338A71C6DE5E300FD6263 /* libplatform_tests_support.a in Frameworks */, @@ -293,6 +299,8 @@ 3496AB6F1DC1F5AB00C5DDBA /* Frameworks */ = { isa = PBXGroup; children = ( + 56DAC38123992707000BC50D /* libgeometry.a */, + 56DAC37F239926EF000BC50D /* liboauthcpp.a */, 67B30B292084B7D7008AEBFD /* CoreLocation.framework */, 3496AB701DC1F5AB00C5DDBA /* libalohalitics.a */, ); @@ -916,7 +924,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.platform-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -928,7 +936,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.platform-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1023,7 +1031,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.platform-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/xcode/routing/routing.xcodeproj/project.pbxproj b/xcode/routing/routing.xcodeproj/project.pbxproj index d55f7a0e72..dddf87d1ce 100644 --- a/xcode/routing/routing.xcodeproj/project.pbxproj +++ b/xcode/routing/routing.xcodeproj/project.pbxproj @@ -98,7 +98,6 @@ 44D1C41B229C59B8001A3CD2 /* transit_route_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44D1C41A229C59B8001A3CD2 /* transit_route_test.cpp */; }; 44E5574A2136EEC900B01439 /* speed_camera_ser_des.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 44E557492136EEC800B01439 /* speed_camera_ser_des.hpp */; }; 44E5574C2136EED000B01439 /* speed_camera_ser_des.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44E5574B2136EED000B01439 /* speed_camera_ser_des.cpp */; }; - 44EB88C4214007AD004E2863 /* speed_camera_notification.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44EB88C2214007A9004E2863 /* speed_camera_notification.cpp */; }; 44F45B282136B069001B1618 /* speed_cameras_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44F45B272136B069001B1618 /* speed_cameras_tests.cpp */; }; 56099E291CC7C97D00A7772A /* loaded_path_segment.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56099E251CC7C97D00A7772A /* loaded_path_segment.hpp */; }; 56099E2A1CC7C97D00A7772A /* routing_result_graph.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56099E261CC7C97D00A7772A /* routing_result_graph.hpp */; }; @@ -153,6 +152,8 @@ 56CBED5622E9CE2600D51AF7 /* position_accumulator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56CBED5422E9CE2600D51AF7 /* position_accumulator.cpp */; }; 56CBED5822E9CFB600D51AF7 /* position_accumulator_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56CBED5722E9CFB600D51AF7 /* position_accumulator_tests.cpp */; }; 56CC5A371E3884960016AC46 /* cross_mwm_index_graph.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56CC5A361E3884960016AC46 /* cross_mwm_index_graph.hpp */; }; + 56DAC2C42398F348000BC50D /* speed_camera_notifications_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC2C32398F348000BC50D /* speed_camera_notifications_tests.cpp */; }; + 56DAC2C82398F3C8000BC50D /* junction_visitor.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC2C72398F3C8000BC50D /* junction_visitor.hpp */; }; 56EA2FD51D8FD8590083F01A /* routing_helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56EA2FD41D8FD8590083F01A /* routing_helpers.hpp */; }; 56ED7DBD1F69425700B67156 /* turn_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 567E9F741F5850460064CB96 /* turn_test.cpp */; }; 56EE14DB1FE812FC0036F20C /* libtransit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14DC1FE812FC0036F20C /* libtransit.a */; }; @@ -404,7 +405,6 @@ 44D1C41A229C59B8001A3CD2 /* transit_route_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transit_route_test.cpp; sourceTree = ""; }; 44E557492136EEC800B01439 /* speed_camera_ser_des.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = speed_camera_ser_des.hpp; sourceTree = ""; }; 44E5574B2136EED000B01439 /* speed_camera_ser_des.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = speed_camera_ser_des.cpp; sourceTree = ""; }; - 44EB88C2214007A9004E2863 /* speed_camera_notification.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = speed_camera_notification.cpp; sourceTree = ""; }; 44F45B272136B069001B1618 /* speed_cameras_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = speed_cameras_tests.cpp; sourceTree = ""; }; 56099E251CC7C97D00A7772A /* loaded_path_segment.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = loaded_path_segment.hpp; sourceTree = ""; }; 56099E261CC7C97D00A7772A /* routing_result_graph.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = routing_result_graph.hpp; sourceTree = ""; }; @@ -458,6 +458,8 @@ 56CBED5422E9CE2600D51AF7 /* position_accumulator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = position_accumulator.cpp; sourceTree = ""; }; 56CBED5722E9CFB600D51AF7 /* position_accumulator_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = position_accumulator_tests.cpp; sourceTree = ""; }; 56CC5A361E3884960016AC46 /* cross_mwm_index_graph.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cross_mwm_index_graph.hpp; sourceTree = ""; }; + 56DAC2C32398F348000BC50D /* speed_camera_notifications_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = speed_camera_notifications_tests.cpp; sourceTree = ""; }; + 56DAC2C72398F3C8000BC50D /* junction_visitor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = junction_visitor.hpp; sourceTree = ""; }; 56EA2FD41D8FD8590083F01A /* routing_helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = routing_helpers.hpp; sourceTree = ""; }; 56EE14DC1FE812FC0036F20C /* libtransit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtransit.a; sourceTree = BUILT_PRODUCTS_DIR; }; 56F0D75F1D896A5300045886 /* routing_benchmarks.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = routing_benchmarks.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -842,6 +844,7 @@ 675343FA1A3F640D00A0A8C3 /* routing */ = { isa = PBXGroup; children = ( + 56DAC2C72398F3C8000BC50D /* junction_visitor.hpp */, 560A273A233BB18900B20E8F /* following_info.hpp */, 56CBED5422E9CE2600D51AF7 /* position_accumulator.cpp */, 56CBED5322E9CE2500D51AF7 /* position_accumulator.hpp */, @@ -992,9 +995,9 @@ 67BD35961C69F03E003AA26F /* routing_integration_tests */ = { isa = PBXGroup; children = ( + 56DAC2C32398F348000BC50D /* speed_camera_notifications_tests.cpp */, 44D1C41A229C59B8001A3CD2 /* transit_route_test.cpp */, 44D1C418229C59A3001A3CD2 /* small_routes.cpp */, - 44EB88C2214007A9004E2863 /* speed_camera_notification.cpp */, 567E9F7A1F58506B0064CB96 /* street_names_test.cpp */, 567E9F701F5850460064CB96 /* route_test.cpp */, 567E9F711F5850460064CB96 /* get_altitude_test.cpp */, @@ -1031,6 +1034,7 @@ 56099E2A1CC7C97D00A7772A /* routing_result_graph.hpp in Headers */, 0C5F5D231E798B0400307B98 /* cross_mwm_connector.hpp in Headers */, 40F7F3E41F7D246D0082D564 /* single_vehicle_world_graph.hpp in Headers */, + 56DAC2C82398F3C8000BC50D /* junction_visitor.hpp in Headers */, 4408A63D21F1E7F0008171B8 /* index_graph_starter_joints.hpp in Headers */, 5670595E1F3AF97F0062672D /* checkpoint_predictor.hpp in Headers */, 6753441F1A3F644F00A0A8C3 /* turns.hpp in Headers */, @@ -1412,8 +1416,8 @@ 56BC22CD1F6A501800B6426B /* route_test.cpp in Sources */, 67BD35BA1C69F08E003AA26F /* testingmain.cpp in Sources */, 67BD35BF1C69F094003AA26F /* pedestrian_route_test.cpp in Sources */, - 44EB88C4214007AD004E2863 /* speed_camera_notification.cpp in Sources */, 56CA630A1F619C1000E6681B /* road_graph_tests.cpp in Sources */, + 56DAC2C42398F348000BC50D /* speed_camera_notifications_tests.cpp in Sources */, 56BC22CC1F6A501200B6426B /* street_names_test.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1425,7 +1429,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = mail.ru.routing_benchmarks; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -1435,7 +1439,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = mail.ru.routing_benchmarks; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -1445,7 +1449,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)_common/build/Debug", @@ -1459,7 +1463,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)_common/build/Debug", @@ -1513,7 +1517,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)_common/build/Debug", @@ -1527,7 +1531,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)_common/build/Debug", @@ -1561,7 +1565,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)_common/build/Debug", @@ -1575,7 +1579,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)_common/build/Debug", @@ -1589,7 +1593,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = mail.ru.routing_benchmarks; PRODUCT_NAME = "$(TARGET_NAME)"; }; diff --git a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj index b310b5a228..eb8d2f4c91 100644 --- a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj +++ b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj @@ -12,6 +12,7 @@ 5631B666219B11D5009F47D4 /* maxspeed_conversion.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 5631B664219B11D5009F47D4 /* maxspeed_conversion.hpp */; }; 5647A4511F72BEB600DE1125 /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5647A4521F72BEB600DE1125 /* libicu.a */; }; 56D0E47D1F8E335D0084B18C /* num_mwm_id.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56D0E47C1F8E335D0084B18C /* num_mwm_id.hpp */; }; + 56DAC36223991F4C000BC50D /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC36123991F4C000BC50D /* libsuccinct.a */; }; 56EE14D91FE80FA30036F20C /* libtransit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14DA1FE80FA30036F20C /* libtransit.a */; }; 671E78881E6A3C5D00B2859B /* bicycle_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E78801E6A3C5D00B2859B /* bicycle_model.cpp */; }; 671E78891E6A3C5D00B2859B /* bicycle_model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671E78811E6A3C5D00B2859B /* bicycle_model.hpp */; }; @@ -47,6 +48,7 @@ 5647A4521F72BEB600DE1125 /* libicu.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libicu.a; sourceTree = BUILT_PRODUCTS_DIR; }; 5667C1DE1F751F4200C6B31B /* routing_common.pro */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = routing_common.pro; sourceTree = ""; }; 56D0E47C1F8E335D0084B18C /* num_mwm_id.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = num_mwm_id.hpp; sourceTree = ""; }; + 56DAC36123991F4C000BC50D /* libsuccinct.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsuccinct.a; sourceTree = BUILT_PRODUCTS_DIR; }; 56EE14DA1FE80FA30036F20C /* libtransit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtransit.a; sourceTree = BUILT_PRODUCTS_DIR; }; 671E78721E6A3BE200B2859B /* librouting_common.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = librouting_common.a; sourceTree = BUILT_PRODUCTS_DIR; }; 671E78801E6A3C5D00B2859B /* bicycle_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bicycle_model.cpp; sourceTree = ""; }; @@ -91,6 +93,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 56DAC36223991F4C000BC50D /* libsuccinct.a in Frameworks */, 56EE14D91FE80FA30036F20C /* libtransit.a in Frameworks */, 5647A4511F72BEB600DE1125 /* libicu.a in Frameworks */, 671E78D11E6A414B00B2859B /* libopening_hours.a in Frameworks */, @@ -169,6 +172,7 @@ 671E78B41E6A404F00B2859B /* Frameworks */ = { isa = PBXGroup; children = ( + 56DAC36123991F4C000BC50D /* libsuccinct.a */, 56EE14DA1FE80FA30036F20C /* libtransit.a */, 5647A4521F72BEB600DE1125 /* libicu.a */, 671E78D01E6A414B00B2859B /* libopening_hours.a */, @@ -267,6 +271,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -364,7 +369,7 @@ 671E78AB1E6A3DA800B2859B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.routing-common-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -373,7 +378,7 @@ 671E78AC1E6A3DA800B2859B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.routing-common-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -404,7 +409,7 @@ A8E541081F9FBC3500A1B8FA /* Production Full */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.routing-common-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj index 372dbd02e7..545919b883 100644 --- a/xcode/search/search.xcodeproj/project.pbxproj +++ b/xcode/search/search.xcodeproj/project.pbxproj @@ -184,6 +184,10 @@ 45A008541FE9088400D77690 /* idf_map.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45A008501FE9088300D77690 /* idf_map.cpp */; }; 56D5456E1C74A48C00E3719C /* mode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56D5456C1C74A48C00E3719C /* mode.cpp */; }; 56D5456F1C74A48C00E3719C /* mode.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56D5456D1C74A48C00E3719C /* mode.hpp */; }; + 56DAC34123991253000BC50D /* helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC33F23991253000BC50D /* helpers.hpp */; }; + 56DAC34223991253000BC50D /* helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC34023991253000BC50D /* helpers.cpp */; }; + 56DAC34423991301000BC50D /* libplatform_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC34323991301000BC50D /* libplatform_tests_support.a */; }; + 56DAC34623991309000BC50D /* libkml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC34523991309000BC50D /* libkml.a */; }; 670F88741CE4C032003F68BA /* types_skipper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F88721CE4C032003F68BA /* types_skipper.cpp */; }; 670F88751CE4C032003F68BA /* types_skipper.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670F88731CE4C032003F68BA /* types_skipper.hpp */; }; 6715565720BF1019002BA3B4 /* libeditor_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6715565620BF1019002BA3B4 /* libeditor_tests_support.a */; }; @@ -454,6 +458,10 @@ 45A008501FE9088300D77690 /* idf_map.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = idf_map.cpp; sourceTree = ""; }; 56D5456C1C74A48C00E3719C /* mode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mode.cpp; sourceTree = ""; }; 56D5456D1C74A48C00E3719C /* mode.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mode.hpp; sourceTree = ""; }; + 56DAC33F23991253000BC50D /* helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = helpers.hpp; sourceTree = ""; }; + 56DAC34023991253000BC50D /* helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = helpers.cpp; sourceTree = ""; }; + 56DAC34323991301000BC50D /* libplatform_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libplatform_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56DAC34523991309000BC50D /* libkml.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libkml.a; sourceTree = BUILT_PRODUCTS_DIR; }; 670F88721CE4C032003F68BA /* types_skipper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = types_skipper.cpp; sourceTree = ""; }; 670F88731CE4C032003F68BA /* types_skipper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = types_skipper.hpp; sourceTree = ""; }; 6715565620BF1019002BA3B4 /* libeditor_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libeditor_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -600,6 +608,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 56DAC34623991309000BC50D /* libkml.a in Frameworks */, + 56DAC34423991301000BC50D /* libplatform_tests_support.a in Frameworks */, 671ED3D220D7AA0400D4317E /* libstorage.a in Frameworks */, 67935E7420D14D07002996B0 /* CoreLocation.framework in Frameworks */, 3D0AEB021FBB102C00AD042B /* libgenerator_tests_support.a in Frameworks */, @@ -667,6 +677,8 @@ 34F558391DBF2E0E00A4FC11 /* Frameworks */ = { isa = PBXGroup; children = ( + 56DAC34523991309000BC50D /* libkml.a */, + 56DAC34323991301000BC50D /* libplatform_tests_support.a */, 67935E7320D14D06002996B0 /* CoreLocation.framework */, 6715565620BF1019002BA3B4 /* libeditor_tests_support.a */, 6715565820BF1019002BA3B4 /* libopen_location_code.a */, @@ -966,6 +978,8 @@ 6796248E1D10134200AE4E3C /* search_tests_support */ = { isa = PBXGroup; children = ( + 56DAC34023991253000BC50D /* helpers.cpp */, + 56DAC33F23991253000BC50D /* helpers.hpp */, 3DA5722820C1956D007BDE27 /* integration_tests_helpers.cpp */, 3DA5722920C1956D007BDE27 /* integration_tests_helpers.hpp */, 6796248F1D10137D00AE4E3C /* test_results_matching.cpp */, @@ -1090,6 +1104,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 56DAC34123991253000BC50D /* helpers.hpp in Headers */, 3DA5722B20C1956D007BDE27 /* integration_tests_helpers.hpp in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1190,6 +1205,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = 675346A71A4055CF00A0A8C3; @@ -1361,6 +1377,7 @@ 6796249B1D10138400AE4E3C /* test_results_matching.cpp in Sources */, 6796249C1D10138400AE4E3C /* test_search_engine.cpp in Sources */, 6796249D1D10138400AE4E3C /* test_search_request.cpp in Sources */, + 56DAC34223991253000BC50D /* helpers.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1370,6 +1387,7 @@ 34E7184D1FBB074300FC98CC /* Production Full */ = { isa = XCBuildConfiguration; buildSettings = { + INFOPLIST_FILE = ""; PRODUCT_NAME = search_tests; }; name = "Production Full"; @@ -1377,7 +1395,7 @@ 39AEF87F1FB45E1600943FC9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = maps.me.search_integration_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -1386,7 +1404,7 @@ 39AEF8801FB45E1600943FC9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = maps.me.search_integration_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -1395,7 +1413,7 @@ 671C62111AE9225100076BD0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = maps.me.search_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -1404,7 +1422,7 @@ 671C62121AE9225100076BD0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = maps.me.search_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -1477,7 +1495,7 @@ A8E541621F9FBDC400A1B8FA /* Production Full */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = maps.me.search_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; diff --git a/xcode/shaders/shaders.xcodeproj/project.pbxproj b/xcode/shaders/shaders.xcodeproj/project.pbxproj index 976829ca99..b7e15a8194 100644 --- a/xcode/shaders/shaders.xcodeproj/project.pbxproj +++ b/xcode/shaders/shaders.xcodeproj/project.pbxproj @@ -40,6 +40,7 @@ 45789EE021343F70009955CC /* metal_program_pool.mm in Sources */ = {isa = PBXBuildFile; fileRef = 45789EDE21343F70009955CC /* metal_program_pool.mm */; }; 45789EE421353CA3009955CC /* program_manager_metal.mm in Sources */ = {isa = PBXBuildFile; fileRef = 45789EE321353CA3009955CC /* program_manager_metal.mm */; }; 45789EE72135464D009955CC /* metal_program_params.mm in Sources */ = {isa = PBXBuildFile; fileRef = 45789EE62135464D009955CC /* metal_program_params.mm */; }; + 56DAC3662399214F000BC50D /* libvulkan_wrapper.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC3652399214F000BC50D /* libvulkan_wrapper.a */; }; BBF791702146D8EC00D27BD8 /* system.metal in Sources */ = {isa = PBXBuildFile; fileRef = BBF7916F2146D8EC00D27BD8 /* system.metal */; }; BBF7917321493AFC00D27BD8 /* arrow3d.metal in Sources */ = {isa = PBXBuildFile; fileRef = BBF7917221493AFC00D27BD8 /* arrow3d.metal */; }; BBF7917521495FF900D27BD8 /* shapes.metal in Sources */ = {isa = PBXBuildFile; fileRef = BBF7917421495FF900D27BD8 /* shapes.metal */; }; @@ -190,6 +191,7 @@ 45789EE52135464D009955CC /* metal_program_params.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = metal_program_params.hpp; sourceTree = ""; }; 45789EE62135464D009955CC /* metal_program_params.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = metal_program_params.mm; sourceTree = ""; }; 4598437C21394BE000F8CAB2 /* shaders_metal.metallib */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "archive.metal-library"; path = shaders_metal.metallib; sourceTree = BUILT_PRODUCTS_DIR; }; + 56DAC3652399214F000BC50D /* libvulkan_wrapper.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libvulkan_wrapper.a; sourceTree = BUILT_PRODUCTS_DIR; }; BBF7916F2146D8EC00D27BD8 /* system.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = system.metal; sourceTree = ""; }; BBF7917221493AFC00D27BD8 /* arrow3d.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = arrow3d.metal; sourceTree = ""; }; BBF7917421495FF900D27BD8 /* shapes.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = shapes.metal; sourceTree = ""; }; @@ -214,6 +216,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 56DAC3662399214F000BC50D /* libvulkan_wrapper.a in Frameworks */, 456660F720E25E360085E8C1 /* libshaders.a in Frameworks */, 456660F620E25E2E0085E8C1 /* libdrape.a in Frameworks */, 4566610520E25EF70085E8C1 /* libplatform.a in Frameworks */, @@ -383,6 +386,7 @@ 456660F420E25E2E0085E8C1 /* Frameworks */ = { isa = PBXGroup; children = ( + 56DAC3652399214F000BC50D /* libvulkan_wrapper.a */, 4566610620E25F560085E8C1 /* libz.tbd */, 4566610420E25EF70085E8C1 /* libplatform.a */, 4566610220E25EEF0085E8C1 /* libcoding.a */, @@ -727,7 +731,7 @@ "$(OMIM_ROOT)/3party/glm", "$(QT_PATH)/include", ); - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; }; name = Debug; }; @@ -742,7 +746,7 @@ "$(OMIM_ROOT)/3party/glm", "$(QT_PATH)/include", ); - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; }; name = Release; }; @@ -757,7 +761,7 @@ "$(OMIM_ROOT)/3party/glm", "$(QT_PATH)/include", ); - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; }; name = "Production Full"; }; diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj index 2422538216..e1cdf6b083 100644 --- a/xcode/storage/storage.xcodeproj/project.pbxproj +++ b/xcode/storage/storage.xcodeproj/project.pbxproj @@ -45,6 +45,12 @@ 56D0E4811F8E40340084B18C /* routing_helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56D0E47F1F8E40340084B18C /* routing_helpers.cpp */; }; 56D8CB991CAC17A80003F420 /* test_defines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56D8CB971CAC17A80003F420 /* test_defines.cpp */; }; 56D8CB9A1CAC17A80003F420 /* test_defines.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56D8CB981CAC17A80003F420 /* test_defines.hpp */; }; + 56DAC38523992819000BC50D /* queued_country.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DAC38323992819000BC50D /* queued_country.cpp */; }; + 56DAC38623992819000BC50D /* queued_country.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DAC38423992819000BC50D /* queued_country.hpp */; }; + 56DAC38823992F7F000BC50D /* libdescriptions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC38723992F7F000BC50D /* libdescriptions.a */; }; + 56DAC38A23992F84000BC50D /* libweb_api.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC38923992F84000BC50D /* libweb_api.a */; }; + 56DAC38C23992F8C000BC50D /* libvulkan_wrapper.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC38B23992F8C000BC50D /* libvulkan_wrapper.a */; }; + 56DAC38D23992FB1000BC50D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3971141D229D89F4003915E5 /* Security.framework */; }; 56EE14DF1FE813D00036F20C /* libmwm_diff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14E01FE813D00036F20C /* libmwm_diff.a */; }; 56EE14E11FE813FC0036F20C /* libbsdiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14E21FE813FC0036F20C /* libbsdiff.a */; }; 56FB436B2164A79C002099B3 /* libopen_location_code.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56FB436A2164A79C002099B3 /* libopen_location_code.a */; }; @@ -59,8 +65,6 @@ 6741251E1B4C05FA00A3E828 /* http_map_files_downloader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674125181B4C05FA00A3E828 /* http_map_files_downloader.cpp */; }; 6741251F1B4C05FA00A3E828 /* http_map_files_downloader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674125191B4C05FA00A3E828 /* http_map_files_downloader.hpp */; }; 674125201B4C05FA00A3E828 /* map_files_downloader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6741251A1B4C05FA00A3E828 /* map_files_downloader.hpp */; }; - 674125211B4C05FA00A3E828 /* queued_country.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6741251B1B4C05FA00A3E828 /* queued_country.cpp */; }; - 674125221B4C05FA00A3E828 /* queued_country.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6741251C1B4C05FA00A3E828 /* queued_country.hpp */; }; 674125231B4C05FA00A3E828 /* storage_defines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6741251D1B4C05FA00A3E828 /* storage_defines.cpp */; }; 675343091A3F5A2600A0A8C3 /* country_decl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675342F21A3F5A2600A0A8C3 /* country_decl.cpp */; }; 6753430A1A3F5A2600A0A8C3 /* country_decl.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675342F31A3F5A2600A0A8C3 /* country_decl.hpp */; }; @@ -89,7 +93,6 @@ 67BE1DC61CD2180D00572709 /* downloading_policy.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BE1DC41CD2180D00572709 /* downloading_policy.hpp */; }; 67F90B6F1C6A277900CD458E /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67247FD71C60BA9900EDE56A /* testingmain.cpp */; }; 67F90B711C6A277900CD458E /* fake_map_files_downloader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67247FC41C60BA8A00EDE56A /* fake_map_files_downloader.cpp */; }; - 67F90B721C6A277900CD458E /* queued_country_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67247FC61C60BA8A00EDE56A /* queued_country_tests.cpp */; }; 67F90B731C6A277900CD458E /* simple_tree_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67247FC71C60BA8A00EDE56A /* simple_tree_test.cpp */; }; 67F90B741C6A277900CD458E /* storage_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67247FC81C60BA8A00EDE56A /* storage_tests.cpp */; }; 67F90B751C6A277900CD458E /* task_runner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67247FC91C60BA8A00EDE56A /* task_runner.cpp */; }; @@ -124,7 +127,6 @@ 67F90B961C6A28CA00CD458E /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FFF1C60BD7E00EDE56A /* libz.tbd */; }; 67F90BCD1C6A2A1E00CD458E /* storage_downloading_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 676C83C01C637FAE00DC9603 /* storage_downloading_tests.cpp */; }; 67F90BCE1C6A2A1E00CD458E /* storage_update_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 676C83C11C637FAE00DC9603 /* storage_update_tests.cpp */; }; - 67F90BCF1C6A2A1E00CD458E /* migrate_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6724800D1C60CE7300EDE56A /* migrate_tests.cpp */; }; 67F90BD01C6A2A1E00CD458E /* storage_group_download_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6724800E1C60CE7300EDE56A /* storage_group_download_tests.cpp */; }; 67F90BD11C6A2A1E00CD458E /* storage_http_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6724800F1C60CE7300EDE56A /* storage_http_tests.cpp */; }; 67F90BD21C6A2A2200CD458E /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67247FD71C60BA9900EDE56A /* testingmain.cpp */; }; @@ -230,6 +232,11 @@ 56D0E47F1F8E40340084B18C /* routing_helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = routing_helpers.cpp; sourceTree = ""; }; 56D8CB971CAC17A80003F420 /* test_defines.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_defines.cpp; sourceTree = ""; }; 56D8CB981CAC17A80003F420 /* test_defines.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_defines.hpp; sourceTree = ""; }; + 56DAC38323992819000BC50D /* queued_country.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = queued_country.cpp; sourceTree = ""; }; + 56DAC38423992819000BC50D /* queued_country.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = queued_country.hpp; sourceTree = ""; }; + 56DAC38723992F7F000BC50D /* libdescriptions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libdescriptions.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56DAC38923992F84000BC50D /* libweb_api.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libweb_api.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56DAC38B23992F8C000BC50D /* libvulkan_wrapper.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libvulkan_wrapper.a; sourceTree = BUILT_PRODUCTS_DIR; }; 56EE14DE1FE813BC0036F20C /* libtransit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtransit.a; sourceTree = BUILT_PRODUCTS_DIR; }; 56EE14E01FE813D00036F20C /* libmwm_diff.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libmwm_diff.a; sourceTree = BUILT_PRODUCTS_DIR; }; 56EE14E21FE813FC0036F20C /* libbsdiff.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbsdiff.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -241,7 +248,6 @@ 67239C941CBBDB0E00C530A8 /* download_calc_size_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = download_calc_size_test.cpp; sourceTree = ""; }; 67247FC41C60BA8A00EDE56A /* fake_map_files_downloader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fake_map_files_downloader.cpp; sourceTree = ""; }; 67247FC51C60BA8A00EDE56A /* fake_map_files_downloader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fake_map_files_downloader.hpp; sourceTree = ""; }; - 67247FC61C60BA8A00EDE56A /* queued_country_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = queued_country_tests.cpp; sourceTree = ""; }; 67247FC71C60BA8A00EDE56A /* simple_tree_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = simple_tree_test.cpp; sourceTree = ""; }; 67247FC81C60BA8A00EDE56A /* storage_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_tests.cpp; sourceTree = ""; }; 67247FC91C60BA8A00EDE56A /* task_runner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = task_runner.cpp; sourceTree = ""; }; @@ -258,14 +264,11 @@ 67247FF41C60BD4000EDE56A /* libjansson.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjansson.a; path = "../../../omim-xcode-build/Debug/libjansson.a"; sourceTree = ""; }; 67247FF71C60BD5900EDE56A /* libalohalitics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libalohalitics.a; path = "../../../omim-xcode-build/Debug/libalohalitics.a"; sourceTree = ""; }; 67247FFF1C60BD7E00EDE56A /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; - 6724800D1C60CE7300EDE56A /* migrate_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = migrate_tests.cpp; sourceTree = ""; }; 6724800E1C60CE7300EDE56A /* storage_group_download_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_group_download_tests.cpp; sourceTree = ""; }; 6724800F1C60CE7300EDE56A /* storage_http_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_http_tests.cpp; sourceTree = ""; }; 674125181B4C05FA00A3E828 /* http_map_files_downloader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = http_map_files_downloader.cpp; sourceTree = ""; }; 674125191B4C05FA00A3E828 /* http_map_files_downloader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = http_map_files_downloader.hpp; sourceTree = ""; }; 6741251A1B4C05FA00A3E828 /* map_files_downloader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = map_files_downloader.hpp; sourceTree = ""; }; - 6741251B1B4C05FA00A3E828 /* queued_country.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = queued_country.cpp; sourceTree = ""; }; - 6741251C1B4C05FA00A3E828 /* queued_country.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = queued_country.hpp; sourceTree = ""; }; 6741251D1B4C05FA00A3E828 /* storage_defines.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_defines.cpp; sourceTree = ""; }; 674709A51C6213F10093DD1B /* libmap.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmap.a; path = "../../../omim-xcode-build/Debug/libmap.a"; sourceTree = ""; }; 674709A71C6215000093DD1B /* libdrape.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdrape.a; path = "../../../omim-xcode-build/Debug/libdrape.a"; sourceTree = ""; }; @@ -390,6 +393,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 56DAC38D23992FB1000BC50D /* Security.framework in Frameworks */, + 56DAC38C23992F8C000BC50D /* libvulkan_wrapper.a in Frameworks */, + 56DAC38A23992F84000BC50D /* libweb_api.a in Frameworks */, + 56DAC38823992F7F000BC50D /* libdescriptions.a in Frameworks */, 56FB43712164A8A1002099B3 /* libkml.a in Frameworks */, 56FB436F2164A848002099B3 /* libshaders.a in Frameworks */, 56FB436D2164A801002099B3 /* libmetrics.a in Frameworks */, @@ -441,6 +448,9 @@ 34F5584C1DBF327C00A4FC11 /* Frameworks */ = { isa = PBXGroup; children = ( + 56DAC38B23992F8C000BC50D /* libvulkan_wrapper.a */, + 56DAC38923992F84000BC50D /* libweb_api.a */, + 56DAC38723992F7F000BC50D /* libdescriptions.a */, 3971141D229D89F4003915E5 /* Security.framework */, 3971141B229D8983003915E5 /* CoreLocation.framework */, 39711419229D7F75003915E5 /* libMopub.a */, @@ -481,7 +491,6 @@ 67247FD71C60BA9900EDE56A /* testingmain.cpp */, 67247FC41C60BA8A00EDE56A /* fake_map_files_downloader.cpp */, 67247FC51C60BA8A00EDE56A /* fake_map_files_downloader.hpp */, - 67247FC61C60BA8A00EDE56A /* queued_country_tests.cpp */, 67247FC71C60BA8A00EDE56A /* simple_tree_test.cpp */, 67247FC81C60BA8A00EDE56A /* storage_tests.cpp */, 67247FC91C60BA8A00EDE56A /* task_runner.cpp */, @@ -537,7 +546,6 @@ 671182CC1C7E069C00CB8177 /* storage_3levels_tests.cpp */, 676C83C01C637FAE00DC9603 /* storage_downloading_tests.cpp */, 676C83C11C637FAE00DC9603 /* storage_update_tests.cpp */, - 6724800D1C60CE7300EDE56A /* migrate_tests.cpp */, 6724800E1C60CE7300EDE56A /* storage_group_download_tests.cpp */, 6724800F1C60CE7300EDE56A /* storage_http_tests.cpp */, ); @@ -573,6 +581,8 @@ 675342E21A3F59EF00A0A8C3 /* storage */ = { isa = PBXGroup; children = ( + 56DAC38323992819000BC50D /* queued_country.cpp */, + 56DAC38423992819000BC50D /* queued_country.hpp */, 3DD84013233A38DE0008D0ED /* diff_scheme_loader.cpp */, 3DD84012233A38DE0008D0ED /* diff_scheme_loader.hpp */, 3D497EA023292706000FB57D /* map_files_downloader_with_ping.cpp */, @@ -603,8 +613,6 @@ 674125181B4C05FA00A3E828 /* http_map_files_downloader.cpp */, 674125191B4C05FA00A3E828 /* http_map_files_downloader.hpp */, 6741251A1B4C05FA00A3E828 /* map_files_downloader.hpp */, - 6741251B1B4C05FA00A3E828 /* queued_country.cpp */, - 6741251C1B4C05FA00A3E828 /* queued_country.hpp */, 6741251D1B4C05FA00A3E828 /* storage_defines.cpp */, 675342F21A3F5A2600A0A8C3 /* country_decl.cpp */, 675342F31A3F5A2600A0A8C3 /* country_decl.hpp */, @@ -663,6 +671,7 @@ 675343191A3F5A2600A0A8C3 /* storage_defines.hpp in Headers */, 67247FD41C60BA8A00EDE56A /* task_runner.hpp in Headers */, 56D0E4801F8E40340084B18C /* routing_helpers.hpp in Headers */, + 56DAC38623992819000BC50D /* queued_country.hpp in Headers */, 6753430F1A3F5A2600A0A8C3 /* country.hpp in Headers */, F6BC312B2034366100F677FE /* pinger.hpp in Headers */, 3DCD414620D80C0900143533 /* country_info_reader_light.hpp in Headers */, @@ -673,7 +682,6 @@ 3DD84014233A38DE0008D0ED /* diff_scheme_loader.hpp in Headers */, 3971140A229D7C6D003915E5 /* helpers.hpp in Headers */, 402873442295A91F0036AA1C /* downloader_search_params.hpp in Headers */, - 674125221B4C05FA00A3E828 /* queued_country.hpp in Headers */, 6753431B1A3F5A2600A0A8C3 /* storage.hpp in Headers */, 67247FD61C60BA8A00EDE56A /* test_map_files_downloader.hpp in Headers */, 4586D0C81F48126A00DF9CE5 /* diff_manager.hpp in Headers */, @@ -846,8 +854,8 @@ 34B093221C61F9BA0066F4C3 /* storage_helpers.cpp in Sources */, 4586D0C71F48126A00DF9CE5 /* diff_manager.cpp in Sources */, 675343091A3F5A2600A0A8C3 /* country_decl.cpp in Sources */, - 674125211B4C05FA00A3E828 /* queued_country.cpp in Sources */, 3DCD414720D80C0900143533 /* country_info_reader_light.cpp in Sources */, + 56DAC38523992819000BC50D /* queued_country.cpp in Sources */, 6753431A1A3F5A2600A0A8C3 /* storage.cpp in Sources */, 674125231B4C05FA00A3E828 /* storage_defines.cpp in Sources */, 3DCD414920D80C1B00143533 /* lightweight_matching_tests.cpp in Sources */, @@ -871,7 +879,6 @@ 67F90B731C6A277900CD458E /* simple_tree_test.cpp in Sources */, 67F90B761C6A277900CD458E /* test_map_files_downloader.cpp in Sources */, 67F90B711C6A277900CD458E /* fake_map_files_downloader.cpp in Sources */, - 67F90B721C6A277900CD458E /* queued_country_tests.cpp in Sources */, 67F90B751C6A277900CD458E /* task_runner.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -885,7 +892,6 @@ 67F90BD21C6A2A2200CD458E /* testingmain.cpp in Sources */, 67F90BCD1C6A2A1E00CD458E /* storage_downloading_tests.cpp in Sources */, 67F90BD01C6A2A1E00CD458E /* storage_group_download_tests.cpp in Sources */, - 67F90BCF1C6A2A1E00CD458E /* migrate_tests.cpp in Sources */, 67F90BD11C6A2A1E00CD458E /* storage_http_tests.cpp in Sources */, 67239C961CBBDB1700C530A8 /* download_calc_size_test.cpp in Sources */, ); @@ -944,7 +950,7 @@ "$(inherited)", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", ); - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "storage-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -958,7 +964,7 @@ "$(inherited)", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", ); - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "storage-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -972,7 +978,7 @@ "$(inherited)", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", ); - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = storage_integration_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -986,7 +992,7 @@ "$(inherited)", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", ); - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = storage_integration_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -1021,7 +1027,7 @@ "$(inherited)", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", ); - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "storage-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -1035,7 +1041,7 @@ "$(inherited)", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", ); - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = storage_integration_tests; PRODUCT_NAME = "$(TARGET_NAME)"; }; diff --git a/xcode/traffic/traffic.xcodeproj/project.pbxproj b/xcode/traffic/traffic.xcodeproj/project.pbxproj index 8a2301265f..97a10d7ca8 100644 --- a/xcode/traffic/traffic.xcodeproj/project.pbxproj +++ b/xcode/traffic/traffic.xcodeproj/project.pbxproj @@ -9,6 +9,9 @@ /* Begin PBXBuildFile section */ 34222E871DF68BB30038B646 /* traffic_cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34222E851DF68BB30038B646 /* traffic_cache.cpp */; }; 34222E881DF68BB30038B646 /* traffic_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34222E861DF68BB30038B646 /* traffic_cache.hpp */; }; + 56DAC38F2399305F000BC50D /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC38E2399305F000BC50D /* libicu.a */; }; + 56DAC39123993068000BC50D /* librouting_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC39023993068000BC50D /* librouting_common.a */; }; + 56DAC3932399307A000BC50D /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC3922399307A000BC50D /* libsuccinct.a */; }; 672292AB1DE2F673005BA3A7 /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 672292AA1DE2F673005BA3A7 /* libalohalitics.a */; }; 672292AD1DE2F683005BA3A7 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 672292AC1DE2F683005BA3A7 /* libz.tbd */; }; 672292AF1DE2FF0F005BA3A7 /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 672292AE1DE2FF0F005BA3A7 /* libindexer.a */; }; @@ -35,6 +38,9 @@ /* Begin PBXFileReference section */ 34222E851DF68BB30038B646 /* traffic_cache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = traffic_cache.cpp; sourceTree = ""; }; 34222E861DF68BB30038B646 /* traffic_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = traffic_cache.hpp; sourceTree = ""; }; + 56DAC38E2399305F000BC50D /* libicu.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libicu.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56DAC39023993068000BC50D /* librouting_common.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = librouting_common.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 56DAC3922399307A000BC50D /* libsuccinct.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsuccinct.a; sourceTree = BUILT_PRODUCTS_DIR; }; 672292AA1DE2F673005BA3A7 /* libalohalitics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libalohalitics.a; path = "../../../omim-build/xcode/Debug/libalohalitics.a"; sourceTree = ""; }; 672292AC1DE2F683005BA3A7 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; 672292AE1DE2FF0F005BA3A7 /* libindexer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libindexer.a; path = "../../../omim-build/xcode/Debug/libindexer.a"; sourceTree = ""; }; @@ -74,6 +80,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 56DAC3932399307A000BC50D /* libsuccinct.a in Frameworks */, + 56DAC39123993068000BC50D /* librouting_common.a in Frameworks */, + 56DAC38F2399305F000BC50D /* libicu.a in Frameworks */, 674231DB1DFAB08C00913FEB /* librouting.a in Frameworks */, 674231D91DFAB06100913FEB /* libjansson.a in Frameworks */, 674231D31DFAB04C00913FEB /* libeditor.a in Frameworks */, @@ -144,6 +153,9 @@ 67BECB831DDA474400FC4E99 /* Frameworks */ = { isa = PBXGroup; children = ( + 56DAC3922399307A000BC50D /* libsuccinct.a */, + 56DAC39023993068000BC50D /* librouting_common.a */, + 56DAC38E2399305F000BC50D /* libicu.a */, 674231DA1DFAB08C00913FEB /* librouting.a */, 674231D81DFAB06100913FEB /* libjansson.a */, 674231CE1DFAB04C00913FEB /* libeditor.a */, @@ -245,6 +257,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -327,7 +340,7 @@ 67BECB7C1DDA466800FC4E99 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.traffic-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -336,7 +349,7 @@ 67BECB7D1DDA466800FC4E99 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.traffic-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -361,7 +374,7 @@ A8E5416A1F9FBDD200A1B8FA /* Production Full */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.traffic-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; diff --git a/xcode/ugc/ugc.xcodeproj/project.pbxproj b/xcode/ugc/ugc.xcodeproj/project.pbxproj index b8257af344..f19dee5a8d 100644 --- a/xcode/ugc/ugc.xcodeproj/project.pbxproj +++ b/xcode/ugc/ugc.xcodeproj/project.pbxproj @@ -319,6 +319,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -376,7 +377,7 @@ 670E7B901EF97C1000A8E9ED /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.ugc-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -385,7 +386,7 @@ 670E7B911EF97C1000A8E9ED /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.ugc-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -415,7 +416,7 @@ A8E541001F9FBBB600A1B8FA /* Production Full */ = { isa = XCBuildConfiguration; buildSettings = { - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + INFOPLIST_FILE = ""; PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.ugc-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; };