RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[routing] Xcode build fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-11-23 15:42:34 +03:00 • committed by mpimenov
parent 3f162dd710
commit 98a6a0f944
5 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
routing/routing_tests/CMakeLists.txt
View file

@ -16,7 +16,7 @@ set(
index_graph_test.cpp
index_graph_tools.cpp
index_graph_tools.hpp
maxspeed_tests.cpp
maxspeeds_tests.cpp
nearest_edge_finder_tests.cpp
online_cross_fetcher_test.cpp
restriction_test.cpp

38
routing/routing_tests/maxspeed_tests.cpp → routing/routing_tests/maxspeeds_tests.cpp
View file

@ -21,7 +21,7 @@ using namespace measurement_utils;
using namespace routing;
using namespace std;
void TestMaxspeedSerialization(std::vector<FeatureMaxspeed> const & speeds)
void TestMaxspeedsSerialization(vector<FeatureMaxspeed> const & speeds)
{
vector<char> buffer;
MemWriter<vector<char>> w(buffer);
@ -78,48 +78,48 @@ UNIT_TEST(MaxspeedConverter)
TEST(!conv.IsValidMacro(9), ()); // A value which is undefined in SpeedMacro enum class.
}
UNIT_TEST(MaxspeedSerializer_Smoke)
UNIT_TEST(MaxspeedsSerializer_Smoke)
{
TestMaxspeedSerialization({});
TestMaxspeedsSerialization({});
}
UNIT_TEST(MaxspeedSerializer_OneForwardMetric)
UNIT_TEST(MaxspeedsSerializer_OneForwardMetric)
{
TestMaxspeedSerialization(
TestMaxspeedsSerialization(
{FeatureMaxspeed(0 /* feature id */, Units::Metric, 20 /* speed */)});
}
UNIT_TEST(MaxspeedSerializer_OneNone)
UNIT_TEST(MaxspeedsSerializer_OneNone)
{
TestMaxspeedSerialization(
TestMaxspeedsSerialization(
{FeatureMaxspeed(0 /* feature id */, Units::Metric, kNoneMaxSpeed)});
}
UNIT_TEST(MaxspeedSerializer_OneWalk)
UNIT_TEST(MaxspeedsSerializer_OneWalk)
{
TestMaxspeedSerialization(
TestMaxspeedsSerialization(
{FeatureMaxspeed(0 /* feature id */, Units::Metric, kWalkMaxSpeed)});
}
UNIT_TEST(MaxspeedSerializer_OneBidirectionalMetric_1)
UNIT_TEST(MaxspeedsSerializer_OneBidirectionalMetric_1)
{
TestMaxspeedSerialization(
TestMaxspeedsSerialization(
{FeatureMaxspeed(0 /* feature id */, Units::Metric, 20 /* speed */, 40 /* speed */)});
}
UNIT_TEST(MaxspeedSerializer_OneBidirectionalMetric_2)
UNIT_TEST(MaxspeedsSerializer_OneBidirectionalMetric_2)
{
TestMaxspeedSerialization(
TestMaxspeedsSerialization(
{FeatureMaxspeed(0 /* feature id */, Units::Metric, 10 /* speed */, kWalkMaxSpeed)});
}
UNIT_TEST(MaxspeedSerializer_OneBidirectionalImperial)
UNIT_TEST(MaxspeedsSerializer_OneBidirectionalImperial)
{
TestMaxspeedSerialization(
TestMaxspeedsSerialization(
{FeatureMaxspeed(0 /* feature id */, Units::Imperial, 30 /* speed */, 50 /* speed */)});
}
UNIT_TEST(MaxspeedSerializer_BigMetric)
UNIT_TEST(MaxspeedsSerializer_BigMetric)
{
std::vector<FeatureMaxspeed> const maxspeeds = {
{0 /* feature id */, Units::Metric, 20 /* speed */},
@ -133,10 +133,10 @@ UNIT_TEST(MaxspeedSerializer_BigMetric)
{11 /* feature id */, Units::Metric, 40 /* speed */, 50 /* speed */},
{12 /* feature id */, Units::Metric, 40 /* speed */, 60 /* speed */},
};
TestMaxspeedSerialization(maxspeeds);
TestMaxspeedsSerialization(maxspeeds);
}
UNIT_TEST(MaxspeedSerializer_BigImperial)
UNIT_TEST(MaxspeedsSerializer_BigImperial)
{
std::vector<FeatureMaxspeed> const maxspeeds = {
{0 /* feature id */, Units::Imperial, 30 /* speed */},
@ -149,7 +149,7 @@ UNIT_TEST(MaxspeedSerializer_BigImperial)
{10 /* feature id */, Units::Imperial, 40 /* speed */, 50 /* speed */},
{11 /* feature id */, Units::Imperial, 30 /* speed */, 50 /* speed */},
};
TestMaxspeedSerialization(maxspeeds);
TestMaxspeedsSerialization(maxspeeds);
}
UNIT_TEST(Maxspeed)

48
xcode/generator/generator.xcodeproj/project.pbxproj
View file

@ -69,16 +69,16 @@
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 */; };
5631B652219B0C82009F47D4 /* extract_addr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5631B651219B0C82009F47D4 /* extract_addr.cpp */; };
5631B659219B0F14009F47D4 /* maxspeed_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 5631B653219B0F14009F47D4 /* maxspeed_builder.hpp */; };
5631B65A219B0F14009F47D4 /* maxspeed_collector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5631B654219B0F14009F47D4 /* maxspeed_collector.cpp */; };
5631B65B219B0F14009F47D4 /* maxspeed_collector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 5631B655219B0F14009F47D4 /* maxspeed_collector.hpp */; };
5631B65C219B0F14009F47D4 /* maxspeed_parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 5631B656219B0F14009F47D4 /* maxspeed_parser.hpp */; };
5631B65D219B0F14009F47D4 /* maxspeed_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5631B657219B0F14009F47D4 /* maxspeed_parser.cpp */; };
5631B65E219B0F14009F47D4 /* maxspeed_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5631B658219B0F14009F47D4 /* maxspeed_builder.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 */; };
568762611F6A9B18002C22A6 /* transit_generator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 5687625F1F6A9B18002C22A6 /* transit_generator.hpp */; };
56A1B7AB21A82C3F00246F8C /* maxspeeds_collector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56A1B7A521A82C3E00246F8C /* maxspeeds_collector.hpp */; };
56A1B7AC21A82C3F00246F8C /* maxspeeds_parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56A1B7A621A82C3E00246F8C /* maxspeeds_parser.hpp */; };
56A1B7AD21A82C3F00246F8C /* maxspeeds_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56A1B7A721A82C3E00246F8C /* maxspeeds_builder.cpp */; };
56A1B7AE21A82C3F00246F8C /* maxspeeds_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56A1B7A821A82C3E00246F8C /* maxspeeds_builder.hpp */; };
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 */; };
56E0C4E4213FD56F00541E0F /* cities_boundaries_checker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56E0C4E2213FD56E00541E0F /* cities_boundaries_checker.cpp */; };
@ -271,16 +271,16 @@
5631B64D219B0C6D009F47D4 /* geo_objects.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = geo_objects.hpp; path = geo_objects/geo_objects.hpp; sourceTree = "<group>"; };
5631B64E219B0C6D009F47D4 /* geo_objects.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = geo_objects.cpp; path = geo_objects/geo_objects.cpp; sourceTree = "<group>"; };
5631B651219B0C82009F47D4 /* extract_addr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = extract_addr.cpp; path = extract_addr/extract_addr.cpp; sourceTree = "<group>"; };
5631B653219B0F14009F47D4 /* maxspeed_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = maxspeed_builder.hpp; sourceTree = "<group>"; };
5631B654219B0F14009F47D4 /* maxspeed_collector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maxspeed_collector.cpp; sourceTree = "<group>"; };
5631B655219B0F14009F47D4 /* maxspeed_collector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = maxspeed_collector.hpp; sourceTree = "<group>"; };
5631B656219B0F14009F47D4 /* maxspeed_parser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = maxspeed_parser.hpp; sourceTree = "<group>"; };
5631B657219B0F14009F47D4 /* maxspeed_parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maxspeed_parser.cpp; sourceTree = "<group>"; };
5631B658219B0F14009F47D4 /* maxspeed_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maxspeed_builder.cpp; sourceTree = "<group>"; };
56829A422134222100A09A28 /* city_roads_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = city_roads_generator.hpp; sourceTree = "<group>"; };
56829A442134222300A09A28 /* city_roads_generator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = city_roads_generator.cpp; sourceTree = "<group>"; };
5687625E1F6A9B18002C22A6 /* transit_generator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transit_generator.cpp; sourceTree = "<group>"; };
5687625F1F6A9B18002C22A6 /* transit_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = transit_generator.hpp; sourceTree = "<group>"; };
56A1B7A521A82C3E00246F8C /* maxspeeds_collector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = maxspeeds_collector.hpp; sourceTree = "<group>"; };
56A1B7A621A82C3E00246F8C /* maxspeeds_parser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = maxspeeds_parser.hpp; sourceTree = "<group>"; };
56A1B7A721A82C3E00246F8C /* maxspeeds_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maxspeeds_builder.cpp; sourceTree = "<group>"; };
56A1B7A821A82C3E00246F8C /* maxspeeds_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = maxspeeds_builder.hpp; sourceTree = "<group>"; };
56A1B7A921A82C3F00246F8C /* maxspeeds_collector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maxspeeds_collector.cpp; sourceTree = "<group>"; };
56A1B7AA21A82C3F00246F8C /* maxspeeds_parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maxspeeds_parser.cpp; sourceTree = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
56E0C4E2213FD56E00541E0F /* cities_boundaries_checker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cities_boundaries_checker.cpp; sourceTree = "<group>"; };
@ -465,12 +465,12 @@
6753401D1A3F2A1B00A0A8C3 /* generator */ = {
isa = PBXGroup;
children = (
5631B658219B0F14009F47D4 /* maxspeed_builder.cpp */,
5631B653219B0F14009F47D4 /* maxspeed_builder.hpp */,
5631B654219B0F14009F47D4 /* maxspeed_collector.cpp */,
5631B655219B0F14009F47D4 /* maxspeed_collector.hpp */,
5631B657219B0F14009F47D4 /* maxspeed_parser.cpp */,
5631B656219B0F14009F47D4 /* maxspeed_parser.hpp */,
56A1B7A721A82C3E00246F8C /* maxspeeds_builder.cpp */,
56A1B7A821A82C3E00246F8C /* maxspeeds_builder.hpp */,
56A1B7A921A82C3F00246F8C /* maxspeeds_collector.cpp */,
56A1B7A521A82C3E00246F8C /* maxspeeds_collector.hpp */,
56A1B7AA21A82C3F00246F8C /* maxspeeds_parser.cpp */,
56A1B7A621A82C3E00246F8C /* maxspeeds_parser.hpp */,
5631B651219B0C82009F47D4 /* extract_addr.cpp */,
5631B64E219B0C6D009F47D4 /* geo_objects.cpp */,
5631B64D219B0C6D009F47D4 /* geo_objects.hpp */,
@ -694,8 +694,6 @@
40492BCA2021DC53008E093A /* feature_helpers.hpp in Headers */,
56FB43872164F571002099B3 /* regions_builder.hpp in Headers */,
675340781A3F2A7400A0A8C3 /* intermediate_elements.hpp in Headers */,
5631B65B219B0F14009F47D4 /* maxspeed_collector.hpp in Headers */,
5631B659219B0F14009F47D4 /* maxspeed_builder.hpp in Headers */,
3DFEBF7E1EF2D58900317D5C /* utils.hpp in Headers */,
39B2B9791FB468CC00AB85A1 /* cities_boundaries_builder.hpp in Headers */,
6753408C1A3F2A7400A0A8C3 /* world_map_generator.hpp in Headers */,
@ -715,6 +713,7 @@
9D1B3F1B2034624A00278AC8 /* node_mixer.hpp in Headers */,
568762611F6A9B18002C22A6 /* transit_generator.hpp in Headers */,
56037E52219AF97200C2193D /* translator_geo_objects.hpp in Headers */,
56A1B7AB21A82C3F00246F8C /* maxspeeds_collector.hpp in Headers */,
675340861A3F2A7400A0A8C3 /* tesselator.hpp in Headers */,
4003E3B12112FB2B007721B0 /* emitter_booking.hpp in Headers */,
67A0FEBF1CEB467F008F2A61 /* booking_dataset.hpp in Headers */,
@ -750,6 +749,8 @@
4003E3AC2112FB2B007721B0 /* emitter_factory.hpp in Headers */,
56FB43892164F571002099B3 /* node.hpp in Headers */,
3D74EF081F86841C0081202C /* ugc_section_builder.hpp in Headers */,
56A1B7AE21A82C3F00246F8C /* maxspeeds_builder.hpp in Headers */,
56A1B7AC21A82C3F00246F8C /* maxspeeds_parser.hpp in Headers */,
56037E51219AF97200C2193D /* filter_elements.hpp in Headers */,
675340711A3F2A7400A0A8C3 /* feature_sorter.hpp in Headers */,
34F5588A1DBF4C9600A4FC11 /* sponsored_dataset_inl.hpp in Headers */,
@ -758,7 +759,6 @@
675340611A3F2A7400A0A8C3 /* check_model.hpp in Headers */,
6726C1D61A4AFEF4005EEA39 /* osm2meta.hpp in Headers */,
34F5588D1DBF4C9600A4FC11 /* sponsored_scoring.hpp in Headers */,
5631B65C219B0F14009F47D4 /* maxspeed_parser.hpp in Headers */,
4003E3B92112FB2B007721B0 /* place.hpp in Headers */,
4003E3B22112FB2B007721B0 /* emitter_interface.hpp in Headers */,
4003E3AA2112FB2B007721B0 /* factory_utils.hpp in Headers */,
@ -865,10 +865,12 @@
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 */,
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 */,
56A1B7AF21A82C3F00246F8C /* maxspeeds_collector.cpp in Sources */,
3D74EF071F86841C0081202C /* ugc_section_builder.cpp in Sources */,
67C79BB11E2CEEAB00C40034 /* restriction_generator.cpp in Sources */,
3D51BC521D5E512500F1FA8D /* altitude_generator.cpp in Sources */,
@ -881,8 +883,6 @@
670B84BC1A8CDB0000CE4492 /* osm_source.cpp in Sources */,
675340701A3F2A7400A0A8C3 /* feature_sorter.cpp in Sources */,
675340621A3F2A7400A0A8C3 /* coastlines_generator.cpp in Sources */,
5631B65E219B0F14009F47D4 /* maxspeed_builder.cpp in Sources */,
5631B65A219B0F14009F47D4 /* maxspeed_collector.cpp in Sources */,
56037E4F219AF97200C2193D /* emitter_simple.cpp in Sources */,
670E7BC11EF983E600A8E9ED /* region_meta.cpp in Sources */,
E162BD4A213EAF0A007ADEF1 /* place.cpp in Sources */,
@ -890,7 +890,6 @@
675340931C5231BA002CF0D9 /* search_index_builder.cpp in Sources */,
6753406E1A3F2A7400A0A8C3 /* feature_merger.cpp in Sources */,
E1EC1461211C5FBD00B53061 /* relation_tags.cpp in Sources */,
5631B65D219B0F14009F47D4 /* maxspeed_parser.cpp in Sources */,
56A6C3DA219B0BDA00A52855 /* collector_region_info.cpp in Sources */,
34F5587B1DBF4C8300A4FC11 /* feature_segments_checker.cpp in Sources */,
67C79BB31E2CEEAB00C40034 /* restriction_writer.cpp in Sources */,
@ -928,6 +927,7 @@
E162BD52213EAF2D007ADEF1 /* ways_merger.cpp in Sources */,
56FB438B2164F571002099B3 /* region_base.cpp in Sources */,
56FB43882164F571002099B3 /* region.cpp in Sources */,
56A1B7B021A82C3F00246F8C /* maxspeeds_parser.cpp in Sources */,
670E7BB51EF9812B00A8E9ED /* road_access_generator.cpp in Sources */,
34F558871DBF4C9600A4FC11 /* opentable_dataset.cpp in Sources */,
56FB43862164F571002099B3 /* regions_builder.cpp in Sources */,

8
xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj
View file

@ -34,9 +34,9 @@
562147291F6AA37E002D2214 /* libmwm_diff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 562147281F6AA37E002D2214 /* libmwm_diff.a */; };
562D42941FD8460500A995F3 /* libugc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 562D42951FD8460500A995F3 /* libugc.a */; };
562D42961FD8463700A995F3 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 670E7BC61EF992F600A8E9ED /* libsqlite3.tbd */; };
5631B660219B0F41009F47D4 /* maxspeed_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5631B65F219B0F41009F47D4 /* maxspeed_tests.cpp */; };
56829A4C2134238800A09A28 /* cities_boundaries_checker_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56829A4A2134238700A09A28 /* cities_boundaries_checker_tests.cpp */; };
56829A4D2134238800A09A28 /* city_roads_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56829A4B2134238800A09A28 /* city_roads_tests.cpp */; };
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 */; };
@ -224,9 +224,9 @@
562147261F6AA36A002D2214 /* libbsdiff.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbsdiff.a; path = ../bsdiff/build/Debug/libbsdiff.a; sourceTree = "<group>"; };
562147281F6AA37E002D2214 /* libmwm_diff.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmwm_diff.a; path = "../../../../Library/Developer/Xcode/DerivedData/omim-gsfdicnjgjjbizhdmwedavcucpok/Build/Products/Debug/libmwm_diff.a"; sourceTree = "<group>"; };
562D42951FD8460500A995F3 /* libugc.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libugc.a; sourceTree = BUILT_PRODUCTS_DIR; };
5631B65F219B0F41009F47D4 /* maxspeed_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maxspeed_tests.cpp; sourceTree = "<group>"; };
56829A4A2134238700A09A28 /* cities_boundaries_checker_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cities_boundaries_checker_tests.cpp; sourceTree = "<group>"; };
56829A4B2134238800A09A28 /* city_roads_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = city_roads_tests.cpp; sourceTree = "<group>"; };
56A1B7A321A82BF700246F8C /* maxspeeds_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maxspeeds_tests.cpp; sourceTree = "<group>"; };
56A6C3CD219AFDED00A52855 /* filter_elements_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = filter_elements_tests.cpp; sourceTree = "<group>"; };
56A6C3CE219AFDED00A52855 /* common.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = common.hpp; sourceTree = "<group>"; };
56A6C3CF219AFDEE00A52855 /* common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = common.cpp; sourceTree = "<group>"; };
@ -501,7 +501,7 @@
6726C1D71A4C27A5005EEA39 /* generator_tests */ = {
isa = PBXGroup;
children = (
5631B65F219B0F41009F47D4 /* maxspeed_tests.cpp */,
56A1B7A321A82BF700246F8C /* maxspeeds_tests.cpp */,
56A6C3D6219AFE2300A52855 /* generator_tests */,
56A6C3CF219AFDEE00A52855 /* common.cpp */,
56A6C3CE219AFDED00A52855 /* common.hpp */,
@ -751,7 +751,6 @@
67AB92D01B75156400AB5194 /* coasts_test.cpp in Sources */,
670F291B1BA6CE4F00F2ABF4 /* check_mwms.cpp in Sources */,
67AB92D91B75158300AB5194 /* osm_o5m_source_test.cpp in Sources */,
5631B660219B0F41009F47D4 /* maxspeed_tests.cpp in Sources */,
56829A4D2134238800A09A28 /* city_roads_tests.cpp in Sources */,
56A6C3D3219AFDEE00A52855 /* common.cpp in Sources */,
56A6C3D5219AFDEE00A52855 /* region_info_collector_tests.cpp in Sources */,
@ -762,6 +761,7 @@
6726C2411A4C2D9F005EEA39 /* testingmain.cpp in Sources */,
56A6C3D2219AFDEE00A52855 /* filter_elements_tests.cpp in Sources */,
670E7BC51EF9860100A8E9ED /* ugc_test.cpp in Sources */,
56A1B7A421A82BF700246F8C /* maxspeeds_tests.cpp in Sources */,
67AB92D21B75156B00AB5194 /* feature_merger_test.cpp in Sources */,
67AB92C31B73C29000AB5194 /* source_to_element_test.cpp in Sources */,
671ED3C520D4098100D4317E /* sponsored_storage_tests.cpp in Sources */,

8
xcode/routing/routing.xcodeproj/project.pbxproj
View file

@ -92,7 +92,6 @@
56290B87206A3232003892E0 /* routing_algorithm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56290B85206A3231003892E0 /* routing_algorithm.cpp */; };
56290B88206A3232003892E0 /* routing_algorithm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56290B86206A3231003892E0 /* routing_algorithm.hpp */; };
562BDE2020D14860008EFF6F /* routing_callbacks.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 562BDE1F20D14860008EFF6F /* routing_callbacks.hpp */; };
5631B662219B0F66009F47D4 /* maxspeed_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5631B661219B0F66009F47D4 /* maxspeed_tests.cpp */; };
5631B66B219B125D009F47D4 /* maxspeeds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5631B667219B125C009F47D4 /* maxspeeds.cpp */; };
5631B66C219B125D009F47D4 /* maxspeeds.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 5631B668219B125C009F47D4 /* maxspeeds.hpp */; };
56473D74214825B6007E6FBA /* city_roads_serialization.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56473D72214825B4007E6FBA /* city_roads_serialization.hpp */; };
@ -116,6 +115,7 @@
5694CECC1EBA25F7004576D3 /* road_access.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5694CEC71EBA25F7004576D3 /* road_access.cpp */; };
5694CECD1EBA25F7004576D3 /* road_access.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 5694CEC81EBA25F7004576D3 /* road_access.hpp */; };
5694CECE1EBA25F7004576D3 /* vehicle_mask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5694CEC91EBA25F7004576D3 /* vehicle_mask.cpp */; };
56A1B7A221A82BCC00246F8C /* maxspeeds_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56A1B7A121A82BCB00246F8C /* maxspeeds_tests.cpp */; };
56BC22CC1F6A501200B6426B /* street_names_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 567E9F7A1F58506B0064CB96 /* street_names_test.cpp */; };
56BC22CD1F6A501800B6426B /* route_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 567E9F701F5850460064CB96 /* route_test.cpp */; };
56BC22CE1F6A501D00B6426B /* get_altitude_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 567E9F711F5850460064CB96 /* get_altitude_test.cpp */; };
@ -381,7 +381,6 @@
56290B85206A3231003892E0 /* routing_algorithm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = routing_algorithm.cpp; sourceTree = "<group>"; };
56290B86206A3231003892E0 /* routing_algorithm.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = routing_algorithm.hpp; sourceTree = "<group>"; };
562BDE1F20D14860008EFF6F /* routing_callbacks.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = routing_callbacks.hpp; sourceTree = "<group>"; };
5631B661219B0F66009F47D4 /* maxspeed_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maxspeed_tests.cpp; sourceTree = "<group>"; };
5631B667219B125C009F47D4 /* maxspeeds.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maxspeeds.cpp; sourceTree = "<group>"; };
5631B668219B125C009F47D4 /* maxspeeds.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = maxspeeds.hpp; sourceTree = "<group>"; };
56473D72214825B4007E6FBA /* city_roads_serialization.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = city_roads_serialization.hpp; sourceTree = "<group>"; };
@ -409,6 +408,7 @@
5694CEC71EBA25F7004576D3 /* road_access.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = road_access.cpp; sourceTree = "<group>"; };
5694CEC81EBA25F7004576D3 /* road_access.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = road_access.hpp; sourceTree = "<group>"; };
5694CEC91EBA25F7004576D3 /* vehicle_mask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vehicle_mask.cpp; sourceTree = "<group>"; };
56A1B7A121A82BCB00246F8C /* maxspeeds_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maxspeeds_tests.cpp; sourceTree = "<group>"; };
56C439241E93BF8C00998E29 /* cross_mwm_graph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cross_mwm_graph.cpp; sourceTree = "<group>"; };
56C439251E93BF8C00998E29 /* cross_mwm_graph.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cross_mwm_graph.hpp; sourceTree = "<group>"; };
56C4392C1E93E5DF00998E29 /* transition_points.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = transition_points.hpp; sourceTree = "<group>"; };
@ -668,7 +668,7 @@
6742ACA01C68A07C009CB89E /* routing_tests */ = {
isa = PBXGroup;
children = (
5631B661219B0F66009F47D4 /* maxspeed_tests.cpp */,
56A1B7A121A82BCB00246F8C /* maxspeeds_tests.cpp */,
44F45B272136B069001B1618 /* speed_cameras_tests.cpp */,
5661A5CD20DE51C500C6B1D1 /* tools.hpp */,
56290B85206A3231003892E0 /* routing_algorithm.cpp */,
@ -1241,7 +1241,6 @@
6742AD351C68A9DF009CB89E /* turns_generator_test.cpp in Sources */,
6742AD301C68A9DF009CB89E /* road_graph_builder.cpp in Sources */,
6742AD2D1C68A9DF009CB89E /* nearest_edge_finder_tests.cpp in Sources */,
5631B662219B0F66009F47D4 /* maxspeed_tests.cpp in Sources */,
6742AD321C68A9DF009CB89E /* route_tests.cpp in Sources */,
6742AD2A1C68A9DF009CB89E /* async_router_test.cpp in Sources */,
6742AD281C68A9DF009CB89E /* astar_progress_test.cpp in Sources */,
@ -1284,6 +1283,7 @@
0CF709361F05172200D5067E /* checkpoints.cpp in Sources */,
671F58BD1B874EC80032311E /* followed_polyline.cpp in Sources */,
670EE55D1B6001E7001E8064 /* routing_session.cpp in Sources */,
56A1B7A221A82BCC00246F8C /* maxspeeds_tests.cpp in Sources */,
40C645161F8D167F002E05A0 /* fake_ending.cpp in Sources */,
56099E331CC9247E00A7772A /* bicycle_directions.cpp in Sources */,
0C08AA341DF83223004195DD /* index_graph_serialization.cpp in Sources */,