From 9c18b20ae3106c915cbb5d05bf7d0dba5ebf8274 Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Thu, 15 Sep 2011 23:00:49 +0300
Subject: [PATCH] Move tesselator from indexer to generator.

---
 generator/coastlines_generator.cpp                             | 2 +-
 generator/feature_sorter.cpp                                   | 2 +-
 generator/generator.pro                                        | 2 ++
 generator/generator_tests/generator_tests.pro                  | 2 ++
 .../generator_tests}/tesselator_test.cpp                       | 0
 .../generator_tests}/triangles_tree_coding_test.cpp            | 0
 {indexer => generator}/tesselator.cpp                          | 3 ++-
 {indexer => generator}/tesselator.hpp                          | 2 +-
 indexer/indexer.pro                                            | 2 --
 indexer/indexer_tests/indexer_tests.pro                        | 3 ---
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename {indexer/indexer_tests => generator/generator_tests}/tesselator_test.cpp (100%)
 rename {indexer/indexer_tests => generator/generator_tests}/triangles_tree_coding_test.cpp (100%)
 rename {indexer => generator}/tesselator.cpp (99%)
 rename {indexer => generator}/tesselator.hpp (99%)

diff --git a/generator/coastlines_generator.cpp b/generator/coastlines_generator.cpp
index 766075dcf3..d337b1c337 100644
--- a/generator/coastlines_generator.cpp
+++ b/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"
diff --git a/generator/feature_sorter.cpp b/generator/feature_sorter.cpp
index f0ec2139aa..0ef27d95ef 100644
--- a/generator/feature_sorter.cpp
+++ b/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"
 
diff --git a/generator/generator.pro b/generator/generator.pro
index 93d52a1365..7e0784e95b 100644
--- a/generator/generator.pro
+++ b/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 \
diff --git a/generator/generator_tests/generator_tests.pro b/generator/generator_tests/generator_tests.pro
index 7c755b33e5..810b4d19ff 100644
--- a/generator/generator_tests/generator_tests.pro
+++ b/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 \
diff --git a/indexer/indexer_tests/tesselator_test.cpp b/generator/generator_tests/tesselator_test.cpp
similarity index 100%
rename from indexer/indexer_tests/tesselator_test.cpp
rename to generator/generator_tests/tesselator_test.cpp
diff --git a/indexer/indexer_tests/triangles_tree_coding_test.cpp b/generator/generator_tests/triangles_tree_coding_test.cpp
similarity index 100%
rename from indexer/indexer_tests/triangles_tree_coding_test.cpp
rename to generator/generator_tests/triangles_tree_coding_test.cpp
diff --git a/indexer/tesselator.cpp b/generator/tesselator.cpp
similarity index 99%
rename from indexer/tesselator.cpp
rename to generator/tesselator.cpp
index c585482c34..b2409b3339 100644
--- a/indexer/tesselator.cpp
+++ b/generator/tesselator.cpp
@@ -1,5 +1,6 @@
 #include "tesselator.hpp"
-#include "geometry_coding.hpp"
+
+#include "../indexer/geometry_coding.hpp"
 
 #include "../geometry/robust_orientation.hpp"
 
diff --git a/indexer/tesselator.hpp b/generator/tesselator.hpp
similarity index 99%
rename from indexer/tesselator.hpp
rename to generator/tesselator.hpp
index 0fcdf9d0fc..ff5279f6d1 100644
--- a/indexer/tesselator.hpp
+++ b/generator/tesselator.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "tesselator_decl.hpp"
+#include "../indexer/tesselator_decl.hpp"
 
 #include "../geometry/point2d.hpp"
 
diff --git a/indexer/indexer.pro b/indexer/indexer.pro
index 5e83209b33..ff4c4f19e3 100644
--- a/indexer/indexer.pro
+++ b/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 \
diff --git a/indexer/indexer_tests/indexer_tests.pro b/indexer/indexer_tests/indexer_tests.pro
index 52fe3fbdea..32daf6ec1d 100644
--- a/indexer/indexer_tests/indexer_tests.pro
+++ b/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
-