From de2b44712a20dd4afc95d207e542bbfa8cfcd593 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 11 Jan 2017 11:10:03 +0100
Subject: [PATCH] move transform related headers into `transform` dir to
 minimize clutter

---
 include/build.py                                              | 1 +
 include/mapnik/attribute_collector.hpp                        | 2 +-
 include/mapnik/symbolizer_utils.hpp                           | 4 ++--
 include/mapnik/{ => transform}/parse_transform.hpp            | 0
 include/mapnik/{ => transform}/transform_expression.hpp       | 0
 .../{ => transform}/transform_expression_grammar_x3.hpp       | 2 +-
 .../{ => transform}/transform_expression_grammar_x3_def.hpp   | 4 ++--
 include/mapnik/{ => transform}/transform_processor.hpp        | 2 +-
 src/load_map.cpp                                              | 4 ++--
 src/parse_transform.cpp                                       | 4 ++--
 src/save_map.cpp                                              | 2 +-
 src/symbolizer.cpp                                            | 2 +-
 src/transform_expression.cpp                                  | 2 +-
 src/transform_expression_grammar_x3.cpp                       | 2 +-
 test/unit/core/transform_expressions_test.cpp                 | 4 ++--
 15 files changed, 18 insertions(+), 17 deletions(-)
 rename include/mapnik/{ => transform}/parse_transform.hpp (100%)
 rename include/mapnik/{ => transform}/transform_expression.hpp (100%)
 rename include/mapnik/{ => transform}/transform_expression_grammar_x3.hpp (96%)
 rename include/mapnik/{ => transform}/transform_expression_grammar_x3_def.hpp (98%)
 rename include/mapnik/{ => transform}/transform_processor.hpp (99%)

diff --git a/include/build.py b/include/build.py
index eb475aa58..f2e94e5f5 100644
--- a/include/build.py
+++ b/include/build.py
@@ -38,6 +38,7 @@ subdirs = [
     'text',
     'text/placements',
     'text/formatting',
+    'transform',
     'markers_placements',
     'geometry',
     'value'
diff --git a/include/mapnik/attribute_collector.hpp b/include/mapnik/attribute_collector.hpp
index ccc6df601..83fec1171 100644
--- a/include/mapnik/attribute_collector.hpp
+++ b/include/mapnik/attribute_collector.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_ATTRIBUTE_COLLECTOR_HPP
 
 // mapnik
-#include <mapnik/transform_processor.hpp>
+#include <mapnik/transform/transform_processor.hpp>
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/attribute.hpp>
 #include <mapnik/symbolizer.hpp>
diff --git a/include/mapnik/symbolizer_utils.hpp b/include/mapnik/symbolizer_utils.hpp
index 319d0e1dd..e18cf2a8c 100644
--- a/include/mapnik/symbolizer_utils.hpp
+++ b/include/mapnik/symbolizer_utils.hpp
@@ -30,13 +30,13 @@
 #include <mapnik/parse_path.hpp>
 #include <mapnik/color.hpp>
 #include <mapnik/expression.hpp>
-#include <mapnik/transform_processor.hpp>
 #include <mapnik/color_factory.hpp>
 #include <mapnik/symbolizer.hpp>
 #include <mapnik/xml_tree.hpp>
 #include <mapnik/config_error.hpp>
 #include <mapnik/evaluate_global_attributes.hpp>
-#include <mapnik/parse_transform.hpp>
+#include <mapnik/transform/transform_processor.hpp>
+#include <mapnik/transform/parse_transform.hpp>
 #include <mapnik/util/dasharray_parser.hpp>
 #include <mapnik/util/variant.hpp>
 
diff --git a/include/mapnik/parse_transform.hpp b/include/mapnik/transform/parse_transform.hpp
similarity index 100%
rename from include/mapnik/parse_transform.hpp
rename to include/mapnik/transform/parse_transform.hpp
diff --git a/include/mapnik/transform_expression.hpp b/include/mapnik/transform/transform_expression.hpp
similarity index 100%
rename from include/mapnik/transform_expression.hpp
rename to include/mapnik/transform/transform_expression.hpp
diff --git a/include/mapnik/transform_expression_grammar_x3.hpp b/include/mapnik/transform/transform_expression_grammar_x3.hpp
similarity index 96%
rename from include/mapnik/transform_expression_grammar_x3.hpp
rename to include/mapnik/transform/transform_expression_grammar_x3.hpp
index 4a83c2cf9..4cc5237f2 100644
--- a/include/mapnik/transform_expression_grammar_x3.hpp
+++ b/include/mapnik/transform/transform_expression_grammar_x3.hpp
@@ -23,7 +23,7 @@
 #ifndef MAPNIK_TRANSFORM_GRAMMAR_X3_HPP
 #define MAPNIK_TRANSFORM_GRAMMAR_X3_HPP
 
-#include <mapnik/transform_expression.hpp>
+#include <mapnik/transform/transform_expression.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/include/mapnik/transform_expression_grammar_x3_def.hpp b/include/mapnik/transform/transform_expression_grammar_x3_def.hpp
similarity index 98%
rename from include/mapnik/transform_expression_grammar_x3_def.hpp
rename to include/mapnik/transform/transform_expression_grammar_x3_def.hpp
index 5481e9ad6..76c439391 100644
--- a/include/mapnik/transform_expression_grammar_x3_def.hpp
+++ b/include/mapnik/transform/transform_expression_grammar_x3_def.hpp
@@ -23,8 +23,8 @@
 #ifndef MAPNIK_TRANSFORM_GRAMMAR_X3_DEF_HPP
 #define MAPNIK_TRANSFORM_GRAMMAR_X3_DEF_HPP
 
-#include <mapnik/transform_expression.hpp>
-#include <mapnik/transform_expression_grammar_x3.hpp>
+#include <mapnik/transform/transform_expression.hpp>
+#include <mapnik/transform/transform_expression_grammar_x3.hpp>
 #include <mapnik/expression_grammar_x3.hpp>
 
 #pragma GCC diagnostic push
diff --git a/include/mapnik/transform_processor.hpp b/include/mapnik/transform/transform_processor.hpp
similarity index 99%
rename from include/mapnik/transform_processor.hpp
rename to include/mapnik/transform/transform_processor.hpp
index 7b17fa1c4..1e780b320 100644
--- a/include/mapnik/transform_processor.hpp
+++ b/include/mapnik/transform/transform_processor.hpp
@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/value.hpp>
-#include <mapnik/transform_expression.hpp>
+#include <mapnik/transform/transform_expression.hpp>
 #include <mapnik/expression_evaluator.hpp>
 #include <mapnik/util/variant.hpp>
 
diff --git a/src/load_map.cpp b/src/load_map.cpp
index 9e303bfa3..2f1e0f8fa 100644
--- a/src/load_map.cpp
+++ b/src/load_map.cpp
@@ -39,7 +39,7 @@
 #include <mapnik/xml_loader.hpp>
 #include <mapnik/expression.hpp>
 #include <mapnik/parse_path.hpp>
-#include <mapnik/parse_transform.hpp>
+#include <mapnik/transform/parse_transform.hpp>
 #include <mapnik/raster_colorizer.hpp>
 #include <mapnik/svg/svg_path_parser.hpp>
 #include <mapnik/text/placements/registry.hpp>
@@ -55,7 +55,7 @@
 #include <mapnik/image_filter_types.hpp>
 #include <mapnik/projection.hpp>
 #include <mapnik/group/group_rule.hpp>
-#include <mapnik/transform_expression.hpp>
+#include <mapnik/transform/transform_expression.hpp>
 #include <mapnik/evaluate_global_attributes.hpp>
 #include <mapnik/boolean.hpp>
 
diff --git a/src/parse_transform.cpp b/src/parse_transform.cpp
index a3698d0f4..ae56560f2 100644
--- a/src/parse_transform.cpp
+++ b/src/parse_transform.cpp
@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#include <mapnik/parse_transform.hpp>
-#include <mapnik/transform_expression_grammar_x3.hpp>
+#include <mapnik/transform/parse_transform.hpp>
+#include <mapnik/transform/transform_expression_grammar_x3.hpp>
 #include <mapnik/expression_grammar_x3_config.hpp> // transcoder_tag
 #include <mapnik/config_error.hpp>
 // stl
diff --git a/src/save_map.cpp b/src/save_map.cpp
index 8e53630bf..008658849 100644
--- a/src/save_map.cpp
+++ b/src/save_map.cpp
@@ -41,7 +41,7 @@
 #include <mapnik/image_filter_types.hpp>
 #include <mapnik/parse_path.hpp>
 #include <mapnik/symbolizer_utils.hpp>
-#include <mapnik/transform_processor.hpp>
+#include <mapnik/transform/transform_processor.hpp>
 #include <mapnik/group/group_rule.hpp>
 #include <mapnik/group/group_layout.hpp>
 #include <mapnik/group/group_symbolizer_properties.hpp>
diff --git a/src/symbolizer.cpp b/src/symbolizer.cpp
index 0dd2ae73b..7833663b5 100644
--- a/src/symbolizer.cpp
+++ b/src/symbolizer.cpp
@@ -24,7 +24,7 @@
 #include <mapnik/symbolizer.hpp>
 #include <mapnik/attribute.hpp>
 #include <mapnik/feature.hpp>
-#include <mapnik/transform_processor.hpp>
+#include <mapnik/transform/transform_processor.hpp>
 
 namespace mapnik {
 
diff --git a/src/transform_expression.cpp b/src/transform_expression.cpp
index d5f90879c..996ba8873 100644
--- a/src/transform_expression.cpp
+++ b/src/transform_expression.cpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/expression_string.hpp>
-#include <mapnik/transform_expression.hpp>
+#include <mapnik/transform/transform_expression.hpp>
 
 // stl
 #include <sstream>
diff --git a/src/transform_expression_grammar_x3.cpp b/src/transform_expression_grammar_x3.cpp
index 7336dd005..cc0839613 100644
--- a/src/transform_expression_grammar_x3.cpp
+++ b/src/transform_expression_grammar_x3.cpp
@@ -20,7 +20,7 @@
  *
  *****************************************************************************/
 
-#include <mapnik/transform_expression_grammar_x3_def.hpp>
+#include <mapnik/transform/transform_expression_grammar_x3_def.hpp>
 #include <mapnik/expression_grammar_x3_config.hpp>
 
 namespace mapnik { namespace grammar {
diff --git a/test/unit/core/transform_expressions_test.cpp b/test/unit/core/transform_expressions_test.cpp
index f63a7d15b..b2195fb50 100644
--- a/test/unit/core/transform_expressions_test.cpp
+++ b/test/unit/core/transform_expressions_test.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
 
-#include <mapnik/parse_transform.hpp>
-#include <mapnik/transform_expression.hpp>
+#include <mapnik/transform/parse_transform.hpp>
+#include <mapnik/transform/transform_expression.hpp>
 
 namespace {