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--map/CMakeLists.txt4
-rw-r--r--map/api_mark_point.hpp2
-rw-r--r--map/bookmark.hpp6
-rw-r--r--map/bookmark_manager.cpp8
-rw-r--r--map/bookmark_manager.hpp14
-rw-r--r--map/local_ads_mark.hpp2
-rw-r--r--map/map_tests/bookmarks_test.cpp28
-rw-r--r--map/map_tests/kmz_unarchive_test.cpp2
-rw-r--r--map/user_mark.cpp2
-rw-r--r--map/user_mark_layer.cpp (renamed from map/user_mark_container.cpp)22
-rw-r--r--map/user_mark_layer.hpp (renamed from map/user_mark_container.hpp)10
-rw-r--r--qt/search_panel.cpp2
-rw-r--r--xcode/map/map.xcodeproj/project.pbxproj16
13 files changed, 59 insertions, 59 deletions
diff --git a/map/CMakeLists.txt b/map/CMakeLists.txt
index b2f82e76db..604220e840 100644
--- a/map/CMakeLists.txt
+++ b/map/CMakeLists.txt
@@ -87,8 +87,8 @@ set(
transit/transit_reader.hpp
user.cpp
user.hpp
- user_mark_container.cpp
- user_mark_container.hpp
+ user_mark_layer.cpp
+ user_mark_layer.hpp
user_mark.cpp
user_mark.hpp
viewport_search_params.hpp
diff --git a/map/api_mark_point.hpp b/map/api_mark_point.hpp
index 897d7eef9a..b9646c830d 100644
--- a/map/api_mark_point.hpp
+++ b/map/api_mark_point.hpp
@@ -1,7 +1,7 @@
#pragma once
#include "map/user_mark.hpp"
-#include "map/user_mark_container.hpp"
+#include "map/user_mark_layer.hpp"
#include "geometry/point2d.hpp"
diff --git a/map/bookmark.hpp b/map/bookmark.hpp
index 2240a64921..7354fec4aa 100644
--- a/map/bookmark.hpp
+++ b/map/bookmark.hpp
@@ -2,7 +2,7 @@
#include "map/track.hpp"
#include "map/user_mark.hpp"
-#include "map/user_mark_container.hpp"
+#include "map/user_mark_layer.hpp"
#include "coding/reader.hpp"
@@ -111,9 +111,9 @@ private:
df::MarkGroupID m_groupId;
};
-class BookmarkCategory : public UserMarkContainer
+class BookmarkCategory : public UserMarkLayer
{
- using Base = UserMarkContainer;
+ using Base = UserMarkLayer;
public:
BookmarkCategory(std::string const & name, df::MarkGroupID groupID);
diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp
index 22d0e532b0..9ff4f228b4 100644
--- a/map/bookmark_manager.cpp
+++ b/map/bookmark_manager.cpp
@@ -142,7 +142,7 @@ BookmarkManager::BookmarkManager(Callbacks && callbacks)
ASSERT(m_callbacks.m_getStringsBundle != nullptr, ());
m_userMarkLayers.reserve(UserMark::BOOKMARK);
for (size_t i = 0; i < UserMark::BOOKMARK; ++i)
- m_userMarkLayers.emplace_back(std::make_unique<UserMarkContainer>(static_cast<UserMark::Type>(i)));
+ m_userMarkLayers.emplace_back(std::make_unique<UserMarkLayer>(static_cast<UserMark::Type>(i)));
m_selectionMark = CreateUserMark<StaticMarkPoint>(m2::PointD{});
m_myPositionMark = CreateUserMark<MyPositionMarkPoint>(m2::PointD{});
@@ -699,7 +699,7 @@ std::string BookmarkManager::LastEditedBMType() const
BookmarkCategory * BookmarkManager::GetBmCategory(df::MarkGroupID categoryId) const
{
- ASSERT(categoryId >= UserMark::BOOKMARK, ());
+ ASSERT(IsBookmarkCategory(categoryId), ());
auto const it = m_categories.find(categoryId);
return (it != m_categories.end() ? it->second.get() : 0);
}
@@ -828,7 +828,7 @@ UserMark const * BookmarkManager::FindNearestUserMark(TTouchRectHolder const & h
return finder.GetFoundMark();
}
-UserMarkContainer const * BookmarkManager::FindContainer(df::MarkGroupID containerId) const
+UserMarkLayer const * BookmarkManager::FindContainer(df::MarkGroupID containerId) const
{
if (containerId < UserMark::Type::BOOKMARK)
return m_userMarkLayers[containerId].get();
@@ -837,7 +837,7 @@ UserMarkContainer const * BookmarkManager::FindContainer(df::MarkGroupID contain
return m_categories.at(containerId).get();
}
-UserMarkContainer * BookmarkManager::FindContainer(df::MarkGroupID containerId)
+UserMarkLayer * BookmarkManager::FindContainer(df::MarkGroupID containerId)
{
if (containerId < UserMark::Type::BOOKMARK)
return m_userMarkLayers[containerId].get();
diff --git a/map/bookmark_manager.hpp b/map/bookmark_manager.hpp
index f53bab679a..5ad2a9d78a 100644
--- a/map/bookmark_manager.hpp
+++ b/map/bookmark_manager.hpp
@@ -1,7 +1,7 @@
#pragma once
#include "map/bookmark.hpp"
-#include "map/user_mark_container.hpp"
+#include "map/user_mark_layer.hpp"
#include "drape_frontend/drape_engine_safe_ptr.hpp"
@@ -22,7 +22,7 @@
class BookmarkManager final
{
- using UserMarkLayers = std::vector<std::unique_ptr<UserMarkContainer>>;
+ using UserMarkLayers = std::vector<std::unique_ptr<UserMarkLayer>>;
using CategoriesCollection = std::map<df::MarkGroupID, std::unique_ptr<BookmarkCategory>>;
using MarksCollection = std::map<df::MarkID, std::unique_ptr<UserMark>>;
@@ -133,6 +133,9 @@ public:
void UpdateViewport(ScreenBase const & screen);
void Teardown();
+ static bool IsBookmarkCategory(df::MarkGroupID groupId) { return groupId >= UserMark::BOOKMARK; }
+ static bool IsBookmark(df::MarkID markID) { return UserMark::GetMarkType(markID) == UserMark::BOOKMARK; }
+
template <typename UserMarkT>
UserMarkT const * GetMark(df::MarkID markId) const
{
@@ -282,13 +285,10 @@ private:
void MoveBookmark(df::MarkID bmID, df::MarkGroupID curGroupID, df::MarkGroupID newGroupID);
void UpdateBookmark(df::MarkID bmId, BookmarkData const & bm);
- static bool IsBookmarkCategory(df::MarkGroupID groupId) { return groupId >= UserMark::BOOKMARK; }
- static bool IsBookmark(df::MarkID markID) { return UserMark::GetMarkType(markID) == UserMark::BOOKMARK; }
-
UserMark const * GetMark(df::MarkID markID) const;
- UserMarkContainer const * FindContainer(df::MarkGroupID containerId) const;
- UserMarkContainer * FindContainer(df::MarkGroupID containerId);
+ UserMarkLayer const * FindContainer(df::MarkGroupID containerId) const;
+ UserMarkLayer * FindContainer(df::MarkGroupID containerId);
BookmarkCategory * GetBmCategory(df::MarkGroupID categoryId) const;
Bookmark * AddBookmark(std::unique_ptr<Bookmark> && bookmark);
diff --git a/map/local_ads_mark.hpp b/map/local_ads_mark.hpp
index 3d3eb461de..ecaf0b0f60 100644
--- a/map/local_ads_mark.hpp
+++ b/map/local_ads_mark.hpp
@@ -1,6 +1,6 @@
#pragma once
-#include "map/user_mark_container.hpp"
+#include "map/user_mark_layer.hpp"
#include <cstdint>
#include <limits>
diff --git a/map/map_tests/bookmarks_test.cpp b/map/map_tests/bookmarks_test.cpp
index d201259f5d..51530465db 100644
--- a/map/map_tests/bookmarks_test.cpp
+++ b/map/map_tests/bookmarks_test.cpp
@@ -160,7 +160,7 @@ char const * kmlString =
UNIT_TEST(Bookmarks_ImportKML)
{
- BookmarkCategory cat("Default", UserMarkContainer::Listeners());
+ BookmarkCategory cat("Default", UserMarkLayer::Listeners());
TEST(cat.LoadFromKML(make_unique<MemReader>(kmlString, strlen(kmlString))), ());
CheckBookmarks(cat);
@@ -174,7 +174,7 @@ UNIT_TEST(Bookmarks_ExportKML)
{
char const * BOOKMARKS_FILE_NAME = "UnitTestBookmarks.kml";
- BookmarkCategory cat("Default", UserMarkContainer::Listeners());
+ BookmarkCategory cat("Default", UserMarkLayer::Listeners());
TEST(cat.LoadFromKML(make_unique<MemReader>(kmlString, strlen(kmlString))), ());
CheckBookmarks(cat);
@@ -194,7 +194,7 @@ UNIT_TEST(Bookmarks_ExportKML)
CheckBookmarks(cat);
TEST_EQUAL(cat.IsVisible(), true, ());
- auto cat2 = BookmarkCategory::CreateFromKMLFile(BOOKMARKS_FILE_NAME, UserMarkContainer::Listeners());
+ auto cat2 = BookmarkCategory::CreateFromKMLFile(BOOKMARKS_FILE_NAME, UserMarkLayer::Listeners());
CheckBookmarks(*cat2);
TEST(cat2->SaveToKMLFile(), ());
@@ -204,7 +204,7 @@ UNIT_TEST(Bookmarks_ExportKML)
// MapName is the <name> tag in test kml data.
string const catFileName = GetPlatform().SettingsDir() + "MapName.kml";
- cat2 = BookmarkCategory::CreateFromKMLFile(catFileName, UserMarkContainer::Listeners());
+ cat2 = BookmarkCategory::CreateFromKMLFile(catFileName, UserMarkLayer::Listeners());
CheckBookmarks(*cat2);
TEST(my::DeleteFileX(catFileName), ());
}
@@ -539,7 +539,7 @@ char const * kmlString2 =
UNIT_TEST(Bookmarks_InnerFolder)
{
- BookmarkCategory cat("Default", UserMarkContainer::Listeners());
+ BookmarkCategory cat("Default", UserMarkLayer::Listeners());
TEST(cat.LoadFromKML(make_unique<MemReader>(kmlString2, strlen(kmlString2))), ());
TEST_EQUAL(cat.GetUserMarkCount(), 1, ());
@@ -547,7 +547,7 @@ UNIT_TEST(Bookmarks_InnerFolder)
UNIT_TEST(BookmarkCategory_EmptyName)
{
- unique_ptr<BookmarkCategory> pCat(new BookmarkCategory("", UserMarkContainer::Listeners()));
+ unique_ptr<BookmarkCategory> pCat(new BookmarkCategory("", UserMarkLayer::Listeners()));
static_cast<Bookmark *>(pCat->CreateUserMark(m2::PointD(0, 0)))->SetData(BookmarkData("", "placemark-red"));
TEST(pCat->SaveToKMLFile(), ());
@@ -596,14 +596,14 @@ char const * kmlString3 =
UNIT_TEST(Bookmarks_SpecialXMLNames)
{
- BookmarkCategory cat1("", UserMarkContainer::Listeners());
+ BookmarkCategory cat1("", UserMarkLayer::Listeners());
TEST(cat1.LoadFromKML(make_unique<MemReader>(kmlString3, strlen(kmlString3))), ());
TEST_EQUAL(cat1.GetUserMarkCount(), 1, ());
TEST(cat1.SaveToKMLFile(), ());
unique_ptr<BookmarkCategory> const cat2(BookmarkCategory::CreateFromKMLFile(cat1.GetFileName(),
- UserMarkContainer::Listeners()));
+ UserMarkLayer::Listeners()));
TEST(cat2.get(), ());
TEST_EQUAL(cat2->GetUserMarkCount(), 1, ());
@@ -621,7 +621,7 @@ UNIT_TEST(Bookmarks_SpecialXMLNames)
UNIT_TEST(TrackParsingTest_1)
{
string const kmlFile = GetPlatform().TestsDataPathForFile("kml-with-track-kml.test");
- auto cat = BookmarkCategory::CreateFromKMLFile(kmlFile, UserMarkContainer::Listeners());
+ auto cat = BookmarkCategory::CreateFromKMLFile(kmlFile, UserMarkLayer::Listeners());
TEST(cat, ("Category can't be created"));
TEST_EQUAL(cat->GetTracksCount(), 4, ());
@@ -646,7 +646,7 @@ UNIT_TEST(TrackParsingTest_1)
UNIT_TEST(TrackParsingTest_2)
{
string const kmlFile = GetPlatform().TestsDataPathForFile("kml-with-track-from-google-earth.test");
- auto cat = BookmarkCategory::CreateFromKMLFile(kmlFile, UserMarkContainer::Listeners());
+ auto cat = BookmarkCategory::CreateFromKMLFile(kmlFile, UserMarkLayer::Listeners());
TEST(cat, ("Category can't be created"));
TEST_EQUAL(cat->GetTracksCount(), 1, ());
@@ -687,20 +687,20 @@ UNIT_TEST(Bookmarks_Listeners)
deletedMarks.clear();
};
- auto const onCreate = [&createdMarksResult](UserMarkContainer const & container, df::IDCollection const & markIds)
+ auto const onCreate = [&createdMarksResult](UserMarkLayer const & container, df::IDCollection const & markIds)
{
createdMarksResult.insert(markIds.begin(), markIds.end());
};
- auto const onUpdate = [&updatedMarksResult](UserMarkContainer const & container, df::IDCollection const & markIds)
+ auto const onUpdate = [&updatedMarksResult](UserMarkLayer const & container, df::IDCollection const & markIds)
{
updatedMarksResult.insert(markIds.begin(), markIds.end());
};
- auto const onDelete = [&deletedMarksResult](UserMarkContainer const & container, df::IDCollection const & markIds)
+ auto const onDelete = [&deletedMarksResult](UserMarkLayer const & container, df::IDCollection const & markIds)
{
deletedMarksResult.insert(markIds.begin(), markIds.end());
};
- BookmarkCategory cat("Default", UserMarkContainer::Listeners(onCreate, onUpdate, onDelete));
+ BookmarkCategory cat("Default", UserMarkLayer::Listeners(onCreate, onUpdate, onDelete));
auto bookmark0 = static_cast<Bookmark *>(cat.CreateUserMark(m2::PointD(0.0, 0.0)));
bookmark0->SetData(BookmarkData("name 0", "type 0"));
diff --git a/map/map_tests/kmz_unarchive_test.cpp b/map/map_tests/kmz_unarchive_test.cpp
index 3c0d62f4cc..dbe38a29b8 100644
--- a/map/map_tests/kmz_unarchive_test.cpp
+++ b/map/map_tests/kmz_unarchive_test.cpp
@@ -35,7 +35,7 @@ UNIT_TEST(KMZ_UnzipTest)
MY_SCOPE_GUARD(fileGuard, bind(&FileWriter::DeleteFileX, kmlFile));
ZipFileReader::UnzipFile(kmzFile, "doc.kml", kmlFile);
- BookmarkCategory cat("Default", UserMarkContainer::Listeners());
+ BookmarkCategory cat("Default", UserMarkLayer::Listeners());
TEST(cat.LoadFromKML(make_unique<FileReader>(kmlFile)), ());
TEST_EQUAL(files.size(), 6, ("KMZ file wrong number of files"));
diff --git a/map/user_mark.cpp b/map/user_mark.cpp
index 466b64bb69..2476b3cb67 100644
--- a/map/user_mark.cpp
+++ b/map/user_mark.cpp
@@ -1,5 +1,5 @@
#include "map/user_mark.hpp"
-#include "map/user_mark_container.hpp"
+#include "map/user_mark_layer.hpp"
#include "indexer/classificator.hpp"
diff --git a/map/user_mark_container.cpp b/map/user_mark_layer.cpp
index 6a60bbc6b7..94bcb84dcf 100644
--- a/map/user_mark_container.cpp
+++ b/map/user_mark_layer.cpp
@@ -1,4 +1,4 @@
-#include "map/user_mark_container.hpp"
+#include "map/user_mark_layer.hpp"
#include "map/search_mark.hpp"
#include "drape_frontend/drape_engine.hpp"
@@ -11,38 +11,38 @@
#include <algorithm>
#include <utility>
-UserMarkContainer::UserMarkContainer(UserMark::Type type)
+UserMarkLayer::UserMarkLayer(UserMark::Type type)
: m_type(type)
{
}
-UserMarkContainer::~UserMarkContainer()
+UserMarkLayer::~UserMarkLayer()
{
Clear();
}
-bool UserMarkContainer::IsVisible() const
+bool UserMarkLayer::IsVisible() const
{
return m_isVisible;
}
-bool UserMarkContainer::IsVisibilityChanged() const
+bool UserMarkLayer::IsVisibilityChanged() const
{
return m_isVisible != m_wasVisible;
}
-UserMark::Type UserMarkContainer::GetType() const
+UserMark::Type UserMarkLayer::GetType() const
{
return m_type;
}
-void UserMarkContainer::Clear()
+void UserMarkLayer::Clear()
{
SetDirty();
m_userMarks.clear();
}
-void UserMarkContainer::SetIsVisible(bool isVisible)
+void UserMarkLayer::SetIsVisible(bool isVisible)
{
if (IsVisible() != isVisible)
{
@@ -51,19 +51,19 @@ void UserMarkContainer::SetIsVisible(bool isVisible)
}
}
-void UserMarkContainer::ResetChanges()
+void UserMarkLayer::ResetChanges()
{
m_isDirty = false;
m_wasVisible = m_isVisible;
}
-void UserMarkContainer::AttachUserMark(df::MarkID markId)
+void UserMarkLayer::AttachUserMark(df::MarkID markId)
{
SetDirty();
m_userMarks.insert(markId);
}
-void UserMarkContainer::DetachUserMark(df::MarkID markId)
+void UserMarkLayer::DetachUserMark(df::MarkID markId)
{
SetDirty();
m_userMarks.erase(markId);
diff --git a/map/user_mark_container.hpp b/map/user_mark_layer.hpp
index acc786fb7b..1223508176 100644
--- a/map/user_mark_container.hpp
+++ b/map/user_mark_layer.hpp
@@ -14,14 +14,14 @@
#include <memory>
#include <set>
-class UserMarkContainer
+class UserMarkLayer
{
public:
- UserMarkContainer(UserMark::Type type);
- virtual ~UserMarkContainer();
+ UserMarkLayer(UserMark::Type type);
+ virtual ~UserMarkLayer();
bool IsDirty() const { return m_isDirty; }
- virtual void ResetChanges();
+ void ResetChanges();
bool IsVisible() const;
bool IsVisibilityChanged() const;
@@ -48,6 +48,6 @@ protected:
bool m_isVisible = true;
bool m_wasVisible = false;
- DISALLOW_COPY_AND_MOVE(UserMarkContainer);
+ DISALLOW_COPY_AND_MOVE(UserMarkLayer);
};
diff --git a/qt/search_panel.cpp b/qt/search_panel.cpp
index 3ca260f594..6a3baf7470 100644
--- a/qt/search_panel.cpp
+++ b/qt/search_panel.cpp
@@ -3,7 +3,7 @@
#include "map/bookmark_manager.hpp"
#include "map/framework.hpp"
-#include "map/user_mark_container.hpp"
+#include "map/user_mark_layer.hpp"
#include "drape/constants.hpp"
diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj
index 0541c05697..91f41993ea 100644
--- a/xcode/map/map.xcodeproj/project.pbxproj
+++ b/xcode/map/map.xcodeproj/project.pbxproj
@@ -98,8 +98,6 @@
675346751A4054E800A0A8C3 /* mwm_url.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346061A4054E800A0A8C3 /* mwm_url.hpp */; };
6753469B1A4054E800A0A8C3 /* track.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753462C1A4054E800A0A8C3 /* track.cpp */; };
6753469C1A4054E800A0A8C3 /* track.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753462D1A4054E800A0A8C3 /* track.hpp */; };
- 6753469D1A4054E800A0A8C3 /* user_mark_container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753462E1A4054E800A0A8C3 /* user_mark_container.cpp */; };
- 6753469E1A4054E800A0A8C3 /* user_mark_container.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753462F1A4054E800A0A8C3 /* user_mark_container.hpp */; };
675346A21A4054E800A0A8C3 /* user_mark.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346331A4054E800A0A8C3 /* user_mark.hpp */; };
678850821D071E33004201E1 /* libdrape.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A29F61B26FE62001A525C /* libdrape.a */; };
6788508A1D071E34004201E1 /* libdrape_frontend.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 678850831D071E34004201E1 /* libdrape_frontend.a */; };
@@ -131,6 +129,8 @@
BB4E5F281FCC664A00A77250 /* transit_reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB4E5F241FCC664A00A77250 /* transit_reader.cpp */; };
BBD9E2C61EE9D01900DF189A /* routing_mark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBD9E2C41EE9D01900DF189A /* routing_mark.cpp */; };
BBD9E2C71EE9D01900DF189A /* routing_mark.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BBD9E2C51EE9D01900DF189A /* routing_mark.hpp */; };
+ BBFC7E3A202D29C000531BE7 /* user_mark_layer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBFC7E38202D29BF00531BE7 /* user_mark_layer.cpp */; };
+ BBFC7E3B202D29C000531BE7 /* user_mark_layer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BBFC7E39202D29BF00531BE7 /* user_mark_layer.hpp */; };
F627BFC41E8E89B600B1CBF4 /* librouting_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F627BFC31E8E89B600B1CBF4 /* librouting_common.a */; };
F63421F81DF9BF9100A96868 /* reachable_by_taxi_checker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F63421F61DF9BF9100A96868 /* reachable_by_taxi_checker.cpp */; };
F63421F91DF9BF9100A96868 /* reachable_by_taxi_checker.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F63421F71DF9BF9100A96868 /* reachable_by_taxi_checker.hpp */; };
@@ -270,8 +270,6 @@
675346061A4054E800A0A8C3 /* mwm_url.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_url.hpp; sourceTree = "<group>"; };
6753462C1A4054E800A0A8C3 /* track.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = track.cpp; sourceTree = "<group>"; };
6753462D1A4054E800A0A8C3 /* track.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = track.hpp; sourceTree = "<group>"; };
- 6753462E1A4054E800A0A8C3 /* user_mark_container.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = user_mark_container.cpp; sourceTree = "<group>"; };
- 6753462F1A4054E800A0A8C3 /* user_mark_container.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = user_mark_container.hpp; sourceTree = "<group>"; };
675346331A4054E800A0A8C3 /* user_mark.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = user_mark.hpp; sourceTree = "<group>"; };
678850831D071E34004201E1 /* libdrape_frontend.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdrape_frontend.a; path = "../../../omim-xcode-build/Debug/libdrape_frontend.a"; sourceTree = "<group>"; };
678850841D071E34004201E1 /* libeditor.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeditor.a; path = "../../../omim-xcode-build/Debug/libeditor.a"; sourceTree = "<group>"; };
@@ -299,6 +297,8 @@
BB4E5F241FCC664A00A77250 /* transit_reader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = transit_reader.cpp; path = transit/transit_reader.cpp; sourceTree = "<group>"; };
BBD9E2C41EE9D01900DF189A /* routing_mark.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = routing_mark.cpp; sourceTree = "<group>"; };
BBD9E2C51EE9D01900DF189A /* routing_mark.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = routing_mark.hpp; sourceTree = "<group>"; };
+ BBFC7E38202D29BF00531BE7 /* user_mark_layer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = user_mark_layer.cpp; sourceTree = "<group>"; };
+ BBFC7E39202D29BF00531BE7 /* user_mark_layer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = user_mark_layer.hpp; sourceTree = "<group>"; };
F627BFC31E8E89B600B1CBF4 /* librouting_common.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librouting_common.a; path = "/Users/v.mikhaylenko/mapsme/omim/xcode/routing_common/../../../omim-build/xcode/Debug/librouting_common.a"; sourceTree = "<absolute>"; };
F63421F61DF9BF9100A96868 /* reachable_by_taxi_checker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = reachable_by_taxi_checker.cpp; sourceTree = "<group>"; };
F63421F71DF9BF9100A96868 /* reachable_by_taxi_checker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = reachable_by_taxi_checker.hpp; sourceTree = "<group>"; };
@@ -508,6 +508,8 @@
675345BD1A4054AD00A0A8C3 /* map */ = {
isa = PBXGroup;
children = (
+ BBFC7E38202D29BF00531BE7 /* user_mark_layer.cpp */,
+ BBFC7E39202D29BF00531BE7 /* user_mark_layer.hpp */,
675345CB1A4054E800A0A8C3 /* address_finder.cpp */,
45201E921CE4AC90008A4842 /* api_mark_point.cpp */,
34921F611BFA0A6900737D6E /* api_mark_point.hpp */,
@@ -579,8 +581,6 @@
347B60741DD9926D0050FA24 /* traffic_manager.cpp */,
347B60751DD9926D0050FA24 /* traffic_manager.hpp */,
BB4E5F201FCC663700A77250 /* transit */,
- 6753462E1A4054E800A0A8C3 /* user_mark_container.cpp */,
- 6753462F1A4054E800A0A8C3 /* user_mark_container.hpp */,
674C385F1BFF3095000D603B /* user_mark.cpp */,
675346331A4054E800A0A8C3 /* user_mark.hpp */,
45A2D9D31F7556EB003310A0 /* user.cpp */,
@@ -643,7 +643,7 @@
348AB57D1D7EE0C6009F8301 /* chart_generator.hpp in Headers */,
45A2D9D61F7556EB003310A0 /* user.hpp in Headers */,
F63421F91DF9BF9100A96868 /* reachable_by_taxi_checker.hpp in Headers */,
- 6753469E1A4054E800A0A8C3 /* user_mark_container.hpp in Headers */,
+ BBFC7E3B202D29C000531BE7 /* user_mark_layer.hpp in Headers */,
3D4E99A51FB4A6410025B48C /* booking_filter.hpp in Headers */,
675346491A4054E800A0A8C3 /* bookmark_manager.hpp in Headers */,
F6B2830A1C1B03320081957A /* gps_track.hpp in Headers */,
@@ -775,6 +775,7 @@
3D47B2931F054BC5000828D2 /* taxi_delegate.cpp in Sources */,
675346741A4054E800A0A8C3 /* mwm_url.cpp in Sources */,
347B60761DD9926D0050FA24 /* traffic_manager.cpp in Sources */,
+ BBFC7E3A202D29C000531BE7 /* user_mark_layer.cpp in Sources */,
F6B283091C1B03320081957A /* gps_track.cpp in Sources */,
34583BCF1C88556800F94664 /* place_page_info.cpp in Sources */,
3D4E99A41FB4A6410025B48C /* booking_filter.cpp in Sources */,
@@ -783,7 +784,6 @@
6753469B1A4054E800A0A8C3 /* track.cpp in Sources */,
675346621A4054E800A0A8C3 /* feature_vec_model.cpp in Sources */,
454523A9202A0068009275C1 /* cloud.cpp in Sources */,
- 6753469D1A4054E800A0A8C3 /* user_mark_container.cpp in Sources */,
674C38621BFF3095000D603B /* user_mark.cpp in Sources */,
675346641A4054E800A0A8C3 /* framework.cpp in Sources */,
BB4E5F281FCC664A00A77250 /* transit_reader.cpp in Sources */,
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 00:19:19 +0300