Move tesselator from indexer to generator.

generator/coastlines_generator.cpp

@@ -1,7 +1,7 @@
 #include "coastlines_generator.hpp"
 #include "feature_builder.hpp"
+//#include "tesselator.hpp"
 
-//#include "../indexer/tesselator.hpp"
 #include "../indexer/point_to_int64.hpp"
 
 #include "../geometry/region2d/binary_operators.hpp"

generator/feature_sorter.cpp

@@ -1,6 +1,7 @@
 #include "feature_sorter.hpp"
 #include "feature_generator.hpp"
 #include "feature_builder.hpp"
+#include "tesselator.hpp"
 
 #include "../defines.hpp"
 
@@ -10,7 +11,6 @@
 #include "../indexer/feature_impl.hpp"
 #include "../indexer/geometry_serialization.hpp"
 #include "../indexer/scales.hpp"
-#include "../indexer/tesselator.hpp"
 
 #include "../geometry/polygon.hpp"
 

generator/generator.pro

@@ -30,6 +30,7 @@ SOURCES += \
     osm_id.cpp \
     osm_decl.cpp \
     coastlines_generator.cpp \
+    tesselator.cpp \
 
 HEADERS += \
     feature_merger.hpp \
@@ -57,3 +58,4 @@ HEADERS += \
     osm_id.hpp \
     osm_decl.hpp \
     coastlines_generator.hpp \
+    tesselator.hpp \

generator/generator_tests/generator_tests.pro

@@ -26,3 +26,5 @@ SOURCES += \
     feature_merger_test.cpp \
     osm_type_test.cpp \
     osm_id_test.cpp \
+    tesselator_test.cpp \
+    triangles_tree_coding_test.cpp \

generator/tesselator.cpp

@@ -1,5 +1,6 @@
 #include "tesselator.hpp"
-#include "geometry_coding.hpp"
+
+#include "../indexer/geometry_coding.hpp"
 
 #include "../geometry/robust_orientation.hpp"
 

generator/tesselator.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "tesselator_decl.hpp"
+#include "../indexer/tesselator_decl.hpp"
 
 #include "../geometry/point2d.hpp"
 

indexer/indexer.pro

@@ -26,7 +26,6 @@ SOURCES += \
     data_header.cpp \
     geometry_coding.cpp \
     geometry_serialization.cpp \
-    tesselator.cpp \
     feature_data.cpp \
     feature_rect.cpp \
     types_mapping.cpp \
@@ -66,7 +65,6 @@ HEADERS += \
     geometry_coding.hpp \
     geometry_serialization.hpp \
     point_to_int64.hpp \
-    tesselator.hpp \
     tesselator_decl.hpp \
     feature_data.hpp \
     feature_rect.hpp \

indexer/indexer_tests/indexer_tests.pro

@@ -30,9 +30,6 @@ SOURCES += \
     mercator_test.cpp \
     sort_and_merge_intervals_test.cpp \
     geometry_coding_test.cpp \
-    triangles_tree_coding_test.cpp \
     scales_test.cpp \
     test_polylines.cpp \
     geometry_serialization_test.cpp \
-    tesselator_test.cpp
-