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

Merge pull request #3670 from syershov/booking-addr-match

Browse source 
Booking addresses
This commit is contained in:
mgsergio 2016-06-30 18:45:20 +04:00 • committed by GitHub
commit 517c506328
19 changed files with 854 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
editor/user_stats.cpp
View file

@ -179,8 +179,10 @@ string UserStatsLoader::GetUserName() const
bool UserStatsLoader::LoadFromSettings()
{
uint32_t rating, changesCount;
uint64_t lastUpdate;
uint32_t rating = 0;
uint32_t changesCount = 0;
uint64_t lastUpdate = 0;
if (!settings::Get(kSettingsUserName, m_userName) ||
!settings::Get(kSettingsChangesCount, changesCount) ||
!settings::Get(kSettingsRating, rating) ||

132
generator/booking_dataset.cpp
View file

@ -1,5 +1,8 @@
#include "generator/booking_dataset.hpp"
#include "platform/local_country_file_utils.hpp"
#include "platform/platform.hpp"
#include "indexer/search_delimiters.hpp"
#include "indexer/search_string_utils.hpp"
@ -26,13 +29,26 @@ bool CheckForValues(string const & value)
}
return false;
}
string EscapeTabs(string const & str)
{
stringstream ss;
for (char c : str)
{
if (c == '\t')
ss << "\\t";
else
ss << c;
}
return ss.str();
}
} // namespace
BookingDataset::Hotel::Hotel(string const & src)
{
vector<string> rec;
strings::ParseCSVRow(src, '\t', rec);
CHECK(rec.size() == FieldsCount(), ("Error parsing hotels.tsv line:", src));
CHECK(rec.size() == FieldsCount(), ("Error parsing hotels.tsv line:", EscapeTabs(src)));
strings::to_uint(rec[Index(Fields::Id)], id);
strings::to_double(rec[Index(Fields::Latitude)], lat);
@ -55,21 +71,61 @@ BookingDataset::Hotel::Hotel(string const & src)
ostream & operator<<(ostream & s, BookingDataset::Hotel const & h)
{
s << fixed << setprecision(7);
return s << "Name: " << h.name << "\t Address: " << h.address << "\t lat: " << h.lat
<< " lon: " << h.lon;
}
BookingDataset::BookingDataset(string const & dataPath)
BookingDataset::AddressMatcher::AddressMatcher()
{
LoadHotels(dataPath);
vector<platform::LocalCountryFile> localFiles;
size_t counter = 0;
for (auto const & hotel : m_hotels)
Platform & platform = GetPlatform();
platform::FindAllLocalMapsInDirectoryAndCleanup(platform.WritableDir(), 0 /* version */,
-1 /* latestVersion */, localFiles);
for (platform::LocalCountryFile const & localFile : localFiles)
{
TBox b(TPoint(hotel.lat, hotel.lon), TPoint(hotel.lat, hotel.lon));
m_rtree.insert(std::make_pair(b, counter));
++counter;
LOG(LINFO, ("Found mwm:", localFile));
try
{
m_index.RegisterMap(localFile);
}
catch (RootException const & ex)
{
CHECK(false, ("Bad mwm file:", localFile));
}
}
m_coder = make_unique<search::ReverseGeocoder>(m_index);
}
void BookingDataset::AddressMatcher::operator()(Hotel & hotel)
{
search::ReverseGeocoder::Address addr;
m_coder->GetNearbyAddress(MercatorBounds::FromLatLon(hotel.lat, hotel.lon), addr);
hotel.street = addr.GetStreetName();
hotel.houseNumber = addr.GetHouseNumber();
}
BookingDataset::BookingDataset(string const & dataPath, string const & addressReferencePath)
{
if (dataPath.empty())
return;
ifstream dataSource(dataPath);
if (!dataSource.is_open())
{
LOG(LERROR, ("Error while opening", dataPath, ":", strerror(errno)));
return;
}
LoadHotels(dataSource, addressReferencePath);
}
BookingDataset::BookingDataset(istream & dataSource, string const & addressReferencePath)
{
LoadHotels(dataSource, addressReferencePath);
}
bool BookingDataset::BookingFilter(OsmElement const & e) const
@ -90,7 +146,13 @@ bool BookingDataset::TourismFilter(OsmElement const & e) const
BookingDataset::Hotel const & BookingDataset::GetHotel(size_t index) const
{
ASSERT_GREATER(m_hotels.size(), index, ());
ASSERT_LESS(index, m_hotels.size(), ());
return m_hotels[index];
}
BookingDataset::Hotel & BookingDataset::GetHotel(size_t index)
{
ASSERT_LESS(index, m_hotels.size(), ());
return m_hotels[index];
}
@ -184,6 +246,12 @@ void BookingDataset::BuildFeatures(function<void(OsmElement *)> const & fn) cons
}
}
if (!hotel.street.empty())
e.AddTag("addr:street", hotel.street);
if (!hotel.houseNumber.empty())
e.AddTag("addr:housenumber", hotel.houseNumber);
switch (hotel.type)
{
case 19:
@ -244,22 +312,46 @@ double BookingDataset::ScoreByLinearNormDistance(double distance)
return 1.0 - distance / kDistanceLimitInMeters;
}
void BookingDataset::LoadHotels(string const & path)
void BookingDataset::LoadHotels(istream & src, string const & addressReferencePath)
{
m_hotels.clear();
if (path.empty())
return;
ifstream src(path);
if (!src.is_open())
{
LOG(LERROR, ("Error while opening", path, ":", strerror(errno)));
return;
}
m_rtree.clear();
for (string line; getline(src, line);)
m_hotels.emplace_back(line);
if (!addressReferencePath.empty())
{
LOG(LINFO, ("Reference addresses for booking objects", addressReferencePath));
Platform & platform = GetPlatform();
string const backupPath = platform.WritableDir();
platform.SetWritableDirForTests(addressReferencePath);
AddressMatcher addressMatcher;
size_t matchedNum = 0;
size_t emptyAddr = 0;
for (Hotel & hotel : m_hotels)
{
addressMatcher(hotel);
if (hotel.address.empty())
++emptyAddr;
if (hotel.IsAddressPartsFilled())
++matchedNum;
}
LOG(LINFO,
("Num of hotels:", m_hotels.size(), "matched:", matchedNum, "empty addresses:", emptyAddr));
platform.SetWritableDirForTests(backupPath);
}
size_t counter = 0;
for (auto const & hotel : m_hotels)
{
TBox b(TPoint(hotel.lat, hotel.lon), TPoint(hotel.lat, hotel.lon));
m_rtree.insert(make_pair(b, counter));
++counter;
}
}
bool BookingDataset::MatchWithBooking(OsmElement const & e) const

25
generator/booking_dataset.hpp
View file

@ -2,6 +2,10 @@
#include "generator/osm_element.hpp"
#include "indexer/index.hpp"
#include "search/reverse_geocoder.hpp"
#include "boost/geometry.hpp"
#include "boost/geometry/geometries/point.hpp"
#include "boost/geometry/geometries/box.hpp"
@ -46,6 +50,8 @@ public:
double lon = 0.0;
string name;
string address;
string street;
string houseNumber;
uint32_t stars = 0;
uint32_t priceCategory = 0;
double ratingBooking = 0.0;
@ -57,14 +63,29 @@ public:
static constexpr size_t Index(Fields field) { return static_cast<size_t>(field); }
static constexpr size_t FieldsCount() { return static_cast<size_t>(Fields::Counter); }
explicit Hotel(string const & src);
inline bool IsAddressPartsFilled() const { return !street.empty() || !houseNumber.empty(); }
};
explicit BookingDataset(string const & dataPath);
class AddressMatcher
{
Index m_index;
unique_ptr<search::ReverseGeocoder> m_coder;
public:
AddressMatcher();
void operator()(Hotel & hotel);
};
explicit BookingDataset(string const & dataPath, string const & addressReferencePath = string());
explicit BookingDataset(istream & dataSource, string const & addressReferencePath = string());
bool BookingFilter(OsmElement const & e) const;
bool TourismFilter(OsmElement const & e) const;
inline size_t Size() const { return m_hotels.size(); }
Hotel const & GetHotel(size_t index) const;
Hotel & GetHotel(size_t index);
vector<size_t> GetNearestHotels(double lat, double lon, size_t limit,
double maxDistance = 0.0) const;
bool MatchByName(string const & osmName, vector<size_t> const & bookingIndexes) const;
@ -83,7 +104,7 @@ protected:
boost::geometry::index::rtree<TValue, boost::geometry::index::quadratic<16>> m_rtree;
void LoadHotels(string const & path);
void LoadHotels(istream & path, string const & addressReferencePath);
bool MatchWithBooking(OsmElement const & e) const;
bool Filter(OsmElement const & e, function<bool(OsmElement const &)> const & fn) const;
};

103
generator/booking_quality_check/booking_addr_match.cpp Normal file
View file

@ -0,0 +1,103 @@
#include "generator/booking_dataset.hpp"
#include "generator/osm_source.hpp"
#include "map/framework.hpp"
#include "search/processor_factory.hpp"
#include "search/ranking_info.hpp"
#include "search/result.hpp"
#include "search/search_quality/helpers.hpp"
#include "search/search_tests_support/test_search_engine.hpp"
#include "search/search_tests_support/test_search_request.hpp"
#include "indexer/classificator_loader.hpp"
#include "indexer/data_header.hpp"
#include "indexer/index.hpp"
#include "indexer/mwm_set.hpp"
#include "storage/country_info_getter.hpp"
#include "storage/index.hpp"
#include "storage/storage.hpp"
#include "coding/reader_wrapper.hpp"
#include "geometry/distance_on_sphere.hpp"
#include "platform/country_file.hpp"
#include "platform/local_country_file.hpp"
#include "platform/local_country_file_utils.hpp"
#include "platform/platform.hpp"
#include "std/fstream.hpp"
#include "std/iostream.hpp"
#include "std/numeric.hpp"
#include "std/shared_ptr.hpp"
#include "3party/gflags/src/gflags/gflags.h"
using namespace generator;
using namespace storage;
using namespace search;
using namespace search::tests_support;
DEFINE_string(booking_data, "", "Path to booking data in .tsv format");
DEFINE_string(user_resource_path, "", "Path to data directory (resources dir)");
DEFINE_string(data_path, "", "Path to mwm files (writable dir)");
DEFINE_string(locale, "en", "Locale of all the search queries");
DEFINE_int32(num_threads, 1, "Number of search engine threads");
int main(int argc, char * argv[])
{
google::SetUsageMessage(
"Takes OSM XML data from stdin and creates"
" data and index files in several passes.");
google::ParseCommandLineFlags(&argc, &argv, true);
Platform & platform = GetPlatform();
string countriesFile = COUNTRIES_FILE;
if (!FLAGS_user_resource_path.empty())
{
platform.SetResourceDir(FLAGS_user_resource_path);
countriesFile = my::JoinFoldersToPath(FLAGS_user_resource_path, COUNTRIES_FILE);
}
if (!FLAGS_data_path.empty())
{
platform.SetSettingsDirForTests(FLAGS_data_path);
platform.SetWritableDirForTests(FLAGS_data_path);
}
LOG(LINFO, ("writable dir =", platform.WritableDir()));
LOG(LINFO, ("resources dir =", platform.ResourcesDir()));
LOG_SHORT(LINFO, ("Booking data:", FLAGS_booking_data));
BookingDataset bookingDataset(FLAGS_booking_data);
BookingDataset::AddressMatcher addressMatcher;
size_t matchedNum = 0;
size_t emptyAddr = 0;
for (size_t i = 0; i < bookingDataset.Size(); ++i)
{
BookingDataset::Hotel & hotel = bookingDataset.GetHotel(i);
addressMatcher(hotel);
if (hotel.address.empty())
++emptyAddr;
if (hotel.IsAddressPartsFilled())
{
++matchedNum;
cout << "[" << i << "/" << bookingDataset.Size() << "] Hotel: " << hotel.address
<< " AddLoc: " << hotel.translations << " --> " << hotel.street << " "
<< hotel.houseNumber << endl;
}
}
cout << "Num of hotels: " << bookingDataset.Size() << " matched: " << matchedNum
<< " Empty addresses: " << emptyAddr << endl;
return 0;
}

1
generator/generate_info.hpp
View file

@ -43,6 +43,7 @@ struct GenerateInfo
string m_osmFileName;
string m_bookingDatafileName;
string m_bookingReferenceDir;
uint32_t m_versionDate = 0;

61
generator/generator_tests/booking_test.cpp Normal file
View file

@ -0,0 +1,61 @@
#include "testing/testing.hpp"
#include "generator/booking_dataset.hpp"
UNIT_TEST(BookingDataset_SmokeTest)
{
stringstream ss;
generator::BookingDataset data(ss);
TEST_EQUAL(data.Size(), 0, ());
}
UNIT_TEST(BookingDataset_ParseTest)
{
stringstream ss(
"1485988\t36.75818960879561\t3.053177244180233\tAppartement Alger Centre\t50 Avenue Ahmed "
"Ghermoul\t0\t0\tNone\tNone\thttp://www.booking.com/hotel/dz/"
"appartement-alger-centre-alger.html\t201\t\t\t");
generator::BookingDataset data(ss);
TEST_EQUAL(data.Size(), 1, ());
}
UNIT_TEST(BookingDataset_ParseTest2)
{
stringstream ss(
"1485988\t36.75818960879561\t3.053177244180233\tAppartement Alger Centre\t50 Avenue Ahmed "
"Ghermoul\t0\t0\tNone\tNone\thttp://www.booking.com/hotel/dz/"
"appartement-alger-centre-alger.html\t201\t\t\t\n"
"357811\t34.86737239675703\t-1.31686270236969\tRenaissance Tlemcen Hotel\tRenaissance "
"Tlemcen "
"Hotel\t5\t2\tNone\tNone\thttp://www.booking.com/hotel/dz/"
"renaissance-tlemcen.html\t204\t\t\t\n"
"1500820\t36.72847621708523\t3.0645270245369147\tMazghana Apartment\tCite Garidi 1 Tours 3 N "
"53, "
"Kouba\t0\t0\tNone\tNone\thttp://www.booking.com/hotel/dz/"
"mazghana-apartment.html\t201\t\t\t\n"
"1318991\t35.692865978372666\t-0.6278949570083796\tBest Western Hotel Colombe\t6 Bd Zabour "
"Larbi Hai Khaldia "
"Delmonte\t4\t2\tNone\tNone\thttp://www.booking.com/hotel/dz/"
"best-western-colombe.html\t204\t\t\t\n"
"1495828\t36.33835943\t6.626214981\tConstantine Marriott Hotel\tOued Rhumel Street, Cites "
"des Arcades "
"Romaines,\t5\t2\tNone\tNone\thttp://www.booking.com/hotel/dz/"
"constantine-marriott.html\t204\t\t\t\n"
"1411999\t35.73994643933386\t-0.757756233215332\tResidence Nadra\tBoulevard de la plage, "
"Niche 1236 Paradis "
"plage\t0\t1\tNone\tNone\thttp://www.booking.com/hotel/dz/residence-nadra.html\t201\t\t\t\n"
"1497769\t36.80667121575615\t3.231203541069817\tApartment La Pérouse\tLa Pérouse Ain "
"Taya\t0\t0\tNone\tNone\thttp://www.booking.com/hotel/dz/"
"apartment-la-perouse.html\t220\t\t\t\n"
"1668244\t36.715150622433804\t2.8442734479904175\tAZ Hotel Zeralda\t09 Rue de Mahelma - "
"Zeralda - "
"ALGER\t4\t2\tNone\tNone\thttp://www.booking.com/hotel/dz/el-aziz-zeralda.html\t204\t\t\t\n"
"1486823\t36.73432645678891\t3.0335435271263123\tGuest House Marhaba\tResidence Soumam - "
"Bloc B - Appt 17- Said "
"Hamdine\t0\t0\tNone\tNone\thttp://www.booking.com/hotel/dz/marhaba.html\t208\t\t\t\n"
"1759799\t35.73832476589291\t-0.7553583383560181\tHotel la brise\tAngle boulevard de la "
"plage et route nationale niche 1159 paradis "
"plage\t2\t2\tNone\tNone\thttp://www.booking.com/hotel/dz/la-brise.html\t204\t\t\t\n");
generator::BookingDataset data(ss);
TEST_EQUAL(data.Size(), 10, ());
}

6
generator/generator_tests/generator_tests.pro
View file

@ -4,8 +4,10 @@ CONFIG -= app_bundle
TEMPLATE = app
ROOT_DIR = ../..
DEPENDENCIES = generator map routing indexer platform geometry coding base \
expat tess2 protobuf tomcrypt osrm succinct
DEPENDENCIES = generator drape_frontend routing search storage indexer drape map platform editor geometry \
coding base freetype expat fribidi tomcrypt jansson protobuf osrm stats_client \
minizip succinct pugixml tess2 gflags oauthcpp
include($$ROOT_DIR/common.pri)

2
generator/generator_tool/generator_tool.cpp
View file

@ -68,6 +68,7 @@ DEFINE_string(osm_file_name, "", "Input osm area file");
DEFINE_string(osm_file_type, "xml", "Input osm area file type [xml, o5m]");
DEFINE_string(user_resource_path, "", "User defined resource path for classificator.txt and etc.");
DEFINE_string(booking_data, "", "Path to booking data in .tsv format");
DEFINE_string(booking_reference_path, "", "Path to mwm dataset for match booking addresses");
DEFINE_uint64(planet_version, my::SecondsSinceEpoch(), "Version as seconds since epoch, by default - now");
int main(int argc, char ** argv)
@ -102,6 +103,7 @@ int main(int argc, char ** argv)
genInfo.m_failOnCoasts = FLAGS_fail_on_coasts;
genInfo.m_preloadCache = FLAGS_preload_cache;
genInfo.m_bookingDatafileName = FLAGS_booking_data;
genInfo.m_bookingReferenceDir = FLAGS_booking_reference_path;
genInfo.m_versionDate = static_cast<uint32_t>(FLAGS_planet_version);

10
generator/generator_tool/generator_tool.pro
View file

@ -1,10 +1,10 @@
# Generator binary
ROOT_DIR = ../..
DEPENDENCIES = generator search routing storage indexer platform editor geometry coding base \
osrm gflags expat tess2 jansson protobuf tomcrypt \
succinct stats_client pugixml
DEPENDENCIES = generator routing search storage indexer editor platform geometry \
coding base freetype expat fribidi tomcrypt jansson protobuf osrm stats_client \
minizip succinct pugixml tess2 gflags oauthcpp
include($$ROOT_DIR/common.pri)
INCLUDEPATH *= $$ROOT_DIR/3party/gflags/src
@ -16,6 +16,10 @@ TEMPLATE = app
# needed for Platform::WorkingDir() and unicode combining
QT *= core
macx-* {
LIBS *= "-framework IOKit" "-framework SystemConfiguration"
}
SOURCES += \
generator_tool.cpp \

5
generator/osm_source.cpp
View file

@ -513,9 +513,10 @@ bool GenerateFeaturesImpl(feature::GenerateInfo & info)
TagAdmixer tagAdmixer(info.GetIntermediateFileName("ways", ".csv"),
info.GetIntermediateFileName("towns", ".csv"));
TagReplacer tagReplacer(GetPlatform().ResourcesDir() + REPLACED_TAGS_FILE);
// If info.m_bookingDatafileName is empty then no data will be loaded.
generator::BookingDataset bookingDataset(info.m_bookingDatafileName);
generator::BookingDataset bookingDataset(info.m_bookingDatafileName,
info.m_bookingReferenceDir);
stringstream skippedElements;

2
generator/search_index_builder.cpp
View file

@ -337,7 +337,7 @@ void BuildAddressTable(FilesContainerR & container, Writer & writer)
feature::AddressData data;
data.Deserialize(src);
size_t streetIndex;
size_t streetIndex = 0;
bool streetMatched = false;
strings::UniString const street = search::GetStreetNameAsKey(data.Get(feature::AddressData::STREET));
if (!street.empty())

12
indexer/indexer_tests/feature_xml_test.cpp
View file

@ -3,19 +3,11 @@
#include "indexer/classificator_loader.hpp"
#include "indexer/feature.hpp"
namespace
{
struct TestSetUp
{
TestSetUp() { classificator::Load(); }
};
TestSetUp g_testSetUp;
} // namespace
UNIT_TEST(FeatureType_FromXMLAndBackToXML)
{
classificator::Load();
string const xmlNoTypeStr = R"(<?xml version="1.0"?>
<node lat="55.7978998" lon="37.474528" timestamp="2015-11-27T21:13:32Z">
<tag k="name" v="Gorki Park" />

3
search/search_quality/search_quality_tool/search_quality_tool.cpp
View file

@ -5,9 +5,6 @@
#include "indexer/index.hpp"
#include "indexer/mwm_set.hpp"
#include "storage/country_info_getter.hpp"
#include "storage/storage.hpp"
#include "geometry/mercator.hpp"
#include "geometry/point2d.hpp"

4
xcode/coding/coding.xcodeproj/project.pbxproj
View file

@ -16,12 +16,12 @@
394916BF1BAC3A82002A8C4F /* arithmetic_codec_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 394916961BAC3A82002A8C4F /* arithmetic_codec_test.cpp */; };
394916E41BAC3ACF002A8C4F /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6753421B1A3F586300A0A8C3 /* libcoding.a */; };
394917201BAC3BE0002A8C4F /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3949171F1BAC3BE0002A8C4F /* testingmain.cpp */; };
394917261BAC3C2F002A8C4F /* huffman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 394917221BAC3C2F002A8C4F /* huffman.cpp */; };
3949172B1BAC3CAC002A8C4F /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 394917271BAC3CAC002A8C4F /* libbase.a */; };
3949172C1BAC3CAC002A8C4F /* libminizip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 394917281BAC3CAC002A8C4F /* libminizip.a */; };
3949172D1BAC3CAC002A8C4F /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 394917291BAC3CAC002A8C4F /* libsuccinct.a */; };
3949172E1BAC3CAC002A8C4F /* libtomcrypt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3949172A1BAC3CAC002A8C4F /* libtomcrypt.a */; };
394917301BAC3CC9002A8C4F /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3949172F1BAC3CC9002A8C4F /* libz.tbd */; };
670BAACB1D0B0C1E000302DA /* huffman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 394917221BAC3C2F002A8C4F /* huffman.cpp */; };
670D04BD1B0BA92D0013A7AC /* expat_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 670D04B31B0BA9050013A7AC /* expat_impl.h */; };
670D04BE1B0BA92D0013A7AC /* file64_api.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670D04B41B0BA9050013A7AC /* file64_api.hpp */; };
670D04BF1B0BA92D0013A7AC /* file_data.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670D04B51B0BA9050013A7AC /* file_data.cpp */; };
@ -616,7 +616,6 @@
67E8DB6A1BBC17490053C5BA /* reader_writer_ops_test.cpp in Sources */,
67E8DB611BBC17490053C5BA /* file_utils_test.cpp in Sources */,
67E8DB671BBC17490053C5BA /* png_decoder_test.cpp in Sources */,
394917261BAC3C2F002A8C4F /* huffman.cpp in Sources */,
394917201BAC3BE0002A8C4F /* testingmain.cpp in Sources */,
67E8DB5D1BBC17490053C5BA /* endianness_test.cpp in Sources */,
67E8DB6D1BBC17490053C5BA /* trie_test.cpp in Sources */,
@ -664,6 +663,7 @@
6753429F1A3F588C00A0A8C3 /* file_reader.cpp in Sources */,
675342C51A3F588C00A0A8C3 /* uri.cpp in Sources */,
675342BB1A3F588C00A0A8C3 /* reader.cpp in Sources */,
670BAACB1D0B0C1E000302DA /* huffman.cpp in Sources */,
6753429C1A3F588C00A0A8C3 /* file_name_utils.cpp in Sources */,
675342A71A3F588C00A0A8C3 /* hex.cpp in Sources */,
675342A31A3F588C00A0A8C3 /* file_writer.cpp in Sources */,

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

@ -442,6 +442,7 @@
"$(OMIM_ROOT)/3party/gflags/src",
"$(OMIM_ROOT)/3party/osrm/osrm-backend/include",
"$(QT_PATH)/include",
"$(OMIM_ROOT)/3party/glm",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = YES;
@ -484,6 +485,7 @@
"$(OMIM_ROOT)/3party/gflags/src",
"$(OMIM_ROOT)/3party/osrm/osrm-backend/include",
"$(QT_PATH)/include",
"$(OMIM_ROOT)/3party/glm",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = NO;

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

@ -77,6 +77,47 @@
677E2A0D1CAAC7CB001DC42A /* osm2meta_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 677E2A0B1CAAC7CB001DC42A /* osm2meta_test.cpp */; };
677E2A0E1CAAC7CB001DC42A /* tag_admixer_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 677E2A0C1CAAC7CB001DC42A /* tag_admixer_test.cpp */; };
677E2A191CAACCB3001DC42A /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 677E2A091CAAC771001DC42A /* libz.tbd */; };
679624641D100F3900AE4E3C /* booking_addr_match.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 679624571D100EE300AE4E3C /* booking_addr_match.cpp */; };
679624651D100F7C00AE4E3C /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6753408F1C5230ED002CF0D9 /* libalohalitics.a */; };
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 */; };
679624721D100F7C00AE4E3C /* libtomcrypt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28DD1B1C8027001A525C /* libtomcrypt.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 */; };
679624781D1012D500AE4E3C /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6753408A1C523054002CF0D9 /* libpugixml.a */; };
679624791D1012E000AE4E3C /* libeditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675340891C523054002CF0D9 /* libeditor.a */; };
6796247A1D1012E900AE4E3C /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6753408D1C5230DE002CF0D9 /* liboauthcpp.a */; };
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 */; };
679624B41D102D3300AE4E3C /* booking_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 679624B31D102D3300AE4E3C /* booking_test.cpp */; };
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 */; };
679624C41D11775300AE4E3C /* libfribidi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624BA1D11775300AE4E3C /* libfribidi.a */; };
679624C51D11775300AE4E3C /* liblodepng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624BB1D11775300AE4E3C /* liblodepng.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 */; };
679624CA1D11775F00AE4E3C /* libosrm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28F31B1C8125001A525C /* libosrm.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 */; };
@ -87,6 +128,18 @@
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 */; };
67BC92BC1D17FD5800A4A378 /* libagg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624CC1D11775F00AE4E3C /* libagg.a */; };
67BC92BD1D17FD5800A4A378 /* libdrape_frontend.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624B71D11775300AE4E3C /* libdrape_frontend.a */; };
67BC92BE1D17FD5800A4A378 /* libdrape.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624B81D11775300AE4E3C /* libdrape.a */; };
67BC92BF1D17FD5800A4A378 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624B91D11775300AE4E3C /* libfreetype.a */; };
67BC92C01D17FD5800A4A378 /* libfribidi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624BA1D11775300AE4E3C /* libfribidi.a */; };
67BC92C11D17FD5800A4A378 /* liblodepng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624BB1D11775300AE4E3C /* liblodepng.a */; };
67BC92C21D17FD5800A4A378 /* libmap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67AB92C61B73D03500AB5194 /* libmap.a */; };
67BC92C31D17FD5800A4A378 /* libminizip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624BC1D11775300AE4E3C /* libminizip.a */; };
67BC92C41D17FD5800A4A378 /* libsdf_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624BE1D11775300AE4E3C /* libsdf_image.a */; };
67BC92C51D17FD5800A4A378 /* libstb_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624BF1D11775300AE4E3C /* libstb_image.a */; };
67BC92C61D17FDE600A4A378 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624CE1D11779700AE4E3C /* OpenGL.framework */; };
67BC92C71D17FDF800A4A378 /* libapi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624B61D11775300AE4E3C /* libapi.a */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
@ -117,6 +170,15 @@
);
runOnlyForDeploymentPostprocessing = 1;
};
6796245B1D100F2500AE4E3C /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = /usr/share/man/man1/;
dstSubfolderSpec = 0;
files = (
);
runOnlyForDeploymentPostprocessing = 1;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
@ -221,6 +283,25 @@
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 = "<group>"; };
677E2A0C1CAAC7CB001DC42A /* tag_admixer_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tag_admixer_test.cpp; sourceTree = "<group>"; };
679624571D100EE300AE4E3C /* booking_addr_match.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = booking_addr_match.cpp; sourceTree = "<group>"; };
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 = "../../../omim-xcode-build/Debug/libopening_hours.a"; sourceTree = "<group>"; };
6796249E1D1013AD00AE4E3C /* libsearch_tests_support.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsearch_tests_support.a; path = "../../../omim-xcode-build/Debug/libsearch_tests_support.a"; sourceTree = "<group>"; };
679624B31D102D3300AE4E3C /* booking_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = booking_test.cpp; sourceTree = "<group>"; };
679624B61D11775300AE4E3C /* libapi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libapi.a; path = "../../../omim-xcode-build/Debug/libapi.a"; sourceTree = "<group>"; };
679624B71D11775300AE4E3C /* libdrape_frontend.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdrape_frontend.a; path = "../../../omim-xcode-build/Debug/libdrape_frontend.a"; sourceTree = "<group>"; };
679624B81D11775300AE4E3C /* libdrape.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdrape.a; path = "../../../omim-xcode-build/Debug/libdrape.a"; sourceTree = "<group>"; };
679624B91D11775300AE4E3C /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = "../../../omim-xcode-build/Debug/libfreetype.a"; sourceTree = "<group>"; };
679624BA1D11775300AE4E3C /* libfribidi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfribidi.a; path = "../../../omim-xcode-build/Debug/libfribidi.a"; sourceTree = "<group>"; };
679624BB1D11775300AE4E3C /* liblodepng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblodepng.a; path = "../../../omim-xcode-build/Debug/liblodepng.a"; sourceTree = "<group>"; };
679624BC1D11775300AE4E3C /* libminizip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libminizip.a; path = "../../../omim-xcode-build/Debug/libminizip.a"; sourceTree = "<group>"; };
679624BD1D11775300AE4E3C /* libplatform_tests_support.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libplatform_tests_support.a; path = "../../../omim-xcode-build/Debug/libplatform_tests_support.a"; sourceTree = "<group>"; };
679624BE1D11775300AE4E3C /* libsdf_image.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsdf_image.a; path = "../../../omim-xcode-build/Debug/libsdf_image.a"; sourceTree = "<group>"; };
679624BF1D11775300AE4E3C /* libstb_image.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libstb_image.a; path = "../../../omim-xcode-build/Debug/libstb_image.a"; sourceTree = "<group>"; };
679624CC1D11775F00AE4E3C /* libagg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libagg.a; path = "../../../omim-xcode-build/Debug/libagg.a"; sourceTree = "<group>"; };
679624CE1D11779700AE4E3C /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
67AB92B31B738DE800AB5194 /* source_data.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = source_data.cpp; sourceTree = "<group>"; };
67AB92B41B738DE800AB5194 /* source_data.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = source_data.hpp; sourceTree = "<group>"; };
67AB92C61B73D03500AB5194 /* libmap.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmap.a; path = "../../../omim-xcode-build/Debug/libmap.a"; sourceTree = "<group>"; };
@ -284,6 +365,18 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
67BC92C71D17FDF800A4A378 /* libapi.a in Frameworks */,
67BC92C61D17FDE600A4A378 /* OpenGL.framework in Frameworks */,
67BC92BC1D17FD5800A4A378 /* libagg.a in Frameworks */,
67BC92BD1D17FD5800A4A378 /* libdrape_frontend.a in Frameworks */,
67BC92BE1D17FD5800A4A378 /* libdrape.a in Frameworks */,
67BC92BF1D17FD5800A4A378 /* libfreetype.a in Frameworks */,
67BC92C01D17FD5800A4A378 /* libfribidi.a in Frameworks */,
67BC92C11D17FD5800A4A378 /* liblodepng.a in Frameworks */,
67BC92C21D17FD5800A4A378 /* libmap.a in Frameworks */,
67BC92C31D17FD5800A4A378 /* libminizip.a in Frameworks */,
67BC92C41D17FD5800A4A378 /* libsdf_image.a in Frameworks */,
67BC92C51D17FD5800A4A378 /* libstb_image.a in Frameworks */,
675340901C5230ED002CF0D9 /* libalohalitics.a in Frameworks */,
677E2A191CAACCB3001DC42A /* libz.tbd in Frameworks */,
6753408E1C5230DE002CF0D9 /* liboauthcpp.a in Frameworks */,
@ -312,6 +405,52 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
6796245A1D100F2500AE4E3C /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
679624CF1D11779700AE4E3C /* OpenGL.framework in Frameworks */,
679624CD1D11775F00AE4E3C /* libagg.a in Frameworks */,
679624CA1D11775F00AE4E3C /* libosrm.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 */,
679624C41D11775300AE4E3C /* libfribidi.a in Frameworks */,
679624C51D11775300AE4E3C /* liblodepng.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 */,
6796247A1D1012E900AE4E3C /* liboauthcpp.a in Frameworks */,
679624791D1012E000AE4E3C /* libeditor.a in Frameworks */,
679624781D1012D500AE4E3C /* libpugixml.a in Frameworks */,
679624771D1012C700AE4E3C /* SystemConfiguration.framework in Frameworks */,
679624751D1012BD00AE4E3C /* IOKit.framework in Frameworks */,
679624741D1012B700AE4E3C /* Foundation.framework in Frameworks */,
679624651D100F7C00AE4E3C /* libalohalitics.a 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 */,
679624721D100F7C00AE4E3C /* libtomcrypt.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
@ -397,6 +536,7 @@
67AB92B31B738DE800AB5194 /* source_data.cpp */,
67AB92B41B738DE800AB5194 /* source_data.hpp */,
671F58B71B86109B0032311E /* intermediate_data_test.cpp */,
679624B31D102D3300AE4E3C /* booking_test.cpp */,
);
name = generator_tests;
path = ../../generator/generator_tests;
@ -405,6 +545,7 @@
6737465A1CF46324005E6D1F /* booking_quality_check */ = {
isa = PBXGroup;
children = (
679624571D100EE300AE4E3C /* booking_addr_match.cpp */,
673746661CF4641B005E6D1F /* booking_quality_check.cpp */,
);
name = booking_quality_check;
@ -430,6 +571,7 @@
675341581A3F54D800A0A8C3 /* generator_tool */,
6726C2351A4C2BBD005EEA39 /* generator_tests */,
6737465F1CF4639F005E6D1F /* booking_quality_check */,
6796245D1D100F2500AE4E3C /* booking_addr_match */,
);
name = Products;
sourceTree = "<group>";
@ -446,6 +588,22 @@
6753453F1A3F6FA600A0A8C3 /* libs */ = {
isa = PBXGroup;
children = (
679624CE1D11779700AE4E3C /* OpenGL.framework */,
679624CC1D11775F00AE4E3C /* libagg.a */,
679624B61D11775300AE4E3C /* libapi.a */,
679624B71D11775300AE4E3C /* libdrape_frontend.a */,
679624B81D11775300AE4E3C /* libdrape.a */,
679624B91D11775300AE4E3C /* libfreetype.a */,
679624BA1D11775300AE4E3C /* libfribidi.a */,
679624BB1D11775300AE4E3C /* liblodepng.a */,
679624BC1D11775300AE4E3C /* libminizip.a */,
679624BD1D11775300AE4E3C /* libplatform_tests_support.a */,
679624BE1D11775300AE4E3C /* libsdf_image.a */,
679624BF1D11775300AE4E3C /* libstb_image.a */,
6796249E1D1013AD00AE4E3C /* libsearch_tests_support.a */,
6796247C1D1012F500AE4E3C /* libopening_hours.a */,
679624761D1012C700AE4E3C /* SystemConfiguration.framework */,
679624731D1012B700AE4E3C /* Foundation.framework */,
670F88781CE4CA81003F68BA /* libopening_hours.a */,
677E2A091CAAC771001DC42A /* libz.tbd */,
6753408F1C5230ED002CF0D9 /* libalohalitics.a */,
@ -533,6 +691,23 @@
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 */
@ -548,6 +723,9 @@
675341571A3F54D800A0A8C3 = {
CreatedOnToolsVersion = 6.1;
};
6796245C1D100F2500AE4E3C = {
CreatedOnToolsVersion = 7.3.1;
};
};
};
buildConfigurationList = 675341531A3F54D800A0A8C3 /* Build configuration list for PBXProject "generator_tool" */;
@ -565,6 +743,7 @@
675341571A3F54D800A0A8C3 /* generator_tool */,
6726C21C1A4C2BBD005EEA39 /* generator_tests */,
6737465E1CF4639F005E6D1F /* booking_quality_check */,
6796245C1D100F2500AE4E3C /* booking_addr_match */,
);
};
/* End PBXProject section */
@ -588,6 +767,7 @@
677792521C1B2E9700EC9499 /* metadata_parser_test.cpp in Sources */,
67AB92D11B75156700AB5194 /* feature_builder_test.cpp in Sources */,
67AB92C21B73C27300AB5194 /* source_data.cpp in Sources */,
679624B41D102D3300AE4E3C /* booking_test.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -609,6 +789,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
679624591D100F2500AE4E3C /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
679624641D100F3900AE4E3C /* booking_addr_match.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin XCBuildConfiguration section */
@ -706,6 +894,7 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(OMIM_ROOT)/3party/gflags/src/",
"$(OMIM_ROOT)/3party/glm",
);
LIBRARY_SEARCH_PATHS = "$(QT_PATH)/lib";
MACOSX_DEPLOYMENT_TARGET = 10.10;
@ -755,6 +944,7 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(OMIM_ROOT)/3party/gflags/src/",
"$(OMIM_ROOT)/3party/glm",
);
LIBRARY_SEARCH_PATHS = "$(QT_PATH)/lib";
MACOSX_DEPLOYMENT_TARGET = 10.10;
@ -790,6 +980,32 @@
};
name = Release;
};
679624621D100F2500AE4E3C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CODE_SIGN_IDENTITY = "-";
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_NO_COMMON_BLOCKS = YES;
HEADER_SEARCH_PATHS = "$(inherited)";
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
679624631D100F2500AE4E3C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
GCC_NO_COMMON_BLOCKS = YES;
HEADER_SEARCH_PATHS = "$(inherited)";
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@ -829,6 +1045,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
679624611D100F2500AE4E3C /* Build configuration list for PBXNativeTarget "booking_addr_match" */ = {
isa = XCConfigurationList;
buildConfigurations = (
679624621D100F2500AE4E3C /* Debug */,
679624631D100F2500AE4E3C /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 675341501A3F54D800A0A8C3 /* Project object */;

275
xcode/indexer/indexer.xcodeproj/project.pbxproj
View file

@ -31,46 +31,53 @@
56C74C231C749E4700B71B9F /* search_delimiters.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56C74C191C749E4700B71B9F /* search_delimiters.hpp */; };
56C74C241C749E4700B71B9F /* search_string_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C1A1C749E4700B71B9F /* search_string_utils.cpp */; };
56C74C251C749E4700B71B9F /* search_string_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56C74C1B1C749E4700B71B9F /* search_string_utils.hpp */; };
56C74C2F1C749E8100B71B9F /* categories_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C261C749E8100B71B9F /* categories_test.cpp */; };
56C74C301C749E8100B71B9F /* drules_selector_parser_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C271C749E8100B71B9F /* drules_selector_parser_test.cpp */; };
56C74C311C749E8100B71B9F /* feature_metadata_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C281C749E8100B71B9F /* feature_metadata_test.cpp */; };
56C74C321C749E8100B71B9F /* feature_xml_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C291C749E8100B71B9F /* feature_xml_test.cpp */; };
56C74C331C749E8100B71B9F /* rank_table_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C2A1C749E8100B71B9F /* rank_table_test.cpp */; };
56C74C341C749E8100B71B9F /* search_string_utils_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C2B1C749E8100B71B9F /* search_string_utils_test.cpp */; };
56C74C351C749E8100B71B9F /* succinct_trie_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C2C1C749E8100B71B9F /* succinct_trie_test.cpp */; };
56C74C361C749E8100B71B9F /* test_mwm_set.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56C74C2D1C749E8100B71B9F /* test_mwm_set.hpp */; };
56C74C371C749E8100B71B9F /* trie_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C2E1C749E8100B71B9F /* trie_test.cpp */; };
670C610D1AB065B100C38A8C /* cell_coverer_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C60FA1AB065B100C38A8C /* cell_coverer_test.cpp */; };
670C610E1AB065B100C38A8C /* cell_id_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C60FB1AB065B100C38A8C /* cell_id_test.cpp */; };
670C610F1AB065B100C38A8C /* checker_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C60FC1AB065B100C38A8C /* checker_test.cpp */; };
670C61101AB065B100C38A8C /* features_offsets_table_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C60FD1AB065B100C38A8C /* features_offsets_table_test.cpp */; };
670C61111AB065B100C38A8C /* geometry_coding_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C60FE1AB065B100C38A8C /* geometry_coding_test.cpp */; };
670C61121AB065B100C38A8C /* geometry_serialization_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C60FF1AB065B100C38A8C /* geometry_serialization_test.cpp */; };
670C61131AB065B100C38A8C /* index_builder_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61001AB065B100C38A8C /* index_builder_test.cpp */; };
670C61141AB065B100C38A8C /* index_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61011AB065B100C38A8C /* index_test.cpp */; };
670C61151AB065B100C38A8C /* interval_index_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61021AB065B100C38A8C /* interval_index_test.cpp */; };
670C61171AB065B100C38A8C /* mwm_set_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61041AB065B100C38A8C /* mwm_set_test.cpp */; };
670C61181AB065B100C38A8C /* point_to_int64_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61051AB065B100C38A8C /* point_to_int64_test.cpp */; };
670C61191AB065B100C38A8C /* scales_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61061AB065B100C38A8C /* scales_test.cpp */; };
670C611A1AB065B100C38A8C /* sort_and_merge_intervals_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61071AB065B100C38A8C /* sort_and_merge_intervals_test.cpp */; };
670C611B1AB065B100C38A8C /* test_polylines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61081AB065B100C38A8C /* test_polylines.cpp */; };
670C611C1AB065B100C38A8C /* test_polylines.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670C61091AB065B100C38A8C /* test_polylines.hpp */; };
670C611D1AB065B100C38A8C /* test_type.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C610A1AB065B100C38A8C /* test_type.cpp */; };
670C611E1AB065B100C38A8C /* visibility_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C610B1AB065B100C38A8C /* visibility_test.cpp */; };
670BAA8C1D0B0673000302DA /* trie_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C2E1C749E8100B71B9F /* trie_test.cpp */; };
670BAA8D1D0B069A000302DA /* succinct_trie_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C2C1C749E8100B71B9F /* succinct_trie_test.cpp */; };
670BAA8E1D0B06A1000302DA /* search_string_utils_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C2B1C749E8100B71B9F /* search_string_utils_test.cpp */; };
670BAA8F1D0B06A6000302DA /* rank_table_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C2A1C749E8100B71B9F /* rank_table_test.cpp */; };
670BAA901D0B06B4000302DA /* postcodes_matcher_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E906DE371CF44917004C4F5E /* postcodes_matcher_tests.cpp */; };
670BAA911D0B06B4000302DA /* categories_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C261C749E8100B71B9F /* categories_test.cpp */; };
670BAA921D0B06B4000302DA /* drules_selector_parser_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C271C749E8100B71B9F /* drules_selector_parser_test.cpp */; };
670BAA931D0B06B4000302DA /* feature_metadata_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C281C749E8100B71B9F /* feature_metadata_test.cpp */; };
670BAA941D0B06B4000302DA /* feature_xml_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C291C749E8100B71B9F /* feature_xml_test.cpp */; };
670BAA951D0B06E1000302DA /* cell_coverer_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C60FA1AB065B100C38A8C /* cell_coverer_test.cpp */; };
670BAA961D0B06E1000302DA /* cell_id_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C60FB1AB065B100C38A8C /* cell_id_test.cpp */; };
670BAA971D0B06E1000302DA /* checker_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C60FC1AB065B100C38A8C /* checker_test.cpp */; };
670BAA981D0B06E1000302DA /* features_offsets_table_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C60FD1AB065B100C38A8C /* features_offsets_table_test.cpp */; };
670BAA991D0B06E1000302DA /* geometry_coding_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C60FE1AB065B100C38A8C /* geometry_coding_test.cpp */; };
670BAA9A1D0B06E1000302DA /* geometry_serialization_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C60FF1AB065B100C38A8C /* geometry_serialization_test.cpp */; };
670BAA9B1D0B06E1000302DA /* index_builder_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61001AB065B100C38A8C /* index_builder_test.cpp */; };
670BAA9C1D0B06E1000302DA /* index_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61011AB065B100C38A8C /* index_test.cpp */; };
670BAA9D1D0B06E1000302DA /* interval_index_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61021AB065B100C38A8C /* interval_index_test.cpp */; };
670BAA9E1D0B06E1000302DA /* mwm_set_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61041AB065B100C38A8C /* mwm_set_test.cpp */; };
670BAA9F1D0B06E1000302DA /* point_to_int64_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61051AB065B100C38A8C /* point_to_int64_test.cpp */; };
670BAAA01D0B06E1000302DA /* scales_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61061AB065B100C38A8C /* scales_test.cpp */; };
670BAAA11D0B06E1000302DA /* sort_and_merge_intervals_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61071AB065B100C38A8C /* sort_and_merge_intervals_test.cpp */; };
670BAAA21D0B06E1000302DA /* test_polylines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61081AB065B100C38A8C /* test_polylines.cpp */; };
670BAAA31D0B06E1000302DA /* test_type.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C610A1AB065B100C38A8C /* test_type.cpp */; };
670BAAA41D0B06E1000302DA /* visibility_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C610B1AB065B100C38A8C /* visibility_test.cpp */; };
670BAAAB1D0B07AA000302DA /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAA51D0B07AA000302DA /* libbase.a */; };
670BAAAC1D0B07AA000302DA /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAA61D0B07AA000302DA /* libcoding.a */; };
670BAAAD1D0B07AA000302DA /* libeditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAA71D0B07AA000302DA /* libeditor.a */; };
670BAAAE1D0B07AA000302DA /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAA81D0B07AA000302DA /* liboauthcpp.a */; };
670BAAAF1D0B07AA000302DA /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAA91D0B07AA000302DA /* libopening_hours.a */; };
670BAAB01D0B07AA000302DA /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAAA1D0B07AA000302DA /* libpugixml.a */; };
670BAAB31D0B07BF000302DA /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAB11D0B07BF000302DA /* libplatform.a */; };
670BAAB41D0B07BF000302DA /* libprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAB21D0B07BF000302DA /* libprotobuf.a */; };
670BAAB71D0B07D1000302DA /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAB51D0B07D1000302DA /* libalohalitics.a */; };
670BAAB81D0B07D1000302DA /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAB61D0B07D1000302DA /* libgeometry.a */; };
670BAABA1D0B07E9000302DA /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAB91D0B07E9000302DA /* libjansson.a */; };
670BAABD1D0B07FE000302DA /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAABB1D0B07FE000302DA /* libsuccinct.a */; };
670BAABE1D0B07FE000302DA /* libtomcrypt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAABC1D0B07FE000302DA /* libtomcrypt.a */; };
670BAAC01D0B0849000302DA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAABF1D0B0849000302DA /* Foundation.framework */; };
670BAAC21D0B0856000302DA /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAC11D0B0856000302DA /* libz.tbd */; };
670BAAC41D0B0865000302DA /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAC31D0B0865000302DA /* IOKit.framework */; };
670BAAC81D0B0B77000302DA /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 670BAAC71D0B0B77000302DA /* SystemConfiguration.framework */; };
670BAACA1D0B0BBB000302DA /* string_slice.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670BAAC91D0B0BBB000302DA /* string_slice.hpp */; };
670C612C1AB0663400C38A8C /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C611F1AB065E100C38A8C /* testingmain.cpp */; };
670C61401AB066CD00C38A8C /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6753409A1A3F53CB00A0A8C3 /* libindexer.a */; };
670C61421AB0670700C38A8C /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C61411AB0670700C38A8C /* libplatform.a */; };
670C61451AB0673800C38A8C /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C61431AB0673800C38A8C /* libbase.a */; };
670C61461AB0673800C38A8C /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C61441AB0673800C38A8C /* libcoding.a */; };
670C61481AB0675700C38A8C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C61471AB0675700C38A8C /* CoreFoundation.framework */; };
670C614A1AB0677200C38A8C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C61491AB0677200C38A8C /* IOKit.framework */; };
670C614C1AB067D300C38A8C /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C614B1AB067D200C38A8C /* Cocoa.framework */; };
670C61501AB0684000C38A8C /* libprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C614F1AB0684000C38A8C /* libprotobuf.a */; };
670C61521AB0685E00C38A8C /* libtomcrypt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C61511AB0685E00C38A8C /* libtomcrypt.a */; };
670C61561AB0689F00C38A8C /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C61551AB0689F00C38A8C /* libgeometry.a */; };
670C615B1AB0691900C38A8C /* features_offsets_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61581AB0691900C38A8C /* features_offsets_table.cpp */; };
670C615C1AB0691900C38A8C /* features_offsets_table.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670C61591AB0691900C38A8C /* features_offsets_table.hpp */; };
670C620B1AC3550F00C38A8C /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C620A1AC3550F00C38A8C /* libopening_hours.a */; };
670D04AB1B0BA8580013A7AC /* feature_loader_101.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670D04A81B0BA8580013A7AC /* feature_loader_101.cpp */; };
670D04AC1B0BA8580013A7AC /* feature_loader_101.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670D04A91B0BA8580013A7AC /* feature_loader_101.hpp */; };
670D04AD1B0BA8580013A7AC /* interval_index_101.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670D04AA1B0BA8580013A7AC /* interval_index_101.hpp */; };
@ -151,11 +158,11 @@
6758AED21BB4413000C26E27 /* drules_selector_parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6758AECE1BB4413000C26E27 /* drules_selector_parser.hpp */; };
6758AED31BB4413000C26E27 /* drules_selector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6758AECF1BB4413000C26E27 /* drules_selector.cpp */; };
6758AED41BB4413000C26E27 /* drules_selector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6758AED01BB4413000C26E27 /* drules_selector.hpp */; };
67BC92F21D21476500A4A378 /* osm_editor.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BC92EE1D21476500A4A378 /* osm_editor.hpp */; };
67BC92F31D21476500A4A378 /* string_set.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BC92EF1D21476500A4A378 /* string_set.hpp */; };
67BC92F41D21476500A4A378 /* string_slice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67BC92F01D21476500A4A378 /* string_slice.cpp */; };
67BC92F51D21476500A4A378 /* string_slice.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BC92F11D21476500A4A378 /* string_slice.hpp */; };
67F183731BD4FCF500AB1840 /* map_style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67F183721BD4FCF500AB1840 /* map_style.cpp */; };
E90547481D1153C70096F4FA /* string_set.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E90547451D1153C70096F4FA /* string_set.hpp */; };
E90547491D1153C70096F4FA /* string_slice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E90547461D1153C70096F4FA /* string_slice.cpp */; };
E905474A1D1153C70096F4FA /* string_slice.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E90547471D1153C70096F4FA /* string_slice.hpp */; };
E906DE381CF44917004C4F5E /* postcodes_matcher_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E906DE371CF44917004C4F5E /* postcodes_matcher_tests.cpp */; };
E906DE3B1CF44934004C4F5E /* postcodes_matcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E906DE391CF44934004C4F5E /* postcodes_matcher.cpp */; };
E906DE3C1CF44934004C4F5E /* postcodes_matcher.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E906DE3A1CF44934004C4F5E /* postcodes_matcher.hpp */; };
F6381BF91CD26C9C004CA943 /* new_feature_categories.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6381BF71CD26C9C004CA943 /* new_feature_categories.cpp */; };
@ -178,7 +185,6 @@
/* Begin PBXFileReference section */
340DF9CF1C1FF04D00B5C7EC /* osm_editor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = osm_editor.cpp; sourceTree = "<group>"; };
340DF9D11C1FF09400B5C7EC /* osm_editor.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = osm_editor.hpp; path = ../../indexer/osm_editor.hpp; sourceTree = "<group>"; };
34583BC11C88552100F94664 /* cuisines.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cuisines.cpp; sourceTree = "<group>"; };
34583BC21C88552100F94664 /* cuisines.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cuisines.hpp; sourceTree = "<group>"; };
34583BC31C88552100F94664 /* editable_map_object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editable_map_object.cpp; sourceTree = "<group>"; };
@ -211,6 +217,25 @@
56C74C2C1C749E8100B71B9F /* succinct_trie_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = succinct_trie_test.cpp; sourceTree = "<group>"; };
56C74C2D1C749E8100B71B9F /* test_mwm_set.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_mwm_set.hpp; sourceTree = "<group>"; };
56C74C2E1C749E8100B71B9F /* trie_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = trie_test.cpp; sourceTree = "<group>"; };
670BAAA51D0B07AA000302DA /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "../../../omim-xcode-build/Debug/libbase.a"; sourceTree = "<group>"; };
670BAAA61D0B07AA000302DA /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "../../../omim-xcode-build/Debug/libcoding.a"; sourceTree = "<group>"; };
670BAAA71D0B07AA000302DA /* libeditor.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeditor.a; path = "../../../omim-xcode-build/Debug/libeditor.a"; sourceTree = "<group>"; };
670BAAA81D0B07AA000302DA /* liboauthcpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liboauthcpp.a; path = "../../../omim-xcode-build/Debug/liboauthcpp.a"; sourceTree = "<group>"; };
670BAAA91D0B07AA000302DA /* libopening_hours.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopening_hours.a; path = "../../../omim-xcode-build/Debug/libopening_hours.a"; sourceTree = "<group>"; };
670BAAAA1D0B07AA000302DA /* libpugixml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpugixml.a; path = "../../../omim-xcode-build/Debug/libpugixml.a"; sourceTree = "<group>"; };
670BAAB11D0B07BF000302DA /* libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libplatform.a; path = "../../../omim-xcode-build/Debug/libplatform.a"; sourceTree = "<group>"; };
670BAAB21D0B07BF000302DA /* libprotobuf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libprotobuf.a; path = "../../../omim-xcode-build/Debug/libprotobuf.a"; sourceTree = "<group>"; };
670BAAB51D0B07D1000302DA /* libalohalitics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libalohalitics.a; path = "../../../omim-xcode-build/Debug/libalohalitics.a"; sourceTree = "<group>"; };
670BAAB61D0B07D1000302DA /* libgeometry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgeometry.a; path = "../../../omim-xcode-build/Debug/libgeometry.a"; sourceTree = "<group>"; };
670BAAB91D0B07E9000302DA /* libjansson.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjansson.a; path = "../../../omim-xcode-build/Debug/libjansson.a"; sourceTree = "<group>"; };
670BAABB1D0B07FE000302DA /* libsuccinct.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsuccinct.a; path = "../../../omim-xcode-build/Debug/libsuccinct.a"; sourceTree = "<group>"; };
670BAABC1D0B07FE000302DA /* libtomcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtomcrypt.a; path = "../../../omim-xcode-build/Debug/libtomcrypt.a"; sourceTree = "<group>"; };
670BAABF1D0B0849000302DA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
670BAAC11D0B0856000302DA /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
670BAAC31D0B0865000302DA /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
670BAAC51D0B086E000302DA /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
670BAAC71D0B0B77000302DA /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
670BAAC91D0B0BBB000302DA /* string_slice.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = string_slice.hpp; sourceTree = "<group>"; };
670C60FA1AB065B100C38A8C /* cell_coverer_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cell_coverer_test.cpp; sourceTree = "<group>"; };
670C60FB1AB065B100C38A8C /* cell_id_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cell_id_test.cpp; sourceTree = "<group>"; };
670C60FC1AB065B100C38A8C /* checker_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = checker_test.cpp; sourceTree = "<group>"; };
@ -230,20 +255,8 @@
670C610B1AB065B100C38A8C /* visibility_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = visibility_test.cpp; sourceTree = "<group>"; };
670C611F1AB065E100C38A8C /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
670C61251AB0661100C38A8C /* indexer_tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = indexer_tests; sourceTree = BUILT_PRODUCTS_DIR; };
670C61411AB0670700C38A8C /* libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libplatform.a; path = ../platform/build/Debug/libplatform.a; sourceTree = "<group>"; };
670C61431AB0673800C38A8C /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = ../base/build/Debug/libbase.a; sourceTree = "<group>"; };
670C61441AB0673800C38A8C /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = ../coding/build/Debug/libcoding.a; sourceTree = "<group>"; };
670C61471AB0675700C38A8C /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
670C61491AB0677200C38A8C /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
670C614B1AB067D200C38A8C /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
670C614D1AB0682300C38A8C /* QtCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QtCore.framework; path = /usr/local/Cellar/qt5/5.3.2/lib/QtCore.framework; sourceTree = "<absolute>"; };
670C614F1AB0684000C38A8C /* libprotobuf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libprotobuf.a; path = /usr/local/Cellar/protobuf/2.5.0/lib/libprotobuf.a; sourceTree = "<absolute>"; };
670C61511AB0685E00C38A8C /* libtomcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtomcrypt.a; path = "../../../Library/Developer/Xcode/DerivedData/omim-baysrswfihipzadzzkpyheldfppg/Build/Products/Debug/libtomcrypt.a"; sourceTree = "<group>"; };
670C61531AB0688100C38A8C /* libstorage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libstorage.a; path = "../../../Library/Developer/Xcode/DerivedData/omim-baysrswfihipzadzzkpyheldfppg/Build/Products/Debug/libstorage.a"; sourceTree = "<group>"; };
670C61551AB0689F00C38A8C /* libgeometry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgeometry.a; path = "../../../Library/Developer/Xcode/DerivedData/omim-baysrswfihipzadzzkpyheldfppg/Build/Products/Debug/libgeometry.a"; sourceTree = "<group>"; };
670C61581AB0691900C38A8C /* features_offsets_table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_offsets_table.cpp; sourceTree = "<group>"; };
670C61591AB0691900C38A8C /* features_offsets_table.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_offsets_table.hpp; sourceTree = "<group>"; };
670C620A1AC3550F00C38A8C /* libopening_hours.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopening_hours.a; path = ../opening_hours/build/Debug/libopening_hours.a; sourceTree = "<group>"; };
670D04A81B0BA8580013A7AC /* feature_loader_101.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_loader_101.cpp; sourceTree = "<group>"; };
670D04A91B0BA8580013A7AC /* feature_loader_101.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = feature_loader_101.hpp; sourceTree = "<group>"; };
670D04AA1B0BA8580013A7AC /* interval_index_101.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = interval_index_101.hpp; sourceTree = "<group>"; };
@ -327,10 +340,11 @@
6758AECE1BB4413000C26E27 /* drules_selector_parser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = drules_selector_parser.hpp; sourceTree = "<group>"; };
6758AECF1BB4413000C26E27 /* drules_selector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drules_selector.cpp; sourceTree = "<group>"; };
6758AED01BB4413000C26E27 /* drules_selector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = drules_selector.hpp; sourceTree = "<group>"; };
67BC92EE1D21476500A4A378 /* osm_editor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_editor.hpp; sourceTree = "<group>"; };
67BC92EF1D21476500A4A378 /* string_set.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = string_set.hpp; sourceTree = "<group>"; };
67BC92F01D21476500A4A378 /* string_slice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_slice.cpp; sourceTree = "<group>"; };
67BC92F11D21476500A4A378 /* string_slice.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = string_slice.hpp; sourceTree = "<group>"; };
67F183721BD4FCF500AB1840 /* map_style.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map_style.cpp; sourceTree = "<group>"; };
E90547451D1153C70096F4FA /* string_set.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = string_set.hpp; sourceTree = "<group>"; };
E90547461D1153C70096F4FA /* string_slice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_slice.cpp; sourceTree = "<group>"; };
E90547471D1153C70096F4FA /* string_slice.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = string_slice.hpp; sourceTree = "<group>"; };
E906DE371CF44917004C4F5E /* postcodes_matcher_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = postcodes_matcher_tests.cpp; sourceTree = "<group>"; };
E906DE391CF44934004C4F5E /* postcodes_matcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = postcodes_matcher.cpp; sourceTree = "<group>"; };
E906DE3A1CF44934004C4F5E /* postcodes_matcher.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = postcodes_matcher.hpp; sourceTree = "<group>"; };
@ -345,17 +359,24 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
670C620B1AC3550F00C38A8C /* libopening_hours.a in Frameworks */,
670C614C1AB067D300C38A8C /* Cocoa.framework in Frameworks */,
670C614A1AB0677200C38A8C /* IOKit.framework in Frameworks */,
670C61481AB0675700C38A8C /* CoreFoundation.framework in Frameworks */,
670C61451AB0673800C38A8C /* libbase.a in Frameworks */,
670C61461AB0673800C38A8C /* libcoding.a in Frameworks */,
670C61421AB0670700C38A8C /* libplatform.a in Frameworks */,
670C61561AB0689F00C38A8C /* libgeometry.a in Frameworks */,
670BAAAC1D0B07AA000302DA /* libcoding.a in Frameworks */,
670BAAC81D0B0B77000302DA /* SystemConfiguration.framework in Frameworks */,
670BAAC41D0B0865000302DA /* IOKit.framework in Frameworks */,
670BAAC21D0B0856000302DA /* libz.tbd in Frameworks */,
670BAAC01D0B0849000302DA /* Foundation.framework in Frameworks */,
670BAABD1D0B07FE000302DA /* libsuccinct.a in Frameworks */,
670BAABE1D0B07FE000302DA /* libtomcrypt.a in Frameworks */,
670BAABA1D0B07E9000302DA /* libjansson.a in Frameworks */,
670BAAB71D0B07D1000302DA /* libalohalitics.a in Frameworks */,
670BAAB81D0B07D1000302DA /* libgeometry.a in Frameworks */,
670BAAB31D0B07BF000302DA /* libplatform.a in Frameworks */,
670BAAB41D0B07BF000302DA /* libprotobuf.a in Frameworks */,
670BAAAB1D0B07AA000302DA /* libbase.a in Frameworks */,
670BAAAD1D0B07AA000302DA /* libeditor.a in Frameworks */,
670BAAAE1D0B07AA000302DA /* liboauthcpp.a in Frameworks */,
670BAAAF1D0B07AA000302DA /* libopening_hours.a in Frameworks */,
670BAAB01D0B07AA000302DA /* libpugixml.a in Frameworks */,
670C61401AB066CD00C38A8C /* libindexer.a in Frameworks */,
670C61501AB0684000C38A8C /* libprotobuf.a in Frameworks */,
670C61521AB0685E00C38A8C /* libtomcrypt.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -369,6 +390,31 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
670BAACC1D0B0F0A000302DA /* libs */ = {
isa = PBXGroup;
children = (
670BAAC71D0B0B77000302DA /* SystemConfiguration.framework */,
670BAAC51D0B086E000302DA /* CFNetwork.framework */,
670BAAC31D0B0865000302DA /* IOKit.framework */,
670BAAC11D0B0856000302DA /* libz.tbd */,
670BAABF1D0B0849000302DA /* Foundation.framework */,
670BAABB1D0B07FE000302DA /* libsuccinct.a */,
670BAABC1D0B07FE000302DA /* libtomcrypt.a */,
670BAAB91D0B07E9000302DA /* libjansson.a */,
670BAAB51D0B07D1000302DA /* libalohalitics.a */,
670BAAB61D0B07D1000302DA /* libgeometry.a */,
670BAAB11D0B07BF000302DA /* libplatform.a */,
670BAAB21D0B07BF000302DA /* libprotobuf.a */,
670BAAA51D0B07AA000302DA /* libbase.a */,
670BAAA61D0B07AA000302DA /* libcoding.a */,
670BAAA71D0B07AA000302DA /* libeditor.a */,
670BAAA81D0B07AA000302DA /* liboauthcpp.a */,
670BAAA91D0B07AA000302DA /* libopening_hours.a */,
670BAAAA1D0B07AA000302DA /* libpugixml.a */,
);
name = libs;
sourceTree = "<group>";
};
670C60F81AB0657700C38A8C /* indexer_tests */ = {
isa = PBXGroup;
children = (
@ -382,7 +428,6 @@
56C74C2C1C749E8100B71B9F /* succinct_trie_test.cpp */,
56C74C2D1C749E8100B71B9F /* test_mwm_set.hpp */,
56C74C2E1C749E8100B71B9F /* trie_test.cpp */,
670C61571AB068C100C38A8C /* Libs */,
670C611F1AB065E100C38A8C /* testingmain.cpp */,
670C60FA1AB065B100C38A8C /* cell_coverer_test.cpp */,
670C60FB1AB065B100C38A8C /* cell_id_test.cpp */,
@ -406,25 +451,6 @@
path = ../../indexer/indexer_tests;
sourceTree = "<group>";
};
670C61571AB068C100C38A8C /* Libs */ = {
isa = PBXGroup;
children = (
670C620A1AC3550F00C38A8C /* libopening_hours.a */,
670C61551AB0689F00C38A8C /* libgeometry.a */,
670C61531AB0688100C38A8C /* libstorage.a */,
670C61511AB0685E00C38A8C /* libtomcrypt.a */,
670C614F1AB0684000C38A8C /* libprotobuf.a */,
670C614D1AB0682300C38A8C /* QtCore.framework */,
670C614B1AB067D200C38A8C /* Cocoa.framework */,
670C61491AB0677200C38A8C /* IOKit.framework */,
670C61471AB0675700C38A8C /* CoreFoundation.framework */,
670C61431AB0673800C38A8C /* libbase.a */,
670C61441AB0673800C38A8C /* libcoding.a */,
670C61411AB0670700C38A8C /* libplatform.a */,
);
name = Libs;
sourceTree = "<group>";
};
670D04A71B0BA8410013A7AC /* old */ = {
isa = PBXGroup;
children = (
@ -438,8 +464,8 @@
675340911A3F53CB00A0A8C3 = {
isa = PBXGroup;
children = (
340DF9D11C1FF09400B5C7EC /* osm_editor.hpp */,
670D05AB1B0E07040013A7AC /* defaults.xcconfig */,
670BAACC1D0B0F0A000302DA /* libs */,
670C60F81AB0657700C38A8C /* indexer_tests */,
6753409C1A3F53CB00A0A8C3 /* indexer */,
6753409B1A3F53CB00A0A8C3 /* Products */,
@ -458,9 +484,10 @@
6753409C1A3F53CB00A0A8C3 /* indexer */ = {
isa = PBXGroup;
children = (
E90547451D1153C70096F4FA /* string_set.hpp */,
E90547461D1153C70096F4FA /* string_slice.cpp */,
E90547471D1153C70096F4FA /* string_slice.hpp */,
67BC92EE1D21476500A4A378 /* osm_editor.hpp */,
67BC92EF1D21476500A4A378 /* string_set.hpp */,
67BC92F01D21476500A4A378 /* string_slice.cpp */,
67BC92F11D21476500A4A378 /* string_slice.hpp */,
E906DE391CF44934004C4F5E /* postcodes_matcher.cpp */,
E906DE3A1CF44934004C4F5E /* postcodes_matcher.hpp */,
F6381BF71CD26C9C004CA943 /* new_feature_categories.cpp */,
@ -587,7 +614,7 @@
files = (
E906DE3C1CF44934004C4F5E /* postcodes_matcher.hpp in Headers */,
6753414E1A3F540F00A0A8C3 /* types_mapping.hpp in Headers */,
E90547481D1153C70096F4FA /* string_set.hpp in Headers */,
67BC92F31D21476500A4A378 /* string_set.hpp in Headers */,
6753411F1A3F540F00A0A8C3 /* feature_loader.hpp in Headers */,
675341151A3F540F00A0A8C3 /* feature_covering.hpp in Headers */,
34583BC81C88552100F94664 /* cuisines.hpp in Headers */,
@ -610,16 +637,16 @@
670EE56D1B60033A001E8064 /* unique_index.hpp in Headers */,
6753412B1A3F540F00A0A8C3 /* geometry_coding.hpp in Headers */,
675340FF1A3F540F00A0A8C3 /* cell_coverer.hpp in Headers */,
56C74C361C749E8100B71B9F /* test_mwm_set.hpp in Headers */,
56C74C251C749E4700B71B9F /* search_string_utils.hpp in Headers */,
6753410C1A3F540F00A0A8C3 /* drawing_rule_def.hpp in Headers */,
675341001A3F540F00A0A8C3 /* cell_id.hpp in Headers */,
E905474A1D1153C70096F4FA /* string_slice.hpp in Headers */,
670D04AD1B0BA8580013A7AC /* interval_index_101.hpp in Headers */,
67BC92F51D21476500A4A378 /* string_slice.hpp in Headers */,
675341271A3F540F00A0A8C3 /* features_vector.hpp in Headers */,
6753413D1A3F540F00A0A8C3 /* scale_index_builder.hpp in Headers */,
675341021A3F540F00A0A8C3 /* classificator_loader.hpp in Headers */,
6758AED21BB4413000C26E27 /* drules_selector_parser.hpp in Headers */,
670BAACA1D0B0BBB000302DA /* string_slice.hpp in Headers */,
6753413F1A3F540F00A0A8C3 /* scale_index.hpp in Headers */,
6753410E1A3F540F00A0A8C3 /* drawing_rules.hpp in Headers */,
670C615C1AB0691900C38A8C /* features_offsets_table.hpp in Headers */,
@ -643,13 +670,13 @@
347F33811C454242009758CC /* trie.hpp in Headers */,
6753410F1A3F540F00A0A8C3 /* drules_include.hpp in Headers */,
675341311A3F540F00A0A8C3 /* index.hpp in Headers */,
670C611C1AB065B100C38A8C /* test_polylines.hpp in Headers */,
675341331A3F540F00A0A8C3 /* interval_index_iface.hpp in Headers */,
675341041A3F540F00A0A8C3 /* classificator.hpp in Headers */,
675341261A3F540F00A0A8C3 /* feature.hpp in Headers */,
34583BCA1C88552100F94664 /* editable_map_object.hpp in Headers */,
34583BCC1C88552100F94664 /* map_object.hpp in Headers */,
670D04AC1B0BA8580013A7AC /* feature_loader_101.hpp in Headers */,
67BC92F21D21476500A4A378 /* osm_editor.hpp in Headers */,
675341081A3F540F00A0A8C3 /* data_factory.hpp in Headers */,
6753410A1A3F540F00A0A8C3 /* data_header.hpp in Headers */,
6753411B1A3F540F00A0A8C3 /* feature_impl.hpp in Headers */,
@ -700,7 +727,7 @@
675340921A3F53CB00A0A8C3 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0630;
LastUpgradeCheck = 0730;
ORGANIZATIONNAME = maps.me;
TargetAttributes = {
670C61241AB0661100C38A8C = {
@ -734,7 +761,32 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
670BAA9D1D0B06E1000302DA /* interval_index_test.cpp in Sources */,
670BAAA31D0B06E1000302DA /* test_type.cpp in Sources */,
670BAA961D0B06E1000302DA /* cell_id_test.cpp in Sources */,
670BAA971D0B06E1000302DA /* checker_test.cpp in Sources */,
670BAA8E1D0B06A1000302DA /* search_string_utils_test.cpp in Sources */,
670BAAA41D0B06E1000302DA /* visibility_test.cpp in Sources */,
670BAA931D0B06B4000302DA /* feature_metadata_test.cpp in Sources */,
670BAA941D0B06B4000302DA /* feature_xml_test.cpp in Sources */,
670BAA901D0B06B4000302DA /* postcodes_matcher_tests.cpp in Sources */,
670BAA921D0B06B4000302DA /* drules_selector_parser_test.cpp in Sources */,
670BAA8F1D0B06A6000302DA /* rank_table_test.cpp in Sources */,
670BAAA21D0B06E1000302DA /* test_polylines.cpp in Sources */,
670BAA9A1D0B06E1000302DA /* geometry_serialization_test.cpp in Sources */,
670BAA981D0B06E1000302DA /* features_offsets_table_test.cpp in Sources */,
670BAA991D0B06E1000302DA /* geometry_coding_test.cpp in Sources */,
670BAAA01D0B06E1000302DA /* scales_test.cpp in Sources */,
670BAA9E1D0B06E1000302DA /* mwm_set_test.cpp in Sources */,
670BAA911D0B06B4000302DA /* categories_test.cpp in Sources */,
670BAAA11D0B06E1000302DA /* sort_and_merge_intervals_test.cpp in Sources */,
670BAA9C1D0B06E1000302DA /* index_test.cpp in Sources */,
670BAA9B1D0B06E1000302DA /* index_builder_test.cpp in Sources */,
670BAA9F1D0B06E1000302DA /* point_to_int64_test.cpp in Sources */,
670C612C1AB0663400C38A8C /* testingmain.cpp in Sources */,
670BAA8D1D0B069A000302DA /* succinct_trie_test.cpp in Sources */,
670BAA951D0B06E1000302DA /* cell_coverer_test.cpp in Sources */,
670BAA8C1D0B0673000302DA /* trie_test.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -742,74 +794,49 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
56C74C321C749E8100B71B9F /* feature_xml_test.cpp in Sources */,
56C74C241C749E4700B71B9F /* search_string_utils.cpp in Sources */,
340DF9D01C1FF04D00B5C7EC /* osm_editor.cpp in Sources */,
67F183731BD4FCF500AB1840 /* map_style.cpp in Sources */,
670D04AB1B0BA8580013A7AC /* feature_loader_101.cpp in Sources */,
6758AED31BB4413000C26E27 /* drules_selector.cpp in Sources */,
6753411A1A3F540F00A0A8C3 /* feature_impl.cpp in Sources */,
670C61111AB065B100C38A8C /* geometry_coding_test.cpp in Sources */,
56C74C1C1C749E4700B71B9F /* categories_holder_loader.cpp in Sources */,
E90547491D1153C70096F4FA /* string_slice.cpp in Sources */,
6753410D1A3F540F00A0A8C3 /* drawing_rules.cpp in Sources */,
670C611E1AB065B100C38A8C /* visibility_test.cpp in Sources */,
675341301A3F540F00A0A8C3 /* index.cpp in Sources */,
56C74C201C749E4700B71B9F /* edits_migration.cpp in Sources */,
6753414D1A3F540F00A0A8C3 /* types_mapping.cpp in Sources */,
6753412A1A3F540F00A0A8C3 /* geometry_coding.cpp in Sources */,
670C61191AB065B100C38A8C /* scales_test.cpp in Sources */,
34583BC71C88552100F94664 /* cuisines.cpp in Sources */,
675341121A3F540F00A0A8C3 /* feature_algo.cpp in Sources */,
675341211A3F540F00A0A8C3 /* feature_utils.cpp in Sources */,
670C61151AB065B100C38A8C /* interval_index_test.cpp in Sources */,
670C61121AB065B100C38A8C /* geometry_serialization_test.cpp in Sources */,
56C74C341C749E8100B71B9F /* search_string_utils_test.cpp in Sources */,
675341231A3F540F00A0A8C3 /* feature_visibility.cpp in Sources */,
56C74C301C749E8100B71B9F /* drules_selector_parser_test.cpp in Sources */,
56C74C221C749E4700B71B9F /* search_delimiters.cpp in Sources */,
347F337B1C454242009758CC /* rank_table.cpp in Sources */,
670C610F1AB065B100C38A8C /* checker_test.cpp in Sources */,
56C74C331C749E8100B71B9F /* rank_table_test.cpp in Sources */,
675341161A3F540F00A0A8C3 /* feature_data.cpp in Sources */,
34583BC91C88552100F94664 /* editable_map_object.cpp in Sources */,
675341031A3F540F00A0A8C3 /* classificator.cpp in Sources */,
670C610E1AB065B100C38A8C /* cell_id_test.cpp in Sources */,
670C61131AB065B100C38A8C /* index_builder_test.cpp in Sources */,
675341401A3F540F00A0A8C3 /* scales.cpp in Sources */,
6753411E1A3F540F00A0A8C3 /* feature_loader.cpp in Sources */,
56C74C351C749E8100B71B9F /* succinct_trie_test.cpp in Sources */,
675341051A3F540F00A0A8C3 /* coding_params.cpp in Sources */,
670C610D1AB065B100C38A8C /* cell_coverer_test.cpp in Sources */,
670C61171AB065B100C38A8C /* mwm_set_test.cpp in Sources */,
675341251A3F540F00A0A8C3 /* feature.cpp in Sources */,
675341091A3F540F00A0A8C3 /* data_header.cpp in Sources */,
56C74C371C749E8100B71B9F /* trie_test.cpp in Sources */,
56C74C311C749E8100B71B9F /* feature_metadata_test.cpp in Sources */,
6753412C1A3F540F00A0A8C3 /* geometry_serialization.cpp in Sources */,
670EE56C1B60033A001E8064 /* features_vector.cpp in Sources */,
6726C1D11A49DAAC005EEA39 /* feature_meta.cpp in Sources */,
6753411C1A3F540F00A0A8C3 /* feature_loader_base.cpp in Sources */,
67BC92F41D21476500A4A378 /* string_slice.cpp in Sources */,
675341071A3F540F00A0A8C3 /* data_factory.cpp in Sources */,
34583BCB1C88552100F94664 /* map_object.cpp in Sources */,
670C611D1AB065B100C38A8C /* test_type.cpp in Sources */,
6753412E1A3F540F00A0A8C3 /* index_builder.cpp in Sources */,
675341011A3F540F00A0A8C3 /* classificator_loader.cpp in Sources */,
670C61181AB065B100C38A8C /* point_to_int64_test.cpp in Sources */,
670C611A1AB065B100C38A8C /* sort_and_merge_intervals_test.cpp in Sources */,
670C61101AB065B100C38A8C /* features_offsets_table_test.cpp in Sources */,
F6381BF91CD26C9C004CA943 /* new_feature_categories.cpp in Sources */,
670C611B1AB065B100C38A8C /* test_polylines.cpp in Sources */,
F6DF5F2D1CD0FC9D00A87154 /* categories_index.cpp in Sources */,
674125131B4C02F100A3E828 /* map_style_reader.cpp in Sources */,
675341141A3F540F00A0A8C3 /* feature_covering.cpp in Sources */,
56C74C1D1C749E4700B71B9F /* categories_holder.cpp in Sources */,
E906DE381CF44917004C4F5E /* postcodes_matcher_tests.cpp in Sources */,
675341371A3F540F00A0A8C3 /* mwm_set.cpp in Sources */,
675341181A3F540F00A0A8C3 /* feature_decl.cpp in Sources */,
6753410B1A3F540F00A0A8C3 /* drawing_rule_def.cpp in Sources */,
56C74C2F1C749E8100B71B9F /* categories_test.cpp in Sources */,
670C61141AB065B100C38A8C /* index_test.cpp in Sources */,
670C615B1AB0691900C38A8C /* features_offsets_table.cpp in Sources */,
675341281A3F540F00A0A8C3 /* ftypes_matcher.cpp in Sources */,
675341101A3F540F00A0A8C3 /* drules_struct.pb.cc in Sources */,
@ -826,10 +853,7 @@
isa = XCBuildConfiguration;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
HEADER_SEARCH_PATHS = "$(inherited)";
LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_LDFLAGS = (
@ -874,6 +898,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = "$(QT_PATH)/lib";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;

24
xcode/map/map.xcodeproj/project.pbxproj
View file

@ -73,6 +73,12 @@
6788508E1D071E34004201E1 /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 678850871D071E34004201E1 /* libpugixml.a */; };
6788508F1D071E34004201E1 /* libsdf_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 678850881D071E34004201E1 /* libsdf_image.a */; };
678850901D071E34004201E1 /* libstb_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 678850891D071E34004201E1 /* libstb_image.a */; };
679624AD1D1017DB00AE4E3C /* address_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 679624A01D1017C200AE4E3C /* address_tests.cpp */; };
679624AE1D1017DB00AE4E3C /* feature_getters_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 679624A11D1017C200AE4E3C /* feature_getters_tests.cpp */; };
679624AF1D1017DB00AE4E3C /* gps_track_collection_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 679624A21D1017C200AE4E3C /* gps_track_collection_test.cpp */; };
679624B01D1017DB00AE4E3C /* gps_track_storage_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 679624A31D1017C200AE4E3C /* gps_track_storage_test.cpp */; };
679624B11D1017DB00AE4E3C /* gps_track_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 679624A41D1017C200AE4E3C /* gps_track_test.cpp */; };
679624B21D1017DB00AE4E3C /* mwm_set_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 679624A51D1017C200AE4E3C /* mwm_set_test.cpp */; };
67F183751BD5041700AB1840 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F183741BD5041700AB1840 /* libz.tbd */; };
67F183761BD5045700AB1840 /* bookmarks_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29CB1B26FCFE001A525C /* bookmarks_test.cpp */; };
67F183771BD5045700AB1840 /* ge0_parser_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29CC1B26FCFE001A525C /* ge0_parser_tests.cpp */; };
@ -183,6 +189,12 @@
678850871D071E34004201E1 /* libpugixml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpugixml.a; path = "../../../omim-xcode-build/Debug/libpugixml.a"; sourceTree = "<group>"; };
678850881D071E34004201E1 /* libsdf_image.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsdf_image.a; path = "../../../omim-xcode-build/Debug/libsdf_image.a"; sourceTree = "<group>"; };
678850891D071E34004201E1 /* libstb_image.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libstb_image.a; path = "../../../omim-xcode-build/Debug/libstb_image.a"; sourceTree = "<group>"; };
679624A01D1017C200AE4E3C /* address_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = address_tests.cpp; sourceTree = "<group>"; };
679624A11D1017C200AE4E3C /* feature_getters_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_getters_tests.cpp; sourceTree = "<group>"; };
679624A21D1017C200AE4E3C /* gps_track_collection_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gps_track_collection_test.cpp; sourceTree = "<group>"; };
679624A31D1017C200AE4E3C /* gps_track_storage_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gps_track_storage_test.cpp; sourceTree = "<group>"; };
679624A41D1017C200AE4E3C /* gps_track_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gps_track_test.cpp; sourceTree = "<group>"; };
679624A51D1017C200AE4E3C /* mwm_set_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_set_test.cpp; sourceTree = "<group>"; };
67F183741BD5041700AB1840 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
67F1837D1BD5049500AB1840 /* libagg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libagg.a; path = "../../../omim-xcode-build/Debug/libagg.a"; sourceTree = "<group>"; };
67F1837E1BD5049500AB1840 /* liblodepng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblodepng.a; path = "../../../omim-xcode-build/Debug/liblodepng.a"; sourceTree = "<group>"; };
@ -260,6 +272,12 @@
674A29CA1B26FCC0001A525C /* map_tests */ = {
isa = PBXGroup;
children = (
679624A01D1017C200AE4E3C /* address_tests.cpp */,
679624A11D1017C200AE4E3C /* feature_getters_tests.cpp */,
679624A21D1017C200AE4E3C /* gps_track_collection_test.cpp */,
679624A31D1017C200AE4E3C /* gps_track_storage_test.cpp */,
679624A41D1017C200AE4E3C /* gps_track_test.cpp */,
679624A51D1017C200AE4E3C /* mwm_set_test.cpp */,
674A29EE1B26FD5F001A525C /* testingmain.cpp */,
674A29CB1B26FCFE001A525C /* bookmarks_test.cpp */,
674A29CC1B26FCFE001A525C /* ge0_parser_tests.cpp */,
@ -496,12 +514,18 @@
files = (
67F183761BD5045700AB1840 /* bookmarks_test.cpp in Sources */,
67F183771BD5045700AB1840 /* ge0_parser_tests.cpp in Sources */,
679624B21D1017DB00AE4E3C /* mwm_set_test.cpp in Sources */,
67F183781BD5045700AB1840 /* geourl_test.cpp in Sources */,
679624AD1D1017DB00AE4E3C /* address_tests.cpp in Sources */,
67F183791BD5045700AB1840 /* kmz_unarchive_test.cpp in Sources */,
679624AE1D1017DB00AE4E3C /* feature_getters_tests.cpp in Sources */,
67F1837A1BD5045700AB1840 /* mwm_url_tests.cpp in Sources */,
679624AF1D1017DB00AE4E3C /* gps_track_collection_test.cpp in Sources */,
679624B01D1017DB00AE4E3C /* gps_track_storage_test.cpp in Sources */,
678850811D06F588004201E1 /* booking_tests.cpp in Sources */,
674A29F01B26FD6F001A525C /* testingmain.cpp in Sources */,
674A2A361B27011A001A525C /* working_time_tests.cpp in Sources */,
679624B11D1017DB00AE4E3C /* gps_track_test.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

133
xcode/search/search.xcodeproj/project.pbxproj
View file

@ -29,7 +29,6 @@
347F332A1C4540A8009758CC /* search_index_values.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F330F1C4540A8009758CC /* search_index_values.hpp */; };
347F332F1C4540A8009758CC /* search_trie.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33141C4540A8009758CC /* search_trie.hpp */; };
347F33301C4540A8009758CC /* suggest.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33151C4540A8009758CC /* suggest.hpp */; };
34B1CB781D22905800B59423 /* ranker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34B1CB761D22905800B59423 /* ranker.cpp */; };
34B1CB791D22905800B59423 /* ranker.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34B1CB771D22905800B59423 /* ranker.hpp */; };
56D5456E1C74A48C00E3719C /* mode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56D5456C1C74A48C00E3719C /* mode.cpp */; };
56D5456F1C74A48C00E3719C /* mode.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56D5456D1C74A48C00E3719C /* mode.hpp */; };
@ -77,6 +76,15 @@
675346F01A40560D00A0A8C3 /* params.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346D21A40560D00A0A8C3 /* params.hpp */; };
675346F11A40560D00A0A8C3 /* result.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675346D31A40560D00A0A8C3 /* result.cpp */; };
675346F21A40560D00A0A8C3 /* result.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346D41A40560D00A0A8C3 /* result.hpp */; };
679624961D10137D00AE4E3C /* test_results_matching.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 679624901D10137D00AE4E3C /* test_results_matching.hpp */; };
679624981D10137D00AE4E3C /* test_search_engine.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 679624921D10137D00AE4E3C /* test_search_engine.hpp */; };
6796249A1D10137D00AE4E3C /* test_search_request.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 679624941D10137D00AE4E3C /* test_search_request.hpp */; };
6796249B1D10138400AE4E3C /* test_results_matching.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6796248F1D10137D00AE4E3C /* test_results_matching.cpp */; };
6796249C1D10138400AE4E3C /* test_search_engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 679624911D10137D00AE4E3C /* test_search_engine.cpp */; };
6796249D1D10138400AE4E3C /* test_search_request.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 679624931D10137D00AE4E3C /* test_search_request.cpp */; };
67BC92ED1D21469A00A4A378 /* ranker.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BC92EB1D21469A00A4A378 /* ranker.hpp */; };
67BC92F81D22E45900A4A378 /* ranker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67BC92F61D22E45900A4A378 /* ranker.cpp */; };
67BC92F91D22E45900A4A378 /* ranker.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BC92F71D22E45900A4A378 /* ranker.hpp */; };
A1347D511B8758C3009050FF /* query_saver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1347D4F1B8758C3009050FF /* query_saver.cpp */; };
A1347D521B8758C3009050FF /* query_saver.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A1347D501B8758C3009050FF /* query_saver.hpp */; };
A1347D551B8758E9009050FF /* query_saver_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1347D541B8758E9009050FF /* query_saver_tests.cpp */; };
@ -164,7 +172,6 @@
347F330F1C4540A8009758CC /* search_index_values.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_index_values.hpp; sourceTree = "<group>"; };
347F33141C4540A8009758CC /* search_trie.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_trie.hpp; sourceTree = "<group>"; };
347F33151C4540A8009758CC /* suggest.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = suggest.hpp; sourceTree = "<group>"; };
34B1CB761D22905800B59423 /* ranker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ranker.cpp; sourceTree = "<group>"; };
34B1CB771D22905800B59423 /* ranker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ranker.hpp; sourceTree = "<group>"; };
56D5456C1C74A48C00E3719C /* mode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mode.cpp; sourceTree = "<group>"; };
56D5456D1C74A48C00E3719C /* mode.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mode.hpp; sourceTree = "<group>"; };
@ -215,6 +222,16 @@
675346D21A40560D00A0A8C3 /* params.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = params.hpp; sourceTree = "<group>"; };
675346D31A40560D00A0A8C3 /* result.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = result.cpp; sourceTree = "<group>"; };
675346D41A40560D00A0A8C3 /* result.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = result.hpp; sourceTree = "<group>"; };
679624831D10133300AE4E3C /* libsearch_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsearch_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; };
6796248F1D10137D00AE4E3C /* test_results_matching.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_results_matching.cpp; sourceTree = "<group>"; };
679624901D10137D00AE4E3C /* test_results_matching.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_results_matching.hpp; sourceTree = "<group>"; };
679624911D10137D00AE4E3C /* test_search_engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_search_engine.cpp; sourceTree = "<group>"; };
679624921D10137D00AE4E3C /* test_search_engine.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_search_engine.hpp; sourceTree = "<group>"; };
679624931D10137D00AE4E3C /* test_search_request.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_search_request.cpp; sourceTree = "<group>"; };
679624941D10137D00AE4E3C /* test_search_request.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_search_request.hpp; sourceTree = "<group>"; };
67BC92EB1D21469A00A4A378 /* ranker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ranker.hpp; sourceTree = "<group>"; };
67BC92F61D22E45900A4A378 /* ranker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ranker.cpp; sourceTree = "<group>"; };
67BC92F71D22E45900A4A378 /* ranker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ranker.hpp; sourceTree = "<group>"; };
A1347D4F1B8758C3009050FF /* query_saver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = query_saver.cpp; sourceTree = "<group>"; };
A1347D501B8758C3009050FF /* query_saver.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = query_saver.hpp; sourceTree = "<group>"; };
A1347D541B8758E9009050FF /* query_saver_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = query_saver_tests.cpp; sourceTree = "<group>"; };
@ -293,6 +310,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
679624801D10133300AE4E3C /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
@ -339,6 +363,7 @@
670D05A31B0DF3C30013A7AC /* defaults.xcconfig */,
675346B21A4055CF00A0A8C3 /* search */,
671C620D1AE9225100076BD0 /* search_tests */,
6796248E1D10134200AE4E3C /* search_tests_support */,
675346B11A4055CF00A0A8C3 /* Products */,
);
sourceTree = "<group>";
@ -348,6 +373,7 @@
children = (
675346B01A4055CF00A0A8C3 /* libsearch.a */,
671C620C1AE9225100076BD0 /* search_tests */,
679624831D10133300AE4E3C /* libsearch_tests_support.a */,
);
name = Products;
sourceTree = "<group>";
@ -355,8 +381,8 @@
675346B21A4055CF00A0A8C3 /* search */ = {
isa = PBXGroup;
children = (
34B1CB761D22905800B59423 /* ranker.cpp */,
34B1CB771D22905800B59423 /* ranker.hpp */,
67BC92F61D22E45900A4A378 /* ranker.cpp */,
67BC92F71D22E45900A4A378 /* ranker.hpp */,
F652D9101CFDE84200FC29A0 /* cbv_ptr.cpp */,
F652D9111CFDE84200FC29A0 /* cbv_ptr.hpp */,
F652D8C21CFDE21900FC29A0 /* features_filter.hpp */,
@ -459,6 +485,20 @@
path = ../../search;
sourceTree = "<group>";
};
6796248E1D10134200AE4E3C /* search_tests_support */ = {
isa = PBXGroup;
children = (
6796248F1D10137D00AE4E3C /* test_results_matching.cpp */,
679624901D10137D00AE4E3C /* test_results_matching.hpp */,
679624911D10137D00AE4E3C /* test_search_engine.cpp */,
679624921D10137D00AE4E3C /* test_search_engine.hpp */,
679624931D10137D00AE4E3C /* test_search_request.cpp */,
679624941D10137D00AE4E3C /* test_search_request.hpp */,
);
name = search_tests_support;
path = ../../search/search_tests_support;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
@ -480,6 +520,7 @@
675346E11A40560D00A0A8C3 /* geometry_utils.hpp in Headers */,
675346E31A40560D00A0A8C3 /* house_detector.hpp in Headers */,
F652D9071CFDE21900FC29A0 /* ranking_info.hpp in Headers */,
679624981D10137D00AE4E3C /* test_search_engine.hpp in Headers */,
F652D8BE1CFDE1E800FC29A0 /* common.hpp in Headers */,
F652D8E91CFDE21900FC29A0 /* features_filter.hpp in Headers */,
F652D90F1CFDE21900FC29A0 /* token_slice.hpp in Headers */,
@ -504,15 +545,19 @@
F652D8F91CFDE21900FC29A0 /* intersection_result.hpp in Headers */,
F652D8F11CFDE21900FC29A0 /* geocoder.hpp in Headers */,
F652D8F31CFDE21900FC29A0 /* geometry_cache.hpp in Headers */,
67BC92F91D22E45900A4A378 /* ranker.hpp in Headers */,
F652D8EB1CFDE21900FC29A0 /* features_layer_matcher.hpp in Headers */,
347F331B1C4540A8009758CC /* interval_set.hpp in Headers */,
F652D9051CFDE21900FC29A0 /* rank_table_cache.hpp in Headers */,
F652D90D1CFDE21900FC29A0 /* string_intersection.hpp in Headers */,
F652D8C01CFDE1E800FC29A0 /* engine.hpp in Headers */,
675346DF1A40560D00A0A8C3 /* feature_offset_match.hpp in Headers */,
6796249A1D10137D00AE4E3C /* test_search_request.hpp in Headers */,
347F331A1C4540A8009758CC /* dummy_rank_table.hpp in Headers */,
3441CE511CFC1D7000CF30D4 /* processor.hpp in Headers */,
3441CE531CFC1D7000CF30D4 /* query_params.hpp in Headers */,
679624961D10137D00AE4E3C /* test_results_matching.hpp in Headers */,
67BC92ED1D21469A00A4A378 /* ranker.hpp in Headers */,
675346DC1A40560D00A0A8C3 /* algos.hpp in Headers */,
F652D8FD1CFDE21900FC29A0 /* model.hpp in Headers */,
F652D8FF1CFDE21900FC29A0 /* mwm_context.hpp in Headers */,
@ -524,6 +569,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
679624811D10133300AE4E3C /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
@ -561,6 +613,23 @@
productReference = 675346B01A4055CF00A0A8C3 /* libsearch.a */;
productType = "com.apple.product-type.library.static";
};
679624821D10133300AE4E3C /* search_tests_support */ = {
isa = PBXNativeTarget;
buildConfigurationList = 6796248D1D10133300AE4E3C /* Build configuration list for PBXNativeTarget "search_tests_support" */;
buildPhases = (
6796247F1D10133300AE4E3C /* Sources */,
679624801D10133300AE4E3C /* Frameworks */,
679624811D10133300AE4E3C /* Headers */,
);
buildRules = (
);
dependencies = (
);
name = search_tests_support;
productName = search_tests_support;
productReference = 679624831D10133300AE4E3C /* libsearch_tests_support.a */;
productType = "com.apple.product-type.library.static";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@ -576,6 +645,9 @@
675346AF1A4055CF00A0A8C3 = {
CreatedOnToolsVersion = 6.1;
};
679624821D10133300AE4E3C = {
CreatedOnToolsVersion = 7.3.1;
};
};
};
buildConfigurationList = 675346AB1A4055CF00A0A8C3 /* Build configuration list for PBXProject "search" */;
@ -592,6 +664,7 @@
targets = (
675346AF1A4055CF00A0A8C3 /* search */,
671C620B1AE9225100076BD0 /* search_tests */,
679624821D10133300AE4E3C /* search_tests_support */,
);
};
/* End PBXProject section */
@ -631,7 +704,7 @@
A1347D511B8758C3009050FF /* query_saver.cpp in Sources */,
675346E01A40560D00A0A8C3 /* geometry_utils.cpp in Sources */,
F652D90E1CFDE21900FC29A0 /* token_slice.cpp in Sources */,
34B1CB781D22905800B59423 /* ranker.cpp in Sources */,
67BC92F81D22E45900A4A378 /* ranker.cpp in Sources */,
347F33201C4540A8009758CC /* projection_on_street.cpp in Sources */,
347F33191C4540A8009758CC /* dummy_rank_table.cpp in Sources */,
F652D8F41CFDE21900FC29A0 /* house_numbers_matcher.cpp in Sources */,
@ -665,6 +738,16 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
6796247F1D10133300AE4E3C /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
6796249B1D10138400AE4E3C /* test_results_matching.cpp in Sources */,
6796249C1D10138400AE4E3C /* test_search_engine.cpp in Sources */,
6796249D1D10138400AE4E3C /* test_search_request.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin XCBuildConfiguration section */
@ -812,6 +895,37 @@
};
name = Release;
};
6796248B1D10133300AE4E3C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CODE_SIGN_IDENTITY = "-";
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_TESTABILITY = YES;
EXECUTABLE_PREFIX = lib;
GCC_ENABLE_CPP_EXCEPTIONS = YES;
GCC_ENABLE_CPP_RTTI = YES;
GCC_NO_COMMON_BLOCKS = YES;
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
6796248C1D10133300AE4E3C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
EXECUTABLE_PREFIX = lib;
GCC_ENABLE_CPP_EXCEPTIONS = YES;
GCC_ENABLE_CPP_RTTI = YES;
GCC_NO_COMMON_BLOCKS = YES;
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@ -842,6 +956,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
6796248D1D10133300AE4E3C /* Build configuration list for PBXNativeTarget "search_tests_support" */ = {
isa = XCConfigurationList;
buildConfigurations = (
6796248B1D10133300AE4E3C /* Debug */,
6796248C1D10133300AE4E3C /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 675346A81A4055CF00A0A8C3 /* Project object */;