Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/worker_thread.hpp2
-rw-r--r--generator/generator_tests_support/test_feature.cpp1
-rw-r--r--indexer/indexer_tests_support/test_mwm_environment.cpp36
-rw-r--r--indexer/indexer_tests_support/test_mwm_environment.hpp83
-rw-r--r--indexer/indexer_tests_support/test_with_custom_mwms.hpp3
-rw-r--r--map/booking_filter.cpp4
-rw-r--r--map/booking_filter.hpp2
-rw-r--r--map/framework.cpp8
-rw-r--r--map/map_tests/booking_filter_test.cpp20
-rw-r--r--map/search_api.cpp18
-rw-r--r--map/search_api.hpp13
-rw-r--r--xcode/indexer/indexer.xcodeproj/project.pbxproj24
-rw-r--r--xcode/map/map.xcodeproj/project.pbxproj12
-rw-r--r--xcode/search/search.xcodeproj/project.pbxproj15
14 files changed, 95 insertions, 146 deletions
diff --git a/base/worker_thread.hpp b/base/worker_thread.hpp
index 2cdb8a0766..29e42e03ee 100644
--- a/base/worker_thread.hpp
+++ b/base/worker_thread.hpp
@@ -65,7 +65,7 @@ public:
// Sends a signal to the thread to shut down and waits for completion.
void ShutdownAndJoin();
- static TimePoint Now() const { return Clock::now(); }
+ static TimePoint Now() { return Clock::now(); }
private:
enum QueueType
diff --git a/generator/generator_tests_support/test_feature.cpp b/generator/generator_tests_support/test_feature.cpp
index 972849381c..6c2b8f0e7c 100644
--- a/generator/generator_tests_support/test_feature.cpp
+++ b/generator/generator_tests_support/test_feature.cpp
@@ -73,6 +73,7 @@ bool TestFeature::Matches(FeatureType const & feature) const
void TestFeature::Serialize(FeatureBuilder1 & fb) const
{
using feature::Metadata;
+ // Metadata::EType::FMD_CUISINE is the first enum value.
size_t i = static_cast<size_t>(Metadata::EType::FMD_CUISINE);
size_t const count = static_cast<size_t>(Metadata::EType::FMD_COUNT);
for (; i < count; ++i)
diff --git a/indexer/indexer_tests_support/test_mwm_environment.cpp b/indexer/indexer_tests_support/test_mwm_environment.cpp
deleted file mode 100644
index ca686ef114..0000000000
--- a/indexer/indexer_tests_support/test_mwm_environment.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "indexer/indexer_tests_support/test_mwm_environment.hpp"
-
-#include <indexer/classificator_loader.hpp>
-
-namespace indexer
-{
-namespace tests_support
-{
-TestMwmEnvironment::TestMwmEnvironment() { classificator::Load(); }
-
-TestMwmEnvironment::~TestMwmEnvironment()
-{
- for (auto const & file : m_mwmFiles)
- Cleanup(file);
-}
-
-void TestMwmEnvironment::Cleanup(platform::LocalCountryFile const & map)
-{
- platform::CountryIndexes::DeleteFromDisk(map);
- map.DeleteFromDisk(MapOptions::Map);
-}
-
-bool TestMwmEnvironment::RemoveMwm(MwmSet::MwmId const & mwmId)
-{
- auto const & file = mwmId.GetInfo()->GetLocalFile();
- auto const it = find(m_mwmFiles.begin(), m_mwmFiles.end(), file);
-
- if (it == m_mwmFiles.end())
- return false;
-
- Cleanup(*it);
- m_mwmFiles.erase(it);
- return true;
-}
-} // namespace tests_support
-} // namespace indexer
diff --git a/indexer/indexer_tests_support/test_mwm_environment.hpp b/indexer/indexer_tests_support/test_mwm_environment.hpp
deleted file mode 100644
index 272c26a824..0000000000
--- a/indexer/indexer_tests_support/test_mwm_environment.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-#pragma once
-
-#include "generator/generator_tests_support/test_feature.hpp"
-#include "generator/generator_tests_support/test_mwm_builder.hpp"
-
-#include "platform/local_country_file_utils.hpp"
-
-#include "storage/country_info_getter.hpp"
-
-#include <indexer/index.hpp>
-
-#include <vector>
-
-namespace indexer
-{
-namespace tests_support
-{
-class TestMwmEnvironment
-{
-public:
- using MwmList = std::vector<platform::LocalCountryFile>;
-
- TestMwmEnvironment();
- ~TestMwmEnvironment();
-
- template <typename TBuildFn>
- MwmSet::MwmId BuildMwm(string const & name, TBuildFn && fn, int64_t version = 0)
- {
- m_mwmFiles.emplace_back(GetPlatform().WritableDir(), platform::CountryFile(name), version);
- auto & file = m_mwmFiles.back();
- Cleanup(file);
-
- {
- generator::tests_support::TestMwmBuilder builder(file, feature::DataHeader::country);
- fn(builder);
- }
-
- auto result = m_index.RegisterMap(file);
- CHECK_EQUAL(result.second, MwmSet::RegResult::Success, ());
-
- auto const & id = result.first;
-
- auto const & info = id.GetInfo();
- if (info)
- m_infoGetter.AddCountry(storage::CountryDef(name, info->m_limitRect));
-
- CHECK(id.IsAlive(), ());
-
- return id;
- }
-
- template <typename Checker>
- FeatureID FeatureIdForPoint(m2::PointD const & mercator, Checker const & checker)
- {
- m2::RectD const rect =
- MercatorBounds::RectByCenterXYAndSizeInMeters(mercator, 0.2 /* rect width */);
- FeatureID id;
- auto const fn = [&id, &checker](FeatureType const & featureType)
- {
- if (checker(featureType))
- id = featureType.GetID();
- };
- m_index.ForEachInRect(fn, rect, scales::GetUpperScale());
- CHECK(id.IsValid(), ());
- return id;
- }
-
- void Cleanup(platform::LocalCountryFile const & map);
- bool RemoveMwm(MwmSet::MwmId const & mwmId);
-
- Index & GetIndex() { return m_index; }
- Index const & GetIndex() const { return m_index; }
-
- MwmList & GetMwms() { return m_mwmFiles; }
- MwmList const & GetMwms() const { return m_mwmFiles; }
-
-private:
- Index m_index;
- storage::CountryInfoGetterForTesting m_infoGetter;
- MwmList m_mwmFiles;
-};
-} // namespace tests_support
-} // namespace indexer
diff --git a/indexer/indexer_tests_support/test_with_custom_mwms.hpp b/indexer/indexer_tests_support/test_with_custom_mwms.hpp
index 9fbc81614b..a1066cdea3 100644
--- a/indexer/indexer_tests_support/test_with_custom_mwms.hpp
+++ b/indexer/indexer_tests_support/test_with_custom_mwms.hpp
@@ -69,6 +69,9 @@ public:
return BuildMwm(name, feature::DataHeader::country, std::forward<BuildFn>(fn));
}
+ Index & GetIndex() { return m_index; }
+ Index const & GetIndex() const { return m_index; }
+
protected:
static void Cleanup(platform::LocalCountryFile const & file);
diff --git a/map/booking_filter.cpp b/map/booking_filter.cpp
index ff3c5e6278..96d1b541c9 100644
--- a/map/booking_filter.cpp
+++ b/map/booking_filter.cpp
@@ -6,6 +6,8 @@
#include "indexer/index.hpp"
+#include "platform/platform.hpp"
+
#include <algorithm>
#include <utility>
#include <vector>
@@ -134,7 +136,7 @@ Filter::Filter(Index const & index, booking::Api const & api) : m_index(index),
void Filter::Availability(search::Results const & results,
availability::internal::Params && params)
{
- m_filterThread.Push([this, results, params]()
+ GetPlatform().RunTask(Platform::Thread::File, [this, results, params]()
{
std::lock_guard<std::mutex> lock(m_mutex);
diff --git a/map/booking_filter.hpp b/map/booking_filter.hpp
index 0c933ca064..4e95578a09 100644
--- a/map/booking_filter.hpp
+++ b/map/booking_filter.hpp
@@ -36,8 +36,6 @@ private:
// |m_cacheDropCounter| and |m_currentParams| are used to identify request actuality.
uint32_t m_cacheDropCounter = {};
AvailabilityParams m_currentParams;
-
- base::WorkerThread m_filterThread;
};
} // namespace filter
} // namespace booking
diff --git a/map/framework.cpp b/map/framework.cpp
index 49e974fa92..9fa12aa7e0 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1576,7 +1576,7 @@ void Framework::FillSearchResultsMarks(search::Results::ConstIter begin,
}
// TODO: delete me after Cian project is finished.
- if (GetSearchAPI().IsCianSearchMode())
+ if (GetSearchAPI().GetSponsoredMode() == SearchAPI::SponsoredMode::Cian)
{
mark->SetMarkType(SearchMarkType::Cian);
continue;
@@ -1585,8 +1585,8 @@ void Framework::FillSearchResultsMarks(search::Results::ConstIter begin,
if (r.m_metadata.m_isSponsoredHotel)
mark->SetMarkType(SearchMarkType::Booking);
- //TODO: set mark in preparing state if some async filter will be applied.
- //mark->SetPreparing(true);
+ if (GetSearchAPI().GetSponsoredMode() == SearchAPI::SponsoredMode::Booking)
+ mark->SetPreparing(true);
}
}
@@ -3330,7 +3330,7 @@ void Framework::FilterSearchResultsOnBooking(booking::filter::availability::Para
std::sort(features.begin(), features.end());
- GetPlatform().RunOnGuiThread([this, features]()
+ GetPlatform().RunTask(Platform::Thread::Gui, [this, features]()
{
m_searchMarks.SetPreparingState(features, false);
});
diff --git a/map/map_tests/booking_filter_test.cpp b/map/map_tests/booking_filter_test.cpp
index 2a989956f9..488eacf1ce 100644
--- a/map/map_tests/booking_filter_test.cpp
+++ b/map/map_tests/booking_filter_test.cpp
@@ -1,7 +1,7 @@
#include "testing/testing.hpp"
#include "generator/generator_tests_support/test_feature.hpp"
-#include "indexer/indexer_tests_support/test_mwm_environment.hpp"
+#include "indexer/indexer_tests_support/test_with_custom_mwms.hpp"
#include "map/booking_filter.hpp"
@@ -11,6 +11,8 @@
#include "indexer/feature_meta.hpp"
+#include "storage/country_info_getter.hpp"
+
#include "base/scope_guard.hpp"
#include <utility>
@@ -20,9 +22,21 @@ using namespace generator::tests_support;
namespace
{
+class TestMwmEnvironment : public indexer::tests_support::TestWithCustomMwms
+{
+protected:
+ void OnMwmBuilt(MwmInfo const & info) override
+ {
+ m_infoGetter.AddCountry(storage::CountryDef(info.GetCountryName(), info.m_limitRect));
+ }
+
+private:
+ storage::CountryInfoGetterForTesting m_infoGetter;
+};
+
UNIT_TEST(BookingFilter_AvailabilitySmoke)
{
- indexer::tests_support::TestMwmEnvironment env;
+ TestMwmEnvironment env;
booking::Api api;
Filter filter(env.GetIndex(), api);
@@ -31,7 +45,7 @@ UNIT_TEST(BookingFilter_AvailabilitySmoke)
std::vector<std::string> const kHotelIds = {"10623", "10624", "10625"};
- env.BuildMwm("TestMwm", [&kHotelIds](TestMwmBuilder & builder)
+ env.BuildCountry("TestMwm", [&kHotelIds](TestMwmBuilder & builder)
{
TestPOI hotel1(m2::PointD(1.0, 1.0), "hotel 1", "en");
hotel1.GetMetadata().Set(feature::Metadata::FMD_SPONSORED_ID, kHotelIds[0]);
diff --git a/map/search_api.cpp b/map/search_api.cpp
index 2b4b10ef15..7d6831c39a 100644
--- a/map/search_api.cpp
+++ b/map/search_api.cpp
@@ -76,6 +76,12 @@ void SearchAPI::OnViewportChanged(m2::RectD const & viewport)
bool SearchAPI::SearchEverywhere(EverywhereSearchParams const & params)
{
+ // TODO: delete me after Cian project is finished.
+ if (IsCianMode(params.m_query))
+ m_sponsoredMode = SponsoredMode::Cian;
+ else if (!params.m_bookingFilterParams.IsEmpty())
+ m_sponsoredMode = SponsoredMode::Booking;
+
SearchParams p;
p.m_query = params.m_query;
p.m_inputLocale = params.m_inputLocale;
@@ -87,7 +93,7 @@ bool SearchAPI::SearchEverywhere(EverywhereSearchParams const & params)
p.m_needAddress = true;
p.m_needHighlighting = true;
p.m_hotelsFilter = params.m_hotelsFilter;
- p.m_cianMode = IsCianMode(params.m_query);
+ p.m_cianMode = m_sponsoredMode == SponsoredMode::Cian;
p.m_onResults = EverywhereSearchCallback(
static_cast<EverywhereSearchCallback::Delegate &>(*this),
@@ -109,7 +115,10 @@ bool SearchAPI::SearchEverywhere(EverywhereSearchParams const & params)
bool SearchAPI::SearchInViewport(ViewportSearchParams const & params)
{
// TODO: delete me after Cian project is finished.
- m_cianSearchMode = IsCianMode(params.m_query);
+ if (IsCianMode(params.m_query))
+ m_sponsoredMode = SponsoredMode::Cian;
+ else if (!params.m_bookingFilterParams.IsEmpty())
+ m_sponsoredMode = SponsoredMode::Booking;
SearchParams p;
p.m_query = params.m_query;
@@ -122,7 +131,7 @@ bool SearchAPI::SearchInViewport(ViewportSearchParams const & params)
p.m_needAddress = false;
p.m_needHighlighting = false;
p.m_hotelsFilter = params.m_hotelsFilter;
- p.m_cianMode = m_cianSearchMode;
+ p.m_cianMode = m_sponsoredMode == SponsoredMode::Cian;
p.m_onStarted = [this, params] {
if (params.m_onStarted)
@@ -181,8 +190,7 @@ void SearchAPI::CancelSearch(Mode mode)
if (mode == Mode::Viewport)
{
- // TODO: delete me after Cian project is finished.
- m_cianSearchMode = false;
+ m_sponsoredMode = SponsoredMode::None;
m_delegate.ClearViewportSearchResults();
m_delegate.SetSearchDisplacementModeEnabled(false /* enabled */);
diff --git a/map/search_api.hpp b/map/search_api.hpp
index ec9ed364e6..881607a89d 100644
--- a/map/search_api.hpp
+++ b/map/search_api.hpp
@@ -46,6 +46,14 @@ class SearchAPI : public search::DownloaderSearchCallback::Delegate,
public search::ViewportSearchCallback::Delegate
{
public:
+ enum SponsoredMode
+ {
+ None,
+ // TODO (@y, @m): delete me after Cian project is finished.
+ Cian,
+ Booking
+ };
+
struct Delegate
{
virtual ~Delegate() = default;
@@ -83,7 +91,7 @@ public:
void LoadCitiesBoundaries() { m_engine.LoadCitiesBoundaries(); }
- bool IsCianSearchMode() const { return m_cianSearchMode; }
+ SponsoredMode GetSponsoredMode() const { return m_sponsoredMode; }
// Search everywhere.
bool SearchEverywhere(search::EverywhereSearchParams const & params);
@@ -146,6 +154,5 @@ private:
m2::RectD m_viewport;
bool m_isViewportInitialized = false;
- // TODO (@y, @m): delete me after Cian project is finished.
- bool m_cianSearchMode = false;
+ SponsoredMode m_sponsoredMode = SponsoredMode::None;
};
diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj
index d5166a9421..ca7ebbc3d9 100644
--- a/xcode/indexer/indexer.xcodeproj/project.pbxproj
+++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj
@@ -42,6 +42,10 @@
34AF87E61DBE565F00E5E7DC /* helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34AF87E41DBE565F00E5E7DC /* helpers.hpp */; };
34AF87E71DBE567C00E5E7DC /* libindexer_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34AF87D71DBE561400E5E7DC /* libindexer_tests_support.a */; };
34AF87E81DBE570200E5E7DC /* helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34AF87E31DBE565F00E5E7DC /* helpers.cpp */; };
+ 3D0AEAF81FBAF9E900AD042B /* test_with_classificator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D0AEAF41FBAF9E900AD042B /* test_with_classificator.cpp */; };
+ 3D0AEAF91FBAF9E900AD042B /* test_with_custom_mwms.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D0AEAF51FBAF9E900AD042B /* test_with_custom_mwms.hpp */; };
+ 3D0AEAFA1FBAF9E900AD042B /* test_with_custom_mwms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D0AEAF61FBAF9E900AD042B /* test_with_custom_mwms.cpp */; };
+ 3D0AEAFB1FBAF9E900AD042B /* test_with_classificator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D0AEAF71FBAF9E900AD042B /* test_with_classificator.hpp */; };
3D452AFA1EE6D9F5009EAB9B /* wheelchair_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D452AF71EE6D9F5009EAB9B /* wheelchair_tests.cpp */; };
3D452AFB1EE6D9F5009EAB9B /* feature_names_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D452AF81EE6D9F5009EAB9B /* feature_names_test.cpp */; };
3D452AFC1EE6D9F5009EAB9B /* centers_table_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D452AF91EE6D9F5009EAB9B /* centers_table_test.cpp */; };
@@ -50,8 +54,6 @@
3D489BC81D3D22190052AA38 /* string_slice_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D489BA91D3D1F8A0052AA38 /* string_slice_tests.cpp */; };
3D489BF31D4F87740052AA38 /* osm_editor_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D489BF11D4F87740052AA38 /* osm_editor_test.cpp */; };
3D489BF41D4F87740052AA38 /* osm_editor_test.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D489BF21D4F87740052AA38 /* osm_editor_test.hpp */; };
- 3D4E99881FB48E5F0025B48C /* test_mwm_environment.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D4E99861FB48E5F0025B48C /* test_mwm_environment.hpp */; };
- 3D4E99891FB48E5F0025B48C /* test_mwm_environment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D4E99871FB48E5F0025B48C /* test_mwm_environment.cpp */; };
3D51BC311D5E4B7300F1FA8D /* osm_editor_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D489BF11D4F87740052AA38 /* osm_editor_test.cpp */; };
3D51BC331D5E4BB000F1FA8D /* osm_editor_test.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D489BF21D4F87740052AA38 /* osm_editor_test.hpp */; };
3D51BC351D5E4BF600F1FA8D /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D51BC341D5E4BF600F1FA8D /* libsearch.a */; };
@@ -275,6 +277,10 @@
34AF87D71DBE561400E5E7DC /* libindexer_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libindexer_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; };
34AF87E31DBE565F00E5E7DC /* helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = helpers.cpp; sourceTree = "<group>"; };
34AF87E41DBE565F00E5E7DC /* helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = helpers.hpp; sourceTree = "<group>"; };
+ 3D0AEAF41FBAF9E900AD042B /* test_with_classificator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_with_classificator.cpp; sourceTree = "<group>"; };
+ 3D0AEAF51FBAF9E900AD042B /* test_with_custom_mwms.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_with_custom_mwms.hpp; sourceTree = "<group>"; };
+ 3D0AEAF61FBAF9E900AD042B /* test_with_custom_mwms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_with_custom_mwms.cpp; sourceTree = "<group>"; };
+ 3D0AEAF71FBAF9E900AD042B /* test_with_classificator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_with_classificator.hpp; sourceTree = "<group>"; };
3D452AF71EE6D9F5009EAB9B /* wheelchair_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wheelchair_tests.cpp; sourceTree = "<group>"; };
3D452AF81EE6D9F5009EAB9B /* feature_names_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_names_test.cpp; sourceTree = "<group>"; };
3D452AF91EE6D9F5009EAB9B /* centers_table_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = centers_table_test.cpp; sourceTree = "<group>"; };
@@ -283,8 +289,6 @@
3D489BA91D3D1F8A0052AA38 /* string_slice_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_slice_tests.cpp; sourceTree = "<group>"; };
3D489BF11D4F87740052AA38 /* osm_editor_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_editor_test.cpp; sourceTree = "<group>"; };
3D489BF21D4F87740052AA38 /* osm_editor_test.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_editor_test.hpp; sourceTree = "<group>"; };
- 3D4E99861FB48E5F0025B48C /* test_mwm_environment.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_mwm_environment.hpp; sourceTree = "<group>"; };
- 3D4E99871FB48E5F0025B48C /* test_mwm_environment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_mwm_environment.cpp; sourceTree = "<group>"; };
3D51BC341D5E4BF600F1FA8D /* libsearch.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsearch.a; path = "../../../omim-xcode-build/Debug/libsearch.a"; sourceTree = "<group>"; };
3D51BC361D5E4C3900F1FA8D /* libstorage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libstorage.a; path = "../../../omim-xcode-build/Debug/libstorage.a"; sourceTree = "<group>"; };
3D51BC381D5E4C4300F1FA8D /* libgenerator.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgenerator.a; path = "../../../omim-xcode-build/Debug/libgenerator.a"; sourceTree = "<group>"; };
@@ -536,8 +540,10 @@
34AF87E21DBE562300E5E7DC /* indexer_tests_support */ = {
isa = PBXGroup;
children = (
- 3D4E99871FB48E5F0025B48C /* test_mwm_environment.cpp */,
- 3D4E99861FB48E5F0025B48C /* test_mwm_environment.hpp */,
+ 3D0AEAF41FBAF9E900AD042B /* test_with_classificator.cpp */,
+ 3D0AEAF71FBAF9E900AD042B /* test_with_classificator.hpp */,
+ 3D0AEAF61FBAF9E900AD042B /* test_with_custom_mwms.cpp */,
+ 3D0AEAF51FBAF9E900AD042B /* test_with_custom_mwms.hpp */,
34AF87E31DBE565F00E5E7DC /* helpers.cpp */,
34AF87E41DBE565F00E5E7DC /* helpers.hpp */,
);
@@ -838,7 +844,6 @@
files = (
E906DE3C1CF44934004C4F5E /* postcodes_matcher.hpp in Headers */,
6753414E1A3F540F00A0A8C3 /* types_mapping.hpp in Headers */,
- 3D4E99881FB48E5F0025B48C /* test_mwm_environment.hpp in Headers */,
67BC92F31D21476500A4A378 /* string_set.hpp in Headers */,
6753411F1A3F540F00A0A8C3 /* feature_loader.hpp in Headers */,
675341151A3F540F00A0A8C3 /* feature_covering.hpp in Headers */,
@@ -884,6 +889,8 @@
670C615C1AB0691900C38A8C /* features_offsets_table.hpp in Headers */,
6758AED41BB4413000C26E27 /* drules_selector.hpp in Headers */,
675341061A3F540F00A0A8C3 /* coding_params.hpp in Headers */,
+ 3D0AEAF91FBAF9E900AD042B /* test_with_custom_mwms.hpp in Headers */,
+ 3D0AEAFB1FBAF9E900AD042B /* test_with_classificator.hpp in Headers */,
56C74C211C749E4700B71B9F /* edits_migration.hpp in Headers */,
6753412F1A3F540F00A0A8C3 /* index_builder.hpp in Headers */,
456E1B1A1F90E5B7009C32E1 /* ftypes_sponsored.hpp in Headers */,
@@ -1092,6 +1099,7 @@
files = (
56C74C241C749E4700B71B9F /* search_string_utils.cpp in Sources */,
3D928F671D50F9FE001670E0 /* index_helpers.cpp in Sources */,
+ 3D0AEAFA1FBAF9E900AD042B /* test_with_custom_mwms.cpp in Sources */,
340DF9D01C1FF04D00B5C7EC /* osm_editor.cpp in Sources */,
67F183731BD4FCF500AB1840 /* map_style.cpp in Sources */,
670D04AB1B0BA8580013A7AC /* feature_loader_101.cpp in Sources */,
@@ -1101,7 +1109,6 @@
3D74EF241F8F559D0081202C /* ugc_types_test.cpp in Sources */,
6753410D1A3F540F00A0A8C3 /* drawing_rules.cpp in Sources */,
675341301A3F540F00A0A8C3 /* index.cpp in Sources */,
- 3D4E99891FB48E5F0025B48C /* test_mwm_environment.cpp in Sources */,
34664CF61D49FEC1003D7096 /* centers_table.cpp in Sources */,
56C74C201C749E4700B71B9F /* edits_migration.cpp in Sources */,
6753414D1A3F540F00A0A8C3 /* types_mapping.cpp in Sources */,
@@ -1128,6 +1135,7 @@
3D452AFC1EE6D9F5009EAB9B /* centers_table_test.cpp in Sources */,
34664CF31D49FEC1003D7096 /* altitude_loader.cpp in Sources */,
6726C1D11A49DAAC005EEA39 /* feature_meta.cpp in Sources */,
+ 3D0AEAF81FBAF9E900AD042B /* test_with_classificator.cpp in Sources */,
6753411C1A3F540F00A0A8C3 /* feature_loader_base.cpp in Sources */,
67BC92F41D21476500A4A378 /* string_slice.cpp in Sources */,
675341071A3F540F00A0A8C3 /* data_factory.cpp in Sources */,
diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj
index 115d1baa3a..754e0bf55e 100644
--- a/xcode/map/map.xcodeproj/project.pbxproj
+++ b/xcode/map/map.xcodeproj/project.pbxproj
@@ -20,6 +20,9 @@
34921F661BFA0A6900737D6E /* api_mark_point.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34921F611BFA0A6900737D6E /* api_mark_point.hpp */; };
34DDA1811DBE5DF40088A609 /* libpartners_api.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34DDA17F1DBE5DF40088A609 /* libpartners_api.a */; };
34DDA1821DBE5DF40088A609 /* libtracking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34DDA1801DBE5DF40088A609 /* libtracking.a */; };
+ 3D0AEAFC1FBB0FF400AD042B /* libgenerator_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0AEAFF1FBB0FF400AD042B /* libgenerator_tests_support.a */; };
+ 3D0AEAFD1FBB0FF400AD042B /* libindexer_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0AEB001FBB0FF400AD042B /* libindexer_tests_support.a */; };
+ 3D0AEAFE1FBB0FF400AD042B /* libsearch_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0AEB011FBB0FF400AD042B /* libsearch_tests_support.a */; };
3D47B2931F054BC5000828D2 /* taxi_delegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D47B2901F054BC5000828D2 /* taxi_delegate.cpp */; };
3D47B2941F054BC5000828D2 /* taxi_delegate.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D47B2911F054BC5000828D2 /* taxi_delegate.hpp */; };
3D47B2C71F20EF06000828D2 /* displayed_categories_modifiers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D47B2C51F20EF06000828D2 /* displayed_categories_modifiers.cpp */; };
@@ -164,6 +167,9 @@
34AF87EA1DBE5AD000E5E7DC /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = "<group>"; };
34DDA17F1DBE5DF40088A609 /* libpartners_api.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpartners_api.a; path = "/Users/igrechuhin/Repo/omim/xcode/partners_api/../../../omim-xcode-build/Debug/libpartners_api.a"; sourceTree = "<absolute>"; };
34DDA1801DBE5DF40088A609 /* libtracking.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtracking.a; path = "/Users/igrechuhin/Repo/omim/xcode/tracking/../../../omim-xcode-build/Debug/libtracking.a"; sourceTree = "<absolute>"; };
+ 3D0AEAFF1FBB0FF400AD042B /* libgenerator_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgenerator_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ 3D0AEB001FBB0FF400AD042B /* libindexer_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libindexer_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ 3D0AEB011FBB0FF400AD042B /* libsearch_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsearch_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; };
3D47B2901F054BC5000828D2 /* taxi_delegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = taxi_delegate.cpp; sourceTree = "<group>"; };
3D47B2911F054BC5000828D2 /* taxi_delegate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = taxi_delegate.hpp; sourceTree = "<group>"; };
3D47B2C51F20EF06000828D2 /* displayed_categories_modifiers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = displayed_categories_modifiers.cpp; sourceTree = "<group>"; };
@@ -300,6 +306,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 3D0AEAFC1FBB0FF400AD042B /* libgenerator_tests_support.a in Frameworks */,
+ 3D0AEAFD1FBB0FF400AD042B /* libindexer_tests_support.a in Frameworks */,
+ 3D0AEAFE1FBB0FF400AD042B /* libsearch_tests_support.a in Frameworks */,
F6C269F91F16174E00EB6519 /* libugc.a in Frameworks */,
45D287671E966E3400587F05 /* liblocal_ads.a in Frameworks */,
F685EB631E955C45003CA3FF /* libicu.a in Frameworks */,
@@ -354,6 +363,9 @@
34DDA17E1DBE5DF40088A609 /* Frameworks */ = {
isa = PBXGroup;
children = (
+ 3D0AEAFF1FBB0FF400AD042B /* libgenerator_tests_support.a */,
+ 3D0AEB001FBB0FF400AD042B /* libindexer_tests_support.a */,
+ 3D0AEB011FBB0FF400AD042B /* libsearch_tests_support.a */,
F6C269F81F16174E00EB6519 /* libugc.a */,
45D287661E966E3400587F05 /* liblocal_ads.a */,
F685EB621E955C45003CA3FF /* libicu.a */,
diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj
index e14121b7ea..401fc66671 100644
--- a/xcode/search/search.xcodeproj/project.pbxproj
+++ b/xcode/search/search.xcodeproj/project.pbxproj
@@ -143,6 +143,8 @@
39BBC13E1F9FD679009D1687 /* segment_tree_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39BBC13D1F9FD679009D1687 /* segment_tree_tests.cpp */; };
39BBC1401F9FD683009D1687 /* point_rect_matcher_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39BBC13F1F9FD683009D1687 /* point_rect_matcher_tests.cpp */; };
39BBC1421F9FD68C009D1687 /* highlighting_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39BBC1411F9FD68C009D1687 /* highlighting_tests.cpp */; };
+ 3D0AEB021FBB102C00AD042B /* libgenerator_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0AEB041FBB102C00AD042B /* libgenerator_tests_support.a */; };
+ 3D0AEB031FBB102C00AD042B /* libindexer_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0AEB051FBB102C00AD042B /* libindexer_tests_support.a */; };
3DF37FAA1EA11B380012CB31 /* everywhere_search_callback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DF37FA81EA11B380012CB31 /* everywhere_search_callback.cpp */; };
3DF37FAB1EA11B380012CB31 /* everywhere_search_callback.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DF37FA91EA11B380012CB31 /* everywhere_search_callback.hpp */; };
3DFEBF761EF2D55800317D5C /* city_finder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DFEBF751EF2D55800317D5C /* city_finder.hpp */; };
@@ -371,6 +373,8 @@
39BBC13D1F9FD679009D1687 /* segment_tree_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = segment_tree_tests.cpp; sourceTree = "<group>"; };
39BBC13F1F9FD683009D1687 /* point_rect_matcher_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = point_rect_matcher_tests.cpp; sourceTree = "<group>"; };
39BBC1411F9FD68C009D1687 /* highlighting_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = highlighting_tests.cpp; sourceTree = "<group>"; };
+ 3D0AEB041FBB102C00AD042B /* libgenerator_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgenerator_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ 3D0AEB051FBB102C00AD042B /* libindexer_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libindexer_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; };
3DF37FA81EA11B380012CB31 /* everywhere_search_callback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = everywhere_search_callback.cpp; sourceTree = "<group>"; };
3DF37FA91EA11B380012CB31 /* everywhere_search_callback.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = everywhere_search_callback.hpp; sourceTree = "<group>"; };
3DFEBF751EF2D55800317D5C /* city_finder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = city_finder.hpp; sourceTree = "<group>"; };
@@ -522,6 +526,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 3D0AEB021FBB102C00AD042B /* libgenerator_tests_support.a in Frameworks */,
+ 3D0AEB031FBB102C00AD042B /* libindexer_tests_support.a in Frameworks */,
34F558491DBF2EC700A4FC11 /* libz.tbd in Frameworks */,
39AEF8471FB45C8900943FC9 /* libicu.a in Frameworks */,
34F558471DBF2E8100A4FC11 /* libsuccinct.a in Frameworks */,
@@ -562,6 +568,8 @@
34F558391DBF2E0E00A4FC11 /* Frameworks */ = {
isa = PBXGroup;
children = (
+ 3D0AEB041FBB102C00AD042B /* libgenerator_tests_support.a */,
+ 3D0AEB051FBB102C00AD042B /* libindexer_tests_support.a */,
39B2B9841FB469ED00AB85A1 /* libminizip.a */,
39B2B9751FB4687500AB85A1 /* libgflags.a */,
39B2B96D1FB4633200AB85A1 /* libtess2.a */,
@@ -1214,6 +1222,13 @@
};
name = Release;
};
+ 3D0AEB061FBB102C00AD042B /* Production Full */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = search_tests;
+ };
+ name = "Production Full";
+ };
671C62111AE9225100076BD0 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-10 00:43:58 +0300