From 89194cb45b919489b9bc3e7eb630bc2155c7ff90 Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Tue, 5 Nov 2019 23:08:01 +0300 Subject: [PATCH] Fix xcode projects and remove unused files --- .../generator_tests/cities_ids_tests.cpp | 119 ----- .../popularity_builder_tests.cpp | 455 ------------------ xcode/coding/coding.xcodeproj/project.pbxproj | 8 - .../generator.xcodeproj/project.pbxproj | 24 - .../generator_tool.xcodeproj/project.pbxproj | 404 +--------------- 5 files changed, 18 insertions(+), 992 deletions(-) delete mode 100644 generator/generator_tests/cities_ids_tests.cpp delete mode 100644 generator/generator_tests/popularity_builder_tests.cpp diff --git a/generator/generator_tests/cities_ids_tests.cpp b/generator/generator_tests/cities_ids_tests.cpp deleted file mode 100644 index 77f430f..0000000 --- a/generator/generator_tests/cities_ids_tests.cpp +++ /dev/null @@ -1,119 +0,0 @@ -#include "testing/testing.hpp" - -#include "generator/cities_ids_builder.hpp" -#include "generator/feature_builder.hpp" -#include "generator/generator_tests_support/test_feature.hpp" -#include "generator/generator_tests_support/test_with_custom_mwms.hpp" -#include "generator/utils.hpp" - -#include "indexer/classificator.hpp" -#include "indexer/data_source.hpp" -#include "indexer/feature.hpp" -#include "indexer/feature_processor.hpp" -#include "indexer/feature_to_osm.hpp" -#include "indexer/ftypes_matcher.hpp" - -#include "platform/country_defines.hpp" -#include "platform/local_country_file.hpp" - -#include "geometry/point2d.hpp" - -#include "base/assert.hpp" -#include "base/geo_object_id.hpp" - -#include -#include -#include - -using namespace generator; -using namespace generator::tests_support; - -namespace -{ -class CitiesIdsTest : public TestWithCustomMwms -{ -public: - DataSource const & GetDataSource() const { return m_dataSource; } -}; - -// A feature that is big enough for World.mwm but is not a locality. -class TestSea : public TestFeature -{ -public: - TestSea(m2::PointD const & center, std::string const & name, std::string const & lang) - : TestFeature(center, name, lang), m_name(name) - { - } - - // TestFeature overrides: - void Serialize(feature::FeatureBuilder & fb) const - { - TestFeature::Serialize(fb); - fb.AddType(classif().GetTypeByPath({"place", "sea"})); - } - - std::string ToDebugString() const - { - std::ostringstream oss; - oss << "TestSea [" << m_name << "]"; - return oss.str(); - } - -private: - std::string m_name; -}; -} // namespace - -UNIT_CLASS_TEST(CitiesIdsTest, BuildCitiesIds) -{ - TestCity paris(m2::PointD(0, 0), "Paris", "fr", 100 /* rank */); - TestCity wien(m2::PointD(1, 1), "Wien", "de", 100 /* rank */); - TestSea marCaribe(m2::PointD(2, 2), "Mar Caribe", "es"); - - auto testWorldId = BuildWorld([&](TestMwmBuilder & builder) { - builder.Add(paris); - builder.Add(wien); - builder.Add(marCaribe); - }); - - auto const worldMwmPath = testWorldId.GetInfo()->GetLocalFile().GetPath(MapOptions::Map); - - indexer::FeatureIdToGeoObjectIdOneWay oneWayMap(GetDataSource()); - TEST(oneWayMap.Load(), ()); - - indexer::FeatureIdToGeoObjectIdTwoWay twoWayMap(GetDataSource()); - TEST(twoWayMap.Load(), ()); - - std::unordered_map originalMapping; - CHECK(ParseFeatureIdToTestIdMapping(worldMwmPath, originalMapping), ()); - - { - size_t numFeatures = 0; - size_t numLocalities = 0; - auto const test = [&](FeatureType & ft, uint32_t index) { - ++numFeatures; - FeatureID const fid(testWorldId, index); - base::GeoObjectId gid; - FeatureID receivedFid; - - bool const mustExist = ftypes::IsLocalityChecker::Instance()(ft); - - TEST_EQUAL(oneWayMap.GetGeoObjectId(fid, gid), mustExist, (index, ft.GetNames())); - TEST_EQUAL(twoWayMap.GetGeoObjectId(fid, gid), mustExist, (index, ft.GetNames())); - if (!mustExist) - return; - - ++numLocalities; - TEST_EQUAL(twoWayMap.GetFeatureID(gid, receivedFid), mustExist, (index)); - TEST_EQUAL(receivedFid, fid, ()); - - CHECK(originalMapping.find(index) != originalMapping.end(), ()); - TEST_EQUAL(originalMapping[index], gid.GetSerialId(), ()); - }; - - feature::ForEachFromDat(worldMwmPath, test); - - TEST_EQUAL(numFeatures, 3, ()); - TEST_EQUAL(numLocalities, 2, ()); - } -} diff --git a/generator/generator_tests/popularity_builder_tests.cpp b/generator/generator_tests/popularity_builder_tests.cpp deleted file mode 100644 index 4c0ce70..0000000 --- a/generator/generator_tests/popularity_builder_tests.cpp +++ /dev/null @@ -1,455 +0,0 @@ -#include "testing/testing.hpp" - -#include "generator/feature_generator.hpp" -#include "generator/generator_tests/common.hpp" -#include "generator/popularity.hpp" - -#include "indexer/classificator_loader.hpp" -#include "indexer/classificator.hpp" - -#include "platform/platform.hpp" - -#include "coding/string_utf8_multilang.hpp" - -#include "base/geo_object_id.hpp" -#include "base/scope_guard.hpp" - -#include -#include -#include -#include -#include -#include - -using namespace generator; -using namespace generator::popularity; -using namespace feature; - -namespace generator_tests -{ -class TestPopularityBuilder -{ -public: - TestPopularityBuilder() - { - classificator::Load(); - m_testSet = TestPopularityBuilder::GetTestSet(); - } - - void GetType() const - { - { - FeatureBuilder fb; - auto const type = m_cl.GetTypeByPath({"tourism", "museum"}); - auto const checkableType = m_cl.GetReadableObjectName(type); - fb.AddType(m_cl.GetTypeByPath({"building"})); - fb.AddType(type); - TEST_EQUAL(PopularityBuilder::GetType(fb), checkableType, ()); - } - - { - FeatureBuilder fb; - fb.AddType(m_cl.GetTypeByPath({"building"})); - TEST_EQUAL(PopularityBuilder::GetType(fb), "", ()); - } - - { - FeatureBuilder fb; - TEST_EQUAL(PopularityBuilder::GetType(fb), "", ()); - } - } - - static void GetFeatureName() - { - { - FeatureBuilder fb; - std::string checkableName = "Фича"; - fb.AddName("ru", checkableName); - fb.AddName("en", "Feature"); - TEST_EQUAL(PopularityBuilder::GetFeatureName(fb), checkableName, ()); - } - - { - FeatureBuilder fb; - std::string checkableName = "Feature"; - fb.AddName("en", checkableName); - fb.AddName("default", "Fonctionnalité"); - TEST_EQUAL(PopularityBuilder::GetFeatureName(fb), checkableName, ()); - } - - { - FeatureBuilder fb; - std::string checkableName = "Fonctionnalité"; - fb.AddName("default", checkableName); - TEST_EQUAL(PopularityBuilder::GetFeatureName(fb), checkableName, ()); - } - - { - FeatureBuilder fb; - fb.AddName("fr", "Fonctionnalité"); - TEST_EQUAL(PopularityBuilder::GetFeatureName(fb), "", ()); - } - - { - FeatureBuilder fb; - TEST_EQUAL(PopularityBuilder::GetFeatureName(fb), "", ()); - } - } - - void FindPointParent() const - { - auto const filtered = FilterPoint(m_testSet); - std::map pointMap; - for (auto const & f : filtered) - pointMap.emplace(f.GetName(), f); - - auto const filteredArea = FilterArea(m_testSet); - auto geomPlaces = MakePopularityGeomPlaces(filteredArea); - auto const nameToNode = GetPlacesMap(geomPlaces); - auto const m = PopularityBuilder::GetAreaMap(geomPlaces); - auto const tree = PopularityBuilder::MakeTree4d(geomPlaces); - - { - auto const & ft = pointMap.at("1_3_4"); - auto const parent = PopularityBuilder::FindPointParent(ft.GetKeyPoint(), m, tree); - TEST(parent, ()); - TEST_EQUAL(*parent, nameToNode.at("1_3")->GetData().GetId(), ()); - } - - { - auto const & ft = pointMap.at("1_3_5"); - auto const parent = PopularityBuilder::FindPointParent(ft.GetKeyPoint(), m, tree); - TEST(parent, ()); - TEST_EQUAL(*parent, nameToNode.at("1_3")->GetData().GetId(), ()); - } - - { - m2::PointD bad{1000.0, 1000.0}; - auto const parent = PopularityBuilder::FindPointParent(bad, m, tree); - TEST(!parent, ()); - } - } - - void FindPopularityGeomPlaceParent() const - { - auto const filtered = FilterArea(m_testSet); - auto geomPlaces = MakePopularityGeomPlaces(filtered); - auto const nameToNode = GetPlacesMap(geomPlaces); - auto const m = PopularityBuilder::GetAreaMap(geomPlaces); - auto const tree = PopularityBuilder::MakeTree4d(geomPlaces); - - { - auto const t = PopularityBuilder::FindPopularityGeomPlaceParent(nameToNode.at("1_2")->GetData(), m, tree); - TEST(t, ()); - TEST_EQUAL(*t, nameToNode.at("1"), ()); - } - - { - auto const t = PopularityBuilder::FindPopularityGeomPlaceParent(nameToNode.at("1_3")->GetData(), m, tree); - TEST(t, ()); - TEST_EQUAL(*t, nameToNode.at("1"), ()); - } - - { - auto const t = PopularityBuilder::FindPopularityGeomPlaceParent(nameToNode.at("1")->GetData(), m, tree); - TEST(!t, ()); - } - } - - void GetAreaMap() const - { - { - auto const filtered = FilterArea(m_testSet); - auto const geomPlaces = MakePopularityGeomPlaces(filtered); - std::map checkableMap; - for (auto const & n : geomPlaces) - checkableMap.emplace(n->GetData().GetId(), n); - - auto const m = PopularityBuilder::GetAreaMap(geomPlaces); - TEST_EQUAL(m.size(), checkableMap.size(), ()); - for (auto const & p : checkableMap) - { - TEST_EQUAL(m.count(p.first), 1, ()); - TEST_EQUAL(p.second, m.at(p.first), ()); - } - } - - { - auto const m = PopularityBuilder::GetAreaMap({}); - TEST(m.empty(), ()); - } - } - - void MakeTree4d() const - { - { - std::set checkableIds; - auto const filtered = FilterArea(m_testSet); - auto const geomPlaces = MakePopularityGeomPlaces(filtered); - for (auto const & node : geomPlaces) - checkableIds.insert(node->GetData().GetId()); - - auto const tree = PopularityBuilder::MakeTree4d(geomPlaces); - std::set ids; - tree.ForEach([&](auto const & id) { - ids.insert(id); - }); - - TEST_EQUAL(checkableIds, ids, ()); - } - - { - std::set checkableIds; - auto const tree = PopularityBuilder::MakeTree4d({}); - std::set ids; - tree.ForEach([&](auto const & id) { - ids.insert(id); - }); - - TEST_EQUAL(checkableIds, ids, ()); - } - } - - void LinkGeomPlaces() const - { - auto const filtered = FilterArea(m_testSet); - auto geomPlaces = MakePopularityGeomPlaces(filtered); - auto const nameToNode = GetPlacesMap(geomPlaces); - auto const m = PopularityBuilder::GetAreaMap(geomPlaces); - auto const tree = PopularityBuilder::MakeTree4d(geomPlaces); - PopularityBuilder::LinkGeomPlaces(m, tree, geomPlaces); - - TEST_EQUAL(nameToNode.size(), 3, ()); - TEST_EQUAL(nameToNode.at("1")->GetParent(), PopularityBuilder::Node::Ptr(), ()); - TEST_EQUAL(nameToNode.at("1_2")->GetParent(), nameToNode.at("1"), ()); - TEST_EQUAL(nameToNode.at("1_3")->GetParent(), nameToNode.at("1"), ()); - } - - void MakeNodes() - { - std::vector v = FilterArea(m_testSet); - auto const nodes = PopularityBuilder::MakeNodes(v); - TEST_EQUAL(nodes.size(), v.size(), ()); - for (size_t i = 0; i < v.size(); ++i) - TEST_EQUAL(nodes[i]->GetData().GetId(), v[i].GetMostGenericOsmId() , ()); - } - - void Build() const - { - auto const filename = GetFileName(); - auto const type = m_cl.GetTypeByPath({"tourism", "museum"}); - auto const typeName = m_cl.GetReadableObjectName(type); - - { - FeaturesCollector collector(filename); - for (auto const & feature : m_testSet) - collector.Collect(feature); - } - - PopularityBuilder builder(filename); - auto const lines = builder.Build(); - - std::map m; - for (auto const & line : lines) - m.emplace(line.m_name, line); - - SCOPE_GUARD(RemoveFile, [&] { - Platform::RemoveFileIfExists(filename); - }); - - TEST_EQUAL(lines.size(), m_testSet.size(), ()); - TEST(!m.at("1").m_parent, ()); - TEST_EQUAL(m.at("1").m_type, typeName, ()); - - TEST(m.at("1_2").m_parent, ()); - TEST_EQUAL(*m.at("1_2").m_parent, m.at("1").m_id, ()); - TEST_EQUAL(m.at("1_2").m_type, typeName, ()); - - TEST(m.at("1_3").m_parent, ()); - TEST_EQUAL(*m.at("1_3").m_parent, m.at("1").m_id, ()); - TEST_EQUAL(m.at("1_3").m_type, typeName, ()); - - TEST(m.at("1_3_4").m_parent, ()); - TEST_EQUAL(*m.at("1_3_4").m_parent, m.at("1_3").m_id, ()); - TEST_EQUAL(m.at("1_3_4").m_type, typeName, ()); - - TEST(m.at("1_3_5").m_parent, ()); - TEST_EQUAL(*m.at("1_3_5").m_parent, m.at("1_3").m_id, ()); - TEST_EQUAL(m.at("1_3_5").m_type, typeName, ()); - } - -private: - static std::vector GetTestSet() - { - std::vector v; - v.reserve(5); - - { - FeatureBuilder feature; - feature.AddOsmId(base::GeoObjectId(1)); - auto const firstLast = m2::PointD{0.0, 0.0}; - feature.AddPoint(firstLast); - feature.AddPoint(m2::PointD{0.0, 7.0}); - feature.AddPoint(m2::PointD{10.0, 7.0}); - feature.AddPoint(m2::PointD{10.0, 0.0}); - feature.AddPoint(firstLast); - feature.SetArea(); - feature.AddType(classif().GetTypeByPath({"tourism", "museum"})); - feature.AddName("default", "1"); - v.push_back(feature); - } - - { - FeatureBuilder feature; - feature.AddOsmId(base::GeoObjectId(2)); - auto const firstLast = m2::PointD{2.0, 3.0}; - feature.AddPoint(firstLast); - feature.AddPoint(m2::PointD{2.0, 5.0}); - feature.AddPoint(m2::PointD{4.0, 5.0}); - feature.AddPoint(m2::PointD{4.0, 3.0}); - feature.AddPoint(firstLast); - feature.SetArea(); - feature.AddType(classif().GetTypeByPath({"tourism", "museum"})); - feature.AddName("default", "1_2"); - v.push_back(feature); - } - - { - FeatureBuilder feature; - feature.AddOsmId(base::GeoObjectId(3)); - auto const firstLast = m2::PointD{6.0, 0.0}; - feature.AddPoint(firstLast); - feature.AddPoint(m2::PointD{6.0, 3.0}); - feature.AddPoint(m2::PointD{10.0, 3.0}); - feature.AddPoint(m2::PointD{10.0, 0.0}); - feature.AddPoint(firstLast); - feature.SetArea(); - feature.AddType(classif().GetTypeByPath({"tourism", "museum"})); - feature.AddName("default", "1_3"); - v.push_back(feature); - } - - { - FeatureBuilder feature; - feature.AddOsmId(base::GeoObjectId(4)); - feature.SetCenter(m2::PointD{8.0, 2.0}); - feature.AddName("default", "1_3_4"); - feature.AddType(classif().GetTypeByPath({"tourism", "museum"})); - v.push_back(feature); - } - - { - FeatureBuilder feature; - feature.AddOsmId(base::GeoObjectId(5)); - feature.SetCenter(m2::PointD{7.0, 2.0}); - feature.AddName("default", "1_3_5"); - feature.AddType(classif().GetTypeByPath({"tourism", "museum"})); - v.push_back(feature); - } - - return v; - } - - static std::vector FilterArea(std::vector const & v) - { - std::vector filtered; - std::copy_if(std::begin(v), std::end(v), std::back_inserter(filtered), [](auto const & feature) { - return feature.IsArea() && feature.IsGeometryClosed(); - }); - - return filtered; - } - - static std::vector FilterPoint(std::vector const & v) - { - std::vector filtered; - std::copy_if(std::begin(v), std::end(v), std::back_inserter(filtered), [](auto const & feature) { - return feature.IsPoint(); - }); - - return filtered; - } - - static std::map - GetPlacesMap(PopularityBuilder::Node::PtrList const & geomPlaces) - { - std::map nameToNode; - for (auto const & place : geomPlaces) - nameToNode.emplace(place->GetData().GetFeature().GetName(), place); - - return nameToNode; - } - - static PopularityBuilder::Node::PtrList MakePopularityGeomPlaces(std::vector const & v) - { - PopularityBuilder::Node::PtrList nodes; - nodes.reserve(v.size()); - std::transform(std::begin(v), std::end(v), std::back_inserter(nodes), [](FeatureBuilder const & f) { - return std::make_shared(PopularityGeomPlace(f)); - }); - - return nodes; - } - - static std::vector AddTypes(std::vector v, std::vector const & types) - { - for (auto & feature : v) - { - for (auto const & type : types) - feature.AddType(type); - } - - return v; - } - - Classificator const & m_cl = classif(); - std::vector m_testSet; -}; -} // namespace generator_tests - -using namespace generator_tests; - -UNIT_CLASS_TEST(TestPopularityBuilder, PopularityBuilder_GetType) -{ - TestPopularityBuilder::GetType(); -} - -UNIT_CLASS_TEST(TestPopularityBuilder, PopularityBuilder_GetFeatureName) -{ - TestPopularityBuilder::GetFeatureName(); -} - -UNIT_CLASS_TEST(TestPopularityBuilder, PopularityBuilder_FindPointParent) -{ - TestPopularityBuilder::FindPointParent(); -} - -UNIT_CLASS_TEST(TestPopularityBuilder, PopularityBuilder_FindPopularityGeomPlaceParent) -{ - TestPopularityBuilder::FindPopularityGeomPlaceParent(); -} - -UNIT_CLASS_TEST(TestPopularityBuilder, PopularityBuilder_GetAreaMap) -{ - TestPopularityBuilder::GetAreaMap(); -} - -UNIT_CLASS_TEST(TestPopularityBuilder, PopularityBuilder_MakeTree4d) -{ - TestPopularityBuilder::MakeTree4d(); -} - -UNIT_CLASS_TEST(TestPopularityBuilder, PopularityBuilder_LinkGeomPlaces) -{ - TestPopularityBuilder::LinkGeomPlaces(); -} - -UNIT_CLASS_TEST(TestPopularityBuilder, PopularityBuilder_MakeNodes) -{ - TestPopularityBuilder::MakeNodes(); -} - -UNIT_CLASS_TEST(TestPopularityBuilder, PopularityBuilder_Build) -{ - TestPopularityBuilder::Build(); -} diff --git a/xcode/coding/coding.xcodeproj/project.pbxproj b/xcode/coding/coding.xcodeproj/project.pbxproj index 0dd014c..1029ff9 100644 --- a/xcode/coding/coding.xcodeproj/project.pbxproj +++ b/xcode/coding/coding.xcodeproj/project.pbxproj @@ -42,8 +42,6 @@ 3DAB4B6E23018E0500F7E5EB /* buffered_file_writer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DAB4B6C23018E0500F7E5EB /* buffered_file_writer.cpp */; }; 3DAB4B6F23018E0500F7E5EB /* buffered_file_writer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DAB4B6D23018E0500F7E5EB /* buffered_file_writer.hpp */; }; 402E9A9321D0DBD9002D3CF4 /* map_uint32_to_val.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 402E9A9221D0DBD9002D3CF4 /* map_uint32_to_val.hpp */; }; - 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 */; }; 670BAACB1D0B0C1E000302DA /* huffman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 394917221BAC3C2F002A8C4F /* huffman.cpp */; }; 670D04BE1B0BA92D0013A7AC /* file64_api.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670D04B41B0BA9050013A7AC /* file64_api.hpp */; }; @@ -173,8 +171,6 @@ 3DAB4B6D23018E0500F7E5EB /* buffered_file_writer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = buffered_file_writer.hpp; sourceTree = ""; }; 402E9A9221D0DBD9002D3CF4 /* map_uint32_to_val.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = map_uint32_to_val.hpp; sourceTree = ""; }; 4098EA6221D12088005612FF /* map_uint32_to_val_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map_uint32_to_val_tests.cpp; sourceTree = ""; }; - 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/geocore/xcode/geometry/../../../geocore-build/xcode/Debug/libgeometry.a"; 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 = ""; }; @@ -416,8 +412,6 @@ 675342641A3F588B00A0A8C3 /* reader_writer_ops.hpp */, 675342651A3F588B00A0A8C3 /* reader.cpp */, 675342661A3F588B00A0A8C3 /* reader.hpp */, - 4563B05F205909280057556D /* sha1.cpp */, - 4563B060205909280057556D /* sha1.hpp */, 347F33341C4540F0009758CC /* simple_dense_coding.cpp */, 347F33351C4540F0009758CC /* simple_dense_coding.hpp */, 347F33361C4540F0009758CC /* succinct_mapper.hpp */, @@ -484,7 +478,6 @@ 39C3C0BC21A43061003B4712 /* point_coding.hpp in Headers */, 3DAB4B6822FDC6DF00F7E5EB /* file_container_writers.hpp in Headers */, 39F376C7207D327B0058E8E0 /* geometry_coding.hpp in Headers */, - 4563B063205909290057556D /* sha1.hpp in Headers */, 6753428B1A3F588C00A0A8C3 /* buffer_reader.hpp in Headers */, 675342831A3F588C00A0A8C3 /* base64.hpp in Headers */, 675342BA1A3F588C00A0A8C3 /* reader_writer_ops.hpp in Headers */, @@ -628,7 +621,6 @@ 675342B61A3F588C00A0A8C3 /* reader_streambuf.cpp in Sources */, 3DAB4B6E23018E0500F7E5EB /* buffered_file_writer.cpp in Sources */, 675342821A3F588C00A0A8C3 /* base64.cpp in Sources */, - 4563B062205909290057556D /* sha1.cpp in Sources */, 347F33371C4540F0009758CC /* compressed_bit_vector.cpp in Sources */, 3D74EF221F8F55740081202C /* csv_reader.cpp in Sources */, 6753429F1A3F588C00A0A8C3 /* file_reader.cpp in Sources */, diff --git a/xcode/generator/generator.xcodeproj/project.pbxproj b/xcode/generator/generator.xcodeproj/project.pbxproj index cf48ded..13de8a0 100644 --- a/xcode/generator/generator.xcodeproj/project.pbxproj +++ b/xcode/generator/generator.xcodeproj/project.pbxproj @@ -33,8 +33,6 @@ 3989E362230302CB00D63F84 /* geo_objects_maintainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3989E35E230302CB00D63F84 /* geo_objects_maintainer.cpp */; }; 39F7E3AA20E1023400DA7A14 /* test_with_classificator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39F7E3A520E1022E00DA7A14 /* test_with_classificator.cpp */; }; 39F7E3AB20E1023400DA7A14 /* test_with_classificator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 39F7E3A420E1022E00DA7A14 /* test_with_classificator.hpp */; }; - 39F7E3AC20E1023400DA7A14 /* test_with_custom_mwms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39F7E3A320E1022E00DA7A14 /* test_with_custom_mwms.cpp */; }; - 39F7E3AD20E1023400DA7A14 /* test_with_custom_mwms.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 39F7E3A220E1022E00DA7A14 /* test_with_custom_mwms.hpp */; }; 3DFEBF7D1EF2D58900317D5C /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DFEBF781EF2D58900317D5C /* utils.cpp */; }; 3DFEBF7E1EF2D58900317D5C /* utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DFEBF791EF2D58900317D5C /* utils.hpp */; }; 4003E3AA2112FB2B007721B0 /* factory_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4003E3992112FB29007721B0 /* factory_utils.hpp */; }; @@ -112,8 +110,6 @@ 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 */; }; 6726C1D61A4AFEF4005EEA39 /* osm2meta.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6726C1D41A4AFEF4005EEA39 /* osm2meta.hpp */; }; 675340621A3F2A7400A0A8C3 /* coastlines_generator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753402F1A3F2A7400A0A8C3 /* coastlines_generator.cpp */; }; @@ -163,8 +159,6 @@ 677E2A181CAACC5F001DC42A /* towns_dumper.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 677E2A131CAACC5F001DC42A /* towns_dumper.hpp */; }; 67BC92E21D1A9ED800A4A378 /* test_feature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67BC92D81D1A9E9800A4A378 /* test_feature.cpp */; }; 67BC92E31D1A9ED800A4A378 /* test_feature.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BC92D91D1A9E9800A4A378 /* test_feature.hpp */; }; - 67BC92E41D1A9ED800A4A378 /* test_mwm_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67BC92DA1D1A9E9800A4A378 /* test_mwm_builder.cpp */; }; - 67BC92E51D1A9ED800A4A378 /* test_mwm_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BC92DB1D1A9E9800A4A378 /* test_mwm_builder.hpp */; }; 67CE951A235F83FB0032E367 /* cttrie.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67CE9519235F83FB0032E367 /* cttrie.hpp */; }; E162BD27213E8F19007ADEF1 /* factory_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E162BD26213E8F18007ADEF1 /* factory_utils.hpp */; }; E162BD51213EAF2D007ADEF1 /* ways_merger.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E162BD4D213EAF2C007ADEF1 /* ways_merger.hpp */; }; @@ -222,8 +216,6 @@ 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 = ""; }; - 39F7E3A220E1022E00DA7A14 /* test_with_custom_mwms.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_with_custom_mwms.hpp; sourceTree = ""; }; - 39F7E3A320E1022E00DA7A14 /* test_with_custom_mwms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_with_custom_mwms.cpp; sourceTree = ""; }; 39F7E3A420E1022E00DA7A14 /* test_with_classificator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_with_classificator.hpp; sourceTree = ""; }; 39F7E3A520E1022E00DA7A14 /* test_with_classificator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_with_classificator.cpp; sourceTree = ""; }; 3DFEBF781EF2D58900317D5C /* utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utils.cpp; sourceTree = ""; }; @@ -311,8 +303,6 @@ 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 = ""; }; 6726C1D41A4AFEF4005EEA39 /* osm2meta.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm2meta.hpp; sourceTree = ""; }; 6753401B1A3F2A1B00A0A8C3 /* libgenerator.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgenerator.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -365,8 +355,6 @@ 67BC92CC1D1A9E5F00A4A378 /* libgenerator_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgenerator_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; 67BC92D81D1A9E9800A4A378 /* test_feature.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_feature.cpp; sourceTree = ""; }; 67BC92D91D1A9E9800A4A378 /* test_feature.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_feature.hpp; sourceTree = ""; }; - 67BC92DA1D1A9E9800A4A378 /* test_mwm_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_mwm_builder.cpp; sourceTree = ""; }; - 67BC92DB1D1A9E9800A4A378 /* test_mwm_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_mwm_builder.hpp; sourceTree = ""; }; 67CE9519235F83FB0032E367 /* cttrie.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = cttrie.hpp; sourceTree = ""; }; 67CE951D235F88320032E367 /* cttrie_sw32.tcc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = cttrie_sw32.tcc; sourceTree = ""; }; 67CE951E235F886F0032E367 /* cttrie_sw256.tcc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = cttrie_sw256.tcc; sourceTree = ""; }; @@ -615,14 +603,8 @@ children = ( 39F7E3A520E1022E00DA7A14 /* test_with_classificator.cpp */, 39F7E3A420E1022E00DA7A14 /* test_with_classificator.hpp */, - 39F7E3A320E1022E00DA7A14 /* test_with_custom_mwms.cpp */, - 39F7E3A220E1022E00DA7A14 /* test_with_custom_mwms.hpp */, - 671ED3CC20D40ABA00D4317E /* routing_helpers.cpp */, - 671ED3CD20D40ABB00D4317E /* routing_helpers.hpp */, 67BC92D81D1A9E9800A4A378 /* test_feature.cpp */, 67BC92D91D1A9E9800A4A378 /* test_feature.hpp */, - 67BC92DA1D1A9E9800A4A378 /* test_mwm_builder.cpp */, - 67BC92DB1D1A9E9800A4A378 /* test_mwm_builder.hpp */, ); name = generator_tests_support; path = ../../generator/generator_tests_support; @@ -736,11 +718,8 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 67BC92E51D1A9ED800A4A378 /* test_mwm_builder.hpp in Headers */, 67BC92E31D1A9ED800A4A378 /* test_feature.hpp in Headers */, - 39F7E3AD20E1023400DA7A14 /* test_with_custom_mwms.hpp in Headers */, 39F7E3AB20E1023400DA7A14 /* test_with_classificator.hpp in Headers */, - 671ED3CF20D40ABB00D4317E /* routing_helpers.hpp in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -898,9 +877,6 @@ files = ( 67BC92E21D1A9ED800A4A378 /* test_feature.cpp in Sources */, 39F7E3AA20E1023400DA7A14 /* test_with_classificator.cpp in Sources */, - 39F7E3AC20E1023400DA7A14 /* test_with_custom_mwms.cpp in Sources */, - 67BC92E41D1A9ED800A4A378 /* test_mwm_builder.cpp in Sources */, - 671ED3CE20D40ABB00D4317E /* routing_helpers.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj b/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj index c922f48..2e04e03 100644 --- a/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj +++ b/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj @@ -7,94 +7,35 @@ objects = { /* Begin PBXBuildFile section */ - 3462FD981DC1E22800906FD7 /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD901DC1E1C400906FD7 /* libalohalitics.a */; }; 3462FD9A1DC1E24400906FD7 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD991DC1E24400906FD7 /* libjansson.a */; }; - 3462FD9B1DC1E26800906FD7 /* libeditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD921DC1E1DD00906FD7 /* libeditor.a */; }; - 3462FD9C1DC1E27300906FD7 /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD941DC1E1EF00906FD7 /* libpugixml.a */; }; - 3462FD9D1DC1E27D00906FD7 /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD961DC1E1FC00906FD7 /* liboauthcpp.a */; }; - 3462FD9F1DC1E28D00906FD7 /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD9E1DC1E28D00906FD7 /* libsearch.a */; }; 3462FDA11DC1E29E00906FD7 /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FDA01DC1E29E00906FD7 /* libsuccinct.a */; }; - 3462FDA21DC1E2D300906FD7 /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD901DC1E1C400906FD7 /* libalohalitics.a */; }; - 3462FDA31DC1E2D600906FD7 /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD941DC1E1EF00906FD7 /* libpugixml.a */; }; - 3462FDA41DC1E2DA00906FD7 /* libeditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD921DC1E1DD00906FD7 /* libeditor.a */; }; - 3462FDA51DC1E2F300906FD7 /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD961DC1E1FC00906FD7 /* liboauthcpp.a */; }; - 3462FDA71DC1E30B00906FD7 /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FDA61DC1E30B00906FD7 /* libopening_hours.a */; }; - 3462FDA91DC1E31E00906FD7 /* libprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FDA81DC1E31E00906FD7 /* libprotobuf.a */; }; - 3462FDAA1DC1E32C00906FD7 /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD9E1DC1E28D00906FD7 /* libsearch.a */; }; - 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 */; }; - 4491F494213D6B470011834F /* speed_cameras_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4491F490213D46380011834F /* speed_cameras_test.cpp */; }; 4491F496213D6B8E0011834F /* osm2meta_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 677E2A0B1CAAC7CB001DC42A /* osm2meta_test.cpp */; }; 4491F497213D6BA00011834F /* tag_admixer_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 677E2A0C1CAAC7CB001DC42A /* tag_admixer_test.cpp */; }; 562D42961FD8463700A995F3 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 670E7BC61EF992F600A8E9ED /* libsqlite3.tbd */; }; - 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 */; }; 56A6C3D5219AFDEE00A52855 /* region_info_collector_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56A6C3D1219AFDEE00A52855 /* region_info_collector_tests.cpp */; }; - 56EE14CF1FE803FE0036F20C /* libtransit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14D01FE803FE0036F20C /* libtransit.a */; }; 670E7BBC1EF9832200A8E9ED /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670E7BBB1EF9832200A8E9ED /* libicu.a */; }; 670E7BC21EF9853500A8E9ED /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670E7BBB1EF9832200A8E9ED /* libicu.a */; }; - 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 */; }; - 6719DD5E1B95AB0F0018166F /* 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 */; }; - 671ED3C020D4098100D4317E /* restriction_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671ED3B820D4098000D4317E /* restriction_test.cpp */; }; - 671ED3C120D4098100D4317E /* srtm_parser_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671ED3B920D4098000D4317E /* srtm_parser_test.cpp */; }; - 671ED3C220D4098100D4317E /* restriction_collector_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671ED3BB20D4098100D4317E /* restriction_collector_test.cpp */; }; - 671ED3C320D4098100D4317E /* altitude_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671ED3BC20D4098100D4317E /* altitude_test.cpp */; }; - 671ED3C420D4098100D4317E /* road_access_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671ED3BD20D4098100D4317E /* road_access_test.cpp */; }; - 671ED3C520D4098100D4317E /* sponsored_storage_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671ED3BE20D4098100D4317E /* sponsored_storage_tests.cpp */; }; 671ED3C720D40A2000D4317E /* libplatform_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671ED3C620D40A2000D4317E /* libplatform_tests_support.a */; }; 671ED3C920D40A3E00D4317E /* libgenerator_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671ED3C820D40A3E00D4317E /* libgenerator_tests_support.a */; }; - 671ED3CB20D40A8C00D4317E /* libminizip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671ED3CA20D40A8C00D4317E /* libminizip.a */; }; 671F58B91B8611360032311E /* intermediate_data_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671F58B71B86109B0032311E /* intermediate_data_test.cpp */; }; 6726C2231A4C2BBD005EEA39 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 675343E01A3F600D00A0A8C3 /* IOKit.framework */; }; 6726C2261A4C2BBD005EEA39 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 675343E21A3F607600A0A8C3 /* Cocoa.framework */; }; 6726C2411A4C2D9F005EEA39 /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C2401A4C2D9F005EEA39 /* testingmain.cpp */; }; - 673746671CF4641B005E6D1F /* booking_quality_check.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 673746661CF4641B005E6D1F /* booking_quality_check.cpp */; }; - 673746681CF47A7B005E6D1F /* libgflags.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CC1B1C7FED001A525C /* libgflags.a */; }; - 673746691CF47BD9005E6D1F /* libgenerator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CA1B1C7FED001A525C /* libgenerator.a */; }; - 6737466A1CF47D82005E6D1F /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28D71B1C800D001A525C /* libbase.a */; }; - 6737466B1CF47D82005E6D1F /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28D31B1C8001001A525C /* libplatform.a */; }; - 6737466C1CF47D82005E6D1F /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28C91B1C7FED001A525C /* libcoding.a */; }; - 6737466D1CF47D82005E6D1F /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CB1B1C7FED001A525C /* libgeometry.a */; }; - 6737466E1CF47D82005E6D1F /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CD1B1C7FED001A525C /* libindexer.a */; }; - 6737466F1CF47D82005E6D1F /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28C71B1C7FC9001A525C /* libexpat.a */; }; - 673746711CF47E14005E6D1F /* librouting.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28D41B1C8001001A525C /* librouting.a */; }; - 673746731CF47E54005E6D1F /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28ED1B1C80FB001A525C /* libjansson.a */; }; - 673746751CF47E7A005E6D1F /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 675343DE1A3F5FE500A0A8C3 /* CoreFoundation.framework */; }; - 673746761CF47E7F005E6D1F /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 675343E01A3F600D00A0A8C3 /* IOKit.framework */; }; - 673746771CF47E83005E6D1F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 675343E21A3F607600A0A8C3 /* Cocoa.framework */; }; 674A28C81B1C7FC9001A525C /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28C71B1C7FC9001A525C /* libexpat.a */; }; 674A28CE1B1C7FED001A525C /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28C91B1C7FED001A525C /* libcoding.a */; }; 674A28CF1B1C7FED001A525C /* libgenerator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CA1B1C7FED001A525C /* libgenerator.a */; }; 674A28D01B1C7FED001A525C /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CB1B1C7FED001A525C /* libgeometry.a */; }; - 674A28D11B1C7FED001A525C /* libgflags.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CC1B1C7FED001A525C /* libgflags.a */; }; 674A28D21B1C7FED001A525C /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CD1B1C7FED001A525C /* libindexer.a */; }; 674A28D51B1C8001001A525C /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28D31B1C8001001A525C /* libplatform.a */; }; - 674A28D61B1C8001001A525C /* librouting.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28D41B1C8001001A525C /* librouting.a */; }; 674A28D81B1C800D001A525C /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28D71B1C800D001A525C /* libbase.a */; }; 674A28DC1B1C801D001A525C /* libprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28DB1B1C801D001A525C /* libprotobuf.a */; }; 674A28DF1B1C80EA001A525C /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28D71B1C800D001A525C /* libbase.a */; }; @@ -110,49 +51,16 @@ 675341631A3F54F600A0A8C3 /* generator_tool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675341621A3F54F600A0A8C3 /* generator_tool.cpp */; }; 67633E73232B9E7800684E04 /* build_version.hpp.in in Sources */ = {isa = PBXBuildFile; fileRef = 67633E4B232A84C700684E04 /* build_version.hpp.in */; }; 67633ED4233298B900684E04 /* libgeocoder.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67633ED3233298B900684E04 /* libgeocoder.a */; }; + 676ADCD52371E9B30047E110 /* path.hpp.in in Sources */ = {isa = PBXBuildFile; fileRef = 676ADCD42371E9B30047E110 /* path.hpp.in */; }; 677792521C1B2E9700EC9499 /* metadata_parser_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 677792501C1B2E9300EC9499 /* metadata_parser_test.cpp */; }; 677E2A0A1CAAC771001DC42A /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 677E2A091CAAC771001DC42A /* libz.tbd */; }; - 679624661D100F7C00AE4E3C /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28D71B1C800D001A525C /* libbase.a */; }; - 679624671D100F7C00AE4E3C /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28C91B1C7FED001A525C /* libcoding.a */; }; - 679624681D100F7C00AE4E3C /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28C71B1C7FC9001A525C /* libexpat.a */; }; - 679624691D100F7C00AE4E3C /* libgenerator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CA1B1C7FED001A525C /* libgenerator.a */; }; - 6796246A1D100F7C00AE4E3C /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CB1B1C7FED001A525C /* libgeometry.a */; }; - 6796246B1D100F7C00AE4E3C /* libgflags.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CC1B1C7FED001A525C /* libgflags.a */; }; - 6796246C1D100F7C00AE4E3C /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CD1B1C7FED001A525C /* libindexer.a */; }; - 6796246D1D100F7C00AE4E3C /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28ED1B1C80FB001A525C /* libjansson.a */; }; - 6796246E1D100F7C00AE4E3C /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28D31B1C8001001A525C /* libplatform.a */; }; - 6796246F1D100F7C00AE4E3C /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28EF1B1C8104001A525C /* libsearch.a */; }; - 679624701D100F7C00AE4E3C /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28EB1B1C80F4001A525C /* libstorage.a */; }; - 679624711D100F7C00AE4E3C /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28F11B1C8119001A525C /* libsuccinct.a */; }; - 679624741D1012B700AE4E3C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624731D1012B700AE4E3C /* Foundation.framework */; }; - 679624751D1012BD00AE4E3C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 675343E01A3F600D00A0A8C3 /* IOKit.framework */; }; - 679624771D1012C700AE4E3C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624761D1012C700AE4E3C /* SystemConfiguration.framework */; }; - 6796247B1D1012F500AE4E3C /* libprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28DB1B1C801D001A525C /* libprotobuf.a */; }; - 6796247D1D1012F500AE4E3C /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6796247C1D1012F500AE4E3C /* libopening_hours.a */; }; - 6796247E1D10130A00AE4E3C /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 677E2A091CAAC771001DC42A /* libz.tbd */; }; - 6796249F1D1013AD00AE4E3C /* libsearch_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6796249E1D1013AD00AE4E3C /* libsearch_tests_support.a */; }; - 679624B51D11773A00AE4E3C /* libmap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67AB92C61B73D03500AB5194 /* libmap.a */; }; - 679624C01D11775300AE4E3C /* libapi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624B61D11775300AE4E3C /* libapi.a */; }; - 679624C11D11775300AE4E3C /* libdrape_frontend.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624B71D11775300AE4E3C /* libdrape_frontend.a */; }; - 679624C21D11775300AE4E3C /* libdrape.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624B81D11775300AE4E3C /* libdrape.a */; }; - 679624C31D11775300AE4E3C /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624B91D11775300AE4E3C /* libfreetype.a */; }; - 679624C61D11775300AE4E3C /* libminizip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624BC1D11775300AE4E3C /* libminizip.a */; }; - 679624C71D11775300AE4E3C /* libplatform_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624BD1D11775300AE4E3C /* libplatform_tests_support.a */; }; - 679624C81D11775300AE4E3C /* libsdf_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624BE1D11775300AE4E3C /* libsdf_image.a */; }; - 679624C91D11775300AE4E3C /* libstb_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624BF1D11775300AE4E3C /* libstb_image.a */; }; - 679624CB1D11775F00AE4E3C /* librouting.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28D41B1C8001001A525C /* librouting.a */; }; - 679624CD1D11775F00AE4E3C /* libagg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624CC1D11775F00AE4E3C /* libagg.a */; }; - 679624CF1D11779700AE4E3C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624CE1D11779700AE4E3C /* OpenGL.framework */; }; 67AB92C21B73C27300AB5194 /* source_data.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67AB92B31B738DE800AB5194 /* source_data.cpp */; }; 67AB92C31B73C29000AB5194 /* source_to_element_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A39D21B727589001DDB91 /* source_to_element_test.cpp */; }; 67AB92D01B75156400AB5194 /* coasts_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1E51A4C28D5005EEA39 /* coasts_test.cpp */; }; 67AB92D11B75156700AB5194 /* feature_builder_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1E61A4C28D5005EEA39 /* feature_builder_test.cpp */; }; 67AB92D21B75156B00AB5194 /* feature_merger_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1E71A4C28D5005EEA39 /* feature_merger_test.cpp */; }; 67AB92D51B75157400AB5194 /* osm_type_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1EA1A4C28D5005EEA39 /* osm_type_test.cpp */; }; - 67AB92D61B75157700AB5194 /* tesselator_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1EB1A4C28D5005EEA39 /* tesselator_test.cpp */; }; - 67AB92D71B75157A00AB5194 /* triangles_tree_coding_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1EC1A4C28D5005EEA39 /* triangles_tree_coding_test.cpp */; }; 67AB92D91B75158300AB5194 /* osm_o5m_source_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6764B8931ADD6FC100DD8B15 /* osm_o5m_source_test.cpp */; }; - E9502E301D2BD6E600CAB86B /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 677E2A091CAAC771001DC42A /* libz.tbd */; }; /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ @@ -169,6 +77,19 @@ ); script = "export GIT_HASH=$(git log --pretty=format:'%h' -n 1)\nexport GIT_TIMESTAMP=$(git log --pretty=format:'%at' -n 1)\nexport GIT_TAG=\"LOCAL\"\nexport PROJECT_NAME=\"geocore\"\nsed -e 's/@PROJECT_NAME@/geocore/g' -e \"s/@GIT_TAG@/${GIT_TAG}/\" -e \"s/@GIT_TIMESTAMP@/${GIT_TIMESTAMP}/\" -e \"s/@GIT_HASH@/${GIT_HASH}/\" ${INPUT_FILE_PATH} > ${DERIVED_FILE_DIR}/${INPUT_FILE_BASE}\n"; }; + 676ADCD82371EAB80047E110 /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.proxy.script; + filePatterns = "*.hpp.in"; + fileType = pattern.proxy; + inputFiles = ( + ); + isEditable = 1; + outputFiles = ( + "$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE)", + ); + script = "export GIT_HASH=$(git log --pretty=format:'%h' -n 1)\nexport GIT_TIMESTAMP=$(git log --pretty=format:'%at' -n 1 || date +%s)\nexport GIT_TAG=\"LOCAL\"\nexport PROJECT_NAME=$PROJECT\nprintf \"cat < ${DERIVED_FILE_DIR}/${INPUT_FILE_BASE}\n"; + }; /* End PBXBuildRule section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -181,15 +102,6 @@ ); runOnlyForDeploymentPostprocessing = 1; }; - 6737465D1CF4639F005E6D1F /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 1; - }; 675341561A3F54D800A0A8C3 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -199,15 +111,6 @@ ); runOnlyForDeploymentPostprocessing = 1; }; - 6796245B1D100F2500AE4E3C /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 1; - }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -225,20 +128,12 @@ 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 = ""; }; 562147261F6AA36A002D2214 /* libbsdiff.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbsdiff.a; path = ../bsdiff/build/Debug/libbsdiff.a; sourceTree = ""; }; 562147281F6AA37E002D2214 /* libmwm_diff.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmwm_diff.a; path = "../../../../Library/Developer/Xcode/DerivedData/geocore-gsfdicnjgjjbizhdmwedavcucpok/Build/Products/Debug/libmwm_diff.a"; sourceTree = ""; }; 562D42951FD8460500A995F3 /* libugc.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libugc.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 56829A4A2134238700A09A28 /* cities_boundaries_checker_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cities_boundaries_checker_tests.cpp; sourceTree = ""; }; - 56829A4B2134238800A09A28 /* city_roads_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = city_roads_tests.cpp; sourceTree = ""; }; - 56A1B7A321A82BF700246F8C /* maxspeeds_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maxspeeds_tests.cpp; sourceTree = ""; }; - 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 = ""; }; @@ -248,40 +143,24 @@ 670E7BBB1EF9832200A8E9ED /* libicu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libicu.a; path = "../../../../Library/Developer/Xcode/DerivedData/geocore-gzleizqujktwggdwiejzkgjrsgvp/Build/Products/Debug/libicu.a"; sourceTree = ""; }; 670E7BBD1EF9839C00A8E9ED /* librouting_common.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librouting_common.a; path = "../../../../Library/Developer/Xcode/DerivedData/geocore-gzleizqujktwggdwiejzkgjrsgvp/Build/Products/Debug/librouting_common.a"; sourceTree = ""; }; 670E7BBF1EF983A400A8E9ED /* libtraffic.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtraffic.a; path = "../../../../Library/Developer/Xcode/DerivedData/geocore-gzleizqujktwggdwiejzkgjrsgvp/Build/Products/Debug/libtraffic.a"; sourceTree = ""; }; - 670E7BC41EF9860100A8E9ED /* ugc_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ugc_test.cpp; sourceTree = ""; }; 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 = "../../../geocore-xcode-build/Release/libopening_hours.a"; sourceTree = ""; }; 6719DD5D1B95AB0F0018166F /* libtess2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtess2.a; path = "../../../geocore-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 = ""; }; - 671ED3B820D4098000D4317E /* restriction_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = restriction_test.cpp; sourceTree = ""; }; - 671ED3B920D4098000D4317E /* srtm_parser_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = srtm_parser_test.cpp; sourceTree = ""; }; 671ED3BA20D4098000D4317E /* types_helper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = types_helper.hpp; sourceTree = ""; }; - 671ED3BB20D4098100D4317E /* restriction_collector_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = restriction_collector_test.cpp; sourceTree = ""; }; - 671ED3BC20D4098100D4317E /* altitude_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = altitude_test.cpp; sourceTree = ""; }; - 671ED3BD20D4098100D4317E /* road_access_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = road_access_test.cpp; sourceTree = ""; }; - 671ED3BE20D4098100D4317E /* sponsored_storage_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sponsored_storage_tests.cpp; sourceTree = ""; }; 671ED3C620D40A2000D4317E /* libplatform_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libplatform_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; 6726C1EA1A4C28D5005EEA39 /* osm_type_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_type_test.cpp; sourceTree = ""; }; - 6726C1EB1A4C28D5005EEA39 /* tesselator_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tesselator_test.cpp; sourceTree = ""; }; - 6726C1EC1A4C28D5005EEA39 /* triangles_tree_coding_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = triangles_tree_coding_test.cpp; sourceTree = ""; }; 6726C2351A4C2BBD005EEA39 /* generator_tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = generator_tests; sourceTree = BUILT_PRODUCTS_DIR; }; 6726C2401A4C2D9F005EEA39 /* testingmain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; - 6737465F1CF4639F005E6D1F /* booking_quality_check */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = booking_quality_check; sourceTree = BUILT_PRODUCTS_DIR; }; 673746661CF4641B005E6D1F /* booking_quality_check.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = booking_quality_check.cpp; sourceTree = ""; }; 674A28C71B1C7FC9001A525C /* libexpat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexpat.a; path = "../../../geocore-xcode-build/Debug/libexpat.a"; sourceTree = ""; }; 674A28C91B1C7FED001A525C /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "../../../geocore-xcode-build/Debug/libcoding.a"; sourceTree = ""; }; @@ -306,11 +185,11 @@ 67633E4B232A84C700684E04 /* build_version.hpp.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = build_version.hpp.in; path = ../../build_version.hpp.in; sourceTree = ""; }; 67633ED3233298B900684E04 /* libgeocoder.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgeocoder.a; sourceTree = BUILT_PRODUCTS_DIR; }; 6764B8931ADD6FC100DD8B15 /* osm_o5m_source_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_o5m_source_test.cpp; sourceTree = ""; }; + 676ADCD42371E9B30047E110 /* path.hpp.in */ = {isa = PBXFileReference; lastKnownFileType = text; name = path.hpp.in; path = ../../testing/path.hpp.in; sourceTree = ""; }; 677792501C1B2E9300EC9499 /* metadata_parser_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = metadata_parser_test.cpp; sourceTree = ""; }; 677E2A091CAAC771001DC42A /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; 677E2A0B1CAAC7CB001DC42A /* osm2meta_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm2meta_test.cpp; sourceTree = ""; }; 677E2A0C1CAAC7CB001DC42A /* tag_admixer_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tag_admixer_test.cpp; sourceTree = ""; }; - 6796245D1D100F2500AE4E3C /* booking_addr_match */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = booking_addr_match; sourceTree = BUILT_PRODUCTS_DIR; }; 679624731D1012B700AE4E3C /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 679624761D1012C700AE4E3C /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 6796247C1D1012F500AE4E3C /* libopening_hours.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopening_hours.a; path = "../../../geocore-xcode-build/Debug/libopening_hours.a"; sourceTree = ""; }; @@ -336,67 +215,23 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 671C2D8B22AFE2F7008B2B8B /* libdescriptions.a in Frameworks */, - 671C2D8922AFE250008B2B8B /* libtraffic.a in Frameworks */, - 671ED3CB20D40A8C00D4317E /* libminizip.a in Frameworks */, 677E2A0A1CAAC771001DC42A /* libz.tbd in Frameworks */, 671ED3C920D40A3E00D4317E /* libgenerator_tests_support.a in Frameworks */, 671ED3C720D40A2000D4317E /* libplatform_tests_support.a in Frameworks */, - 56EE14CF1FE803FE0036F20C /* libtransit.a in Frameworks */, 670E7BC71EF992F600A8E9ED /* libsqlite3.tbd in Frameworks */, - 670E7BC31EF9853C00A8E9ED /* librouting_common.a in Frameworks */, 670E7BC21EF9853500A8E9ED /* libicu.a in Frameworks */, 3462FDA11DC1E29E00906FD7 /* libsuccinct.a in Frameworks */, - 3462FD9F1DC1E28D00906FD7 /* libsearch.a in Frameworks */, 3462FD9A1DC1E24400906FD7 /* libjansson.a in Frameworks */, - 670F88791CE4CA81003F68BA /* libopening_hours.a in Frameworks */, - 670F291C1BA6CEE400F2ABF4 /* libmap.a in Frameworks */, - 3462FD9C1DC1E27300906FD7 /* libpugixml.a in Frameworks */, - 3462FD9B1DC1E26800906FD7 /* libeditor.a in Frameworks */, - 6719DD5E1B95AB0F0018166F /* libtess2.a in Frameworks */, 674A28DC1B1C801D001A525C /* libprotobuf.a in Frameworks */, 674A28D81B1C800D001A525C /* libbase.a in Frameworks */, 674A28D51B1C8001001A525C /* libplatform.a in Frameworks */, - 674A28D61B1C8001001A525C /* librouting.a in Frameworks */, 674A28CE1B1C7FED001A525C /* libcoding.a in Frameworks */, 674A28CF1B1C7FED001A525C /* libgenerator.a in Frameworks */, - 3462FD981DC1E22800906FD7 /* libalohalitics.a in Frameworks */, 674A28D01B1C7FED001A525C /* libgeometry.a in Frameworks */, - 674A28D11B1C7FED001A525C /* libgflags.a in Frameworks */, 674A28D21B1C7FED001A525C /* libindexer.a in Frameworks */, 674A28C81B1C7FC9001A525C /* libexpat.a in Frameworks */, 6726C2231A4C2BBD005EEA39 /* IOKit.framework in Frameworks */, 6726C2261A4C2BBD005EEA39 /* Cocoa.framework in Frameworks */, - 3462FD9D1DC1E27D00906FD7 /* liboauthcpp.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 6737465C1CF4639F005E6D1F /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 3462FDA91DC1E31E00906FD7 /* libprotobuf.a in Frameworks */, - 3462FDA71DC1E30B00906FD7 /* libopening_hours.a in Frameworks */, - 3462FDA41DC1E2DA00906FD7 /* libeditor.a in Frameworks */, - E9502E301D2BD6E600CAB86B /* libz.tbd in Frameworks */, - 673746771CF47E83005E6D1F /* Cocoa.framework in Frameworks */, - 3462FDAA1DC1E32C00906FD7 /* libsearch.a in Frameworks */, - 6737466B1CF47D82005E6D1F /* libplatform.a in Frameworks */, - 3462FDA21DC1E2D300906FD7 /* libalohalitics.a in Frameworks */, - 673746711CF47E14005E6D1F /* librouting.a in Frameworks */, - 6737466D1CF47D82005E6D1F /* libgeometry.a in Frameworks */, - 3462FDA51DC1E2F300906FD7 /* liboauthcpp.a in Frameworks */, - 6737466F1CF47D82005E6D1F /* libexpat.a in Frameworks */, - 673746681CF47A7B005E6D1F /* libgflags.a in Frameworks */, - 673746731CF47E54005E6D1F /* libjansson.a in Frameworks */, - 3462FDAB1DC1E33400906FD7 /* libsuccinct.a in Frameworks */, - 673746761CF47E7F005E6D1F /* IOKit.framework in Frameworks */, - 673746691CF47BD9005E6D1F /* libgenerator.a in Frameworks */, - 6737466E1CF47D82005E6D1F /* libindexer.a in Frameworks */, - 673746751CF47E7A005E6D1F /* CoreFoundation.framework in Frameworks */, - 6737466C1CF47D82005E6D1F /* libcoding.a in Frameworks */, - 6737466A1CF47D82005E6D1F /* libbase.a in Frameworks */, - 3462FDA31DC1E2D600906FD7 /* libpugixml.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -421,44 +256,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 6796245A1D100F2500AE4E3C /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 679624CF1D11779700AE4E3C /* OpenGL.framework in Frameworks */, - 679624CD1D11775F00AE4E3C /* libagg.a in Frameworks */, - 679624CB1D11775F00AE4E3C /* librouting.a in Frameworks */, - 679624C01D11775300AE4E3C /* libapi.a in Frameworks */, - 679624C11D11775300AE4E3C /* libdrape_frontend.a in Frameworks */, - 679624C21D11775300AE4E3C /* libdrape.a in Frameworks */, - 679624C31D11775300AE4E3C /* libfreetype.a in Frameworks */, - 679624C61D11775300AE4E3C /* libminizip.a in Frameworks */, - 679624C71D11775300AE4E3C /* libplatform_tests_support.a in Frameworks */, - 679624C81D11775300AE4E3C /* libsdf_image.a in Frameworks */, - 679624C91D11775300AE4E3C /* libstb_image.a in Frameworks */, - 679624B51D11773A00AE4E3C /* libmap.a in Frameworks */, - 6796249F1D1013AD00AE4E3C /* libsearch_tests_support.a in Frameworks */, - 6796247E1D10130A00AE4E3C /* libz.tbd in Frameworks */, - 6796247D1D1012F500AE4E3C /* libopening_hours.a in Frameworks */, - 6796247B1D1012F500AE4E3C /* libprotobuf.a in Frameworks */, - 679624771D1012C700AE4E3C /* SystemConfiguration.framework in Frameworks */, - 679624751D1012BD00AE4E3C /* IOKit.framework in Frameworks */, - 679624741D1012B700AE4E3C /* Foundation.framework in Frameworks */, - 679624661D100F7C00AE4E3C /* libbase.a in Frameworks */, - 679624671D100F7C00AE4E3C /* libcoding.a in Frameworks */, - 679624681D100F7C00AE4E3C /* libexpat.a in Frameworks */, - 679624691D100F7C00AE4E3C /* libgenerator.a in Frameworks */, - 6796246A1D100F7C00AE4E3C /* libgeometry.a in Frameworks */, - 6796246B1D100F7C00AE4E3C /* libgflags.a in Frameworks */, - 6796246C1D100F7C00AE4E3C /* libindexer.a in Frameworks */, - 6796246D1D100F7C00AE4E3C /* libjansson.a in Frameworks */, - 6796246E1D100F7C00AE4E3C /* libplatform.a in Frameworks */, - 6796246F1D100F7C00AE4E3C /* libsearch.a in Frameworks */, - 679624701D100F7C00AE4E3C /* libstorage.a in Frameworks */, - 679624711D100F7C00AE4E3C /* libsuccinct.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -500,50 +297,27 @@ children = ( 395784D3230303E700F2CC07 /* geo_objects_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 */, 671F58B71B86109B0032311E /* intermediate_data_test.cpp */, 677792501C1B2E9300EC9499 /* metadata_parser_test.cpp */, - 671ED3B720D4098000D4317E /* node_mixer_test.cpp */, 6764B8931ADD6FC100DD8B15 /* osm_o5m_source_test.cpp */, 6726C1EA1A4C28D5005EEA39 /* osm_type_test.cpp */, 677E2A0B1CAAC7CB001DC42A /* osm2meta_test.cpp */, - 671ED3BB20D4098100D4317E /* restriction_collector_test.cpp */, - 671ED3B820D4098000D4317E /* restriction_test.cpp */, - 671ED3BD20D4098100D4317E /* road_access_test.cpp */, 67AB92B31B738DE800AB5194 /* source_data.cpp */, 67AB92B41B738DE800AB5194 /* source_data.hpp */, 674A39D21B727589001DDB91 /* source_to_element_test.cpp */, - 671ED3BE20D4098100D4317E /* sponsored_storage_tests.cpp */, - 671ED3B920D4098000D4317E /* srtm_parser_test.cpp */, 677E2A0C1CAAC7CB001DC42A /* tag_admixer_test.cpp */, - 6726C1EB1A4C28D5005EEA39 /* tesselator_test.cpp */, 6726C2401A4C2D9F005EEA39 /* testingmain.cpp */, - 6726C1EC1A4C28D5005EEA39 /* triangles_tree_coding_test.cpp */, 671ED3BA20D4098000D4317E /* types_helper.hpp */, - 670E7BC41EF9860100A8E9ED /* ugc_test.cpp */, ); name = generator_tests; path = ../../generator/generator_tests; @@ -562,6 +336,7 @@ 6753414F1A3F54D800A0A8C3 = { isa = PBXGroup; children = ( + 676ADCD42371E9B30047E110 /* path.hpp.in */, 34F558531DBF3ACC00A4FC11 /* common-debug.xcconfig */, 34F558541DBF3ACC00A4FC11 /* common-release.xcconfig */, 6737465A1CF46324005E6D1F /* booking_quality_check */, @@ -578,8 +353,6 @@ children = ( 675341581A3F54D800A0A8C3 /* generator_tool */, 6726C2351A4C2BBD005EEA39 /* generator_tests */, - 6737465F1CF4639F005E6D1F /* booking_quality_check */, - 6796245D1D100F2500AE4E3C /* booking_addr_match */, ); name = Products; sourceTree = ""; @@ -649,6 +422,7 @@ 6726C2311A4C2BBD005EEA39 /* CopyFiles */, ); buildRules = ( + 676ADCD82371EAB80047E110 /* PBXBuildRule */, ); dependencies = ( ); @@ -657,23 +431,6 @@ productReference = 6726C2351A4C2BBD005EEA39 /* generator_tests */; productType = "com.apple.product-type.tool"; }; - 6737465E1CF4639F005E6D1F /* booking_quality_check */ = { - isa = PBXNativeTarget; - buildConfigurationList = 673746631CF4639F005E6D1F /* Build configuration list for PBXNativeTarget "booking_quality_check" */; - buildPhases = ( - 6737465B1CF4639F005E6D1F /* Sources */, - 6737465C1CF4639F005E6D1F /* Frameworks */, - 6737465D1CF4639F005E6D1F /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = booking_quality_check; - productName = booking_quality_check; - productReference = 6737465F1CF4639F005E6D1F /* booking_quality_check */; - productType = "com.apple.product-type.tool"; - }; 675341571A3F54D800A0A8C3 /* generator_tool */ = { isa = PBXNativeTarget; buildConfigurationList = 6753415F1A3F54D800A0A8C3 /* Build configuration list for PBXNativeTarget "generator_tool" */; @@ -692,23 +449,6 @@ productReference = 675341581A3F54D800A0A8C3 /* generator_tool */; productType = "com.apple.product-type.tool"; }; - 6796245C1D100F2500AE4E3C /* booking_addr_match */ = { - isa = PBXNativeTarget; - buildConfigurationList = 679624611D100F2500AE4E3C /* Build configuration list for PBXNativeTarget "booking_addr_match" */; - buildPhases = ( - 679624591D100F2500AE4E3C /* Sources */, - 6796245A1D100F2500AE4E3C /* Frameworks */, - 6796245B1D100F2500AE4E3C /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = booking_addr_match; - productName = booking_addr_match; - productReference = 6796245D1D100F2500AE4E3C /* booking_addr_match */; - productType = "com.apple.product-type.tool"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -718,16 +458,10 @@ LastUpgradeCheck = 0800; ORGANIZATIONNAME = maps.me; TargetAttributes = { - 6737465E1CF4639F005E6D1F = { - CreatedOnToolsVersion = 7.3.1; - }; 675341571A3F54D800A0A8C3 = { CreatedOnToolsVersion = 6.1; DevelopmentTeam = 5P46UQ2Y83; }; - 6796245C1D100F2500AE4E3C = { - CreatedOnToolsVersion = 7.3.1; - }; }; }; buildConfigurationList = 675341531A3F54D800A0A8C3 /* Build configuration list for PBXProject "generator_tool" */; @@ -745,8 +479,6 @@ targets = ( 675341571A3F54D800A0A8C3 /* generator_tool */, 6726C21C1A4C2BBD005EEA39 /* generator_tests */, - 6737465E1CF4639F005E6D1F /* booking_quality_check */, - 6796245C1D100F2500AE4E3C /* booking_addr_match */, ); }; /* End PBXProject section */ @@ -756,60 +488,30 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 676ADCD52371E9B30047E110 /* path.hpp.in 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 */, 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 */, - 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 */, 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 */, 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 */, - 671C2D8222AFDAB4008B2B8B /* descriptions_section_builder_tests.cpp in Sources */, - 671ED3C120D4098100D4317E /* srtm_parser_test.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 */, ); runOnlyForDeploymentPostprocessing = 0; }; - 6737465B1CF4639F005E6D1F /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 673746671CF4641B005E6D1F /* booking_quality_check.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 675341541A3F54D800A0A8C3 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -819,14 +521,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 679624591D100F2500AE4E3C /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 395784D923030D5000F2CC07 /* booking_addr_match.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ @@ -857,20 +551,6 @@ }; name = Release; }; - 673746641CF4639F005E6D1F /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 673746651CF4639F005E6D1F /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; 6753415D1A3F54D800A0A8C3 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 34F558531DBF3ACC00A4FC11 /* common-debug.xcconfig */; @@ -921,20 +601,6 @@ }; name = Release; }; - 679624621D100F2500AE4E3C /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 679624631D100F2500AE4E3C /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; A8E541501F9FBD9900A1B8FA /* Production Full */ = { isa = XCBuildConfiguration; baseConfigurationReference = 34F558541DBF3ACC00A4FC11 /* common-release.xcconfig */; @@ -970,20 +636,6 @@ }; name = "Production Full"; }; - A8E541531F9FBD9900A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E541541F9FBD9900A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -997,16 +649,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 673746631CF4639F005E6D1F /* Build configuration list for PBXNativeTarget "booking_quality_check" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 673746641CF4639F005E6D1F /* Debug */, - 673746651CF4639F005E6D1F /* Release */, - A8E541531F9FBD9900A1B8FA /* Production Full */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 675341531A3F54D800A0A8C3 /* Build configuration list for PBXProject "generator_tool" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -1027,16 +669,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 679624611D100F2500AE4E3C /* Build configuration list for PBXNativeTarget "booking_addr_match" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 679624621D100F2500AE4E3C /* Debug */, - 679624631D100F2500AE4E3C /* Release */, - A8E541541F9FBD9900A1B8FA /* Production Full */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 675341501A3F54D800A0A8C3 /* Project object */;