Moved feature_merger to indexer_tool

indexer/indexer.pro

@@ -11,60 +11,58 @@ include($$ROOT_DIR/common.pri)
 
 
 SOURCES += \
-  osm2type.cpp \
-  classificator.cpp \
-  drawing_rules.cpp \
-  drawing_rule_def.cpp \
-  scales.cpp \
-  osm_decl.cpp \
-  feature.cpp \
-  classif_routine.cpp \
-  xml_element.cpp \
-  scale_index.cpp \
-  covering.cpp \
-  point_to_int64.cpp \
-  mercator.cpp \
-  index_builder.cpp \
-  feature_visibility.cpp \
-  data_header.cpp \
-  data_header_reader.cpp \
-  geometry_coding.cpp \
-  geometry_serialization.cpp \
-  tesselator.cpp \
-  feature_merger.cpp \
+    osm2type.cpp \
+    classificator.cpp \
+    drawing_rules.cpp \
+    drawing_rule_def.cpp \
+    scales.cpp \
+    osm_decl.cpp \
+    feature.cpp \
+    classif_routine.cpp \
+    xml_element.cpp \
+    scale_index.cpp \
+    covering.cpp \
+    point_to_int64.cpp \
+    mercator.cpp \
+    index_builder.cpp \
+    feature_visibility.cpp \
+    data_header.cpp \
+    data_header_reader.cpp \
+    geometry_coding.cpp \
+    geometry_serialization.cpp \
+    tesselator.cpp \
 
 HEADERS += \
-  feature.hpp \
-  cell_coverer.hpp \
-  cell_id.hpp \
-  osm2type.hpp \
-  classificator.hpp \
-  drawing_rules.hpp \
-  drawing_rule_def.hpp \
-  features_vector.hpp \
-  scale_index.hpp \
-  scale_index_builder.hpp \
-  index.hpp \
-  index_builder.hpp \
-  scales.hpp \
-  osm_decl.hpp \
-  classif_routine.hpp \
-  xml_element.hpp \
-  interval_index.hpp \
-  interval_index_builder.hpp \
-  covering.hpp \
-  mercator.hpp \
-  feature_processor.hpp \
-  file_reader_stream.hpp \
-  file_writer_stream.hpp \
-  feature_visibility.hpp \
-  data_header.hpp \
-  data_header_reader.hpp \
-  tree_structure.hpp \
-  feature_impl.hpp \
-  geometry_coding.hpp \
-  geometry_serialization.hpp \
-  point_to_int64.hpp \
-  tesselator.hpp \
-  tesselator_decl.hpp \
-  feature_merger.hpp \
+    feature.hpp \
+    cell_coverer.hpp \
+    cell_id.hpp \
+    osm2type.hpp \
+    classificator.hpp \
+    drawing_rules.hpp \
+    drawing_rule_def.hpp \
+    features_vector.hpp \
+    scale_index.hpp \
+    scale_index_builder.hpp \
+    index.hpp \
+    index_builder.hpp \
+    scales.hpp \
+    osm_decl.hpp \
+    classif_routine.hpp \
+    xml_element.hpp \
+    interval_index.hpp \
+    interval_index_builder.hpp \
+    covering.hpp \
+    mercator.hpp \
+    feature_processor.hpp \
+    file_reader_stream.hpp \
+    file_writer_stream.hpp \
+    feature_visibility.hpp \
+    data_header.hpp \
+    data_header_reader.hpp \
+    tree_structure.hpp \
+    feature_impl.hpp \
+    geometry_coding.hpp \
+    geometry_serialization.hpp \
+    point_to_int64.hpp \
+    tesselator.hpp \
+    tesselator_decl.hpp \

indexer/indexer_tool/feature_merger.cpp

@@ -1,6 +1,6 @@
 #include "feature_merger.hpp"
 
-#include "../base/logging.hpp"
+#include "../../base/logging.hpp"
 
 #define MAX_MERGED_POINTS_COUNT 10000
 

indexer/indexer_tool/feature_merger.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "feature.hpp"
+#include "../feature.hpp"
 
 class FeatureBuilder1Merger : public FeatureBuilder1
 {

indexer/indexer_tool/indexer_tool.pro

@@ -17,26 +17,28 @@ win32 {
 }
 
 SOURCES += \
-  indexer_tool.cpp \
-  data_generator.cpp \
-  feature_generator.cpp \
-  feature_sorter.cpp \
-  update_generator.cpp \
-  grid_generator.cpp \
-  statistics.cpp \
-  kml_parser.cpp \
+    indexer_tool.cpp \
+    data_generator.cpp \
+    feature_generator.cpp \
+    feature_sorter.cpp \
+    update_generator.cpp \
+    grid_generator.cpp \
+    statistics.cpp \
+    kml_parser.cpp \
+    feature_merger.cpp \
 
 HEADERS += \
-  osm_element.hpp \
-  data_generator.hpp \
-  feature_generator.hpp \
-  first_pass_parser.hpp \
-  data_cache_file.hpp \
-  feature_sorter.hpp \
-  update_generator.hpp \
-  feature_bucketer.hpp \
-  grid_generator.hpp \
-  statistics.hpp \
-  kml_parser.hpp \
-  polygonizer.hpp \
-  world_map_generator.hpp \
+    osm_element.hpp \
+    data_generator.hpp \
+    feature_generator.hpp \
+    first_pass_parser.hpp \
+    data_cache_file.hpp \
+    feature_sorter.hpp \
+    update_generator.hpp \
+    feature_bucketer.hpp \
+    grid_generator.hpp \
+    statistics.hpp \
+    kml_parser.hpp \
+    polygonizer.hpp \
+    world_map_generator.hpp \
+    feature_merger.hpp \

indexer/indexer_tool/world_map_generator.hpp

@@ -1,11 +1,12 @@
 #pragma once
 
+#include "feature_merger.hpp"
+
 #include "../../base/logging.hpp"
 
 #include "../../defines.hpp"
 
 #include "../../indexer/feature.hpp"
-#include "../../indexer/feature_merger.hpp"
 #include "../../indexer/feature_visibility.hpp"
 #include "../../indexer/point_to_int64.hpp"