From be7a96fd583abad67353c32353a75835f6d9b1b2 Mon Sep 17 00:00:00 2001
From: Anatoly Serdtcev <serdtcev@maps.me>
Date: Tue, 17 Dec 2019 11:14:41 +0300
Subject: [PATCH] [generator:generator_tool] Erase geocoder tokidx generator

---
 generator/generator_tool/CMakeLists.txt     |  1 -
 generator/generator_tool/generator_tool.cpp | 28 ---------------------
 2 files changed, 29 deletions(-)

diff --git a/generator/generator_tool/CMakeLists.txt b/generator/generator_tool/CMakeLists.txt
index 0f74bea..21bd8c2 100644
--- a/generator/generator_tool/CMakeLists.txt
+++ b/generator/generator_tool/CMakeLists.txt
@@ -6,7 +6,6 @@ geocore_add_executable(${PROJECT_NAME} ${SRC})
 geocore_link_libraries(
   ${PROJECT_NAME}
   generator
-  geocoder
   ${Boost_PROGRAM_OPTIONS_LIBRARY}
   ${CMAKE_DL_LIBS}
   tcmalloc_config
diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp
index 620ea7e..a684057 100644
--- a/generator/generator_tool/generator_tool.cpp
+++ b/generator/generator_tool/generator_tool.cpp
@@ -12,8 +12,6 @@
 #include "generator/translator_collection.hpp"
 #include "generator/translator_factory.hpp"
 
-#include "geocoder/geocoder.hpp"
-
 #include "indexer/classificator_loader.hpp"
 #include "indexer/features_vector.hpp"
 #include "indexer/locality_index_builder.hpp"
@@ -69,7 +67,6 @@ struct CliCommandOptions
   std::string m_streets_features;
   std::string m_geo_objects_features;
   std::string m_geo_objects_index;
-  std::string m_geocoder_token_index;
   std::string m_key_value;
   bool m_preprocess = false;
   bool m_generate_region_features = false;
@@ -79,7 +76,6 @@ struct CliCommandOptions
   bool m_generate_regions_kv = false;
   bool m_generate_streets_features = false;
   bool m_generate_geo_objects_features = false;
-  bool m_generate_geocoder_token_index = false;
   bool m_verbose = false;
 };
 
@@ -160,12 +156,6 @@ CliCommandOptions DefineOptions(int argc, char * argv[])
      ("regions_features",
          po::value(&o.m_regions_features)->default_value(""),
          "Input/Output tmp.mwm file with regions.")
-     ("generate_geocoder_token_index",
-         po::value(&o.m_generate_geocoder_token_index)->default_value(false),
-         "Generate geocoder token index.")
-     ("geocoder_token_index",
-         po::value(&o.m_geocoder_token_index)->default_value(""),
-         "Geocoder token index file.")
      ("key_value",
          po::value(&o.m_key_value)->default_value(""),
          "Input key-value file (.jsonl or .jsonl.gz).")
@@ -369,24 +359,6 @@ int GeneratorToolMain(int argc, char ** argv)
                              genInfo.m_threadsCount);
   }
 
-  if (options.m_generate_geocoder_token_index)
-  {
-    if (options.m_key_value.empty())
-    {
-      LOG(LCRITICAL, ("Unspecified key-value file."));
-      return EXIT_FAILURE;
-    }
-    if (options.m_geocoder_token_index.empty())
-    {
-      LOG(LCRITICAL, ("Unspecified geocoder_token_index file."));
-      return EXIT_FAILURE;
-    }
-
-    geocoder::Geocoder geocoder;
-    geocoder.LoadFromJsonl(options.m_key_value, genInfo.m_threadsCount);
-    geocoder.SaveToBinaryIndex(options.m_geocoder_token_index);
-  }
-
   return 0;
 }