From bdb8df372a9a5d78e4e8a1b6ba53b5b6122262e0 Mon Sep 17 00:00:00 2001
From: Yuri Gorshenin <y@maps.me>
Date: Wed, 18 Oct 2017 15:10:55 +0300
Subject: [PATCH] [feature_list] Fixed feature_list build.

---
 CMakeLists.txt                |  3 ++-
 feature_list/CMakeLists.txt   | 38 +++++++++++++++++++++++++++++++++++
 feature_list/feature_list.cpp |  9 ++++++---
 feature_list/feature_list.pro |  1 +
 4 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 feature_list/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27b5f3e54b..12fa2e64c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -362,8 +362,9 @@ if (PLATFORM_DESKTOP)
     add_subdirectory(software_renderer)
     add_subdirectory(mapshot)
   endif()
-  add_subdirectory(openlr)
+  add_subdirectory(feature_list)
   add_subdirectory(generator)
+  add_subdirectory(openlr)
   add_subdirectory(skin_generator)
   add_subdirectory(track_analyzing)
 endif()
diff --git a/feature_list/CMakeLists.txt b/feature_list/CMakeLists.txt
new file mode 100644
index 0000000000..f4f7054017
--- /dev/null
+++ b/feature_list/CMakeLists.txt
@@ -0,0 +1,38 @@
+project(feature_list_generator)
+
+include_directories(${OMIM_ROOT}/3party/jansson/src)
+
+set(SRC feature_list.cpp)
+
+omim_add_executable(${PROJECT_NAME} ${SRC})
+
+omim_link_libraries(
+  ${PROJECT_NAME}
+  map
+  traffic
+  search_tests_support
+  search search_quality
+  storage
+  ugc
+  indexer
+  platform
+  editor
+  mwm_diff
+  bsdiff
+  geometry
+  coding
+  base
+  agg
+  icu
+  jansson
+  oauthcpp
+  opening_hours
+  protobuf
+  pugixml
+  stats_client
+  succinct
+  ${LIBZ}
+)
+
+link_qt5_core(${PROJECT_NAME})
+link_qt5_network(${PROJECT_NAME})
diff --git a/feature_list/feature_list.cpp b/feature_list/feature_list.cpp
index 06be6aa78e..11e2f7446c 100644
--- a/feature_list/feature_list.cpp
+++ b/feature_list/feature_list.cpp
@@ -163,13 +163,16 @@ class Processor
 {
   search::ReverseGeocoder m_geocoder;
   my::Cancellable m_cancellable;
+  search::CitiesBoundariesTable m_boundariesTable;
   search::VillagesCache m_villagesCache;
   search::LocalityFinder m_finder;
 
 public:
-  Processor(Index const & index)
-    : m_geocoder(index), m_villagesCache(m_cancellable), m_finder(index, m_villagesCache)
-  {
+  Processor(Index const &index)
+      : m_geocoder(index), m_boundariesTable(index),
+        m_villagesCache(m_cancellable),
+        m_finder(index, m_boundariesTable, m_villagesCache) {
+    m_boundariesTable.Load();
   }
 
   void ClearCache() { m_villagesCache.Clear(); }
diff --git a/feature_list/feature_list.pro b/feature_list/feature_list.pro
index 83048f9e21..a1589f1ea1 100644
--- a/feature_list/feature_list.pro
+++ b/feature_list/feature_list.pro
@@ -1,5 +1,6 @@
 # Feature List Tool
 
+TARGET = feature_list_generator
 ROOT_DIR = ..
 DEPENDENCIES = map traffic search_tests_support search search_quality storage ugc indexer platform \
                editor mwm_diff bsdiff geometry coding base jansson protobuf stats_client succinct \