From 237022719a9f255de0cf7af77c1b4d3e1d3c67c9 Mon Sep 17 00:00:00 2001
From: Jiri Drbalek <jiri.drbalek@firma.seznam.cz>
Date: Tue, 6 Sep 2016 15:15:28 +0000
Subject: [PATCH 001/328] unit tests: move fake_path to separate file

---
 test/unit/vertex_adapter/fake_path.hpp        | 93 +++++++++++++++++++
 test/unit/vertex_adapter/line_offset_test.cpp | 48 +---------
 test/unit/vertex_adapter/offset_converter.cpp | 53 +----------
 3 files changed, 95 insertions(+), 99 deletions(-)
 create mode 100644 test/unit/vertex_adapter/fake_path.hpp

diff --git a/test/unit/vertex_adapter/fake_path.hpp b/test/unit/vertex_adapter/fake_path.hpp
new file mode 100644
index 000000000..dc1b4aed2
--- /dev/null
+++ b/test/unit/vertex_adapter/fake_path.hpp
@@ -0,0 +1,93 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2015 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+// mapnik
+#include <mapnik/vertex.hpp>
+
+// stl
+#include <vector>
+#include <tuple>
+
+namespace detail
+{
+
+template <typename T>
+struct fake_path
+{
+    using coord_type = std::tuple<T, T, unsigned>;
+    using cont_type = std::vector<coord_type>;
+    cont_type vertices_;
+    typename cont_type::iterator itr_;
+
+    fake_path(std::initializer_list<T> l)
+        : fake_path(l.begin(), l.size())
+    {
+    }
+
+    fake_path(std::vector<T> const &v, bool make_invalid = false)
+        : fake_path(v.begin(), v.size(), make_invalid)
+    {
+    }
+
+    template <typename Itr>
+    fake_path(Itr itr, size_t sz, bool make_invalid = false)
+    {
+        size_t num_coords = sz >> 1;
+        vertices_.reserve(num_coords + (make_invalid ? 1 : 0));
+        if (make_invalid)
+        {
+            vertices_.push_back(std::make_tuple(0,0,mapnik::SEG_END));
+        }
+
+        for (size_t i = 0; i < num_coords; ++i)
+        {
+            T x = *itr++;
+            T y = *itr++;
+            unsigned cmd = (i == 0) ? mapnik::SEG_MOVETO : mapnik::SEG_LINETO;
+            vertices_.push_back(std::make_tuple(x, y, cmd));
+        }
+        itr_ = vertices_.begin();
+    }
+
+    unsigned vertex(T *x, T *y)
+    {
+        if (itr_ == vertices_.end())
+        {
+            return mapnik::SEG_END;
+        }
+        *x = std::get<0>(*itr_);
+        *y = std::get<1>(*itr_);
+        unsigned cmd = std::get<2>(*itr_);
+        ++itr_;
+        return cmd;
+    }
+
+    void rewind(unsigned)
+    {
+        itr_ = vertices_.begin();
+    }
+};
+
+}
+
+using fake_path = detail::fake_path<double>;
+
diff --git a/test/unit/vertex_adapter/line_offset_test.cpp b/test/unit/vertex_adapter/line_offset_test.cpp
index dcb8dc68b..75bfb0799 100644
--- a/test/unit/vertex_adapter/line_offset_test.cpp
+++ b/test/unit/vertex_adapter/line_offset_test.cpp
@@ -1,5 +1,6 @@
 
 #include "catch.hpp"
+#include "fake_path.hpp"
 
 // mapnik
 #include <mapnik/vertex_cache.hpp>
@@ -7,53 +8,6 @@
 
 // stl
 #include <iostream>
-#include <vector>
-#include <tuple>
-
-struct fake_path
-{
-    using coord_type = std::tuple<double, double, unsigned>;
-    using cont_type = std::vector<coord_type>;
-    cont_type vertices_;
-    cont_type::iterator itr_;
-
-    fake_path(std::initializer_list<double> l)
-        : fake_path(l.begin(), l.size()) {
-    }
-
-    fake_path(std::vector<double> const &v)
-        : fake_path(v.begin(), v.size()) {
-    }
-
-    template <typename Itr>
-    fake_path(Itr itr, size_t sz) {
-        size_t num_coords = sz >> 1;
-        vertices_.reserve(num_coords);
-
-        for (size_t i = 0; i < num_coords; ++i) {
-            double x = *itr++;
-            double y = *itr++;
-            unsigned cmd = (i == 0) ? agg::path_cmd_move_to : agg::path_cmd_line_to;
-            vertices_.push_back(std::make_tuple(x, y, cmd));
-        }
-        itr_ = vertices_.begin();
-    }
-
-    unsigned vertex(double *x, double *y) {
-        if (itr_ == vertices_.end()) {
-            return agg::path_cmd_stop;
-        }
-        *x = std::get<0>(*itr_);
-        *y = std::get<1>(*itr_);
-        unsigned cmd = std::get<2>(*itr_);
-        ++itr_;
-        return cmd;
-    }
-
-    void rewind(unsigned) {
-        itr_ = vertices_.begin();
-    }
-};
 
 double dist(mapnik::pixel_position const &a,
             mapnik::pixel_position const &b)
diff --git a/test/unit/vertex_adapter/offset_converter.cpp b/test/unit/vertex_adapter/offset_converter.cpp
index 9255f7d97..96c796d06 100644
--- a/test/unit/vertex_adapter/offset_converter.cpp
+++ b/test/unit/vertex_adapter/offset_converter.cpp
@@ -1,66 +1,15 @@
 
 #include "catch.hpp"
+#include "fake_path.hpp"
 
 // mapnik
-#include <mapnik/vertex.hpp>
 #include <mapnik/offset_converter.hpp>
 
 // stl
 #include <iostream>
-#include <vector>
-#include <tuple>
 
 namespace offset_test {
 
-struct fake_path
-{
-    using coord_type = std::tuple<double, double, unsigned>;
-    using cont_type = std::vector<coord_type>;
-    cont_type vertices_;
-    cont_type::iterator itr_;
-
-    fake_path(std::initializer_list<double> l)
-        : fake_path(l.begin(), l.size()) {
-    }
-
-    fake_path(std::vector<double> const &v, bool make_invalid = false)
-        : fake_path(v.begin(), v.size(), make_invalid) {
-    }
-
-    template <typename Itr>
-    fake_path(Itr itr, size_t sz, bool make_invalid = false) {
-        size_t num_coords = sz >> 1;
-        vertices_.reserve(num_coords + (make_invalid ? 1 : 0));
-        if (make_invalid)
-        {
-            vertices_.push_back(std::make_tuple(0,0,mapnik::SEG_END));
-        }
-
-        for (size_t i = 0; i < num_coords; ++i) {
-            double x = *itr++;
-            double y = *itr++;
-            unsigned cmd = (i == 0) ? mapnik::SEG_MOVETO : mapnik::SEG_LINETO;
-            vertices_.push_back(std::make_tuple(x, y, cmd));
-        }
-        itr_ = vertices_.begin();
-    }
-
-    unsigned vertex(double *x, double *y) {
-        if (itr_ == vertices_.end()) {
-            return mapnik::SEG_END;
-        }
-        *x = std::get<0>(*itr_);
-        *y = std::get<1>(*itr_);
-        unsigned cmd = std::get<2>(*itr_);
-        ++itr_;
-        return cmd;
-    }
-
-    void rewind(unsigned) {
-        itr_ = vertices_.begin();
-    }
-};
-
 static double DELTA_BUFF = 0.5;
 
 double dist(double x0, double y0, double x1, double y1)

From 8733622885da6175c8e45b4bd4c98f61b74fc847 Mon Sep 17 00:00:00 2001
From: Jiri Drbalek <jiri.drbalek@firma.seznam.cz>
Date: Tue, 6 Sep 2016 15:15:11 +0000
Subject: [PATCH 002/328] add extend_converter

---
 include/mapnik/extend_converter.hpp           | 232 ++++++++++++++++++
 test/unit/vertex_adapter/extend_converter.cpp | 128 ++++++++++
 2 files changed, 360 insertions(+)
 create mode 100644 include/mapnik/extend_converter.hpp
 create mode 100644 test/unit/vertex_adapter/extend_converter.cpp

diff --git a/include/mapnik/extend_converter.hpp b/include/mapnik/extend_converter.hpp
new file mode 100644
index 000000000..a7ac187eb
--- /dev/null
+++ b/include/mapnik/extend_converter.hpp
@@ -0,0 +1,232 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2015 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_EXTEND_CONVERTER_HPP
+#define MAPNIK_EXTEND_CONVERTER_HPP
+
+#include <mapnik/vertex.hpp>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/optional.hpp>
+#include <boost/msm/back/state_machine.hpp>
+#include <boost/msm/front/state_machine_def.hpp>
+#include <boost/msm/front/functor_row.hpp>
+#pragma GCC diagnostic pop
+
+// stl
+#include <cmath>
+
+namespace mapnik
+{
+
+namespace detail
+{
+
+namespace msm = boost::msm;
+namespace mpl = boost::mpl;
+using namespace msm::front;
+
+template <typename T>
+T extend(T const & v1, T const & v2, double length)
+{
+    double dx = v2.x - v1.x;
+    double dy = v2.y - v1.y;
+    double l12 = std::sqrt(dx * dx + dy * dy);
+    double coef = 1.0 + length / l12;
+    return vertex2d(v1.x + dx * coef,
+                    v1.y + dy * coef, v2.cmd);
+}
+
+namespace events
+{
+    struct vertex_event
+    {
+        vertex_event(vertex2d const & vertex) : vertex(vertex) { }
+        vertex2d const & vertex;
+    };
+
+    struct move_to : vertex_event { using vertex_event::vertex_event; };
+    struct line_to : vertex_event { using vertex_event::vertex_event; };
+    struct close : vertex_event { using vertex_event::vertex_event; };
+    struct end : vertex_event { using vertex_event::vertex_event; };
+}
+
+namespace actions
+{
+    struct store
+    {
+        template <class FSM, class EVT, class SourceState, class TargetState>
+        void operator()(EVT const & e, FSM & m, SourceState&, TargetState&)
+        {
+            m.v2 = m.v1;
+            m.v1 = e.vertex;
+            m.output = boost::none;
+        }
+    };
+
+    struct output
+    {
+        template <class FSM, class EVT, class SourceState, class TargetState>
+        void operator()(EVT const & e, FSM & m, SourceState&, TargetState&)
+        {
+            m.output = e.vertex;
+        }
+    };
+
+    struct store_and_output
+    {
+        template <class FSM, class EVT, class SourceState, class TargetState>
+        void operator()(EVT const & e, FSM & m, SourceState&, TargetState&)
+        {
+            m.v2 = m.v1;
+            m.v1 = e.vertex;
+            m.output = m.v2;
+        }
+    };
+
+    struct output_begin
+    {
+        template <class FSM, class EVT, class SourceState, class TargetState>
+        void operator()(EVT const & e, FSM & m, SourceState&, TargetState&)
+        {
+            m.v2 = m.v1;
+            m.v1 = e.vertex;
+            m.output = extend(m.v1, m.v2, m.extend_length);
+        }
+    };
+
+    struct output_end
+    {
+        template <class FSM, class EVT, class SourceState, class TargetState>
+        void operator()(EVT const & e, FSM & m, SourceState&, TargetState&)
+        {
+            m.output = extend(m.v2, m.v1, m.extend_length);
+            m.v1 = e.vertex;
+        }
+    };
+}
+
+struct extender_def : public msm::front::state_machine_def<extender_def>
+{
+    using no_exception_thrown = int;
+    using no_message_queue = int;
+
+    struct initial : public msm::front::state<> { };
+    struct vertex_one : public msm::front::state<> { };
+    struct vertex_two : public msm::front::state<> { };
+    struct end : public msm::front::state<> { };
+
+    using initial_state = initial;
+
+    struct transition_table : mpl::vector<
+        //  Start         Event                Next      Action                Guard
+        //  +------------+-----------------+------------+--------------------+------+
+        Row < initial    , events::move_to , vertex_one , actions::store            >,
+        Row < initial    , events::line_to , vertex_one , actions::store            >,
+        Row < initial    , events::close   , initial                                >,
+        Row < initial    , events::end     , end        , actions::output           >,
+        Row < vertex_one , events::move_to , vertex_one , actions::store_and_output >,
+        Row < vertex_one , events::line_to , vertex_two , actions::output_begin     >,
+        Row < vertex_one , events::close   , initial    , actions::store_and_output >,
+        Row < vertex_one , events::end     , end        , actions::store_and_output >,
+        Row < vertex_two , events::move_to , vertex_one , actions::output_end       >,
+        Row < vertex_two , events::line_to , vertex_two , actions::store_and_output >,
+        Row < vertex_two , events::close   , initial    , actions::output_end       >,
+        Row < vertex_two , events::end     , end        , actions::output_end       >,
+        Row < end        , events::end     , end        , actions::output           >
+    > {};
+
+    extender_def(double extend_length)
+        : extend_length(extend_length)
+    {
+    }
+
+    boost::optional<vertex2d> output;
+    vertex2d v1, v2;
+    double extend_length;
+};
+
+using extender = msm::back::state_machine<extender_def>;
+
+}
+
+template <typename Geometry>
+struct extend_converter
+{
+    extend_converter(Geometry & geom)
+        : extend_converter(geom, 0)
+    {}
+
+    extend_converter(Geometry & geom, double extend)
+        : geom_(geom), extender_(extend)
+    {}
+
+    void set_extend(double extend)
+    {
+        extender_.extend_length = extend;
+    }
+
+    unsigned vertex(double * x, double * y)
+    {
+        using namespace detail;
+        vertex2d v;
+        do
+        {
+            v.cmd = geom_.vertex(&v.x, &v.y);
+            switch (v.cmd)
+            {
+                case SEG_MOVETO:
+                    extender_.process_event(events::move_to(v));
+                    break;
+                case SEG_LINETO:
+                    extender_.process_event(events::line_to(v));
+                    break;
+                case SEG_CLOSE:
+                    extender_.process_event(events::close(v));
+                    break;
+                case SEG_END:
+                    extender_.process_event(events::end(v));
+                    break;
+            }
+        } while(!extender_.output);
+
+        vertex2d const & output = *extender_.output;
+        *x = output.x;
+        *y = output.y;
+        return output.cmd;
+    }
+
+    void rewind(unsigned)
+    {
+        geom_.rewind(0);
+        extender_.start();
+    }
+
+private:
+    Geometry & geom_;
+    detail::extender extender_;
+};
+
+}
+
+#endif // MAPNIK_EXTEND_CONVERTER_HPP
diff --git a/test/unit/vertex_adapter/extend_converter.cpp b/test/unit/vertex_adapter/extend_converter.cpp
new file mode 100644
index 000000000..a8b0f080d
--- /dev/null
+++ b/test/unit/vertex_adapter/extend_converter.cpp
@@ -0,0 +1,128 @@
+#include "catch.hpp"
+#include "fake_path.hpp"
+
+// mapnik
+#include <mapnik/extend_converter.hpp>
+
+// stl
+#include <iostream>
+
+namespace offset_test {
+
+TEST_CASE("extend converter") {
+
+SECTION("empty") {
+    try
+    {
+        fake_path path = {};
+        mapnik::extend_converter<fake_path> c(path, 1000);
+        double x, y;
+        REQUIRE(c.vertex(&x, &y) == mapnik::SEG_END);
+    }
+    catch (std::exception const& ex)
+    {
+        std::cerr << ex.what() << "\n";
+        REQUIRE(false);
+    }
+}
+
+SECTION("one point") {
+    try
+    {
+        fake_path path = { 0, 0 };
+        mapnik::extend_converter<fake_path> c(path, 1000);
+        double x, y;
+        REQUIRE(c.vertex(&x, &y) == mapnik::SEG_MOVETO);
+        REQUIRE(x == 0);
+        REQUIRE(y == 0);
+        REQUIRE(c.vertex(&x, &y) == mapnik::SEG_END);
+        REQUIRE(c.vertex(&x, &y) == mapnik::SEG_END);
+    }
+    catch (std::exception const& ex)
+    {
+        std::cerr << ex.what() << "\n";
+        REQUIRE(false);
+    }
+}
+
+SECTION("two points") {
+    try
+    {
+        fake_path path = { 0, 0 , 1, 0};
+        mapnik::extend_converter<fake_path> c(path, 1000);
+        double x, y;
+        REQUIRE(c.vertex(&x, &y) == mapnik::SEG_MOVETO);
+        REQUIRE(x == -1000);
+        REQUIRE(y == 0);
+        REQUIRE(c.vertex(&x, &y) == mapnik::SEG_LINETO);
+        REQUIRE(x == 1001);
+        REQUIRE(y == 0);
+        REQUIRE(c.vertex(&x, &y) == mapnik::SEG_END);
+    }
+    catch (std::exception const& ex)
+    {
+        std::cerr << ex.what() << "\n";
+        REQUIRE(false);
+    }
+}
+
+SECTION("three points") {
+    try
+    {
+        fake_path path = { 0, 0, 1, 0, 2, 0 };
+        mapnik::extend_converter<fake_path> c(path, 1000);
+        double x, y;
+        REQUIRE(c.vertex(&x, &y) == mapnik::SEG_MOVETO);
+        REQUIRE(x == -1000);
+        REQUIRE(y == 0);
+        REQUIRE(c.vertex(&x, &y) == mapnik::SEG_LINETO);
+        REQUIRE(x == 1);
+        REQUIRE(y == 0);
+        REQUIRE(c.vertex(&x, &y) == mapnik::SEG_LINETO);
+        REQUIRE(x == 1002);
+        REQUIRE(y == 0);
+        REQUIRE(c.vertex(&x, &y) == mapnik::SEG_END);
+    }
+    catch (std::exception const& ex)
+    {
+        std::cerr << ex.what() << "\n";
+        REQUIRE(false);
+    }
+}
+
+SECTION("more points") {
+    try
+    {
+        fake_path path = { 0, 0, 1, 0, 2, 0, 3, 0, 4, 0, 5, 0 };
+        mapnik::extend_converter<fake_path> c(path, 1000);
+        double x, y;
+        REQUIRE(c.vertex(&x, &y) == mapnik::SEG_MOVETO);
+        REQUIRE(x == -1000);
+        REQUIRE(y == 0);
+        REQUIRE(c.vertex(&x, &y) == mapnik::SEG_LINETO);
+        REQUIRE(x == 1);
+        REQUIRE(y == 0);
+        REQUIRE(c.vertex(&x, &y) == mapnik::SEG_LINETO);
+        REQUIRE(x == 2);
+        REQUIRE(y == 0);
+        REQUIRE(c.vertex(&x, &y) == mapnik::SEG_LINETO);
+        REQUIRE(x == 3);
+        REQUIRE(y == 0);
+        REQUIRE(c.vertex(&x, &y) == mapnik::SEG_LINETO);
+        REQUIRE(x == 4);
+        REQUIRE(y == 0);
+        REQUIRE(c.vertex(&x, &y) == mapnik::SEG_LINETO);
+        REQUIRE(x == 1005);
+        REQUIRE(y == 0);
+        REQUIRE(c.vertex(&x, &y) == mapnik::SEG_END);
+    }
+    catch (std::exception const& ex)
+    {
+        std::cerr << ex.what() << "\n";
+        REQUIRE(false);
+    }
+}
+
+}
+
+}

From 6e489a95a3c6e951347f51c8910cc88947ba6270 Mon Sep 17 00:00:00 2001
From: Jiri Drbalek <jiri.drbalek@firma.seznam.cz>
Date: Wed, 7 Sep 2016 10:33:46 +0000
Subject: [PATCH 003/328] add extend parameter of text symbolizer

---
 include/mapnik/symbolizer_default_values.hpp |  7 +++++++
 include/mapnik/symbolizer_keys.hpp           |  1 +
 include/mapnik/text/symbolizer_helpers.hpp   |  2 +-
 include/mapnik/vertex_converters.hpp         | 19 +++++++++++++++++++
 src/load_map.cpp                             |  1 +
 src/symbolizer_keys.cpp                      |  1 +
 src/text/symbolizer_helpers.cpp              |  5 +++++
 7 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/include/mapnik/symbolizer_default_values.hpp b/include/mapnik/symbolizer_default_values.hpp
index ea5e5c02e..464533e97 100644
--- a/include/mapnik/symbolizer_default_values.hpp
+++ b/include/mapnik/symbolizer_default_values.hpp
@@ -369,6 +369,13 @@ struct symbolizer_default<value_bool, keys::avoid_edges>
 
 // font-feature-settings
 
+// extend
+template <>
+struct symbolizer_default<value_double, keys::extend>
+{
+    static value_double value() { return 0.0; }
+};
+
 } // namespace mapnik
 
 #endif // MAPNIK_SYMBOLIZER_DEFAULT_VALUES_HPP
diff --git a/include/mapnik/symbolizer_keys.hpp b/include/mapnik/symbolizer_keys.hpp
index 15919dc1b..abce68ba4 100644
--- a/include/mapnik/symbolizer_keys.hpp
+++ b/include/mapnik/symbolizer_keys.hpp
@@ -92,6 +92,7 @@ enum class keys : std::uint8_t
     direction,
     avoid_edges,
     ff_settings,
+    extend,
     MAX_SYMBOLIZER_KEY
 };
 
diff --git a/include/mapnik/text/symbolizer_helpers.hpp b/include/mapnik/text/symbolizer_helpers.hpp
index 8fd3c155a..02d0f005b 100644
--- a/include/mapnik/text/symbolizer_helpers.hpp
+++ b/include/mapnik/text/symbolizer_helpers.hpp
@@ -59,7 +59,7 @@ struct placement_finder_adapter
 
 };
 
-using vertex_converter_type = vertex_converter<clip_line_tag, transform_tag, affine_transform_tag, simplify_tag, smooth_tag>;
+using vertex_converter_type = vertex_converter<clip_line_tag, transform_tag, affine_transform_tag, extend_tag, simplify_tag, smooth_tag>;
 
 class base_symbolizer_helper
 {
diff --git a/include/mapnik/vertex_converters.hpp b/include/mapnik/vertex_converters.hpp
index ba1829472..b793f77ec 100644
--- a/include/mapnik/vertex_converters.hpp
+++ b/include/mapnik/vertex_converters.hpp
@@ -36,6 +36,7 @@
 #include <mapnik/symbolizer_enumerations.hpp>
 #include <mapnik/symbolizer_keys.hpp>
 #include <mapnik/symbolizer.hpp>
+#include <mapnik/extend_converter.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore_agg.hpp>
@@ -65,6 +66,7 @@ struct stroke_tag {};
 struct dash_tag {};
 struct affine_transform_tag {};
 struct offset_transform_tag {};
+struct extend_tag {};
 
 namespace  detail {
 
@@ -254,6 +256,23 @@ struct converter_traits<T,mapnik::offset_transform_tag>
     }
 };
 
+template <typename T>
+struct converter_traits<T, mapnik::extend_tag>
+{
+    using geometry_type = T;
+    using conv_type = extend_converter<geometry_type>;
+
+    template <typename Args>
+    static void setup(geometry_type & geom, Args const& args)
+    {
+        auto const& sym = args.sym;
+        auto const& feat = args.feature;
+        auto const& vars = args.vars;
+        double extend = get<value_double, keys::extend>(sym, feat, vars);
+        geom.set_extend(extend * args.scale_factor);
+    }
+};
+
 
 template <typename T0, typename T1>
 struct is_switchable
diff --git a/src/load_map.cpp b/src/load_map.cpp
index bf6324d20..8f8015daa 100644
--- a/src/load_map.cpp
+++ b/src/load_map.cpp
@@ -895,6 +895,7 @@ void map_parser::parse_symbolizer_base(symbolizer_base &sym, xml_node const& nod
     set_symbolizer_property<symbolizer_base,composite_mode_e>(sym, keys::comp_op, node);
     set_symbolizer_property<symbolizer_base,transform_type>(sym, keys::geometry_transform, node);
     set_symbolizer_property<symbolizer_base,simplify_algorithm_e>(sym, keys::simplify_algorithm, node);
+    set_symbolizer_property<symbolizer_base,double>(sym, keys::extend, node);
 }
 
 void map_parser::parse_point_symbolizer(rule & rule, xml_node const & node)
diff --git a/src/symbolizer_keys.cpp b/src/symbolizer_keys.cpp
index fa5c73d32..4d7a558c4 100644
--- a/src/symbolizer_keys.cpp
+++ b/src/symbolizer_keys.cpp
@@ -158,6 +158,7 @@ static const property_meta_type key_meta[const_max_key] =
                         property_types::target_direction},
     property_meta_type{ "avoid-edges",nullptr, property_types::target_bool },
     property_meta_type{ "font-feature-settings", nullptr, property_types::target_font_feature_settings },
+    property_meta_type{ "extend", nullptr, property_types::target_double},
 
 };
 
diff --git a/src/text/symbolizer_helpers.cpp b/src/text/symbolizer_helpers.cpp
index fe5568ad2..75944babb 100644
--- a/src/text/symbolizer_helpers.cpp
+++ b/src/text/symbolizer_helpers.cpp
@@ -318,10 +318,12 @@ text_symbolizer_helper::text_symbolizer_helper(
     value_bool clip = mapnik::get<value_bool, keys::clip>(sym_, feature_, vars_);
     value_double simplify_tolerance = mapnik::get<value_double, keys::simplify_tolerance>(sym_, feature_, vars_);
     value_double smooth = mapnik::get<value_double, keys::smooth>(sym_, feature_, vars_);
+    value_double extend = mapnik::get<value_double, keys::extend>(sym_, feature_, vars_);
 
     if (clip) converter_.template set<clip_line_tag>();
     converter_.template set<transform_tag>(); //always transform
     converter_.template set<affine_transform_tag>();
+    if (extend > 0.0) converter_.template set<extend_tag>();
     if (simplify_tolerance > 0.0) converter_.template set<simplify_tag>(); // optional simplify converter
     if (smooth > 0.0) converter_.template set<smooth_tag>(); // optional smooth converter
 
@@ -443,12 +445,15 @@ text_symbolizer_helper::text_symbolizer_helper(
     value_bool clip = mapnik::get<value_bool, keys::clip>(sym_, feature_, vars_);
     value_double simplify_tolerance = mapnik::get<value_double, keys::simplify_tolerance>(sym_, feature_, vars_);
     value_double smooth = mapnik::get<value_double, keys::smooth>(sym_, feature_, vars_);
+    value_double extend = mapnik::get<value_double, keys::extend>(sym_, feature_, vars_);
 
     if (clip) converter_.template set<clip_line_tag>();
     converter_.template set<transform_tag>(); //always transform
     converter_.template set<affine_transform_tag>();
+    if (extend > 0.0) converter_.template set<extend_tag>();
     if (simplify_tolerance > 0.0) converter_.template set<simplify_tag>(); // optional simplify converter
     if (smooth > 0.0) converter_.template set<smooth_tag>(); // optional smooth converter
+
     if (geometries_to_process_.size())
     {
         init_marker();

From 530cead861b9152c133ef77a56da5499de008062 Mon Sep 17 00:00:00 2001
From: Jiri Drbalek <jiri.drbalek@firma.seznam.cz>
Date: Wed, 7 Sep 2016 11:18:26 +0000
Subject: [PATCH 004/328] update visual test data

---
 test/data-visual | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/data-visual b/test/data-visual
index 61f0d314b..849f8d8c7 160000
--- a/test/data-visual
+++ b/test/data-visual
@@ -1 +1 @@
-Subproject commit 61f0d314b989a345df9515d5bc1472c8d5362990
+Subproject commit 849f8d8c722aa38803fc76106a86af2bc0aed9dd

From 8ce7a1c43d448bc36916263469a5961d3f99c344 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 2 Aug 2016 14:43:02 +0100
Subject: [PATCH 005/328] refactor souce code files with the following rule:
 the physical filesytem path matches namespace structure e.g
 `mapnik::geometry::centroid()` ->
 `$(MAPNIK_SOURCE)/include/mapnik/geometry/centroid.hpp`

---
 benchmark/test_polygon_clipping.cpp           |  8 ++--
 include/mapnik/feature.hpp                    |  2 +-
 include/mapnik/geom_util.hpp                  |  2 +-
 .../boost_adapters.hpp}                       |  0
 .../centroid.hpp}                             |  6 +--
 .../correct.hpp}                              |  2 +-
 .../envelope.hpp}                             |  0
 .../envelope_impl.hpp}                        |  2 +-
 .../fusion_adapted.hpp}                       |  0
 .../mapnik/{ => geometry}/geometry_type.hpp   |  2 +-
 .../mapnik/{ => geometry}/geometry_types.hpp  |  0
 .../is_empty.hpp}                             |  0
 .../is_simple.hpp}                            |  2 +-
 .../is_valid.hpp}                             | 10 ++---
 .../remove_empty.hpp}                         |  2 +-
 .../reprojection.hpp}                         |  0
 .../reprojection_impl.hpp}                    |  2 +-
 .../strategy.hpp}                             | 30 ++++++-------
 .../transform.hpp}                            |  2 +-
 .../extract_bounding_box_grammar_impl.hpp     |  2 +-
 .../json/geometry_generator_grammar.hpp       |  2 +-
 .../json/geometry_generator_grammar_impl.hpp  |  4 +-
 include/mapnik/json/geometry_grammar_impl.hpp |  2 +-
 include/mapnik/json/geometry_util.hpp         |  2 +-
 .../mapnik/json/positions_grammar_impl.hpp    |  2 +-
 include/mapnik/json/topojson_utils.hpp        |  4 +-
 include/mapnik/marker_helpers.hpp             |  4 +-
 .../mapnik/markers_placements/interior.hpp    |  2 +-
 include/mapnik/markers_placements/line.hpp    |  2 +-
 include/mapnik/markers_placements/point.hpp   |  2 +-
 include/mapnik/memory_featureset.hpp          |  2 +-
 .../process_point_symbolizer.hpp              |  6 +--
 .../svg/geometry_svg_generator_impl.hpp       |  2 +-
 include/mapnik/util/geometry_to_wkb.hpp       |  2 +-
 include/mapnik/vertex_adapters.hpp            |  2 +-
 include/mapnik/wkt/wkt_generator_grammar.hpp  |  2 +-
 .../mapnik/wkt/wkt_generator_grammar_impl.hpp |  2 +-
 include/mapnik/wkt/wkt_grammar_impl.hpp       |  2 +-
 plugins/input/csv/csv_datasource.cpp          |  2 +-
 plugins/input/csv/csv_utils.cpp               |  2 +-
 plugins/input/geojson/geojson_datasource.cpp  |  2 +-
 .../geojson/geojson_index_featureset.cpp      |  2 +-
 .../geojson_memory_index_featureset.cpp       |  2 +-
 plugins/input/ogr/ogr_featureset.cpp          |  2 +-
 plugins/input/ogr/ogr_index_featureset.cpp    |  2 +-
 plugins/input/shape/shape_io.cpp              |  2 +-
 plugins/input/sqlite/sqlite_datasource.cpp    |  2 +-
 plugins/input/sqlite/sqlite_featureset.cpp    |  4 +-
 plugins/input/sqlite/sqlite_utils.hpp         |  4 +-
 .../input/topojson/topojson_datasource.cpp    |  2 +-
 src/agg/process_line_symbolizer.cpp           |  2 +-
 src/build.py                                  |  4 +-
 src/cairo/process_line_symbolizer.cpp         |  2 +-
 .../envelope.cpp}                             |  4 +-
 .../reprojection.cpp}                         |  4 +-
 src/grid/process_line_symbolizer.cpp          |  2 +-
 src/memory_datasource.cpp                     |  4 +-
 .../render_markers_symbolizer.cpp             |  2 +-
 src/svg/output/process_symbolizers.cpp        |  2 +-
 src/text/symbolizer_helpers.cpp               |  4 +-
 src/twkb.cpp                                  |  2 +-
 src/vertex_adapters.cpp                       |  2 +-
 src/wkb.cpp                                   |  2 +-
 test/unit/datasource/csv.cpp                  |  4 +-
 test/unit/datasource/ds_test_util.hpp         |  4 +-
 test/unit/datasource/geojson.cpp              |  2 +-
 test/unit/datasource/postgis.cpp              |  2 +-
 test/unit/geometry/centroid.cpp               |  3 +-
 test/unit/geometry/geometry_envelope_test.cpp |  2 +-
 test/unit/geometry/geometry_hit_test.cpp      |  3 +-
 test/unit/geometry/geometry_is_simple.cpp     | 45 +++++++++----------
 test/unit/geometry/geometry_is_valid.cpp      |  3 +-
 test/unit/geometry/geometry_reprojection.cpp  |  3 +-
 test/unit/geometry/geometry_strategy_test.cpp |  5 +--
 test/unit/geometry/geometry_test_helper.cpp   |  4 +-
 test/unit/geometry/has_empty.cpp              |  3 +-
 test/unit/geometry/is_empty.cpp               |  3 +-
 test/unit/geometry/remove_empty.cpp           |  3 +-
 test/unit/serialization/wkb_formats_test.cpp  |  6 +--
 test/unit/serialization/wkb_test.cpp          |  4 +-
 test/unit/vertex_adapter/vertex_adapter.cpp   |  3 +-
 utils/mapnik-index/process_csv_file.cpp       |  2 +-
 utils/pgsql2sqlite/pgsql2sqlite.hpp           |  4 +-
 utils/shapeindex/shapeindex.cpp               |  3 +-
 84 files changed, 142 insertions(+), 153 deletions(-)
 rename include/mapnik/{geometry_adapters.hpp => geometry/boost_adapters.hpp} (100%)
 rename include/mapnik/{geometry_centroid.hpp => geometry/centroid.hpp} (96%)
 rename include/mapnik/{geometry_correct.hpp => geometry/correct.hpp} (98%)
 rename include/mapnik/{geometry_envelope.hpp => geometry/envelope.hpp} (100%)
 rename include/mapnik/{geometry_envelope_impl.hpp => geometry/envelope_impl.hpp} (99%)
 rename include/mapnik/{geometry_fusion_adapted.hpp => geometry/fusion_adapted.hpp} (100%)
 rename include/mapnik/{ => geometry}/geometry_type.hpp (98%)
 rename include/mapnik/{ => geometry}/geometry_types.hpp (100%)
 rename include/mapnik/{geometry_is_empty.hpp => geometry/is_empty.hpp} (100%)
 rename include/mapnik/{geometry_is_simple.hpp => geometry/is_simple.hpp} (98%)
 rename include/mapnik/{geometry_is_valid.hpp => geometry/is_valid.hpp} (97%)
 rename include/mapnik/{geometry_remove_empty.hpp => geometry/remove_empty.hpp} (98%)
 rename include/mapnik/{geometry_reprojection.hpp => geometry/reprojection.hpp} (100%)
 rename include/mapnik/{geometry_reprojection_impl.hpp => geometry/reprojection_impl.hpp} (99%)
 rename include/mapnik/{geometry_strategy.hpp => geometry/strategy.hpp} (97%)
 rename include/mapnik/{geometry_transform.hpp => geometry/transform.hpp} (99%)
 rename src/{geometry_envelope.cpp => geometry/envelope.cpp} (95%)
 rename src/{geometry_reprojection.cpp => geometry/reprojection.cpp} (98%)

diff --git a/benchmark/test_polygon_clipping.cpp b/benchmark/test_polygon_clipping.cpp
index b189a0443..d65ec34e2 100644
--- a/benchmark/test_polygon_clipping.cpp
+++ b/benchmark/test_polygon_clipping.cpp
@@ -10,10 +10,10 @@
 #include <mapnik/geometry.hpp>
 #include <mapnik/vertex_adapters.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
-#include <mapnik/geometry_envelope.hpp>
-#include <mapnik/geometry_correct.hpp>
-#include <mapnik/geometry_is_empty.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
+#include <mapnik/geometry/envelope.hpp>
+#include <mapnik/geometry/correct.hpp>
+#include <mapnik/geometry/is_empty.hpp>
 #include <mapnik/image_util.hpp>
 #include <mapnik/color.hpp>
 // boost geometry
diff --git a/include/mapnik/feature.hpp b/include/mapnik/feature.hpp
index 1300d3220..5e09ebb3c 100644
--- a/include/mapnik/feature.hpp
+++ b/include/mapnik/feature.hpp
@@ -29,7 +29,7 @@
 #include <mapnik/value.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/envelope.hpp>
 //
 #include <mapnik/feature_kv_iterator.hpp>
 #include <mapnik/util/noncopyable.hpp>
diff --git a/include/mapnik/geom_util.hpp b/include/mapnik/geom_util.hpp
index 7dbe51ff4..e08c519f2 100644
--- a/include/mapnik/geom_util.hpp
+++ b/include/mapnik/geom_util.hpp
@@ -27,7 +27,7 @@
 #include <mapnik/box2d.hpp>
 #include <mapnik/coord.hpp>
 #include <mapnik/vertex.hpp>
-#include <mapnik/geometry_types.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
 // stl
 #include <cmath>
 #include <vector>
diff --git a/include/mapnik/geometry_adapters.hpp b/include/mapnik/geometry/boost_adapters.hpp
similarity index 100%
rename from include/mapnik/geometry_adapters.hpp
rename to include/mapnik/geometry/boost_adapters.hpp
diff --git a/include/mapnik/geometry_centroid.hpp b/include/mapnik/geometry/centroid.hpp
similarity index 96%
rename from include/mapnik/geometry_centroid.hpp
rename to include/mapnik/geometry/centroid.hpp
index 590ba4898..2fe458edd 100644
--- a/include/mapnik/geometry_centroid.hpp
+++ b/include/mapnik/geometry/centroid.hpp
@@ -24,10 +24,10 @@
 #define MAPNIK_GEOMETRY_CENTROID_HPP
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
 #include <boost/geometry/algorithms/centroid.hpp>
-#include <mapnik/geometry_is_empty.hpp>
-#include <mapnik/geometry_remove_empty.hpp>
+#include <mapnik/geometry/is_empty.hpp>
+#include <mapnik/geometry/remove_empty.hpp>
 
 namespace mapnik { namespace geometry {
 
diff --git a/include/mapnik/geometry_correct.hpp b/include/mapnik/geometry/correct.hpp
similarity index 98%
rename from include/mapnik/geometry_correct.hpp
rename to include/mapnik/geometry/correct.hpp
index dc83ad3a2..40379bd22 100644
--- a/include/mapnik/geometry_correct.hpp
+++ b/include/mapnik/geometry/correct.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_GEOMETRY_CORRECT_HPP
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
 #include <mapnik/util/variant.hpp>
 
 #pragma GCC diagnostic push
diff --git a/include/mapnik/geometry_envelope.hpp b/include/mapnik/geometry/envelope.hpp
similarity index 100%
rename from include/mapnik/geometry_envelope.hpp
rename to include/mapnik/geometry/envelope.hpp
diff --git a/include/mapnik/geometry_envelope_impl.hpp b/include/mapnik/geometry/envelope_impl.hpp
similarity index 99%
rename from include/mapnik/geometry_envelope_impl.hpp
rename to include/mapnik/geometry/envelope_impl.hpp
index 2ebddb9d9..542936314 100644
--- a/include/mapnik/geometry_envelope_impl.hpp
+++ b/include/mapnik/geometry/envelope_impl.hpp
@@ -20,7 +20,7 @@
  *
  *****************************************************************************/
 
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/envelope.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/box2d.hpp>
 
diff --git a/include/mapnik/geometry_fusion_adapted.hpp b/include/mapnik/geometry/fusion_adapted.hpp
similarity index 100%
rename from include/mapnik/geometry_fusion_adapted.hpp
rename to include/mapnik/geometry/fusion_adapted.hpp
diff --git a/include/mapnik/geometry_type.hpp b/include/mapnik/geometry/geometry_type.hpp
similarity index 98%
rename from include/mapnik/geometry_type.hpp
rename to include/mapnik/geometry/geometry_type.hpp
index b052446cd..006394f1e 100644
--- a/include/mapnik/geometry_type.hpp
+++ b/include/mapnik/geometry/geometry_type.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_types.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
 
 namespace mapnik { namespace geometry { namespace detail {
 
diff --git a/include/mapnik/geometry_types.hpp b/include/mapnik/geometry/geometry_types.hpp
similarity index 100%
rename from include/mapnik/geometry_types.hpp
rename to include/mapnik/geometry/geometry_types.hpp
diff --git a/include/mapnik/geometry_is_empty.hpp b/include/mapnik/geometry/is_empty.hpp
similarity index 100%
rename from include/mapnik/geometry_is_empty.hpp
rename to include/mapnik/geometry/is_empty.hpp
diff --git a/include/mapnik/geometry_is_simple.hpp b/include/mapnik/geometry/is_simple.hpp
similarity index 98%
rename from include/mapnik/geometry_is_simple.hpp
rename to include/mapnik/geometry/is_simple.hpp
index 868b41afd..64da5ac05 100644
--- a/include/mapnik/geometry_is_simple.hpp
+++ b/include/mapnik/geometry/is_simple.hpp
@@ -29,7 +29,7 @@
 #if BOOST_VERSION >= 105600
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
 #include <boost/geometry/algorithms/is_simple.hpp>
 
 namespace mapnik { namespace geometry {
diff --git a/include/mapnik/geometry_is_valid.hpp b/include/mapnik/geometry/is_valid.hpp
similarity index 97%
rename from include/mapnik/geometry_is_valid.hpp
rename to include/mapnik/geometry/is_valid.hpp
index 95319cce9..ecdc2e16f 100644
--- a/include/mapnik/geometry_is_valid.hpp
+++ b/include/mapnik/geometry/is_valid.hpp
@@ -29,7 +29,7 @@
 #if BOOST_VERSION >= 105800
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
 #include <boost/geometry/algorithms/is_valid.hpp>
 #include <boost/geometry/algorithms/validity_failure_type.hpp>
 
@@ -102,7 +102,7 @@ struct geometry_is_valid
 struct geometry_is_valid_reason
 {
     using result_type = bool;
-    
+
     boost::geometry::validity_failure_type & failure_;
 
     geometry_is_valid_reason(boost::geometry::validity_failure_type & failure):
@@ -170,7 +170,7 @@ struct geometry_is_valid_reason
 struct geometry_is_valid_string
 {
     using result_type = bool;
-    
+
     std::string & message_;
 
     geometry_is_valid_string(std::string & message):
@@ -257,7 +257,7 @@ inline bool is_valid(T const& geom, boost::geometry::validity_failure_type & fai
 }
 
 template <typename T>
-inline bool is_valid(mapnik::geometry::geometry<T> const& geom, 
+inline bool is_valid(mapnik::geometry::geometry<T> const& geom,
                      boost::geometry::validity_failure_type & failure)
 {
     return util::apply_visitor(detail::geometry_is_valid_reason(failure), geom);
@@ -270,7 +270,7 @@ inline bool is_valid(T const& geom, std::string & message)
 }
 
 template <typename T>
-inline bool is_valid(mapnik::geometry::geometry<T> const& geom, 
+inline bool is_valid(mapnik::geometry::geometry<T> const& geom,
                      std::string & message)
 {
     return util::apply_visitor(detail::geometry_is_valid_string(message), geom);
diff --git a/include/mapnik/geometry_remove_empty.hpp b/include/mapnik/geometry/remove_empty.hpp
similarity index 98%
rename from include/mapnik/geometry_remove_empty.hpp
rename to include/mapnik/geometry/remove_empty.hpp
index 9838b5a61..7b820213a 100644
--- a/include/mapnik/geometry_remove_empty.hpp
+++ b/include/mapnik/geometry/remove_empty.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_GEOMETRY_REMOVE_EMPTY_HPP
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_is_empty.hpp>
+#include <mapnik/geometry/is_empty.hpp>
 
 namespace mapnik { namespace geometry {
 
diff --git a/include/mapnik/geometry_reprojection.hpp b/include/mapnik/geometry/reprojection.hpp
similarity index 100%
rename from include/mapnik/geometry_reprojection.hpp
rename to include/mapnik/geometry/reprojection.hpp
diff --git a/include/mapnik/geometry_reprojection_impl.hpp b/include/mapnik/geometry/reprojection_impl.hpp
similarity index 99%
rename from include/mapnik/geometry_reprojection_impl.hpp
rename to include/mapnik/geometry/reprojection_impl.hpp
index ff01bd451..1cc46fa1e 100644
--- a/include/mapnik/geometry_reprojection_impl.hpp
+++ b/include/mapnik/geometry/reprojection_impl.hpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/geometry_reprojection.hpp>
+#include <mapnik/geometry/reprojection.hpp>
 #include <mapnik/geometry.hpp>
 
 namespace mapnik {
diff --git a/include/mapnik/geometry_strategy.hpp b/include/mapnik/geometry/strategy.hpp
similarity index 97%
rename from include/mapnik/geometry_strategy.hpp
rename to include/mapnik/geometry/strategy.hpp
index cc4121e60..5e55512d5 100644
--- a/include/mapnik/geometry_strategy.hpp
+++ b/include/mapnik/geometry/strategy.hpp
@@ -23,20 +23,20 @@
 #ifndef MAPNIK_GEOMETRY_STRATEGY_HPP
 #define MAPNIK_GEOMETRY_STRATEGY_HPP
 
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
 #include <mapnik/util/rounding_cast.hpp>
 
-namespace mapnik { 
+namespace mapnik {
 namespace geometry {
 
 namespace helper
 {
     template <std::size_t... Ts>
     struct index {};
- 
+
     template <std::size_t N, std::size_t... Ts>
     struct gen_seq : gen_seq<N - 1, N - 1, Ts...> {};
- 
+
     template <std::size_t... Ts>
     struct gen_seq<0, Ts...> : index<Ts...> {};
 }
@@ -70,7 +70,7 @@ struct strategy_group
 
     template <typename P1, typename P2, typename T, typename ...Args>
     inline P2 execute(P1 const& p, bool & status, T const& strat, Args const& ... args) const
-    { 
+    {
         return execute<P1,P2>(strat.template execute<P1,P1>(p, status), status, args...);
     }
 
@@ -79,7 +79,7 @@ struct strategy_group
     {
         return strat.template execute<P1,P2>(p, status);
     }
-    
+
 private:
     std::tuple<Strategies const& ...> ops_;
 
@@ -87,7 +87,7 @@ private:
 
 
 // The difference between this strategy group and the previous is that the conversion from P1 to P2 happens
-// in the first strategy rather then the last strategy. 
+// in the first strategy rather then the last strategy.
 template <typename... Strategies>
 struct strategy_group_first
 {
@@ -116,13 +116,13 @@ struct strategy_group_first
 
     template <typename P1, typename P2, typename T, typename ...Args>
     inline P2 execute_first(P1 const& p, bool & status, T const& strat, Args const& ... args) const
-    { 
+    {
         return execute<P2>(strat.template execute<P1,P2>(p, status), status, args...);
     }
 
     template <typename P2, typename T, typename ...Args>
     inline P2 execute(P2 const& p, bool & status, T const& strat, Args const& ... args) const
-    { 
+    {
         return execute<P2>(strat.template execute<P2,P2>(p, status), status, args...);
     }
 
@@ -131,13 +131,13 @@ struct strategy_group_first
     {
         return strat.template execute<P2,P2>(p, status);
     }
-    
+
     template <typename P2>
     inline P2 execute(P2 const& p, bool & status) const
     {
         return p;
     }
-    
+
 private:
     std::tuple<Strategies const& ...> ops_;
 
@@ -151,7 +151,7 @@ struct scale_strategy
     template <typename P1, typename P2>
     inline bool apply(P1 const & p1, P2 & p2) const
     {
-        
+
         using p2_type = typename boost::geometry::coordinate_type<P2>::type;
         double x = (boost::geometry::get<0>(p1) * scale_) + offset_;
         double y = (boost::geometry::get<1>(p1) * scale_) + offset_;
@@ -159,7 +159,7 @@ struct scale_strategy
         boost::geometry::set<1>(p2, static_cast<p2_type>(y));
         return true;
     }
-    
+
     template <typename P1, typename P2>
     inline P2 execute(P1 const& p1, bool & status) const
     {
@@ -181,7 +181,7 @@ struct scale_rounding_strategy
     template <typename P1, typename P2>
     inline bool apply(P1 const & p1, P2 & p2) const
     {
-        
+
         using p2_type = typename boost::geometry::coordinate_type<P2>::type;
         double x = (boost::geometry::get<0>(p1) * scale_) + offset_;
         double y = (boost::geometry::get<1>(p1) * scale_) + offset_;
@@ -189,7 +189,7 @@ struct scale_rounding_strategy
         boost::geometry::set<1>(p2, static_cast<p2_type>(std::round(y)));
         return true;
     }
-    
+
     template <typename P1, typename P2>
     inline P2 execute(P1 const& p1, bool & status) const
     {
diff --git a/include/mapnik/geometry_transform.hpp b/include/mapnik/geometry/transform.hpp
similarity index 99%
rename from include/mapnik/geometry_transform.hpp
rename to include/mapnik/geometry/transform.hpp
index a7bb2f13d..cee47d9cf 100644
--- a/include/mapnik/geometry_transform.hpp
+++ b/include/mapnik/geometry/transform.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_GEOMETRY_TRANSFORM_HPP
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
 #include <boost/geometry/algorithms/transform.hpp>
 
 namespace mapnik { namespace geometry { namespace detail {
diff --git a/include/mapnik/json/extract_bounding_box_grammar_impl.hpp b/include/mapnik/json/extract_bounding_box_grammar_impl.hpp
index bdc1b98b2..fb9868322 100644
--- a/include/mapnik/json/extract_bounding_box_grammar_impl.hpp
+++ b/include/mapnik/json/extract_bounding_box_grammar_impl.hpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/json/extract_bounding_box_grammar.hpp>
-#include <mapnik/geometry_fusion_adapted.hpp>
+#include <mapnik/geometry/fusion_adapted.hpp>
 // boost
 #include <boost/spirit/include/qi_omit.hpp>
 #include <boost/spirit/include/phoenix_object.hpp>
diff --git a/include/mapnik/json/geometry_generator_grammar.hpp b/include/mapnik/json/geometry_generator_grammar.hpp
index 0e314650b..018608849 100644
--- a/include/mapnik/json/geometry_generator_grammar.hpp
+++ b/include/mapnik/json/geometry_generator_grammar.hpp
@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/global.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 // boost
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/include/mapnik/json/geometry_generator_grammar_impl.hpp b/include/mapnik/json/geometry_generator_grammar_impl.hpp
index 87a60db70..c1e2b4fe8 100644
--- a/include/mapnik/json/geometry_generator_grammar_impl.hpp
+++ b/include/mapnik/json/geometry_generator_grammar_impl.hpp
@@ -23,8 +23,8 @@
 // mapnik
 #include <mapnik/json/geometry_generator_grammar.hpp>
 #include <mapnik/util/spirit_transform_attribute.hpp>
-#include <mapnik/geometry_types.hpp>
-#include <mapnik/geometry_fusion_adapted.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
+#include <mapnik/geometry/fusion_adapted.hpp>
 
 // boost
 #pragma GCC diagnostic push
diff --git a/include/mapnik/json/geometry_grammar_impl.hpp b/include/mapnik/json/geometry_grammar_impl.hpp
index 171894c78..219d3689f 100644
--- a/include/mapnik/json/geometry_grammar_impl.hpp
+++ b/include/mapnik/json/geometry_grammar_impl.hpp
@@ -24,7 +24,7 @@
 #include <mapnik/config.hpp>
 #include <mapnik/json/error_handler.hpp>
 #include <mapnik/json/geometry_grammar.hpp>
-#include <mapnik/geometry_fusion_adapted.hpp>
+#include <mapnik/geometry/fusion_adapted.hpp>
 // boost
 #include <boost/spirit/include/phoenix_stl.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
diff --git a/include/mapnik/json/geometry_util.hpp b/include/mapnik/json/geometry_util.hpp
index cf538ae73..d26720e48 100644
--- a/include/mapnik/json/geometry_util.hpp
+++ b/include/mapnik/json/geometry_util.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_JSON_GEOMETRY_UTIL_HPP
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/correct.hpp>
 #include <mapnik/json/positions.hpp>
 
 namespace mapnik { namespace json {
diff --git a/include/mapnik/json/positions_grammar_impl.hpp b/include/mapnik/json/positions_grammar_impl.hpp
index 65f2a93c0..32379ea2c 100644
--- a/include/mapnik/json/positions_grammar_impl.hpp
+++ b/include/mapnik/json/positions_grammar_impl.hpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/json/positions_grammar.hpp>
-#include <mapnik/geometry_fusion_adapted.hpp>
+#include <mapnik/geometry/fusion_adapted.hpp>
 // boost
 #include <boost/spirit/include/qi_omit.hpp>
 #include <boost/spirit/include/phoenix_object.hpp>
diff --git a/include/mapnik/json/topojson_utils.hpp b/include/mapnik/json/topojson_utils.hpp
index 40a2c91ff..557e09067 100644
--- a/include/mapnik/json/topojson_utils.hpp
+++ b/include/mapnik/json/topojson_utils.hpp
@@ -29,8 +29,8 @@
 #include <mapnik/json/topology.hpp>
 #include <mapnik/json/attribute_value_visitor.hpp>
 #include <mapnik/feature_factory.hpp>
-#include <mapnik/geometry_adapters.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
+#include <mapnik/geometry/correct.hpp>
 
 namespace mapnik { namespace topojson {
 
diff --git a/include/mapnik/marker_helpers.hpp b/include/mapnik/marker_helpers.hpp
index 8ba3c6f4b..03d859c3e 100644
--- a/include/mapnik/marker_helpers.hpp
+++ b/include/mapnik/marker_helpers.hpp
@@ -25,8 +25,8 @@
 
 #include <mapnik/feature.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_type.hpp>
-#include <mapnik/geometry_centroid.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
+#include <mapnik/geometry/centroid.hpp>
 #include <mapnik/symbolizer.hpp>
 #include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/marker.hpp> // for svg_storage_type
diff --git a/include/mapnik/markers_placements/interior.hpp b/include/mapnik/markers_placements/interior.hpp
index 6a2705e15..be3dd0f12 100644
--- a/include/mapnik/markers_placements/interior.hpp
+++ b/include/mapnik/markers_placements/interior.hpp
@@ -25,7 +25,7 @@
 
 #include <mapnik/markers_placements/point.hpp>
 #include <mapnik/geom_util.hpp>
-#include <mapnik/geometry_types.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
 
 namespace mapnik {
 
diff --git a/include/mapnik/markers_placements/line.hpp b/include/mapnik/markers_placements/line.hpp
index bc99cc937..ea858aa0d 100644
--- a/include/mapnik/markers_placements/line.hpp
+++ b/include/mapnik/markers_placements/line.hpp
@@ -27,7 +27,7 @@
 #include <mapnik/view_transform.hpp>
 #include <mapnik/vertex_cache.hpp>
 #include <mapnik/tolerance_iterator.hpp>
-#include <mapnik/geometry_types.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
 
 namespace mapnik {
 
diff --git a/include/mapnik/markers_placements/point.hpp b/include/mapnik/markers_placements/point.hpp
index 6e2f1dafb..344797905 100644
--- a/include/mapnik/markers_placements/point.hpp
+++ b/include/mapnik/markers_placements/point.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_MARKERS_PLACEMENTS_POINT_HPP
 
 #include <mapnik/geom_util.hpp>
-#include <mapnik/geometry_types.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
 #include <mapnik/markers_placements/basic.hpp>
 
 namespace mapnik {
diff --git a/include/mapnik/memory_featureset.hpp b/include/mapnik/memory_featureset.hpp
index cc5005b42..f4863268f 100644
--- a/include/mapnik/memory_featureset.hpp
+++ b/include/mapnik/memory_featureset.hpp
@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/box2d.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/envelope.hpp>
 #include <mapnik/featureset.hpp>
 #include <mapnik/datasource.hpp>
 #include <mapnik/memory_datasource.hpp>
diff --git a/include/mapnik/renderer_common/process_point_symbolizer.hpp b/include/mapnik/renderer_common/process_point_symbolizer.hpp
index ef0863fd6..508f7a2ce 100644
--- a/include/mapnik/renderer_common/process_point_symbolizer.hpp
+++ b/include/mapnik/renderer_common/process_point_symbolizer.hpp
@@ -29,9 +29,9 @@
 #include <mapnik/marker.hpp>
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/label_collision_detector.hpp>
-#include <mapnik/geometry_centroid.hpp>
-#include <mapnik/geometry_type.hpp>
-#include <mapnik/geometry_types.hpp>
+#include <mapnik/geometry/centroid.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
 #include <mapnik/vertex_adapters.hpp>
 #include <mapnik/geom_util.hpp>
 
diff --git a/include/mapnik/svg/geometry_svg_generator_impl.hpp b/include/mapnik/svg/geometry_svg_generator_impl.hpp
index 57df89f96..cb94a7a28 100644
--- a/include/mapnik/svg/geometry_svg_generator_impl.hpp
+++ b/include/mapnik/svg/geometry_svg_generator_impl.hpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/geometry_types.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
 #include <mapnik/svg/geometry_svg_generator.hpp>
 
 namespace mapnik { namespace svg {
diff --git a/include/mapnik/util/geometry_to_wkb.hpp b/include/mapnik/util/geometry_to_wkb.hpp
index bb9d05b34..a01509d16 100644
--- a/include/mapnik/util/geometry_to_wkb.hpp
+++ b/include/mapnik/util/geometry_to_wkb.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/make_unique.hpp>
 #include <mapnik/wkb.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 
 // stl
 #include <sstream>
diff --git a/include/mapnik/vertex_adapters.hpp b/include/mapnik/vertex_adapters.hpp
index 0c77d7550..5a4307ee0 100644
--- a/include/mapnik/vertex_adapters.hpp
+++ b/include/mapnik/vertex_adapters.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_VERTEX_ADAPTERS_HPP
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_types.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
 #include <mapnik/vertex.hpp>
 
 namespace mapnik { namespace geometry {
diff --git a/include/mapnik/wkt/wkt_generator_grammar.hpp b/include/mapnik/wkt/wkt_generator_grammar.hpp
index f31fcc08e..c88f9cfd5 100644
--- a/include/mapnik/wkt/wkt_generator_grammar.hpp
+++ b/include/mapnik/wkt/wkt_generator_grammar.hpp
@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/global.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/include/mapnik/wkt/wkt_generator_grammar_impl.hpp b/include/mapnik/wkt/wkt_generator_grammar_impl.hpp
index 8d950edd0..6cb015562 100644
--- a/include/mapnik/wkt/wkt_generator_grammar_impl.hpp
+++ b/include/mapnik/wkt/wkt_generator_grammar_impl.hpp
@@ -23,7 +23,7 @@
 // mapnik
 #include <mapnik/wkt/wkt_generator_grammar.hpp>
 #include <mapnik/util/spirit_transform_attribute.hpp>
-#include <mapnik/geometry_fusion_adapted.hpp>
+#include <mapnik/geometry/fusion_adapted.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/include/mapnik/wkt/wkt_grammar_impl.hpp b/include/mapnik/wkt/wkt_grammar_impl.hpp
index d2444130a..a9ac43b1e 100644
--- a/include/mapnik/wkt/wkt_grammar_impl.hpp
+++ b/include/mapnik/wkt/wkt_grammar_impl.hpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #include <mapnik/wkt/wkt_grammar.hpp>
-#include <mapnik/geometry_fusion_adapted.hpp>
+#include <mapnik/geometry/fusion_adapted.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/plugins/input/csv/csv_datasource.cpp b/plugins/input/csv/csv_datasource.cpp
index 322940528..17b9f3adb 100644
--- a/plugins/input/csv/csv_datasource.cpp
+++ b/plugins/input/csv/csv_datasource.cpp
@@ -38,7 +38,7 @@
 #include <mapnik/boolean.hpp>
 #include <mapnik/util/trim.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
 #include <mapnik/util/geometry_to_ds_type.hpp>
 #include <mapnik/value_types.hpp>
 #include <mapnik/util/fs.hpp>
diff --git a/plugins/input/csv/csv_utils.cpp b/plugins/input/csv/csv_utils.cpp
index 217276f6a..62e9e760b 100644
--- a/plugins/input/csv/csv_utils.cpp
+++ b/plugins/input/csv/csv_utils.cpp
@@ -23,7 +23,7 @@
 // mapnik
 #include <mapnik/debug.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/correct.hpp>
 #include <mapnik/wkt/wkt_factory.hpp>
 #include <mapnik/json/geometry_parser.hpp>
 #include <mapnik/util/conversions.hpp>
diff --git a/plugins/input/geojson/geojson_datasource.cpp b/plugins/input/geojson/geojson_datasource.cpp
index 60fd7b715..054b1e07b 100644
--- a/plugins/input/geojson/geojson_datasource.cpp
+++ b/plugins/input/geojson/geojson_datasource.cpp
@@ -49,7 +49,7 @@
 #include <mapnik/util/file_io.hpp>
 #include <mapnik/util/geometry_to_ds_type.hpp>
 #include <mapnik/make_unique.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
 #include <mapnik/json/feature_collection_grammar.hpp>
 #include <mapnik/json/extract_bounding_box_grammar_impl.hpp>
 #include <mapnik/util/fs.hpp>
diff --git a/plugins/input/geojson/geojson_index_featureset.cpp b/plugins/input/geojson/geojson_index_featureset.cpp
index 4cd139899..2764c62af 100644
--- a/plugins/input/geojson/geojson_index_featureset.cpp
+++ b/plugins/input/geojson/geojson_index_featureset.cpp
@@ -27,7 +27,7 @@
 #include <mapnik/json/feature_grammar.hpp>
 #include <mapnik/util/utf_conv_win.hpp>
 #include <mapnik/util/spatial_index.hpp>
-#include <mapnik/geometry_is_empty.hpp>
+#include <mapnik/geometry/is_empty.hpp>
 // stl
 #include <string>
 #include <vector>
diff --git a/plugins/input/geojson/geojson_memory_index_featureset.cpp b/plugins/input/geojson/geojson_memory_index_featureset.cpp
index 32b851373..78789a07a 100644
--- a/plugins/input/geojson/geojson_memory_index_featureset.cpp
+++ b/plugins/input/geojson/geojson_memory_index_featureset.cpp
@@ -25,7 +25,7 @@
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/json/feature_grammar.hpp>
 #include <mapnik/util/utf_conv_win.hpp>
-#include <mapnik/geometry_is_empty.hpp>
+#include <mapnik/geometry/is_empty.hpp>
 // stl
 #include <string>
 #include <vector>
diff --git a/plugins/input/ogr/ogr_featureset.cpp b/plugins/input/ogr/ogr_featureset.cpp
index 267ebc017..c82a8431f 100644
--- a/plugins/input/ogr/ogr_featureset.cpp
+++ b/plugins/input/ogr/ogr_featureset.cpp
@@ -31,7 +31,7 @@
 #include <mapnik/unicode.hpp>
 #include <mapnik/value_types.hpp>
 #include <mapnik/feature_factory.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/correct.hpp>
 
 // ogr
 #include "ogr_featureset.hpp"
diff --git a/plugins/input/ogr/ogr_index_featureset.cpp b/plugins/input/ogr/ogr_index_featureset.cpp
index 54b91f470..768e16e91 100644
--- a/plugins/input/ogr/ogr_index_featureset.cpp
+++ b/plugins/input/ogr/ogr_index_featureset.cpp
@@ -30,7 +30,7 @@
 #include <mapnik/wkb.hpp>
 #include <mapnik/unicode.hpp>
 #include <mapnik/feature_factory.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/correct.hpp>
 
 // boost
 #if defined(MAPNIK_MEMORY_MAPPED_FILE)
diff --git a/plugins/input/shape/shape_io.cpp b/plugins/input/shape/shape_io.cpp
index 5dd591996..9ccfb91dd 100644
--- a/plugins/input/shape/shape_io.cpp
+++ b/plugins/input/shape/shape_io.cpp
@@ -27,7 +27,7 @@
 #include <mapnik/make_unique.hpp>
 #include <mapnik/datasource.hpp>
 #include <mapnik/util/is_clockwise.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/correct.hpp>
 
 using mapnik::datasource_exception;
 const std::string shape_io::SHP = ".shp";
diff --git a/plugins/input/sqlite/sqlite_datasource.cpp b/plugins/input/sqlite/sqlite_datasource.cpp
index 28add6453..74b936668 100644
--- a/plugins/input/sqlite/sqlite_datasource.cpp
+++ b/plugins/input/sqlite/sqlite_datasource.cpp
@@ -34,7 +34,7 @@
 #include <mapnik/wkb.hpp>
 #include <mapnik/util/trim.hpp>
 #include <mapnik/util/fs.hpp>
-#include <mapnik/geometry_is_empty.hpp>
+#include <mapnik/geometry/is_empty.hpp>
 
 // boost
 #include <boost/algorithm/string.hpp>
diff --git a/plugins/input/sqlite/sqlite_featureset.cpp b/plugins/input/sqlite/sqlite_featureset.cpp
index 99a44db54..fc5af1d09 100644
--- a/plugins/input/sqlite/sqlite_featureset.cpp
+++ b/plugins/input/sqlite/sqlite_featureset.cpp
@@ -30,8 +30,8 @@
 #include <mapnik/unicode.hpp>
 #include <mapnik/value_types.hpp>
 #include <mapnik/feature_factory.hpp>
-#include <mapnik/geometry_is_empty.hpp>
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/is_empty.hpp>
+#include <mapnik/geometry/envelope.hpp>
 
 // ogr
 #include "sqlite_featureset.hpp"
diff --git a/plugins/input/sqlite/sqlite_utils.hpp b/plugins/input/sqlite/sqlite_utils.hpp
index 959e3f7c6..58091a42d 100644
--- a/plugins/input/sqlite/sqlite_utils.hpp
+++ b/plugins/input/sqlite/sqlite_utils.hpp
@@ -35,8 +35,8 @@
 #include <mapnik/params.hpp>
 #include <mapnik/sql_utils.hpp>
 #include <mapnik/util/fs.hpp>
-#include <mapnik/geometry_is_empty.hpp>
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/is_empty.hpp>
+#include <mapnik/geometry/envelope.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/plugins/input/topojson/topojson_datasource.cpp b/plugins/input/topojson/topojson_datasource.cpp
index 67bae443b..6c557d1f6 100644
--- a/plugins/input/topojson/topojson_datasource.cpp
+++ b/plugins/input/topojson/topojson_datasource.cpp
@@ -33,7 +33,7 @@
 #include <mapnik/unicode.hpp>
 #include <mapnik/value_types.hpp>
 #include <mapnik/box2d.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
 #include <mapnik/json/topojson_grammar.hpp>
 #include <mapnik/json/topojson_utils.hpp>
 #include <mapnik/util/variant.hpp>
diff --git a/src/agg/process_line_symbolizer.cpp b/src/agg/process_line_symbolizer.cpp
index 9bace2539..e8435a0a0 100644
--- a/src/agg/process_line_symbolizer.cpp
+++ b/src/agg/process_line_symbolizer.cpp
@@ -31,7 +31,7 @@
 #include <mapnik/vertex_processor.hpp>
 #include <mapnik/renderer_common/clipping_extent.hpp>
 #include <mapnik/renderer_common/apply_vertex_converter.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore_agg.hpp>
diff --git a/src/build.py b/src/build.py
index 6dd0f24a9..f4d444ee0 100644
--- a/src/build.py
+++ b/src/build.py
@@ -168,7 +168,8 @@ source = Split(
     datasource_cache.cpp
     datasource_cache_static.cpp
     debug.cpp
-    geometry_reprojection.cpp
+    geometry/reprojection.cpp
+    geometry/envelope.cpp
     expression_node.cpp
     expression_string.cpp
     expression.cpp
@@ -200,7 +201,6 @@ source = Split(
     palette.cpp
     marker_helpers.cpp
     transform_expression_grammar.cpp
-    geometry_envelope.cpp
     plugin.cpp
     rule.cpp
     save_map.cpp
diff --git a/src/cairo/process_line_symbolizer.cpp b/src/cairo/process_line_symbolizer.cpp
index ed64d5c01..d567ced88 100644
--- a/src/cairo/process_line_symbolizer.cpp
+++ b/src/cairo/process_line_symbolizer.cpp
@@ -29,7 +29,7 @@
 #include <mapnik/vertex_converters.hpp>
 #include <mapnik/vertex_processor.hpp>
 #include <mapnik/renderer_common/apply_vertex_converter.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 
 namespace mapnik
 {
diff --git a/src/geometry_envelope.cpp b/src/geometry/envelope.cpp
similarity index 95%
rename from src/geometry_envelope.cpp
rename to src/geometry/envelope.cpp
index bb79f59ad..d9c4d7a93 100644
--- a/src/geometry_envelope.cpp
+++ b/src/geometry/envelope.cpp
@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#include <mapnik/geometry_envelope.hpp>
-#include <mapnik/geometry_envelope_impl.hpp>
+#include <mapnik/geometry/envelope.hpp>
+#include <mapnik/geometry/envelope_impl.hpp>
 #include <mapnik/text/symbolizer_helpers.hpp>
 
 namespace mapnik { namespace geometry {
diff --git a/src/geometry_reprojection.cpp b/src/geometry/reprojection.cpp
similarity index 98%
rename from src/geometry_reprojection.cpp
rename to src/geometry/reprojection.cpp
index 7cd3ff08d..59cbd1ef5 100644
--- a/src/geometry_reprojection.cpp
+++ b/src/geometry/reprojection.cpp
@@ -21,8 +21,8 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/geometry_reprojection.hpp>
-#include <mapnik/geometry_reprojection_impl.hpp>
+#include <mapnik/geometry/reprojection.hpp>
+#include <mapnik/geometry/reprojection_impl.hpp>
 
 namespace mapnik {
 
diff --git a/src/grid/process_line_symbolizer.cpp b/src/grid/process_line_symbolizer.cpp
index b65dd8502..7bb126298 100644
--- a/src/grid/process_line_symbolizer.cpp
+++ b/src/grid/process_line_symbolizer.cpp
@@ -31,7 +31,7 @@
 #include <mapnik/vertex_converters.hpp>
 #include <mapnik/vertex_processor.hpp>
 #include <mapnik/renderer_common/apply_vertex_converter.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore_agg.hpp>
diff --git a/src/memory_datasource.cpp b/src/memory_datasource.cpp
index 1127f4b83..24238f382 100644
--- a/src/memory_datasource.cpp
+++ b/src/memory_datasource.cpp
@@ -27,7 +27,7 @@
 #include <mapnik/memory_datasource.hpp>
 #include <mapnik/memory_featureset.hpp>
 #include <mapnik/boolean.hpp>
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/envelope.hpp>
 
 // stl
 #include <algorithm>
@@ -95,7 +95,7 @@ void memory_datasource::push(feature_ptr feature)
             throw std::runtime_error("Can not add a raster feature to a memory datasource that contains vectors");
         }
     }
-    else 
+    else
     {
         if (!type_set_)
         {
diff --git a/src/renderer_common/render_markers_symbolizer.cpp b/src/renderer_common/render_markers_symbolizer.cpp
index 6706cb1cd..965ff45b4 100644
--- a/src/renderer_common/render_markers_symbolizer.cpp
+++ b/src/renderer_common/render_markers_symbolizer.cpp
@@ -25,7 +25,7 @@
 #include <mapnik/svg/svg_path_adapter.hpp>
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/marker_helpers.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 #include <mapnik/renderer_common/render_markers_symbolizer.hpp>
 #include <mapnik/symbolizer.hpp>
 
diff --git a/src/svg/output/process_symbolizers.cpp b/src/svg/output/process_symbolizers.cpp
index 6ff486f7f..cfd82f694 100644
--- a/src/svg/output/process_symbolizers.cpp
+++ b/src/svg/output/process_symbolizers.cpp
@@ -32,7 +32,7 @@
 #include <mapnik/svg/output/svg_output_attributes.hpp>
 #include <mapnik/symbolizer_dispatch.hpp>
 #include <mapnik/vertex_processor.hpp>
-#include <mapnik/geometry_transform.hpp>
+#include <mapnik/geometry/transform.hpp>
 #include <mapnik/geometry_to_path.hpp>
 #include <mapnik/util/geometry_to_ds_type.hpp>
 #include <mapnik/safe_cast.hpp>
diff --git a/src/text/symbolizer_helpers.cpp b/src/text/symbolizer_helpers.cpp
index fe5568ad2..85c5876b6 100644
--- a/src/text/symbolizer_helpers.cpp
+++ b/src/text/symbolizer_helpers.cpp
@@ -29,8 +29,8 @@
 #include <mapnik/marker.hpp>
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_type.hpp>
-#include <mapnik/geometry_centroid.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
+#include <mapnik/geometry/centroid.hpp>
 #include <mapnik/vertex_processor.hpp>
 #include <mapnik/geom_util.hpp>
 #include <mapnik/parse_path.hpp>
diff --git a/src/twkb.cpp b/src/twkb.cpp
index f1928e5a6..bcb9dc07a 100644
--- a/src/twkb.cpp
+++ b/src/twkb.cpp
@@ -26,7 +26,7 @@
 #include <mapnik/feature.hpp>
 #include <mapnik/geom_util.hpp>
 #include <mapnik/util/noncopyable.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/correct.hpp>
 #include <cmath>
 
 namespace mapnik { namespace detail {
diff --git a/src/vertex_adapters.cpp b/src/vertex_adapters.cpp
index e96a9e25e..446a61550 100644
--- a/src/vertex_adapters.cpp
+++ b/src/vertex_adapters.cpp
@@ -22,7 +22,7 @@
 
 #include <mapnik/vertex_adapters.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_types.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
 #include <mapnik/vertex.hpp>
 
 namespace mapnik { namespace geometry {
diff --git a/src/wkb.cpp b/src/wkb.cpp
index 94c1fccde..f2e1fce6e 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -27,7 +27,7 @@
 #include <mapnik/wkb.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/util/noncopyable.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/correct.hpp>
 
 namespace mapnik
 {
diff --git a/test/unit/datasource/csv.cpp b/test/unit/datasource/csv.cpp
index 6142185ca..18c337702 100644
--- a/test/unit/datasource/csv.cpp
+++ b/test/unit/datasource/csv.cpp
@@ -28,8 +28,8 @@
 #include <mapnik/datasource.hpp>
 #include <mapnik/datasource_cache.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_types.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 #include <mapnik/expression.hpp>
 #include <mapnik/expression_evaluator.hpp>
 #include <mapnik/debug.hpp>
diff --git a/test/unit/datasource/ds_test_util.hpp b/test/unit/datasource/ds_test_util.hpp
index 46868d4e5..2a0d2ac90 100644
--- a/test/unit/datasource/ds_test_util.hpp
+++ b/test/unit/datasource/ds_test_util.hpp
@@ -29,8 +29,8 @@
 #include <mapnik/datasource.hpp>
 #include <mapnik/datasource_cache.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_types.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 
 namespace {
 
diff --git a/test/unit/datasource/geojson.cpp b/test/unit/datasource/geojson.cpp
index b03668436..d65977d93 100644
--- a/test/unit/datasource/geojson.cpp
+++ b/test/unit/datasource/geojson.cpp
@@ -27,7 +27,7 @@
 #include <mapnik/datasource.hpp>
 #include <mapnik/datasource_cache.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 #include <mapnik/util/fs.hpp>
 #include <cstdlib>
 
diff --git a/test/unit/datasource/postgis.cpp b/test/unit/datasource/postgis.cpp
index 95ee65851..219dcda8e 100644
--- a/test/unit/datasource/postgis.cpp
+++ b/test/unit/datasource/postgis.cpp
@@ -25,7 +25,7 @@
 
 #include <mapnik/datasource.hpp>
 #include <mapnik/datasource_cache.hpp>
-#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry/geometry_type.hpp>
 #include <mapnik/util/fs.hpp>
 
 /*
diff --git a/test/unit/geometry/centroid.cpp b/test/unit/geometry/centroid.cpp
index cdfbd6e4b..bd13ba9b8 100644
--- a/test/unit/geometry/centroid.cpp
+++ b/test/unit/geometry/centroid.cpp
@@ -1,7 +1,6 @@
-
 #include "catch.hpp"
 
-#include <mapnik/geometry_centroid.hpp>
+#include <mapnik/geometry/centroid.hpp>
 
 TEST_CASE("geometry centroid") {
 
diff --git a/test/unit/geometry/geometry_envelope_test.cpp b/test/unit/geometry/geometry_envelope_test.cpp
index 75049820a..6c3d68048 100644
--- a/test/unit/geometry/geometry_envelope_test.cpp
+++ b/test/unit/geometry/geometry_envelope_test.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/envelope.hpp>
 
 namespace {
 
diff --git a/test/unit/geometry/geometry_hit_test.cpp b/test/unit/geometry/geometry_hit_test.cpp
index 3b21407f6..7208785d1 100644
--- a/test/unit/geometry/geometry_hit_test.cpp
+++ b/test/unit/geometry/geometry_hit_test.cpp
@@ -1,9 +1,8 @@
-
 #include "catch.hpp"
 
 #include <mapnik/geometry.hpp>
 #include <mapnik/hit_test_filter.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/correct.hpp>
 
 TEST_CASE("geometry ops") {
 
diff --git a/test/unit/geometry/geometry_is_simple.cpp b/test/unit/geometry/geometry_is_simple.cpp
index 55480585c..061bcd799 100644
--- a/test/unit/geometry/geometry_is_simple.cpp
+++ b/test/unit/geometry/geometry_is_simple.cpp
@@ -1,9 +1,8 @@
-
 #include "catch.hpp"
 
 #include <boost/version.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_is_simple.hpp>
+#include <mapnik/geometry/is_simple.hpp>
 
 TEST_CASE("geometry is_simple") {
 
@@ -53,7 +52,7 @@ SECTION("point Infinity") {
 
 SECTION("multi point") {
     mapnik::geometry::multi_point<double> mpt;
-    mpt.add_coord(0,0);    
+    mpt.add_coord(0,0);
     mpt.add_coord(1,1);
     CHECK( mapnik::geometry::is_simple(mpt) );
 }
@@ -65,7 +64,7 @@ SECTION("multi point empty") {
 
 SECTION("line_string") {
     mapnik::geometry::line_string<double> line;
-    line.add_coord(0,0);    
+    line.add_coord(0,0);
     line.add_coord(1,1);
     CHECK( mapnik::geometry::is_simple(line) );
 }
@@ -73,7 +72,7 @@ SECTION("line_string") {
 // This fails while is_valid will not fail!
 SECTION("line_string repeated points") {
     mapnik::geometry::line_string<double> line;
-    line.add_coord(0,0);    
+    line.add_coord(0,0);
     line.add_coord(1,1);
     line.add_coord(1,1);
     line.add_coord(2,2);
@@ -87,10 +86,10 @@ SECTION("line_string empty") {
 
 SECTION("multi_line_string") {
     mapnik::geometry::line_string<double> line1;
-    line1.add_coord(0,0);    
+    line1.add_coord(0,0);
     line1.add_coord(1,1);
     mapnik::geometry::line_string<double> line2;
-    line2.add_coord(0,1);    
+    line2.add_coord(0,1);
     line2.add_coord(1,2);
     mapnik::geometry::multi_line_string<double> lines;
     lines.emplace_back(line1);
@@ -113,7 +112,7 @@ SECTION("multi_line_string empty") {
 SECTION("polygon") {
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(1,0);
     ring.add_coord(1,1);
     ring.add_coord(0,1);
@@ -125,7 +124,7 @@ SECTION("polygon") {
 SECTION("polygon invalid winding order") {
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(0,1);
     ring.add_coord(1,1);
     ring.add_coord(1,0);
@@ -139,7 +138,7 @@ SECTION("polygon invalid winding order") {
 SECTION("polygon 2 repeated points") {
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(1,0);
     ring.add_coord(1,1);
     ring.add_coord(1,1);
@@ -153,7 +152,7 @@ SECTION("polygon 2 repeated points") {
 SECTION("polygon 3 repeated points") {
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(1,0);
     ring.add_coord(1,1);
     ring.add_coord(1,1);
@@ -181,7 +180,7 @@ SECTION("polygon that has empty exterior ring") {
 SECTION("polygon that has empty interior ring") {
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(1,0);
     ring.add_coord(1,1);
     ring.add_coord(0,1);
@@ -209,7 +208,7 @@ SECTION("polygon that has empty exterior ring") {
 SECTION("polygon that has empty interior ring") {
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(1,0);
     ring.add_coord(1,1);
     ring.add_coord(0,1);
@@ -226,7 +225,7 @@ SECTION("polygon that has empty interior ring") {
 SECTION("polygon with spike") {
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(1,0);
     ring.add_coord(1,1);
     ring.add_coord(2,2);
@@ -240,14 +239,14 @@ SECTION("polygon with spike") {
 SECTION("polygon with hole") {
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(3,0);
     ring.add_coord(3,3);
     ring.add_coord(0,3);
     ring.add_coord(0,0);
     poly.set_exterior_ring(std::move(ring));
     mapnik::geometry::linear_ring<double> hole;
-    hole.add_coord(1,1);    
+    hole.add_coord(1,1);
     hole.add_coord(1,2);
     hole.add_coord(2,2);
     hole.add_coord(2,1);
@@ -260,14 +259,14 @@ SECTION("polygon with hole") {
 SECTION("polygon with hole with invalid winding order") {
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(3,0);
     ring.add_coord(3,3);
     ring.add_coord(0,3);
     ring.add_coord(0,0);
     poly.set_exterior_ring(std::move(ring));
     mapnik::geometry::linear_ring<double> hole;
-    hole.add_coord(1,1);    
+    hole.add_coord(1,1);
     hole.add_coord(2,1);
     hole.add_coord(2,2);
     hole.add_coord(1,2);
@@ -280,7 +279,7 @@ SECTION("multi polygon") {
     mapnik::geometry::multi_polygon<double> mp;
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(1,0);
     ring.add_coord(1,1);
     ring.add_coord(0,1);
@@ -288,7 +287,7 @@ SECTION("multi polygon") {
     poly.set_exterior_ring(std::move(ring));
     mapnik::geometry::polygon<double> poly2;
     mapnik::geometry::linear_ring<double> ring2;
-    ring2.add_coord(0,0);    
+    ring2.add_coord(0,0);
     ring2.add_coord(-1,0);
     ring2.add_coord(-1,-1);
     ring2.add_coord(0,-1);
@@ -303,7 +302,7 @@ SECTION("multi polygon with hole") {
     mapnik::geometry::multi_polygon<double> mp;
     mapnik::geometry::polygon<double> poly;
     mapnik::geometry::linear_ring<double> ring;
-    ring.add_coord(0,0);    
+    ring.add_coord(0,0);
     ring.add_coord(3,0);
     ring.add_coord(3,3);
     ring.add_coord(0,3);
@@ -318,14 +317,14 @@ SECTION("multi polygon with hole") {
     poly.add_hole(std::move(hole));
     mapnik::geometry::polygon<double> poly2;
     mapnik::geometry::linear_ring<double> ring2;
-    ring2.add_coord(0,0);    
+    ring2.add_coord(0,0);
     ring2.add_coord(-3,0);
     ring2.add_coord(-3,-3);
     ring2.add_coord(0,-3);
     ring2.add_coord(0,0);
     poly2.set_exterior_ring(std::move(ring2));
     mapnik::geometry::linear_ring<double> hole2;
-    hole2.add_coord(-1,-1);    
+    hole2.add_coord(-1,-1);
     hole2.add_coord(-1,-2);
     hole2.add_coord(-2,-2);
     hole2.add_coord(-2,-1);
diff --git a/test/unit/geometry/geometry_is_valid.cpp b/test/unit/geometry/geometry_is_valid.cpp
index de1ee4c04..aa5f1ecaf 100644
--- a/test/unit/geometry/geometry_is_valid.cpp
+++ b/test/unit/geometry/geometry_is_valid.cpp
@@ -1,8 +1,7 @@
-
 #include "catch.hpp"
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_is_valid.hpp>
+#include <mapnik/geometry/is_valid.hpp>
 
 TEST_CASE("geometry is_valid") {
 
diff --git a/test/unit/geometry/geometry_reprojection.cpp b/test/unit/geometry/geometry_reprojection.cpp
index c8ec36243..764a190f2 100644
--- a/test/unit/geometry/geometry_reprojection.cpp
+++ b/test/unit/geometry/geometry_reprojection.cpp
@@ -1,4 +1,3 @@
-
 #include "catch.hpp"
 #include "geometry_equal.hpp"
 
@@ -6,7 +5,7 @@
 #include <mapnik/geometry.hpp>
 #include <mapnik/projection.hpp>
 #include <mapnik/proj_transform.hpp>
-#include <mapnik/geometry_reprojection.hpp>
+#include <mapnik/geometry/reprojection.hpp>
 
 TEST_CASE("geometry reprojection") {
 
diff --git a/test/unit/geometry/geometry_strategy_test.cpp b/test/unit/geometry/geometry_strategy_test.cpp
index c08e828cb..c79a5e2d9 100644
--- a/test/unit/geometry/geometry_strategy_test.cpp
+++ b/test/unit/geometry/geometry_strategy_test.cpp
@@ -1,4 +1,3 @@
-
 #include "catch.hpp"
 #include "geometry_equal.hpp"
 
@@ -6,8 +5,8 @@
 #include <mapnik/projection.hpp>
 #include <mapnik/proj_transform.hpp>
 #include <mapnik/view_transform.hpp>
-#include <mapnik/geometry_transform.hpp>
-#include <mapnik/geometry_strategy.hpp>
+#include <mapnik/geometry/transform.hpp>
+#include <mapnik/geometry/strategy.hpp>
 #include <mapnik/proj_strategy.hpp>
 #include <mapnik/view_strategy.hpp>
 
diff --git a/test/unit/geometry/geometry_test_helper.cpp b/test/unit/geometry/geometry_test_helper.cpp
index 44bcce596..98c254b55 100644
--- a/test/unit/geometry/geometry_test_helper.cpp
+++ b/test/unit/geometry/geometry_test_helper.cpp
@@ -1,6 +1,6 @@
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_envelope.hpp>
-#include <mapnik/geometry_envelope_impl.hpp>
+#include <mapnik/geometry/envelope.hpp>
+#include <mapnik/geometry/envelope_impl.hpp>
 
 
 namespace mapnik { namespace geometry {
diff --git a/test/unit/geometry/has_empty.cpp b/test/unit/geometry/has_empty.cpp
index b7fcab14e..671ffdea2 100644
--- a/test/unit/geometry/has_empty.cpp
+++ b/test/unit/geometry/has_empty.cpp
@@ -1,7 +1,6 @@
-
 #include "catch.hpp"
 
-#include <mapnik/geometry_is_empty.hpp>
+#include <mapnik/geometry/is_empty.hpp>
 
 TEST_CASE("geometry has_empty") {
 
diff --git a/test/unit/geometry/is_empty.cpp b/test/unit/geometry/is_empty.cpp
index 949b2b285..28b290b39 100644
--- a/test/unit/geometry/is_empty.cpp
+++ b/test/unit/geometry/is_empty.cpp
@@ -1,7 +1,6 @@
-
 #include "catch.hpp"
 
-#include <mapnik/geometry_is_empty.hpp>
+#include <mapnik/geometry/is_empty.hpp>
 
 TEST_CASE("geometry is_empty") {
 
diff --git a/test/unit/geometry/remove_empty.cpp b/test/unit/geometry/remove_empty.cpp
index 93881c854..c160182a6 100644
--- a/test/unit/geometry/remove_empty.cpp
+++ b/test/unit/geometry/remove_empty.cpp
@@ -1,7 +1,6 @@
-
 #include "catch.hpp"
 
-#include <mapnik/geometry_remove_empty.hpp>
+#include <mapnik/geometry/remove_empty.hpp>
 
 TEST_CASE("geometry remove_empty") {
 
diff --git a/test/unit/serialization/wkb_formats_test.cpp b/test/unit/serialization/wkb_formats_test.cpp
index bc0c17198..d74c7ed63 100644
--- a/test/unit/serialization/wkb_formats_test.cpp
+++ b/test/unit/serialization/wkb_formats_test.cpp
@@ -2,9 +2,9 @@
 
 #include <iostream>
 #include <mapnik/wkb.hpp>
-#include <mapnik/geometry_is_valid.hpp>
-#include <mapnik/geometry_is_simple.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/is_valid.hpp>
+#include <mapnik/geometry/is_simple.hpp>
+#include <mapnik/geometry/correct.hpp>
 #include <boost/version.hpp>
 
 TEST_CASE("geometry formats") {
diff --git a/test/unit/serialization/wkb_test.cpp b/test/unit/serialization/wkb_test.cpp
index 8a617df26..7e25bf2a2 100644
--- a/test/unit/serialization/wkb_test.cpp
+++ b/test/unit/serialization/wkb_test.cpp
@@ -2,8 +2,8 @@
 // mapnik
 #include <mapnik/wkb.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
-#include <mapnik/geometry_is_empty.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
+#include <mapnik/geometry/is_empty.hpp>
 #include <mapnik/util/geometry_to_wkt.hpp>
 // bool
 #include <boost/version.hpp>
diff --git a/test/unit/vertex_adapter/vertex_adapter.cpp b/test/unit/vertex_adapter/vertex_adapter.cpp
index da3e815fa..487f6bbd9 100644
--- a/test/unit/vertex_adapter/vertex_adapter.cpp
+++ b/test/unit/vertex_adapter/vertex_adapter.cpp
@@ -1,8 +1,7 @@
-
 #include "catch.hpp"
 
 #include <mapnik/vertex_adapters.hpp>
-#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry/correct.hpp>
 
 TEST_CASE("vertex_adapters") {
 
diff --git a/utils/mapnik-index/process_csv_file.cpp b/utils/mapnik-index/process_csv_file.cpp
index a0342cff5..79802392c 100644
--- a/utils/mapnik-index/process_csv_file.cpp
+++ b/utils/mapnik-index/process_csv_file.cpp
@@ -24,7 +24,7 @@
 #include "../../plugins/input/csv/csv_getline.hpp"
 #include "../../plugins/input/csv/csv_utils.hpp"
 #include <mapnik/datasource.hpp>
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/envelope.hpp>
 #include <mapnik/util/utf_conv_win.hpp>
 
 #if defined(MAPNIK_MEMORY_MAPPED_FILE)
diff --git a/utils/pgsql2sqlite/pgsql2sqlite.hpp b/utils/pgsql2sqlite/pgsql2sqlite.hpp
index 9de886732..8e702a2fa 100644
--- a/utils/pgsql2sqlite/pgsql2sqlite.hpp
+++ b/utils/pgsql2sqlite/pgsql2sqlite.hpp
@@ -29,8 +29,8 @@
 #include <mapnik/global.hpp>
 #include <mapnik/sql_utils.hpp>
 #include <mapnik/util/conversions.hpp>
-#include <mapnik/geometry_is_empty.hpp>
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/is_empty.hpp>
+#include <mapnik/geometry/envelope.hpp>
 
 #include "connection_manager.hpp"
 #include "cursorresultset.hpp"
diff --git a/utils/shapeindex/shapeindex.cpp b/utils/shapeindex/shapeindex.cpp
index 9dcff1189..bc086fccf 100644
--- a/utils/shapeindex/shapeindex.cpp
+++ b/utils/shapeindex/shapeindex.cpp
@@ -20,13 +20,12 @@
  *
  *****************************************************************************/
 
-
 #include <iostream>
 #include <vector>
 #include <string>
 #include <mapnik/util/fs.hpp>
 #include <mapnik/quad_tree.hpp>
-#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry/envelope.hpp>
 #include "shapefile.hpp"
 #include "shape_io.hpp"
 #include "shape_index_featureset.hpp"

From b5c9966e4b6997884a3cd95f58e679a6c5dbf9c7 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 2 Aug 2016 15:34:59 +0100
Subject: [PATCH 006/328] refactor value related objects into `include/value`
 dir

---
 benchmark/bench_framework.hpp                    |  2 +-
 include/mapnik/attribute.hpp                     |  2 +-
 include/mapnik/expression_evaluator.hpp          |  2 +-
 include/mapnik/expression_grammar_impl.hpp       |  2 +-
 include/mapnik/expression_node.hpp               |  2 +-
 include/mapnik/expression_node_types.hpp         |  2 +-
 include/mapnik/feature.hpp                       |  2 +-
 include/mapnik/feature_factory.hpp               |  2 +-
 include/mapnik/group/group_symbolizer_helper.hpp |  2 +-
 include/mapnik/json/generic_json.hpp             |  2 +-
 .../mapnik/json/properties_generator_grammar.hpp |  2 +-
 include/mapnik/label_collision_detector.hpp      |  2 +-
 include/mapnik/params.hpp                        |  2 +-
 include/mapnik/params_impl.hpp                   |  2 +-
 include/mapnik/svg/output/svg_generator.hpp      |  2 +-
 include/mapnik/svg/svg_renderer_agg.hpp          |  2 +-
 include/mapnik/symbolizer_base.hpp               |  2 +-
 include/mapnik/symbolizer_default_values.hpp     |  2 +-
 include/mapnik/text/itemizer.hpp                 |  2 +-
 include/mapnik/text/text_layout.hpp              |  2 +-
 include/mapnik/transform_expression.hpp          |  2 +-
 include/mapnik/unicode.hpp                       |  2 +-
 include/mapnik/util/conversions.hpp              |  2 +-
 include/mapnik/value.hpp                         |  8 ++++----
 .../mapnik/{value_error.hpp => value/error.hpp}  | 16 ++++++++--------
 .../mapnik/{value_hash.hpp => value/hash.hpp}    |  8 +++++---
 .../mapnik/{value_types.hpp => value/types.hpp}  |  0
 include/mapnik/vertex_converters.hpp             |  2 +-
 include/mapnik/xml_attribute_cast.hpp            |  2 +-
 plugins/input/csv/csv_datasource.cpp             |  2 +-
 plugins/input/csv/csv_datasource.hpp             |  2 +-
 plugins/input/csv/csv_utils.hpp                  |  2 +-
 plugins/input/gdal/gdal_datasource.cpp           |  2 +-
 plugins/input/geojson/geojson_datasource.cpp     |  2 +-
 plugins/input/ogr/ogr_featureset.cpp             |  4 ++--
 plugins/input/ogr/ogr_index_featureset.cpp       |  2 +-
 plugins/input/pgraster/pgraster_datasource.cpp   |  2 +-
 plugins/input/pgraster/pgraster_datasource.hpp   |  2 +-
 plugins/input/pgraster/pgraster_featureset.cpp   |  2 +-
 plugins/input/postgis/postgis_datasource.cpp     |  2 +-
 plugins/input/postgis/postgis_datasource.hpp     |  2 +-
 plugins/input/postgis/postgis_featureset.cpp     |  2 +-
 plugins/input/shape/dbfile.cpp                   |  2 +-
 plugins/input/shape/shape_datasource.cpp         |  2 +-
 plugins/input/shape/shape_datasource.hpp         |  2 +-
 plugins/input/shape/shape_featureset.hpp         |  2 +-
 plugins/input/shape/shape_index_featureset.hpp   |  2 +-
 plugins/input/sqlite/sqlite_datasource.hpp       |  2 +-
 plugins/input/sqlite/sqlite_featureset.cpp       |  2 +-
 plugins/input/topojson/topojson_datasource.cpp   |  2 +-
 src/conversions.cpp                              |  2 +-
 src/expression_node.cpp                          |  2 +-
 src/expression_string.cpp                        |  2 +-
 src/group/group_symbolizer_helper.cpp            |  2 +-
 src/params.cpp                                   |  2 +-
 src/raster_colorizer.cpp                         |  2 +-
 src/text/symbolizer_helpers.cpp                  |  2 +-
 src/unicode.cpp                                  |  2 +-
 src/value.cpp                                    |  2 +-
 test/unit/core/comparison_test.cpp               |  3 +--
 test/unit/core/conversions_test.cpp              |  3 +--
 test/unit/core/params_test.cpp                   |  3 +--
 test/unit/core/value_test.cpp                    |  3 +--
 test/unit/font/fontset_runtime_test.cpp          |  5 ++---
 64 files changed, 79 insertions(+), 82 deletions(-)
 rename include/mapnik/{value_error.hpp => value/error.hpp} (89%)
 rename include/mapnik/{value_hash.hpp => value/hash.hpp} (94%)
 rename include/mapnik/{value_types.hpp => value/types.hpp} (100%)

diff --git a/benchmark/bench_framework.hpp b/benchmark/bench_framework.hpp
index a3de4fdd9..4cc9390e8 100644
--- a/benchmark/bench_framework.hpp
+++ b/benchmark/bench_framework.hpp
@@ -4,7 +4,7 @@
 // mapnik
 #include <mapnik/debug.hpp>
 #include <mapnik/params.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/safe_cast.hpp>
 #include "../test/cleanup.hpp"
 
diff --git a/include/mapnik/attribute.hpp b/include/mapnik/attribute.hpp
index edfaebefc..80887dacd 100644
--- a/include/mapnik/attribute.hpp
+++ b/include/mapnik/attribute.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_ATTRIBUTE_HPP
 
 // mapnik
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 #include <mapnik/util/geometry_to_ds_type.hpp>
 // stl
diff --git a/include/mapnik/expression_evaluator.hpp b/include/mapnik/expression_evaluator.hpp
index 58b34486e..d2acffa55 100644
--- a/include/mapnik/expression_evaluator.hpp
+++ b/include/mapnik/expression_evaluator.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/attribute.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/expression_node.hpp>
 #include <mapnik/function_call.hpp>
 #include <mapnik/util/variant.hpp>
diff --git a/include/mapnik/expression_grammar_impl.hpp b/include/mapnik/expression_grammar_impl.hpp
index ad28f0135..5bc85954a 100644
--- a/include/mapnik/expression_grammar_impl.hpp
+++ b/include/mapnik/expression_grammar_impl.hpp
@@ -27,7 +27,7 @@
 #include <mapnik/expression_node.hpp>
 #include <mapnik/expression_grammar.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/function_call.hpp>
 
 #pragma GCC diagnostic push
diff --git a/include/mapnik/expression_node.hpp b/include/mapnik/expression_node.hpp
index 6fdad8f5f..77c45463a 100644
--- a/include/mapnik/expression_node.hpp
+++ b/include/mapnik/expression_node.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_EXPRESSION_NODE_HPP
 
 // mapnik
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 #include <mapnik/config.hpp>
 #include <mapnik/unicode.hpp>
diff --git a/include/mapnik/expression_node_types.hpp b/include/mapnik/expression_node_types.hpp
index 371274a4e..0e2e3ce7b 100644
--- a/include/mapnik/expression_node_types.hpp
+++ b/include/mapnik/expression_node_types.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/variant.hpp>
 
 namespace mapnik
diff --git a/include/mapnik/feature.hpp b/include/mapnik/feature.hpp
index 5e09ebb3c..ff10ed5b0 100644
--- a/include/mapnik/feature.hpp
+++ b/include/mapnik/feature.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/geometry.hpp>
diff --git a/include/mapnik/feature_factory.hpp b/include/mapnik/feature_factory.hpp
index c4a4d560e..87d20dc75 100644
--- a/include/mapnik/feature_factory.hpp
+++ b/include/mapnik/feature_factory.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/feature.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // boost
 //#include <boost/pool/pool_alloc.hpp>
diff --git a/include/mapnik/group/group_symbolizer_helper.hpp b/include/mapnik/group/group_symbolizer_helper.hpp
index 93c7d4f3f..082f75e5d 100644
--- a/include/mapnik/group/group_symbolizer_helper.hpp
+++ b/include/mapnik/group/group_symbolizer_helper.hpp
@@ -25,7 +25,7 @@
 //mapnik
 #include <mapnik/text/symbolizer_helpers.hpp>
 #include <mapnik/text/placements/base.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/pixel_position.hpp>
 
 namespace mapnik {
diff --git a/include/mapnik/json/generic_json.hpp b/include/mapnik/json/generic_json.hpp
index 65c04c47d..4b812700d 100644
--- a/include/mapnik/json/generic_json.hpp
+++ b/include/mapnik/json/generic_json.hpp
@@ -23,7 +23,7 @@
 #ifndef MAPNIK_GENERIC_JSON_HPP
 #define MAPNIK_GENERIC_JSON_HPP
 
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/variant.hpp>
 #include <mapnik/json/value_converters.hpp>
 
diff --git a/include/mapnik/json/properties_generator_grammar.hpp b/include/mapnik/json/properties_generator_grammar.hpp
index 69145b8ab..3ae671af7 100644
--- a/include/mapnik/json/properties_generator_grammar.hpp
+++ b/include/mapnik/json/properties_generator_grammar.hpp
@@ -23,7 +23,7 @@
 #ifndef MAPNIK_JSON_PROPERTIES_GENERATOR_GRAMMAR_HPP
 #define MAPNIK_JSON_PROPERTIES_GENERATOR_GRAMMAR_HPP
 
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 
 #pragma GCC diagnostic push
diff --git a/include/mapnik/label_collision_detector.hpp b/include/mapnik/label_collision_detector.hpp
index f751f31c3..a35fa7034 100644
--- a/include/mapnik/label_collision_detector.hpp
+++ b/include/mapnik/label_collision_detector.hpp
@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/quad_tree.hpp>
 #include <mapnik/util/noncopyable.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/include/mapnik/params.hpp b/include/mapnik/params.hpp
index 535cacb38..280a6addf 100644
--- a/include/mapnik/params.hpp
+++ b/include/mapnik/params.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/variant.hpp>
 
 #pragma GCC diagnostic push
diff --git a/include/mapnik/params_impl.hpp b/include/mapnik/params_impl.hpp
index f127c4cf2..03b7765cb 100644
--- a/include/mapnik/params_impl.hpp
+++ b/include/mapnik/params_impl.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/params.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/boolean.hpp>
 #include <mapnik/util/conversions.hpp>
 
diff --git a/include/mapnik/svg/output/svg_generator.hpp b/include/mapnik/svg/output/svg_generator.hpp
index 1b3f18dea..e2a2830e2 100644
--- a/include/mapnik/svg/output/svg_generator.hpp
+++ b/include/mapnik/svg/output/svg_generator.hpp
@@ -30,7 +30,7 @@
 #include <mapnik/svg/geometry_svg_generator.hpp>
 #include <mapnik/svg/output/svg_output_attributes.hpp>
 #include <mapnik/util/noncopyable.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 
 namespace mapnik { namespace svg {
diff --git a/include/mapnik/svg/svg_renderer_agg.hpp b/include/mapnik/svg/svg_renderer_agg.hpp
index d99575b4d..9cd7e0536 100644
--- a/include/mapnik/svg/svg_renderer_agg.hpp
+++ b/include/mapnik/svg/svg_renderer_agg.hpp
@@ -27,7 +27,7 @@
 #include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/gradient.hpp>
 #include <mapnik/box2d.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/noncopyable.hpp>
 
 #if defined(GRID_RENDERER)
diff --git a/include/mapnik/symbolizer_base.hpp b/include/mapnik/symbolizer_base.hpp
index f07cf3d2a..17f14a8e5 100644
--- a/include/mapnik/symbolizer_base.hpp
+++ b/include/mapnik/symbolizer_base.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/expression.hpp>
 #include <mapnik/path_expression.hpp>
 #include <mapnik/symbolizer_keys.hpp>
diff --git a/include/mapnik/symbolizer_default_values.hpp b/include/mapnik/symbolizer_default_values.hpp
index ea5e5c02e..6131e89ae 100644
--- a/include/mapnik/symbolizer_default_values.hpp
+++ b/include/mapnik/symbolizer_default_values.hpp
@@ -29,7 +29,7 @@
 #include <mapnik/image_scaling.hpp>
 #include <mapnik/simplify.hpp>
 #include <mapnik/color.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <type_traits>
 
 
diff --git a/include/mapnik/text/itemizer.hpp b/include/mapnik/text/itemizer.hpp
index 5087ce06f..b33c559bb 100644
--- a/include/mapnik/text/itemizer.hpp
+++ b/include/mapnik/text/itemizer.hpp
@@ -25,7 +25,7 @@
 
 //mapnik
 #include <mapnik/text/evaluated_format_properties_ptr.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/config.hpp>
 
diff --git a/include/mapnik/text/text_layout.hpp b/include/mapnik/text/text_layout.hpp
index 2e59cdc8b..9d769c848 100644
--- a/include/mapnik/text/text_layout.hpp
+++ b/include/mapnik/text/text_layout.hpp
@@ -23,7 +23,7 @@
 #define MAPNIK_TEXT_LAYOUT_HPP
 
 //mapnik
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/pixel_position.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/attribute.hpp>
diff --git a/include/mapnik/transform_expression.hpp b/include/mapnik/transform_expression.hpp
index b43f69170..471287932 100644
--- a/include/mapnik/transform_expression.hpp
+++ b/include/mapnik/transform_expression.hpp
@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/attribute.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/expression_node_types.hpp>
 #include <mapnik/expression_node.hpp>
 #include <mapnik/util/variant.hpp>
diff --git a/include/mapnik/unicode.hpp b/include/mapnik/unicode.hpp
index f3b270cb9..22c0c87a0 100644
--- a/include/mapnik/unicode.hpp
+++ b/include/mapnik/unicode.hpp
@@ -26,7 +26,7 @@
 //mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/util/noncopyable.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // std
 #include <cstdint>
diff --git a/include/mapnik/util/conversions.hpp b/include/mapnik/util/conversions.hpp
index 284d20e03..49df4a49a 100644
--- a/include/mapnik/util/conversions.hpp
+++ b/include/mapnik/util/conversions.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // stl
 #include <iosfwd>
diff --git a/include/mapnik/value.hpp b/include/mapnik/value.hpp
index 9ee732385..ba1575019 100644
--- a/include/mapnik/value.hpp
+++ b/include/mapnik/value.hpp
@@ -25,8 +25,8 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/value_types.hpp>
-#include <mapnik/value_hash.hpp>
+#include <mapnik/value/types.hpp>
+#include <mapnik/value/hash.hpp>
 #include <mapnik/util/variant.hpp>
 
 
@@ -115,7 +115,7 @@ operator << (std::basic_ostream<charT,traits>& out,
 // hash function
 inline std::size_t hash_value(value const& val)
 {
-    return mapnik_hash_value(val);
+    return mapnik::value_hash(val);
 }
 
 } // namespace value_adl_barrier
@@ -157,7 +157,7 @@ struct hash<mapnik::value>
 {
     size_t operator()(mapnik::value const& val) const
     {
-        return mapnik::mapnik_hash_value(val);
+        return mapnik::value_hash(val);
     }
 };
 
diff --git a/include/mapnik/value_error.hpp b/include/mapnik/value/error.hpp
similarity index 89%
rename from include/mapnik/value_error.hpp
rename to include/mapnik/value/error.hpp
index 68df62255..171c65f7d 100644
--- a/include/mapnik/value_error.hpp
+++ b/include/mapnik/value/error.hpp
@@ -28,20 +28,19 @@
 #include <exception>
 #include <string>
 
-namespace mapnik {
+namespace mapnik { namespace value {
 
-class value_error : public std::exception
+class error : public std::exception
 {
 public:
-    value_error() :
+    error() :
         what_() {}
 
-    value_error( std::string const& what ) :
+    error( std::string const& what ) :
         what_( what )
-    {
-    }
+    {}
 
-    virtual ~value_error() throw() {}
+    virtual ~error() throw() {}
 
     virtual const char * what() const throw()
     {
@@ -56,6 +55,7 @@ public:
 protected:
     mutable std::string what_;
 };
-}
+
+}}
 
 #endif // MAPNIK_VALUE_ERROR_HPP
diff --git a/include/mapnik/value_hash.hpp b/include/mapnik/value/hash.hpp
similarity index 94%
rename from include/mapnik/value_hash.hpp
rename to include/mapnik/value/hash.hpp
index 80e10d855..81a27019a 100644
--- a/include/mapnik/value_hash.hpp
+++ b/include/mapnik/value/hash.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/util/variant.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 // stl
 #include <functional>
 
@@ -35,7 +35,9 @@
 
 #pragma GCC diagnostic pop
 
-namespace mapnik { namespace detail {
+namespace mapnik {
+
+namespace detail {
 
 inline void hash_combine(std::size_t & seed, std::size_t val)
 {
@@ -70,7 +72,7 @@ struct value_hasher
 } // namespace  detail
 
 template <typename T>
-std::size_t mapnik_hash_value(T const& val)
+std::size_t value_hash(T const& val)
 {
     std::size_t seed = 0;
     detail::hash_combine(seed, util::apply_visitor(detail::value_hasher(), val));
diff --git a/include/mapnik/value_types.hpp b/include/mapnik/value/types.hpp
similarity index 100%
rename from include/mapnik/value_types.hpp
rename to include/mapnik/value/types.hpp
diff --git a/include/mapnik/vertex_converters.hpp b/include/mapnik/vertex_converters.hpp
index ba1829472..1ebe96190 100644
--- a/include/mapnik/vertex_converters.hpp
+++ b/include/mapnik/vertex_converters.hpp
@@ -32,7 +32,7 @@
 #include <mapnik/simplify.hpp>
 #include <mapnik/simplify_converter.hpp>
 #include <mapnik/util/noncopyable.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/symbolizer_enumerations.hpp>
 #include <mapnik/symbolizer_keys.hpp>
 #include <mapnik/symbolizer.hpp>
diff --git a/include/mapnik/xml_attribute_cast.hpp b/include/mapnik/xml_attribute_cast.hpp
index cafa7e79a..0b3531189 100644
--- a/include/mapnik/xml_attribute_cast.hpp
+++ b/include/mapnik/xml_attribute_cast.hpp
@@ -25,7 +25,7 @@
 
 //mapnik
 #include <mapnik/debug.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/xml_tree.hpp>
 #include <mapnik/enumeration.hpp>
 #include <mapnik/boolean.hpp>
diff --git a/plugins/input/csv/csv_datasource.cpp b/plugins/input/csv/csv_datasource.cpp
index 17b9f3adb..cb763f08c 100644
--- a/plugins/input/csv/csv_datasource.cpp
+++ b/plugins/input/csv/csv_datasource.cpp
@@ -40,7 +40,7 @@
 #include <mapnik/geometry.hpp>
 #include <mapnik/geometry/boost_adapters.hpp>
 #include <mapnik/util/geometry_to_ds_type.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/fs.hpp>
 #include <mapnik/make_unique.hpp>
 #include <mapnik/util/spatial_index.hpp>
diff --git a/plugins/input/csv/csv_datasource.hpp b/plugins/input/csv/csv_datasource.hpp
index 71cf2ea71..bbb47339b 100644
--- a/plugins/input/csv/csv_datasource.hpp
+++ b/plugins/input/csv/csv_datasource.hpp
@@ -31,7 +31,7 @@
 #include <mapnik/box2d.hpp>
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include "csv_utils.hpp"
 
 #pragma GCC diagnostic push
diff --git a/plugins/input/csv/csv_utils.hpp b/plugins/input/csv/csv_utils.hpp
index df976e3a7..73f9530e6 100644
--- a/plugins/input/csv/csv_utils.hpp
+++ b/plugins/input/csv/csv_utils.hpp
@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/box2d.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/conversions.hpp>
 #include <mapnik/util/trim.hpp>
 #include <mapnik/csv/csv_types.hpp>
diff --git a/plugins/input/gdal/gdal_datasource.cpp b/plugins/input/gdal/gdal_datasource.cpp
index 2454ed65b..2514b9455 100644
--- a/plugins/input/gdal/gdal_datasource.cpp
+++ b/plugins/input/gdal/gdal_datasource.cpp
@@ -28,7 +28,7 @@
 #include <mapnik/boolean.hpp>
 #include <mapnik/geom_util.hpp>
 #include <mapnik/timer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 #include <gdal_version.h>
 
diff --git a/plugins/input/geojson/geojson_datasource.cpp b/plugins/input/geojson/geojson_datasource.cpp
index 054b1e07b..bd58306ce 100644
--- a/plugins/input/geojson/geojson_datasource.cpp
+++ b/plugins/input/geojson/geojson_datasource.cpp
@@ -40,7 +40,7 @@
 #include <mapnik/feature.hpp>
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/feature_kv_iterator.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/proj_transform.hpp>
diff --git a/plugins/input/ogr/ogr_featureset.cpp b/plugins/input/ogr/ogr_featureset.cpp
index c82a8431f..f5b28041d 100644
--- a/plugins/input/ogr/ogr_featureset.cpp
+++ b/plugins/input/ogr/ogr_featureset.cpp
@@ -22,14 +22,14 @@
 
 // mapnik
 #include <mapnik/global.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/wkb.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/geometry/correct.hpp>
 
diff --git a/plugins/input/ogr/ogr_index_featureset.cpp b/plugins/input/ogr/ogr_index_featureset.cpp
index 768e16e91..a2442475b 100644
--- a/plugins/input/ogr/ogr_index_featureset.cpp
+++ b/plugins/input/ogr/ogr_index_featureset.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/global.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/box2d.hpp>
diff --git a/plugins/input/pgraster/pgraster_datasource.cpp b/plugins/input/pgraster/pgraster_datasource.cpp
index e6eddf758..16339efbb 100644
--- a/plugins/input/pgraster/pgraster_datasource.cpp
+++ b/plugins/input/pgraster/pgraster_datasource.cpp
@@ -36,7 +36,7 @@
 #include <mapnik/sql_utils.hpp>
 #include <mapnik/util/conversions.hpp>
 #include <mapnik/timer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/plugins/input/pgraster/pgraster_datasource.hpp b/plugins/input/pgraster/pgraster_datasource.hpp
index 221f196e4..321e36635 100644
--- a/plugins/input/pgraster/pgraster_datasource.hpp
+++ b/plugins/input/pgraster/pgraster_datasource.hpp
@@ -36,7 +36,7 @@
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // boost
 #include <boost/optional.hpp>
diff --git a/plugins/input/pgraster/pgraster_featureset.cpp b/plugins/input/pgraster/pgraster_featureset.cpp
index e2d4ccb50..781f06958 100644
--- a/plugins/input/pgraster/pgraster_featureset.cpp
+++ b/plugins/input/pgraster/pgraster_featureset.cpp
@@ -34,7 +34,7 @@
 #include <mapnik/global.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/view_transform.hpp>
 #include <mapnik/raster.hpp>
diff --git a/plugins/input/postgis/postgis_datasource.cpp b/plugins/input/postgis/postgis_datasource.cpp
index 10ce521d0..02fc0c3b3 100644
--- a/plugins/input/postgis/postgis_datasource.cpp
+++ b/plugins/input/postgis/postgis_datasource.cpp
@@ -33,7 +33,7 @@
 #include <mapnik/sql_utils.hpp>
 #include <mapnik/util/conversions.hpp>
 #include <mapnik/timer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/plugins/input/postgis/postgis_datasource.hpp b/plugins/input/postgis/postgis_datasource.hpp
index 80ba89495..229fc831a 100644
--- a/plugins/input/postgis/postgis_datasource.hpp
+++ b/plugins/input/postgis/postgis_datasource.hpp
@@ -32,7 +32,7 @@
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/attribute.hpp>
 
 // boost
diff --git a/plugins/input/postgis/postgis_featureset.cpp b/plugins/input/postgis/postgis_featureset.cpp
index 25e2b6b4b..1b00cdb01 100644
--- a/plugins/input/postgis/postgis_featureset.cpp
+++ b/plugins/input/postgis/postgis_featureset.cpp
@@ -30,7 +30,7 @@
 #include <mapnik/debug.hpp>
 #include <mapnik/wkb.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/util/conversions.hpp>
 #include <mapnik/util/trim.hpp>
diff --git a/plugins/input/shape/dbfile.cpp b/plugins/input/shape/dbfile.cpp
index d64d37384..3594bcbd6 100644
--- a/plugins/input/shape/dbfile.cpp
+++ b/plugins/input/shape/dbfile.cpp
@@ -20,7 +20,7 @@
  *
  *****************************************************************************/
 // mapnik
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/global.hpp>
 #include <mapnik/util/utf_conv_win.hpp>
 #include <mapnik/unicode.hpp>
diff --git a/plugins/input/shape/shape_datasource.cpp b/plugins/input/shape/shape_datasource.cpp
index 56d7a6aae..9c9015879 100644
--- a/plugins/input/shape/shape_datasource.cpp
+++ b/plugins/input/shape/shape_datasource.cpp
@@ -40,7 +40,7 @@
 #include <mapnik/util/conversions.hpp>
 #include <mapnik/geom_util.hpp>
 #include <mapnik/timer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // stl
 #include <fstream>
diff --git a/plugins/input/shape/shape_datasource.hpp b/plugins/input/shape/shape_datasource.hpp
index f702036eb..016d5cb57 100644
--- a/plugins/input/shape/shape_datasource.hpp
+++ b/plugins/input/shape/shape_datasource.hpp
@@ -31,7 +31,7 @@
 #include <mapnik/box2d.hpp>
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // boost
 #include <boost/optional.hpp>
diff --git a/plugins/input/shape/shape_featureset.hpp b/plugins/input/shape/shape_featureset.hpp
index caa962554..cfd440bca 100644
--- a/plugins/input/shape/shape_featureset.hpp
+++ b/plugins/input/shape/shape_featureset.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/geom_util.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 #include "shape_io.hpp"
 
diff --git a/plugins/input/shape/shape_index_featureset.hpp b/plugins/input/shape/shape_index_featureset.hpp
index d104e0f20..bd8eecfe7 100644
--- a/plugins/input/shape/shape_index_featureset.hpp
+++ b/plugins/input/shape/shape_index_featureset.hpp
@@ -31,7 +31,7 @@
 #include <mapnik/geom_util.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // boost
 
diff --git a/plugins/input/sqlite/sqlite_datasource.hpp b/plugins/input/sqlite/sqlite_datasource.hpp
index eab71e9e3..5551d65aa 100644
--- a/plugins/input/sqlite/sqlite_datasource.hpp
+++ b/plugins/input/sqlite/sqlite_datasource.hpp
@@ -32,7 +32,7 @@
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/wkb.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // boost
 #include <boost/optional.hpp>
diff --git a/plugins/input/sqlite/sqlite_featureset.cpp b/plugins/input/sqlite/sqlite_featureset.cpp
index fc5af1d09..93d977a02 100644
--- a/plugins/input/sqlite/sqlite_featureset.cpp
+++ b/plugins/input/sqlite/sqlite_featureset.cpp
@@ -28,7 +28,7 @@
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/wkb.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/geometry/is_empty.hpp>
 #include <mapnik/geometry/envelope.hpp>
diff --git a/plugins/input/topojson/topojson_datasource.cpp b/plugins/input/topojson/topojson_datasource.cpp
index 6c557d1f6..7c5493764 100644
--- a/plugins/input/topojson/topojson_datasource.cpp
+++ b/plugins/input/topojson/topojson_datasource.cpp
@@ -31,7 +31,7 @@
 
 // mapnik
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/geometry/boost_adapters.hpp>
 #include <mapnik/json/topojson_grammar.hpp>
diff --git a/src/conversions.cpp b/src/conversions.cpp
index 04bfc5789..fc63f1dcd 100644
--- a/src/conversions.cpp
+++ b/src/conversions.cpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/util/conversions.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 #include <cstring>
 #include <algorithm>
diff --git a/src/expression_node.cpp b/src/expression_node.cpp
index 549f4c891..9b78b5a04 100644
--- a/src/expression_node.cpp
+++ b/src/expression_node.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #include <mapnik/expression_node.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/safe_cast.hpp>
 
diff --git a/src/expression_string.cpp b/src/expression_string.cpp
index 0f904ee68..a10a85da2 100644
--- a/src/expression_string.cpp
+++ b/src/expression_string.cpp
@@ -27,7 +27,7 @@
 #include <mapnik/expression_node_types.hpp>
 #include <mapnik/expression_node.hpp>
 #include <mapnik/attribute.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 
 namespace mapnik
diff --git a/src/group/group_symbolizer_helper.cpp b/src/group/group_symbolizer_helper.cpp
index 2ba70ff9b..e520f1ae8 100644
--- a/src/group/group_symbolizer_helper.cpp
+++ b/src/group/group_symbolizer_helper.cpp
@@ -28,7 +28,7 @@
 #include <mapnik/vertex_processor.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/symbolizer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/text/placements/base.hpp>
 #include <mapnik/text/placements/dummy.hpp>
 #include <mapnik/vertex_cache.hpp>
diff --git a/src/params.cpp b/src/params.cpp
index 8d3a2c859..4a25c64a6 100644
--- a/src/params.cpp
+++ b/src/params.cpp
@@ -24,7 +24,7 @@
 #include <mapnik/boolean.hpp>
 #include <mapnik/params.hpp>
 #include <mapnik/params_impl.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 namespace mapnik {
 
diff --git a/src/raster_colorizer.cpp b/src/raster_colorizer.cpp
index 2c43df6b6..b8dc077f9 100644
--- a/src/raster_colorizer.cpp
+++ b/src/raster_colorizer.cpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/debug.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp> // for to_double
 #include <mapnik/feature.hpp>
 #include <mapnik/raster.hpp>
diff --git a/src/text/symbolizer_helpers.cpp b/src/text/symbolizer_helpers.cpp
index 85c5876b6..384a7fe96 100644
--- a/src/text/symbolizer_helpers.cpp
+++ b/src/text/symbolizer_helpers.cpp
@@ -36,7 +36,7 @@
 #include <mapnik/parse_path.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/symbolizer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/text/placement_finder_impl.hpp>
 #include <mapnik/text/placements/base.hpp>
 #include <mapnik/text/placements/dummy.hpp>
diff --git a/src/unicode.cpp b/src/unicode.cpp
index c96c58914..969926788 100644
--- a/src/unicode.cpp
+++ b/src/unicode.cpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // std
 #include <stdexcept>
diff --git a/src/value.cpp b/src/value.cpp
index b5ad606c7..7dfb9f4ed 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/value.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/conversions.hpp>
 
 // stl
diff --git a/test/unit/core/comparison_test.cpp b/test/unit/core/comparison_test.cpp
index 7e8e8e414..886b52960 100644
--- a/test/unit/core/comparison_test.cpp
+++ b/test/unit/core/comparison_test.cpp
@@ -1,7 +1,6 @@
-
 #include "catch.hpp"
 
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 
 TEST_CASE("comparison")
diff --git a/test/unit/core/conversions_test.cpp b/test/unit/core/conversions_test.cpp
index 43592af01..d804230b0 100644
--- a/test/unit/core/conversions_test.cpp
+++ b/test/unit/core/conversions_test.cpp
@@ -1,7 +1,6 @@
-
 #include "catch.hpp"
 
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 #include <mapnik/unicode.hpp>
 #include <mapnik/util/conversions.hpp>
diff --git a/test/unit/core/params_test.cpp b/test/unit/core/params_test.cpp
index 3131f0cbc..0363d24a4 100644
--- a/test/unit/core/params_test.cpp
+++ b/test/unit/core/params_test.cpp
@@ -1,8 +1,7 @@
-
 #include "catch.hpp"
 
 #include <iostream>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/params.hpp>
 #include <mapnik/boolean.hpp>
 
diff --git a/test/unit/core/value_test.cpp b/test/unit/core/value_test.cpp
index cdb64dbbe..a76910a26 100644
--- a/test/unit/core/value_test.cpp
+++ b/test/unit/core/value_test.cpp
@@ -1,7 +1,6 @@
-
 #include "catch.hpp"
 
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 
 TEST_CASE("mapnik::value")
diff --git a/test/unit/font/fontset_runtime_test.cpp b/test/unit/font/fontset_runtime_test.cpp
index bfbae2786..1182807cd 100644
--- a/test/unit/font/fontset_runtime_test.cpp
+++ b/test/unit/font/fontset_runtime_test.cpp
@@ -1,4 +1,3 @@
-
 #include "catch.hpp"
 
 #include <mapnik/memory_datasource.hpp>
@@ -12,7 +11,7 @@
 #include <mapnik/rule.hpp>
 #include <mapnik/feature_type_style.hpp>
 #include <mapnik/agg_renderer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/symbolizer.hpp>
 #include <mapnik/text/placements/dummy.hpp>
 #include <mapnik/text/formatting/text.hpp>
@@ -69,4 +68,4 @@ SECTION("error") {
         REQUIRE(std::string(ex.what()) == std::string("Unable to find specified font face 'DejaVu Sans Book' in font set: 'fontset'"));
     }
 }
-}
\ No newline at end of file
+}

From 923efd589cdd44b78c7f63a7a369aafc77eb16e3 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 3 Aug 2016 12:17:05 +0100
Subject: [PATCH 007/328] `geometry_to_path.hpp` => `geometry/to_path.hpp`

---
 include/mapnik/{geometry_to_path.hpp => geometry/to_path.hpp} | 0
 src/svg/output/process_symbolizers.cpp                        | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename include/mapnik/{geometry_to_path.hpp => geometry/to_path.hpp} (100%)

diff --git a/include/mapnik/geometry_to_path.hpp b/include/mapnik/geometry/to_path.hpp
similarity index 100%
rename from include/mapnik/geometry_to_path.hpp
rename to include/mapnik/geometry/to_path.hpp
diff --git a/src/svg/output/process_symbolizers.cpp b/src/svg/output/process_symbolizers.cpp
index cfd82f694..85f57768e 100644
--- a/src/svg/output/process_symbolizers.cpp
+++ b/src/svg/output/process_symbolizers.cpp
@@ -33,7 +33,7 @@
 #include <mapnik/symbolizer_dispatch.hpp>
 #include <mapnik/vertex_processor.hpp>
 #include <mapnik/geometry/transform.hpp>
-#include <mapnik/geometry_to_path.hpp>
+#include <mapnik/geometry/to_path.hpp>
 #include <mapnik/util/geometry_to_ds_type.hpp>
 #include <mapnik/safe_cast.hpp>
 // boost

From 9a82ffbde72328f8def1cf7476643afc0bbd1958 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 3 Aug 2016 13:49:58 +0100
Subject: [PATCH 008/328] add `geometry` and `value` dirs

---
 include/build.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/build.py b/include/build.py
index 9c225a767..eb475aa58 100644
--- a/include/build.py
+++ b/include/build.py
@@ -38,7 +38,9 @@ subdirs = [
     'text',
     'text/placements',
     'text/formatting',
-    'markers_placements'
+    'markers_placements',
+    'geometry',
+    'value'
     ]
 
 if env['SVG_RENDERER']:

From ce0f87fb719a65416a6312084c3540f3a7cf12f5 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 26 Aug 2016 10:09:22 +0100
Subject: [PATCH 009/328] merge spirit-x3

---
 Makefile                                      |   9 +-
 SConstruct                                    |   5 +-
 benchmark/run                                 |   2 +-
 benchmark/test_expression_parse.cpp           |   2 +-
 deps/agg/include/agg_vpgen_clip_polygon.h     |  10 +-
 deps/agg/include/agg_vpgen_clip_polyline.h    |  10 +-
 include/mapnik/box2d.hpp                      |   2 +-
 include/mapnik/box2d_impl.hpp                 |  46 +-
 include/mapnik/color.hpp                      |   7 +-
 include/mapnik/css_color_grammar.hpp          |  67 ---
 include/mapnik/css_color_grammar_x3.hpp       |  55 +++
 ..._impl.hpp => css_color_grammar_x3_def.hpp} | 399 ++++++++++------
 include/mapnik/datasource.hpp                 |   4 +-
 include/mapnik/evaluate_global_attributes.hpp |   4 +-
 include/mapnik/expression_grammar.hpp         | 103 -----
 include/mapnik/expression_grammar_impl.hpp    | 280 -----------
 include/mapnik/expression_grammar_x3.hpp      |  51 +++
 .../mapnik/expression_grammar_x3_config.hpp   |  43 ++
 include/mapnik/expression_grammar_x3_def.hpp  | 433 ++++++++++++++++++
 include/mapnik/expression_node.hpp            |  82 +---
 .../mapnik/feature_style_processor_impl.hpp   |   4 +-
 include/mapnik/function_call.hpp              |   4 +-
 include/mapnik/grid/grid_renderer.hpp         |   4 +-
 include/mapnik/grid/grid_view.hpp             |   4 +-
 include/mapnik/image_filter.hpp               |   8 +-
 include/mapnik/image_filter_grammar.hpp       |  87 ----
 include/mapnik/image_filter_grammar_impl.hpp  | 141 ------
 include/mapnik/image_filter_grammar_x3.hpp    |  56 +++
 .../mapnik/image_filter_grammar_x3_def.hpp    | 261 +++++++++++
 include/mapnik/image_filter_types.hpp         |  41 +-
 include/mapnik/json/geometry_grammar.hpp      |   2 +
 include/mapnik/make_unique.hpp                |   4 +-
 include/mapnik/offset_converter.hpp           |  22 +-
 include/mapnik/path.hpp                       |   4 +-
 .../mapnik/path_expression_grammar_impl.hpp   |  62 ---
 include/mapnik/path_expression_grammar_x3.hpp |  44 ++
 .../mapnik/path_expression_grammar_x3_def.hpp |  63 +++
 include/mapnik/quad_tree.hpp                  |  28 +-
 include/mapnik/query.hpp                      |  16 +-
 include/mapnik/raster.hpp                     |   4 +-
 include/mapnik/span_image_filter.hpp          |   4 +-
 .../svg/output/svg_output_attributes.hpp      |   4 +-
 include/mapnik/svg/output/svg_renderer.hpp    |   4 +-
 include/mapnik/text/placements/list.hpp       |   4 +-
 include/mapnik/transform_expression.hpp       |  22 +-
 .../mapnik/transform_expression_grammar.hpp   |  66 ---
 .../transform_expression_grammar_impl.hpp     | 128 ------
 ...pp => transform_expression_grammar_x3.hpp} |  44 +-
 .../transform_expression_grammar_x3_def.hpp   | 184 ++++++++
 include/mapnik/well_known_srs.hpp             |  21 +-
 plugins/input/shape/dbfile.cpp                |  14 +-
 src/agg/process_building_symbolizer.cpp       |   1 +
 src/build.py                                  |  14 +-
 src/cairo/process_building_symbolizer.cpp     |   1 +
 src/cairo/process_group_symbolizer.cpp        |   2 +
 src/cairo/process_line_pattern_symbolizer.cpp |   2 +
 src/cairo/process_raster_symbolizer.cpp       |   2 +
 src/color_factory.cpp                         |  11 +-
 src/conversions.cpp                           | 264 -----------
 src/conversions_numeric.cpp                   | 146 ++++++
 src/conversions_string.cpp                    | 162 +++++++
 ...r_grammar.cpp => css_color_grammar_x3.cpp} |  16 +-
 src/dasharray_parser.cpp                      |  25 +-
 src/expression.cpp                            |  24 +-
 ..._grammar.cpp => expression_grammar_x3.cpp} |  10 +-
 src/feature_type_style.cpp                    |   4 +-
 src/font_engine_freetype.cpp                  |   1 -
 ...r_types.cpp => generate_image_filters.cpp} |  18 +-
 src/grid/process_building_symbolizer.cpp      |   1 +
 ...rammar.cpp => image_filter_grammar_x3.cpp} |  20 +-
 src/image_options.cpp                         |  54 +--
 src/layer.cpp                                 |  26 +-
 src/map.cpp                                   |  46 +-
 src/memory_datasource.cpp                     |   8 +-
 src/parse_image_filters.cpp                   |  54 +++
 src/parse_path.cpp                            |  21 +-
 src/parse_transform.cpp                       |  29 +-
 src/svg/svg_parser.cpp                        | 150 +++---
 src/text/face.cpp                             |   4 +-
 src/text/font_feature_settings.cpp            |  24 +-
 src/text/placement_finder.cpp                 |   1 +
 src/text/placements/simple.cpp                |  38 +-
 src/text/text_layout.cpp                      |   1 +
 src/text/text_properties.cpp                  |   2 +
 ...pp => transform_expression_grammar_x3.cpp} |  12 +-
 src/webp_reader.cpp                           |   1 +
 src/wkb.cpp                                   |   2 +
 src/xml_tree.cpp                              |   1 +
 test/unit/color/css_color.cpp                 | 160 ++++---
 89 files changed, 2418 insertions(+), 1908 deletions(-)
 delete mode 100644 include/mapnik/css_color_grammar.hpp
 create mode 100644 include/mapnik/css_color_grammar_x3.hpp
 rename include/mapnik/{css_color_grammar_impl.hpp => css_color_grammar_x3_def.hpp} (54%)
 delete mode 100644 include/mapnik/expression_grammar.hpp
 delete mode 100644 include/mapnik/expression_grammar_impl.hpp
 create mode 100644 include/mapnik/expression_grammar_x3.hpp
 create mode 100644 include/mapnik/expression_grammar_x3_config.hpp
 create mode 100644 include/mapnik/expression_grammar_x3_def.hpp
 delete mode 100644 include/mapnik/image_filter_grammar.hpp
 delete mode 100644 include/mapnik/image_filter_grammar_impl.hpp
 create mode 100644 include/mapnik/image_filter_grammar_x3.hpp
 create mode 100644 include/mapnik/image_filter_grammar_x3_def.hpp
 delete mode 100644 include/mapnik/path_expression_grammar_impl.hpp
 create mode 100644 include/mapnik/path_expression_grammar_x3.hpp
 create mode 100644 include/mapnik/path_expression_grammar_x3_def.hpp
 delete mode 100644 include/mapnik/transform_expression_grammar.hpp
 delete mode 100644 include/mapnik/transform_expression_grammar_impl.hpp
 rename include/mapnik/{path_expression_grammar.hpp => transform_expression_grammar_x3.hpp} (58%)
 create mode 100644 include/mapnik/transform_expression_grammar_x3_def.hpp
 delete mode 100644 src/conversions.cpp
 create mode 100644 src/conversions_numeric.cpp
 create mode 100644 src/conversions_string.cpp
 rename src/{image_filter_grammar.cpp => css_color_grammar_x3.cpp} (74%)
 rename src/{transform_expression_grammar.cpp => expression_grammar_x3.cpp} (81%)
 rename src/{image_filter_types.cpp => generate_image_filters.cpp} (66%)
 rename src/{css_color_grammar.cpp => image_filter_grammar_x3.cpp} (67%)
 create mode 100644 src/parse_image_filters.cpp
 rename src/{expression_grammar.cpp => transform_expression_grammar_x3.cpp} (77%)

diff --git a/Makefile b/Makefile
index 752791b1e..14daf29ae 100755
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-
 OS := $(shell uname -s)
 
 PYTHON = python
@@ -36,10 +35,10 @@ src/json/libmapnik-json.a:
 		src/renderer_common/render_thunk_extractor.os \
 		src/json/libmapnik-json.a \
 		src/wkt/libmapnik-wkt.a \
-		src/css_color_grammar.os \
-		src/expression_grammar.os \
-		src/transform_expression_grammar.os \
-		src/image_filter_grammar.os \
+		src/css_color_grammar_x3.os \
+		src/expression_grammar_x3.os \
+		src/transform_expression_grammar_x3.os \
+		src/image_filter_grammar_x3.os \
 		src/marker_helpers.os \
 		src/svg/svg_transform_parser.os \
 		src/agg/process_line_symbolizer.os \
diff --git a/SConstruct b/SConstruct
index 0523e184d..e88e0b373 100644
--- a/SConstruct
+++ b/SConstruct
@@ -41,7 +41,7 @@ ICU_LIBS_DEFAULT='/usr/'
 
 DEFAULT_CC = "cc"
 DEFAULT_CXX = "c++"
-DEFAULT_CXX11_CXXFLAGS = " -std=c++11"
+DEFAULT_CXX11_CXXFLAGS = " -std=c++14"
 DEFAULT_CXX11_LINKFLAGS = ""
 if sys.platform == 'darwin':
     # homebrew default
@@ -1786,8 +1786,7 @@ if not preconfigured:
         common_cxx_flags = '-fvisibility=hidden -fvisibility-inlines-hidden -Wall %s %s -ftemplate-depth-300 -Wsign-compare -Wshadow ' % (env['WARNING_CXXFLAGS'], pthread)
 
         if 'clang++' in env['CXX']:
-            common_cxx_flags += ' -Wno-unsequenced -Wtautological-compare -Wheader-hygiene '
-
+            common_cxx_flags += ' -Wno-unsequenced  -Wtautological-compare -Wheader-hygiene -Wc++14-extensions '
         if env['DEBUG']:
             env.Append(CXXFLAGS = common_cxx_flags + '-O0')
         else:
diff --git a/benchmark/run b/benchmark/run
index 6a8fdd938..36cda4e92 100755
--- a/benchmark/run
+++ b/benchmark/run
@@ -24,7 +24,7 @@ run test_getline 30 10000000
 #run test_polygon_clipping 10 1000
 #run test_polygon_clipping_rendering 10 100
 run test_proj_transform1 10 100
-run test_expression_parse 10 1000
+run test_expression_parse 10 10000
 run test_face_ptr_creation 10 1000
 run test_font_registration 10 100
 run test_offset_converter 10 1000
diff --git a/benchmark/test_expression_parse.cpp b/benchmark/test_expression_parse.cpp
index 7e399223c..f39fb8e84 100644
--- a/benchmark/test_expression_parse.cpp
+++ b/benchmark/test_expression_parse.cpp
@@ -1,8 +1,8 @@
 #include "bench_framework.hpp"
 #include <mapnik/unicode.hpp>
+#include <mapnik/attribute.hpp>
 #include <mapnik/expression.hpp>
 #include <mapnik/expression_string.hpp>
-#include <mapnik/expression_grammar.hpp>
 
 class test : public benchmark::test_case
 {
diff --git a/deps/agg/include/agg_vpgen_clip_polygon.h b/deps/agg/include/agg_vpgen_clip_polygon.h
index 4972a390b..7f98538e3 100644
--- a/deps/agg/include/agg_vpgen_clip_polygon.h
+++ b/deps/agg/include/agg_vpgen_clip_polygon.h
@@ -43,12 +43,12 @@ namespace agg
         {
         }
 
-        void clip_box(double x1, double y1, double x2, double y2)
+        void clip_box(double _x1, double _y1, double _x2, double _y2)
         {
-            m_clip_box.x1 = x1;
-            m_clip_box.y1 = y1;
-            m_clip_box.x2 = x2;
-            m_clip_box.y2 = y2;
+            m_clip_box.x1 = _x1;
+            m_clip_box.y1 = _y1;
+            m_clip_box.x2 = _x2;
+            m_clip_box.y2 = _y2;
             m_clip_box.normalize();
         }
 
diff --git a/deps/agg/include/agg_vpgen_clip_polyline.h b/deps/agg/include/agg_vpgen_clip_polyline.h
index a2e60fa7b..c7b18c98a 100644
--- a/deps/agg/include/agg_vpgen_clip_polyline.h
+++ b/deps/agg/include/agg_vpgen_clip_polyline.h
@@ -41,12 +41,12 @@ namespace agg
         {
         }
 
-        void clip_box(double x1, double y1, double x2, double y2)
+        void clip_box(double _x1, double _y1, double _x2, double _y2)
         {
-            m_clip_box.x1 = x1;
-            m_clip_box.y1 = y1;
-            m_clip_box.x2 = x2;
-            m_clip_box.y2 = y2;
+            m_clip_box.x1 = _x1;
+            m_clip_box.y1 = _y1;
+            m_clip_box.x2 = _x2;
+            m_clip_box.y2 = _y2;
             m_clip_box.normalize();
         }
 
diff --git a/include/mapnik/box2d.hpp b/include/mapnik/box2d.hpp
index 267120111..c6c794c83 100644
--- a/include/mapnik/box2d.hpp
+++ b/include/mapnik/box2d.hpp
@@ -51,11 +51,11 @@ template <typename T> class MAPNIK_DECL box2d
 public:
     using value_type = T;
     using box2d_type = box2d<value_type>;
-private:
     T minx_;
     T miny_;
     T maxx_;
     T maxy_;
+private:
     friend inline void swap(box2d_type & lhs, box2d_type & rhs)
     {
         using std::swap;
diff --git a/include/mapnik/box2d_impl.hpp b/include/mapnik/box2d_impl.hpp
index 7f3e9d1e7..b1c462d16 100644
--- a/include/mapnik/box2d_impl.hpp
+++ b/include/mapnik/box2d_impl.hpp
@@ -33,24 +33,35 @@
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
-#include <boost/fusion/include/adapt_adt.hpp>
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/support_adapt_adt_attributes.hpp>
+#include <boost/fusion/include/adapt_struct.hpp>
+#include <boost/spirit/home/x3.hpp>
 #pragma GCC diagnostic pop
 
 // agg
 #include "agg_trans_affine.h"
 
-BOOST_FUSION_ADAPT_TPL_ADT(
+BOOST_FUSION_ADAPT_TPL_STRUCT(
     (T),
     (mapnik::box2d)(T),
-    (T, T, obj.minx(), obj.set_minx(mapnik::safe_cast<T>(val)))
-    (T, T, obj.miny(), obj.set_miny(mapnik::safe_cast<T>(val)))
-    (T, T, obj.maxx(), obj.set_maxx(mapnik::safe_cast<T>(val)))
-    (T, T, obj.maxy(), obj.set_maxy(mapnik::safe_cast<T>(val))))
+    (T, minx_),
+    (T, miny_),
+    (T, maxx_),
+    (T, maxy_))
 
-namespace mapnik
+namespace mapnik { namespace detail { namespace {
+
+template <typename T>
+struct assign
 {
+    template <typename Context>
+    void operator() (Context & ctx) const
+    {
+        _val(ctx) = safe_cast<T>(_attr(ctx));
+    }
+};
+} // anonymous
+} // detail
+
 template <typename T>
 box2d<T>::box2d()
     :minx_( std::numeric_limits<T>::max()),
@@ -61,13 +72,13 @@ box2d<T>::box2d()
 template <typename T>
 box2d<T>::box2d(T minx,T miny,T maxx,T maxy)
 {
-    init(minx,miny,maxx,maxy);
+    init(minx, miny, maxx, maxy);
 }
 
 template <typename T>
 box2d<T>::box2d(coord<T,2> const& c0, coord<T,2> const& c1)
 {
-    init(c0.x,c0.y,c1.x,c1.y);
+    init(c0.x, c0.y, c1.x, c1.y);
 }
 
 template <typename T>
@@ -350,12 +361,15 @@ void box2d<T>::pad(T padding)
 template <typename T>
 bool box2d<T>::from_string(std::string const& str)
 {
-    boost::spirit::qi::lit_type lit;
-    boost::spirit::qi::double_type double_;
-    boost::spirit::ascii::space_type space;
-    bool r = boost::spirit::qi::phrase_parse(str.begin(),
+    using boost::spirit::x3::lit;
+    boost::spirit::x3::double_type double_;
+    boost::spirit::x3::ascii::space_type space;
+    bool r = boost::spirit::x3::phrase_parse(str.begin(),
                                              str.end(),
-                                             double_ >> -lit(',') >> double_ >> -lit(',') >> double_ >> -lit(',') >> double_,
+                                             double_[detail::assign<T>()] >> -lit(',') >>
+                                             double_[detail::assign<T>()] >> -lit(',') >>
+                                             double_[detail::assign<T>()] >> -lit(',') >>
+                                             double_[detail::assign<T>()],
                                              space,
                                              *this);
     return r;
diff --git a/include/mapnik/color.hpp b/include/mapnik/color.hpp
index 434a9cf21..39bcc2eac 100644
--- a/include/mapnik/color.hpp
+++ b/include/mapnik/color.hpp
@@ -38,16 +38,15 @@
 
 namespace mapnik {
 
-class MAPNIK_DECL color
-    : boost::equality_comparable<color>
+class MAPNIK_DECL color : boost::equality_comparable<color>
 {
-private:
+public:
     std::uint8_t red_;
     std::uint8_t green_;
     std::uint8_t blue_;
     std::uint8_t alpha_;
     bool premultiplied_;
-public:
+
     // default ctor
     color()
       : red_(0xff),
diff --git a/include/mapnik/css_color_grammar.hpp b/include/mapnik/css_color_grammar.hpp
deleted file mode 100644
index 8fbdeaa6f..000000000
--- a/include/mapnik/css_color_grammar.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_CSS_COLOR_GRAMMAR_HPP
-#define MAPNIK_CSS_COLOR_GRAMMAR_HPP
-
-// mapnik
-#include <mapnik/color.hpp>
-#include <mapnik/util/hsl.hpp>
-#include <mapnik/safe_cast.hpp>
-
-// boost
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#pragma GCC diagnostic pop
-
-// stl
-#include <string>
-
-namespace mapnik
-{
-
-namespace qi = boost::spirit::qi;
-namespace ascii = boost::spirit::ascii;
-
-using ascii_space_type = boost::spirit::ascii::space_type;
-
-template <typename Iterator>
-struct css_color_grammar : qi::grammar<Iterator, color(), ascii_space_type>
-{
-    // ctor
-    css_color_grammar();
-    // rules
-    qi::uint_parser< unsigned, 16, 2, 2 > hex2 ;
-    qi::uint_parser< unsigned, 16, 1, 1 > hex1 ;
-    qi::uint_parser< unsigned, 10, 1, 3 > dec3 ;
-    qi::rule<Iterator, color(), ascii_space_type> rgba_color;
-    qi::rule<Iterator, color(), ascii_space_type> rgba_percent_color;
-    qi::rule<Iterator, qi::locals<double,double,double>,color(), ascii_space_type> hsl_percent_color;
-    qi::rule<Iterator, color(), ascii_space_type> hex_color;
-    qi::rule<Iterator, color(), ascii_space_type> hex_color_small;
-    qi::rule<Iterator, color(), ascii_space_type> css_color;
-};
-
-}
-
-#endif // MAPNIK_CSS_COLOR_GRAMMAR_HPP
diff --git a/include/mapnik/css_color_grammar_x3.hpp b/include/mapnik/css_color_grammar_x3.hpp
new file mode 100644
index 000000000..0719e44ec
--- /dev/null
+++ b/include/mapnik/css_color_grammar_x3.hpp
@@ -0,0 +1,55 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_CSS_COLOR_GRAMMAR_X3_HPP
+#define MAPNIK_CSS_COLOR_GRAMMAR_X3_HPP
+
+#include <mapnik/color.hpp>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#pragma GCC diagnostic pop
+
+namespace mapnik
+{
+
+namespace x3 = boost::spirit::x3;
+
+namespace css_color_grammar
+{
+
+struct css_color_class;
+using css_color_grammar_type = x3::rule<css_color_class, mapnik::color>;
+
+BOOST_SPIRIT_DECLARE(css_color_grammar_type);
+
+}}
+
+
+namespace mapnik
+{
+css_color_grammar::css_color_grammar_type color_grammar();
+}
+
+
+#endif // MAPNIK_CSS_COLOR_GRAMMAR_X3_HPP
diff --git a/include/mapnik/css_color_grammar_impl.hpp b/include/mapnik/css_color_grammar_x3_def.hpp
similarity index 54%
rename from include/mapnik/css_color_grammar_impl.hpp
rename to include/mapnik/css_color_grammar_x3_def.hpp
index 22fa74472..2ad3cfa34 100644
--- a/include/mapnik/css_color_grammar_impl.hpp
+++ b/include/mapnik/css_color_grammar_x3_def.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,84 +20,49 @@
  *
  *****************************************************************************/
 
-// NOTE: This is an implementation header file and is only meant to be included
-//    from implementation files. It therefore doesn't have an include guard.
-// mapnik
-#include <mapnik/css_color_grammar.hpp>
-// boost
+// REF: http://www.w3.org/TR/css3-color/
+
+#ifndef MAPNIK_CSS_COLOR_GRAMMAR_X3_DEF_HPP
+#define MAPNIK_CSS_COLOR_GRAMMAR_X3_DEF_HPP
+
+#include <mapnik/css_color_grammar_x3.hpp>
+#include <mapnik/util/hsl.hpp>
+#include <mapnik/safe_cast.hpp>
+
 #pragma GCC diagnostic push
-#include <boost/fusion/include/adapt_adt.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_fusion.hpp>
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#include <boost/fusion/adapted/struct.hpp>
+#include <boost/fusion/adapted/std_tuple.hpp>
 #pragma GCC diagnostic pop
 
-
-BOOST_FUSION_ADAPT_ADT(
+BOOST_FUSION_ADAPT_STRUCT (
     mapnik::color,
-    (unsigned, unsigned, obj.red(), obj.set_red(mapnik::safe_cast<uint8_t>(val)))
-    (unsigned, unsigned, obj.green(), obj.set_green(mapnik::safe_cast<uint8_t>(val)))
-    (unsigned, unsigned, obj.blue(), obj.set_blue(mapnik::safe_cast<uint8_t>(val)))
-    (unsigned, unsigned, obj.alpha(), obj.set_alpha(mapnik::safe_cast<uint8_t>(val)))
+    (std::uint8_t, red_)
+    (std::uint8_t, green_)
+    (std::uint8_t, blue_)
+    (std::uint8_t, alpha_)
     )
 
-namespace mapnik
+namespace mapnik {
+
+namespace x3 = boost::spirit::x3;
+
+namespace css_color_grammar {
+
+using x3::lit;
+using x3::uint_parser;
+using x3::hex;
+using x3::symbols;
+using x3::omit;
+using x3::attr;
+using x3::double_;
+using x3::no_case;
+using x3::no_skip;
+
+struct named_colors_ : x3::symbols<color>
 {
-namespace phoenix = boost::phoenix;
-
-struct percent_conv_impl
-{
-    using result_type = unsigned;
-    unsigned operator() (double val) const
-    {
-        return safe_cast<uint8_t>(std::lround((255.0 * val)/100.0));
-    }
-};
-
-struct alpha_conv_impl
-{
-    using result_type = unsigned;
-    unsigned operator() (double val) const
-    {
-        return safe_cast<uint8_t>(std::lround((255.0 * val)));
-    }
-};
-
-struct hsl_conv_impl
-{
-    using result_type = void;
-    template <typename T0,typename T1, typename T2, typename T3>
-    void operator() (T0 & c, T1 h, T2 s, T3 l) const
-    {
-        double m1,m2;
-        // normalize values
-        h /= 360.0;
-        s /= 100.0;
-        l /= 100.0;
-
-        if (l <= 0.5)
-        {
-            m2 = l * (s + 1.0);
-        }
-        else
-        {
-            m2 = l + s - l*s;
-        }
-        m1 = l * 2 - m2;
-
-        double r = hue_to_rgb(m1, m2, h + 1.0/3.0);
-        double g = hue_to_rgb(m1, m2, h);
-        double b = hue_to_rgb(m1, m2, h - 1.0/3.0);
-
-        c.set_red(safe_cast<uint8_t>(std::lround(255.0 * r)));
-        c.set_green(safe_cast<uint8_t>(std::lround(255.0 * g)));
-        c.set_blue(safe_cast<uint8_t>(std::lround(255.0 * b)));
-    }
-};
-
-struct named_colors : qi::symbols<char,color>
-{
-    named_colors()
+    named_colors_()
     {
         add
             ("aliceblue", color(240, 248, 255))
@@ -249,77 +214,241 @@ struct named_colors : qi::symbols<char,color>
             ("transparent", color(0, 0, 0, 0))
             ;
     }
+} named_colors;
+
+x3::uint_parser<std::uint8_t, 16, 2, 2> hex2;
+x3::uint_parser<std::uint8_t, 16, 1, 1> hex1;
+x3::uint_parser<std::uint8_t, 10, 1, 3> dec3;
+
+// starting rule
+css_color_grammar_type const css_color("css_color");
+// rules
+x3::rule<class hex2_color, color> const hex2_color("hex2_color");
+x3::rule<class hex1_color, color> const hex1_color("hex1_color");
+x3::rule<class rgb_color,  color> const rgb_color("rgb_color");
+x3::rule<class rgba_color, color> const rgba_color("rgba_color");
+x3::rule<class rgb_color_percent, color> const rgb_color_percent("rgb_color_percent");
+x3::rule<class rgba_color_percent, color> const rgba_color_percent("rgba_color_percent");
+
+struct clip_opacity
+{
+    static double call(double val)
+    {
+        if (val > 1.0) return 1.0;
+        if (val < 0.0) return 0.0;
+        return val;
+    }
 };
 
-template <typename Iterator>
-css_color_grammar<Iterator>::css_color_grammar()
-    : css_color_grammar::base_type(css_color)
-
+struct percent_converter
 {
-    qi::lit_type lit;
-    qi::_val_type _val;
-    qi::double_type double_;
-    qi::_1_type _1;
-    qi::_a_type _a;
-    qi::_b_type _b;
-    qi::_c_type _c;
-    qi::lexeme_type lexeme;
-    ascii::no_case_type no_case;
-    using phoenix::at_c;
-    // symbols
-    named_colors named;
-    // functions
-    phoenix::function<percent_conv_impl> percent_converter;
-    phoenix::function<alpha_conv_impl>   alpha_converter;
-    phoenix::function<hsl_conv_impl>  hsl_converter;
+    static std::uint8_t call(double val)
+    {
+        return safe_cast<std::uint8_t>(std::lround((255.0 * val)/100.0));
+    }
+};
 
-    css_color %= rgba_color
-        | rgba_percent_color
-        | hsl_percent_color
-        | hex_color
-        | hex_color_small
-        | no_case[named];
+auto dec_red = [](auto& ctx)
+{
+    _val(ctx).red_ = _attr(ctx);
+};
 
-    hex_color = lexeme[ lit('#')
-        >> hex2 [ at_c<0>(_val) = _1 ]
-        >> hex2 [ at_c<1>(_val) = _1 ]
-        >> hex2 [ at_c<2>(_val) = _1 ]
-        >>-hex2 [ at_c<3>(_val) = _1 ] ]
-        ;
+auto dec_green = [](auto& ctx)
+{
+    _val(ctx).green_ = _attr(ctx);
+};
 
-    hex_color_small = lexeme[ lit('#')
-        >> hex1 [ at_c<0>(_val) = _1 | _1 << 4 ]
-        >> hex1 [ at_c<1>(_val) = _1 | _1 << 4 ]
-        >> hex1 [ at_c<2>(_val) = _1 | _1 << 4 ]
-        >>-hex1 [ at_c<3>(_val) = _1 | _1 << 4 ] ]
-        ;
+auto dec_blue = [](auto& ctx)
+{
+    _val(ctx).blue_ = _attr(ctx);
+};
 
-    rgba_color = lit("rgb") >> -lit('a')
-                            >> lit('(')
-                            >> dec3 [at_c<0>(_val) = _1] >> ','
-                            >> dec3 [at_c<1>(_val) = _1] >> ','
-                            >> dec3 [at_c<2>(_val) = _1]
-                            >> -(','>> -double_ [at_c<3>(_val) = alpha_converter(_1)])
-                            >> lit(')')
-        ;
+auto opacity = [](auto& ctx)
+{
+    _val(ctx).alpha_ = uint8_t((255.0 * clip_opacity::call(_attr(ctx))) + 0.5);
+};
 
-    rgba_percent_color = lit("rgb") >> -lit('a')
-                                    >> lit('(')
-                                    >> double_ [at_c<0>(_val) = percent_converter(_1)] >> '%' >> ','
-                                    >> double_ [at_c<1>(_val) = percent_converter(_1)] >> '%' >> ','
-                                    >> double_ [at_c<2>(_val) = percent_converter(_1)] >> '%'
-                                    >> -(','>> -double_ [at_c<3>(_val) = alpha_converter(_1)])
-                                    >> lit(')')
-        ;
+auto percent_red = [] (auto & ctx)
+{
+    _val(ctx).red_ = percent_converter::call(_attr(ctx));
+};
 
-    hsl_percent_color = lit("hsl") >> -lit('a')
-                                   >> lit('(')
-                                   >> double_ [ _a = _1] >> ','        // hue 0..360
-                                   >> double_ [ _b = _1] >> '%' >> ',' // saturation 0..100%
-                                   >> double_ [ _c = _1] >> '%'        // lightness  0..100%
-                                   >> -(','>> -double_ [at_c<3>(_val) = alpha_converter(_1)]) // opacity 0...1
-                                   >> lit (')') [ hsl_converter(_val,_a,_b,_c)]
-        ;
+auto percent_green = [] (auto & ctx)
+{
+    _val(ctx).green_ = percent_converter::call(_attr(ctx));
+};
+
+auto percent_blue = [] (auto & ctx)
+{
+    _val(ctx).blue_ = percent_converter::call(_attr(ctx));
+};
+
+auto hex1_red = [](auto& ctx)
+{
+    _val(ctx).red_ = _attr(ctx) | _attr(ctx) << 4;
+};
+
+auto hex1_green = [](auto& ctx)
+{
+    _val(ctx).green_ = _attr(ctx) | _attr(ctx) << 4;
+};
+
+auto hex1_blue = [](auto& ctx)
+{
+    _val(ctx).blue_ = _attr(ctx) | _attr(ctx) << 4;
+};
+
+auto hex1_opacity = [](auto& ctx)
+{
+    _val(ctx).alpha_ = _attr(ctx) | _attr(ctx) << 4;
+};
+
+auto hex2_red = [](auto& ctx)
+{
+    _val(ctx).red_ = _attr(ctx);
+};
+
+auto hex2_green = [](auto& ctx)
+{
+    _val(ctx).green_ = _attr(ctx);
+};
+
+auto hex2_blue = [](auto& ctx)
+{
+    _val(ctx).blue_ = _attr(ctx);
+};
+
+auto hex2_opacity = [](auto& ctx)
+{
+    _val(ctx).alpha_ = _attr(ctx);
+};
+
+auto hsl_to_rgba = [] (auto& ctx)
+{
+    double h = std::get<0>(_attr(ctx));
+    double s = std::get<1>(_attr(ctx));
+    double l = std::get<2>(_attr(ctx));
+    double m1;
+    double m2;
+    // normalise values
+    h /= 360.0;
+    s /= 100.0;
+    l /= 100.0;
+    if (l <= 0.5)
+    {
+        m2 = l * (s + 1.0);
+    }
+    else
+    {
+        m2 = l + s - l*s;
+    }
+    m1 = l * 2 - m2;
+
+    double r = hue_to_rgb(m1, m2, h + 1.0/3.0);
+    double g = hue_to_rgb(m1, m2, h);
+    double b = hue_to_rgb(m1, m2, h - 1.0/3.0);
+    uint8_t alpha = uint8_t((255.0 * clip_opacity::call(std::get<3>(_attr(ctx)))) + 0.5);
+    _val(ctx) = color(safe_cast<uint8_t>(std::lround(255.0 * r)),
+                      safe_cast<uint8_t>(std::lround(255.0 * g)),
+                      safe_cast<uint8_t>(std::lround(255.0 * b)),
+                      alpha);
+};
+
+auto const hex2_color_def = no_skip[lit('#')
+                                    >> hex2[hex2_red]
+                                    >> hex2[hex2_green]
+                                    >> hex2[hex2_blue]
+                                    >> (hex2[hex2_opacity] | attr(255)[hex2_opacity])];
+
+auto const hex1_color_def = no_skip[lit('#')
+                                    >> hex1[hex1_red]
+                                    >> hex1[hex1_green]
+                                    >> hex1[hex1_blue]
+                                    >> (hex1[hex1_opacity] | attr(15)[hex1_opacity])];
+
+auto const rgb_color_def = lit("rgb")
+    >> lit('(') >> dec3[dec_red]
+    >> lit(',') >> dec3[dec_green]
+    >> lit(',') >> dec3[dec_blue]
+    >> attr(255) >> lit(')');
+
+auto const rgb_color_percent_def = lit("rgb")
+    >> lit('(') >> dec3[percent_red] >> lit('%')
+    >> lit(',') >> dec3[percent_green] >> lit('%')
+    >> lit(',') >> dec3[percent_blue] >> lit('%')
+    >> attr(255) >> lit(')');
+
+auto const rgba_color_def = lit("rgba")
+    >> lit('(') >> dec3[dec_red]
+    >> lit(',') >> dec3[dec_green]
+    >> lit(',') >> dec3[dec_blue]
+    >> lit(',') >> double_[opacity] >> lit(')');
+
+auto const rgba_color_percent_def = lit("rgba")
+    >> lit('(') >> dec3[percent_red] >> lit('%')
+    >> lit(',') >> dec3[percent_green] >> lit('%')
+    >> lit(',') >> dec3[percent_blue] >> lit('%')
+    >> lit(',') >> double_[opacity] >> lit(')');
+
+auto const hsl_values = x3::rule<class hsl_values, std::tuple<std::uint8_t,std::uint8_t,std::uint8_t, double >> {} =
+    lit("hsl")
+    >> lit('(') >> dec3
+    >> lit(',') >> dec3 >> lit('%')
+    >> lit(',') >> dec3 >> lit('%')
+    >> attr(1.0) >> lit(')')
+    ;
+
+auto const hsla_values = x3::rule<class hsla_values, std::tuple<std::uint8_t,std::uint8_t,std::uint8_t, double >> {} =
+    lit("hsla")
+    >> lit('(') >> dec3
+    >> lit(',') >> dec3 >> lit('%')
+    >> lit(',') >> dec3 >> lit('%')
+    >> lit(',') >> double_ >> lit(')')
+    ;
+
+auto const hsl_color = x3::rule<class hsl_color, color> {} = hsl_values[hsl_to_rgba];
+auto const hsla_color = x3::rule<class hsla_color, color> {} = hsla_values[hsl_to_rgba];
+
+auto const css_color_def =
+    no_case[named_colors]
+    |
+    hex2_color
+    |
+    hex1_color
+    |
+    rgb_color
+    |
+    rgba_color
+    |
+    rgb_color_percent
+    |
+    rgba_color_percent
+    |
+    hsl_color
+    |
+    hsla_color
+    ;
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+BOOST_SPIRIT_DEFINE(
+    css_color,
+    hex2_color,
+    hex1_color,
+    rgb_color,
+    rgba_color,
+    rgb_color_percent,
+    rgba_color_percent
+    );
+#pragma GCC diagnostic pop
+
+} // ns
+
+css_color_grammar::css_color_grammar_type color_grammar()
+{
+    return css_color_grammar::css_color;
 }
 
-}
+} //ns mapnik
+
+#endif //MAPNIK_CSS_COLOR_GRAMMAR_X3_DEF_HPP
diff --git a/include/mapnik/datasource.hpp b/include/mapnik/datasource.hpp
index ec14a621c..4f0b17526 100644
--- a/include/mapnik/datasource.hpp
+++ b/include/mapnik/datasource.hpp
@@ -69,8 +69,8 @@ public:
         Raster
     };
 
-    datasource (parameters const& params)
-       : params_(params) {}
+    datasource (parameters const& _params)
+       : params_(_params) {}
 
     /*!
      * @brief Get the configuration parameters of the data source.
diff --git a/include/mapnik/evaluate_global_attributes.hpp b/include/mapnik/evaluate_global_attributes.hpp
index 3e3d63cbd..cf227821b 100644
--- a/include/mapnik/evaluate_global_attributes.hpp
+++ b/include/mapnik/evaluate_global_attributes.hpp
@@ -43,8 +43,8 @@ struct evaluate_expression
 {
     using value_type = T;
 
-    explicit evaluate_expression(Attributes const& attributes)
-        : attributes_(attributes) {}
+    explicit evaluate_expression(Attributes const& _attributes)
+        : attributes_(_attributes) {}
 
     value_type operator() (attribute const&) const
     {
diff --git a/include/mapnik/expression_grammar.hpp b/include/mapnik/expression_grammar.hpp
deleted file mode 100644
index ad35589bb..000000000
--- a/include/mapnik/expression_grammar.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_EXPRESSIONS_GRAMMAR_HPP
-#define MAPNIK_EXPRESSIONS_GRAMMAR_HPP
-
-// mapnik
-#include <mapnik/config.hpp>
-#include <mapnik/expression_node.hpp>
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#pragma GCC diagnostic pop
-
-namespace mapnik
-{
-namespace qi = boost::spirit::qi;
-namespace standard_wide =  boost::spirit::standard_wide;
-using standard_wide::space_type;
-
-template <typename T>
-struct integer_parser
-{
-    using type = qi::int_parser<T,10,1,-1>;
-};
-
-struct unary_function_types : qi::symbols<char, unary_function_impl>
-{
-    unary_function_types();
-};
-
-struct binary_function_types : qi::symbols<char, binary_function_impl>
-{
-    binary_function_types();
-};
-
-
-#ifdef __GNUC__
-template <typename Iterator>
-struct MAPNIK_DECL expression_grammar : qi::grammar<Iterator, expr_node(), space_type>
-#else
-template <typename Iterator>
-struct expression_grammar : qi::grammar<Iterator, expr_node(), space_type>
-#endif
-{
-    using rule_type = qi::rule<Iterator, expr_node(), space_type>;
-
-    explicit expression_grammar(std::string const& encoding = "utf-8");
-
-    qi::real_parser<double, qi::strict_real_policies<double> > strict_double;
-    typename integer_parser<mapnik::value_integer>::type int__;
-    mapnik::transcoder tr_;
-
-    rule_type expr;
-    rule_type equality_expr;
-    rule_type cond_expr;
-    rule_type relational_expr;
-    rule_type logical_expr;
-    rule_type additive_expr;
-    rule_type multiplicative_expr;
-    rule_type unary_expr;
-    rule_type not_expr;
-    rule_type primary_expr;
-    qi::rule<Iterator, unary_function_call() , space_type> unary_function_expr;
-    qi::rule<Iterator, binary_function_call() , space_type> binary_function_expr;
-    qi::rule<Iterator, std::string() > regex_match_expr;
-    qi::rule<Iterator, expr_node(expr_node), qi::locals<std::string,std::string>, space_type> regex_replace_expr;
-    qi::rule<Iterator, std::string() , space_type> attr;
-    qi::rule<Iterator, std::string() , space_type> global_attr;
-    qi::rule<Iterator, std::string(), qi::locals<char> > quoted_ustring;
-    qi::rule<Iterator, std::string()> unquoted_ustring;
-    qi::rule<Iterator, std::string(), space_type> ustring;
-
-    qi::symbols<char const, char const> unesc_char;
-    qi::rule<Iterator, char() > quote_char;
-    qi::symbols<char, expr_node> constant;
-    unary_function_types unary_func_type;
-    binary_function_types binary_func_type;
-
-};
-
-} // namespace
-
-#endif  // MAPNIK_EXPRESSIONS_GRAMMAR_HPP
diff --git a/include/mapnik/expression_grammar_impl.hpp b/include/mapnik/expression_grammar_impl.hpp
deleted file mode 100644
index 5bc85954a..000000000
--- a/include/mapnik/expression_grammar_impl.hpp
+++ /dev/null
@@ -1,280 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-// NOTE: This is an implementation header file and is only meant to be included
-//    from implementation files. It therefore doesn't have an include guard.
-
-// mapnik
-#include <mapnik/expression_node.hpp>
-#include <mapnik/expression_grammar.hpp>
-#include <mapnik/unicode.hpp>
-#include <mapnik/value/types.hpp>
-#include <mapnik/function_call.hpp>
-
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/fusion/adapted/struct.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_object.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#pragma GCC diagnostic pop
-
-BOOST_FUSION_ADAPT_STRUCT(mapnik::unary_function_call,
-                          (mapnik::unary_function_impl, fun)
-                          (mapnik::unary_function_call::argument_type, arg))
-
-BOOST_FUSION_ADAPT_STRUCT(mapnik::binary_function_call,
-                          (mapnik::binary_function_impl, fun)
-                          (mapnik::binary_function_call::argument_type, arg1)
-                          (mapnik::binary_function_call::argument_type, arg2))
-
-// fwd declare
-namespace mapnik {
-  struct attribute;
-  struct geometry_type_attribute;
-}
-
-namespace mapnik
-{
-
-struct unicode_impl
-{
-    using result_type = mapnik::value_unicode_string;
-    explicit unicode_impl(mapnik::transcoder const& tr)
-        : tr_(tr) {}
-
-    mapnik::value_unicode_string operator()(std::string const& str) const
-    {
-        return tr_.transcode(str.c_str());
-    }
-
-    mapnik::transcoder const& tr_;
-};
-
-struct regex_match_impl
-{
-    using result_type = expr_node;
-    explicit regex_match_impl(mapnik::transcoder const& tr)
-        : tr_(tr) {}
-
-    template <typename T0,typename T1>
-    expr_node operator() (T0 & node, T1 const& pattern) const;
-
-    mapnik::transcoder const& tr_;
-};
-
-struct regex_replace_impl
-{
-    using result_type = expr_node;
-    explicit regex_replace_impl(mapnik::transcoder const& tr)
-        : tr_(tr) {}
-
-    template <typename T0,typename T1,typename T2>
-    expr_node operator() (T0 & node, T1 const& pattern, T2 const& format) const;
-
-    mapnik::transcoder const& tr_;
-};
-
-unary_function_types::unary_function_types()
-{
-    add
-        ("sin",  sin_impl())
-        ("cos",  cos_impl())
-        ("tan",  tan_impl())
-        ("atan", atan_impl())
-        ("exp",  exp_impl())
-        ("log",  log_impl())
-        ("abs",  abs_impl())
-        ("length",length_impl())
-        ;
-}
-
-binary_function_types::binary_function_types()
-{
-    add
-        ("min", binary_function_impl(min_impl))
-        ("max", binary_function_impl(max_impl))
-        ("pow", binary_function_impl(pow_impl))
-        ;
-}
-
-template <typename T0,typename T1>
-expr_node regex_match_impl::operator() (T0 & node, T1 const& pattern) const
-{
-    return regex_match_node(tr_,node,pattern);
-}
-
-template <typename T0,typename T1,typename T2>
-expr_node regex_replace_impl::operator() (T0 & node, T1 const& pattern, T2 const& format) const
-{
-    return regex_replace_node(tr_,node,pattern,format);
-}
-
-template <typename Iterator>
-expression_grammar<Iterator>::expression_grammar(std::string const& encoding)
-    : expression_grammar::base_type(expr),
-      tr_(encoding)
-{
-    qi::_1_type _1;
-    qi::_a_type _a;
-    qi::_b_type _b;
-    qi::_r1_type _r1;
-    qi::no_skip_type no_skip;
-    qi::_val_type _val;
-    qi::lit_type lit;
-    qi::double_type double_;
-    qi::hex_type hex;
-    qi::omit_type omit;
-    qi::alpha_type alpha;
-    qi::alnum_type alnum;
-    standard_wide::char_type char_;
-    standard_wide::no_case_type no_case;
-    using boost::phoenix::construct;
-    using boost::phoenix::if_else;
-
-    boost::phoenix::function<unicode_impl> unicode = unicode_impl(tr_);
-    boost::phoenix::function<regex_match_impl> regex_match = regex_match_impl(tr_);
-    boost::phoenix::function<regex_replace_impl> regex_replace = regex_replace_impl(tr_);
-
-    constant.add
-        ("null",        mapnik::value_null())
-        ("false",       mapnik::value_bool(false))
-        ("true",        mapnik::value_bool(true))
-        ("point",       mapnik::value_integer(1))
-        ("linestring",  mapnik::value_integer(2))
-        ("polygon",     mapnik::value_integer(3))
-        ("collection",  mapnik::value_integer(4))
-        ("pi",          mapnik::value_double(3.1415926535897932384626433832795))
-        ("deg_to_rad",  mapnik::value_double(0.017453292519943295769236907684886))
-        ("rad_to_deg",  mapnik::value_double(57.295779513082320876798154814105))
-        ;
-
-    expr = logical_expr [_val = _1]
-        //| ustring [_val = unicode(_1)]
-        ;
-
-    logical_expr = not_expr [_val = _1]
-        >>
-        *(  (  ( lit("and") | lit("&&")) >> not_expr [_val && _1] )
-            | (( lit("or") | lit("||")) >> not_expr [_val || _1])
-            )
-        ;
-
-    not_expr =
-        cond_expr [_val = _1 ]
-        | ((lit("not") | lit('!')) >> cond_expr [ _val = !_1 ])
-        ;
-
-    cond_expr = equality_expr [_val = _1] | additive_expr [_val = _1]
-        ;
-
-    equality_expr =
-        relational_expr [_val = _1]
-        >> *(  ( (lit("=") | lit("eq") | lit("is")) >> relational_expr [_val == _1])
-               | (( lit("!=") | lit("<>") | lit("neq") ) >> relational_expr [_val != _1])
-            )
-        ;
-
-    regex_match_expr = lit(".match")
-        >> lit('(')
-        >> quoted_ustring [_val = _1]
-        >> lit(')')
-        ;
-
-    regex_replace_expr =
-        lit(".replace")
-        >> lit('(')
-        >> quoted_ustring           [_a = _1]
-        >> lit(',')
-        >> quoted_ustring           [_b = _1]
-        >> lit(')')          [_val = regex_replace(_r1,_a,_b)]
-        ;
-
-    relational_expr = additive_expr[_val = _1]
-        >>
-        *(  (   (lit("<=") | lit("le") ) >> additive_expr [ _val <= _1 ])
-            | ( (lit('<')  | lit("lt") ) >> additive_expr [ _val <  _1 ])
-            | ( (lit(">=") | lit("ge") ) >> additive_expr [ _val >= _1 ])
-            | ( (lit('>')  | lit("gt") ) >> additive_expr [ _val >  _1 ])
-            )
-        ;
-
-    additive_expr = multiplicative_expr [_val = _1]
-        >> * (   '+' >> multiplicative_expr[_val += _1]
-                 | '-' >> multiplicative_expr[_val -= _1]
-            )
-        ;
-
-    multiplicative_expr = unary_expr [_val = _1]
-        >> *(     '*' >> unary_expr [_val *= _1]
-                  | '/' >> unary_expr [_val /= _1]
-                  | '%' >> unary_expr [_val %= construct<mapnik::expr_node>(_1)] //needed by clang++ with -std=c++11
-                  |  regex_match_expr[_val = regex_match(_val, _1)]
-                  |  regex_replace_expr(_val) [_val = _1]
-            )
-        ;
-
-    unary_function_expr = unary_func_type >> '(' > logical_expr > ')'
-        ;
-
-    binary_function_expr = binary_func_type >> '(' > logical_expr > ','
-                                                   > logical_expr > ')'
-        ;
-
-    unary_expr = primary_expr [_val = _1]
-        | '+' >> primary_expr [_val = _1]
-        | '-' >> primary_expr [_val = -_1]
-        ;
-
-    primary_expr = strict_double [_val = _1]
-        | int__[_val = _1]
-        | no_case[constant] [_val = _1]
-        | quoted_ustring [_val = unicode(_1)]
-        | attr [if_else(_1 == "mapnik::geometry_type",
-                        _val = construct<mapnik::geometry_type_attribute>(),
-                        _val = construct<mapnik::attribute>(_1))]
-        | global_attr [_val = construct<mapnik::global_attribute>( _1 )]
-        | unary_function_expr [_val = _1]
-        | binary_function_expr [_val = _1]
-        | '(' > logical_expr [_val = _1 ] > ')'
-        //  TODO: this is a backward compatibility hack to allow unquoted strings
-        | unquoted_ustring [_val = unicode(_1)]
-        // ^ https://github.com/mapnik/mapnik/pull/3389
-        ;
-
-    unesc_char.add("\\a", '\a')("\\b", '\b')("\\f", '\f')("\\n", '\n')
-        ("\\r", '\r')("\\t", '\t')("\\v", '\v')("\\\\", '\\')
-        ("\\\'", '\'')("\\\"", '\"')
-        ;
-
-    ustring %= no_skip[alpha >> *alnum];
-    quote_char %= char_('\'') | char_('"');
-    quoted_ustring %= omit[quote_char[_a = _1]]
-        >> *(unesc_char | "\\x" >> hex | (char_ - lit(_a)))
-        >> lit(_a);
-    unquoted_ustring %= no_skip[alpha >> *alnum] - lit("not");
-    attr %= '[' >> no_skip[+~char_(']')] >> ']';
-    global_attr %= '@' >> no_skip[alpha >> * (alnum | char_('-'))];
-
-}
-
-}
diff --git a/include/mapnik/expression_grammar_x3.hpp b/include/mapnik/expression_grammar_x3.hpp
new file mode 100644
index 000000000..889211939
--- /dev/null
+++ b/include/mapnik/expression_grammar_x3.hpp
@@ -0,0 +1,51 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2015 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_EXPRESSIONS_GRAMMAR_X3_HPP
+#define MAPNIK_EXPRESSIONS_GRAMMAR_X3_HPP
+
+#include <mapnik/expression_node.hpp>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#pragma GCC diagnostic pop
+
+namespace mapnik { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+struct transcoder_tag;
+struct expression_class; // top-most ID
+using expression_grammar_type = x3::rule<expression_class, expr_node>;
+
+BOOST_SPIRIT_DECLARE(expression_grammar_type);
+
+}}
+
+
+namespace mapnik
+{
+grammar::expression_grammar_type expression_grammar();
+}
+
+
+#endif // MAPNIK_EXPRESSIONS_GRAMMAR_X3_HPP
diff --git a/include/mapnik/expression_grammar_x3_config.hpp b/include/mapnik/expression_grammar_x3_config.hpp
new file mode 100644
index 000000000..402fdd6b3
--- /dev/null
+++ b/include/mapnik/expression_grammar_x3_config.hpp
@@ -0,0 +1,43 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2015 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_EXPRESSIONS_GRAMMAR_X3_CONFIG_HPP
+#define MAPNIK_EXPRESSIONS_GRAMMAR_X3_CONFIG_HPP
+
+#include <mapnik/expression_grammar_x3.hpp>
+#include <mapnik/unicode.hpp>
+#include <string>
+
+namespace mapnik { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+using iterator_type = std::string::const_iterator;
+using phrase_context_type = x3::phrase_parse_context<x3::ascii::space_type>::type;
+
+// define combined context
+using context_type = x3::with_context<transcoder_tag,
+                                      std::reference_wrapper<mapnik::transcoder const> const,
+                                      phrase_context_type>::type;
+
+}}
+
+#endif // MAPNIK_EXPRESSIONS_GRAMMAR_X3_CONFIG_HPP
diff --git a/include/mapnik/expression_grammar_x3_def.hpp b/include/mapnik/expression_grammar_x3_def.hpp
new file mode 100644
index 000000000..0ef8fe960
--- /dev/null
+++ b/include/mapnik/expression_grammar_x3_def.hpp
@@ -0,0 +1,433 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_EXPRESSIONS_GRAMMAR_X3_DEF_HPP
+#define MAPNIK_EXPRESSIONS_GRAMMAR_X3_DEF_HPP
+
+#include <mapnik/expression_grammar_x3.hpp>
+#include <mapnik/expression_node.hpp>
+#include <mapnik/function_call.hpp>
+#include <mapnik/unicode.hpp>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#include <boost/spirit/home/x3/support/ast/variant.hpp>
+#include <boost/fusion/include/adapt_struct.hpp>
+#include <boost/fusion/include/std_pair.hpp>
+#pragma GCC diagnostic pop
+
+BOOST_FUSION_ADAPT_STRUCT(mapnik::unary_function_call,
+                          (mapnik::unary_function_impl, fun)
+                          (mapnik::unary_function_call::argument_type, arg))
+
+BOOST_FUSION_ADAPT_STRUCT(mapnik::binary_function_call,
+                          (mapnik::binary_function_impl, fun)
+                          (mapnik::binary_function_call::argument_type, arg1)
+                          (mapnik::binary_function_call::argument_type, arg2))
+
+
+namespace mapnik { namespace grammar {
+
+    namespace x3 = boost::spirit::x3;
+    namespace ascii = boost::spirit::x3::ascii;
+    using ascii::char_;
+    using ascii::string;
+    using x3::lit;
+    using x3::double_;
+    using x3::int_;
+    using x3::bool_;
+    using x3::_attr;
+    using x3::_val;
+    using x3::no_skip;
+    using x3::lexeme;
+    using x3::no_case;
+    using x3::alpha;
+    using x3::alnum;
+    using x3::hex;
+    struct transcoder_tag;
+
+    auto do_assign = [] (auto & ctx)
+    {
+        _val(ctx) = std::move(_attr(ctx));
+    };
+
+    auto do_negate = [] (auto & ctx)
+    {
+        _val(ctx) = std::move(unary_node<mapnik::tags::negate>(_attr(ctx)));
+    };
+
+    auto do_attribute = [] (auto & ctx)
+    {
+        _val(ctx) = std::move(attribute(_attr(ctx)));
+    };
+
+    auto do_global_attribute = [] (auto & ctx)
+    {
+        _val(ctx) = std::move(global_attribute(_attr(ctx)));
+    };
+
+    auto do_geometry_type_attribute = [] (auto & ctx)
+    {
+        _val(ctx) = std::move(geometry_type_attribute());
+    };
+
+    auto do_add = [] (auto & ctx)
+    {
+        _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::plus>(std::move(_val(ctx)), std::move(_attr(ctx))));
+    };
+
+    auto do_subt = [] (auto & ctx)
+    {
+        _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::minus>(std::move(_val(ctx)), std::move(_attr(ctx))));
+    };
+
+    auto do_mult = [] (auto & ctx)
+    {
+        _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::mult>(std::move(_val(ctx)), std::move(_attr(ctx))));
+    };
+
+    auto do_div = [] (auto & ctx)
+    {
+        _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::div>(std::move(_val(ctx)), std::move(_attr(ctx))));
+    };
+
+    auto do_mod = [] (auto & ctx)
+    {
+        _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::mod>(std::move(_val(ctx)), std::move(_attr(ctx))));
+    };
+
+    auto do_unicode = [] (auto & ctx)
+    {
+        auto & tr = x3::get<transcoder_tag>(ctx).get();
+        _val(ctx) = std::move(tr.transcode(_attr(ctx).c_str()));
+    };
+
+    auto do_null = [] (auto & ctx)
+    {
+        _val(ctx) = std::move(mapnik::value_null());
+    };
+
+    auto do_not = [] (auto & ctx)
+    {
+        mapnik::unary_node<mapnik::tags::logical_not> node(_attr(ctx));
+        _val(ctx) = std::move(node);
+    };
+
+    auto do_and = [] (auto & ctx)
+    {
+        _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::logical_and>(std::move(_val(ctx)), std::move(_attr(ctx))));
+    };
+
+    auto do_or = [] (auto & ctx)
+    {
+        _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::logical_or>(std::move(_val(ctx)), std::move(_attr(ctx))));
+    };
+
+    auto do_equal = [] (auto & ctx)
+    {
+        _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::equal_to>(std::move(_val(ctx)), std::move(_attr(ctx))));
+    };
+
+    auto do_not_equal = [] (auto & ctx)
+    {
+        _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::not_equal_to>(std::move(_val(ctx)), std::move(_attr(ctx))));
+    };
+
+    auto do_less = [] (auto & ctx)
+    {
+        _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::less>(std::move(_val(ctx)), std::move(_attr(ctx))));
+    };
+
+    auto do_less_equal = [] (auto & ctx)
+    {
+        _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::less_equal>(std::move(_val(ctx)), std::move(_attr(ctx))));
+    };
+
+    auto do_greater = [] (auto & ctx)
+    {
+        _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::greater>(std::move(_val(ctx)), std::move(_attr(ctx))));
+    };
+
+    auto do_greater_equal = [] (auto & ctx)
+    {
+        _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::greater_equal>(std::move(_val(ctx)), std::move(_attr(ctx))));
+    };
+
+// regex
+    auto do_regex_match = [] (auto & ctx)
+    {
+        auto const& tr = x3::get<transcoder_tag>(ctx).get();
+        _val(ctx) = std::move(mapnik::regex_match_node(tr, std::move(_val(ctx)) , std::move(_attr(ctx))));
+    };
+
+    auto do_regex_replace = [] (auto & ctx)
+    {
+        auto const& tr = x3::get<transcoder_tag>(ctx).get();
+        auto const& pattern = std::get<0>(_attr(ctx));
+        auto const& format = std::get<1>(_attr(ctx));
+        _val(ctx) = mapnik::regex_replace_node(tr, _val(ctx) , pattern, format);
+    };
+
+// mapnik::value_integer
+    auto const mapnik_int = x3::int_parser<value_integer,10,1,-1>();
+// mapnik::value_double
+    auto const mapnik_double = x3::real_parser<value_double, x3::strict_real_policies<value_double>>();
+// mapnik::value_bool
+    struct boolean_ : x3::symbols<mapnik::value_bool>
+    {
+        boolean_()
+        {
+            add
+                ("true", true)
+                ("false", false)
+                ;
+        }
+    } boolean;
+
+    struct floating_point_constants :  x3::symbols<mapnik::value_double>
+    {
+        floating_point_constants()
+        {
+            add
+                ("pi", 3.1415926535897932384626433832795)
+                ("deg_to_rad",0.017453292519943295769236907684886)
+                ("rad_to_deg",57.295779513082320876798154814105)
+                ;
+        }
+    } float_const;
+
+// unary functions
+    struct unary_function_types_ : x3::symbols<unary_function_impl>
+    {
+        unary_function_types_()
+        {
+            add
+                ("sin",  sin_impl())
+                ("cos",  cos_impl())
+                ("tan",  tan_impl())
+                ("atan", atan_impl())
+                ("exp",  exp_impl())
+                ("log",  log_impl())
+                ("abs",  abs_impl())
+                ("length",length_impl())
+                ;
+        }
+    } unary_func_types ;
+
+
+// binary functions
+
+    struct binary_function_types_ : x3::symbols<binary_function_impl>
+    {
+        binary_function_types_()
+        {
+            add
+                ("min", binary_function_impl(min_impl))
+                ("max", binary_function_impl(max_impl))
+                ("pow", binary_function_impl(pow_impl))
+                ;
+        }
+    } binary_func_types;
+
+// geometry types
+    struct geometry_types_ : x3::symbols<mapnik::value_integer>
+    {
+        geometry_types_()
+        {
+            add
+                ("point", 1)
+                ("linestring", 2)
+                ("polygon",3)
+                ("collection",4)
+                ;
+        }
+    } geometry_type;
+
+    struct unesc_chars_ : x3::symbols<char>
+    {
+        unesc_chars_()
+        {
+            add
+                ("\\a", '\a')
+                ("\\b", '\b')
+                ("\\f", '\f')
+                ("\\n", '\n')
+                ("\\r", '\r')
+                ("\\t", '\t')
+                ("\\v", '\v')
+                ("\\\\", '\\')
+                ("\\\'", '\'')
+                ("\\\"", '\"')
+                ;
+        }
+    } unesc_char;
+    // starting rule
+    expression_grammar_type const expression("expression");
+    // rules
+    x3::rule<class logical_expression, mapnik::expr_node> const logical_expression("logical expression");
+    x3::rule<class not_expression, mapnik::expr_node> const not_expression("not expression");
+    x3::rule<class conditional_expression, mapnik::expr_node> const conditional_expression("conditional expression");
+    x3::rule<class equality_expression, mapnik::expr_node> const equality_expression("equality expression");
+    x3::rule<class relational_expression, mapnik::expr_node> const relational_expression("relational expression");
+    x3::rule<class additive_expression, mapnik::expr_node> const additive_expression("additive expression");
+    x3::rule<class multiplicative_expression, mapnik::expr_node> const multiplicative_expression("multiplicative expression");
+    x3::rule<class unary_func_expression, mapnik::unary_function_call> const unary_func_expression("unary function expression");
+    x3::rule<class binary_func_expression, mapnik::binary_function_call> const binary_func_expression("binary function expression");
+    x3::rule<class unary_expression, mapnik::expr_node> const unary_expression("unary expression");
+    x3::rule<class primary_expression, mapnik::expr_node> const primary_expression("primary expression");
+    x3::rule<class regex_match_expression, std::string> const regex_match_expression("regex match expression");
+    x3::rule<class regex_replace_expression, std::pair<std::string,std::string> > const regex_replace_expression("regex replace expression");
+
+    // strings
+    auto const single_quoted_string = x3::rule<class single_quoted_string, std::string> {} = lit('\'') >> no_skip[*(unesc_char | ("\\x" > hex) | (char_ - '\''))] > '\'';
+    auto const double_quoted_string = x3::rule<class double_quoted_string, std::string> {} = lit('"') >> no_skip[*(unesc_char | ("\\x" > hex) | (char_ - '"'))] > '"';
+    auto const quoted_string = x3::rule<class quoted_string, std::string> {} = single_quoted_string | double_quoted_string;
+
+    auto const unquoted_ustring = x3::rule<class ustring, std::string> {} = no_skip[alpha > *alnum] - lit("not");
+
+    // start
+    auto const expression_def = logical_expression [do_assign]
+        ;
+
+    auto const logical_expression_def = not_expression[do_assign] >
+        *(((lit("and") | lit("&&")) > not_expression[do_and])
+          |
+          ((lit("or") | lit("||")) > not_expression[do_or]));
+
+    auto const not_expression_def = conditional_expression[do_assign]
+        |
+        (lit("not") | lit('!')) > conditional_expression[do_not]
+        ;
+
+    auto const conditional_expression_def = equality_expression[do_assign]
+        |
+        additive_expression[do_assign]
+        ;
+
+    auto const equality_expression_def = relational_expression[do_assign] >
+        *( ( ( lit("=") | lit("eq") | lit("is")) > relational_expression [do_equal])
+           | (( lit( "!=") | lit("<>") | lit("neq") ) > relational_expression [do_not_equal])
+            );
+
+    auto const relational_expression_def = additive_expression[do_assign] >
+        *( ( (lit("<=") | lit("le")) >  additive_expression [do_less_equal])
+           |
+           ( (lit("<")  | lit("lt")) >> additive_expression[do_less]) // allow backtracking to be able to handle '<' and '<>' correctly
+           |
+           ( (lit(">=") | lit("ge")) > additive_expression [do_greater_equal])
+           |
+           ( (lit(">")  | lit("gt")) > additive_expression [do_greater]));
+
+
+    auto const additive_expression_def = multiplicative_expression[do_assign]
+        > *( ('+' > multiplicative_expression[do_add])
+             |
+             ('-' > multiplicative_expression[do_subt]));
+
+    auto const feature_attr = lexeme['[' > +~char_(']') > ']'];
+    auto const global_attr = x3::rule<class global_attr, std::string> {} = lexeme[lit('@') > alpha > *alnum];
+
+    auto const regex_match_expression_def = lit(".match") > '(' > quoted_string > ')';
+    auto const regex_replace_expression_def = lit(".replace") > '(' > quoted_string > ',' > quoted_string > ')';
+    auto const multiplicative_expression_def = unary_expression [do_assign]
+        > *( '*' > unary_expression [do_mult]
+             |
+             '/' > unary_expression [do_div]
+             |
+             '%' > unary_expression [do_mod]
+             |
+             regex_match_expression[do_regex_match]
+             |
+             regex_replace_expression[do_regex_replace]
+            );
+
+    auto const unary_func_expression_def = unary_func_types > '(' > expression > ')';
+    auto const binary_func_expression_def = binary_func_types > '(' > expression > ',' > expression > ')';
+
+    auto const unary_expression_def =
+        primary_expression[do_assign]
+        |
+        '+' > primary_expression[do_assign]
+        |
+        '-' > primary_expression[do_negate]
+        ;
+
+    auto const primary_expression_def =
+        mapnik_double[do_assign]
+        |
+        mapnik_int[do_assign]
+        |
+        no_case[boolean][do_assign]
+        |
+        no_case["null"][do_null]
+        |
+        no_case[geometry_type][do_assign]
+        |
+        float_const[do_assign]
+        |
+        quoted_string[do_unicode]
+        |
+        lit("[mapnik::geometry_type]")[do_geometry_type_attribute]
+        |
+        feature_attr[do_attribute]
+        |
+        global_attr[do_global_attribute]
+        |
+        unary_func_expression[do_assign]
+        |
+        binary_func_expression[do_assign]
+        |
+        ('(' > logical_expression[do_assign] > ')')
+        |
+        unquoted_ustring[do_unicode]
+        // ^ https://github.com/mapnik/mapnik/pull/3389
+        ;
+
+    BOOST_SPIRIT_DEFINE (
+        expression,
+        logical_expression,
+        not_expression,
+        conditional_expression,
+        equality_expression,
+        relational_expression,
+        additive_expression,
+        regex_match_expression,
+        regex_replace_expression,
+        multiplicative_expression,
+        unary_func_expression,
+        binary_func_expression,
+        unary_expression,
+        primary_expression
+        );
+
+    }}
+
+namespace mapnik
+{
+grammar::expression_grammar_type expression_grammar()
+{
+    return grammar::expression;
+}
+}
+
+#endif  // MAPNIK_EXPRESSIONS_GRAMMAR_X3_DEF_HPP
diff --git a/include/mapnik/expression_node.hpp b/include/mapnik/expression_node.hpp
index 77c45463a..e0b86ebec 100644
--- a/include/mapnik/expression_node.hpp
+++ b/include/mapnik/expression_node.hpp
@@ -59,6 +59,9 @@ template <> struct make_op<mapnik::tags::logical_or> { using type =  std::logica
 template <typename Tag>
 struct unary_node
 {
+    unary_node (expr_node && a)
+        : expr(std::move(a)) {}
+
     unary_node (expr_node const& a)
         : expr(a) {}
 
@@ -73,6 +76,10 @@ struct unary_node
 template <typename Tag>
 struct binary_node
 {
+    binary_node(expr_node && a, expr_node && b)
+        : left(std::move(a)),
+          right(std::move(b)) {}
+
     binary_node(expr_node const& a, expr_node const& b)
         : left(a),
           right(b) {}
@@ -130,81 +137,6 @@ struct MAPNIK_DECL regex_replace_node
     std::shared_ptr<_regex_replace_impl> impl_;
 };
 
-inline expr_node & operator- (expr_node& expr)
-{
-    return expr = unary_node<mapnik::tags::negate>(expr);
-}
-
-inline expr_node & operator += ( expr_node &left, expr_node const& right)
-{
-    return left =  binary_node<mapnik::tags::plus>(left,right);
-}
-
-inline expr_node & operator -= ( expr_node &left, expr_node const& right)
-{
-    return left =  binary_node<mapnik::tags::minus>(left,right);
-}
-
-inline expr_node & operator *= ( expr_node &left , expr_node const& right)
-{
-    return left =  binary_node<mapnik::tags::mult>(left,right);
-}
-
-inline expr_node & operator /= ( expr_node &left , expr_node const& right)
-{
-    return left =  binary_node<mapnik::tags::div>(left,right);
-}
-
-inline expr_node & operator %= ( expr_node &left , expr_node const& right)
-{
-    return left = binary_node<mapnik::tags::mod>(left,right);
-}
-
-inline expr_node & operator < ( expr_node &left, expr_node const& right)
-{
-    return left = binary_node<mapnik::tags::less>(left,right);
-}
-
-inline expr_node & operator <= ( expr_node &left, expr_node const& right)
-{
-    return left = binary_node<mapnik::tags::less_equal>(left,right);
-}
-
-inline expr_node & operator > ( expr_node &left, expr_node const& right)
-{
-    return left = binary_node<mapnik::tags::greater>(left,right);
-}
-
-inline expr_node & operator >= ( expr_node &left, expr_node const& right)
-{
-    return left = binary_node<mapnik::tags::greater_equal>(left,right);
-}
-
-inline expr_node & operator == ( expr_node &left, expr_node const& right)
-{
-    return left = binary_node<mapnik::tags::equal_to>(left,right);
-}
-
-inline expr_node & operator != ( expr_node &left, expr_node const& right)
-{
-    return left = binary_node<mapnik::tags::not_equal_to>(left,right);
-}
-
-inline expr_node & operator ! (expr_node & expr)
-{
-    return expr = unary_node<mapnik::tags::logical_not>(expr);
-}
-
-inline expr_node & operator && ( expr_node &left, expr_node const& right)
-{
-    return left = binary_node<mapnik::tags::logical_and>(left,right);
-}
-
-inline expr_node & operator || ( expr_node &left, expr_node const& right)
-{
-    return left = binary_node<mapnik::tags::logical_or>(left,right);
-}
-
 }
 
 
diff --git a/include/mapnik/feature_style_processor_impl.hpp b/include/mapnik/feature_style_processor_impl.hpp
index 2fea9d8b3..712e0f014 100644
--- a/include/mapnik/feature_style_processor_impl.hpp
+++ b/include/mapnik/feature_style_processor_impl.hpp
@@ -368,10 +368,10 @@ void feature_style_processor<Processor>::prepare_layer(layer_rendering_material
             continue;
         }
 
-        std::vector<rule> const& rules = style->get_rules();
+        std::vector<rule> const& style_rules = style->get_rules();
         bool active_rules = false;
         rule_cache rc;
-        for(rule const& r : rules)
+        for(rule const& r : style_rules)
         {
             if (r.active(scale_denom))
             {
diff --git a/include/mapnik/function_call.hpp b/include/mapnik/function_call.hpp
index f50829bd6..84344592a 100644
--- a/include/mapnik/function_call.hpp
+++ b/include/mapnik/function_call.hpp
@@ -47,7 +47,6 @@ struct exp_impl
     {
         return std::exp(val.to_double());
     }
-
 };
 
 // log
@@ -58,7 +57,6 @@ struct log_impl
     {
         return std::log(val.to_double());
     }
-
 };
 
 // sin
@@ -102,7 +100,7 @@ struct abs_impl
 {
     value_type operator() (value_type const& val) const
     {
-        return std::fabs(val.to_double());
+        return std::abs(val.to_double());
     }
 };
 
diff --git a/include/mapnik/grid/grid_renderer.hpp b/include/mapnik/grid/grid_renderer.hpp
index cc689e308..4b6060c69 100644
--- a/include/mapnik/grid/grid_renderer.hpp
+++ b/include/mapnik/grid/grid_renderer.hpp
@@ -124,9 +124,9 @@ public:
         return pixmap_.painted();
     }
 
-    void painted(bool painted)
+    void painted(bool _painted)
     {
-        pixmap_.painted(painted);
+        pixmap_.painted(_painted);
     }
 
     inline eAttributeCollectionPolicy attribute_collection_policy() const
diff --git a/include/mapnik/grid/grid_view.hpp b/include/mapnik/grid/grid_view.hpp
index 80c539f53..80d459b78 100644
--- a/include/mapnik/grid/grid_view.hpp
+++ b/include/mapnik/grid/grid_view.hpp
@@ -52,7 +52,7 @@ public:
 
     hit_grid_view(unsigned x, unsigned y,
                   unsigned width, unsigned height,
-                  T const& data,
+                  T const& _data,
                   std::string const& key,
                   std::string const& id_name,
                   std::set<std::string> const& names,
@@ -63,7 +63,7 @@ public:
           y_(y),
           width_(width),
           height_(height),
-          data_(data),
+          data_(_data),
           key_(key),
           id_name_(id_name),
           names_(names),
diff --git a/include/mapnik/image_filter.hpp b/include/mapnik/image_filter.hpp
index a96d4cd9d..c8870d412 100644
--- a/include/mapnik/image_filter.hpp
+++ b/include/mapnik/image_filter.hpp
@@ -681,7 +681,7 @@ void apply_filter(Src & src, scale_hsla const& transform)
 }
 
 template <typename Src, typename ColorBlindFilter>
-void color_blind_filter(Src & src, ColorBlindFilter const& op)
+void apply_color_blind_filter(Src & src, ColorBlindFilter const& op)
 {
     using namespace boost::gil;
     rgba8_view_t src_view = rgba8_view(src);
@@ -804,19 +804,19 @@ void color_blind_filter(Src & src, ColorBlindFilter const& op)
 template <typename Src>
 void apply_filter(Src & src, color_blind_protanope const& op)
 {
-    color_blind_filter(src, op);
+    apply_color_blind_filter(src, op);
 }
 
 template <typename Src>
 void apply_filter(Src & src, color_blind_deuteranope const& op)
 {
-    color_blind_filter(src, op);
+    apply_color_blind_filter(src, op);
 }
 
 template <typename Src>
 void apply_filter(Src & src, color_blind_tritanope const& op)
 {
-    color_blind_filter(src, op);
+    apply_color_blind_filter(src, op);
 }
 
 template <typename Src>
diff --git a/include/mapnik/image_filter_grammar.hpp b/include/mapnik/image_filter_grammar.hpp
deleted file mode 100644
index ca96116eb..000000000
--- a/include/mapnik/image_filter_grammar.hpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_IMAGE_FILTER_GRAMMAR_HPP
-#define MAPNIK_IMAGE_FILTER_GRAMMAR_HPP
-
-// mapnik
-#include <mapnik/config.hpp>
-#include <mapnik/css_color_grammar.hpp>
-#include <mapnik/color.hpp>
-
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#pragma GCC diagnostic pop
-
-// stl
-#include <cmath>
-
-namespace mapnik {
-
-namespace filter {
-struct color_stop;
-struct colorize_alpha;
-}
-
-namespace qi = boost::spirit::qi;
-
-struct percent_offset_impl
-{
-    using result_type = double;
-    double operator() (double val) const
-    {
-        double result = std::abs(val/100.0);
-        if (result > 1.0) result = 1.0;
-        return result;
-    }
-};
-
-
-template <typename Iterator, typename ContType>
-struct image_filter_grammar :
-        qi::grammar<Iterator, ContType(), qi::ascii::space_type>
-{
-    using alternative_type = qi::rule<Iterator, ContType(), qi::ascii::space_type>;
-
-    image_filter_grammar();
-
-    qi::rule<Iterator, ContType(), qi::ascii::space_type> start;
-    qi::rule<Iterator, ContType(), qi::ascii::space_type,
-                                   qi::locals<alternative_type*>> filter;
-    qi::rule<Iterator, qi::ascii::space_type> no_args;
-    qi::symbols<char, alternative_type*> alternatives;
-    qi::uint_parser< unsigned, 10, 1, 3 > radius_;
-    css_color_grammar<Iterator> css_color_;
-    qi::rule<Iterator, filter::color_stop(), qi::ascii::space_type> color_stop_;
-    qi::rule<Iterator, double(), qi::ascii::space_type> color_stop_offset;
-
-private:
-    alternative_type & add(std::string const& symbol);
-    static constexpr unsigned max_alternatives = 16;
-    unsigned num_alternatives = 0;
-    alternative_type alternative_storage[max_alternatives];
-};
-
-} // namespace mapnik
-
-#endif // MAPNIK_IMAGE_FILTER_GRAMMAR_HPP
diff --git a/include/mapnik/image_filter_grammar_impl.hpp b/include/mapnik/image_filter_grammar_impl.hpp
deleted file mode 100644
index bf1770083..000000000
--- a/include/mapnik/image_filter_grammar_impl.hpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-// mapnik
-#include <mapnik/image_filter_types.hpp>
-#include <mapnik/image_filter_grammar.hpp>
-
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/phoenix.hpp>
-#pragma GCC diagnostic pop
-
-namespace { // internal
-
-    BOOST_PHOENIX_ADAPT_FUNCTION(
-        typename std::remove_reference<A1>::type, ovo, // = optional_value_or
-        boost::get_optional_value_or, 2)
-
-} // namespace internal
-
-namespace mapnik {
-
-namespace qi = boost::spirit::qi;
-namespace phoenix = boost::phoenix;
-
-template <typename Iterator, typename ContType>
-image_filter_grammar<Iterator,ContType>::image_filter_grammar()
-    : image_filter_grammar::base_type(start)
-{
-    qi::lit_type lit;
-    qi::_val_type _val;
-    qi::_1_type _1;
-    qi::_2_type _2;
-    qi::_3_type _3;
-    qi::_4_type _4;
-    qi::_5_type _5;
-    qi::_6_type _6;
-    qi::_7_type _7;
-    qi::_8_type _8;
-    qi::_a_type _a;
-    qi::attr_type attr;
-    qi::double_type double_;
-    qi::hold_type hold;
-    qi::omit_type omit;
-    using phoenix::push_back;
-    using phoenix::construct;
-
-    // functions
-    phoenix::function<percent_offset_impl> percent_offset;
-
-    start = -(filter % *lit(','))
-        ;
-
-    filter = omit[alternatives[_a = _1]] >> qi::lazy(*_a)
-        ;
-
-    add("emboss") = no_args >> attr(construct<mapnik::filter::emboss>());
-    add("blur") = no_args >> attr(construct<mapnik::filter::blur>());
-    add("gray") = no_args >> attr(construct<mapnik::filter::gray>());
-    add("edge-detect") = no_args >> attr(construct<mapnik::filter::edge_detect>());
-    add("sobel") = no_args >> attr(construct<mapnik::filter::sobel>());
-    add("sharpen") = no_args >> attr(construct<mapnik::filter::sharpen>());
-    add("x-gradient") = no_args >> attr(construct<mapnik::filter::x_gradient>());
-    add("y-gradient") = no_args >> attr(construct<mapnik::filter::y_gradient>());
-    add("invert") = no_args >> attr(construct<mapnik::filter::invert>());
-    add("color-blind-protanope") = no_args >> attr(construct<mapnik::filter::color_blind_protanope>());
-    add("color-blind-deuteranope") = no_args >> attr(construct<mapnik::filter::color_blind_deuteranope>());
-    add("color-blind-tritanope") = no_args >> attr(construct<mapnik::filter::color_blind_tritanope>());
-
-    add("agg-stack-blur") =
-        (lit('(') >> radius_ >> -( lit(',') >> radius_ ) >> lit(')'))
-        [push_back(_val, construct<filter::agg_stack_blur>(_1, ovo(_2, _1)))]
-        |
-        no_args
-        [push_back(_val, construct<filter::agg_stack_blur>(1, 1))]
-        ;
-
-    add("scale-hsla") =
-        (lit('(')
-          >> double_ >> lit(',') >> double_ >> lit(',')
-          >> double_ >> lit(',') >> double_ >> lit(',')
-          >> double_ >> lit(',') >> double_ >> lit(',')
-          >> double_ >> lit(',') >> double_ >> lit(')'))
-        [push_back(_val, construct<filter::scale_hsla>(_1,_2,_3,_4,_5,_6,_7,_8))]
-        ;
-
-    add("colorize-alpha") = qi::as<filter::colorize_alpha>()
-        [lit('(') >> color_stop_ % lit(',') >> lit(')')]
-        [push_back(_val, _1)]
-        ;
-
-    color_stop_ = (css_color_ >> -color_stop_offset)
-        [_val = construct<filter::color_stop>(_1, ovo(_2, 0.0))]
-        ;
-
-    color_stop_offset = double_[_val = _1]
-        >> -lit('%')[_val = percent_offset(_val)]
-        ;
-
-    add("color-to-alpha") =
-        hold[lit('(') >> css_color_ >> lit(')')]
-        [push_back(_val, construct<filter::color_to_alpha>(_1))]
-        ;
-
-    no_args = -(lit('(') >> lit(')'));
-}
-
-template <typename Iterator, typename ContType>
-auto image_filter_grammar<Iterator, ContType>::add(std::string const& symbol)
-    -> alternative_type &
-{
-    if (num_alternatives >= max_alternatives)
-    {
-        throw std::length_error("too many alternatives in image_filter_grammar");
-    }
-
-    alternative_storage[num_alternatives].name(symbol);
-    alternatives.add(symbol, &alternative_storage[num_alternatives]);
-    return alternative_storage[num_alternatives++];
-}
-
-} // namespace mapnik
diff --git a/include/mapnik/image_filter_grammar_x3.hpp b/include/mapnik/image_filter_grammar_x3.hpp
new file mode 100644
index 000000000..ca452009e
--- /dev/null
+++ b/include/mapnik/image_filter_grammar_x3.hpp
@@ -0,0 +1,56 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_IMAGE_FILTER_GRAMMAR_X3_HPP
+#define MAPNIK_IMAGE_FILTER_GRAMMAR_X3_HPP
+
+//#include <mapnik/image_filter.hpp>
+#include <mapnik/image_filter_types.hpp>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#pragma GCC diagnostic pop
+
+namespace mapnik
+{
+
+namespace x3 = boost::spirit::x3;
+
+namespace image_filter
+{
+
+struct image_filter_class;
+using image_filter_grammar_type = x3::rule<image_filter_class, std::vector<filter::filter_type> >;
+
+BOOST_SPIRIT_DECLARE(image_filter_grammar_type);
+
+
+}}
+
+namespace mapnik {
+
+image_filter::image_filter_grammar_type image_filter_grammar();
+
+}
+
+#endif // MAPNIK_IMAGE_FILTER_GRAMMAR_X3_HPP
diff --git a/include/mapnik/image_filter_grammar_x3_def.hpp b/include/mapnik/image_filter_grammar_x3_def.hpp
new file mode 100644
index 000000000..2d680bea1
--- /dev/null
+++ b/include/mapnik/image_filter_grammar_x3_def.hpp
@@ -0,0 +1,261 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_IMAGE_FILTER_GRAMMAR_X3_DEF_HPP
+#define MAPNIK_IMAGE_FILTER_GRAMMAR_X3_DEF_HPP
+
+
+#include <mapnik/image_filter_grammar_x3.hpp>
+#include <mapnik/image_filter_types.hpp>
+#include <mapnik/css_color_grammar_x3.hpp>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#include <boost/spirit/home/x3/support/ast/variant.hpp>
+#include <boost/fusion/include/adapt_struct.hpp>
+#include <boost/fusion/adapted/std_tuple.hpp> // spirit support
+#pragma GCC diagnostic pop
+
+
+BOOST_FUSION_ADAPT_STRUCT(
+    mapnik::filter::scale_hsla,
+    (double, h0)
+    (double, h1)
+    (double, s0)
+    (double, s1)
+    (double, l0)
+    (double, l1)
+    (double, a0)
+    (double, a1)
+)
+
+BOOST_FUSION_ADAPT_STRUCT(
+    mapnik::filter::color_stop,
+    (mapnik::color, color )
+    (double, offset)
+)
+
+BOOST_FUSION_ADAPT_STRUCT(
+    mapnik::filter::color_to_alpha,
+    (mapnik::color, color)
+)
+
+namespace mapnik {
+
+namespace x3 = boost::spirit::x3;
+
+namespace image_filter {
+
+using x3::lit;
+using x3::uint_parser;
+using x3::hex;
+using x3::symbols;
+using x3::omit;
+using x3::attr;
+using x3::double_;
+using x3::no_case;
+using x3::no_skip;
+using x3::char_;
+
+auto push_back = [](auto& ctx)
+{
+    _val(ctx).push_back(_attr(ctx));
+
+};
+
+auto set_rx_ry = [](auto & ctx)
+{
+    _val(ctx).rx = _val(ctx).ry = _attr(ctx);
+};
+
+auto set_ry = [](auto & ctx)
+{
+    _val(ctx).ry = _attr(ctx);
+};
+
+auto offset_value = [](auto & ctx)
+{
+    _val(ctx) = _attr(ctx);
+};
+
+auto percent = [](auto & ctx)
+{
+    double val = std::abs(_val(ctx)/100.0);
+    if (val > 1.0) val = 1.0;
+    _val(ctx) = val;
+};
+
+x3::uint_parser<unsigned, 10, 1, 3> radius;
+
+// Import the expression rule
+namespace { auto const& css_color = color_grammar(); }
+
+// starting rule
+image_filter_grammar_type const start("start");
+// rules
+x3::rule<class filter_class, filter::filter_type > const filter("filter");
+
+x3::rule<class emboss_class, filter::emboss> const emboss_filter("emboss");
+x3::rule<class blur_class, filter::blur> const blur_filter("blur");
+x3::rule<class gray_class, filter::gray> const gray_filter("gray");
+x3::rule<class edge_detect_class, filter::edge_detect> const edge_detect_filter("edge-detect");
+x3::rule<class sobel_class, filter::sobel> const sobel_filter("sobel");
+x3::rule<class sharpen_class, filter::sharpen> const sharpen_filter("sharpen");
+x3::rule<class x_gradient_class, filter::x_gradient> const x_gradient_filter("x-gradient");
+x3::rule<class y_gradient_class, filter::y_gradient> const y_gradient_filter("y-gradient");
+x3::rule<class invert_class, filter::invert> const invert_filter("invert");
+x3::rule<class color_blind_protanope_class, filter::color_blind_protanope> const color_blind_protanope_filter("color-blind-protanope");
+x3::rule<class color_blind_deuteranope_class, filter::color_blind_deuteranope> const color_blind_deuteranope_filter("color-blind-deuteranope");
+x3::rule<class color_blind_tritanope_class, filter::color_blind_tritanope> const color_blind_tritanope_filter("color-blind-tritanope");
+
+x3::rule<class agg_blur_class, filter::agg_stack_blur> const agg_blur_filter("agg blur filter");
+x3::rule<class scale_hsla_class, filter::scale_hsla> const scale_hsla_filter("scale-hsla");
+x3::rule<class colorize_alpha_class, filter::colorize_alpha> const colorize_alpha_filter("colorize-alpha");
+x3::rule<class color_stop_class, filter::color_stop> const color_stop("color-stop");
+x3::rule<class offset_class, double> const offset("color-stop-offset");
+x3::rule<class color_to_alpha_class, filter::color_to_alpha> const color_to_alpha_filter("color-to-alpha");
+
+auto const no_args = -(lit('(') > lit(')'));
+
+auto const start_def = -(filter[push_back] % *lit(','));
+
+auto const filter_def = (emboss_filter
+                         |
+                         blur_filter
+                         |
+                         gray_filter
+                         |
+                         edge_detect_filter
+                         |
+                         sobel_filter
+                         |
+                         sharpen_filter
+                         |
+                         x_gradient_filter
+                         |
+                         y_gradient_filter
+                         |
+                         invert_filter
+                         |
+                         color_blind_protanope_filter
+                         |
+                         color_blind_deuteranope_filter
+                         |
+                         color_blind_tritanope_filter
+                         |
+                         agg_blur_filter
+                         |
+                         scale_hsla_filter
+                         |
+                         colorize_alpha_filter
+                         |
+                         color_to_alpha_filter
+                         )
+    ;
+
+auto const emboss_filter_def = lit("emboss") > no_args;
+
+auto const blur_filter_def = lit("blur") > no_args;
+
+auto const gray_filter_def = lit("gray") > no_args;
+
+auto const edge_detect_filter_def = lit("edge-detect") > no_args;
+
+auto const sobel_filter_def = lit("sobel") > no_args;
+
+auto const sharpen_filter_def = lit("sharpen") > no_args;
+
+auto const x_gradient_filter_def = lit("x-gradient") > no_args;
+
+auto const y_gradient_filter_def = lit("y-gradient") > no_args;
+
+auto const invert_filter_def = lit("invert") > no_args;
+
+auto const color_blind_protanope_filter_def = lit("color-blind-protanope") > no_args;
+
+auto const color_blind_deuteranope_filter_def = lit("color-blind-deuteranope") > no_args;
+
+auto const color_blind_tritanope_filter_def = lit("color-blind-tritanope") > no_args;
+
+auto const agg_blur_filter_def = lit("agg-stack-blur")
+    > -(lit('(') > -(radius[set_rx_ry] > -(lit(',') > radius[set_ry])) > lit(')'));
+
+auto const scale_hsla_filter_def = lit("scale-hsla") > lit('(')
+    > double_ > ','
+    > double_ > ','
+    > double_ > ','
+    > double_ > ','
+    > double_ > ','
+    > double_ > ','
+    > double_ > ','
+    > double_ > ')' ;
+
+
+auto const offset_def = double_[offset_value] > -lit('%')[percent];
+auto const color_stop_def = css_color > -offset;
+
+auto const colorize_alpha_filter_def = lit("colorize-alpha")
+    > lit('(')
+    > color_stop > *(lit(',') > color_stop)
+    > lit(')') ;
+
+auto const color_to_alpha_filter_def = lit("color-to-alpha") > lit('(')
+    > -css_color > lit(')');
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+
+BOOST_SPIRIT_DEFINE(
+    start,
+    filter,
+    emboss_filter,
+    blur_filter,
+    gray_filter,
+    edge_detect_filter,
+    sobel_filter,
+    sharpen_filter,
+    x_gradient_filter,
+    y_gradient_filter,
+    invert_filter,
+    agg_blur_filter,
+    color_blind_protanope_filter,
+    color_blind_deuteranope_filter,
+    color_blind_tritanope_filter,
+    scale_hsla_filter,
+    colorize_alpha_filter,
+    color_stop,
+    offset,
+    color_to_alpha_filter
+    );
+#pragma GCC diagnostic pop
+
+} // image_filter
+
+image_filter::image_filter_grammar_type image_filter_grammar()
+{
+    return image_filter::start;
+}
+
+} //ns mapnik
+
+#endif //MAPNIK_IMAGE_FILTER_GRAMMAR_X3_DEF_HPP
diff --git a/include/mapnik/image_filter_types.hpp b/include/mapnik/image_filter_types.hpp
index 7e04df87a..ba36aa5eb 100644
--- a/include/mapnik/image_filter_types.hpp
+++ b/include/mapnik/image_filter_types.hpp
@@ -56,32 +56,41 @@ struct y_gradient : image_filter_base {};
 struct invert : image_filter_base {};
 
 // http://vision.psychol.cam.ac.uk/jdmollon/papers/colourmaps.pdf
-struct color_blind_protanope : image_filter_base 
+struct color_blind_filter : image_filter_base
 {
-    const double x = 0.7465;
-    const double y = 0.2535;
-    const double m = 1.273463;
-    const double yint = -0.073894;
+    color_blind_filter(double x_, double y_, double m_, double yint_)
+        : x(x_), y(y_), m(m_), yint(yint_) {}
+    double x;
+    double y;
+    double m;
+    double yint;
 };
 
-struct color_blind_deuteranope : image_filter_base
+struct color_blind_protanope : color_blind_filter
 {
-    const double x = 1.4;
-    const double y = -0.4;
-    const double m = 0.968437;
-    const double yint = 0.003331;
+    color_blind_protanope()
+        : color_blind_filter(0.7465, 0.2535, 1.273463, -0.073894) {}
 };
 
-struct color_blind_tritanope : image_filter_base
+struct color_blind_deuteranope : color_blind_filter
 {
-    const double x = 0.1748;
-    const double y = 0.0;
-    const double m = 0.062921;
-    const double yint = 0.292119;
+    color_blind_deuteranope()
+        : color_blind_filter(1.4, -0.4, 0.968437, 0.003331) {}
 };
 
+struct color_blind_tritanope : color_blind_filter
+{
+    color_blind_tritanope()
+        : color_blind_filter(0.1748, 0.0, 0.062921, 0.292119) {}
+};
+
+
 struct agg_stack_blur : image_filter_base
 {
+    agg_stack_blur()
+        : rx(1), ry(1) {}
+    agg_stack_blur(unsigned r)
+        : rx(r), ry(r) {}
     agg_stack_blur(unsigned rx_, unsigned ry_)
         : rx(rx_),ry(ry_) {}
     inline bool operator==(agg_stack_blur const& rhs) const
@@ -94,6 +103,7 @@ struct agg_stack_blur : image_filter_base
 
 struct color_to_alpha : image_filter_base
 {
+    color_to_alpha() {}
     color_to_alpha(mapnik::color const& c)
         : color(c) {}
     inline bool operator==(color_to_alpha const& rhs) const
@@ -105,6 +115,7 @@ struct color_to_alpha : image_filter_base
 
 struct scale_hsla : image_filter_base
 {
+    scale_hsla() {}
     scale_hsla(double _h0, double _h1,
          double _s0, double _s1,
          double _l0, double _l1,
diff --git a/include/mapnik/json/geometry_grammar.hpp b/include/mapnik/json/geometry_grammar.hpp
index fc0d3a43d..e4b60fd4f 100644
--- a/include/mapnik/json/geometry_grammar.hpp
+++ b/include/mapnik/json/geometry_grammar.hpp
@@ -36,6 +36,8 @@
 #include <boost/spirit/include/phoenix_function.hpp>
 #pragma GCC diagnostic pop
 
+#include <memory>
+
 namespace mapnik { namespace json {
 
 namespace qi = boost::spirit::qi;
diff --git a/include/mapnik/make_unique.hpp b/include/mapnik/make_unique.hpp
index f6fd4a230..577c0cf78 100644
--- a/include/mapnik/make_unique.hpp
+++ b/include/mapnik/make_unique.hpp
@@ -23,11 +23,11 @@
 #ifndef MAPNIK_MAKE_UNIQUE_HPP
 #define MAPNIK_MAKE_UNIQUE_HPP
 
-#include <memory>
-
 // http://stackoverflow.com/questions/14131454/visual-studio-2012-cplusplus-and-c-11
 #if defined(_MSC_VER) && _MSC_VER < 1800 || !defined(_MSC_VER) && __cplusplus <= 201103L
 
+#include <memory>
+
 namespace std {
 
 // C++14 backfill from http://herbsutter.com/gotw/_102/
diff --git a/include/mapnik/offset_converter.hpp b/include/mapnik/offset_converter.hpp
index 310ed808a..0f0d1ceb4 100644
--- a/include/mapnik/offset_converter.hpp
+++ b/include/mapnik/offset_converter.hpp
@@ -269,7 +269,7 @@ private:
         if (position < -1e-6) return -1;
         return 0;
     }
-    
+
     void displace2(vertex2d & v1, vertex2d const& v0, vertex2d const& v2, double a, double b) const
     {
         double sa = offset_ * std::sin(a);
@@ -284,14 +284,14 @@ private:
         double abs_hcasa = std::abs(hcasa);
         double abs_hsa = std::abs(hsa);
         double abs_hca = std::abs(hca);
-                
-        vertex2d v_tmp(vertex2d::no_init);    
+
+        vertex2d v_tmp(vertex2d::no_init);
         v_tmp.x = v1.x - sa - hca;
         v_tmp.y = v1.y + ca - hsa;
         v_tmp.cmd = v1.cmd;
-        
+
         int same = point_line_position(v0, v2, v_tmp)*point_line_position(v0, v2, v1);
-        
+
         if (same >= 0 && std::abs(h) < 10)
         {
             v1.x = v_tmp.x;
@@ -314,14 +314,14 @@ private:
             v1.y = v1.y + ca - hsa;
         }
         else
-        {      
+        {
             if (abs_hsaca*abs_hsaca + abs_hcasa*abs_hcasa > abs_offset*abs_offset)
             {
                 double d = (abs_hsaca*abs_hsaca + abs_hcasa*abs_hcasa);
                 d = d < 1e-6 ? 1. : d;
                 double scale = (abs_offset*abs_offset)/d;
                 v1.x = v1.x + hcasa*scale;
-                v1.y = v1.y + hsaca*scale;                
+                v1.y = v1.y + hsaca*scale;
             }
             else
             {
@@ -330,8 +330,7 @@ private:
             }
         }
     }
-    
-    
+
     status init_vertices()
     {
         if (status_ != initial) // already initialized
@@ -482,8 +481,9 @@ private:
         }
         start_v2.x = v2.x;
         start_v2.y = v2.y;
+
         vertex2d tmp_prev(vertex2d::no_init);
-        
+
         while (i < points.size())
         {
             v1 = v2;
@@ -576,7 +576,7 @@ private:
             tmp_prev.cmd = v1.cmd;
             tmp_prev.x = v1.x;
             tmp_prev.y = v1.y;
-            
+
             if (v1.cmd == SEG_MOVETO)
             {
                 if (bulge_steps == 0)
diff --git a/include/mapnik/path.hpp b/include/mapnik/path.hpp
index 6d253466d..8d2e4f6f4 100644
--- a/include/mapnik/path.hpp
+++ b/include/mapnik/path.hpp
@@ -70,9 +70,9 @@ public:
         return static_cast<bool>(type_ >> geometry_bits);
     }
 
-    void set_type(types type)
+    void set_type(types _type)
     {
-        type_ = type;
+        type_ = _type;
     }
 
     container_type const& data() const
diff --git a/include/mapnik/path_expression_grammar_impl.hpp b/include/mapnik/path_expression_grammar_impl.hpp
deleted file mode 100644
index 22002bf33..000000000
--- a/include/mapnik/path_expression_grammar_impl.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-// mapnik
-#include <mapnik/path_expression_grammar.hpp>
-#include <mapnik/attribute.hpp>
-
-
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_object.hpp>
-#include <boost/spirit/include/phoenix_stl.hpp>
-#pragma GCC diagnostic pop
-
-namespace mapnik
-{
-
-template <typename Iterator>
-path_expression_grammar<Iterator>::path_expression_grammar()
-    : path_expression_grammar::base_type(expr)
-{
-    standard_wide::char_type char_;
-    qi::_1_type _1;
-    qi::_val_type _val;
-    qi::lit_type lit;
-    qi::lexeme_type lexeme;
-    using phoenix::push_back;
-    using boost::phoenix::construct;
-
-    expr =
-        * (
-            str [ push_back(_val, _1)]
-            |
-            ( '[' >> attr [ push_back(_val, construct<mapnik::attribute>( _1 )) ] >> ']')
-            )
-        ;
-
-    attr %= +(char_ - ']');
-    str  %= lexeme[+(char_ -'[')];
-}
-
-}
diff --git a/include/mapnik/path_expression_grammar_x3.hpp b/include/mapnik/path_expression_grammar_x3.hpp
new file mode 100644
index 000000000..86e811fea
--- /dev/null
+++ b/include/mapnik/path_expression_grammar_x3.hpp
@@ -0,0 +1,44 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_PATH_EXPRESSIONS_GRAMMAR_X3_HPP
+#define MAPNIK_PATH_EXPRESSIONS_GRAMMAR_X3_HPP
+
+// mapnik
+#include <mapnik/path_expression.hpp>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#pragma GCC diagnostic pop
+
+namespace mapnik { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+struct path_expression_class; // top-most ID
+using path_expression_grammar_type = x3::rule<path_expression_class, path_expression>;
+
+BOOST_SPIRIT_DECLARE(path_expression_grammar_type);
+
+}}
+
+#endif  // MAPNIK_PATH_EXPRESSIONS_GRAMMAR_X3_HPP
diff --git a/include/mapnik/path_expression_grammar_x3_def.hpp b/include/mapnik/path_expression_grammar_x3_def.hpp
new file mode 100644
index 000000000..7dc772aa1
--- /dev/null
+++ b/include/mapnik/path_expression_grammar_x3_def.hpp
@@ -0,0 +1,63 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_PATH_EXPRESSIONS_GRAMMAR_X3_DEF_HPP
+#define MAPNIK_PATH_EXPRESSIONS_GRAMMAR_X3_DEF_HPP
+// mapnik
+#include <mapnik/path_expression_grammar_x3.hpp>
+#include <mapnik/attribute.hpp>
+
+namespace mapnik { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+using x3::standard_wide::char_;
+using x3::lexeme;
+auto create_string = [](auto & ctx) { _val(ctx).push_back(_attr(ctx)); };
+auto create_attribute = [](auto & ctx) { _val(ctx).push_back(mapnik::attribute(_attr(ctx))); };
+// top-most rule
+path_expression_grammar_type const path_expression("path_expression");
+// rules
+x3::rule<class attr_expression, std::string> const attr_expression("attribute");
+x3::rule<class str_expression, std::string> const str_expression("string");
+
+auto const attr_expression_def = +(char_ - ']');
+auto const str_expression_def = lexeme[+(char_ -'[')];
+auto const path_expression_def = *(str_expression[create_string] | '[' > attr_expression[create_attribute] > ']');
+
+BOOST_SPIRIT_DEFINE(
+    path_expression,
+    attr_expression,
+    str_expression
+);
+
+}}
+
+namespace mapnik {
+
+grammar::path_expression_grammar_type path_expression_grammar()
+{
+    return grammar::path_expression;
+}
+
+}
+
+#endif //MAPNIK_PATH_EXPRESSIONS_GRAMMAR_X3_DEF_HPP
diff --git a/include/mapnik/quad_tree.hpp b/include/mapnik/quad_tree.hpp
index c15f09f26..a44962ec1 100644
--- a/include/mapnik/quad_tree.hpp
+++ b/include/mapnik/quad_tree.hpp
@@ -27,8 +27,10 @@
 #include <mapnik/box2d.hpp>
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/make_unique.hpp>
+
 // stl
-#include <algorithm>
+#include <memory>
+#include <new>
 #include <vector>
 #include <type_traits>
 
@@ -83,12 +85,12 @@ class quad_tree : util::noncopyable
 
         int num_subnodes() const
         {
-            int count = 0;
+            int _count = 0;
             for (int i = 0; i < 4; ++i)
             {
-                if (children_[i]) ++count;
+                if (children_[i]) ++_count;
             }
-            return count;
+            return _count;
         }
         ~node () {}
     };
@@ -164,9 +166,9 @@ public:
 
     int count_items() const
     {
-        int count = 0;
-        count_items(root_, count);
-        return count;
+        int _count = 0;
+        count_items(root_, _count);
+        return _count;
     }
     void trim()
     {
@@ -276,23 +278,23 @@ private:
         if (!n) return 0;
         else
         {
-            int count = 1;
+            int _count = 1;
             for (int i = 0; i < 4; ++i)
             {
-                count += count_nodes(n->children_[i]);
+                _count += count_nodes(n->children_[i]);
             }
-            return count;
+            return _count;
         }
     }
 
-    void count_items(node const* n,int& count) const
+    void count_items(node const* n, int& _count) const
     {
         if (n)
         {
-            count += n->cont_.size();
+            _count += n->cont_.size();
             for (int i = 0; i < 4; ++i)
             {
-                count_items(n->children_[i],count);
+                count_items(n->children_[i],_count);
             }
         }
     }
diff --git a/include/mapnik/query.hpp b/include/mapnik/query.hpp
index 5d5a6e7c8..6a86cfa3b 100644
--- a/include/mapnik/query.hpp
+++ b/include/mapnik/query.hpp
@@ -40,12 +40,12 @@ public:
     using resolution_type = std::tuple<double,double>;
 
     query(box2d<double> const& bbox,
-          resolution_type const& resolution,
-          double scale_denominator,
+          resolution_type const& _resolution,
+          double _scale_denominator,
           box2d<double> const& unbuffered_bbox)
         : bbox_(bbox),
-          resolution_(resolution),
-          scale_denominator_(scale_denominator),
+          resolution_(_resolution),
+          scale_denominator_(_scale_denominator),
           filter_factor_(1.0),
           unbuffered_bbox_(unbuffered_bbox),
           names_(),
@@ -53,11 +53,11 @@ public:
     {}
 
     query(box2d<double> const& bbox,
-          resolution_type const& resolution,
-          double scale_denominator = 1.0)
+          resolution_type const& _resolution,
+          double _scale_denominator = 1.0)
         : bbox_(bbox),
-          resolution_(resolution),
-          scale_denominator_(scale_denominator),
+          resolution_(_resolution),
+          scale_denominator_(_scale_denominator),
           filter_factor_(1.0),
           unbuffered_bbox_(bbox),
           names_(),
diff --git a/include/mapnik/raster.hpp b/include/mapnik/raster.hpp
index 02022d359..8ed30e5a2 100644
--- a/include/mapnik/raster.hpp
+++ b/include/mapnik/raster.hpp
@@ -52,9 +52,9 @@ public:
           data_(std::move(data)),
           filter_factor_(filter_factor) {}
 
-    void set_nodata(double nodata)
+    void set_nodata(double _nodata)
     {
-        nodata_ = nodata;
+        nodata_ = _nodata;
     }
 
     boost::optional<double> const& nodata() const
diff --git a/include/mapnik/span_image_filter.hpp b/include/mapnik/span_image_filter.hpp
index c0a9adbb9..950f76c08 100644
--- a/include/mapnik/span_image_filter.hpp
+++ b/include/mapnik/span_image_filter.hpp
@@ -176,9 +176,9 @@ public:
 
     span_image_resample_rgba_affine(source_type & src,
                                     interpolator_type & inter,
-                                    agg::image_filter_lut const & filter,
+                                    agg::image_filter_lut const & _filter,
                                     boost::optional<value_type> const & nodata_value) :
-        agg::span_image_resample_rgba_affine<Source>(src, inter, filter)
+        agg::span_image_resample_rgba_affine<Source>(src, inter, _filter)
     { }
 };
 
diff --git a/include/mapnik/svg/output/svg_output_attributes.hpp b/include/mapnik/svg/output/svg_output_attributes.hpp
index 00deeea26..06a00f276 100644
--- a/include/mapnik/svg/output/svg_output_attributes.hpp
+++ b/include/mapnik/svg/output/svg_output_attributes.hpp
@@ -121,12 +121,12 @@ namespace mapnik { namespace svg {
               fill_color_("#000000")
         {}
 
-        rect_output_attributes(const int x, const int y, const unsigned width, const unsigned height, color const& fill_color)
+        rect_output_attributes(const int x, const int y, const unsigned width, const unsigned height, color const& _fill_color)
             : x_(x),
               y_(y),
               width_(width),
               height_(height),
-              fill_color_(fill_color.to_hex_string())
+              fill_color_(_fill_color.to_hex_string())
         {}
 
         void set_x(const int x);
diff --git a/include/mapnik/svg/output/svg_renderer.hpp b/include/mapnik/svg/output/svg_renderer.hpp
index 037ec0ddb..7ce3e044d 100644
--- a/include/mapnik/svg/output/svg_renderer.hpp
+++ b/include/mapnik/svg/output/svg_renderer.hpp
@@ -131,9 +131,9 @@ public:
         return painted_;
     }
 
-    void painted(bool painted)
+    void painted(bool _painted)
     {
-        painted_ = painted;
+        painted_ = _painted;
     }
 
     inline eAttributeCollectionPolicy attribute_collection_policy() const
diff --git a/include/mapnik/text/placements/list.hpp b/include/mapnik/text/placements/list.hpp
index c21a4d87c..88938ee1c 100644
--- a/include/mapnik/text/placements/list.hpp
+++ b/include/mapnik/text/placements/list.hpp
@@ -50,8 +50,8 @@ private:
 class text_placement_info_list : public text_placement_info
 {
 public:
-    text_placement_info_list(text_placements_list const* parent, double scale_factor) :
-        text_placement_info(parent, scale_factor),
+    text_placement_info_list(text_placements_list const* parent, double _scale_factor) :
+        text_placement_info(parent, _scale_factor),
         state(0), parent_(parent) {}
     bool next() const;
 private:
diff --git a/include/mapnik/transform_expression.hpp b/include/mapnik/transform_expression.hpp
index 471287932..586d89e4a 100644
--- a/include/mapnik/transform_expression.hpp
+++ b/include/mapnik/transform_expression.hpp
@@ -55,6 +55,8 @@ struct matrix_node
     expr_node e_;
     expr_node f_;
 
+    matrix_node() = default;
+
     template <typename T>
     explicit matrix_node(T const& m)
         : a_(m.sx), b_(m.shy), c_(m.shx), d_(m.sy), e_(m.tx), f_(m.ty) {}
@@ -69,6 +71,8 @@ struct translate_node
     expr_node tx_;
     expr_node ty_;
 
+    translate_node() = default;
+
     translate_node(expr_node const& tx,
                    boost::optional<expr_node> const& ty)
         : tx_(tx)
@@ -80,6 +84,8 @@ struct scale_node
     expr_node sx_;
     expr_node sy_;
 
+    scale_node() = default;
+
     scale_node(expr_node const& sx,
                boost::optional<expr_node> const& sy)
         : sx_(sx)
@@ -94,6 +100,8 @@ struct rotate_node
     expr_node cx_;
     expr_node cy_;
 
+    rotate_node() = default;
+
     explicit rotate_node(expr_node const& angle)
         : angle_(angle) {}
 
@@ -123,16 +131,16 @@ struct rotate_node
 struct skewX_node
 {
     expr_node angle_;
-
-    explicit skewX_node(expr_node const& angle)
+    skewX_node() = default;
+    skewX_node(expr_node const& angle)
         : angle_(angle) {}
 };
 
 struct skewY_node
 {
     expr_node angle_;
-
-    explicit skewY_node(expr_node const& angle)
+    skewY_node() = default;
+    skewY_node(expr_node const& angle)
         : angle_(angle) {}
 };
 
@@ -225,9 +233,9 @@ bool is_null_node (T const& node)
 
 } // namespace detail
 
-using transform_node = detail::transform_node             ;
-using transform_list = std::vector<transform_node>        ;
-using transform_list_ptr = std::shared_ptr<transform_list>  ;
+using transform_node = detail::transform_node;
+using transform_list = std::vector<transform_node>;
+using transform_list_ptr = std::shared_ptr<transform_list>;
 
 MAPNIK_DECL std::string to_expression_string(transform_node const& node);
 MAPNIK_DECL std::string to_expression_string(transform_list const& list);
diff --git a/include/mapnik/transform_expression_grammar.hpp b/include/mapnik/transform_expression_grammar.hpp
deleted file mode 100644
index f3945f39b..000000000
--- a/include/mapnik/transform_expression_grammar.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_TRANSFORM_EXPRESSION_GRAMMAR_HPP
-#define MAPNIK_TRANSFORM_EXPRESSION_GRAMMAR_HPP
-
-// mapnik
-#include <mapnik/expression_grammar.hpp>
-#include <mapnik/expression_node_types.hpp>
-#include <mapnik/transform_expression.hpp>
-
-// spirit
-#include <boost/spirit/include/qi.hpp>
-
-namespace mapnik {
-
-    namespace qi = boost::spirit::qi;
-
-    template <typename Iterator>
-    struct transform_expression_grammar
-        : qi::grammar<Iterator, transform_list(), space_type>
-    {
-        explicit transform_expression_grammar();
-
-        using node_rule = qi::rule<Iterator, transform_node(), space_type>;
-        using list_rule = qi::rule<Iterator, transform_list(), space_type>;
-
-        // rules
-        qi::rule<Iterator, std::string(), space_type>    attr;
-        qi::rule<Iterator, expr_node(), space_type>      atom;
-        qi::rule<Iterator, expr_node(), space_type>      expr;
-        qi::rule<Iterator, expr_node(), space_type>      sep_atom;
-        qi::rule<Iterator, expr_node(), space_type>      sep_expr;
-        qi::rule<Iterator, transform_list(), space_type> start;
-        qi::rule<Iterator, transform_node(), space_type> transform_;
-        qi::rule<Iterator, transform_node(), space_type> matrix;
-        qi::rule<Iterator, transform_node(), space_type> translate;
-        qi::rule<Iterator, transform_node(), space_type> scale;
-        qi::rule<Iterator, transform_node(), space_type> rotate;
-        qi::rule<Iterator, transform_node(), space_type> skewX;
-        qi::rule<Iterator, transform_node(), space_type> skewY;
-        mapnik::expression_grammar<Iterator> g_;
-    };
-
-} // namespace mapnik
-
-#endif // MAPNIK_TRANSFORM_EXPRESSION_GRAMMAR_HPP
diff --git a/include/mapnik/transform_expression_grammar_impl.hpp b/include/mapnik/transform_expression_grammar_impl.hpp
deleted file mode 100644
index 4b8c2b92a..000000000
--- a/include/mapnik/transform_expression_grammar_impl.hpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-// mapnik
-#include <mapnik/transform_expression_grammar.hpp>
-
-// boost
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_object.hpp>
-
-
-namespace mapnik {
-
-namespace qi = boost::spirit::qi;
-
-template <typename Iterator>
-transform_expression_grammar<Iterator>::transform_expression_grammar()
-        : transform_expression_grammar::base_type(start)
-{
-    using boost::phoenix::construct;
-    qi::_1_type _1;
-    qi::_4_type _4;
-    qi::_2_type _2;
-    qi::_5_type _5;
-    qi::_3_type _3;
-    qi::_6_type _6;
-    qi::_val_type _val;
-    qi::double_type double_;
-    qi::lit_type lit;
-    qi::no_case_type no_case;
-
-    // [http://www.w3.org/TR/SVG/coords.html#TransformAttribute]
-
-    // The value of the ‘transform’ attribute is a <transform-list>, which
-    // is defined as a list of transform definitions, which are applied in
-    // the order provided.  The individual transform definitions are
-    // separated by whitespace and/or a comma.
-
-    start = transform_ % *lit(',') ;
-
-    transform_ = matrix | translate | scale | rotate | skewX | skewY ;
-
-    // matrix(<a> <b> <c> <d> <e> <f>)
-    matrix = no_case[lit("matrix")]
-        >> (lit('(')
-            >> ( atom >> sep_atom >> sep_atom >> sep_atom >> sep_atom
-                      >> sep_atom >> lit(')')
-               | expr >> sep_expr >> sep_expr >> sep_expr >> sep_expr
-                      >> sep_expr >> lit(')')
-               ))
-        [ _val = construct<matrix_node>(_1,_2,_3,_4,_5,_6) ];
-
-    // translate(<tx> [<ty>])
-    translate = no_case[lit("translate")]
-        >> lit('(')
-        >> ( ( atom >> -sep_atom >> lit(')') )
-             [ _val = construct<translate_node>(_1,_2) ]
-           | ( expr >> -sep_expr >> lit(')') )
-             [ _val = construct<translate_node>(_1,_2) ]
-           );
-
-    // scale(<sx> [<sy>])
-    scale = no_case[lit("scale")]
-        >> lit('(')
-        >> ( ( atom >> -sep_atom >> lit(')') )
-             [ _val = construct<scale_node>(_1,_2) ]
-           | ( expr >> -sep_expr >> lit(')') )
-             [ _val = construct<scale_node>(_1,_2) ]
-           );
-
-    // rotate(<rotate-angle> [<cx> <cy>])
-    rotate = no_case[lit("rotate")]
-        >> lit('(')
-        >> ( ( atom >> -( sep_atom >> sep_atom ) >> lit(')') )
-             [ _val = construct<rotate_node>(_1,_2) ]
-           | ( expr >> -( sep_expr >> sep_expr ) >> lit(')') )
-             [ _val = construct<rotate_node>(_1,_2) ]
-           );
-
-    // skewX(<skew-angle>)
-    skewX = no_case[lit("skewX")]
-        >> lit('(')
-        >> expr [ _val = construct<skewX_node>(_1) ]
-        >> lit(')');
-
-    // skewY(<skew-angle>)
-    skewY = no_case[lit("skewY")]
-        >> lit('(')
-        >> expr [ _val = construct<skewY_node>(_1) ]
-        >> lit(')');
-
-    // number or attribute
-    atom = double_ [ _val = _1 ]
-        | attr [ _val = construct<mapnik::attribute>(_1) ];
-
-    // Individual arguments in lists consiting solely of numbers and/or
-    // attributes are separated by whitespace and/or a comma.
-    sep_atom = -lit(',') >> atom [ _val = _1 ];
-
-    // Individual arguments in lists containing one or more compound
-    // expressions are separated by a comma.
-    sep_expr = lit(',') >> expr [ _val = _1 ];
-
-    attr = g_.attr.alias();
-    expr = g_.expr.alias();
-}
-
-}
diff --git a/include/mapnik/path_expression_grammar.hpp b/include/mapnik/transform_expression_grammar_x3.hpp
similarity index 58%
rename from include/mapnik/path_expression_grammar.hpp
rename to include/mapnik/transform_expression_grammar_x3.hpp
index 61a3db7ed..ccf480c22 100644
--- a/include/mapnik/path_expression_grammar.hpp
+++ b/include/mapnik/transform_expression_grammar_x3.hpp
@@ -20,40 +20,32 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_PATH_EXPRESSIONS_GRAMMAR_HPP
-#define MAPNIK_PATH_EXPRESSIONS_GRAMMAR_HPP
+#ifndef MAPNIK_TRANSFORM_GRAMMAR_X3_HPP
+#define MAPNIK_TRANSFORM_GRAMMAR_X3_HPP
 
-// mapnik
-#include <mapnik/path_expression.hpp>
+#include <mapnik/transform_expression.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
+#include <boost/spirit/home/x3.hpp>
 #pragma GCC diagnostic pop
 
-// stl
-#include <string>
-#include <vector>
+namespace mapnik {
+
+namespace x3 = boost::spirit::x3;
+
+namespace grammar {
+
+struct transform_expression_class; // top-most ID
+using transform_expression_grammar_type = x3::rule<transform_expression_class, mapnik::transform_list>;
+
+BOOST_SPIRIT_DECLARE(transform_expression_grammar_type);
+
+}}  // ns
 
 namespace mapnik
 {
-
-using namespace boost;
-namespace qi = boost::spirit::qi;
-namespace phoenix = boost::phoenix;
-namespace standard_wide =  boost::spirit::standard_wide;
-
-using standard_wide::space_type;
-
-template <typename Iterator>
-struct path_expression_grammar : qi::grammar<Iterator, std::vector<path_component>(), space_type>
-{
-    path_expression_grammar();
-    qi::rule<Iterator, std::vector<path_component>() , space_type> expr;
-    qi::rule<Iterator, std::string() , space_type> attr;
-    qi::rule<Iterator, std::string() > str;
-};
-
+grammar::transform_expression_grammar_type transform_expression_grammar();
 }
 
-#endif  // MAPNIK_PATH_EXPRESSIONS_GRAMMAR_HPP
+#endif
diff --git a/include/mapnik/transform_expression_grammar_x3_def.hpp b/include/mapnik/transform_expression_grammar_x3_def.hpp
new file mode 100644
index 000000000..602f30aee
--- /dev/null
+++ b/include/mapnik/transform_expression_grammar_x3_def.hpp
@@ -0,0 +1,184 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2015 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#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/expression_grammar_x3.hpp>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#include <boost/fusion/include/adapt_struct.hpp>
+#pragma GCC diagnostic pop
+
+// adapt transform nodes
+// martrix
+BOOST_FUSION_ADAPT_STRUCT(mapnik::matrix_node,
+                          (mapnik::expr_node, a_)
+                          (mapnik::expr_node, b_)
+                          (mapnik::expr_node, c_)
+                          (mapnik::expr_node, d_)
+                          (mapnik::expr_node, e_)
+                          (mapnik::expr_node, f_))
+// translate
+BOOST_FUSION_ADAPT_STRUCT(mapnik::translate_node,
+                          (mapnik::expr_node, tx_)
+                          (mapnik::expr_node, ty_))
+
+// scale
+BOOST_FUSION_ADAPT_STRUCT(mapnik::scale_node,
+                          (mapnik::expr_node, sx_)
+                          (mapnik::expr_node, sy_))
+
+// rotate
+BOOST_FUSION_ADAPT_STRUCT(mapnik::rotate_node,
+                          (mapnik::expr_node, angle_)
+                          (mapnik::expr_node, cx_)
+                          (mapnik::expr_node, cy_))
+// skewX
+BOOST_FUSION_ADAPT_STRUCT(mapnik::skewX_node,
+                          (mapnik::expr_node, angle_))
+
+// skewY
+BOOST_FUSION_ADAPT_STRUCT(mapnik::skewY_node,
+                          (mapnik::expr_node, angle_))
+
+
+// Following specializations are required to avoid trasferring mapnik::skewX/Y nodes as underlying expressions
+//
+// template <typename Source, typename Dest>
+// inline void
+// move_to_plain(Source&& src, Dest& dest, mpl::true_) // src is a single-element tuple
+// {
+//     dest = std::move(fusion::front(src));
+// }
+// which will fail to compile with latest (more strict) `mapbox::variant` (boost_1_61)
+
+namespace boost { namespace spirit { namespace x3 { namespace traits {
+template <>
+inline void move_to<mapnik::skewX_node, mapnik::detail::transform_node>(mapnik::skewX_node && src, mapnik::detail::transform_node& dst)
+{
+    dst = std::move(src);
+}
+
+template <>
+inline void move_to<mapnik::skewY_node, mapnik::detail::transform_node>(mapnik::skewY_node && src, mapnik::detail::transform_node& dst)
+{
+    dst = std::move(src);
+}
+
+}}}}
+
+
+namespace mapnik { namespace grammar {
+
+    namespace x3 = boost::spirit::x3;
+    namespace ascii = boost::spirit::x3::ascii;
+
+    // [http://www.w3.org/TR/SVG/coords.html#TransformAttribute]
+
+    // The value of the ‘transform’ attribute is a <transform-list>, which
+    // is defined as a list of transform definitions, which are applied in
+    // the order provided.  The individual transform definitions are
+    // separated by whitespace and/or a comma.
+
+    using x3::double_;
+    using x3::no_skip;
+    using x3::no_case;
+    using x3::lit;
+
+    // starting rule
+    transform_expression_grammar_type const transform("transform");
+    // rules
+    x3::rule<class transform_list_class, mapnik::transform_list> transform_list_rule("transform list");
+    x3::rule<class transform_node_class, mapnik::transform_node> transform_node_rule("transform node");
+    x3::rule<class matrix_node_class, mapnik::matrix_node> matrix("matrix node");
+    x3::rule<class translate_node_class, mapnik::translate_node> translate("translate node");
+    x3::rule<class scale_node_class, mapnik::scale_node> scale("scale node");
+    x3::rule<class rotate_node_class, mapnik::rotate_node> rotate("rotate node");
+    x3::rule<class skewX_node_class, mapnik::skewX_node> skewX("skew X node");
+    x3::rule<class skewY_node_class, mapnik::skewY_node> skewY("skew Y node");
+
+    // Import the expression rule
+    namespace { auto const& expr = expression_grammar(); }
+
+    // start
+    auto const transform_def = transform_list_rule;
+
+    auto const transform_list_rule_def = transform_node_rule % *lit(',');
+
+    auto const transform_node_rule_def = matrix | translate  | scale | rotate | skewX | skewY ;
+
+    // matrix(<a> <b> <c> <d> <e> <f>)
+    auto const matrix_def = no_case[lit("matrix")]
+        > '(' > expr > ',' >  expr > ',' > expr > ',' > expr > ',' > expr > ',' > expr > ')'
+        ;
+
+    // translate(<tx> [<ty>])
+    auto const translate_def = no_case[lit("translate")]
+        > '(' > expr > -(',' > expr )  > ')'
+        ;
+
+    // scale(<sx> [<sy>])
+    auto const scale_def = no_case[lit("scale")]
+        > '(' > expr >  -(',' > expr )  > ')'
+        ;
+
+    // rotate(<rotate-angle> [<cx> <cy>])
+    auto const rotate_def = no_case[lit("rotate")]
+        > '(' > expr > -(',' > expr > ',' > expr) > ')'
+        ;
+
+    // skewX(<skew-angle>)
+    auto const skewX_def = no_case[lit("skewX")]
+        > '(' > expr > ')';
+
+    // skewY(<skew-angle>)
+    auto const skewY_def = no_case[lit("skewY")]
+        > '(' >  expr  > ')';
+
+
+    BOOST_SPIRIT_DEFINE (
+        transform,
+        transform_list_rule,
+        transform_node_rule,
+        matrix,
+        translate,
+        scale,
+        rotate,
+        skewX,
+        skewY);
+
+}} // ns
+
+namespace mapnik
+{
+grammar::transform_expression_grammar_type transform_expression_grammar()
+{
+    return grammar::transform;
+}
+}
+
+#endif
diff --git a/include/mapnik/well_known_srs.hpp b/include/mapnik/well_known_srs.hpp
index e8349e709..235a90859 100644
--- a/include/mapnik/well_known_srs.hpp
+++ b/include/mapnik/well_known_srs.hpp
@@ -51,11 +51,11 @@ static const double EARTH_DIAMETER = EARTH_RADIUS * 2.0;
 static const double EARTH_CIRCUMFERENCE = EARTH_DIAMETER * M_PI;
 static const double MAXEXTENT = EARTH_CIRCUMFERENCE / 2.0;
 static const double M_PI_by2 = M_PI / 2;
-static const double D2R = M_PI / 180;
-static const double R2D = 180 / M_PI;
-static const double M_PIby360 = M_PI / 360;
-static const double MAXEXTENTby180 = MAXEXTENT / 180;
-static const double MAX_LATITUDE = R2D * (2 * std::atan(std::exp(180 * D2R)) - M_PI_by2);
+static const double D2R = M_PI / 180.0;
+static const double R2D = 180.0 / M_PI;
+static const double M_PIby360 = M_PI / 360.0;
+static const double MAXEXTENTby180 = MAXEXTENT / 180.0;
+static const double MAX_LATITUDE = R2D * (2 * std::atan(std::exp(180.0 * D2R)) - M_PI_by2);
 static const std::string MAPNIK_LONGLAT_PROJ = "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs";
 static const std::string MAPNIK_GMERC_PROJ = "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over";
 
@@ -63,24 +63,23 @@ boost::optional<well_known_srs_e> is_well_known_srs(std::string const& srs);
 
 boost::optional<bool> is_known_geographic(std::string const& srs);
 
-static inline bool lonlat2merc(double * x, double * y , int point_count)
+static inline bool lonlat2merc(double * x, double * y, std::size_t point_count)
 {
-    for(int i=0; i<point_count; ++i)
+    for (std::size_t i = 0; i < point_count; ++i)
     {
         if (x[i] > 180) x[i] = 180;
         else if (x[i] < -180) x[i] = -180;
         if (y[i] > MAX_LATITUDE) y[i] = MAX_LATITUDE;
         else if (y[i] < -MAX_LATITUDE) y[i] = -MAX_LATITUDE;
         x[i] = x[i] * MAXEXTENTby180;
-        y[i] = std::log(std::tan((90 + y[i]) * M_PIby360)) * R2D;
-        y[i] = y[i] * MAXEXTENTby180;
+        y[i] = std::log(std::tan((90.0 + y[i]) * M_PIby360)) * R2D * MAXEXTENTby180;
     }
     return true;
 }
 
-static inline bool merc2lonlat(double * x, double * y , int point_count)
+static inline bool merc2lonlat(double * x, double * y, std::size_t point_count)
 {
-    for(int i=0; i<point_count; i++)
+    for(std::size_t i = 0; i < point_count; ++i)
     {
         if (x[i] > MAXEXTENT) x[i] = MAXEXTENT;
         else if (x[i] < -MAXEXTENT) x[i] = -MAXEXTENT;
diff --git a/plugins/input/shape/dbfile.cpp b/plugins/input/shape/dbfile.cpp
index 3594bcbd6..36d9a964c 100644
--- a/plugins/input/shape/dbfile.cpp
+++ b/plugins/input/shape/dbfile.cpp
@@ -30,7 +30,7 @@
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
+#include <boost/spirit/home/x3.hpp>
 #if defined(MAPNIK_MEMORY_MAPPED_FILE)
 #include <boost/interprocess/mapped_region.hpp>
 #include <mapnik/mapped_memory_cache.hpp>
@@ -187,9 +187,9 @@ void dbf_file::add_attribute(int col, mapnik::transcoder const& tr, mapnik::feat
                 double val = 0.0;
                 const char *itr = record_+fields_[col].offset_;
                 const char *end = itr + fields_[col].length_;
-                ascii::space_type space;
-                static qi::double_type double_;
-                if (qi::phrase_parse(itr,end,double_,space,val))
+                x3::ascii::space_type space;
+                static x3::double_type double_;
+                if (x3::phrase_parse(itr,end,double_,space,val))
                 {
                     f.put(name,val);
                 }
@@ -199,9 +199,9 @@ void dbf_file::add_attribute(int col, mapnik::transcoder const& tr, mapnik::feat
                 mapnik::value_integer val = 0;
                 const char *itr = record_+fields_[col].offset_;
                 const char *end = itr + fields_[col].length_;
-                ascii::space_type space;
-                static qi::int_parser<mapnik::value_integer,10,1,-1> numeric_parser;
-                if (qi::phrase_parse(itr, end, numeric_parser, space, val))
+                x3::ascii::space_type space;
+                static x3::int_parser<mapnik::value_integer,10,1,-1> numeric_parser;
+                if (x3::phrase_parse(itr, end, numeric_parser, space, val))
                 {
                     f.put(name,val);
                 }
diff --git a/src/agg/process_building_symbolizer.cpp b/src/agg/process_building_symbolizer.cpp
index d27b68b7c..6bcee3457 100644
--- a/src/agg/process_building_symbolizer.cpp
+++ b/src/agg/process_building_symbolizer.cpp
@@ -36,6 +36,7 @@
 
 // stl
 #include <deque>
+#include <memory>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore_agg.hpp>
diff --git a/src/build.py b/src/build.py
index f4d444ee0..a1c7da041 100644
--- a/src/build.py
+++ b/src/build.py
@@ -152,15 +152,17 @@ else: # unix, non-macos
 
 source = Split(
     """
-    expression_grammar.cpp
+    expression_grammar_x3.cpp
     fs.cpp
     request.cpp
     well_known_srs.cpp
     params.cpp
-    image_filter_types.cpp
-    image_filter_grammar.cpp
+    parse_image_filters.cpp
+    generate_image_filters.cpp
+    image_filter_grammar_x3.cpp
     color.cpp
-    conversions.cpp
+    conversions_numeric.cpp
+    conversions_string.cpp
     image_copy.cpp
     image_compositing.cpp
     image_scaling.cpp
@@ -174,6 +176,7 @@ source = Split(
     expression_string.cpp
     expression.cpp
     transform_expression.cpp
+    transform_expression_grammar_x3.cpp
     feature_kv_iterator.cpp
     feature_style_processor.cpp
     feature_type_style.cpp
@@ -200,7 +203,6 @@ source = Split(
     load_map.cpp
     palette.cpp
     marker_helpers.cpp
-    transform_expression_grammar.cpp
     plugin.cpp
     rule.cpp
     save_map.cpp
@@ -224,7 +226,7 @@ source = Split(
     svg/svg_points_parser.cpp
     svg/svg_transform_parser.cpp
     warp.cpp
-    css_color_grammar.cpp
+    css_color_grammar_x3.cpp
     vertex_cache.cpp
     vertex_adapters.cpp
     text/font_library.cpp
diff --git a/src/cairo/process_building_symbolizer.cpp b/src/cairo/process_building_symbolizer.cpp
index 544414374..cc4c6baf5 100644
--- a/src/cairo/process_building_symbolizer.cpp
+++ b/src/cairo/process_building_symbolizer.cpp
@@ -34,6 +34,7 @@
 
 // stl
 #include <cmath>
+#include <memory>
 
 namespace mapnik
 {
diff --git a/src/cairo/process_group_symbolizer.cpp b/src/cairo/process_group_symbolizer.cpp
index 0c35ba0ec..0885df49d 100644
--- a/src/cairo/process_group_symbolizer.cpp
+++ b/src/cairo/process_group_symbolizer.cpp
@@ -32,6 +32,8 @@
 // mapnik symbolizer generics
 #include <mapnik/renderer_common/render_group_symbolizer.hpp>
 
+#include <memory>
+
 namespace mapnik
 {
 
diff --git a/src/cairo/process_line_pattern_symbolizer.cpp b/src/cairo/process_line_pattern_symbolizer.cpp
index f53d850a6..e4ae6f609 100644
--- a/src/cairo/process_line_pattern_symbolizer.cpp
+++ b/src/cairo/process_line_pattern_symbolizer.cpp
@@ -35,6 +35,8 @@
 #include <mapnik/agg_rasterizer.hpp>
 #include <mapnik/renderer_common/apply_vertex_converter.hpp>
 
+#include <memory>
+
 namespace mapnik
 {
 
diff --git a/src/cairo/process_raster_symbolizer.cpp b/src/cairo/process_raster_symbolizer.cpp
index 2b6fdc5c2..658ad8373 100644
--- a/src/cairo/process_raster_symbolizer.cpp
+++ b/src/cairo/process_raster_symbolizer.cpp
@@ -32,6 +32,8 @@
 // mapnik symbolizer generics
 #include <mapnik/renderer_common/process_raster_symbolizer.hpp>
 
+#include <memory>
+
 namespace mapnik
 {
 
diff --git a/src/color_factory.cpp b/src/color_factory.cpp
index dc54e89e5..83956d71f 100644
--- a/src/color_factory.cpp
+++ b/src/color_factory.cpp
@@ -24,21 +24,20 @@
 #include <mapnik/color.hpp>
 #include <mapnik/color_factory.hpp>
 #include <mapnik/config_error.hpp>
-#include <mapnik/css_color_grammar.hpp>
+#include <mapnik/css_color_grammar_x3.hpp>
 
 namespace mapnik {
 
 color parse_color(std::string const& str)
 {
     // TODO - early return for @color?
-    static const css_color_grammar<std::string::const_iterator> g;
+    auto const& grammar = mapnik::color_grammar();
     color c;
     std::string::const_iterator first = str.begin();
     std::string::const_iterator last =  str.end();
-    boost::spirit::ascii::space_type space;
-    bool result = boost::spirit::qi::phrase_parse(first, last, g,
-                                                  space,
-                                                  c);
+    using namespace boost::spirit::x3::ascii;
+
+    bool result = boost::spirit::x3::phrase_parse(first, last, grammar, space, c);
     if (result && (first == last))
     {
         return c;
diff --git a/src/conversions.cpp b/src/conversions.cpp
deleted file mode 100644
index fc63f1dcd..000000000
--- a/src/conversions.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-// mapnik
-#include <mapnik/util/conversions.hpp>
-#include <mapnik/value/types.hpp>
-
-#include <cstring>
-#include <algorithm>
-
-// karma is used by default
-#define MAPNIK_KARMA_TO_STRING
-
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#ifdef MAPNIK_KARMA_TO_STRING
-  #include <boost/spirit/include/karma.hpp>
-#endif
-#pragma GCC diagnostic pop
-
-#if _MSC_VER
-#define snprintf _snprintf
-#endif
-
-namespace mapnik {
-
-namespace util {
-
-using namespace boost::spirit;
-
-auto INTEGER = qi::int_type();
-#ifdef BIGINT
-auto LONGLONG = qi::long_long_type();
-#endif
-auto FLOAT = qi::float_type();
-auto DOUBLE = qi::double_type();
-
-bool string2bool(std::string const& value, bool & result)
-{
-    if (value.empty() || value.size() > 5) {
-        return false;
-    } else if (value == "true") {
-        return result = true;
-    } else if (value == "false") {
-        result = false;
-        return true;
-    }
-    std::string val(value);
-    std::transform(val.begin(), val.end(), val.begin(), ::tolower);
-    if (val == "true" || val == "yes" || val == "1" || val == "on") {
-        return result = true;
-    } else if (val == "false" || val == "no" || val == "0" || val == "off") {
-        result = false;
-        return true;
-    }
-    return false;
-}
-
-bool string2bool(const char * iter, const char * end, bool & result)
-{
-    std::string val(iter,end);
-    return string2bool(val,result);
-}
-
-bool string2int(const char * iter, const char * end, int & result)
-{
-    ascii::space_type space;
-    bool r = qi::phrase_parse(iter,end,INTEGER,space,result);
-    return r && (iter == end);
-}
-
-bool string2int(std::string const& value, int & result)
-{
-    ascii::space_type space;
-    std::string::const_iterator str_beg = value.begin();
-    std::string::const_iterator str_end = value.end();
-    bool r = qi::phrase_parse(str_beg,str_end,INTEGER,space,result);
-    return r && (str_beg == str_end);
-}
-
-#ifdef BIGINT
-bool string2int(const char * iter, const char * end, mapnik::value_integer & result)
-{
-    ascii::space_type space;
-    bool r = qi::phrase_parse(iter,end,LONGLONG,space,result);
-    return r && (iter == end);
-}
-
-bool string2int(std::string const& value, mapnik::value_integer & result)
-{
-    ascii::space_type space;
-    std::string::const_iterator str_beg = value.begin();
-    std::string::const_iterator str_end = value.end();
-    bool r = qi::phrase_parse(str_beg,str_end,LONGLONG,space,result);
-    return r && (str_beg == str_end);
-}
-#endif
-
-bool string2double(std::string const& value, double & result)
-{
-    ascii::space_type space;
-    std::string::const_iterator str_beg = value.begin();
-    std::string::const_iterator str_end = value.end();
-    bool r = qi::phrase_parse(str_beg,str_end,DOUBLE,space,result);
-    return r && (str_beg == str_end);
-}
-
-bool string2double(const char * iter, const char * end, double & result)
-{
-    ascii::space_type space;
-    bool r = qi::phrase_parse(iter,end,DOUBLE,space,result);
-    return r && (iter == end);
-}
-
-bool string2float(std::string const& value, float & result)
-{
-    ascii::space_type space;
-    std::string::const_iterator str_beg = value.begin();
-    std::string::const_iterator str_end = value.end();
-    bool r = qi::phrase_parse(str_beg,str_end,FLOAT,space,result);
-    return r && (str_beg == str_end);
-}
-
-bool string2float(const char * iter, const char * end, float & result)
-{
-    ascii::space_type space;
-    bool r = qi::phrase_parse(iter,end,FLOAT,space,result);
-    return r && (iter == end);
-}
-
-// double conversion - here we use sprintf over karma to work
-// around https://github.com/mapnik/mapnik/issues/1741
-bool to_string(std::string & s, double val)
-{
-    s.resize(s.capacity());
-    while (true)
-    {
-        size_t n2 = static_cast<size_t>(snprintf(&s[0], s.size()+1, "%g", val));
-        if (n2 <= s.size())
-        {
-            s.resize(n2);
-            break;
-        }
-        s.resize(n2);
-    }
-    return true;
-}
-
-#ifdef MAPNIK_KARMA_TO_STRING
-
-bool to_string(std::string & str, int value)
-{
-  namespace karma = boost::spirit::karma;
-  std::back_insert_iterator<std::string> sink(str);
-  return karma::generate(sink, value);
-}
-
-#ifdef BIGINT
-bool to_string(std::string & str, mapnik::value_integer value)
-{
-  namespace karma = boost::spirit::karma;
-  std::back_insert_iterator<std::string> sink(str);
-  return karma::generate(sink, value);
-}
-#endif
-
-bool to_string(std::string & str, unsigned value)
-{
-  namespace karma = boost::spirit::karma;
-  std::back_insert_iterator<std::string> sink(str);
-  return karma::generate(sink, value);
-}
-
-bool to_string(std::string & str, bool value)
-{
-  namespace karma = boost::spirit::karma;
-  std::back_insert_iterator<std::string> sink(str);
-  return karma::generate(sink, value);
-}
-
-#else
-
-bool to_string(std::string & s, int val)
-{
-    s.resize(s.capacity());
-    while (true)
-    {
-        size_t n2 = static_cast<size_t>(snprintf(&s[0], s.size()+1, "%d", val));
-        if (n2 <= s.size())
-        {
-            s.resize(n2);
-            break;
-        }
-        s.resize(n2);
-    }
-    return true;
-}
-
-#ifdef BIGINT
-bool to_string(std::string & s, mapnik::value_integer val)
-{
-    s.resize(s.capacity());
-    while (true)
-    {
-        size_t n2 = static_cast<size_t>(snprintf(&s[0], s.size()+1, "%lld", val));
-        if (n2 <= s.size())
-        {
-            s.resize(n2);
-            break;
-        }
-        s.resize(n2);
-    }
-    return true;
-}
-#endif
-
-bool to_string(std::string & s, unsigned val)
-{
-    s.resize(s.capacity());
-    while (true)
-    {
-        size_t n2 = static_cast<size_t>(snprintf(&s[0], s.size()+1, "%u", val));
-        if (n2 <= s.size())
-        {
-            s.resize(n2);
-            break;
-        }
-        s.resize(n2);
-    }
-    return true;
-}
-
-bool to_string(std::string & s, bool val)
-{
-  if (val) s = "true";
-  else s = "false";
-  return true;
-}
-
-#endif
-
-} // end namespace util
-
-}
diff --git a/src/conversions_numeric.cpp b/src/conversions_numeric.cpp
new file mode 100644
index 000000000..d209ea6b6
--- /dev/null
+++ b/src/conversions_numeric.cpp
@@ -0,0 +1,146 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+// mapnik
+#include <mapnik/util/conversions.hpp>
+#include <mapnik/value/types.hpp>
+
+#include <algorithm>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#pragma GCC diagnostic pop
+
+namespace mapnik { namespace util {
+
+using namespace boost::spirit;
+
+auto INTEGER = x3::int_type();
+#ifdef BIGINT
+//auto LONGLONG = x3::long_long_type();
+#endif
+auto FLOAT = x3::float_type();
+auto DOUBLE = x3::double_type();
+
+bool string2bool(std::string const& value, bool& result)
+{
+    if (value.empty() || value.size() > 5)
+    {
+        return false;
+    }
+    else if (value == "true")
+    {
+        return result = true;
+    }
+    else if (value == "false")
+    {
+        result = false;
+        return true;
+    }
+    std::string val(value);
+    std::transform(val.begin(), val.end(), val.begin(), ::tolower);
+    if (val == "true" || val == "yes" || val == "1" || val == "on")
+    {
+        return result = true;
+    }
+    else if (val == "false" || val == "no" || val == "0" || val == "off")
+    {
+        result = false;
+        return true;
+    }
+    return false;
+}
+
+bool string2bool(const char* iter, const char* end, bool& result)
+{
+    std::string val(iter, end);
+    return string2bool(val, result);
+}
+
+bool string2int(const char* iter, const char* end, int& result)
+{
+    x3::ascii::space_type space;
+    bool r = x3::phrase_parse(iter, end, INTEGER, space, result);
+    return r && (iter == end);
+}
+
+bool string2int(std::string const& value, int& result)
+{
+    x3::ascii::space_type space;
+    std::string::const_iterator str_beg = value.begin();
+    std::string::const_iterator str_end = value.end();
+    bool r = x3::phrase_parse(str_beg, str_end, INTEGER, space, result);
+    return r && (str_beg == str_end);
+}
+
+#ifdef BIGINT
+bool string2int(const char* iter, const char* end, mapnik::value_integer& result)
+{
+    x3::ascii::space_type space;
+    bool r = x3::phrase_parse(iter, end, x3::long_long, space, result);
+    return r && (iter == end);
+}
+
+bool string2int(std::string const& value, mapnik::value_integer& result)
+{
+    x3::ascii::space_type space;
+    std::string::const_iterator str_beg = value.begin();
+    std::string::const_iterator str_end = value.end();
+    bool r = x3::phrase_parse(str_beg, str_end, x3::long_long, space, result);
+    return r && (str_beg == str_end);
+}
+#endif
+
+bool string2double(std::string const& value, double& result)
+{
+    x3::ascii::space_type space;
+    std::string::const_iterator str_beg = value.begin();
+    std::string::const_iterator str_end = value.end();
+    bool r = x3::phrase_parse(str_beg, str_end, DOUBLE, space, result);
+    return r && (str_beg == str_end);
+}
+
+bool string2double(const char* iter, const char* end, double& result)
+{
+    x3::ascii::space_type space;
+    bool r = x3::phrase_parse(iter, end, DOUBLE, space, result);
+    return r && (iter == end);
+}
+
+bool string2float(std::string const& value, float& result)
+{
+    x3::ascii::space_type space;
+    std::string::const_iterator str_beg = value.begin();
+    std::string::const_iterator str_end = value.end();
+    bool r = x3::phrase_parse(str_beg, str_end, FLOAT, space, result);
+    return r && (str_beg == str_end);
+}
+
+bool string2float(const char* iter, const char* end, float& result)
+{
+    x3::ascii::space_type space;
+    bool r = x3::phrase_parse(iter, end, FLOAT, space, result);
+    return r && (iter == end);
+}
+} // util
+} // mapnik
diff --git a/src/conversions_string.cpp b/src/conversions_string.cpp
new file mode 100644
index 000000000..bd9e46df1
--- /dev/null
+++ b/src/conversions_string.cpp
@@ -0,0 +1,162 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+// mapnik
+#include <mapnik/util/conversions.hpp>
+#include <mapnik/value/types.hpp>
+
+#include <algorithm>
+#include <cstring>
+
+// karma is used by default
+#define MAPNIK_KARMA_TO_STRING
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#ifdef MAPNIK_KARMA_TO_STRING
+#include <boost/spirit/include/karma.hpp>
+#endif
+#pragma GCC diagnostic pop
+
+#if _MSC_VER
+#define snprintf _snprintf
+#endif
+
+namespace mapnik { namespace util {
+
+using namespace boost::spirit;
+
+// double conversion - here we use sprintf over karma to work
+// around https://github.com/mapnik/mapnik/issues/1741
+bool to_string(std::string& s, double val)
+{
+    s.resize(s.capacity());
+    while (true)
+    {
+        size_t n2 = static_cast<size_t>(snprintf(&s[0], s.size() + 1, "%g", val));
+        if (n2 <= s.size())
+        {
+            s.resize(n2);
+            break;
+        }
+        s.resize(n2);
+    }
+    return true;
+}
+
+#ifdef MAPNIK_KARMA_TO_STRING
+
+bool to_string(std::string& str, int value)
+{
+    namespace karma = boost::spirit::karma;
+    std::back_insert_iterator<std::string> sink(str);
+    return karma::generate(sink, value);
+}
+
+#ifdef BIGINT
+bool to_string(std::string& str, mapnik::value_integer value)
+{
+    namespace karma = boost::spirit::karma;
+    std::back_insert_iterator<std::string> sink(str);
+    return karma::generate(sink, value);
+}
+#endif
+
+bool to_string(std::string& str, unsigned value)
+{
+    namespace karma = boost::spirit::karma;
+    std::back_insert_iterator<std::string> sink(str);
+    return karma::generate(sink, value);
+}
+
+bool to_string(std::string& str, bool value)
+{
+    namespace karma = boost::spirit::karma;
+    std::back_insert_iterator<std::string> sink(str);
+    return karma::generate(sink, value);
+}
+
+#else
+
+bool to_string(std::string& s, int val)
+{
+    s.resize(s.capacity());
+    while (true)
+    {
+        size_t n2 = static_cast<size_t>(snprintf(&s[0], s.size() + 1, "%d", val));
+        if (n2 <= s.size())
+        {
+            s.resize(n2);
+            break;
+        }
+        s.resize(n2);
+    }
+    return true;
+}
+
+#ifdef BIGINT
+bool to_string(std::string& s, mapnik::value_integer val)
+{
+    s.resize(s.capacity());
+    while (true)
+    {
+        size_t n2 = static_cast<size_t>(snprintf(&s[0], s.size() + 1, "%lld", val));
+        if (n2 <= s.size())
+        {
+            s.resize(n2);
+            break;
+        }
+        s.resize(n2);
+    }
+    return true;
+}
+#endif
+
+bool to_string(std::string& s, unsigned val)
+{
+    s.resize(s.capacity());
+    while (true)
+    {
+        size_t n2 = static_cast<size_t>(snprintf(&s[0], s.size() + 1, "%u", val));
+        if (n2 <= s.size())
+        {
+            s.resize(n2);
+            break;
+        }
+        s.resize(n2);
+    }
+    return true;
+}
+
+bool to_string(std::string& s, bool val)
+{
+    if (val)
+        s = "true";
+    else
+        s = "false";
+    return true;
+}
+
+#endif
+
+} // end namespace util
+}
diff --git a/src/image_filter_grammar.cpp b/src/css_color_grammar_x3.cpp
similarity index 74%
rename from src/image_filter_grammar.cpp
rename to src/css_color_grammar_x3.cpp
index 9a4bea35a..a89505496 100644
--- a/src/image_filter_grammar.cpp
+++ b/src/css_color_grammar_x3.cpp
@@ -20,10 +20,14 @@
  *
  *****************************************************************************/
 
-#include <mapnik/image_filter_grammar.hpp>
-#include <mapnik/image_filter_grammar_impl.hpp>
-#include <mapnik/image_filter_types.hpp>
-#include <string>
-#include <vector>
+#include <mapnik/css_color_grammar_x3_def.hpp>
 
-template struct mapnik::image_filter_grammar<std::string::const_iterator,std::vector<mapnik::filter::filter_type>>;
+namespace mapnik { namespace css_color_grammar {
+
+namespace x3 = boost::spirit::x3;
+using iterator_type = std::string::const_iterator;
+using context_type = x3::phrase_parse_context<x3::ascii::space_type>::type;
+
+BOOST_SPIRIT_INSTANTIATE(css_color_grammar_type, iterator_type, context_type);
+
+}}
diff --git a/src/dasharray_parser.cpp b/src/dasharray_parser.cpp
index 963a2905a..3c884cb3f 100644
--- a/src/dasharray_parser.cpp
+++ b/src/dasharray_parser.cpp
@@ -25,11 +25,7 @@
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_stl.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
+#include <boost/spirit/home/x3.hpp>
 #pragma GCC diagnostic pop
 
 namespace mapnik {
@@ -58,15 +54,14 @@ inline bool setup_dashes(std::vector<double> & buf, dash_array & dash)
 }
 }
 
+
 bool parse_dasharray(std::string const& value, dash_array & dash)
 {
     using namespace boost::spirit;
-    qi::double_type double_;
-    qi::_1_type _1;
-    qi::lit_type lit;
-    qi::char_type char_;
-    qi::ascii::space_type space;
-    qi::no_skip_type no_skip;
+    using x3::no_skip;
+    using x3::double_;
+    using x3::char_;
+    boost::spirit::x3::ascii::space_type space;
     // SVG
     // dasharray ::= (length | percentage) (comma-wsp dasharray)?
     // no support for 'percentage' as viewport is unknown at load_map
@@ -74,11 +69,9 @@ bool parse_dasharray(std::string const& value, dash_array & dash)
     std::vector<double> buf;
     auto first = value.begin();
     auto last = value.end();
-    bool r = qi::phrase_parse(first, last,
-                          (double_[boost::phoenix::push_back(boost::phoenix::ref(buf), _1)] %
-                          no_skip[char_(", ")]
-                          | lit("none")),
-                          space);
+    bool r = x3::phrase_parse(first, last,
+                              (double_ % no_skip[char_(", ")] | "none"),
+                              space, buf);
     if (r &&  first == last)
     {
         return setup_dashes(buf, dash);
diff --git a/src/expression.cpp b/src/expression.cpp
index f4bdeeb84..2988fc7d9 100644
--- a/src/expression.cpp
+++ b/src/expression.cpp
@@ -25,27 +25,31 @@
 #include <mapnik/config_error.hpp>
 #include <mapnik/unicode.hpp>
 #include <mapnik/expression_node_types.hpp>
-#include <mapnik/expression_grammar.hpp>
-
-// boost
-#include <boost/spirit/include/qi.hpp>
+#include <mapnik/expression_grammar_x3.hpp>
+#include <mapnik/expression_grammar_x3_config.hpp>
 
 namespace mapnik
 {
 
 expression_ptr parse_expression(std::string const& str)
 {
-    static const expression_grammar<std::string::const_iterator> g;
-    boost::spirit::standard_wide::space_type space;
     auto node = std::make_shared<expr_node>();
-    std::string::const_iterator itr = str.begin();
-    std::string::const_iterator end = str.end();
+    using boost::spirit::x3::ascii::space;
+    mapnik::transcoder const tr("utf8");
+    auto parser = boost::spirit::x3::with<mapnik::grammar::transcoder_tag>(std::ref(tr))
+        [
+            mapnik::expression_grammar()
+        ];
+
     bool r = false;
+    std::string::const_iterator itr = str.begin();
+    std::string::const_iterator const end = str.end();
+
     try
     {
-        r = boost::spirit::qi::phrase_parse(itr, end, g, space, *node);
+        r = boost::spirit::x3::phrase_parse(itr, end, parser, space, *node);
     }
-    catch (boost::spirit::qi::expectation_failure<std::string::const_iterator> const& ex)
+    catch (boost::spirit::x3::expectation_failure<std::string::const_iterator> const& ex)
     {
         // no need to show "boost::spirit::qi::expectation_failure" which is a std::runtime_error
         throw config_error("Failed to parse expression: \"" + str + "\"");
diff --git a/src/transform_expression_grammar.cpp b/src/expression_grammar_x3.cpp
similarity index 81%
rename from src/transform_expression_grammar.cpp
rename to src/expression_grammar_x3.cpp
index 170b0a823..f55e7cc3b 100644
--- a/src/transform_expression_grammar.cpp
+++ b/src/expression_grammar_x3.cpp
@@ -20,7 +20,11 @@
  *
  *****************************************************************************/
 
-#include <mapnik/transform_expression_grammar_impl.hpp>
-#include <string>
+#include <mapnik/expression_grammar_x3_def.hpp>
+#include <mapnik/expression_grammar_x3_config.hpp>
 
-template struct mapnik::transform_expression_grammar<std::string::const_iterator>;
+namespace mapnik { namespace grammar {
+
+BOOST_SPIRIT_INSTANTIATE(expression_grammar_type, iterator_type, context_type);
+
+}}
diff --git a/src/feature_type_style.cpp b/src/feature_type_style.cpp
index a2ddb33ba..6d0ee13fd 100644
--- a/src/feature_type_style.cpp
+++ b/src/feature_type_style.cpp
@@ -148,9 +148,9 @@ std::vector<filter::filter_type> const&  feature_type_style::direct_image_filter
     return direct_filters_;
 }
 
-void feature_type_style::set_comp_op(composite_mode_e comp_op)
+void feature_type_style::set_comp_op(composite_mode_e _comp_op)
 {
-    comp_op_ = comp_op;
+    comp_op_ = _comp_op;
 }
 
 boost::optional<composite_mode_e> feature_type_style::comp_op() const
diff --git a/src/font_engine_freetype.cpp b/src/font_engine_freetype.cpp
index 9721d70bf..29e34a769 100644
--- a/src/font_engine_freetype.cpp
+++ b/src/font_engine_freetype.cpp
@@ -48,7 +48,6 @@ extern "C"
 #include <algorithm>
 #include <stdexcept>
 
-
 namespace mapnik
 {
 
diff --git a/src/image_filter_types.cpp b/src/generate_image_filters.cpp
similarity index 66%
rename from src/image_filter_types.cpp
rename to src/generate_image_filters.cpp
index d30804378..03c55ab43 100644
--- a/src/image_filter_types.cpp
+++ b/src/generate_image_filters.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
+
 // mapnik
 #include <mapnik/image_filter_types.hpp>
-#include <mapnik/image_filter_grammar.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
@@ -43,18 +43,4 @@ bool generate_image_filters(std::back_insert_iterator<std::string> & sink, std::
     return r;
 }
 
-bool parse_image_filters(std::string const& filters, std::vector<filter_type>& image_filters)
-{
-    std::string::const_iterator itr = filters.begin();
-    std::string::const_iterator end = filters.end();
-    static const mapnik::image_filter_grammar<std::string::const_iterator,
-                                 std::vector<mapnik::filter::filter_type> > filter_grammar;
-    boost::spirit::qi::ascii::space_type space;
-    bool r = boost::spirit::qi::phrase_parse(itr,end,
-                                             filter_grammar,
-                                             space,
-                                             image_filters);
-    return r && itr==end;
-}
-
 }}
diff --git a/src/grid/process_building_symbolizer.cpp b/src/grid/process_building_symbolizer.cpp
index 13ee8d442..f3fb0f76d 100644
--- a/src/grid/process_building_symbolizer.cpp
+++ b/src/grid/process_building_symbolizer.cpp
@@ -38,6 +38,7 @@
 
 // stl
 #include <deque>
+#include <memory>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore_agg.hpp>
diff --git a/src/css_color_grammar.cpp b/src/image_filter_grammar_x3.cpp
similarity index 67%
rename from src/css_color_grammar.cpp
rename to src/image_filter_grammar_x3.cpp
index 2e9f60c92..8b1e84f8a 100644
--- a/src/css_color_grammar.cpp
+++ b/src/image_filter_grammar_x3.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,12 +20,14 @@
  *
  *****************************************************************************/
 
-// NOTE: we define this here in a cpp because def is needed twice:
-// once by src/color_factory.cpp and once by include/mapnik/image_filter_grammar.hpp
-// otherwise it would make sense to simply do `#include <mapnik/css_color_grammar_impl.hpp>`
-// in a single file
-#include <mapnik/color.hpp>
-#include <mapnik/css_color_grammar_impl.hpp>
-#include <string>
+#include <mapnik/image_filter_grammar_x3_def.hpp>
 
-template struct mapnik::css_color_grammar<std::string::const_iterator>;
+namespace mapnik { namespace image_filter {
+
+namespace x3 = boost::spirit::x3;
+using iterator_type = std::string::const_iterator;
+using context_type = x3::phrase_parse_context<x3::ascii::space_type>::type;
+
+BOOST_SPIRIT_INSTANTIATE(image_filter_grammar_type, iterator_type, context_type);
+
+}} // image_filter //mapnik
diff --git a/src/image_options.cpp b/src/image_options.cpp
index bbcb6c909..7494838cf 100644
--- a/src/image_options.cpp
+++ b/src/image_options.cpp
@@ -24,49 +24,43 @@
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
+#include <boost/spirit/home/x3.hpp>
 #include <boost/fusion/include/std_pair.hpp>
 #pragma GCC diagnostic pop
 
-namespace mapnik { namespace detail {
+namespace mapnik { namespace grammar {
 
-namespace qi = boost::spirit::qi;
+namespace x3 = boost::spirit::x3;
 
-template <typename Iterator>
-struct image_options_grammar
-    : qi::grammar<Iterator, image_options_map(), boost::spirit::ascii::space_type>
-{
-    using pair_type = std::pair<std::string, boost::optional<std::string>>;
-    image_options_grammar()
-        : image_options_grammar::base_type(start)
-    {
-        qi::lit_type lit;
-        qi::char_type char_;
-        start = pair >> *(lit(':') >> pair)
-            ;
-        pair = key >> -('=' >> value)
-            ;
-        key = char_("a-zA-Z_") >> *char_("a-zA-Z_0-9\\.\\-")
-            ;
-        value = +char_("a-zA-Z_0-9\\.\\-")
-            ;
-    }
+using x3::lit;
+using x3::ascii::char_;
+using pair_type = std::pair<std::string, boost::optional<std::string>>;
 
-    qi::rule<Iterator, image_options_map(), boost::spirit::ascii::space_type> start;
-    qi::rule<Iterator, pair_type(), boost::spirit::ascii::space_type> pair;
-    qi::rule<Iterator, std::string(), boost::spirit::ascii::space_type> key, value;
-};
+x3::rule<class image_options, image_options_map> const image_options("image options");
+x3::rule<class key_value, pair_type> const key_value("key_value");
+x3::rule<class key, std::string> const key("key");
+x3::rule<class value, std::string> const value("value");
 
-} // ns detail
+auto const key_def = char_("a-zA-Z_") > *char_("a-zA-Z_0-9\\.\\-");
+auto const value_def = +char_("a-zA-Z_0-9\\.\\-");
+auto const key_value_def = key > -('=' > value);
+auto const image_options_def = key_value % lit(':');
+
+BOOST_SPIRIT_DEFINE(key);
+BOOST_SPIRIT_DEFINE(value);
+BOOST_SPIRIT_DEFINE(key_value);
+BOOST_SPIRIT_DEFINE(image_options);
+
+} // grammar
 
 image_options_map parse_image_options(std::string const& str)
 {
      auto const begin = str.begin();
      auto const end = str.end();
-     boost::spirit::ascii::space_type space;
-     mapnik::detail::image_options_grammar<std::string::const_iterator> g;
+     using boost::spirit::x3::space;
+     using mapnik::grammar::image_options;
      image_options_map options;
-     bool success = boost::spirit::qi::phrase_parse(begin, end, g, space, options);
+     bool success = boost::spirit::x3::phrase_parse(begin, end, image_options, space, options);
      if (!success)
      {
          throw std::runtime_error("Can't parse image options: " + str);
diff --git a/src/layer.cpp b/src/layer.cpp
index 442026b4d..a923ae11b 100644
--- a/src/layer.cpp
+++ b/src/layer.cpp
@@ -31,9 +31,9 @@
 namespace mapnik
 {
 
-layer::layer(std::string const& name, std::string const& srs)
-    : name_(name),
-      srs_(srs),
+layer::layer(std::string const& _name, std::string const& _srs)
+    : name_(_name),
+      srs_(_srs),
       minimum_scale_denom_(0),
       maximum_scale_denom_(std::numeric_limits<double>::max()),
       active_(true),
@@ -114,9 +114,9 @@ bool layer::operator==(layer const& rhs) const
 
 layer::~layer() {}
 
-void layer::set_name( std::string const& name)
+void layer::set_name( std::string const& _name)
 {
-    name_ = name;
+    name_ = _name;
 }
 
 std::string const& layer::name() const
@@ -124,9 +124,9 @@ std::string const& layer::name() const
     return name_;
 }
 
-void layer::set_srs(std::string const& srs)
+void layer::set_srs(std::string const& _srs)
 {
-    srs_ = srs;
+    srs_ = _srs;
 }
 
 std::string const& layer::srs() const
@@ -169,9 +169,9 @@ double layer::maximum_scale_denominator() const
     return maximum_scale_denom_;
 }
 
-void layer::set_active(bool active)
+void layer::set_active(bool _active)
 {
-    active_=active;
+    active_ = _active;
 }
 
 bool layer::active() const
@@ -184,9 +184,9 @@ bool layer::visible(double scale_denom) const
     return active() && scale_denom >= minimum_scale_denom_ - 1e-6 && scale_denom < maximum_scale_denom_ + 1e-6;
 }
 
-void layer::set_queryable(bool queryable)
+void layer::set_queryable(bool _queryable)
 {
-    queryable_=queryable;
+    queryable_ = _queryable;
 }
 
 bool layer::queryable() const
@@ -250,9 +250,9 @@ bool layer::clear_label_cache() const
     return clear_label_cache_;
 }
 
-void layer::set_cache_features(bool cache_features)
+void layer::set_cache_features(bool _cache_features)
 {
-    cache_features_ = cache_features;
+    cache_features_ = _cache_features;
 }
 
 bool layer::cache_features() const
diff --git a/src/map.cpp b/src/map.cpp
index ec0d9f83e..dc3d53040 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -375,39 +375,39 @@ unsigned Map::height() const
     return height_;
 }
 
-void Map::set_width(unsigned width)
+void Map::set_width(unsigned _width)
 {
-    if (width != width_ &&
-        width >= MIN_MAPSIZE &&
-        width <= MAX_MAPSIZE)
+    if (_width != width_ &&
+        _width >= MIN_MAPSIZE &&
+        _width <= MAX_MAPSIZE)
     {
-        width_=width;
+        width_=_width;
         fixAspectRatio();
     }
 }
 
-void Map::set_height(unsigned height)
+void Map::set_height(unsigned _height)
 {
-    if (height != height_ &&
-        height >= MIN_MAPSIZE &&
-        height <= MAX_MAPSIZE)
+    if (_height != height_ &&
+        _height >= MIN_MAPSIZE &&
+        _height <= MAX_MAPSIZE)
     {
-        height_=height;
+        height_ = _height;
         fixAspectRatio();
     }
 }
 
-void Map::resize(unsigned width,unsigned height)
+void Map::resize(unsigned _width, unsigned _height)
 {
-    if ((width != width_ ||
-         height != height_) &&
-        width >= MIN_MAPSIZE &&
-        width <= MAX_MAPSIZE &&
-        height >= MIN_MAPSIZE &&
-        height <= MAX_MAPSIZE)
+    if ((_width != width_ ||
+         _height != height_) &&
+        _width >= MIN_MAPSIZE &&
+        _width <= MAX_MAPSIZE &&
+        _height >= MIN_MAPSIZE &&
+        _height <= MAX_MAPSIZE)
     {
-        width_=width;
-        height_=height;
+        width_ = _width;
+        height_ = _height;
         fixAspectRatio();
     }
 }
@@ -417,14 +417,14 @@ std::string const&  Map::srs() const
     return srs_;
 }
 
-void Map::set_srs(std::string const& srs)
+void Map::set_srs(std::string const& _srs)
 {
-    srs_ = srs;
+    srs_ = _srs;
 }
 
-void Map::set_buffer_size( int buffer_size)
+void Map::set_buffer_size(int _buffer_size)
 {
-    buffer_size_ = buffer_size;
+    buffer_size_ = _buffer_size;
 }
 
 int Map::buffer_size() const
diff --git a/src/memory_datasource.cpp b/src/memory_datasource.cpp
index 24238f382..d4a2fdcf5 100644
--- a/src/memory_datasource.cpp
+++ b/src/memory_datasource.cpp
@@ -68,12 +68,12 @@ const char * memory_datasource::name()
     return "memory";
 }
 
-memory_datasource::memory_datasource(parameters const& params)
-    : datasource(params),
+memory_datasource::memory_datasource(parameters const& _params)
+    : datasource(_params),
       desc_(memory_datasource::name(),
-            *params.get<std::string>("encoding","utf-8")),
+            *params_.get<std::string>("encoding","utf-8")),
       type_(datasource::Vector),
-      bbox_check_(*params.get<boolean_type>("bbox_check", true)),
+      bbox_check_(*params_.get<boolean_type>("bbox_check", true)),
       type_set_(false) {}
 
 memory_datasource::~memory_datasource() {}
diff --git a/src/parse_image_filters.cpp b/src/parse_image_filters.cpp
new file mode 100644
index 000000000..e8370e897
--- /dev/null
+++ b/src/parse_image_filters.cpp
@@ -0,0 +1,54 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2015 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+// mapnik
+#include <mapnik/image_filter_types.hpp>
+#include <mapnik/image_filter_grammar_x3.hpp>
+// stl
+#include <vector>
+
+namespace mapnik {
+
+namespace filter {
+
+bool parse_image_filters(std::string const& str, std::vector<filter_type> & image_filters)
+{
+    using namespace boost::spirit::x3::ascii;
+    auto const& grammar = mapnik::image_filter_grammar();
+    auto itr = str.begin();
+    auto end = str.end();
+
+    boost::spirit::x3::ascii::space_type space;
+    bool r = false;
+    try
+    {
+        r = boost::spirit::x3::phrase_parse(itr, end, grammar, space, image_filters);
+    }
+    catch (...)
+    {
+        image_filters.clear();
+        r = false;
+    }
+    return r && itr==end;
+}
+
+}}
diff --git a/src/parse_path.cpp b/src/parse_path.cpp
index a3d67c2cb..ebf50fbcc 100644
--- a/src/parse_path.cpp
+++ b/src/parse_path.cpp
@@ -21,26 +21,35 @@
  *****************************************************************************/
 
 #include <mapnik/parse_path.hpp>
-#include <mapnik/path_expression_grammar.hpp>
-#include <mapnik/path_expression_grammar_impl.hpp>
 #include <mapnik/config.hpp>
 #include <mapnik/attribute.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/value.hpp>
 
+#include <mapnik/path_expression_grammar_x3.hpp>
+#include <mapnik/path_expression_grammar_x3_def.hpp>
+
 // stl
 #include <stdexcept>
 
-namespace mapnik {
+namespace mapnik { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+using iterator_type = std::string::const_iterator;
+using context_type = x3::phrase_parse_context<x3::standard_wide::space_type>::type;
+
+BOOST_SPIRIT_INSTANTIATE(path_expression_grammar_type, iterator_type, context_type);
+
+}
 
 path_expression_ptr parse_path(std::string const& str)
 {
-    static const path_expression_grammar<std::string::const_iterator> g;
+    namespace x3 = boost::spirit::x3;
     auto path = std::make_shared<path_expression>();
-    boost::spirit::standard_wide::space_type space;
+    using boost::spirit::x3::standard_wide::space;
     std::string::const_iterator itr = str.begin();
     std::string::const_iterator end = str.end();
-    bool r = qi::phrase_parse(itr, end, g, space, *path);
+    bool r = x3::phrase_parse(itr, end, path_expression_grammar(), space, *path);
     if (r && itr == end)
     {
         return path;
diff --git a/src/parse_transform.cpp b/src/parse_transform.cpp
index e2daaf480..06b189f35 100644
--- a/src/parse_transform.cpp
+++ b/src/parse_transform.cpp
@@ -21,8 +21,9 @@
  *****************************************************************************/
 
 #include <mapnik/parse_transform.hpp>
-#include <mapnik/transform_expression_grammar.hpp>
-
+#include <mapnik/transform_expression_grammar_x3.hpp>
+#include <mapnik/expression_grammar_x3_config.hpp> // transcoder_tag
+#include <mapnik/config_error.hpp>
 // stl
 #include <string>
 #include <stdexcept>
@@ -31,14 +32,28 @@ namespace mapnik {
 
 transform_list_ptr parse_transform(std::string const& str, std::string const& encoding)
 {
-    static const transform_expression_grammar<std::string::const_iterator> g;
-    transform_list_ptr tl = std::make_shared<transform_list>();
+    using boost::spirit::x3::ascii::space;
+    transform_list_ptr trans_list = std::make_shared<transform_list>();
     std::string::const_iterator itr = str.begin();
     std::string::const_iterator end = str.end();
-    bool r = qi::phrase_parse(itr, end, g, space_type(), *tl);
-    if (r && itr == end)
+    mapnik::transcoder const tr(encoding);
+    auto const parser = boost::spirit::x3::with<mapnik::grammar::transcoder_tag>(std::ref(tr))
+        [
+            mapnik::transform_expression_grammar()
+        ];
+    bool status = false;
+    try
     {
-        return tl;
+        status = boost::spirit::x3::phrase_parse(itr, end, parser, space, *trans_list);
+    }
+    catch (boost::spirit::x3::expectation_failure<std::string::const_iterator> const& ex)
+    {
+        throw config_error("Failed to parse transform expression: \"" + str + "\"");
+    }
+
+    if (status && itr == end)
+    {
+        return trans_list;
     }
     else
     {
diff --git a/src/svg/svg_parser.cpp b/src/svg/svg_parser.cpp
index 827f557fc..9247eef86 100644
--- a/src/svg/svg_parser.cpp
+++ b/src/svg/svg_parser.cpp
@@ -41,9 +41,8 @@
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/spirit/home/x3.hpp>
+#include <boost/fusion/adapted/struct.hpp>
 #include <boost/fusion/include/std_pair.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/property_tree/detail/xml_parser_read_rapidxml.hpp>
@@ -55,6 +54,24 @@
 #include <cstring>
 #include <fstream>
 
+namespace mapnik { namespace svg {
+struct viewbox
+{
+    double x0;
+    double y0;
+    double x1;
+    double y1;
+};
+}}
+
+BOOST_FUSION_ADAPT_STRUCT (
+    mapnik::svg::viewbox,
+    (double, x0)
+    (double, y0)
+    (double, x1)
+    (double, y1)
+    )
+
 namespace mapnik { namespace svg {
 
 namespace rapidxml = boost::property_tree::detail::rapidxml;
@@ -77,29 +94,29 @@ void parse_attr(svg_parser & parser,rapidxml::xml_node<char> const* node);
 void parse_attr(svg_parser & parser,char const * name, char const* value);
 
 
+namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+
 using color_lookup_type = std::vector<std::pair<double, agg::rgba8> >;
-namespace qi = boost::spirit::qi;
 using pairs_type = std::vector<std::pair<std::string, std::string> >;
 
-template <typename Iterator,typename SkipType>
-struct key_value_sequence_ordered
-    : qi::grammar<Iterator, pairs_type(), SkipType>
-{
-    key_value_sequence_ordered()
-        : key_value_sequence_ordered::base_type(query)
-    {
-        qi::lit_type lit;
-        qi::char_type char_;
-        query =  pair >> *( lit(';') >> pair);
-        pair  =  key >> -(':' >> value);
-        key   =  char_("a-zA-Z_") >> *char_("a-zA-Z_0-9-");
-        value = +(char_ - lit(';'));
-    }
+x3::rule<class key_value_sequence_ordered, pairs_type> const key_value_sequence_ordered("key_value_sequence_ordered");
+x3::rule<class key_value, std::pair<std::string, std::string> > key_value("key_value");
+x3::rule<class key, std::string> key("key");
+x3::rule<class value_, std::string> value("value");
 
-    qi::rule<Iterator, pairs_type(), SkipType> query;
-    qi::rule<Iterator, std::pair<std::string, std::string>(), SkipType> pair;
-    qi::rule<Iterator, std::string(), SkipType> key, value;
-};
+auto const key_def = x3::char_("a-zA-Z_") > *x3::char_("a-zA-Z_0-9-");
+auto const value_def = +(x3::char_ - ';');
+auto const key_value_def = key > -(':' > value);
+auto const key_value_sequence_ordered_def = key_value % ';';
+
+BOOST_SPIRIT_DEFINE(key);
+BOOST_SPIRIT_DEFINE(value);
+BOOST_SPIRIT_DEFINE(key_value);
+BOOST_SPIRIT_DEFINE(key_value_sequence_ordered);
+
+}
 
 template <typename T>
 mapnik::color parse_color(T & error_messages, const char* str)
@@ -126,10 +143,9 @@ agg::rgba8 parse_color_agg(T & error_messages, const char* str)
 template <typename T>
 double parse_double(T & error_messages, const char* str)
 {
-    using namespace boost::spirit::qi;
-    double_type double_;
+    using namespace boost::spirit::x3;
     double val = 0.0;
-    if (!parse(str, str + std::strlen(str),double_,val))
+    if (!parse(str, str + std::strlen(str), double_, val))
     {
         error_messages.emplace_back("Failed to parse double: \"" + std::string(str) + "\"");
     }
@@ -138,15 +154,11 @@ double parse_double(T & error_messages, const char* str)
 
 // https://www.w3.org/TR/SVG/coords.html#Units
 template <typename T, int DPI = 90>
-double parse_svg_value(T & error_messages, const char* str, bool & percent)
+double parse_svg_value(T & error_messages, const char* str, bool & is_percent)
 {
-    using skip_type = boost::spirit::ascii::space_type;
-    using boost::phoenix::ref;
-    qi::double_type double_;
-    qi::lit_type lit;
-    qi::_1_type _1;
+    namespace x3 = boost::spirit::x3;
     double val = 0.0;
-    qi::symbols<char, double> units;
+    x3::symbols<double> units;
     units.add
         ("px", 1.0)
         ("pt", DPI/72.0)
@@ -157,12 +169,17 @@ double parse_svg_value(T & error_messages, const char* str, bool & percent)
         ;
     const char* cur = str; // phrase_parse modifies the first iterator
     const char* end = str + std::strlen(str);
-    if (!qi::phrase_parse(cur, end,
-                      double_[ref(val) = _1][ref(percent) = false]
-                      > - (units[ ref(val) *= _1]
-                           |
-                           lit('%')[ref(val) *= 0.01][ref(percent) = true]),
-                      skip_type()))
+
+    auto apply_value =   [&](auto const& ctx) { val = _attr(ctx); is_percent = false; };
+    auto apply_units =   [&](auto const& ctx) { val *= _attr(ctx); };
+    auto apply_percent = [&](auto const& ctx) { val *= 0.01; is_percent = true; };
+
+    if (!x3::phrase_parse(cur, end,
+                          x3::double_[apply_value]
+                          > - (units[apply_units]
+                               |
+                               x3::lit('%')[apply_percent]),
+                          x3::space))
     {
         error_messages.emplace_back("Failed to parse SVG value: '" + std::string(str) + "'");
     }
@@ -174,46 +191,35 @@ double parse_svg_value(T & error_messages, const char* str, bool & percent)
     return val;
 }
 
-template <typename T>
-bool parse_double_list(T & error_messages, const char* str, double* list)
+template <typename T, typename V>
+bool parse_viewbox(T & error_messages, const char* str, V & viewbox)
 {
-    using namespace boost::spirit::qi;
-    using boost::phoenix::ref;
-    _1_type _1;
-    double_type double_;
-    lit_type lit;
-    using skip_type = boost::spirit::ascii::space_type;
-
-    if (!phrase_parse(str, str + std::strlen(str),
-                      double_[ref(list[0])=_1] >> -lit(',') >>
-                      double_[ref(list[1])=_1] >> -lit(',') >>
-                      double_[ref(list[2])=_1] >> -lit(',') >>
-                      double_[ref(list[3])=_1], skip_type()))
+    namespace x3 = boost::spirit::x3;
+    if ( !x3::phrase_parse(str, str + std::strlen(str),
+                           x3::double_ > -x3::lit(',') >
+                           x3::double_ > -x3::lit(',') >
+                           x3::double_ > -x3::lit(',') >
+                           x3::double_, x3::space, viewbox))
     {
-        error_messages.emplace_back("failed to parse list of doubles from " + std::string(str));
+        error_messages.emplace_back("failed to parse SVG viewbox from " + std::string(str));
         return false;
     }
     return true;
 }
 
-bool parse_style (char const* str, pairs_type & v)
+bool parse_style (char const* str, grammar::pairs_type & v)
 {
-    using namespace boost::spirit::qi;
-    using skip_type = boost::spirit::ascii::space_type;
-    key_value_sequence_ordered<const char*, skip_type> kv_parser;
-    return phrase_parse(str, str + std::strlen(str), kv_parser, skip_type(), v);
+    namespace x3 = boost::spirit::x3;
+    return x3::phrase_parse(str, str + std::strlen(str), grammar::key_value_sequence_ordered , x3::space, v);
 }
 
 bool parse_id_from_url (char const* str, std::string & id)
 {
-    using namespace boost::spirit::qi;
-    using skip_type = boost::spirit::ascii::space_type;
-    qi::_1_type _1;
-    qi::char_type char_;
-    qi::lit_type lit;
-    return phrase_parse(str, str + std::strlen(str),
-                        lit("url") > "(" > "#" > *(char_ - lit(')'))[boost::phoenix::ref(id) += _1] > ")",
-                        skip_type());
+    namespace x3 = boost::spirit::x3;
+    auto extract_id = [&](auto const& ctx) { id += _attr(ctx); };
+    return x3::phrase_parse(str, str + std::strlen(str),
+                            x3::lit("url") > '(' > '#' > *(x3::char_ - ')')[extract_id] > ')',
+                            x3::space);
 }
 
 bool traverse_tree(svg_parser & parser, rapidxml::xml_node<char> const* node)
@@ -517,7 +523,7 @@ void parse_dimensions(svg_parser & parser, rapidxml::xml_node<char> const* node)
     double width = 0;
     double height = 0;
     double aspect_ratio = 1;
-    double viewbox[4] = {0,0,0,0};
+    viewbox vbox = {0,0,0,0};
     bool has_viewbox = false;
     bool has_percent_height = true;
     bool has_percent_width = true;
@@ -535,23 +541,23 @@ void parse_dimensions(svg_parser & parser, rapidxml::xml_node<char> const* node)
     auto const* viewbox_attr = node->first_attribute("viewBox");
     if (viewbox_attr)
     {
-        has_viewbox = parse_double_list(parser.error_messages_, viewbox_attr->value(), viewbox);
+        has_viewbox = parse_viewbox(parser.error_messages_, viewbox_attr->value(), vbox);
     }
 
     if (has_percent_width && !has_percent_height && has_viewbox)
     {
-        aspect_ratio = viewbox[2] / viewbox[3];
+        aspect_ratio = vbox.x1 / vbox.y1;
         width = aspect_ratio * height;
     }
     else if (!has_percent_width && has_percent_height && has_viewbox)
     {
-        aspect_ratio = viewbox[2] / viewbox[3];
+        aspect_ratio = vbox.x1 / vbox.y1;
         height = height / aspect_ratio;
     }
     else if (has_percent_width && has_percent_height && has_viewbox)
     {
-        width = viewbox[2];
-        height = viewbox[3];
+        width = vbox.x1;
+        height = vbox.y1;
     }
 
     parser.path_.set_dimensions(width, height);
diff --git a/src/text/face.cpp b/src/text/face.cpp
index 1d3ad7820..b05f0d169 100644
--- a/src/text/face.cpp
+++ b/src/text/face.cpp
@@ -93,11 +93,11 @@ void font_face_set::add(face_ptr face)
     faces_.push_back(face);
 }
 
-void font_face_set::set_character_sizes(double size)
+void font_face_set::set_character_sizes(double _size)
 {
     for (face_ptr const& face : faces_)
     {
-        face->set_character_sizes(size);
+        face->set_character_sizes(_size);
     }
 }
 
diff --git a/src/text/font_feature_settings.cpp b/src/text/font_feature_settings.cpp
index 81a62f9dd..cf70c5d01 100644
--- a/src/text/font_feature_settings.cpp
+++ b/src/text/font_feature_settings.cpp
@@ -26,11 +26,10 @@
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
+#include <boost/spirit/home/x3.hpp>
 #include <boost/version.hpp>
 #pragma GCC diagnostic pop
 
-
 // stl
 #include <algorithm>
 #include <cctype>
@@ -52,23 +51,14 @@ font_feature_settings::font_feature_settings()
 void font_feature_settings::from_string(std::string const& features)
 {
     features_.clear();
-
     if (std::all_of(features.begin(), features.end(), isspace)) return;
 
-    namespace qi = boost::spirit::qi;
-    qi::char_type char_;
-    qi::as_string_type as_string;
-
-#if BOOST_VERSION <= 104800
-    // Call correct overload.
-    using std::placeholders::_1;
-    void (font_feature_settings::*append)(std::string const&) = &font_feature_settings::append;
-    if (!qi::parse(features.begin(), features.end(), as_string[+(char_ - ',')][std::bind(append, this, _1)] % ','))
-#else
-    auto app = [&](std::string const& s) { append(s); };
-    if (!qi::parse(features.begin(), features.end(), as_string[+(char_ - ',')][app] % ','))
-#endif
-
+    namespace x3 = boost::spirit::x3;
+    auto appender = [&](auto const& ctx)
+        {
+            this->append(_attr(ctx));
+        };
+    if (!x3::parse(features.begin(), features.end(), (+(x3::char_ - ','))[appender] % ','))
     {
         throw config_error("failed to parse font-feature-settings: '" + features + "'");
     }
diff --git a/src/text/placement_finder.cpp b/src/text/placement_finder.cpp
index e4adddf3e..e6ae4d185 100644
--- a/src/text/placement_finder.cpp
+++ b/src/text/placement_finder.cpp
@@ -35,6 +35,7 @@
 
 // stl
 #include <vector>
+#include <memory>
 
 namespace mapnik
 {
diff --git a/src/text/placements/simple.cpp b/src/text/placements/simple.cpp
index 800a3d3e3..766d1381d 100644
--- a/src/text/placements/simple.cpp
+++ b/src/text/placements/simple.cpp
@@ -32,9 +32,7 @@
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_stl.hpp>
+#include <boost/spirit/home/x3.hpp>
 #include <boost/property_tree/ptree.hpp>
 #pragma GCC diagnostic pop
 
@@ -43,12 +41,9 @@
 namespace mapnik
 {
 
-namespace qi = boost::spirit::qi;
-namespace phoenix = boost::phoenix;
-using phoenix::push_back;
-using phoenix::ref;
+namespace x3 = boost::spirit::x3;
 
-struct direction_name : qi::symbols<char, directions_e>
+struct direction_name : x3::symbols<directions_e>
 {
     direction_name()
     {
@@ -64,8 +59,7 @@ struct direction_name : qi::symbols<char, directions_e>
             ("X" , EXACT_POSITION)
             ;
     }
-
-};
+} names;
 
 // Position string: [POS][SIZE]
 // [POS] is any combination of
@@ -82,21 +76,15 @@ bool parse_positions(std::string const& evaluated_positions,
                      std::vector<directions_e> & direction,
                      std::vector<int> & text_sizes)
 {
-    direction_name names;
-    boost::spirit::ascii::space_type space;
-    qi::_1_type _1;
-    qi::float_type float_;
-    std::string::const_iterator first = evaluated_positions.begin();
-    std::string::const_iterator last = evaluated_positions.end();
-    bool r = qi::phrase_parse(first, last,
-                     (names[push_back(phoenix::ref(direction), _1)] % ',')
-                     >> *(',' >> float_[push_back(phoenix::ref(text_sizes), _1)]),
-                     space);
-    if (first != last)
-    {
-        return false;
-    }
-    return r;
+    auto push_back_direction = [&](auto const& ctx) { direction.push_back(_attr(ctx));};
+    auto push_back_size = [&](auto const& ctx) { text_sizes.push_back(_attr(ctx));};
+    auto const first = evaluated_positions.begin();
+    auto const last = evaluated_positions.end();
+    bool r = x3::phrase_parse(first, last,
+                              (names[push_back_direction] % ',')
+                              >> *(',' >> x3::float_[push_back_size]),
+                              x3::space);
+    return (r && first != last);
 }
 
 
diff --git a/src/text/text_layout.cpp b/src/text/text_layout.cpp
index 3a3818c1f..0846ea8d7 100644
--- a/src/text/text_layout.cpp
+++ b/src/text/text_layout.cpp
@@ -35,6 +35,7 @@
 #pragma GCC diagnostic pop
 
 #include <algorithm>
+#include <memory>
 
 namespace mapnik
 {
diff --git a/src/text/text_properties.cpp b/src/text/text_properties.cpp
index 73210d109..db37f7e26 100644
--- a/src/text/text_properties.cpp
+++ b/src/text/text_properties.cpp
@@ -39,6 +39,8 @@
 #include <boost/property_tree/ptree.hpp>
 #pragma GCC diagnostic pop
 
+#include <memory>
+
 namespace mapnik
 {
 using boost::optional;
diff --git a/src/expression_grammar.cpp b/src/transform_expression_grammar_x3.cpp
similarity index 77%
rename from src/expression_grammar.cpp
rename to src/transform_expression_grammar_x3.cpp
index 09234a07f..ab3d6a77b 100644
--- a/src/expression_grammar.cpp
+++ b/src/transform_expression_grammar_x3.cpp
@@ -20,9 +20,11 @@
  *
  *****************************************************************************/
 
-// NOTE: we define this here in a cpp because def is needed twice:
-// once by src/expression.cpp and once by mapnik/transform_expression_grammar_impl.hpp
-#include <mapnik/expression_grammar_impl.hpp>
-#include <string>
+#include <mapnik/transform_expression_grammar_x3_def.hpp>
+#include <mapnik/expression_grammar_x3_config.hpp>
 
-template struct mapnik::expression_grammar<std::string::const_iterator>;
+namespace mapnik { namespace grammar {
+
+BOOST_SPIRIT_INSTANTIATE(transform_expression_grammar_type, iterator_type, context_type);
+
+}}
diff --git a/src/webp_reader.cpp b/src/webp_reader.cpp
index ca611aeef..f5fec3416 100644
--- a/src/webp_reader.cpp
+++ b/src/webp_reader.cpp
@@ -37,6 +37,7 @@ extern "C"
 
 // stl
 #include <fstream>
+#include <memory>
 
 namespace mapnik
 {
diff --git a/src/wkb.cpp b/src/wkb.cpp
index f2e1fce6e..cf2fc9704 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -29,6 +29,8 @@
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/geometry/correct.hpp>
 
+#include <memory>
+
 namespace mapnik
 {
 
diff --git a/src/xml_tree.cpp b/src/xml_tree.cpp
index 2e2a7df8e..cd6cdaca3 100644
--- a/src/xml_tree.cpp
+++ b/src/xml_tree.cpp
@@ -38,6 +38,7 @@
 
 // stl
 #include <type_traits>
+#include <memory>
 
 namespace mapnik
 {
diff --git a/test/unit/color/css_color.cpp b/test/unit/color/css_color.cpp
index f1bc17196..a532cb1cf 100644
--- a/test/unit/color/css_color.cpp
+++ b/test/unit/color/css_color.cpp
@@ -1,63 +1,113 @@
 
 #include "catch.hpp"
-#include <mapnik/css_color_grammar.hpp>
-#include <mapnik/css_color_grammar_impl.hpp>
+
 #include <mapnik/safe_cast.hpp>
+#include <mapnik/color.hpp>
+#include <mapnik/css_color_grammar_x3.hpp>
+#include <mapnik/css_color_grammar_x3_def.hpp>
+
 #include <sstream>
 
-TEST_CASE("css color") {
+TEST_CASE("CSS color") {
 
     SECTION("conversions")
     {
-        mapnik::percent_conv_impl conv;
-        CHECK( conv(1.0) == 3 );
-        CHECK( conv(60.0) == 153 );
+        using namespace mapnik::css_color_grammar;
+        CHECK( percent_converter::call(1.0) == 3 );
+        CHECK( percent_converter::call(60.0) == 153 );
         // should not overflow on invalid input
-        CHECK( conv(100000.0) == 255 );
-        CHECK( conv(-100000.0) == 0 );
-
-        mapnik::alpha_conv_impl conv2;
-        CHECK( conv2(0.5) == 128 );
-        CHECK( conv2(1.0) == 255 );
-        // should not overflow on invalid input
-        CHECK( conv2(60.0) == 255 );
-        CHECK( conv2(100000.0) == 255 );
-        CHECK( conv2(-100000.0) == 0 );
-
-        mapnik::hsl_conv_impl conv3;
-        mapnik::color c;
-        conv3(c, 1.0, 1.0, 1.0);
-        CHECK( c.alpha() == 255 );
-        CHECK( c.red() == 3 );
-        CHECK( c.green() == 3 );
-        CHECK( c.blue() == 3 );
-        // invalid
-        conv3(c, -1, -1, -1);
-        CHECK( c.alpha() == 255 ); // should not be touched by hsl converter
-        CHECK( c.red() == 0 );
-        CHECK( c.green() == 0 );
-        CHECK( c.blue() == 0 );
+        CHECK( percent_converter::call(100000.0) == 255 );
+        CHECK( percent_converter::call(-100000.0) == 0 );
     }
 
-    SECTION("hex colors")
+    SECTION("CSS colors")
     {
-        mapnik::css_color_grammar<std::string::const_iterator> color_grammar;
-        boost::spirit::qi::ascii::space_type space;
-
+        auto const& color_grammar = mapnik::color_grammar();
+        boost::spirit::x3::ascii::space_type space;
+        {
+            // rgb
+            std::string s("rgb(128,0,255)");
+            mapnik::color c;
+            CHECK( boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
+            CHECK( c.alpha() == 0xff );
+            CHECK( c.red() == 0x80 );
+            CHECK( c.green() == 0x00 );
+            CHECK( c.blue() == 0xff );
+        }
+        {
+            // rgb (percent)
+            std::string s("rgb(50%,0%,100%)");
+            mapnik::color c;
+            CHECK( boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
+            CHECK( c.alpha() == 0xff );
+            CHECK( c.red() == 0x80 );
+            CHECK( c.green() == 0x00 );
+            CHECK( c.blue() == 0xff );
+        }
+        {
+            // rgba
+            std::string s("rgba(128,0,255,0.5)");
+            mapnik::color c;
+            CHECK( boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
+            CHECK( c.alpha() == 0x80 );
+            CHECK( c.red() == 0x80 );
+            CHECK( c.green() == 0x00 );
+            CHECK( c.blue() == 0xff );
+        }
+        {
+            // rgba (percent)
+            std::string s("rgba(50%,0%,100%,0.5)");
+            mapnik::color c;
+            CHECK( boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
+            CHECK( c.alpha() == 0x80 );
+            CHECK( c.red() == 0x80 );
+            CHECK( c.green() == 0x00 );
+            CHECK( c.blue() == 0xff );
+        }
+        {
+            // named colours
+            std::string s("darksalmon");
+            mapnik::color c;
+            CHECK( boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
+            CHECK( c.alpha() == 255 );
+            CHECK( c.red() == 233 );
+            CHECK( c.green() == 150 );
+            CHECK( c.blue() == 122 );
+        }
+        // hsl
+        {
+            std::string s("hsl(240,50%,50%)");
+            mapnik::color c;
+            CHECK( boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
+            CHECK( c.alpha() == 255 );
+            CHECK( c.red() == 64 );
+            CHECK( c.green() == 64 );
+            CHECK( c.blue() == 191 );
+        }
+        // hsla
+        {
+            std::string s("hsla(240,50%,50%,0.5)");
+            mapnik::color c;
+            CHECK( boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
+            CHECK( c.alpha() == 128 );
+            CHECK( c.red() == 64 );
+            CHECK( c.green() == 64 );
+            CHECK( c.blue() == 191 );
+        }
+        // hex colours
         {
             std::string s("#abcdef");
             mapnik::color c;
-            CHECK( boost::spirit::qi::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
+            CHECK( boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
             CHECK( c.alpha() == 0xff );
             CHECK( c.red() == 0xab );
             CHECK( c.green() == 0xcd );
             CHECK( c.blue() == 0xef );
         }
-
         {
             std::string s("#abcdef12");
             mapnik::color c;
-            CHECK( boost::spirit::qi::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
+            CHECK( boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
             CHECK( c.alpha() == 0x12 );
             CHECK( c.red() == 0xab );
             CHECK( c.green() == 0xcd );
@@ -67,7 +117,7 @@ TEST_CASE("css color") {
         {
             std::string s("  #abcdef");
             mapnik::color c;
-            CHECK( boost::spirit::qi::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
+            CHECK( boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
             CHECK( c.alpha() == 0xff );
             CHECK( c.red() == 0xab );
             CHECK( c.green() == 0xcd );
@@ -77,7 +127,7 @@ TEST_CASE("css color") {
         {
             std::string s("   #abcdef12");
             mapnik::color c;
-            CHECK( boost::spirit::qi::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
+            CHECK( boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
             CHECK( c.alpha() == 0x12 );
             CHECK( c.red() == 0xab );
             CHECK( c.green() == 0xcd );
@@ -86,22 +136,26 @@ TEST_CASE("css color") {
 
         {
             std::string s("# abcdef");
-            CHECK( !boost::spirit::qi::phrase_parse(s.cbegin(), s.cend(), color_grammar, space) );
+            mapnik::color c;
+            CHECK( !boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
         }
 
         {
             std::string s("# abcdef12");
-            CHECK( !boost::spirit::qi::phrase_parse(s.cbegin(), s.cend(), color_grammar, space) );
+            mapnik::color c;
+            CHECK( !boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
         }
 
         {
             std::string s("#ab cdef");
-            CHECK( !boost::spirit::qi::phrase_parse(s.cbegin(), s.cend(), color_grammar, space) );
+            mapnik::color c;
+            CHECK( !boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
         }
 
         {
             std::string s("#ab cdef12");
-            CHECK( !boost::spirit::qi::phrase_parse(s.cbegin(), s.cend(), color_grammar, space) );
+            mapnik::color c;
+            CHECK( !boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
         }
 
         // hex_color_small
@@ -109,7 +163,7 @@ TEST_CASE("css color") {
         {
             std::string s("#abc");
             mapnik::color c;
-            CHECK( boost::spirit::qi::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
+            CHECK( boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
             CHECK( c.alpha() == 0xff );
             CHECK( c.red() == 0xaa );
             CHECK( c.green() == 0xbb );
@@ -119,7 +173,7 @@ TEST_CASE("css color") {
         {
             std::string s("#abcd");
             mapnik::color c;
-            CHECK( boost::spirit::qi::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
+            CHECK( boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
             CHECK( c.alpha() == 0xdd );
             CHECK( c.red() == 0xaa );
             CHECK( c.green() == 0xbb );
@@ -129,7 +183,7 @@ TEST_CASE("css color") {
         {
             std::string s("   #abc");
             mapnik::color c;
-            CHECK( boost::spirit::qi::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
+            CHECK( boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
             CHECK( c.alpha() == 0xff );
             CHECK( c.red() == 0xaa );
             CHECK( c.green() == 0xbb );
@@ -139,7 +193,7 @@ TEST_CASE("css color") {
         {
             std::string s("   #abcd");
             mapnik::color c;
-            CHECK( boost::spirit::qi::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
+            CHECK( boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
             CHECK( c.alpha() == 0xdd );
             CHECK( c.red() == 0xaa );
             CHECK( c.green() == 0xbb );
@@ -148,22 +202,26 @@ TEST_CASE("css color") {
 
         {
             std::string s("# abc");
-            CHECK( !boost::spirit::qi::phrase_parse(s.cbegin(), s.cend(), color_grammar, space) );
+            mapnik::color c;
+            CHECK( !boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
         }
 
         {
             std::string s("# abcd");
-            CHECK( !boost::spirit::qi::phrase_parse(s.cbegin(), s.cend(), color_grammar, space) );
+            mapnik::color c;
+            CHECK( !boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
         }
 
         {
             std::string s("#a bc");
-            CHECK( !boost::spirit::qi::phrase_parse(s.cbegin(), s.cend(), color_grammar, space) );
+            mapnik::color c;
+            CHECK( !boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
         }
 
         {
             std::string s("#a bcd");
-            CHECK( !boost::spirit::qi::phrase_parse(s.cbegin(), s.cend(), color_grammar, space) );
+            mapnik::color c;
+            CHECK( !boost::spirit::x3::phrase_parse(s.cbegin(), s.cend(), color_grammar, space, c) );
         }
     }
     SECTION("operator<< / to_string()")

From 3d80a625318c1972b577fb600e9085703a625081 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 26 Aug 2016 10:34:10 +0100
Subject: [PATCH 010/328] remove unused include directives

---
 include/mapnik/wkt/wkt_grammar.hpp      | 1 -
 include/mapnik/wkt/wkt_grammar_impl.hpp | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/include/mapnik/wkt/wkt_grammar.hpp b/include/mapnik/wkt/wkt_grammar.hpp
index 9d23f81ca..2040b86fa 100644
--- a/include/mapnik/wkt/wkt_grammar.hpp
+++ b/include/mapnik/wkt/wkt_grammar.hpp
@@ -28,7 +28,6 @@
 #include <mapnik/geometry.hpp>
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
-#include <boost/assert.hpp>
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
 #pragma GCC diagnostic pop
diff --git a/include/mapnik/wkt/wkt_grammar_impl.hpp b/include/mapnik/wkt/wkt_grammar_impl.hpp
index a9ac43b1e..05c60b578 100644
--- a/include/mapnik/wkt/wkt_grammar_impl.hpp
+++ b/include/mapnik/wkt/wkt_grammar_impl.hpp
@@ -26,10 +26,6 @@
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/include/phoenix.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_fusion.hpp>
-#include <boost/spirit/include/phoenix_object.hpp>
-#include <boost/spirit/include/phoenix_stl.hpp>
 #include <boost/phoenix/object/construct.hpp>
 #pragma GCC diagnostic pop
 
@@ -50,7 +46,6 @@ wkt_grammar<Iterator>::wkt_grammar()
     qi::_1_type _1;
     qi::_a_type _a;
     using boost::phoenix::construct;
-    using boost::phoenix::at_c;
     geometry_tagged_text = point_tagged_text(_r1)
         | linestring_tagged_text(_r1)
         | polygon_tagged_text(_r1)

From 1cb966cee2162950ecf778cba3e578bcf505fe02 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 13 Sep 2016 15:11:05 +0200
Subject: [PATCH 011/328] upgrade WKT grammar to `boost::spirit::x3`

---
 include/mapnik/wkt/wkt_factory.hpp            |  16 +-
 include/mapnik/wkt/wkt_grammar.hpp            | 117 -------------
 include/mapnik/wkt/wkt_grammar_impl.hpp       | 154 ------------------
 include/mapnik/wkt/wkt_grammar_x3.hpp         |  49 ++++++
 include/mapnik/wkt/wkt_grammar_x3_def.hpp     | 130 +++++++++++++++
 src/wkt/wkt_factory.cpp                       |  47 ++++++
 ...nik_wkt_grammar.cpp => wkt_grammar_x3.cpp} |  11 +-
 7 files changed, 234 insertions(+), 290 deletions(-)
 delete mode 100644 include/mapnik/wkt/wkt_grammar.hpp
 delete mode 100644 include/mapnik/wkt/wkt_grammar_impl.hpp
 create mode 100644 include/mapnik/wkt/wkt_grammar_x3.hpp
 create mode 100644 include/mapnik/wkt/wkt_grammar_x3_def.hpp
 create mode 100644 src/wkt/wkt_factory.cpp
 rename src/wkt/{mapnik_wkt_grammar.cpp => wkt_grammar_x3.cpp} (77%)

diff --git a/include/mapnik/wkt/wkt_factory.hpp b/include/mapnik/wkt/wkt_factory.hpp
index 14f509dda..722fc18d6 100644
--- a/include/mapnik/wkt/wkt_factory.hpp
+++ b/include/mapnik/wkt/wkt_factory.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -25,24 +25,12 @@
 
 // mapnik
 #include <mapnik/geometry.hpp>
-
-#include <mapnik/wkt/wkt_grammar.hpp>
-#include <mapnik/wkt/wkt_generator_grammar.hpp>
-
 // stl
 #include <string>
 
 namespace mapnik {
 
-inline bool from_wkt(std::string const& wkt, mapnik::geometry::geometry<double> & geom)
-{
-    using namespace boost::spirit;
-    static const mapnik::wkt::wkt_grammar<std::string::const_iterator> g;
-    ascii::space_type space;
-    std::string::const_iterator first = wkt.begin();
-    std::string::const_iterator last =  wkt.end();
-    return qi::phrase_parse(first, last, (g)(boost::phoenix::ref(geom)), space);
-}
+bool from_wkt(std::string const& wkt, mapnik::geometry::geometry<double> & geom);
 
 }
 
diff --git a/include/mapnik/wkt/wkt_grammar.hpp b/include/mapnik/wkt/wkt_grammar.hpp
deleted file mode 100644
index 2040b86fa..000000000
--- a/include/mapnik/wkt/wkt_grammar.hpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_WKT_GRAMMAR_HPP
-#define MAPNIK_WKT_GRAMMAR_HPP
-
-// mapnik
-#include <mapnik/config.hpp>
-#include <mapnik/geometry.hpp>
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#pragma GCC diagnostic pop
-
-
-namespace mapnik { namespace wkt {
-
-using namespace boost::spirit;
-
-namespace detail {
-
-struct assign
-{
-    using result_type = void;
-    template <typename T0, typename T1>
-    void operator() (T0 & geom, T1 && obj) const
-    {
-        geom = std::move(obj);
-    }
-};
-
-struct move_part
-{
-    using result_type = void;
-    template <typename Geometry, typename Part>
-    void operator() (Geometry & geom, Part && part) const
-    {
-        geom.push_back(std::move(part));
-    }
-};
-
-struct set_exterior
-{
-    using result_type = void;
-    template <typename Polygon, typename Ring>
-    void operator() (Polygon & poly, Ring && ring) const
-    {
-        poly.set_exterior_ring(std::move(ring));
-    }
-};
-
-struct add_hole
-{
-    using result_type = void;
-    template <typename Polygon, typename Ring>
-    void operator() (Polygon & poly, Ring && ring) const
-    {
-        poly.add_hole(std::move(ring));
-    }
-};
-
-}
-
-template <typename Iterator>
-struct wkt_grammar : qi::grammar<Iterator, void(mapnik::geometry::geometry<double> &) , ascii::space_type>
-{
-    wkt_grammar();
-    qi::rule<Iterator, void(mapnik::geometry::geometry<double> &), ascii::space_type> geometry_tagged_text;
-    qi::rule<Iterator, void(mapnik::geometry::geometry<double> &), ascii::space_type> point_tagged_text;
-    qi::rule<Iterator, void(mapnik::geometry::geometry<double> &), ascii::space_type> linestring_tagged_text;
-    qi::rule<Iterator, void(mapnik::geometry::geometry<double> &), ascii::space_type> polygon_tagged_text;
-    qi::rule<Iterator, void(mapnik::geometry::geometry<double> &), ascii::space_type> multipoint_tagged_text;
-    qi::rule<Iterator, void(mapnik::geometry::geometry<double> &), ascii::space_type> multilinestring_tagged_text;
-    qi::rule<Iterator, void(mapnik::geometry::geometry<double> &), ascii::space_type> multipolygon_tagged_text;
-    qi::rule<Iterator, void(mapnik::geometry::geometry<double> &), ascii::space_type> geometrycollection_tagged_text;
-    qi::rule<Iterator, mapnik::geometry::point<double>(), ascii::space_type> point_text;
-    qi::rule<Iterator, mapnik::geometry::line_string<double>(), ascii::space_type> linestring_text;
-    qi::rule<Iterator, mapnik::geometry::linear_ring<double>(), ascii::space_type> linearring_text;
-    qi::rule<Iterator, mapnik::geometry::polygon<double>(), ascii::space_type> polygon_text;
-    qi::rule<Iterator, mapnik::geometry::multi_point<double>(), ascii::space_type> multipoint_text;
-    qi::rule<Iterator, mapnik::geometry::multi_line_string<double>(), ascii::space_type> multilinestring_text;
-    qi::rule<Iterator, mapnik::geometry::multi_polygon<double>(), ascii::space_type> multipolygon_text;
-    qi::rule<Iterator, qi::locals<mapnik::geometry::geometry<double> >,
-             mapnik::geometry::geometry_collection<double>(), ascii::space_type> geometrycollection_text;
-    qi::rule<Iterator, mapnik::geometry::point<double>(), ascii::space_type> point;
-    qi::rule<Iterator, mapnik::geometry::line_string<double>(), ascii::space_type> points;
-    qi::rule<Iterator, mapnik::geometry::linear_ring<double>(), ascii::space_type> ring_points;
-    qi::rule<Iterator,ascii::space_type> empty_set;
-    boost::phoenix::function<detail::assign> assign;
-    boost::phoenix::function<detail::move_part> move_part;
-    boost::phoenix::function<detail::set_exterior> set_exterior;
-    boost::phoenix::function<detail::add_hole> add_hole;
-};
-
-}}
-
-#endif // MAPNIK_WKT_GRAMMAR_HPP
diff --git a/include/mapnik/wkt/wkt_grammar_impl.hpp b/include/mapnik/wkt/wkt_grammar_impl.hpp
deleted file mode 100644
index 05c60b578..000000000
--- a/include/mapnik/wkt/wkt_grammar_impl.hpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#include <mapnik/wkt/wkt_grammar.hpp>
-#include <mapnik/geometry/fusion_adapted.hpp>
-
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/phoenix.hpp>
-#include <boost/phoenix/object/construct.hpp>
-#pragma GCC diagnostic pop
-
-namespace mapnik { namespace wkt {
-
-using namespace boost::spirit;
-
-template <typename Iterator>
-wkt_grammar<Iterator>::wkt_grammar()
-    : wkt_grammar::base_type(geometry_tagged_text)
-{
-    qi::eps_type eps;
-    qi::_r1_type _r1;
-    qi::_val_type _val;
-    qi::lit_type lit;
-    qi::no_case_type no_case;
-    qi::double_type double_;
-    qi::_1_type _1;
-    qi::_a_type _a;
-    using boost::phoenix::construct;
-    geometry_tagged_text = point_tagged_text(_r1)
-        | linestring_tagged_text(_r1)
-        | polygon_tagged_text(_r1)
-        | multipoint_tagged_text(_r1)
-        | multilinestring_tagged_text(_r1)
-        | multipolygon_tagged_text(_r1)
-        | geometrycollection_tagged_text(_r1)
-        ;
-
-    // <point tagged text> ::= point <point text>
-    point_tagged_text = no_case[lit("POINT")]
-        >> (point_text[assign(_r1,_1)] | empty_set[assign(_r1,construct<geometry::geometry_empty>())])
-        ;
-    // <point text> ::= <empty set> | <left paren> <point> <right paren>
-    point_text = (lit("(") >> point >> lit(')'))
-        //| empty_set - we're catching 'POINT EMPTY' case in point_tagged_text rule ^^ by creating geometry_empty
-        // because our geometry::point<double> can't be empty
-        ;
-
-    //<linestring tagged text> ::= linestring <linestring text>
-    linestring_tagged_text = no_case[lit("LINESTRING")]
-        >> linestring_text[assign(_r1,_1)]
-        ;
-
-    // <linestring text> ::= <empty set> | <left paren> <point> {<comma> <point>}* <right paren>
-    linestring_text = points | empty_set
-        ;
-
-    // <polygon tagged text> ::= polygon <polygon text>
-    polygon_tagged_text = no_case[lit("POLYGON")]
-        >> polygon_text[assign(_r1,_1)]
-        ;
-
-    // <polygon text> ::= <empty set> | <left paren> <linestring text> {<comma> <linestring text>}* <right paren>
-    polygon_text =
-        (lit('(') >> linearring_text[set_exterior(_val,_1)] >> *(lit(',') >> linearring_text[add_hole(_val,_1)]) >> lit(')'))
-        |
-        empty_set
-        ;
-
-    linearring_text = ring_points | empty_set
-        ;
-    //<multipoint tagged text> ::= multipoint <multipoint text>
-    multipoint_tagged_text = no_case[lit("MULTIPOINT")]
-        >>  multipoint_text[assign(_r1,_1)]
-        ;
-
-    // <multipoint text> ::= <empty set> | <left paren> <point text> {<comma> <point text>}* <right paren>
-    multipoint_text = (lit('(')
-                       >> point_text % lit(',')
-                       >> lit(')'))
-        |
-        (lit('(')
-         >> point % lit(',')
-         >> lit(')'))
-        |
-        empty_set
-        ;
-
-    // <multilinestring tagged text> ::= multilinestring <multilinestring text>
-    multilinestring_tagged_text = no_case[lit("MULTILINESTRING")]
-        >> multilinestring_text[assign(_r1,_1)] ;
-
-    // <multilinestring text> ::= <empty set> | <left paren> <linestring text> {<comma> <linestring text>}* <right paren>
-    multilinestring_text = (lit('(')
-                            >> points[move_part(_val,_1)] % lit(',')
-                            >> lit(')')) | empty_set;
-
-    // <multipolygon tagged text> ::= multipolygon <multipolygon text>
-    multipolygon_tagged_text = no_case[lit("MULTIPOLYGON")]
-        >> multipolygon_text[assign(_r1,_1)] ;
-
-    //<multipolygon text> ::= <empty set> | <left paren> <polygon text> {<comma> <polygon text>}* <right paren>
-    multipolygon_text = (lit('(')
-                         >> polygon_text[move_part(_val,_1)] % lit(',')
-                         >> lit(')'))
-        |
-        empty_set;
-
-    // geometry collection tagged text
-    geometrycollection_tagged_text = no_case[lit("GEOMETRYCOLLECTION")]
-        >> geometrycollection_text[assign(_r1,_1)]
-        ;
-
-    // geometry collection text
-    geometrycollection_text = (lit('(')
-                               >> ( eps[_a = construct<geometry::geometry<double> >()]
-                                    >> geometry_tagged_text(_a)[move_part(_val,_a)] % lit(','))
-                               >> lit(')'))
-        |
-        empty_set;
-    // points
-    points = lit('(') >> point % lit(',') >> lit(')')
-        ;
-    // ring points
-    ring_points = lit('(') >> point % lit(',') >> lit(')')
-        ;
-    // point
-    point = double_ >> double_
-        ;
-
-    // <empty set>
-    empty_set = no_case[lit("EMPTY")];
-}
-
-}}
diff --git a/include/mapnik/wkt/wkt_grammar_x3.hpp b/include/mapnik/wkt/wkt_grammar_x3.hpp
new file mode 100644
index 000000000..3fd969848
--- /dev/null
+++ b/include/mapnik/wkt/wkt_grammar_x3.hpp
@@ -0,0 +1,49 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_WKT_GRAMMAR_X3_HPP
+#define MAPNIK_WKT_GRAMMAR_X3_HPP
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#pragma GCC diagnostic pop
+
+#include <mapnik/geometry.hpp>
+
+namespace mapnik { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+struct wkt_class; // top-most ID
+using wkt_grammar_type = x3::rule<wkt_class, mapnik::geometry::geometry<double>>;
+
+BOOST_SPIRIT_DECLARE(wkt_grammar_type);
+
+}}
+
+namespace mapnik
+{
+grammar::wkt_grammar_type wkt_grammar();
+}
+
+
+#endif // MAPNIK_WKT_GRAMMAR_X3_HPP
diff --git a/include/mapnik/wkt/wkt_grammar_x3_def.hpp b/include/mapnik/wkt/wkt_grammar_x3_def.hpp
new file mode 100644
index 000000000..62fdb1ac0
--- /dev/null
+++ b/include/mapnik/wkt/wkt_grammar_x3_def.hpp
@@ -0,0 +1,130 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_WKT_GRAMMAR_X3_DEF_HPP
+#define MAPNIK_WKT_GRAMMAR_X3_DEF_HPP
+
+#include <mapnik/wkt/wkt_grammar_x3.hpp>
+#include <mapnik/geometry/fusion_adapted.hpp>
+
+namespace mapnik { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+namespace ascii = boost::spirit::x3::ascii;
+using x3::lit;
+using x3::double_;
+using x3::no_case;
+
+// functors
+auto make_empty = [](auto const& ctx)
+{
+    _val(ctx) = geometry::geometry_empty();
+};
+
+auto set_exterior = [](auto const& ctx)
+{
+    _val(ctx).set_exterior_ring(std::move(_attr(ctx)));
+};
+
+auto add_hole = [](auto const& ctx)
+{
+    _val(ctx).add_hole(std::move(_attr(ctx)));
+};
+
+// start rule
+wkt_grammar_type const wkt("wkt");
+// rules
+x3::rule<class empty, mapnik::geometry::geometry_empty> const empty("EMPTY");
+x3::rule<class point, mapnik::geometry::geometry<double> > const point("POINT");
+x3::rule<class line_string, mapnik::geometry::line_string<double> > const line_string("LINESTRING");
+x3::rule<class polygon, mapnik::geometry::polygon<double> > const polygon("POLYGON");
+x3::rule<class multi_point, mapnik::geometry::multi_point<double> > const multi_point("MULTIPOINT");
+x3::rule<class multi_line_string, mapnik::geometry::multi_line_string<double> > const multi_line_string("MULTILINESTRING");
+x3::rule<class multi_polygon, mapnik::geometry::multi_polygon<double> > const multi_polygon("MULTIPOLYGON");
+x3::rule<class geometry_collection, mapnik::geometry::geometry_collection<double> > const geometry_collection("GEOMETRYCOLLECTION");
+
+x3::rule<class point_text, mapnik::geometry::point<double> > const point_text("point-text");
+x3::rule<class positions, mapnik::geometry::line_string<double> > const positions("positions");
+x3::rule<class polygon_rings, mapnik::geometry::polygon<double> > const polygon_rings("polygon-rings");
+x3::rule<class points, mapnik::geometry::multi_point<double> > const points("points");
+x3::rule<class lines, mapnik::geometry::multi_line_string<double> > const lines("lines");
+x3::rule<class polygons, mapnik::geometry::multi_polygon<double> > const polygons("polygons");
+x3::rule<class geometries, mapnik::geometry::geometry_collection<double> > const geometries("geometries");
+
+
+auto const point_text_def = '(' > double_ > double_ > ')';
+auto const positions_def = lit('(') > (double_ > double_) % lit(',') > lit(')');
+auto const polygon_rings_def = '(' > positions[set_exterior] > *(lit(',') > positions[add_hole]) > ')';
+auto const points_def = (lit('(') >> ((point_text_def % ',') > lit(')'))) | positions_def ;
+auto const lines_def = lit('(') > (positions_def % lit(',')) > lit(')');
+auto const polygons_def = lit('(') > (polygon_rings % lit(',')) > lit(')');
+auto const geometries_def = lit('(') > -(wkt % ',') > lit(')');
+
+//
+auto const wkt_def = point | line_string | polygon | multi_point | multi_line_string | multi_polygon | geometry_collection;
+
+// EMPTY
+auto const empty_def = no_case["EMPTY"][make_empty];
+// POINT
+auto const point_def = no_case["POINT"] > (point_text | empty);
+// LINESTRING
+auto const line_string_def = no_case["LINESTRING"] > (positions | no_case["EMPTY"]);
+// POLYGON
+auto const polygon_def = no_case["POLYGON"] > (polygon_rings | no_case["EMPTY"]);
+// MULTIPOINT
+auto const multi_point_def = no_case["MULTIPOINT"] > (points | no_case["EMPTY"]);
+// MULTILINESTRING
+auto const multi_line_string_def = no_case["MULTILINESTRING"] > (lines | no_case["EMPTY"]);
+// MULTIPOLYGON
+auto const multi_polygon_def = no_case["MULTIPOLYGON"] > (polygons | no_case["EMPTY"]);
+// GEOMETRYCOLLECTION
+auto const geometry_collection_def = no_case["GEOMETRYCOLLECTION"] > (geometries | no_case["EMPTY"]);
+
+BOOST_SPIRIT_DEFINE(
+    wkt,
+    point_text,
+    positions,
+    points,
+    lines,
+    polygons,
+    geometries,
+    empty,
+    point,
+    line_string,
+    polygon_rings,
+    polygon,
+    multi_point,
+    multi_line_string,
+    multi_polygon,
+    geometry_collection
+    );
+}}
+
+namespace mapnik
+{
+grammar::wkt_grammar_type wkt_grammar()
+{
+    return grammar::wkt;
+}
+}
+
+#endif // MAPNIK_WKT_GRAMMAR_X3_DEF_HPP
diff --git a/src/wkt/wkt_factory.cpp b/src/wkt/wkt_factory.cpp
new file mode 100644
index 000000000..acb388434
--- /dev/null
+++ b/src/wkt/wkt_factory.cpp
@@ -0,0 +1,47 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+// mapnik
+#include <mapnik/wkt/wkt_factory.hpp>
+#include <mapnik/wkt/wkt_grammar_x3.hpp>
+
+namespace mapnik {
+
+bool from_wkt(std::string const& wkt, mapnik::geometry::geometry<double> & geom)
+{
+    using namespace boost::spirit;
+    x3::ascii::space_type space;
+    std::string::const_iterator itr = wkt.begin();
+    std::string::const_iterator end =  wkt.end();
+    bool result;
+    try
+    {
+        result  = x3::phrase_parse(itr, end, wkt_grammar(), space, geom);
+    }
+    catch (x3::expectation_failure<std::string::const_iterator> const& ex)
+    {
+        return false;
+    }
+    return result && itr==end;
+}
+
+}
diff --git a/src/wkt/mapnik_wkt_grammar.cpp b/src/wkt/wkt_grammar_x3.cpp
similarity index 77%
rename from src/wkt/mapnik_wkt_grammar.cpp
rename to src/wkt/wkt_grammar_x3.cpp
index aea52a917..eeb602e7d 100644
--- a/src/wkt/mapnik_wkt_grammar.cpp
+++ b/src/wkt/wkt_grammar_x3.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,12 +20,13 @@
  *
  *****************************************************************************/
 
-#include <mapnik/wkt/wkt_grammar_impl.hpp>
-#include <string>
+#include <mapnik/wkt/wkt_grammar_x3_def.hpp>
 
-namespace mapnik { namespace wkt {
+namespace mapnik { namespace grammar {
 
+namespace x3 = boost::spirit::x3;
 using iterator_type = std::string::const_iterator;
-template struct wkt_grammar<iterator_type>;
+using context_type = x3::phrase_parse_context<x3::ascii::space_type>::type;
+BOOST_SPIRIT_INSTANTIATE(wkt_grammar_type, iterator_type, context_type);
 
 }}

From d2f64604a30cae3784ad08123f645a14a4c99d7b Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 15 Sep 2016 15:40:38 +0200
Subject: [PATCH 012/328] consistently return x3 grammars by const&

---
 include/mapnik/css_color_grammar_x3.hpp                | 2 +-
 include/mapnik/css_color_grammar_x3_def.hpp            | 2 +-
 include/mapnik/expression_grammar_x3.hpp               | 2 +-
 include/mapnik/expression_grammar_x3_def.hpp           | 2 +-
 include/mapnik/image_filter_grammar_x3.hpp             | 2 +-
 include/mapnik/image_filter_grammar_x3_def.hpp         | 2 +-
 include/mapnik/transform_expression_grammar_x3.hpp     | 2 +-
 include/mapnik/transform_expression_grammar_x3_def.hpp | 2 +-
 include/mapnik/wkt/wkt_grammar_x3.hpp                  | 2 +-
 include/mapnik/wkt/wkt_grammar_x3_def.hpp              | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/mapnik/css_color_grammar_x3.hpp b/include/mapnik/css_color_grammar_x3.hpp
index 0719e44ec..54e022528 100644
--- a/include/mapnik/css_color_grammar_x3.hpp
+++ b/include/mapnik/css_color_grammar_x3.hpp
@@ -48,7 +48,7 @@ BOOST_SPIRIT_DECLARE(css_color_grammar_type);
 
 namespace mapnik
 {
-css_color_grammar::css_color_grammar_type color_grammar();
+css_color_grammar::css_color_grammar_type const& color_grammar();
 }
 
 
diff --git a/include/mapnik/css_color_grammar_x3_def.hpp b/include/mapnik/css_color_grammar_x3_def.hpp
index 2ad3cfa34..457f0d999 100644
--- a/include/mapnik/css_color_grammar_x3_def.hpp
+++ b/include/mapnik/css_color_grammar_x3_def.hpp
@@ -444,7 +444,7 @@ BOOST_SPIRIT_DEFINE(
 
 } // ns
 
-css_color_grammar::css_color_grammar_type color_grammar()
+css_color_grammar::css_color_grammar_type const& color_grammar()
 {
     return css_color_grammar::css_color;
 }
diff --git a/include/mapnik/expression_grammar_x3.hpp b/include/mapnik/expression_grammar_x3.hpp
index 889211939..46bdb2a84 100644
--- a/include/mapnik/expression_grammar_x3.hpp
+++ b/include/mapnik/expression_grammar_x3.hpp
@@ -44,7 +44,7 @@ BOOST_SPIRIT_DECLARE(expression_grammar_type);
 
 namespace mapnik
 {
-grammar::expression_grammar_type expression_grammar();
+grammar::expression_grammar_type const& expression_grammar();
 }
 
 
diff --git a/include/mapnik/expression_grammar_x3_def.hpp b/include/mapnik/expression_grammar_x3_def.hpp
index 0ef8fe960..d8ab45ade 100644
--- a/include/mapnik/expression_grammar_x3_def.hpp
+++ b/include/mapnik/expression_grammar_x3_def.hpp
@@ -424,7 +424,7 @@ namespace mapnik { namespace grammar {
 
 namespace mapnik
 {
-grammar::expression_grammar_type expression_grammar()
+grammar::expression_grammar_type const& expression_grammar()
 {
     return grammar::expression;
 }
diff --git a/include/mapnik/image_filter_grammar_x3.hpp b/include/mapnik/image_filter_grammar_x3.hpp
index ca452009e..8632c9122 100644
--- a/include/mapnik/image_filter_grammar_x3.hpp
+++ b/include/mapnik/image_filter_grammar_x3.hpp
@@ -49,7 +49,7 @@ BOOST_SPIRIT_DECLARE(image_filter_grammar_type);
 
 namespace mapnik {
 
-image_filter::image_filter_grammar_type image_filter_grammar();
+image_filter::image_filter_grammar_type const& image_filter_grammar();
 
 }
 
diff --git a/include/mapnik/image_filter_grammar_x3_def.hpp b/include/mapnik/image_filter_grammar_x3_def.hpp
index 2d680bea1..b40bfc8f9 100644
--- a/include/mapnik/image_filter_grammar_x3_def.hpp
+++ b/include/mapnik/image_filter_grammar_x3_def.hpp
@@ -251,7 +251,7 @@ BOOST_SPIRIT_DEFINE(
 
 } // image_filter
 
-image_filter::image_filter_grammar_type image_filter_grammar()
+image_filter::image_filter_grammar_type const& image_filter_grammar()
 {
     return image_filter::start;
 }
diff --git a/include/mapnik/transform_expression_grammar_x3.hpp b/include/mapnik/transform_expression_grammar_x3.hpp
index ccf480c22..77ff330d9 100644
--- a/include/mapnik/transform_expression_grammar_x3.hpp
+++ b/include/mapnik/transform_expression_grammar_x3.hpp
@@ -45,7 +45,7 @@ BOOST_SPIRIT_DECLARE(transform_expression_grammar_type);
 
 namespace mapnik
 {
-grammar::transform_expression_grammar_type transform_expression_grammar();
+grammar::transform_expression_grammar_type const& transform_expression_grammar();
 }
 
 #endif
diff --git a/include/mapnik/transform_expression_grammar_x3_def.hpp b/include/mapnik/transform_expression_grammar_x3_def.hpp
index 602f30aee..4af1e9481 100644
--- a/include/mapnik/transform_expression_grammar_x3_def.hpp
+++ b/include/mapnik/transform_expression_grammar_x3_def.hpp
@@ -175,7 +175,7 @@ namespace mapnik { namespace grammar {
 
 namespace mapnik
 {
-grammar::transform_expression_grammar_type transform_expression_grammar()
+grammar::transform_expression_grammar_type const& transform_expression_grammar()
 {
     return grammar::transform;
 }
diff --git a/include/mapnik/wkt/wkt_grammar_x3.hpp b/include/mapnik/wkt/wkt_grammar_x3.hpp
index 3fd969848..a0b6be0f0 100644
--- a/include/mapnik/wkt/wkt_grammar_x3.hpp
+++ b/include/mapnik/wkt/wkt_grammar_x3.hpp
@@ -42,7 +42,7 @@ BOOST_SPIRIT_DECLARE(wkt_grammar_type);
 
 namespace mapnik
 {
-grammar::wkt_grammar_type wkt_grammar();
+grammar::wkt_grammar_type const& wkt_grammar();
 }
 
 
diff --git a/include/mapnik/wkt/wkt_grammar_x3_def.hpp b/include/mapnik/wkt/wkt_grammar_x3_def.hpp
index 62fdb1ac0..b4bff5e38 100644
--- a/include/mapnik/wkt/wkt_grammar_x3_def.hpp
+++ b/include/mapnik/wkt/wkt_grammar_x3_def.hpp
@@ -121,7 +121,7 @@ BOOST_SPIRIT_DEFINE(
 
 namespace mapnik
 {
-grammar::wkt_grammar_type wkt_grammar()
+grammar::wkt_grammar_type const& wkt_grammar()
 {
     return grammar::wkt;
 }

From 67468ef3567987ba8517bb8a897a91ffe4e75044 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 15 Sep 2016 15:41:31 +0200
Subject: [PATCH 013/328] refactor path_expression_grammar

---
 include/mapnik/path_expression_grammar_x3.hpp |  6 +++-
 .../mapnik/path_expression_grammar_x3_def.hpp |  2 +-
 src/build.py                                  |  1 +
 src/parse_path.cpp                            | 13 ++------
 src/path_expression_grammar_x3.cpp            | 32 +++++++++++++++++++
 5 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 src/path_expression_grammar_x3.cpp

diff --git a/include/mapnik/path_expression_grammar_x3.hpp b/include/mapnik/path_expression_grammar_x3.hpp
index 86e811fea..60bfd2bb4 100644
--- a/include/mapnik/path_expression_grammar_x3.hpp
+++ b/include/mapnik/path_expression_grammar_x3.hpp
@@ -39,6 +39,10 @@ using path_expression_grammar_type = x3::rule<path_expression_class, path_expres
 
 BOOST_SPIRIT_DECLARE(path_expression_grammar_type);
 
-}}
+}
+
+grammar::path_expression_grammar_type const& path_expression_grammar();
+
+}
 
 #endif  // MAPNIK_PATH_EXPRESSIONS_GRAMMAR_X3_HPP
diff --git a/include/mapnik/path_expression_grammar_x3_def.hpp b/include/mapnik/path_expression_grammar_x3_def.hpp
index 7dc772aa1..324e44e35 100644
--- a/include/mapnik/path_expression_grammar_x3_def.hpp
+++ b/include/mapnik/path_expression_grammar_x3_def.hpp
@@ -53,7 +53,7 @@ BOOST_SPIRIT_DEFINE(
 
 namespace mapnik {
 
-grammar::path_expression_grammar_type path_expression_grammar()
+grammar::path_expression_grammar_type const& path_expression_grammar()
 {
     return grammar::path_expression;
 }
diff --git a/src/build.py b/src/build.py
index a1c7da041..45ba882ee 100644
--- a/src/build.py
+++ b/src/build.py
@@ -185,6 +185,7 @@ source = Split(
     font_set.cpp
     function_call.cpp
     gradient.cpp
+    path_expression_grammar_x3.cpp
     parse_path.cpp
     image_reader.cpp
     cairo_io.cpp
diff --git a/src/parse_path.cpp b/src/parse_path.cpp
index ebf50fbcc..4a9751d13 100644
--- a/src/parse_path.cpp
+++ b/src/parse_path.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -27,20 +27,11 @@
 #include <mapnik/value.hpp>
 
 #include <mapnik/path_expression_grammar_x3.hpp>
-#include <mapnik/path_expression_grammar_x3_def.hpp>
 
 // stl
 #include <stdexcept>
 
-namespace mapnik { namespace grammar {
-
-namespace x3 = boost::spirit::x3;
-using iterator_type = std::string::const_iterator;
-using context_type = x3::phrase_parse_context<x3::standard_wide::space_type>::type;
-
-BOOST_SPIRIT_INSTANTIATE(path_expression_grammar_type, iterator_type, context_type);
-
-}
+namespace mapnik {
 
 path_expression_ptr parse_path(std::string const& str)
 {
diff --git a/src/path_expression_grammar_x3.cpp b/src/path_expression_grammar_x3.cpp
new file mode 100644
index 000000000..fe3bf276d
--- /dev/null
+++ b/src/path_expression_grammar_x3.cpp
@@ -0,0 +1,32 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#include <mapnik/path_expression_grammar_x3_def.hpp>
+
+namespace mapnik { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+using iterator_type = std::string::const_iterator;
+using context_type = x3::phrase_parse_context<x3::standard_wide::space_type>::type;
+BOOST_SPIRIT_INSTANTIATE(path_expression_grammar_type, iterator_type, context_type);
+
+}}

From bdaef2cc913c56f9cc0a8b270d79702195a8a490 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 19 Sep 2016 15:49:18 +0200
Subject: [PATCH 014/328] variant - pin to 'types' branch (requires `types`
 typedef)

---
 deps/mapbox/variant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index aaddee927..e5818212a 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit aaddee9270e3956cee98cdd7d04aea848d69f5f0
+Subproject commit e5818212a8f7ef89df0aa76d5244eca78b8dbb8d

From 98533533530b076dc96f7c912d134da628645668 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 19 Sep 2016 15:51:21 +0200
Subject: [PATCH 015/328] adapt `mapnik::geometry::geometry<double>` to work
 with `boost::spirit::karma` + simplify and optimise WKT generator

---
 include/mapnik/util/geometry_to_wkt.hpp       | 24 ++-----
 include/mapnik/wkt/wkt_generator_grammar.hpp  | 54 ++++++---------
 .../mapnik/wkt/wkt_generator_grammar_impl.hpp | 65 +++++-------------
 src/wkt/geometry_to_wkt.cpp                   | 48 ++++++++++++++
 src/wkt/mapnik_wkt_generator_grammar.cpp      | 66 ++++++++++++++++++-
 5 files changed, 155 insertions(+), 102 deletions(-)
 create mode 100644 src/wkt/geometry_to_wkt.cpp

diff --git a/include/mapnik/util/geometry_to_wkt.hpp b/include/mapnik/util/geometry_to_wkt.hpp
index 3c81ef440..2c1c1829d 100644
--- a/include/mapnik/util/geometry_to_wkt.hpp
+++ b/include/mapnik/util/geometry_to_wkt.hpp
@@ -24,29 +24,13 @@
 #define MAPNIK_GEOMETRY_TO_WKT_HPP
 
 // mapnik
-#include <mapnik/wkt/wkt_factory.hpp>
-#include <mapnik/wkt/wkt_generator_grammar.hpp>
-
-// boost
-#include <boost/spirit/include/karma.hpp>
+#include <mapnik/geometry.hpp>
+// stl
+#include <string>
 
 namespace mapnik { namespace util {
 
-inline bool to_wkt(std::string & wkt,  mapnik::geometry::geometry<double> const& geom)
-{
-    using sink_type = std::back_insert_iterator<std::string>;
-    static const mapnik::wkt::wkt_generator_grammar<sink_type, mapnik::geometry::geometry<double>> generator;
-    sink_type sink(wkt);
-    return boost::spirit::karma::generate(sink, generator, geom);
-}
-
-inline bool to_wkt(std::string & wkt,  mapnik::geometry::geometry<std::int64_t> const& geom)
-{
-    using sink_type = std::back_insert_iterator<std::string>;
-    static const mapnik::wkt::wkt_generator_grammar<sink_type, mapnik::geometry::geometry<std::int64_t>> generator;
-    sink_type sink(wkt);
-    return boost::spirit::karma::generate(sink, generator, geom);
-}
+bool to_wkt(std::string & wkt,  mapnik::geometry::geometry<double> const& geom);
 
 }}
 
diff --git a/include/mapnik/wkt/wkt_generator_grammar.hpp b/include/mapnik/wkt/wkt_generator_grammar.hpp
index c88f9cfd5..2844833bb 100644
--- a/include/mapnik/wkt/wkt_generator_grammar.hpp
+++ b/include/mapnik/wkt/wkt_generator_grammar.hpp
@@ -25,8 +25,8 @@
 
 // mapnik
 #include <mapnik/global.hpp>
+
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry/geometry_type.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
@@ -43,18 +43,6 @@ namespace phoenix = boost::phoenix;
 
 namespace detail {
 
-template <typename Geometry>
-struct get_type
-{
-    using result_type = mapnik::geometry::geometry_types;
-    template <typename T>
-    result_type operator() (T const& geom) const
-    {
-        auto type = mapnik::geometry::geometry_type(geom);
-        return type;
-    }
-};
-
 template <typename T>
 struct wkt_coordinate_policy : karma::real_policies<T>
 {
@@ -102,31 +90,29 @@ struct coordinate_generator<std::int64_t>
 
 template <typename OutputIterator, typename Geometry>
 struct wkt_generator_grammar :
-    karma::grammar<OutputIterator, Geometry const& ()>
+    karma::grammar<OutputIterator, Geometry()>
 {
     using coord_type = typename Geometry::coord_type;
     wkt_generator_grammar();
     // rules
-    karma::rule<OutputIterator, Geometry const&()> geometry;
-    karma::rule<OutputIterator, karma::locals<mapnik::geometry::geometry_types>, Geometry const&() > geometry_dispatch;
-    karma::rule<OutputIterator, geometry::geometry<coord_type> const&()> point;
-    karma::rule<OutputIterator, geometry::point<coord_type> const&()> point_coord;
-    karma::rule<OutputIterator, geometry::geometry<coord_type> const&()> linestring;
-    karma::rule<OutputIterator, geometry::line_string<coord_type> const&()> linestring_coord;
-    karma::rule<OutputIterator, geometry::geometry<coord_type> const&()> polygon;
-    karma::rule<OutputIterator, geometry::polygon<coord_type> const&()> polygon_coord;
-    karma::rule<OutputIterator, geometry::linear_ring<coord_type> const&()> exterior_ring_coord;
-    karma::rule<OutputIterator, std::vector<geometry::linear_ring<coord_type> > const&()> interior_ring_coord;
-    karma::rule<OutputIterator, geometry::geometry<coord_type> const& ()> multi_point;
-    karma::rule<OutputIterator, geometry::multi_point<coord_type> const& ()> multi_point_coord;
-    karma::rule<OutputIterator, geometry::geometry<coord_type> const& ()> multi_linestring;
-    karma::rule<OutputIterator, geometry::multi_line_string<coord_type> const& ()> multi_linestring_coord;
-    karma::rule<OutputIterator, geometry::geometry<coord_type> const& ()> multi_polygon;
-    karma::rule<OutputIterator, geometry::multi_polygon<coord_type> const& ()> multi_polygon_coord;
-    karma::rule<OutputIterator, geometry::geometry<coord_type> const& ()> geometry_collection;
-    karma::rule<OutputIterator, geometry::geometry_collection<coord_type> const& ()> geometries;
-    boost::phoenix::function<detail::get_type<Geometry> > geometry_type;
-    karma::symbols<mapnik::geometry::geometry_types, char const*> empty;
+    karma::rule<OutputIterator, Geometry()> geometry;
+    karma::rule<OutputIterator, geometry::geometry_empty()> empty;
+    karma::rule<OutputIterator, geometry::point<coord_type>()> point;
+    karma::rule<OutputIterator, geometry::point<coord_type>()> point_coord;
+    karma::rule<OutputIterator, geometry::line_string<coord_type>()> linestring;
+    karma::rule<OutputIterator, geometry::line_string<coord_type>()> linestring_coord;
+    karma::rule<OutputIterator, geometry::polygon<coord_type>()> polygon;
+    karma::rule<OutputIterator, geometry::polygon<coord_type>()> polygon_coord;
+    karma::rule<OutputIterator, geometry::linear_ring<coord_type>()> exterior_ring_coord;
+    karma::rule<OutputIterator, std::vector<geometry::linear_ring<coord_type> >()> interior_ring_coord;
+    karma::rule<OutputIterator, geometry::multi_point<coord_type>()> multi_point;
+    karma::rule<OutputIterator, geometry::multi_point<coord_type>()> multi_point_coord;
+    karma::rule<OutputIterator, geometry::multi_line_string<coord_type>()> multi_linestring;
+    karma::rule<OutputIterator, geometry::multi_line_string<coord_type>()> multi_linestring_coord;
+    karma::rule<OutputIterator, geometry::multi_polygon<coord_type>()> multi_polygon;
+    karma::rule<OutputIterator, geometry::multi_polygon<coord_type>()> multi_polygon_coord;
+    karma::rule<OutputIterator, geometry::geometry_collection<coord_type>()> geometry_collection;
+    karma::rule<OutputIterator, geometry::geometry_collection<coord_type>()> geometries;
     //
     typename detail::coordinate_generator<coord_type>::generator coordinate;
 };
diff --git a/include/mapnik/wkt/wkt_generator_grammar_impl.hpp b/include/mapnik/wkt/wkt_generator_grammar_impl.hpp
index 6cb015562..c3b94d2e6 100644
--- a/include/mapnik/wkt/wkt_generator_grammar_impl.hpp
+++ b/include/mapnik/wkt/wkt_generator_grammar_impl.hpp
@@ -22,9 +22,7 @@
 
 // mapnik
 #include <mapnik/wkt/wkt_generator_grammar.hpp>
-#include <mapnik/util/spirit_transform_attribute.hpp>
 #include <mapnik/geometry/fusion_adapted.hpp>
-
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/include/phoenix.hpp>
@@ -36,53 +34,26 @@ template <typename OutputIterator, typename Geometry>
 wkt_generator_grammar<OutputIterator, Geometry>::wkt_generator_grammar()
     : wkt_generator_grammar::base_type(geometry)
 {
-    boost::spirit::karma::_val_type _val;
-    boost::spirit::karma::_1_type _1;
-    boost::spirit::karma::_a_type _a;
     boost::spirit::karma::lit_type lit;
-    boost::spirit::karma::uint_type uint_;
-    boost::spirit::karma::eps_type eps;
-
-    empty.add
-        (geometry::geometry_types::Point, "POINT EMPTY")
-        (geometry::geometry_types::LineString, "LINESTRING EMPTY")
-        (geometry::geometry_types::Polygon, "POLYGON EMPTY")
-        (geometry::geometry_types::MultiPoint, "MULTIPOINT EMPTY")
-        (geometry::geometry_types::MultiLineString, "MULTILINESTRING EMPTY")
-        (geometry::geometry_types::MultiPolygon, "MULTIPOLYGON EMPTY")
-        (geometry::geometry_types::GeometryCollection, "GEOMETRYCOLLECTION EMPTY")
+    geometry =
+        point
+        |
+        linestring
+        |
+        polygon
+        |
+        multi_point
+        |
+        multi_linestring
+        |
+        multi_polygon
+        |
+        geometry_collection
+        |
+        lit("POINT EMPTY") // special case for geometry_empty
         ;
 
-    geometry = geometry_dispatch.alias()
-        ;
-
-    geometry_dispatch = eps[_a = geometry_type(_val)] <<
-        (&uint_(geometry::geometry_types::Point)[_1 = _a]
-         << point)
-        |
-        (&uint_(geometry::geometry_types::LineString)[_1 = _a]
-         << (linestring | empty[_1 = _a]))
-        |
-        (&uint_(geometry::geometry_types::Polygon)[_1 = _a]
-         << (polygon | empty[_1 = _a]))
-        |
-        (&uint_(geometry::geometry_types::MultiPoint)[_1 = _a]
-         << ( multi_point | empty[_1 = _a]))
-        |
-        (&uint_(geometry::geometry_types::MultiLineString)[_1 = _a]
-         << (multi_linestring | empty[_1 = _a]))
-        |
-        (&uint_(geometry::geometry_types::MultiPolygon)[_1 = _a]
-         << (multi_polygon | empty[_1 = _a]))
-        |
-        (&uint_(geometry::geometry_types::GeometryCollection)[_1 = _a]
-         << (geometry_collection | empty[_1 = _a]))
-        |
-        (&uint_(geometry::geometry_types::Unknown)[_1 = _a]
-         << lit("POINT EMPTY")) // special case for geometry_empty as mapnik::geometry::point<double> can't be empty
-        ;
-
-    point = lit("POINT(") << point_coord << lit(")")
+    point = lit("POINT(") << coordinate << lit(' ') << coordinate << lit(")")
         ;
     linestring = lit("LINESTRING(") << linestring_coord << lit(")")
         ;
@@ -112,7 +83,7 @@ wkt_generator_grammar<OutputIterator, Geometry>::wkt_generator_grammar()
         ;
     multi_polygon_coord = (lit('(') << polygon_coord << lit(')')) % lit(',')
         ;
-    geometries =  geometry % lit(',')
+    geometries = geometry % lit(',')
         ;
 
 }
diff --git a/src/wkt/geometry_to_wkt.cpp b/src/wkt/geometry_to_wkt.cpp
new file mode 100644
index 000000000..64d652434
--- /dev/null
+++ b/src/wkt/geometry_to_wkt.cpp
@@ -0,0 +1,48 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+// mapnik
+#include <mapnik/util/geometry_to_wkt.hpp>
+#include <mapnik/wkt/wkt_generator_grammar.hpp>
+// boost
+#include <boost/spirit/include/karma.hpp>
+
+namespace mapnik { namespace util {
+
+bool to_wkt(std::string & wkt,  mapnik::geometry::geometry<double> const& geom)
+{
+    using sink_type = std::back_insert_iterator<std::string>;
+    static const mapnik::wkt::wkt_generator_grammar<sink_type, mapnik::geometry::geometry<double>> generator;
+    sink_type sink(wkt);
+    return boost::spirit::karma::generate(sink, generator, geom);
+}
+
+/*
+inline bool to_wkt(std::string & wkt,  mapnik::geometry::geometry<std::int64_t> const& geom)
+{
+    using sink_type = std::back_insert_iterator<std::string>;
+    static const mapnik::wkt::wkt_generator_grammar<sink_type, mapnik::geometry::geometry<std::int64_t>> generator;
+    sink_type sink(wkt);
+    return boost::spirit::karma::generate(sink, generator, geom);
+}
+*/
+}}
diff --git a/src/wkt/mapnik_wkt_generator_grammar.cpp b/src/wkt/mapnik_wkt_generator_grammar.cpp
index 07813fcc8..e27f8aa32 100644
--- a/src/wkt/mapnik_wkt_generator_grammar.cpp
+++ b/src/wkt/mapnik_wkt_generator_grammar.cpp
@@ -21,9 +21,73 @@
  *****************************************************************************/
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/wkt/wkt_generator_grammar_impl.hpp>
 #include <string>
 
+namespace boost { using mapbox::util::get; }
+
+#include <mapnik/wkt/wkt_generator_grammar_impl.hpp>
+
+namespace boost { namespace spirit { namespace traits
+{
+template <>
+struct not_is_variant<mapnik::geometry::geometry<double>, karma::domain>
+    : mpl::false_
+{};
+
+template <>
+struct variant_which< mapnik::geometry::geometry<double> >
+{
+    static int call(mapnik::geometry::geometry<double> const& v)
+    {
+        return v.which();
+    }
+};
+
+namespace detail {
+
+template <typename T, typename Tuple>
+struct has_type;
+
+template <typename T>
+struct has_type<T, std::tuple<>> : std::false_type {};
+
+template <typename T, typename U, typename... Types>
+struct has_type<T, std::tuple<U, Types...>> : has_type<T, std::tuple<Types...>> {};
+
+template <typename T, typename... Types>
+struct has_type<T, std::tuple<T, Types...>> : std::true_type {};
+
+template <typename T, typename Tuple>
+struct index;
+
+template <typename T, typename... Types>
+struct index<T, std::tuple<T, Types...>>
+{
+    static const std::size_t value = 0;
+};
+
+template <typename T, typename U, typename... Types>
+struct index<T, std::tuple<U, Types...>>
+{
+    static const std::size_t value = 1 + index<T, std::tuple<Types...>>::value;
+};
+
+}
+
+template <typename Expected>
+struct compute_compatible_component_variant<mapnik::geometry::geometry<double>, Expected>
+    :  detail::has_type<Expected, mapnik::geometry::geometry<double>::types>
+{
+    using compatible_type = Expected;
+    static bool is_compatible(int index)
+    {
+        return (index == detail::index<compatible_type, mapnik::geometry::geometry<double>::types>::value);
+    }
+};
+
+}}}
+
+
 namespace mapnik { namespace wkt {
 
 using sink_type = std::back_insert_iterator<std::string>;

From beee2fd53937641c9a8c830d4d265f19b741b553 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 19 Sep 2016 16:32:40 +0200
Subject: [PATCH 016/328] mapnik::geometry - refactor karma adaper into
 separate header for re-use

---
 deps/mapbox/variant                           |  2 +-
 .../geometry/boost_spirit_karma_adapter.hpp   | 96 +++++++++++++++++++
 src/wkt/mapnik_wkt_generator_grammar.cpp      | 71 +-------------
 3 files changed, 100 insertions(+), 69 deletions(-)
 create mode 100644 include/mapnik/geometry/boost_spirit_karma_adapter.hpp

diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index e5818212a..aaddee927 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit e5818212a8f7ef89df0aa76d5244eca78b8dbb8d
+Subproject commit aaddee9270e3956cee98cdd7d04aea848d69f5f0
diff --git a/include/mapnik/geometry/boost_spirit_karma_adapter.hpp b/include/mapnik/geometry/boost_spirit_karma_adapter.hpp
new file mode 100644
index 000000000..2a76e979d
--- /dev/null
+++ b/include/mapnik/geometry/boost_spirit_karma_adapter.hpp
@@ -0,0 +1,96 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+
+#ifndef MAPNIK_BOOST_SPIRIT_KARMA_ADAPTER_HPP
+#define MAPNIK_BOOST_SPIRIT_KARMA_ADAPTER_HPP
+
+#include <mapnik/geometry.hpp>
+
+namespace boost { using mapbox::util::get; }
+
+#include <boost/spirit/home/karma/domain.hpp>
+#include <boost/spirit/home/support/attributes.hpp>
+
+namespace boost { namespace spirit { namespace traits
+{
+template <>
+struct not_is_variant<mapnik::geometry::geometry<double>, karma::domain>
+    : mpl::false_
+{};
+
+template <>
+struct variant_which< mapnik::geometry::geometry<double> >
+{
+    static int call(mapnik::geometry::geometry<double> const& v)
+    {
+        return v.which();
+    }
+};
+
+namespace detail {
+
+template <typename T, typename Tuple>
+struct has_type;
+
+template <typename T>
+struct has_type<T, std::tuple<>> : std::false_type {};
+
+template <typename T, typename U, typename... Types>
+struct has_type<T, std::tuple<U, Types...>> : has_type<T, std::tuple<Types...>> {};
+
+template <typename T, typename... Types>
+struct has_type<T, std::tuple<T, Types...>> : std::true_type {};
+
+template <typename T, typename Tuple>
+struct index;
+
+template <typename T, typename... Types>
+struct index<T, std::tuple<T, Types...>>
+{
+    static const std::size_t value = 0;
+};
+
+template <typename T, typename U, typename... Types>
+struct index<T, std::tuple<U, Types...>>
+{
+    static const std::size_t value = 1 + index<T, std::tuple<Types...>>::value;
+};
+
+}
+
+template <typename Expected>
+struct compute_compatible_component_variant<mapnik::geometry::geometry<double>, Expected>
+    :  detail::has_type<Expected, mapnik::geometry::geometry<double>::types>
+{
+    using compatible_type = Expected;
+    static bool is_compatible(int index)
+    {
+        return (index == detail::index<compatible_type, mapnik::geometry::geometry<double>::types>::value);
+    }
+};
+
+}}}
+
+
+
+#endif //MAPNIK_BOOST_SPIRIT_KARMA_ADAPTER_HPP
diff --git a/src/wkt/mapnik_wkt_generator_grammar.cpp b/src/wkt/mapnik_wkt_generator_grammar.cpp
index e27f8aa32..72452036a 100644
--- a/src/wkt/mapnik_wkt_generator_grammar.cpp
+++ b/src/wkt/mapnik_wkt_generator_grammar.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,79 +19,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-
-#include <mapnik/geometry.hpp>
 #include <string>
-
-namespace boost { using mapbox::util::get; }
-
+#include <mapnik/geometry/boost_spirit_karma_adapter.hpp>
 #include <mapnik/wkt/wkt_generator_grammar_impl.hpp>
 
-namespace boost { namespace spirit { namespace traits
-{
-template <>
-struct not_is_variant<mapnik::geometry::geometry<double>, karma::domain>
-    : mpl::false_
-{};
-
-template <>
-struct variant_which< mapnik::geometry::geometry<double> >
-{
-    static int call(mapnik::geometry::geometry<double> const& v)
-    {
-        return v.which();
-    }
-};
-
-namespace detail {
-
-template <typename T, typename Tuple>
-struct has_type;
-
-template <typename T>
-struct has_type<T, std::tuple<>> : std::false_type {};
-
-template <typename T, typename U, typename... Types>
-struct has_type<T, std::tuple<U, Types...>> : has_type<T, std::tuple<Types...>> {};
-
-template <typename T, typename... Types>
-struct has_type<T, std::tuple<T, Types...>> : std::true_type {};
-
-template <typename T, typename Tuple>
-struct index;
-
-template <typename T, typename... Types>
-struct index<T, std::tuple<T, Types...>>
-{
-    static const std::size_t value = 0;
-};
-
-template <typename T, typename U, typename... Types>
-struct index<T, std::tuple<U, Types...>>
-{
-    static const std::size_t value = 1 + index<T, std::tuple<Types...>>::value;
-};
-
-}
-
-template <typename Expected>
-struct compute_compatible_component_variant<mapnik::geometry::geometry<double>, Expected>
-    :  detail::has_type<Expected, mapnik::geometry::geometry<double>::types>
-{
-    using compatible_type = Expected;
-    static bool is_compatible(int index)
-    {
-        return (index == detail::index<compatible_type, mapnik::geometry::geometry<double>::types>::value);
-    }
-};
-
-}}}
-
-
 namespace mapnik { namespace wkt {
 
 using sink_type = std::back_insert_iterator<std::string>;
 template struct wkt_generator_grammar<sink_type, mapnik::geometry::geometry<double>>;
-template struct wkt_generator_grammar<sink_type, mapnik::geometry::geometry<std::int64_t>>;
+//template struct wkt_generator_grammar<sink_type, mapnik::geometry::geometry<std::int64_t>>;
 
 }}

From a63a491ba077502074d235c4a104f482eddd8084 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 19 Sep 2016 16:54:54 +0200
Subject: [PATCH 017/328] wkt generator - remove boost::phoenix headers

---
 include/mapnik/wkt/wkt_generator_grammar.hpp      | 2 --
 include/mapnik/wkt/wkt_generator_grammar_impl.hpp | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/include/mapnik/wkt/wkt_generator_grammar.hpp b/include/mapnik/wkt/wkt_generator_grammar.hpp
index 2844833bb..fe84afeed 100644
--- a/include/mapnik/wkt/wkt_generator_grammar.hpp
+++ b/include/mapnik/wkt/wkt_generator_grammar.hpp
@@ -31,7 +31,6 @@
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/include/karma.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
 #include <boost/math/special_functions/trunc.hpp> // for vc++ and android whose c++11 libs lack std::trunc
 #include <boost/spirit/home/karma/domain.hpp>
 #pragma GCC diagnostic pop
@@ -39,7 +38,6 @@
 namespace mapnik { namespace wkt {
 
 namespace karma = boost::spirit::karma;
-namespace phoenix = boost::phoenix;
 
 namespace detail {
 
diff --git a/include/mapnik/wkt/wkt_generator_grammar_impl.hpp b/include/mapnik/wkt/wkt_generator_grammar_impl.hpp
index c3b94d2e6..bc62cd64f 100644
--- a/include/mapnik/wkt/wkt_generator_grammar_impl.hpp
+++ b/include/mapnik/wkt/wkt_generator_grammar_impl.hpp
@@ -23,10 +23,6 @@
 // mapnik
 #include <mapnik/wkt/wkt_generator_grammar.hpp>
 #include <mapnik/geometry/fusion_adapted.hpp>
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/phoenix.hpp>
-#pragma GCC diagnostic pop
 
 namespace mapnik { namespace wkt {
 

From 9de3c80b0da11dd15307e82f4d51972316593366 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 20 Sep 2016 10:52:51 +0200
Subject: [PATCH 018/328] add specialisations for `coord_type = std::int64_t`

---
 .../geometry/boost_spirit_karma_adapter.hpp   | 25 +++++++++++++++++++
 src/wkt/mapnik_wkt_generator_grammar.cpp      |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/include/mapnik/geometry/boost_spirit_karma_adapter.hpp b/include/mapnik/geometry/boost_spirit_karma_adapter.hpp
index 2a76e979d..8182e6e57 100644
--- a/include/mapnik/geometry/boost_spirit_karma_adapter.hpp
+++ b/include/mapnik/geometry/boost_spirit_karma_adapter.hpp
@@ -38,6 +38,11 @@ struct not_is_variant<mapnik::geometry::geometry<double>, karma::domain>
     : mpl::false_
 {};
 
+template <>
+struct not_is_variant<mapnik::geometry::geometry<std::int64_t>, karma::domain>
+    : mpl::false_
+{};
+
 template <>
 struct variant_which< mapnik::geometry::geometry<double> >
 {
@@ -47,6 +52,15 @@ struct variant_which< mapnik::geometry::geometry<double> >
     }
 };
 
+template <>
+struct variant_which< mapnik::geometry::geometry<std::int64_t> >
+{
+    static int call(mapnik::geometry::geometry<std::int64_t> const& v)
+    {
+        return v.which();
+    }
+};
+
 namespace detail {
 
 template <typename T, typename Tuple>
@@ -89,6 +103,17 @@ struct compute_compatible_component_variant<mapnik::geometry::geometry<double>,
     }
 };
 
+template <typename Expected>
+struct compute_compatible_component_variant<mapnik::geometry::geometry<std::int64_t>, Expected>
+    :  detail::has_type<Expected, mapnik::geometry::geometry<std::int64_t>::types>
+{
+    using compatible_type = Expected;
+    static bool is_compatible(int index)
+    {
+        return (index == detail::index<compatible_type, mapnik::geometry::geometry<std::int64_t>::types>::value);
+    }
+};
+
 }}}
 
 
diff --git a/src/wkt/mapnik_wkt_generator_grammar.cpp b/src/wkt/mapnik_wkt_generator_grammar.cpp
index 72452036a..a7267b71f 100644
--- a/src/wkt/mapnik_wkt_generator_grammar.cpp
+++ b/src/wkt/mapnik_wkt_generator_grammar.cpp
@@ -27,6 +27,6 @@ namespace mapnik { namespace wkt {
 
 using sink_type = std::back_insert_iterator<std::string>;
 template struct wkt_generator_grammar<sink_type, mapnik::geometry::geometry<double>>;
-//template struct wkt_generator_grammar<sink_type, mapnik::geometry::geometry<std::int64_t>>;
+template struct wkt_generator_grammar<sink_type, mapnik::geometry::geometry<std::int64_t>>;
 
 }}

From b770db56c30a02dbeae2f2828def0880fe967489 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 20 Sep 2016 10:55:38 +0200
Subject: [PATCH 019/328] remove unused rule

---
 include/mapnik/wkt/wkt_generator_grammar.hpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/mapnik/wkt/wkt_generator_grammar.hpp b/include/mapnik/wkt/wkt_generator_grammar.hpp
index fe84afeed..bb40e7965 100644
--- a/include/mapnik/wkt/wkt_generator_grammar.hpp
+++ b/include/mapnik/wkt/wkt_generator_grammar.hpp
@@ -25,7 +25,6 @@
 
 // mapnik
 #include <mapnik/global.hpp>
-
 #include <mapnik/geometry.hpp>
 
 #pragma GCC diagnostic push
@@ -94,7 +93,6 @@ struct wkt_generator_grammar :
     wkt_generator_grammar();
     // rules
     karma::rule<OutputIterator, Geometry()> geometry;
-    karma::rule<OutputIterator, geometry::geometry_empty()> empty;
     karma::rule<OutputIterator, geometry::point<coord_type>()> point;
     karma::rule<OutputIterator, geometry::point<coord_type>()> point_coord;
     karma::rule<OutputIterator, geometry::line_string<coord_type>()> linestring;

From ab86171c2b8f586d893aedc222ad96f9af84a935 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 20 Sep 2016 11:01:38 +0200
Subject: [PATCH 020/328] GeoJSON generator - implement using geometry<double>
 karma adapters

---
 .../mapnik/json/feature_generator_grammar.hpp | 21 ++++---
 .../json/feature_generator_grammar_impl.hpp   |  2 +-
 .../json/geometry_generator_grammar.hpp       | 57 +++++++------------
 .../json/geometry_generator_grammar_impl.hpp  | 43 +++-----------
 .../properties_generator_grammar_impl.hpp     |  8 +++
 src/json/mapnik_json_generator_grammar.cpp    |  5 +-
 6 files changed, 50 insertions(+), 86 deletions(-)

diff --git a/include/mapnik/json/feature_generator_grammar.hpp b/include/mapnik/json/feature_generator_grammar.hpp
index 9eaa3bb99..4e393ea0e 100644
--- a/include/mapnik/json/feature_generator_grammar.hpp
+++ b/include/mapnik/json/feature_generator_grammar.hpp
@@ -63,17 +63,6 @@ struct end_container<mapnik::feature_impl const>
     }
 };
 
-template <>
-struct transform_attribute<const boost::fusion::cons<mapnik::feature_impl const&, boost::fusion::nil>,
-                           mapnik::geometry::geometry<double> const& , karma::domain>
-{
-    using type = mapnik::geometry::geometry<double> const&;
-    static type pre(const boost::fusion::cons<mapnik::feature_impl const&, boost::fusion::nil>& f)
-    {
-        return boost::fusion::at<mpl::int_<0> >(f).get_geometry();
-    }
-};
-
 }}}
 
 namespace mapnik { namespace json {
@@ -91,6 +80,15 @@ struct get_id
     }
 };
 
+struct extract_geometry
+{
+    using result_type = mapnik::geometry::geometry<double> const&;
+    template <typename T>
+    result_type operator() (T const& f) const
+    {
+        return f.get_geometry();
+    }
+};
 
 template <typename OutputIterator, typename FeatureType>
 struct feature_generator_grammar :
@@ -101,6 +99,7 @@ struct feature_generator_grammar :
     geometry_generator_grammar<OutputIterator, mapnik::geometry::geometry<double> > geometry;
     properties_generator_grammar<OutputIterator, FeatureType> properties;
     boost::phoenix::function<get_id<FeatureType> > id_;
+    boost::phoenix::function<extract_geometry> geom_;
 };
 
 }}
diff --git a/include/mapnik/json/feature_generator_grammar_impl.hpp b/include/mapnik/json/feature_generator_grammar_impl.hpp
index f819baa80..7008bb9f3 100644
--- a/include/mapnik/json/feature_generator_grammar_impl.hpp
+++ b/include/mapnik/json/feature_generator_grammar_impl.hpp
@@ -40,7 +40,7 @@ feature_generator_grammar<OutputIterator, FeatureType>::feature_generator_gramma
 
     feature = lit("{\"type\":\"Feature\",\"id\":")
         << uint_[_1 = id_(_val)]
-        << lit(",\"geometry\":") << geometry
+        << lit(",\"geometry\":") << geometry[_1 = geom_(_val)]
         << lit(",\"properties\":") << properties
         << lit('}')
         ;
diff --git a/include/mapnik/json/geometry_generator_grammar.hpp b/include/mapnik/json/geometry_generator_grammar.hpp
index 018608849..3203a79f4 100644
--- a/include/mapnik/json/geometry_generator_grammar.hpp
+++ b/include/mapnik/json/geometry_generator_grammar.hpp
@@ -26,13 +26,10 @@
 // mapnik
 #include <mapnik/global.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry/geometry_type.hpp>
 // boost
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/include/karma.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/fusion/adapted/std_tuple.hpp>
 #include <boost/math/special_functions/trunc.hpp> // for vc++ and android whose c++11 libs lack std::trunc
 #include <boost/spirit/home/karma/domain.hpp>
 #pragma GCC diagnostic pop
@@ -43,18 +40,6 @@ namespace karma = boost::spirit::karma;
 
 namespace detail {
 
-template <typename Geometry>
-struct get_type
-{
-    using result_type = mapnik::geometry::geometry_types;
-    template <typename T>
-    result_type operator() (T const& geom) const
-    {
-        auto type = mapnik::geometry::geometry_type(geom);
-        return type;
-    }
-};
-
 template <typename T>
 struct json_coordinate_policy : karma::real_policies<T>
 {
@@ -88,29 +73,29 @@ struct json_coordinate_policy : karma::real_policies<T>
 
 template <typename OutputIterator, typename Geometry>
 struct geometry_generator_grammar :
-        karma::grammar<OutputIterator, Geometry const&()>
+        karma::grammar<OutputIterator, Geometry()>
 {
+    using coord_type = typename Geometry::coord_type;
     geometry_generator_grammar();
-    karma::rule<OutputIterator, Geometry const&()> geometry;
-    karma::rule<OutputIterator, karma::locals<mapnik::geometry::geometry_types>, Geometry const&() > geometry_dispatch;
-    karma::rule<OutputIterator, geometry::geometry<double> const&()> point;
-    karma::rule<OutputIterator, geometry::point<double> const&()> point_coord;
-    karma::rule<OutputIterator, geometry::geometry<double> const&()> linestring;
-    karma::rule<OutputIterator, geometry::line_string<double> const&()> linestring_coord;
-    karma::rule<OutputIterator, geometry::geometry<double> const&()> polygon;
-    karma::rule<OutputIterator, geometry::polygon<double> const&()> polygon_coord;
-    karma::rule<OutputIterator, geometry::linear_ring<double> const&()> exterior_ring_coord;
-    karma::rule<OutputIterator, geometry::polygon<double>::rings_container const&()> interior_ring_coord;
-    karma::rule<OutputIterator, geometry::geometry<double> const& ()> multi_point;
-    karma::rule<OutputIterator, geometry::multi_point<double> const& ()> multi_point_coord;
-    karma::rule<OutputIterator, geometry::geometry<double> const& ()> multi_linestring;
-    karma::rule<OutputIterator, geometry::multi_line_string<double> const& ()> multi_linestring_coord;
-    karma::rule<OutputIterator, geometry::geometry<double> const& ()> multi_polygon;
-    karma::rule<OutputIterator, geometry::multi_polygon<double> const& ()> multi_polygon_coord;
-    karma::rule<OutputIterator, geometry::geometry<double> const& ()> geometry_collection;
-    karma::rule<OutputIterator, geometry::geometry_collection<double> const& ()> geometries;
-    boost::phoenix::function<detail::get_type<Geometry> > geometry_type;
-    karma::real_generator<double, detail::json_coordinate_policy<double> > coordinate;
+    karma::rule<OutputIterator, Geometry()> geometry;
+    karma::rule<OutputIterator, geometry::point<coord_type>()> point;
+    karma::rule<OutputIterator, geometry::point<coord_type>()> point_coord;
+    karma::rule<OutputIterator, geometry::line_string<coord_type>()> linestring;
+    karma::rule<OutputIterator, geometry::line_string<coord_type>()> linestring_coord;
+    karma::rule<OutputIterator, geometry::polygon<coord_type>()> polygon;
+    karma::rule<OutputIterator, geometry::polygon<coord_type>()> polygon_coord;
+    karma::rule<OutputIterator, geometry::linear_ring<coord_type>()> exterior_ring_coord;
+    karma::rule<OutputIterator, std::vector<geometry::linear_ring<coord_type> >()> interior_ring_coord;
+    karma::rule<OutputIterator, geometry::multi_point<coord_type>()> multi_point;
+    karma::rule<OutputIterator, geometry::multi_point<coord_type>()> multi_point_coord;
+    karma::rule<OutputIterator, geometry::multi_line_string<coord_type>()> multi_linestring;
+    karma::rule<OutputIterator, geometry::multi_line_string<coord_type> ()> multi_linestring_coord;
+    karma::rule<OutputIterator, geometry::multi_polygon<coord_type>()> multi_polygon;
+    karma::rule<OutputIterator, geometry::multi_polygon<coord_type>()> multi_polygon_coord;
+    karma::rule<OutputIterator, geometry::geometry_collection<coord_type>()> geometry_collection;
+    karma::rule<OutputIterator, geometry::geometry_collection<coord_type>()> geometries;
+    //
+    karma::real_generator<coord_type, detail::json_coordinate_policy<coord_type> > coordinate;
 
 };
 
diff --git a/include/mapnik/json/geometry_generator_grammar_impl.hpp b/include/mapnik/json/geometry_generator_grammar_impl.hpp
index c1e2b4fe8..8a546d67b 100644
--- a/include/mapnik/json/geometry_generator_grammar_impl.hpp
+++ b/include/mapnik/json/geometry_generator_grammar_impl.hpp
@@ -22,60 +22,33 @@
 
 // mapnik
 #include <mapnik/json/geometry_generator_grammar.hpp>
-#include <mapnik/util/spirit_transform_attribute.hpp>
-#include <mapnik/geometry/geometry_types.hpp>
 #include <mapnik/geometry/fusion_adapted.hpp>
 
-// boost
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/karma.hpp>
-#include <boost/spirit/include/phoenix.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_fusion.hpp>
-#include <boost/fusion/include/at.hpp>
-#pragma GCC diagnostic pop
 
 namespace mapnik { namespace json {
 
 namespace karma = boost::spirit::karma;
-namespace phoenix = boost::phoenix;
 
 template <typename OutputIterator, typename Geometry>
 geometry_generator_grammar<OutputIterator, Geometry>::geometry_generator_grammar()
     : geometry_generator_grammar::base_type(geometry)
 {
-    boost::spirit::karma::_val_type _val;
-    boost::spirit::karma::_1_type _1;
-    boost::spirit::karma::_a_type _a;
     boost::spirit::karma::lit_type lit;
-    boost::spirit::karma::uint_type uint_;
-    boost::spirit::karma::eps_type eps;
 
-    geometry = geometry_dispatch.alias()
-        ;
-
-    geometry_dispatch = eps[_a = geometry_type(_val)] <<
-        (&uint_(geometry::geometry_types::Point)[_1 = _a]
-         << (point | lit("null")))
+    geometry =
+        point
         |
-        (&uint_(geometry::geometry_types::LineString)[_1 = _a]
-         << (linestring | lit("null")))
+        linestring
         |
-        (&uint_(geometry::geometry_types::Polygon)[_1 = _a]
-         << (polygon | lit("null")))
+        polygon
         |
-        (&uint_(geometry::geometry_types::MultiPoint)[_1 = _a]
-         << (multi_point | lit("null")))
+        multi_point
         |
-        (&uint_(geometry::geometry_types::MultiLineString)[_1 = _a]
-         << (multi_linestring | lit("null")))
+        multi_linestring
         |
-        (&uint_(geometry::geometry_types::MultiPolygon)[_1 = _a]
-         << (multi_polygon | lit("null")))
+        multi_polygon
         |
-        (&uint_(geometry::geometry_types::GeometryCollection)[_1 = _a]
-         << (geometry_collection | lit("null")))
+        geometry_collection
         |
         lit("null")
         ;
diff --git a/include/mapnik/json/properties_generator_grammar_impl.hpp b/include/mapnik/json/properties_generator_grammar_impl.hpp
index eff4565b5..df9b113c5 100644
--- a/include/mapnik/json/properties_generator_grammar_impl.hpp
+++ b/include/mapnik/json/properties_generator_grammar_impl.hpp
@@ -23,6 +23,14 @@
 
 #include <mapnik/json/properties_generator_grammar.hpp>
 
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/include/phoenix.hpp>
+#include <boost/spirit/include/phoenix_fusion.hpp>
+#include <boost/fusion/include/at.hpp>
+#include <boost/fusion/adapted/std_tuple.hpp>
+#pragma GCC diagnostic pop
+
 namespace mapnik { namespace json {
 
 namespace karma = boost::spirit::karma;
diff --git a/src/json/mapnik_json_generator_grammar.cpp b/src/json/mapnik_json_generator_grammar.cpp
index 2b0171f98..6b8edd136 100644
--- a/src/json/mapnik_json_generator_grammar.cpp
+++ b/src/json/mapnik_json_generator_grammar.cpp
@@ -20,8 +20,7 @@
  *
  *****************************************************************************/
 
-#include <mapnik/geometry.hpp>
-
+#include <mapnik/geometry/boost_spirit_karma_adapter.hpp>
 #include <mapnik/json/geometry_generator_grammar_impl.hpp>
 #include <mapnik/json/properties_generator_grammar_impl.hpp>
 #include <mapnik/json/feature_generator_grammar_impl.hpp>
@@ -31,5 +30,5 @@
 using sink_type = std::back_insert_iterator<std::string>;
 
 template struct mapnik::json::properties_generator_grammar<sink_type, mapnik::feature_impl>;
-template struct mapnik::json::feature_generator_grammar<sink_type, mapnik::feature_impl>;
 template struct mapnik::json::geometry_generator_grammar<sink_type, mapnik::geometry::geometry<double> >;
+template struct mapnik::json::feature_generator_grammar<sink_type, mapnik::feature_impl>;

From d934630bc50c20fa161c5d2ae5207c171ad2caab Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 23 Sep 2016 16:01:07 +0200
Subject: [PATCH 021/328] Fix clang >= 3.9.0 compilation by using
 `mapbox::util::variant` as alias (via deps/mapbox/variant => "types" branch)

---
 deps/mapbox/variant             |  2 +-
 include/mapnik/util/variant.hpp | 10 +---------
 src/save_map.cpp                |  2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index aaddee927..e5818212a 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit aaddee9270e3956cee98cdd7d04aea848d69f5f0
+Subproject commit e5818212a8f7ef89df0aa76d5244eca78b8dbb8d
diff --git a/include/mapnik/util/variant.hpp b/include/mapnik/util/variant.hpp
index 27993ce3f..b73533d71 100644
--- a/include/mapnik/util/variant.hpp
+++ b/include/mapnik/util/variant.hpp
@@ -32,15 +32,7 @@ template <typename T>
 using recursive_wrapper = typename mapbox::util::recursive_wrapper<T>;
 
 template<typename... Types>
-class variant : public mapbox::util::variant<Types...>
-{
-public:
-    // tell spirit that this is an adapted variant
-    struct adapted_variant_tag;
-    using types = std::tuple<Types...>;
-    // inherit ctor's
-    using mapbox::util::variant<Types...>::variant;
-};
+using variant = typename  mapbox::util::variant<Types...>;
 
 // unary visitor interface
 // const
diff --git a/src/save_map.cpp b/src/save_map.cpp
index f3d89153c..882d795f9 100644
--- a/src/save_map.cpp
+++ b/src/save_map.cpp
@@ -46,7 +46,7 @@
 #include <mapnik/group/group_layout.hpp>
 #include <mapnik/group/group_symbolizer_properties.hpp>
 #include <mapnik/util/variant.hpp>
-#include <mapnik/util/variant_io.hpp>
+#include <mapbox/variant_io.hpp>
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/algorithm/string.hpp>

From 4384178e3f1f95e9e2990289bfc211fc76f6d1bb Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 23 Sep 2016 16:40:58 +0200
Subject: [PATCH 022/328] update deps/mapbox/variant

---
 deps/mapbox/variant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index e5818212a..173a74579 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit e5818212a8f7ef89df0aa76d5244eca78b8dbb8d
+Subproject commit 173a7457952d0f24e2c55d5eb3ea785ad41639fb

From d99b4eaeb463843cf6b204d60612b6c0f5113dad Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 11 Oct 2016 12:32:34 +0200
Subject: [PATCH 023/328] remove unused include directive

---
 src/geometry/envelope.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/geometry/envelope.cpp b/src/geometry/envelope.cpp
index d9c4d7a93..b2049821b 100644
--- a/src/geometry/envelope.cpp
+++ b/src/geometry/envelope.cpp
@@ -22,7 +22,6 @@
 
 #include <mapnik/geometry/envelope.hpp>
 #include <mapnik/geometry/envelope_impl.hpp>
-#include <mapnik/text/symbolizer_helpers.hpp>
 
 namespace mapnik { namespace geometry {
 

From 75024c067c66ffcbb7c9d8cf9c4d4c2db109e014 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 11 Oct 2016 12:57:20 +0200
Subject: [PATCH 024/328] remove bogus template instantiations

---
 src/image.cpp           | 1 -
 src/image_util_jpeg.cpp | 2 --
 src/image_util_png.cpp  | 4 ----
 src/image_util_webp.cpp | 2 --
 src/image_view.cpp      | 2 --
 5 files changed, 11 deletions(-)

diff --git a/src/image.cpp b/src/image.cpp
index 5141860b7..9772fb7dc 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -88,7 +88,6 @@ template struct MAPNIK_DECL image_dimensions<65535>;
 
 } // end ns detail
 
-template class MAPNIK_DECL image<null_t>;
 template class MAPNIK_DECL image<rgba8_t>;
 template class MAPNIK_DECL image<gray8_t>;
 template class MAPNIK_DECL image<gray8s_t>;
diff --git a/src/image_util_jpeg.cpp b/src/image_util_jpeg.cpp
index 13860fd4e..32d1979a3 100644
--- a/src/image_util_jpeg.cpp
+++ b/src/image_util_jpeg.cpp
@@ -119,7 +119,6 @@ void jpeg_saver::operator() (T const& image) const
     throw image_writer_exception("Mapnik does not support jpeg grayscale images");
 }
 
-template void jpeg_saver::operator()<image_rgba8> (image_rgba8 const& image) const;
 template void jpeg_saver::operator()<image_gray8> (image_gray8 const& image) const;
 template void jpeg_saver::operator()<image_gray8s> (image_gray8s const& image) const;
 template void jpeg_saver::operator()<image_gray16> (image_gray16 const& image) const;
@@ -130,7 +129,6 @@ template void jpeg_saver::operator()<image_gray32f> (image_gray32f const& image)
 template void jpeg_saver::operator()<image_gray64> (image_gray64 const& image) const;
 template void jpeg_saver::operator()<image_gray64s> (image_gray64s const& image) const;
 template void jpeg_saver::operator()<image_gray64f> (image_gray64f const& image) const;
-template void jpeg_saver::operator()<image_view_rgba8> (image_view_rgba8 const& image) const;
 template void jpeg_saver::operator()<image_view_gray8> (image_view_gray8 const& image) const;
 template void jpeg_saver::operator()<image_view_gray8s> (image_view_gray8s const& image) const;
 template void jpeg_saver::operator()<image_view_gray16> (image_view_gray16 const& image) const;
diff --git a/src/image_util_png.cpp b/src/image_util_png.cpp
index f09d58019..322acd226 100644
--- a/src/image_util_png.cpp
+++ b/src/image_util_png.cpp
@@ -316,7 +316,6 @@ void png_saver_pal::operator() (T const& image) const
 #endif
 }
 
-template void png_saver::operator()<image_rgba8> (image_rgba8 const& image) const;
 template void png_saver::operator()<image_gray8> (image_gray8 const& image) const;
 template void png_saver::operator()<image_gray8s> (image_gray8s const& image) const;
 template void png_saver::operator()<image_gray16> (image_gray16 const& image) const;
@@ -327,7 +326,6 @@ template void png_saver::operator()<image_gray32f> (image_gray32f const& image)
 template void png_saver::operator()<image_gray64> (image_gray64 const& image) const;
 template void png_saver::operator()<image_gray64s> (image_gray64s const& image) const;
 template void png_saver::operator()<image_gray64f> (image_gray64f const& image) const;
-template void png_saver::operator()<image_view_rgba8> (image_view_rgba8 const& image) const;
 template void png_saver::operator()<image_view_gray8> (image_view_gray8 const& image) const;
 template void png_saver::operator()<image_view_gray8s> (image_view_gray8s const& image) const;
 template void png_saver::operator()<image_view_gray16> (image_view_gray16 const& image) const;
@@ -338,7 +336,6 @@ template void png_saver::operator()<image_view_gray32f> (image_view_gray32f cons
 template void png_saver::operator()<image_view_gray64> (image_view_gray64 const& image) const;
 template void png_saver::operator()<image_view_gray64s> (image_view_gray64s const& image) const;
 template void png_saver::operator()<image_view_gray64f> (image_view_gray64f const& image) const;
-template void png_saver_pal::operator()<image_rgba8> (image_rgba8 const& image) const;
 template void png_saver_pal::operator()<image_gray8> (image_gray8 const& image) const;
 template void png_saver_pal::operator()<image_gray8s> (image_gray8s const& image) const;
 template void png_saver_pal::operator()<image_gray16> (image_gray16 const& image) const;
@@ -349,7 +346,6 @@ template void png_saver_pal::operator()<image_gray32f> (image_gray32f const& ima
 template void png_saver_pal::operator()<image_gray64> (image_gray64 const& image) const;
 template void png_saver_pal::operator()<image_gray64s> (image_gray64s const& image) const;
 template void png_saver_pal::operator()<image_gray64f> (image_gray64f const& image) const;
-template void png_saver_pal::operator()<image_view_rgba8> (image_view_rgba8 const& image) const;
 template void png_saver_pal::operator()<image_view_gray8> (image_view_gray8 const& image) const;
 template void png_saver_pal::operator()<image_view_gray8s> (image_view_gray8s const& image) const;
 template void png_saver_pal::operator()<image_view_gray16> (image_view_gray16 const& image) const;
diff --git a/src/image_util_webp.cpp b/src/image_util_webp.cpp
index c7b96aca5..99e6690cc 100644
--- a/src/image_util_webp.cpp
+++ b/src/image_util_webp.cpp
@@ -360,7 +360,6 @@ void webp_saver::operator() (T const& image) const
     throw image_writer_exception("Mapnik does not support webp grayscale images");
 }
 
-template void webp_saver::operator()<image_rgba8> (image_rgba8 const& image) const;
 template void webp_saver::operator()<image_gray8> (image_gray8 const& image) const;
 template void webp_saver::operator()<image_gray8s> (image_gray8s const& image) const;
 template void webp_saver::operator()<image_gray16> (image_gray16 const& image) const;
@@ -371,7 +370,6 @@ template void webp_saver::operator()<image_gray32f> (image_gray32f const& image)
 template void webp_saver::operator()<image_gray64> (image_gray64 const& image) const;
 template void webp_saver::operator()<image_gray64s> (image_gray64s const& image) const;
 template void webp_saver::operator()<image_gray64f> (image_gray64f const& image) const;
-template void webp_saver::operator()<image_view_rgba8> (image_view_rgba8 const& image) const;
 template void webp_saver::operator()<image_view_gray8> (image_view_gray8 const& image) const;
 template void webp_saver::operator()<image_view_gray8s> (image_view_gray8s const& image) const;
 template void webp_saver::operator()<image_view_gray16> (image_view_gray16 const& image) const;
diff --git a/src/image_view.cpp b/src/image_view.cpp
index 44e4d7716..345b2a5d1 100644
--- a/src/image_view.cpp
+++ b/src/image_view.cpp
@@ -28,8 +28,6 @@
 
 namespace mapnik
 {
-
-template class MAPNIK_DECL image_view<image_null>;
 template class MAPNIK_DECL image_view<image_rgba8>;
 template class MAPNIK_DECL image_view<image_gray8>;
 template class MAPNIK_DECL image_view<image_gray8s>;

From b27cddc1013f84c2950f6f9c0971eeb8c0bd1eac Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 12 Oct 2016 11:16:01 +0200
Subject: [PATCH 025/328] Silence `-Wundefined-var-template` warnings in
 enumeration.hpp

---
 include/mapnik/enumeration.hpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/include/mapnik/enumeration.hpp b/include/mapnik/enumeration.hpp
index 9064c2d34..d57955b9f 100644
--- a/include/mapnik/enumeration.hpp
+++ b/include/mapnik/enumeration.hpp
@@ -189,7 +189,10 @@ public:
         }
         for (unsigned i = 0; i < THE_MAX; ++i)
         {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wundefined-var-template"
             if (str_copy == our_strings_[i])
+#pragma GCC diagnostic pop
             {
                 value_ = static_cast<ENUM>(i);
                 if (deprecated)
@@ -199,14 +202,20 @@ public:
                 return;
             }
         }
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wundefined-var-template"
         throw illegal_enum_value(std::string("Illegal enumeration value '") +
                                  str + "' for enum " + our_name_);
+#pragma GCC diagnostic pop
     }
 
     /** Returns the current value as a string identifier. */
     std::string as_string() const
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wundefined-var-template"
         return our_strings_[value_];
+#pragma GCC diagnostic pop
     }
 
     /** Static helper function to iterate over valid identifiers. */

From 4c7d4a51e64fa3706b99e8ab8a76272caab08293 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 12 Oct 2016 17:06:24 +0200
Subject: [PATCH 026/328] remove unused <bitset> header

---
 include/mapnik/enumeration.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/mapnik/enumeration.hpp b/include/mapnik/enumeration.hpp
index d57955b9f..1b6fc21b6 100644
--- a/include/mapnik/enumeration.hpp
+++ b/include/mapnik/enumeration.hpp
@@ -28,7 +28,6 @@
 #include <mapnik/debug.hpp>
 
 // stl
-#include <bitset>
 #include <iostream>
 #include <cstdlib>
 #include <algorithm>

From 558fa0cdaacf77958755835287bc1d051546027f Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 13 Oct 2016 10:26:54 +0200
Subject: [PATCH 027/328] remove unused `#include
 <mapnik/expression_grammar_x3_config.hpp>`

---
 src/expression.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/expression.cpp b/src/expression.cpp
index 2988fc7d9..c935324af 100644
--- a/src/expression.cpp
+++ b/src/expression.cpp
@@ -26,7 +26,6 @@
 #include <mapnik/unicode.hpp>
 #include <mapnik/expression_node_types.hpp>
 #include <mapnik/expression_grammar_x3.hpp>
-#include <mapnik/expression_grammar_x3_config.hpp>
 
 namespace mapnik
 {

From 01fbbafc2638e33c9d59609b5b3e5d6555d66750 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 14 Oct 2016 09:24:52 +0200
Subject: [PATCH 028/328] remove duplicate 'transcoder_tag`

---
 include/mapnik/expression_grammar_x3_def.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/mapnik/expression_grammar_x3_def.hpp b/include/mapnik/expression_grammar_x3_def.hpp
index d8ab45ade..9bdc920ba 100644
--- a/include/mapnik/expression_grammar_x3_def.hpp
+++ b/include/mapnik/expression_grammar_x3_def.hpp
@@ -64,7 +64,6 @@ namespace mapnik { namespace grammar {
     using x3::alpha;
     using x3::alnum;
     using x3::hex;
-    struct transcoder_tag;
 
     auto do_assign = [] (auto & ctx)
     {

From 83cc819c392813d71978da8fd2399639e9fdc445 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 14 Oct 2016 14:24:44 +0200
Subject: [PATCH 029/328] upgrade CSV parser to boost::spirit::x3

---
 include/mapnik/csv/csv_grammar.hpp        |  79 --------------
 include/mapnik/csv/csv_grammar_impl.hpp   |  61 -----------
 include/mapnik/csv/csv_grammar_x3.hpp     |  67 ++++++++++++
 include/mapnik/csv/csv_grammar_x3_def.hpp | 127 ++++++++++++++++++++++
 plugins/input/csv/csv_utils.cpp           |  13 ++-
 5 files changed, 202 insertions(+), 145 deletions(-)
 delete mode 100644 include/mapnik/csv/csv_grammar.hpp
 delete mode 100644 include/mapnik/csv/csv_grammar_impl.hpp
 create mode 100644 include/mapnik/csv/csv_grammar_x3.hpp
 create mode 100644 include/mapnik/csv/csv_grammar_x3_def.hpp

diff --git a/include/mapnik/csv/csv_grammar.hpp b/include/mapnik/csv/csv_grammar.hpp
deleted file mode 100644
index 240f11ce1..000000000
--- a/include/mapnik/csv/csv_grammar.hpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_CSV_GRAMMAR_HPP
-#define MAPNIK_CSV_GRAMMAR_HPP
-
-#include <mapnik/csv/csv_types.hpp>
-#include <boost/spirit/include/qi.hpp>
-
-namespace mapnik {
-
-namespace qi = boost::spirit::qi;
-
-struct csv_white_space_skipper : qi::primitive_parser<csv_white_space_skipper>
-{
-    template <typename Context, typename Iterator>
-    struct attribute
-    {
-        typedef qi::unused_type type;
-    };
-
-    template <typename Iterator, typename Context
-      , typename Skipper, typename Attribute>
-    bool parse(Iterator& first, Iterator const& last
-      , Context& /*context*/, Skipper const& skipper
-      , Attribute& /*attr*/) const
-    {
-        qi::skip_over(first, last, skipper);
-        if (first != last && *first == ' ')
-        {
-            while (++first != last && *first == ' ')
-                ;
-            return true;
-        }
-        return false;
-    }
-
-    template <typename Context>
-    qi::info what(Context& /*context*/) const
-    {
-        return qi::info("csv_white_space_skipper");
-    }
-};
-
-
-template <typename Iterator, typename Skipper = csv_white_space_skipper>
-struct csv_line_grammar : qi::grammar<Iterator, csv_line(char, char), Skipper>
-{
-    csv_line_grammar();
-private:
-    qi::rule<Iterator, csv_line(char, char),  Skipper> line;
-    qi::rule<Iterator, csv_value(char, char)> column; // no-skip
-    qi::rule<Iterator, csv_value(char)> text; // no-skip
-    qi::rule<Iterator, csv_value(char)> quoted; // no-skip
-    qi::symbols<char const, char const> unesc_char;
-};
-
-}
-
-#endif // MAPNIK_CSV_GRAMMAR_HPP
diff --git a/include/mapnik/csv/csv_grammar_impl.hpp b/include/mapnik/csv/csv_grammar_impl.hpp
deleted file mode 100644
index 560835443..000000000
--- a/include/mapnik/csv/csv_grammar_impl.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2016 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#include <mapnik/csv/csv_grammar.hpp>
-
-namespace mapnik {
-
-namespace qi = boost::spirit::qi;
-
-template <typename Iterator, typename Skipper>
-csv_line_grammar<Iterator, Skipper>::csv_line_grammar()
-    : csv_line_grammar::base_type(line)
-{
-    qi::_r1_type _r1;
-    qi::_r2_type _r2;
-    qi::lit_type lit;
-    qi::char_type char_;
-    unesc_char.add
-        ("\\a", '\a')
-        ("\\b", '\b')
-        ("\\f", '\f')
-        ("\\n", '\n')
-        ("\\r", '\r')
-        ("\\t", '\t')
-        ("\\v", '\v')
-        ("\\\\",'\\')
-        ("\\\'", '\'')
-        ("\\\"", '\"')
-        ("\"\"", '\"') // double quote
-        ;
-    line = -lit("\r") > -lit("\n") > column(_r1, _r2) % lit(_r1)
-        ;
-    column = quoted(_r2) | *(char_ - lit(_r1))
-        ;
-    quoted = lit(_r1) > text(_r1) > lit(_r1) // support unmatched quotes or not (??)
-        ;
-    text = *(unesc_char | (char_ - lit(_r1)))
-        ;
-    BOOST_SPIRIT_DEBUG_NODES((line)(column)(quoted));
-}
-
-} // namespace mapnik
diff --git a/include/mapnik/csv/csv_grammar_x3.hpp b/include/mapnik/csv/csv_grammar_x3.hpp
new file mode 100644
index 000000000..2d66a39ab
--- /dev/null
+++ b/include/mapnik/csv/csv_grammar_x3.hpp
@@ -0,0 +1,67 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2015 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_CSV_GRAMMAR_X3_HPP
+#define MAPNIK_CSV_GRAMMAR_X3_HPP
+
+#include <mapnik/csv/csv_types.hpp>
+#include <boost/spirit/home/x3.hpp>
+#include <iostream>
+namespace mapnik {
+
+namespace x3 = boost::spirit::x3;
+
+struct csv_white_space_skipper : x3::parser<csv_white_space_skipper>
+{
+    using attribute_type = x3::unused_type;
+    static bool const has_attribute = false;
+
+    template <typename Iterator, typename Context, typename Attribute>
+    bool parse(Iterator& first, Iterator const& last,
+               Context const& context, x3::unused_type, Attribute& ) const
+    {
+        x3::skip_over(first, last, context);
+        if (first != last && *first == ' ')
+        {
+            while (++first != last && *first == ' ')
+                ;
+            return true;
+        }
+        return false;
+    }
+};
+
+auto static const csv_white_space = csv_white_space_skipper{};
+
+namespace grammar {
+
+struct separator_tag;
+struct quote_tag;
+
+struct csv_line_class;
+using csv_line_grammar_type = x3::rule<csv_line_class, csv_line>;
+
+BOOST_SPIRIT_DECLARE(csv_line_grammar_type);
+
+}}
+
+#endif // MAPNIK_CSV_GRAMMAR_X3_HPP
diff --git a/include/mapnik/csv/csv_grammar_x3_def.hpp b/include/mapnik/csv/csv_grammar_x3_def.hpp
new file mode 100644
index 000000000..9b1d3ba6f
--- /dev/null
+++ b/include/mapnik/csv/csv_grammar_x3_def.hpp
@@ -0,0 +1,127 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <mapnik/csv/csv_grammar_x3.hpp>
+#pragma GCC diagnostic pop
+#include <iostream>
+namespace mapnik { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+namespace ascii = boost::spirit::x3::ascii;
+
+using x3::lit;
+using x3::lexeme;
+using ascii::char_;
+
+struct unesc_char_ : x3::symbols<char>
+{
+    unesc_char_()
+    {
+        add("\\a", '\a')
+            ("\\b", '\b')
+            ("\\f", '\f')
+            ("\\n", '\n')
+            ("\\r", '\r')
+            ("\\t", '\t')
+            ("\\v", '\v')
+            ("\\\\",'\\')
+            ("\\\'", '\'')
+            ("\\\"", '\"')
+            ("\"\"", '\"') // double quote
+            ;
+    }
+} unesc_char;
+
+struct separator_ : x3::parser<separator_>
+{
+    using attribute_type = x3::unused_type;
+    static bool const has_attribute = false;
+
+    template <typename Iterator, typename Context, typename Attribute>
+    bool parse(Iterator& first, Iterator const& last,
+               Context const& context, x3::unused_type, Attribute& ) const
+    {
+        x3::skip_over(first, last, context);
+        if (first != last && *first == x3::get<separator_tag>(context))
+        {
+            ++first;
+            return true;
+        }
+        return false;
+    }
+} separator;
+
+struct quote_ : x3::parser<quote_>
+{
+    using attribute_type = x3::unused_type;
+    static bool const has_attribute = false;
+
+    template <typename Iterator, typename Context, typename Attribute>
+    bool parse(Iterator& first, Iterator const& last,
+               Context const& context, x3::unused_type, Attribute& ) const
+    {
+        x3::skip_over(first, last, context);
+        if (first != last && *first == x3::get<quote_tag>(context))
+        {
+            ++first;
+            return true;
+        }
+        return false;
+    }
+} quote;
+
+// starting rule
+csv_line_grammar_type const line("csv-line");
+// rules
+x3::rule<class csv_column, csv_value> column("csv-column");
+x3::rule<class csv_text, csv_value> text("csv-text");
+x3::rule<class csc_quoted_text, csv_value> quoted_text("csv-quoted-text");
+
+auto const line_def = -lit('\r') > -lit('\n') > lexeme[column] % separator
+    ;
+
+auto const column_def = quoted_text | *(char_ - separator)
+    ;
+
+auto const quoted_text_def = quote > text > quote // support unmatched quotes or not (??)
+    ;
+
+auto const text_def = *(unesc_char | (char_ - quote))
+    ;
+
+BOOST_SPIRIT_DEFINE (
+    line,
+    column,
+    quoted_text,
+    text
+    );
+
+} // grammar
+
+grammar::csv_line_grammar_type const& csv_line_grammar()
+{
+    return grammar::line;
+}
+
+} // namespace mapnik
diff --git a/plugins/input/csv/csv_utils.cpp b/plugins/input/csv/csv_utils.cpp
index 62e9e760b..b9e7ea762 100644
--- a/plugins/input/csv/csv_utils.cpp
+++ b/plugins/input/csv/csv_utils.cpp
@@ -30,7 +30,7 @@
 #include <mapnik/util/trim.hpp>
 #include <mapnik/datasource.hpp>
 // csv grammar
-#include <mapnik/csv/csv_grammar_impl.hpp>
+#include <mapnik/csv/csv_grammar_x3_def.hpp>
 //
 #include "csv_getline.hpp"
 #include "csv_utils.hpp"
@@ -192,14 +192,17 @@ bool valid(geometry_column_locator const& locator, std::size_t max_size)
 
 } // namespace detail
 
-static const mapnik::csv_line_grammar<char const*> line_g;
-static const mapnik::csv_white_space_skipper skipper{};
-
 mapnik::csv_line parse_line(char const* start, char const* end, char separator, char quote, std::size_t num_columns)
 {
+    namespace x3 = boost::spirit::x3;
+    auto parser = x3::with<mapnik::grammar::quote_tag>(quote)
+        [ x3::with<mapnik::grammar::separator_tag>(separator)
+          [ mapnik::csv_line_grammar()]
+            ];
+
     mapnik::csv_line values;
     if (num_columns > 0) values.reserve(num_columns);
-    if (!boost::spirit::qi::phrase_parse(start, end, (line_g)(separator, quote), skipper, values))
+    if (!x3::phrase_parse(start, end, parser, mapnik::csv_white_space, values))
     {
         throw mapnik::datasource_exception("Failed to parse CSV line:\n" + std::string(start, end));
     }

From df12183e1058a45d3da10d27650af4198f1bcb8d Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 14 Oct 2016 14:25:34 +0200
Subject: [PATCH 030/328] re-use object file to avoid duplicate compilation

---
 utils/mapnik-index/build.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/mapnik-index/build.py b/utils/mapnik-index/build.py
index 358ce5f88..230f545e4 100644
--- a/utils/mapnik-index/build.py
+++ b/utils/mapnik-index/build.py
@@ -33,7 +33,7 @@ source = Split(
     mapnik-index.cpp
     process_csv_file.cpp
     process_geojson_file.cpp
-    ../../plugins/input/csv/csv_utils.cpp
+    ../../plugins/input/csv/csv_utils.os
     """
     )
 

From 1e66580f0db5327a0afbdaf03faf5fbac8638a53 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 14 Oct 2016 14:26:10 +0200
Subject: [PATCH 031/328] add explicit 'types' branch to "deps/mapbox/variant"

---
 .gitmodules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitmodules b/.gitmodules
index dfcbea536..a2c6b429e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,3 +9,4 @@
 [submodule "deps/mapbox/variant"]
 	path = deps/mapbox/variant
 	url = https://github.com/mapbox/variant.git
+        branch = types
\ No newline at end of file

From 62012fbf198ca5c481d65040b02b57a32ed4e4ac Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 14 Oct 2016 14:32:44 +0200
Subject: [PATCH 032/328] re-use literal parser implementation between
 `separator` and `quote` primitives

---
 include/mapnik/csv/csv_grammar_x3_def.hpp | 28 ++++++-----------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/include/mapnik/csv/csv_grammar_x3_def.hpp b/include/mapnik/csv/csv_grammar_x3_def.hpp
index 9b1d3ba6f..b40507030 100644
--- a/include/mapnik/csv/csv_grammar_x3_def.hpp
+++ b/include/mapnik/csv/csv_grammar_x3_def.hpp
@@ -53,9 +53,11 @@ struct unesc_char_ : x3::symbols<char>
     }
 } unesc_char;
 
-struct separator_ : x3::parser<separator_>
+template <typename T>
+struct literal : x3::parser<literal<T>>
 {
     using attribute_type = x3::unused_type;
+    using context_tag = T;
     static bool const has_attribute = false;
 
     template <typename Iterator, typename Context, typename Attribute>
@@ -63,33 +65,17 @@ struct separator_ : x3::parser<separator_>
                Context const& context, x3::unused_type, Attribute& ) const
     {
         x3::skip_over(first, last, context);
-        if (first != last && *first == x3::get<separator_tag>(context))
+        if (first != last && *first == x3::get<context_tag>(context))
         {
             ++first;
             return true;
         }
         return false;
     }
-} separator;
+};
 
-struct quote_ : x3::parser<quote_>
-{
-    using attribute_type = x3::unused_type;
-    static bool const has_attribute = false;
-
-    template <typename Iterator, typename Context, typename Attribute>
-    bool parse(Iterator& first, Iterator const& last,
-               Context const& context, x3::unused_type, Attribute& ) const
-    {
-        x3::skip_over(first, last, context);
-        if (first != last && *first == x3::get<quote_tag>(context))
-        {
-            ++first;
-            return true;
-        }
-        return false;
-    }
-} quote;
+auto static const separator = literal<separator_tag>{};
+auto static const quote = literal<quote_tag>{};
 
 // starting rule
 csv_line_grammar_type const line("csv-line");

From 6790e277129cdc587b1b76021c691f19671728e5 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 17 Oct 2016 10:31:01 +0200
Subject: [PATCH 033/328] remove redundant includes directives

---
 include/mapnik/svg/svg_path_grammar_impl.hpp      | 1 -
 include/mapnik/svg/svg_points_grammar.hpp         | 3 ---
 include/mapnik/svg/svg_points_grammar_impl.hpp    | 3 ---
 include/mapnik/svg/svg_transform_grammar_impl.hpp | 1 -
 4 files changed, 8 deletions(-)

diff --git a/include/mapnik/svg/svg_path_grammar_impl.hpp b/include/mapnik/svg/svg_path_grammar_impl.hpp
index 5d5fd1a7a..5d1de4b7d 100644
--- a/include/mapnik/svg/svg_path_grammar_impl.hpp
+++ b/include/mapnik/svg/svg_path_grammar_impl.hpp
@@ -31,7 +31,6 @@
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
 #pragma GCC diagnostic pop
 
diff --git a/include/mapnik/svg/svg_points_grammar.hpp b/include/mapnik/svg/svg_points_grammar.hpp
index afbe7ee09..f6023c94c 100644
--- a/include/mapnik/svg/svg_points_grammar.hpp
+++ b/include/mapnik/svg/svg_points_grammar.hpp
@@ -23,9 +23,6 @@
 #ifndef SVG_POINTS_GRAMMAR_HPP
 #define SVG_POINTS_GRAMMAR_HPP
 
-// mapnik
-#include <mapnik/svg/svg_path_commands.hpp>
-
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/include/qi.hpp>
diff --git a/include/mapnik/svg/svg_points_grammar_impl.hpp b/include/mapnik/svg/svg_points_grammar_impl.hpp
index 5d56f7e25..efec8295d 100644
--- a/include/mapnik/svg/svg_points_grammar_impl.hpp
+++ b/include/mapnik/svg/svg_points_grammar_impl.hpp
@@ -28,10 +28,7 @@
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
 #pragma GCC diagnostic pop
 
 namespace mapnik { namespace svg {
diff --git a/include/mapnik/svg/svg_transform_grammar_impl.hpp b/include/mapnik/svg/svg_transform_grammar_impl.hpp
index 65c05ab2c..c1ef74417 100644
--- a/include/mapnik/svg/svg_transform_grammar_impl.hpp
+++ b/include/mapnik/svg/svg_transform_grammar_impl.hpp
@@ -28,7 +28,6 @@
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
 #include <boost/spirit/include/phoenix_object.hpp>
 #pragma GCC diagnostic pop

From 1c0abe5e2f791924e36c38e50ea5ffb108788440 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 17 Oct 2016 11:01:07 +0200
Subject: [PATCH 034/328] update deps/mapbox/variant

---
 .gitmodules         | 2 +-
 deps/mapbox/variant | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index a2c6b429e..baac64f8a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,4 +9,4 @@
 [submodule "deps/mapbox/variant"]
 	path = deps/mapbox/variant
 	url = https://github.com/mapbox/variant.git
-        branch = types
\ No newline at end of file
+        branch = master
\ No newline at end of file
diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index 173a74579..84a426a31 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit 173a7457952d0f24e2c55d5eb3ea785ad41639fb
+Subproject commit 84a426a31ad3b63c4b8f8d189841e19af48cda40

From 7a64fae41f75704c59bbe0714a77893a1edefe2d Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 17 Oct 2016 16:34:40 +0200
Subject: [PATCH 035/328] update visual test data

---
 test/data-visual | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/data-visual b/test/data-visual
index 61f0d314b..941db3d00 160000
--- a/test/data-visual
+++ b/test/data-visual
@@ -1 +1 @@
-Subproject commit 61f0d314b989a345df9515d5bc1472c8d5362990
+Subproject commit 941db3d00920dc7aceaa6797096a7228bc7bac14

From 7622aa25be984a11653bf0e57fee8214ce5f5b13 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 19 Oct 2016 13:15:15 +0200
Subject: [PATCH 036/328] cleanup include directives

---
 include/mapnik/json/positions_grammar.hpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/mapnik/json/positions_grammar.hpp b/include/mapnik/json/positions_grammar.hpp
index 016ecb222..6984300f9 100644
--- a/include/mapnik/json/positions_grammar.hpp
+++ b/include/mapnik/json/positions_grammar.hpp
@@ -24,10 +24,8 @@
 #define MAPNIK_JSON_POSITIONS_GRAMMAR_HPP
 
 // mapnik
-#include <mapnik/util/variant.hpp>
 #include <mapnik/json/positions.hpp>
 #include <mapnik/json/error_handler.hpp>
-#include <mapnik/geometry.hpp>
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/include/qi.hpp>

From 88b16e0ca849f9cea19bc6334d3a654b7ce2ea3f Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 20 Oct 2016 17:16:03 +0200
Subject: [PATCH 037/328] pass context by const ref + extract _attr(ctx) once
 and re-use

---
 include/mapnik/expression_grammar_x3_def.hpp | 51 ++++++++++----------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/include/mapnik/expression_grammar_x3_def.hpp b/include/mapnik/expression_grammar_x3_def.hpp
index 9bdc920ba..4a8d3c6dc 100644
--- a/include/mapnik/expression_grammar_x3_def.hpp
+++ b/include/mapnik/expression_grammar_x3_def.hpp
@@ -65,125 +65,126 @@ namespace mapnik { namespace grammar {
     using x3::alnum;
     using x3::hex;
 
-    auto do_assign = [] (auto & ctx)
+    auto do_assign = [] (auto const& ctx)
     {
         _val(ctx) = std::move(_attr(ctx));
     };
 
-    auto do_negate = [] (auto & ctx)
+    auto do_negate = [] (auto const& ctx)
     {
         _val(ctx) = std::move(unary_node<mapnik::tags::negate>(_attr(ctx)));
     };
 
-    auto do_attribute = [] (auto & ctx)
+    auto do_attribute = [] (auto const& ctx)
     {
         _val(ctx) = std::move(attribute(_attr(ctx)));
     };
 
-    auto do_global_attribute = [] (auto & ctx)
+    auto do_global_attribute = [] (auto const& ctx)
     {
         _val(ctx) = std::move(global_attribute(_attr(ctx)));
     };
 
-    auto do_geometry_type_attribute = [] (auto & ctx)
+    auto do_geometry_type_attribute = [] (auto const& ctx)
     {
         _val(ctx) = std::move(geometry_type_attribute());
     };
 
-    auto do_add = [] (auto & ctx)
+    auto do_add = [] (auto const& ctx)
     {
         _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::plus>(std::move(_val(ctx)), std::move(_attr(ctx))));
     };
 
-    auto do_subt = [] (auto & ctx)
+    auto do_subt = [] (auto const& ctx)
     {
         _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::minus>(std::move(_val(ctx)), std::move(_attr(ctx))));
     };
 
-    auto do_mult = [] (auto & ctx)
+    auto do_mult = [] (auto const& ctx)
     {
         _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::mult>(std::move(_val(ctx)), std::move(_attr(ctx))));
     };
 
-    auto do_div = [] (auto & ctx)
+    auto do_div = [] (auto const& ctx)
     {
         _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::div>(std::move(_val(ctx)), std::move(_attr(ctx))));
     };
 
-    auto do_mod = [] (auto & ctx)
+    auto do_mod = [] (auto const& ctx)
     {
         _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::mod>(std::move(_val(ctx)), std::move(_attr(ctx))));
     };
 
-    auto do_unicode = [] (auto & ctx)
+    auto do_unicode = [] (auto const& ctx)
     {
         auto & tr = x3::get<transcoder_tag>(ctx).get();
         _val(ctx) = std::move(tr.transcode(_attr(ctx).c_str()));
     };
 
-    auto do_null = [] (auto & ctx)
+    auto do_null = [] (auto const& ctx)
     {
         _val(ctx) = std::move(mapnik::value_null());
     };
 
-    auto do_not = [] (auto & ctx)
+    auto do_not = [] (auto const& ctx)
     {
         mapnik::unary_node<mapnik::tags::logical_not> node(_attr(ctx));
         _val(ctx) = std::move(node);
     };
 
-    auto do_and = [] (auto & ctx)
+    auto do_and = [] (auto const& ctx)
     {
         _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::logical_and>(std::move(_val(ctx)), std::move(_attr(ctx))));
     };
 
-    auto do_or = [] (auto & ctx)
+    auto do_or = [] (auto const& ctx)
     {
         _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::logical_or>(std::move(_val(ctx)), std::move(_attr(ctx))));
     };
 
-    auto do_equal = [] (auto & ctx)
+    auto do_equal = [] (auto const& ctx)
     {
         _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::equal_to>(std::move(_val(ctx)), std::move(_attr(ctx))));
     };
 
-    auto do_not_equal = [] (auto & ctx)
+    auto do_not_equal = [] (auto const& ctx)
     {
         _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::not_equal_to>(std::move(_val(ctx)), std::move(_attr(ctx))));
     };
 
-    auto do_less = [] (auto & ctx)
+    auto do_less = [] (auto const& ctx)
     {
         _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::less>(std::move(_val(ctx)), std::move(_attr(ctx))));
     };
 
-    auto do_less_equal = [] (auto & ctx)
+    auto do_less_equal = [] (auto const& ctx)
     {
         _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::less_equal>(std::move(_val(ctx)), std::move(_attr(ctx))));
     };
 
-    auto do_greater = [] (auto & ctx)
+    auto do_greater = [] (auto const& ctx)
     {
         _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::greater>(std::move(_val(ctx)), std::move(_attr(ctx))));
     };
 
-    auto do_greater_equal = [] (auto & ctx)
+    auto do_greater_equal = [] (auto const& ctx)
     {
         _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::greater_equal>(std::move(_val(ctx)), std::move(_attr(ctx))));
     };
 
 // regex
-    auto do_regex_match = [] (auto & ctx)
+    auto do_regex_match = [] (auto const& ctx)
     {
         auto const& tr = x3::get<transcoder_tag>(ctx).get();
         _val(ctx) = std::move(mapnik::regex_match_node(tr, std::move(_val(ctx)) , std::move(_attr(ctx))));
     };
 
-    auto do_regex_replace = [] (auto & ctx)
+    auto do_regex_replace = [] (auto const& ctx)
     {
         auto const& tr = x3::get<transcoder_tag>(ctx).get();
-        auto const& pattern = std::get<0>(_attr(ctx));
-        auto const& format = std::get<1>(_attr(ctx));
+        auto const& pair = _attr(ctx);
+        auto const& pattern = std::get<0>(pair);
+        auto const& format = std::get<1>(pair);
         _val(ctx) = mapnik::regex_replace_node(tr, _val(ctx) , pattern, format);
     };
 

From 2757ec8973f341ad5321d760b2c23128c0d515aa Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 9 Nov 2016 10:47:40 +0100
Subject: [PATCH 038/328] update variant submodule

---
 deps/mapbox/variant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index 84a426a31..a5a79a594 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit 84a426a31ad3b63c4b8f8d189841e19af48cda40
+Subproject commit a5a79a594f39d705a7ef969f54a0743516f0bc6d

From e46a52c3f088eb5006eff7a1399a6c3169843664 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 10 Nov 2016 17:26:24 +0100
Subject: [PATCH 039/328] GeoJSON - spirit::x3 based parsing building blocks

---
 include/mapnik/json/create_geometry.hpp       | 243 ++++++++++++++++++
 include/mapnik/json/geojson_grammar_x3.hpp    |  84 ++++++
 .../mapnik/json/geojson_grammar_x3_def.hpp    | 182 +++++++++++++
 include/mapnik/json/json_grammar_config.hpp   |  45 ++++
 include/mapnik/json/positions_grammar_x3.hpp  |  50 ++++
 .../mapnik/json/positions_grammar_x3_def.hpp  |  67 +++++
 include/mapnik/json/positions_x3.hpp          |  41 +++
 .../mapnik/json/unicode_string_grammar_x3.hpp |  46 ++++
 .../json/unicode_string_grammar_x3_def.hpp    | 129 ++++++++++
 src/json/geojson_grammar_x3.cpp               |  29 +++
 src/json/positions_grammar_x3.cpp             |  28 ++
 src/json/unicode_string_grammar_x3.cpp        |  28 ++
 12 files changed, 972 insertions(+)
 create mode 100644 include/mapnik/json/create_geometry.hpp
 create mode 100644 include/mapnik/json/geojson_grammar_x3.hpp
 create mode 100644 include/mapnik/json/geojson_grammar_x3_def.hpp
 create mode 100644 include/mapnik/json/json_grammar_config.hpp
 create mode 100644 include/mapnik/json/positions_grammar_x3.hpp
 create mode 100644 include/mapnik/json/positions_grammar_x3_def.hpp
 create mode 100644 include/mapnik/json/positions_x3.hpp
 create mode 100644 include/mapnik/json/unicode_string_grammar_x3.hpp
 create mode 100644 include/mapnik/json/unicode_string_grammar_x3_def.hpp
 create mode 100644 src/json/geojson_grammar_x3.cpp
 create mode 100644 src/json/positions_grammar_x3.cpp
 create mode 100644 src/json/unicode_string_grammar_x3.cpp

diff --git a/include/mapnik/json/create_geometry.hpp b/include/mapnik/json/create_geometry.hpp
new file mode 100644
index 000000000..a04f377fb
--- /dev/null
+++ b/include/mapnik/json/create_geometry.hpp
@@ -0,0 +1,243 @@
+ /*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_JSON_CREATE_GEOMETRY_HPP
+#define MAPNIK_JSON_CREATE_GEOMETRY_HPP
+
+#include <mapnik/geometry.hpp>
+#include <mapnik/geometry/correct.hpp>
+#include <mapnik/json/positions_x3.hpp>
+
+namespace mapnik { namespace json {
+
+// geometries
+template <typename Geometry>
+struct create_point
+{
+    explicit create_point(Geometry & geom)
+        : geom_(geom) {}
+
+    void operator() (point const& pos) const
+    {
+        mapnik::geometry::point<double> point(pos.x, pos.y);
+        geom_ = std::move(point);
+    }
+
+    template <typename T>
+    void operator()(T const&) const {} // no-op - shouldn't get here
+    Geometry & geom_;
+};
+
+template <typename Geometry>
+struct create_linestring
+{
+    explicit create_linestring(Geometry & geom)
+        : geom_(geom) {}
+
+    void operator() (ring const& points) const
+    {
+        std::size_t size = points.size();
+        if (size > 1)
+        {
+            mapnik::geometry::line_string<double> line;
+            line.reserve(size);
+            for (auto && pt : points)
+            {
+                line.emplace_back(std::move(pt));
+            }
+            geom_ = std::move(line);
+        }
+    }
+
+    template <typename T>
+    void operator()(T const&) const {}  // no-op - shouldn't get here
+
+    Geometry & geom_;
+};
+
+template <typename Geometry>
+struct create_polygon
+{
+    explicit create_polygon(Geometry & geom)
+        : geom_(geom) {}
+
+    void operator() (rings const& rngs) const
+    {
+        mapnik::geometry::polygon<double> poly;
+        std::size_t num_rings = rngs.size();
+        if (num_rings > 1)
+        {
+            poly.interior_rings.reserve(num_rings - 1);
+        }
+
+        for ( std::size_t i = 0; i < num_rings; ++i)
+        {
+            std::size_t size = rngs[i].size();
+            mapnik::geometry::linear_ring<double> ring;
+            ring.reserve(size);
+            for ( auto && pt : rngs[i])
+            {
+                ring.emplace_back(std::move(pt));
+            }
+            if (i == 0) poly.set_exterior_ring(std::move(ring));
+            else poly.add_hole(std::move(ring));
+        }
+        geom_ = std::move(poly);
+        mapnik::geometry::correct(geom_);
+    }
+
+    template <typename T>
+    void operator()(T const&) const {}  // no-op - shouldn't get here
+
+    Geometry & geom_;
+};
+
+// multi-geometries
+template <typename Geometry>
+struct create_multipoint
+{
+    explicit create_multipoint(Geometry & geom)
+        : geom_(geom) {}
+
+    void operator() (ring const& points) const
+    {
+        mapnik::geometry::multi_point<double> multi_point;
+        multi_point.reserve(points.size());
+        for (auto && pos : points)
+        {
+            multi_point.emplace_back(std::move(pos));
+        }
+        geom_ = std::move(multi_point);
+    }
+
+    template <typename T>
+    void operator()(T const&) const {}  // no-op - shouldn't get here
+
+    Geometry & geom_;
+};
+
+template <typename Geometry>
+struct create_multilinestring
+{
+    explicit create_multilinestring(Geometry & geom)
+        : geom_(geom) {}
+
+    void operator() (rings const& rngs) const
+    {
+        mapnik::geometry::multi_line_string<double> multi_line;
+        multi_line.reserve(rngs.size());
+
+        for (auto const& ring : rngs)
+        {
+            mapnik::geometry::line_string<double> line;
+            line.reserve(ring.size());
+            for (auto && pt : ring)
+            {
+                line.emplace_back(std::move(pt));
+            }
+            multi_line.emplace_back(std::move(line));
+        }
+        geom_ = std::move(multi_line);
+    }
+
+    template <typename T>
+    void operator()(T const&) const {}  // no-op - shouldn't get here
+
+    Geometry & geom_;
+};
+
+template <typename Geometry>
+struct create_multipolygon
+{
+    explicit create_multipolygon(Geometry & geom)
+        : geom_(geom) {}
+
+    void operator()(rings_array const& rngs_arr) const
+    {
+        mapnik::geometry::multi_polygon<double> multi_poly;
+        multi_poly.reserve(rngs_arr.size());
+        for (auto const& rings : rngs_arr)
+        {
+            mapnik::geometry::polygon<double> poly;
+            std::size_t num_rings = rings.size();
+            if ( num_rings > 1)
+                poly.interior_rings.reserve(num_rings - 1);
+
+            for ( std::size_t i = 0; i < num_rings; ++i)
+            {
+                std::size_t size = rings[i].size();
+                mapnik::geometry::linear_ring<double> ring;
+                ring.reserve(size);
+                for ( auto && pt : rings[i])
+                {
+                    ring.emplace_back(std::move(pt));
+                }
+                if (i == 0) poly.set_exterior_ring(std::move(ring));
+                else poly.add_hole(std::move(ring));
+            }
+            multi_poly.emplace_back(std::move(poly));
+        }
+        geom_ = std::move(multi_poly);
+        mapnik::geometry::correct(geom_);
+    }
+
+    template <typename T>
+    void operator()(T const&) const {}  // no-op - shouldn't get here
+
+    Geometry & geom_;
+};
+
+struct create_geometry_impl
+{
+    using result_type = void;
+    template <typename Geometry>
+    void operator() (Geometry & geom, int type, mapnik::json::positions const& coords) const
+    {
+        switch (type)
+        {
+        case 1 ://Point
+            util::apply_visitor(create_point<Geometry>(geom), coords);
+            break;
+        case 2 ://LineString
+           util::apply_visitor(create_linestring<Geometry>(geom), coords);
+           break;
+        case 3 ://Polygon
+            util::apply_visitor(create_polygon<Geometry>(geom), coords);
+            break;
+        case 4 ://MultiPoint
+            util::apply_visitor(create_multipoint<Geometry>(geom), coords);
+            break;
+        case 5 ://MultiLineString
+            util::apply_visitor(create_multilinestring<Geometry>(geom), coords);
+            break;
+        case 6 ://MultiPolygon
+            util::apply_visitor(create_multipolygon<Geometry>(geom), coords);
+            break;
+        default:
+            break;
+        }
+    }
+};
+
+}}
+
+#endif // MAPNIK_JSON_CREATE_GEOMETRY_HPP
diff --git a/include/mapnik/json/geojson_grammar_x3.hpp b/include/mapnik/json/geojson_grammar_x3.hpp
new file mode 100644
index 000000000..557db176f
--- /dev/null
+++ b/include/mapnik/json/geojson_grammar_x3.hpp
@@ -0,0 +1,84 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_JSON_GEOJSON_GRAMMAR_X3_HPP
+#define MAPNIK_JSON_GEOJSON_GRAMMAR_X3_HPP
+
+#include <mapnik/value/types.hpp>
+#include <mapnik/util/variant.hpp>
+#include <mapnik/json/json_grammar_config.hpp>
+#include <mapnik/json/positions_x3.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#pragma GCC diagnostic pop
+
+#include <vector>
+
+namespace mapnik { namespace json {
+
+namespace x3 = boost::spirit::x3;
+struct json_value;
+using json_array = std::vector<json_value>;
+using json_object_element = std::pair<int, json_value>;
+using json_object = std::vector<json_object_element>;
+using json_value_base = mapnik::util::variant<value_null,
+                                              value_bool,
+                                              value_integer,
+                                              value_double,
+                                              std::string,
+                                              mapnik::geometry::geometry_types,
+                                              positions,
+                                              json_array,
+                                              json_object>;
+struct json_value : json_value_base
+{
+#if __cpp_inheriting_constructors >= 200802
+
+    using json_value_base::json_value_base;
+
+#else
+
+    json_value() = default;
+
+    template <typename T>
+    json_value(T && val)
+        : json_value_base(std::forward<T>(val)) {}
+
+#endif
+};
+
+namespace grammar {
+
+using geojson_grammar_type = x3::rule<class geojson_tag, json_value>;
+using key_value_type = x3::rule<class key_value_tag, json_object_element>;
+BOOST_SPIRIT_DECLARE(geojson_grammar_type);
+BOOST_SPIRIT_DECLARE(key_value_type);
+}
+
+grammar::geojson_grammar_type const& geojson_grammar();
+grammar::key_value_type const& key_value_grammar();
+
+}}
+
+#endif // MAPNIK_JSON_GEOJSON_GRAMMAR_X3_HPP
diff --git a/include/mapnik/json/geojson_grammar_x3_def.hpp b/include/mapnik/json/geojson_grammar_x3_def.hpp
new file mode 100644
index 000000000..5b85732bc
--- /dev/null
+++ b/include/mapnik/json/geojson_grammar_x3_def.hpp
@@ -0,0 +1,182 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_JSON_GEOJSON_GRAMMAR_X3_DEF_HPP
+#define MAPNIK_JSON_GEOJSON_GRAMMAR_X3_DEF_HPP
+
+#define BIGINT // int64_t support
+
+#include <mapnik/json/geojson_grammar_x3.hpp>
+#include <mapnik/json/unicode_string_grammar_x3.hpp>
+#include <mapnik/json/positions_grammar_x3.hpp>
+#include <boost/fusion/include/std_pair.hpp>
+
+namespace mapnik { namespace json { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+
+auto make_null = [] (auto const& ctx)
+{
+    _val(ctx) = mapnik::value_null{};
+};
+
+auto make_true = [] (auto const& ctx)
+{
+    _val(ctx) = true;
+};
+
+auto make_false = [] (auto const& ctx)
+{
+    _val(ctx) = false;
+};
+
+auto assign = [](auto const& ctx)
+{
+    _val(ctx) = std::move(_attr(ctx));
+};
+
+auto assign_key = [](auto const& ctx)
+{
+    std::string const& name = _attr(ctx);
+    keys_map & keys = x3::get<keys_tag>(ctx);
+    auto result = keys.insert(std::make_pair(name, keys.size()));
+    std::get<0>(_val(ctx)) = result.first->second;
+};
+
+auto assign_value = [](auto const& ctx)
+{
+    std::get<1>(_val(ctx)) = std::move(_attr(ctx));
+};
+
+using x3::lit;
+using x3::string;
+using x3::omit;
+
+struct geometry_type_ : x3::symbols<mapnik::geometry::geometry_types>
+{
+    geometry_type_()
+    {
+        add
+            ("\"Feature\"",mapnik::geometry::geometry_types(0xff)) // this is a temp hack FIXME
+            ("\"Point\"", mapnik::geometry::geometry_types::Point)
+            ("\"LineString\"", mapnik::geometry::geometry_types::LineString)
+            ("\"Polygon\"", mapnik::geometry::geometry_types::Polygon)
+            ("\"MultiPoint\"", mapnik::geometry::geometry_types::MultiPoint)
+            ("\"MultiLineString\"", mapnik::geometry::geometry_types::MultiLineString )
+            ("\"MultiPolygon\"",mapnik::geometry::geometry_types::MultiPolygon)
+            ("\"GeometryCollection\"",mapnik::geometry::geometry_types::GeometryCollection)
+            ;
+    }
+} geometry_type_sym;
+
+// exported rules
+// start
+geojson_grammar_type const value("JSON Value");
+key_value_type const key_value("JSON key/value");
+// rules
+x3::rule<class json_object_tag, json_object> object("JSON Object");
+x3::rule<class json_array_tag, json_array> array("JSON Array");
+x3::rule<class json_number_tag, json_value> number("JSON Number");
+//x3::rule<class key_value_tag, json_object_element> key_value("JSON key/value");
+// GeoJSON
+x3::rule<class geojson_coordinates_tag, json_object_element> coordinates("GeoJSON Coordinates");
+x3::rule<class geojson_geometry_type_tag, json_object_element> geometry_type("GeoJSON Geometry Type");
+x3::rule<class geojson_key_value_type_tag, json_object_element> geojson_key_value("GeoJSON Key/Value Type");
+auto const json_double = x3::real_parser<value_double, x3::strict_real_policies<value_double>>();
+auto const json_integer = x3::int_parser<value_integer, 10, 1, -1>();
+
+// import unicode string rule
+namespace { auto const& json_string = mapnik::json::unicode_string_grammar(); }
+// import positions rule
+namespace { auto const& positions_rule = mapnik::json::positions_grammar(); }
+
+// GeoJSON types
+auto const value_def =  object | array | json_string | number
+    ;
+
+auto const coordinates_def = string("\"coordinates\"")[assign_key] > lit(':') > (positions_rule[assign_value] | value[assign_value])
+    ;
+
+auto const geometry_type_def = string("\"type\"")[assign_key] > lit(':') > (geometry_type_sym[assign_value] | value[assign_value])
+    ;
+
+auto const key_value_def = json_string[assign_key] > lit(':') > value[assign_value]
+    ;
+
+auto const geojson_key_value_def =
+    geometry_type
+    |
+    coordinates
+    |
+    key_value
+    ;
+
+auto const object_def = lit('{')
+    > -(geojson_key_value % lit(','))
+    > lit('}')
+    ;
+
+auto const array_def = lit('[')
+    > -(value % lit(','))
+    > lit(']')
+    ;
+
+auto const number_def = json_double[assign]
+    | json_integer[assign]
+    | lit("true") [make_true]
+    | lit ("false") [make_false]
+    | lit("null")[make_null]
+    ;
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+
+BOOST_SPIRIT_DEFINE(
+    value,
+    geometry_type,
+    coordinates,
+    object,
+    key_value,
+    geojson_key_value,
+    array,
+    number
+    );
+
+#pragma GCC diagnostic pop
+
+}}}
+
+namespace mapnik { namespace json {
+
+grammar::geojson_grammar_type const& geojson_grammar()
+{
+    return grammar::value;
+}
+
+grammar::key_value_type const& key_value_grammar()
+{
+    return grammar::key_value;
+}
+
+}}
+
+#endif // MAPNIK_JSON_GEOJSON_GRAMMAR_X3_DEF_HPP
diff --git a/include/mapnik/json/json_grammar_config.hpp b/include/mapnik/json/json_grammar_config.hpp
new file mode 100644
index 000000000..f8e5c07c4
--- /dev/null
+++ b/include/mapnik/json/json_grammar_config.hpp
@@ -0,0 +1,45 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_JSON_GRAMMAR_CONFIG_HPP
+#define MAPNIK_JSON_GRAMMAR_CONFIG_HPP
+
+#include <boost/spirit/home/x3.hpp>
+#include <unordered_map>
+
+namespace mapnik { namespace json {
+
+struct keys_tag;
+
+namespace grammar {
+
+using keys_map = std::unordered_map<std::string, int>;
+
+namespace x3 = boost::spirit::x3;
+using space_type = x3::standard::space_type;
+using iterator_type = std::string::const_iterator;
+using context_type = x3::with_context<keys_tag,
+                                      std::reference_wrapper<keys_map> const,
+                                      x3::phrase_parse_context<space_type>::type>::type;
+}}}
+
+#endif // MAPNIK_JSON_GRAMMAR_CONFIG_HPP
diff --git a/include/mapnik/json/positions_grammar_x3.hpp b/include/mapnik/json/positions_grammar_x3.hpp
new file mode 100644
index 000000000..55827907e
--- /dev/null
+++ b/include/mapnik/json/positions_grammar_x3.hpp
@@ -0,0 +1,50 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_JSON_POSITIONS_GRAMMAR_X3_HPP
+#define MAPNIK_JSON_POSITIONS_GRAMMAR_X3_HPP
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#pragma GCC diagnostic pop
+
+// mapnik
+#include <mapnik/geometry.hpp>
+#include <mapnik/json/positions_x3.hpp>
+
+namespace mapnik { namespace json {
+
+namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+using positions_grammar_type = x3::rule<class positions_tag, positions>;
+
+BOOST_SPIRIT_DECLARE(positions_grammar_type);
+
+}
+
+grammar::positions_grammar_type const& positions_grammar();
+
+}}
+
+#endif // MAPNIK_JSON_POSITIONS_GRAMMAR_X3_HPP
diff --git a/include/mapnik/json/positions_grammar_x3_def.hpp b/include/mapnik/json/positions_grammar_x3_def.hpp
new file mode 100644
index 000000000..ab012c061
--- /dev/null
+++ b/include/mapnik/json/positions_grammar_x3_def.hpp
@@ -0,0 +1,67 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_JSON_POSITIONS_GRAMMAR_X3_DEF_HPP
+#define MAPNIK_JSON_POSITIONS_GRAMMAR_X3_DEF_HPP
+
+#include <mapnik/json/positions_grammar_x3.hpp>
+#include <mapnik/geometry/fusion_adapted.hpp>
+
+namespace mapnik { namespace json { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+using x3::lit;
+using x3::double_;
+using x3::no_case;
+using x3::omit;
+
+// start rule
+positions_grammar_type const positions("Positions");
+// rules
+x3::rule<class point_class, point> const point("Position");
+x3::rule<class ring_class, ring> const ring("Ring");
+x3::rule<class rings_class, rings> const rings("Rings");
+x3::rule<class rings_array_class, rings_array> const rings_array("RingsArray");
+
+auto const positions_def = rings_array | rings | ring | point ;
+auto const point_def = lit('[') > double_ > lit(',') > double_ > omit[*(lit(',') > double_)] > lit(']');
+auto const ring_def = lit('[') >> (point % lit(',') > lit(']'));
+auto const rings_def = lit('[') >> (ring % lit(',') > lit(']'));
+auto const rings_array_def = lit('[') >> (rings % lit(',') > lit(']'));
+
+BOOST_SPIRIT_DEFINE(
+    positions,
+    point,
+    ring,
+    rings,
+    rings_array
+    );
+}}}
+
+namespace mapnik { namespace json {
+grammar::positions_grammar_type const& positions_grammar()
+{
+    return grammar::positions;
+}
+}}
+
+#endif // MAPNIK_JSON_POSITIONS_GRAMMAR_X3_DEF_HPP
diff --git a/include/mapnik/json/positions_x3.hpp b/include/mapnik/json/positions_x3.hpp
new file mode 100644
index 000000000..38a56a647
--- /dev/null
+++ b/include/mapnik/json/positions_x3.hpp
@@ -0,0 +1,41 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_JSON_POSITIONS_HPP
+#define MAPNIK_JSON_POSITIONS_HPP
+
+// mapnik
+#include <mapnik/util/variant.hpp>
+#include <mapnik/geometry.hpp>
+
+namespace mapnik { namespace json {
+
+struct empty {};
+using point = mapnik::geometry::point<double>;
+using ring = std::vector<point>;
+using rings = std::vector<ring>;
+using rings_array = std::vector<rings>;
+using positions = util::variant<point, ring, rings, rings_array>;
+
+}}
+
+#endif // MAPNIK_JSON_POSITIONS_HPP
diff --git a/include/mapnik/json/unicode_string_grammar_x3.hpp b/include/mapnik/json/unicode_string_grammar_x3.hpp
new file mode 100644
index 000000000..8b70f598a
--- /dev/null
+++ b/include/mapnik/json/unicode_string_grammar_x3.hpp
@@ -0,0 +1,46 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2015 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_JSON_UNICODE_STRING_GRAMMAR_X3_HPP
+#define MAPNIK_JSON_UNICODE_STRING_GRAMMAR_X3_HPP
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#pragma GCC diagnostic pop
+
+
+namespace mapnik { namespace json { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+class unicode_string_tag;
+using unicode_string_grammar_type = x3::rule<unicode_string_tag, std::string>;
+
+BOOST_SPIRIT_DECLARE(unicode_string_grammar_type);
+
+}
+
+grammar::unicode_string_grammar_type const& unicode_string_grammar();
+
+}}
+
+#endif // MAPNIK_JSON_UNICODE_STRING_GRAMMAR_X3_HPP
diff --git a/include/mapnik/json/unicode_string_grammar_x3_def.hpp b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
new file mode 100644
index 000000000..00a5932b8
--- /dev/null
+++ b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
@@ -0,0 +1,129 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_JSON_UNICODE_STRING_GRAMMAR_X3_DEF_HPP
+#define MAPNIK_JSON_UNICODE_STRING_GRAMMAR_X3_DEF_HPP
+
+#include <mapnik/json/unicode_string_grammar_x3.hpp>
+#include <iostream>
+
+namespace mapnik { namespace json { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+
+using uchar = std::uint32_t; // a unicode code point
+
+auto append = [](auto const& ctx)
+{
+    _val(ctx) += _attr(ctx);
+};
+
+namespace detail {
+
+void push_utf8_impl(std::string & str, uchar code_point)
+{
+    using insert_iterator = std::back_insert_iterator<std::string>;
+    insert_iterator iter(str);
+    boost::utf8_output_iterator<insert_iterator> utf8_iter(iter);
+    *utf8_iter++ = code_point;
+}
+}
+
+auto push_utf8 = [](auto const& ctx) { detail::push_utf8_impl(_val(ctx), _attr(ctx));};
+
+auto push_esc = [] (auto const& ctx)
+{
+    std::string & utf8 = _val(ctx);
+    char c = _attr(ctx);
+    switch (c)
+    {
+    case ' ': utf8 += ' ';          break;
+    case '\t': utf8 += '\t';        break;
+    case '0': utf8 += char(0);      break;
+    case 'a': utf8 += 0x7;          break;
+    case 'b': utf8 += 0x8;          break;
+    case 't': utf8 += 0x9;          break;
+    case 'n': utf8 += 0xA;          break;
+    case 'v': utf8 += 0xB;          break;
+    case 'f': utf8 += 0xC;          break;
+    case 'r': utf8 += 0xD;          break;
+    case 'e': utf8 += 0x1B;         break;
+    case '"': utf8 += '"';          break;
+    case '/': utf8 += '/';          break;
+    case '\\': utf8 += '\\';        break;
+    case '_': detail::push_utf8_impl(utf8, 0xA0);  break;
+    case 'N': detail::push_utf8_impl(utf8, 0x85);  break;
+    case 'L': detail::push_utf8_impl(utf8, 0x2028);  break;
+    case 'P': detail::push_utf8_impl(utf8, 0x2029);  break;
+    }
+};
+
+using x3::lit;
+using x3::char_;
+using x3::hex;
+using x3::eol;
+using x3::no_skip;
+
+x3::uint_parser<uchar, 16, 4, 4> hex4;
+x3::uint_parser<uchar, 16, 8, 8> hex8;
+
+// start rule
+unicode_string_grammar_type const unicode_string("Unicode String");
+// rules
+x3::rule<class double_quoted_tag, std::string> const double_quoted("Double-quoted string");
+x3::rule<class escaped_tag, std::string> const escaped("Escaped Characted");
+
+auto unicode_string_def = double_quoted
+    ;
+auto const escaped_def = lit('\\') >
+    (lit('x') > hex[push_utf8]
+     |
+     lit('u') > hex4[push_utf8]
+     |
+     lit('U') > hex8[push_utf8]
+     |
+     char_("0abtnvfre\"/\\N_LP \t")[push_esc]
+     |
+     eol) // continue to next line
+    ;
+
+auto const double_quoted_def = lit('"') > no_skip[*(escaped[append] | (~char_('"'))[append])] > lit('"');
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+
+BOOST_SPIRIT_DEFINE(
+    unicode_string,
+    double_quoted,
+    escaped
+    );
+
+#pragma GCC diagnostic pop
+
+}
+grammar::unicode_string_grammar_type const& unicode_string_grammar()
+{
+    return grammar::unicode_string;
+}
+}}
+
+#endif // MAPNIK_JSON_UNICODE_STRING_GRAMMAR_X3_DEF_HPP
diff --git a/src/json/geojson_grammar_x3.cpp b/src/json/geojson_grammar_x3.cpp
new file mode 100644
index 000000000..824156557
--- /dev/null
+++ b/src/json/geojson_grammar_x3.cpp
@@ -0,0 +1,29 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#include <mapnik/json/geojson_grammar_x3_def.hpp>
+#include <mapnik/json/json_grammar_config.hpp>
+namespace mapnik { namespace json { namespace grammar {
+
+BOOST_SPIRIT_INSTANTIATE(geojson_grammar_type, iterator_type, context_type);
+
+}}}
diff --git a/src/json/positions_grammar_x3.cpp b/src/json/positions_grammar_x3.cpp
new file mode 100644
index 000000000..e20de39f5
--- /dev/null
+++ b/src/json/positions_grammar_x3.cpp
@@ -0,0 +1,28 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#include <mapnik/json/positions_grammar_x3_def.hpp>
+#include <mapnik/json/json_grammar_config.hpp>
+
+namespace mapnik { namespace json { namespace grammar {
+BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, context_type);
+}}}
diff --git a/src/json/unicode_string_grammar_x3.cpp b/src/json/unicode_string_grammar_x3.cpp
new file mode 100644
index 000000000..69fadbba2
--- /dev/null
+++ b/src/json/unicode_string_grammar_x3.cpp
@@ -0,0 +1,28 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#include <mapnik/json/unicode_string_grammar_x3_def.hpp>
+#include <mapnik/json/json_grammar_config.hpp>
+
+namespace mapnik { namespace json { namespace grammar {
+BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, context_type);
+}}}

From 6fb3dbd63f193fbe8cc556e3e831bfedd86d008a Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 10 Nov 2016 17:28:16 +0100
Subject: [PATCH 040/328] remove BIGINT redifinition

---
 include/mapnik/json/geojson_grammar_x3_def.hpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/mapnik/json/geojson_grammar_x3_def.hpp b/include/mapnik/json/geojson_grammar_x3_def.hpp
index 5b85732bc..f299ab0d6 100644
--- a/include/mapnik/json/geojson_grammar_x3_def.hpp
+++ b/include/mapnik/json/geojson_grammar_x3_def.hpp
@@ -23,8 +23,6 @@
 #ifndef MAPNIK_JSON_GEOJSON_GRAMMAR_X3_DEF_HPP
 #define MAPNIK_JSON_GEOJSON_GRAMMAR_X3_DEF_HPP
 
-#define BIGINT // int64_t support
-
 #include <mapnik/json/geojson_grammar_x3.hpp>
 #include <mapnik/json/unicode_string_grammar_x3.hpp>
 #include <mapnik/json/positions_grammar_x3.hpp>

From 19f1af38619fe18f3065f42341914fcb0439074c Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 11 Nov 2016 10:40:52 +0100
Subject: [PATCH 041/328] mapnik-index - add optional 'fast' spirit::x3 GeoJSON
 parsing. Activated by "--x3" program option.

---
 utils/mapnik-index/build.py                   |   1 +
 utils/mapnik-index/mapnik-index.cpp           |  17 +-
 .../mapnik-index/process_geojson_file_x3.cpp  | 347 ++++++++++++++++++
 .../mapnik-index/process_geojson_file_x3.hpp  |  36 ++
 4 files changed, 400 insertions(+), 1 deletion(-)
 create mode 100644 utils/mapnik-index/process_geojson_file_x3.cpp
 create mode 100644 utils/mapnik-index/process_geojson_file_x3.hpp

diff --git a/utils/mapnik-index/build.py b/utils/mapnik-index/build.py
index 230f545e4..e2b9901a2 100644
--- a/utils/mapnik-index/build.py
+++ b/utils/mapnik-index/build.py
@@ -33,6 +33,7 @@ source = Split(
     mapnik-index.cpp
     process_csv_file.cpp
     process_geojson_file.cpp
+    process_geojson_file_x3.cpp
     ../../plugins/input/csv/csv_utils.os
     """
     )
diff --git a/utils/mapnik-index/mapnik-index.cpp b/utils/mapnik-index/mapnik-index.cpp
index 9b1859bf2..5b5ac8b93 100644
--- a/utils/mapnik-index/mapnik-index.cpp
+++ b/utils/mapnik-index/mapnik-index.cpp
@@ -30,6 +30,7 @@
 
 #include "process_csv_file.hpp"
 #include "process_geojson_file.hpp"
+#include "process_geojson_file_x3.hpp"
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
@@ -62,6 +63,7 @@ int main (int argc, char** argv)
     namespace po = boost::program_options;
     bool verbose = false;
     bool validate_features = false;
+    bool use_x3 = false;
     unsigned int depth = DEFAULT_DEPTH;
     double ratio = DEFAULT_RATIO;
     std::vector<std::string> files;
@@ -82,6 +84,7 @@ int main (int argc, char** argv)
             ("manual-headers,H", po::value<std::string>(), "CSV manual headers string")
             ("files",po::value<std::vector<std::string> >(),"Files to index: file1 file2 ...fileN")
             ("validate-features", "Validate GeoJSON features")
+            ("x3","Use boost::spirit::x3 based parser for GeoJSON")
             ;
 
         po::positional_options_description p;
@@ -108,6 +111,10 @@ int main (int argc, char** argv)
         {
             validate_features = true;
         }
+        if (vm.count("x3"))
+        {
+            use_x3 = true;
+        }
         if (vm.count("depth"))
         {
             depth = vm["depth"].as<unsigned int>();
@@ -190,7 +197,15 @@ int main (int argc, char** argv)
         else if (mapnik::detail::is_geojson(filename))
         {
             std::clog << "processing '" << filename << "' as GeoJSON\n";
-            auto result = mapnik::detail::process_geojson_file(boxes, filename, validate_features, verbose);
+            std::pair<bool,mapnik::box2d<float>> result;
+            if (use_x3)
+            {
+                result = mapnik::detail::process_geojson_file_x3(boxes, filename, validate_features, verbose);
+            }
+            else
+            {
+                result = mapnik::detail::process_geojson_file(boxes, filename, validate_features, verbose);
+            }
             if (!result.first)
             {
                 std::clog << "Error: failed to process " << filename << std::endl;
diff --git a/utils/mapnik-index/process_geojson_file_x3.cpp b/utils/mapnik-index/process_geojson_file_x3.cpp
new file mode 100644
index 000000000..44d712496
--- /dev/null
+++ b/utils/mapnik-index/process_geojson_file_x3.cpp
@@ -0,0 +1,347 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2015 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#include "process_geojson_file_x3.hpp"
+
+#if defined(MAPNIK_MEMORY_MAPPED_FILE)
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/interprocess/mapped_region.hpp>
+#include <boost/interprocess/streams/bufferstream.hpp>
+#include <boost/spirit/home/x3.hpp>
+#pragma GCC diagnostic pop
+#include <mapnik/mapped_memory_cache.hpp>
+#else
+#include <mapnik/util/file_io.hpp>
+#endif
+#include <mapnik/feature.hpp>
+#include <mapnik/json/json_grammar_config.hpp>
+#include <mapnik/json/geojson_grammar_x3_def.hpp>
+#include <mapnik/json/unicode_string_grammar_x3_def.hpp>
+#include <mapnik/json/positions_grammar_x3_def.hpp>
+
+namespace {
+
+template <typename T>
+struct feature_validate_callback
+{
+    feature_validate_callback(mapnik::box2d<T> const& box)
+        : box_(box) {}
+
+    void operator() (mapnik::feature_ptr const& f) const
+    {
+        if (box_ != box_)
+        {
+            throw std::runtime_error("Bounding boxes mismatch validation feature");
+        }
+    }
+    mapnik::box2d<T> const& box_;
+};
+
+using box_type = mapnik::box2d<float>;
+using boxes_type = std::vector<std::pair<box_type, std::pair<std::size_t, std::size_t>>>;
+//using base_iterator_type = char const*;
+//const mapnik::json::extract_bounding_box_grammar<base_iterator_type, boxes_type> geojson_datasource_static_bbox_grammar;
+//const mapnik::transcoder tr("utf8");
+//const mapnik::json::feature_grammar_callback<base_iterator_type, mapnik::feature_impl, feature_validate_callback<float>> fc_grammar(tr);
+}
+
+namespace mapnik { namespace json {
+
+template <typename Box>
+struct calculate_bounding_box
+{
+    calculate_bounding_box(Box & box)
+        : box_(box) {}
+
+    void operator()(mapnik::json::point const& pt) const
+    {
+        box_.init(pt.x, pt.y);
+    }
+
+    void operator()(mapnik::json::ring const& ring) const
+    {
+        for (auto const& pt : ring)
+        {
+            if (!box_.valid()) box_.init(pt.x, pt.y);
+            else box_.expand_to_include(pt.x, pt.y);
+        }
+    }
+
+    void operator()(mapnik::json::rings const& rings) const
+    {
+        for (auto const& ring : rings)
+        {
+            operator()(ring);
+            break; // consider first ring only
+        }
+    }
+
+    void operator()(mapnik::json::rings_array const& rings_array) const
+    {
+        for (auto const& rings : rings_array)
+        {
+            operator()(rings);
+        }
+    }
+
+    template <typename T>
+    void operator() (T const& ) const {}
+
+    Box & box_;
+};
+
+namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+
+using x3::lit;
+using x3::omit;
+using x3::raw;
+using x3::char_;
+using x3::eps;
+
+struct feature_callback_tag;
+
+auto on_feature_callback = [] (auto const& ctx)
+{
+    // call our callback
+    x3::get<feature_callback_tag>(ctx)(_attr(ctx));
+};
+
+namespace {
+auto const& geojson_value = geojson_grammar();
+//auto const& key_value_ = key_value_grammar();
+//auto const& json_string = mapnik::json::unicode_string_grammar();
+}
+
+// extract bounding box from GeoJSON Feature
+
+struct bracket_tag ;
+
+auto check_brackets = [](auto const& ctx)
+{
+    _pass(ctx) = (x3::get<bracket_tag>(ctx) > 0);
+};
+
+auto open_bracket = [](auto const& ctx)
+{
+    ++x3::get<bracket_tag>(ctx);
+};
+
+auto close_bracket = [](auto const& ctx)
+{
+    --x3::get<bracket_tag>(ctx);
+};
+
+auto assign_range = [](auto const& ctx)
+{
+    std::get<0>(_val(ctx)) = std::move(_attr(ctx));
+};
+
+auto assign_bbox = [](auto const& ctx)
+{
+    std::get<1>(_val(ctx)) = std::move(_attr(ctx));
+};
+
+auto extract_bounding_box = [](auto const& ctx)
+{
+    mapnik::box2d<float>  bbox;
+    calculate_bounding_box<mapnik::box2d<float>> visitor(bbox);
+    mapnik::util::apply_visitor(visitor, _attr(ctx));
+    _val(ctx) = std::move(bbox);
+};
+
+auto const coordinates_rule = x3::rule<struct coordinates_rule_tag, mapnik::box2d<float> > {}
+    = lit("\"coordinates\"") >> lit(':') >> positions_rule[extract_bounding_box];
+
+auto const bounding_box = x3::rule<struct bounding_box_rule_tag, std::tuple<boost::iterator_range<char const*>,mapnik::box2d<float>>> {}
+    = raw[lit('{')[open_bracket] >> *(eps[check_brackets] >>
+                                  (lit("\"FeatureCollection\"") > eps(false)
+                                   |
+                                   lit('{')[open_bracket]
+                                   |
+                                   lit('}')[close_bracket]
+                                   |
+                                   coordinates_rule[assign_bbox]
+                                   |
+                                   omit[json_string]
+                                   |
+                                   omit[char_]))][assign_range];
+
+
+auto const feature = bounding_box[on_feature_callback];
+
+auto const key_value_ = omit[json_string] > lit(':') > omit[geojson_value] ;
+
+auto const features = lit("\"features\"")
+    > lit(':') > lit('[') > -(omit[feature] % lit(',')) > lit(']');
+
+auto const type = lit("\"type\"") > lit(':') > lit("\"FeatureCollection\"");
+
+auto const feature_collection = x3::rule<struct feature_collection_tag> {}
+    = lit('{') > (( type | features | key_value_) % lit(',')) > lit('}');
+
+
+}}}
+
+namespace {
+struct collect_features
+{
+    collect_features(std::vector<mapnik::json::json_value> & values)
+        : values_(values) {}
+    void operator() (mapnik::json::json_value && val) const
+    {
+        values_.push_back(std::move(val));
+    }
+    std::vector<mapnik::json::json_value> & values_;
+};
+
+template <typename Iterator, typename Boxes>
+struct extract_positions
+{
+    extract_positions(Iterator start, Boxes & boxes)
+        : start_(start),
+          boxes_(boxes) {}
+
+    template <typename T>
+    void operator() (T const& val) const
+    {
+        auto const& r = std::get<0>(val);
+        mapnik::box2d<float> const& bbox = std::get<1>(val);
+        auto offset = std::distance(start_, r.begin());
+        auto size = std::distance(r.begin(), r.end());
+        boxes_.emplace_back(std::make_pair(bbox,std::make_pair(offset, size)));
+        //boxes_.emplace_back(std::make_tuple(bbox,offset, size));
+        //std::clog << offset << ":" << size << " " << bbox << std::endl;
+    }
+    Iterator start_;
+    Boxes & boxes_;
+};
+
+}
+
+namespace mapnik { namespace detail {
+
+template <typename T>
+std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & boxes, std::string const& filename, bool validate_features, bool verbose)
+{
+    using box_type = typename T::value_type::first_type;
+    box_type extent;
+#if defined(MAPNIK_MEMORY_MAPPED_FILE)
+    mapnik::mapped_region_ptr mapped_region;
+    boost::optional<mapnik::mapped_region_ptr> memory =
+        mapnik::mapped_memory_cache::instance().find(filename, true);
+    if (!memory)
+    {
+        std::clog << "Error : cannot memory map " << filename << std::endl;
+        return std::make_pair(false, extent);
+    }
+    else
+    {
+        mapped_region = *memory;
+    }
+    char const* start = reinterpret_cast<char const*>(mapped_region->get_address());
+    char const* end = start + mapped_region->get_size();
+#else
+    mapnik::util::file file(filename);
+    if (!file)
+    {
+        std::clog << "Error : cannot open " << filename << std::endl;
+        return std::make_pair(false, extent);
+    }
+    std::string file_buffer;
+    file_buffer.resize(file.size());
+    std::fread(&file_buffer[0], file.size(), 1, file.get());
+    char const* start = file_buffer.c_str();
+    char const* end = start + file_buffer.length();
+#endif
+    using namespace boost::spirit;
+    using space_type = mapnik::json::grammar::space_type;
+    auto const* itr = start;
+
+    extract_positions<char const*, boxes_type> callback(itr, boxes);
+    mapnik::json::grammar::keys_map keys;
+    std::size_t bracket_counter = 0;
+    auto feature_collection_impl = x3::with<mapnik::json::grammar::bracket_tag>(std::ref(bracket_counter))
+        [x3::with<mapnik::json::keys_tag>(std::ref(keys))
+         [x3::with<mapnik::json::grammar::feature_callback_tag>(std::ref(callback))
+          [mapnik::json::grammar::feature_collection]
+             ]];
+
+    try
+    {
+        bool result = x3::phrase_parse(itr, end, feature_collection_impl, space_type());
+        if (!result)
+        {
+            std::clog << "mapnik-index (GeoJSON) : could not extract bounding boxes from : '" <<  filename <<  "'" << std::endl;
+            return std::make_pair(false, extent);
+        }
+    }
+    catch (x3::expectation_failure<char const*> const& ex)
+    {
+        std::clog << ex.what() << std::endl;
+        std::clog << "Expected: " << ex.which();
+        std::clog << " Got: \"" << std::string(ex.where(), ex.where() + 200) << '"' << std::endl;
+        return std::make_pair(false, extent);
+    }
+    catch (std::exception const& ex)
+    {
+        std::clog << "Exception caught:" << ex.what() <<  std::endl;
+        return std::make_pair(false, extent);
+    }
+
+    mapnik::context_ptr ctx = std::make_shared<mapnik::context_type>();
+    //std::size_t start_id = 1;
+    for (auto const& item : boxes)
+    {
+        if (item.first.valid())
+        {
+            if (!extent.valid()) extent = item.first;
+            else extent.expand_to_include(item.first);
+
+            if (validate_features)
+            {
+                std::clog << "FIXME" << std::endl;
+                return std::make_pair(false, extent);
+#if 0
+                base_iterator_type feat_itr = start + item.second.first;
+                base_iterator_type feat_end = feat_itr + item.second.second;
+                feature_validate_callback<float> callback(item.first);
+                bool result = boost::spirit::::phrase_parse(feat_itr, feat_end, (fc_grammar)
+                                                              (boost::phoenix::ref(ctx), boost::phoenix::ref(start_id), boost::phoenix::ref(callback)),
+                                                              space);
+                if (!result || feat_itr != feat_end)
+                {
+                    if (verbose) std::clog << std::string(start + item.second.first, feat_end ) << std::endl;
+                    return std::make_pair(false, extent);
+                }
+#endif
+            }
+        }
+    }
+    return std::make_pair(true, extent);
+}
+
+template std::pair<bool,box_type> process_geojson_file_x3(boxes_type&, std::string const&, bool, bool);
+
+}}
diff --git a/utils/mapnik-index/process_geojson_file_x3.hpp b/utils/mapnik-index/process_geojson_file_x3.hpp
new file mode 100644
index 000000000..23617354f
--- /dev/null
+++ b/utils/mapnik-index/process_geojson_file_x3.hpp
@@ -0,0 +1,36 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2015 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_UTILS_PROCESS_GEOJSON_FILE_X3_HPP
+#define MAPNIK_UTILS_PROCESS_GEOJSON_FILE_X3_HPP
+
+#include <utility>
+#include <mapnik/box2d.hpp>
+
+namespace mapnik { namespace detail {
+
+template <typename T>
+std::pair<bool, typename T::value_type::first_type> process_geojson_file_x3(T & boxes, std::string const& filename, bool validate_features, bool verbose);
+
+}}
+
+#endif // MAPNIK_UTILS_PROCESS_GEOJSON_FILE_X3_HPP

From 99ce79fd364c80139ecabbbd62f488490dd5a7b0 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 11 Nov 2016 10:48:03 +0100
Subject: [PATCH 042/328] allow short style syntax for long options e.g "-x3",
 "-validate-features" etc.

---
 utils/mapnik-index/mapnik-index.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/utils/mapnik-index/mapnik-index.cpp b/utils/mapnik-index/mapnik-index.cpp
index 5b5ac8b93..a926441a5 100644
--- a/utils/mapnik-index/mapnik-index.cpp
+++ b/utils/mapnik-index/mapnik-index.cpp
@@ -90,7 +90,11 @@ int main (int argc, char** argv)
         po::positional_options_description p;
         p.add("files",-1);
         po::variables_map vm;
-        po::store(po::command_line_parser(argc, argv).options(desc).positional(p).run(), vm);
+        po::store(po::command_line_parser(argc, argv)
+                  .options(desc)
+                  .style(po::command_line_style::unix_style | po::command_line_style::allow_long_disguise)
+                  .positional(p)
+                  .run(), vm);
         po::notify(vm);
 
         if (vm.count("version"))

From 252a0366e9eab2feebeaa4bc726c4bbf0ebebd78 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 11 Nov 2016 15:24:11 +0100
Subject: [PATCH 043/328] consistent usage of iterator type + cleanups

---
 .../mapnik-index/process_geojson_file_x3.cpp  | 37 ++++---------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/utils/mapnik-index/process_geojson_file_x3.cpp b/utils/mapnik-index/process_geojson_file_x3.cpp
index 44d712496..a9ac4a129 100644
--- a/utils/mapnik-index/process_geojson_file_x3.cpp
+++ b/utils/mapnik-index/process_geojson_file_x3.cpp
@@ -59,7 +59,7 @@ struct feature_validate_callback
 
 using box_type = mapnik::box2d<float>;
 using boxes_type = std::vector<std::pair<box_type, std::pair<std::size_t, std::size_t>>>;
-//using base_iterator_type = char const*;
+using base_iterator_type = char const*;
 //const mapnik::json::extract_bounding_box_grammar<base_iterator_type, boxes_type> geojson_datasource_static_bbox_grammar;
 //const mapnik::transcoder tr("utf8");
 //const mapnik::json::feature_grammar_callback<base_iterator_type, mapnik::feature_impl, feature_validate_callback<float>> fc_grammar(tr);
@@ -130,8 +130,6 @@ auto on_feature_callback = [] (auto const& ctx)
 
 namespace {
 auto const& geojson_value = geojson_grammar();
-//auto const& key_value_ = key_value_grammar();
-//auto const& json_string = mapnik::json::unicode_string_grammar();
 }
 
 // extract bounding box from GeoJSON Feature
@@ -174,7 +172,7 @@ auto extract_bounding_box = [](auto const& ctx)
 auto const coordinates_rule = x3::rule<struct coordinates_rule_tag, mapnik::box2d<float> > {}
     = lit("\"coordinates\"") >> lit(':') >> positions_rule[extract_bounding_box];
 
-auto const bounding_box = x3::rule<struct bounding_box_rule_tag, std::tuple<boost::iterator_range<char const*>,mapnik::box2d<float>>> {}
+auto const bounding_box = x3::rule<struct bounding_box_rule_tag, std::tuple<boost::iterator_range<base_iterator_type>,mapnik::box2d<float>>> {}
     = raw[lit('{')[open_bracket] >> *(eps[check_brackets] >>
                                   (lit("\"FeatureCollection\"") > eps(false)
                                    |
@@ -260,8 +258,8 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
     {
         mapped_region = *memory;
     }
-    char const* start = reinterpret_cast<char const*>(mapped_region->get_address());
-    char const* end = start + mapped_region->get_size();
+    base_iterator_type start = reinterpret_cast<base_iterator_type>(mapped_region->get_address());
+    base_iterator_type end = start + mapped_region->get_size();
 #else
     mapnik::util::file file(filename);
     if (!file)
@@ -272,14 +270,14 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
     std::string file_buffer;
     file_buffer.resize(file.size());
     std::fread(&file_buffer[0], file.size(), 1, file.get());
-    char const* start = file_buffer.c_str();
-    char const* end = start + file_buffer.length();
+    base_iterator_type start = file_buffer.c_str();
+    base_iterator_type end = start + file_buffer.length();
 #endif
     using namespace boost::spirit;
     using space_type = mapnik::json::grammar::space_type;
     auto const* itr = start;
 
-    extract_positions<char const*, boxes_type> callback(itr, boxes);
+    extract_positions<base_iterator_type, boxes_type> callback(itr, boxes);
     mapnik::json::grammar::keys_map keys;
     std::size_t bracket_counter = 0;
     auto feature_collection_impl = x3::with<mapnik::json::grammar::bracket_tag>(std::ref(bracket_counter))
@@ -297,7 +295,7 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
             return std::make_pair(false, extent);
         }
     }
-    catch (x3::expectation_failure<char const*> const& ex)
+    catch (x3::expectation_failure<base_iterator_type> const& ex)
     {
         std::clog << ex.what() << std::endl;
         std::clog << "Expected: " << ex.which();
@@ -318,25 +316,6 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
         {
             if (!extent.valid()) extent = item.first;
             else extent.expand_to_include(item.first);
-
-            if (validate_features)
-            {
-                std::clog << "FIXME" << std::endl;
-                return std::make_pair(false, extent);
-#if 0
-                base_iterator_type feat_itr = start + item.second.first;
-                base_iterator_type feat_end = feat_itr + item.second.second;
-                feature_validate_callback<float> callback(item.first);
-                bool result = boost::spirit::::phrase_parse(feat_itr, feat_end, (fc_grammar)
-                                                              (boost::phoenix::ref(ctx), boost::phoenix::ref(start_id), boost::phoenix::ref(callback)),
-                                                              space);
-                if (!result || feat_itr != feat_end)
-                {
-                    if (verbose) std::clog << std::string(start + item.second.first, feat_end ) << std::endl;
-                    return std::make_pair(false, extent);
-                }
-#endif
-            }
         }
     }
     return std::make_pair(true, extent);

From 2b6f23890bb25e803eddb9c4d8e266e95edcece8 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 14 Nov 2016 12:13:26 +0100
Subject: [PATCH 044/328] remove redundant `mapnik::util::recursive_wrapper`

---
 include/mapnik/json/generic_json.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/mapnik/json/generic_json.hpp b/include/mapnik/json/generic_json.hpp
index 4b812700d..9a70237bc 100644
--- a/include/mapnik/json/generic_json.hpp
+++ b/include/mapnik/json/generic_json.hpp
@@ -53,8 +53,8 @@ using json_value_base = mapnik::util::variant<value_null,
                                               value_integer,
                                               value_double,
                                               std::string,
-                                              mapnik::util::recursive_wrapper<json_array>,
-                                              mapnik::util::recursive_wrapper<json_object> >;
+                                              json_array,
+                                              json_object>;
 struct json_value : json_value_base
 {
 #if __cpp_inheriting_constructors >= 200802

From 92d35d1e40244a44e2097bc036fcc0705c38e51b Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 14 Nov 2016 12:18:36 +0100
Subject: [PATCH 045/328] fix json_value name clashing + add skeleton feature
 validation method

---
 include/mapnik/json/geojson_grammar_x3.hpp    | 28 ++++----
 .../mapnik/json/geojson_grammar_x3_def.hpp    | 28 ++++----
 .../mapnik-index/process_geojson_file_x3.cpp  | 65 ++++++++++++-------
 3 files changed, 71 insertions(+), 50 deletions(-)

diff --git a/include/mapnik/json/geojson_grammar_x3.hpp b/include/mapnik/json/geojson_grammar_x3.hpp
index 557db176f..36fe6ea42 100644
--- a/include/mapnik/json/geojson_grammar_x3.hpp
+++ b/include/mapnik/json/geojson_grammar_x3.hpp
@@ -38,40 +38,40 @@
 namespace mapnik { namespace json {
 
 namespace x3 = boost::spirit::x3;
-struct json_value;
-using json_array = std::vector<json_value>;
-using json_object_element = std::pair<int, json_value>;
-using json_object = std::vector<json_object_element>;
-using json_value_base = mapnik::util::variant<value_null,
+struct geojson_value;
+using geojson_array = std::vector<geojson_value>;
+using geojson_object_element = std::pair<int, geojson_value>;
+using geojson_object = std::vector<geojson_object_element>;
+using geojson_value_base = mapnik::util::variant<value_null,
                                               value_bool,
                                               value_integer,
                                               value_double,
                                               std::string,
                                               mapnik::geometry::geometry_types,
                                               positions,
-                                              json_array,
-                                              json_object>;
-struct json_value : json_value_base
+                                              geojson_array,
+                                              geojson_object>;
+struct geojson_value : geojson_value_base
 {
 #if __cpp_inheriting_constructors >= 200802
 
-    using json_value_base::json_value_base;
+    using geojson_value_base::geojson_value_base;
 
 #else
 
-    json_value() = default;
+    geojson_value() = default;
 
     template <typename T>
-    json_value(T && val)
-        : json_value_base(std::forward<T>(val)) {}
+    geojson_value(T && val)
+        : geojson_value_base(std::forward<T>(val)) {}
 
 #endif
 };
 
 namespace grammar {
 
-using geojson_grammar_type = x3::rule<class geojson_tag, json_value>;
-using key_value_type = x3::rule<class key_value_tag, json_object_element>;
+using geojson_grammar_type = x3::rule<class geojson_tag, geojson_value>;
+using key_value_type = x3::rule<class key_value_tag, geojson_object_element>;
 BOOST_SPIRIT_DECLARE(geojson_grammar_type);
 BOOST_SPIRIT_DECLARE(key_value_type);
 }
diff --git a/include/mapnik/json/geojson_grammar_x3_def.hpp b/include/mapnik/json/geojson_grammar_x3_def.hpp
index f299ab0d6..5b784d47e 100644
--- a/include/mapnik/json/geojson_grammar_x3_def.hpp
+++ b/include/mapnik/json/geojson_grammar_x3_def.hpp
@@ -91,24 +91,24 @@ struct geometry_type_ : x3::symbols<mapnik::geometry::geometry_types>
 geojson_grammar_type const value("JSON Value");
 key_value_type const key_value("JSON key/value");
 // rules
-x3::rule<class json_object_tag, json_object> object("JSON Object");
-x3::rule<class json_array_tag, json_array> array("JSON Array");
-x3::rule<class json_number_tag, json_value> number("JSON Number");
-//x3::rule<class key_value_tag, json_object_element> key_value("JSON key/value");
+x3::rule<class json_object_tag, geojson_object> object("JSON Object");
+x3::rule<class json_array_tag, geojson_array> array("JSON Array");
+x3::rule<class json_number_tag, geojson_value> number("JSON Number");
+//x3::rule<class key_value_tag, geojson_object_element> key_value("JSON key/value");
 // GeoJSON
-x3::rule<class geojson_coordinates_tag, json_object_element> coordinates("GeoJSON Coordinates");
-x3::rule<class geojson_geometry_type_tag, json_object_element> geometry_type("GeoJSON Geometry Type");
-x3::rule<class geojson_key_value_type_tag, json_object_element> geojson_key_value("GeoJSON Key/Value Type");
-auto const json_double = x3::real_parser<value_double, x3::strict_real_policies<value_double>>();
-auto const json_integer = x3::int_parser<value_integer, 10, 1, -1>();
+x3::rule<class geojson_coordinates_tag, geojson_object_element> coordinates("GeoJSON Coordinates");
+x3::rule<class geojson_geometry_type_tag, geojson_object_element> geometry_type("GeoJSON Geometry Type");
+x3::rule<class geojson_key_value_type_tag, geojson_object_element> geojson_key_value("GeoJSON Key/Value Type");
+auto const geojson_double = x3::real_parser<value_double, x3::strict_real_policies<value_double>>();
+auto const geojson_integer = x3::int_parser<value_integer, 10, 1, -1>();
 
 // import unicode string rule
-namespace { auto const& json_string = mapnik::json::unicode_string_grammar(); }
+namespace { auto const& geojson_string = mapnik::json::unicode_string_grammar(); }
 // import positions rule
 namespace { auto const& positions_rule = mapnik::json::positions_grammar(); }
 
 // GeoJSON types
-auto const value_def =  object | array | json_string | number
+auto const value_def =  object | array | geojson_string | number
     ;
 
 auto const coordinates_def = string("\"coordinates\"")[assign_key] > lit(':') > (positions_rule[assign_value] | value[assign_value])
@@ -117,7 +117,7 @@ auto const coordinates_def = string("\"coordinates\"")[assign_key] > lit(':') >
 auto const geometry_type_def = string("\"type\"")[assign_key] > lit(':') > (geometry_type_sym[assign_value] | value[assign_value])
     ;
 
-auto const key_value_def = json_string[assign_key] > lit(':') > value[assign_value]
+auto const key_value_def = geojson_string[assign_key] > lit(':') > value[assign_value]
     ;
 
 auto const geojson_key_value_def =
@@ -138,8 +138,8 @@ auto const array_def = lit('[')
     > lit(']')
     ;
 
-auto const number_def = json_double[assign]
-    | json_integer[assign]
+auto const number_def = geojson_double[assign]
+    | geojson_integer[assign]
     | lit("true") [make_true]
     | lit ("false") [make_false]
     | lit("null")[make_null]
diff --git a/utils/mapnik-index/process_geojson_file_x3.cpp b/utils/mapnik-index/process_geojson_file_x3.cpp
index a9ac4a129..d6283cf3d 100644
--- a/utils/mapnik-index/process_geojson_file_x3.cpp
+++ b/utils/mapnik-index/process_geojson_file_x3.cpp
@@ -41,28 +41,21 @@
 
 namespace {
 
-template <typename T>
-struct feature_validate_callback
+template <typename Keys>
+bool validate_geojson_feature(mapnik::json::geojson_value const& value, Keys const& keys)
 {
-    feature_validate_callback(mapnik::box2d<T> const& box)
-        : box_(box) {}
-
-    void operator() (mapnik::feature_ptr const& f) const
+    if (!value.is<mapnik::json::geojson_object>())
     {
-        if (box_ != box_)
-        {
-            throw std::runtime_error("Bounding boxes mismatch validation feature");
-        }
+        std::clog << "Expecting an GeoJSON object" << std::endl;
+        return false;
     }
-    mapnik::box2d<T> const& box_;
+    mapnik::json::geojson_object const& feature = mapnik::util::get<mapnik::json::geojson_object>(value);
+    return true;
 };
 
 using box_type = mapnik::box2d<float>;
 using boxes_type = std::vector<std::pair<box_type, std::pair<std::size_t, std::size_t>>>;
 using base_iterator_type = char const*;
-//const mapnik::json::extract_bounding_box_grammar<base_iterator_type, boxes_type> geojson_datasource_static_bbox_grammar;
-//const mapnik::transcoder tr("utf8");
-//const mapnik::json::feature_grammar_callback<base_iterator_type, mapnik::feature_impl, feature_validate_callback<float>> fc_grammar(tr);
 }
 
 namespace mapnik { namespace json {
@@ -182,14 +175,14 @@ auto const bounding_box = x3::rule<struct bounding_box_rule_tag, std::tuple<boos
                                    |
                                    coordinates_rule[assign_bbox]
                                    |
-                                   omit[json_string]
+                                   omit[geojson_string]
                                    |
                                    omit[char_]))][assign_range];
 
 
 auto const feature = bounding_box[on_feature_callback];
 
-auto const key_value_ = omit[json_string] > lit(':') > omit[geojson_value] ;
+auto const key_value_ = omit[geojson_string] > lit(':') > omit[geojson_value] ;
 
 auto const features = lit("\"features\"")
     > lit(':') > lit('[') > -(omit[feature] % lit(',')) > lit(']');
@@ -205,13 +198,13 @@ auto const feature_collection = x3::rule<struct feature_collection_tag> {}
 namespace {
 struct collect_features
 {
-    collect_features(std::vector<mapnik::json::json_value> & values)
+    collect_features(std::vector<mapnik::json::geojson_value> & values)
         : values_(values) {}
-    void operator() (mapnik::json::json_value && val) const
+    void operator() (mapnik::json::geojson_value && val) const
     {
         values_.push_back(std::move(val));
     }
-    std::vector<mapnik::json::json_value> & values_;
+    std::vector<mapnik::json::geojson_value> & values_;
 };
 
 template <typename Iterator, typename Boxes>
@@ -230,7 +223,6 @@ struct extract_positions
         auto size = std::distance(r.begin(), r.end());
         boxes_.emplace_back(std::make_pair(bbox,std::make_pair(offset, size)));
         //boxes_.emplace_back(std::make_tuple(bbox,offset, size));
-        //std::clog << offset << ":" << size << " " << bbox << std::endl;
     }
     Iterator start_;
     Boxes & boxes_;
@@ -308,14 +300,43 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
         return std::make_pair(false, extent);
     }
 
-    mapnik::context_ptr ctx = std::make_shared<mapnik::context_type>();
-    //std::size_t start_id = 1;
+    auto feature_grammar = x3::with<mapnik::json::keys_tag>(std::ref(keys))
+        [ mapnik::json::grammar::geojson_value ];
     for (auto const& item : boxes)
     {
         if (item.first.valid())
         {
             if (!extent.valid()) extent = item.first;
             else extent.expand_to_include(item.first);
+
+            if (validate_features)
+            {
+                base_iterator_type feat_itr = start + item.second.first;
+                base_iterator_type feat_end = feat_itr + item.second.second;
+                mapnik::json::geojson_value feature_value;
+                try
+                {
+                    bool result = x3::phrase_parse(feat_itr, feat_end, feature_grammar, space_type(), feature_value);
+                    if (!result || feat_itr != feat_end)
+                    {
+                        if (verbose) std::clog << std::string(start + item.second.first, feat_end ) << std::endl;
+                        return std::make_pair(false, extent);
+                    }
+                }
+                catch (x3::expectation_failure<std::string::const_iterator> const& ex)
+                {
+                    if (verbose) std::clog << ex.what() << std::endl;
+                    return std::make_pair(false, extent);
+                }
+                catch (...)
+                {
+                    return std::make_pair(false, extent);
+                }
+                if (!validate_geojson_feature(feature_value, keys))
+                {
+                    return std::make_pair(false, extent);
+                }
+            }
         }
     }
     return std::make_pair(true, extent);

From 0e9f06d2212c113aa0b61423e83c9dc42cf1ddb0 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 14 Nov 2016 12:58:13 +0100
Subject: [PATCH 046/328] more comprehensive validation implementation

---
 .../mapnik-index/process_geojson_file_x3.cpp  | 176 +++++++++++++++++-
 1 file changed, 171 insertions(+), 5 deletions(-)

diff --git a/utils/mapnik-index/process_geojson_file_x3.cpp b/utils/mapnik-index/process_geojson_file_x3.cpp
index d6283cf3d..89e2a6156 100644
--- a/utils/mapnik-index/process_geojson_file_x3.cpp
+++ b/utils/mapnik-index/process_geojson_file_x3.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -41,15 +41,181 @@
 
 namespace {
 
+enum well_known_names
+{
+    type = 0,
+    geometry = 1,
+    coordinates = 2,
+    properties = 3
+};
+
+constexpr int feature_properties[] = {
+    well_known_names::type,
+    well_known_names::geometry,
+    well_known_names::properties}; // sorted
+
+constexpr int geometry_properties[] = {
+    well_known_names::type,
+    well_known_names::coordinates}; // sorted
+
 template <typename Keys>
-bool validate_geojson_feature(mapnik::json::geojson_value const& value, Keys const& keys)
+std::string join(Keys const& keys)
+{
+    std::string result;
+    bool first = true;
+    for (auto const& key : keys)
+    {
+        if (!first) result += ",";
+        result += "\"" + std::to_string(key) + "\"";
+        first = false;
+    }
+    return result;
+}
+
+template <typename Iterator, typename Keys>
+bool has_keys(Iterator first1, Iterator last1, Keys const& keys)
+{
+    auto first2 = std::begin(keys);
+    auto last2 = std::end(keys);
+    for (; first2 != last2; ++first1)
+    {
+        if (first1 == last1 || *first2 < std::get<0>(*first1))
+            return false;
+        if (!(std::get<0>(*first1) < *first2))
+            ++first2;
+    }
+    return true;
+}
+
+template <typename Keys>
+bool validate_geojson_feature(mapnik::json::geojson_value & value, Keys const& keys, bool verbose)
 {
     if (!value.is<mapnik::json::geojson_object>())
     {
-        std::clog << "Expecting an GeoJSON object" << std::endl;
+        if (verbose) std::clog << "Expecting an GeoJSON object" << std::endl;
         return false;
     }
-    mapnik::json::geojson_object const& feature = mapnik::util::get<mapnik::json::geojson_object>(value);
+    mapnik::json::geojson_object & feature = mapnik::util::get<mapnik::json::geojson_object>(value);
+    std::sort(feature.begin(), feature.end(), [](auto const& e0, auto const& e1)
+              {
+                  return std::get<0>(e0) < std::get<0>(e1);
+              });
+
+    if (!has_keys(feature.begin(), feature.end(), feature_properties))
+    {
+        if (verbose) std::clog << "Expecting one of " << join(feature_properties) << std::endl;
+        return false;
+    }
+
+    for (auto & elem : feature)
+    {
+        auto const key = std::get<0>(elem);
+        if (key == well_known_names::geometry)
+        {
+            auto & geom_value = std::get<1>(elem);
+            if (!geom_value.is<mapnik::json::geojson_object>())
+            {
+                if (verbose) std::clog << "\"geometry\": xxx <-- expecting an JSON object here" << std::endl;
+                return false;
+            }
+            auto & geometry = mapnik::util::get<mapnik::json::geojson_object>(geom_value);
+            // sort by property name
+            std::sort(geometry.begin(), geometry.end(), [](auto const& e0, auto const& e1)
+                      {
+                          return std::get<0>(e0) < std::get<0>(e1);
+                      });
+            if (!has_keys(geometry.begin(), geometry.end(), geometry_properties))
+            {
+                if (verbose) std::clog << "Expecting one of " << join(geometry_properties) << std::endl;
+                return false;
+            }
+
+            mapnik::geometry::geometry_types geom_type;
+            mapnik::json::positions const* coordinates = nullptr;
+            for (auto & elem2 : geometry)
+            {
+                auto const key2 = std::get<0>(elem2);
+                if (key2 == well_known_names::type)
+                {
+                    auto const& geom_type_value = std::get<1>(elem2);
+                    if (!geom_type_value.is<mapnik::geometry::geometry_types>())
+                    {
+                        if (verbose) std::clog << "\"type\": xxx <-- expecting an GeoJSON geometry type here" << std::endl;
+                        return false;
+                    }
+                    geom_type = mapnik::util::get<mapnik::geometry::geometry_types>(geom_type_value);
+                    if (geom_type == mapnik::geometry::geometry_types::GeometryCollection)
+                    {
+                        if (verbose) std::clog << "GeometryCollections are not allowed" << std::endl;;
+                        return false;
+                    }
+                }
+                else if (key2 == well_known_names::coordinates)
+                {
+                    auto const& coordinates_value = std::get<1>(elem2);
+                    if (!coordinates_value.is<mapnik::json::positions>())
+                    {
+                        if (verbose) std::clog << "\"coordinates\": xxx <-- expecting an GeoJSON positions here" << std::endl;
+                        return false;
+                    }
+                    coordinates = &mapnik::util::get<mapnik::json::positions>(coordinates_value);
+                }
+            }
+            if (geom_type == mapnik::geometry::geometry_types::Point)
+            {
+                // expecting single position
+                if (!coordinates->is<mapnik::json::point>())
+                {
+                    if (verbose) std::clog << "Expecting single position in Point" << std::endl;
+                    return false;
+                }
+            }
+            else if (geom_type == mapnik::geometry::geometry_types::LineString)
+            {
+                // expecting
+                if (!coordinates->is<mapnik::json::ring>())
+                {
+                    if (verbose) std::clog << "Expecting sequence of positions (ring) in LineString" << std::endl;
+                    return false;
+                }
+                else
+                {
+                    auto const& ring = mapnik::util::get<mapnik::json::ring>(*coordinates);
+                    if (ring.size() < 2)
+                    {
+                        if (verbose) std::clog << "Expecting at least two coordinates in LineString" << std::endl;
+                        return false;
+                    }
+                }
+            }
+            else if (geom_type == mapnik::geometry::geometry_types::Polygon)
+            {
+                // expecting
+                if (!coordinates->is<mapnik::json::rings>())
+                {
+                    if (verbose) std::clog << "Expecting an array of rings in Polygon" << std::endl;
+                    return false;
+                }
+                else
+                {
+                    auto const& rings = mapnik::util::get<mapnik::json::rings>(*coordinates);
+                    if (rings.size() < 1)
+                    {
+                        if (verbose) std::clog << "Expecting at least one ring in Polygon" << std::endl;
+                        return false;
+                    }
+                    for (auto const& ring : rings)
+                    {
+                        if (ring.size() < 4)
+                        {
+                            if (verbose) std::clog << "Expecting at least four coordinates in Polygon ring" << std::endl;
+                            return false;
+                        }
+                    }
+                }
+            }
+        }
+    }
     return true;
 };
 
@@ -332,7 +498,7 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
                 {
                     return std::make_pair(false, extent);
                 }
-                if (!validate_geojson_feature(feature_value, keys))
+                if (!validate_geojson_feature(feature_value, keys, verbose))
                 {
                     return std::make_pair(false, extent);
                 }

From 6b4638a9554dfbd495de9fc5d17f82da426c55de Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 14 Nov 2016 15:57:34 +0100
Subject: [PATCH 047/328] add `-x3` option to `mapnik-index` to test new json
 parser

---
 test/unit/datasource/ds_test_util.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/datasource/ds_test_util.hpp b/test/unit/datasource/ds_test_util.hpp
index 2a0d2ac90..c90fd55d2 100644
--- a/test/unit/datasource/ds_test_util.hpp
+++ b/test/unit/datasource/ds_test_util.hpp
@@ -192,7 +192,7 @@ inline int create_disk_index(std::string const& filename, bool silent = true)
     {
         cmd += std::string("DYLD_LIBRARY_PATH=") + std::getenv("DYLD_LIBRARY_PATH") + " ";
     }
-    cmd += "mapnik-index " + filename;
+    cmd += "mapnik-index -x3 " + filename;
     if (silent)
     {
 #ifndef _WINDOWS

From 657dd7d73ae88c8c8262a3a9ff5ba2b6013169c3 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Mon, 14 Nov 2016 15:04:07 -0800
Subject: [PATCH 048/328] suppress boost warnings

---
 include/mapnik/enumeration.hpp              | 6 ++++++
 include/mapnik/json/json_grammar_config.hpp | 4 ++++
 test/unit/serialization/parse_hex.hpp       | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/include/mapnik/enumeration.hpp b/include/mapnik/enumeration.hpp
index 1b6fc21b6..ded9dc058 100644
--- a/include/mapnik/enumeration.hpp
+++ b/include/mapnik/enumeration.hpp
@@ -189,6 +189,8 @@ public:
         for (unsigned i = 0; i < THE_MAX; ++i)
         {
 #pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunknown-pragmas" // clang+gcc
+#pragma GCC diagnostic ignored "-Wpragmas" // gcc
 #pragma GCC diagnostic ignored "-Wundefined-var-template"
             if (str_copy == our_strings_[i])
 #pragma GCC diagnostic pop
@@ -202,6 +204,8 @@ public:
             }
         }
 #pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunknown-pragmas" // clang+gcc
+#pragma GCC diagnostic ignored "-Wpragmas" // gcc
 #pragma GCC diagnostic ignored "-Wundefined-var-template"
         throw illegal_enum_value(std::string("Illegal enumeration value '") +
                                  str + "' for enum " + our_name_);
@@ -212,6 +216,8 @@ public:
     std::string as_string() const
     {
 #pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunknown-pragmas" // clang+gcc
+#pragma GCC diagnostic ignored "-Wpragmas" // gcc
 #pragma GCC diagnostic ignored "-Wundefined-var-template"
         return our_strings_[value_];
 #pragma GCC diagnostic pop
diff --git a/include/mapnik/json/json_grammar_config.hpp b/include/mapnik/json/json_grammar_config.hpp
index f8e5c07c4..564ed796f 100644
--- a/include/mapnik/json/json_grammar_config.hpp
+++ b/include/mapnik/json/json_grammar_config.hpp
@@ -23,7 +23,11 @@
 #ifndef MAPNIK_JSON_GRAMMAR_CONFIG_HPP
 #define MAPNIK_JSON_GRAMMAR_CONFIG_HPP
 
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/home/x3.hpp>
+#pragma GCC diagnostic pop
+
 #include <unordered_map>
 
 namespace mapnik { namespace json {
diff --git a/test/unit/serialization/parse_hex.hpp b/test/unit/serialization/parse_hex.hpp
index 48c70a5d4..53f48fdbe 100644
--- a/test/unit/serialization/parse_hex.hpp
+++ b/test/unit/serialization/parse_hex.hpp
@@ -23,8 +23,11 @@
 #ifndef MAPNIK_PARSE_HEX_HPP
 #define MAPNIK_PARSE_HEX_HPP
 
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/qi_char_.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik { namespace util {
 

From 4449f81e036e2c7212e5d8f3aebbd71f42a953d3 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Mon, 14 Nov 2016 15:23:29 -0800
Subject: [PATCH 049/328] restore to_wkt on geometry<std::int64_t>

---
 include/mapnik/util/geometry_to_wkt.hpp |  2 ++
 src/wkt/geometry_to_wkt.cpp             |  5 ++---
 test/unit/serialization/wkb_test.cpp    | 21 ++++++++++++++++++++-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/include/mapnik/util/geometry_to_wkt.hpp b/include/mapnik/util/geometry_to_wkt.hpp
index 2c1c1829d..9b92a8868 100644
--- a/include/mapnik/util/geometry_to_wkt.hpp
+++ b/include/mapnik/util/geometry_to_wkt.hpp
@@ -32,6 +32,8 @@ namespace mapnik { namespace util {
 
 bool to_wkt(std::string & wkt,  mapnik::geometry::geometry<double> const& geom);
 
+bool to_wkt(std::string & wkt,  mapnik::geometry::geometry<std::int64_t> const& geom);
+
 }}
 
 
diff --git a/src/wkt/geometry_to_wkt.cpp b/src/wkt/geometry_to_wkt.cpp
index 64d652434..3460dfec4 100644
--- a/src/wkt/geometry_to_wkt.cpp
+++ b/src/wkt/geometry_to_wkt.cpp
@@ -36,13 +36,12 @@ bool to_wkt(std::string & wkt,  mapnik::geometry::geometry<double> const& geom)
     return boost::spirit::karma::generate(sink, generator, geom);
 }
 
-/*
-inline bool to_wkt(std::string & wkt,  mapnik::geometry::geometry<std::int64_t> const& geom)
+bool to_wkt(std::string & wkt,  mapnik::geometry::geometry<std::int64_t> const& geom)
 {
     using sink_type = std::back_insert_iterator<std::string>;
     static const mapnik::wkt::wkt_generator_grammar<sink_type, mapnik::geometry::geometry<std::int64_t>> generator;
     sink_type sink(wkt);
     return boost::spirit::karma::generate(sink, generator, geom);
 }
-*/
+
 }}
diff --git a/test/unit/serialization/wkb_test.cpp b/test/unit/serialization/wkb_test.cpp
index 7e25bf2a2..97c292486 100644
--- a/test/unit/serialization/wkb_test.cpp
+++ b/test/unit/serialization/wkb_test.cpp
@@ -100,7 +100,7 @@ TEST_CASE("Well-known-geometries")
             REQUIRE(mapnik::util::parse_hex(columns[2], twkb));
             mapnik::geometry::geometry<double> geom_0 = mapnik::geometry_utils::from_wkb(wkb.data(), wkb.size(), mapnik::wkbAuto);
             mapnik::geometry::geometry<double> geom_1 = mapnik::geometry_utils::from_twkb(twkb.data(), twkb.size());
-            // compare WKTs
+            // compare WKTs as doubles
             std::string wkt0, wkt1;
             REQUIRE(mapnik::util::to_wkt(wkt0, geom_0));
             REQUIRE(mapnik::util::to_wkt(wkt1, geom_1));
@@ -112,6 +112,25 @@ TEST_CASE("Well-known-geometries")
                 REQUIRE(spatially_equal(geom_0, geom_1));
 #endif
             }
+
+            // compare WKTS as ints
+            // note: mapnik::util::to_wkt<std::int64_t> used in mapnik-vt
+            std::string wkt2, wkt3;
+            mapnik::geometry::line_string<std::int64_t> geom_2;
+            geom_2.emplace_back(0,0);
+            geom_2.emplace_back(1,1);
+            geom_2.emplace_back(2,2);
+            mapnik::geometry::line_string<std::int64_t> geom_3;
+            geom_3.emplace_back(0,0);
+            geom_3.emplace_back(1,1);
+            geom_3.emplace_back(2,2);
+            REQUIRE(mapnik::util::to_wkt(wkt0, geom_2));
+            REQUIRE(mapnik::util::to_wkt(wkt1, geom_3));
+            if (!mapnik::geometry::is_empty(geom_2) && !mapnik::geometry::is_empty(geom_3))
+            {
+                REQUIRE(wkt2 == wkt3);
+                // compare spatially (NOTE: GeometryCollection comparison also enforces strict order)
+            }
         }
     }
 }

From 5a6d16d4fe5c47eed6b9a844a43bafc1c0d88679 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Mon, 14 Nov 2016 15:31:18 -0800
Subject: [PATCH 050/328] default scale_factor for filter_visitor (unbreaks
 node-mapnik compile)

---
 include/mapnik/image_filter.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/mapnik/image_filter.hpp b/include/mapnik/image_filter.hpp
index 0532b6a5b..4aa1e8c7d 100644
--- a/include/mapnik/image_filter.hpp
+++ b/include/mapnik/image_filter.hpp
@@ -916,7 +916,7 @@ void apply_filter(Src & src, invert const& /*op*/, double /*scale_factor*/)
 template <typename Src>
 struct filter_visitor
 {
-    filter_visitor(Src & src, double scale_factor)
+    filter_visitor(Src & src, double scale_factor=1.0)
     : src_(src),
       scale_factor_(scale_factor) {}
 

From 8adc190117c1f002434a45934c79271a4a8b3976 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Mon, 14 Nov 2016 15:47:20 -0800
Subject: [PATCH 051/328] new publish vars

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bc4d5462f..f98cb1f65 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,8 @@ env:
    - CCACHE_COMPRESS=1
    - HEAVY_JOBS="2"
    - PREFIX=/tmp/mapnik
-   - secure: "N3a5nzzsgpuu45k8qWdYsHNxrSnqeAGLTOYpfYoAH7B94vuf7pa7XV1tQjXbxrnx2D6ryTdtUtyRKwy7zXbwXxGt4DpczWEo8f6DUd6+obAp3kdnXABg2Sj4oA7KMs0F0CmoADy0jdUZD5YyOJHu64LCIIgzEQ9q49PFMNbU3IE="
-   - secure: "iQYPNpMtejcgYeUkWZGIWz1msIco5qydJrhZTSCQOYahAQerdT7q5WZEpEo3G6IWOGgO1eo7GFuY8DvqQjw1+jC9b9mhkRNdo3LhGTKS9Gsbl5Q27k0rjlaFZmmQHrfPlQJwhfAIp+KLugHtQw5bCoLh+95E3j0F0DayF1tuJ3s="
+   - secure: "D5CLP5lbyFru788iZO8RqDenY/YsHPREvr34zCEi93xMqOTxPmME/zyuEZSyjP5ZLyf8g/fxOuPYSDbOQ1QLwNDBWxB0JomWOahyimHKrMCrMcGHCjl//2W2mE+p9VwF5VLGgfy7CskGkS49Mye37FDK0ejwuq6MDI45DsH4Fkk="
+   - secure: "ZPHyAVL3ID5g3KEmwcnzG9z2tAQwSx526Qd3Y6tsZ3Yj+aSagVBiZQjZGKWgNX74lymtmYKnb2Md46apWLeImt6tjB3MWTu7WwWoZRnqUligz/8Nmg4Lgo7EOCkQcjN/gpA1i+cM5b+ZKDTZYOaHO6/+DAaunQzA7/p99hw/XYg="
    - secure: "F6ivqDNMBQQnrDGA9+7IX+GDswuIqQQd7YPJdQqa2Ked9jddAQDeJClb05ig3JlwfOlYLGZOd43ZX0pKuMtI2Gbkwz211agGP9S3YunwlRg8iWtJlO5kYFUdKCmJNhjg4icfkGELCgwXn+zuEWFSLpkPcjqAFKFlQrIJeAJJgKM="
 addons:
   postgresql: "9.4"

From 5ef77d07b904f7f2d6d3995d522bf295884d1260 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 15 Nov 2016 09:32:27 +0100
Subject: [PATCH 052/328] update deps/mapbox/variant to the lastest HEAD

---
 deps/mapbox/variant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index a5a79a594..84a426a31 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit a5a79a594f39d705a7ef969f54a0743516f0bc6d
+Subproject commit 84a426a31ad3b63c4b8f8d189841e19af48cda40

From ae30675e9894386d18dbeb968df9a119ed2b9b9c Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 15 Nov 2016 10:13:36 +0100
Subject: [PATCH 053/328] move json well_known_names

---
 include/mapnik/json/json_grammar_config.hpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/mapnik/json/json_grammar_config.hpp b/include/mapnik/json/json_grammar_config.hpp
index 564ed796f..e875dec76 100644
--- a/include/mapnik/json/json_grammar_config.hpp
+++ b/include/mapnik/json/json_grammar_config.hpp
@@ -32,6 +32,14 @@
 
 namespace mapnik { namespace json {
 
+enum well_known_names
+{
+    type = 0,
+    geometry = 1,
+    coordinates = 2,
+    properties = 3
+};
+
 struct keys_tag;
 
 namespace grammar {

From c860f9e465f3dbece051c224caef84492785f08f Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 15 Nov 2016 10:14:10 +0100
Subject: [PATCH 054/328] add well_known_names to string mappings

---
 .../mapnik-index/process_geojson_file_x3.cpp  | 46 +++++++++++--------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/utils/mapnik-index/process_geojson_file_x3.cpp b/utils/mapnik-index/process_geojson_file_x3.cpp
index 89e2a6156..73b7775df 100644
--- a/utils/mapnik-index/process_geojson_file_x3.cpp
+++ b/utils/mapnik-index/process_geojson_file_x3.cpp
@@ -39,24 +39,32 @@
 #include <mapnik/json/unicode_string_grammar_x3_def.hpp>
 #include <mapnik/json/positions_grammar_x3_def.hpp>
 
+namespace mapnik { namespace json {
+
+constexpr char const* wkn_to_string(well_known_names val)
+{
+    switch(val)
+    {
+    case type: return "type";
+    case geometry: return "geometry";
+    case coordinates: return "coordinates";
+    case properties: return "properties";
+    default: return "unknown";
+    }
+}
+
+}}
+
 namespace {
 
-enum well_known_names
-{
-    type = 0,
-    geometry = 1,
-    coordinates = 2,
-    properties = 3
-};
+constexpr mapnik::json::well_known_names feature_properties[] = {
+    mapnik::json::well_known_names::type,
+    mapnik::json::well_known_names::geometry,
+    mapnik::json::well_known_names::properties}; // sorted
 
-constexpr int feature_properties[] = {
-    well_known_names::type,
-    well_known_names::geometry,
-    well_known_names::properties}; // sorted
-
-constexpr int geometry_properties[] = {
-    well_known_names::type,
-    well_known_names::coordinates}; // sorted
+constexpr mapnik::json::well_known_names geometry_properties[] = {
+    mapnik::json::well_known_names::type,
+    mapnik::json::well_known_names::coordinates}; // sorted
 
 template <typename Keys>
 std::string join(Keys const& keys)
@@ -66,7 +74,7 @@ std::string join(Keys const& keys)
     for (auto const& key : keys)
     {
         if (!first) result += ",";
-        result += "\"" + std::to_string(key) + "\"";
+        result += "\"" + std::string(mapnik::json::wkn_to_string(key)) + "\"";
         first = false;
     }
     return result;
@@ -110,7 +118,7 @@ bool validate_geojson_feature(mapnik::json::geojson_value & value, Keys const& k
     for (auto & elem : feature)
     {
         auto const key = std::get<0>(elem);
-        if (key == well_known_names::geometry)
+        if (key == mapnik::json::well_known_names::geometry)
         {
             auto & geom_value = std::get<1>(elem);
             if (!geom_value.is<mapnik::json::geojson_object>())
@@ -135,7 +143,7 @@ bool validate_geojson_feature(mapnik::json::geojson_value & value, Keys const& k
             for (auto & elem2 : geometry)
             {
                 auto const key2 = std::get<0>(elem2);
-                if (key2 == well_known_names::type)
+                if (key2 == mapnik::json::well_known_names::type)
                 {
                     auto const& geom_type_value = std::get<1>(elem2);
                     if (!geom_type_value.is<mapnik::geometry::geometry_types>())
@@ -150,7 +158,7 @@ bool validate_geojson_feature(mapnik::json::geojson_value & value, Keys const& k
                         return false;
                     }
                 }
-                else if (key2 == well_known_names::coordinates)
+                else if (key2 == mapnik::json::well_known_names::coordinates)
                 {
                     auto const& coordinates_value = std::get<1>(elem2);
                     if (!coordinates_value.is<mapnik::json::positions>())

From 1e238be7ee16d2a20af902c35fb1896e552bb9bf Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 15 Nov 2016 10:15:10 +0100
Subject: [PATCH 055/328] move wkn_to_string to json_grammar_config.hpp

---
 include/mapnik/json/json_grammar_config.hpp    | 12 ++++++++++++
 utils/mapnik-index/process_geojson_file_x3.cpp | 16 ----------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/include/mapnik/json/json_grammar_config.hpp b/include/mapnik/json/json_grammar_config.hpp
index e875dec76..acd0bd7d9 100644
--- a/include/mapnik/json/json_grammar_config.hpp
+++ b/include/mapnik/json/json_grammar_config.hpp
@@ -40,6 +40,18 @@ enum well_known_names
     properties = 3
 };
 
+constexpr char const* wkn_to_string(well_known_names val)
+{
+    switch(val)
+    {
+    case type: return "type";
+    case geometry: return "geometry";
+    case coordinates: return "coordinates";
+    case properties: return "properties";
+    default: return "unknown";
+    }
+}
+
 struct keys_tag;
 
 namespace grammar {
diff --git a/utils/mapnik-index/process_geojson_file_x3.cpp b/utils/mapnik-index/process_geojson_file_x3.cpp
index 73b7775df..0e2d50cbd 100644
--- a/utils/mapnik-index/process_geojson_file_x3.cpp
+++ b/utils/mapnik-index/process_geojson_file_x3.cpp
@@ -39,22 +39,6 @@
 #include <mapnik/json/unicode_string_grammar_x3_def.hpp>
 #include <mapnik/json/positions_grammar_x3_def.hpp>
 
-namespace mapnik { namespace json {
-
-constexpr char const* wkn_to_string(well_known_names val)
-{
-    switch(val)
-    {
-    case type: return "type";
-    case geometry: return "geometry";
-    case coordinates: return "coordinates";
-    case properties: return "properties";
-    default: return "unknown";
-    }
-}
-
-}}
-
 namespace {
 
 constexpr mapnik::json::well_known_names feature_properties[] = {

From d6bedd235c5be4b1e7614099a4a7d617f36ffd6e Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 15 Nov 2016 11:16:58 +0100
Subject: [PATCH 056/328] parse well-known-names as un-quoted strings

---
 include/mapnik/json/geojson_grammar_x3_def.hpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/mapnik/json/geojson_grammar_x3_def.hpp b/include/mapnik/json/geojson_grammar_x3_def.hpp
index 5b784d47e..bb1ba1bab 100644
--- a/include/mapnik/json/geojson_grammar_x3_def.hpp
+++ b/include/mapnik/json/geojson_grammar_x3_def.hpp
@@ -67,7 +67,7 @@ auto assign_value = [](auto const& ctx)
 
 using x3::lit;
 using x3::string;
-using x3::omit;
+using x3::lexeme;
 
 struct geometry_type_ : x3::symbols<mapnik::geometry::geometry_types>
 {
@@ -111,10 +111,12 @@ namespace { auto const& positions_rule = mapnik::json::positions_grammar(); }
 auto const value_def =  object | array | geojson_string | number
     ;
 
-auto const coordinates_def = string("\"coordinates\"")[assign_key] > lit(':') > (positions_rule[assign_value] | value[assign_value])
+auto const coordinates_def = lexeme[lit('"') >> (string("coordinates") > lit('"'))][assign_key]
+    > lit(':') > (positions_rule[assign_value] | value[assign_value])
     ;
 
-auto const geometry_type_def = string("\"type\"")[assign_key] > lit(':') > (geometry_type_sym[assign_value] | value[assign_value])
+auto const geometry_type_def = lexeme[lit('"') >> (string("type") > lit('"'))][assign_key]
+    > lit(':') > (geometry_type_sym[assign_value] | value[assign_value])
     ;
 
 auto const key_value_def = geojson_string[assign_key] > lit(':') > value[assign_value]

From 1b74544b0879ee7663fa9a6aade5d1c7498a9d6e Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 15 Nov 2016 11:18:44 +0100
Subject: [PATCH 057/328] start well-known-names enum from 1 + pre-initialise
 keys_map with well-known-names

---
 include/mapnik/json/json_grammar_config.hpp    | 8 ++++----
 utils/mapnik-index/process_geojson_file_x3.cpp | 9 ++++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/include/mapnik/json/json_grammar_config.hpp b/include/mapnik/json/json_grammar_config.hpp
index acd0bd7d9..ffa8be913 100644
--- a/include/mapnik/json/json_grammar_config.hpp
+++ b/include/mapnik/json/json_grammar_config.hpp
@@ -34,10 +34,10 @@ namespace mapnik { namespace json {
 
 enum well_known_names
 {
-    type = 0,
-    geometry = 1,
-    coordinates = 2,
-    properties = 3
+    type = 1,
+    geometry,
+    coordinates,
+    properties
 };
 
 constexpr char const* wkn_to_string(well_known_names val)
diff --git a/utils/mapnik-index/process_geojson_file_x3.cpp b/utils/mapnik-index/process_geojson_file_x3.cpp
index 0e2d50cbd..9f87d95ae 100644
--- a/utils/mapnik-index/process_geojson_file_x3.cpp
+++ b/utils/mapnik-index/process_geojson_file_x3.cpp
@@ -428,7 +428,14 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
     auto const* itr = start;
 
     extract_positions<base_iterator_type, boxes_type> callback(itr, boxes);
-    mapnik::json::grammar::keys_map keys;
+    mapnik::json::grammar::keys_map keys =
+        {
+            {"type", mapnik::json::well_known_names::type},
+            {"geometry", mapnik::json::well_known_names::geometry},
+            {"coordinates", mapnik::json::well_known_names::coordinates},
+            {"properties", mapnik::json::well_known_names::properties}
+        };
+
     std::size_t bracket_counter = 0;
     auto feature_collection_impl = x3::with<mapnik::json::grammar::bracket_tag>(std::ref(bracket_counter))
         [x3::with<mapnik::json::keys_tag>(std::ref(keys))

From c2d7ecbef7540a67ddcdc4b6ebc13e4210e928d9 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 15 Nov 2016 17:23:27 +0100
Subject: [PATCH 058/328] move keys_map initilizer with well-known-names into
 separate inline method

---
 include/mapnik/json/json_grammar_config.hpp   | 20 ++++++++++++++++---
 .../mapnik-index/process_geojson_file_x3.cpp  |  9 +--------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/include/mapnik/json/json_grammar_config.hpp b/include/mapnik/json/json_grammar_config.hpp
index ffa8be913..b0fe23e4f 100644
--- a/include/mapnik/json/json_grammar_config.hpp
+++ b/include/mapnik/json/json_grammar_config.hpp
@@ -37,7 +37,8 @@ enum well_known_names
     type = 1,
     geometry,
     coordinates,
-    properties
+    properties,
+    id
 };
 
 constexpr char const* wkn_to_string(well_known_names val)
@@ -48,16 +49,29 @@ constexpr char const* wkn_to_string(well_known_names val)
     case geometry: return "geometry";
     case coordinates: return "coordinates";
     case properties: return "properties";
+    case id: return "id";
     default: return "unknown";
     }
 }
 
 struct keys_tag;
 
-namespace grammar {
-
 using keys_map = std::unordered_map<std::string, int>;
 
+inline keys_map get_keys()
+{
+    keys_map keys =  {
+        {"type", well_known_names::type},
+        {"geometry", well_known_names::geometry},
+        {"coordinates", well_known_names::coordinates},
+        {"properties", well_known_names::properties},
+        {"id", well_known_names::id}
+    };
+    return keys;
+}
+
+namespace grammar {
+
 namespace x3 = boost::spirit::x3;
 using space_type = x3::standard::space_type;
 using iterator_type = std::string::const_iterator;
diff --git a/utils/mapnik-index/process_geojson_file_x3.cpp b/utils/mapnik-index/process_geojson_file_x3.cpp
index 9f87d95ae..b20f07d54 100644
--- a/utils/mapnik-index/process_geojson_file_x3.cpp
+++ b/utils/mapnik-index/process_geojson_file_x3.cpp
@@ -428,14 +428,7 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
     auto const* itr = start;
 
     extract_positions<base_iterator_type, boxes_type> callback(itr, boxes);
-    mapnik::json::grammar::keys_map keys =
-        {
-            {"type", mapnik::json::well_known_names::type},
-            {"geometry", mapnik::json::well_known_names::geometry},
-            {"coordinates", mapnik::json::well_known_names::coordinates},
-            {"properties", mapnik::json::well_known_names::properties}
-        };
-
+    auto keys = mapnik::json::get_keys();
     std::size_t bracket_counter = 0;
     auto feature_collection_impl = x3::with<mapnik::json::grammar::bracket_tag>(std::ref(bracket_counter))
         [x3::with<mapnik::json::keys_tag>(std::ref(keys))

From 69b79b303fdaac0380c21871748ad93089f05755 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 16 Nov 2016 16:03:25 +0100
Subject: [PATCH 059/328] make create_geometry a method

---
 include/mapnik/json/create_geometry.hpp | 54 ++++++++++++-------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/include/mapnik/json/create_geometry.hpp b/include/mapnik/json/create_geometry.hpp
index a04f377fb..780a1d4cc 100644
--- a/include/mapnik/json/create_geometry.hpp
+++ b/include/mapnik/json/create_geometry.hpp
@@ -29,6 +29,7 @@
 
 namespace mapnik { namespace json {
 
+namespace {
 // geometries
 template <typename Geometry>
 struct create_point
@@ -205,38 +206,35 @@ struct create_multipolygon
 
     Geometry & geom_;
 };
+} // anonymous ns
 
-struct create_geometry_impl
+template <typename Geometry>
+void create_geometry (Geometry & geom, int type, mapnik::json::positions const& coords)
 {
-    using result_type = void;
-    template <typename Geometry>
-    void operator() (Geometry & geom, int type, mapnik::json::positions const& coords) const
+    switch (type)
     {
-        switch (type)
-        {
-        case 1 ://Point
-            util::apply_visitor(create_point<Geometry>(geom), coords);
-            break;
-        case 2 ://LineString
-           util::apply_visitor(create_linestring<Geometry>(geom), coords);
-           break;
-        case 3 ://Polygon
-            util::apply_visitor(create_polygon<Geometry>(geom), coords);
-            break;
-        case 4 ://MultiPoint
-            util::apply_visitor(create_multipoint<Geometry>(geom), coords);
-            break;
-        case 5 ://MultiLineString
-            util::apply_visitor(create_multilinestring<Geometry>(geom), coords);
-            break;
-        case 6 ://MultiPolygon
-            util::apply_visitor(create_multipolygon<Geometry>(geom), coords);
-            break;
-        default:
-            break;
-        }
+    case 1 ://Point
+        util::apply_visitor(create_point<Geometry>(geom), coords);
+        break;
+    case 2 ://LineString
+        util::apply_visitor(create_linestring<Geometry>(geom), coords);
+        break;
+    case 3 ://Polygon
+        util::apply_visitor(create_polygon<Geometry>(geom), coords);
+        break;
+    case 4 ://MultiPoint
+        util::apply_visitor(create_multipoint<Geometry>(geom), coords);
+        break;
+    case 5 ://MultiLineString
+        util::apply_visitor(create_multilinestring<Geometry>(geom), coords);
+        break;
+    case 6 ://MultiPolygon
+        util::apply_visitor(create_multipolygon<Geometry>(geom), coords);
+        break;
+    default:
+        break;
     }
-};
+}
 
 }}
 

From 4588c232743a127e4db6b8c4cdf65ab12720e60a Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 16 Nov 2016 16:04:54 +0100
Subject: [PATCH 060/328] use `boost:bimap` to store key/name mapping for
 inverse searching caps

---
 include/mapnik/json/json_grammar_config.hpp | 34 ++++++++++++---------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/include/mapnik/json/json_grammar_config.hpp b/include/mapnik/json/json_grammar_config.hpp
index b0fe23e4f..e1199e705 100644
--- a/include/mapnik/json/json_grammar_config.hpp
+++ b/include/mapnik/json/json_grammar_config.hpp
@@ -26,47 +26,53 @@
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/home/x3.hpp>
+#include <boost/bimap.hpp>
+#include <boost/bimap/set_of.hpp>
+#include <boost/bimap/unordered_set_of.hpp>
+#include <boost/assign/list_of.hpp>
 #pragma GCC diagnostic pop
 
-#include <unordered_map>
-
 namespace mapnik { namespace json {
 
 enum well_known_names
 {
-    type = 1,
+    id = 1,
+    type,
+    features,
     geometry,
     coordinates,
-    properties,
-    id
+    properties
 };
 
 constexpr char const* wkn_to_string(well_known_names val)
 {
     switch(val)
     {
+    case id: return "id";
     case type: return "type";
+    case features: return "features";
     case geometry: return "geometry";
     case coordinates: return "coordinates";
     case properties: return "properties";
-    case id: return "id";
     default: return "unknown";
     }
 }
 
 struct keys_tag;
 
-using keys_map = std::unordered_map<std::string, int>;
+using keys_map = boost::bimap<boost::bimaps::unordered_set_of<std::string>,
+                              boost::bimaps::set_of<int>>;
 
 inline keys_map get_keys()
 {
-    keys_map keys =  {
-        {"type", well_known_names::type},
-        {"geometry", well_known_names::geometry},
-        {"coordinates", well_known_names::coordinates},
-        {"properties", well_known_names::properties},
-        {"id", well_known_names::id}
-    };
+    keys_map keys = boost::assign::list_of<keys_map::relation>
+        ("type", well_known_names::type)
+        ("features", well_known_names::features)
+        ("geometry", well_known_names::geometry)
+        ("coordinates", well_known_names::coordinates)
+        ("properties", well_known_names::properties)
+        ("id", well_known_names::id)
+        ;
     return keys;
 }
 

From fec5715a699410b705dc2853f98d0d64f13e08fd Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 16 Nov 2016 16:05:40 +0100
Subject: [PATCH 061/328] update to use boost::bimap

---
 include/mapnik/json/geojson_grammar_x3_def.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/mapnik/json/geojson_grammar_x3_def.hpp b/include/mapnik/json/geojson_grammar_x3_def.hpp
index bb1ba1bab..d4e5707ee 100644
--- a/include/mapnik/json/geojson_grammar_x3_def.hpp
+++ b/include/mapnik/json/geojson_grammar_x3_def.hpp
@@ -56,8 +56,8 @@ auto assign_key = [](auto const& ctx)
 {
     std::string const& name = _attr(ctx);
     keys_map & keys = x3::get<keys_tag>(ctx);
-    auto result = keys.insert(std::make_pair(name, keys.size()));
-    std::get<0>(_val(ctx)) = result.first->second;
+    auto result = keys.insert(keys_map::value_type(name, keys.size() + 1));
+    std::get<0>(_val(ctx)) = result.first->right;
 };
 
 auto assign_value = [](auto const& ctx)

From 190023a0858925f2eaa0f38ea86973b5df96ab87 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 17 Nov 2016 10:31:55 +0100
Subject: [PATCH 062/328] remove unused include (#include
 <mapnik/json/value_converters.hpp>)

---
 include/mapnik/json/attribute_value_visitor.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/mapnik/json/attribute_value_visitor.hpp b/include/mapnik/json/attribute_value_visitor.hpp
index 206530cae..3e5e74219 100644
--- a/include/mapnik/json/attribute_value_visitor.hpp
+++ b/include/mapnik/json/attribute_value_visitor.hpp
@@ -27,7 +27,6 @@
 #include <mapnik/value.hpp>
 #include <mapnik/unicode.hpp>
 #include <mapnik/json/stringifier.hpp>
-#include <mapnik/json/value_converters.hpp>
 
 namespace mapnik { namespace json {
 

From ca96d3e137b49ce613dcbe61d6a3eafc9cf5d82a Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 17 Nov 2016 10:33:05 +0100
Subject: [PATCH 063/328] fix duplicate feature to geojson code

---
 include/mapnik/util/feature_to_geojson.hpp    | 21 +++++++------------
 .../json/mapnik_feature_to_geojson.cpp        | 13 ++++--------
 2 files changed, 12 insertions(+), 22 deletions(-)
 rename include/mapnik/json/feature_generator.hpp => src/json/mapnik_feature_to_geojson.cpp (81%)

diff --git a/include/mapnik/util/feature_to_geojson.hpp b/include/mapnik/util/feature_to_geojson.hpp
index ad3c0a7d4..b6e5797c4 100644
--- a/include/mapnik/util/feature_to_geojson.hpp
+++ b/include/mapnik/util/feature_to_geojson.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,23 +20,18 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_FEATURE_TO_GEOJSON_HPP
-#define MAPNIK_FEATURE_TO_GEOJSON_HPP
+#ifndef MAPNIK_UTIL_FEATURE_TO_GEOJSON_HPP
+#define MAPNIK_UTIL_FEATURE_TO_GEOJSON_HPP
 
 // mapnik
-
-#include <mapnik/json/feature_generator_grammar.hpp>
+#include <mapnik/feature.hpp>
+// stl
+#include <string>
 
 namespace mapnik { namespace util {
 
-inline bool to_geojson(std::string & json, mapnik::feature_impl const& feat)
-{
-    using sink_type = std::back_insert_iterator<std::string>;
-    static const mapnik::json::feature_generator_grammar<sink_type, mapnik::feature_impl> grammar;
-    sink_type sink(json);
-    return boost::spirit::karma::generate(sink, grammar, feat);
-}
+bool to_geojson(std::string & json, mapnik::feature_impl const& feat);
 
 }}
 
-#endif // MAPNIK_FEATURE_TO_GEOJSON_HPP
+#endif // MAPNIK_UTIL_FEATURE_TO_GEOJSON_HPP
diff --git a/include/mapnik/json/feature_generator.hpp b/src/json/mapnik_feature_to_geojson.cpp
similarity index 81%
rename from include/mapnik/json/feature_generator.hpp
rename to src/json/mapnik_feature_to_geojson.cpp
index f24df4ed8..3532fea97 100644
--- a/include/mapnik/json/feature_generator.hpp
+++ b/src/json/mapnik_feature_to_geojson.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,19 +20,16 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_JSON_FEATURE_GENERATOR_HPP
-#define MAPNIK_JSON_FEATURE_GENERATOR_HPP
-
 // mapnik
-#include <mapnik/feature.hpp>
+#include <mapnik/util/feature_to_geojson.hpp>
 #include <mapnik/json/feature_generator_grammar.hpp>
 
 // boost
 #include <boost/spirit/include/karma.hpp>
 
-namespace mapnik { namespace json {
+namespace mapnik { namespace util {
 
-inline bool to_geojson(std::string & json, mapnik::feature_impl const& feature)
+bool to_geojson(std::string & json, mapnik::feature_impl const& feature)
 {
     using sink_type = std::back_insert_iterator<std::string>;
     static const mapnik::json::feature_generator_grammar<sink_type, mapnik::feature_impl> grammar;
@@ -41,5 +38,3 @@ inline bool to_geojson(std::string & json, mapnik::feature_impl const& feature)
 }
 
 }}
-
-#endif // MAPNIK_JSON_FEATURE_GENERATOR_HPP

From 21a121df182d4f5d0b0b57083539a180fc1d2736 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 17 Nov 2016 13:13:07 +0100
Subject: [PATCH 064/328] avoid name clashing

---
 include/mapnik/value/error.hpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/mapnik/value/error.hpp b/include/mapnik/value/error.hpp
index 171c65f7d..58df3fafa 100644
--- a/include/mapnik/value/error.hpp
+++ b/include/mapnik/value/error.hpp
@@ -28,19 +28,19 @@
 #include <exception>
 #include <string>
 
-namespace mapnik { namespace value {
+namespace mapnik {
 
-class error : public std::exception
+class value_error : public std::exception
 {
 public:
-    error() :
+    value_error() :
         what_() {}
 
-    error( std::string const& what ) :
+    value_error( std::string const& what ) :
         what_( what )
     {}
 
-    virtual ~error() throw() {}
+    virtual ~value_error() throw() {}
 
     virtual const char * what() const throw()
     {
@@ -56,6 +56,6 @@ protected:
     mutable std::string what_;
 };
 
-}}
+}
 
 #endif // MAPNIK_VALUE_ERROR_HPP

From 493b662f162f2476d517464582225ff94ada0542 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 17 Nov 2016 16:44:09 +0100
Subject: [PATCH 065/328] add `create_feature` helper method (geojson_value ->
 mapnik::feature_impl)

---
 include/mapnik/json/create_feature.hpp | 237 +++++++++++++++++++++++++
 1 file changed, 237 insertions(+)
 create mode 100644 include/mapnik/json/create_feature.hpp

diff --git a/include/mapnik/json/create_feature.hpp b/include/mapnik/json/create_feature.hpp
new file mode 100644
index 000000000..3d6beea65
--- /dev/null
+++ b/include/mapnik/json/create_feature.hpp
@@ -0,0 +1,237 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_JSON_CREATE_FEATURE_HPP
+#define MAPNIK_JSON_CREATE_FEATURE_HPP
+
+#include <mapnik/json/json_grammar_config.hpp>
+#include <mapnik/json/geojson_grammar_x3.hpp>
+#include <mapnik/json/create_geometry.hpp>
+#include <mapnik/util/conversions.hpp>
+
+#include <mapnik/value.hpp>
+#include <mapnik/unicode.hpp>
+#include <mapnik/feature.hpp>
+
+namespace mapnik { namespace json {
+
+struct stringifier
+{
+    std::string operator()(std::string const& val) const
+    {
+        return "\"" + val + "\"";
+    }
+
+    std::string operator()(value_null) const
+    {
+        return "null";
+    }
+
+    std::string operator()(value_bool val) const
+    {
+        return val ? "true" : "false";
+    }
+
+    std::string operator()(value_integer val) const
+    {
+        std::string str;
+        util::to_string(str, val);
+        return str;
+    }
+
+    std::string operator()(value_double val) const
+    {
+        std::string str;
+        util::to_string(str, val);
+        return str;
+    }
+
+    std::string operator()(mapnik::json::geojson_array const& array) const
+    {
+        std::string str = "[";
+        bool first = true;
+        for (auto const& val : array)
+        {
+            if (first) first = false;
+            else str += ",";
+            str += mapnik::util::apply_visitor(*this, val);
+        }
+        str += "]";
+        return str;
+    }
+
+    std::string operator()(mapnik::json::geojson_object const& object, keys_map const& keys) const
+    {
+        std::string str = "{";
+        bool first = true;
+        for (auto const& kv : object)
+        {
+            auto itr = keys.right.find(std::get<0>(kv));
+            if (itr != keys.right.end())
+            {
+                if (first) first = false;
+                else str += ",";
+                str +=  "\"" + itr->second + "\"";
+                str += ":";
+                str += mapnik::util::apply_visitor(*this, kv.second);
+            }
+        }
+        str += "}";
+        return str;
+    }
+    template <typename T>
+    std::string operator()(T const&) const
+    {
+        return "";
+    }
+};
+
+struct attribute_value_visitor
+{
+public:
+    attribute_value_visitor(mapnik::transcoder const& tr, keys_map const& keys)
+        : tr_(tr),
+          keys_(keys) {}
+
+    mapnik::value operator()(std::string const& val) const
+    {
+        return mapnik::value(tr_.transcode(val.c_str()));
+    }
+
+    mapnik::value operator()(mapnik::json::geojson_array const& array) const
+    {
+        std::string str = stringifier()(array);
+        return mapnik::value(tr_.transcode(str.c_str()));
+    }
+
+    mapnik::value operator()(mapnik::json::geojson_object const& object) const
+    {
+        std::string str = stringifier()(object, keys_);
+        return mapnik::value(tr_.transcode(str.c_str()));
+    }
+
+    mapnik::value operator() (mapnik::value_bool val) const
+    {
+        return mapnik::value(val);
+    }
+
+    mapnik::value operator() (mapnik::value_integer val) const
+    {
+        return mapnik::value(val);
+    }
+
+    mapnik::value operator() (mapnik::value_double val) const
+    {
+        return mapnik::value(val);
+    }
+
+    template <typename T>
+    mapnik::value operator()(T const& val) const
+    {
+        return mapnik::value_null{};
+    }
+
+    mapnik::transcoder const& tr_;
+    mapnik::json::keys_map const& keys_;
+};
+
+void create_feature(feature_impl & feature,
+                    mapnik::json::geojson_value const& value,
+                    mapnik::json::keys_map const& keys,
+                    mapnik::transcoder const& tr)
+{
+
+    if (!value.is<mapnik::json::geojson_object>())
+    {
+        throw std::runtime_error("Expecting an GeoJSON object");
+    }
+    mapnik::json::geojson_object const& feature_value = mapnik::util::get<mapnik::json::geojson_object>(value);
+    for (auto const& elem : feature_value)
+    {
+        auto const key = std::get<0>(elem);
+        if (key == mapnik::json::well_known_names::geometry)
+        {
+            auto const& geom_value = std::get<1>(elem);
+            if (!geom_value.is<mapnik::json::geojson_object>())
+            {
+                throw std::runtime_error("\"geometry\": xxx <-- expecting an JSON object here");
+            }
+            auto const& geometry = mapnik::util::get<mapnik::json::geojson_object>(geom_value);
+            mapnik::geometry::geometry_types geom_type;
+            mapnik::json::positions const* coordinates = nullptr;
+            for (auto & elem2 : geometry)
+            {
+                auto const key2 = std::get<0>(elem2);
+                if (key2 == mapnik::json::well_known_names::type)
+                {
+                    auto const& geom_type_value = std::get<1>(elem2);
+                    if (!geom_type_value.is<mapnik::geometry::geometry_types>())
+                    {
+                        throw std::runtime_error("\"type\": xxx <-- expecting an GeoJSON geometry type here");
+                    }
+                    geom_type = mapnik::util::get<mapnik::geometry::geometry_types>(geom_type_value);
+                    if (geom_type == mapnik::geometry::geometry_types::GeometryCollection)
+                    {
+                        throw std::runtime_error("GeometryCollections are not allowed");
+                    }
+                }
+                else if (key2 == mapnik::json::well_known_names::coordinates)
+                {
+                    auto const& coordinates_value = std::get<1>(elem2);
+                    if (!coordinates_value.is<mapnik::json::positions>())
+                    {
+                        throw std::runtime_error("\"coordinates\": xxx <-- expecting an GeoJSON positions here");
+                    }
+                    coordinates = &mapnik::util::get<mapnik::json::positions>(coordinates_value);
+                }
+            }
+
+            mapnik::geometry::geometry<double> geom;
+            mapnik::json::create_geometry(geom, geom_type, *coordinates);
+            feature.set_geometry(std::move(geom));
+        }
+        else if (key == mapnik::json::well_known_names::properties)
+        {
+            auto const& prop_value = std::get<1>(elem);
+            if (!prop_value.is<mapnik::json::geojson_object>())
+            {
+                throw std::runtime_error("\"properties\": xxx <-- expecting an JSON object here");
+            }
+            auto const& properties = mapnik::util::get<mapnik::json::geojson_object>(prop_value);
+            auto end = keys.right.end();
+            for (auto const& kv : properties)
+            {
+                auto itr = keys.right.find(std::get<0>(kv));
+                if (itr != end)
+                {
+                    feature.put_new(itr->second,
+                                    mapnik::util::apply_visitor(mapnik::json::attribute_value_visitor(tr, keys),
+                                                                std::get<1>(kv)));
+                }
+            }
+        }
+    }
+}
+
+}}
+
+#endif //MAPNIK_JSON_CREATE_FEATURE_HPP

From 22a6652160c91f653242c002944f11ba56c59d54 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 17 Nov 2016 16:45:11 +0100
Subject: [PATCH 066/328] use spirit::x3 based parser for disk-indexed GeoJSON
 access

---
 .../geojson/geojson_index_featureset.cpp      | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/plugins/input/geojson/geojson_index_featureset.cpp b/plugins/input/geojson/geojson_index_featureset.cpp
index 2764c62af..03adfb861 100644
--- a/plugins/input/geojson/geojson_index_featureset.cpp
+++ b/plugins/input/geojson/geojson_index_featureset.cpp
@@ -24,10 +24,14 @@
 #include "geojson_index_featureset.hpp"
 #include <mapnik/feature.hpp>
 #include <mapnik/feature_factory.hpp>
-#include <mapnik/json/feature_grammar.hpp>
 #include <mapnik/util/utf_conv_win.hpp>
 #include <mapnik/util/spatial_index.hpp>
 #include <mapnik/geometry/is_empty.hpp>
+#include <mapnik/json/unicode_string_grammar_x3_def.hpp>
+#include <mapnik/json/positions_grammar_x3_def.hpp>
+#include <mapnik/json/geojson_grammar_x3_def.hpp>
+#include <mapnik/json/json_grammar_config.hpp>
+#include <mapnik/json/create_feature.hpp>
 // stl
 #include <string>
 #include <vector>
@@ -90,14 +94,32 @@ mapnik::feature_ptr geojson_index_featureset::next()
         auto const*  end = start + record.size();
 #endif
         static const mapnik::transcoder tr("utf8");
-        static const mapnik::json::feature_grammar<char const*, mapnik::feature_impl> grammar(tr);
-        using namespace boost::spirit;
-        standard::space_type space;
         mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx_, feature_id_++));
-        if (!qi::phrase_parse(start, end, (grammar)(boost::phoenix::ref(*feature)), space) || start != end)
+        using namespace boost::spirit;
+        using space_type = mapnik::json::grammar::space_type;
+        using mapnik::json::grammar::iterator_type;
+
+        mapnik::json::geojson_value value;
+        auto keys = mapnik::json::get_keys();
+        auto grammar = x3::with<mapnik::json::keys_tag>(std::ref(keys))
+            [ mapnik::json::geojson_grammar() ];
+        try
         {
-            throw std::runtime_error("Failed to parse GeoJSON feature");
+            bool result = x3::phrase_parse(start, end, grammar, space_type(), value);
+            if (!result) return mapnik::feature_ptr();
+            mapnik::json::create_feature(*feature, value, keys, tr);
         }
+        catch (x3::expectation_failure<std::string::const_iterator> const& ex)
+        {
+            std::cerr << ex.what() << std::endl;
+            return mapnik::feature_ptr();
+        }
+        catch (std::runtime_error const& ex)
+        {
+            std::cerr << "Exception caught:" << ex.what() << std::endl;
+            return mapnik::feature_ptr();
+        }
+
         // skip empty geometries
         if (mapnik::geometry::is_empty(feature->get_geometry()))
             continue;

From a3106a6a6e31f499993324513f0f571180c88f16 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 17 Nov 2016 15:27:48 +0000
Subject: [PATCH 067/328] Use 2D box for pgraster bounding box

Using a 3D box causes errors with postgis 2.3 when clipping is
enabled as ST_Clip throws an error clipping a raster to a 3D box.
---
 plugins/input/pgraster/pgraster_datasource.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/input/pgraster/pgraster_datasource.cpp b/plugins/input/pgraster/pgraster_datasource.cpp
index e6eddf758..2c64f3a23 100644
--- a/plugins/input/pgraster/pgraster_datasource.cpp
+++ b/plugins/input/pgraster/pgraster_datasource.cpp
@@ -627,10 +627,10 @@ std::string pgraster_datasource::sql_bbox(box2d<double> const& env) const
         b << "ST_SetSRID(";
     }
 
-    b << "'BOX3D(";
+    b << "'BOX(";
     b << std::setprecision(16);
     b << env.minx() << " " << env.miny() << ",";
-    b << env.maxx() << " " << env.maxy() << ")'::box3d";
+    b << env.maxx() << " " << env.maxy() << ")'::box2d";
 
     if (srid_ > 0)
     {

From d286b75fb514b9dfcae6be1b9127d39da0a23a59 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 17 Nov 2016 17:36:01 +0100
Subject: [PATCH 068/328] make keys member var + cache geojson grammar

---
 .../geojson/geojson_index_featureset.cpp      | 15 +++++---
 .../geojson/geojson_index_featureset.hpp      | 34 +++++++++++++++++++
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/plugins/input/geojson/geojson_index_featureset.cpp b/plugins/input/geojson/geojson_index_featureset.cpp
index 03adfb861..a9a6bc732 100644
--- a/plugins/input/geojson/geojson_index_featureset.cpp
+++ b/plugins/input/geojson/geojson_index_featureset.cpp
@@ -77,6 +77,13 @@ geojson_index_featureset::geojson_index_featureset(std::string const& filename,
 
 geojson_index_featureset::~geojson_index_featureset() {}
 
+namespace {
+using namespace boost::spirit;
+//static const mapnik::json::keys_map keys = mapnik::json::get_keys();
+static const mapnik::json::grammar::geojson_grammar_type geojson_g = mapnik::json::geojson_grammar();
+
+}
+
 mapnik::feature_ptr geojson_index_featureset::next()
 {
     while( itr_ != positions_.end())
@@ -98,16 +105,14 @@ mapnik::feature_ptr geojson_index_featureset::next()
         using namespace boost::spirit;
         using space_type = mapnik::json::grammar::space_type;
         using mapnik::json::grammar::iterator_type;
-
         mapnik::json::geojson_value value;
-        auto keys = mapnik::json::get_keys();
-        auto grammar = x3::with<mapnik::json::keys_tag>(std::ref(keys))
-            [ mapnik::json::geojson_grammar() ];
+        auto const grammar = x3::with<mapnik::json::keys_tag>(std::ref(keys_))
+            [ geojson_g ];
         try
         {
             bool result = x3::phrase_parse(start, end, grammar, space_type(), value);
             if (!result) return mapnik::feature_ptr();
-            mapnik::json::create_feature(*feature, value, keys, tr);
+            mapnik::json::create_feature(*feature, value, keys_, tr);
         }
         catch (x3::expectation_failure<std::string::const_iterator> const& ex)
         {
diff --git a/plugins/input/geojson/geojson_index_featureset.hpp b/plugins/input/geojson/geojson_index_featureset.hpp
index 41e8e84ba..4371636b0 100644
--- a/plugins/input/geojson/geojson_index_featureset.hpp
+++ b/plugins/input/geojson/geojson_index_featureset.hpp
@@ -32,6 +32,10 @@
 #include <mapnik/warning_ignore.hpp>
 #include <boost/interprocess/mapped_region.hpp>
 #include <boost/interprocess/streams/bufferstream.hpp>
+#include <boost/bimap.hpp>
+#include <boost/bimap/set_of.hpp>
+#include <boost/bimap/unordered_set_of.hpp>
+#include <boost/assign/list_of.hpp>
 #pragma GCC diagnostic pop
 #include <mapnik/mapped_memory_cache.hpp>
 #endif
@@ -39,6 +43,35 @@
 #include <deque>
 #include <cstdio>
 
+namespace {
+
+using keys_map = boost::bimap<boost::bimaps::unordered_set_of<std::string>,
+                              boost::bimaps::set_of<int>>;
+
+enum well_known_names
+{
+    id = 1,
+    type,
+    features,
+    geometry,
+    coordinates,
+    properties
+};
+
+inline keys_map get_keys()
+{
+    keys_map keys = boost::assign::list_of<keys_map::relation>
+        ("type", well_known_names::type)
+        ("features", well_known_names::features)
+        ("geometry", well_known_names::geometry)
+        ("coordinates", well_known_names::coordinates)
+        ("properties", well_known_names::properties)
+        ("id", well_known_names::id)
+        ;
+    return keys;
+}
+}
+
 class geojson_index_featureset : public mapnik::Featureset
 {
     using value_type = std::pair<std::size_t, std::size_t>;
@@ -59,6 +92,7 @@ private:
     mapnik::context_ptr ctx_;
     std::vector<value_type> positions_;
     std::vector<value_type>::iterator itr_;
+    keys_map keys_ = get_keys();
 };
 
 #endif // GEOJSON_INDEX_FEATURESE_HPP

From ead152499b277edc2c59c2e7ecfaa5da0eefa37a Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 18 Nov 2016 09:42:47 +0100
Subject: [PATCH 069/328] fix - ensure stringifier called recursively for
 nested json objects

---
 include/mapnik/json/create_feature.hpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/include/mapnik/json/create_feature.hpp b/include/mapnik/json/create_feature.hpp
index 3d6beea65..bada4ab69 100644
--- a/include/mapnik/json/create_feature.hpp
+++ b/include/mapnik/json/create_feature.hpp
@@ -36,6 +36,9 @@ namespace mapnik { namespace json {
 
 struct stringifier
 {
+    stringifier(keys_map const& keys)
+        : keys_(keys) {}
+
     std::string operator()(std::string const& val) const
     {
         return "\"" + val + "\"";
@@ -79,14 +82,14 @@ struct stringifier
         return str;
     }
 
-    std::string operator()(mapnik::json::geojson_object const& object, keys_map const& keys) const
+    std::string operator()(mapnik::json::geojson_object const& object) const
     {
         std::string str = "{";
         bool first = true;
         for (auto const& kv : object)
         {
-            auto itr = keys.right.find(std::get<0>(kv));
-            if (itr != keys.right.end())
+            auto itr = keys_.right.find(std::get<0>(kv));
+            if (itr != keys_.right.end())
             {
                 if (first) first = false;
                 else str += ",";
@@ -103,6 +106,8 @@ struct stringifier
     {
         return "";
     }
+
+    keys_map const& keys_;
 };
 
 struct attribute_value_visitor
@@ -119,13 +124,13 @@ public:
 
     mapnik::value operator()(mapnik::json::geojson_array const& array) const
     {
-        std::string str = stringifier()(array);
+        std::string str = stringifier(keys_)(array);
         return mapnik::value(tr_.transcode(str.c_str()));
     }
 
     mapnik::value operator()(mapnik::json::geojson_object const& object) const
     {
-        std::string str = stringifier()(object, keys_);
+        std::string str = stringifier(keys_)(object);
         return mapnik::value(tr_.transcode(str.c_str()));
     }
 

From f64db40a8a58d4ab34910d40f898d11c436c26b0 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 18 Nov 2016 09:43:53 +0100
Subject: [PATCH 070/328] don't catch exceptions in featureset::next() as
 expected behaviour is to throw

---
 .../geojson/geojson_index_featureset.cpp      | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/plugins/input/geojson/geojson_index_featureset.cpp b/plugins/input/geojson/geojson_index_featureset.cpp
index a9a6bc732..594fc83f5 100644
--- a/plugins/input/geojson/geojson_index_featureset.cpp
+++ b/plugins/input/geojson/geojson_index_featureset.cpp
@@ -108,23 +108,10 @@ mapnik::feature_ptr geojson_index_featureset::next()
         mapnik::json::geojson_value value;
         auto const grammar = x3::with<mapnik::json::keys_tag>(std::ref(keys_))
             [ geojson_g ];
-        try
-        {
-            bool result = x3::phrase_parse(start, end, grammar, space_type(), value);
-            if (!result) return mapnik::feature_ptr();
-            mapnik::json::create_feature(*feature, value, keys_, tr);
-        }
-        catch (x3::expectation_failure<std::string::const_iterator> const& ex)
-        {
-            std::cerr << ex.what() << std::endl;
-            return mapnik::feature_ptr();
-        }
-        catch (std::runtime_error const& ex)
-        {
-            std::cerr << "Exception caught:" << ex.what() << std::endl;
-            return mapnik::feature_ptr();
-        }
 
+        bool result = x3::phrase_parse(start, end, grammar, space_type(), value);
+        if (!result) throw std::runtime_error("Failed to parse GeoJSON feature");
+        mapnik::json::create_feature(*feature, value, keys_, tr);
         // skip empty geometries
         if (mapnik::geometry::is_empty(feature->get_geometry()))
             continue;

From aca229c2bbce5332f2ec90262d9811e3f9cc7f6b Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 18 Nov 2016 15:17:23 +0100
Subject: [PATCH 071/328] implement custom `feature` GeoJSON parser for
 improved performance

---
 .../geojson/geojson_index_featureset.cpp      | 108 +++++++++++++++---
 .../geojson/geojson_index_featureset.hpp      |  34 ------
 2 files changed, 94 insertions(+), 48 deletions(-)

diff --git a/plugins/input/geojson/geojson_index_featureset.cpp b/plugins/input/geojson/geojson_index_featureset.cpp
index 594fc83f5..da23aac3f 100644
--- a/plugins/input/geojson/geojson_index_featureset.cpp
+++ b/plugins/input/geojson/geojson_index_featureset.cpp
@@ -29,14 +29,100 @@
 #include <mapnik/geometry/is_empty.hpp>
 #include <mapnik/json/unicode_string_grammar_x3_def.hpp>
 #include <mapnik/json/positions_grammar_x3_def.hpp>
-#include <mapnik/json/geojson_grammar_x3_def.hpp>
+#include <mapnik/json/generic_json_grammar_x3_def.hpp>
 #include <mapnik/json/json_grammar_config.hpp>
-#include <mapnik/json/create_feature.hpp>
+#include <mapnik/json/create_geometry.hpp>
 // stl
 #include <string>
 #include <vector>
 #include <fstream>
 
+
+namespace mapnik { namespace json { namespace {
+
+namespace x3 = boost::spirit::x3;
+using x3::lit;
+using x3::omit;
+using x3::char_;
+
+struct feature_tag;
+// generic json rule
+auto const& value = generic_json_grammar();
+// import unicode string rule
+auto const& geojson_string = unicode_string_grammar();
+// import positions rule
+auto const& positions_rule = positions_grammar();
+// geometry types symbols
+struct geometry_type_ : x3::symbols<mapnik::geometry::geometry_types>
+{
+    geometry_type_()
+    {
+        add
+            ("\"Point\"", mapnik::geometry::geometry_types::Point)
+            ("\"LineString\"", mapnik::geometry::geometry_types::LineString)
+            ("\"Polygon\"", mapnik::geometry::geometry_types::Polygon)
+            ("\"MultiPoint\"", mapnik::geometry::geometry_types::MultiPoint)
+            ("\"MultiLineString\"", mapnik::geometry::geometry_types::MultiLineString )
+            ("\"MultiPolygon\"",mapnik::geometry::geometry_types::MultiPolygon)
+            ("\"GeometryCollection\"",mapnik::geometry::geometry_types::GeometryCollection)
+            ;
+    }
+} geometry_type_symbols;
+
+auto const assign_geometry_type = [] (auto const& ctx)
+{
+    std::get<0>(_val(ctx)) = _attr(ctx);
+};
+
+auto const assign_geometry = [] (auto const& ctx)
+{
+    mapnik::feature_impl & feature = x3::get<feature_tag>(ctx);
+    mapnik::geometry::geometry<double> geom;
+    auto const type = std::get<0>(_attr(ctx));
+    auto const& coordinates = std::get<1>(_attr(ctx));
+    mapnik::json::create_geometry(geom, type, coordinates);
+    feature.set_geometry(std::move(geom));
+};
+
+auto const assign_positions = [] (auto const& ctx)
+{
+    std::get<1>(_val(ctx)) = std::move(_attr(ctx));
+};
+
+auto const feature_type = lit("\"type\"") > lit(':') > lit("\"Feature\"");
+auto const geometry_type = x3::rule<struct geometry_type_tag, mapnik::geometry::geometry_types> {} =
+    lit("\"type\"") > lit(':') > geometry_type_symbols;
+
+auto const coordinates = x3::rule<struct coordinates_tag, positions> {} =
+    lit("\"coordinates\"") > lit(':') > positions_rule
+    ;
+
+auto const geometry = x3::rule<struct geomerty_tag, std::tuple<mapnik::geometry::geometry_types, positions>> {} =
+    (geometry_type[assign_geometry_type]
+     |
+     coordinates[assign_positions]
+     |
+     (omit[geojson_string] > lit(':') > omit[value])) % lit(',')
+    ;
+
+
+auto const feature_part = x3::rule<struct feature_part_rule_tag> {} =
+    feature_type
+    |
+    (lit("\"geometry\"") > lit(':') > lit('{') > geometry[assign_geometry] > lit('}'))
+    |
+    (lit("\"properties\"") > lit(':') > omit[value])
+    |
+    omit[geojson_string] > lit(':') > omit[value]
+    ;
+
+auto const feature = x3::rule<struct feature_rule_tag> {} =
+    lit('{') > feature_part % lit(',') > lit('}')
+    ;
+
+}}}
+
+
 geojson_index_featureset::geojson_index_featureset(std::string const& filename, mapnik::filter_in_box const& filter)
     :
 #if defined(MAPNIK_MEMORY_MAPPED_FILE)
@@ -77,13 +163,6 @@ geojson_index_featureset::geojson_index_featureset(std::string const& filename,
 
 geojson_index_featureset::~geojson_index_featureset() {}
 
-namespace {
-using namespace boost::spirit;
-//static const mapnik::json::keys_map keys = mapnik::json::get_keys();
-static const mapnik::json::grammar::geojson_grammar_type geojson_g = mapnik::json::geojson_grammar();
-
-}
-
 mapnik::feature_ptr geojson_index_featureset::next()
 {
     while( itr_ != positions_.end())
@@ -105,13 +184,14 @@ mapnik::feature_ptr geojson_index_featureset::next()
         using namespace boost::spirit;
         using space_type = mapnik::json::grammar::space_type;
         using mapnik::json::grammar::iterator_type;
-        mapnik::json::geojson_value value;
-        auto const grammar = x3::with<mapnik::json::keys_tag>(std::ref(keys_))
-            [ geojson_g ];
+        //mapnik::json::geojson_value value;
+        //auto const grammar = x3::with<mapnik::json::keys_tag>(std::ref(keys_))
+        //    [ mapnik::json::geojson_grammar() ];
+        auto grammar = x3::with<mapnik::json::feature_tag>(std::ref(*feature))
+            [ mapnik::json::feature ];
+        bool result = x3::phrase_parse(start, end, grammar, space_type());
 
-        bool result = x3::phrase_parse(start, end, grammar, space_type(), value);
         if (!result) throw std::runtime_error("Failed to parse GeoJSON feature");
-        mapnik::json::create_feature(*feature, value, keys_, tr);
         // skip empty geometries
         if (mapnik::geometry::is_empty(feature->get_geometry()))
             continue;
diff --git a/plugins/input/geojson/geojson_index_featureset.hpp b/plugins/input/geojson/geojson_index_featureset.hpp
index 4371636b0..41e8e84ba 100644
--- a/plugins/input/geojson/geojson_index_featureset.hpp
+++ b/plugins/input/geojson/geojson_index_featureset.hpp
@@ -32,10 +32,6 @@
 #include <mapnik/warning_ignore.hpp>
 #include <boost/interprocess/mapped_region.hpp>
 #include <boost/interprocess/streams/bufferstream.hpp>
-#include <boost/bimap.hpp>
-#include <boost/bimap/set_of.hpp>
-#include <boost/bimap/unordered_set_of.hpp>
-#include <boost/assign/list_of.hpp>
 #pragma GCC diagnostic pop
 #include <mapnik/mapped_memory_cache.hpp>
 #endif
@@ -43,35 +39,6 @@
 #include <deque>
 #include <cstdio>
 
-namespace {
-
-using keys_map = boost::bimap<boost::bimaps::unordered_set_of<std::string>,
-                              boost::bimaps::set_of<int>>;
-
-enum well_known_names
-{
-    id = 1,
-    type,
-    features,
-    geometry,
-    coordinates,
-    properties
-};
-
-inline keys_map get_keys()
-{
-    keys_map keys = boost::assign::list_of<keys_map::relation>
-        ("type", well_known_names::type)
-        ("features", well_known_names::features)
-        ("geometry", well_known_names::geometry)
-        ("coordinates", well_known_names::coordinates)
-        ("properties", well_known_names::properties)
-        ("id", well_known_names::id)
-        ;
-    return keys;
-}
-}
-
 class geojson_index_featureset : public mapnik::Featureset
 {
     using value_type = std::pair<std::size_t, std::size_t>;
@@ -92,7 +59,6 @@ private:
     mapnik::context_ptr ctx_;
     std::vector<value_type> positions_;
     std::vector<value_type>::iterator itr_;
-    keys_map keys_ = get_keys();
 };
 
 #endif // GEOJSON_INDEX_FEATURESE_HPP

From 4e646c13231f7dbaa90ddb6eeb793a4ef8b31da1 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 18 Nov 2016 15:51:39 +0100
Subject: [PATCH 072/328] handle properties

---
 .../geojson/geojson_index_featureset.cpp      | 134 +++++++++++++++++-
 1 file changed, 128 insertions(+), 6 deletions(-)

diff --git a/plugins/input/geojson/geojson_index_featureset.cpp b/plugins/input/geojson/geojson_index_featureset.cpp
index da23aac3f..3fb069425 100644
--- a/plugins/input/geojson/geojson_index_featureset.cpp
+++ b/plugins/input/geojson/geojson_index_featureset.cpp
@@ -26,6 +26,7 @@
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/util/utf_conv_win.hpp>
 #include <mapnik/util/spatial_index.hpp>
+#include <mapnik/util/conversions.hpp>
 #include <mapnik/geometry/is_empty.hpp>
 #include <mapnik/json/unicode_string_grammar_x3_def.hpp>
 #include <mapnik/json/positions_grammar_x3_def.hpp>
@@ -40,11 +41,107 @@
 
 namespace mapnik { namespace json { namespace {
 
+struct stringifier
+{
+    std::string operator()(std::string const& val) const
+    {
+        return "\"" + val + "\"";
+    }
+
+    std::string operator()(value_null) const
+    {
+        return "null";
+    }
+
+    std::string operator()(value_bool val) const
+    {
+        return val ? "true" : "false";
+    }
+
+    std::string operator()(value_integer val) const
+    {
+        std::string str;
+        util::to_string(str, val);
+        return str;
+    }
+
+    std::string operator()(value_double val) const
+    {
+        std::string str;
+        util::to_string(str, val);
+        return str;
+    }
+
+    std::string operator()(std::vector<mapnik::json::json_value> const& array) const
+    {
+        std::string str = "[";
+        bool first = true;
+        for (auto const& val : array)
+        {
+            if (first) first = false;
+            else str += ",";
+            str += mapnik::util::apply_visitor(*this, val);
+        }
+        str += "]";
+        return str;
+    }
+
+    std::string operator()(std::vector<std::pair<std::string, mapnik::json::json_value>> const& object) const
+    {
+        std::string str = "{";
+        bool first = true;
+        for (auto const& kv : object)
+        {
+            if (first) first = false;
+            else str += ",";
+            str +=  "\"" + kv.first + "\"";
+            str += ":";
+            str += mapnik::util::apply_visitor(*this, kv.second);
+        }
+        str += "}";
+        return str;
+    }
+};
+
+struct attribute_value_visitor
+{
+public:
+    attribute_value_visitor(mapnik::transcoder const& tr)
+        : tr_(tr) {}
+
+    mapnik::value operator()(std::string const& val) const
+    {
+        return mapnik::value(tr_.transcode(val.c_str()));
+    }
+
+    mapnik::value operator()(std::vector<mapnik::json::json_value> const& array) const
+    {
+        std::string str = stringifier()(array);
+        return mapnik::value(tr_.transcode(str.c_str()));
+    }
+
+    mapnik::value operator()(std::vector<std::pair<std::string, mapnik::json::json_value> > const& object) const
+    {
+        std::string str = stringifier()(object);
+        return mapnik::value(tr_.transcode(str.c_str()));
+    }
+
+    template <typename T>
+    mapnik::value operator()(T const& val) const
+    {
+        return mapnik::value(val);
+    }
+
+    mapnik::transcoder const& tr_;
+};
+
+
 namespace x3 = boost::spirit::x3;
 using x3::lit;
 using x3::omit;
 using x3::char_;
 
+struct transcoder_tag;
 struct feature_tag;
 // generic json rule
 auto const& value = generic_json_grammar();
@@ -69,6 +166,15 @@ struct geometry_type_ : x3::symbols<mapnik::geometry::geometry_types>
     }
 } geometry_type_symbols;
 
+auto assign_name = [](auto const& ctx)
+{
+    std::get<0>(_val(ctx)) = std::move(_attr(ctx));
+};
+auto assign_value = [](auto const& ctx)
+{
+    std::get<1>(_val(ctx)) = std::move(_attr(ctx));
+};
+
 auto const assign_geometry_type = [] (auto const& ctx)
 {
     std::get<0>(_val(ctx)) = _attr(ctx);
@@ -89,6 +195,15 @@ auto const assign_positions = [] (auto const& ctx)
     std::get<1>(_val(ctx)) = std::move(_attr(ctx));
 };
 
+auto assign_property = [](auto const& ctx)
+{
+    mapnik::feature_impl & feature = x3::get<feature_tag>(ctx);
+    mapnik::transcoder const& tr = x3::get<transcoder_tag>(ctx);
+    feature.put_new(std::get<0>(_attr(ctx)),
+                    mapnik::util::apply_visitor(attribute_value_visitor(tr),
+                                                std::get<1>(_attr(ctx))));
+};
+
 auto const feature_type = lit("\"type\"") > lit(':') > lit("\"Feature\"");
 auto const geometry_type = x3::rule<struct geometry_type_tag, mapnik::geometry::geometry_types> {} =
     lit("\"type\"") > lit(':') > geometry_type_symbols;
@@ -105,13 +220,20 @@ auto const geometry = x3::rule<struct geomerty_tag, std::tuple<mapnik::geometry:
      (omit[geojson_string] > lit(':') > omit[value])) % lit(',')
     ;
 
+auto const property = x3::rule<struct property, std::tuple<std::string, json_value>> {} =
+    geojson_string[assign_name] > lit(':') > value[assign_value]
+    ;
+
+auto const properties = x3::rule<struct properties_tag> {} =
+    property[assign_property] % lit(',')
+    ;
 
 auto const feature_part = x3::rule<struct feature_part_rule_tag> {} =
     feature_type
     |
     (lit("\"geometry\"") > lit(':') > lit('{') > geometry[assign_geometry] > lit('}'))
     |
-    (lit("\"properties\"") > lit(':') > omit[value])
+    (lit("\"properties\"") > lit(':') > lit('{') > properties > lit('}'))
     |
     omit[geojson_string] > lit(':') > omit[value]
     ;
@@ -184,11 +306,11 @@ mapnik::feature_ptr geojson_index_featureset::next()
         using namespace boost::spirit;
         using space_type = mapnik::json::grammar::space_type;
         using mapnik::json::grammar::iterator_type;
-        //mapnik::json::geojson_value value;
-        //auto const grammar = x3::with<mapnik::json::keys_tag>(std::ref(keys_))
-        //    [ mapnik::json::geojson_grammar() ];
-        auto grammar = x3::with<mapnik::json::feature_tag>(std::ref(*feature))
-            [ mapnik::json::feature ];
+
+        auto grammar = x3::with<mapnik::json::transcoder_tag>(std::ref(tr))
+            [x3::with<mapnik::json::feature_tag>(std::ref(*feature))
+             [ mapnik::json::feature ]];
+
         bool result = x3::phrase_parse(start, end, grammar, space_type());
 
         if (!result) throw std::runtime_error("Failed to parse GeoJSON feature");

From e5c08800ebe3793ef1049cea82f54c4f7e722c2d Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 21 Nov 2016 10:48:10 +0100
Subject: [PATCH 073/328] update deps/mapbox/variant

---
 deps/mapbox/variant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index 84a426a31..9a115c5eb 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit 84a426a31ad3b63c4b8f8d189841e19af48cda40
+Subproject commit 9a115c5eb3c09509c70a57b25b283b6e1cbba919

From 7d778350805682f6a0ce1d6e17e83ea866834442 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 21 Nov 2016 10:49:17 +0100
Subject: [PATCH 074/328] update deps/mapbox/variant

---
 deps/mapbox/variant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index 84a426a31..9a115c5eb 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit 84a426a31ad3b63c4b8f8d189841e19af48cda40
+Subproject commit 9a115c5eb3c09509c70a57b25b283b6e1cbba919

From 3d629bf76d36533aa91b7141fe66bc4e9710591d Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 21 Nov 2016 11:15:21 +0100
Subject: [PATCH 075/328] add missing generic_json_grammar_x3

---
 .../mapnik/json/generic_json_grammar_x3.hpp   |  82 +++++++++++
 .../json/generic_json_grammar_x3_def.hpp      | 133 ++++++++++++++++++
 2 files changed, 215 insertions(+)
 create mode 100644 include/mapnik/json/generic_json_grammar_x3.hpp
 create mode 100644 include/mapnik/json/generic_json_grammar_x3_def.hpp

diff --git a/include/mapnik/json/generic_json_grammar_x3.hpp b/include/mapnik/json/generic_json_grammar_x3.hpp
new file mode 100644
index 000000000..4d633cf9e
--- /dev/null
+++ b/include/mapnik/json/generic_json_grammar_x3.hpp
@@ -0,0 +1,82 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2015 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_JSON_GENERIC_JSON_GRAMMAR_X3_HPP
+#define MAPNIK_JSON_GENERIC_JSON_GRAMMAR_X3_HPP
+
+#include <mapnik/value/types.hpp>
+#include <mapnik/util/variant.hpp>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#pragma GCC diagnostic pop
+
+#include <vector>
+
+namespace mapnik { namespace json {
+
+namespace x3 = boost::spirit::x3;
+
+struct json_value;
+
+using json_array = std::vector<json_value>;
+using json_object_element = std::pair<std::string, json_value>;
+using json_object = std::vector<json_object_element>;
+using json_value_base = mapnik::util::variant<value_null,
+                                              value_bool,
+                                              value_integer,
+                                              value_double,
+                                              std::string,
+                                              json_array,
+                                              json_object>;
+struct json_value : json_value_base
+{
+#if __cpp_inheriting_constructors >= 200802
+
+    using json_value_base::json_value_base;
+
+#else
+
+    json_value() = default;
+
+    template <typename T>
+    json_value(T && val)
+        : json_value_base(std::forward<T>(val)) {}
+
+#endif
+};
+
+namespace grammar {
+
+using generic_json_grammar_type = x3::rule<class generic_json_tag, json_value>;
+using generic_json_key_value_type = x3::rule<class json_object_element_tag, json_object_element>;
+BOOST_SPIRIT_DECLARE(generic_json_grammar_type);
+BOOST_SPIRIT_DECLARE(generic_json_key_value_type);
+}
+
+grammar::generic_json_grammar_type const& generic_json_grammar();
+grammar::generic_json_key_value_type const& generic_json_key_value();
+
+}}
+
+#endif // MAPNIK_JSON_GENERIC_JSON_GRAMMAR_X3_HPP
diff --git a/include/mapnik/json/generic_json_grammar_x3_def.hpp b/include/mapnik/json/generic_json_grammar_x3_def.hpp
new file mode 100644
index 000000000..390c2251e
--- /dev/null
+++ b/include/mapnik/json/generic_json_grammar_x3_def.hpp
@@ -0,0 +1,133 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_JSON_GENERIC_JSON_GRAMMAR_X3_DEF_HPP
+#define MAPNIK_JSON_GENERIC_JSON_GRAMMAR_X3_DEF_HPP
+
+#include <boost/fusion/include/std_pair.hpp>
+#include <mapnik/json/generic_json_grammar_x3.hpp>
+#include <mapnik/json/unicode_string_grammar_x3_def.hpp>
+
+namespace mapnik { namespace json { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+
+auto make_null = [] (auto const& ctx)
+{
+    _val(ctx) = mapnik::value_null{};
+};
+
+auto make_true = [] (auto const& ctx)
+{
+    _val(ctx) = true;
+};
+
+auto make_false = [] (auto const& ctx)
+{
+    _val(ctx) = false;
+};
+
+auto assign = [](auto const& ctx)
+{
+    _val(ctx) = _attr(ctx);
+};
+
+auto assign_key = [](auto const& ctx)
+{
+    std::get<0>(_val(ctx)) = _attr(ctx);
+};
+
+auto assign_value = [](auto const& ctx)
+{
+    std::get<1>(_val(ctx)) = _attr(ctx);
+};
+
+
+using x3::lit;
+using x3::string;
+// exported rules
+// start
+generic_json_grammar_type const value("JSON Value");
+generic_json_key_value_type const key_value("JSON Object element");
+// rules
+x3::rule<class json_object_tag, json_object> object("JSON Object");
+x3::rule<class json_array_tag, json_array> array("JSON Array");
+x3::rule<class json_number_tag, json_value> number("JSON Number");
+
+auto const json_double = x3::real_parser<value_double, x3::strict_real_policies<value_double>>();
+auto const json_integer = x3::int_parser<value_integer, 10, 1, -1>();
+
+// import unicode string rule
+namespace { auto const& json_string = mapnik::json::unicode_string_grammar(); }
+ // generic json types
+auto const value_def = object | array | json_string | number
+    ;
+
+auto const key_value_def = json_string[assign_key] > lit(':') > value[assign_value]
+    ;
+
+auto const object_def = lit('{')
+    > -(key_value % lit(','))
+   > lit('}')
+   ;
+
+auto const array_def = lit('[')
+    > -(value % lit(','))
+    > lit(']')
+    ;
+
+auto const number_def = json_double[assign]
+    | json_integer[assign]
+    | lit("true") [make_true]
+    | lit ("false") [make_false]
+    | lit("null")[make_null]
+    ;
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+
+BOOST_SPIRIT_DEFINE(
+    value,
+    object,
+    key_value,
+    array,
+    number
+    );
+
+#pragma GCC diagnostic pop
+
+}}}
+
+namespace mapnik { namespace json {
+
+grammar::generic_json_grammar_type const& generic_json_grammar()
+{
+    return grammar::value;
+}
+grammar::generic_json_key_value_type const& generic_json_key_value()
+{
+    return grammar::key_value;
+}
+
+}}
+
+#endif // MAPNIK_JSON_GENERIC_JSON_GRAMMAR_X3_DEF_HPP

From fe0b0a7f2d50d8cb01d4fd04be1fa92f915365f5 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 21 Nov 2016 12:01:09 +0100
Subject: [PATCH 076/328] update deps/mapbox/variant to the latest HEAD

---
 deps/mapbox/variant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index 9a115c5eb..02bd1ac4c 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit 9a115c5eb3c09509c70a57b25b283b6e1cbba919
+Subproject commit 02bd1ac4c07e6db9fe0f01267853e43b41637b74

From 2a0bc9db6c82b6379835f9792ae00faeb9a8403c Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 21 Nov 2016 16:08:15 +0100
Subject: [PATCH 077/328] GeoJSON - refactor feature/geometry parsing

---
 include/mapnik/json/parse_feature.hpp         |  41 +++
 .../geojson/geojson_index_featureset.cpp      | 223 +--------------
 src/json/parse_feature.cpp                    | 270 ++++++++++++++++++
 3 files changed, 313 insertions(+), 221 deletions(-)
 create mode 100644 include/mapnik/json/parse_feature.hpp
 create mode 100644 src/json/parse_feature.cpp

diff --git a/include/mapnik/json/parse_feature.hpp b/include/mapnik/json/parse_feature.hpp
new file mode 100644
index 000000000..b0d775e78
--- /dev/null
+++ b/include/mapnik/json/parse_feature.hpp
@@ -0,0 +1,41 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+
+#ifndef MAPNIK_JSON_PARSE_FEATURE_HPP
+#define MAPNIK_JSON_PARSE_FEATURE_HPP
+
+#include <mapnik/feature.hpp>
+#include <mapnik/unicode.hpp>
+
+namespace mapnik { namespace json {
+
+template <typename Iterator>
+void parse_feature(Iterator start, Iterator end, feature_impl& feature, mapnik::transcoder const& tr = mapnik::transcoder("utf8"));
+
+template <typename Iterator>
+void parse_geometry(Iterator start, Iterator end, feature_impl& feature);
+
+}}
+
+
+#endif // MAPNIK_JSON_PARSE_FEATURE_HPP
diff --git a/plugins/input/geojson/geojson_index_featureset.cpp b/plugins/input/geojson/geojson_index_featureset.cpp
index 3fb069425..34a211fa6 100644
--- a/plugins/input/geojson/geojson_index_featureset.cpp
+++ b/plugins/input/geojson/geojson_index_featureset.cpp
@@ -28,223 +28,13 @@
 #include <mapnik/util/spatial_index.hpp>
 #include <mapnik/util/conversions.hpp>
 #include <mapnik/geometry/is_empty.hpp>
-#include <mapnik/json/unicode_string_grammar_x3_def.hpp>
-#include <mapnik/json/positions_grammar_x3_def.hpp>
-#include <mapnik/json/generic_json_grammar_x3_def.hpp>
+#include <mapnik/json/parse_feature.hpp>
 #include <mapnik/json/json_grammar_config.hpp>
-#include <mapnik/json/create_geometry.hpp>
 // stl
 #include <string>
 #include <vector>
 #include <fstream>
 
-
-namespace mapnik { namespace json { namespace {
-
-struct stringifier
-{
-    std::string operator()(std::string const& val) const
-    {
-        return "\"" + val + "\"";
-    }
-
-    std::string operator()(value_null) const
-    {
-        return "null";
-    }
-
-    std::string operator()(value_bool val) const
-    {
-        return val ? "true" : "false";
-    }
-
-    std::string operator()(value_integer val) const
-    {
-        std::string str;
-        util::to_string(str, val);
-        return str;
-    }
-
-    std::string operator()(value_double val) const
-    {
-        std::string str;
-        util::to_string(str, val);
-        return str;
-    }
-
-    std::string operator()(std::vector<mapnik::json::json_value> const& array) const
-    {
-        std::string str = "[";
-        bool first = true;
-        for (auto const& val : array)
-        {
-            if (first) first = false;
-            else str += ",";
-            str += mapnik::util::apply_visitor(*this, val);
-        }
-        str += "]";
-        return str;
-    }
-
-    std::string operator()(std::vector<std::pair<std::string, mapnik::json::json_value>> const& object) const
-    {
-        std::string str = "{";
-        bool first = true;
-        for (auto const& kv : object)
-        {
-            if (first) first = false;
-            else str += ",";
-            str +=  "\"" + kv.first + "\"";
-            str += ":";
-            str += mapnik::util::apply_visitor(*this, kv.second);
-        }
-        str += "}";
-        return str;
-    }
-};
-
-struct attribute_value_visitor
-{
-public:
-    attribute_value_visitor(mapnik::transcoder const& tr)
-        : tr_(tr) {}
-
-    mapnik::value operator()(std::string const& val) const
-    {
-        return mapnik::value(tr_.transcode(val.c_str()));
-    }
-
-    mapnik::value operator()(std::vector<mapnik::json::json_value> const& array) const
-    {
-        std::string str = stringifier()(array);
-        return mapnik::value(tr_.transcode(str.c_str()));
-    }
-
-    mapnik::value operator()(std::vector<std::pair<std::string, mapnik::json::json_value> > const& object) const
-    {
-        std::string str = stringifier()(object);
-        return mapnik::value(tr_.transcode(str.c_str()));
-    }
-
-    template <typename T>
-    mapnik::value operator()(T const& val) const
-    {
-        return mapnik::value(val);
-    }
-
-    mapnik::transcoder const& tr_;
-};
-
-
-namespace x3 = boost::spirit::x3;
-using x3::lit;
-using x3::omit;
-using x3::char_;
-
-struct transcoder_tag;
-struct feature_tag;
-// generic json rule
-auto const& value = generic_json_grammar();
-// import unicode string rule
-auto const& geojson_string = unicode_string_grammar();
-// import positions rule
-auto const& positions_rule = positions_grammar();
-// geometry types symbols
-struct geometry_type_ : x3::symbols<mapnik::geometry::geometry_types>
-{
-    geometry_type_()
-    {
-        add
-            ("\"Point\"", mapnik::geometry::geometry_types::Point)
-            ("\"LineString\"", mapnik::geometry::geometry_types::LineString)
-            ("\"Polygon\"", mapnik::geometry::geometry_types::Polygon)
-            ("\"MultiPoint\"", mapnik::geometry::geometry_types::MultiPoint)
-            ("\"MultiLineString\"", mapnik::geometry::geometry_types::MultiLineString )
-            ("\"MultiPolygon\"",mapnik::geometry::geometry_types::MultiPolygon)
-            ("\"GeometryCollection\"",mapnik::geometry::geometry_types::GeometryCollection)
-            ;
-    }
-} geometry_type_symbols;
-
-auto assign_name = [](auto const& ctx)
-{
-    std::get<0>(_val(ctx)) = std::move(_attr(ctx));
-};
-auto assign_value = [](auto const& ctx)
-{
-    std::get<1>(_val(ctx)) = std::move(_attr(ctx));
-};
-
-auto const assign_geometry_type = [] (auto const& ctx)
-{
-    std::get<0>(_val(ctx)) = _attr(ctx);
-};
-
-auto const assign_geometry = [] (auto const& ctx)
-{
-    mapnik::feature_impl & feature = x3::get<feature_tag>(ctx);
-    mapnik::geometry::geometry<double> geom;
-    auto const type = std::get<0>(_attr(ctx));
-    auto const& coordinates = std::get<1>(_attr(ctx));
-    mapnik::json::create_geometry(geom, type, coordinates);
-    feature.set_geometry(std::move(geom));
-};
-
-auto const assign_positions = [] (auto const& ctx)
-{
-    std::get<1>(_val(ctx)) = std::move(_attr(ctx));
-};
-
-auto assign_property = [](auto const& ctx)
-{
-    mapnik::feature_impl & feature = x3::get<feature_tag>(ctx);
-    mapnik::transcoder const& tr = x3::get<transcoder_tag>(ctx);
-    feature.put_new(std::get<0>(_attr(ctx)),
-                    mapnik::util::apply_visitor(attribute_value_visitor(tr),
-                                                std::get<1>(_attr(ctx))));
-};
-
-auto const feature_type = lit("\"type\"") > lit(':') > lit("\"Feature\"");
-auto const geometry_type = x3::rule<struct geometry_type_tag, mapnik::geometry::geometry_types> {} =
-    lit("\"type\"") > lit(':') > geometry_type_symbols;
-
-auto const coordinates = x3::rule<struct coordinates_tag, positions> {} =
-    lit("\"coordinates\"") > lit(':') > positions_rule
-    ;
-
-auto const geometry = x3::rule<struct geomerty_tag, std::tuple<mapnik::geometry::geometry_types, positions>> {} =
-    (geometry_type[assign_geometry_type]
-     |
-     coordinates[assign_positions]
-     |
-     (omit[geojson_string] > lit(':') > omit[value])) % lit(',')
-    ;
-
-auto const property = x3::rule<struct property, std::tuple<std::string, json_value>> {} =
-    geojson_string[assign_name] > lit(':') > value[assign_value]
-    ;
-
-auto const properties = x3::rule<struct properties_tag> {} =
-    property[assign_property] % lit(',')
-    ;
-
-auto const feature_part = x3::rule<struct feature_part_rule_tag> {} =
-    feature_type
-    |
-    (lit("\"geometry\"") > lit(':') > lit('{') > geometry[assign_geometry] > lit('}'))
-    |
-    (lit("\"properties\"") > lit(':') > lit('{') > properties > lit('}'))
-    |
-    omit[geojson_string] > lit(':') > omit[value]
-    ;
-
-auto const feature = x3::rule<struct feature_rule_tag> {} =
-    lit('{') > feature_part % lit(',') > lit('}')
-    ;
-
-}}}
-
-
 geojson_index_featureset::geojson_index_featureset(std::string const& filename, mapnik::filter_in_box const& filter)
     :
 #if defined(MAPNIK_MEMORY_MAPPED_FILE)
@@ -303,17 +93,8 @@ mapnik::feature_ptr geojson_index_featureset::next()
 #endif
         static const mapnik::transcoder tr("utf8");
         mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx_, feature_id_++));
-        using namespace boost::spirit;
-        using space_type = mapnik::json::grammar::space_type;
         using mapnik::json::grammar::iterator_type;
-
-        auto grammar = x3::with<mapnik::json::transcoder_tag>(std::ref(tr))
-            [x3::with<mapnik::json::feature_tag>(std::ref(*feature))
-             [ mapnik::json::feature ]];
-
-        bool result = x3::phrase_parse(start, end, grammar, space_type());
-
-        if (!result) throw std::runtime_error("Failed to parse GeoJSON feature");
+        mapnik::json::parse_feature(start, end, *feature, tr); // throw in failure
         // skip empty geometries
         if (mapnik::geometry::is_empty(feature->get_geometry()))
             continue;
diff --git a/src/json/parse_feature.cpp b/src/json/parse_feature.cpp
new file mode 100644
index 000000000..f4f794885
--- /dev/null
+++ b/src/json/parse_feature.cpp
@@ -0,0 +1,270 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#include <mapnik/json/parse_feature.hpp>
+#include <mapnik/json/generic_json_grammar_x3_def.hpp>
+#include <mapnik/json/unicode_string_grammar_x3_def.hpp>
+#include <mapnik/json/positions_grammar_x3_def.hpp>
+#include <mapnik/json/json_grammar_config.hpp>
+#include <mapnik/json/create_geometry.hpp>
+#include <mapnik/util/conversions.hpp>
+
+#include <mapnik/value.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
+
+namespace mapnik { namespace json { namespace {
+
+struct stringifier
+{
+    std::string operator()(std::string const& val) const
+    {
+        return "\"" + val + "\"";
+    }
+
+    std::string operator()(value_null) const
+    {
+        return "null";
+    }
+
+    std::string operator()(value_bool val) const
+    {
+        return val ? "true" : "false";
+    }
+
+    std::string operator()(value_integer val) const
+    {
+        std::string str;
+        util::to_string(str, val);
+        return str;
+    }
+
+    std::string operator()(value_double val) const
+    {
+        std::string str;
+        util::to_string(str, val);
+        return str;
+    }
+
+    std::string operator()(std::vector<mapnik::json::json_value> const& array) const
+    {
+        std::string str = "[";
+        bool first = true;
+        for (auto const& val : array)
+        {
+            if (first) first = false;
+            else str += ",";
+            str += mapnik::util::apply_visitor(*this, val);
+        }
+        str += "]";
+        return str;
+    }
+
+    std::string operator()(std::vector<std::pair<std::string, mapnik::json::json_value>> const& object) const
+    {
+        std::string str = "{";
+        bool first = true;
+        for (auto const& kv : object)
+        {
+            if (first) first = false;
+            else str += ",";
+            str +=  "\"" + kv.first + "\"";
+            str += ":";
+            str += mapnik::util::apply_visitor(*this, kv.second);
+        }
+        str += "}";
+        return str;
+    }
+};
+
+struct attribute_value_visitor
+{
+public:
+    attribute_value_visitor(mapnik::transcoder const& tr)
+        : tr_(tr) {}
+
+    mapnik::value operator()(std::string const& val) const
+    {
+        return mapnik::value(tr_.transcode(val.c_str()));
+    }
+
+    mapnik::value operator()(std::vector<mapnik::json::json_value> const& array) const
+    {
+        std::string str = stringifier()(array);
+        return mapnik::value(tr_.transcode(str.c_str()));
+    }
+
+    mapnik::value operator()(std::vector<std::pair<std::string, mapnik::json::json_value> > const& object) const
+    {
+        std::string str = stringifier()(object);
+        return mapnik::value(tr_.transcode(str.c_str()));
+    }
+
+    template <typename T>
+    mapnik::value operator()(T const& val) const
+    {
+        return mapnik::value(val);
+    }
+
+    mapnik::transcoder const& tr_;
+};
+
+
+namespace x3 = boost::spirit::x3;
+using x3::lit;
+using x3::omit;
+using x3::char_;
+
+struct transcoder_tag;
+struct feature_tag;
+//
+auto const& value = mapnik::json::generic_json_grammar();
+// import unicode string rule
+auto const& geojson_string = unicode_string_grammar();
+// import positions rule
+auto const& positions_rule = positions_grammar();
+// geometry types symbols
+struct geometry_type_ : x3::symbols<mapnik::geometry::geometry_types>
+{
+    geometry_type_()
+    {
+        add
+            ("\"Point\"", mapnik::geometry::geometry_types::Point)
+            ("\"LineString\"", mapnik::geometry::geometry_types::LineString)
+            ("\"Polygon\"", mapnik::geometry::geometry_types::Polygon)
+            ("\"MultiPoint\"", mapnik::geometry::geometry_types::MultiPoint)
+            ("\"MultiLineString\"", mapnik::geometry::geometry_types::MultiLineString )
+            ("\"MultiPolygon\"",mapnik::geometry::geometry_types::MultiPolygon)
+            ("\"GeometryCollection\"",mapnik::geometry::geometry_types::GeometryCollection)
+            ;
+    }
+} geometry_type_symbols;
+
+auto assign_name = [](auto const& ctx)
+{
+    std::get<0>(_val(ctx)) = std::move(_attr(ctx));
+};
+auto assign_value = [](auto const& ctx)
+{
+    std::get<1>(_val(ctx)) = std::move(_attr(ctx));
+};
+
+auto const assign_geometry_type = [] (auto const& ctx)
+{
+    std::get<0>(_val(ctx)) = _attr(ctx);
+};
+
+auto const assign_geometry = [] (auto const& ctx)
+{
+    mapnik::feature_impl & feature = x3::get<feature_tag>(ctx);
+    mapnik::geometry::geometry<double> geom;
+    auto const type = std::get<0>(_attr(ctx));
+    auto const& coordinates = std::get<1>(_attr(ctx));
+    mapnik::json::create_geometry(geom, type, coordinates);
+    feature.set_geometry(std::move(geom));
+};
+
+auto const assign_positions = [] (auto const& ctx)
+{
+    std::get<1>(_val(ctx)) = std::move(_attr(ctx));
+};
+
+auto assign_property = [](auto const& ctx)
+{
+    mapnik::feature_impl & feature = x3::get<feature_tag>(ctx);
+    mapnik::transcoder const& tr = x3::get<transcoder_tag>(ctx);
+    feature.put_new(std::get<0>(_attr(ctx)),
+                    mapnik::util::apply_visitor(attribute_value_visitor(tr),
+                                                std::get<1>(_attr(ctx))));
+};
+
+
+auto const feature_type = lit("\"type\"") > lit(':') > lit("\"Feature\"");
+auto const geometry_type = x3::rule<struct geometry_type_tag, mapnik::geometry::geometry_types> {} =
+    lit("\"type\"") > lit(':') > geometry_type_symbols;
+
+auto const coordinates = x3::rule<struct coordinates_tag, positions> {} =
+    lit("\"coordinates\"") > lit(':') > positions_rule
+    ;
+
+auto const geometry = x3::rule<struct geomerty_tag, std::tuple<mapnik::geometry::geometry_types, positions>> {} =
+    (geometry_type[assign_geometry_type]
+     |
+     coordinates[assign_positions]
+     |
+     (omit[geojson_string] > lit(':') > omit[value])) % lit(',')
+    ;
+
+auto const property = x3::rule<struct property, std::tuple<std::string, json_value>> {} =
+    geojson_string[assign_name] > lit(':') > value[assign_value]
+    ;
+
+auto const properties = x3::rule<struct properties_tag> {} =
+    property[assign_property] % lit(',')
+    ;
+auto const feature_part = x3::rule<struct feature_part_rule_tag> {} =
+    feature_type
+    |
+    (lit("\"geometry\"") > lit(':') > lit('{') > geometry[assign_geometry] > lit('}'))
+    |
+    (lit("\"properties\"") > lit(':') > lit('{') > properties > lit('}'))
+    |
+    omit[geojson_string] > lit(':') > omit[value]
+    ;
+
+auto const feature = x3::rule<struct feature_rule_tag> {} =
+    lit('{') > feature_part % lit(',') > lit('}')
+    ;
+
+auto const geometry_rule = x3::rule<struct geometry_rule_tag> {} = lit('{') > geometry[assign_geometry] > lit('}');
+
+}
+
+template <typename Iterator>
+void parse_feature(Iterator start, Iterator end, feature_impl& feature, mapnik::transcoder const& tr)
+{
+    using space_type = mapnik::json::grammar::space_type;
+    auto grammar = x3::with<mapnik::json::transcoder_tag>(std::ref(tr))
+        [x3::with<mapnik::json::feature_tag>(std::ref(feature))
+         [ mapnik::json::feature ]];
+    if (!x3::phrase_parse(start, end, grammar, space_type()))
+    {
+        throw std::runtime_error("Can't parser GeoJSON Feature");
+    }
+}
+
+template <typename Iterator>
+void parse_geometry(Iterator start, Iterator end, feature_impl& feature)
+{
+    using space_type = mapnik::json::grammar::space_type;
+    auto grammar = x3::with<mapnik::json::feature_tag>(std::ref(feature))
+        [ mapnik::json::geometry_rule ];
+    if (!x3::phrase_parse(start, end, grammar, space_type()))
+    {
+        throw std::runtime_error("Can't parser GeoJSON Geometry");
+    }
+}
+
+using iterator_type = char const* ;//mapnik::json::grammar::iterator_type;
+template void parse_feature<iterator_type>(iterator_type,iterator_type, feature_impl& feature, mapnik::transcoder const& tr);
+template void parse_geometry<iterator_type>(iterator_type,iterator_type, feature_impl& feature);
+
+}}

From 5834de9b1f2dc9e2c32bd1b4075ab16e9781cc24 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 21 Nov 2016 16:35:27 +0100
Subject: [PATCH 078/328] use `parse_feature` method in geojson.input

---
 plugins/input/geojson/geojson_datasource.cpp        | 12 +++++++-----
 plugins/input/geojson/geojson_index_featureset.cpp  |  2 +-
 .../geojson/geojson_memory_index_featureset.cpp     | 13 +++++--------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/plugins/input/geojson/geojson_datasource.cpp b/plugins/input/geojson/geojson_datasource.cpp
index bd58306ce..688a691ad 100644
--- a/plugins/input/geojson/geojson_datasource.cpp
+++ b/plugins/input/geojson/geojson_datasource.cpp
@@ -55,6 +55,7 @@
 #include <mapnik/util/fs.hpp>
 #include <mapnik/util/spatial_index.hpp>
 #include <mapnik/geom_util.hpp>
+#include <mapnik/json/parse_feature.hpp>
 
 #if defined(MAPNIK_MEMORY_MAPPED_FILE)
 #pragma GCC diagnostic push
@@ -233,11 +234,12 @@ void geojson_datasource::initialise_disk_index(std::string const& filename)
         auto const* start = record.data();
         auto const*  end = start + record.size();
         mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx, -1));
-        using namespace boost::spirit;
-        standard::space_type space;
-        if (!boost::spirit::qi::phrase_parse(start, end,
-                                             (geojson_datasource_static_feature_grammar)(boost::phoenix::ref(*feature)), space)
-            || start != end)
+
+        try
+        {
+            mapnik::json::parse_feature(start, end, *feature, geojson_datasource_static_tr);
+        }
+        catch (...)
         {
             throw std::runtime_error("Failed to parse geojson feature");
         }
diff --git a/plugins/input/geojson/geojson_index_featureset.cpp b/plugins/input/geojson/geojson_index_featureset.cpp
index 34a211fa6..1f623aa62 100644
--- a/plugins/input/geojson/geojson_index_featureset.cpp
+++ b/plugins/input/geojson/geojson_index_featureset.cpp
@@ -94,7 +94,7 @@ mapnik::feature_ptr geojson_index_featureset::next()
         static const mapnik::transcoder tr("utf8");
         mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx_, feature_id_++));
         using mapnik::json::grammar::iterator_type;
-        mapnik::json::parse_feature(start, end, *feature, tr); // throw in failure
+        mapnik::json::parse_feature(start, end, *feature, tr); // throw on failure
         // skip empty geometries
         if (mapnik::geometry::is_empty(feature->get_geometry()))
             continue;
diff --git a/plugins/input/geojson/geojson_memory_index_featureset.cpp b/plugins/input/geojson/geojson_memory_index_featureset.cpp
index 78789a07a..405ec61dd 100644
--- a/plugins/input/geojson/geojson_memory_index_featureset.cpp
+++ b/plugins/input/geojson/geojson_memory_index_featureset.cpp
@@ -21,17 +21,19 @@
  *****************************************************************************/
 
 // mapnik
+#include "geojson_memory_index_featureset.hpp"
+
 #include <mapnik/feature.hpp>
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/json/feature_grammar.hpp>
 #include <mapnik/util/utf_conv_win.hpp>
 #include <mapnik/geometry/is_empty.hpp>
+#include <mapnik/json/parse_feature.hpp>
+//#include <mapnik/json/json_grammar_config.hpp>
 // stl
 #include <string>
 #include <vector>
 
-#include "geojson_memory_index_featureset.hpp"
-
 geojson_memory_index_featureset::geojson_memory_index_featureset(std::string const& filename,
                                                    array_type && index_array)
 :
@@ -66,13 +68,8 @@ mapnik::feature_ptr geojson_memory_index_featureset::next()
         chr_iterator_type end = start + json.size();
         static const mapnik::transcoder tr("utf8");
         static const mapnik::json::feature_grammar<chr_iterator_type,mapnik::feature_impl> grammar(tr);
-        using namespace boost::spirit;
-        standard::space_type space;
         mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx_, feature_id_++));
-        if (!qi::phrase_parse(start, end, (grammar)(boost::phoenix::ref(*feature)), space) || start != end)
-        {
-            throw std::runtime_error("Failed to parse geojson feature");
-        }
+        mapnik::json::parse_feature(start, end, *feature, tr); // throw on failure
         // skip empty geometries
         if (mapnik::geometry::is_empty(feature->get_geometry()))
             continue;

From 20d6f84b3b2ee9c80d8e1bce0191bf83433a101e Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 22 Nov 2016 10:43:41 +0100
Subject: [PATCH 079/328] use `char const*`

---
 include/mapnik/json/json_grammar_config.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/mapnik/json/json_grammar_config.hpp b/include/mapnik/json/json_grammar_config.hpp
index e1199e705..ba104f142 100644
--- a/include/mapnik/json/json_grammar_config.hpp
+++ b/include/mapnik/json/json_grammar_config.hpp
@@ -80,7 +80,7 @@ namespace grammar {
 
 namespace x3 = boost::spirit::x3;
 using space_type = x3::standard::space_type;
-using iterator_type = std::string::const_iterator;
+using iterator_type = char const*;
 using context_type = x3::with_context<keys_tag,
                                       std::reference_wrapper<keys_map> const,
                                       x3::phrase_parse_context<space_type>::type>::type;

From ed5ee69c3cf3f66be9f44799337cf57ec13485d3 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 23 Nov 2016 16:18:38 +0100
Subject: [PATCH 080/328] refactor GeoJSON bounding box extraction into
 separate method for re-use and more...

---
 .../mapnik/json/extract_bounding_boxes_x3.hpp |  35 +++
 include/mapnik/json/json_grammar_config.hpp   |  13 +
 src/json/extract_bounding_boxes_x3.cpp        | 231 ++++++++++++++++++
 src/json/geojson_grammar_x3.cpp               |   6 +-
 src/json/parse_feature.cpp                    |   9 +-
 src/json/positions_grammar_x3.cpp             |   2 +
 src/json/unicode_string_grammar_x3.cpp        |   4 +-
 .../mapnik-index/process_geojson_file_x3.cpp  | 213 ++--------------
 8 files changed, 309 insertions(+), 204 deletions(-)
 create mode 100644 include/mapnik/json/extract_bounding_boxes_x3.hpp
 create mode 100644 src/json/extract_bounding_boxes_x3.cpp

diff --git a/include/mapnik/json/extract_bounding_boxes_x3.hpp b/include/mapnik/json/extract_bounding_boxes_x3.hpp
new file mode 100644
index 000000000..fc3cb4772
--- /dev/null
+++ b/include/mapnik/json/extract_bounding_boxes_x3.hpp
@@ -0,0 +1,35 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+
+#ifndef MAPNIK_JSON_EXTRACT_BOUNDING_BOXES_X3_HPP
+#define MAPNIK_JSON_EXTRACT_BOUNDING_BOXES_X3_HPP
+
+namespace mapnik { namespace json {
+
+template <typename Iterator, typename Boxes>
+void extract_bounding_boxes(Iterator start, Iterator end, Boxes & boxes);
+
+}}
+
+
+#endif // MAPNIK_JSON_EXTRACT_BOUNDING_BOXES_X3_HPP
diff --git a/include/mapnik/json/json_grammar_config.hpp b/include/mapnik/json/json_grammar_config.hpp
index ba104f142..2637ab0c4 100644
--- a/include/mapnik/json/json_grammar_config.hpp
+++ b/include/mapnik/json/json_grammar_config.hpp
@@ -23,6 +23,8 @@
 #ifndef MAPNIK_JSON_GRAMMAR_CONFIG_HPP
 #define MAPNIK_JSON_GRAMMAR_CONFIG_HPP
 
+#include <mapnik/feature.hpp>
+#include <mapnik/unicode.hpp>
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/home/x3.hpp>
@@ -59,6 +61,8 @@ constexpr char const* wkn_to_string(well_known_names val)
 }
 
 struct keys_tag;
+struct transcoder_tag;
+struct feature_tag;
 
 using keys_map = boost::bimap<boost::bimaps::unordered_set_of<std::string>,
                               boost::bimaps::set_of<int>>;
@@ -84,6 +88,15 @@ using iterator_type = char const*;
 using context_type = x3::with_context<keys_tag,
                                       std::reference_wrapper<keys_map> const,
                                       x3::phrase_parse_context<space_type>::type>::type;
+
+using geometry_context_type = x3::with_context<feature_tag,
+                                               std::reference_wrapper<mapnik::feature_impl> const,
+                                               context_type>::type;
+
+using feature_context_type = x3::with_context<transcoder_tag,
+                                              std::reference_wrapper<mapnik::transcoder> const,
+                                              geometry_context_type>::type;
+
 }}}
 
 #endif // MAPNIK_JSON_GRAMMAR_CONFIG_HPP
diff --git a/src/json/extract_bounding_boxes_x3.cpp b/src/json/extract_bounding_boxes_x3.cpp
new file mode 100644
index 000000000..09e657b9a
--- /dev/null
+++ b/src/json/extract_bounding_boxes_x3.cpp
@@ -0,0 +1,231 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#include <mapnik/box2d.hpp>
+#include <mapnik/json/extract_bounding_boxes_x3.hpp>
+#include <mapnik/json/json_grammar_config.hpp>
+#include <mapnik/json/geojson_grammar_x3_def.hpp>
+#include <mapnik/json/unicode_string_grammar_x3_def.hpp>
+#include <mapnik/json/positions_grammar_x3_def.hpp>
+
+namespace mapnik { namespace json {
+
+template <typename Box>
+struct calculate_bounding_box
+{
+    calculate_bounding_box(Box & box)
+        : box_(box) {}
+
+    void operator()(mapnik::json::point const& pt) const
+    {
+        box_.init(pt.x, pt.y);
+    }
+
+    void operator()(mapnik::json::ring const& ring) const
+    {
+        for (auto const& pt : ring)
+        {
+            if (!box_.valid()) box_.init(pt.x, pt.y);
+            else box_.expand_to_include(pt.x, pt.y);
+        }
+    }
+
+    void operator()(mapnik::json::rings const& rings) const
+    {
+        for (auto const& ring : rings)
+        {
+            operator()(ring);
+            break; // consider first ring only
+        }
+    }
+
+    void operator()(mapnik::json::rings_array const& rings_array) const
+    {
+        for (auto const& rings : rings_array)
+        {
+            operator()(rings);
+        }
+    }
+
+    template <typename T>
+    void operator() (T const& ) const {}
+
+    Box & box_;
+};
+
+namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+
+using base_iterator_type = char const*;
+using x3::lit;
+using x3::omit;
+using x3::raw;
+using x3::char_;
+using x3::eps;
+
+struct feature_callback_tag;
+
+auto on_feature_callback = [] (auto const& ctx)
+{
+    // call our callback
+    x3::get<feature_callback_tag>(ctx)(_attr(ctx));
+};
+
+namespace {
+auto const& geojson_value = geojson_grammar();
+}
+
+// extract bounding box from GeoJSON Feature
+
+struct bracket_tag ;
+
+auto check_brackets = [](auto const& ctx)
+{
+    _pass(ctx) = (x3::get<bracket_tag>(ctx) > 0);
+};
+
+auto open_bracket = [](auto const& ctx)
+{
+    ++x3::get<bracket_tag>(ctx);
+};
+
+auto close_bracket = [](auto const& ctx)
+{
+    --x3::get<bracket_tag>(ctx);
+};
+
+auto assign_range = [](auto const& ctx)
+{
+    std::get<0>(_val(ctx)) = std::move(_attr(ctx));
+};
+
+auto assign_bbox = [](auto const& ctx)
+{
+    std::get<1>(_val(ctx)) = std::move(_attr(ctx));
+};
+
+auto extract_bounding_box = [](auto const& ctx)
+{
+    mapnik::box2d<double> bbox;
+    calculate_bounding_box<mapnik::box2d<double>> visitor(bbox);
+    mapnik::util::apply_visitor(visitor, _attr(ctx));
+    _val(ctx) = std::move(bbox);
+};
+
+auto const coordinates_rule = x3::rule<struct coordinates_rule_tag, mapnik::box2d<double> > {}
+    = lit("\"coordinates\"") >> lit(':') >> positions_rule[extract_bounding_box];
+
+auto const bounding_box = x3::rule<struct bounding_box_rule_tag, std::tuple<boost::iterator_range<base_iterator_type>,mapnik::box2d<double>>> {}
+    = raw[lit('{')[open_bracket] >> *(eps[check_brackets] >>
+                                  (lit("\"FeatureCollection\"") > eps(false)
+                                   |
+                                   lit('{')[open_bracket]
+                                   |
+                                   lit('}')[close_bracket]
+                                   |
+                                   coordinates_rule[assign_bbox]
+                                   |
+                                   omit[geojson_string]
+                                   |
+                                   omit[char_]))][assign_range];
+
+
+auto const feature = bounding_box[on_feature_callback];
+
+auto const key_value_ = omit[geojson_string] > lit(':') > omit[geojson_value] ;
+
+auto const features = lit("\"features\"")
+    > lit(':') > lit('[') > -(omit[feature] % lit(',')) > lit(']');
+
+auto const type = lit("\"type\"") > lit(':') > lit("\"FeatureCollection\"");
+
+auto const feature_collection = x3::rule<struct feature_collection_tag> {}
+    = lit('{') > (( type | features | key_value_) % lit(',')) > lit('}');
+
+
+}
+
+namespace {
+struct collect_features
+{
+    collect_features(std::vector<mapnik::json::geojson_value> & values)
+        : values_(values) {}
+    void operator() (mapnik::json::geojson_value && val) const
+    {
+        values_.push_back(std::move(val));
+    }
+    std::vector<mapnik::json::geojson_value> & values_;
+};
+
+template <typename Iterator, typename Boxes>
+struct extract_positions
+{
+    extract_positions(Iterator start, Boxes & boxes)
+        : start_(start),
+          boxes_(boxes) {}
+
+    template <typename T>
+    void operator() (T const& val) const
+    {
+        auto const& r = std::get<0>(val);
+        mapnik::box2d<double> const& bbox = std::get<1>(val);
+        auto offset = std::distance(start_, r.begin());
+        auto size = std::distance(r.begin(), r.end());
+        boxes_.emplace_back(std::make_pair(bbox,std::make_pair(offset, size)));
+        //boxes_.emplace_back(std::make_tuple(bbox,offset, size));
+    }
+    Iterator start_;
+    Boxes & boxes_;
+};
+
+}
+
+template <typename Iterator, typename Boxes>
+void extract_bounding_boxes(Iterator start, Iterator end, Boxes & boxes)
+{
+    using namespace boost::spirit;
+    using space_type = mapnik::json::grammar::space_type;
+    using iterator_type = Iterator;
+    using boxes_type = Boxes;
+
+    extract_positions<iterator_type, boxes_type> callback(start, boxes);
+    auto keys = mapnik::json::get_keys();
+    std::size_t bracket_counter = 0;
+    auto feature_collection_impl = x3::with<mapnik::json::grammar::bracket_tag>(std::ref(bracket_counter))
+        [x3::with<mapnik::json::keys_tag>(std::ref(keys))
+         [x3::with<mapnik::json::grammar::feature_callback_tag>(std::ref(callback))
+          [mapnik::json::grammar::feature_collection]
+             ]];
+
+    if (!x3::phrase_parse(start, end, feature_collection_impl, space_type()))
+    {
+        throw std::runtime_error("Can't extract bounding boxes");
+    }
+
+}
+
+using box_type = mapnik::box2d<double>;
+using boxes_type = std::vector<std::pair<box_type, std::pair<std::size_t, std::size_t>>>;
+using base_iterator_type = char const*;
+template void extract_bounding_boxes<base_iterator_type, boxes_type>(base_iterator_type, base_iterator_type, boxes_type&);
+}}
diff --git a/src/json/geojson_grammar_x3.cpp b/src/json/geojson_grammar_x3.cpp
index 824156557..496d34472 100644
--- a/src/json/geojson_grammar_x3.cpp
+++ b/src/json/geojson_grammar_x3.cpp
@@ -20,10 +20,12 @@
  *
  *****************************************************************************/
 
+#if 0
 #include <mapnik/json/geojson_grammar_x3_def.hpp>
 #include <mapnik/json/json_grammar_config.hpp>
+
 namespace mapnik { namespace json { namespace grammar {
-
 BOOST_SPIRIT_INSTANTIATE(geojson_grammar_type, iterator_type, context_type);
-
 }}}
+
+#endif
diff --git a/src/json/parse_feature.cpp b/src/json/parse_feature.cpp
index f4f794885..bf4282d86 100644
--- a/src/json/parse_feature.cpp
+++ b/src/json/parse_feature.cpp
@@ -21,10 +21,10 @@
  *****************************************************************************/
 
 #include <mapnik/json/parse_feature.hpp>
+#include <mapnik/json/json_grammar_config.hpp>
 #include <mapnik/json/generic_json_grammar_x3_def.hpp>
 #include <mapnik/json/unicode_string_grammar_x3_def.hpp>
 #include <mapnik/json/positions_grammar_x3_def.hpp>
-#include <mapnik/json/json_grammar_config.hpp>
 #include <mapnik/json/create_geometry.hpp>
 #include <mapnik/util/conversions.hpp>
 
@@ -133,9 +133,6 @@ using x3::lit;
 using x3::omit;
 using x3::char_;
 
-struct transcoder_tag;
-struct feature_tag;
-//
 auto const& value = mapnik::json::generic_json_grammar();
 // import unicode string rule
 auto const& geojson_string = unicode_string_grammar();
@@ -230,7 +227,7 @@ auto const feature_part = x3::rule<struct feature_part_rule_tag> {} =
     omit[geojson_string] > lit(':') > omit[value]
     ;
 
-auto const feature = x3::rule<struct feature_rule_tag> {} =
+auto const feature_rule = x3::rule<struct feature_rule_tag> {} =
     lit('{') > feature_part % lit(',') > lit('}')
     ;
 
@@ -244,7 +241,7 @@ void parse_feature(Iterator start, Iterator end, feature_impl& feature, mapnik::
     using space_type = mapnik::json::grammar::space_type;
     auto grammar = x3::with<mapnik::json::transcoder_tag>(std::ref(tr))
         [x3::with<mapnik::json::feature_tag>(std::ref(feature))
-         [ mapnik::json::feature ]];
+         [ mapnik::json::feature_rule ]];
     if (!x3::phrase_parse(start, end, grammar, space_type()))
     {
         throw std::runtime_error("Can't parser GeoJSON Feature");
diff --git a/src/json/positions_grammar_x3.cpp b/src/json/positions_grammar_x3.cpp
index e20de39f5..0b92dc2f6 100644
--- a/src/json/positions_grammar_x3.cpp
+++ b/src/json/positions_grammar_x3.cpp
@@ -20,9 +20,11 @@
  *
  *****************************************************************************/
 
+#if 0
 #include <mapnik/json/positions_grammar_x3_def.hpp>
 #include <mapnik/json/json_grammar_config.hpp>
 
 namespace mapnik { namespace json { namespace grammar {
 BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, context_type);
 }}}
+#endif
diff --git a/src/json/unicode_string_grammar_x3.cpp b/src/json/unicode_string_grammar_x3.cpp
index 69fadbba2..41d6acb99 100644
--- a/src/json/unicode_string_grammar_x3.cpp
+++ b/src/json/unicode_string_grammar_x3.cpp
@@ -19,10 +19,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-
+#if 0
 #include <mapnik/json/unicode_string_grammar_x3_def.hpp>
 #include <mapnik/json/json_grammar_config.hpp>
 
 namespace mapnik { namespace json { namespace grammar {
 BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, context_type);
 }}}
+
+#endif
diff --git a/utils/mapnik-index/process_geojson_file_x3.cpp b/utils/mapnik-index/process_geojson_file_x3.cpp
index b20f07d54..5f3b5c6de 100644
--- a/utils/mapnik-index/process_geojson_file_x3.cpp
+++ b/utils/mapnik-index/process_geojson_file_x3.cpp
@@ -35,9 +35,11 @@
 #endif
 #include <mapnik/feature.hpp>
 #include <mapnik/json/json_grammar_config.hpp>
-#include <mapnik/json/geojson_grammar_x3_def.hpp>
-#include <mapnik/json/unicode_string_grammar_x3_def.hpp>
-#include <mapnik/json/positions_grammar_x3_def.hpp>
+#include <mapnik/json/geojson_grammar_x3.hpp>
+#include <mapnik/json/unicode_string_grammar_x3.hpp>
+#include <mapnik/json/positions_grammar_x3.hpp>
+
+#include <mapnik/json/extract_bounding_boxes_x3.hpp>
 
 namespace {
 
@@ -211,185 +213,17 @@ bool validate_geojson_feature(mapnik::json::geojson_value & value, Keys const& k
     return true;
 };
 
-using box_type = mapnik::box2d<float>;
+using box_type = mapnik::box2d<double>;
 using boxes_type = std::vector<std::pair<box_type, std::pair<std::size_t, std::size_t>>>;
 using base_iterator_type = char const*;
-}
 
-namespace mapnik { namespace json {
-
-template <typename Box>
-struct calculate_bounding_box
-{
-    calculate_bounding_box(Box & box)
-        : box_(box) {}
-
-    void operator()(mapnik::json::point const& pt) const
-    {
-        box_.init(pt.x, pt.y);
-    }
-
-    void operator()(mapnik::json::ring const& ring) const
-    {
-        for (auto const& pt : ring)
-        {
-            if (!box_.valid()) box_.init(pt.x, pt.y);
-            else box_.expand_to_include(pt.x, pt.y);
-        }
-    }
-
-    void operator()(mapnik::json::rings const& rings) const
-    {
-        for (auto const& ring : rings)
-        {
-            operator()(ring);
-            break; // consider first ring only
-        }
-    }
-
-    void operator()(mapnik::json::rings_array const& rings_array) const
-    {
-        for (auto const& rings : rings_array)
-        {
-            operator()(rings);
-        }
-    }
-
-    template <typename T>
-    void operator() (T const& ) const {}
-
-    Box & box_;
-};
-
-namespace grammar {
-
-namespace x3 = boost::spirit::x3;
-
-using x3::lit;
-using x3::omit;
-using x3::raw;
-using x3::char_;
-using x3::eps;
-
-struct feature_callback_tag;
-
-auto on_feature_callback = [] (auto const& ctx)
-{
-    // call our callback
-    x3::get<feature_callback_tag>(ctx)(_attr(ctx));
-};
-
-namespace {
-auto const& geojson_value = geojson_grammar();
-}
-
-// extract bounding box from GeoJSON Feature
-
-struct bracket_tag ;
-
-auto check_brackets = [](auto const& ctx)
-{
-    _pass(ctx) = (x3::get<bracket_tag>(ctx) > 0);
-};
-
-auto open_bracket = [](auto const& ctx)
-{
-    ++x3::get<bracket_tag>(ctx);
-};
-
-auto close_bracket = [](auto const& ctx)
-{
-    --x3::get<bracket_tag>(ctx);
-};
-
-auto assign_range = [](auto const& ctx)
-{
-    std::get<0>(_val(ctx)) = std::move(_attr(ctx));
-};
-
-auto assign_bbox = [](auto const& ctx)
-{
-    std::get<1>(_val(ctx)) = std::move(_attr(ctx));
-};
-
-auto extract_bounding_box = [](auto const& ctx)
-{
-    mapnik::box2d<float>  bbox;
-    calculate_bounding_box<mapnik::box2d<float>> visitor(bbox);
-    mapnik::util::apply_visitor(visitor, _attr(ctx));
-    _val(ctx) = std::move(bbox);
-};
-
-auto const coordinates_rule = x3::rule<struct coordinates_rule_tag, mapnik::box2d<float> > {}
-    = lit("\"coordinates\"") >> lit(':') >> positions_rule[extract_bounding_box];
-
-auto const bounding_box = x3::rule<struct bounding_box_rule_tag, std::tuple<boost::iterator_range<base_iterator_type>,mapnik::box2d<float>>> {}
-    = raw[lit('{')[open_bracket] >> *(eps[check_brackets] >>
-                                  (lit("\"FeatureCollection\"") > eps(false)
-                                   |
-                                   lit('{')[open_bracket]
-                                   |
-                                   lit('}')[close_bracket]
-                                   |
-                                   coordinates_rule[assign_bbox]
-                                   |
-                                   omit[geojson_string]
-                                   |
-                                   omit[char_]))][assign_range];
-
-
-auto const feature = bounding_box[on_feature_callback];
-
-auto const key_value_ = omit[geojson_string] > lit(':') > omit[geojson_value] ;
-
-auto const features = lit("\"features\"")
-    > lit(':') > lit('[') > -(omit[feature] % lit(',')) > lit(']');
-
-auto const type = lit("\"type\"") > lit(':') > lit("\"FeatureCollection\"");
-
-auto const feature_collection = x3::rule<struct feature_collection_tag> {}
-    = lit('{') > (( type | features | key_value_) % lit(',')) > lit('}');
-
-
-}}}
-
-namespace {
-struct collect_features
-{
-    collect_features(std::vector<mapnik::json::geojson_value> & values)
-        : values_(values) {}
-    void operator() (mapnik::json::geojson_value && val) const
-    {
-        values_.push_back(std::move(val));
-    }
-    std::vector<mapnik::json::geojson_value> & values_;
-};
-
-template <typename Iterator, typename Boxes>
-struct extract_positions
-{
-    extract_positions(Iterator start, Boxes & boxes)
-        : start_(start),
-          boxes_(boxes) {}
-
-    template <typename T>
-    void operator() (T const& val) const
-    {
-        auto const& r = std::get<0>(val);
-        mapnik::box2d<float> const& bbox = std::get<1>(val);
-        auto offset = std::distance(start_, r.begin());
-        auto size = std::distance(r.begin(), r.end());
-        boxes_.emplace_back(std::make_pair(bbox,std::make_pair(offset, size)));
-        //boxes_.emplace_back(std::make_tuple(bbox,offset, size));
-    }
-    Iterator start_;
-    Boxes & boxes_;
-};
+auto const& geojson_value = mapnik::json::geojson_grammar();
 
 }
 
 namespace mapnik { namespace detail {
 
+
 template <typename T>
 std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & boxes, std::string const& filename, bool validate_features, bool verbose)
 {
@@ -423,29 +257,12 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
     base_iterator_type start = file_buffer.c_str();
     base_iterator_type end = start + file_buffer.length();
 #endif
-    using namespace boost::spirit;
-    using space_type = mapnik::json::grammar::space_type;
-    auto const* itr = start;
-
-    extract_positions<base_iterator_type, boxes_type> callback(itr, boxes);
-    auto keys = mapnik::json::get_keys();
-    std::size_t bracket_counter = 0;
-    auto feature_collection_impl = x3::with<mapnik::json::grammar::bracket_tag>(std::ref(bracket_counter))
-        [x3::with<mapnik::json::keys_tag>(std::ref(keys))
-         [x3::with<mapnik::json::grammar::feature_callback_tag>(std::ref(callback))
-          [mapnik::json::grammar::feature_collection]
-             ]];
 
     try
     {
-        bool result = x3::phrase_parse(itr, end, feature_collection_impl, space_type());
-        if (!result)
-        {
-            std::clog << "mapnik-index (GeoJSON) : could not extract bounding boxes from : '" <<  filename <<  "'" << std::endl;
-            return std::make_pair(false, extent);
-        }
+        mapnik::json::extract_bounding_boxes(start, end, boxes);
     }
-    catch (x3::expectation_failure<base_iterator_type> const& ex)
+    catch (boost::spirit::x3::expectation_failure<base_iterator_type> const& ex)
     {
         std::clog << ex.what() << std::endl;
         std::clog << "Expected: " << ex.which();
@@ -454,12 +271,16 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
     }
     catch (std::exception const& ex)
     {
-        std::clog << "Exception caught:" << ex.what() <<  std::endl;
+        std::clog << "mapnik-index (GeoJSON) : could not extract bounding boxes from : '" <<  filename <<  "'" << std::endl;
         return std::make_pair(false, extent);
     }
 
+    using namespace boost::spirit;
+    using space_type = mapnik::json::grammar::space_type;
+
+    auto keys = mapnik::json::get_keys();
     auto feature_grammar = x3::with<mapnik::json::keys_tag>(std::ref(keys))
-        [ mapnik::json::grammar::geojson_value ];
+        [ geojson_value ];
     for (auto const& item : boxes)
     {
         if (item.first.valid())
@@ -469,6 +290,7 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
 
             if (validate_features)
             {
+#if 0
                 base_iterator_type feat_itr = start + item.second.first;
                 base_iterator_type feat_end = feat_itr + item.second.second;
                 mapnik::json::geojson_value feature_value;
@@ -494,6 +316,7 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
                 {
                     return std::make_pair(false, extent);
                 }
+#endif
             }
         }
     }

From a112e88e238608efc5d33846553c774d6e39f116 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 23 Nov 2016 17:44:35 +0100
Subject: [PATCH 081/328] fix compilation - move extract_bounding_boxes into
 mapnik-index src dir

---
 include/mapnik/json/json_grammar_config.hpp   |  2 +-
 src/json/geojson_grammar_x3.cpp               |  7 +++----
 src/json/positions_grammar_x3.cpp             |  6 +++---
 src/json/unicode_string_grammar_x3.cpp        |  6 +++---
 utils/mapnik-index/build.py                   |  1 +
 .../extract_bounding_boxes_x3.cpp             | 20 ++++++++++---------
 .../mapnik-index/process_geojson_file_x3.cpp  | 16 +++++++--------
 .../mapnik-index/process_geojson_file_x3.hpp  |  2 +-
 8 files changed, 30 insertions(+), 30 deletions(-)
 rename {src/json => utils/mapnik-index}/extract_bounding_boxes_x3.cpp (93%)

diff --git a/include/mapnik/json/json_grammar_config.hpp b/include/mapnik/json/json_grammar_config.hpp
index 2637ab0c4..b6fba2962 100644
--- a/include/mapnik/json/json_grammar_config.hpp
+++ b/include/mapnik/json/json_grammar_config.hpp
@@ -91,7 +91,7 @@ using context_type = x3::with_context<keys_tag,
 
 using geometry_context_type = x3::with_context<feature_tag,
                                                std::reference_wrapper<mapnik::feature_impl> const,
-                                               context_type>::type;
+                                               x3::phrase_parse_context<space_type>::type>::type;
 
 using feature_context_type = x3::with_context<transcoder_tag,
                                               std::reference_wrapper<mapnik::transcoder> const,
diff --git a/src/json/geojson_grammar_x3.cpp b/src/json/geojson_grammar_x3.cpp
index 496d34472..dd3684655 100644
--- a/src/json/geojson_grammar_x3.cpp
+++ b/src/json/geojson_grammar_x3.cpp
@@ -20,12 +20,11 @@
  *
  *****************************************************************************/
 
-#if 0
-#include <mapnik/json/geojson_grammar_x3_def.hpp>
 #include <mapnik/json/json_grammar_config.hpp>
+#include <mapnik/json/geojson_grammar_x3_def.hpp>
 
 namespace mapnik { namespace json { namespace grammar {
 BOOST_SPIRIT_INSTANTIATE(geojson_grammar_type, iterator_type, context_type);
+//BOOST_SPIRIT_INSTANTIATE(geojson_grammar_type, iterator_type, geometry_context_type);
+//BOOST_SPIRIT_INSTANTIATE(geojson_grammar_type, iterator_type, feature_context_type);
 }}}
-
-#endif
diff --git a/src/json/positions_grammar_x3.cpp b/src/json/positions_grammar_x3.cpp
index 0b92dc2f6..8edf6c985 100644
--- a/src/json/positions_grammar_x3.cpp
+++ b/src/json/positions_grammar_x3.cpp
@@ -20,11 +20,11 @@
  *
  *****************************************************************************/
 
-#if 0
-#include <mapnik/json/positions_grammar_x3_def.hpp>
 #include <mapnik/json/json_grammar_config.hpp>
+#include <mapnik/json/positions_grammar_x3_def.hpp>
 
 namespace mapnik { namespace json { namespace grammar {
 BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, context_type);
+//BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, geometry_context_type);
+//BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, feature_context_type);
 }}}
-#endif
diff --git a/src/json/unicode_string_grammar_x3.cpp b/src/json/unicode_string_grammar_x3.cpp
index 41d6acb99..888e3340a 100644
--- a/src/json/unicode_string_grammar_x3.cpp
+++ b/src/json/unicode_string_grammar_x3.cpp
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-#if 0
+
 #include <mapnik/json/unicode_string_grammar_x3_def.hpp>
 #include <mapnik/json/json_grammar_config.hpp>
 
 namespace mapnik { namespace json { namespace grammar {
 BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, context_type);
+//BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, geometry_context_type);
+//BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, feature_context_type);
 }}}
-
-#endif
diff --git a/utils/mapnik-index/build.py b/utils/mapnik-index/build.py
index e2b9901a2..e04a81230 100644
--- a/utils/mapnik-index/build.py
+++ b/utils/mapnik-index/build.py
@@ -34,6 +34,7 @@ source = Split(
     process_csv_file.cpp
     process_geojson_file.cpp
     process_geojson_file_x3.cpp
+    extract_bounding_boxes_x3.cpp
     ../../plugins/input/csv/csv_utils.os
     """
     )
diff --git a/src/json/extract_bounding_boxes_x3.cpp b/utils/mapnik-index/extract_bounding_boxes_x3.cpp
similarity index 93%
rename from src/json/extract_bounding_boxes_x3.cpp
rename to utils/mapnik-index/extract_bounding_boxes_x3.cpp
index 09e657b9a..da0827881 100644
--- a/src/json/extract_bounding_boxes_x3.cpp
+++ b/utils/mapnik-index/extract_bounding_boxes_x3.cpp
@@ -91,9 +91,11 @@ auto on_feature_callback = [] (auto const& ctx)
     x3::get<feature_callback_tag>(ctx)(_attr(ctx));
 };
 
-namespace {
-auto const& geojson_value = geojson_grammar();
-}
+namespace { auto const& geojson_value = geojson_grammar();}
+// import unicode string rule
+//namespace { auto const& geojson_string = unicode_string_grammar(); }
+// import positions rule
+//namespace { auto const& positions_rule = positions_grammar(); }
 
 // extract bounding box from GeoJSON Feature
 
@@ -126,16 +128,16 @@ auto assign_bbox = [](auto const& ctx)
 
 auto extract_bounding_box = [](auto const& ctx)
 {
-    mapnik::box2d<double> bbox;
-    calculate_bounding_box<mapnik::box2d<double>> visitor(bbox);
+    mapnik::box2d<float> bbox;
+    calculate_bounding_box<mapnik::box2d<float>> visitor(bbox);
     mapnik::util::apply_visitor(visitor, _attr(ctx));
     _val(ctx) = std::move(bbox);
 };
 
-auto const coordinates_rule = x3::rule<struct coordinates_rule_tag, mapnik::box2d<double> > {}
+auto const coordinates_rule = x3::rule<struct coordinates_rule_tag, mapnik::box2d<float> > {}
     = lit("\"coordinates\"") >> lit(':') >> positions_rule[extract_bounding_box];
 
-auto const bounding_box = x3::rule<struct bounding_box_rule_tag, std::tuple<boost::iterator_range<base_iterator_type>,mapnik::box2d<double>>> {}
+auto const bounding_box = x3::rule<struct bounding_box_rule_tag, std::tuple<boost::iterator_range<base_iterator_type>,mapnik::box2d<float>>> {}
     = raw[lit('{')[open_bracket] >> *(eps[check_brackets] >>
                                   (lit("\"FeatureCollection\"") > eps(false)
                                    |
@@ -188,7 +190,7 @@ struct extract_positions
     void operator() (T const& val) const
     {
         auto const& r = std::get<0>(val);
-        mapnik::box2d<double> const& bbox = std::get<1>(val);
+        mapnik::box2d<float> const& bbox = std::get<1>(val);
         auto offset = std::distance(start_, r.begin());
         auto size = std::distance(r.begin(), r.end());
         boxes_.emplace_back(std::make_pair(bbox,std::make_pair(offset, size)));
@@ -224,7 +226,7 @@ void extract_bounding_boxes(Iterator start, Iterator end, Boxes & boxes)
 
 }
 
-using box_type = mapnik::box2d<double>;
+using box_type = mapnik::box2d<float>;
 using boxes_type = std::vector<std::pair<box_type, std::pair<std::size_t, std::size_t>>>;
 using base_iterator_type = char const*;
 template void extract_bounding_boxes<base_iterator_type, boxes_type>(base_iterator_type, base_iterator_type, boxes_type&);
diff --git a/utils/mapnik-index/process_geojson_file_x3.cpp b/utils/mapnik-index/process_geojson_file_x3.cpp
index 5f3b5c6de..8d3516ee3 100644
--- a/utils/mapnik-index/process_geojson_file_x3.cpp
+++ b/utils/mapnik-index/process_geojson_file_x3.cpp
@@ -38,7 +38,6 @@
 #include <mapnik/json/geojson_grammar_x3.hpp>
 #include <mapnik/json/unicode_string_grammar_x3.hpp>
 #include <mapnik/json/positions_grammar_x3.hpp>
-
 #include <mapnik/json/extract_bounding_boxes_x3.hpp>
 
 namespace {
@@ -213,7 +212,7 @@ bool validate_geojson_feature(mapnik::json::geojson_value & value, Keys const& k
     return true;
 };
 
-using box_type = mapnik::box2d<double>;
+using box_type = mapnik::box2d<float>;
 using boxes_type = std::vector<std::pair<box_type, std::pair<std::size_t, std::size_t>>>;
 using base_iterator_type = char const*;
 
@@ -276,21 +275,20 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
     }
 
     using namespace boost::spirit;
-    using space_type = mapnik::json::grammar::space_type;
 
-    auto keys = mapnik::json::get_keys();
-    auto feature_grammar = x3::with<mapnik::json::keys_tag>(std::ref(keys))
-        [ geojson_value ];
+    //using space_type = mapnik::json::grammar::space_type;
+    //auto keys = mapnik::json::get_keys();
+    //auto feature_grammar = x3::with<mapnik::json::keys_tag>(std::ref(keys))
+    //    [ geojson_value ];
     for (auto const& item : boxes)
     {
         if (item.first.valid())
         {
             if (!extent.valid()) extent = item.first;
             else extent.expand_to_include(item.first);
-
+#if 0
             if (validate_features)
             {
-#if 0
                 base_iterator_type feat_itr = start + item.second.first;
                 base_iterator_type feat_end = feat_itr + item.second.second;
                 mapnik::json::geojson_value feature_value;
@@ -316,8 +314,8 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
                 {
                     return std::make_pair(false, extent);
                 }
-#endif
             }
+#endif
         }
     }
     return std::make_pair(true, extent);
diff --git a/utils/mapnik-index/process_geojson_file_x3.hpp b/utils/mapnik-index/process_geojson_file_x3.hpp
index 23617354f..17545db66 100644
--- a/utils/mapnik-index/process_geojson_file_x3.hpp
+++ b/utils/mapnik-index/process_geojson_file_x3.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_UTILS_PROCESS_GEOJSON_FILE_X3_HPP
 
 #include <utility>
-#include <mapnik/box2d.hpp>
+#include <string>
 
 namespace mapnik { namespace detail {
 

From 71c112a0b0ae04b6a6a962d9bb8ab284a5a04d9b Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 23 Nov 2016 18:21:44 +0100
Subject: [PATCH 082/328] add coord2f type

---
 include/mapnik/coord.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/mapnik/coord.hpp b/include/mapnik/coord.hpp
index f8ea3f161..e1e527807 100644
--- a/include/mapnik/coord.hpp
+++ b/include/mapnik/coord.hpp
@@ -181,6 +181,7 @@ private:
 };
 
 using coord2d = coord<double,2>;
+using coord2f = coord<float,2>;
 using coord2i = coord<int,2>;
 
 }

From 4aa60d669e2cb0e57b1ea9bc596975e549ae49be Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 23 Nov 2016 18:22:11 +0100
Subject: [PATCH 083/328] adapt box2d<float> to boost::geometry

---
 include/mapnik/geometry/boost_adapters.hpp | 40 +++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/include/mapnik/geometry/boost_adapters.hpp b/include/mapnik/geometry/boost_adapters.hpp
index 7a708463a..9c633b618 100644
--- a/include/mapnik/geometry/boost_adapters.hpp
+++ b/include/mapnik/geometry/boost_adapters.hpp
@@ -46,11 +46,13 @@
 
 // register point
 BOOST_GEOMETRY_REGISTER_POINT_2D (mapnik::geometry::point<double>, double, boost::geometry::cs::cartesian, x, y)
+BOOST_GEOMETRY_REGISTER_POINT_2D (mapnik::geometry::point<float>, float, boost::geometry::cs::cartesian, x, y)
 BOOST_GEOMETRY_REGISTER_POINT_2D (mapnik::geometry::point<std::int64_t>, std::int64_t, boost::geometry::cs::cartesian, x, y)
 // ring
 BOOST_GEOMETRY_REGISTER_RING_TEMPLATED(mapnik::geometry::linear_ring)
-// needed by box2d<double>
+// needed by box2d<T>
 BOOST_GEOMETRY_REGISTER_POINT_2D(mapnik::coord2d, double, boost::geometry::cs::cartesian, x, y)
+BOOST_GEOMETRY_REGISTER_POINT_2D(mapnik::coord2f, float,  boost::geometry::cs::cartesian, x, y)
 
 namespace boost {
 
@@ -120,6 +122,42 @@ struct indexed_access<mapnik::box2d<double>, max_corner, 1>
     static inline void set(mapnik::box2d<double> &b , ct const& value) { b.set_maxy(value); }
 };
 
+// box2d<float>
+template<> struct tag<mapnik::box2d<float> > { using type = box_tag; };
+template<> struct point_type<mapnik::box2d<float> > { using type = mapnik::coord2f; };
+
+template <>
+struct indexed_access<mapnik::box2d<float>, min_corner, 0>
+{
+    using ct = coordinate_type<mapnik::coord2f>::type;
+    static inline ct get(mapnik::box2d<float> const& b) { return b.minx();}
+    static inline void set(mapnik::box2d<float> &b, ct const& value) { b.set_minx(value); }
+};
+
+template <>
+struct indexed_access<mapnik::box2d<float>, min_corner, 1>
+{
+    using ct = coordinate_type<mapnik::coord2f>::type;
+    static inline ct get(mapnik::box2d<float> const& b) { return b.miny();}
+    static inline void set(mapnik::box2d<float> &b, ct const& value) { b.set_miny(value); }
+};
+
+template <>
+struct indexed_access<mapnik::box2d<float>, max_corner, 0>
+{
+    using ct = coordinate_type<mapnik::coord2f>::type;
+    static inline ct get(mapnik::box2d<float> const& b) { return b.maxx();}
+    static inline void set(mapnik::box2d<float> &b, ct const& value) { b.set_maxx(value); }
+};
+
+template <>
+struct indexed_access<mapnik::box2d<float>, max_corner, 1>
+{
+    using ct = coordinate_type<mapnik::coord2f>::type;
+    static inline ct get(mapnik::box2d<float> const& b) { return b.maxy();}
+    static inline void set(mapnik::box2d<float> &b , ct const& value) { b.set_maxy(value); }
+};
+
 // mapnik::geometry::line_string
 template<typename CoordinateType>
 struct tag<mapnik::geometry::line_string<CoordinateType> >

From 988966c68e09dd0212f17dc3cf26ef7589dced55 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 25 Nov 2016 11:47:33 +0100
Subject: [PATCH 084/328] declare in using one macro

---
 include/mapnik/json/geojson_grammar_x3.hpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/mapnik/json/geojson_grammar_x3.hpp b/include/mapnik/json/geojson_grammar_x3.hpp
index 36fe6ea42..b5dda0b35 100644
--- a/include/mapnik/json/geojson_grammar_x3.hpp
+++ b/include/mapnik/json/geojson_grammar_x3.hpp
@@ -72,8 +72,7 @@ namespace grammar {
 
 using geojson_grammar_type = x3::rule<class geojson_tag, geojson_value>;
 using key_value_type = x3::rule<class key_value_tag, geojson_object_element>;
-BOOST_SPIRIT_DECLARE(geojson_grammar_type);
-BOOST_SPIRIT_DECLARE(key_value_type);
+BOOST_SPIRIT_DECLARE(geojson_grammar_type, key_value_type);
 }
 
 grammar::geojson_grammar_type const& geojson_grammar();

From 23ba18ead27842e7742f2373b8770e07bb5f1aaa Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 25 Nov 2016 11:48:06 +0100
Subject: [PATCH 085/328] make rules const

---
 include/mapnik/json/geojson_grammar_x3_def.hpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/mapnik/json/geojson_grammar_x3_def.hpp b/include/mapnik/json/geojson_grammar_x3_def.hpp
index d4e5707ee..10dd81aab 100644
--- a/include/mapnik/json/geojson_grammar_x3_def.hpp
+++ b/include/mapnik/json/geojson_grammar_x3_def.hpp
@@ -23,6 +23,7 @@
 #ifndef MAPNIK_JSON_GEOJSON_GRAMMAR_X3_DEF_HPP
 #define MAPNIK_JSON_GEOJSON_GRAMMAR_X3_DEF_HPP
 
+
 #include <mapnik/json/geojson_grammar_x3.hpp>
 #include <mapnik/json/unicode_string_grammar_x3.hpp>
 #include <mapnik/json/positions_grammar_x3.hpp>
@@ -91,14 +92,14 @@ struct geometry_type_ : x3::symbols<mapnik::geometry::geometry_types>
 geojson_grammar_type const value("JSON Value");
 key_value_type const key_value("JSON key/value");
 // rules
-x3::rule<class json_object_tag, geojson_object> object("JSON Object");
-x3::rule<class json_array_tag, geojson_array> array("JSON Array");
-x3::rule<class json_number_tag, geojson_value> number("JSON Number");
+x3::rule<class json_object_tag, geojson_object> const object("JSON Object");
+x3::rule<class json_array_tag, geojson_array> const array("JSON Array");
+x3::rule<class json_number_tag, geojson_value> const number("JSON Number");
 //x3::rule<class key_value_tag, geojson_object_element> key_value("JSON key/value");
 // GeoJSON
-x3::rule<class geojson_coordinates_tag, geojson_object_element> coordinates("GeoJSON Coordinates");
-x3::rule<class geojson_geometry_type_tag, geojson_object_element> geometry_type("GeoJSON Geometry Type");
-x3::rule<class geojson_key_value_type_tag, geojson_object_element> geojson_key_value("GeoJSON Key/Value Type");
+x3::rule<class geojson_coordinates_tag, geojson_object_element> const coordinates("GeoJSON Coordinates");
+x3::rule<class geojson_geometry_type_tag, geojson_object_element> const geometry_type("GeoJSON Geometry Type");
+x3::rule<class geojson_key_value_type_tag, geojson_object_element> const geojson_key_value("GeoJSON Key/Value Type");
 auto const geojson_double = x3::real_parser<value_double, x3::strict_real_policies<value_double>>();
 auto const geojson_integer = x3::int_parser<value_integer, 10, 1, -1>();
 

From 994a327c7f9c27df1120733a653ec5d0a2f5c5ce Mon Sep 17 00:00:00 2001
From: talaj <jiri.drbalek@gmail.com>
Date: Fri, 25 Nov 2016 13:31:55 +0100
Subject: [PATCH 086/328] remove superfluous declaration

---
 include/mapnik/text/placement_finder.hpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/mapnik/text/placement_finder.hpp b/include/mapnik/text/placement_finder.hpp
index 3b02d8924..83e8a04b3 100644
--- a/include/mapnik/text/placement_finder.hpp
+++ b/include/mapnik/text/placement_finder.hpp
@@ -67,8 +67,6 @@ private:
     bool single_line_placement(vertex_cache &pp, text_upright_e orientation);
     // Moves dx pixels but makes sure not to fall of the end.
     void path_move_dx(vertex_cache & pp, double dx);
-    // Normalize angle in range [-pi, +pi].
-    static double normalize_angle(double angle);
     // Adjusts user defined spacing to place an integer number of labels.
     double get_spacing(double path_length, double layout_width) const;
     // Checks for collision.

From cad029bf7cd4274c864ebb26614850a865896a5a Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 25 Nov 2016 16:44:20 +0100
Subject: [PATCH 087/328] make hex rules const

---
 include/mapnik/json/unicode_string_grammar_x3_def.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/mapnik/json/unicode_string_grammar_x3_def.hpp b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
index 00a5932b8..c1f6a39c0 100644
--- a/include/mapnik/json/unicode_string_grammar_x3_def.hpp
+++ b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
@@ -83,8 +83,8 @@ using x3::hex;
 using x3::eol;
 using x3::no_skip;
 
-x3::uint_parser<uchar, 16, 4, 4> hex4;
-x3::uint_parser<uchar, 16, 8, 8> hex8;
+x3::uint_parser<uchar, 16, 4, 4> const hex4;
+x3::uint_parser<uchar, 16, 8, 8> const hex8;
 
 // start rule
 unicode_string_grammar_type const unicode_string("Unicode String");

From 163a82fd1e937f658d989e21e10b72f9c3883293 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 25 Nov 2016 16:45:23 +0100
Subject: [PATCH 088/328] add feature_grammar_x3 implementation

---
 include/mapnik/json/feature_grammar_x3.hpp    |  48 +++
 .../mapnik/json/feature_grammar_x3_def.hpp    | 282 ++++++++++++++++++
 src/json/feature_grammar_x3.cpp               |  34 +++
 3 files changed, 364 insertions(+)
 create mode 100644 include/mapnik/json/feature_grammar_x3.hpp
 create mode 100644 include/mapnik/json/feature_grammar_x3_def.hpp
 create mode 100644 src/json/feature_grammar_x3.cpp

diff --git a/include/mapnik/json/feature_grammar_x3.hpp b/include/mapnik/json/feature_grammar_x3.hpp
new file mode 100644
index 000000000..f6cd6c45f
--- /dev/null
+++ b/include/mapnik/json/feature_grammar_x3.hpp
@@ -0,0 +1,48 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_JSON_FEATURE_GRAMMAR_X3_HPP
+#define MAPNIK_JSON_FEATURE_GRAMMAR_X3_HPP
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#pragma GCC diagnostic pop
+
+namespace mapnik { namespace json { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+using feature_grammar_type = x3::rule<class feature_rule_tag>;
+using geometry_grammar_type = x3::rule<class geometry_rule_tag>;
+
+BOOST_SPIRIT_DECLARE(feature_grammar_type);
+BOOST_SPIRIT_DECLARE(geometry_grammar_type);
+
+}
+
+grammar::feature_grammar_type const& feature_grammar();
+grammar::geometry_grammar_type const& geometry_grammar();
+
+
+}}
+
+#endif // MAPNIK_JSON_FEATURE_GRAMMAR_X3_HPP
diff --git a/include/mapnik/json/feature_grammar_x3_def.hpp b/include/mapnik/json/feature_grammar_x3_def.hpp
new file mode 100644
index 000000000..a67cffd76
--- /dev/null
+++ b/include/mapnik/json/feature_grammar_x3_def.hpp
@@ -0,0 +1,282 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_JSON_FEATURE_GRAMMAR_X3_DEF_HPP
+#define MAPNIK_JSON_FEATURE_GRAMMAR_X3_DEF_HPP
+
+#include <mapnik/json/json_grammar_config.hpp>
+#include <mapnik/json/feature_grammar_x3.hpp>
+#include <mapnik/json/generic_json_grammar_x3.hpp>
+#include <mapnik/json/unicode_string_grammar_x3.hpp>
+#include <mapnik/json/positions_grammar_x3.hpp>
+#include <mapnik/json/positions_x3.hpp>
+
+#include <mapnik/json/create_geometry.hpp>
+#include <mapnik/util/conversions.hpp>
+#include <mapnik/value.hpp>
+#include <mapnik/geometry/geometry_types.hpp>
+
+namespace mapnik { namespace json {
+
+struct stringifier
+{
+    std::string operator()(std::string const& val) const
+    {
+        return "\"" + val + "\"";
+    }
+
+    std::string operator()(value_null) const
+    {
+        return "null";
+    }
+
+    std::string operator()(value_bool val) const
+    {
+        return val ? "true" : "false";
+    }
+
+    std::string operator()(value_integer val) const
+    {
+        std::string str;
+        util::to_string(str, val);
+        return str;
+    }
+
+    std::string operator()(value_double val) const
+    {
+        std::string str;
+        util::to_string(str, val);
+        return str;
+    }
+
+    std::string operator()(std::vector<mapnik::json::json_value> const& array) const
+    {
+        std::string str = "[";
+        bool first = true;
+        for (auto const& val : array)
+        {
+            if (first) first = false;
+            else str += ",";
+            str += mapnik::util::apply_visitor(*this, val);
+        }
+        str += "]";
+        return str;
+    }
+
+    std::string operator()(std::vector<std::pair<std::string, mapnik::json::json_value>> const& object) const
+    {
+        std::string str = "{";
+        bool first = true;
+        for (auto const& kv : object)
+        {
+            if (first) first = false;
+            else str += ",";
+            str +=  "\"" + kv.first + "\"";
+            str += ":";
+            str += mapnik::util::apply_visitor(*this, kv.second);
+        }
+        str += "}";
+        return str;
+    }
+};
+
+struct attribute_value_visitor
+{
+public:
+    attribute_value_visitor(mapnik::transcoder const& tr)
+        : tr_(tr) {}
+
+    mapnik::value operator()(std::string const& val) const
+    {
+        return mapnik::value(tr_.transcode(val.c_str()));
+    }
+
+    mapnik::value operator()(std::vector<mapnik::json::json_value> const& array) const
+    {
+        std::string str = stringifier()(array);
+        return mapnik::value(tr_.transcode(str.c_str()));
+    }
+
+    mapnik::value operator()(std::vector<std::pair<std::string, mapnik::json::json_value> > const& object) const
+    {
+        std::string str = stringifier()(object);
+        return mapnik::value(tr_.transcode(str.c_str()));
+    }
+
+    template <typename T>
+    mapnik::value operator()(T const& val) const
+    {
+        return mapnik::value(val);
+    }
+
+    mapnik::transcoder const& tr_;
+};
+
+namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+using x3::lit;
+using x3::omit;
+using x3::char_;
+
+namespace {
+auto const& value = generic_json_grammar();
+// import unicode string rule
+auto const& geojson_string = unicode_string_grammar();
+// import positions rule
+auto const& positions_rule = positions_grammar();
+}
+
+// geometry types symbols
+struct geometry_type_ : x3::symbols<mapnik::geometry::geometry_types>
+{
+    geometry_type_()
+    {
+        add
+            ("\"Point\"", mapnik::geometry::geometry_types::Point)
+            ("\"LineString\"", mapnik::geometry::geometry_types::LineString)
+            ("\"Polygon\"", mapnik::geometry::geometry_types::Polygon)
+            ("\"MultiPoint\"", mapnik::geometry::geometry_types::MultiPoint)
+            ("\"MultiLineString\"", mapnik::geometry::geometry_types::MultiLineString )
+            ("\"MultiPolygon\"",mapnik::geometry::geometry_types::MultiPolygon)
+            ("\"GeometryCollection\"",mapnik::geometry::geometry_types::GeometryCollection)
+            ;
+    }
+} geometry_type_symbols;
+
+auto assign_name = [](auto const& ctx)
+{
+    std::get<0>(_val(ctx)) = std::move(_attr(ctx));
+};
+auto assign_value = [](auto const& ctx)
+{
+    std::get<1>(_val(ctx)) = std::move(_attr(ctx));
+};
+
+auto const assign_geometry_type = [] (auto const& ctx)
+{
+    std::get<0>(_val(ctx)) = _attr(ctx);
+};
+
+auto const assign_geometry = [] (auto const& ctx)
+{
+    mapnik::feature_impl & feature = x3::get<grammar::feature_tag>(ctx);
+    mapnik::geometry::geometry<double> geom;
+    auto const type = std::get<0>(_attr(ctx));
+    auto const& coordinates = std::get<1>(_attr(ctx));
+    mapnik::json::create_geometry(geom, type, coordinates);
+    feature.set_geometry(std::move(geom));
+};
+
+auto const assign_positions = [] (auto const& ctx)
+{
+    std::get<1>(_val(ctx)) = std::move(_attr(ctx));
+};
+
+auto assign_property = [](auto const& ctx)
+{
+    mapnik::feature_impl & feature = x3::get<grammar::feature_tag>(ctx);
+    mapnik::transcoder const& tr = x3::get<grammar::transcoder_tag>(ctx);
+    feature.put_new(std::get<0>(_attr(ctx)),
+                    mapnik::util::apply_visitor(attribute_value_visitor(tr),
+                                                std::get<1>(_attr(ctx))));
+};
+
+
+//exported rules
+feature_grammar_type const feature_rule = "Feature";
+geometry_grammar_type const geometry_rule = "Geometry";
+// rules
+x3::rule<struct feature_type_tag> const feature_type = "Feature Type";
+x3::rule<struct geometry_type_tag, mapnik::geometry::geometry_types> const geometry_type = "Geometry Type";
+x3::rule<struct coordinates_tag, mapnik::json::positions> const coordinates = "Coordinates";
+x3::rule<struct geometry_tag, std::tuple<mapnik::geometry::geometry_types, mapnik::json::positions>> const geometry_tuple = "Geometry";
+x3::rule<struct property_tag, std::tuple<std::string, json_value>> const property = "Property";
+x3::rule<struct properties_tag> const properties = "Properties";
+x3::rule<struct feature_part_rule_tag> const feature_part = "Feature part";
+
+
+auto const feature_type_def = lit("\"type\"") > lit(':') > lit("\"Feature\"");
+
+auto const geometry_type_def = lit("\"type\"") > lit(':') > geometry_type_symbols;
+
+auto const coordinates_def = lit("\"coordinates\"") > lit(':') > positions_rule;
+
+auto const geometry_tuple_def = (geometry_type[assign_geometry_type]
+                                 |
+                                 coordinates[assign_positions]
+                                 |
+                                 (omit[geojson_string] > lit(':') > omit[value])) % lit(',');
+
+
+auto const property_def = geojson_string[assign_name] > lit(':') > value[assign_value];
+
+auto const properties_def = property[assign_property] % lit(',');
+
+auto const feature_part_def = feature_type
+    |
+    (lit("\"geometry\"") > lit(':') > lit('{') > geometry_tuple[assign_geometry] > lit('}'))
+    |
+    (lit("\"properties\"") > lit(':') > lit('{') > properties > lit('}'))
+    |
+    omit[geojson_string] > lit(':') > omit[value]
+    ;
+
+
+auto const feature_rule_def = lit('{') > feature_part % lit(',') > lit('}');
+
+auto const geometry_rule_def =  lit('{') > geometry_tuple[assign_geometry] > lit('}');
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+
+BOOST_SPIRIT_DEFINE(
+    feature_type,
+    geometry_type,
+    coordinates,
+    geometry_tuple,
+    property,
+    properties,
+    feature_part,
+    feature_rule,
+    geometry_rule
+    );
+#pragma GCC diagnostic pop
+
+}}}
+
+
+namespace mapnik { namespace json {
+
+grammar::feature_grammar_type const& feature_grammar()
+{
+    return grammar::feature_rule;
+}
+
+grammar::geometry_grammar_type const& geometry_grammar()
+{
+    return grammar::geometry_rule;
+}
+
+}}
+
+#endif // MAPNIK_JSON_FEATURE_GRAMMAR_X3_DEF_HPP
diff --git a/src/json/feature_grammar_x3.cpp b/src/json/feature_grammar_x3.cpp
new file mode 100644
index 000000000..78fa26453
--- /dev/null
+++ b/src/json/feature_grammar_x3.cpp
@@ -0,0 +1,34 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#include <mapnik/json/json_grammar_config.hpp>
+#include <mapnik/json/feature_grammar_x3_def.hpp>
+
+namespace mapnik { namespace json { namespace grammar {
+
+BOOST_SPIRIT_INSTANTIATE(geometry_grammar_type, iterator_type, geometry_context_type);
+BOOST_SPIRIT_INSTANTIATE(feature_grammar_type, iterator_type, feature_context_type);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(geometry_grammar_type, iterator_type, geometry_context_type);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(feature_grammar_type, iterator_type, feature_context_type);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(feature_grammar_type, iterator_type, feature_context_const_type);
+
+}}}

From be4f9ca79bf8e96e335a1364a49546b3503270b3 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 25 Nov 2016 16:46:10 +0100
Subject: [PATCH 089/328] add missing context type definitions +
 BOOST_SPIRIT_INSTANTIATE_UNUSED macro to instantiate `parse_rule` with
 `boost::spirit::x3::unused_type` attribute

---
 include/mapnik/json/json_grammar_config.hpp | 28 +++++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/include/mapnik/json/json_grammar_config.hpp b/include/mapnik/json/json_grammar_config.hpp
index b6fba2962..b00c4d73f 100644
--- a/include/mapnik/json/json_grammar_config.hpp
+++ b/include/mapnik/json/json_grammar_config.hpp
@@ -60,9 +60,6 @@ constexpr char const* wkn_to_string(well_known_names val)
     }
 }
 
-struct keys_tag;
-struct transcoder_tag;
-struct feature_tag;
 
 using keys_map = boost::bimap<boost::bimaps::unordered_set_of<std::string>,
                               boost::bimaps::set_of<int>>;
@@ -82,21 +79,42 @@ inline keys_map get_keys()
 
 namespace grammar {
 
+struct keys_tag;
+struct transcoder_tag;
+struct feature_tag;
+
 namespace x3 = boost::spirit::x3;
 using space_type = x3::standard::space_type;
 using iterator_type = char const*;
+
+using phrase_parse_context_type = x3::phrase_parse_context<space_type>::type;
 using context_type = x3::with_context<keys_tag,
                                       std::reference_wrapper<keys_map> const,
-                                      x3::phrase_parse_context<space_type>::type>::type;
+                                      phrase_parse_context_type>::type;
 
 using geometry_context_type = x3::with_context<feature_tag,
                                                std::reference_wrapper<mapnik::feature_impl> const,
-                                               x3::phrase_parse_context<space_type>::type>::type;
+                                               phrase_parse_context_type>::type;
 
 using feature_context_type = x3::with_context<transcoder_tag,
                                               std::reference_wrapper<mapnik::transcoder> const,
                                               geometry_context_type>::type;
 
+// our spirit x3 grammars needs this one with changed order of feature_impl and transcoder (??)
+using feature_context_const_type = x3::with_context<feature_tag,
+                                                    std::reference_wrapper<mapnik::feature_impl> const,
+                                                    x3::with_context<transcoder_tag,
+                                                                     std::reference_wrapper<mapnik::transcoder const> const,
+                                                                     phrase_parse_context_type>::type>::type;
+
+// helper macro
+#define BOOST_SPIRIT_INSTANTIATE_UNUSED(rule_type, Iterator, Context)   \
+    template bool parse_rule<Iterator, Context, boost::spirit::x3::unused_type const>( \
+        rule_type rule_                                                 \
+        , Iterator& first, Iterator const& last                         \
+        , Context const& context, boost::spirit::x3::unused_type const& ); \
+    /***/
+
 }}}
 
 #endif // MAPNIK_JSON_GRAMMAR_CONFIG_HPP

From 44fc648cad3fd8199fae6be4c34a1c78c29e51fc Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 25 Nov 2016 16:47:40 +0100
Subject: [PATCH 090/328] move extract_bounding_boxes_x3 back into
 mapnik-json.a

---
 src/json/extract_bounding_boxes_x3.cpp        |   0
 .../extract_bounding_boxes_x3.cpp             | 233 ------------------
 2 files changed, 233 deletions(-)
 create mode 100644 src/json/extract_bounding_boxes_x3.cpp
 delete mode 100644 utils/mapnik-index/extract_bounding_boxes_x3.cpp

diff --git a/src/json/extract_bounding_boxes_x3.cpp b/src/json/extract_bounding_boxes_x3.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/utils/mapnik-index/extract_bounding_boxes_x3.cpp b/utils/mapnik-index/extract_bounding_boxes_x3.cpp
deleted file mode 100644
index da0827881..000000000
--- a/utils/mapnik-index/extract_bounding_boxes_x3.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2016 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#include <mapnik/box2d.hpp>
-#include <mapnik/json/extract_bounding_boxes_x3.hpp>
-#include <mapnik/json/json_grammar_config.hpp>
-#include <mapnik/json/geojson_grammar_x3_def.hpp>
-#include <mapnik/json/unicode_string_grammar_x3_def.hpp>
-#include <mapnik/json/positions_grammar_x3_def.hpp>
-
-namespace mapnik { namespace json {
-
-template <typename Box>
-struct calculate_bounding_box
-{
-    calculate_bounding_box(Box & box)
-        : box_(box) {}
-
-    void operator()(mapnik::json::point const& pt) const
-    {
-        box_.init(pt.x, pt.y);
-    }
-
-    void operator()(mapnik::json::ring const& ring) const
-    {
-        for (auto const& pt : ring)
-        {
-            if (!box_.valid()) box_.init(pt.x, pt.y);
-            else box_.expand_to_include(pt.x, pt.y);
-        }
-    }
-
-    void operator()(mapnik::json::rings const& rings) const
-    {
-        for (auto const& ring : rings)
-        {
-            operator()(ring);
-            break; // consider first ring only
-        }
-    }
-
-    void operator()(mapnik::json::rings_array const& rings_array) const
-    {
-        for (auto const& rings : rings_array)
-        {
-            operator()(rings);
-        }
-    }
-
-    template <typename T>
-    void operator() (T const& ) const {}
-
-    Box & box_;
-};
-
-namespace grammar {
-
-namespace x3 = boost::spirit::x3;
-
-using base_iterator_type = char const*;
-using x3::lit;
-using x3::omit;
-using x3::raw;
-using x3::char_;
-using x3::eps;
-
-struct feature_callback_tag;
-
-auto on_feature_callback = [] (auto const& ctx)
-{
-    // call our callback
-    x3::get<feature_callback_tag>(ctx)(_attr(ctx));
-};
-
-namespace { auto const& geojson_value = geojson_grammar();}
-// import unicode string rule
-//namespace { auto const& geojson_string = unicode_string_grammar(); }
-// import positions rule
-//namespace { auto const& positions_rule = positions_grammar(); }
-
-// extract bounding box from GeoJSON Feature
-
-struct bracket_tag ;
-
-auto check_brackets = [](auto const& ctx)
-{
-    _pass(ctx) = (x3::get<bracket_tag>(ctx) > 0);
-};
-
-auto open_bracket = [](auto const& ctx)
-{
-    ++x3::get<bracket_tag>(ctx);
-};
-
-auto close_bracket = [](auto const& ctx)
-{
-    --x3::get<bracket_tag>(ctx);
-};
-
-auto assign_range = [](auto const& ctx)
-{
-    std::get<0>(_val(ctx)) = std::move(_attr(ctx));
-};
-
-auto assign_bbox = [](auto const& ctx)
-{
-    std::get<1>(_val(ctx)) = std::move(_attr(ctx));
-};
-
-auto extract_bounding_box = [](auto const& ctx)
-{
-    mapnik::box2d<float> bbox;
-    calculate_bounding_box<mapnik::box2d<float>> visitor(bbox);
-    mapnik::util::apply_visitor(visitor, _attr(ctx));
-    _val(ctx) = std::move(bbox);
-};
-
-auto const coordinates_rule = x3::rule<struct coordinates_rule_tag, mapnik::box2d<float> > {}
-    = lit("\"coordinates\"") >> lit(':') >> positions_rule[extract_bounding_box];
-
-auto const bounding_box = x3::rule<struct bounding_box_rule_tag, std::tuple<boost::iterator_range<base_iterator_type>,mapnik::box2d<float>>> {}
-    = raw[lit('{')[open_bracket] >> *(eps[check_brackets] >>
-                                  (lit("\"FeatureCollection\"") > eps(false)
-                                   |
-                                   lit('{')[open_bracket]
-                                   |
-                                   lit('}')[close_bracket]
-                                   |
-                                   coordinates_rule[assign_bbox]
-                                   |
-                                   omit[geojson_string]
-                                   |
-                                   omit[char_]))][assign_range];
-
-
-auto const feature = bounding_box[on_feature_callback];
-
-auto const key_value_ = omit[geojson_string] > lit(':') > omit[geojson_value] ;
-
-auto const features = lit("\"features\"")
-    > lit(':') > lit('[') > -(omit[feature] % lit(',')) > lit(']');
-
-auto const type = lit("\"type\"") > lit(':') > lit("\"FeatureCollection\"");
-
-auto const feature_collection = x3::rule<struct feature_collection_tag> {}
-    = lit('{') > (( type | features | key_value_) % lit(',')) > lit('}');
-
-
-}
-
-namespace {
-struct collect_features
-{
-    collect_features(std::vector<mapnik::json::geojson_value> & values)
-        : values_(values) {}
-    void operator() (mapnik::json::geojson_value && val) const
-    {
-        values_.push_back(std::move(val));
-    }
-    std::vector<mapnik::json::geojson_value> & values_;
-};
-
-template <typename Iterator, typename Boxes>
-struct extract_positions
-{
-    extract_positions(Iterator start, Boxes & boxes)
-        : start_(start),
-          boxes_(boxes) {}
-
-    template <typename T>
-    void operator() (T const& val) const
-    {
-        auto const& r = std::get<0>(val);
-        mapnik::box2d<float> const& bbox = std::get<1>(val);
-        auto offset = std::distance(start_, r.begin());
-        auto size = std::distance(r.begin(), r.end());
-        boxes_.emplace_back(std::make_pair(bbox,std::make_pair(offset, size)));
-        //boxes_.emplace_back(std::make_tuple(bbox,offset, size));
-    }
-    Iterator start_;
-    Boxes & boxes_;
-};
-
-}
-
-template <typename Iterator, typename Boxes>
-void extract_bounding_boxes(Iterator start, Iterator end, Boxes & boxes)
-{
-    using namespace boost::spirit;
-    using space_type = mapnik::json::grammar::space_type;
-    using iterator_type = Iterator;
-    using boxes_type = Boxes;
-
-    extract_positions<iterator_type, boxes_type> callback(start, boxes);
-    auto keys = mapnik::json::get_keys();
-    std::size_t bracket_counter = 0;
-    auto feature_collection_impl = x3::with<mapnik::json::grammar::bracket_tag>(std::ref(bracket_counter))
-        [x3::with<mapnik::json::keys_tag>(std::ref(keys))
-         [x3::with<mapnik::json::grammar::feature_callback_tag>(std::ref(callback))
-          [mapnik::json::grammar::feature_collection]
-             ]];
-
-    if (!x3::phrase_parse(start, end, feature_collection_impl, space_type()))
-    {
-        throw std::runtime_error("Can't extract bounding boxes");
-    }
-
-}
-
-using box_type = mapnik::box2d<float>;
-using boxes_type = std::vector<std::pair<box_type, std::pair<std::size_t, std::size_t>>>;
-using base_iterator_type = char const*;
-template void extract_bounding_boxes<base_iterator_type, boxes_type>(base_iterator_type, base_iterator_type, boxes_type&);
-}}

From 00b2bf013ad99be85ada680e0071281242097aee Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 25 Nov 2016 16:48:56 +0100
Subject: [PATCH 091/328] add missing generic_json_grammar_x3.cpp

---
 src/json/generic_json_grammar_x3.cpp | 36 ++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 src/json/generic_json_grammar_x3.cpp

diff --git a/src/json/generic_json_grammar_x3.cpp b/src/json/generic_json_grammar_x3.cpp
new file mode 100644
index 000000000..9064e0555
--- /dev/null
+++ b/src/json/generic_json_grammar_x3.cpp
@@ -0,0 +1,36 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#include <mapnik/json/json_grammar_config.hpp>
+#include <mapnik/json/generic_json_grammar_x3_def.hpp>
+
+namespace mapnik { namespace json { namespace grammar {
+
+BOOST_SPIRIT_INSTANTIATE(generic_json_grammar_type, iterator_type, phrase_parse_context_type);
+BOOST_SPIRIT_INSTANTIATE(generic_json_grammar_type, iterator_type, context_type);
+BOOST_SPIRIT_INSTANTIATE(generic_json_grammar_type, iterator_type, geometry_context_type);
+BOOST_SPIRIT_INSTANTIATE(generic_json_grammar_type, iterator_type, feature_context_type);
+BOOST_SPIRIT_INSTANTIATE(generic_json_grammar_type, iterator_type, feature_context_const_type);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(generic_json_grammar_type, iterator_type, geometry_context_type);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(generic_json_grammar_type, iterator_type, feature_context_type);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(generic_json_grammar_type, iterator_type, feature_context_const_type);
+}}}

From 8a436c8cdc3756c02d4abb91d48266e8c30dc89a Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 25 Nov 2016 16:49:42 +0100
Subject: [PATCH 092/328] add extract_bounding_boxes_x3 parser configuration

---
 .../json/extract_bounding_boxes_x3_config.hpp | 92 +++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 include/mapnik/json/extract_bounding_boxes_x3_config.hpp

diff --git a/include/mapnik/json/extract_bounding_boxes_x3_config.hpp b/include/mapnik/json/extract_bounding_boxes_x3_config.hpp
new file mode 100644
index 000000000..8cdf9f03e
--- /dev/null
+++ b/include/mapnik/json/extract_bounding_boxes_x3_config.hpp
@@ -0,0 +1,92 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_JSON_EXTRACT_BOUNDING_BOXES_CONFIG_HPP
+#define MAPNIK_JSON_EXTRACT_BOUNDING_BOXES_CONFIG_HPP
+
+#include <mapnik/json/json_grammar_config.hpp>
+#include <mapnik/box2d.hpp>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#pragma GCC diagnostic pop
+
+//auto feature_collection_impl = x3::with<mapnik::json::grammar::bracket_tag>(std::ref(bracket_counter))
+// [x3::with<mapnik::json::grammar::keys_tag>(std::ref(keys))
+//       [x3::with<mapnik::json::grammar::feature_callback_tag>(std::ref(callback))
+//        [mapnik::json::grammar::feature_collection]
+//           ]];
+
+namespace mapnik { namespace json {
+
+template <typename Iterator, typename Boxes>
+struct extract_positions
+{
+    extract_positions(Iterator start, Boxes & boxes)
+        : start_(start),
+          boxes_(boxes) {}
+
+    template <typename T>
+    void operator() (T const& val) const
+    {
+        auto const& r = std::get<0>(val);
+        mapnik::box2d<float> const& bbox = std::get<1>(val);
+        auto offset = std::distance(start_, r.begin());
+        auto size = std::distance(r.begin(), r.end());
+        boxes_.emplace_back(std::make_pair(bbox,std::make_pair(offset, size)));
+        //boxes_.emplace_back(std::make_tuple(bbox,offset, size));
+    }
+    Iterator start_;
+    Boxes & boxes_;
+};
+
+using box_type = mapnik::box2d<float>;
+using boxes_type = std::vector<std::pair<box_type, std::pair<std::size_t, std::size_t>>>;
+using callback_type = extract_positions<grammar::iterator_type, boxes_type>;
+
+namespace grammar {
+
+struct bracket_tag;
+struct feature_callback_tag;
+
+namespace x3 = boost::spirit::x3;
+using space_type = x3::standard::space_type;
+//using iterator_type = char const*;
+
+using phrase_parse_context_type = x3::phrase_parse_context<space_type>::type;
+
+using context_type = x3::with_context<keys_tag,
+                                      std::reference_wrapper<keys_map> const,
+                                      phrase_parse_context_type>::type;
+
+using extract_bounding_boxes_context_type =
+    x3::with_context<bracket_tag,
+                     std::reference_wrapper<std::size_t> const,
+                     x3::with_context<feature_callback_tag,
+                                      std::reference_wrapper<callback_type> const,
+                                      context_type>::type>::type;
+
+
+}}}
+
+#endif // MAPNIK_JSON_EXTRACT_BOUNDING_BOXES_CONFIG_HPP

From 236d42402f6e7069521c6f34396bbfe15a327107 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 25 Nov 2016 16:50:15 +0100
Subject: [PATCH 093/328] instatiate parse_rules via BOOST_SPIRIT_INSTANTIATE

---
 src/json/geojson_grammar_x3.cpp        |  3 +--
 src/json/positions_grammar_x3.cpp      |  8 ++++++--
 src/json/unicode_string_grammar_x3.cpp | 11 +++++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/json/geojson_grammar_x3.cpp b/src/json/geojson_grammar_x3.cpp
index dd3684655..6ded54c21 100644
--- a/src/json/geojson_grammar_x3.cpp
+++ b/src/json/geojson_grammar_x3.cpp
@@ -25,6 +25,5 @@
 
 namespace mapnik { namespace json { namespace grammar {
 BOOST_SPIRIT_INSTANTIATE(geojson_grammar_type, iterator_type, context_type);
-//BOOST_SPIRIT_INSTANTIATE(geojson_grammar_type, iterator_type, geometry_context_type);
-//BOOST_SPIRIT_INSTANTIATE(geojson_grammar_type, iterator_type, feature_context_type);
+BOOST_SPIRIT_INSTANTIATE(key_value_type, iterator_type, context_type);
 }}}
diff --git a/src/json/positions_grammar_x3.cpp b/src/json/positions_grammar_x3.cpp
index 8edf6c985..f1ed01cf9 100644
--- a/src/json/positions_grammar_x3.cpp
+++ b/src/json/positions_grammar_x3.cpp
@@ -24,7 +24,11 @@
 #include <mapnik/json/positions_grammar_x3_def.hpp>
 
 namespace mapnik { namespace json { namespace grammar {
+
+BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, phrase_parse_context_type);
 BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, context_type);
-//BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, geometry_context_type);
-//BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, feature_context_type);
+BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, geometry_context_type);
+BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, feature_context_type);
+BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, feature_context_const_type);
+
 }}}
diff --git a/src/json/unicode_string_grammar_x3.cpp b/src/json/unicode_string_grammar_x3.cpp
index 888e3340a..7a9b2d007 100644
--- a/src/json/unicode_string_grammar_x3.cpp
+++ b/src/json/unicode_string_grammar_x3.cpp
@@ -24,7 +24,14 @@
 #include <mapnik/json/json_grammar_config.hpp>
 
 namespace mapnik { namespace json { namespace grammar {
+
+BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, phrase_parse_context_type);
 BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, context_type);
-//BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, geometry_context_type);
-//BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, feature_context_type);
+BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, geometry_context_type);
+BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, feature_context_type);
+BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, feature_context_const_type);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, geometry_context_type);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, feature_context_type);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, feature_context_const_type);
+
 }}}

From 7a819d94faff59509ec42f2ac6598d6d589f6e64 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 25 Nov 2016 16:51:15 +0100
Subject: [PATCH 094/328] manually add missing parse_rule instantiation (FIXME)
 <-- must a better way perhaps via adding another macro

---
 src/json/geojson_grammar_x3.cpp        |  11 +-
 src/json/parse_feature.cpp             | 223 ++-----------------------
 src/json/positions_grammar_x3.cpp      |   8 +-
 src/json/unicode_string_grammar_x3.cpp |   9 +
 4 files changed, 36 insertions(+), 215 deletions(-)

diff --git a/src/json/geojson_grammar_x3.cpp b/src/json/geojson_grammar_x3.cpp
index 6ded54c21..5d3964fe1 100644
--- a/src/json/geojson_grammar_x3.cpp
+++ b/src/json/geojson_grammar_x3.cpp
@@ -20,10 +20,19 @@
  *
  *****************************************************************************/
 
-#include <mapnik/json/json_grammar_config.hpp>
+
 #include <mapnik/json/geojson_grammar_x3_def.hpp>
+#include <mapnik/json/json_grammar_config.hpp>
+#include <mapnik/json/extract_bounding_boxes_x3_config.hpp>
 
 namespace mapnik { namespace json { namespace grammar {
+
 BOOST_SPIRIT_INSTANTIATE(geojson_grammar_type, iterator_type, context_type);
 BOOST_SPIRIT_INSTANTIATE(key_value_type, iterator_type, context_type);
+
+BOOST_SPIRIT_INSTANTIATE(geojson_grammar_type, iterator_type, extract_bounding_boxes_context_type);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(geojson_grammar_type, iterator_type, extract_bounding_boxes_context_type);
 }}}
+
+
+template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::__1::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, boost::hash<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >, std::__1::equal_to<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > >, boost::bimaps::set_of<int, std::__1::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::__1::reference_wrapper<mapnik::json::extract_positions<char const*, std::__1::vector<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> >, std::__1::allocator<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::__1::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > >, boost::spirit::x3::unused_type const>(boost::spirit::x3::rule<mapnik::json::grammar::geojson_tag, mapnik::json::geojson_value, false>, char const*&, char const* const&, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::__1::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, boost::hash<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >, std::__1::equal_to<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > >, boost::bimaps::set_of<int, std::__1::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::__1::reference_wrapper<mapnik::json::extract_positions<char const*, std::__1::vector<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> >, std::__1::allocator<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::__1::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > > const&, boost::spirit::x3::unused_type const&);
diff --git a/src/json/parse_feature.cpp b/src/json/parse_feature.cpp
index bf4282d86..74941257f 100644
--- a/src/json/parse_feature.cpp
+++ b/src/json/parse_feature.cpp
@@ -22,226 +22,22 @@
 
 #include <mapnik/json/parse_feature.hpp>
 #include <mapnik/json/json_grammar_config.hpp>
-#include <mapnik/json/generic_json_grammar_x3_def.hpp>
-#include <mapnik/json/unicode_string_grammar_x3_def.hpp>
-#include <mapnik/json/positions_grammar_x3_def.hpp>
+#include <mapnik/json/feature_grammar_x3.hpp>
 #include <mapnik/json/create_geometry.hpp>
 #include <mapnik/util/conversions.hpp>
-
 #include <mapnik/value.hpp>
 #include <mapnik/geometry/geometry_types.hpp>
 
-namespace mapnik { namespace json { namespace {
-
-struct stringifier
-{
-    std::string operator()(std::string const& val) const
-    {
-        return "\"" + val + "\"";
-    }
-
-    std::string operator()(value_null) const
-    {
-        return "null";
-    }
-
-    std::string operator()(value_bool val) const
-    {
-        return val ? "true" : "false";
-    }
-
-    std::string operator()(value_integer val) const
-    {
-        std::string str;
-        util::to_string(str, val);
-        return str;
-    }
-
-    std::string operator()(value_double val) const
-    {
-        std::string str;
-        util::to_string(str, val);
-        return str;
-    }
-
-    std::string operator()(std::vector<mapnik::json::json_value> const& array) const
-    {
-        std::string str = "[";
-        bool first = true;
-        for (auto const& val : array)
-        {
-            if (first) first = false;
-            else str += ",";
-            str += mapnik::util::apply_visitor(*this, val);
-        }
-        str += "]";
-        return str;
-    }
-
-    std::string operator()(std::vector<std::pair<std::string, mapnik::json::json_value>> const& object) const
-    {
-        std::string str = "{";
-        bool first = true;
-        for (auto const& kv : object)
-        {
-            if (first) first = false;
-            else str += ",";
-            str +=  "\"" + kv.first + "\"";
-            str += ":";
-            str += mapnik::util::apply_visitor(*this, kv.second);
-        }
-        str += "}";
-        return str;
-    }
-};
-
-struct attribute_value_visitor
-{
-public:
-    attribute_value_visitor(mapnik::transcoder const& tr)
-        : tr_(tr) {}
-
-    mapnik::value operator()(std::string const& val) const
-    {
-        return mapnik::value(tr_.transcode(val.c_str()));
-    }
-
-    mapnik::value operator()(std::vector<mapnik::json::json_value> const& array) const
-    {
-        std::string str = stringifier()(array);
-        return mapnik::value(tr_.transcode(str.c_str()));
-    }
-
-    mapnik::value operator()(std::vector<std::pair<std::string, mapnik::json::json_value> > const& object) const
-    {
-        std::string str = stringifier()(object);
-        return mapnik::value(tr_.transcode(str.c_str()));
-    }
-
-    template <typename T>
-    mapnik::value operator()(T const& val) const
-    {
-        return mapnik::value(val);
-    }
-
-    mapnik::transcoder const& tr_;
-};
-
-
-namespace x3 = boost::spirit::x3;
-using x3::lit;
-using x3::omit;
-using x3::char_;
-
-auto const& value = mapnik::json::generic_json_grammar();
-// import unicode string rule
-auto const& geojson_string = unicode_string_grammar();
-// import positions rule
-auto const& positions_rule = positions_grammar();
-// geometry types symbols
-struct geometry_type_ : x3::symbols<mapnik::geometry::geometry_types>
-{
-    geometry_type_()
-    {
-        add
-            ("\"Point\"", mapnik::geometry::geometry_types::Point)
-            ("\"LineString\"", mapnik::geometry::geometry_types::LineString)
-            ("\"Polygon\"", mapnik::geometry::geometry_types::Polygon)
-            ("\"MultiPoint\"", mapnik::geometry::geometry_types::MultiPoint)
-            ("\"MultiLineString\"", mapnik::geometry::geometry_types::MultiLineString )
-            ("\"MultiPolygon\"",mapnik::geometry::geometry_types::MultiPolygon)
-            ("\"GeometryCollection\"",mapnik::geometry::geometry_types::GeometryCollection)
-            ;
-    }
-} geometry_type_symbols;
-
-auto assign_name = [](auto const& ctx)
-{
-    std::get<0>(_val(ctx)) = std::move(_attr(ctx));
-};
-auto assign_value = [](auto const& ctx)
-{
-    std::get<1>(_val(ctx)) = std::move(_attr(ctx));
-};
-
-auto const assign_geometry_type = [] (auto const& ctx)
-{
-    std::get<0>(_val(ctx)) = _attr(ctx);
-};
-
-auto const assign_geometry = [] (auto const& ctx)
-{
-    mapnik::feature_impl & feature = x3::get<feature_tag>(ctx);
-    mapnik::geometry::geometry<double> geom;
-    auto const type = std::get<0>(_attr(ctx));
-    auto const& coordinates = std::get<1>(_attr(ctx));
-    mapnik::json::create_geometry(geom, type, coordinates);
-    feature.set_geometry(std::move(geom));
-};
-
-auto const assign_positions = [] (auto const& ctx)
-{
-    std::get<1>(_val(ctx)) = std::move(_attr(ctx));
-};
-
-auto assign_property = [](auto const& ctx)
-{
-    mapnik::feature_impl & feature = x3::get<feature_tag>(ctx);
-    mapnik::transcoder const& tr = x3::get<transcoder_tag>(ctx);
-    feature.put_new(std::get<0>(_attr(ctx)),
-                    mapnik::util::apply_visitor(attribute_value_visitor(tr),
-                                                std::get<1>(_attr(ctx))));
-};
-
-
-auto const feature_type = lit("\"type\"") > lit(':') > lit("\"Feature\"");
-auto const geometry_type = x3::rule<struct geometry_type_tag, mapnik::geometry::geometry_types> {} =
-    lit("\"type\"") > lit(':') > geometry_type_symbols;
-
-auto const coordinates = x3::rule<struct coordinates_tag, positions> {} =
-    lit("\"coordinates\"") > lit(':') > positions_rule
-    ;
-
-auto const geometry = x3::rule<struct geomerty_tag, std::tuple<mapnik::geometry::geometry_types, positions>> {} =
-    (geometry_type[assign_geometry_type]
-     |
-     coordinates[assign_positions]
-     |
-     (omit[geojson_string] > lit(':') > omit[value])) % lit(',')
-    ;
-
-auto const property = x3::rule<struct property, std::tuple<std::string, json_value>> {} =
-    geojson_string[assign_name] > lit(':') > value[assign_value]
-    ;
-
-auto const properties = x3::rule<struct properties_tag> {} =
-    property[assign_property] % lit(',')
-    ;
-auto const feature_part = x3::rule<struct feature_part_rule_tag> {} =
-    feature_type
-    |
-    (lit("\"geometry\"") > lit(':') > lit('{') > geometry[assign_geometry] > lit('}'))
-    |
-    (lit("\"properties\"") > lit(':') > lit('{') > properties > lit('}'))
-    |
-    omit[geojson_string] > lit(':') > omit[value]
-    ;
-
-auto const feature_rule = x3::rule<struct feature_rule_tag> {} =
-    lit('{') > feature_part % lit(',') > lit('}')
-    ;
-
-auto const geometry_rule = x3::rule<struct geometry_rule_tag> {} = lit('{') > geometry[assign_geometry] > lit('}');
-
-}
+namespace mapnik { namespace json {
 
 template <typename Iterator>
 void parse_feature(Iterator start, Iterator end, feature_impl& feature, mapnik::transcoder const& tr)
 {
+    namespace x3 = boost::spirit::x3;
     using space_type = mapnik::json::grammar::space_type;
-    auto grammar = x3::with<mapnik::json::transcoder_tag>(std::ref(tr))
-        [x3::with<mapnik::json::feature_tag>(std::ref(feature))
-         [ mapnik::json::feature_rule ]];
+    auto grammar = x3::with<mapnik::json::grammar::transcoder_tag>(std::ref(tr))
+        [x3::with<mapnik::json::grammar::feature_tag>(std::ref(feature))
+          [ mapnik::json::feature_grammar() ]];
     if (!x3::phrase_parse(start, end, grammar, space_type()))
     {
         throw std::runtime_error("Can't parser GeoJSON Feature");
@@ -251,16 +47,17 @@ void parse_feature(Iterator start, Iterator end, feature_impl& feature, mapnik::
 template <typename Iterator>
 void parse_geometry(Iterator start, Iterator end, feature_impl& feature)
 {
+    namespace x3 = boost::spirit::x3;
     using space_type = mapnik::json::grammar::space_type;
-    auto grammar = x3::with<mapnik::json::feature_tag>(std::ref(feature))
-        [ mapnik::json::geometry_rule ];
+    auto grammar = x3::with<mapnik::json::grammar::feature_tag>(std::ref(feature))
+        [ mapnik::json::geometry_grammar() ];
     if (!x3::phrase_parse(start, end, grammar, space_type()))
     {
         throw std::runtime_error("Can't parser GeoJSON Geometry");
     }
 }
 
-using iterator_type = char const* ;//mapnik::json::grammar::iterator_type;
+using iterator_type = mapnik::json::grammar::iterator_type;
 template void parse_feature<iterator_type>(iterator_type,iterator_type, feature_impl& feature, mapnik::transcoder const& tr);
 template void parse_geometry<iterator_type>(iterator_type,iterator_type, feature_impl& feature);
 
diff --git a/src/json/positions_grammar_x3.cpp b/src/json/positions_grammar_x3.cpp
index f1ed01cf9..9d5417e46 100644
--- a/src/json/positions_grammar_x3.cpp
+++ b/src/json/positions_grammar_x3.cpp
@@ -20,8 +20,9 @@
  *
  *****************************************************************************/
 
-#include <mapnik/json/json_grammar_config.hpp>
 #include <mapnik/json/positions_grammar_x3_def.hpp>
+#include <mapnik/json/json_grammar_config.hpp>
+#include <mapnik/json/extract_bounding_boxes_x3_config.hpp>
 
 namespace mapnik { namespace json { namespace grammar {
 
@@ -31,4 +32,9 @@ BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, geometry_context
 BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, feature_context_type);
 BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, feature_context_const_type);
 
+BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, extract_bounding_boxes_context_type);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(positions_grammar_type, iterator_type, extract_bounding_boxes_context_type);
 }}}
+
+
+template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::__1::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, boost::hash<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >, std::__1::equal_to<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > >, boost::bimaps::set_of<int, std::__1::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::__1::reference_wrapper<mapnik::json::extract_positions<char const*, std::__1::vector<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> >, std::__1::allocator<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::__1::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > >, mapbox::util::variant<mapnik::geometry::point<double>, std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::vector<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::allocator<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > > > >, std::__1::vector<std::__1::vector<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::allocator<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > > > >, std::__1::allocator<std::__1::vector<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::allocator<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > > > > > > > >(boost::spirit::x3::rule<mapnik::json::grammar::positions_tag, mapbox::util::variant<mapnik::geometry::point<double>, std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::vector<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::allocator<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > > > >, std::__1::vector<std::__1::vector<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::allocator<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > > > >, std::__1::allocator<std::__1::vector<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::allocator<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > > > > > > >, false>, char const*&, char const* const&, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::__1::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, boost::hash<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >, std::__1::equal_to<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > >, boost::bimaps::set_of<int, std::__1::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::__1::reference_wrapper<mapnik::json::extract_positions<char const*, std::__1::vector<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> >, std::__1::allocator<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::__1::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > > const&, mapbox::util::variant<mapnik::geometry::point<double>, std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::vector<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::allocator<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > > > >, std::__1::vector<std::__1::vector<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::allocator<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > > > >, std::__1::allocator<std::__1::vector<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::allocator<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > > > > > > >&);
diff --git a/src/json/unicode_string_grammar_x3.cpp b/src/json/unicode_string_grammar_x3.cpp
index 7a9b2d007..4626ecada 100644
--- a/src/json/unicode_string_grammar_x3.cpp
+++ b/src/json/unicode_string_grammar_x3.cpp
@@ -22,6 +22,7 @@
 
 #include <mapnik/json/unicode_string_grammar_x3_def.hpp>
 #include <mapnik/json/json_grammar_config.hpp>
+#include <mapnik/json/extract_bounding_boxes_x3_config.hpp>
 
 namespace mapnik { namespace json { namespace grammar {
 
@@ -34,4 +35,12 @@ BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, geom
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, feature_context_type);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, feature_context_const_type);
 
+BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_context_type);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_context_type);
 }}}
+
+
+template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::__1::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, boost::hash<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >, std::__1::equal_to<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > >, boost::bimaps::set_of<int, std::__1::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::__1::reference_wrapper<mapnik::json::extract_positions<char const*, std::__1::vector<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> >, std::__1::allocator<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::__1::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > >, boost::spirit::x3::unused_type const>(boost::spirit::x3::rule<mapnik::json::grammar::unicode_string_tag, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, false>, char const*&, char const* const&, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::__1::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, boost::hash<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >, std::__1::equal_to<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > >, boost::bimaps::set_of<int, std::__1::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::__1::reference_wrapper<mapnik::json::extract_positions<char const*, std::__1::vector<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> >, std::__1::allocator<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::__1::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > > const&, boost::spirit::x3::unused_type const&);
+
+
+template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::__1::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, boost::hash<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >, std::__1::equal_to<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > >, boost::bimaps::set_of<int, std::__1::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::__1::reference_wrapper<mapnik::json::extract_positions<char const*, std::__1::vector<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> >, std::__1::allocator<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::__1::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > >, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >(boost::spirit::x3::rule<mapnik::json::grammar::unicode_string_tag, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, false>, char const*&, char const* const&, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::__1::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, boost::hash<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >, std::__1::equal_to<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > >, boost::bimaps::set_of<int, std::__1::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::__1::reference_wrapper<mapnik::json::extract_positions<char const*, std::__1::vector<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> >, std::__1::allocator<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::__1::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > > const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >&);

From 7decec426d96ffa6e96625bd2559a4ac522149af Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 25 Nov 2016 16:52:19 +0100
Subject: [PATCH 095/328] mapnik-index update build script

---
 utils/mapnik-index/build.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/utils/mapnik-index/build.py b/utils/mapnik-index/build.py
index e04a81230..e2b9901a2 100644
--- a/utils/mapnik-index/build.py
+++ b/utils/mapnik-index/build.py
@@ -34,7 +34,6 @@ source = Split(
     process_csv_file.cpp
     process_geojson_file.cpp
     process_geojson_file_x3.cpp
-    extract_bounding_boxes_x3.cpp
     ../../plugins/input/csv/csv_utils.os
     """
     )

From 483f7095418b14c8d663c4848d8686e733473a91 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 25 Nov 2016 16:52:56 +0100
Subject: [PATCH 096/328] don't include xxx_def.hpp + make rules const

---
 include/mapnik/json/generic_json_grammar_x3_def.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/mapnik/json/generic_json_grammar_x3_def.hpp b/include/mapnik/json/generic_json_grammar_x3_def.hpp
index 390c2251e..64570eeb1 100644
--- a/include/mapnik/json/generic_json_grammar_x3_def.hpp
+++ b/include/mapnik/json/generic_json_grammar_x3_def.hpp
@@ -25,7 +25,7 @@
 
 #include <boost/fusion/include/std_pair.hpp>
 #include <mapnik/json/generic_json_grammar_x3.hpp>
-#include <mapnik/json/unicode_string_grammar_x3_def.hpp>
+#include <mapnik/json/unicode_string_grammar_x3.hpp>
 
 namespace mapnik { namespace json { namespace grammar {
 
@@ -69,9 +69,9 @@ using x3::string;
 generic_json_grammar_type const value("JSON Value");
 generic_json_key_value_type const key_value("JSON Object element");
 // rules
-x3::rule<class json_object_tag, json_object> object("JSON Object");
-x3::rule<class json_array_tag, json_array> array("JSON Array");
-x3::rule<class json_number_tag, json_value> number("JSON Number");
+x3::rule<class json_object_tag, json_object> const object("JSON Object");
+x3::rule<class json_array_tag, json_array> const array("JSON Array");
+x3::rule<class json_number_tag, json_value> const number("JSON Number");
 
 auto const json_double = x3::real_parser<value_double, x3::strict_real_policies<value_double>>();
 auto const json_integer = x3::int_parser<value_integer, 10, 1, -1>();

From a40d4ee83f6c994806c94ebda7594c1c3d2ce051 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 25 Nov 2016 17:01:01 +0100
Subject: [PATCH 097/328] Revert "move extract_bounding_boxes_x3 back into
 mapnik-json.a"

This reverts commit 44fc648cad3fd8199fae6be4c34a1c78c29e51fc.
---
 src/json/extract_bounding_boxes_x3.cpp        |   0
 .../extract_bounding_boxes_x3.cpp             | 233 ++++++++++++++++++
 2 files changed, 233 insertions(+)
 delete mode 100644 src/json/extract_bounding_boxes_x3.cpp
 create mode 100644 utils/mapnik-index/extract_bounding_boxes_x3.cpp

diff --git a/src/json/extract_bounding_boxes_x3.cpp b/src/json/extract_bounding_boxes_x3.cpp
deleted file mode 100644
index e69de29bb..000000000
diff --git a/utils/mapnik-index/extract_bounding_boxes_x3.cpp b/utils/mapnik-index/extract_bounding_boxes_x3.cpp
new file mode 100644
index 000000000..da0827881
--- /dev/null
+++ b/utils/mapnik-index/extract_bounding_boxes_x3.cpp
@@ -0,0 +1,233 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#include <mapnik/box2d.hpp>
+#include <mapnik/json/extract_bounding_boxes_x3.hpp>
+#include <mapnik/json/json_grammar_config.hpp>
+#include <mapnik/json/geojson_grammar_x3_def.hpp>
+#include <mapnik/json/unicode_string_grammar_x3_def.hpp>
+#include <mapnik/json/positions_grammar_x3_def.hpp>
+
+namespace mapnik { namespace json {
+
+template <typename Box>
+struct calculate_bounding_box
+{
+    calculate_bounding_box(Box & box)
+        : box_(box) {}
+
+    void operator()(mapnik::json::point const& pt) const
+    {
+        box_.init(pt.x, pt.y);
+    }
+
+    void operator()(mapnik::json::ring const& ring) const
+    {
+        for (auto const& pt : ring)
+        {
+            if (!box_.valid()) box_.init(pt.x, pt.y);
+            else box_.expand_to_include(pt.x, pt.y);
+        }
+    }
+
+    void operator()(mapnik::json::rings const& rings) const
+    {
+        for (auto const& ring : rings)
+        {
+            operator()(ring);
+            break; // consider first ring only
+        }
+    }
+
+    void operator()(mapnik::json::rings_array const& rings_array) const
+    {
+        for (auto const& rings : rings_array)
+        {
+            operator()(rings);
+        }
+    }
+
+    template <typename T>
+    void operator() (T const& ) const {}
+
+    Box & box_;
+};
+
+namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+
+using base_iterator_type = char const*;
+using x3::lit;
+using x3::omit;
+using x3::raw;
+using x3::char_;
+using x3::eps;
+
+struct feature_callback_tag;
+
+auto on_feature_callback = [] (auto const& ctx)
+{
+    // call our callback
+    x3::get<feature_callback_tag>(ctx)(_attr(ctx));
+};
+
+namespace { auto const& geojson_value = geojson_grammar();}
+// import unicode string rule
+//namespace { auto const& geojson_string = unicode_string_grammar(); }
+// import positions rule
+//namespace { auto const& positions_rule = positions_grammar(); }
+
+// extract bounding box from GeoJSON Feature
+
+struct bracket_tag ;
+
+auto check_brackets = [](auto const& ctx)
+{
+    _pass(ctx) = (x3::get<bracket_tag>(ctx) > 0);
+};
+
+auto open_bracket = [](auto const& ctx)
+{
+    ++x3::get<bracket_tag>(ctx);
+};
+
+auto close_bracket = [](auto const& ctx)
+{
+    --x3::get<bracket_tag>(ctx);
+};
+
+auto assign_range = [](auto const& ctx)
+{
+    std::get<0>(_val(ctx)) = std::move(_attr(ctx));
+};
+
+auto assign_bbox = [](auto const& ctx)
+{
+    std::get<1>(_val(ctx)) = std::move(_attr(ctx));
+};
+
+auto extract_bounding_box = [](auto const& ctx)
+{
+    mapnik::box2d<float> bbox;
+    calculate_bounding_box<mapnik::box2d<float>> visitor(bbox);
+    mapnik::util::apply_visitor(visitor, _attr(ctx));
+    _val(ctx) = std::move(bbox);
+};
+
+auto const coordinates_rule = x3::rule<struct coordinates_rule_tag, mapnik::box2d<float> > {}
+    = lit("\"coordinates\"") >> lit(':') >> positions_rule[extract_bounding_box];
+
+auto const bounding_box = x3::rule<struct bounding_box_rule_tag, std::tuple<boost::iterator_range<base_iterator_type>,mapnik::box2d<float>>> {}
+    = raw[lit('{')[open_bracket] >> *(eps[check_brackets] >>
+                                  (lit("\"FeatureCollection\"") > eps(false)
+                                   |
+                                   lit('{')[open_bracket]
+                                   |
+                                   lit('}')[close_bracket]
+                                   |
+                                   coordinates_rule[assign_bbox]
+                                   |
+                                   omit[geojson_string]
+                                   |
+                                   omit[char_]))][assign_range];
+
+
+auto const feature = bounding_box[on_feature_callback];
+
+auto const key_value_ = omit[geojson_string] > lit(':') > omit[geojson_value] ;
+
+auto const features = lit("\"features\"")
+    > lit(':') > lit('[') > -(omit[feature] % lit(',')) > lit(']');
+
+auto const type = lit("\"type\"") > lit(':') > lit("\"FeatureCollection\"");
+
+auto const feature_collection = x3::rule<struct feature_collection_tag> {}
+    = lit('{') > (( type | features | key_value_) % lit(',')) > lit('}');
+
+
+}
+
+namespace {
+struct collect_features
+{
+    collect_features(std::vector<mapnik::json::geojson_value> & values)
+        : values_(values) {}
+    void operator() (mapnik::json::geojson_value && val) const
+    {
+        values_.push_back(std::move(val));
+    }
+    std::vector<mapnik::json::geojson_value> & values_;
+};
+
+template <typename Iterator, typename Boxes>
+struct extract_positions
+{
+    extract_positions(Iterator start, Boxes & boxes)
+        : start_(start),
+          boxes_(boxes) {}
+
+    template <typename T>
+    void operator() (T const& val) const
+    {
+        auto const& r = std::get<0>(val);
+        mapnik::box2d<float> const& bbox = std::get<1>(val);
+        auto offset = std::distance(start_, r.begin());
+        auto size = std::distance(r.begin(), r.end());
+        boxes_.emplace_back(std::make_pair(bbox,std::make_pair(offset, size)));
+        //boxes_.emplace_back(std::make_tuple(bbox,offset, size));
+    }
+    Iterator start_;
+    Boxes & boxes_;
+};
+
+}
+
+template <typename Iterator, typename Boxes>
+void extract_bounding_boxes(Iterator start, Iterator end, Boxes & boxes)
+{
+    using namespace boost::spirit;
+    using space_type = mapnik::json::grammar::space_type;
+    using iterator_type = Iterator;
+    using boxes_type = Boxes;
+
+    extract_positions<iterator_type, boxes_type> callback(start, boxes);
+    auto keys = mapnik::json::get_keys();
+    std::size_t bracket_counter = 0;
+    auto feature_collection_impl = x3::with<mapnik::json::grammar::bracket_tag>(std::ref(bracket_counter))
+        [x3::with<mapnik::json::keys_tag>(std::ref(keys))
+         [x3::with<mapnik::json::grammar::feature_callback_tag>(std::ref(callback))
+          [mapnik::json::grammar::feature_collection]
+             ]];
+
+    if (!x3::phrase_parse(start, end, feature_collection_impl, space_type()))
+    {
+        throw std::runtime_error("Can't extract bounding boxes");
+    }
+
+}
+
+using box_type = mapnik::box2d<float>;
+using boxes_type = std::vector<std::pair<box_type, std::pair<std::size_t, std::size_t>>>;
+using base_iterator_type = char const*;
+template void extract_bounding_boxes<base_iterator_type, boxes_type>(base_iterator_type, base_iterator_type, boxes_type&);
+}}

From c5e44cc7a660a145871a9b5c19897fdb04171d68 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 25 Nov 2016 17:16:13 +0100
Subject: [PATCH 098/328] add missing extract_bounding_boxes_x3.cpp back

---
 .../json}/extract_bounding_boxes_x3.cpp       | 73 ++++++-------------
 1 file changed, 21 insertions(+), 52 deletions(-)
 rename {utils/mapnik-index => src/json}/extract_bounding_boxes_x3.cpp (71%)

diff --git a/utils/mapnik-index/extract_bounding_boxes_x3.cpp b/src/json/extract_bounding_boxes_x3.cpp
similarity index 71%
rename from utils/mapnik-index/extract_bounding_boxes_x3.cpp
rename to src/json/extract_bounding_boxes_x3.cpp
index da0827881..7ca64afc5 100644
--- a/utils/mapnik-index/extract_bounding_boxes_x3.cpp
+++ b/src/json/extract_bounding_boxes_x3.cpp
@@ -23,9 +23,10 @@
 #include <mapnik/box2d.hpp>
 #include <mapnik/json/extract_bounding_boxes_x3.hpp>
 #include <mapnik/json/json_grammar_config.hpp>
-#include <mapnik/json/geojson_grammar_x3_def.hpp>
-#include <mapnik/json/unicode_string_grammar_x3_def.hpp>
-#include <mapnik/json/positions_grammar_x3_def.hpp>
+#include <mapnik/json/extract_bounding_boxes_x3_config.hpp>
+#include <mapnik/json/geojson_grammar_x3.hpp>
+#include <mapnik/json/unicode_string_grammar_x3.hpp>
+#include <mapnik/json/positions_grammar_x3.hpp>
 
 namespace mapnik { namespace json {
 
@@ -93,9 +94,9 @@ auto on_feature_callback = [] (auto const& ctx)
 
 namespace { auto const& geojson_value = geojson_grammar();}
 // import unicode string rule
-//namespace { auto const& geojson_string = unicode_string_grammar(); }
+namespace { auto const& geojson_string = unicode_string_grammar(); }
 // import positions rule
-//namespace { auto const& positions_rule = positions_grammar(); }
+namespace { auto const& positions_rule = positions_grammar(); }
 
 // extract bounding box from GeoJSON Feature
 
@@ -134,11 +135,13 @@ auto extract_bounding_box = [](auto const& ctx)
     _val(ctx) = std::move(bbox);
 };
 
-auto const coordinates_rule = x3::rule<struct coordinates_rule_tag, mapnik::box2d<float> > {}
-    = lit("\"coordinates\"") >> lit(':') >> positions_rule[extract_bounding_box];
+x3::rule<struct coordinates_rule_tag, mapnik::box2d<float> > const coordinates_rule = "Coordinates";
+x3::rule<struct bounding_box_rule_tag, std::tuple<boost::iterator_range<base_iterator_type>,mapnik::box2d<float>>> const bounding_box = "Bounding Box";
+x3::rule<struct feature_collection_tag> const feature_collection = "Feature Collection";
 
-auto const bounding_box = x3::rule<struct bounding_box_rule_tag, std::tuple<boost::iterator_range<base_iterator_type>,mapnik::box2d<float>>> {}
-    = raw[lit('{')[open_bracket] >> *(eps[check_brackets] >>
+auto const coordinates_rule_def = lit("\"coordinates\"") >> lit(':') >> positions_rule[extract_bounding_box];
+
+auto const bounding_box_def = raw[lit('{')[open_bracket] >> *(eps[check_brackets] >>
                                   (lit("\"FeatureCollection\"") > eps(false)
                                    |
                                    lit('{')[open_bracket]
@@ -161,45 +164,13 @@ auto const features = lit("\"features\"")
 
 auto const type = lit("\"type\"") > lit(':') > lit("\"FeatureCollection\"");
 
-auto const feature_collection = x3::rule<struct feature_collection_tag> {}
-    = lit('{') > (( type | features | key_value_) % lit(',')) > lit('}');
-
-
-}
-
-namespace {
-struct collect_features
-{
-    collect_features(std::vector<mapnik::json::geojson_value> & values)
-        : values_(values) {}
-    void operator() (mapnik::json::geojson_value && val) const
-    {
-        values_.push_back(std::move(val));
-    }
-    std::vector<mapnik::json::geojson_value> & values_;
-};
-
-template <typename Iterator, typename Boxes>
-struct extract_positions
-{
-    extract_positions(Iterator start, Boxes & boxes)
-        : start_(start),
-          boxes_(boxes) {}
-
-    template <typename T>
-    void operator() (T const& val) const
-    {
-        auto const& r = std::get<0>(val);
-        mapnik::box2d<float> const& bbox = std::get<1>(val);
-        auto offset = std::distance(start_, r.begin());
-        auto size = std::distance(r.begin(), r.end());
-        boxes_.emplace_back(std::make_pair(bbox,std::make_pair(offset, size)));
-        //boxes_.emplace_back(std::make_tuple(bbox,offset, size));
-    }
-    Iterator start_;
-    Boxes & boxes_;
-};
+auto const feature_collection_def = lit('{') > (( type | features | key_value_) % lit(',')) > lit('}');
 
+BOOST_SPIRIT_DEFINE (
+    coordinates_rule,
+    bounding_box,
+    feature_collection
+    );
 }
 
 template <typename Iterator, typename Boxes>
@@ -214,8 +185,8 @@ void extract_bounding_boxes(Iterator start, Iterator end, Boxes & boxes)
     auto keys = mapnik::json::get_keys();
     std::size_t bracket_counter = 0;
     auto feature_collection_impl = x3::with<mapnik::json::grammar::bracket_tag>(std::ref(bracket_counter))
-        [x3::with<mapnik::json::keys_tag>(std::ref(keys))
-         [x3::with<mapnik::json::grammar::feature_callback_tag>(std::ref(callback))
+        [x3::with<mapnik::json::grammar::feature_callback_tag>(std::ref(callback))
+         [x3::with<mapnik::json::keys_tag>(std::ref(keys))
           [mapnik::json::grammar::feature_collection]
              ]];
 
@@ -225,9 +196,7 @@ void extract_bounding_boxes(Iterator start, Iterator end, Boxes & boxes)
     }
 
 }
-
-using box_type = mapnik::box2d<float>;
-using boxes_type = std::vector<std::pair<box_type, std::pair<std::size_t, std::size_t>>>;
 using base_iterator_type = char const*;
 template void extract_bounding_boxes<base_iterator_type, boxes_type>(base_iterator_type, base_iterator_type, boxes_type&);
+
 }}

From 1a16dfd8c266a5262d90b81a73520739473c556f Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 25 Nov 2016 17:19:30 +0100
Subject: [PATCH 099/328] fix namespace

---
 src/json/extract_bounding_boxes_x3.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/json/extract_bounding_boxes_x3.cpp b/src/json/extract_bounding_boxes_x3.cpp
index 7ca64afc5..8aae1db1f 100644
--- a/src/json/extract_bounding_boxes_x3.cpp
+++ b/src/json/extract_bounding_boxes_x3.cpp
@@ -186,7 +186,7 @@ void extract_bounding_boxes(Iterator start, Iterator end, Boxes & boxes)
     std::size_t bracket_counter = 0;
     auto feature_collection_impl = x3::with<mapnik::json::grammar::bracket_tag>(std::ref(bracket_counter))
         [x3::with<mapnik::json::grammar::feature_callback_tag>(std::ref(callback))
-         [x3::with<mapnik::json::keys_tag>(std::ref(keys))
+         [x3::with<mapnik::json::grammar::keys_tag>(std::ref(keys))
           [mapnik::json::grammar::feature_collection]
              ]];
 

From 8158293b16a70b0ca4a3c70b49ec1fe99391785f Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 25 Nov 2016 17:47:41 +0100
Subject: [PATCH 100/328] fix std:: namespace :)

---
 src/json/geojson_grammar_x3.cpp        | 2 +-
 src/json/positions_grammar_x3.cpp      | 2 +-
 src/json/unicode_string_grammar_x3.cpp | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/json/geojson_grammar_x3.cpp b/src/json/geojson_grammar_x3.cpp
index 5d3964fe1..cf08bab75 100644
--- a/src/json/geojson_grammar_x3.cpp
+++ b/src/json/geojson_grammar_x3.cpp
@@ -35,4 +35,4 @@ BOOST_SPIRIT_INSTANTIATE_UNUSED(geojson_grammar_type, iterator_type, extract_bou
 }}}
 
 
-template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::__1::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, boost::hash<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >, std::__1::equal_to<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > >, boost::bimaps::set_of<int, std::__1::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::__1::reference_wrapper<mapnik::json::extract_positions<char const*, std::__1::vector<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> >, std::__1::allocator<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::__1::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > >, boost::spirit::x3::unused_type const>(boost::spirit::x3::rule<mapnik::json::grammar::geojson_tag, mapnik::json::geojson_value, false>, char const*&, char const* const&, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::__1::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, boost::hash<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >, std::__1::equal_to<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > >, boost::bimaps::set_of<int, std::__1::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::__1::reference_wrapper<mapnik::json::extract_positions<char const*, std::__1::vector<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> >, std::__1::allocator<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::__1::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > > const&, boost::spirit::x3::unused_type const&);
+template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::hash<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::equal_to<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, boost::bimaps::set_of<int, std::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::reference_wrapper<mapnik::json::extract_positions<char const*, std::vector<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> >, std::allocator<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > >, boost::spirit::x3::unused_type const>(boost::spirit::x3::rule<mapnik::json::grammar::geojson_tag, mapnik::json::geojson_value, false>, char const*&, char const* const&, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::hash<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::equal_to<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, boost::bimaps::set_of<int, std::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::reference_wrapper<mapnik::json::extract_positions<char const*, std::vector<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> >, std::allocator<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > > const&, boost::spirit::x3::unused_type const&);
diff --git a/src/json/positions_grammar_x3.cpp b/src/json/positions_grammar_x3.cpp
index 9d5417e46..18112cfde 100644
--- a/src/json/positions_grammar_x3.cpp
+++ b/src/json/positions_grammar_x3.cpp
@@ -37,4 +37,4 @@ BOOST_SPIRIT_INSTANTIATE_UNUSED(positions_grammar_type, iterator_type, extract_b
 }}}
 
 
-template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::__1::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, boost::hash<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >, std::__1::equal_to<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > >, boost::bimaps::set_of<int, std::__1::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::__1::reference_wrapper<mapnik::json::extract_positions<char const*, std::__1::vector<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> >, std::__1::allocator<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::__1::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > >, mapbox::util::variant<mapnik::geometry::point<double>, std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::vector<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::allocator<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > > > >, std::__1::vector<std::__1::vector<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::allocator<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > > > >, std::__1::allocator<std::__1::vector<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::allocator<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > > > > > > > >(boost::spirit::x3::rule<mapnik::json::grammar::positions_tag, mapbox::util::variant<mapnik::geometry::point<double>, std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::vector<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::allocator<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > > > >, std::__1::vector<std::__1::vector<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::allocator<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > > > >, std::__1::allocator<std::__1::vector<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::allocator<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > > > > > > >, false>, char const*&, char const* const&, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::__1::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, boost::hash<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >, std::__1::equal_to<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > >, boost::bimaps::set_of<int, std::__1::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::__1::reference_wrapper<mapnik::json::extract_positions<char const*, std::__1::vector<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> >, std::__1::allocator<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::__1::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > > const&, mapbox::util::variant<mapnik::geometry::point<double>, std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::vector<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::allocator<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > > > >, std::__1::vector<std::__1::vector<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::allocator<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > > > >, std::__1::allocator<std::__1::vector<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > >, std::__1::allocator<std::__1::vector<mapnik::geometry::point<double>, std::__1::allocator<mapnik::geometry::point<double> > > > > > > >&);
+template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::hash<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::equal_to<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, boost::bimaps::set_of<int, std::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::reference_wrapper<mapnik::json::extract_positions<char const*, std::vector<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> >, std::allocator<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > >, mapbox::util::variant<mapnik::geometry::point<double>, std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::vector<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::allocator<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > > > >, std::vector<std::vector<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::allocator<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > > > >, std::allocator<std::vector<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::allocator<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > > > > > > > >(boost::spirit::x3::rule<mapnik::json::grammar::positions_tag, mapbox::util::variant<mapnik::geometry::point<double>, std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::vector<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::allocator<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > > > >, std::vector<std::vector<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::allocator<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > > > >, std::allocator<std::vector<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::allocator<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > > > > > > >, false>, char const*&, char const* const&, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::hash<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::equal_to<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, boost::bimaps::set_of<int, std::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::reference_wrapper<mapnik::json::extract_positions<char const*, std::vector<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> >, std::allocator<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > > const&, mapbox::util::variant<mapnik::geometry::point<double>, std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::vector<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::allocator<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > > > >, std::vector<std::vector<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::allocator<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > > > >, std::allocator<std::vector<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::allocator<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > > > > > > >&);
diff --git a/src/json/unicode_string_grammar_x3.cpp b/src/json/unicode_string_grammar_x3.cpp
index 4626ecada..41f18c289 100644
--- a/src/json/unicode_string_grammar_x3.cpp
+++ b/src/json/unicode_string_grammar_x3.cpp
@@ -40,7 +40,7 @@ BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extr
 }}}
 
 
-template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::__1::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, boost::hash<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >, std::__1::equal_to<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > >, boost::bimaps::set_of<int, std::__1::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::__1::reference_wrapper<mapnik::json::extract_positions<char const*, std::__1::vector<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> >, std::__1::allocator<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::__1::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > >, boost::spirit::x3::unused_type const>(boost::spirit::x3::rule<mapnik::json::grammar::unicode_string_tag, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, false>, char const*&, char const* const&, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::__1::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, boost::hash<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >, std::__1::equal_to<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > >, boost::bimaps::set_of<int, std::__1::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::__1::reference_wrapper<mapnik::json::extract_positions<char const*, std::__1::vector<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> >, std::__1::allocator<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::__1::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > > const&, boost::spirit::x3::unused_type const&);
+template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::hash<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::equal_to<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, boost::bimaps::set_of<int, std::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::reference_wrapper<mapnik::json::extract_positions<char const*, std::vector<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> >, std::allocator<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > >, boost::spirit::x3::unused_type const>(boost::spirit::x3::rule<mapnik::json::grammar::unicode_string_tag, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, false>, char const*&, char const* const&, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::hash<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::equal_to<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, boost::bimaps::set_of<int, std::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::reference_wrapper<mapnik::json::extract_positions<char const*, std::vector<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> >, std::allocator<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > > const&, boost::spirit::x3::unused_type const&);
 
 
-template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::__1::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, boost::hash<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >, std::__1::equal_to<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > >, boost::bimaps::set_of<int, std::__1::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::__1::reference_wrapper<mapnik::json::extract_positions<char const*, std::__1::vector<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> >, std::__1::allocator<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::__1::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > >, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >(boost::spirit::x3::rule<mapnik::json::grammar::unicode_string_tag, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, false>, char const*&, char const* const&, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::__1::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, boost::hash<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >, std::__1::equal_to<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > >, boost::bimaps::set_of<int, std::__1::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::__1::reference_wrapper<mapnik::json::extract_positions<char const*, std::__1::vector<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> >, std::__1::allocator<std::__1::pair<mapnik::box2d<float>, std::__1::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::__1::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > > const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >&);
+template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::hash<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::equal_to<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, boost::bimaps::set_of<int, std::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::reference_wrapper<mapnik::json::extract_positions<char const*, std::vector<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> >, std::allocator<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >(boost::spirit::x3::rule<mapnik::json::grammar::unicode_string_tag, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, false>, char const*&, char const* const&, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::hash<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::equal_to<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, boost::bimaps::set_of<int, std::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::reference_wrapper<mapnik::json::extract_positions<char const*, std::vector<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> >, std::allocator<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&);

From c04d8bf08213f41b627a832644b0cffc3c66a75e Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 25 Nov 2016 17:50:33 +0100
Subject: [PATCH 101/328] re-enable GeoJSON feature validation

---
 utils/mapnik-index/process_geojson_file_x3.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/utils/mapnik-index/process_geojson_file_x3.cpp b/utils/mapnik-index/process_geojson_file_x3.cpp
index 8d3516ee3..51fe30e1e 100644
--- a/utils/mapnik-index/process_geojson_file_x3.cpp
+++ b/utils/mapnik-index/process_geojson_file_x3.cpp
@@ -276,17 +276,16 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
 
     using namespace boost::spirit;
 
-    //using space_type = mapnik::json::grammar::space_type;
-    //auto keys = mapnik::json::get_keys();
-    //auto feature_grammar = x3::with<mapnik::json::keys_tag>(std::ref(keys))
-    //    [ geojson_value ];
+    using space_type = mapnik::json::grammar::space_type;
+    auto keys = mapnik::json::get_keys();
+    auto feature_grammar = x3::with<mapnik::json::grammar::keys_tag>(std::ref(keys))
+        [ geojson_value ];
     for (auto const& item : boxes)
     {
         if (item.first.valid())
         {
             if (!extent.valid()) extent = item.first;
             else extent.expand_to_include(item.first);
-#if 0
             if (validate_features)
             {
                 base_iterator_type feat_itr = start + item.second.first;
@@ -315,7 +314,6 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
                     return std::make_pair(false, extent);
                 }
             }
-#endif
         }
     }
     return std::make_pair(true, extent);

From f32b4234282073fabb0dcbb80fa0ba685ab2a305 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 25 Nov 2016 17:59:44 +0100
Subject: [PATCH 102/328] attempting to keep clang on Travis happy

---
 include/mapnik/json/unicode_string_grammar_x3_def.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/mapnik/json/unicode_string_grammar_x3_def.hpp b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
index c1f6a39c0..1e3d0094e 100644
--- a/include/mapnik/json/unicode_string_grammar_x3_def.hpp
+++ b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
@@ -83,8 +83,8 @@ using x3::hex;
 using x3::eol;
 using x3::no_skip;
 
-x3::uint_parser<uchar, 16, 4, 4> const hex4;
-x3::uint_parser<uchar, 16, 8, 8> const hex8;
+x3::uint_parser<uchar, 16, 4, 4> const hex4 {};
+x3::uint_parser<uchar, 16, 8, 8> const hex8 {};
 
 // start rule
 unicode_string_grammar_type const unicode_string("Unicode String");

From d4e1cb9ae740c55a015667b69ddae133089c996d Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Sun, 27 Nov 2016 17:06:02 +0100
Subject: [PATCH 103/328] add an extra
 extract_bounding_boxes_reverse_context_type  definition

---
 .../json/extract_bounding_boxes_x3_config.hpp     | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/include/mapnik/json/extract_bounding_boxes_x3_config.hpp b/include/mapnik/json/extract_bounding_boxes_x3_config.hpp
index 8cdf9f03e..927be8f9c 100644
--- a/include/mapnik/json/extract_bounding_boxes_x3_config.hpp
+++ b/include/mapnik/json/extract_bounding_boxes_x3_config.hpp
@@ -75,17 +75,20 @@ using space_type = x3::standard::space_type;
 
 using phrase_parse_context_type = x3::phrase_parse_context<space_type>::type;
 
-using context_type = x3::with_context<keys_tag,
-                                      std::reference_wrapper<keys_map> const,
+using context_type = x3::with_context<keys_tag, std::reference_wrapper<keys_map> const,
                                       phrase_parse_context_type>::type;
 
 using extract_bounding_boxes_context_type =
-    x3::with_context<bracket_tag,
-                     std::reference_wrapper<std::size_t> const,
-                     x3::with_context<feature_callback_tag,
-                                      std::reference_wrapper<callback_type> const,
+    x3::with_context<bracket_tag, std::reference_wrapper<std::size_t> const,
+                     x3::with_context<feature_callback_tag, std::reference_wrapper<callback_type> const,
                                       context_type>::type>::type;
 
+using extract_bounding_boxes_reverse_context_type =
+    x3::with_context<keys_tag, std::reference_wrapper<keys_map> const,
+                     x3::with_context<feature_callback_tag, std::reference_wrapper<callback_type> const,
+                                      x3::with_context<bracket_tag, std::reference_wrapper<std::size_t> const,
+                                                       phrase_parse_context_type>::type>::type>::type;
+
 
 }}}
 

From f422da8681868bb74912656b95811b622c5a541a Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Sun, 27 Nov 2016 17:07:04 +0100
Subject: [PATCH 104/328] sanitise parse_rule instantiations via
 BOOST_SPIRIT_INSTANTIATE and OOST_SPIRIT_INSTANTIATE_UNUSED macros

---
 src/json/geojson_grammar_x3.cpp        |  5 ++---
 src/json/positions_grammar_x3.cpp      |  8 ++++----
 src/json/unicode_string_grammar_x3.cpp | 13 +++++--------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/json/geojson_grammar_x3.cpp b/src/json/geojson_grammar_x3.cpp
index cf08bab75..9cdcd347d 100644
--- a/src/json/geojson_grammar_x3.cpp
+++ b/src/json/geojson_grammar_x3.cpp
@@ -32,7 +32,6 @@ BOOST_SPIRIT_INSTANTIATE(key_value_type, iterator_type, context_type);
 
 BOOST_SPIRIT_INSTANTIATE(geojson_grammar_type, iterator_type, extract_bounding_boxes_context_type);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(geojson_grammar_type, iterator_type, extract_bounding_boxes_context_type);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(geojson_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type);
+
 }}}
-
-
-template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::hash<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::equal_to<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, boost::bimaps::set_of<int, std::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::reference_wrapper<mapnik::json::extract_positions<char const*, std::vector<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> >, std::allocator<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > >, boost::spirit::x3::unused_type const>(boost::spirit::x3::rule<mapnik::json::grammar::geojson_tag, mapnik::json::geojson_value, false>, char const*&, char const* const&, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::hash<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::equal_to<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, boost::bimaps::set_of<int, std::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::reference_wrapper<mapnik::json::extract_positions<char const*, std::vector<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> >, std::allocator<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > > const&, boost::spirit::x3::unused_type const&);
diff --git a/src/json/positions_grammar_x3.cpp b/src/json/positions_grammar_x3.cpp
index 18112cfde..663f6af7e 100644
--- a/src/json/positions_grammar_x3.cpp
+++ b/src/json/positions_grammar_x3.cpp
@@ -31,10 +31,10 @@ BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, context_type);
 BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, geometry_context_type);
 BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, feature_context_type);
 BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, feature_context_const_type);
-
 BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, extract_bounding_boxes_context_type);
+BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type);
+
 BOOST_SPIRIT_INSTANTIATE_UNUSED(positions_grammar_type, iterator_type, extract_bounding_boxes_context_type);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(positions_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type);
+
 }}}
-
-
-template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::hash<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::equal_to<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, boost::bimaps::set_of<int, std::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::reference_wrapper<mapnik::json::extract_positions<char const*, std::vector<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> >, std::allocator<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > >, mapbox::util::variant<mapnik::geometry::point<double>, std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::vector<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::allocator<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > > > >, std::vector<std::vector<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::allocator<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > > > >, std::allocator<std::vector<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::allocator<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > > > > > > > >(boost::spirit::x3::rule<mapnik::json::grammar::positions_tag, mapbox::util::variant<mapnik::geometry::point<double>, std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::vector<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::allocator<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > > > >, std::vector<std::vector<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::allocator<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > > > >, std::allocator<std::vector<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::allocator<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > > > > > > >, false>, char const*&, char const* const&, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::hash<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::equal_to<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, boost::bimaps::set_of<int, std::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::reference_wrapper<mapnik::json::extract_positions<char const*, std::vector<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> >, std::allocator<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > > const&, mapbox::util::variant<mapnik::geometry::point<double>, std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::vector<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::allocator<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > > > >, std::vector<std::vector<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::allocator<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > > > >, std::allocator<std::vector<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > >, std::allocator<std::vector<mapnik::geometry::point<double>, std::allocator<mapnik::geometry::point<double> > > > > > > >&);
diff --git a/src/json/unicode_string_grammar_x3.cpp b/src/json/unicode_string_grammar_x3.cpp
index 41f18c289..66f15c212 100644
--- a/src/json/unicode_string_grammar_x3.cpp
+++ b/src/json/unicode_string_grammar_x3.cpp
@@ -31,16 +31,13 @@ BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, context_typ
 BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, geometry_context_type);
 BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, feature_context_type);
 BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, feature_context_const_type);
+BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_context_type);
+BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type);
+
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, geometry_context_type);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, feature_context_type);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, feature_context_const_type);
-
-BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_context_type);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_context_type);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type);
+
 }}}
-
-
-template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::hash<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::equal_to<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, boost::bimaps::set_of<int, std::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::reference_wrapper<mapnik::json::extract_positions<char const*, std::vector<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> >, std::allocator<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > >, boost::spirit::x3::unused_type const>(boost::spirit::x3::rule<mapnik::json::grammar::unicode_string_tag, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, false>, char const*&, char const* const&, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::hash<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::equal_to<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, boost::bimaps::set_of<int, std::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::reference_wrapper<mapnik::json::extract_positions<char const*, std::vector<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> >, std::allocator<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > > const&, boost::spirit::x3::unused_type const&);
-
-
-template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::hash<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::equal_to<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, boost::bimaps::set_of<int, std::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::reference_wrapper<mapnik::json::extract_positions<char const*, std::vector<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> >, std::allocator<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >(boost::spirit::x3::rule<mapnik::json::grammar::unicode_string_tag, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, false>, char const*&, char const* const&, boost::spirit::x3::context<mapnik::json::grammar::keys_tag, std::reference_wrapper<boost::bimaps::bimap<boost::bimaps::unordered_set_of<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::hash<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::equal_to<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, boost::bimaps::set_of<int, std::less<int> >, mpl_::na, mpl_::na, mpl_::na> > const, boost::spirit::x3::context<mapnik::json::grammar::feature_callback_tag, std::reference_wrapper<mapnik::json::extract_positions<char const*, std::vector<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> >, std::allocator<std::pair<mapnik::box2d<float>, std::pair<unsigned long, unsigned long> > > > > > const, boost::spirit::x3::context<mapnik::json::grammar::bracket_tag, std::reference_wrapper<unsigned long> const, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> > > > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&);

From af1b39c689b35fc99ccb0fa947dfe9cc81ca6685 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 28 Nov 2016 10:13:31 +0100
Subject: [PATCH 105/328] support both box2d<float> and box2d<double>

---
 .../json/extract_bounding_boxes_x3_config.hpp | 25 ++++++++++++++++---
 src/json/extract_bounding_boxes_x3.cpp        | 11 ++++----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/include/mapnik/json/extract_bounding_boxes_x3_config.hpp b/include/mapnik/json/extract_bounding_boxes_x3_config.hpp
index 927be8f9c..e08baae18 100644
--- a/include/mapnik/json/extract_bounding_boxes_x3_config.hpp
+++ b/include/mapnik/json/extract_bounding_boxes_x3_config.hpp
@@ -42,6 +42,9 @@ namespace mapnik { namespace json {
 template <typename Iterator, typename Boxes>
 struct extract_positions
 {
+    using boxes_type = Boxes;
+    using box_type = typename boxes_type::value_type::first_type;
+
     extract_positions(Iterator start, Boxes & boxes)
         : start_(start),
           boxes_(boxes) {}
@@ -50,20 +53,25 @@ struct extract_positions
     void operator() (T const& val) const
     {
         auto const& r = std::get<0>(val);
-        mapnik::box2d<float> const& bbox = std::get<1>(val);
+        auto const& b = std::get<1>(val);
         auto offset = std::distance(start_, r.begin());
         auto size = std::distance(r.begin(), r.end());
-        boxes_.emplace_back(std::make_pair(bbox,std::make_pair(offset, size)));
+        boxes_.emplace_back(std::make_pair(box_type(b.minx(), b.miny(), b.maxx(), b.maxy()), std::make_pair(offset, size)));
         //boxes_.emplace_back(std::make_tuple(bbox,offset, size));
     }
     Iterator start_;
     Boxes & boxes_;
 };
 
-using box_type = mapnik::box2d<float>;
+using box_type = mapnik::box2d<double>;
 using boxes_type = std::vector<std::pair<box_type, std::pair<std::size_t, std::size_t>>>;
 using callback_type = extract_positions<grammar::iterator_type, boxes_type>;
 
+using box_type_f = mapnik::box2d<float>;
+using boxes_type_f = std::vector<std::pair<box_type_f, std::pair<std::size_t, std::size_t>>>;
+using callback_type_f = extract_positions<grammar::iterator_type, boxes_type_f>;
+
+
 namespace grammar {
 
 struct bracket_tag;
@@ -90,6 +98,17 @@ using extract_bounding_boxes_reverse_context_type =
                                                        phrase_parse_context_type>::type>::type>::type;
 
 
+using extract_bounding_boxes_context_type_f =
+    x3::with_context<bracket_tag, std::reference_wrapper<std::size_t> const,
+                     x3::with_context<feature_callback_tag, std::reference_wrapper<callback_type_f> const,
+                                      context_type>::type>::type;
+
+using extract_bounding_boxes_reverse_context_type_f =
+    x3::with_context<keys_tag, std::reference_wrapper<keys_map> const,
+                     x3::with_context<feature_callback_tag, std::reference_wrapper<callback_type_f> const,
+                                      x3::with_context<bracket_tag, std::reference_wrapper<std::size_t> const,
+                                                       phrase_parse_context_type>::type>::type>::type;
+
 }}}
 
 #endif // MAPNIK_JSON_EXTRACT_BOUNDING_BOXES_CONFIG_HPP
diff --git a/src/json/extract_bounding_boxes_x3.cpp b/src/json/extract_bounding_boxes_x3.cpp
index 8aae1db1f..0c7a97d71 100644
--- a/src/json/extract_bounding_boxes_x3.cpp
+++ b/src/json/extract_bounding_boxes_x3.cpp
@@ -129,14 +129,15 @@ auto assign_bbox = [](auto const& ctx)
 
 auto extract_bounding_box = [](auto const& ctx)
 {
-    mapnik::box2d<float> bbox;
-    calculate_bounding_box<mapnik::box2d<float>> visitor(bbox);
+    using box_type = typename std::decay<decltype(_val(ctx))>::type;
+    box_type bbox;
+    calculate_bounding_box<box_type> visitor(bbox);
     mapnik::util::apply_visitor(visitor, _attr(ctx));
     _val(ctx) = std::move(bbox);
 };
 
-x3::rule<struct coordinates_rule_tag, mapnik::box2d<float> > const coordinates_rule = "Coordinates";
-x3::rule<struct bounding_box_rule_tag, std::tuple<boost::iterator_range<base_iterator_type>,mapnik::box2d<float>>> const bounding_box = "Bounding Box";
+x3::rule<struct coordinates_rule_tag, mapnik::box2d<double> > const coordinates_rule = "Coordinates";
+x3::rule<struct bounding_box_rule_tag, std::tuple<boost::iterator_range<base_iterator_type>, mapnik::box2d<double>>> const bounding_box = "Bounding Box";
 x3::rule<struct feature_collection_tag> const feature_collection = "Feature Collection";
 
 auto const coordinates_rule_def = lit("\"coordinates\"") >> lit(':') >> positions_rule[extract_bounding_box];
@@ -198,5 +199,5 @@ void extract_bounding_boxes(Iterator start, Iterator end, Boxes & boxes)
 }
 using base_iterator_type = char const*;
 template void extract_bounding_boxes<base_iterator_type, boxes_type>(base_iterator_type, base_iterator_type, boxes_type&);
-
+template void extract_bounding_boxes<base_iterator_type, boxes_type_f>(base_iterator_type, base_iterator_type, boxes_type_f&);
 }}

From 1e2b4c6bc1a346bd9ff155517fcaec100f99934c Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 28 Nov 2016 10:15:17 +0100
Subject: [PATCH 106/328] instantiate require parse_rule's

---
 src/json/geojson_grammar_x3.cpp        | 4 ++++
 src/json/positions_grammar_x3.cpp      | 5 +++++
 src/json/unicode_string_grammar_x3.cpp | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/src/json/geojson_grammar_x3.cpp b/src/json/geojson_grammar_x3.cpp
index 9cdcd347d..2d9b30bb9 100644
--- a/src/json/geojson_grammar_x3.cpp
+++ b/src/json/geojson_grammar_x3.cpp
@@ -31,7 +31,11 @@ BOOST_SPIRIT_INSTANTIATE(geojson_grammar_type, iterator_type, context_type);
 BOOST_SPIRIT_INSTANTIATE(key_value_type, iterator_type, context_type);
 
 BOOST_SPIRIT_INSTANTIATE(geojson_grammar_type, iterator_type, extract_bounding_boxes_context_type);
+
 BOOST_SPIRIT_INSTANTIATE_UNUSED(geojson_grammar_type, iterator_type, extract_bounding_boxes_context_type);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(geojson_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type);
 
+BOOST_SPIRIT_INSTANTIATE_UNUSED(geojson_grammar_type, iterator_type, extract_bounding_boxes_context_type_f);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(geojson_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type_f);
+
 }}}
diff --git a/src/json/positions_grammar_x3.cpp b/src/json/positions_grammar_x3.cpp
index 663f6af7e..23e0be7e0 100644
--- a/src/json/positions_grammar_x3.cpp
+++ b/src/json/positions_grammar_x3.cpp
@@ -31,10 +31,15 @@ BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, context_type);
 BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, geometry_context_type);
 BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, feature_context_type);
 BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, feature_context_const_type);
+
 BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, extract_bounding_boxes_context_type);
 BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type);
+BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, extract_bounding_boxes_context_type_f);
+BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type_f);
 
 BOOST_SPIRIT_INSTANTIATE_UNUSED(positions_grammar_type, iterator_type, extract_bounding_boxes_context_type);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(positions_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(positions_grammar_type, iterator_type, extract_bounding_boxes_context_type_f);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(positions_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type_f);
 
 }}}
diff --git a/src/json/unicode_string_grammar_x3.cpp b/src/json/unicode_string_grammar_x3.cpp
index 66f15c212..c96f2c281 100644
--- a/src/json/unicode_string_grammar_x3.cpp
+++ b/src/json/unicode_string_grammar_x3.cpp
@@ -33,11 +33,15 @@ BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, feature_con
 BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, feature_context_const_type);
 BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_context_type);
 BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type);
+BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_context_type_f);
+BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type_f);
 
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, geometry_context_type);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, feature_context_type);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, feature_context_const_type);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_context_type);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_context_type_f);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type_f);
 
 }}}

From ac3e72703db3beeb95d3d52d07fe83df41b64adc Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 28 Nov 2016 10:16:25 +0100
Subject: [PATCH 107/328] use spirit::x3 based extract_bounding_boxes

---
 plugins/input/geojson/geojson_datasource.cpp | 71 ++++++++++----------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/plugins/input/geojson/geojson_datasource.cpp b/plugins/input/geojson/geojson_datasource.cpp
index 688a691ad..825752614 100644
--- a/plugins/input/geojson/geojson_datasource.cpp
+++ b/plugins/input/geojson/geojson_datasource.cpp
@@ -51,11 +51,11 @@
 #include <mapnik/make_unique.hpp>
 #include <mapnik/geometry/boost_adapters.hpp>
 #include <mapnik/json/feature_collection_grammar.hpp>
-#include <mapnik/json/extract_bounding_box_grammar_impl.hpp>
 #include <mapnik/util/fs.hpp>
 #include <mapnik/util/spatial_index.hpp>
 #include <mapnik/geom_util.hpp>
 #include <mapnik/json/parse_feature.hpp>
+#include <mapnik/json/extract_bounding_boxes_x3.hpp>
 
 #if defined(MAPNIK_MEMORY_MAPPED_FILE)
 #pragma GCC diagnostic push
@@ -190,7 +190,7 @@ const mapnik::transcoder geojson_datasource_static_tr("utf8");
 const mapnik::json::feature_collection_grammar<base_iterator_type,mapnik::feature_impl> geojson_datasource_static_fc_grammar(geojson_datasource_static_tr);
 const mapnik::json::feature_grammar_callback<base_iterator_type,mapnik::feature_impl> geojson_datasource_static_feature_callback_grammar(geojson_datasource_static_tr);
 const mapnik::json::feature_grammar<base_iterator_type, mapnik::feature_impl> geojson_datasource_static_feature_grammar(geojson_datasource_static_tr);
-const mapnik::json::extract_bounding_box_grammar<base_iterator_type, boxes_type> geojson_datasource_static_bbox_grammar;
+
 }
 
 void geojson_datasource::initialise_descriptor(mapnik::feature_ptr const& feature)
@@ -254,8 +254,41 @@ void geojson_datasource::initialise_index(Iterator start, Iterator end)
     boxes_type boxes;
     boost::spirit::standard::space_type space;
     Iterator itr = start;
-    if (!boost::spirit::qi::phrase_parse(itr, end, (geojson_datasource_static_bbox_grammar)(boost::phoenix::ref(boxes)) , space))
+    try
     {
+        mapnik::json::extract_bounding_boxes(itr, end, boxes);
+        // bulk insert initialise r-tree
+        tree_ = std::make_unique<spatial_index_type>(boxes);
+        // calculate total extent
+        std::size_t feature_count = 0;
+        mapnik::context_ptr ctx = std::make_shared<mapnik::context_type>();
+        for (auto const& item : boxes)
+        {
+            auto const& box = std::get<0>(item);
+            auto const& geometry_index = std::get<1>(item);
+            if (!extent_.valid()) extent_ = box;
+            else extent_.expand_to_include(box);
+            if (feature_count++ < num_features_to_query_)
+            {
+                // parse first N features to extract attributes schema.
+                // NOTE: this doesn't yield correct answer for geoJSON in general, just an indication
+                Iterator itr2 = start + geometry_index.first;
+                Iterator end2 = itr2 + geometry_index.second;
+                mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx,-1)); // temp feature
+                if (!boost::spirit::qi::phrase_parse(itr2, end2,
+                                                     (geojson_datasource_static_feature_grammar)(boost::phoenix::ref(*feature)), space)
+                    || itr2 != end2)
+                {
+                    throw std::runtime_error("Failed to parse geojson feature");
+                }
+
+                initialise_descriptor(feature);
+            }
+        }
+    }
+    catch (...)
+    {
+
         cache_features_ = true; // force caching single feature
         itr = start; // reset iteraror
         // try parsing as single Feature or single Geometry JSON
@@ -300,37 +333,6 @@ void geojson_datasource::initialise_index(Iterator start, Iterator end)
         // packing algorithm
         tree_ = std::make_unique<spatial_index_type>(values);
     }
-    else
-    {
-        // bulk insert initialise r-tree
-        tree_ = std::make_unique<spatial_index_type>(boxes);
-        // calculate total extent
-        std::size_t feature_count = 0;
-        mapnik::context_ptr ctx = std::make_shared<mapnik::context_type>();
-        for (auto const& item : boxes)
-        {
-            auto const& box = std::get<0>(item);
-            auto const& geometry_index = std::get<1>(item);
-            if (!extent_.valid()) extent_ = box;
-            else extent_.expand_to_include(box);
-            if (feature_count++ < num_features_to_query_)
-            {
-                // parse first N features to extract attributes schema.
-                // NOTE: this doesn't yield correct answer for geoJSON in general, just an indication
-                Iterator itr2 = start + geometry_index.first;
-                Iterator end2 = itr2 + geometry_index.second;
-                mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx,-1)); // temp feature
-                if (!boost::spirit::qi::phrase_parse(itr2, end2,
-                                                     (geojson_datasource_static_feature_grammar)(boost::phoenix::ref(*feature)), space)
-                    || itr2 != end2)
-                {
-                    throw std::runtime_error("Failed to parse geojson feature");
-                }
-
-                initialise_descriptor(feature);
-            }
-        }
-    }
     desc_.order_by_name();
 }
 
@@ -391,7 +393,6 @@ void geojson_datasource::parse_geojson(Iterator start, Iterator end)
             if (geometry_index == 0)
             {
                 extent_ = box;
-
             }
             else
             {

From e6eda7e8b90f96edf06e3a634eed0fba999b7cd1 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 28 Nov 2016 10:28:12 +0100
Subject: [PATCH 108/328] use parse_feature()

---
 plugins/input/geojson/geojson_datasource.cpp | 33 +++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/plugins/input/geojson/geojson_datasource.cpp b/plugins/input/geojson/geojson_datasource.cpp
index 825752614..0de7e424d 100644
--- a/plugins/input/geojson/geojson_datasource.cpp
+++ b/plugins/input/geojson/geojson_datasource.cpp
@@ -183,13 +183,13 @@ geojson_datasource::geojson_datasource(parameters const& params)
 }
 
 namespace {
+
 using box_type = box2d<double>;
 using boxes_type = std::vector<std::pair<box_type, std::pair<std::size_t, std::size_t>>>;
 using base_iterator_type = char const*;
 const mapnik::transcoder geojson_datasource_static_tr("utf8");
 const mapnik::json::feature_collection_grammar<base_iterator_type,mapnik::feature_impl> geojson_datasource_static_fc_grammar(geojson_datasource_static_tr);
 const mapnik::json::feature_grammar_callback<base_iterator_type,mapnik::feature_impl> geojson_datasource_static_feature_callback_grammar(geojson_datasource_static_tr);
-const mapnik::json::feature_grammar<base_iterator_type, mapnik::feature_impl> geojson_datasource_static_feature_grammar(geojson_datasource_static_tr);
 
 }
 
@@ -234,7 +234,6 @@ void geojson_datasource::initialise_disk_index(std::string const& filename)
         auto const* start = record.data();
         auto const*  end = start + record.size();
         mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx, -1));
-
         try
         {
             mapnik::json::parse_feature(start, end, *feature, geojson_datasource_static_tr);
@@ -272,16 +271,17 @@ void geojson_datasource::initialise_index(Iterator start, Iterator end)
             {
                 // parse first N features to extract attributes schema.
                 // NOTE: this doesn't yield correct answer for geoJSON in general, just an indication
+                mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx,-1)); // temp feature
                 Iterator itr2 = start + geometry_index.first;
                 Iterator end2 = itr2 + geometry_index.second;
-                mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx,-1)); // temp feature
-                if (!boost::spirit::qi::phrase_parse(itr2, end2,
-                                                     (geojson_datasource_static_feature_grammar)(boost::phoenix::ref(*feature)), space)
-                    || itr2 != end2)
+                try
+                {
+                    mapnik::json::parse_feature(itr2, end2, *feature, geojson_datasource_static_tr);
+                }
+                catch (...)
                 {
                     throw std::runtime_error("Failed to parse geojson feature");
                 }
-
                 initialise_descriptor(feature);
             }
         }
@@ -461,11 +461,11 @@ boost::optional<mapnik::datasource_geometry_t> geojson_datasource::get_geometry_
             auto const* start = record.data();
             auto const*  end = start + record.size();
             mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx, -1)); // temp feature
-            using namespace boost::spirit;
-            standard::space_type space;
-            if (!boost::spirit::qi::phrase_parse(start, end,
-                                                 (geojson_datasource_static_feature_grammar)(boost::phoenix::ref(*feature)), space)
-                || start != end)
+            try
+            {
+                mapnik::json::parse_feature(start, end, *feature, geojson_datasource_static_tr);
+            }
+            catch (...)
             {
                 throw std::runtime_error("Failed to parse geojson feature");
             }
@@ -525,13 +525,16 @@ boost::optional<mapnik::datasource_geometry_t> geojson_datasource::get_geometry_
             chr_iterator_type start2 = json.data();
             chr_iterator_type end2 = start2 + json.size();
 
-            using namespace boost::spirit;
-            standard::space_type space;
             mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx, -1)); // temp feature
-            if (!qi::phrase_parse(start2, end2, (geojson_datasource_static_feature_grammar)(boost::phoenix::ref(*feature)), space))
+            try
+            {
+                mapnik::json::parse_feature(start2, end2, *feature, geojson_datasource_static_tr);
+            }
+            catch (...)
             {
                 throw std::runtime_error("Failed to parse geojson feature");
             }
+
             result = mapnik::util::to_ds_type(feature->get_geometry());
             if (result)
             {

From b05d0caba18bd58528b09f9b3046272dabff7f9b Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 28 Nov 2016 17:05:46 +0100
Subject: [PATCH 109/328] implement support for "GeometryCollection" type

---
 .../mapnik/json/feature_grammar_x3_def.hpp    | 41 +++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/include/mapnik/json/feature_grammar_x3_def.hpp b/include/mapnik/json/feature_grammar_x3_def.hpp
index a67cffd76..e5dcf9f7c 100644
--- a/include/mapnik/json/feature_grammar_x3_def.hpp
+++ b/include/mapnik/json/feature_grammar_x3_def.hpp
@@ -177,14 +177,40 @@ auto const assign_geometry_type = [] (auto const& ctx)
     std::get<0>(_val(ctx)) = _attr(ctx);
 };
 
+auto const create_collection = [] (auto const& ctx)
+{
+    mapnik::feature_impl & feature = x3::get<grammar::feature_tag>(ctx);
+    feature.set_geometry(mapnik::geometry::geometry_collection<double>());
+};
+
 auto const assign_geometry = [] (auto const& ctx)
 {
     mapnik::feature_impl & feature = x3::get<grammar::feature_tag>(ctx);
+    // first check if we're not dealing with GeometryCollection
+    if (feature.get_geometry().is<mapnik::geometry::geometry_empty>())
+    {
+        mapnik::geometry::geometry<double> geom;
+        auto const type = std::get<0>(_attr(ctx));
+        auto const& coordinates = std::get<1>(_attr(ctx));
+        mapnik::json::create_geometry(geom, type, coordinates);
+        feature.set_geometry(std::move(geom));
+    }
+};
+
+auto const push_geometry = [] (auto const& ctx)
+{
     mapnik::geometry::geometry<double> geom;
     auto const type = std::get<0>(_attr(ctx));
     auto const& coordinates = std::get<1>(_attr(ctx));
     mapnik::json::create_geometry(geom, type, coordinates);
-    feature.set_geometry(std::move(geom));
+    mapnik::feature_impl & feature = x3::get<grammar::feature_tag>(ctx);
+    geometry::geometry<double> & collection = feature.get_geometry();
+
+    if (collection.is<mapnik::geometry::geometry_collection<double>>())
+    {
+        auto & col = collection.get<mapnik::geometry::geometry_collection<double>>();
+        col.push_back(std::move(geom));
+    }
 };
 
 auto const assign_positions = [] (auto const& ctx)
@@ -213,7 +239,7 @@ x3::rule<struct geometry_tag, std::tuple<mapnik::geometry::geometry_types, mapni
 x3::rule<struct property_tag, std::tuple<std::string, json_value>> const property = "Property";
 x3::rule<struct properties_tag> const properties = "Properties";
 x3::rule<struct feature_part_rule_tag> const feature_part = "Feature part";
-
+x3::rule<struct geometry_collection> const geometry_collection = "GeometryCollection";
 
 auto const feature_type_def = lit("\"type\"") > lit(':') > lit("\"Feature\"");
 
@@ -221,10 +247,18 @@ auto const geometry_type_def = lit("\"type\"") > lit(':') > geometry_type_symbol
 
 auto const coordinates_def = lit("\"coordinates\"") > lit(':') > positions_rule;
 
+auto const geometry_collection_def = lit("\"geometries\"")[create_collection] > lit(':')
+    > lit('[')
+    > ((lit('{') > geometry_tuple[push_geometry] > lit('}')) % lit(','))
+    > lit(']');
+
+
 auto const geometry_tuple_def = (geometry_type[assign_geometry_type]
                                  |
                                  coordinates[assign_positions]
                                  |
+                                 geometry_collection
+                                 |
                                  (omit[geojson_string] > lit(':') > omit[value])) % lit(',');
 
 
@@ -258,7 +292,8 @@ BOOST_SPIRIT_DEFINE(
     properties,
     feature_part,
     feature_rule,
-    geometry_rule
+    geometry_rule,
+    geometry_collection
     );
 #pragma GCC diagnostic pop
 

From cc9f23c4708e56c4422177b56618517ead9cb872 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 28 Nov 2016 18:38:04 +0100
Subject: [PATCH 110/328] allow empty "properties"

---
 include/mapnik/json/feature_grammar_x3_def.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/mapnik/json/feature_grammar_x3_def.hpp b/include/mapnik/json/feature_grammar_x3_def.hpp
index e5dcf9f7c..1f332d19a 100644
--- a/include/mapnik/json/feature_grammar_x3_def.hpp
+++ b/include/mapnik/json/feature_grammar_x3_def.hpp
@@ -270,7 +270,7 @@ auto const feature_part_def = feature_type
     |
     (lit("\"geometry\"") > lit(':') > lit('{') > geometry_tuple[assign_geometry] > lit('}'))
     |
-    (lit("\"properties\"") > lit(':') > lit('{') > properties > lit('}'))
+    (lit("\"properties\"") > lit(':') > lit('{') > -properties > lit('}'))
     |
     omit[geojson_string] > lit(':') > omit[value]
     ;

From f4f39993d0987b9dd75150aa62f39a0b6f57a54d Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 28 Nov 2016 18:38:40 +0100
Subject: [PATCH 111/328] allow accessing geometry by ref

---
 include/mapnik/feature.hpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/mapnik/feature.hpp b/include/mapnik/feature.hpp
index ff10ed5b0..743ac78bd 100644
--- a/include/mapnik/feature.hpp
+++ b/include/mapnik/feature.hpp
@@ -208,6 +208,11 @@ public:
         return geom_;
     }
 
+    inline geometry::geometry<double> & get_geometry()
+    {
+        return geom_;
+    }
+
     inline box2d<double> envelope() const
     {
         return mapnik::geometry::envelope(geom_);

From 160c1c94711c1d79070e8c85cbe2bc747f400b13 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 28 Nov 2016 18:40:03 +0100
Subject: [PATCH 112/328] pass iterator pair by ref,const& ref to match
 spirit::x3 APIs and be able check for fully consumed input (needed by
 geojson.input logic)

---
 include/mapnik/json/extract_bounding_boxes_x3.hpp | 2 +-
 src/json/extract_bounding_boxes_x3.cpp            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/mapnik/json/extract_bounding_boxes_x3.hpp b/include/mapnik/json/extract_bounding_boxes_x3.hpp
index fc3cb4772..39ede302c 100644
--- a/include/mapnik/json/extract_bounding_boxes_x3.hpp
+++ b/include/mapnik/json/extract_bounding_boxes_x3.hpp
@@ -27,7 +27,7 @@
 namespace mapnik { namespace json {
 
 template <typename Iterator, typename Boxes>
-void extract_bounding_boxes(Iterator start, Iterator end, Boxes & boxes);
+void extract_bounding_boxes(Iterator & start, Iterator const& end, Boxes & boxes);
 
 }}
 
diff --git a/src/json/extract_bounding_boxes_x3.cpp b/src/json/extract_bounding_boxes_x3.cpp
index 0c7a97d71..7aadea8e5 100644
--- a/src/json/extract_bounding_boxes_x3.cpp
+++ b/src/json/extract_bounding_boxes_x3.cpp
@@ -175,7 +175,7 @@ BOOST_SPIRIT_DEFINE (
 }
 
 template <typename Iterator, typename Boxes>
-void extract_bounding_boxes(Iterator start, Iterator end, Boxes & boxes)
+void extract_bounding_boxes(Iterator& start, Iterator const& end, Boxes & boxes)
 {
     using namespace boost::spirit;
     using space_type = mapnik::json::grammar::space_type;
@@ -198,6 +198,6 @@ void extract_bounding_boxes(Iterator start, Iterator end, Boxes & boxes)
 
 }
 using base_iterator_type = char const*;
-template void extract_bounding_boxes<base_iterator_type, boxes_type>(base_iterator_type, base_iterator_type, boxes_type&);
-template void extract_bounding_boxes<base_iterator_type, boxes_type_f>(base_iterator_type, base_iterator_type, boxes_type_f&);
+template void extract_bounding_boxes<base_iterator_type, boxes_type>(base_iterator_type&, base_iterator_type const&, boxes_type&);
+template void extract_bounding_boxes<base_iterator_type, boxes_type_f>(base_iterator_type&, base_iterator_type const& , boxes_type_f&);
 }}

From 2fcd608ab3adcd47f3b2e0985dece29d22a31b2f Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 28 Nov 2016 18:41:38 +0100
Subject: [PATCH 113/328] remove spirit spirit::qi usage

---
 plugins/input/geojson/geojson_datasource.cpp | 91 ++++++++++++--------
 1 file changed, 53 insertions(+), 38 deletions(-)

diff --git a/plugins/input/geojson/geojson_datasource.cpp b/plugins/input/geojson/geojson_datasource.cpp
index 0de7e424d..0bb8af398 100644
--- a/plugins/input/geojson/geojson_datasource.cpp
+++ b/plugins/input/geojson/geojson_datasource.cpp
@@ -30,7 +30,6 @@
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/algorithm/string.hpp>
-#include <boost/spirit/include/qi.hpp>
 #pragma GCC diagnostic pop
 
 // mapnik
@@ -188,8 +187,6 @@ using box_type = box2d<double>;
 using boxes_type = std::vector<std::pair<box_type, std::pair<std::size_t, std::size_t>>>;
 using base_iterator_type = char const*;
 const mapnik::transcoder geojson_datasource_static_tr("utf8");
-const mapnik::json::feature_collection_grammar<base_iterator_type,mapnik::feature_impl> geojson_datasource_static_fc_grammar(geojson_datasource_static_tr);
-const mapnik::json::feature_grammar_callback<base_iterator_type,mapnik::feature_impl> geojson_datasource_static_feature_callback_grammar(geojson_datasource_static_tr);
 
 }
 
@@ -247,11 +244,31 @@ void geojson_datasource::initialise_disk_index(std::string const& filename)
     desc_.order_by_name();
 }
 
+namespace mapnik { namespace json {
+
+template <typename Iterator>
+void parse_geometry_or_feature(Iterator& itr, Iterator const& end, feature_impl& feature, transcoder const& tr )
+{
+    Iterator start = itr;
+    try
+    {
+        parse_feature(start, end, feature, tr);
+    }
+    catch (...)
+    {
+        start = itr;
+        parse_geometry(start, end, feature);
+    }
+}
+
+}}
+
+
 template <typename Iterator>
 void geojson_datasource::initialise_index(Iterator start, Iterator end)
 {
     boxes_type boxes;
-    boost::spirit::standard::space_type space;
+    mapnik::context_ptr ctx = std::make_shared<mapnik::context_type>();
     Iterator itr = start;
     try
     {
@@ -260,7 +277,7 @@ void geojson_datasource::initialise_index(Iterator start, Iterator end)
         tree_ = std::make_unique<spatial_index_type>(boxes);
         // calculate total extent
         std::size_t feature_count = 0;
-        mapnik::context_ptr ctx = std::make_shared<mapnik::context_type>();
+
         for (auto const& item : boxes)
         {
             auto const& box = std::get<0>(item);
@@ -291,19 +308,20 @@ void geojson_datasource::initialise_index(Iterator start, Iterator end)
 
         cache_features_ = true; // force caching single feature
         itr = start; // reset iteraror
-        // try parsing as single Feature or single Geometry JSON
-        mapnik::context_ptr ctx = std::make_shared<mapnik::context_type>();
         std::size_t start_id = 1;
-        mapnik::json::default_feature_callback callback(features_);
-        bool result = boost::spirit::qi::phrase_parse(itr, end, (geojson_datasource_static_feature_callback_grammar)
-                                                      (boost::phoenix::ref(ctx), boost::phoenix::ref(start_id), boost::phoenix::ref(callback)),
-                                                      space);
-        if (!result || itr != end)
+        mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx, start_id)); // single feature
+        try
+        {
+            mapnik::json::parse_geometry_or_feature(itr, end, *feature, geojson_datasource_static_tr);
+        }
+        catch (...)
         {
             if (from_inline_string_) throw mapnik::datasource_exception("geojson_datasource: Failed to parse GeoJSON file from in-memory string");
             else throw mapnik::datasource_exception("geojson_datasource: Failed to parse GeoJSON file '" + filename_ + "'");
         }
 
+        features_.push_back(std::move(feature));
+
         using values_container = std::vector< std::pair<box_type, std::pair<std::size_t, std::size_t>>>;
         values_container values;
         values.reserve(features_.size());
@@ -339,45 +357,42 @@ void geojson_datasource::initialise_index(Iterator start, Iterator end)
 template <typename Iterator>
 void geojson_datasource::parse_geojson(Iterator start, Iterator end)
 {
-    using boost::spirit::qi::expectation_failure;
-    boost::spirit::standard::space_type space;
     mapnik::context_ptr ctx = std::make_shared<mapnik::context_type>();
     std::size_t start_id = 1;
-
-    mapnik::json::default_feature_callback callback(features_);
     Iterator itr = start;
-
     try
     {
-        bool result = boost::spirit::qi::phrase_parse(itr, end, (geojson_datasource_static_fc_grammar)
-                                                      (boost::phoenix::ref(ctx), boost::phoenix::ref(start_id), boost::phoenix::ref(callback)),
-                                                      space);
-        if (!result || itr != end)
+        boxes_type boxes;
+        mapnik::json::extract_bounding_boxes(itr, end, boxes);
+
+        if (itr != end) throw std::runtime_error("Malformed GeoJSON"); //ensure we've consumed all input
+
+        for (auto const& item : boxes)
         {
-            itr = start;
-            // try parsing as single Feature or single Geometry JSON
-            result = boost::spirit::qi::phrase_parse(itr, end, (geojson_datasource_static_feature_callback_grammar)
-                                                     (boost::phoenix::ref(ctx),boost::phoenix::ref(start_id), boost::phoenix::ref(callback)),
-                                                     space);
-            if (!result || itr != end)
-            {
-                if (from_inline_string_) throw mapnik::datasource_exception("geojson_datasource: Failed parse GeoJSON file from in-memory string");
-                else throw mapnik::datasource_exception("geojson_datasource: Failed parse GeoJSON file '" + filename_ + "'");
-            }
+            auto const& geometry_index = std::get<1>(item);
+            Iterator itr2 = start + geometry_index.first;
+            Iterator end2 = itr2 + geometry_index.second;
+            mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx, start_id++));
+            mapnik::json::parse_feature(itr2, end2, *feature, geojson_datasource_static_tr);
+            features_.push_back(std::move(feature));
         }
     }
-    catch (expectation_failure<char const*> const& ex)
+    catch (...)
     {
         itr = start;
         // try parsing as single Feature or single Geometry JSON
-        bool result = boost::spirit::qi::phrase_parse(itr, end, (geojson_datasource_static_feature_callback_grammar)
-                                                      (boost::phoenix::ref(ctx),boost::phoenix::ref(start_id), boost::phoenix::ref(callback)),
-                                                      space);
-        if (!result || itr != end)
+        mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx, start_id)); // single feature
+        try
         {
-            if (from_inline_string_) throw mapnik::datasource_exception("geojson_datasource: Failed parse GeoJSON file from in-memory string");
-            else throw mapnik::datasource_exception("geojson_datasource: Failed parse GeoJSON file '" + filename_ + "'");
+            mapnik::json::parse_geometry_or_feature(itr, end, *feature, geojson_datasource_static_tr);
         }
+        catch (...)
+        {
+            if (from_inline_string_) throw mapnik::datasource_exception("geojson_datasource: Failed to parse GeoJSON file from in-memory string");
+            else throw mapnik::datasource_exception("geojson_datasource: Failed to parse GeoJSON file '" + filename_ + "'");
+        }
+
+        features_.push_back(std::move(feature));
     }
 
     using values_container = std::vector< std::pair<box_type, std::pair<std::size_t, std::size_t>>>;

From 0ec510025dca2460ec19766f6f510fdd6d6b036c Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 29 Nov 2016 09:20:41 +0100
Subject: [PATCH 114/328] mapnik-index - remove `-x3` option, use
 process_geojson_x3 always

---
 test/unit/datasource/ds_test_util.hpp       |   2 +-
 utils/mapnik-index/build.py                 |   1 -
 utils/mapnik-index/mapnik-index.cpp         |  16 +--
 utils/mapnik-index/process_geojson_file.cpp | 146 --------------------
 utils/mapnik-index/process_geojson_file.hpp |  36 -----
 5 files changed, 2 insertions(+), 199 deletions(-)
 delete mode 100644 utils/mapnik-index/process_geojson_file.cpp
 delete mode 100644 utils/mapnik-index/process_geojson_file.hpp

diff --git a/test/unit/datasource/ds_test_util.hpp b/test/unit/datasource/ds_test_util.hpp
index c90fd55d2..2a0d2ac90 100644
--- a/test/unit/datasource/ds_test_util.hpp
+++ b/test/unit/datasource/ds_test_util.hpp
@@ -192,7 +192,7 @@ inline int create_disk_index(std::string const& filename, bool silent = true)
     {
         cmd += std::string("DYLD_LIBRARY_PATH=") + std::getenv("DYLD_LIBRARY_PATH") + " ";
     }
-    cmd += "mapnik-index -x3 " + filename;
+    cmd += "mapnik-index " + filename;
     if (silent)
     {
 #ifndef _WINDOWS
diff --git a/utils/mapnik-index/build.py b/utils/mapnik-index/build.py
index e2b9901a2..9bddaf196 100644
--- a/utils/mapnik-index/build.py
+++ b/utils/mapnik-index/build.py
@@ -32,7 +32,6 @@ source = Split(
     """
     mapnik-index.cpp
     process_csv_file.cpp
-    process_geojson_file.cpp
     process_geojson_file_x3.cpp
     ../../plugins/input/csv/csv_utils.os
     """
diff --git a/utils/mapnik-index/mapnik-index.cpp b/utils/mapnik-index/mapnik-index.cpp
index a926441a5..01397ed63 100644
--- a/utils/mapnik-index/mapnik-index.cpp
+++ b/utils/mapnik-index/mapnik-index.cpp
@@ -29,7 +29,6 @@
 #include <mapnik/quad_tree.hpp>
 
 #include "process_csv_file.hpp"
-#include "process_geojson_file.hpp"
 #include "process_geojson_file_x3.hpp"
 
 #pragma GCC diagnostic push
@@ -63,7 +62,6 @@ int main (int argc, char** argv)
     namespace po = boost::program_options;
     bool verbose = false;
     bool validate_features = false;
-    bool use_x3 = false;
     unsigned int depth = DEFAULT_DEPTH;
     double ratio = DEFAULT_RATIO;
     std::vector<std::string> files;
@@ -84,7 +82,6 @@ int main (int argc, char** argv)
             ("manual-headers,H", po::value<std::string>(), "CSV manual headers string")
             ("files",po::value<std::vector<std::string> >(),"Files to index: file1 file2 ...fileN")
             ("validate-features", "Validate GeoJSON features")
-            ("x3","Use boost::spirit::x3 based parser for GeoJSON")
             ;
 
         po::positional_options_description p;
@@ -115,10 +112,6 @@ int main (int argc, char** argv)
         {
             validate_features = true;
         }
-        if (vm.count("x3"))
-        {
-            use_x3 = true;
-        }
         if (vm.count("depth"))
         {
             depth = vm["depth"].as<unsigned int>();
@@ -202,14 +195,7 @@ int main (int argc, char** argv)
         {
             std::clog << "processing '" << filename << "' as GeoJSON\n";
             std::pair<bool,mapnik::box2d<float>> result;
-            if (use_x3)
-            {
-                result = mapnik::detail::process_geojson_file_x3(boxes, filename, validate_features, verbose);
-            }
-            else
-            {
-                result = mapnik::detail::process_geojson_file(boxes, filename, validate_features, verbose);
-            }
+            result = mapnik::detail::process_geojson_file_x3(boxes, filename, validate_features, verbose);
             if (!result.first)
             {
                 std::clog << "Error: failed to process " << filename << std::endl;
diff --git a/utils/mapnik-index/process_geojson_file.cpp b/utils/mapnik-index/process_geojson_file.cpp
deleted file mode 100644
index 44553185f..000000000
--- a/utils/mapnik-index/process_geojson_file.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#include "process_geojson_file.hpp"
-
-#if defined(MAPNIK_MEMORY_MAPPED_FILE)
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/interprocess/mapped_region.hpp>
-#include <boost/interprocess/streams/bufferstream.hpp>
-#include <boost/spirit/include/qi.hpp>
-#pragma GCC diagnostic pop
-#include <mapnik/mapped_memory_cache.hpp>
-#else
-#include <mapnik/util/file_io.hpp>
-#endif
-
-#include <mapnik/json/extract_bounding_box_grammar_impl.hpp>
-#include <mapnik/json/feature_collection_grammar_impl.hpp>
-
-namespace {
-
-template <typename T>
-struct feature_validate_callback
-{
-    feature_validate_callback(mapnik::box2d<T> const& box)
-        : box_(box) {}
-
-    void operator() (mapnik::feature_ptr const& f) const
-    {
-        if (box_ != box_)
-        {
-            throw std::runtime_error("Bounding boxes mismatch validation feature");
-        }
-    }
-    mapnik::box2d<T> const& box_;
-};
-
-using box_type = mapnik::box2d<float>;
-using boxes_type = std::vector<std::pair<box_type, std::pair<std::size_t, std::size_t>>>;
-using base_iterator_type = char const*;
-const mapnik::json::extract_bounding_box_grammar<base_iterator_type, boxes_type> geojson_datasource_static_bbox_grammar;
-const mapnik::transcoder tr("utf8");
-const mapnik::json::feature_grammar_callback<base_iterator_type, mapnik::feature_impl, feature_validate_callback<float>> fc_grammar(tr);
-}
-
-namespace mapnik { namespace detail {
-
-template <typename T>
-std::pair<bool,typename T::value_type::first_type> process_geojson_file(T & boxes, std::string const& filename, bool validate_features, bool verbose)
-{
-    using box_type = typename T::value_type::first_type;
-    box_type extent;
-#if defined(MAPNIK_MEMORY_MAPPED_FILE)
-    mapnik::mapped_region_ptr mapped_region;
-    boost::optional<mapnik::mapped_region_ptr> memory =
-        mapnik::mapped_memory_cache::instance().find(filename, true);
-    if (!memory)
-    {
-        std::clog << "Error : cannot memory map " << filename << std::endl;
-        return std::make_pair(false, extent);
-    }
-    else
-    {
-        mapped_region = *memory;
-    }
-    char const* start = reinterpret_cast<char const*>(mapped_region->get_address());
-    char const* end = start + mapped_region->get_size();
-#else
-    mapnik::util::file file(filename);
-    if (!file)
-    {
-        std::clog << "Error : cannot open " << filename << std::endl;
-        return std::make_pair(false, extent);
-    }
-    std::string file_buffer;
-    file_buffer.resize(file.size());
-    std::fread(&file_buffer[0], file.size(), 1, file.get());
-    char const* start = file_buffer.c_str();
-    char const* end = start + file_buffer.length();
-#endif
-
-    boost::spirit::standard::space_type space;
-    auto const* itr = start;
-    try
-    {
-        if (!boost::spirit::qi::phrase_parse(itr, end, (geojson_datasource_static_bbox_grammar)(boost::phoenix::ref(boxes)) , space))
-        {
-            std::clog << "mapnik-index (GeoJSON) : could not extract bounding boxes from : '" <<  filename <<  "'" << std::endl;
-            return std::make_pair(false, extent);
-        }
-    }
-    catch (std::exception const& ex)
-    {
-        std::clog << "mapnik-index (GeoJSON): " << ex.what() << std::endl;
-    }
-    mapnik::context_ptr ctx = std::make_shared<mapnik::context_type>();
-    std::size_t start_id = 1;
-    for (auto const& item : boxes)
-    {
-        if (item.first.valid())
-        {
-            if (!extent.valid()) extent = item.first;
-            else extent.expand_to_include(item.first);
-
-            if (validate_features)
-            {
-                base_iterator_type feat_itr = start + item.second.first;
-                base_iterator_type feat_end = feat_itr + item.second.second;
-                feature_validate_callback<float> callback(item.first);
-                bool result = boost::spirit::qi::phrase_parse(feat_itr, feat_end, (fc_grammar)
-                                                              (boost::phoenix::ref(ctx), boost::phoenix::ref(start_id), boost::phoenix::ref(callback)),
-                                                              space);
-                if (!result || feat_itr != feat_end)
-                {
-                    if (verbose) std::clog << std::string(start + item.second.first, feat_end ) << std::endl;
-                    return std::make_pair(false, extent);
-                }
-            }
-        }
-    }
-    return std::make_pair(true, extent);
-}
-
-template std::pair<bool,box_type> process_geojson_file(boxes_type&, std::string const&, bool, bool);
-
-}}
diff --git a/utils/mapnik-index/process_geojson_file.hpp b/utils/mapnik-index/process_geojson_file.hpp
deleted file mode 100644
index a377d23e3..000000000
--- a/utils/mapnik-index/process_geojson_file.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_UTILS_PROCESS_GEOJSON_FILE_HPP
-#define MAPNIK_UTILS_PROCESS_GEOJSON_FILE_HPP
-
-#include <utility>
-#include <mapnik/box2d.hpp>
-
-namespace mapnik { namespace detail {
-
-template <typename T>
-std::pair<bool, typename T::value_type::first_type> process_geojson_file(T & boxes, std::string const& filename, bool validate_features, bool verbose);
-
-}}
-
-#endif // MAPNIK_UTILS_PROCESS_GEOJSON_FILE_HPP

From 941a025682a4054b31f1207f388588934cab871e Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 29 Nov 2016 10:46:23 +0100
Subject: [PATCH 115/328] remove spirit::qi usage from (Geo)JSON

---
 .../json/extract_bounding_box_grammar.hpp     |  64 -----
 .../extract_bounding_box_grammar_impl.hpp     | 157 -----------
 .../json/feature_collection_grammar.hpp       | 103 --------
 .../json/feature_collection_grammar_impl.hpp  | 122 ---------
 include/mapnik/json/feature_grammar.hpp       |  91 -------
 include/mapnik/json/feature_grammar_impl.hpp  |  87 -------
 include/mapnik/json/geometry_grammar.hpp      |  65 -----
 include/mapnik/json/geometry_grammar_impl.hpp |  94 -------
 include/mapnik/json/geometry_util.hpp         | 244 ------------------
 include/mapnik/json/positions.hpp             |  40 ---
 include/mapnik/json/positions_grammar.hpp     |  55 ----
 .../mapnik/json/positions_grammar_impl.hpp    |  97 -------
 ...mapnik_json_feature_collection_grammar.cpp |  29 ---
 src/json/mapnik_json_feature_grammar.cpp      |  28 --
 src/json/mapnik_json_geometry_grammar.cpp     |  27 --
 src/json/mapnik_json_geometry_parser.cpp      |  43 ---
 src/json/mapnik_json_positions_grammar.cpp    |  27 --
 17 files changed, 1373 deletions(-)
 delete mode 100644 include/mapnik/json/extract_bounding_box_grammar.hpp
 delete mode 100644 include/mapnik/json/extract_bounding_box_grammar_impl.hpp
 delete mode 100644 include/mapnik/json/feature_collection_grammar.hpp
 delete mode 100644 include/mapnik/json/feature_collection_grammar_impl.hpp
 delete mode 100644 include/mapnik/json/feature_grammar.hpp
 delete mode 100644 include/mapnik/json/feature_grammar_impl.hpp
 delete mode 100644 include/mapnik/json/geometry_grammar.hpp
 delete mode 100644 include/mapnik/json/geometry_grammar_impl.hpp
 delete mode 100644 include/mapnik/json/geometry_util.hpp
 delete mode 100644 include/mapnik/json/positions.hpp
 delete mode 100644 include/mapnik/json/positions_grammar.hpp
 delete mode 100644 include/mapnik/json/positions_grammar_impl.hpp
 delete mode 100644 src/json/mapnik_json_feature_collection_grammar.cpp
 delete mode 100644 src/json/mapnik_json_feature_grammar.cpp
 delete mode 100644 src/json/mapnik_json_geometry_grammar.cpp
 delete mode 100644 src/json/mapnik_json_geometry_parser.cpp
 delete mode 100644 src/json/mapnik_json_positions_grammar.cpp

diff --git a/include/mapnik/json/extract_bounding_box_grammar.hpp b/include/mapnik/json/extract_bounding_box_grammar.hpp
deleted file mode 100644
index 906e7126d..000000000
--- a/include/mapnik/json/extract_bounding_box_grammar.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_JSON_EXTRACT_BOUNDING_BOX_GRAMMAR_HPP
-#define MAPNIK_JSON_EXTRACT_BOUNDING_BOX_GRAMMAR_HPP
-
-// mapnik
-#include <mapnik/json/generic_json.hpp>
-#include <mapnik/json/error_handler.hpp>
-#include <mapnik/box2d.hpp>
-#include <mapnik/geometry.hpp>
-
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#pragma GCC diagnostic pop
-
-namespace mapnik { namespace json {
-
-namespace qi = boost::spirit::qi;
-
-template <typename Iterator, typename Boxes, typename ErrorHandler = error_handler<Iterator> >
-struct extract_bounding_box_grammar :
-        qi::grammar<Iterator, void(Boxes&), space_type>
-{
-    using position_type = mapnik::geometry::point<double>;
-    using boxes_type = Boxes;
-    using box_type = typename Boxes::value_type::first_type;
-    extract_bounding_box_grammar();
-    // rules
-    qi::rule<Iterator, void(boxes_type&), space_type> start;
-    qi::rule<Iterator, qi::locals<Iterator>, void(boxes_type&), space_type> features;
-    qi::rule<Iterator, qi::locals<int, box_type>, void(boxes_type&, Iterator const&), space_type> feature;
-    qi::rule<Iterator, qi::locals<box_type>, box_type(), space_type> coords;
-    qi::rule<Iterator, boost::optional<position_type>(), space_type> pos;
-    qi::rule<Iterator, void(box_type&), space_type> ring;
-    qi::rule<Iterator, void(box_type&), space_type> rings;
-    qi::rule<Iterator, void(box_type&), space_type> rings_array;
-    // generic JSON support
-    json::generic_json<Iterator> json;
-};
-
-}}
-
-#endif // MAPNIK_JSON_EXTRACT_BOUNDING_BOX_GRAMMAR_HPP
diff --git a/include/mapnik/json/extract_bounding_box_grammar_impl.hpp b/include/mapnik/json/extract_bounding_box_grammar_impl.hpp
deleted file mode 100644
index fb9868322..000000000
--- a/include/mapnik/json/extract_bounding_box_grammar_impl.hpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-// mapnik
-#include <mapnik/json/extract_bounding_box_grammar.hpp>
-#include <mapnik/geometry/fusion_adapted.hpp>
-// boost
-#include <boost/spirit/include/qi_omit.hpp>
-#include <boost/spirit/include/phoenix_object.hpp>
-#include <boost/spirit/include/phoenix_stl.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/repository/include/qi_iter_pos.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-// stl
-#include <iostream>
-#include <string>
-
-namespace mapnik { namespace json {
-
-struct calculate_bounding_box_impl
-{
-    using result_type = void;
-    template <typename T0, typename T1>
-    result_type operator() (T0 & bbox, T1 const& pos) const
-    {
-        if (pos)
-        {
-            typename T0::value_type x = pos->x;
-            typename T0::value_type y = pos->y;
-            if (!bbox.valid())
-            {
-                bbox.init(x, y);
-            }
-            else
-            {
-                bbox.expand_to_include(x, y);
-            }
-        }
-    }
-};
-
-struct push_box_impl
-{
-    using result_type = void;
-    template <typename T0, typename T1, typename T2, typename T3>
-    void operator() (T0 & boxes, T1 const& begin, T2 const& box, T3 const& range) const
-    {
-        if (box.valid()) boxes.emplace_back(box,
-                                            std::make_pair(std::distance(begin,
-                                                                         range.begin()),
-                                                           std::distance(range.begin(), range.end())));
-    }
-};
-
-namespace repo = boost::spirit::repository;
-
-template <typename Iterator, typename Boxes, typename ErrorHandler>
-extract_bounding_box_grammar<Iterator, Boxes, ErrorHandler>::extract_bounding_box_grammar()
-    : extract_bounding_box_grammar::base_type(start, "GeoJSON bounding boxes")
-{
-    qi::lit_type lit;
-    qi::double_type double_;
-    qi::_val_type _val;
-    qi::_1_type _1;
-    qi::_2_type _2;
-    qi::_3_type _3;
-    qi::_4_type _4;
-    qi::omit_type omit;
-    qi::_r1_type _r1;
-    qi::_r2_type _r2;
-    qi::_a_type _a;
-    qi::_b_type _b;
-    qi::eps_type eps;
-    qi::raw_type raw;
-    qi::char_type char_;
-    qi::no_skip_type no_skip;
-    boost::spirit::repository::qi::iter_pos_type iter_pos;
-    using qi::fail;
-    using qi::on_error;
-
-    // phoenix functions
-    boost::phoenix::function<push_box_impl> push_box;
-    boost::phoenix::function<calculate_bounding_box_impl> calculate_bounding_box;
-    // error handler
-    boost::phoenix::function<ErrorHandler> const error_handler;
-
-    start = features(_r1)
-        ;
-
-    features = no_skip[iter_pos[_a = _1]] >> -(lit('{')
-                                               >> *((json.key_value - lit("\"features\"")) >> lit(','))
-                                               >> lit("\"features\"")
-                                               >> lit(':'))
-                                          >> lit('[') >> -(feature(_r1,_a) % lit(',')) >> lit(']')
-        ;
-
-    feature = raw[lit('{')[_a = 1]
-                  >> *(eps(_a > 0) >> (
-                           lit("\"FeatureCollection\"") > eps(false) // fail if nested FeatureCollection
-                           |
-                           lit('{')[_a += 1]
-                           |
-                           lit('}')[_a -= 1]
-                           |
-                           coords[_b = _1]
-                           |
-                           json.string_
-                           |
-                           char_))][push_box(_r1, _r2, _b, _1)]
-        ;
-
-    coords = lit("\"coordinates\"")
-        >> lit(':') >> (rings_array(_a) | rings (_a) | ring(_a) | pos[calculate_bounding_box(_a,_1)])[_val = _a]
-        ;
-
-    pos = lit('[') > -(double_ > lit(',') > double_) > omit[*(lit(',') > double_)] > lit(']')
-        ;
-
-    ring = lit('[') >> pos[calculate_bounding_box(_r1,_1)] % lit(',') > lit(']')
-        ;
-
-    rings = lit('[') >> ring(_r1)  % lit(',') > lit(']')
-        ;
-
-    rings_array = lit('[') >> rings(_r1) % lit(',') > lit(']')
-        ;
-
-    coords.name("Coordinates");
-    pos.name("Position");
-    ring.name("Ring");
-    rings.name("Rings");
-    rings_array.name("Rings array");
-
-    // error handler
-    on_error<fail>(coords, error_handler(_1, _2, _3, _4));
-}
-
-}}
diff --git a/include/mapnik/json/feature_collection_grammar.hpp b/include/mapnik/json/feature_collection_grammar.hpp
deleted file mode 100644
index c71801c3f..000000000
--- a/include/mapnik/json/feature_collection_grammar.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_FEATURE_COLLECTION_GRAMMAR_HPP
-#define MAPNIK_FEATURE_COLLECTION_GRAMMAR_HPP
-
-// mapnik
-#include <mapnik/unicode.hpp>
-#include <mapnik/json/geometry_grammar.hpp>
-#include <mapnik/json/feature_grammar.hpp>
-#include <mapnik/feature.hpp>
-
-// spirit::qi
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix.hpp>
-
-namespace mapnik { namespace json {
-
-namespace qi = boost::spirit::qi;
-namespace phoenix = boost::phoenix;
-
-struct default_feature_callback
-{
-    default_feature_callback(std::vector<feature_ptr> & features)
-        : features_(features) {}
-    void operator() (feature_ptr const& feature)
-    {
-        features_.push_back(feature);
-    }
-    std::vector<feature_ptr> & features_;
-};
-
-struct apply_feature_callback
-{
-    using result_type = void;
-    template <typename Callback, typename Feature>
-    void operator() (Callback & callback, Feature const& feature) const
-    {
-        callback(feature);
-    }
-};
-
-template <typename Iterator, typename FeatureType, typename FeatureCallback = default_feature_callback, typename ErrorHandler = error_handler<Iterator> >
-struct feature_collection_grammar :
-        qi::grammar<Iterator, void(context_ptr const&, std::size_t&, FeatureCallback &), space_type>
-{
-    feature_collection_grammar(mapnik::transcoder const& tr);
-    // grammars
-    feature_grammar<Iterator, FeatureType, ErrorHandler> feature_g;
-    // rules
-    qi::rule<Iterator, void(context_ptr const&, std::size_t&, FeatureCallback&), space_type> start; // START
-    qi::rule<Iterator, void(context_ptr const&, std::size_t&, FeatureCallback&), space_type> feature_collection;
-    qi::rule<Iterator, space_type> type;
-    qi::rule<Iterator, void(context_ptr const&, std::size_t&, FeatureCallback&), space_type> features;
-    qi::rule<Iterator, qi::locals<feature_ptr,int>, void(context_ptr const& ctx, std::size_t, FeatureCallback&), space_type> feature;
-    // phoenix functions
-    phoenix::function<apply_feature_callback> on_feature;
-    // error handler
-    boost::phoenix::function<ErrorHandler> const error_handler;
-};
-
-template <typename Iterator, typename FeatureType, typename FeatureCallback = default_feature_callback, typename ErrorHandler = error_handler<Iterator> >
-struct feature_grammar_callback :
-        qi::grammar<Iterator, void(context_ptr const&, std::size_t&, FeatureCallback &), space_type>
-{
-    feature_grammar_callback(mapnik::transcoder const& tr);
-    // grammars
-    feature_grammar<Iterator, FeatureType> feature_g;
-    geometry_grammar<Iterator> geometry_g;
-    // rules
-    qi::rule<Iterator, void(context_ptr const&, std::size_t&, FeatureCallback&), space_type> start; // START
-    qi::rule<Iterator, qi::locals<feature_ptr,int>, void(context_ptr const& ctx, std::size_t, FeatureCallback&), space_type> feature;
-    qi::rule<Iterator, qi::locals<feature_ptr,int>, void(context_ptr const& ctx, std::size_t, FeatureCallback&), space_type> feature_from_geometry;
-    // phoenix functions
-    phoenix::function<json::set_geometry_impl> set_geometry;
-    phoenix::function<apply_feature_callback> on_feature;
-    // error handler
-    boost::phoenix::function<ErrorHandler> const error_handler;
-};
-
-
-}}
-
-#endif // MAPNIK_FEATURE_COLLECTION_GRAMMAR_HPP
diff --git a/include/mapnik/json/feature_collection_grammar_impl.hpp b/include/mapnik/json/feature_collection_grammar_impl.hpp
deleted file mode 100644
index b2836af37..000000000
--- a/include/mapnik/json/feature_collection_grammar_impl.hpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-
-// mapnik
-#include <mapnik/json/error_handler.hpp>
-#include <mapnik/json/feature_collection_grammar.hpp>
-
-// spirit::qi
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix.hpp>
-
-namespace mapnik { namespace json {
-
-template <typename Iterator, typename FeatureType, typename FeatureCallback, typename ErrorHandler>
-feature_collection_grammar<Iterator,FeatureType, FeatureCallback,ErrorHandler>::feature_collection_grammar(mapnik::transcoder const& tr)
-        : feature_collection_grammar::base_type(start,"start"),
-          feature_g(tr)
-{
-        qi::lit_type lit;
-        qi::eps_type eps;
-        qi::_1_type _1;
-        qi::_2_type _2;
-        qi::_3_type _3;
-        qi::_4_type _4;
-        qi::_a_type _a;
-        qi::_r1_type _r1;
-        qi::_r2_type _r2;
-        qi::_r3_type _r3;
-        using phoenix::construct;
-        using phoenix::new_;
-        using phoenix::val;
-        using qi::on_error;
-        using qi::fail;
-        start = feature_collection(_r1, _r2, _r3)
-            ;
-
-        feature_collection = lit('{') > (type | features(_r1, _r2, _r3) | feature_g.json_.key_value) % lit(',') > lit('}')
-            ;
-
-        type = lit("\"type\"") > lit(':') > lit("\"FeatureCollection\"")
-            ;
-
-        features = lit("\"features\"")
-            > lit(':') > lit('[') >
-            ( lit(']') | ((feature(_r1, _r2, _r3) [_r2 +=1] % lit(',')) > lit(']')))
-            ;
-
-        feature = eps[_a = phoenix::construct<mapnik::feature_ptr>(new_<mapnik::feature_impl>(_r1, _r2))]
-            > feature_g(*_a)[on_feature(_r3,_a)]
-            ;
-
-        start.name("start");
-        feature_collection.name("FeatureCollection");
-        type.name("type");
-        features.name("features");
-        feature.name("feature");
-        feature_g.name("feature-grammar");
-        on_error<fail>(feature_collection, error_handler(_1, _2, _3, _4));
-}
-
-
-template <typename Iterator, typename FeatureType, typename FeatureCallback, typename ErrorHandler>
-feature_grammar_callback<Iterator,FeatureType, FeatureCallback,ErrorHandler>::feature_grammar_callback(mapnik::transcoder const& tr)
-    : feature_grammar_callback::base_type(start,"start"),
-      feature_g(tr)
-{
-        qi::lit_type lit;
-        qi::eps_type eps;
-        qi::_1_type _1;
-        qi::_2_type _2;
-        qi::_3_type _3;
-        qi::_4_type _4;
-        qi::_a_type _a;
-        qi::_r1_type _r1;
-        qi::_r2_type _r2;
-        qi::_r3_type _r3;
-        using phoenix::construct;
-        using phoenix::new_;
-        using phoenix::val;
-        using qi::on_error;
-        using qi::fail;
-        start = feature_from_geometry(_r1, _r2, _r3) | feature(_r1, _r2, _r3)
-            ;
-
-        feature = eps[_a = phoenix::construct<mapnik::feature_ptr>(new_<mapnik::feature_impl>(_r1, _r2))]
-            >> feature_g(*_a)[on_feature(_r3,_a)]
-            ;
-
-        feature_from_geometry =
-            eps[_a = phoenix::construct<mapnik::feature_ptr>(new_<mapnik::feature_impl>(_r1, _r2))]
-            >> geometry_g[set_geometry(*_a, _1)] [on_feature(_r3, _a)]
-            ;
-
-        start.name("start");
-        feature.name("feature");
-        feature_from_geometry.name("feature-from-geometry");
-        feature_g.name("feature-grammar");
-        geometry_g.name("geometry-grammar");
-        on_error<fail>(feature, error_handler(_1, _2, _3, _4));
-}
-
-}}
diff --git a/include/mapnik/json/feature_grammar.hpp b/include/mapnik/json/feature_grammar.hpp
deleted file mode 100644
index fae8ed58a..000000000
--- a/include/mapnik/json/feature_grammar.hpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_FEATURE_GRAMMAR_HPP
-#define MAPNIK_FEATURE_GRAMMAR_HPP
-
-// mapnik
-#include <mapnik/value.hpp>
-#include <mapnik/feature.hpp>
-#include <mapnik/json/geometry_grammar.hpp>
-#include <mapnik/json/attribute_value_visitor.hpp>
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix.hpp>
-#include <boost/spirit/include/support_line_pos_iterator.hpp>
-#pragma GCC diagnostic pop
-
-namespace mapnik { namespace json {
-
-namespace qi = boost::spirit::qi;
-namespace phoenix = boost::phoenix;
-namespace fusion = boost::fusion;
-
-struct put_property
-{
-    using result_type = void;
-    explicit put_property(mapnik::transcoder const& tr)
-        : tr_(tr) {}
-    template <typename T0,typename T1, typename T2>
-    result_type operator() (T0 & feature, T1 const& key, T2 && val) const
-    {
-        feature.put_new(key, mapnik::util::apply_visitor(attribute_value_visitor(tr_),val));
-    }
-    mapnik::transcoder const& tr_;
-};
-
-struct set_geometry_impl
-{
-    using result_type =  void;
-    template <typename T0, typename T1>
-    result_type operator() (T0 & feature, T1 && geom) const
-    {
-        return feature.set_geometry(std::move(geom));
-    }
-};
-
-template <typename Iterator, typename FeatureType, typename ErrorHandler = error_handler<Iterator>>
-struct feature_grammar : qi::grammar<Iterator, void(FeatureType&), space_type>
-{
-    explicit feature_grammar(mapnik::transcoder const& tr);
-    // generic JSON
-    generic_json<Iterator> json_;
-    // geoJSON
-    qi::rule<Iterator, void(FeatureType&),space_type> start;
-    qi::rule<Iterator, qi::locals<bool>, void(FeatureType&), space_type> feature;
-    qi::rule<Iterator, void(FeatureType&, bool&), space_type> feature_part;
-    qi::rule<Iterator, space_type> feature_type;
-    qi::rule<Iterator,void(FeatureType &),space_type> properties;
-    qi::rule<Iterator,qi::locals<std::string>, void(FeatureType &),space_type> attributes;
-    // functions
-    phoenix::function<put_property> put_property_;
-    phoenix::function<set_geometry_impl> set_geometry;
-    // error handler
-    boost::phoenix::function<ErrorHandler> const error_handler;
-    // geometry
-    geometry_grammar<Iterator> geometry_grammar_;
-};
-
-}}
-
-#endif // MAPNIK_FEATURE_GRAMMAR_HPP
diff --git a/include/mapnik/json/feature_grammar_impl.hpp b/include/mapnik/json/feature_grammar_impl.hpp
deleted file mode 100644
index bdda650cc..000000000
--- a/include/mapnik/json/feature_grammar_impl.hpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-// mapnik
-#include <mapnik/feature.hpp>
-#include <mapnik/json/feature_grammar.hpp>
-
-namespace mapnik { namespace json {
-
-template <typename Iterator, typename FeatureType, typename ErrorHandler>
-feature_grammar<Iterator,FeatureType,ErrorHandler>::feature_grammar(mapnik::transcoder const& tr)
-    : feature_grammar::base_type(start,"feature"),
-      json_(),
-      put_property_(put_property(tr))
-{
-    qi::lit_type lit;
-    qi::long_long_type long_long;
-    qi::double_type double_;
-    qi::_1_type _1;
-    qi::_2_type _2;
-    qi::_3_type _3;
-    qi::_4_type _4;
-    qi::_a_type _a;
-    qi::_r1_type _r1;
-    qi::_r2_type _r2;
-    qi::eps_type eps;
-    qi::char_type char_;
-    using qi::fail;
-    using qi::on_error;
-    using phoenix::new_;
-    using phoenix::construct;
-
-    // geojson types
-    feature_type = lit("\"type\"") > lit(':') > lit("\"Feature\"")
-        ;
-
-    start = feature(_r1);
-
-    feature = eps[_a = false] > lit('{') >
-        feature_part(_r1, _a) % lit(',')
-        > eps(_a) > lit('}')
-        ;
-
-    feature_part = feature_type[_r2 = true]
-        |
-        (lit("\"geometry\"") > lit(':') > geometry_grammar_[set_geometry(_r1, _1)])
-        |
-        properties(_r1)
-        |
-        json_.key_value
-        ;
-
-    properties = lit("\"properties\"")
-        > lit(':') > ((lit('{') > -attributes(_r1) > lit('}')) | lit("null"))
-        ;
-
-    attributes = (json_.string_ [_a = _1] > lit(':') > json_.value [put_property_(_r1,_a,_1)]) % lit(',')
-        ;
-
-    feature.name("Feature");
-    feature_type.name("type");
-    properties.name("properties");
-    attributes.name("Attributes");
-    on_error<fail>(feature, error_handler(_1, _2, _3, _4));
-
-}
-
-}}
diff --git a/include/mapnik/json/geometry_grammar.hpp b/include/mapnik/json/geometry_grammar.hpp
deleted file mode 100644
index e4b60fd4f..000000000
--- a/include/mapnik/json/geometry_grammar.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_GEOMETRY_GRAMMAR_HPP
-#define MAPNIK_GEOMETRY_GRAMMAR_HPP
-
-// mapnik
-#include <mapnik/geometry.hpp>  // for geometry_type
-#include <mapnik/make_unique.hpp>
-#include <mapnik/json/generic_json.hpp>
-#include <mapnik/json/positions_grammar.hpp>
-#include <mapnik/json/geometry_util.hpp>
-
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#pragma GCC diagnostic pop
-
-#include <memory>
-
-namespace mapnik { namespace json {
-
-namespace qi = boost::spirit::qi;
-
-template <typename Iterator, typename ErrorHandler = error_handler<Iterator> >
-struct geometry_grammar :
-        qi::grammar<Iterator, mapnik::geometry::geometry<double>() ,space_type>
-{
-    geometry_grammar();
-    qi::rule<Iterator, mapnik::geometry::geometry<double>(), space_type> start;
-    qi::rule<Iterator, qi::locals<int, mapnik::json::coordinates>, mapnik::geometry::geometry<double>(), space_type> geometry;
-    qi::rule<Iterator, void(int&, mapnik::json::coordinates&, mapnik::geometry::geometry<double>&), space_type> geometry_part;
-    qi::rule<Iterator, mapnik::geometry::geometry_collection<double>(), space_type> geometry_collection;
-    qi::symbols<char, int> geometry_type_dispatch;
-    positions_grammar<Iterator> coordinates;
-    boost::phoenix::function<create_geometry_impl> create_geometry;
-    // generic JSON
-    generic_json<Iterator> json_;
-    // error handler
-    ErrorHandler error_handler;
-};
-
-}}
-
-#endif // MAPNIK_GEOMETRY_GRAMMAR_HPP
diff --git a/include/mapnik/json/geometry_grammar_impl.hpp b/include/mapnik/json/geometry_grammar_impl.hpp
deleted file mode 100644
index 219d3689f..000000000
--- a/include/mapnik/json/geometry_grammar_impl.hpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-// mapnik
-#include <mapnik/config.hpp>
-#include <mapnik/json/error_handler.hpp>
-#include <mapnik/json/geometry_grammar.hpp>
-#include <mapnik/geometry/fusion_adapted.hpp>
-// boost
-#include <boost/spirit/include/phoenix_stl.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-
-namespace mapnik { namespace json {
-
-template <typename Iterator, typename ErrorHandler >
-geometry_grammar<Iterator, ErrorHandler>::geometry_grammar()
-    : geometry_grammar::base_type(start,"geometry"),
-      coordinates(error_handler)
-{
-    qi::lit_type lit;
-    qi::int_type int_;
-    qi::double_type double_;
-    qi::_val_type _val;
-    qi::_1_type _1;
-    qi::_2_type _2;
-    qi::_3_type _3;
-    qi::_4_type _4;
-    qi::_a_type _a;
-    qi::_b_type _b;
-    qi::_r1_type _r1;
-    qi::_r2_type _r2;
-    qi::_r3_type _r3;
-    qi::eps_type eps;
-    using qi::fail;
-    using qi::on_error;
-    using phoenix::push_back;
-
-    start = geometry.alias() | lit("null");
-
-    geometry = lit('{')[_a = 0]
-        > (geometry_part(_a, _b, _val) % lit(','))[create_geometry(_val, _a, _b)]
-        > lit('}');
-
-    geometry_part = ((lit("\"type\"") > lit(':') > geometry_type_dispatch[_r1 = _1])
-                     |
-                     (lit("\"coordinates\"") > lit(':') > coordinates[_r2 = _1])
-                     |
-                     (lit("\"geometries\"") > lit(':') > lit('[') > geometry_collection[_r3 = _1] > lit(']'))
-                     |
-                     json_.key_value)
-        ;
-
-    geometry_collection = geometry[push_back(_val, _1)] % lit(',')
-        ;
-    geometry_type_dispatch.add
-        ("\"Point\"",1)
-        ("\"LineString\"",2)
-        ("\"Polygon\"",3)
-        ("\"MultiPoint\"",4)
-        ("\"MultiLineString\"",5)
-        ("\"MultiPolygon\"",6)
-        ("\"GeometryCollection\"",7)
-        ;
-
-    // give some rules names
-    geometry.name("Geometry");
-    geometry_collection.name("GeometryCollection");
-    geometry_type_dispatch.name("type: (Point|LineString|Polygon|MultiPoint|MultiLineString|MultiPolygon|GeometryCollection)");
-    coordinates.name("coordinates");
-    // error handler
-    auto error_handler_function = boost::phoenix::function<ErrorHandler>(error_handler);
-    on_error<fail>(start, error_handler_function(_1, _2, _3, _4));
-}
-
-}}
diff --git a/include/mapnik/json/geometry_util.hpp b/include/mapnik/json/geometry_util.hpp
deleted file mode 100644
index d26720e48..000000000
--- a/include/mapnik/json/geometry_util.hpp
+++ /dev/null
@@ -1,244 +0,0 @@
- /*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_JSON_GEOMETRY_UTIL_HPP
-#define MAPNIK_JSON_GEOMETRY_UTIL_HPP
-
-#include <mapnik/geometry.hpp>
-#include <mapnik/geometry/correct.hpp>
-#include <mapnik/json/positions.hpp>
-
-namespace mapnik { namespace json {
-
-// geometries
-template <typename Geometry>
-struct create_point
-{
-    explicit create_point(Geometry & geom)
-        : geom_(geom) {}
-
-    void operator() (position const& pos) const
-    {
-        mapnik::geometry::point<double> point(pos.x, pos.y);
-        geom_ = std::move(point);
-    }
-
-    template <typename T>
-    void operator()(T const&) const {} // no-op - shouldn't get here
-    Geometry & geom_;
-};
-
-template <typename Geometry>
-struct create_linestring
-{
-    explicit create_linestring(Geometry & geom)
-        : geom_(geom) {}
-
-    void operator() (positions const& ring) const
-    {
-        std::size_t size = ring.size();
-        if (size > 1)
-        {
-            mapnik::geometry::line_string<double> line;
-            line.reserve(size);
-            for (auto && pt : ring)
-            {
-                line.emplace_back(std::move(pt));
-            }
-            geom_ = std::move(line);
-        }
-    }
-
-    template <typename T>
-    void operator()(T const&) const {}  // no-op - shouldn't get here
-
-    Geometry & geom_;
-};
-
-template <typename Geometry>
-struct create_polygon
-{
-    explicit create_polygon(Geometry & geom)
-        : geom_(geom) {}
-
-    void operator() (std::vector<positions> const& rings) const
-    {
-        mapnik::geometry::polygon<double> poly;
-        std::size_t num_rings = rings.size();
-        if (num_rings > 1)
-        {
-            poly.interior_rings.reserve(num_rings - 1);
-        }
-
-        for ( std::size_t i = 0; i < num_rings; ++i)
-        {
-            std::size_t size = rings[i].size();
-            mapnik::geometry::linear_ring<double> ring;
-            ring.reserve(size);
-            for ( auto && pt : rings[i])
-            {
-                ring.emplace_back(std::move(pt));
-            }
-            if (i == 0) poly.set_exterior_ring(std::move(ring));
-            else poly.add_hole(std::move(ring));
-        }
-        geom_ = std::move(poly);
-        mapnik::geometry::correct(geom_);
-    }
-
-    template <typename T>
-    void operator()(T const&) const {}  // no-op - shouldn't get here
-
-    Geometry & geom_;
-};
-
-// multi-geometries
-template <typename Geometry>
-struct create_multipoint
-{
-    explicit create_multipoint(Geometry & geom)
-        : geom_(geom) {}
-
-    void operator() (positions const& points) const
-    {
-        mapnik::geometry::multi_point<double> multi_point;
-        multi_point.reserve(points.size());
-        for (auto && pos : points)
-        {
-            multi_point.emplace_back(std::move(pos));
-        }
-        geom_ = std::move(multi_point);
-    }
-
-    template <typename T>
-    void operator()(T const&) const {}  // no-op - shouldn't get here
-
-    Geometry & geom_;
-};
-
-template <typename Geometry>
-struct create_multilinestring
-{
-    explicit create_multilinestring(Geometry & geom)
-        : geom_(geom) {}
-
-    void operator() (std::vector<positions> const& rings) const
-    {
-        mapnik::geometry::multi_line_string<double> multi_line;
-        multi_line.reserve(rings.size());
-
-        for (auto const& ring : rings)
-        {
-            mapnik::geometry::line_string<double> line;
-            line.reserve(ring.size());
-            for (auto && pt : ring)
-            {
-                line.emplace_back(std::move(pt));
-            }
-            multi_line.emplace_back(std::move(line));
-        }
-        geom_ = std::move(multi_line);
-    }
-
-    template <typename T>
-    void operator()(T const&) const {}  // no-op - shouldn't get here
-
-    Geometry & geom_;
-};
-
-template <typename Geometry>
-struct create_multipolygon
-{
-    explicit create_multipolygon(Geometry & geom)
-        : geom_(geom) {}
-
-    void operator()(std::vector<std::vector<positions> > const& rings_array) const
-    {
-        mapnik::geometry::multi_polygon<double> multi_poly;
-        multi_poly.reserve(rings_array.size());
-        for (auto const& rings : rings_array)
-        {
-            mapnik::geometry::polygon<double> poly;
-            std::size_t num_rings = rings.size();
-            if ( num_rings > 1)
-                poly.interior_rings.reserve(num_rings - 1);
-
-            for ( std::size_t i = 0; i < num_rings; ++i)
-            {
-                std::size_t size = rings[i].size();
-                mapnik::geometry::linear_ring<double> ring;
-                ring.reserve(size);
-                for ( auto && pt : rings[i])
-                {
-                    ring.emplace_back(std::move(pt));
-                }
-                if (i == 0) poly.set_exterior_ring(std::move(ring));
-                else poly.add_hole(std::move(ring));
-            }
-            multi_poly.emplace_back(std::move(poly));
-        }
-        geom_ = std::move(multi_poly);
-        mapnik::geometry::correct(geom_);
-    }
-
-    template <typename T>
-    void operator()(T const&) const {}  // no-op - shouldn't get here
-
-    Geometry & geom_;
-};
-
-struct create_geometry_impl
-{
-    using result_type = void;
-    template <typename Geometry>
-    void operator() (Geometry & geom, int type, mapnik::json::coordinates const& coords) const
-    {
-        switch (type)
-        {
-        case 1 ://Point
-            util::apply_visitor(create_point<Geometry>(geom), coords);
-            break;
-        case 2 ://LineString
-           util::apply_visitor(create_linestring<Geometry>(geom), coords);
-           break;
-        case 3 ://Polygon
-            util::apply_visitor(create_polygon<Geometry>(geom), coords);
-            break;
-        case 4 ://MultiPoint
-            util::apply_visitor(create_multipoint<Geometry>(geom), coords);
-            break;
-        case 5 ://MultiLineString
-            util::apply_visitor(create_multilinestring<Geometry>(geom), coords);
-            break;
-        case 6 ://MultiPolygon
-            util::apply_visitor(create_multipolygon<Geometry>(geom), coords);
-            break;
-        default:
-            break;
-        }
-
-    }
-};
-
-}}
-
-#endif // MAPNIK_JSON_GEOMETRY_UTIL_HPP
diff --git a/include/mapnik/json/positions.hpp b/include/mapnik/json/positions.hpp
deleted file mode 100644
index 9ad10f99a..000000000
--- a/include/mapnik/json/positions.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_JSON_POSITIONS_HPP
-#define MAPNIK_JSON_POSITIONS_HPP
-
-// mapnik
-#include <mapnik/util/variant.hpp>
-#include <mapnik/geometry.hpp>
-
-namespace mapnik { namespace json {
-
-struct empty {};
-
-using position = mapnik::geometry::point<double>;
-using positions = std::vector<position>;
-using coordinates = util::variant<empty, position, positions, std::vector<positions>, std::vector<std::vector<positions> > > ;
-
-}}
-
-#endif // MAPNIK_JSON_POSITIONS_HPP
diff --git a/include/mapnik/json/positions_grammar.hpp b/include/mapnik/json/positions_grammar.hpp
deleted file mode 100644
index 6984300f9..000000000
--- a/include/mapnik/json/positions_grammar.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_JSON_POSITIONS_GRAMMAR_HPP
-#define MAPNIK_JSON_POSITIONS_GRAMMAR_HPP
-
-// mapnik
-#include <mapnik/json/positions.hpp>
-#include <mapnik/json/error_handler.hpp>
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#pragma GCC diagnostic pop
-
-
-namespace mapnik { namespace json {
-
-namespace qi = boost::spirit::qi;
-namespace standard = boost::spirit::standard;
-using space_type = standard::space_type;
-
-template <typename Iterator, typename ErrorHandler = error_handler<Iterator> >
-struct positions_grammar :
-        qi::grammar<Iterator,coordinates(),space_type>
-{
-    positions_grammar(ErrorHandler & error_handler);
-    qi::rule<Iterator, coordinates(),space_type> coords;
-    qi::rule<Iterator, boost::optional<position>(), space_type> pos;
-    qi::rule<Iterator, positions(), space_type> ring;
-    qi::rule<Iterator, std::vector<positions>(), space_type> rings;
-    qi::rule<Iterator, std::vector<std::vector<positions> >(), space_type> rings_array;
-};
-
-}}
-
-#endif // MAPNIK_JSON_POSITIONS_GRAMMAR_HPP
diff --git a/include/mapnik/json/positions_grammar_impl.hpp b/include/mapnik/json/positions_grammar_impl.hpp
deleted file mode 100644
index 32379ea2c..000000000
--- a/include/mapnik/json/positions_grammar_impl.hpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-// mapnik
-#include <mapnik/json/positions_grammar.hpp>
-#include <mapnik/geometry/fusion_adapted.hpp>
-// boost
-#include <boost/spirit/include/qi_omit.hpp>
-#include <boost/spirit/include/phoenix_object.hpp>
-#include <boost/spirit/include/phoenix_stl.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-// stl
-#include <iostream>
-#include <string>
-
-namespace mapnik { namespace json {
-
-struct set_position_impl
-{
-    using result_type = void;
-    template <typename T0,typename T1>
-    result_type operator() (T0 & coords, T1 const& pos) const
-    {
-        if (pos) coords = *pos;
-    }
-};
-
-struct push_position_impl
-{
-    using result_type = void;
-    template <typename T0, typename T1>
-    result_type operator() (T0 & coords, T1 const& pos) const
-    {
-        if (pos) coords.emplace_back(*pos);
-    }
-};
-
-template <typename Iterator, typename ErrorHandler>
-positions_grammar<Iterator, ErrorHandler>::positions_grammar(ErrorHandler & error_handler)
-    : positions_grammar::base_type(coords,"coordinates")
-{
-    qi::lit_type lit;
-    qi::double_type double_;
-    qi::_val_type _val;
-    qi::_1_type _1;
-    qi::_2_type _2;
-    qi::_3_type _3;
-    qi::_4_type _4;
-    qi::omit_type omit;
-    using qi::fail;
-    using qi::on_error;
-
-    boost::phoenix::function<set_position_impl> set_position;
-    boost::phoenix::function<push_position_impl> push_position;
-
-    coords = rings_array[_val = _1] | rings [_val = _1] | ring[_val = _1] |  pos[set_position(_val,_1)]
-        ;
-    pos = lit('[') > -(double_ > lit(',') > double_) > omit[*(lit(',') > double_)] > lit(']')
-        ;
-    ring = lit('[') >> pos[push_position(_val,_1)] % lit(',') > lit(']')
-        ;
-    rings = lit('[') >> ring % lit(',') > lit(']')
-        ;
-    rings_array = lit('[') >> rings % lit(',') > lit(']')
-        ;
-    coords.name("Coordinates");
-    pos.name("Position");
-    ring.name("Ring");
-    rings.name("Rings");
-    rings_array.name("Rings array");
-
-    // error handler
-    auto error_handler_function = boost::phoenix::function<ErrorHandler>(error_handler);
-    on_error<fail>(coords, error_handler_function(_1, _2, _3, _4));
-}
-
-}}
diff --git a/src/json/mapnik_json_feature_collection_grammar.cpp b/src/json/mapnik_json_feature_collection_grammar.cpp
deleted file mode 100644
index e262d7cfc..000000000
--- a/src/json/mapnik_json_feature_collection_grammar.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#include <mapnik/feature.hpp>
-#include <mapnik/json/feature_collection_grammar_impl.hpp>
-#include <string>
-
-using iterator_type = char const*;
-template struct mapnik::json::feature_collection_grammar<iterator_type,mapnik::feature_impl, mapnik::json::default_feature_callback> ;
-template struct mapnik::json::feature_grammar_callback<iterator_type,mapnik::feature_impl, mapnik::json::default_feature_callback> ;
diff --git a/src/json/mapnik_json_feature_grammar.cpp b/src/json/mapnik_json_feature_grammar.cpp
deleted file mode 100644
index 1aa6c7e9e..000000000
--- a/src/json/mapnik_json_feature_grammar.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#include <mapnik/feature.hpp>
-#include <mapnik/json/feature_grammar_impl.hpp>
-#include <string>
-
-using iterator_type = char const*;
-template struct mapnik::json::feature_grammar<iterator_type,mapnik::feature_impl>;
diff --git a/src/json/mapnik_json_geometry_grammar.cpp b/src/json/mapnik_json_geometry_grammar.cpp
deleted file mode 100644
index f2b96f230..000000000
--- a/src/json/mapnik_json_geometry_grammar.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#include <mapnik/json/geometry_grammar_impl.hpp>
-#include <string>
-
-using iterator_type = char const*;
-template struct mapnik::json::geometry_grammar<iterator_type>;
diff --git a/src/json/mapnik_json_geometry_parser.cpp b/src/json/mapnik_json_geometry_parser.cpp
deleted file mode 100644
index 278d2c4be..000000000
--- a/src/json/mapnik_json_geometry_parser.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2016 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-
-#include <mapnik/json/geometry_parser.hpp>
-#include <mapnik/json/geometry_grammar.hpp>
-
-// boost
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-
-namespace mapnik { namespace json {
-
-bool from_geojson(std::string const& json, mapnik::geometry::geometry<double> & geom)
-{
-    using namespace boost::spirit;
-    static const geometry_grammar<char const*> g;
-    standard::space_type space;
-    char const* start = json.c_str();
-    char const* end = start + json.length();
-    return qi::phrase_parse(start, end, g, space, geom);
-}
-
-}}
diff --git a/src/json/mapnik_json_positions_grammar.cpp b/src/json/mapnik_json_positions_grammar.cpp
deleted file mode 100644
index a13f0e313..000000000
--- a/src/json/mapnik_json_positions_grammar.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#include <mapnik/json/positions_grammar_impl.hpp>
-#include <string>
-
-using iterator_type = char const*;
-template struct mapnik::json::positions_grammar<iterator_type>;

From 36eb7f61bdfa61c78d7d6f604a62f310fde00563 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 29 Nov 2016 10:48:06 +0100
Subject: [PATCH 116/328] implement from_geojson in terms of
 parse_(feature|geometry)

---
 include/mapnik/json/feature_parser.hpp | 19 ++--------
 src/json/feature_from_geojson.cpp      | 45 +++++++++++++++++++++++
 src/json/geometry_from_geojson.cpp     | 49 ++++++++++++++++++++++++++
 3 files changed, 97 insertions(+), 16 deletions(-)
 create mode 100644 src/json/feature_from_geojson.cpp
 create mode 100644 src/json/geometry_from_geojson.cpp

diff --git a/include/mapnik/json/feature_parser.hpp b/include/mapnik/json/feature_parser.hpp
index 433d19e30..11d363154 100644
--- a/include/mapnik/json/feature_parser.hpp
+++ b/include/mapnik/json/feature_parser.hpp
@@ -25,25 +25,12 @@
 
 // mapnik
 #include <mapnik/feature.hpp>
-#include <mapnik/json/feature_grammar.hpp>
-
-// boost
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
+// stl
+#include <string>
 
 namespace mapnik { namespace json {
 
-inline bool from_geojson(std::string const& json, mapnik::feature_impl & feature)
-{
-    static const mapnik::transcoder tr("utf8");
-    using iterator_type = char const*;
-    static const mapnik::json::feature_grammar<iterator_type,mapnik::feature_impl> g(tr);
-    using namespace boost::spirit;
-    standard::space_type space;
-    iterator_type start = json.c_str();
-    iterator_type end = start + json.length();
-    return qi::phrase_parse(start, end, (g)(boost::phoenix::ref(feature)), space);
-}
+bool from_geojson(std::string const& json, mapnik::feature_impl & feature);
 
 }}
 
diff --git a/src/json/feature_from_geojson.cpp b/src/json/feature_from_geojson.cpp
new file mode 100644
index 000000000..b4d0188c8
--- /dev/null
+++ b/src/json/feature_from_geojson.cpp
@@ -0,0 +1,45 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+
+// mapnik
+#include <mapnik/json/geometry_parser.hpp>
+#include <mapnik/json/parse_feature.hpp>
+
+namespace mapnik { namespace json {
+
+bool from_geojson(std::string const& json, feature_impl & feature)
+{
+    try
+    {
+        const char* start = json.c_str();
+        const char* end = start + json.length();
+        mapnik::json::parse_feature(start, end, feature);
+    }
+    catch (...)
+    {
+        return false;
+    }
+    return true;
+}
+
+}}
diff --git a/src/json/geometry_from_geojson.cpp b/src/json/geometry_from_geojson.cpp
new file mode 100644
index 000000000..58e1477d2
--- /dev/null
+++ b/src/json/geometry_from_geojson.cpp
@@ -0,0 +1,49 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+
+// mapnik
+#include <mapnik/json/geometry_parser.hpp>
+#include <mapnik/json/parse_feature.hpp>
+#include <mapnik/feature_factory.hpp>
+
+namespace mapnik { namespace json {
+
+bool from_geojson(std::string const& json, mapnik::geometry::geometry<double> & geom)
+{
+    try
+    {
+        mapnik::context_ptr ctx = std::make_shared<mapnik::context_type>();
+        mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx, -1)); // temp geometry holder
+        const char* start = json.c_str();
+        const char* end = start + json.length();
+        mapnik::json::parse_geometry(start, end, *feature);
+        geom = std::move(feature->get_geometry());
+    }
+    catch (...)
+    {
+        return false;
+    }
+    return true;
+}
+
+}}

From d88bf9e1ef3ddcd8ca3ecac808e4b211687631cf Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 29 Nov 2016 10:48:48 +0100
Subject: [PATCH 117/328] remove unused old headers

---
 plugins/input/geojson/geojson_datasource.cpp              | 1 -
 plugins/input/geojson/geojson_memory_index_featureset.cpp | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/plugins/input/geojson/geojson_datasource.cpp b/plugins/input/geojson/geojson_datasource.cpp
index 0bb8af398..6c5ce0727 100644
--- a/plugins/input/geojson/geojson_datasource.cpp
+++ b/plugins/input/geojson/geojson_datasource.cpp
@@ -49,7 +49,6 @@
 #include <mapnik/util/geometry_to_ds_type.hpp>
 #include <mapnik/make_unique.hpp>
 #include <mapnik/geometry/boost_adapters.hpp>
-#include <mapnik/json/feature_collection_grammar.hpp>
 #include <mapnik/util/fs.hpp>
 #include <mapnik/util/spatial_index.hpp>
 #include <mapnik/geom_util.hpp>
diff --git a/plugins/input/geojson/geojson_memory_index_featureset.cpp b/plugins/input/geojson/geojson_memory_index_featureset.cpp
index 405ec61dd..d4872c30d 100644
--- a/plugins/input/geojson/geojson_memory_index_featureset.cpp
+++ b/plugins/input/geojson/geojson_memory_index_featureset.cpp
@@ -25,11 +25,10 @@
 
 #include <mapnik/feature.hpp>
 #include <mapnik/feature_factory.hpp>
-#include <mapnik/json/feature_grammar.hpp>
 #include <mapnik/util/utf_conv_win.hpp>
 #include <mapnik/geometry/is_empty.hpp>
 #include <mapnik/json/parse_feature.hpp>
-//#include <mapnik/json/json_grammar_config.hpp>
+
 // stl
 #include <string>
 #include <vector>
@@ -67,7 +66,6 @@ mapnik::feature_ptr geojson_memory_index_featureset::next()
         chr_iterator_type start = json.data();
         chr_iterator_type end = start + json.size();
         static const mapnik::transcoder tr("utf8");
-        static const mapnik::json::feature_grammar<chr_iterator_type,mapnik::feature_impl> grammar(tr);
         mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx_, feature_id_++));
         mapnik::json::parse_feature(start, end, *feature, tr); // throw on failure
         // skip empty geometries

From f7cf220688307691dbc2950dfedf523fc2a7daa6 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 29 Nov 2016 15:28:32 +0100
Subject: [PATCH 118/328] fix Makefike - remove
 utils/mapnik-index/process_geojson_file.o

---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index 14daf29ae..090be8d5d 100755
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,6 @@ src/json/libmapnik-json.a:
 		src/svg/svg_transform_parser.os \
 		src/agg/process_line_symbolizer.os \
 		plugins/input/geojson/geojson_datasource.os \
-		utils/mapnik-index/process_geojson_file.o \
 		src/svg/svg_path_parser.os \
 		src/svg/svg_parser.os \
 		src/svg/svg_points_parser.os \

From 2b852ad1f96cd45bd335024963b3ce4fef054184 Mon Sep 17 00:00:00 2001
From: Jiri Drbalek <jiri.drbalek@firma.seznam.cz>
Date: Tue, 29 Nov 2016 14:55:06 +0000
Subject: [PATCH 119/328] remove methods that are not referenced anywhere

---
 include/mapnik/group/group_symbolizer_helper.hpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/include/mapnik/group/group_symbolizer_helper.hpp b/include/mapnik/group/group_symbolizer_helper.hpp
index 082f75e5d..29c5747c1 100644
--- a/include/mapnik/group/group_symbolizer_helper.hpp
+++ b/include/mapnik/group/group_symbolizer_helper.hpp
@@ -68,16 +68,6 @@ public:
         box_elements_.push_back(box_element(box, repeat_key));
     }
 
-    inline void clear_box_elements()
-    {
-        box_elements_.clear();
-    }
-
-    inline text_symbolizer_properties const& get_properties() const
-    {
-        return info_ptr_->properties;
-    }
-
     pixel_position_list const& get();
 
     // Iterate over the given path, placing line-following labels or point labels with respect to label_spacing.

From 2dc57effb86711516d40e9d30a75a693c8a2cae8 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 29 Nov 2016 16:23:22 +0100
Subject: [PATCH 120/328] allow `null` geometry

---
 include/mapnik/json/feature_grammar_x3_def.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/mapnik/json/feature_grammar_x3_def.hpp b/include/mapnik/json/feature_grammar_x3_def.hpp
index 1f332d19a..82dc53c7c 100644
--- a/include/mapnik/json/feature_grammar_x3_def.hpp
+++ b/include/mapnik/json/feature_grammar_x3_def.hpp
@@ -268,7 +268,7 @@ auto const properties_def = property[assign_property] % lit(',');
 
 auto const feature_part_def = feature_type
     |
-    (lit("\"geometry\"") > lit(':') > lit('{') > geometry_tuple[assign_geometry] > lit('}'))
+    (lit("\"geometry\"") > lit(':') > (lit('{') > geometry_tuple[assign_geometry] > lit('}')) | lit("null"))
     |
     (lit("\"properties\"") > lit(':') > lit('{') > -properties > lit('}'))
     |
@@ -278,7 +278,7 @@ auto const feature_part_def = feature_type
 
 auto const feature_rule_def = lit('{') > feature_part % lit(',') > lit('}');
 
-auto const geometry_rule_def =  lit('{') > geometry_tuple[assign_geometry] > lit('}');
+auto const geometry_rule_def =  (lit('{') > geometry_tuple[assign_geometry] > lit('}')) | lit("null");
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>

From b01481ded7b0060e2e93429c1944937cc29ff393 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 30 Nov 2016 11:33:35 +0100
Subject: [PATCH 121/328] refactor feature_grammar_x3 to have a cleaner
 separation between feature and geometry rules

---
 include/mapnik/json/feature_grammar_x3.hpp    |  4 +-
 .../mapnik/json/feature_grammar_x3_def.hpp    | 63 ++++++++++---------
 include/mapnik/json/json_grammar_config.hpp   |  8 +--
 src/json/feature_grammar_x3.cpp               |  4 +-
 src/json/generic_json_grammar_x3.cpp          |  5 +-
 src/json/parse_feature.cpp                    |  5 +-
 src/json/positions_grammar_x3.cpp             |  1 -
 src/json/unicode_string_grammar_x3.cpp        |  3 +-
 8 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/include/mapnik/json/feature_grammar_x3.hpp b/include/mapnik/json/feature_grammar_x3.hpp
index f6cd6c45f..b3425e88f 100644
--- a/include/mapnik/json/feature_grammar_x3.hpp
+++ b/include/mapnik/json/feature_grammar_x3.hpp
@@ -23,6 +23,8 @@
 #ifndef MAPNIK_JSON_FEATURE_GRAMMAR_X3_HPP
 #define MAPNIK_JSON_FEATURE_GRAMMAR_X3_HPP
 
+#include <mapnik/geometry.hpp>
+
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/home/x3.hpp>
@@ -32,7 +34,7 @@ namespace mapnik { namespace json { namespace grammar {
 
 namespace x3 = boost::spirit::x3;
 using feature_grammar_type = x3::rule<class feature_rule_tag>;
-using geometry_grammar_type = x3::rule<class geometry_rule_tag>;
+using geometry_grammar_type = x3::rule<struct geomerty_rule_tag, mapnik::geometry::geometry<double> >;
 
 BOOST_SPIRIT_DECLARE(feature_grammar_type);
 BOOST_SPIRIT_DECLARE(geometry_grammar_type);
diff --git a/include/mapnik/json/feature_grammar_x3_def.hpp b/include/mapnik/json/feature_grammar_x3_def.hpp
index 82dc53c7c..d2a4ad57f 100644
--- a/include/mapnik/json/feature_grammar_x3_def.hpp
+++ b/include/mapnik/json/feature_grammar_x3_def.hpp
@@ -35,6 +35,7 @@
 #include <mapnik/value.hpp>
 #include <mapnik/geometry/geometry_types.hpp>
 
+
 namespace mapnik { namespace json {
 
 struct stringifier
@@ -177,24 +178,26 @@ auto const assign_geometry_type = [] (auto const& ctx)
     std::get<0>(_val(ctx)) = _attr(ctx);
 };
 
-auto const create_collection = [] (auto const& ctx)
+auto const create_geometry = [] (auto const& ctx)
 {
-    mapnik::feature_impl & feature = x3::get<grammar::feature_tag>(ctx);
-    feature.set_geometry(mapnik::geometry::geometry_collection<double>());
+    mapnik::geometry::geometry<double> geom;
+    auto const type = std::get<0>(_attr(ctx));
+    if (type == mapnik::geometry::geometry_types::GeometryCollection)
+    {
+        _val(ctx) = std::move(std::get<2>(_attr(ctx)));
+    }
+    else
+    {
+        auto const& coordinates = std::get<1>(_attr(ctx));
+        mapnik::json::create_geometry(geom, type, coordinates);
+        _val(ctx) = std::move(geom);
+    }
 };
 
 auto const assign_geometry = [] (auto const& ctx)
 {
     mapnik::feature_impl & feature = x3::get<grammar::feature_tag>(ctx);
-    // first check if we're not dealing with GeometryCollection
-    if (feature.get_geometry().is<mapnik::geometry::geometry_empty>())
-    {
-        mapnik::geometry::geometry<double> geom;
-        auto const type = std::get<0>(_attr(ctx));
-        auto const& coordinates = std::get<1>(_attr(ctx));
-        mapnik::json::create_geometry(geom, type, coordinates);
-        feature.set_geometry(std::move(geom));
-    }
+    feature.set_geometry(std::move(_attr(ctx)));
 };
 
 auto const push_geometry = [] (auto const& ctx)
@@ -203,14 +206,7 @@ auto const push_geometry = [] (auto const& ctx)
     auto const type = std::get<0>(_attr(ctx));
     auto const& coordinates = std::get<1>(_attr(ctx));
     mapnik::json::create_geometry(geom, type, coordinates);
-    mapnik::feature_impl & feature = x3::get<grammar::feature_tag>(ctx);
-    geometry::geometry<double> & collection = feature.get_geometry();
-
-    if (collection.is<mapnik::geometry::geometry_collection<double>>())
-    {
-        auto & col = collection.get<mapnik::geometry::geometry_collection<double>>();
-        col.push_back(std::move(geom));
-    }
+    _val(ctx).push_back(std::move(geom));
 };
 
 auto const assign_positions = [] (auto const& ctx)
@@ -218,6 +214,11 @@ auto const assign_positions = [] (auto const& ctx)
     std::get<1>(_val(ctx)) = std::move(_attr(ctx));
 };
 
+auto const assign_collection = [] (auto const& ctx)
+{
+    std::get<2>(_val(ctx)) = std::move(_attr(ctx));
+};
+
 auto assign_property = [](auto const& ctx)
 {
     mapnik::feature_impl & feature = x3::get<grammar::feature_tag>(ctx);
@@ -229,17 +230,18 @@ auto assign_property = [](auto const& ctx)
 
 
 //exported rules
-feature_grammar_type const feature_rule = "Feature";
-geometry_grammar_type const geometry_rule = "Geometry";
+feature_grammar_type const feature_rule = "Feature Rule";
+geometry_grammar_type const geometry_rule = "Feature Rule";
+
 // rules
 x3::rule<struct feature_type_tag> const feature_type = "Feature Type";
 x3::rule<struct geometry_type_tag, mapnik::geometry::geometry_types> const geometry_type = "Geometry Type";
 x3::rule<struct coordinates_tag, mapnik::json::positions> const coordinates = "Coordinates";
-x3::rule<struct geometry_tag, std::tuple<mapnik::geometry::geometry_types, mapnik::json::positions>> const geometry_tuple = "Geometry";
-x3::rule<struct property_tag, std::tuple<std::string, json_value>> const property = "Property";
+x3::rule<struct geomerty_tag, std::tuple<mapnik::geometry::geometry_types, mapnik::json::positions, mapnik::geometry::geometry_collection<double>>> const geometry_tuple = "Geometry";
+x3::rule<struct property, std::tuple<std::string, json_value>> const property = "Property";
 x3::rule<struct properties_tag> const properties = "Properties";
 x3::rule<struct feature_part_rule_tag> const feature_part = "Feature part";
-x3::rule<struct geometry_collection> const geometry_collection = "GeometryCollection";
+x3::rule<struct geometry_collection, mapnik::geometry::geometry_collection<double>> const geometry_collection = "GeometryCollection";
 
 auto const feature_type_def = lit("\"type\"") > lit(':') > lit("\"Feature\"");
 
@@ -247,17 +249,16 @@ auto const geometry_type_def = lit("\"type\"") > lit(':') > geometry_type_symbol
 
 auto const coordinates_def = lit("\"coordinates\"") > lit(':') > positions_rule;
 
-auto const geometry_collection_def = lit("\"geometries\"")[create_collection] > lit(':')
+auto const geometry_collection_def = lit("\"geometries\"") > lit(':')
     > lit('[')
     > ((lit('{') > geometry_tuple[push_geometry] > lit('}')) % lit(','))
     > lit(']');
 
-
 auto const geometry_tuple_def = (geometry_type[assign_geometry_type]
                                  |
                                  coordinates[assign_positions]
                                  |
-                                 geometry_collection
+                                 geometry_collection[assign_collection]
                                  |
                                  (omit[geojson_string] > lit(':') > omit[value])) % lit(',');
 
@@ -268,7 +269,7 @@ auto const properties_def = property[assign_property] % lit(',');
 
 auto const feature_part_def = feature_type
     |
-    (lit("\"geometry\"") > lit(':') > (lit('{') > geometry_tuple[assign_geometry] > lit('}')) | lit("null"))
+    (lit("\"geometry\"") > lit(':') >  geometry_rule[assign_geometry])
     |
     (lit("\"properties\"") > lit(':') > lit('{') > -properties > lit('}'))
     |
@@ -278,7 +279,8 @@ auto const feature_part_def = feature_type
 
 auto const feature_rule_def = lit('{') > feature_part % lit(',') > lit('}');
 
-auto const geometry_rule_def =  (lit('{') > geometry_tuple[assign_geometry] > lit('}')) | lit("null");
+
+auto const geometry_rule_def =  (lit('{') > geometry_tuple[create_geometry] > lit('}')) | lit("null");
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
@@ -299,7 +301,6 @@ BOOST_SPIRIT_DEFINE(
 
 }}}
 
-
 namespace mapnik { namespace json {
 
 grammar::feature_grammar_type const& feature_grammar()
diff --git a/include/mapnik/json/json_grammar_config.hpp b/include/mapnik/json/json_grammar_config.hpp
index b00c4d73f..26c117201 100644
--- a/include/mapnik/json/json_grammar_config.hpp
+++ b/include/mapnik/json/json_grammar_config.hpp
@@ -92,13 +92,11 @@ using context_type = x3::with_context<keys_tag,
                                       std::reference_wrapper<keys_map> const,
                                       phrase_parse_context_type>::type;
 
-using geometry_context_type = x3::with_context<feature_tag,
-                                               std::reference_wrapper<mapnik::feature_impl> const,
-                                               phrase_parse_context_type>::type;
-
 using feature_context_type = x3::with_context<transcoder_tag,
                                               std::reference_wrapper<mapnik::transcoder> const,
-                                              geometry_context_type>::type;
+                                              x3::with_context<feature_tag,
+                                                               std::reference_wrapper<mapnik::feature_impl> const,
+                                                               phrase_parse_context_type>::type>::type;
 
 // our spirit x3 grammars needs this one with changed order of feature_impl and transcoder (??)
 using feature_context_const_type = x3::with_context<feature_tag,
diff --git a/src/json/feature_grammar_x3.cpp b/src/json/feature_grammar_x3.cpp
index 78fa26453..a34474d49 100644
--- a/src/json/feature_grammar_x3.cpp
+++ b/src/json/feature_grammar_x3.cpp
@@ -25,9 +25,9 @@
 
 namespace mapnik { namespace json { namespace grammar {
 
-BOOST_SPIRIT_INSTANTIATE(geometry_grammar_type, iterator_type, geometry_context_type);
 BOOST_SPIRIT_INSTANTIATE(feature_grammar_type, iterator_type, feature_context_type);
-BOOST_SPIRIT_INSTANTIATE_UNUSED(geometry_grammar_type, iterator_type, geometry_context_type);
+BOOST_SPIRIT_INSTANTIATE(geometry_grammar_type, iterator_type, phrase_parse_context_type);
+
 BOOST_SPIRIT_INSTANTIATE_UNUSED(feature_grammar_type, iterator_type, feature_context_type);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(feature_grammar_type, iterator_type, feature_context_const_type);
 
diff --git a/src/json/generic_json_grammar_x3.cpp b/src/json/generic_json_grammar_x3.cpp
index 9064e0555..7c768e6cf 100644
--- a/src/json/generic_json_grammar_x3.cpp
+++ b/src/json/generic_json_grammar_x3.cpp
@@ -27,10 +27,11 @@ namespace mapnik { namespace json { namespace grammar {
 
 BOOST_SPIRIT_INSTANTIATE(generic_json_grammar_type, iterator_type, phrase_parse_context_type);
 BOOST_SPIRIT_INSTANTIATE(generic_json_grammar_type, iterator_type, context_type);
-BOOST_SPIRIT_INSTANTIATE(generic_json_grammar_type, iterator_type, geometry_context_type);
 BOOST_SPIRIT_INSTANTIATE(generic_json_grammar_type, iterator_type, feature_context_type);
 BOOST_SPIRIT_INSTANTIATE(generic_json_grammar_type, iterator_type, feature_context_const_type);
-BOOST_SPIRIT_INSTANTIATE_UNUSED(generic_json_grammar_type, iterator_type, geometry_context_type);
+
+BOOST_SPIRIT_INSTANTIATE_UNUSED(generic_json_grammar_type, iterator_type, phrase_parse_context_type);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(generic_json_grammar_type, iterator_type, feature_context_type);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(generic_json_grammar_type, iterator_type, feature_context_const_type);
+
 }}}
diff --git a/src/json/parse_feature.cpp b/src/json/parse_feature.cpp
index 74941257f..f32b32070 100644
--- a/src/json/parse_feature.cpp
+++ b/src/json/parse_feature.cpp
@@ -49,9 +49,8 @@ void parse_geometry(Iterator start, Iterator end, feature_impl& feature)
 {
     namespace x3 = boost::spirit::x3;
     using space_type = mapnik::json::grammar::space_type;
-    auto grammar = x3::with<mapnik::json::grammar::feature_tag>(std::ref(feature))
-        [ mapnik::json::geometry_grammar() ];
-    if (!x3::phrase_parse(start, end, grammar, space_type()))
+    auto grammar = mapnik::json::geometry_grammar();
+    if (!x3::phrase_parse(start, end, grammar, space_type(), feature.get_geometry()))
     {
         throw std::runtime_error("Can't parser GeoJSON Geometry");
     }
diff --git a/src/json/positions_grammar_x3.cpp b/src/json/positions_grammar_x3.cpp
index 23e0be7e0..339137ae2 100644
--- a/src/json/positions_grammar_x3.cpp
+++ b/src/json/positions_grammar_x3.cpp
@@ -28,7 +28,6 @@ namespace mapnik { namespace json { namespace grammar {
 
 BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, phrase_parse_context_type);
 BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, context_type);
-BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, geometry_context_type);
 BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, feature_context_type);
 BOOST_SPIRIT_INSTANTIATE(positions_grammar_type, iterator_type, feature_context_const_type);
 
diff --git a/src/json/unicode_string_grammar_x3.cpp b/src/json/unicode_string_grammar_x3.cpp
index c96f2c281..76c0e731e 100644
--- a/src/json/unicode_string_grammar_x3.cpp
+++ b/src/json/unicode_string_grammar_x3.cpp
@@ -28,7 +28,6 @@ namespace mapnik { namespace json { namespace grammar {
 
 BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, phrase_parse_context_type);
 BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, context_type);
-BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, geometry_context_type);
 BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, feature_context_type);
 BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, feature_context_const_type);
 BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_context_type);
@@ -36,7 +35,7 @@ BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, extract_bou
 BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_context_type_f);
 BOOST_SPIRIT_INSTANTIATE(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type_f);
 
-BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, geometry_context_type);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, phrase_parse_context_type);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, feature_context_type);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, feature_context_const_type);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_context_type);

From 56d5ffb473a24123a77629d915bc81b7ad51d79c Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 30 Nov 2016 12:21:38 +0100
Subject: [PATCH 122/328] remove unused headers

---
 src/json/parse_feature.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/json/parse_feature.cpp b/src/json/parse_feature.cpp
index f32b32070..d95343ccb 100644
--- a/src/json/parse_feature.cpp
+++ b/src/json/parse_feature.cpp
@@ -23,10 +23,6 @@
 #include <mapnik/json/parse_feature.hpp>
 #include <mapnik/json/json_grammar_config.hpp>
 #include <mapnik/json/feature_grammar_x3.hpp>
-#include <mapnik/json/create_geometry.hpp>
-#include <mapnik/util/conversions.hpp>
-#include <mapnik/value.hpp>
-#include <mapnik/geometry/geometry_types.hpp>
 
 namespace mapnik { namespace json {
 

From 410a2ce7caa5ffa8c2bd65655abbf942c43f62e3 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 30 Nov 2016 12:21:56 +0100
Subject: [PATCH 123/328] from_geojson(json, geometry) - remove temp feature/
 parse directly into geometry

---
 src/json/geometry_from_geojson.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/json/geometry_from_geojson.cpp b/src/json/geometry_from_geojson.cpp
index 58e1477d2..c9a0659f4 100644
--- a/src/json/geometry_from_geojson.cpp
+++ b/src/json/geometry_from_geojson.cpp
@@ -23,26 +23,27 @@
 
 // mapnik
 #include <mapnik/json/geometry_parser.hpp>
-#include <mapnik/json/parse_feature.hpp>
-#include <mapnik/feature_factory.hpp>
+#include <mapnik/json/json_grammar_config.hpp>
+#include <mapnik/json/feature_grammar_x3.hpp>
 
 namespace mapnik { namespace json {
 
 bool from_geojson(std::string const& json, mapnik::geometry::geometry<double> & geom)
 {
+    namespace x3 = boost::spirit::x3;
+    using space_type = mapnik::json::grammar::space_type;
+    auto grammar = mapnik::json::geometry_grammar();
     try
     {
-        mapnik::context_ptr ctx = std::make_shared<mapnik::context_type>();
-        mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx, -1)); // temp geometry holder
         const char* start = json.c_str();
         const char* end = start + json.length();
-        mapnik::json::parse_geometry(start, end, *feature);
-        geom = std::move(feature->get_geometry());
-    }
-    catch (...)
-    {
-        return false;
+        if (!x3::phrase_parse(start, end, grammar, space_type(), geom))
+        {
+            throw std::runtime_error("Can't parser GeoJSON Geometry");
+        }
     }
+    catch(...) { return false; }
+
     return true;
 }
 

From 2f8da6dfd558ab6b0a89ad8c7093b0f87c9449f6 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 1 Dec 2016 17:17:56 +0100
Subject: [PATCH 124/328] reduce compiler warnings (gcc 6)

---
 .../mapnik/json/feature_grammar_x3_def.hpp    |  2 +-
 .../json/unicode_string_grammar_x3_def.hpp    |  6 +--
 src/json/extract_bounding_boxes_x3.cpp        | 41 ++++++++++---------
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/include/mapnik/json/feature_grammar_x3_def.hpp b/include/mapnik/json/feature_grammar_x3_def.hpp
index d2a4ad57f..1e18faeec 100644
--- a/include/mapnik/json/feature_grammar_x3_def.hpp
+++ b/include/mapnik/json/feature_grammar_x3_def.hpp
@@ -273,7 +273,7 @@ auto const feature_part_def = feature_type
     |
     (lit("\"properties\"") > lit(':') > lit('{') > -properties > lit('}'))
     |
-    omit[geojson_string] > lit(':') > omit[value]
+    (omit[geojson_string] > lit(':') > omit[value])
     ;
 
 
diff --git a/include/mapnik/json/unicode_string_grammar_x3_def.hpp b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
index 1e3d0094e..d58293cf3 100644
--- a/include/mapnik/json/unicode_string_grammar_x3_def.hpp
+++ b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
@@ -95,11 +95,11 @@ x3::rule<class escaped_tag, std::string> const escaped("Escaped Characted");
 auto unicode_string_def = double_quoted
     ;
 auto const escaped_def = lit('\\') >
-    (lit('x') > hex[push_utf8]
+    ((lit('x') > hex[push_utf8])
      |
-     lit('u') > hex4[push_utf8]
+     (lit('u') > hex4[push_utf8])
      |
-     lit('U') > hex8[push_utf8]
+     (lit('U') > hex8[push_utf8])
      |
      char_("0abtnvfre\"/\\N_LP \t")[push_esc]
      |
diff --git a/src/json/extract_bounding_boxes_x3.cpp b/src/json/extract_bounding_boxes_x3.cpp
index 7aadea8e5..a744c7eff 100644
--- a/src/json/extract_bounding_boxes_x3.cpp
+++ b/src/json/extract_bounding_boxes_x3.cpp
@@ -41,29 +41,29 @@ struct calculate_bounding_box
         box_.init(pt.x, pt.y);
     }
 
-    void operator()(mapnik::json::ring const& ring) const
+    void operator()(mapnik::json::ring const& r) const
     {
-        for (auto const& pt : ring)
+        for (auto const& pt : r)
         {
             if (!box_.valid()) box_.init(pt.x, pt.y);
             else box_.expand_to_include(pt.x, pt.y);
         }
     }
 
-    void operator()(mapnik::json::rings const& rings) const
+    void operator()(mapnik::json::rings const& rs) const
     {
-        for (auto const& ring : rings)
+        for (auto const& r : rs)
         {
-            operator()(ring);
+            operator()(r);
             break; // consider first ring only
         }
     }
 
-    void operator()(mapnik::json::rings_array const& rings_array) const
+    void operator()(mapnik::json::rings_array const& rings_ar) const
     {
-        for (auto const& rings : rings_array)
+        for (auto const& rs : rings_ar)
         {
-            operator()(rings);
+            operator()(rs);
         }
     }
 
@@ -142,18 +142,19 @@ x3::rule<struct feature_collection_tag> const feature_collection = "Feature Coll
 
 auto const coordinates_rule_def = lit("\"coordinates\"") >> lit(':') >> positions_rule[extract_bounding_box];
 
-auto const bounding_box_def = raw[lit('{')[open_bracket] >> *(eps[check_brackets] >>
-                                  (lit("\"FeatureCollection\"") > eps(false)
-                                   |
-                                   lit('{')[open_bracket]
-                                   |
-                                   lit('}')[close_bracket]
-                                   |
-                                   coordinates_rule[assign_bbox]
-                                   |
-                                   omit[geojson_string]
-                                   |
-                                   omit[char_]))][assign_range];
+auto const bounding_box_def = raw[lit('{')[open_bracket]
+                                  >> *(eps[check_brackets] >>
+                                       ((lit("\"FeatureCollection\"") > eps(false))
+                                        |
+                                        lit('{')[open_bracket]
+                                        |
+                                        lit('}')[close_bracket]
+                                        |
+                                        coordinates_rule[assign_bbox]
+                                        |
+                                        omit[geojson_string]
+                                        |
+                                        omit[char_]))][assign_range];
 
 
 auto const feature = bounding_box[on_feature_callback];

From 8b6059eab698d748ea68d54c85ee47d3a5881585 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 1 Dec 2016 09:50:34 -0800
Subject: [PATCH 125/328] mason packages are currently built with
 -D_GLIBCXX_USE_CXX11_ABI=0

---
 bootstrap.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bootstrap.sh b/bootstrap.sh
index e926c26bc..4a7bfa49c 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -95,6 +95,7 @@ function make_config() {
     echo "
 CXX = '$CXX'
 CC = '$CC'
+CUSTOM_CXXFLAGS = '-D_GLIBCXX_USE_CXX11_ABI=0'
 RUNTIME_LINK = 'static'
 INPUT_PLUGINS = 'all'
 PATH = '${MASON_LINKED_REL}/bin'

From 069de8e266d0f68f1330e42f9340ed84c6622b6a Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 2 Dec 2016 11:04:11 +0100
Subject: [PATCH 126/328] fix gcc6 compilation issue

---
 include/mapnik/wkt/wkt_grammar_x3_def.hpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/include/mapnik/wkt/wkt_grammar_x3_def.hpp b/include/mapnik/wkt/wkt_grammar_x3_def.hpp
index b4bff5e38..db44a4ce4 100644
--- a/include/mapnik/wkt/wkt_grammar_x3_def.hpp
+++ b/include/mapnik/wkt/wkt_grammar_x3_def.hpp
@@ -26,6 +26,16 @@
 #include <mapnik/wkt/wkt_grammar_x3.hpp>
 #include <mapnik/geometry/fusion_adapted.hpp>
 
+#ifdef __GNUC__
+// instantiate `is_substitute` for reference T and reference Attribute
+// fixes gcc6 compilation issue
+namespace boost { namespace spirit { namespace x3 { namespace traits {
+template <typename T, typename Attribute, typename Enable>
+struct is_substitute<T&, Attribute&, Enable>
+  : is_substitute<T, Attribute, Enable> {};
+}}}}
+#endif
+
 namespace mapnik { namespace grammar {
 
 namespace x3 = boost::spirit::x3;

From 6824f4c477ce9a83e60cb58a0a39d209e93b7277 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 2 Dec 2016 11:42:57 +0100
Subject: [PATCH 127/328] fix more gcc warnings

---
 include/mapnik/expression_grammar_x3_def.hpp | 12 ++++++------
 src/json/extract_bounding_boxes_x3.cpp       |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/include/mapnik/expression_grammar_x3_def.hpp b/include/mapnik/expression_grammar_x3_def.hpp
index 4a8d3c6dc..6c25b4812 100644
--- a/include/mapnik/expression_grammar_x3_def.hpp
+++ b/include/mapnik/expression_grammar_x3_def.hpp
@@ -316,7 +316,7 @@ namespace mapnik { namespace grammar {
 
     auto const not_expression_def = conditional_expression[do_assign]
         |
-        (lit("not") | lit('!')) > conditional_expression[do_not]
+        ((lit("not") | lit('!')) > conditional_expression[do_not])
         ;
 
     auto const conditional_expression_def = equality_expression[do_assign]
@@ -350,11 +350,11 @@ namespace mapnik { namespace grammar {
     auto const regex_match_expression_def = lit(".match") > '(' > quoted_string > ')';
     auto const regex_replace_expression_def = lit(".replace") > '(' > quoted_string > ',' > quoted_string > ')';
     auto const multiplicative_expression_def = unary_expression [do_assign]
-        > *( '*' > unary_expression [do_mult]
+        > *( ('*' > unary_expression [do_mult])
              |
-             '/' > unary_expression [do_div]
+             ('/' > unary_expression [do_div])
              |
-             '%' > unary_expression [do_mod]
+             ('%' > unary_expression [do_mod])
              |
              regex_match_expression[do_regex_match]
              |
@@ -367,9 +367,9 @@ namespace mapnik { namespace grammar {
     auto const unary_expression_def =
         primary_expression[do_assign]
         |
-        '+' > primary_expression[do_assign]
+        ('+' > primary_expression[do_assign])
         |
-        '-' > primary_expression[do_negate]
+        ('-' > primary_expression[do_negate])
         ;
 
     auto const primary_expression_def =
diff --git a/src/json/extract_bounding_boxes_x3.cpp b/src/json/extract_bounding_boxes_x3.cpp
index a744c7eff..8346f1061 100644
--- a/src/json/extract_bounding_boxes_x3.cpp
+++ b/src/json/extract_bounding_boxes_x3.cpp
@@ -181,9 +181,8 @@ void extract_bounding_boxes(Iterator& start, Iterator const& end, Boxes & boxes)
     using namespace boost::spirit;
     using space_type = mapnik::json::grammar::space_type;
     using iterator_type = Iterator;
-    using boxes_type = Boxes;
 
-    extract_positions<iterator_type, boxes_type> callback(start, boxes);
+    extract_positions<iterator_type, Boxes> callback(start, boxes);
     auto keys = mapnik::json::get_keys();
     std::size_t bracket_counter = 0;
     auto feature_collection_impl = x3::with<mapnik::json::grammar::bracket_tag>(std::ref(bracket_counter))

From 5ea5f18a7ec86c330c15c922a409a13bbb187bde Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 2 Dec 2016 12:41:20 +0100
Subject: [PATCH 128/328] cleanups

---
 include/mapnik/image_filter_grammar_x3.hpp    | 1 -
 include/mapnik/text/placement_finder_impl.hpp | 3 ---
 src/group/group_symbolizer_helper.cpp         | 1 -
 3 files changed, 5 deletions(-)

diff --git a/include/mapnik/image_filter_grammar_x3.hpp b/include/mapnik/image_filter_grammar_x3.hpp
index 8632c9122..cddc2d0dd 100644
--- a/include/mapnik/image_filter_grammar_x3.hpp
+++ b/include/mapnik/image_filter_grammar_x3.hpp
@@ -23,7 +23,6 @@
 #ifndef MAPNIK_IMAGE_FILTER_GRAMMAR_X3_HPP
 #define MAPNIK_IMAGE_FILTER_GRAMMAR_X3_HPP
 
-//#include <mapnik/image_filter.hpp>
 #include <mapnik/image_filter_types.hpp>
 
 #pragma GCC diagnostic push
diff --git a/include/mapnik/text/placement_finder_impl.hpp b/include/mapnik/text/placement_finder_impl.hpp
index 1b8f84147..3f5895c1e 100644
--- a/include/mapnik/text/placement_finder_impl.hpp
+++ b/include/mapnik/text/placement_finder_impl.hpp
@@ -21,12 +21,9 @@
  *****************************************************************************/
 
 // mapnik
-//#include <mapnik/label_collision_detector.hpp>
-//#include <mapnik/view_transform.hpp>
 #include <mapnik/text/placement_finder.hpp>
 #include <mapnik/text/text_layout.hpp>
 #include <mapnik/text/text_properties.hpp>
-//#include <mapnik/text/glyph_positions.hpp>
 #include <mapnik/vertex_cache.hpp>
 #include <mapnik/tolerance_iterator.hpp>
 #include <mapnik/symbolizer_enumerations.hpp>
diff --git a/src/group/group_symbolizer_helper.cpp b/src/group/group_symbolizer_helper.cpp
index e520f1ae8..c1c360d19 100644
--- a/src/group/group_symbolizer_helper.cpp
+++ b/src/group/group_symbolizer_helper.cpp
@@ -23,7 +23,6 @@
 // mapnik
 #include <mapnik/group/group_symbolizer_helper.hpp>
 #include <mapnik/label_collision_detector.hpp>
-//#include <mapnik/geom_util.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/vertex_processor.hpp>
 #include <mapnik/debug.hpp>

From e57ac30690f7ee2cf492f3f248fb165e988f42e5 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Tue, 29 Nov 2016 12:03:34 -0800
Subject: [PATCH 129/328] use clang 3.9, g++-6

---
 .travis.yml | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f98cb1f65..0df3c2dc8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,19 +25,29 @@ matrix:
     - os: linux
       sudo: false
       compiler: ": clang"
-      env: JOBS=8 MASON_PUBLISH=true CXX="ccache clang++-3.8 -Qunused-arguments" CC="clang-3.8" TRIGGER=true
+      sudo: required
+      dist: trusty
+      env: JOBS=4 CXX="ccache g++-6" CC="gcc-6"
       addons:
         apt:
           sources: [ 'ubuntu-toolchain-r-test']
-          packages: [ 'libstdc++-5-dev', 'xutils-dev']
+          packages: [ 'libstdc++-6-dev', 'g++-6', 'xutils-dev']
+    - os: linux
+      sudo: false
+      compiler: ": clang"
+      env: JOBS=8 MASON_PUBLISH=true CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9" TRIGGER=true
+      addons:
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test']
+          packages: [ 'libstdc++-4.9-dev', 'xutils-dev']
     - os: linux
       sudo: false
       compiler: ": clang-coverage"
-      env: JOBS=8 COVERAGE=true CXX="ccache clang++-3.8 -Qunused-arguments" CC="clang-3.8"
+      env: JOBS=8 COVERAGE=true CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9"
       addons:
         apt:
           sources: [ 'ubuntu-toolchain-r-test']
-          packages: ['libstdc++-5-dev', 'xutils-dev' ]
+          packages: ['libstdc++-4.9-dev', 'xutils-dev' ]
     - os: osx
       compiler: ": clang-osx"
       # https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions
@@ -78,10 +88,12 @@ before_script:
  - source bootstrap.sh
  - |
    if [[ $(uname -s) == 'Linux' ]]; then
-     mason install clang 3.8.0
-     export PATH=$(mason prefix clang 3.8.0)/bin:${PATH}
-     which clang++
-     export LLVM_COV="$(mason prefix clang 3.8.0)/bin/llvm-cov"
+     mason install clang++ 3.9.0
+     export PATH=$(mason prefix clang++ 3.9.0)/bin:${PATH}
+     mason install llvm-cov 3.9.0
+     export PATH=$(mason prefix llvm-cov 3.9.0)/bin:${PATH}
+     which llvm-cov
+     export LLVM_COV="$(mason prefix llvm-cov 3.9.0)/bin/llvm-cov"
    fi
  - ccache --version
  - ccache -p || true

From 9cc8af91732f1520f19db94f85fca2f3d40f6f41 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Tue, 29 Nov 2016 13:01:44 -0800
Subject: [PATCH 130/328] try g++6 on precise

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0df3c2dc8..e71832ce9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,8 +25,7 @@ matrix:
     - os: linux
       sudo: false
       compiler: ": clang"
-      sudo: required
-      dist: trusty
+      sudo: false
       env: JOBS=4 CXX="ccache g++-6" CC="gcc-6"
       addons:
         apt:

From 8262eb5206415ff3a26fb4f7e7011afe714e86ea Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Tue, 29 Nov 2016 13:50:08 -0800
Subject: [PATCH 131/328] avoid -Wshadow and 'unrecognized command line option'
 with gcc

---
 include/mapnik/offset_converter.hpp   | 10 +++++-----
 include/mapnik/simplify_converter.hpp | 12 ++++++------
 scripts/travis-common.sh              |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/mapnik/offset_converter.hpp b/include/mapnik/offset_converter.hpp
index 0f0d1ceb4..c739c152d 100644
--- a/include/mapnik/offset_converter.hpp
+++ b/include/mapnik/offset_converter.hpp
@@ -77,18 +77,18 @@ struct offset_converter
         return threshold_;
     }
 
-    void set_offset(double value)
+    void set_offset(double val)
     {
-        if (offset_ != value)
+        if (offset_ != val)
         {
-            offset_ = value;
+            offset_ = val;
             reset();
         }
     }
 
-    void set_threshold(double value)
+    void set_threshold(double val)
     {
-        threshold_ = value;
+        threshold_ = val;
         // no need to reset(), since threshold doesn't affect
         // offset vertices' computation, it only controls how
         // far will we be looking for self-intersections
diff --git a/include/mapnik/simplify_converter.hpp b/include/mapnik/simplify_converter.hpp
index 248842504..a8a6c377b 100644
--- a/include/mapnik/simplify_converter.hpp
+++ b/include/mapnik/simplify_converter.hpp
@@ -120,11 +120,11 @@ public:
         return algorithm_;
     }
 
-    void set_simplify_algorithm(simplify_algorithm_e value)
+    void set_simplify_algorithm(simplify_algorithm_e val)
     {
-        if (algorithm_ != value)
+        if (algorithm_ != val)
         {
-            algorithm_ = value;
+            algorithm_ = val;
             reset();
         }
     }
@@ -134,11 +134,11 @@ public:
         return tolerance_;
     }
 
-    void set_simplify_tolerance(double value)
+    void set_simplify_tolerance(double val)
     {
-        if (tolerance_ != value)
+        if (tolerance_ != val)
         {
-            tolerance_ = value;
+            tolerance_ = val;
             reset();
         }
     }
diff --git a/scripts/travis-common.sh b/scripts/travis-common.sh
index 56909b79d..288fcc1ce 100644
--- a/scripts/travis-common.sh
+++ b/scripts/travis-common.sh
@@ -83,9 +83,9 @@ config_override () {
 configure () {
     if enabled ${COVERAGE}; then
         ./configure "$@" PREFIX=${PREFIX} PGSQL2SQLITE=False SVG2PNG=False SVG_RENDERER=False \
-            COVERAGE=True DEBUG=True WARNING_CXXFLAGS="-Wno-unknown-warning-option"
+            COVERAGE=True DEBUG=True
     else
-        ./configure "$@" PREFIX=${PREFIX} WARNING_CXXFLAGS="-Wno-unknown-warning-option"
+        ./configure "$@" PREFIX=${PREFIX}
     fi
     # print final config values, sorted and indented
     sort -sk1,1 ./config.py | sed -e 's/^/	/'

From 05936826b378e79306fa9aef0c890ceb822f2224 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 2 Dec 2016 14:05:16 -0800
Subject: [PATCH 132/328] allow visual test failures with g++
 https://github.com/mapnik/mapnik/issues/3567

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e71832ce9..7dd209fae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -109,7 +109,10 @@ script:
  # (and might work) for the next build
  - DURATION=2400
  - scripts/travis-command-wrapper.py -s "date" -i 120 --deadline=$(( $(date +%s) + ${DURATION} )) make
- - make test
+ - RESULT=0
+ - make test || RESULT=$?
+ # we allow visual failures with g++ for now: https://github.com/mapnik/mapnik/issues/3567
+ - if [[ ${RESULT} != 0 ]] && [[ ${CXX} =~ 'clang++' ]]; then false; fi;
  - enabled ${COVERAGE} coverage
  - enabled ${BENCH} make bench
 

From 4cdc3428bdad8a09b8f6a4c32e2dabdc1b5b287a Mon Sep 17 00:00:00 2001
From: Jiri Drbalek <jiri.drbalek@firma.seznam.cz>
Date: Fri, 2 Dec 2016 15:55:50 +0000
Subject: [PATCH 133/328] remove redundant code

---
 src/text/symbolizer_helpers.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/text/symbolizer_helpers.cpp b/src/text/symbolizer_helpers.cpp
index 384a7fe96..b0a2430a1 100644
--- a/src/text/symbolizer_helpers.cpp
+++ b/src/text/symbolizer_helpers.cpp
@@ -189,12 +189,6 @@ base_symbolizer_helper::base_symbolizer_helper(
 
 struct largest_bbox_first
 {
-    bool operator() (geometry::geometry<double> const* g0, geometry::geometry<double> const* g1) const
-    {
-        box2d<double> b0 = geometry::envelope(*g0);
-        box2d<double> b1 = geometry::envelope(*g1);
-        return b0.width() * b0.height() > b1.width() * b1.height();
-    }
     bool operator() (base_symbolizer_helper::geometry_cref const& g0,
                      base_symbolizer_helper::geometry_cref const& g1) const
     {

From 2174c10b2fcfc8d79421e7d22fc6024f9a3b2d9f Mon Sep 17 00:00:00 2001
From: Jiri Drbalek <jiri.drbalek@firma.seznam.cz>
Date: Fri, 2 Dec 2016 16:15:07 +0000
Subject: [PATCH 134/328] find max element instead of std::sort

---
 include/mapnik/box2d.hpp        |  1 +
 include/mapnik/box2d_impl.hpp   |  5 +++++
 src/text/symbolizer_helpers.cpp | 35 +++++++++++++++++++++++----------
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/include/mapnik/box2d.hpp b/include/mapnik/box2d.hpp
index c6c794c83..626aebde2 100644
--- a/include/mapnik/box2d.hpp
+++ b/include/mapnik/box2d.hpp
@@ -116,6 +116,7 @@ public:
     bool valid() const;
     void move(T x, T y);
     std::string to_string() const;
+    T area() const;
 
     // define some operators
     box2d_type& operator+=(box2d_type const& other);
diff --git a/include/mapnik/box2d_impl.hpp b/include/mapnik/box2d_impl.hpp
index b1c462d16..232a25d58 100644
--- a/include/mapnik/box2d_impl.hpp
+++ b/include/mapnik/box2d_impl.hpp
@@ -407,6 +407,11 @@ std::string box2d<T>::to_string() const
     return s.str();
 }
 
+template <typename T>
+T  box2d<T>::area() const
+{
+    return width() * height();
+}
 
 template <typename T>
 box2d<T>&  box2d<T>::operator+=(box2d<T> const& other)
diff --git a/src/text/symbolizer_helpers.cpp b/src/text/symbolizer_helpers.cpp
index b0a2430a1..300d91938 100644
--- a/src/text/symbolizer_helpers.cpp
+++ b/src/text/symbolizer_helpers.cpp
@@ -187,17 +187,26 @@ base_symbolizer_helper::base_symbolizer_helper(
     initialize_points();
 }
 
-struct largest_bbox_first
+template <typename It>
+static It largest_bbox(It begin, It end)
 {
-    bool operator() (base_symbolizer_helper::geometry_cref const& g0,
-                     base_symbolizer_helper::geometry_cref const& g1) const
+    if (begin == end)
     {
-        // TODO - this has got to be expensive! Can we cache bbox's if there are repeated calls to same geom?
-        box2d<double> b0 = geometry::envelope(g0);
-        box2d<double> b1 = geometry::envelope(g1);
-        return b0.width() * b0.height() > b1.width() * b1.height();
+        return end;
     }
-};
+    It largest_geom = begin;
+    double largest_bbox = geometry::envelope(*largest_geom).area();
+    for (++begin; begin != end; ++begin)
+    {
+        double bbox = geometry::envelope(*begin).area();
+        if (bbox > largest_bbox)
+        {
+            largest_bbox = bbox;
+            largest_geom = begin;
+        }
+    }
+    return largest_geom;
+}
 
 void base_symbolizer_helper::initialize_geometries() const
 {
@@ -210,10 +219,16 @@ void base_symbolizer_helper::initialize_geometries() const
             type == geometry::geometry_types::MultiPolygon)
         {
             bool largest_box_only = text_props_->largest_bbox_only;
-            if (largest_box_only)
+            if (largest_box_only && geometries_to_process_.size() > 1)
             {
-                geometries_to_process_.sort(largest_bbox_first());
+                auto largest_geom = largest_bbox(
+                    geometries_to_process_.begin(),
+                    geometries_to_process_.end());
                 geo_itr_ = geometries_to_process_.begin();
+                if (geo_itr_ != largest_geom)
+                {
+                    std::swap(*geo_itr_, *largest_geom);
+                }
                 geometries_to_process_.erase(++geo_itr_, geometries_to_process_.end());
             }
         }

From 6364e07d71a800051c199a715231e09fbd9d6448 Mon Sep 17 00:00:00 2001
From: Jiri Drbalek <jiri.drbalek@firma.seznam.cz>
Date: Mon, 5 Dec 2016 08:49:16 +0000
Subject: [PATCH 135/328] duplicate code elimination

---
 src/agg/process_line_pattern_symbolizer.cpp   |  78 ++--------
 .../process_polygon_pattern_symbolizer.cpp    | 136 +++---------------
 2 files changed, 32 insertions(+), 182 deletions(-)

diff --git a/src/agg/process_line_pattern_symbolizer.cpp b/src/agg/process_line_pattern_symbolizer.cpp
index dbbb7f26d..e8770e2cd 100644
--- a/src/agg/process_line_pattern_symbolizer.cpp
+++ b/src/agg/process_line_pattern_symbolizer.cpp
@@ -79,79 +79,22 @@ struct agg_renderer_process_visitor_l
 
     void operator() (marker_svg const& marker) const
     {
-        using color = agg::rgba8;
-        using order = agg::order_rgba;
-        using blender_type = agg::comp_op_adaptor_rgba_pre<color, order>;
-        using pattern_filter_type = agg::pattern_filter_bilinear_rgba8;
-        using pattern_type = agg::line_image_pattern<pattern_filter_type>;
-        using pixfmt_type = agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer>;
-        using renderer_base = agg::renderer_base<pixfmt_type>;
-        using renderer_type = agg::renderer_outline_image<renderer_base, pattern_type>;
-        using rasterizer_type = agg::rasterizer_outline_aa<renderer_type>;
-
-        value_double opacity = get<value_double, keys::opacity>(sym_, feature_, common_.vars_);
         agg::trans_affine image_tr = agg::trans_affine_scaling(common_.scale_factor_);
         auto image_transform = get_optional<transform_type>(sym_, keys::image_transform);
         if (image_transform) evaluate_transform(image_tr, feature_, common_.vars_, *image_transform, common_.scale_factor_);
         mapnik::box2d<double> const& bbox_image = marker.get_data()->bounding_box() * image_tr;
         image_rgba8 image(bbox_image.width(), bbox_image.height());
         render_pattern<buffer_type>(*ras_ptr_, marker, image_tr, 1.0, image);
-
-        value_bool clip = get<value_bool, keys::clip>(sym_, feature_, common_.vars_);
-        value_double offset = get<value_double, keys::offset>(sym_, feature_, common_.vars_);
-        value_double simplify_tolerance = get<value_double, keys::simplify_tolerance>(sym_, feature_, common_.vars_);
-        value_double smooth = get<value_double, keys::smooth>(sym_, feature_, common_.vars_);
-
-        agg::rendering_buffer buf(current_buffer_->bytes(),current_buffer_->width(),current_buffer_->height(), current_buffer_->row_size());
-        pixfmt_type pixf(buf);
-        pixf.comp_op(static_cast<agg::comp_op_e>(get<composite_mode_e, keys::comp_op>(sym_, feature_, common_.vars_)));
-        renderer_base ren_base(pixf);
-        agg::pattern_filter_bilinear_rgba8 filter;
-
-        pattern_source source(image, opacity);
-        pattern_type pattern (filter,source);
-        renderer_type ren(ren_base, pattern);
-        double half_stroke = std::max(marker.width()/2.0,marker.height()/2.0);
-        int rast_clip_padding = static_cast<int>(std::round(half_stroke));
-        ren.clip_box(-rast_clip_padding,-rast_clip_padding,common_.width_+rast_clip_padding,common_.height_+rast_clip_padding);
-        rasterizer_type ras(ren);
-
-        agg::trans_affine tr;
-        auto transform = get_optional<transform_type>(sym_, keys::geometry_transform);
-        if (transform) evaluate_transform(tr, feature_, common_.vars_, *transform, common_.scale_factor_);
-
-        box2d<double> clip_box = clipping_extent(common_);
-        if (clip)
-        {
-            double padding = (double)(common_.query_extent_.width()/pixmap_.width());
-            if (half_stroke > 1)
-                padding *= half_stroke;
-            if (std::fabs(offset) > 0)
-                padding *= std::fabs(offset) * 1.2;
-            padding *= common_.scale_factor_;
-            clip_box.pad(padding);
-        }
-        using vertex_converter_type = vertex_converter<clip_line_tag, transform_tag,
-                                                       affine_transform_tag,
-                                                       simplify_tag,smooth_tag,
-                                                       offset_transform_tag>;
-
-        vertex_converter_type converter(clip_box,sym_,common_.t_,prj_trans_,tr,feature_,common_.vars_,common_.scale_factor_);
-
-        if (clip) converter.set<clip_line_tag>();
-        converter.set<transform_tag>(); //always transform
-        if (simplify_tolerance > 0.0) converter.set<simplify_tag>(); // optional simplify converter
-        if (std::fabs(offset) > 0.0) converter.set<offset_transform_tag>(); // parallel offset
-        converter.set<affine_transform_tag>(); // optional affine transform
-        if (smooth > 0.0) converter.set<smooth_tag>(); // optional smooth converter
-
-        using apply_vertex_converter_type = detail::apply_vertex_converter<vertex_converter_type, rasterizer_type>;
-        using vertex_processor_type = geometry::vertex_processor<apply_vertex_converter_type>;
-        apply_vertex_converter_type apply(converter, ras);
-        mapnik::util::apply_visitor(vertex_processor_type(apply),feature_.get_geometry());
+        render(image, marker.width(), marker.height());
     }
 
     void operator() (marker_rgba8 const& marker) const
+    {
+        render(marker.get_data(), marker.width(), marker.height());
+    }
+
+private:
+    void render(mapnik::image_rgba8 const& marker, double width, double height) const
     {
         using color = agg::rgba8;
         using order = agg::order_rgba;
@@ -164,8 +107,6 @@ struct agg_renderer_process_visitor_l
         using rasterizer_type = agg::rasterizer_outline_aa<renderer_type>;
 
         value_double opacity = get<value_double, keys::opacity>(sym_, feature_, common_.vars_);
-        mapnik::image_rgba8 const& image = marker.get_data();
-
         value_bool clip = get<value_bool, keys::clip>(sym_, feature_, common_.vars_);
         value_double offset = get<value_double, keys::offset>(sym_, feature_, common_.vars_);
         value_double simplify_tolerance = get<value_double, keys::simplify_tolerance>(sym_, feature_, common_.vars_);
@@ -178,10 +119,10 @@ struct agg_renderer_process_visitor_l
         renderer_base ren_base(pixf);
         agg::pattern_filter_bilinear_rgba8 filter;
 
-        pattern_source source(image, opacity);
+        pattern_source source(marker, opacity);
         pattern_type pattern (filter,source);
         renderer_type ren(ren_base, pattern);
-        double half_stroke = std::max(marker.width()/2.0,marker.height()/2.0);
+        double half_stroke = std::max(width / 2.0, height / 2.0);
         int rast_clip_padding = static_cast<int>(std::round(half_stroke));
         ren.clip_box(-rast_clip_padding,-rast_clip_padding,common_.width_+rast_clip_padding,common_.height_+rast_clip_padding);
         rasterizer_type ras(ren);
@@ -221,7 +162,6 @@ struct agg_renderer_process_visitor_l
         mapnik::util::apply_visitor(vertex_processor_type(apply), feature_.get_geometry());
     }
 
-  private:
     renderer_common & common_;
     buffer_type & pixmap_;
     buffer_type * current_buffer_;
diff --git a/src/agg/process_polygon_pattern_symbolizer.cpp b/src/agg/process_polygon_pattern_symbolizer.cpp
index f2a0159d1..5e017cf7e 100644
--- a/src/agg/process_polygon_pattern_symbolizer.cpp
+++ b/src/agg/process_polygon_pattern_symbolizer.cpp
@@ -88,123 +88,17 @@ struct agg_renderer_process_visitor_p
         mapnik::box2d<double> const& bbox_image = marker.get_data()->bounding_box() * image_tr;
         mapnik::image_rgba8 image(bbox_image.width(), bbox_image.height());
         render_pattern<buffer_type>(*ras_ptr_, marker, image_tr, 1.0, image);
-
-        agg::rendering_buffer buf(current_buffer_->bytes(), current_buffer_->width(),
-                                  current_buffer_->height(), current_buffer_->row_size());
-        ras_ptr_->reset();
-        value_double gamma = get<value_double, keys::gamma>(sym_, feature_, common_.vars_);
-        gamma_method_enum gamma_method = get<gamma_method_enum, keys::gamma_method>(sym_, feature_, common_.vars_);
-        if (gamma != gamma_ || gamma_method != gamma_method_)
-        {
-            set_gamma_method(ras_ptr_, gamma, gamma_method);
-            gamma_method_ = gamma_method;
-            gamma_ = gamma;
-        }
-
-        value_bool clip = get<value_bool, keys::clip>(sym_, feature_, common_.vars_);
-        value_double opacity = get<double, keys::opacity>(sym_, feature_, common_.vars_);
-        value_double simplify_tolerance = get<value_double, keys::simplify_tolerance>(sym_, feature_, common_.vars_);
-        value_double smooth = get<value_double, keys::smooth>(sym_, feature_, common_.vars_);
-
-        box2d<double> clip_box = clipping_extent(common_);
-
-        using color = agg::rgba8;
-        using order = agg::order_rgba;
-        using blender_type = agg::comp_op_adaptor_rgba_pre<color, order>;
-        using pixfmt_type = agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer>;
-
-        using wrap_x_type = agg::wrap_mode_repeat;
-        using wrap_y_type = agg::wrap_mode_repeat;
-        using img_source_type = agg::image_accessor_wrap<agg::pixfmt_rgba32_pre,
-                                                         wrap_x_type,
-                                                         wrap_y_type>;
-
-        using span_gen_type = agg::span_pattern_rgba<img_source_type>;
-        using ren_base = agg::renderer_base<pixfmt_type>;
-
-        using renderer_type = agg::renderer_scanline_aa_alpha<ren_base,
-                                                              agg::span_allocator<agg::rgba8>,
-                                                              span_gen_type>;
-
-        pixfmt_type pixf(buf);
-        pixf.comp_op(static_cast<agg::comp_op_e>(get<composite_mode_e, keys::comp_op>(sym_, feature_, common_.vars_)));
-        ren_base renb(pixf);
-
-        unsigned w = image.width();
-        unsigned h = image.height();
-        agg::rendering_buffer pattern_rbuf((agg::int8u*)image.bytes(),w,h,w*4);
-        agg::pixfmt_rgba32_pre pixf_pattern(pattern_rbuf);
-        img_source_type img_src(pixf_pattern);
-
-        pattern_alignment_enum alignment = get<pattern_alignment_enum, keys::alignment>(sym_, feature_, common_.vars_);
-        unsigned offset_x=0;
-        unsigned offset_y=0;
-
-        if (alignment == LOCAL_ALIGNMENT)
-        {
-            double x0 = 0;
-            double y0 = 0;
-            using apply_local_alignment = detail::apply_local_alignment;
-            apply_local_alignment apply(common_.t_,prj_trans_, clip_box, x0, y0);
-            util::apply_visitor(geometry::vertex_processor<apply_local_alignment>(apply), feature_.get_geometry());
-            offset_x = unsigned(current_buffer_->width() - x0);
-            offset_y = unsigned(current_buffer_->height() - y0);
-        }
-
-        span_gen_type sg(img_src, offset_x, offset_y);
-
-        agg::span_allocator<agg::rgba8> sa;
-        renderer_type rp(renb,sa, sg, unsigned(opacity * 255));
-
-        agg::trans_affine tr;
-        auto transform = get_optional<transform_type>(sym_, keys::geometry_transform);
-        if (transform) evaluate_transform(tr, feature_, common_.vars_, *transform, common_.scale_factor_);
-        using vertex_converter_type = vertex_converter<clip_poly_tag,
-                                                       transform_tag,
-                                                       affine_transform_tag,
-                                                       simplify_tag,
-                                                       smooth_tag>;
-
-        vertex_converter_type converter(clip_box,sym_,common_.t_,prj_trans_,tr,feature_,common_.vars_,common_.scale_factor_);
-
-
-        if (prj_trans_.equal() && clip) converter.set<clip_poly_tag>();
-        converter.set<transform_tag>(); //always transform
-        converter.set<affine_transform_tag>(); // optional affine transform
-        if (simplify_tolerance > 0.0) converter.set<simplify_tag>(); // optional simplify converter
-        if (smooth > 0.0) converter.set<smooth_tag>(); // optional smooth converter
-
-        using apply_vertex_converter_type = detail::apply_vertex_converter<vertex_converter_type, rasterizer>;
-        using vertex_processor_type = geometry::vertex_processor<apply_vertex_converter_type>;
-        apply_vertex_converter_type apply(converter, *ras_ptr_);
-        mapnik::util::apply_visitor(vertex_processor_type(apply),feature_.get_geometry());
-        agg::scanline_u8 sl;
-        ras_ptr_->filling_rule(agg::fill_even_odd);
-        agg::render_scanlines(*ras_ptr_, sl, rp);
+        render(image);
     }
 
     void operator() (marker_rgba8 const& marker) const
     {
-        using color = agg::rgba8;
-        using order = agg::order_rgba;
-        using blender_type = agg::comp_op_adaptor_rgba_pre<color, order>;
-        using pixfmt_type = agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer>;
-
-        using wrap_x_type = agg::wrap_mode_repeat;
-        using wrap_y_type = agg::wrap_mode_repeat;
-        using img_source_type = agg::image_accessor_wrap<agg::pixfmt_rgba32_pre,
-                                                         wrap_x_type,
-                                                         wrap_y_type>;
-
-        using span_gen_type = agg::span_pattern_rgba<img_source_type>;
-        using ren_base = agg::renderer_base<pixfmt_type>;
-
-        using renderer_type = agg::renderer_scanline_aa_alpha<ren_base,
-                                                              agg::span_allocator<agg::rgba8>,
-                                                              span_gen_type>;
-        mapnik::image_rgba8 const& image = marker.get_data();
-
+        render(marker.get_data());
+    }
 
+private:
+    void render(mapnik::image_rgba8 const& image) const
+    {
         agg::rendering_buffer buf(current_buffer_->bytes(), current_buffer_->width(),
                                   current_buffer_->height(), current_buffer_->row_size());
         ras_ptr_->reset();
@@ -224,6 +118,23 @@ struct agg_renderer_process_visitor_p
 
         box2d<double> clip_box = clipping_extent(common_);
 
+        using color = agg::rgba8;
+        using order = agg::order_rgba;
+        using blender_type = agg::comp_op_adaptor_rgba_pre<color, order>;
+        using pixfmt_type = agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer>;
+
+        using wrap_x_type = agg::wrap_mode_repeat;
+        using wrap_y_type = agg::wrap_mode_repeat;
+        using img_source_type = agg::image_accessor_wrap<agg::pixfmt_rgba32_pre,
+                                                         wrap_x_type,
+                                                         wrap_y_type>;
+
+        using span_gen_type = agg::span_pattern_rgba<img_source_type>;
+        using ren_base = agg::renderer_base<pixfmt_type>;
+
+        using renderer_type = agg::renderer_scanline_aa_alpha<ren_base,
+                                                              agg::span_allocator<agg::rgba8>,
+                                                              span_gen_type>;
 
         pixfmt_type pixf(buf);
         pixf.comp_op(static_cast<agg::comp_op_e>(get<composite_mode_e, keys::comp_op>(sym_, feature_, common_.vars_)));
@@ -282,7 +193,6 @@ struct agg_renderer_process_visitor_p
         agg::render_scanlines(*ras_ptr_, sl, rp);
     }
 
-private:
     renderer_common & common_;
     buffer_type * current_buffer_;
     std::unique_ptr<rasterizer> const& ras_ptr_;

From cb41fc5d483c91f0a3c708542fd100e1e3f79c15 Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Wed, 5 Oct 2016 23:51:03 +0200
Subject: [PATCH 136/328] fix #3526 GroupSymbolizer PairLayout with 3+ items

---
 src/group/group_layout_manager.cpp | 48 ++++++++++++++----------------
 test/data-visual                   |  2 +-
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/group/group_layout_manager.cpp b/src/group/group_layout_manager.cpp
index ad9aaad7c..a6b60d0ae 100644
--- a/src/group/group_layout_manager.cpp
+++ b/src/group/group_layout_manager.cpp
@@ -90,30 +90,26 @@ struct process_layout
             return;
         }
 
-        bound_box layout_box;
-        int middle_ifirst = safe_cast<int>((member_boxes_.size() - 1) >> 1);
-        int top_i = 0;
-        int bottom_i = 0;
-        if (middle_ifirst % 2 == 0)
+        auto max_diff = layout.get_max_difference();
+        auto layout_box = make_horiz_pair(0, 0.0, 0, x_margin, max_diff);
+        auto y_shift = 0.5 * layout_box.height();
+
+        for (size_t i = 2; i < member_boxes_.size(); i += 2)
         {
-            layout_box = make_horiz_pair(0, 0.0, 0, x_margin, layout.get_max_difference());
-            top_i = middle_ifirst - 2;
-            bottom_i = middle_ifirst + 2;
-        }
-        else
-        {
-            top_i = middle_ifirst - 1;
-            bottom_i = middle_ifirst + 1;
+            auto y = layout_box.maxy() + y_margin;
+            auto pair_box = make_horiz_pair(i, y, 1, x_margin, max_diff);
+            layout_box.expand_to_include(pair_box);
         }
 
-        while (bottom_i >= 0 && top_i >= 0 && top_i < static_cast<int>(member_offsets_.size()))
-        {
-            layout_box.expand_to_include(make_horiz_pair(static_cast<std::size_t>(top_i), layout_box.miny() - y_margin, -1, x_margin, layout.get_max_difference()));
-            layout_box.expand_to_include(make_horiz_pair(static_cast<std::size_t>(bottom_i), layout_box.maxy() + y_margin, 1, x_margin, layout.get_max_difference()));
-            top_i -= 2;
-            bottom_i += 2;
-        }
+        // layout_box.center corresponds to the center of the first row;
+        // shift offsets so that the whole group is centered vertically
 
+        y_shift -= 0.5 * layout_box.height();
+
+        for (auto & offset : member_offsets_)
+        {
+            offset.y += y_shift;
+        }
     }
 
 private:
@@ -146,12 +142,12 @@ private:
     // stores corresponding offset, and returns modified bounding box
     bound_box box_offset_align(size_t i, double x, double y, int x_dir, int y_dir) const
     {
-        bound_box const& box = member_boxes_[i];
-        pixel_position offset((x_dir == 0 ? x - input_origin_.x : x - (x_dir < 0 ? box.maxx() : box.minx())),
-                             (y_dir == 0 ? y - input_origin_.y : y - (y_dir < 0 ? box.maxy() : box.miny())));
-
-        member_offsets_[i] = offset;
-        return bound_box(box.minx() + offset.x, box.miny() + offset.y, box.maxx() + offset.x, box.maxy() + offset.y);
+        auto box = member_boxes_[i];
+        auto & offset = member_offsets_[i];
+        offset.x = x - (x_dir == 0 ? input_origin_.x : (x_dir < 0 ? box.maxx() : box.minx()));
+        offset.y = y - (y_dir == 0 ? input_origin_.y : (y_dir < 0 ? box.maxy() : box.miny()));
+        box.move(offset.x, offset.y);
+        return box;
     }
 };
 
diff --git a/test/data-visual b/test/data-visual
index 941db3d00..f9a3c203b 160000
--- a/test/data-visual
+++ b/test/data-visual
@@ -1 +1 @@
-Subproject commit 941db3d00920dc7aceaa6797096a7228bc7bac14
+Subproject commit f9a3c203b3657dd1748d788304f83a26efb6439f

From df10fab4395e5a2446d13777170d855c7ba5afc7 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 6 Dec 2016 12:20:16 +0100
Subject: [PATCH 137/328] only add `valid` bounding boxes (make backward
 compatible)

---
 .../mapnik/json/extract_bounding_boxes_x3_config.hpp  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/mapnik/json/extract_bounding_boxes_x3_config.hpp b/include/mapnik/json/extract_bounding_boxes_x3_config.hpp
index e08baae18..0f460c7c8 100644
--- a/include/mapnik/json/extract_bounding_boxes_x3_config.hpp
+++ b/include/mapnik/json/extract_bounding_boxes_x3_config.hpp
@@ -54,10 +54,13 @@ struct extract_positions
     {
         auto const& r = std::get<0>(val);
         auto const& b = std::get<1>(val);
-        auto offset = std::distance(start_, r.begin());
-        auto size = std::distance(r.begin(), r.end());
-        boxes_.emplace_back(std::make_pair(box_type(b.minx(), b.miny(), b.maxx(), b.maxy()), std::make_pair(offset, size)));
-        //boxes_.emplace_back(std::make_tuple(bbox,offset, size));
+        if (b.valid())
+        {
+            auto offset = std::distance(start_, r.begin());
+            auto size = std::distance(r.begin(), r.end());
+            boxes_.emplace_back(std::make_pair(box_type(b.minx(), b.miny(), b.maxx(), b.maxy()), std::make_pair(offset, size)));
+            //boxes_.emplace_back(std::make_tuple(bbox,offset, size));
+        }
     }
     Iterator start_;
     Boxes & boxes_;

From a07a8cd6fe4ad4226a4c76e9be57522e3e60bee8 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 6 Dec 2016 14:56:04 +0100
Subject: [PATCH 138/328] use <mapnik/util/variant_io.hpp> which has
 specialisation for boolean type

---
 src/save_map.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/save_map.cpp b/src/save_map.cpp
index 882d795f9..4594a1e65 100644
--- a/src/save_map.cpp
+++ b/src/save_map.cpp
@@ -46,7 +46,7 @@
 #include <mapnik/group/group_layout.hpp>
 #include <mapnik/group/group_symbolizer_properties.hpp>
 #include <mapnik/util/variant.hpp>
-#include <mapbox/variant_io.hpp>
+#include <mapnik/util/variant_io.hpp>
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/algorithm/string.hpp>
@@ -488,7 +488,8 @@ void serialize_datasource( ptree & layer_node, datasource_ptr datasource)
 
 void serialize_parameters( ptree & map_node, mapnik::parameters const& params)
 {
-    if (params.size()) {
+    if (params.size())
+    {
         ptree & params_node = map_node.push_back(
             ptree::value_type("Parameters", ptree()))->second;
 

From 87c65e888dba18bd80b5a1efbda2dc8d0ff0c0d9 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 6 Dec 2016 14:56:52 +0100
Subject: [PATCH 139/328] update variant dep

---
 deps/mapbox/variant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index 02bd1ac4c..84a426a31 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit 02bd1ac4c07e6db9fe0f01267853e43b41637b74
+Subproject commit 84a426a31ad3b63c4b8f8d189841e19af48cda40

From fe7e9a7dc517dbe7d3617f1edea86ab3b8ee3a9d Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 6 Dec 2016 15:14:28 +0100
Subject: [PATCH 140/328] use mapbox namespace to fix name resolution

---
 include/mapnik/util/variant_io.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/mapnik/util/variant_io.hpp b/include/mapnik/util/variant_io.hpp
index 02f0be5ca..98978e3ac 100644
--- a/include/mapnik/util/variant_io.hpp
+++ b/include/mapnik/util/variant_io.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_UTIL_VARIANT_IO_HPP
 
 
-namespace mapnik { namespace util {
+namespace mapbox { namespace util {
 
 namespace detail {
 

From 1372ca48ef841e548241552671831ac1736e91e6 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 8 Dec 2016 10:43:25 +0100
Subject: [PATCH 141/328] SConstruct - require c++14

---
 SConstruct | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/SConstruct b/SConstruct
index e88e0b373..1498ee4b1 100644
--- a/SConstruct
+++ b/SConstruct
@@ -41,8 +41,8 @@ ICU_LIBS_DEFAULT='/usr/'
 
 DEFAULT_CC = "cc"
 DEFAULT_CXX = "c++"
-DEFAULT_CXX11_CXXFLAGS = " -std=c++14"
-DEFAULT_CXX11_LINKFLAGS = ""
+DEFAULT_CXX14_CXXFLAGS = " -std=c++14"
+DEFAULT_CXX14_LINKFLAGS = ""
 if sys.platform == 'darwin':
     # homebrew default
     ICU_INCLUDES_DEFAULT='/usr/local/opt/icu4c/include/'
@@ -1037,12 +1037,12 @@ int main()
         return True
     return False
 
-def supports_cxx11(context,silent=False):
+def supports_cxx14(context,silent=False):
     ret = context.TryRun("""
 
 int main()
 {
-#if __cplusplus >= 201103
+#if __cplusplus >= 201402L
     return 0;
 #else
     return -1;
@@ -1051,7 +1051,7 @@ int main()
 
 """, '.cpp')
     if not silent:
-        context.Message('Checking if compiler (%s) supports -std=c++11 flag... ' % context.env.get('CXX','CXX'))
+        context.Message('Checking if compiler (%s) supports -std=c++14 flag... ' % context.env.get('CXX','CXX'))
     if silent:
         context.did_show_result=1
     context.Result(ret[0])
@@ -1080,7 +1080,7 @@ conf_tests = { 'prioritize_paths'      : prioritize_paths,
                'harfbuzz_with_freetype_support': harfbuzz_with_freetype_support,
                'boost_regex_has_icu'   : boost_regex_has_icu,
                'sqlite_has_rtree'      : sqlite_has_rtree,
-               'supports_cxx11'        : supports_cxx11,
+               'supports_cxx14'        : supports_cxx14,
                'CheckBoostScopedEnum'  : CheckBoostScopedEnum,
                }
 
@@ -1213,13 +1213,13 @@ if not preconfigured:
 
     # set any custom cxxflags and ldflags to come first
     if sys.platform == 'darwin' and not env['HOST']:
-        DEFAULT_CXX11_CXXFLAGS += ' -stdlib=libc++'
-        DEFAULT_CXX11_LINKFLAGS = ' -stdlib=libc++'
+        DEFAULT_CXX14_CXXFLAGS += ' -stdlib=libc++'
+        DEFAULT_CXX14_LINKFLAGS = ' -stdlib=libc++'
     env.Append(CPPDEFINES = env['CUSTOM_DEFINES'])
-    env.Append(CXXFLAGS = DEFAULT_CXX11_CXXFLAGS)
+    env.Append(CXXFLAGS = DEFAULT_CXX14_CXXFLAGS)
     env.Append(CXXFLAGS = env['CUSTOM_CXXFLAGS'])
     env.Append(CFLAGS = env['CUSTOM_CFLAGS'])
-    env.Append(LINKFLAGS = DEFAULT_CXX11_LINKFLAGS)
+    env.Append(LINKFLAGS = DEFAULT_CXX14_LINKFLAGS)
     env.Append(LINKFLAGS = env['CUSTOM_LDFLAGS'])
 
     ### platform specific bits
@@ -1353,9 +1353,9 @@ if not preconfigured:
     if env['PRIORITIZE_LINKING']:
         conf.prioritize_paths(silent=True)
 
-    # test for C++11 support, which is required
-    if not env['HOST'] and not conf.supports_cxx11():
-        color_print(1,"C++ compiler does not support C++11 standard (-std=c++11), which is required. Please upgrade your compiler")
+    # test for C++14 support, which is required
+    if not env['HOST'] and not conf.supports_cxx14():
+        color_print(1,"C++ compiler does not support C++14 standard (-std=c++14), which is required. Please upgrade your compiler")
         Exit(1)
 
     if not env['HOST']:

From 0d703ee5521d8a2d120bb0c07f69e011e722927c Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 8 Dec 2016 18:55:55 +0100
Subject: [PATCH 142/328] cleanup include directives

---
 .../mapnik/json/feature_generator_grammar_impl.hpp |  5 -----
 .../json/properties_generator_grammar_impl.hpp     | 14 ++------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/include/mapnik/json/feature_generator_grammar_impl.hpp b/include/mapnik/json/feature_generator_grammar_impl.hpp
index 7008bb9f3..1ee4b99ae 100644
--- a/include/mapnik/json/feature_generator_grammar_impl.hpp
+++ b/include/mapnik/json/feature_generator_grammar_impl.hpp
@@ -22,11 +22,6 @@
 
 #include <mapnik/json/feature_generator_grammar.hpp>
 
-#include <boost/spirit/include/karma.hpp>
-#include <boost/spirit/include/phoenix.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/fusion/include/at.hpp>
-
 namespace mapnik { namespace json {
 
 template <typename OutputIterator, typename FeatureType>
diff --git a/include/mapnik/json/properties_generator_grammar_impl.hpp b/include/mapnik/json/properties_generator_grammar_impl.hpp
index df9b113c5..b0f008a72 100644
--- a/include/mapnik/json/properties_generator_grammar_impl.hpp
+++ b/include/mapnik/json/properties_generator_grammar_impl.hpp
@@ -26,8 +26,6 @@
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/include/phoenix.hpp>
-#include <boost/spirit/include/phoenix_fusion.hpp>
-#include <boost/fusion/include/at.hpp>
 #include <boost/fusion/adapted/std_tuple.hpp>
 #pragma GCC diagnostic pop
 
@@ -60,7 +58,7 @@ escaped_string<OutputIterator>::escaped_string()
 }
 
 template <typename OutputIterator, typename KeyValueStore>
-properties_generator_grammar<OutputIterator,KeyValueStore>::properties_generator_grammar()
+properties_generator_grammar<OutputIterator, KeyValueStore>::properties_generator_grammar()
     : properties_generator_grammar::base_type(properties),
       quote_("\"")
 {
@@ -71,14 +69,13 @@ properties_generator_grammar<OutputIterator,KeyValueStore>::properties_generator
     boost::spirit::karma::string_type kstring;
     boost::spirit::karma::eps_type eps;
     using boost::phoenix::at_c;
-
     properties = lit('{')
         << -(pair % lit(','))
         << lit('}')
         ;
 
     pair = lit('"')
-        << kstring[_1 = boost::phoenix::at_c<0>(_val)] << lit('"')
+        << kstring[_1 = at_c<0>(_val)] << lit('"')
         << lit(':')
         << value[_1 = extract_string_(at_c<1>(_val))]
         ;
@@ -88,13 +85,6 @@ properties_generator_grammar<OutputIterator,KeyValueStore>::properties_generator
         kstring[_1 = at_c<0>(_val)]
         ;
 
-    // FIXME http://boost-spirit.com/home/articles/karma-examples/creating-your-own-generator-component-for-spirit-karma/
-    //value = (value_null_| bool_ | int__ | double_ | ustring)//[_1 = value_base_(_r1)]
-    //   ;
-    //value_null_ = kstring[_1 = "null"]
-    //    ;
-    //ustring = escaped_string_(quote_.c_str())[_1 = utf8_(_val)]
-    //    ;
 }
 
 }}

From 5eaf37404a0cf65ff072178ecbe5024550e83044 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 9 Dec 2016 11:49:08 +0100
Subject: [PATCH 143/328] remove unused `using` directive

---
 src/parse_image_filters.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/parse_image_filters.cpp b/src/parse_image_filters.cpp
index e8370e897..09b2fe3a5 100644
--- a/src/parse_image_filters.cpp
+++ b/src/parse_image_filters.cpp
@@ -32,7 +32,6 @@ namespace filter {
 
 bool parse_image_filters(std::string const& str, std::vector<filter_type> & image_filters)
 {
-    using namespace boost::spirit::x3::ascii;
     auto const& grammar = mapnik::image_filter_grammar();
     auto itr = str.begin();
     auto end = str.end();

From c5174d28622f556bbf255f0366de7cb416466c7d Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 9 Dec 2016 11:49:53 +0100
Subject: [PATCH 144/328] port `parse_hex` to use boost::spirit::x3

---
 test/unit/serialization/parse_hex.hpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/test/unit/serialization/parse_hex.hpp b/test/unit/serialization/parse_hex.hpp
index 53f48fdbe..4475bc946 100644
--- a/test/unit/serialization/parse_hex.hpp
+++ b/test/unit/serialization/parse_hex.hpp
@@ -25,8 +25,7 @@
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/qi_char_.hpp>
+#include <boost/spirit/home/x3.hpp>
 #pragma GCC diagnostic pop
 
 namespace mapnik { namespace util {
@@ -34,11 +33,11 @@ namespace mapnik { namespace util {
 template <typename Out>
 bool parse_hex(std::string const& input, Out & output)
 {
-    boost::spirit::qi::lit_type lit;
+    using boost::spirit::x3::lit;
     auto itr = input.begin();
     auto end = input.end();
-    using hex2 = boost::spirit::qi::uint_parser< unsigned, 16, 2, 2 >;
-    return boost::spirit::qi::parse(itr, end, -(lit("\\x") | lit("0x")) > *hex2(), output);
+    using hex2 = boost::spirit::x3::uint_parser< unsigned, 16, 2, 2 >;
+    return boost::spirit::x3::parse(itr, end, -(lit("\\x") | lit("0x")) > *hex2(), output);
 }
 
 }}

From fc54faac54edc0e600c1d40cbbba945a34796c63 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 9 Dec 2016 11:52:25 +0100
Subject: [PATCH 145/328] make `parse_map_sizes` standalone method + upgrade
 parser to use `boost::spirit::x3`

---
 test/build.py                                 |  1 +
 ..._sizes_grammar.hpp => parse_map_sizes.cpp} | 48 +++++++++----------
 test/visual/parse_map_sizes.hpp               | 36 ++++++++++++++
 test/visual/runner.cpp                        | 16 ++-----
 test/visual/runner.hpp                        |  7 +--
 5 files changed, 64 insertions(+), 44 deletions(-)
 rename test/visual/{map_sizes_grammar.hpp => parse_map_sizes.cpp} (55%)
 create mode 100644 test/visual/parse_map_sizes.hpp

diff --git a/test/build.py b/test/build.py
index 78fd9342a..8a9a44523 100644
--- a/test/build.py
+++ b/test/build.py
@@ -54,6 +54,7 @@ else:
         visual/report.cpp
         visual/runner.cpp
         visual/run.cpp
+        visual/parse_map_sizes.cpp
         """
         )
     test_program3 = test_env_local.Program('visual/run', source=source)
diff --git a/test/visual/map_sizes_grammar.hpp b/test/visual/parse_map_sizes.cpp
similarity index 55%
rename from test/visual/map_sizes_grammar.hpp
rename to test/visual/parse_map_sizes.cpp
index 2c79d90d8..7cea5df4a 100644
--- a/test/visual/map_sizes_grammar.hpp
+++ b/test/visual/parse_map_sizes.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,40 +20,36 @@
  *
  *****************************************************************************/
 
-#ifndef MAP_SIZES_GRAMMAR_HPP
-#define MAP_SIZES_GRAMMAR_HPP
+#include "parse_map_sizes.hpp"
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix.hpp>
+#include <boost/spirit/home/x3.hpp>
+#include <boost/fusion/include/adapt_struct.hpp>
 #pragma GCC diagnostic pop
 
-namespace visual_tests
-{
+BOOST_FUSION_ADAPT_STRUCT (
+    visual_tests::map_size,
+    (std::size_t, width)
+    (std::size_t, height)
+    )
 
-namespace qi = boost::spirit::qi;
-namespace ascii = boost::spirit::ascii;
+namespace visual_tests {
 
-template <typename Iterator>
-struct map_sizes_grammar : qi::grammar<Iterator, std::vector<map_size>(), ascii::space_type>
+namespace x3 = boost::spirit::x3;
+using x3::ulong_;
+auto const map_sizes_grammar = x3::rule<class map_sizes_grammar_type, std::vector<map_size> >{} =
+    (ulong_ >> ',' >> ulong_) % ';' ;
+
+void parse_map_sizes(std::string const & str, std::vector<map_size> & sizes)
 {
-    map_sizes_grammar() : map_sizes_grammar::base_type(start)
+    boost::spirit::x3::ascii::space_type space;
+    std::string::const_iterator iter = str.begin();
+    std::string::const_iterator end = str.end();
+    if (!boost::spirit::x3::phrase_parse(iter, end, map_sizes_grammar, space, sizes))
     {
-        using namespace boost::spirit::qi;
-        using namespace boost::phoenix;
-
-        int_type int_;
-        _1_type _1;
-        _2_type _2;
-        _val_type _val;
-
-        start = (int_ >> ',' >> int_)[push_back(_val, construct<map_size>(_1, _2))] % ';';
+        throw std::runtime_error("Failed to parse list of sizes: '" + str + "'");
     }
-
-    qi::rule<Iterator, std::vector<map_size>(), ascii::space_type> start;
-};
-
 }
 
-#endif
+}
diff --git a/test/visual/parse_map_sizes.hpp b/test/visual/parse_map_sizes.hpp
new file mode 100644
index 000000000..5d0f0125b
--- /dev/null
+++ b/test/visual/parse_map_sizes.hpp
@@ -0,0 +1,36 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef VISUAL_TESTS_PARSE_MAP_SIZES_HPP
+#define VISUAL_TESTS_PARSE_MAP_SIZES_HPP
+
+#include "config.hpp"
+#include <vector>
+#include <string>
+
+namespace visual_tests {
+
+void parse_map_sizes(std::string const & str, std::vector<map_size> & sizes);
+
+}
+
+#endif //VISUAL_TESTS_PARSE_MAP_SIZES_HPP
diff --git a/test/visual/runner.cpp b/test/visual/runner.cpp
index d0c7222fb..18e6506ec 100644
--- a/test/visual/runner.cpp
+++ b/test/visual/runner.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -25,9 +25,11 @@
 #include <future>
 #include <atomic>
 
+
 #include <mapnik/load_map.hpp>
 
 #include "runner.hpp"
+#include "parse_map_sizes.hpp"
 
 namespace visual_tests
 {
@@ -348,19 +350,7 @@ result_list runner::test_one(runner::path_type const& style_path,
             }
         }
     }
-
     return results;
 }
 
-void runner::parse_map_sizes(std::string const & str, std::vector<map_size> & sizes) const
-{
-    boost::spirit::ascii::space_type space;
-    std::string::const_iterator iter = str.begin();
-    std::string::const_iterator end = str.end();
-    if (!boost::spirit::qi::phrase_parse(iter, end, map_sizes_parser_, space, sizes))
-    {
-        throw std::runtime_error("Failed to parse list of sizes: '" + str + "'");
-    }
-}
-
 }
diff --git a/test/visual/runner.hpp b/test/visual/runner.hpp
index e38e39422..b5c031627 100644
--- a/test/visual/runner.hpp
+++ b/test/visual/runner.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -26,7 +26,6 @@
 #include "config.hpp"
 #include "report.hpp"
 #include "renderer.hpp"
-#include "map_sizes_grammar.hpp"
 
 namespace visual_tests
 {
@@ -58,9 +57,7 @@ private:
     result_list test_one(path_type const & style_path,
                          report_type & report,
                          std::atomic<std::size_t> & fail_limit) const;
-    void parse_map_sizes(std::string const & str, std::vector<map_size> & sizes) const;
 
-    const map_sizes_grammar<std::string::const_iterator> map_sizes_parser_;
     const path_type styles_dir_;
     const config defaults_;
     const std::size_t jobs_;
@@ -71,4 +68,4 @@ private:
 
 }
 
-#endif
+#endif //VISUAL_TEST_RUNNER_HPP

From 2924d736a8457a12269f63be3f260bb151bd966e Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 9 Dec 2016 17:07:23 +0100
Subject: [PATCH 146/328] update version to 3.1.0

---
 include/mapnik/version.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/mapnik/version.hpp b/include/mapnik/version.hpp
index deba4287c..828ff9bac 100644
--- a/include/mapnik/version.hpp
+++ b/include/mapnik/version.hpp
@@ -26,8 +26,8 @@
 #include <mapnik/stringify_macro.hpp>
 
 #define MAPNIK_MAJOR_VERSION 3
-#define MAPNIK_MINOR_VERSION 0
-#define MAPNIK_PATCH_VERSION 12
+#define MAPNIK_MINOR_VERSION 1
+#define MAPNIK_PATCH_VERSION 0
 
 #define MAPNIK_VERSION (MAPNIK_MAJOR_VERSION*100000) + (MAPNIK_MINOR_VERSION*100) + (MAPNIK_PATCH_VERSION)
 

From b7a4cd99d7ac25455fe1c90adf3244c68d5cf746 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 9 Dec 2016 17:55:51 +0100
Subject: [PATCH 147/328] update BOOST_MIN_VERSION to 1.61

---
 SConstruct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SConstruct b/SConstruct
index 1498ee4b1..de19797a3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -61,7 +61,7 @@ SCONS_CONFIGURE_CACHE = 'config.cache'
 SCONF_TEMP_DIR = '.sconf_temp'
 # auto-search directories for boost libs/headers
 BOOST_SEARCH_PREFIXES = ['/usr/local','/opt/local','/sw','/usr',]
-BOOST_MIN_VERSION = '1.47'
+BOOST_MIN_VERSION = '1.61'
 #CAIRO_MIN_VERSION = '1.8.0'
 
 HARFBUZZ_MIN_VERSION = (0, 9, 34)

From 8e15353818d385634674246d09c5dcf639eb6b24 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 13 Dec 2016 15:49:03 +0100
Subject: [PATCH 148/328] minor format tweak

---
 include/mapnik/json/topojson_grammar.hpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/mapnik/json/topojson_grammar.hpp b/include/mapnik/json/topojson_grammar.hpp
index c21be95fe..1317fd3a9 100644
--- a/include/mapnik/json/topojson_grammar.hpp
+++ b/include/mapnik/json/topojson_grammar.hpp
@@ -173,7 +173,9 @@ struct create_geometry_impl
 };
 
 using coordinates_type = util::variant<coordinate,std::vector<coordinate>>;
-using arcs_type = util::variant<std::vector<index_type>, std::vector<std::vector<index_type>>, std::vector<std::vector<std::vector<index_type>>>>;
+using arcs_type = util::variant<std::vector<index_type>,
+                                std::vector<std::vector<index_type>>,
+                                std::vector<std::vector<std::vector<index_type>>>>;
 template <typename Iterator, typename ErrorHandler = json::error_handler<Iterator> >
 struct topojson_grammar : qi::grammar<Iterator, space_type, topology()>
 

From 03074997535df82c3b30bd6005d9b271dd3c8966 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 13 Dec 2016 15:50:00 +0100
Subject: [PATCH 149/328] simplify hash calculation (we don't need combine with
 which(), using hash<T> is sufficient)

---
 include/mapnik/value/hash.hpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/include/mapnik/value/hash.hpp b/include/mapnik/value/hash.hpp
index 81a27019a..1c6b57216 100644
--- a/include/mapnik/value/hash.hpp
+++ b/include/mapnik/value/hash.hpp
@@ -56,11 +56,6 @@ struct value_hasher
         return static_cast<std::size_t>(val.hashCode());
     }
 
-    std::size_t operator()(value_integer val) const
-    {
-        return static_cast<std::size_t>(val);
-    }
-
     template <class T>
     std::size_t operator()(T const& val) const
     {
@@ -74,10 +69,7 @@ struct value_hasher
 template <typename T>
 std::size_t value_hash(T const& val)
 {
-    std::size_t seed = 0;
-    detail::hash_combine(seed, util::apply_visitor(detail::value_hasher(), val));
-    detail::hash_combine(seed, val.which());
-    return seed;
+    return util::apply_visitor(detail::value_hasher(), val);
 }
 
 } // namespace mapnik

From c2a61161a64766974a89009cfc6b20a797d6fcb2 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 13 Dec 2016 15:51:57 +0100
Subject: [PATCH 150/328] remove `hash_combine` (unused)

---
 include/mapnik/value/hash.hpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/include/mapnik/value/hash.hpp b/include/mapnik/value/hash.hpp
index 1c6b57216..a035f1657 100644
--- a/include/mapnik/value/hash.hpp
+++ b/include/mapnik/value/hash.hpp
@@ -39,11 +39,6 @@ namespace mapnik {
 
 namespace detail {
 
-inline void hash_combine(std::size_t & seed, std::size_t val)
-{
-    seed ^= val + 0x9e3779b9 + (seed << 6) + (seed >> 2);
-}
-
 struct value_hasher
 {
     std::size_t operator() (value_null val) const

From e40a1d9a151854d2087247ec3c307a1d216d66c3 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 13 Dec 2016 16:16:19 +0100
Subject: [PATCH 151/328] expand std::hash<mapnik::value> and operator== test
 for all types in mapnik::value

---
 test/unit/core/conversions_test.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/test/unit/core/conversions_test.cpp b/test/unit/core/conversions_test.cpp
index d804230b0..c7551c0e8 100644
--- a/test/unit/core/conversions_test.cpp
+++ b/test/unit/core/conversions_test.cpp
@@ -283,16 +283,19 @@ SECTION("to string") {
         REQUIRE( string2bool("true",val) );
         REQUIRE( val == true );
 
-        // mapnik::value hashability
+        // mapnik::value hash() and operator== works for all T in value<Types...>
+        mapnik::transcoder tr("utf8");
         using values_container = std::unordered_map<mapnik::value, unsigned>;
         values_container vc;
-        mapnik::value val2(1);
-        vc[val2] = 1;
-        REQUIRE( vc[1] == static_cast<int>(1) );
+        mapnik::value keys[5] = {true, 1, 3.14159f, tr.transcode("Мапник"), mapnik::value_null()} ;
+        for (auto const& k : keys)
+        {
+            vc.insert({k, 123456789});
+            REQUIRE( vc[k] == 123456789 );
+        }
 
         // mapnik::value << to ostream
         std::stringstream s;
-        mapnik::transcoder tr("utf-8");
         mapnik::value_unicode_string ustr = tr.transcode("hello world!");
         mapnik::value streamable(ustr);
         s << streamable;

From e3a1efabe99b007386d9653d86f97642650e051b Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 13 Dec 2016 16:39:16 +0100
Subject: [PATCH 152/328] use latest mapbox::variant

---
 deps/mapbox/variant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index 84a426a31..02bd1ac4c 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit 84a426a31ad3b63c4b8f8d189841e19af48cda40
+Subproject commit 02bd1ac4c07e6db9fe0f01267853e43b41637b74

From 81fafe8198c18c4776c13276e7e29f818a68dd17 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 13 Dec 2016 17:03:09 +0100
Subject: [PATCH 153/328] update test to use `std::unordered_map<mapnik::value,
 mapnik::value>`

---
 test/unit/core/conversions_test.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/unit/core/conversions_test.cpp b/test/unit/core/conversions_test.cpp
index c7551c0e8..98d2bacf4 100644
--- a/test/unit/core/conversions_test.cpp
+++ b/test/unit/core/conversions_test.cpp
@@ -285,13 +285,13 @@ SECTION("to string") {
 
         // mapnik::value hash() and operator== works for all T in value<Types...>
         mapnik::transcoder tr("utf8");
-        using values_container = std::unordered_map<mapnik::value, unsigned>;
+        using values_container = std::unordered_map<mapnik::value, mapnik::value>;
         values_container vc;
-        mapnik::value keys[5] = {true, 1, 3.14159f, tr.transcode("Мапник"), mapnik::value_null()} ;
+        mapnik::value keys[5] = {true, 123456789, 3.14159f, tr.transcode("Мапник"), mapnik::value_null()} ;
         for (auto const& k : keys)
         {
-            vc.insert({k, 123456789});
-            REQUIRE( vc[k] == 123456789 );
+            vc.insert({k, k});
+            REQUIRE( vc[k] == k );
         }
 
         // mapnik::value << to ostream

From 7c14964de3891b293d5ad4301c4630148ad9d171 Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Tue, 13 Dec 2016 15:50:12 +0100
Subject: [PATCH 154/328] simplify mapnik::value conversion rules

- fixes #3570

- avoids recursive exception-specification on value constructor
  by only constructing a temporary for arithmetic types (everything
  else passes a reference to the base variant constructor)

- also removes `is_same<decay_t<T>, value>` SFINAE check -- because
  we're only passing a reference down, explicitly forcing the compiler
  to use the implicitly-defined copy/move instead is pointless
---
 include/mapnik/symbolizer_base.hpp | 13 ++--
 include/mapnik/value.hpp           | 30 +++------
 include/mapnik/value/types.hpp     | 97 +++++-------------------------
 3 files changed, 29 insertions(+), 111 deletions(-)

diff --git a/include/mapnik/symbolizer_base.hpp b/include/mapnik/symbolizer_base.hpp
index 17f14a8e5..e2400faf0 100644
--- a/include/mapnik/symbolizer_base.hpp
+++ b/include/mapnik/symbolizer_base.hpp
@@ -100,18 +100,13 @@ struct strict_value : value_base_type
 {
     strict_value() = default;
 
-    strict_value(const char* val)
+    strict_value(const char* val) noexcept(false)
         : value_base_type(std::string(val)) {}
 
-    template <typename T>
-    strict_value(T const& obj)
-        : value_base_type(typename detail::mapnik_value_type<T>::type(obj))
-    {}
-
-    template <typename T>
+    template <typename T, typename U = detail::mapnik_value_type_t<T>>
     strict_value(T && obj)
-        noexcept(std::is_nothrow_constructible<value_base_type, T && >::value)
-        : value_base_type(std::forward<T>(obj))
+        noexcept(std::is_nothrow_constructible<value_base_type, U>::value)
+        : value_base_type(U(std::forward<T>(obj)))
     {}
 };
 
diff --git a/include/mapnik/value.hpp b/include/mapnik/value.hpp
index ba1575019..8341a557b 100644
--- a/include/mapnik/value.hpp
+++ b/include/mapnik/value.hpp
@@ -47,30 +47,20 @@ class MAPNIK_DECL value : public value_base
 public:
     value() = default;
 
-    // conversion from type T is done via a temporary of type U, which
-    // is determined by mapnik_value_type;
-    // enable_if< decay<T> != value > is necessary to avoid ill-formed
-    // recursion in noexcept specifier; and it also prevents using this
-    // constructor where implicitly-declared copy/move should be used
-    // (e.g. value(value&))
-    template <typename T,
-              typename U = typename std::enable_if<
-                                !detail::is_same_decay<T, value>::value,
-                                detail::mapnik_value_type_decay<T>
-                            >::type::type>
+    // Conversion from type T is done via a temporary value or reference
+    // of type U, which is determined by mapnik_value_type_t.
+    //
+    // CAVEAT: We don't check `noexcept(conversion from T to U)`.
+    //         But since the type U is either value_bool, value_integer,
+    //         value_double or T &&, this conversion SHOULD NEVER throw.
+    template <typename T, typename U = detail::mapnik_value_type_t<T>>
     value(T && val)
-        noexcept(noexcept(U(std::forward<T>(val))) &&
-                 std::is_nothrow_constructible<value_base, U && >::value)
+        noexcept(std::is_nothrow_constructible<value_base, U>::value)
         : value_base(U(std::forward<T>(val))) {}
 
-    template <typename T,
-              typename U = typename std::enable_if<
-                                !detail::is_same_decay<T, value>::value,
-                                detail::mapnik_value_type_decay<T>
-                            >::type::type>
+    template <typename T, typename U = detail::mapnik_value_type_t<T>>
     value& operator=(T && val)
-        noexcept(noexcept(U(std::forward<T>(val))) &&
-                 std::is_nothrow_assignable<value_base, U && >::value)
+        noexcept(std::is_nothrow_assignable<value_base, U>::value)
     {
         value_base::operator=(U(std::forward<T>(val)));
         return *this;
diff --git a/include/mapnik/value/types.hpp b/include/mapnik/value/types.hpp
index 235133a34..d1c0c59bd 100644
--- a/include/mapnik/value/types.hpp
+++ b/include/mapnik/value/types.hpp
@@ -152,90 +152,23 @@ inline std::istream& operator>> ( std::istream & s, value_null & )
 
 
 namespace detail {
-// to mapnik::value_type conversions traits
-template <typename T>
-struct is_value_bool
-{
-    constexpr static bool value = std::is_same<T, bool>::value;
-};
 
-template <typename T>
-struct is_value_integer
-{
-    constexpr static bool value = std::is_integral<T>::value && !std::is_same<T, bool>::value;
-};
+// Helper metafunction for mapnik::value construction and assignment.
+// Returns:
+//  value_bool      if T is bool
+//  value_integer   if T is an integral type (except bool)
+//  value_double    if T is a floating-point type
+//  T &&            otherwise
 
-template <typename T>
-struct is_value_double
-{
-    constexpr static bool value = std::is_floating_point<T>::value;
-};
-
-template <typename T>
-struct is_value_unicode_string
-{
-    constexpr static bool value = std::is_same<T, typename mapnik::value_unicode_string>::value;
-};
-
-template <typename T>
-struct is_value_string
-{
-    constexpr static bool value = std::is_same<T, typename std::string>::value;
-};
-
-template <typename T>
-struct is_value_null
-{
-    constexpr static bool value = std::is_same<T, typename mapnik::value_null>::value;
-};
-
-template <typename T, class Enable = void>
-struct mapnik_value_type
-{
-    using type = T;
-};
-
-// value_null
-template <typename T>
-struct mapnik_value_type<T, typename std::enable_if<detail::is_value_null<T>::value>::type>
-{
-    using type = mapnik::value_null;
-};
-
-// value_bool
-template <typename T>
-struct mapnik_value_type<T, typename std::enable_if<detail::is_value_bool<T>::value>::type>
-{
-    using type = mapnik::value_bool;
-};
-
-// value_integer
-template <typename T>
-struct mapnik_value_type<T, typename std::enable_if<detail::is_value_integer<T>::value>::type>
-{
-    using type = mapnik::value_integer;
-};
-
-// value_double
-template <typename T>
-struct mapnik_value_type<T, typename std::enable_if<detail::is_value_double<T>::value>::type>
-{
-    using type = mapnik::value_double;
-};
-
-// value_unicode_string
-template <typename T>
-struct mapnik_value_type<T, typename std::enable_if<detail::is_value_unicode_string<T>::value>::type>
-{
-    using type = mapnik::value_unicode_string const&;
-};
-
-template <typename T>
-using mapnik_value_type_decay = mapnik_value_type<typename std::decay<T>::type>;
-
-template <typename T, typename U>
-using is_same_decay = std::is_same<typename std::decay<T>::type,
-                                   typename std::decay<U>::type>;
+template <typename T, typename dT = std::decay_t<T>>
+using mapnik_value_type_t =
+    std::conditional_t<
+        std::is_same<dT, bool>::value, value_bool,
+        std::conditional_t<
+            std::is_integral<dT>::value, value_integer,
+            std::conditional_t<
+                std::is_floating_point<dT>::value, value_double,
+                T && >>>;
 
 } // namespace detail
 

From e46785a063003d62d7fd267a29f13f8c53fff133 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 14 Dec 2016 10:49:11 +0100
Subject: [PATCH 155/328] wrap grammar into anonymous namespace - attempting to
 fix VC++ compilation issue (#3573)

---
 src/svg/svg_parser.cpp | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/svg/svg_parser.cpp b/src/svg/svg_parser.cpp
index 9247eef86..0d4db78d4 100644
--- a/src/svg/svg_parser.cpp
+++ b/src/svg/svg_parser.cpp
@@ -94,29 +94,26 @@ void parse_attr(svg_parser & parser,rapidxml::xml_node<char> const* node);
 void parse_attr(svg_parser & parser,char const * name, char const* value);
 
 
-namespace grammar {
+namespace { namespace grammar {
 
 namespace x3 = boost::spirit::x3;
 
 using color_lookup_type = std::vector<std::pair<double, agg::rgba8> >;
 using pairs_type = std::vector<std::pair<std::string, std::string> >;
 
-x3::rule<class key_value_sequence_ordered, pairs_type> const key_value_sequence_ordered("key_value_sequence_ordered");
-x3::rule<class key_value, std::pair<std::string, std::string> > key_value("key_value");
-x3::rule<class key, std::string> key("key");
-x3::rule<class value_, std::string> value("value");
+x3::rule<class key_value_sequence_ordered_tag, pairs_type> const key_value_sequence_ordered("key_value_sequence_ordered");
+x3::rule<class key_value_tag, std::pair<std::string, std::string> > key_value("key_value");
+x3::rule<class key_tag, std::string> key("key");
+x3::rule<class value_tag, std::string> value("value");
 
 auto const key_def = x3::char_("a-zA-Z_") > *x3::char_("a-zA-Z_0-9-");
 auto const value_def = +(x3::char_ - ';');
 auto const key_value_def = key > -(':' > value);
 auto const key_value_sequence_ordered_def = key_value % ';';
 
-BOOST_SPIRIT_DEFINE(key);
-BOOST_SPIRIT_DEFINE(value);
-BOOST_SPIRIT_DEFINE(key_value);
-BOOST_SPIRIT_DEFINE(key_value_sequence_ordered);
+BOOST_SPIRIT_DEFINE(key, value, key_value, key_value_sequence_ordered);
 
-}
+}}
 
 template <typename T>
 mapnik::color parse_color(T & error_messages, const char* str)

From 9f91bb018a21229040d9a260ec122aef4bf4e91a Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 14 Dec 2016 11:17:42 +0100
Subject: [PATCH 156/328] update deps

---
 deps/mapbox/variant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index 02bd1ac4c..6317a0b74 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit 02bd1ac4c07e6db9fe0f01267853e43b41637b74
+Subproject commit 6317a0b7406395729139327a83a71cfa14513fac

From 2a2f0bf00a5772f9894206e880a8d285296c9aa2 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 14 Dec 2016 15:10:22 +0100
Subject: [PATCH 157/328] Workaround for VC++ C2995 via redifining
 BOOST_SPIRIT_DEFINE macro (#3573)

---
 include/mapnik/json/json_grammar_config.hpp | 27 +++++++++++++++++++++
 src/svg/svg_parser.cpp                      |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/include/mapnik/json/json_grammar_config.hpp b/include/mapnik/json/json_grammar_config.hpp
index 26c117201..b46626817 100644
--- a/include/mapnik/json/json_grammar_config.hpp
+++ b/include/mapnik/json/json_grammar_config.hpp
@@ -113,6 +113,33 @@ using feature_context_const_type = x3::with_context<feature_tag,
         , Context const& context, boost::spirit::x3::unused_type const& ); \
     /***/
 
+
+
+#ifdef _WINDOWS
+
+// VC++ C2995 fix
+#undef BOOST_SPIRIT_DEFINE_
+#undef BOOST_SPIRIT_DEFINE
+
+#define BOOST_SPIRIT_DEFINE_(r, data, rule_name)                                \
+    using BOOST_PP_CAT(rule_name, _synonym) = decltype(rule_name);              \
+    template <typename Iterator, typename Context, typename Attribute>          \
+    inline bool parse_rule(                                                     \
+        BOOST_PP_CAT(rule_name, _synonym) rule_                                 \
+      , Iterator& first, Iterator const& last                                   \
+      , Context const& context, Attribute& attr)                                \
+    {                                                                           \
+        using boost::spirit::x3::unused;                                        \
+        static auto const def_ = (rule_name = BOOST_PP_CAT(rule_name, _def));   \
+        return def_.parse(first, last, context, unused, attr);                  \
+    }                                                                           \
+    /***/
+
+#define BOOST_SPIRIT_DEFINE(...) BOOST_PP_SEQ_FOR_EACH(                         \
+    BOOST_SPIRIT_DEFINE_, _, BOOST_PP_VARIADIC_TO_SEQ(__VA_ARGS__))             \
+    /***/
+#endif
+
 }}}
 
 #endif // MAPNIK_JSON_GRAMMAR_CONFIG_HPP
diff --git a/src/svg/svg_parser.cpp b/src/svg/svg_parser.cpp
index 0d4db78d4..8031fc53c 100644
--- a/src/svg/svg_parser.cpp
+++ b/src/svg/svg_parser.cpp
@@ -30,7 +30,7 @@
 #include <mapnik/util/file_io.hpp>
 #include <mapnik/util/utf_conv_win.hpp>
 #include <mapnik/util/dasharray_parser.hpp>
-
+#include <mapnik/json/json_grammar_config.hpp>
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore_agg.hpp>
 #include "agg_ellipse.h"

From 8327905abaece377185d1b02837f49056d668206 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 14 Dec 2016 15:53:07 +0100
Subject: [PATCH 158/328] windows : fix errors C3259 + C3249

---
 include/mapnik/json/json_grammar_config.hpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/include/mapnik/json/json_grammar_config.hpp b/include/mapnik/json/json_grammar_config.hpp
index b46626817..d055ee959 100644
--- a/include/mapnik/json/json_grammar_config.hpp
+++ b/include/mapnik/json/json_grammar_config.hpp
@@ -46,6 +46,21 @@ enum well_known_names
     properties
 };
 
+#ifdef _WINDOWS
+char const* wkn_to_string(well_known_names val)
+{
+    switch(val)
+    {
+    case id: return "id";
+    case type: return "type";
+    case features: return "features";
+    case geometry: return "geometry";
+    case coordinates: return "coordinates";
+    case properties: return "properties";
+    default: return "unknown";
+    }
+}
+#else
 constexpr char const* wkn_to_string(well_known_names val)
 {
     switch(val)
@@ -59,6 +74,7 @@ constexpr char const* wkn_to_string(well_known_names val)
     default: return "unknown";
     }
 }
+#endif
 
 
 using keys_map = boost::bimap<boost::bimaps::unordered_set_of<std::string>,

From 81cfa721dbfe3df55346f7823ecabc98b9f74f07 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 14 Dec 2016 16:35:24 +0100
Subject: [PATCH 159/328] move BOOST_SPIRIT_DEFINE into separate headers + use
 across all grammar defs (#3573)

---
 include/mapnik/css_color_grammar_x3_def.hpp   |  2 +-
 include/mapnik/csv/csv_grammar_x3_def.hpp     |  1 +
 include/mapnik/expression_grammar_x3_def.hpp  |  1 +
 .../mapnik/image_filter_grammar_x3_def.hpp    |  2 +-
 .../mapnik/json/feature_grammar_x3_def.hpp    |  1 +
 .../json/generic_json_grammar_x3_def.hpp      |  1 +
 .../mapnik/json/geojson_grammar_x3_def.hpp    |  1 +
 include/mapnik/json/json_grammar_config.hpp   | 27 ----------
 .../mapnik/json/positions_grammar_x3_def.hpp  |  1 +
 .../json/unicode_string_grammar_x3_def.hpp    |  1 +
 .../mapnik/path_expression_grammar_x3_def.hpp |  1 +
 .../transform_expression_grammar_x3_def.hpp   |  1 +
 include/mapnik/util/windows_c2995.hpp         | 51 +++++++++++++++++++
 include/mapnik/wkt/wkt_grammar_x3_def.hpp     |  2 +-
 src/image_options.cpp                         |  2 +-
 src/json/extract_bounding_boxes_x3.cpp        |  1 +
 src/svg/svg_parser.cpp                        |  1 +
 17 files changed, 66 insertions(+), 31 deletions(-)
 create mode 100644 include/mapnik/util/windows_c2995.hpp

diff --git a/include/mapnik/css_color_grammar_x3_def.hpp b/include/mapnik/css_color_grammar_x3_def.hpp
index 457f0d999..d163c8f7d 100644
--- a/include/mapnik/css_color_grammar_x3_def.hpp
+++ b/include/mapnik/css_color_grammar_x3_def.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/css_color_grammar_x3.hpp>
 #include <mapnik/util/hsl.hpp>
 #include <mapnik/safe_cast.hpp>
-
+#include <mapnik/util/windows_c2995.hpp>
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/home/x3.hpp>
diff --git a/include/mapnik/csv/csv_grammar_x3_def.hpp b/include/mapnik/csv/csv_grammar_x3_def.hpp
index b40507030..23eaeef26 100644
--- a/include/mapnik/csv/csv_grammar_x3_def.hpp
+++ b/include/mapnik/csv/csv_grammar_x3_def.hpp
@@ -20,6 +20,7 @@
  *
  *****************************************************************************/
 
+#include <mapnik/util/windows_c2995.hpp>
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <mapnik/csv/csv_grammar_x3.hpp>
diff --git a/include/mapnik/expression_grammar_x3_def.hpp b/include/mapnik/expression_grammar_x3_def.hpp
index 6c25b4812..84d29bc5f 100644
--- a/include/mapnik/expression_grammar_x3_def.hpp
+++ b/include/mapnik/expression_grammar_x3_def.hpp
@@ -23,6 +23,7 @@
 #ifndef MAPNIK_EXPRESSIONS_GRAMMAR_X3_DEF_HPP
 #define MAPNIK_EXPRESSIONS_GRAMMAR_X3_DEF_HPP
 
+#include <mapnik/util/windows_c2995.hpp>
 #include <mapnik/expression_grammar_x3.hpp>
 #include <mapnik/expression_node.hpp>
 #include <mapnik/function_call.hpp>
diff --git a/include/mapnik/image_filter_grammar_x3_def.hpp b/include/mapnik/image_filter_grammar_x3_def.hpp
index b40bfc8f9..bb4def992 100644
--- a/include/mapnik/image_filter_grammar_x3_def.hpp
+++ b/include/mapnik/image_filter_grammar_x3_def.hpp
@@ -23,10 +23,10 @@
 #ifndef MAPNIK_IMAGE_FILTER_GRAMMAR_X3_DEF_HPP
 #define MAPNIK_IMAGE_FILTER_GRAMMAR_X3_DEF_HPP
 
-
 #include <mapnik/image_filter_grammar_x3.hpp>
 #include <mapnik/image_filter_types.hpp>
 #include <mapnik/css_color_grammar_x3.hpp>
+#include <mapnik/util/windows_c2995.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/include/mapnik/json/feature_grammar_x3_def.hpp b/include/mapnik/json/feature_grammar_x3_def.hpp
index 1e18faeec..fa2925fbd 100644
--- a/include/mapnik/json/feature_grammar_x3_def.hpp
+++ b/include/mapnik/json/feature_grammar_x3_def.hpp
@@ -32,6 +32,7 @@
 
 #include <mapnik/json/create_geometry.hpp>
 #include <mapnik/util/conversions.hpp>
+#include <mapnik/util/windows_c2995.hpp>
 #include <mapnik/value.hpp>
 #include <mapnik/geometry/geometry_types.hpp>
 
diff --git a/include/mapnik/json/generic_json_grammar_x3_def.hpp b/include/mapnik/json/generic_json_grammar_x3_def.hpp
index 64570eeb1..3d870343a 100644
--- a/include/mapnik/json/generic_json_grammar_x3_def.hpp
+++ b/include/mapnik/json/generic_json_grammar_x3_def.hpp
@@ -26,6 +26,7 @@
 #include <boost/fusion/include/std_pair.hpp>
 #include <mapnik/json/generic_json_grammar_x3.hpp>
 #include <mapnik/json/unicode_string_grammar_x3.hpp>
+#include <mapnik/util/windows_c2995.hpp>
 
 namespace mapnik { namespace json { namespace grammar {
 
diff --git a/include/mapnik/json/geojson_grammar_x3_def.hpp b/include/mapnik/json/geojson_grammar_x3_def.hpp
index 10dd81aab..8c7b43b7d 100644
--- a/include/mapnik/json/geojson_grammar_x3_def.hpp
+++ b/include/mapnik/json/geojson_grammar_x3_def.hpp
@@ -27,6 +27,7 @@
 #include <mapnik/json/geojson_grammar_x3.hpp>
 #include <mapnik/json/unicode_string_grammar_x3.hpp>
 #include <mapnik/json/positions_grammar_x3.hpp>
+#include <mapnik/util/windows_c2995.hpp>
 #include <boost/fusion/include/std_pair.hpp>
 
 namespace mapnik { namespace json { namespace grammar {
diff --git a/include/mapnik/json/json_grammar_config.hpp b/include/mapnik/json/json_grammar_config.hpp
index d055ee959..3e5c55616 100644
--- a/include/mapnik/json/json_grammar_config.hpp
+++ b/include/mapnik/json/json_grammar_config.hpp
@@ -129,33 +129,6 @@ using feature_context_const_type = x3::with_context<feature_tag,
         , Context const& context, boost::spirit::x3::unused_type const& ); \
     /***/
 
-
-
-#ifdef _WINDOWS
-
-// VC++ C2995 fix
-#undef BOOST_SPIRIT_DEFINE_
-#undef BOOST_SPIRIT_DEFINE
-
-#define BOOST_SPIRIT_DEFINE_(r, data, rule_name)                                \
-    using BOOST_PP_CAT(rule_name, _synonym) = decltype(rule_name);              \
-    template <typename Iterator, typename Context, typename Attribute>          \
-    inline bool parse_rule(                                                     \
-        BOOST_PP_CAT(rule_name, _synonym) rule_                                 \
-      , Iterator& first, Iterator const& last                                   \
-      , Context const& context, Attribute& attr)                                \
-    {                                                                           \
-        using boost::spirit::x3::unused;                                        \
-        static auto const def_ = (rule_name = BOOST_PP_CAT(rule_name, _def));   \
-        return def_.parse(first, last, context, unused, attr);                  \
-    }                                                                           \
-    /***/
-
-#define BOOST_SPIRIT_DEFINE(...) BOOST_PP_SEQ_FOR_EACH(                         \
-    BOOST_SPIRIT_DEFINE_, _, BOOST_PP_VARIADIC_TO_SEQ(__VA_ARGS__))             \
-    /***/
-#endif
-
 }}}
 
 #endif // MAPNIK_JSON_GRAMMAR_CONFIG_HPP
diff --git a/include/mapnik/json/positions_grammar_x3_def.hpp b/include/mapnik/json/positions_grammar_x3_def.hpp
index ab012c061..4fd14db13 100644
--- a/include/mapnik/json/positions_grammar_x3_def.hpp
+++ b/include/mapnik/json/positions_grammar_x3_def.hpp
@@ -25,6 +25,7 @@
 
 #include <mapnik/json/positions_grammar_x3.hpp>
 #include <mapnik/geometry/fusion_adapted.hpp>
+#include <mapnik/util/windows_c2995.hpp>
 
 namespace mapnik { namespace json { namespace grammar {
 
diff --git a/include/mapnik/json/unicode_string_grammar_x3_def.hpp b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
index d58293cf3..f0a974a50 100644
--- a/include/mapnik/json/unicode_string_grammar_x3_def.hpp
+++ b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
@@ -24,6 +24,7 @@
 #define MAPNIK_JSON_UNICODE_STRING_GRAMMAR_X3_DEF_HPP
 
 #include <mapnik/json/unicode_string_grammar_x3.hpp>
+#include <mapnik/util/windows_c2995.hpp>
 #include <iostream>
 
 namespace mapnik { namespace json { namespace grammar {
diff --git a/include/mapnik/path_expression_grammar_x3_def.hpp b/include/mapnik/path_expression_grammar_x3_def.hpp
index 324e44e35..a6d5023c0 100644
--- a/include/mapnik/path_expression_grammar_x3_def.hpp
+++ b/include/mapnik/path_expression_grammar_x3_def.hpp
@@ -25,6 +25,7 @@
 // mapnik
 #include <mapnik/path_expression_grammar_x3.hpp>
 #include <mapnik/attribute.hpp>
+#include <mapnik/util/windows_c2995.hpp>
 
 namespace mapnik { namespace grammar {
 
diff --git a/include/mapnik/transform_expression_grammar_x3_def.hpp b/include/mapnik/transform_expression_grammar_x3_def.hpp
index 4af1e9481..7fe96af45 100644
--- a/include/mapnik/transform_expression_grammar_x3_def.hpp
+++ b/include/mapnik/transform_expression_grammar_x3_def.hpp
@@ -26,6 +26,7 @@
 #include <mapnik/transform_expression.hpp>
 #include <mapnik/transform_expression_grammar_x3.hpp>
 #include <mapnik/expression_grammar_x3.hpp>
+#include <mapnik/util/windows_c2995.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/include/mapnik/util/windows_c2995.hpp b/include/mapnik/util/windows_c2995.hpp
new file mode 100644
index 000000000..13d5b6f13
--- /dev/null
+++ b/include/mapnik/util/windows_c2995.hpp
@@ -0,0 +1,51 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_UTIL_WINDOWS_C2995_HPP
+#define MAPNIK_UTIL_WINDOWS_C2995_HPP
+
+#ifdef _WINDOWS
+
+// VC++ C2995 fix
+#undef BOOST_SPIRIT_DEFINE_
+#undef BOOST_SPIRIT_DEFINE
+
+#define BOOST_SPIRIT_DEFINE_(r, data, rule_name)                                \
+    using BOOST_PP_CAT(rule_name, _synonym) = decltype(rule_name);              \
+    template <typename Iterator, typename Context, typename Attribute>          \
+    inline bool parse_rule(                                                     \
+        BOOST_PP_CAT(rule_name, _synonym) rule_                                 \
+      , Iterator& first, Iterator const& last                                   \
+      , Context const& context, Attribute& attr)                                \
+    {                                                                           \
+        using boost::spirit::x3::unused;                                        \
+        static auto const def_ = (rule_name = BOOST_PP_CAT(rule_name, _def));   \
+        return def_.parse(first, last, context, unused, attr);                  \
+    }                                                                           \
+    /***/
+
+#define BOOST_SPIRIT_DEFINE(...) BOOST_PP_SEQ_FOR_EACH(                         \
+    BOOST_SPIRIT_DEFINE_, _, BOOST_PP_VARIADIC_TO_SEQ(__VA_ARGS__))             \
+    /***/
+#endif
+
+#endif //MAPNIK_UTIL_WINDOWS_C2995_HPP
diff --git a/include/mapnik/wkt/wkt_grammar_x3_def.hpp b/include/mapnik/wkt/wkt_grammar_x3_def.hpp
index db44a4ce4..e748ac9c5 100644
--- a/include/mapnik/wkt/wkt_grammar_x3_def.hpp
+++ b/include/mapnik/wkt/wkt_grammar_x3_def.hpp
@@ -25,7 +25,7 @@
 
 #include <mapnik/wkt/wkt_grammar_x3.hpp>
 #include <mapnik/geometry/fusion_adapted.hpp>
-
+#include <mapnik/util/windows_c2995.hpp>
 #ifdef __GNUC__
 // instantiate `is_substitute` for reference T and reference Attribute
 // fixes gcc6 compilation issue
diff --git a/src/image_options.cpp b/src/image_options.cpp
index 7494838cf..fcc6f171f 100644
--- a/src/image_options.cpp
+++ b/src/image_options.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #include <mapnik/image_options.hpp>
-
+#include <mapnik/util/windows_c2995.hpp>
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/home/x3.hpp>
diff --git a/src/json/extract_bounding_boxes_x3.cpp b/src/json/extract_bounding_boxes_x3.cpp
index 8346f1061..467f43deb 100644
--- a/src/json/extract_bounding_boxes_x3.cpp
+++ b/src/json/extract_bounding_boxes_x3.cpp
@@ -27,6 +27,7 @@
 #include <mapnik/json/geojson_grammar_x3.hpp>
 #include <mapnik/json/unicode_string_grammar_x3.hpp>
 #include <mapnik/json/positions_grammar_x3.hpp>
+#include <mapnik/util/windows_c2995.hpp>
 
 namespace mapnik { namespace json {
 
diff --git a/src/svg/svg_parser.cpp b/src/svg/svg_parser.cpp
index 8031fc53c..3bfe4f83e 100644
--- a/src/svg/svg_parser.cpp
+++ b/src/svg/svg_parser.cpp
@@ -31,6 +31,7 @@
 #include <mapnik/util/utf_conv_win.hpp>
 #include <mapnik/util/dasharray_parser.hpp>
 #include <mapnik/json/json_grammar_config.hpp>
+#include <mapnik/util/windows_c2995.hpp>
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore_agg.hpp>
 #include "agg_ellipse.h"

From 4ba87b1e9db90b586fa3f4bfc7b672c5e3338e93 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 14 Dec 2016 17:07:34 +0100
Subject: [PATCH 160/328] c++14 support is not sufficient on windows: reverting
 back and start tracking Windows workarounds in separate branch

Revert "move BOOST_SPIRIT_DEFINE into separate headers + use across all grammar defs (#3573)"

This reverts commit 81cfa721dbfe3df55346f7823ecabc98b9f74f07.

Revert "windows : fix errors C3259 + C3249"

This reverts commit 8327905abaece377185d1b02837f49056d668206.

Revert "Workaround for VC++ C2995 via redifining BOOST_SPIRIT_DEFINE macro (#3573)"

This reverts commit 2a2f0bf00a5772f9894206e880a8d285296c9aa2.
---
 include/mapnik/css_color_grammar_x3_def.hpp   |  2 +-
 include/mapnik/csv/csv_grammar_x3_def.hpp     |  1 -
 include/mapnik/expression_grammar_x3_def.hpp  |  1 -
 .../mapnik/image_filter_grammar_x3_def.hpp    |  2 +-
 .../mapnik/json/feature_grammar_x3_def.hpp    |  1 -
 .../json/generic_json_grammar_x3_def.hpp      |  1 -
 .../mapnik/json/geojson_grammar_x3_def.hpp    |  1 -
 include/mapnik/json/json_grammar_config.hpp   | 16 ------
 .../mapnik/json/positions_grammar_x3_def.hpp  |  1 -
 .../json/unicode_string_grammar_x3_def.hpp    |  1 -
 .../mapnik/path_expression_grammar_x3_def.hpp |  1 -
 .../transform_expression_grammar_x3_def.hpp   |  1 -
 include/mapnik/util/windows_c2995.hpp         | 51 -------------------
 include/mapnik/wkt/wkt_grammar_x3_def.hpp     |  2 +-
 src/image_options.cpp                         |  2 +-
 src/json/extract_bounding_boxes_x3.cpp        |  1 -
 src/svg/svg_parser.cpp                        |  3 +-
 17 files changed, 5 insertions(+), 83 deletions(-)
 delete mode 100644 include/mapnik/util/windows_c2995.hpp

diff --git a/include/mapnik/css_color_grammar_x3_def.hpp b/include/mapnik/css_color_grammar_x3_def.hpp
index d163c8f7d..457f0d999 100644
--- a/include/mapnik/css_color_grammar_x3_def.hpp
+++ b/include/mapnik/css_color_grammar_x3_def.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/css_color_grammar_x3.hpp>
 #include <mapnik/util/hsl.hpp>
 #include <mapnik/safe_cast.hpp>
-#include <mapnik/util/windows_c2995.hpp>
+
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/home/x3.hpp>
diff --git a/include/mapnik/csv/csv_grammar_x3_def.hpp b/include/mapnik/csv/csv_grammar_x3_def.hpp
index 23eaeef26..b40507030 100644
--- a/include/mapnik/csv/csv_grammar_x3_def.hpp
+++ b/include/mapnik/csv/csv_grammar_x3_def.hpp
@@ -20,7 +20,6 @@
  *
  *****************************************************************************/
 
-#include <mapnik/util/windows_c2995.hpp>
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <mapnik/csv/csv_grammar_x3.hpp>
diff --git a/include/mapnik/expression_grammar_x3_def.hpp b/include/mapnik/expression_grammar_x3_def.hpp
index 84d29bc5f..6c25b4812 100644
--- a/include/mapnik/expression_grammar_x3_def.hpp
+++ b/include/mapnik/expression_grammar_x3_def.hpp
@@ -23,7 +23,6 @@
 #ifndef MAPNIK_EXPRESSIONS_GRAMMAR_X3_DEF_HPP
 #define MAPNIK_EXPRESSIONS_GRAMMAR_X3_DEF_HPP
 
-#include <mapnik/util/windows_c2995.hpp>
 #include <mapnik/expression_grammar_x3.hpp>
 #include <mapnik/expression_node.hpp>
 #include <mapnik/function_call.hpp>
diff --git a/include/mapnik/image_filter_grammar_x3_def.hpp b/include/mapnik/image_filter_grammar_x3_def.hpp
index bb4def992..b40bfc8f9 100644
--- a/include/mapnik/image_filter_grammar_x3_def.hpp
+++ b/include/mapnik/image_filter_grammar_x3_def.hpp
@@ -23,10 +23,10 @@
 #ifndef MAPNIK_IMAGE_FILTER_GRAMMAR_X3_DEF_HPP
 #define MAPNIK_IMAGE_FILTER_GRAMMAR_X3_DEF_HPP
 
+
 #include <mapnik/image_filter_grammar_x3.hpp>
 #include <mapnik/image_filter_types.hpp>
 #include <mapnik/css_color_grammar_x3.hpp>
-#include <mapnik/util/windows_c2995.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/include/mapnik/json/feature_grammar_x3_def.hpp b/include/mapnik/json/feature_grammar_x3_def.hpp
index fa2925fbd..1e18faeec 100644
--- a/include/mapnik/json/feature_grammar_x3_def.hpp
+++ b/include/mapnik/json/feature_grammar_x3_def.hpp
@@ -32,7 +32,6 @@
 
 #include <mapnik/json/create_geometry.hpp>
 #include <mapnik/util/conversions.hpp>
-#include <mapnik/util/windows_c2995.hpp>
 #include <mapnik/value.hpp>
 #include <mapnik/geometry/geometry_types.hpp>
 
diff --git a/include/mapnik/json/generic_json_grammar_x3_def.hpp b/include/mapnik/json/generic_json_grammar_x3_def.hpp
index 3d870343a..64570eeb1 100644
--- a/include/mapnik/json/generic_json_grammar_x3_def.hpp
+++ b/include/mapnik/json/generic_json_grammar_x3_def.hpp
@@ -26,7 +26,6 @@
 #include <boost/fusion/include/std_pair.hpp>
 #include <mapnik/json/generic_json_grammar_x3.hpp>
 #include <mapnik/json/unicode_string_grammar_x3.hpp>
-#include <mapnik/util/windows_c2995.hpp>
 
 namespace mapnik { namespace json { namespace grammar {
 
diff --git a/include/mapnik/json/geojson_grammar_x3_def.hpp b/include/mapnik/json/geojson_grammar_x3_def.hpp
index 8c7b43b7d..10dd81aab 100644
--- a/include/mapnik/json/geojson_grammar_x3_def.hpp
+++ b/include/mapnik/json/geojson_grammar_x3_def.hpp
@@ -27,7 +27,6 @@
 #include <mapnik/json/geojson_grammar_x3.hpp>
 #include <mapnik/json/unicode_string_grammar_x3.hpp>
 #include <mapnik/json/positions_grammar_x3.hpp>
-#include <mapnik/util/windows_c2995.hpp>
 #include <boost/fusion/include/std_pair.hpp>
 
 namespace mapnik { namespace json { namespace grammar {
diff --git a/include/mapnik/json/json_grammar_config.hpp b/include/mapnik/json/json_grammar_config.hpp
index 3e5c55616..26c117201 100644
--- a/include/mapnik/json/json_grammar_config.hpp
+++ b/include/mapnik/json/json_grammar_config.hpp
@@ -46,21 +46,6 @@ enum well_known_names
     properties
 };
 
-#ifdef _WINDOWS
-char const* wkn_to_string(well_known_names val)
-{
-    switch(val)
-    {
-    case id: return "id";
-    case type: return "type";
-    case features: return "features";
-    case geometry: return "geometry";
-    case coordinates: return "coordinates";
-    case properties: return "properties";
-    default: return "unknown";
-    }
-}
-#else
 constexpr char const* wkn_to_string(well_known_names val)
 {
     switch(val)
@@ -74,7 +59,6 @@ constexpr char const* wkn_to_string(well_known_names val)
     default: return "unknown";
     }
 }
-#endif
 
 
 using keys_map = boost::bimap<boost::bimaps::unordered_set_of<std::string>,
diff --git a/include/mapnik/json/positions_grammar_x3_def.hpp b/include/mapnik/json/positions_grammar_x3_def.hpp
index 4fd14db13..ab012c061 100644
--- a/include/mapnik/json/positions_grammar_x3_def.hpp
+++ b/include/mapnik/json/positions_grammar_x3_def.hpp
@@ -25,7 +25,6 @@
 
 #include <mapnik/json/positions_grammar_x3.hpp>
 #include <mapnik/geometry/fusion_adapted.hpp>
-#include <mapnik/util/windows_c2995.hpp>
 
 namespace mapnik { namespace json { namespace grammar {
 
diff --git a/include/mapnik/json/unicode_string_grammar_x3_def.hpp b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
index f0a974a50..d58293cf3 100644
--- a/include/mapnik/json/unicode_string_grammar_x3_def.hpp
+++ b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
@@ -24,7 +24,6 @@
 #define MAPNIK_JSON_UNICODE_STRING_GRAMMAR_X3_DEF_HPP
 
 #include <mapnik/json/unicode_string_grammar_x3.hpp>
-#include <mapnik/util/windows_c2995.hpp>
 #include <iostream>
 
 namespace mapnik { namespace json { namespace grammar {
diff --git a/include/mapnik/path_expression_grammar_x3_def.hpp b/include/mapnik/path_expression_grammar_x3_def.hpp
index a6d5023c0..324e44e35 100644
--- a/include/mapnik/path_expression_grammar_x3_def.hpp
+++ b/include/mapnik/path_expression_grammar_x3_def.hpp
@@ -25,7 +25,6 @@
 // mapnik
 #include <mapnik/path_expression_grammar_x3.hpp>
 #include <mapnik/attribute.hpp>
-#include <mapnik/util/windows_c2995.hpp>
 
 namespace mapnik { namespace grammar {
 
diff --git a/include/mapnik/transform_expression_grammar_x3_def.hpp b/include/mapnik/transform_expression_grammar_x3_def.hpp
index 7fe96af45..4af1e9481 100644
--- a/include/mapnik/transform_expression_grammar_x3_def.hpp
+++ b/include/mapnik/transform_expression_grammar_x3_def.hpp
@@ -26,7 +26,6 @@
 #include <mapnik/transform_expression.hpp>
 #include <mapnik/transform_expression_grammar_x3.hpp>
 #include <mapnik/expression_grammar_x3.hpp>
-#include <mapnik/util/windows_c2995.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/include/mapnik/util/windows_c2995.hpp b/include/mapnik/util/windows_c2995.hpp
deleted file mode 100644
index 13d5b6f13..000000000
--- a/include/mapnik/util/windows_c2995.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2016 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_UTIL_WINDOWS_C2995_HPP
-#define MAPNIK_UTIL_WINDOWS_C2995_HPP
-
-#ifdef _WINDOWS
-
-// VC++ C2995 fix
-#undef BOOST_SPIRIT_DEFINE_
-#undef BOOST_SPIRIT_DEFINE
-
-#define BOOST_SPIRIT_DEFINE_(r, data, rule_name)                                \
-    using BOOST_PP_CAT(rule_name, _synonym) = decltype(rule_name);              \
-    template <typename Iterator, typename Context, typename Attribute>          \
-    inline bool parse_rule(                                                     \
-        BOOST_PP_CAT(rule_name, _synonym) rule_                                 \
-      , Iterator& first, Iterator const& last                                   \
-      , Context const& context, Attribute& attr)                                \
-    {                                                                           \
-        using boost::spirit::x3::unused;                                        \
-        static auto const def_ = (rule_name = BOOST_PP_CAT(rule_name, _def));   \
-        return def_.parse(first, last, context, unused, attr);                  \
-    }                                                                           \
-    /***/
-
-#define BOOST_SPIRIT_DEFINE(...) BOOST_PP_SEQ_FOR_EACH(                         \
-    BOOST_SPIRIT_DEFINE_, _, BOOST_PP_VARIADIC_TO_SEQ(__VA_ARGS__))             \
-    /***/
-#endif
-
-#endif //MAPNIK_UTIL_WINDOWS_C2995_HPP
diff --git a/include/mapnik/wkt/wkt_grammar_x3_def.hpp b/include/mapnik/wkt/wkt_grammar_x3_def.hpp
index e748ac9c5..db44a4ce4 100644
--- a/include/mapnik/wkt/wkt_grammar_x3_def.hpp
+++ b/include/mapnik/wkt/wkt_grammar_x3_def.hpp
@@ -25,7 +25,7 @@
 
 #include <mapnik/wkt/wkt_grammar_x3.hpp>
 #include <mapnik/geometry/fusion_adapted.hpp>
-#include <mapnik/util/windows_c2995.hpp>
+
 #ifdef __GNUC__
 // instantiate `is_substitute` for reference T and reference Attribute
 // fixes gcc6 compilation issue
diff --git a/src/image_options.cpp b/src/image_options.cpp
index fcc6f171f..7494838cf 100644
--- a/src/image_options.cpp
+++ b/src/image_options.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #include <mapnik/image_options.hpp>
-#include <mapnik/util/windows_c2995.hpp>
+
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/home/x3.hpp>
diff --git a/src/json/extract_bounding_boxes_x3.cpp b/src/json/extract_bounding_boxes_x3.cpp
index 467f43deb..8346f1061 100644
--- a/src/json/extract_bounding_boxes_x3.cpp
+++ b/src/json/extract_bounding_boxes_x3.cpp
@@ -27,7 +27,6 @@
 #include <mapnik/json/geojson_grammar_x3.hpp>
 #include <mapnik/json/unicode_string_grammar_x3.hpp>
 #include <mapnik/json/positions_grammar_x3.hpp>
-#include <mapnik/util/windows_c2995.hpp>
 
 namespace mapnik { namespace json {
 
diff --git a/src/svg/svg_parser.cpp b/src/svg/svg_parser.cpp
index 3bfe4f83e..0d4db78d4 100644
--- a/src/svg/svg_parser.cpp
+++ b/src/svg/svg_parser.cpp
@@ -30,8 +30,7 @@
 #include <mapnik/util/file_io.hpp>
 #include <mapnik/util/utf_conv_win.hpp>
 #include <mapnik/util/dasharray_parser.hpp>
-#include <mapnik/json/json_grammar_config.hpp>
-#include <mapnik/util/windows_c2995.hpp>
+
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore_agg.hpp>
 #include "agg_ellipse.h"

From b5b6548a81223f577c55478898226d6f17d1fac2 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 15 Dec 2016 10:34:40 +0100
Subject: [PATCH 161/328] update variant

---
 deps/mapbox/variant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index 6317a0b74..18919174d 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit 6317a0b7406395729139327a83a71cfa14513fac
+Subproject commit 18919174da93165a79ca5fdbfde4b172182c6156

From 7affd45511cfa7965f24cfc71025be1140d97ff3 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 15 Dec 2016 11:29:29 +0100
Subject: [PATCH 162/328] refactor json_value into separate header and reduce
 `include` bloat

---
 include/mapnik/json/generic_json.hpp          | 31 +--------
 .../mapnik/json/generic_json_grammar_x3.hpp   | 33 +---------
 include/mapnik/json/json_value.hpp            | 65 +++++++++++++++++++
 include/mapnik/json/stringifier.hpp           |  2 +-
 include/mapnik/json/topojson_grammar.hpp      |  1 +
 include/mapnik/json/topology.hpp              |  2 +-
 6 files changed, 70 insertions(+), 64 deletions(-)
 create mode 100644 include/mapnik/json/json_value.hpp

diff --git a/include/mapnik/json/generic_json.hpp b/include/mapnik/json/generic_json.hpp
index 9a70237bc..eea6dd993 100644
--- a/include/mapnik/json/generic_json.hpp
+++ b/include/mapnik/json/generic_json.hpp
@@ -26,7 +26,7 @@
 #include <mapnik/value/types.hpp>
 #include <mapnik/util/variant.hpp>
 #include <mapnik/json/value_converters.hpp>
-
+#include <mapnik/json/json_value.hpp>
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/include/qi.hpp>
@@ -43,35 +43,6 @@ namespace standard = boost::spirit::standard;
 namespace phoenix = boost::phoenix;
 using space_type = standard::space_type;
 
-struct json_value;
-
-using json_array = std::vector<json_value>;
-using json_object_element = std::pair<std::string, json_value>;
-using json_object = std::vector<json_object_element>;
-using json_value_base = mapnik::util::variant<value_null,
-                                              value_bool,
-                                              value_integer,
-                                              value_double,
-                                              std::string,
-                                              json_array,
-                                              json_object>;
-struct json_value : json_value_base
-{
-#if __cpp_inheriting_constructors >= 200802
-
-    using json_value_base::json_value_base;
-
-#else
-
-    json_value() = default;
-
-    template <typename T>
-    json_value(T && val)
-        : json_value_base(std::forward<T>(val)) {}
-
-#endif
-};
-
 using uchar = std::uint32_t; // a unicode code point
 
 // unicode string grammar via boost/libs/spirit/example/qi/json/json/parser/grammar.hpp
diff --git a/include/mapnik/json/generic_json_grammar_x3.hpp b/include/mapnik/json/generic_json_grammar_x3.hpp
index 4d633cf9e..a1064bdeb 100644
--- a/include/mapnik/json/generic_json_grammar_x3.hpp
+++ b/include/mapnik/json/generic_json_grammar_x3.hpp
@@ -23,9 +23,7 @@
 #ifndef MAPNIK_JSON_GENERIC_JSON_GRAMMAR_X3_HPP
 #define MAPNIK_JSON_GENERIC_JSON_GRAMMAR_X3_HPP
 
-#include <mapnik/value/types.hpp>
-#include <mapnik/util/variant.hpp>
-
+#include <mapnik/json/json_value.hpp>
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/home/x3.hpp>
@@ -37,35 +35,6 @@ namespace mapnik { namespace json {
 
 namespace x3 = boost::spirit::x3;
 
-struct json_value;
-
-using json_array = std::vector<json_value>;
-using json_object_element = std::pair<std::string, json_value>;
-using json_object = std::vector<json_object_element>;
-using json_value_base = mapnik::util::variant<value_null,
-                                              value_bool,
-                                              value_integer,
-                                              value_double,
-                                              std::string,
-                                              json_array,
-                                              json_object>;
-struct json_value : json_value_base
-{
-#if __cpp_inheriting_constructors >= 200802
-
-    using json_value_base::json_value_base;
-
-#else
-
-    json_value() = default;
-
-    template <typename T>
-    json_value(T && val)
-        : json_value_base(std::forward<T>(val)) {}
-
-#endif
-};
-
 namespace grammar {
 
 using generic_json_grammar_type = x3::rule<class generic_json_tag, json_value>;
diff --git a/include/mapnik/json/json_value.hpp b/include/mapnik/json/json_value.hpp
new file mode 100644
index 000000000..8d6c1b09a
--- /dev/null
+++ b/include/mapnik/json/json_value.hpp
@@ -0,0 +1,65 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_JSON_JSON_VALUE_HPP
+#define MAPNIK_JSON_JSON_VALUE_HPP
+
+// mapnik
+#include <mapnik/value/types.hpp>
+#include <mapnik/util/variant.hpp>
+// stl
+#include <string>
+#include <vector>
+
+namespace mapnik { namespace json {
+
+struct json_value;
+
+using json_array = std::vector<json_value>;
+using json_object_element = std::pair<std::string, json_value>;
+using json_object = std::vector<json_object_element>;
+using json_value_base = mapnik::util::variant<value_null,
+                                              value_bool,
+                                              value_integer,
+                                              value_double,
+                                              std::string,
+                                              json_array,
+                                              json_object>;
+struct json_value : json_value_base
+{
+#if __cpp_inheriting_constructors >= 200802
+
+    using json_value_base::json_value_base;
+
+#else
+
+    json_value() = default;
+
+    template <typename T>
+    json_value(T && val)
+        : json_value_base(std::forward<T>(val)) {}
+
+#endif
+};
+}}
+
+#endif // MAPNIK_JSON_JSON_VALUE_HPP
diff --git a/include/mapnik/json/stringifier.hpp b/include/mapnik/json/stringifier.hpp
index 44b9425d8..af5a39778 100644
--- a/include/mapnik/json/stringifier.hpp
+++ b/include/mapnik/json/stringifier.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_JSON_STRINGIFIER_HPP
 
 // mapnik
-#include <mapnik/json/generic_json.hpp>
+#include <mapnik/json/json_value.hpp>
 #include <mapnik/util/conversions.hpp>
 #include <mapnik/util/variant.hpp>
 // stl
diff --git a/include/mapnik/json/topojson_grammar.hpp b/include/mapnik/json/topojson_grammar.hpp
index 1317fd3a9..5139b5c6c 100644
--- a/include/mapnik/json/topojson_grammar.hpp
+++ b/include/mapnik/json/topojson_grammar.hpp
@@ -26,6 +26,7 @@
 // mapnik
 #include <mapnik/json/error_handler.hpp>
 #include <mapnik/json/topology.hpp>
+#include <mapnik/json/generic_json.hpp>
 #include <mapnik/json/value_converters.hpp>
 
 #pragma GCC diagnostic push
diff --git a/include/mapnik/json/topology.hpp b/include/mapnik/json/topology.hpp
index 048c85528..b45789b9e 100644
--- a/include/mapnik/json/topology.hpp
+++ b/include/mapnik/json/topology.hpp
@@ -23,7 +23,7 @@
 #ifndef MAPNIK_TOPOLOGY_HPP
 #define MAPNIK_TOPOLOGY_HPP
 
-#include <mapnik/json/generic_json.hpp>
+#include <mapnik/json/json_value.hpp>
 #include <mapnik/util/variant.hpp>
 
 #pragma GCC diagnostic push

From 568507349b8e7173cc7eb1e06fcfafdb749b35dc Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Thu, 15 Dec 2016 11:51:02 +0100
Subject: [PATCH 163/328] bring C++14 type traits aliases for C++11 support

---
 include/mapnik/cxx11_support.hpp | 43 ++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 include/mapnik/cxx11_support.hpp

diff --git a/include/mapnik/cxx11_support.hpp b/include/mapnik/cxx11_support.hpp
new file mode 100644
index 000000000..dafd721dd
--- /dev/null
+++ b/include/mapnik/cxx11_support.hpp
@@ -0,0 +1,43 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_CXX11_SUPPORT_HPP
+#define MAPNIK_CXX11_SUPPORT_HPP
+
+#include <type_traits>
+
+namespace mapnik {
+namespace detail {
+
+template <bool B, typename T, typename F>
+using conditional_t = typename std::conditional<B, T, F>::type;
+
+template <typename T>
+using decay_t = typename std::decay<T>::type;
+
+template <bool B, typename T = void>
+using enable_if_t = typename std::enable_if<B, T>::type;
+
+} // namespace detail
+} // namespace mapnik
+
+#endif // MAPNIK_CXX11_SUPPORT_HPP

From e6ed16e94e0edf50af29b58e110b78a1e1347402 Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Thu, 15 Dec 2016 11:58:50 +0100
Subject: [PATCH 164/328] make mapnik_value_type_t C++11-friendly

---
 include/mapnik/value/types.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/mapnik/value/types.hpp b/include/mapnik/value/types.hpp
index d1c0c59bd..7682d52b2 100644
--- a/include/mapnik/value/types.hpp
+++ b/include/mapnik/value/types.hpp
@@ -25,6 +25,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
+#include <mapnik/cxx11_support.hpp>
 #include <mapnik/pixel_types.hpp>
 
 
@@ -34,7 +35,6 @@
 #pragma GCC diagnostic pop
 
 // stl
-#include <type_traits>
 #include <iosfwd>
 #include <cstddef>
 
@@ -160,13 +160,13 @@ namespace detail {
 //  value_double    if T is a floating-point type
 //  T &&            otherwise
 
-template <typename T, typename dT = std::decay_t<T>>
+template <typename T, typename dT = decay_t<T>>
 using mapnik_value_type_t =
-    std::conditional_t<
+    conditional_t<
         std::is_same<dT, bool>::value, value_bool,
-        std::conditional_t<
+        conditional_t<
             std::is_integral<dT>::value, value_integer,
-            std::conditional_t<
+            conditional_t<
                 std::is_floating_point<dT>::value, value_double,
                 T && >>>;
 

From 068ead5a13d00c0fb41a6ff26112eebbc4e1dd7c Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 15 Dec 2016 13:34:08 -0800
Subject: [PATCH 165/328] remove duplicate sudo:false from travis

---
 .travis.yml         | 1 -
 deps/mapbox/variant | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7dd209fae..387e6772c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,6 @@ matrix:
     - os: linux
       sudo: false
       compiler: ": clang"
-      sudo: false
       env: JOBS=4 CXX="ccache g++-6" CC="gcc-6"
       addons:
         apt:
diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index 18919174d..6317a0b74 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit 18919174da93165a79ca5fdbfde4b172182c6156
+Subproject commit 6317a0b7406395729139327a83a71cfa14513fac

From 053eca1232cf9d0f7689428d029e2e0c2c115794 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 16 Dec 2016 11:21:20 +0100
Subject: [PATCH 166/328] JSON - add geometry_grammar_x3

---
 include/mapnik/json/geometry_grammar_x3.hpp   |  51 ++++++
 .../mapnik/json/geometry_grammar_x3_def.hpp   | 155 ++++++++++++++++++
 2 files changed, 206 insertions(+)
 create mode 100644 include/mapnik/json/geometry_grammar_x3.hpp
 create mode 100644 include/mapnik/json/geometry_grammar_x3_def.hpp

diff --git a/include/mapnik/json/geometry_grammar_x3.hpp b/include/mapnik/json/geometry_grammar_x3.hpp
new file mode 100644
index 000000000..a630f6b05
--- /dev/null
+++ b/include/mapnik/json/geometry_grammar_x3.hpp
@@ -0,0 +1,51 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_GEOMETRY_GRAMMAR_X3_HPP
+#define MAPNIK_GEOMETRY_GRAMMAR_X3_HPP
+
+// mapnik
+#include <mapnik/geometry.hpp>  // for geometry_type
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#pragma GCC diagnostic pop
+
+// mapnik
+#include <mapnik/geometry.hpp>
+
+namespace mapnik { namespace json { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+
+using geometry_grammar_type = x3::rule<class geometry_grammar_tag, mapnik::geometry::geometry<double>>;
+
+BOOST_SPIRIT_DECLARE(geometry_grammar_type);
+
+}
+
+grammar::geometry_grammar_type const& geometry_grammar();
+
+}}
+
+#endif // MAPNIK_GEOMETRY_GRAMMAR_X3_HPP
diff --git a/include/mapnik/json/geometry_grammar_x3_def.hpp b/include/mapnik/json/geometry_grammar_x3_def.hpp
new file mode 100644
index 000000000..9ec425e37
--- /dev/null
+++ b/include/mapnik/json/geometry_grammar_x3_def.hpp
@@ -0,0 +1,155 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+// mapnik
+#include <mapnik/json/geometry_grammar_x3.hpp>
+#include <mapnik/json/positions_grammar_x3.hpp>
+#include <mapnik/json/generic_json_grammar_x3.hpp>
+#include <mapnik/json/unicode_string_grammar_x3.hpp>
+#include <mapnik/json/create_geometry.hpp>
+#include <mapnik/geometry/fusion_adapted.hpp>
+#include <mapnik/util/noncopyable.hpp>
+#include <mapnik/util/windows_c2995.hpp>
+// boost
+#include <boost/fusion/include/std_pair.hpp>
+
+namespace mapnik { namespace json { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+using x3::lit;
+using x3::_pass;
+using x3::omit;
+
+auto create_geometry = [](auto const& ctx)
+{
+    auto const& attr = _attr(ctx);
+    mapnik::json::create_geometry_impl()(_val(ctx), std::get<0>(attr), std::get<1>(attr));
+};
+
+auto assign_element = [] (auto const& ctx)
+{
+    _val(ctx) = std::move(_attr(ctx));
+};
+
+namespace {
+template <typename T>
+struct assign_geometry_element_visitor : util::noncopyable
+{
+    assign_geometry_element_visitor(T & t)
+        : t_(t) {}
+
+    void operator() (int const& type)
+    {
+        std::get<0>(t_) = type;
+    }
+    void operator () (::mapnik::json::positions const& p)
+    {
+        std::get<1>(t_) = p;
+    }
+
+    T & t_;
+};
+
+}
+
+auto assign_geometry_element = [] (auto const& ctx)
+{
+    assign_geometry_element_visitor<decltype(_val(ctx))> v(_val(ctx));
+    mapnik::util::apply_visitor(v, _attr(ctx));
+};
+
+auto assign_collection = [] (auto const& ctx)
+{
+    auto & val = _val(ctx);
+    std::get<0>(val) = 7; //GeometryCollection
+    std::get<1>(val) = std::move(_attr(ctx));
+};
+
+auto push_geometry = [] (auto const& ctx)
+{
+    _val(ctx).emplace_back(std::move(_attr(ctx)));
+};
+
+// start rule
+geometry_grammar_type const geometry("Geometry");
+// rules
+x3::rule<class geometry_element_tag, mapnik::util::variant
+         <int,
+          mapnik::json::positions,
+          mapnik::geometry::geometry_collection<double>> const geometry_element("Geometry Element");
+x3::rule<class geometry_tuple_tag, std::pair<int, mapnik::json::positions>> const geometry_tuple("Geometry Tuple");
+x3::rule<class geometry_collection_tag, mapnik::geometry::geometry_collection<double>> const geometry_collection("Geometry Collection");
+// import positions rule
+namespace { auto const& pos = positions_grammar(); }
+// import generic JSON key:value rule
+namespace { auto const& json_key_value = generic_json_key_value(); }
+
+struct geometry_type_ : x3::symbols<int>
+{
+    geometry_type_()
+    {
+        add
+            ("\"Point\"",1)
+            ("\"LineString\"",2)
+            ("\"Polygon\"",3)
+            ("\"MultiPoint\"",4)
+            ("\"MultiLineString\"",5)
+            ("\"MultiPolygon\"",6)
+            ("\"GeometryCollection\"",7)
+            ;
+    }
+} geometry_type;
+
+auto const geometry_def = (lit('{') > (geometry_tuple)[create_geometry] > lit('}')) | lit("null")
+                 ;
+
+auto const geometry_tuple_def = geometry_element[assign_geometry_element] % lit(',')
+                 ;
+
+auto const geometry_element_def =
+    (lit("\"type\"") > lit(":") > geometry_type[assign_element])
+    |
+    (lit("\"coordinates\"") > lit(':') > pos[assign_element])
+    |
+    (lit("\"geometries\"") > lit(':') > lit('[') > geometry_collection[assign_collection] > lit(']'))
+    |
+    omit[json_key_value]
+    ;
+
+auto const geometry_collection_def = geometry[push_geometry] % lit(',')
+                     ;
+
+BOOST_SPIRIT_DEFINE(
+    geometry,
+    geometry_element,
+    geometry_tuple,
+    geometry_collection
+    );
+
+}}}
+
+namespace mapnik { namespace json {
+grammar::geometry_grammar_type const& geometry_grammar()
+{
+    return grammar::geometry;
+}
+}}

From 18f721fd17dd32374ae996931ec42e177c2531fa Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 19 Dec 2016 16:18:19 +0100
Subject: [PATCH 167/328] TopoJSON - implement parsing using spirit::x3

---
 include/mapnik/json/error_handler.hpp         |  73 ---
 include/mapnik/json/generic_json.hpp          | 167 -------
 include/mapnik/json/topojson_grammar.hpp      | 209 ---------
 include/mapnik/json/topojson_grammar_impl.hpp | 206 ---------
 .../mapnik/json/topojson_grammar_x3.hpp       |  49 +-
 .../mapnik/json/topojson_grammar_x3_def.hpp   | 427 ++++++++++++++++++
 .../input/topojson/topojson_datasource.cpp    |  20 +-
 ...on_grammar.cpp => topojson_grammar_x3.cpp} |  14 +-
 src/json/unicode_string_grammar_x3.cpp        |   7 +
 test/unit/datasource/topojson.cpp             |  26 +-
 10 files changed, 487 insertions(+), 711 deletions(-)
 delete mode 100644 include/mapnik/json/error_handler.hpp
 delete mode 100644 include/mapnik/json/generic_json.hpp
 delete mode 100644 include/mapnik/json/topojson_grammar.hpp
 delete mode 100644 include/mapnik/json/topojson_grammar_impl.hpp
 rename src/json/generic_json.cpp => include/mapnik/json/topojson_grammar_x3.hpp (50%)
 create mode 100644 include/mapnik/json/topojson_grammar_x3_def.hpp
 rename src/json/{mapnik_topojson_grammar.cpp => topojson_grammar_x3.cpp} (76%)

diff --git a/include/mapnik/json/error_handler.hpp b/include/mapnik/json/error_handler.hpp
deleted file mode 100644
index 1e66427ad..000000000
--- a/include/mapnik/json/error_handler.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_JSON_ERROR_HANDLER_HPP
-#define MAPNIK_JSON_ERROR_HANDLER_HPP
-
-#include <mapnik/config.hpp>
-
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/home/qi/nonterminal/error_handler.hpp>
-namespace boost { namespace spirit { struct info; } }
-#pragma GCC diagnostic pop
-
-// mapnik
-#ifdef MAPNIK_LOG
-#include <mapnik/debug.hpp>
-#endif
-
-// stl
-#include <cassert>
-#include <string>
-#include <sstream>
-
-
-namespace mapnik { namespace json {
-
-template <typename Iterator>
-struct error_handler
-{
-    using result_type = boost::spirit::qi::error_handler_result;
-    result_type operator() (
-        Iterator,
-        Iterator end,
-        Iterator err_pos,
-        boost::spirit::info const& what) const
-    {
-#ifdef MAPNIK_LOG
-        std::stringstream s;
-        using difference_type = typename std::iterator_traits<Iterator>::difference_type;
-        auto start_err = err_pos;
-        std::advance(err_pos, std::min(std::distance(err_pos, end), difference_type(16)));
-        auto end_err = err_pos;
-        assert(end_err <= end);
-        s << "Mapnik GeoJSON parsing error:" << what << " expected but got: " << std::string(start_err, end_err);
-        MAPNIK_LOG_ERROR(error_handler) << s.str();
-#endif
-        return boost::spirit::qi::fail;
-    }
-};
-
-}}
-
-#endif // MAPNIK_JSON_ERROR_HANDLER_HPP
diff --git a/include/mapnik/json/generic_json.hpp b/include/mapnik/json/generic_json.hpp
deleted file mode 100644
index eea6dd993..000000000
--- a/include/mapnik/json/generic_json.hpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_GENERIC_JSON_HPP
-#define MAPNIK_GENERIC_JSON_HPP
-
-#include <mapnik/value/types.hpp>
-#include <mapnik/util/variant.hpp>
-#include <mapnik/json/value_converters.hpp>
-#include <mapnik/json/json_value.hpp>
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix.hpp>
-#include <boost/fusion/include/std_pair.hpp>
-#pragma GCC diagnostic pop
-
-#include <vector>
-
-namespace mapnik { namespace json {
-
-namespace qi = boost::spirit::qi;
-namespace standard = boost::spirit::standard;
-namespace phoenix = boost::phoenix;
-using space_type = standard::space_type;
-
-using uchar = std::uint32_t; // a unicode code point
-
-// unicode string grammar via boost/libs/spirit/example/qi/json/json/parser/grammar.hpp
-
-template <typename Iterator>
-struct unicode_string : qi::grammar<Iterator, std::string()>
-{
-    unicode_string();
-    qi::rule<Iterator, void(std::string&)> escape;
-    qi::rule<Iterator, void(std::string&)> char_esc;
-    qi::rule<Iterator, std::string()> double_quoted;
-};
-
-
-struct push_utf8
-{
-    using result_type = void;
-
-    void operator()(std::string& utf8, uchar code_point) const
-    {
-        typedef std::back_insert_iterator<std::string> insert_iter;
-        insert_iter out_iter(utf8);
-        boost::utf8_output_iterator<insert_iter> utf8_iter(out_iter);
-        *utf8_iter++ = code_point;
-    }
-};
-
-struct push_esc
-{
-    using result_type = void;
-
-    void operator()(std::string& utf8, uchar c) const
-    {
-        switch (c)
-        {
-        case ' ': utf8 += ' ';          break;
-        case '\t': utf8 += '\t';        break;
-        case '0': utf8 += char(0);      break;
-        case 'a': utf8 += 0x7;          break;
-        case 'b': utf8 += 0x8;          break;
-        case 't': utf8 += 0x9;          break;
-        case 'n': utf8 += 0xA;          break;
-        case 'v': utf8 += 0xB;          break;
-        case 'f': utf8 += 0xC;          break;
-        case 'r': utf8 += 0xD;          break;
-        case 'e': utf8 += 0x1B;         break;
-        case '"': utf8 += '"';          break;
-        case '/': utf8 += '/';          break;
-        case '\\': utf8 += '\\';        break;
-        case '_': push_utf8()(utf8, 0xA0);  break;
-        case 'N': push_utf8()(utf8, 0x85);  break;
-        case 'L': push_utf8()(utf8, 0x2028);  break;
-        case 'P': push_utf8()(utf8, 0x2029);  break;
-        }
-    }
-};
-
-template< typename Iterator>
-unicode_string<Iterator>::unicode_string()
-    : unicode_string::base_type(double_quoted)
-{
-    qi::char_type char_;
-    qi::_val_type _val;
-    qi::_r1_type _r1;
-    qi::_1_type _1;
-    qi::lit_type lit;
-    qi::eol_type eol;
-    qi::repeat_type repeat;
-    qi::hex_type hex;
-
-    using boost::spirit::qi::uint_parser;
-    using boost::phoenix::function;
-    using boost::phoenix::ref;
-
-    uint_parser<uchar, 16, 4, 4> hex4;
-    uint_parser<uchar, 16, 8, 8> hex8;
-    function<push_utf8> push_utf8;
-    function<push_esc> push_esc;
-
-    escape =
-        ('x' > hex)                     [push_utf8(_r1, _1)]
-        |
-        ('u' > hex4)                    [push_utf8(_r1, _1)]
-        |
-        ('U' > hex8)                    [push_utf8(_r1, _1)]
-        |
-        char_("0abtnvfre\"/\\N_LP \t")  [push_esc(_r1, _1)]
-        |
-        eol                             // continue to next line
-        ;
-
-    char_esc =
-        '\\' > escape(_r1)
-        ;
-
-    double_quoted =
-        '"'
-        > *(char_esc(_val) | (~char_('"'))    [_val += _1])
-        > '"'
-        ;
-}
-
-template <typename Iterator>
-struct generic_json : qi::grammar<Iterator, json_value(), space_type>
-{
-    generic_json();
-    qi::rule<Iterator, json_value(), space_type> value;
-    qi::int_parser<mapnik::value_integer, 10, 1, -1> int__;
-    unicode_string<Iterator> string_;
-    qi::rule<Iterator, json_object_element(), space_type> key_value;
-    qi::rule<Iterator, json_value(), space_type> number;
-    qi::rule<Iterator, json_object(), space_type> object;
-    qi::rule<Iterator, json_array(), space_type> array;
-    qi::real_parser<double, qi::strict_real_policies<double>> strict_double;
-    // conversions
-    boost::phoenix::function<mapnik::detail::value_converter<mapnik::value_integer>> integer_converter;
-    boost::phoenix::function<mapnik::detail::value_converter<mapnik::value_double>> double_converter;
-};
-
-}}
-
-#endif // MAPNIK_GENERIC_JSON_HPP
diff --git a/include/mapnik/json/topojson_grammar.hpp b/include/mapnik/json/topojson_grammar.hpp
deleted file mode 100644
index 5139b5c6c..000000000
--- a/include/mapnik/json/topojson_grammar.hpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_TOPOJSON_GRAMMAR_HPP
-#define MAPNIK_TOPOJSON_GRAMMAR_HPP
-
-// mapnik
-#include <mapnik/json/error_handler.hpp>
-#include <mapnik/json/topology.hpp>
-#include <mapnik/json/generic_json.hpp>
-#include <mapnik/json/value_converters.hpp>
-
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#pragma GCC diagnostic pop
-
-// stl
-#include <vector>
-
-namespace mapnik { namespace topojson {
-
-namespace qi = boost::spirit::qi;
-namespace fusion = boost::fusion;
-using space_type = mapnik::json::space_type;
-
-struct create_point
-{
-    using result_type = mapnik::topojson::point;
-    template <typename T0, typename T1>
-    result_type operator()(T0 & coord, T1 & props) const
-    {
-        mapnik::topojson::point pt;
-        if (coord.template is<mapnik::topojson::coordinate>())
-        {
-            auto const& coord_ = coord.template get<mapnik::topojson::coordinate>();
-            pt.coord = coord_;
-            pt.props = props;
-        }
-        return pt;
-    }
-};
-
-struct create_multi_point
-{
-    using result_type = mapnik::topojson::multi_point;
-    template <typename T0, typename T1>
-    result_type operator()(T0 & coords, T1 & props) const
-    {
-        mapnik::topojson::multi_point mpt;
-        if (coords.template is<std::vector<mapnik::topojson::coordinate>>())
-        {
-            auto const& points = coords.template get<std::vector<mapnik::topojson::coordinate>>();
-            mpt. points = points;
-            mpt.props = props;
-        }
-        return mpt;
-    }
-};
-
-struct create_line_string
-{
-    using result_type = mapnik::topojson::linestring;
-    template <typename T0, typename T1>
-    result_type operator()(T0 & arcs, T1 & props) const
-    {
-        mapnik::topojson::linestring line;
-        if (arcs.template is<std::vector<index_type>>())
-        {
-            auto const& arcs_ = arcs.template get<std::vector<index_type>>();
-            line.rings = arcs_;
-            line.props = props;
-        }
-        return line;
-    }
-};
-
-struct create_multi_line_string
-{
-    using result_type = mapnik::topojson::multi_linestring;
-    template <typename T0, typename T1>
-    result_type operator()(T0 & arcs, T1 & props) const
-    {
-        mapnik::topojson::multi_linestring mline;
-        if (arcs.template is<std::vector<std::vector<index_type>>>())
-        {
-            auto const& arcs_ = arcs.template get<std::vector<std::vector<index_type>>>();
-            mline.lines = arcs_;
-            mline.props = props;
-        }
-        return mline;
-    }
-};
-
-struct create_polygon
-{
-    using result_type = mapnik::topojson::polygon;
-    template <typename T0, typename T1>
-    result_type operator()(T0 & arcs, T1 & props) const
-    {
-        mapnik::topojson::polygon poly;
-        if (arcs.template is<std::vector<std::vector<index_type>>>())
-        {
-            auto const& arcs_ = arcs.template get<std::vector<std::vector<index_type>>>();
-            poly.rings = arcs_;
-            poly.props = props;
-        }
-        return poly;
-    }
-};
-
-struct create_multi_polygon
-{
-    using result_type = mapnik::topojson::multi_polygon;
-    template <typename T0, typename T1>
-    result_type operator()(T0 & arcs, T1 & props) const
-    {
-        mapnik::topojson::multi_polygon mpoly;
-        if (arcs.template is<std::vector<std::vector<std::vector<index_type>>>>())
-        {
-            auto const& arcs_ = arcs.template get<std::vector<std::vector<std::vector<index_type>>>>();
-            mpoly.polygons = arcs_;
-            mpoly.props = props;
-        }
-        return mpoly;
-    }
-};
-
-
-struct create_geometry_impl
-{
-    using result_type = mapnik::topojson::geometry;
-    template <typename T0, typename T1, typename T2, typename T3>
-    result_type operator()(T0 geom_type, T1 & coord, T2 & arcs, T3 & props) const
-    {
-        switch (geom_type)
-        {
-        case 1: //Point
-            return create_point()(coord, props);
-        case 2: //LineString
-            return create_line_string()(arcs, props);
-        case 3: //Polygon
-            return create_polygon()(arcs, props);
-        case 4: //MultiPoint
-            return create_multi_point()(coord, props);
-        case 5: //MultiLineString
-            return create_multi_line_string()(arcs, props);
-        case 6: //MultiPolygon
-            return create_multi_polygon()(arcs, props);
-        default:
-            break;
-        }
-        return mapnik::topojson::geometry(); //empty
-    }
-};
-
-using coordinates_type = util::variant<coordinate,std::vector<coordinate>>;
-using arcs_type = util::variant<std::vector<index_type>,
-                                std::vector<std::vector<index_type>>,
-                                std::vector<std::vector<std::vector<index_type>>>>;
-template <typename Iterator, typename ErrorHandler = json::error_handler<Iterator> >
-struct topojson_grammar : qi::grammar<Iterator, space_type, topology()>
-
-{
-    topojson_grammar();
-private:
-    // generic JSON support
-    json::generic_json<Iterator> json;
-    // topoJSON
-    qi::rule<Iterator, space_type, mapnik::topojson::topology()> topology;
-    qi::rule<Iterator, space_type, std::vector<mapnik::topojson::geometry>()> objects;
-    qi::rule<Iterator, space_type, std::vector<mapnik::topojson::arc>()> arcs;
-    qi::rule<Iterator, space_type, mapnik::topojson::arc()> arc;
-    qi::rule<Iterator, space_type, mapnik::topojson::coordinate()> coordinate_;
-    qi::rule<Iterator, space_type, coordinates_type()> coordinates;
-    qi::rule<Iterator, space_type, mapnik::topojson::transform()> transform;
-    qi::rule<Iterator, space_type, mapnik::topojson::bounding_box()> bbox;
-    qi::rule<Iterator, qi::locals<int, coordinates_type, arcs_type, properties>, mapnik::topojson::geometry(), space_type> geometry;
-    qi::rule<Iterator, space_type, void(std::vector<mapnik::topojson::geometry>&)> geometry_collection;
-    qi::rule<Iterator, space_type, std::vector<index_type>()> ring;
-    qi::rule<Iterator, space_type, std::vector<std::vector<index_type>>()> rings;
-    qi::rule<Iterator, space_type, arcs_type()> rings_array;
-    // properties
-    qi::rule<Iterator, space_type, mapnik::topojson::properties()> properties_;
-    qi::symbols<char, int> geometry_type_dispatch;
-};
-
-}}
-
-#endif //MAPNIK_TOPOJSON_GRAMMAR_HPP
diff --git a/include/mapnik/json/topojson_grammar_impl.hpp b/include/mapnik/json/topojson_grammar_impl.hpp
deleted file mode 100644
index 07b3a9756..000000000
--- a/include/mapnik/json/topojson_grammar_impl.hpp
+++ /dev/null
@@ -1,206 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#include <mapnik/json/topojson_grammar.hpp>
-#include <mapnik/json/generic_json.hpp>
-
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/fusion/include/adapt_struct.hpp>
-#include <boost/fusion/adapted/std_tuple.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#pragma GCC diagnostic pop
-
-BOOST_FUSION_ADAPT_STRUCT(
-    mapnik::topojson::coordinate,
-    (double, x)
-    (double, y)
-    )
-
-BOOST_FUSION_ADAPT_STRUCT(
-    mapnik::topojson::arc,
-    (std::list<mapnik::topojson::coordinate>, coordinates)
-    )
-
-BOOST_FUSION_ADAPT_STRUCT(
-    mapnik::topojson::transform,
-    (double, scale_x)
-    (double, scale_y)
-    (double, translate_x)
-    (double, translate_y)
-    )
-
-BOOST_FUSION_ADAPT_STRUCT(
-    mapnik::topojson::bounding_box,
-    (double, minx)
-    (double, miny)
-    (double, maxx)
-    (double, maxy)
-    )
-
-BOOST_FUSION_ADAPT_STRUCT(
-    mapnik::topojson::topology,
-    (std::vector<mapnik::topojson::geometry>, geometries)
-    (std::vector<mapnik::topojson::arc>, arcs)
-    (boost::optional<mapnik::topojson::transform>, tr)
-    (boost::optional<mapnik::topojson::bounding_box>, bbox)
-   )
-
-
-
-namespace mapnik { namespace topojson {
-
-namespace qi = boost::spirit::qi;
-namespace phoenix = boost::phoenix;
-namespace fusion = boost::fusion;
-
-template <typename Iterator, typename ErrorHandler>
-topojson_grammar<Iterator, ErrorHandler>::topojson_grammar()
-    : topojson_grammar::base_type(topology, "topojson")
-{
-    qi::lit_type lit;
-    qi::double_type double_;
-    qi::int_type int_;
-    qi::omit_type omit;
-    qi::_val_type _val;
-    qi::_1_type _1;
-    qi::_2_type _2;
-    qi::_3_type _3;
-    qi::_4_type _4;
-    qi::_r1_type _r1;
-    qi::_a_type _a;
-    qi::_b_type _b;
-    qi::_c_type _c;
-    qi::_d_type _d;
-    using qi::fail;
-    using qi::on_error;
-    using phoenix::push_back;
-
-    geometry_type_dispatch.add
-        ("\"Point\"",1)
-        ("\"LineString\"",2)
-        ("\"Polygon\"",3)
-        ("\"MultiPoint\"",4)
-        ("\"MultiLineString\"",5)
-        ("\"MultiPolygon\"",6)
-        ("\"GeometryCollection\"",7)
-        ;
-
-    // error handler
-    boost::phoenix::function<ErrorHandler> const error_handler;
-    boost::phoenix::function<create_geometry_impl> const create_geometry;
-
-    // topo json
-    topology = lit('{') >> lit("\"type\"") >> lit(':') >> lit("\"Topology\"")
-                        >> ( (lit(',') >> objects ) ^ ( lit(',') >> arcs) ^ (lit(',') >> transform) ^ (lit(',') >> bbox))
-                        >> lit('}')
-        ;
-
-    transform = lit("\"transform\"") >> lit(':') >> lit('{')
-                                     >> lit("\"scale\"") >> lit(':')
-                                     >> lit('[')
-                                     >> double_ >> lit(',')
-                                     >> double_ >> lit(']') >> lit(',')
-                                     >> lit("\"translate\"") >> lit(':')
-                                     >> lit('[') >> double_ >> lit(',') >> double_ >> lit(']')
-                                     >> lit('}')
-        ;
-
-    bbox = lit("\"bbox\"") >> lit(':')
-                           >> lit('[') >> double_ >> lit(',') >> double_
-                           >> lit(',') >> double_ >> lit(',') >> double_
-                           >> lit(']')
-        ;
-
-    objects = lit("\"objects\"")
-        >> lit(':')
-        >> lit('{')
-        >> -((omit[json.string_]
-              >> lit(':')
-              >>  (geometry_collection(_val) | geometry[push_back(_val, _1)]) % lit(',')))
-        >> lit('}')
-        ;
-
-    geometry = lit('{')[_a = 0]
-        > ((lit("\"type\"") > lit(':') > geometry_type_dispatch[_a = _1])
-           |
-           (lit("\"coordinates\"") > lit(':') > coordinates[_b = _1])
-           |
-           (lit("\"arcs\"") > lit(':') > rings_array[_c = _1])
-           |
-           properties_[_d = _1]
-           |
-           json.key_value) % lit(',')
-        > lit('}')[_val = create_geometry(_a, _b, _c, _d)]
-        ;
-
-
-    geometry_collection =  lit('{')
-        >> lit("\"type\"") >> lit(':') >> lit("\"GeometryCollection\"")
-        >> lit(',') >> lit("\"geometries\"") >> lit(':')
-        >> lit('[')
-        >> -(geometry[push_back(_r1, _1)] % lit(','))
-        >> lit(']')
-        >> lit('}')
-        ;
-
-    ring = lit('[') >> -(int_ % lit(',')) >> lit(']')
-        ;
-    rings = lit('[') >> -(ring % lit(',')) >> lit(']')
-        ;
-    rings_array = lit('[') >> -(rings % lit(',')) >> lit(']')
-        |
-        rings
-        |
-        ring
-        ;
-
-    properties_ = lit("\"properties\"")
-        >> lit(':')
-        >> lit('{') >> (json.string_ >> lit(':') >> json.value) % lit(',') >> lit('}')
-        ;
-
-    arcs = lit("\"arcs\"") >> lit(':')
-                           >> lit('[') >> -( arc % lit(',')) >> lit(']') ;
-
-    arc = lit('[') >> -(coordinate_ % lit(',')) >> lit(']') ;
-
-    coordinate_ = lit('[') > double_ > lit(',') > double_ > lit(']');
-
-    coordinates = (lit('[') >> coordinate_ % lit(',') > lit(']'))
-        | coordinate_;
-
-    topology.name("topology");
-    transform.name("transform");
-    objects.name("objects");
-    arc.name("arc");
-    arcs.name("arcs");
-    json.value.name("value");
-    coordinate_.name("coordinate");
-    geometry.name("geometry");
-    properties_.name("properties");
-    geometry_collection.name("geometry_collection");
-    // error handler
-    on_error<fail>(topology, error_handler(_1, _2, _3, _4));
-}
-
-}}
diff --git a/src/json/generic_json.cpp b/include/mapnik/json/topojson_grammar_x3.hpp
similarity index 50%
rename from src/json/generic_json.cpp
rename to include/mapnik/json/topojson_grammar_x3.hpp
index 7fb2e9fd3..6f5d58eb0 100644
--- a/src/json/generic_json.cpp
+++ b/include/mapnik/json/topojson_grammar_x3.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,44 +20,29 @@
  *
  *****************************************************************************/
 
-#include <mapnik/json/generic_json.hpp>
+#ifndef MAPNIK_TOPOJSON_GRAMMAR_X3_HPP
+#define MAPNIK_TOPOJSON_GRAMMAR_X3_HPP
 
-namespace mapnik { namespace json {
+// mapnik
+#include <mapnik/json/topology.hpp>
 
-template <typename Iterator>
-generic_json<Iterator>::generic_json()
-    : generic_json::base_type(value)
-{
-    qi::lit_type lit;
-    qi::_val_type _val;
-    qi::_1_type _1;
-    using phoenix::construct;
-    // generic json types
-    value = object | array | string_ | number
-        ;
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#pragma GCC diagnostic pop
 
-    key_value = string_ > lit(':') > value
-        ;
+namespace mapnik { namespace json { namespace grammar {
 
-    object = lit('{')
-        > -(key_value % lit(','))
-        > lit('}')
-        ;
+namespace x3 = boost::spirit::x3;
 
-    array = lit('[')
-        > -(value % lit(','))
-        > lit(']')
-        ;
+using topojson_grammar_type = x3::rule<class topojson_rule_tag, topojson::topology>;
+
+BOOST_SPIRIT_DECLARE(topojson_grammar_type);
 
-    number = strict_double[_val = double_converter(_1)]
-        | int__[_val = integer_converter(_1)]
-        | lit("true") [_val = true]
-        | lit ("false") [_val = false]
-        | lit("null")[_val = construct<value_null>()]
-        ;
 }
 
+grammar::topojson_grammar_type const& topojson_grammar();
+
 }}
 
-using iterator_type = char const*;
-template struct mapnik::json::generic_json<iterator_type>;
+#endif //MAPNIK_TOPOJSON_GRAMMAR_X3_HPP
diff --git a/include/mapnik/json/topojson_grammar_x3_def.hpp b/include/mapnik/json/topojson_grammar_x3_def.hpp
new file mode 100644
index 000000000..aa040c371
--- /dev/null
+++ b/include/mapnik/json/topojson_grammar_x3_def.hpp
@@ -0,0 +1,427 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_JSON_TOPOJSON_GRAMMAR_X3_DEF_HPP
+#define MAPNIK_JSON_TOPOJSON_GRAMMAR_X3_DEF_HPP
+
+#include <mapnik/json/topojson_grammar_x3.hpp>
+#include <mapnik/json/unicode_string_grammar_x3.hpp>
+#include <mapnik/json/generic_json_grammar_x3.hpp>
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/fusion/adapted/struct.hpp>
+#include <boost/fusion/adapted/std_tuple.hpp>
+#pragma GCC diagnostic pop
+
+BOOST_FUSION_ADAPT_STRUCT(
+    mapnik::topojson::coordinate,
+    (double, x)
+    (double, y)
+    )
+
+BOOST_FUSION_ADAPT_STRUCT(
+    mapnik::topojson::arc,
+    (std::list<mapnik::topojson::coordinate>, coordinates)
+    )
+
+BOOST_FUSION_ADAPT_STRUCT(
+    mapnik::topojson::transform,
+    (double, scale_x)
+    (double, scale_y)
+    (double, translate_x)
+    (double, translate_y)
+    )
+
+BOOST_FUSION_ADAPT_STRUCT(
+    mapnik::topojson::bounding_box,
+    (double, minx)
+    (double, miny)
+    (double, maxx)
+    (double, maxy)
+    )
+
+namespace mapnik { namespace json { namespace grammar {
+
+using index_type = topojson::index_type;
+struct create_point
+{
+    using result_type = mapnik::topojson::point;
+    template <typename T0, typename T1>
+    result_type operator()(T0 & coord, T1 & props) const
+    {
+        mapnik::topojson::point pt;
+        if (coord.template is<mapnik::topojson::coordinate>())
+        {
+            auto const& coord_ = coord.template get<mapnik::topojson::coordinate>();
+            pt.coord = coord_;
+            pt.props = props;
+        }
+        return pt;
+    }
+};
+
+struct create_multi_point
+{
+    using result_type = mapnik::topojson::multi_point;
+    template <typename T0, typename T1>
+    result_type operator()(T0 & coords, T1 & props) const
+    {
+        mapnik::topojson::multi_point mpt;
+        if (coords.template is<std::vector<mapnik::topojson::coordinate>>())
+        {
+            auto const& points = coords.template get<std::vector<mapnik::topojson::coordinate>>();
+            mpt. points = points;
+            mpt.props = props;
+        }
+        return mpt;
+    }
+};
+
+struct create_line_string
+{
+    using result_type = mapnik::topojson::linestring;
+    template <typename T0, typename T1>
+    result_type operator()(T0 & arcs, T1 & props) const
+    {
+        mapnik::topojson::linestring line;
+        if (arcs.template is<std::vector<index_type>>())
+        {
+            auto const& arcs_ = arcs.template get<std::vector<index_type>>();
+            line.rings = arcs_;
+            line.props = props;
+        }
+        return line;
+    }
+};
+
+struct create_multi_line_string
+{
+    using result_type = mapnik::topojson::multi_linestring;
+    template <typename T0, typename T1>
+    result_type operator()(T0 & arcs, T1 & props) const
+    {
+        mapnik::topojson::multi_linestring mline;
+        if (arcs.template is<std::vector<std::vector<index_type>>>())
+        {
+            auto const& arcs_ = arcs.template get<std::vector<std::vector<index_type>>>();
+            mline.lines = arcs_;
+            mline.props = props;
+        }
+        return mline;
+    }
+};
+
+struct create_polygon
+{
+    using result_type = mapnik::topojson::polygon;
+    template <typename T0, typename T1>
+    result_type operator()(T0 & arcs, T1 & props) const
+    {
+        mapnik::topojson::polygon poly;
+        if (arcs.template is<std::vector<std::vector<index_type>>>())
+        {
+            auto const& arcs_ = arcs.template get<std::vector<std::vector<index_type>>>();
+            poly.rings = arcs_;
+            poly.props = props;
+        }
+        return poly;
+    }
+};
+
+struct create_multi_polygon
+{
+    using result_type = mapnik::topojson::multi_polygon;
+    template <typename T0, typename T1>
+    result_type operator()(T0 & arcs, T1 & props) const
+    {
+        mapnik::topojson::multi_polygon mpoly;
+        if (arcs.template is<std::vector<std::vector<std::vector<index_type>>>>())
+        {
+            auto const& arcs_ = arcs.template get<std::vector<std::vector<std::vector<index_type>>>>();
+            mpoly.polygons = arcs_;
+            mpoly.props = props;
+        }
+        return mpoly;
+    }
+};
+
+
+auto create_geometry = [] (auto const& ctx)
+{
+    auto const geom_type = std::get<0>(_attr(ctx));
+    auto const& coord = std::get<1>(_attr(ctx));
+    auto const& arcs = std::get<2>(_attr(ctx));
+    auto const& props = std::get<3>(_attr(ctx));
+    mapnik::topojson::geometry geom; //empty
+    switch (geom_type)
+    {
+    case 1: //Point
+        geom = create_point()(coord, props);
+        break;
+    case 2: //LineString
+        geom = create_line_string()(arcs, props);
+        break;
+    case 3: //Polygon
+        geom = create_polygon()(arcs, props);
+        break;
+    case 4: //MultiPoint
+        geom = create_multi_point()(coord, props);
+        break;
+    case 5: //MultiLineString
+        geom = create_multi_line_string()(arcs, props);
+        break;
+    case 6: //MultiPolygon
+        geom = create_multi_polygon()(arcs, props);
+        break;
+    }
+    _val(ctx) = std::move(geom);
+};
+
+
+auto assign_bbox = [] (auto const& ctx)
+{
+    _val(ctx).bbox = std::move(_attr(ctx));
+};
+
+auto assign_transform = [] (auto const& ctx)
+{
+    _val(ctx).tr = std::move(_attr(ctx));
+};
+
+auto assign_arcs = [] (auto const& ctx)
+{
+    _val(ctx).arcs = std::move(_attr(ctx));
+};
+
+auto assign_objects = [] (auto const& ctx)
+{
+    _val(ctx).geometries = std::move(_attr(ctx));
+};
+
+
+auto push_geometry = [] (auto const& ctx)
+{
+    _val(ctx).push_back(std::move(_attr(ctx)));
+};
+
+auto push_collection = [] (auto const& ctx)
+{
+    auto & dest = _val(ctx);
+    auto const& src = _attr(ctx);
+    if (dest.empty()) dest = std::move(src);
+    else
+        dest.insert(std::end(dest),
+                    std::make_move_iterator(std::begin(src)),
+                    std::make_move_iterator(std::end(src)));
+};
+
+
+auto assign_geometry_type = [] (auto const& ctx)
+{
+    std::get<0>(_val(ctx)) = _attr(ctx);
+};
+
+auto assign_coordinates = [] (auto const& ctx)
+{
+    std::get<1>(_val(ctx)) = std::move(_attr(ctx));
+};
+
+auto assign_rings = [] (auto const& ctx)
+{
+    std::get<2>(_val(ctx)) = std::move(_attr(ctx));
+};
+
+auto assign_properties = [] (auto const& ctx)
+{
+    std::get<3>(_val(ctx)) = std::move(_attr(ctx));
+};
+
+namespace x3 = boost::spirit::x3;
+
+using x3::lit;
+using x3::double_;
+using x3::int_;
+using x3::omit;
+
+namespace
+{
+// import unicode string rule
+auto const& json_string = json::unicode_string_grammar();
+// json value
+auto const& json_value = json::generic_json_grammar();
+}
+
+using coordinates_type = util::variant<topojson::coordinate,std::vector<topojson::coordinate>>;
+using arcs_type = util::variant<std::vector<index_type>,
+                                std::vector<std::vector<index_type>>,
+                                std::vector<std::vector<std::vector<index_type>>>>;
+
+struct geometry_type_ : x3::symbols<int>
+{
+    geometry_type_()
+    {
+        add
+            ("\"Point\"",1)
+            ("\"LineString\"",2)
+            ("\"Polygon\"",3)
+            ("\"MultiPoint\"",4)
+            ("\"MultiLineString\"",5)
+            ("\"MultiPolygon\"",6)
+            ;
+    }
+} geometry_type;
+
+// start rule
+topojson_grammar_type const topology = "Topology";
+// rules
+x3::rule<class transform_tag, mapnik::topojson::transform> transform = "Transform";
+x3::rule<class bbox_tag, mapnik::topojson::bounding_box> bbox = "Bounding Box";
+x3::rule<class objects_tag, std::vector<mapnik::topojson::geometry>> objects= "Objects";
+x3::rule<class properties_tag, mapnik::topojson::properties> properties = "Properties";
+x3::rule<class geometry_tag, mapnik::topojson::geometry> geometry = "Geometry";
+x3::rule<class geometry_collection_tag, std::vector<mapnik::topojson::geometry>> geometry_collection = "Geometry Collection";
+x3::rule<class geometry_tuple_tag,
+         std::tuple<int,
+                    coordinates_type,
+                    arcs_type,
+                    mapnik::topojson::properties>> geometry_tuple = "Geometry Tuple";
+x3::rule<class coordinate_tag, mapnik::topojson::coordinate> coordinate = "Coordinate";
+x3::rule<class coordinates_tag, coordinates_type> coordinates = "Coordinates";
+x3::rule<class arc_tag, mapnik::topojson::arc> arc = "Arc";
+x3::rule<class arcs_tag, std::vector<mapnik::topojson::arc>> arcs = "Arcs";
+x3::rule<class ring_type, std::vector<index_type>> ring = "Ring";
+x3::rule<class rings_type, std::vector<std::vector<index_type>>> rings = "Rings";
+x3::rule<class rings_array_type, arcs_type> rings_array = "Rings Array";
+
+// defs
+auto const topology_def = lit('{') >
+    -(((lit("\"type\"") > lit(':') > lit("\"Topology\""))
+       |
+       bbox[assign_bbox]
+       |
+       transform[assign_transform]
+       |
+       objects[assign_objects]
+       |
+       arcs[assign_arcs]) % lit(','))
+      > lit('}')
+      ;
+
+
+auto const transform_def = lit("\"transform\"") > lit(':') > lit('{')
+    > lit("\"scale\"") > lit(':')
+    > lit('[')
+    > double_ > lit(',')
+    > double_ > lit(']') > lit(',')
+    > lit("\"translate\"") > lit(':')
+    > lit('[') > double_ > lit(',') > double_ > lit(']')
+    > lit('}')
+    ;
+
+auto const  bbox_def = lit("\"bbox\"") > lit(':')
+    > lit('[') > double_ > lit(',') > double_
+    > lit(',') > double_ > lit(',') > double_
+    > lit(']')
+    ;
+
+
+auto const objects_def = lit("\"objects\"") > lit(':')
+    > lit('{')
+    > ((omit[json_string] > lit(':') > ((geometry_collection[push_collection] | geometry[push_geometry]))) % lit(','))
+    > lit('}')
+    ;
+
+auto const geometry_tuple_def =
+    ((lit("\"type\"") > lit(':') > geometry_type[assign_geometry_type])
+     |
+     (lit("\"coordinates\"") > lit(':') > coordinates[assign_coordinates])
+     |
+     (lit("\"arcs\"") > lit(':') > rings_array[assign_rings])
+     |
+     properties[assign_properties]
+     |
+     omit[json_string >> lit(':') >> json_value]) % lit(',')
+    ;
+
+auto const geometry_def = lit("{") > geometry_tuple[create_geometry] > lit("}");
+
+auto const geometry_collection_def = (lit('{') >> lit("\"type\"") >> lit(':') >> lit("\"GeometryCollection\"") >> -omit[lit(',') >> bbox])
+    > lit(',') > lit("\"geometries\"") > lit(':')
+    > lit('[')
+    > -(geometry[push_geometry] % lit(','))
+    > lit(']')
+    > lit('}')
+    ;
+
+
+auto const ring_def = lit('[') >> (int_ % lit(',')) >> lit(']')
+    ;
+auto const rings_def = lit('[') >> (ring % lit(',')) >> lit(']')
+    ;
+auto const rings_array_def = (lit('[') >> (rings % lit(',')) >> lit(']'))
+    |
+    rings
+    |
+    ring
+    ;
+
+auto const properties_def = lit("\"properties\"")
+    > lit(':')
+    > lit('{') > (json_string > lit(':') > json_value) % lit(',') > lit('}')
+    ;
+
+auto const arcs_def = lit("\"arcs\"") >> lit(':') >> lit('[') >> -( arc % lit(',')) >> lit(']') ;
+
+auto const arc_def = lit('[') >> -(coordinate % lit(',')) >> lit(']') ;
+
+auto const coordinate_def = lit('[') >> double_ >> lit(',') >> double_ >> omit[*(lit(',') >> double_)] >> lit(']');
+
+auto const coordinates_def = (lit('[') >> coordinate % lit(',') >> lit(']')) | coordinate;
+
+BOOST_SPIRIT_DEFINE(
+    topology,
+    transform,
+    bbox,
+    objects,
+    geometry_tuple,
+    geometry,
+    geometry_collection,
+    ring,
+    rings,
+    rings_array,
+    properties,
+    arcs,
+    arc,
+    coordinate,
+    coordinates
+    );
+
+}}}
+
+namespace mapnik { namespace json {
+grammar::topojson_grammar_type const& topojson_grammar()
+{
+    return grammar::topology;
+}
+}}
+
+#endif //MAPNIK_TOPOJSON_GRAMMAR_X3_DEF_HPP
diff --git a/plugins/input/topojson/topojson_datasource.cpp b/plugins/input/topojson/topojson_datasource.cpp
index 7c5493764..0c9b99a5e 100644
--- a/plugins/input/topojson/topojson_datasource.cpp
+++ b/plugins/input/topojson/topojson_datasource.cpp
@@ -34,7 +34,7 @@
 #include <mapnik/value/types.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/geometry/boost_adapters.hpp>
-#include <mapnik/json/topojson_grammar.hpp>
+#include <mapnik/json/topojson_grammar_x3.hpp>
 #include <mapnik/json/topojson_utils.hpp>
 #include <mapnik/util/variant.hpp>
 #include <mapnik/util/file_io.hpp>
@@ -176,20 +176,22 @@ topojson_datasource::topojson_datasource(parameters const& params)
     }
 }
 
-namespace {
-using iterator_type = const char*;
-const mapnik::topojson::topojson_grammar<iterator_type> g;
-}
-
 template <typename T>
 void topojson_datasource::parse_topojson(T const& buffer)
 {
-    boost::spirit::standard::space_type space;
     auto itr = buffer;
     auto end = buffer + std::strlen(buffer);
-    bool result = boost::spirit::qi::phrase_parse(itr, end, g, space, topo_);
-    if (!result)
+    using space_type = boost::spirit::x3::standard::space_type;
+    try
     {
+        boost::spirit::x3::phrase_parse(itr, end, mapnik::json::topojson_grammar(), space_type(), topo_);
+    }
+    catch (boost::spirit::x3::expectation_failure<char const*> const& ex)
+    {
+        std::clog << "failed to parse TopoJSON..." << std::endl;
+        std::clog << ex.what() << std::endl;
+        std::clog << "Expected: " << ex.which();
+        std::clog << " Got: \"" << std::string(ex.where(), ex.where() + 200) << "...\"" << std::endl;
         throw mapnik::datasource_exception("topojson_datasource: Failed parse TopoJSON file '" + filename_ + "'");
     }
 
diff --git a/src/json/mapnik_topojson_grammar.cpp b/src/json/topojson_grammar_x3.cpp
similarity index 76%
rename from src/json/mapnik_topojson_grammar.cpp
rename to src/json/topojson_grammar_x3.cpp
index e4b9dca32..895b5e8cd 100644
--- a/src/json/mapnik_topojson_grammar.cpp
+++ b/src/json/topojson_grammar_x3.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,11 @@
  *
  *****************************************************************************/
 
-#include <mapnik/feature.hpp>
-#include <mapnik/json/topojson_grammar_impl.hpp>
-#include <string>
+#include <mapnik/json/json_grammar_config.hpp>
+#include <mapnik/json/topojson_grammar_x3_def.hpp>
 
-using iterator_type = char const*;
-template struct mapnik::topojson::topojson_grammar<iterator_type> ;
+namespace mapnik { namespace json { namespace grammar {
+
+BOOST_SPIRIT_INSTANTIATE(topojson_grammar_type, iterator_type, phrase_parse_context_type);
+
+}}}
diff --git a/src/json/unicode_string_grammar_x3.cpp b/src/json/unicode_string_grammar_x3.cpp
index 76c0e731e..515ef66bd 100644
--- a/src/json/unicode_string_grammar_x3.cpp
+++ b/src/json/unicode_string_grammar_x3.cpp
@@ -23,6 +23,11 @@
 #include <mapnik/json/unicode_string_grammar_x3_def.hpp>
 #include <mapnik/json/json_grammar_config.hpp>
 #include <mapnik/json/extract_bounding_boxes_x3_config.hpp>
+#include <mapnik/json/json_value.hpp>
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/fusion/adapted/std_tuple.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik { namespace json { namespace grammar {
 
@@ -44,3 +49,5 @@ BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extr
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type_f);
 
 }}}
+
+template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type>, boost::fusion::iterator_range<boost::fusion::std_tuple_iterator<std::__1::tuple<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, mapnik::json::json_value>, 0>, boost::fusion::std_tuple_iterator<std::__1::tuple<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, mapnik::json::json_value>, 1> > >(boost::spirit::x3::rule<mapnik::json::grammar::unicode_string_tag, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, false>, char const*&, char const* const&, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> const&, boost::fusion::iterator_range<boost::fusion::std_tuple_iterator<std::__1::tuple<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, mapnik::json::json_value>, 0>, boost::fusion::std_tuple_iterator<std::__1::tuple<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, mapnik::json::json_value>, 1> >&);
diff --git a/test/unit/datasource/topojson.cpp b/test/unit/datasource/topojson.cpp
index 7bf155e33..229e7d9b1 100644
--- a/test/unit/datasource/topojson.cpp
+++ b/test/unit/datasource/topojson.cpp
@@ -26,14 +26,11 @@
 #include <mapnik/util/fs.hpp>
 #include <mapnik/util/file_io.hpp>
 #include <mapnik/json/topology.hpp>
-#include <mapnik/json/topojson_grammar.hpp>
+#include <mapnik/json/topojson_grammar_x3.hpp>
 #include <mapnik/json/topojson_utils.hpp>
 
 namespace {
 
-using iterator_type = char const*;
-const mapnik::topojson::topojson_grammar<iterator_type> grammar;
-
 bool parse_topology(std::string const& filename, mapnik::topojson::topology & topo)
 {
     mapnik::util::file file(filename);
@@ -41,11 +38,22 @@ bool parse_topology(std::string const& filename, mapnik::topojson::topology & to
     buffer.resize(file.size());
     std::fread(&buffer[0], buffer.size(), 1, file.get());
     if (!file) return false;
-    boost::spirit::standard::space_type space;
-    iterator_type itr = buffer.c_str();
-    iterator_type end = itr + buffer.length();
-    bool result = boost::spirit::qi::phrase_parse(itr, end, grammar, space, topo);
-    return (result && (itr == end));
+    using space_type = boost::spirit::x3::standard::space_type;
+    char const* itr = buffer.c_str();
+    char const* end = itr + buffer.length();
+    try
+    {
+        boost::spirit::x3::phrase_parse(itr, end, mapnik::json::topojson_grammar(), space_type() , topo);
+    }
+    catch (boost::spirit::x3::expectation_failure<char const*> const& ex)
+    {
+        std::cerr << "failed to parse TopoJSON..." << std::endl;
+        std::cerr << ex.what() << std::endl;
+        std::cerr << "Expected: " << ex.which();
+        std::cerr << " Got: \"" << std::string(ex.where(), ex.where() + 200) << "...\"" << std::endl;
+        return false;
+    }
+    return (itr == end);
 }
 
 }

From c5b5bc02374c504115f4895cb279db6941d0d83e Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 19 Dec 2016 16:34:16 +0100
Subject: [PATCH 168/328] fix namespace prefix

---
 src/json/unicode_string_grammar_x3.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/json/unicode_string_grammar_x3.cpp b/src/json/unicode_string_grammar_x3.cpp
index 515ef66bd..eef120098 100644
--- a/src/json/unicode_string_grammar_x3.cpp
+++ b/src/json/unicode_string_grammar_x3.cpp
@@ -50,4 +50,4 @@ BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extr
 
 }}}
 
-template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type>, boost::fusion::iterator_range<boost::fusion::std_tuple_iterator<std::__1::tuple<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, mapnik::json::json_value>, 0>, boost::fusion::std_tuple_iterator<std::__1::tuple<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, mapnik::json::json_value>, 1> > >(boost::spirit::x3::rule<mapnik::json::grammar::unicode_string_tag, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, false>, char const*&, char const* const&, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> const&, boost::fusion::iterator_range<boost::fusion::std_tuple_iterator<std::__1::tuple<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, mapnik::json::json_value>, 0>, boost::fusion::std_tuple_iterator<std::__1::tuple<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, mapnik::json::json_value>, 1> >&);
+template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type>, boost::fusion::iterator_range<boost::fusion::std_tuple_iterator<std::tuple<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, mapnik::json::json_value>, 0>, boost::fusion::std_tuple_iterator<std::tuple<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, mapnik::json::json_value>, 1> > >(boost::spirit::x3::rule<mapnik::json::grammar::unicode_string_tag, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, false>, char const*&, char const* const&, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> const&, boost::fusion::iterator_range<boost::fusion::std_tuple_iterator<std::tuple<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, mapnik::json::json_value>, 0>, boost::fusion::std_tuple_iterator<std::tuple<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, mapnik::json::json_value>, 1> >&);

From 4475754e8ad84ea42ca7f7df0ca784004d4b128c Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 19 Dec 2016 17:02:45 +0100
Subject: [PATCH 169/328] deduce types

---
 src/json/unicode_string_grammar_x3.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/json/unicode_string_grammar_x3.cpp b/src/json/unicode_string_grammar_x3.cpp
index eef120098..4f8289a42 100644
--- a/src/json/unicode_string_grammar_x3.cpp
+++ b/src/json/unicode_string_grammar_x3.cpp
@@ -48,6 +48,7 @@ BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extr
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_context_type_f);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type_f);
 
-}}}
+template bool mapnik::json::grammar::parse_rule<iterator_type, phrase_parse_context_type,
+                                                boost::fusion::iterator_range<boost::fusion::std_tuple_iterator<std::tuple<std::string, mapnik::json::json_value>, 0>, boost::fusion::std_tuple_iterator<std::tuple<std::string, mapnik::json::json_value>, 1>>> (unicode_string_grammar_type, iterator_type&, iterator_type const&,  phrase_parse_context_type const&, boost::fusion::iterator_range<boost::fusion::std_tuple_iterator<std::tuple<std::string, mapnik::json::json_value>, 0>, boost::fusion::std_tuple_iterator<std::tuple<std::string, mapnik::json::json_value>, 1> >&);
 
-template bool mapnik::json::grammar::parse_rule<char const*, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type>, boost::fusion::iterator_range<boost::fusion::std_tuple_iterator<std::tuple<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, mapnik::json::json_value>, 0>, boost::fusion::std_tuple_iterator<std::tuple<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, mapnik::json::json_value>, 1> > >(boost::spirit::x3::rule<mapnik::json::grammar::unicode_string_tag, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, false>, char const*&, char const* const&, boost::spirit::x3::context<boost::spirit::x3::skipper_tag, boost::spirit::x3::char_class<boost::spirit::char_encoding::standard, boost::spirit::x3::space_tag> const, boost::spirit::x3::unused_type> const&, boost::fusion::iterator_range<boost::fusion::std_tuple_iterator<std::tuple<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, mapnik::json::json_value>, 0>, boost::fusion::std_tuple_iterator<std::tuple<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, mapnik::json::json_value>, 1> >&);
+}}}

From 47cdd22fad7f2cfd1eefc1b3cb6ca7ccd97f198a Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 19 Dec 2016 17:06:27 +0100
Subject: [PATCH 170/328] simplify further

---
 src/json/unicode_string_grammar_x3.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/json/unicode_string_grammar_x3.cpp b/src/json/unicode_string_grammar_x3.cpp
index 4f8289a42..f3969feec 100644
--- a/src/json/unicode_string_grammar_x3.cpp
+++ b/src/json/unicode_string_grammar_x3.cpp
@@ -48,7 +48,9 @@ BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extr
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_context_type_f);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type_f);
 
-template bool mapnik::json::grammar::parse_rule<iterator_type, phrase_parse_context_type,
-                                                boost::fusion::iterator_range<boost::fusion::std_tuple_iterator<std::tuple<std::string, mapnik::json::json_value>, 0>, boost::fusion::std_tuple_iterator<std::tuple<std::string, mapnik::json::json_value>, 1>>> (unicode_string_grammar_type, iterator_type&, iterator_type const&,  phrase_parse_context_type const&, boost::fusion::iterator_range<boost::fusion::std_tuple_iterator<std::tuple<std::string, mapnik::json::json_value>, 0>, boost::fusion::std_tuple_iterator<std::tuple<std::string, mapnik::json::json_value>, 1> >&);
+using attribute_type = boost::fusion::iterator_range<boost::fusion::std_tuple_iterator<std::tuple<std::string, mapnik::json::json_value>, 0>, boost::fusion::std_tuple_iterator<std::tuple<std::string, mapnik::json::json_value>, 1>>;
+
+template bool mapnik::json::grammar::parse_rule<iterator_type, phrase_parse_context_type, attribute_type> (
+    unicode_string_grammar_type, iterator_type&, iterator_type const&,  phrase_parse_context_type const&, attribute_type &);
 
 }}}

From f1ccc66162edc9978dcf1871ed7c67dbe738f64f Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 19 Dec 2016 17:52:01 +0100
Subject: [PATCH 171/328] avoid parsing synthesised std::tuple<> + more
 fine-grained rules

---
 .../mapnik/json/topojson_grammar_x3_def.hpp   | 23 +++++++++++++++----
 src/json/unicode_string_grammar_x3.cpp        | 10 --------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/include/mapnik/json/topojson_grammar_x3_def.hpp b/include/mapnik/json/topojson_grammar_x3_def.hpp
index aa040c371..6a5d6920e 100644
--- a/include/mapnik/json/topojson_grammar_x3_def.hpp
+++ b/include/mapnik/json/topojson_grammar_x3_def.hpp
@@ -255,13 +255,23 @@ auto assign_properties = [] (auto const& ctx)
     std::get<3>(_val(ctx)) = std::move(_attr(ctx));
 };
 
+auto assign_prop_name = [] (auto const& ctx)
+{
+    std::get<0>(_val(ctx)) = std::move(_attr(ctx));
+};
+
+auto assign_prop_value = [] (auto const& ctx)
+{
+    std::get<1>(_val(ctx)) = std::move(_attr(ctx));
+};
+
 namespace x3 = boost::spirit::x3;
 
 using x3::lit;
 using x3::double_;
 using x3::int_;
 using x3::omit;
-
+using x3::char_;
 namespace
 {
 // import unicode string rule
@@ -296,6 +306,7 @@ topojson_grammar_type const topology = "Topology";
 x3::rule<class transform_tag, mapnik::topojson::transform> transform = "Transform";
 x3::rule<class bbox_tag, mapnik::topojson::bounding_box> bbox = "Bounding Box";
 x3::rule<class objects_tag, std::vector<mapnik::topojson::geometry>> objects= "Objects";
+x3::rule<class property_tag, mapnik::topojson::property> property = "Property";
 x3::rule<class properties_tag, mapnik::topojson::properties> properties = "Properties";
 x3::rule<class geometry_tag, mapnik::topojson::geometry> geometry = "Geometry";
 x3::rule<class geometry_collection_tag, std::vector<mapnik::topojson::geometry>> geometry_collection = "Geometry Collection";
@@ -346,7 +357,7 @@ auto const  bbox_def = lit("\"bbox\"") > lit(':')
 
 auto const objects_def = lit("\"objects\"") > lit(':')
     > lit('{')
-    > ((omit[json_string] > lit(':') > ((geometry_collection[push_collection] | geometry[push_geometry]))) % lit(','))
+    > ((omit[*~char_(':')] > lit(':') > ((geometry_collection[push_collection] | geometry[push_geometry]))) % lit(','))
     > lit('}')
     ;
 
@@ -359,7 +370,7 @@ auto const geometry_tuple_def =
      |
      properties[assign_properties]
      |
-     omit[json_string >> lit(':') >> json_value]) % lit(',')
+     omit[json_string] > lit(':') > omit[json_value]) % lit(',')
     ;
 
 auto const geometry_def = lit("{") > geometry_tuple[create_geometry] > lit("}");
@@ -384,9 +395,12 @@ auto const rings_array_def = (lit('[') >> (rings % lit(',')) >> lit(']'))
     ring
     ;
 
+auto const property_def = json_string[assign_prop_name] > lit(':') > json_value[assign_prop_value]
+    ;
+
 auto const properties_def = lit("\"properties\"")
     > lit(':')
-    > lit('{') > (json_string > lit(':') > json_value) % lit(',') > lit('}')
+    > lit('{') > (property % lit(',')) > lit('}')
     ;
 
 auto const arcs_def = lit("\"arcs\"") >> lit(':') >> lit('[') >> -( arc % lit(',')) >> lit(']') ;
@@ -408,6 +422,7 @@ BOOST_SPIRIT_DEFINE(
     ring,
     rings,
     rings_array,
+    property,
     properties,
     arcs,
     arc,
diff --git a/src/json/unicode_string_grammar_x3.cpp b/src/json/unicode_string_grammar_x3.cpp
index f3969feec..76c0e731e 100644
--- a/src/json/unicode_string_grammar_x3.cpp
+++ b/src/json/unicode_string_grammar_x3.cpp
@@ -23,11 +23,6 @@
 #include <mapnik/json/unicode_string_grammar_x3_def.hpp>
 #include <mapnik/json/json_grammar_config.hpp>
 #include <mapnik/json/extract_bounding_boxes_x3_config.hpp>
-#include <mapnik/json/json_value.hpp>
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/fusion/adapted/std_tuple.hpp>
-#pragma GCC diagnostic pop
 
 namespace mapnik { namespace json { namespace grammar {
 
@@ -48,9 +43,4 @@ BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extr
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_context_type_f);
 BOOST_SPIRIT_INSTANTIATE_UNUSED(unicode_string_grammar_type, iterator_type, extract_bounding_boxes_reverse_context_type_f);
 
-using attribute_type = boost::fusion::iterator_range<boost::fusion::std_tuple_iterator<std::tuple<std::string, mapnik::json::json_value>, 0>, boost::fusion::std_tuple_iterator<std::tuple<std::string, mapnik::json::json_value>, 1>>;
-
-template bool mapnik::json::grammar::parse_rule<iterator_type, phrase_parse_context_type, attribute_type> (
-    unicode_string_grammar_type, iterator_type&, iterator_type const&,  phrase_parse_context_type const&, attribute_type &);
-
 }}}

From 8b049230b31013a6421607f8e3733f9d53d078a6 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 20 Dec 2016 10:31:52 +0100
Subject: [PATCH 172/328] topojson_grammar_x3 : make rules const

---
 .../mapnik/json/topojson_grammar_x3_def.hpp   | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/mapnik/json/topojson_grammar_x3_def.hpp b/include/mapnik/json/topojson_grammar_x3_def.hpp
index 6a5d6920e..a2a96cef6 100644
--- a/include/mapnik/json/topojson_grammar_x3_def.hpp
+++ b/include/mapnik/json/topojson_grammar_x3_def.hpp
@@ -303,25 +303,25 @@ struct geometry_type_ : x3::symbols<int>
 // start rule
 topojson_grammar_type const topology = "Topology";
 // rules
-x3::rule<class transform_tag, mapnik::topojson::transform> transform = "Transform";
-x3::rule<class bbox_tag, mapnik::topojson::bounding_box> bbox = "Bounding Box";
-x3::rule<class objects_tag, std::vector<mapnik::topojson::geometry>> objects= "Objects";
-x3::rule<class property_tag, mapnik::topojson::property> property = "Property";
-x3::rule<class properties_tag, mapnik::topojson::properties> properties = "Properties";
-x3::rule<class geometry_tag, mapnik::topojson::geometry> geometry = "Geometry";
-x3::rule<class geometry_collection_tag, std::vector<mapnik::topojson::geometry>> geometry_collection = "Geometry Collection";
+x3::rule<class transform_tag, mapnik::topojson::transform> const transform = "Transform";
+x3::rule<class bbox_tag, mapnik::topojson::bounding_box> const bbox = "Bounding Box";
+x3::rule<class objects_tag, std::vector<mapnik::topojson::geometry>> const objects= "Objects";
+x3::rule<class property_tag, mapnik::topojson::property> const property = "Property";
+x3::rule<class properties_tag, mapnik::topojson::properties> const properties = "Properties";
+x3::rule<class geometry_tag, mapnik::topojson::geometry> const geometry = "Geometry";
+x3::rule<class geometry_collection_tag, std::vector<mapnik::topojson::geometry>> const geometry_collection = "Geometry Collection";
 x3::rule<class geometry_tuple_tag,
          std::tuple<int,
                     coordinates_type,
                     arcs_type,
-                    mapnik::topojson::properties>> geometry_tuple = "Geometry Tuple";
-x3::rule<class coordinate_tag, mapnik::topojson::coordinate> coordinate = "Coordinate";
-x3::rule<class coordinates_tag, coordinates_type> coordinates = "Coordinates";
-x3::rule<class arc_tag, mapnik::topojson::arc> arc = "Arc";
-x3::rule<class arcs_tag, std::vector<mapnik::topojson::arc>> arcs = "Arcs";
-x3::rule<class ring_type, std::vector<index_type>> ring = "Ring";
-x3::rule<class rings_type, std::vector<std::vector<index_type>>> rings = "Rings";
-x3::rule<class rings_array_type, arcs_type> rings_array = "Rings Array";
+                    mapnik::topojson::properties>> const geometry_tuple = "Geometry Tuple";
+x3::rule<class coordinate_tag, mapnik::topojson::coordinate> const coordinate = "Coordinate";
+x3::rule<class coordinates_tag, coordinates_type> const coordinates = "Coordinates";
+x3::rule<class arc_tag, mapnik::topojson::arc> const arc = "Arc";
+x3::rule<class arcs_tag, std::vector<mapnik::topojson::arc>> const arcs = "Arcs";
+x3::rule<class ring_type, std::vector<index_type>> const ring = "Ring";
+x3::rule<class rings_type, std::vector<std::vector<index_type>>> const rings = "Rings";
+x3::rule<class rings_array_type, arcs_type> const rings_array = "Rings Array";
 
 // defs
 auto const topology_def = lit('{') >

From f3cd36f0cdd88e5b1e0a76aad99e0ea13f93da77 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 20 Dec 2016 10:40:50 +0100
Subject: [PATCH 173/328] reserve std::vector capacity prior oppending + remove
 const qualifier

---
 include/mapnik/json/topojson_grammar_x3_def.hpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/mapnik/json/topojson_grammar_x3_def.hpp b/include/mapnik/json/topojson_grammar_x3_def.hpp
index a2a96cef6..d891cc629 100644
--- a/include/mapnik/json/topojson_grammar_x3_def.hpp
+++ b/include/mapnik/json/topojson_grammar_x3_def.hpp
@@ -226,12 +226,15 @@ auto push_geometry = [] (auto const& ctx)
 auto push_collection = [] (auto const& ctx)
 {
     auto & dest = _val(ctx);
-    auto const& src = _attr(ctx);
+    auto & src = _attr(ctx);
     if (dest.empty()) dest = std::move(src);
     else
+    {
+        dest.reserve(dest.size() + src.size());
         dest.insert(std::end(dest),
                     std::make_move_iterator(std::begin(src)),
                     std::make_move_iterator(std::end(src)));
+    }
 };
 
 

From b73901edab7e86a6fdd42456b436b999b39c2172 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 20 Dec 2016 17:45:00 +0100
Subject: [PATCH 174/328] remove from forthcoming 3.1.x release

---
 include/mapnik/filter_factory.hpp | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 include/mapnik/filter_factory.hpp

diff --git a/include/mapnik/filter_factory.hpp b/include/mapnik/filter_factory.hpp
deleted file mode 100644
index 68d729a6c..000000000
--- a/include/mapnik/filter_factory.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO - remove this file at mapnik 3.x
-#ifdef _MSC_VER
-#pragma NOTE("filter_factory.hpp" is now called "expression.hpp")
-#else
-#warning "filter_factory.hpp" is now called "expression.hpp"
-#endif
-
-#include <mapnik/expression.hpp>

From 7f4fd0cc767b42c33e023308c7bd13dcaf836d8d Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 20 Dec 2016 17:45:38 +0100
Subject: [PATCH 175/328] include guards - add missing and normalise namings

---
 include/mapnik/agg_render_marker.hpp                | 5 +++++
 include/mapnik/csv/csv_grammar_x3_def.hpp           | 9 ++++++++-
 include/mapnik/json/geometry_grammar_x3_def.hpp     | 6 ++++++
 include/mapnik/stringify_macro.hpp                  | 7 ++++++-
 include/mapnik/svg/output/svg_output_attributes.hpp | 6 +++---
 include/mapnik/xml_node.hpp                         | 6 +++---
 include/mapnik/xml_tree.hpp                         | 6 +++---
 7 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/include/mapnik/agg_render_marker.hpp b/include/mapnik/agg_render_marker.hpp
index 283807a93..c0f9d1876 100644
--- a/include/mapnik/agg_render_marker.hpp
+++ b/include/mapnik/agg_render_marker.hpp
@@ -20,6 +20,9 @@
  *
  *****************************************************************************/
 
+#ifndef MAPNIK_AGG_RENDER_MARKER_HPP
+#define MAPNIK_AGG_RENDER_MARKER_HPP
+
 #include <mapnik/color.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/geom_util.hpp>
@@ -148,3 +151,5 @@ void render_raster_marker(RendererType renb, RasterizerType & ras, image_rgba8 c
 }
 
 }
+
+#endif // MAPNIK_AGG_RENDER_MARKER_HPP
diff --git a/include/mapnik/csv/csv_grammar_x3_def.hpp b/include/mapnik/csv/csv_grammar_x3_def.hpp
index b40507030..d284cbbce 100644
--- a/include/mapnik/csv/csv_grammar_x3_def.hpp
+++ b/include/mapnik/csv/csv_grammar_x3_def.hpp
@@ -20,11 +20,15 @@
  *
  *****************************************************************************/
 
+#ifndef MAPNIK_CSV_GRAMMAR_X3_DEF_HPP
+#define MAPNIK_CSV_GRAMMAR_X3_DEF_HPP
+
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <mapnik/csv/csv_grammar_x3.hpp>
 #pragma GCC diagnostic pop
-#include <iostream>
+
+
 namespace mapnik { namespace grammar {
 
 namespace x3 = boost::spirit::x3;
@@ -111,3 +115,6 @@ grammar::csv_line_grammar_type const& csv_line_grammar()
 }
 
 } // namespace mapnik
+
+
+#endif // MAPNIK_CSV_GRAMMAR_X3_DEF_HPP
diff --git a/include/mapnik/json/geometry_grammar_x3_def.hpp b/include/mapnik/json/geometry_grammar_x3_def.hpp
index 9ec425e37..69d5a2e90 100644
--- a/include/mapnik/json/geometry_grammar_x3_def.hpp
+++ b/include/mapnik/json/geometry_grammar_x3_def.hpp
@@ -20,6 +20,9 @@
  *
  *****************************************************************************/
 
+#ifndef MAPNIK_JSON_GEOMETRY_GRAMMAR_X3_DEF_HPP
+#define MAPNIK_JSON_GEOMETRY_GRAMMAR_X3_DEF_HPP
+
 // mapnik
 #include <mapnik/json/geometry_grammar_x3.hpp>
 #include <mapnik/json/positions_grammar_x3.hpp>
@@ -153,3 +156,6 @@ grammar::geometry_grammar_type const& geometry_grammar()
     return grammar::geometry;
 }
 }}
+
+
+#endif // MAPNIK_JSON_GEOMETRY_GRAMMAR_X3_DEF_HPP
diff --git a/include/mapnik/stringify_macro.hpp b/include/mapnik/stringify_macro.hpp
index 41f947467..a450b98c8 100644
--- a/include/mapnik/stringify_macro.hpp
+++ b/include/mapnik/stringify_macro.hpp
@@ -20,7 +20,12 @@
  *
  *****************************************************************************/
 
+#ifndef MAPNIK_STRINGIFY_MACRO_HPP
+#define MAPNIK_STRINGIFY_MACRO_HPP
+
 #ifndef MAPNIK_STRINGIFY
 #define MAPNIK_STRINGIFY(n) MAPNIK_STRINGIFY_HELPER(n)
 #define MAPNIK_STRINGIFY_HELPER(n) #n
-#endif
\ No newline at end of file
+#endif
+
+#endif // MAPNIK_STRINGIFY_MACRO_HPP
diff --git a/include/mapnik/svg/output/svg_output_attributes.hpp b/include/mapnik/svg/output/svg_output_attributes.hpp
index 06a00f276..0c5351305 100644
--- a/include/mapnik/svg/output/svg_output_attributes.hpp
+++ b/include/mapnik/svg/output/svg_output_attributes.hpp
@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_SVG_OUTPUT_ATTRIBUTES
-#define MAPNIK_SVG_OUTPUT_ATTRIBUTES
+#ifndef MAPNIK_SVG_OUTPUT_ATTRIBUTES_HPP
+#define MAPNIK_SVG_OUTPUT_ATTRIBUTES_HPP
 
 // mapnik
 #include <mapnik/color.hpp>
@@ -199,4 +199,4 @@ namespace mapnik { namespace svg {
     };
     }}
 
-#endif // MAPNIK_SVG_OUTPUT_ATTRIBUTES
+#endif // MAPNIK_SVG_OUTPUT_ATTRIBUTES_HPP
diff --git a/include/mapnik/xml_node.hpp b/include/mapnik/xml_node.hpp
index bf7130c20..b0952f289 100644
--- a/include/mapnik/xml_node.hpp
+++ b/include/mapnik/xml_node.hpp
@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_XML_NODE_H
-#define MAPNIK_XML_NODE_H
+#ifndef MAPNIK_XML_NODE_HPP
+#define MAPNIK_XML_NODE_HPP
 
 //mapnik
 #include <mapnik/config.hpp> // for MAPNIK_DECL
@@ -150,4 +150,4 @@ private:
 
 } //ns mapnik
 
-#endif // MAPNIK_XML_NODE_H
+#endif // MAPNIK_XML_NODE_HPP
diff --git a/include/mapnik/xml_tree.hpp b/include/mapnik/xml_tree.hpp
index 535d96763..042421836 100644
--- a/include/mapnik/xml_tree.hpp
+++ b/include/mapnik/xml_tree.hpp
@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_XML_TREE_H
-#define MAPNIK_XML_TREE_H
+#ifndef MAPNIK_XML_TREE_HPP
+#define MAPNIK_XML_TREE_HPP
 
 // mapnik
 #include <mapnik/xml_node.hpp>
@@ -50,4 +50,4 @@ public:
 
 } //ns mapnik
 
-#endif // MAPNIK_XML_TREE_H
+#endif // MAPNIK_XML_TREE_HPP

From 5745bedbd9274b1fcef7a1d6a8c161a59e53479f Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 20 Dec 2016 17:57:22 +0100
Subject: [PATCH 176/328] update copyright year to 2016

---
 demo/c++/rundemo.cpp                                          | 2 +-
 demo/viewer/about_dialog.cpp                                  | 2 +-
 demo/viewer/about_dialog.hpp                                  | 2 +-
 demo/viewer/info_dialog.cpp                                   | 2 +-
 demo/viewer/info_dialog.hpp                                   | 2 +-
 demo/viewer/layer_info_dialog.cpp                             | 2 +-
 demo/viewer/layer_info_dialog.hpp                             | 2 +-
 demo/viewer/layerdelegate.cpp                                 | 2 +-
 demo/viewer/layerdelegate.hpp                                 | 2 +-
 demo/viewer/layerlistmodel.cpp                                | 2 +-
 demo/viewer/layerlistmodel.hpp                                | 2 +-
 demo/viewer/layerwidget.cpp                                   | 2 +-
 demo/viewer/layerwidget.hpp                                   | 2 +-
 demo/viewer/main.cpp                                          | 2 +-
 demo/viewer/mainwindow.cpp                                    | 2 +-
 demo/viewer/mainwindow.hpp                                    | 2 +-
 demo/viewer/mapwidget.cpp                                     | 2 +-
 demo/viewer/mapwidget.hpp                                     | 2 +-
 demo/viewer/styles_model.cpp                                  | 2 +-
 demo/viewer/styles_model.hpp                                  | 2 +-
 include/mapnik/agg_helpers.hpp                                | 2 +-
 include/mapnik/agg_pattern_source.hpp                         | 2 +-
 include/mapnik/agg_rasterizer.hpp                             | 2 +-
 include/mapnik/agg_render_marker.hpp                          | 2 +-
 include/mapnik/agg_renderer.hpp                               | 2 +-
 include/mapnik/attribute.hpp                                  | 2 +-
 include/mapnik/attribute_collector.hpp                        | 2 +-
 include/mapnik/attribute_descriptor.hpp                       | 2 +-
 include/mapnik/boolean.hpp                                    | 2 +-
 include/mapnik/box2d.hpp                                      | 2 +-
 include/mapnik/cairo/cairo_context.hpp                        | 2 +-
 include/mapnik/cairo/cairo_image_util.hpp                     | 2 +-
 include/mapnik/cairo/cairo_render_vector.hpp                  | 2 +-
 include/mapnik/cairo/cairo_renderer.hpp                       | 2 +-
 include/mapnik/cairo_io.hpp                                   | 2 +-
 include/mapnik/color.hpp                                      | 2 +-
 include/mapnik/color_factory.hpp                              | 2 +-
 include/mapnik/config.hpp                                     | 2 +-
 include/mapnik/config_error.hpp                               | 2 +-
 include/mapnik/coord.hpp                                      | 2 +-
 include/mapnik/csv/csv_grammar_x3.hpp                         | 2 +-
 include/mapnik/csv/csv_types.hpp                              | 2 +-
 include/mapnik/datasource.hpp                                 | 2 +-
 include/mapnik/datasource_cache.hpp                           | 2 +-
 include/mapnik/datasource_geometry_type.hpp                   | 2 +-
 include/mapnik/debug.hpp                                      | 2 +-
 include/mapnik/ellipsoid.hpp                                  | 2 +-
 include/mapnik/enumeration.hpp                                | 2 +-
 include/mapnik/evaluate_global_attributes.hpp                 | 2 +-
 include/mapnik/expression.hpp                                 | 2 +-
 include/mapnik/expression_evaluator.hpp                       | 2 +-
 include/mapnik/expression_grammar_x3.hpp                      | 2 +-
 include/mapnik/expression_grammar_x3_config.hpp               | 2 +-
 include/mapnik/expression_node.hpp                            | 2 +-
 include/mapnik/expression_node_types.hpp                      | 2 +-
 include/mapnik/expression_string.hpp                          | 2 +-
 include/mapnik/factory.hpp                                    | 2 +-
 include/mapnik/feature.hpp                                    | 2 +-
 include/mapnik/feature_factory.hpp                            | 2 +-
 include/mapnik/feature_kv_iterator.hpp                        | 2 +-
 include/mapnik/feature_layer_desc.hpp                         | 2 +-
 include/mapnik/feature_style_processor.hpp                    | 2 +-
 include/mapnik/feature_style_processor_context.hpp            | 2 +-
 include/mapnik/feature_style_processor_impl.hpp               | 2 +-
 include/mapnik/feature_type_style.hpp                         | 2 +-
 include/mapnik/featureset.hpp                                 | 2 +-
 include/mapnik/filter_featureset.hpp                          | 2 +-
 include/mapnik/font_engine_freetype.hpp                       | 2 +-
 include/mapnik/font_set.hpp                                   | 2 +-
 include/mapnik/function_call.hpp                              | 2 +-
 include/mapnik/geom_util.hpp                                  | 2 +-
 include/mapnik/geometry.hpp                                   | 2 +-
 include/mapnik/geometry/boost_adapters.hpp                    | 2 +-
 include/mapnik/geometry/centroid.hpp                          | 2 +-
 include/mapnik/geometry/correct.hpp                           | 2 +-
 include/mapnik/geometry/envelope.hpp                          | 2 +-
 include/mapnik/geometry/envelope_impl.hpp                     | 2 +-
 include/mapnik/geometry/fusion_adapted.hpp                    | 2 +-
 include/mapnik/geometry/geometry_type.hpp                     | 2 +-
 include/mapnik/geometry/geometry_types.hpp                    | 2 +-
 include/mapnik/geometry/is_empty.hpp                          | 2 +-
 include/mapnik/geometry/is_simple.hpp                         | 2 +-
 include/mapnik/geometry/is_valid.hpp                          | 2 +-
 include/mapnik/geometry/remove_empty.hpp                      | 2 +-
 include/mapnik/geometry/reprojection.hpp                      | 2 +-
 include/mapnik/geometry/reprojection_impl.hpp                 | 2 +-
 include/mapnik/geometry/strategy.hpp                          | 2 +-
 include/mapnik/geometry/to_path.hpp                           | 2 +-
 include/mapnik/geometry/transform.hpp                         | 2 +-
 include/mapnik/global.hpp                                     | 2 +-
 include/mapnik/gradient.hpp                                   | 2 +-
 include/mapnik/grid/grid.hpp                                  | 2 +-
 include/mapnik/grid/grid_pixel.hpp                            | 2 +-
 include/mapnik/grid/grid_pixfmt.hpp                           | 2 +-
 include/mapnik/grid/grid_rasterizer.hpp                       | 2 +-
 include/mapnik/grid/grid_render_marker.hpp                    | 2 +-
 include/mapnik/grid/grid_renderer.hpp                         | 2 +-
 include/mapnik/grid/grid_renderer_base.hpp                    | 2 +-
 include/mapnik/grid/grid_rendering_buffer.hpp                 | 2 +-
 include/mapnik/grid/grid_view.hpp                             | 2 +-
 include/mapnik/group/group_layout.hpp                         | 2 +-
 include/mapnik/group/group_layout_manager.hpp                 | 2 +-
 include/mapnik/group/group_rule.hpp                           | 2 +-
 include/mapnik/group/group_symbolizer_helper.hpp              | 2 +-
 include/mapnik/group/group_symbolizer_properties.hpp          | 2 +-
 include/mapnik/hextree.hpp                                    | 2 +-
 include/mapnik/hit_test_filter.hpp                            | 2 +-
 include/mapnik/image.hpp                                      | 2 +-
 include/mapnik/image_any.hpp                                  | 2 +-
 include/mapnik/image_compositing.hpp                          | 2 +-
 include/mapnik/image_copy.hpp                                 | 2 +-
 include/mapnik/image_filter.hpp                               | 2 +-
 include/mapnik/image_filter_types.hpp                         | 2 +-
 include/mapnik/image_impl.hpp                                 | 2 +-
 include/mapnik/image_null.hpp                                 | 2 +-
 include/mapnik/image_options.hpp                              | 2 +-
 include/mapnik/image_reader.hpp                               | 2 +-
 include/mapnik/image_scaling.hpp                              | 2 +-
 include/mapnik/image_scaling_traits.hpp                       | 2 +-
 include/mapnik/image_util.hpp                                 | 2 +-
 include/mapnik/image_util_jpeg.hpp                            | 2 +-
 include/mapnik/image_util_png.hpp                             | 2 +-
 include/mapnik/image_util_tiff.hpp                            | 2 +-
 include/mapnik/image_util_webp.hpp                            | 2 +-
 include/mapnik/image_view.hpp                                 | 2 +-
 include/mapnik/image_view_any.hpp                             | 2 +-
 include/mapnik/image_view_impl.hpp                            | 2 +-
 include/mapnik/image_view_null.hpp                            | 2 +-
 include/mapnik/jpeg_io.hpp                                    | 2 +-
 include/mapnik/json/feature_generator_grammar.hpp             | 2 +-
 include/mapnik/json/feature_generator_grammar_impl.hpp        | 2 +-
 include/mapnik/json/feature_parser.hpp                        | 2 +-
 include/mapnik/json/generic_json_grammar_x3.hpp               | 2 +-
 include/mapnik/json/geometry_generator_grammar.hpp            | 2 +-
 include/mapnik/json/geometry_generator_grammar_impl.hpp       | 2 +-
 include/mapnik/json/geometry_parser.hpp                       | 2 +-
 include/mapnik/json/properties_generator_grammar.hpp          | 2 +-
 include/mapnik/json/properties_generator_grammar_impl.hpp     | 2 +-
 include/mapnik/json/topology.hpp                              | 2 +-
 include/mapnik/json/unicode_string_grammar_x3.hpp             | 2 +-
 include/mapnik/json/value_converters.hpp                      | 2 +-
 include/mapnik/label_collision_detector.hpp                   | 2 +-
 include/mapnik/layer.hpp                                      | 2 +-
 include/mapnik/load_map.hpp                                   | 2 +-
 include/mapnik/make_unique.hpp                                | 2 +-
 include/mapnik/map.hpp                                        | 2 +-
 include/mapnik/mapped_memory_cache.hpp                        | 2 +-
 include/mapnik/marker.hpp                                     | 2 +-
 include/mapnik/marker_cache.hpp                               | 2 +-
 include/mapnik/marker_helpers.hpp                             | 2 +-
 include/mapnik/markers_placement.hpp                          | 2 +-
 include/mapnik/markers_placements/interior.hpp                | 2 +-
 include/mapnik/markers_placements/line.hpp                    | 2 +-
 include/mapnik/markers_placements/point.hpp                   | 2 +-
 include/mapnik/markers_placements/vertext_first.hpp           | 2 +-
 include/mapnik/markers_placements/vertext_last.hpp            | 2 +-
 include/mapnik/memory_datasource.hpp                          | 2 +-
 include/mapnik/memory_featureset.hpp                          | 2 +-
 include/mapnik/octree.hpp                                     | 2 +-
 include/mapnik/offset_converter.hpp                           | 2 +-
 include/mapnik/palette.hpp                                    | 2 +-
 include/mapnik/params.hpp                                     | 2 +-
 include/mapnik/params_impl.hpp                                | 2 +-
 include/mapnik/parse_path.hpp                                 | 2 +-
 include/mapnik/parse_transform.hpp                            | 2 +-
 include/mapnik/path.hpp                                       | 2 +-
 include/mapnik/path_expression.hpp                            | 2 +-
 include/mapnik/pixel_position.hpp                             | 2 +-
 include/mapnik/pixel_types.hpp                                | 2 +-
 include/mapnik/plugin.hpp                                     | 2 +-
 include/mapnik/png_io.hpp                                     | 2 +-
 include/mapnik/pool.hpp                                       | 2 +-
 include/mapnik/proj_strategy.hpp                              | 2 +-
 include/mapnik/proj_transform.hpp                             | 2 +-
 include/mapnik/projection.hpp                                 | 2 +-
 include/mapnik/ptree_helpers.hpp                              | 2 +-
 include/mapnik/quad_tree.hpp                                  | 2 +-
 include/mapnik/query.hpp                                      | 2 +-
 include/mapnik/raster.hpp                                     | 2 +-
 include/mapnik/raster_colorizer.hpp                           | 2 +-
 include/mapnik/renderer_common.hpp                            | 2 +-
 include/mapnik/renderer_common/apply_vertex_converter.hpp     | 2 +-
 include/mapnik/renderer_common/clipping_extent.hpp            | 2 +-
 include/mapnik/renderer_common/pattern_alignment.hpp          | 2 +-
 .../mapnik/renderer_common/process_building_symbolizer.hpp    | 2 +-
 include/mapnik/renderer_common/process_point_symbolizer.hpp   | 2 +-
 include/mapnik/renderer_common/process_polygon_symbolizer.hpp | 2 +-
 include/mapnik/renderer_common/process_raster_symbolizer.hpp  | 2 +-
 include/mapnik/renderer_common/render_pattern.hpp             | 2 +-
 include/mapnik/request.hpp                                    | 2 +-
 include/mapnik/rule.hpp                                       | 2 +-
 include/mapnik/rule_cache.hpp                                 | 2 +-
 include/mapnik/safe_cast.hpp                                  | 2 +-
 include/mapnik/save_map.hpp                                   | 2 +-
 include/mapnik/scale_denominator.hpp                          | 2 +-
 include/mapnik/segment.hpp                                    | 2 +-
 include/mapnik/span_image_filter.hpp                          | 2 +-
 include/mapnik/sql_utils.hpp                                  | 2 +-
 include/mapnik/sse.hpp                                        | 2 +-
 include/mapnik/svg/geometry_svg_generator.hpp                 | 2 +-
 include/mapnik/svg/geometry_svg_generator_impl.hpp            | 2 +-
 include/mapnik/svg/output/svg_generator.hpp                   | 2 +-
 include/mapnik/svg/output/svg_output_attributes.hpp           | 2 +-
 include/mapnik/svg/output/svg_output_grammars.hpp             | 2 +-
 include/mapnik/svg/output/svg_output_grammars_impl.hpp        | 2 +-
 include/mapnik/svg/output/svg_path_iterator.hpp               | 2 +-
 include/mapnik/svg/output/svg_renderer.hpp                    | 2 +-
 include/mapnik/svg/svg_converter.hpp                          | 2 +-
 include/mapnik/svg/svg_parser.hpp                             | 2 +-
 include/mapnik/svg/svg_parser_exception.hpp                   | 2 +-
 include/mapnik/svg/svg_path_adapter.hpp                       | 2 +-
 include/mapnik/svg/svg_path_attributes.hpp                    | 2 +-
 include/mapnik/svg/svg_path_commands.hpp                      | 2 +-
 include/mapnik/svg/svg_path_parser.hpp                        | 2 +-
 include/mapnik/svg/svg_points_grammar.hpp                     | 2 +-
 include/mapnik/svg/svg_points_grammar_impl.hpp                | 2 +-
 include/mapnik/svg/svg_renderer_agg.hpp                       | 2 +-
 include/mapnik/svg/svg_storage.hpp                            | 2 +-
 include/mapnik/svg/svg_transform_grammar.hpp                  | 2 +-
 include/mapnik/svg/svg_transform_grammar_impl.hpp             | 2 +-
 include/mapnik/symbolizer.hpp                                 | 2 +-
 include/mapnik/symbolizer_base.hpp                            | 2 +-
 include/mapnik/symbolizer_default_values.hpp                  | 2 +-
 include/mapnik/symbolizer_dispatch.hpp                        | 2 +-
 include/mapnik/symbolizer_enumerations.hpp                    | 2 +-
 include/mapnik/symbolizer_hash.hpp                            | 2 +-
 include/mapnik/symbolizer_keys.hpp                            | 2 +-
 include/mapnik/symbolizer_utils.hpp                           | 2 +-
 include/mapnik/text/evaluated_format_properties_ptr.hpp       | 2 +-
 include/mapnik/text/face.hpp                                  | 2 +-
 include/mapnik/text/font_feature_settings.hpp                 | 2 +-
 include/mapnik/text/font_library.hpp                          | 2 +-
 include/mapnik/text/formatting/base.hpp                       | 2 +-
 include/mapnik/text/formatting/format.hpp                     | 2 +-
 include/mapnik/text/formatting/layout.hpp                     | 2 +-
 include/mapnik/text/formatting/list.hpp                       | 2 +-
 include/mapnik/text/formatting/registry.hpp                   | 2 +-
 include/mapnik/text/formatting/text.hpp                       | 2 +-
 include/mapnik/text/glyph_info.hpp                            | 2 +-
 include/mapnik/text/glyph_positions.hpp                       | 2 +-
 include/mapnik/text/harfbuzz_shaper.hpp                       | 2 +-
 include/mapnik/text/icu_shaper.hpp                            | 2 +-
 include/mapnik/text/itemizer.hpp                              | 2 +-
 include/mapnik/text/placement_finder.hpp                      | 2 +-
 include/mapnik/text/placement_finder_impl.hpp                 | 2 +-
 include/mapnik/text/placements/base.hpp                       | 2 +-
 include/mapnik/text/placements/dummy.hpp                      | 2 +-
 include/mapnik/text/placements/list.hpp                       | 2 +-
 include/mapnik/text/placements/registry.hpp                   | 2 +-
 include/mapnik/text/placements/simple.hpp                     | 2 +-
 include/mapnik/text/properties_util.hpp                       | 2 +-
 include/mapnik/text/renderer.hpp                              | 2 +-
 include/mapnik/text/symbolizer_helpers.hpp                    | 2 +-
 include/mapnik/text/text_layout.hpp                           | 2 +-
 include/mapnik/text/text_line.hpp                             | 2 +-
 include/mapnik/text/text_properties.hpp                       | 2 +-
 include/mapnik/tiff_io.hpp                                    | 2 +-
 include/mapnik/timer.hpp                                      | 2 +-
 include/mapnik/tolerance_iterator.hpp                         | 2 +-
 include/mapnik/transform_expression.hpp                       | 2 +-
 include/mapnik/transform_expression_grammar_x3.hpp            | 2 +-
 include/mapnik/transform_expression_grammar_x3_def.hpp        | 2 +-
 include/mapnik/transform_path_adapter.hpp                     | 2 +-
 include/mapnik/transform_processor.hpp                        | 2 +-
 include/mapnik/unicode.hpp                                    | 2 +-
 include/mapnik/util/const_rendering_buffer.hpp                | 4 ++--
 include/mapnik/util/container_adapter.hpp                     | 2 +-
 include/mapnik/util/conversions.hpp                           | 2 +-
 include/mapnik/util/dasharray_parser.hpp                      | 2 +-
 include/mapnik/util/featureset_buffer.hpp                     | 2 +-
 include/mapnik/util/file_io.hpp                               | 2 +-
 include/mapnik/util/fs.hpp                                    | 2 +-
 include/mapnik/util/geometry_to_ds_type.hpp                   | 2 +-
 include/mapnik/util/geometry_to_geojson.hpp                   | 2 +-
 include/mapnik/util/geometry_to_svg.hpp                       | 2 +-
 include/mapnik/util/geometry_to_wkb.hpp                       | 2 +-
 include/mapnik/util/geometry_to_wkt.hpp                       | 2 +-
 include/mapnik/util/hsl.hpp                                   | 2 +-
 include/mapnik/util/is_clockwise.hpp                          | 2 +-
 include/mapnik/util/math.hpp                                  | 2 +-
 include/mapnik/util/noncopyable.hpp                           | 2 +-
 include/mapnik/util/path_iterator.hpp                         | 2 +-
 include/mapnik/util/rounding_cast.hpp                         | 2 +-
 include/mapnik/util/singleton.hpp                             | 2 +-
 include/mapnik/util/spatial_index.hpp                         | 2 +-
 include/mapnik/util/spirit_transform_attribute.hpp            | 2 +-
 include/mapnik/util/timer.hpp                                 | 2 +-
 include/mapnik/util/trim.hpp                                  | 2 +-
 include/mapnik/util/utf_conv_win.hpp                          | 2 +-
 include/mapnik/util/variant.hpp                               | 2 +-
 include/mapnik/util/variant_io.hpp                            | 2 +-
 include/mapnik/value.hpp                                      | 2 +-
 include/mapnik/value/error.hpp                                | 2 +-
 include/mapnik/value/hash.hpp                                 | 2 +-
 include/mapnik/value/types.hpp                                | 2 +-
 include/mapnik/version.hpp                                    | 2 +-
 include/mapnik/vertex.hpp                                     | 2 +-
 include/mapnik/vertex_adapters.hpp                            | 2 +-
 include/mapnik/vertex_cache.hpp                               | 2 +-
 include/mapnik/vertex_converters.hpp                          | 2 +-
 include/mapnik/vertex_processor.hpp                           | 2 +-
 include/mapnik/vertex_vector.hpp                              | 2 +-
 include/mapnik/view_strategy.hpp                              | 2 +-
 include/mapnik/view_transform.hpp                             | 2 +-
 include/mapnik/warning_ignore.hpp                             | 2 +-
 include/mapnik/warning_ignore_agg.hpp                         | 2 +-
 include/mapnik/warp.hpp                                       | 2 +-
 include/mapnik/webp_io.hpp                                    | 2 +-
 include/mapnik/well_known_srs.hpp                             | 2 +-
 include/mapnik/wkb.hpp                                        | 2 +-
 include/mapnik/wkt/wkt_generator_grammar.hpp                  | 2 +-
 include/mapnik/wkt/wkt_generator_grammar_impl.hpp             | 2 +-
 include/mapnik/xml_attribute_cast.hpp                         | 2 +-
 include/mapnik/xml_loader.hpp                                 | 2 +-
 include/mapnik/xml_node.hpp                                   | 2 +-
 include/mapnik/xml_tree.hpp                                   | 2 +-
 plugins/input/csv/csv_datasource.cpp                          | 2 +-
 plugins/input/csv/csv_datasource.hpp                          | 2 +-
 plugins/input/csv/csv_featureset.cpp                          | 2 +-
 plugins/input/csv/csv_featureset.hpp                          | 2 +-
 plugins/input/csv/csv_getline.hpp                             | 2 +-
 plugins/input/csv/csv_index_featureset.cpp                    | 2 +-
 plugins/input/csv/csv_index_featureset.hpp                    | 2 +-
 plugins/input/csv/csv_inline_featureset.cpp                   | 2 +-
 plugins/input/csv/csv_inline_featureset.hpp                   | 2 +-
 plugins/input/csv/csv_utils.cpp                               | 2 +-
 plugins/input/csv/csv_utils.hpp                               | 2 +-
 plugins/input/gdal/gdal_datasource.cpp                        | 2 +-
 plugins/input/gdal/gdal_datasource.hpp                        | 2 +-
 plugins/input/gdal/gdal_featureset.cpp                        | 2 +-
 plugins/input/gdal/gdal_featureset.hpp                        | 2 +-
 plugins/input/geojson/geojson_datasource.cpp                  | 2 +-
 plugins/input/geojson/geojson_datasource.hpp                  | 2 +-
 plugins/input/geojson/geojson_featureset.cpp                  | 2 +-
 plugins/input/geojson/geojson_featureset.hpp                  | 2 +-
 plugins/input/geojson/geojson_index_featureset.cpp            | 2 +-
 plugins/input/geojson/geojson_index_featureset.hpp            | 2 +-
 plugins/input/geojson/geojson_memory_index_featureset.cpp     | 2 +-
 plugins/input/geojson/geojson_memory_index_featureset.hpp     | 2 +-
 plugins/input/ogr/ogr_converter.cpp                           | 2 +-
 plugins/input/ogr/ogr_converter.hpp                           | 2 +-
 plugins/input/ogr/ogr_datasource.cpp                          | 2 +-
 plugins/input/ogr/ogr_datasource.hpp                          | 2 +-
 plugins/input/ogr/ogr_featureset.cpp                          | 2 +-
 plugins/input/ogr/ogr_featureset.hpp                          | 2 +-
 plugins/input/ogr/ogr_index.hpp                               | 2 +-
 plugins/input/ogr/ogr_index_featureset.cpp                    | 2 +-
 plugins/input/ogr/ogr_index_featureset.hpp                    | 2 +-
 plugins/input/ogr/ogr_layer_ptr.hpp                           | 2 +-
 plugins/input/pgraster/pgraster_datasource.cpp                | 2 +-
 plugins/input/pgraster/pgraster_datasource.hpp                | 2 +-
 plugins/input/pgraster/pgraster_featureset.cpp                | 2 +-
 plugins/input/pgraster/pgraster_featureset.hpp                | 2 +-
 plugins/input/pgraster/pgraster_wkb_reader.cpp                | 2 +-
 plugins/input/pgraster/pgraster_wkb_reader.hpp                | 2 +-
 plugins/input/postgis/asyncresultset.hpp                      | 2 +-
 plugins/input/postgis/connection.hpp                          | 2 +-
 plugins/input/postgis/connection_manager.hpp                  | 2 +-
 plugins/input/postgis/cursorresultset.hpp                     | 2 +-
 plugins/input/postgis/numeric2string.hpp                      | 2 +-
 plugins/input/postgis/postgis_datasource.cpp                  | 2 +-
 plugins/input/postgis/postgis_datasource.hpp                  | 2 +-
 plugins/input/postgis/postgis_featureset.cpp                  | 2 +-
 plugins/input/postgis/postgis_featureset.hpp                  | 2 +-
 plugins/input/postgis/resultset.hpp                           | 2 +-
 plugins/input/raster/raster_datasource.cpp                    | 2 +-
 plugins/input/raster/raster_datasource.hpp                    | 2 +-
 plugins/input/raster/raster_featureset.cpp                    | 2 +-
 plugins/input/raster/raster_featureset.hpp                    | 2 +-
 plugins/input/raster/raster_info.cpp                          | 2 +-
 plugins/input/raster/raster_info.hpp                          | 2 +-
 plugins/input/shape/dbf_test.cpp                              | 2 +-
 plugins/input/shape/dbfile.cpp                                | 2 +-
 plugins/input/shape/dbfile.hpp                                | 2 +-
 plugins/input/shape/shape_datasource.cpp                      | 2 +-
 plugins/input/shape/shape_datasource.hpp                      | 2 +-
 plugins/input/shape/shape_featureset.cpp                      | 2 +-
 plugins/input/shape/shape_featureset.hpp                      | 2 +-
 plugins/input/shape/shape_index_featureset.cpp                | 2 +-
 plugins/input/shape/shape_index_featureset.hpp                | 2 +-
 plugins/input/shape/shape_io.cpp                              | 2 +-
 plugins/input/shape/shape_io.hpp                              | 2 +-
 plugins/input/shape/shape_utils.cpp                           | 2 +-
 plugins/input/shape/shape_utils.hpp                           | 2 +-
 plugins/input/shape/shapefile.hpp                             | 2 +-
 plugins/input/sqlite/sqlite_connection.hpp                    | 2 +-
 plugins/input/sqlite/sqlite_datasource.cpp                    | 2 +-
 plugins/input/sqlite/sqlite_datasource.hpp                    | 2 +-
 plugins/input/sqlite/sqlite_featureset.cpp                    | 2 +-
 plugins/input/sqlite/sqlite_featureset.hpp                    | 2 +-
 plugins/input/sqlite/sqlite_prepared.hpp                      | 2 +-
 plugins/input/sqlite/sqlite_resultset.hpp                     | 2 +-
 plugins/input/sqlite/sqlite_utils.hpp                         | 2 +-
 plugins/input/topojson/topojson_datasource.cpp                | 2 +-
 plugins/input/topojson/topojson_datasource.hpp                | 2 +-
 plugins/input/topojson/topojson_featureset.cpp                | 2 +-
 plugins/input/topojson/topojson_featureset.hpp                | 2 +-
 src/agg/agg_renderer.cpp                                      | 2 +-
 src/agg/process_building_symbolizer.cpp                       | 2 +-
 src/agg/process_debug_symbolizer.cpp                          | 2 +-
 src/agg/process_dot_symbolizer.cpp                            | 2 +-
 src/agg/process_group_symbolizer.cpp                          | 2 +-
 src/agg/process_line_pattern_symbolizer.cpp                   | 2 +-
 src/agg/process_line_symbolizer.cpp                           | 2 +-
 src/agg/process_markers_symbolizer.cpp                        | 2 +-
 src/agg/process_point_symbolizer.cpp                          | 2 +-
 src/agg/process_polygon_pattern_symbolizer.cpp                | 2 +-
 src/agg/process_polygon_symbolizer.cpp                        | 2 +-
 src/agg/process_raster_symbolizer.cpp                         | 2 +-
 src/agg/process_shield_symbolizer.cpp                         | 2 +-
 src/agg/process_text_symbolizer.cpp                           | 2 +-
 src/cairo/cairo_context.cpp                                   | 2 +-
 src/cairo/cairo_render_vector.cpp                             | 2 +-
 src/cairo/cairo_renderer.cpp                                  | 2 +-
 src/cairo/process_building_symbolizer.cpp                     | 2 +-
 src/cairo/process_debug_symbolizer.cpp                        | 2 +-
 src/cairo/process_group_symbolizer.cpp                        | 2 +-
 src/cairo/process_line_pattern_symbolizer.cpp                 | 2 +-
 src/cairo/process_line_symbolizer.cpp                         | 2 +-
 src/cairo/process_markers_symbolizer.cpp                      | 2 +-
 src/cairo/process_point_symbolizer.cpp                        | 2 +-
 src/cairo/process_polygon_pattern_symbolizer.cpp              | 2 +-
 src/cairo/process_polygon_symbolizer.cpp                      | 2 +-
 src/cairo/process_raster_symbolizer.cpp                       | 2 +-
 src/cairo/process_text_symbolizer.cpp                         | 2 +-
 src/cairo_io.cpp                                              | 2 +-
 src/color.cpp                                                 | 2 +-
 src/color_factory.cpp                                         | 2 +-
 src/dasharray_parser.cpp                                      | 2 +-
 src/datasource_cache.cpp                                      | 2 +-
 src/datasource_cache_static.cpp                               | 2 +-
 src/debug.cpp                                                 | 2 +-
 src/expression.cpp                                            | 2 +-
 src/expression_grammar_x3.cpp                                 | 2 +-
 src/expression_node.cpp                                       | 2 +-
 src/expression_string.cpp                                     | 2 +-
 src/feature_kv_iterator.cpp                                   | 2 +-
 src/feature_style_processor.cpp                               | 2 +-
 src/feature_type_style.cpp                                    | 2 +-
 src/font_engine_freetype.cpp                                  | 2 +-
 src/font_set.cpp                                              | 2 +-
 src/fs.cpp                                                    | 2 +-
 src/function_call.cpp                                         | 2 +-
 src/geometry/envelope.cpp                                     | 2 +-
 src/geometry/reprojection.cpp                                 | 2 +-
 src/gradient.cpp                                              | 2 +-
 src/grid/grid.cpp                                             | 2 +-
 src/grid/grid_renderer.cpp                                    | 2 +-
 src/grid/process_building_symbolizer.cpp                      | 2 +-
 src/grid/process_group_symbolizer.cpp                         | 2 +-
 src/grid/process_line_pattern_symbolizer.cpp                  | 2 +-
 src/grid/process_line_symbolizer.cpp                          | 2 +-
 src/grid/process_markers_symbolizer.cpp                       | 2 +-
 src/grid/process_point_symbolizer.cpp                         | 2 +-
 src/grid/process_polygon_pattern_symbolizer.cpp               | 2 +-
 src/grid/process_polygon_symbolizer.cpp                       | 2 +-
 src/grid/process_raster_symbolizer.cpp                        | 2 +-
 src/grid/process_shield_symbolizer.cpp                        | 2 +-
 src/grid/process_text_symbolizer.cpp                          | 2 +-
 src/group/group_layout_manager.cpp                            | 2 +-
 src/group/group_rule.cpp                                      | 2 +-
 src/group/group_symbolizer_helper.cpp                         | 2 +-
 src/image.cpp                                                 | 2 +-
 src/image_any.cpp                                             | 2 +-
 src/image_compositing.cpp                                     | 2 +-
 src/image_copy.cpp                                            | 2 +-
 src/image_options.cpp                                         | 2 +-
 src/image_reader.cpp                                          | 2 +-
 src/image_scaling.cpp                                         | 2 +-
 src/image_util.cpp                                            | 2 +-
 src/image_util_jpeg.cpp                                       | 2 +-
 src/image_util_png.cpp                                        | 2 +-
 src/image_util_tiff.cpp                                       | 2 +-
 src/image_util_webp.cpp                                       | 2 +-
 src/image_view.cpp                                            | 2 +-
 src/image_view_any.cpp                                        | 2 +-
 src/jpeg_reader.cpp                                           | 2 +-
 src/json/mapnik_geometry_to_geojson.cpp                       | 2 +-
 src/json/mapnik_json_generator_grammar.cpp                    | 2 +-
 src/layer.cpp                                                 | 2 +-
 src/libxml2_loader.cpp                                        | 2 +-
 src/load_map.cpp                                              | 2 +-
 src/map.cpp                                                   | 2 +-
 src/mapped_memory_cache.cpp                                   | 2 +-
 src/marker_cache.cpp                                          | 2 +-
 src/marker_helpers.cpp                                        | 2 +-
 src/math.cpp                                                  | 2 +-
 src/memory_datasource.cpp                                     | 2 +-
 src/palette.cpp                                               | 2 +-
 src/params.cpp                                                | 2 +-
 src/parse_image_filters.cpp                                   | 2 +-
 src/parse_transform.cpp                                       | 2 +-
 src/plugin.cpp                                                | 2 +-
 src/png_reader.cpp                                            | 2 +-
 src/proj_transform.cpp                                        | 2 +-
 src/projection.cpp                                            | 2 +-
 src/rapidxml_loader.cpp                                       | 2 +-
 src/raster_colorizer.cpp                                      | 2 +-
 src/renderer_common.cpp                                       | 2 +-
 src/renderer_common/render_pattern.cpp                        | 2 +-
 src/request.cpp                                               | 2 +-
 src/rule.cpp                                                  | 2 +-
 src/save_map.cpp                                              | 2 +-
 src/scale_denominator.cpp                                     | 2 +-
 src/svg/output/process_line_symbolizer.cpp                    | 2 +-
 src/svg/output/process_polygon_symbolizer.cpp                 | 2 +-
 src/svg/output/process_symbolizers.cpp                        | 2 +-
 src/svg/output/svg_generator.cpp                              | 2 +-
 src/svg/output/svg_output_attributes.cpp                      | 2 +-
 src/svg/output/svg_output_grammars.cpp                        | 2 +-
 src/svg/output/svg_renderer.cpp                               | 2 +-
 src/svg/svg_parser.cpp                                        | 2 +-
 src/svg/svg_path_parser.cpp                                   | 2 +-
 src/svg/svg_points_parser.cpp                                 | 2 +-
 src/svg/svg_transform_parser.cpp                              | 2 +-
 src/symbolizer.cpp                                            | 2 +-
 src/symbolizer_enumerations.cpp                               | 2 +-
 src/symbolizer_keys.cpp                                       | 2 +-
 src/text/face.cpp                                             | 2 +-
 src/text/font_feature_settings.cpp                            | 2 +-
 src/text/font_library.cpp                                     | 2 +-
 src/text/formatting/base.cpp                                  | 2 +-
 src/text/formatting/format.cpp                                | 2 +-
 src/text/formatting/layout.cpp                                | 2 +-
 src/text/formatting/list.cpp                                  | 2 +-
 src/text/formatting/registry.cpp                              | 2 +-
 src/text/formatting/text.cpp                                  | 2 +-
 src/text/glyph_positions.cpp                                  | 2 +-
 src/text/itemizer.cpp                                         | 2 +-
 src/text/placement_finder.cpp                                 | 2 +-
 src/text/placements/base.cpp                                  | 2 +-
 src/text/placements/dummy.cpp                                 | 2 +-
 src/text/placements/list.cpp                                  | 2 +-
 src/text/placements/registry.cpp                              | 2 +-
 src/text/placements/simple.cpp                                | 2 +-
 src/text/properties_util.cpp                                  | 2 +-
 src/text/renderer.cpp                                         | 2 +-
 src/text/symbolizer_helpers.cpp                               | 2 +-
 src/text/text_layout.cpp                                      | 2 +-
 src/text/text_line.cpp                                        | 2 +-
 src/text/text_properties.cpp                                  | 2 +-
 src/tiff_reader.cpp                                           | 2 +-
 src/transform_expression.cpp                                  | 2 +-
 src/transform_expression_grammar_x3.cpp                       | 2 +-
 src/unicode.cpp                                               | 2 +-
 src/util/utf_conv_win.cpp                                     | 2 +-
 src/vertex_cache.cpp                                          | 2 +-
 src/warp.cpp                                                  | 2 +-
 src/webp_reader.cpp                                           | 2 +-
 src/well_known_srs.cpp                                        | 2 +-
 src/wkb.cpp                                                   | 2 +-
 src/xml_tree.cpp                                              | 2 +-
 552 files changed, 553 insertions(+), 553 deletions(-)

diff --git a/demo/c++/rundemo.cpp b/demo/c++/rundemo.cpp
index ff7907d2e..46e2cb2c0 100644
--- a/demo/c++/rundemo.cpp
+++ b/demo/c++/rundemo.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/demo/viewer/about_dialog.cpp b/demo/viewer/about_dialog.cpp
index 2a37349ee..b6aa9fa33 100644
--- a/demo/viewer/about_dialog.cpp
+++ b/demo/viewer/about_dialog.cpp
@@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * Mapnik is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/demo/viewer/about_dialog.hpp b/demo/viewer/about_dialog.hpp
index 160dcc857..0edc78dfa 100644
--- a/demo/viewer/about_dialog.hpp
+++ b/demo/viewer/about_dialog.hpp
@@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * Mapnik is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/demo/viewer/info_dialog.cpp b/demo/viewer/info_dialog.cpp
index b25002025..a65951082 100644
--- a/demo/viewer/info_dialog.cpp
+++ b/demo/viewer/info_dialog.cpp
@@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * Mapnik is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/demo/viewer/info_dialog.hpp b/demo/viewer/info_dialog.hpp
index c4b887f18..4dfded270 100644
--- a/demo/viewer/info_dialog.hpp
+++ b/demo/viewer/info_dialog.hpp
@@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * Mapnik is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/demo/viewer/layer_info_dialog.cpp b/demo/viewer/layer_info_dialog.cpp
index f7e983d35..65dddd392 100644
--- a/demo/viewer/layer_info_dialog.cpp
+++ b/demo/viewer/layer_info_dialog.cpp
@@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * Mapnik is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/demo/viewer/layer_info_dialog.hpp b/demo/viewer/layer_info_dialog.hpp
index 370551e01..3ac825dbc 100644
--- a/demo/viewer/layer_info_dialog.hpp
+++ b/demo/viewer/layer_info_dialog.hpp
@@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * Mapnik is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/demo/viewer/layerdelegate.cpp b/demo/viewer/layerdelegate.cpp
index 5e4331793..a43214a9b 100644
--- a/demo/viewer/layerdelegate.cpp
+++ b/demo/viewer/layerdelegate.cpp
@@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * Mapnik is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/demo/viewer/layerdelegate.hpp b/demo/viewer/layerdelegate.hpp
index 92a57a75e..479e0838d 100644
--- a/demo/viewer/layerdelegate.hpp
+++ b/demo/viewer/layerdelegate.hpp
@@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * Mapnik is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/demo/viewer/layerlistmodel.cpp b/demo/viewer/layerlistmodel.cpp
index f2ad085ef..e1e46e075 100644
--- a/demo/viewer/layerlistmodel.cpp
+++ b/demo/viewer/layerlistmodel.cpp
@@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * Mapnik is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/demo/viewer/layerlistmodel.hpp b/demo/viewer/layerlistmodel.hpp
index d69133315..4fec7a712 100644
--- a/demo/viewer/layerlistmodel.hpp
+++ b/demo/viewer/layerlistmodel.hpp
@@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * Mapnik is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/demo/viewer/layerwidget.cpp b/demo/viewer/layerwidget.cpp
index d392150fb..f066a3d1b 100644
--- a/demo/viewer/layerwidget.cpp
+++ b/demo/viewer/layerwidget.cpp
@@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * Mapnik is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/demo/viewer/layerwidget.hpp b/demo/viewer/layerwidget.hpp
index e75ee7db2..09763fc45 100644
--- a/demo/viewer/layerwidget.hpp
+++ b/demo/viewer/layerwidget.hpp
@@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * Mapnik is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/demo/viewer/main.cpp b/demo/viewer/main.cpp
index d8f06d25a..f7ab2e432 100644
--- a/demo/viewer/main.cpp
+++ b/demo/viewer/main.cpp
@@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * Mapnik is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/demo/viewer/mainwindow.cpp b/demo/viewer/mainwindow.cpp
index 939028ab5..27f71d4c0 100644
--- a/demo/viewer/mainwindow.cpp
+++ b/demo/viewer/mainwindow.cpp
@@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * Mapnik is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/demo/viewer/mainwindow.hpp b/demo/viewer/mainwindow.hpp
index ebfc2c59a..b816617ad 100644
--- a/demo/viewer/mainwindow.hpp
+++ b/demo/viewer/mainwindow.hpp
@@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * Mapnik is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/demo/viewer/mapwidget.cpp b/demo/viewer/mapwidget.cpp
index 9b2c5278d..fd3c3d1f7 100644
--- a/demo/viewer/mapwidget.cpp
+++ b/demo/viewer/mapwidget.cpp
@@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * Mapnik is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/demo/viewer/mapwidget.hpp b/demo/viewer/mapwidget.hpp
index e65908fcf..d0f538e6e 100644
--- a/demo/viewer/mapwidget.hpp
+++ b/demo/viewer/mapwidget.hpp
@@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * Mapnik is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/demo/viewer/styles_model.cpp b/demo/viewer/styles_model.cpp
index d7b68ba0e..332200b21 100644
--- a/demo/viewer/styles_model.cpp
+++ b/demo/viewer/styles_model.cpp
@@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * Mapnik is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/demo/viewer/styles_model.hpp b/demo/viewer/styles_model.hpp
index a21885915..ce7879469 100644
--- a/demo/viewer/styles_model.hpp
+++ b/demo/viewer/styles_model.hpp
@@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * Mapnik is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/include/mapnik/agg_helpers.hpp b/include/mapnik/agg_helpers.hpp
index ff87ce0ef..51319d52b 100644
--- a/include/mapnik/agg_helpers.hpp
+++ b/include/mapnik/agg_helpers.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/agg_pattern_source.hpp b/include/mapnik/agg_pattern_source.hpp
index 42dd7f36f..7ca93e1df 100644
--- a/include/mapnik/agg_pattern_source.hpp
+++ b/include/mapnik/agg_pattern_source.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/agg_rasterizer.hpp b/include/mapnik/agg_rasterizer.hpp
index 66da59fd6..b25160b04 100644
--- a/include/mapnik/agg_rasterizer.hpp
+++ b/include/mapnik/agg_rasterizer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/agg_render_marker.hpp b/include/mapnik/agg_render_marker.hpp
index c0f9d1876..e6f0d404e 100644
--- a/include/mapnik/agg_render_marker.hpp
+++ b/include/mapnik/agg_render_marker.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/agg_renderer.hpp b/include/mapnik/agg_renderer.hpp
index 776632d68..4d1a1f65f 100644
--- a/include/mapnik/agg_renderer.hpp
+++ b/include/mapnik/agg_renderer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/attribute.hpp b/include/mapnik/attribute.hpp
index 80887dacd..3e82f8f2f 100644
--- a/include/mapnik/attribute.hpp
+++ b/include/mapnik/attribute.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/attribute_collector.hpp b/include/mapnik/attribute_collector.hpp
index cfd29cc6b..ccc6df601 100644
--- a/include/mapnik/attribute_collector.hpp
+++ b/include/mapnik/attribute_collector.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/attribute_descriptor.hpp b/include/mapnik/attribute_descriptor.hpp
index a5245ea55..a80d7e0d5 100644
--- a/include/mapnik/attribute_descriptor.hpp
+++ b/include/mapnik/attribute_descriptor.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/boolean.hpp b/include/mapnik/boolean.hpp
index 92751b7fe..9d2b97bf6 100644
--- a/include/mapnik/boolean.hpp
+++ b/include/mapnik/boolean.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/box2d.hpp b/include/mapnik/box2d.hpp
index c6c794c83..b90644f91 100644
--- a/include/mapnik/box2d.hpp
+++ b/include/mapnik/box2d.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/cairo/cairo_context.hpp b/include/mapnik/cairo/cairo_context.hpp
index c15f87cd7..1e775d6a0 100644
--- a/include/mapnik/cairo/cairo_context.hpp
+++ b/include/mapnik/cairo/cairo_context.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/cairo/cairo_image_util.hpp b/include/mapnik/cairo/cairo_image_util.hpp
index 9f039d605..2c7c269a4 100644
--- a/include/mapnik/cairo/cairo_image_util.hpp
+++ b/include/mapnik/cairo/cairo_image_util.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/cairo/cairo_render_vector.hpp b/include/mapnik/cairo/cairo_render_vector.hpp
index 37bd44925..ead3798e9 100644
--- a/include/mapnik/cairo/cairo_render_vector.hpp
+++ b/include/mapnik/cairo/cairo_render_vector.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/cairo/cairo_renderer.hpp b/include/mapnik/cairo/cairo_renderer.hpp
index 0563149a6..9e7a91477 100644
--- a/include/mapnik/cairo/cairo_renderer.hpp
+++ b/include/mapnik/cairo/cairo_renderer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/cairo_io.hpp b/include/mapnik/cairo_io.hpp
index 55b107286..45c4353d2 100644
--- a/include/mapnik/cairo_io.hpp
+++ b/include/mapnik/cairo_io.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/color.hpp b/include/mapnik/color.hpp
index 39bcc2eac..7f8ee7c03 100644
--- a/include/mapnik/color.hpp
+++ b/include/mapnik/color.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/color_factory.hpp b/include/mapnik/color_factory.hpp
index 6fdb5663c..594cb40b0 100644
--- a/include/mapnik/color_factory.hpp
+++ b/include/mapnik/color_factory.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/config.hpp b/include/mapnik/config.hpp
index a9168e59f..25df5371f 100644
--- a/include/mapnik/config.hpp
+++ b/include/mapnik/config.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/config_error.hpp b/include/mapnik/config_error.hpp
index b8bd31f67..82ea9a859 100644
--- a/include/mapnik/config_error.hpp
+++ b/include/mapnik/config_error.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/coord.hpp b/include/mapnik/coord.hpp
index e1e527807..c20c755bc 100644
--- a/include/mapnik/coord.hpp
+++ b/include/mapnik/coord.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/csv/csv_grammar_x3.hpp b/include/mapnik/csv/csv_grammar_x3.hpp
index 2d66a39ab..26abba97f 100644
--- a/include/mapnik/csv/csv_grammar_x3.hpp
+++ b/include/mapnik/csv/csv_grammar_x3.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/csv/csv_types.hpp b/include/mapnik/csv/csv_types.hpp
index 5359c3dd6..042f68968 100644
--- a/include/mapnik/csv/csv_types.hpp
+++ b/include/mapnik/csv/csv_types.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/datasource.hpp b/include/mapnik/datasource.hpp
index 4f0b17526..728405561 100644
--- a/include/mapnik/datasource.hpp
+++ b/include/mapnik/datasource.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/datasource_cache.hpp b/include/mapnik/datasource_cache.hpp
index 4f90f8907..bd5b3310d 100644
--- a/include/mapnik/datasource_cache.hpp
+++ b/include/mapnik/datasource_cache.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/datasource_geometry_type.hpp b/include/mapnik/datasource_geometry_type.hpp
index 00e4b2af7..4d824b841 100644
--- a/include/mapnik/datasource_geometry_type.hpp
+++ b/include/mapnik/datasource_geometry_type.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/debug.hpp b/include/mapnik/debug.hpp
index 84290958b..b841d81d5 100644
--- a/include/mapnik/debug.hpp
+++ b/include/mapnik/debug.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/ellipsoid.hpp b/include/mapnik/ellipsoid.hpp
index 6f872d4d4..b43a6dad9 100644
--- a/include/mapnik/ellipsoid.hpp
+++ b/include/mapnik/ellipsoid.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/enumeration.hpp b/include/mapnik/enumeration.hpp
index ded9dc058..6befe2617 100644
--- a/include/mapnik/enumeration.hpp
+++ b/include/mapnik/enumeration.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/evaluate_global_attributes.hpp b/include/mapnik/evaluate_global_attributes.hpp
index cf227821b..18eaa436a 100644
--- a/include/mapnik/evaluate_global_attributes.hpp
+++ b/include/mapnik/evaluate_global_attributes.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/expression.hpp b/include/mapnik/expression.hpp
index 7b9ca59e7..7b8f0c4f8 100644
--- a/include/mapnik/expression.hpp
+++ b/include/mapnik/expression.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/expression_evaluator.hpp b/include/mapnik/expression_evaluator.hpp
index d2acffa55..8b87a64e1 100644
--- a/include/mapnik/expression_evaluator.hpp
+++ b/include/mapnik/expression_evaluator.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/expression_grammar_x3.hpp b/include/mapnik/expression_grammar_x3.hpp
index 46bdb2a84..ae3660c4f 100644
--- a/include/mapnik/expression_grammar_x3.hpp
+++ b/include/mapnik/expression_grammar_x3.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/expression_grammar_x3_config.hpp b/include/mapnik/expression_grammar_x3_config.hpp
index 402fdd6b3..6d79b3b82 100644
--- a/include/mapnik/expression_grammar_x3_config.hpp
+++ b/include/mapnik/expression_grammar_x3_config.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/expression_node.hpp b/include/mapnik/expression_node.hpp
index e0b86ebec..9823fd05e 100644
--- a/include/mapnik/expression_node.hpp
+++ b/include/mapnik/expression_node.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/expression_node_types.hpp b/include/mapnik/expression_node_types.hpp
index 0e2e3ce7b..2db430486 100644
--- a/include/mapnik/expression_node_types.hpp
+++ b/include/mapnik/expression_node_types.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/expression_string.hpp b/include/mapnik/expression_string.hpp
index 6efc07e81..0a8a171da 100644
--- a/include/mapnik/expression_string.hpp
+++ b/include/mapnik/expression_string.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/factory.hpp b/include/mapnik/factory.hpp
index 81f261320..69f62b8bf 100644
--- a/include/mapnik/factory.hpp
+++ b/include/mapnik/factory.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/feature.hpp b/include/mapnik/feature.hpp
index 743ac78bd..c6ee3111b 100644
--- a/include/mapnik/feature.hpp
+++ b/include/mapnik/feature.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/feature_factory.hpp b/include/mapnik/feature_factory.hpp
index 87d20dc75..4388ac1e7 100644
--- a/include/mapnik/feature_factory.hpp
+++ b/include/mapnik/feature_factory.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/feature_kv_iterator.hpp b/include/mapnik/feature_kv_iterator.hpp
index 1def2e7c2..eb3402b37 100644
--- a/include/mapnik/feature_kv_iterator.hpp
+++ b/include/mapnik/feature_kv_iterator.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/feature_layer_desc.hpp b/include/mapnik/feature_layer_desc.hpp
index cd69d831f..d8fcc4990 100644
--- a/include/mapnik/feature_layer_desc.hpp
+++ b/include/mapnik/feature_layer_desc.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/feature_style_processor.hpp b/include/mapnik/feature_style_processor.hpp
index c0ba4f383..474ba62a3 100644
--- a/include/mapnik/feature_style_processor.hpp
+++ b/include/mapnik/feature_style_processor.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/feature_style_processor_context.hpp b/include/mapnik/feature_style_processor_context.hpp
index aca0c8f72..c1f1d7112 100644
--- a/include/mapnik/feature_style_processor_context.hpp
+++ b/include/mapnik/feature_style_processor_context.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/feature_style_processor_impl.hpp b/include/mapnik/feature_style_processor_impl.hpp
index 712e0f014..ba5b40528 100644
--- a/include/mapnik/feature_style_processor_impl.hpp
+++ b/include/mapnik/feature_style_processor_impl.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/feature_type_style.hpp b/include/mapnik/feature_type_style.hpp
index 9f9f1aec9..5341b2fdb 100644
--- a/include/mapnik/feature_type_style.hpp
+++ b/include/mapnik/feature_type_style.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/featureset.hpp b/include/mapnik/featureset.hpp
index a6ad4e85d..579bf6ffe 100644
--- a/include/mapnik/featureset.hpp
+++ b/include/mapnik/featureset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/filter_featureset.hpp b/include/mapnik/filter_featureset.hpp
index ee3fa4087..a4bf5d299 100644
--- a/include/mapnik/filter_featureset.hpp
+++ b/include/mapnik/filter_featureset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/font_engine_freetype.hpp b/include/mapnik/font_engine_freetype.hpp
index 73227cdbf..a4ca09642 100644
--- a/include/mapnik/font_engine_freetype.hpp
+++ b/include/mapnik/font_engine_freetype.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/font_set.hpp b/include/mapnik/font_set.hpp
index 5df8e35df..6e1366559 100644
--- a/include/mapnik/font_set.hpp
+++ b/include/mapnik/font_set.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/function_call.hpp b/include/mapnik/function_call.hpp
index 84344592a..68f102129 100644
--- a/include/mapnik/function_call.hpp
+++ b/include/mapnik/function_call.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/geom_util.hpp b/include/mapnik/geom_util.hpp
index e08c519f2..6b15b30f5 100644
--- a/include/mapnik/geom_util.hpp
+++ b/include/mapnik/geom_util.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/geometry.hpp b/include/mapnik/geometry.hpp
index aae2bf3e8..4a9ef956c 100644
--- a/include/mapnik/geometry.hpp
+++ b/include/mapnik/geometry.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/geometry/boost_adapters.hpp b/include/mapnik/geometry/boost_adapters.hpp
index 9c633b618..d3dbde86e 100644
--- a/include/mapnik/geometry/boost_adapters.hpp
+++ b/include/mapnik/geometry/boost_adapters.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/geometry/centroid.hpp b/include/mapnik/geometry/centroid.hpp
index 2fe458edd..c7180e6dd 100644
--- a/include/mapnik/geometry/centroid.hpp
+++ b/include/mapnik/geometry/centroid.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/geometry/correct.hpp b/include/mapnik/geometry/correct.hpp
index 40379bd22..16a35c93a 100644
--- a/include/mapnik/geometry/correct.hpp
+++ b/include/mapnik/geometry/correct.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/geometry/envelope.hpp b/include/mapnik/geometry/envelope.hpp
index 981b97849..3b76fca34 100644
--- a/include/mapnik/geometry/envelope.hpp
+++ b/include/mapnik/geometry/envelope.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/geometry/envelope_impl.hpp b/include/mapnik/geometry/envelope_impl.hpp
index 542936314..23f3850d2 100644
--- a/include/mapnik/geometry/envelope_impl.hpp
+++ b/include/mapnik/geometry/envelope_impl.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/geometry/fusion_adapted.hpp b/include/mapnik/geometry/fusion_adapted.hpp
index e3bdd7ef8..df4e3d87d 100644
--- a/include/mapnik/geometry/fusion_adapted.hpp
+++ b/include/mapnik/geometry/fusion_adapted.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/geometry/geometry_type.hpp b/include/mapnik/geometry/geometry_type.hpp
index 006394f1e..12f3627f8 100644
--- a/include/mapnik/geometry/geometry_type.hpp
+++ b/include/mapnik/geometry/geometry_type.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/geometry/geometry_types.hpp b/include/mapnik/geometry/geometry_types.hpp
index 8c4d67722..a4f00c287 100644
--- a/include/mapnik/geometry/geometry_types.hpp
+++ b/include/mapnik/geometry/geometry_types.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/geometry/is_empty.hpp b/include/mapnik/geometry/is_empty.hpp
index 953bddc22..206fb185c 100644
--- a/include/mapnik/geometry/is_empty.hpp
+++ b/include/mapnik/geometry/is_empty.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/geometry/is_simple.hpp b/include/mapnik/geometry/is_simple.hpp
index 64da5ac05..c8df58e2d 100644
--- a/include/mapnik/geometry/is_simple.hpp
+++ b/include/mapnik/geometry/is_simple.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/geometry/is_valid.hpp b/include/mapnik/geometry/is_valid.hpp
index ecdc2e16f..9fb17b192 100644
--- a/include/mapnik/geometry/is_valid.hpp
+++ b/include/mapnik/geometry/is_valid.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/geometry/remove_empty.hpp b/include/mapnik/geometry/remove_empty.hpp
index 7b820213a..b2945b6c6 100644
--- a/include/mapnik/geometry/remove_empty.hpp
+++ b/include/mapnik/geometry/remove_empty.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/geometry/reprojection.hpp b/include/mapnik/geometry/reprojection.hpp
index 22a334e61..a8b82860b 100644
--- a/include/mapnik/geometry/reprojection.hpp
+++ b/include/mapnik/geometry/reprojection.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/geometry/reprojection_impl.hpp b/include/mapnik/geometry/reprojection_impl.hpp
index 1cc46fa1e..b08efe388 100644
--- a/include/mapnik/geometry/reprojection_impl.hpp
+++ b/include/mapnik/geometry/reprojection_impl.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/geometry/strategy.hpp b/include/mapnik/geometry/strategy.hpp
index 5e55512d5..d71479072 100644
--- a/include/mapnik/geometry/strategy.hpp
+++ b/include/mapnik/geometry/strategy.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/geometry/to_path.hpp b/include/mapnik/geometry/to_path.hpp
index d443158a6..51afffd8f 100644
--- a/include/mapnik/geometry/to_path.hpp
+++ b/include/mapnik/geometry/to_path.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/geometry/transform.hpp b/include/mapnik/geometry/transform.hpp
index cee47d9cf..1a71d070b 100644
--- a/include/mapnik/geometry/transform.hpp
+++ b/include/mapnik/geometry/transform.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/global.hpp b/include/mapnik/global.hpp
index 39a8c5ff7..0ef336d6b 100644
--- a/include/mapnik/global.hpp
+++ b/include/mapnik/global.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/gradient.hpp b/include/mapnik/gradient.hpp
index ae9acb5a3..3cdddadc7 100644
--- a/include/mapnik/gradient.hpp
+++ b/include/mapnik/gradient.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/grid/grid.hpp b/include/mapnik/grid/grid.hpp
index ab79cdd2a..628e434ae 100644
--- a/include/mapnik/grid/grid.hpp
+++ b/include/mapnik/grid/grid.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/grid/grid_pixel.hpp b/include/mapnik/grid/grid_pixel.hpp
index fda65779a..16a917a2b 100644
--- a/include/mapnik/grid/grid_pixel.hpp
+++ b/include/mapnik/grid/grid_pixel.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/grid/grid_pixfmt.hpp b/include/mapnik/grid/grid_pixfmt.hpp
index dda24121f..7d5623850 100644
--- a/include/mapnik/grid/grid_pixfmt.hpp
+++ b/include/mapnik/grid/grid_pixfmt.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/grid/grid_rasterizer.hpp b/include/mapnik/grid/grid_rasterizer.hpp
index 612944799..c79dec555 100644
--- a/include/mapnik/grid/grid_rasterizer.hpp
+++ b/include/mapnik/grid/grid_rasterizer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/grid/grid_render_marker.hpp b/include/mapnik/grid/grid_render_marker.hpp
index 5ad5fea13..68b09c3a3 100644
--- a/include/mapnik/grid/grid_render_marker.hpp
+++ b/include/mapnik/grid/grid_render_marker.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/grid/grid_renderer.hpp b/include/mapnik/grid/grid_renderer.hpp
index 4b6060c69..b3bd66157 100644
--- a/include/mapnik/grid/grid_renderer.hpp
+++ b/include/mapnik/grid/grid_renderer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/grid/grid_renderer_base.hpp b/include/mapnik/grid/grid_renderer_base.hpp
index bcc2e18c1..439b585a5 100644
--- a/include/mapnik/grid/grid_renderer_base.hpp
+++ b/include/mapnik/grid/grid_renderer_base.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/grid/grid_rendering_buffer.hpp b/include/mapnik/grid/grid_rendering_buffer.hpp
index 8ab12cfc0..dc38d3d83 100644
--- a/include/mapnik/grid/grid_rendering_buffer.hpp
+++ b/include/mapnik/grid/grid_rendering_buffer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/grid/grid_view.hpp b/include/mapnik/grid/grid_view.hpp
index 80d459b78..dea9ab028 100644
--- a/include/mapnik/grid/grid_view.hpp
+++ b/include/mapnik/grid/grid_view.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/group/group_layout.hpp b/include/mapnik/group/group_layout.hpp
index 23811e800..4b4e6d4a3 100644
--- a/include/mapnik/group/group_layout.hpp
+++ b/include/mapnik/group/group_layout.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/group/group_layout_manager.hpp b/include/mapnik/group/group_layout_manager.hpp
index 548e37bb6..f264a1e66 100644
--- a/include/mapnik/group/group_layout_manager.hpp
+++ b/include/mapnik/group/group_layout_manager.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/group/group_rule.hpp b/include/mapnik/group/group_rule.hpp
index 58f8505b4..486e85bca 100644
--- a/include/mapnik/group/group_rule.hpp
+++ b/include/mapnik/group/group_rule.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/group/group_symbolizer_helper.hpp b/include/mapnik/group/group_symbolizer_helper.hpp
index 29c5747c1..b3ff666bf 100644
--- a/include/mapnik/group/group_symbolizer_helper.hpp
+++ b/include/mapnik/group/group_symbolizer_helper.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/group/group_symbolizer_properties.hpp b/include/mapnik/group/group_symbolizer_properties.hpp
index f5967b8be..6837b5ef2 100644
--- a/include/mapnik/group/group_symbolizer_properties.hpp
+++ b/include/mapnik/group/group_symbolizer_properties.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/hextree.hpp b/include/mapnik/hextree.hpp
index 5d8adc1da..33654703f 100644
--- a/include/mapnik/hextree.hpp
+++ b/include/mapnik/hextree.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/hit_test_filter.hpp b/include/mapnik/hit_test_filter.hpp
index d4b850496..e5a6274f5 100644
--- a/include/mapnik/hit_test_filter.hpp
+++ b/include/mapnik/hit_test_filter.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image.hpp b/include/mapnik/image.hpp
index da2f7738e..96b65e00e 100644
--- a/include/mapnik/image.hpp
+++ b/include/mapnik/image.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_any.hpp b/include/mapnik/image_any.hpp
index 8aedf302a..9ee056c81 100644
--- a/include/mapnik/image_any.hpp
+++ b/include/mapnik/image_any.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_compositing.hpp b/include/mapnik/image_compositing.hpp
index 82b89a398..0cb6b1339 100644
--- a/include/mapnik/image_compositing.hpp
+++ b/include/mapnik/image_compositing.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_copy.hpp b/include/mapnik/image_copy.hpp
index 8f40ef40a..84481c692 100644
--- a/include/mapnik/image_copy.hpp
+++ b/include/mapnik/image_copy.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_filter.hpp b/include/mapnik/image_filter.hpp
index 47e0da903..8c29fe19b 100644
--- a/include/mapnik/image_filter.hpp
+++ b/include/mapnik/image_filter.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_filter_types.hpp b/include/mapnik/image_filter_types.hpp
index ba36aa5eb..1b7fd0498 100644
--- a/include/mapnik/image_filter_types.hpp
+++ b/include/mapnik/image_filter_types.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_impl.hpp b/include/mapnik/image_impl.hpp
index f340d9a4b..5e9a50948 100644
--- a/include/mapnik/image_impl.hpp
+++ b/include/mapnik/image_impl.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_null.hpp b/include/mapnik/image_null.hpp
index 5a698bbc9..7fb2a5da8 100644
--- a/include/mapnik/image_null.hpp
+++ b/include/mapnik/image_null.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_options.hpp b/include/mapnik/image_options.hpp
index d44b2bf35..b860ee684 100644
--- a/include/mapnik/image_options.hpp
+++ b/include/mapnik/image_options.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_reader.hpp b/include/mapnik/image_reader.hpp
index 6c1c2329c..731b87940 100644
--- a/include/mapnik/image_reader.hpp
+++ b/include/mapnik/image_reader.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_scaling.hpp b/include/mapnik/image_scaling.hpp
index 461e99f27..f2ac1c10c 100644
--- a/include/mapnik/image_scaling.hpp
+++ b/include/mapnik/image_scaling.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_scaling_traits.hpp b/include/mapnik/image_scaling_traits.hpp
index b8daff152..a1c329e31 100644
--- a/include/mapnik/image_scaling_traits.hpp
+++ b/include/mapnik/image_scaling_traits.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_util.hpp b/include/mapnik/image_util.hpp
index 0db5a3752..aa224ae4d 100644
--- a/include/mapnik/image_util.hpp
+++ b/include/mapnik/image_util.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_util_jpeg.hpp b/include/mapnik/image_util_jpeg.hpp
index feb810533..d684b9a22 100644
--- a/include/mapnik/image_util_jpeg.hpp
+++ b/include/mapnik/image_util_jpeg.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_util_png.hpp b/include/mapnik/image_util_png.hpp
index 8592c4fd4..c6ef08a24 100644
--- a/include/mapnik/image_util_png.hpp
+++ b/include/mapnik/image_util_png.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_util_tiff.hpp b/include/mapnik/image_util_tiff.hpp
index 39b524d88..87791e4e2 100644
--- a/include/mapnik/image_util_tiff.hpp
+++ b/include/mapnik/image_util_tiff.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_util_webp.hpp b/include/mapnik/image_util_webp.hpp
index 6d28138de..3c654dec8 100644
--- a/include/mapnik/image_util_webp.hpp
+++ b/include/mapnik/image_util_webp.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_view.hpp b/include/mapnik/image_view.hpp
index 846da6691..3b2270b27 100644
--- a/include/mapnik/image_view.hpp
+++ b/include/mapnik/image_view.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_view_any.hpp b/include/mapnik/image_view_any.hpp
index a5452df0b..fde9b723e 100644
--- a/include/mapnik/image_view_any.hpp
+++ b/include/mapnik/image_view_any.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_view_impl.hpp b/include/mapnik/image_view_impl.hpp
index 14032042a..9609913d6 100644
--- a/include/mapnik/image_view_impl.hpp
+++ b/include/mapnik/image_view_impl.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/image_view_null.hpp b/include/mapnik/image_view_null.hpp
index 76ebc5f49..214e8f0a3 100644
--- a/include/mapnik/image_view_null.hpp
+++ b/include/mapnik/image_view_null.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/jpeg_io.hpp b/include/mapnik/jpeg_io.hpp
index cc64dac75..02b8b94a2 100644
--- a/include/mapnik/jpeg_io.hpp
+++ b/include/mapnik/jpeg_io.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/json/feature_generator_grammar.hpp b/include/mapnik/json/feature_generator_grammar.hpp
index 4e393ea0e..6da343feb 100644
--- a/include/mapnik/json/feature_generator_grammar.hpp
+++ b/include/mapnik/json/feature_generator_grammar.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/json/feature_generator_grammar_impl.hpp b/include/mapnik/json/feature_generator_grammar_impl.hpp
index 1ee4b99ae..3bb56dff9 100644
--- a/include/mapnik/json/feature_generator_grammar_impl.hpp
+++ b/include/mapnik/json/feature_generator_grammar_impl.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/json/feature_parser.hpp b/include/mapnik/json/feature_parser.hpp
index 11d363154..7c0cf3198 100644
--- a/include/mapnik/json/feature_parser.hpp
+++ b/include/mapnik/json/feature_parser.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/json/generic_json_grammar_x3.hpp b/include/mapnik/json/generic_json_grammar_x3.hpp
index a1064bdeb..1dce6b161 100644
--- a/include/mapnik/json/generic_json_grammar_x3.hpp
+++ b/include/mapnik/json/generic_json_grammar_x3.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/json/geometry_generator_grammar.hpp b/include/mapnik/json/geometry_generator_grammar.hpp
index 3203a79f4..802d70974 100644
--- a/include/mapnik/json/geometry_generator_grammar.hpp
+++ b/include/mapnik/json/geometry_generator_grammar.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/json/geometry_generator_grammar_impl.hpp b/include/mapnik/json/geometry_generator_grammar_impl.hpp
index 8a546d67b..3f0a84fcc 100644
--- a/include/mapnik/json/geometry_generator_grammar_impl.hpp
+++ b/include/mapnik/json/geometry_generator_grammar_impl.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/json/geometry_parser.hpp b/include/mapnik/json/geometry_parser.hpp
index 761c193f8..a4fded3f0 100644
--- a/include/mapnik/json/geometry_parser.hpp
+++ b/include/mapnik/json/geometry_parser.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/json/properties_generator_grammar.hpp b/include/mapnik/json/properties_generator_grammar.hpp
index 3ae671af7..fd925b825 100644
--- a/include/mapnik/json/properties_generator_grammar.hpp
+++ b/include/mapnik/json/properties_generator_grammar.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/json/properties_generator_grammar_impl.hpp b/include/mapnik/json/properties_generator_grammar_impl.hpp
index b0f008a72..d3d81026f 100644
--- a/include/mapnik/json/properties_generator_grammar_impl.hpp
+++ b/include/mapnik/json/properties_generator_grammar_impl.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/json/topology.hpp b/include/mapnik/json/topology.hpp
index b45789b9e..97d44f7b6 100644
--- a/include/mapnik/json/topology.hpp
+++ b/include/mapnik/json/topology.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/json/unicode_string_grammar_x3.hpp b/include/mapnik/json/unicode_string_grammar_x3.hpp
index 8b70f598a..4415a0046 100644
--- a/include/mapnik/json/unicode_string_grammar_x3.hpp
+++ b/include/mapnik/json/unicode_string_grammar_x3.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/json/value_converters.hpp b/include/mapnik/json/value_converters.hpp
index 384ecb88c..1f92aa97b 100644
--- a/include/mapnik/json/value_converters.hpp
+++ b/include/mapnik/json/value_converters.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/label_collision_detector.hpp b/include/mapnik/label_collision_detector.hpp
index a35fa7034..135a6daa8 100644
--- a/include/mapnik/label_collision_detector.hpp
+++ b/include/mapnik/label_collision_detector.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/layer.hpp b/include/mapnik/layer.hpp
index a00b4885f..38a8360f9 100644
--- a/include/mapnik/layer.hpp
+++ b/include/mapnik/layer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/load_map.hpp b/include/mapnik/load_map.hpp
index 30a04eb07..4ec42d55d 100644
--- a/include/mapnik/load_map.hpp
+++ b/include/mapnik/load_map.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/make_unique.hpp b/include/mapnik/make_unique.hpp
index 577c0cf78..b967a5241 100644
--- a/include/mapnik/make_unique.hpp
+++ b/include/mapnik/make_unique.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/map.hpp b/include/mapnik/map.hpp
index 9f582791b..6c4cfda7c 100644
--- a/include/mapnik/map.hpp
+++ b/include/mapnik/map.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/mapped_memory_cache.hpp b/include/mapnik/mapped_memory_cache.hpp
index 1ac8d877e..d00f4396b 100644
--- a/include/mapnik/mapped_memory_cache.hpp
+++ b/include/mapnik/mapped_memory_cache.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/marker.hpp b/include/mapnik/marker.hpp
index 1feb0fecf..e4222e10f 100644
--- a/include/mapnik/marker.hpp
+++ b/include/mapnik/marker.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/marker_cache.hpp b/include/mapnik/marker_cache.hpp
index 47aa5558e..5a59eaca3 100644
--- a/include/mapnik/marker_cache.hpp
+++ b/include/mapnik/marker_cache.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/marker_helpers.hpp b/include/mapnik/marker_helpers.hpp
index 03d859c3e..2e935fd6e 100644
--- a/include/mapnik/marker_helpers.hpp
+++ b/include/mapnik/marker_helpers.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/markers_placement.hpp b/include/mapnik/markers_placement.hpp
index 0d4319115..c164f307a 100644
--- a/include/mapnik/markers_placement.hpp
+++ b/include/mapnik/markers_placement.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/markers_placements/interior.hpp b/include/mapnik/markers_placements/interior.hpp
index be3dd0f12..987c28991 100644
--- a/include/mapnik/markers_placements/interior.hpp
+++ b/include/mapnik/markers_placements/interior.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/markers_placements/line.hpp b/include/mapnik/markers_placements/line.hpp
index ea858aa0d..c1ab435c6 100644
--- a/include/mapnik/markers_placements/line.hpp
+++ b/include/mapnik/markers_placements/line.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/markers_placements/point.hpp b/include/mapnik/markers_placements/point.hpp
index 344797905..7ae070a70 100644
--- a/include/mapnik/markers_placements/point.hpp
+++ b/include/mapnik/markers_placements/point.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/markers_placements/vertext_first.hpp b/include/mapnik/markers_placements/vertext_first.hpp
index ce1b415b3..59943c709 100644
--- a/include/mapnik/markers_placements/vertext_first.hpp
+++ b/include/mapnik/markers_placements/vertext_first.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/markers_placements/vertext_last.hpp b/include/mapnik/markers_placements/vertext_last.hpp
index 62c94a66a..077fd8eca 100644
--- a/include/mapnik/markers_placements/vertext_last.hpp
+++ b/include/mapnik/markers_placements/vertext_last.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/memory_datasource.hpp b/include/mapnik/memory_datasource.hpp
index 9b589741f..11a64069d 100644
--- a/include/mapnik/memory_datasource.hpp
+++ b/include/mapnik/memory_datasource.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/memory_featureset.hpp b/include/mapnik/memory_featureset.hpp
index f4863268f..9f0a1bc0b 100644
--- a/include/mapnik/memory_featureset.hpp
+++ b/include/mapnik/memory_featureset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/octree.hpp b/include/mapnik/octree.hpp
index 007e6960e..f085f219b 100644
--- a/include/mapnik/octree.hpp
+++ b/include/mapnik/octree.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/offset_converter.hpp b/include/mapnik/offset_converter.hpp
index c739c152d..c54f3b5f9 100644
--- a/include/mapnik/offset_converter.hpp
+++ b/include/mapnik/offset_converter.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/palette.hpp b/include/mapnik/palette.hpp
index 1276d1302..2f5dc3091 100644
--- a/include/mapnik/palette.hpp
+++ b/include/mapnik/palette.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/params.hpp b/include/mapnik/params.hpp
index 280a6addf..f53a4e651 100644
--- a/include/mapnik/params.hpp
+++ b/include/mapnik/params.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/params_impl.hpp b/include/mapnik/params_impl.hpp
index 03b7765cb..f7534d666 100644
--- a/include/mapnik/params_impl.hpp
+++ b/include/mapnik/params_impl.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/parse_path.hpp b/include/mapnik/parse_path.hpp
index e5b5882ab..3b1eb2524 100644
--- a/include/mapnik/parse_path.hpp
+++ b/include/mapnik/parse_path.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/parse_transform.hpp b/include/mapnik/parse_transform.hpp
index 68e605c40..8d4c4899b 100644
--- a/include/mapnik/parse_transform.hpp
+++ b/include/mapnik/parse_transform.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/path.hpp b/include/mapnik/path.hpp
index 8d2e4f6f4..76381dcac 100644
--- a/include/mapnik/path.hpp
+++ b/include/mapnik/path.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/path_expression.hpp b/include/mapnik/path_expression.hpp
index b3dde7dab..1cc4a949d 100644
--- a/include/mapnik/path_expression.hpp
+++ b/include/mapnik/path_expression.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/pixel_position.hpp b/include/mapnik/pixel_position.hpp
index 93cdb4f7f..09381345c 100644
--- a/include/mapnik/pixel_position.hpp
+++ b/include/mapnik/pixel_position.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/pixel_types.hpp b/include/mapnik/pixel_types.hpp
index b0d6304b3..f341155c8 100644
--- a/include/mapnik/pixel_types.hpp
+++ b/include/mapnik/pixel_types.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/plugin.hpp b/include/mapnik/plugin.hpp
index 68e7de620..99c1e8d1e 100644
--- a/include/mapnik/plugin.hpp
+++ b/include/mapnik/plugin.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/png_io.hpp b/include/mapnik/png_io.hpp
index 9f8b38d8f..2e5712e24 100644
--- a/include/mapnik/png_io.hpp
+++ b/include/mapnik/png_io.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/pool.hpp b/include/mapnik/pool.hpp
index c37aab4e3..96a305fce 100644
--- a/include/mapnik/pool.hpp
+++ b/include/mapnik/pool.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/proj_strategy.hpp b/include/mapnik/proj_strategy.hpp
index 064f3669b..30a798483 100644
--- a/include/mapnik/proj_strategy.hpp
+++ b/include/mapnik/proj_strategy.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/proj_transform.hpp b/include/mapnik/proj_transform.hpp
index 3247a15e3..d4827a4b5 100644
--- a/include/mapnik/proj_transform.hpp
+++ b/include/mapnik/proj_transform.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/projection.hpp b/include/mapnik/projection.hpp
index 0869bb2d6..ddc4ff843 100644
--- a/include/mapnik/projection.hpp
+++ b/include/mapnik/projection.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/ptree_helpers.hpp b/include/mapnik/ptree_helpers.hpp
index 6a9c91e56..3bdb26aea 100644
--- a/include/mapnik/ptree_helpers.hpp
+++ b/include/mapnik/ptree_helpers.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/quad_tree.hpp b/include/mapnik/quad_tree.hpp
index a44962ec1..ba92ca8cf 100644
--- a/include/mapnik/quad_tree.hpp
+++ b/include/mapnik/quad_tree.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/query.hpp b/include/mapnik/query.hpp
index 6a86cfa3b..9ecc310f3 100644
--- a/include/mapnik/query.hpp
+++ b/include/mapnik/query.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/raster.hpp b/include/mapnik/raster.hpp
index 8ed30e5a2..d0cfc38dd 100644
--- a/include/mapnik/raster.hpp
+++ b/include/mapnik/raster.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/raster_colorizer.hpp b/include/mapnik/raster_colorizer.hpp
index 690549746..448dc9e9d 100644
--- a/include/mapnik/raster_colorizer.hpp
+++ b/include/mapnik/raster_colorizer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/renderer_common.hpp b/include/mapnik/renderer_common.hpp
index c9d181b42..2cd695cb3 100644
--- a/include/mapnik/renderer_common.hpp
+++ b/include/mapnik/renderer_common.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/renderer_common/apply_vertex_converter.hpp b/include/mapnik/renderer_common/apply_vertex_converter.hpp
index 503dc4176..b79912d57 100644
--- a/include/mapnik/renderer_common/apply_vertex_converter.hpp
+++ b/include/mapnik/renderer_common/apply_vertex_converter.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/renderer_common/clipping_extent.hpp b/include/mapnik/renderer_common/clipping_extent.hpp
index aabacf36f..ead1a80ed 100644
--- a/include/mapnik/renderer_common/clipping_extent.hpp
+++ b/include/mapnik/renderer_common/clipping_extent.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/renderer_common/pattern_alignment.hpp b/include/mapnik/renderer_common/pattern_alignment.hpp
index 12f746d32..053901188 100644
--- a/include/mapnik/renderer_common/pattern_alignment.hpp
+++ b/include/mapnik/renderer_common/pattern_alignment.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/renderer_common/process_building_symbolizer.hpp b/include/mapnik/renderer_common/process_building_symbolizer.hpp
index d65df2544..9c157c7c3 100644
--- a/include/mapnik/renderer_common/process_building_symbolizer.hpp
+++ b/include/mapnik/renderer_common/process_building_symbolizer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/renderer_common/process_point_symbolizer.hpp b/include/mapnik/renderer_common/process_point_symbolizer.hpp
index 508f7a2ce..4365240eb 100644
--- a/include/mapnik/renderer_common/process_point_symbolizer.hpp
+++ b/include/mapnik/renderer_common/process_point_symbolizer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/renderer_common/process_polygon_symbolizer.hpp b/include/mapnik/renderer_common/process_polygon_symbolizer.hpp
index 6fd2524fc..4322793f0 100644
--- a/include/mapnik/renderer_common/process_polygon_symbolizer.hpp
+++ b/include/mapnik/renderer_common/process_polygon_symbolizer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/renderer_common/process_raster_symbolizer.hpp b/include/mapnik/renderer_common/process_raster_symbolizer.hpp
index 7ca90a0af..c700327c4 100644
--- a/include/mapnik/renderer_common/process_raster_symbolizer.hpp
+++ b/include/mapnik/renderer_common/process_raster_symbolizer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/renderer_common/render_pattern.hpp b/include/mapnik/renderer_common/render_pattern.hpp
index acb989731..e9953e215 100644
--- a/include/mapnik/renderer_common/render_pattern.hpp
+++ b/include/mapnik/renderer_common/render_pattern.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/request.hpp b/include/mapnik/request.hpp
index 74c085197..697ce9cca 100644
--- a/include/mapnik/request.hpp
+++ b/include/mapnik/request.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/rule.hpp b/include/mapnik/rule.hpp
index 1c98eaf59..018297ae9 100644
--- a/include/mapnik/rule.hpp
+++ b/include/mapnik/rule.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/rule_cache.hpp b/include/mapnik/rule_cache.hpp
index 3d6f7d025..857873734 100644
--- a/include/mapnik/rule_cache.hpp
+++ b/include/mapnik/rule_cache.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/safe_cast.hpp b/include/mapnik/safe_cast.hpp
index d8973032e..7e638e8a6 100644
--- a/include/mapnik/safe_cast.hpp
+++ b/include/mapnik/safe_cast.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/save_map.hpp b/include/mapnik/save_map.hpp
index 80317b356..99d3beacb 100644
--- a/include/mapnik/save_map.hpp
+++ b/include/mapnik/save_map.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/scale_denominator.hpp b/include/mapnik/scale_denominator.hpp
index fb09cefd9..68cad70d2 100644
--- a/include/mapnik/scale_denominator.hpp
+++ b/include/mapnik/scale_denominator.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/segment.hpp b/include/mapnik/segment.hpp
index 4463382b8..6aace570c 100644
--- a/include/mapnik/segment.hpp
+++ b/include/mapnik/segment.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/span_image_filter.hpp b/include/mapnik/span_image_filter.hpp
index 950f76c08..b3fd21367 100644
--- a/include/mapnik/span_image_filter.hpp
+++ b/include/mapnik/span_image_filter.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/sql_utils.hpp b/include/mapnik/sql_utils.hpp
index 2720e8424..d54cdbc04 100644
--- a/include/mapnik/sql_utils.hpp
+++ b/include/mapnik/sql_utils.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/sse.hpp b/include/mapnik/sse.hpp
index 603af7cd2..4e9d96445 100644
--- a/include/mapnik/sse.hpp
+++ b/include/mapnik/sse.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/geometry_svg_generator.hpp b/include/mapnik/svg/geometry_svg_generator.hpp
index 7594c26dd..44982b2a9 100644
--- a/include/mapnik/svg/geometry_svg_generator.hpp
+++ b/include/mapnik/svg/geometry_svg_generator.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/geometry_svg_generator_impl.hpp b/include/mapnik/svg/geometry_svg_generator_impl.hpp
index cb94a7a28..98df1cb44 100644
--- a/include/mapnik/svg/geometry_svg_generator_impl.hpp
+++ b/include/mapnik/svg/geometry_svg_generator_impl.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/output/svg_generator.hpp b/include/mapnik/svg/output/svg_generator.hpp
index e2a2830e2..f3f2414f3 100644
--- a/include/mapnik/svg/output/svg_generator.hpp
+++ b/include/mapnik/svg/output/svg_generator.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/output/svg_output_attributes.hpp b/include/mapnik/svg/output/svg_output_attributes.hpp
index 0c5351305..21644a8bd 100644
--- a/include/mapnik/svg/output/svg_output_attributes.hpp
+++ b/include/mapnik/svg/output/svg_output_attributes.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/output/svg_output_grammars.hpp b/include/mapnik/svg/output/svg_output_grammars.hpp
index 5657e2606..d4f1bb6d1 100644
--- a/include/mapnik/svg/output/svg_output_grammars.hpp
+++ b/include/mapnik/svg/output/svg_output_grammars.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/output/svg_output_grammars_impl.hpp b/include/mapnik/svg/output/svg_output_grammars_impl.hpp
index ef856a05e..6ada195fd 100644
--- a/include/mapnik/svg/output/svg_output_grammars_impl.hpp
+++ b/include/mapnik/svg/output/svg_output_grammars_impl.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/output/svg_path_iterator.hpp b/include/mapnik/svg/output/svg_path_iterator.hpp
index b773888cd..f970fa5bd 100644
--- a/include/mapnik/svg/output/svg_path_iterator.hpp
+++ b/include/mapnik/svg/output/svg_path_iterator.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/output/svg_renderer.hpp b/include/mapnik/svg/output/svg_renderer.hpp
index 7ce3e044d..7ed568810 100644
--- a/include/mapnik/svg/output/svg_renderer.hpp
+++ b/include/mapnik/svg/output/svg_renderer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/svg_converter.hpp b/include/mapnik/svg/svg_converter.hpp
index 9cf3c9c16..66edc5d0b 100644
--- a/include/mapnik/svg/svg_converter.hpp
+++ b/include/mapnik/svg/svg_converter.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/svg_parser.hpp b/include/mapnik/svg/svg_parser.hpp
index 63caacd8b..8246bac91 100644
--- a/include/mapnik/svg/svg_parser.hpp
+++ b/include/mapnik/svg/svg_parser.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/svg_parser_exception.hpp b/include/mapnik/svg/svg_parser_exception.hpp
index 89139da88..70de6efff 100644
--- a/include/mapnik/svg/svg_parser_exception.hpp
+++ b/include/mapnik/svg/svg_parser_exception.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/svg_path_adapter.hpp b/include/mapnik/svg/svg_path_adapter.hpp
index 8b4fb6bf2..54fdf3f6d 100644
--- a/include/mapnik/svg/svg_path_adapter.hpp
+++ b/include/mapnik/svg/svg_path_adapter.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/svg_path_attributes.hpp b/include/mapnik/svg/svg_path_attributes.hpp
index 80bf46349..e4acbba49 100644
--- a/include/mapnik/svg/svg_path_attributes.hpp
+++ b/include/mapnik/svg/svg_path_attributes.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/svg_path_commands.hpp b/include/mapnik/svg/svg_path_commands.hpp
index 7e7ab5fef..26a5bba6b 100644
--- a/include/mapnik/svg/svg_path_commands.hpp
+++ b/include/mapnik/svg/svg_path_commands.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/svg_path_parser.hpp b/include/mapnik/svg/svg_path_parser.hpp
index 5633b2ea9..a56051c24 100644
--- a/include/mapnik/svg/svg_path_parser.hpp
+++ b/include/mapnik/svg/svg_path_parser.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/svg_points_grammar.hpp b/include/mapnik/svg/svg_points_grammar.hpp
index f6023c94c..07c93cc08 100644
--- a/include/mapnik/svg/svg_points_grammar.hpp
+++ b/include/mapnik/svg/svg_points_grammar.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/svg_points_grammar_impl.hpp b/include/mapnik/svg/svg_points_grammar_impl.hpp
index efec8295d..f6f09583a 100644
--- a/include/mapnik/svg/svg_points_grammar_impl.hpp
+++ b/include/mapnik/svg/svg_points_grammar_impl.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/svg_renderer_agg.hpp b/include/mapnik/svg/svg_renderer_agg.hpp
index 9cd7e0536..a71777ef7 100644
--- a/include/mapnik/svg/svg_renderer_agg.hpp
+++ b/include/mapnik/svg/svg_renderer_agg.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/svg_storage.hpp b/include/mapnik/svg/svg_storage.hpp
index c360ecf52..eb6506d96 100644
--- a/include/mapnik/svg/svg_storage.hpp
+++ b/include/mapnik/svg/svg_storage.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/svg_transform_grammar.hpp b/include/mapnik/svg/svg_transform_grammar.hpp
index 895112d4a..18fce6bb6 100644
--- a/include/mapnik/svg/svg_transform_grammar.hpp
+++ b/include/mapnik/svg/svg_transform_grammar.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/svg/svg_transform_grammar_impl.hpp b/include/mapnik/svg/svg_transform_grammar_impl.hpp
index c1ef74417..39c731928 100644
--- a/include/mapnik/svg/svg_transform_grammar_impl.hpp
+++ b/include/mapnik/svg/svg_transform_grammar_impl.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/symbolizer.hpp b/include/mapnik/symbolizer.hpp
index 9308ecd7b..d277fe678 100644
--- a/include/mapnik/symbolizer.hpp
+++ b/include/mapnik/symbolizer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/symbolizer_base.hpp b/include/mapnik/symbolizer_base.hpp
index e2400faf0..be1529216 100644
--- a/include/mapnik/symbolizer_base.hpp
+++ b/include/mapnik/symbolizer_base.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/symbolizer_default_values.hpp b/include/mapnik/symbolizer_default_values.hpp
index 6131e89ae..07b31fed5 100644
--- a/include/mapnik/symbolizer_default_values.hpp
+++ b/include/mapnik/symbolizer_default_values.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/symbolizer_dispatch.hpp b/include/mapnik/symbolizer_dispatch.hpp
index 52f65bcfc..cb43b7b65 100644
--- a/include/mapnik/symbolizer_dispatch.hpp
+++ b/include/mapnik/symbolizer_dispatch.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/symbolizer_enumerations.hpp b/include/mapnik/symbolizer_enumerations.hpp
index 7a3e72fd8..e24f079a9 100644
--- a/include/mapnik/symbolizer_enumerations.hpp
+++ b/include/mapnik/symbolizer_enumerations.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/symbolizer_hash.hpp b/include/mapnik/symbolizer_hash.hpp
index 9c2baa4e4..afd5cd3de 100644
--- a/include/mapnik/symbolizer_hash.hpp
+++ b/include/mapnik/symbolizer_hash.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/symbolizer_keys.hpp b/include/mapnik/symbolizer_keys.hpp
index 15919dc1b..217fff1d0 100644
--- a/include/mapnik/symbolizer_keys.hpp
+++ b/include/mapnik/symbolizer_keys.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/symbolizer_utils.hpp b/include/mapnik/symbolizer_utils.hpp
index cea99000c..319d0e1dd 100644
--- a/include/mapnik/symbolizer_utils.hpp
+++ b/include/mapnik/symbolizer_utils.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/evaluated_format_properties_ptr.hpp b/include/mapnik/text/evaluated_format_properties_ptr.hpp
index 472865181..351261339 100644
--- a/include/mapnik/text/evaluated_format_properties_ptr.hpp
+++ b/include/mapnik/text/evaluated_format_properties_ptr.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/face.hpp b/include/mapnik/text/face.hpp
index 3d797a1f2..210c3479b 100644
--- a/include/mapnik/text/face.hpp
+++ b/include/mapnik/text/face.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/font_feature_settings.hpp b/include/mapnik/text/font_feature_settings.hpp
index 8bc3e33c6..e6b8d7b6c 100644
--- a/include/mapnik/text/font_feature_settings.hpp
+++ b/include/mapnik/text/font_feature_settings.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/font_library.hpp b/include/mapnik/text/font_library.hpp
index 163aad3d6..31ef063ab 100644
--- a/include/mapnik/text/font_library.hpp
+++ b/include/mapnik/text/font_library.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/formatting/base.hpp b/include/mapnik/text/formatting/base.hpp
index da47d5d54..68aa33392 100644
--- a/include/mapnik/text/formatting/base.hpp
+++ b/include/mapnik/text/formatting/base.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/formatting/format.hpp b/include/mapnik/text/formatting/format.hpp
index c540abd13..76deed1a5 100644
--- a/include/mapnik/text/formatting/format.hpp
+++ b/include/mapnik/text/formatting/format.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/formatting/layout.hpp b/include/mapnik/text/formatting/layout.hpp
index 6892ce72b..de6d35e5a 100644
--- a/include/mapnik/text/formatting/layout.hpp
+++ b/include/mapnik/text/formatting/layout.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/formatting/list.hpp b/include/mapnik/text/formatting/list.hpp
index 45c4217db..3f9914dcc 100644
--- a/include/mapnik/text/formatting/list.hpp
+++ b/include/mapnik/text/formatting/list.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/formatting/registry.hpp b/include/mapnik/text/formatting/registry.hpp
index 7328d2b9c..ed974fc10 100644
--- a/include/mapnik/text/formatting/registry.hpp
+++ b/include/mapnik/text/formatting/registry.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/formatting/text.hpp b/include/mapnik/text/formatting/text.hpp
index 012288507..46766422e 100644
--- a/include/mapnik/text/formatting/text.hpp
+++ b/include/mapnik/text/formatting/text.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/glyph_info.hpp b/include/mapnik/text/glyph_info.hpp
index 3950f9dd2..fc177440d 100644
--- a/include/mapnik/text/glyph_info.hpp
+++ b/include/mapnik/text/glyph_info.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/glyph_positions.hpp b/include/mapnik/text/glyph_positions.hpp
index aa08e3376..08caa10cc 100644
--- a/include/mapnik/text/glyph_positions.hpp
+++ b/include/mapnik/text/glyph_positions.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/harfbuzz_shaper.hpp b/include/mapnik/text/harfbuzz_shaper.hpp
index 8b574b095..56887e5fc 100644
--- a/include/mapnik/text/harfbuzz_shaper.hpp
+++ b/include/mapnik/text/harfbuzz_shaper.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/icu_shaper.hpp b/include/mapnik/text/icu_shaper.hpp
index 39bc590bb..2f3373e9c 100644
--- a/include/mapnik/text/icu_shaper.hpp
+++ b/include/mapnik/text/icu_shaper.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/itemizer.hpp b/include/mapnik/text/itemizer.hpp
index b33c559bb..70e99322e 100644
--- a/include/mapnik/text/itemizer.hpp
+++ b/include/mapnik/text/itemizer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/placement_finder.hpp b/include/mapnik/text/placement_finder.hpp
index 83e8a04b3..240668330 100644
--- a/include/mapnik/text/placement_finder.hpp
+++ b/include/mapnik/text/placement_finder.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/placement_finder_impl.hpp b/include/mapnik/text/placement_finder_impl.hpp
index 3f5895c1e..efebf3d76 100644
--- a/include/mapnik/text/placement_finder_impl.hpp
+++ b/include/mapnik/text/placement_finder_impl.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/placements/base.hpp b/include/mapnik/text/placements/base.hpp
index 0b93fb8e8..8e075f575 100644
--- a/include/mapnik/text/placements/base.hpp
+++ b/include/mapnik/text/placements/base.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/placements/dummy.hpp b/include/mapnik/text/placements/dummy.hpp
index e83808f45..3e39dd678 100644
--- a/include/mapnik/text/placements/dummy.hpp
+++ b/include/mapnik/text/placements/dummy.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/placements/list.hpp b/include/mapnik/text/placements/list.hpp
index 88938ee1c..5da67e85b 100644
--- a/include/mapnik/text/placements/list.hpp
+++ b/include/mapnik/text/placements/list.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/placements/registry.hpp b/include/mapnik/text/placements/registry.hpp
index f8d8aefb1..76ec5e285 100644
--- a/include/mapnik/text/placements/registry.hpp
+++ b/include/mapnik/text/placements/registry.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/placements/simple.hpp b/include/mapnik/text/placements/simple.hpp
index ea0d73c5e..9f7bf91bc 100644
--- a/include/mapnik/text/placements/simple.hpp
+++ b/include/mapnik/text/placements/simple.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/properties_util.hpp b/include/mapnik/text/properties_util.hpp
index 5b92ed306..d280f5657 100644
--- a/include/mapnik/text/properties_util.hpp
+++ b/include/mapnik/text/properties_util.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/renderer.hpp b/include/mapnik/text/renderer.hpp
index 692ada3cd..9d480f4c9 100644
--- a/include/mapnik/text/renderer.hpp
+++ b/include/mapnik/text/renderer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/symbolizer_helpers.hpp b/include/mapnik/text/symbolizer_helpers.hpp
index 8fd3c155a..3e7a4dc3a 100644
--- a/include/mapnik/text/symbolizer_helpers.hpp
+++ b/include/mapnik/text/symbolizer_helpers.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/text_layout.hpp b/include/mapnik/text/text_layout.hpp
index 9d769c848..0711a252f 100644
--- a/include/mapnik/text/text_layout.hpp
+++ b/include/mapnik/text/text_layout.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/text_line.hpp b/include/mapnik/text/text_line.hpp
index cf47026df..81e7d7e72 100644
--- a/include/mapnik/text/text_line.hpp
+++ b/include/mapnik/text/text_line.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/text/text_properties.hpp b/include/mapnik/text/text_properties.hpp
index 511ba3a28..cd63ae93a 100644
--- a/include/mapnik/text/text_properties.hpp
+++ b/include/mapnik/text/text_properties.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/tiff_io.hpp b/include/mapnik/tiff_io.hpp
index b80142906..1b31cb94c 100644
--- a/include/mapnik/tiff_io.hpp
+++ b/include/mapnik/tiff_io.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/timer.hpp b/include/mapnik/timer.hpp
index 8111ff645..347fda4d2 100644
--- a/include/mapnik/timer.hpp
+++ b/include/mapnik/timer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/tolerance_iterator.hpp b/include/mapnik/tolerance_iterator.hpp
index 2b9512c8b..448a0af3b 100644
--- a/include/mapnik/tolerance_iterator.hpp
+++ b/include/mapnik/tolerance_iterator.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/transform_expression.hpp b/include/mapnik/transform_expression.hpp
index 586d89e4a..18256efee 100644
--- a/include/mapnik/transform_expression.hpp
+++ b/include/mapnik/transform_expression.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/transform_expression_grammar_x3.hpp b/include/mapnik/transform_expression_grammar_x3.hpp
index 77ff330d9..4a83c2cf9 100644
--- a/include/mapnik/transform_expression_grammar_x3.hpp
+++ b/include/mapnik/transform_expression_grammar_x3.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/transform_expression_grammar_x3_def.hpp b/include/mapnik/transform_expression_grammar_x3_def.hpp
index 4af1e9481..14244730b 100644
--- a/include/mapnik/transform_expression_grammar_x3_def.hpp
+++ b/include/mapnik/transform_expression_grammar_x3_def.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/transform_path_adapter.hpp b/include/mapnik/transform_path_adapter.hpp
index 08212703f..fbb7a75ee 100644
--- a/include/mapnik/transform_path_adapter.hpp
+++ b/include/mapnik/transform_path_adapter.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/transform_processor.hpp b/include/mapnik/transform_processor.hpp
index b1d8eab73..7b17fa1c4 100644
--- a/include/mapnik/transform_processor.hpp
+++ b/include/mapnik/transform_processor.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/unicode.hpp b/include/mapnik/unicode.hpp
index 22c0c87a0..48b433f68 100644
--- a/include/mapnik/unicode.hpp
+++ b/include/mapnik/unicode.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/const_rendering_buffer.hpp b/include/mapnik/util/const_rendering_buffer.hpp
index 97b98ca65..5ee9de7f1 100644
--- a/include/mapnik/util/const_rendering_buffer.hpp
+++ b/include/mapnik/util/const_rendering_buffer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -58,4 +58,4 @@ struct rendering_buffer
 
 }}
 
-#endif // MAPNIK_CONST_RENDERING_BUFFER_HPP
\ No newline at end of file
+#endif // MAPNIK_CONST_RENDERING_BUFFER_HPP
diff --git a/include/mapnik/util/container_adapter.hpp b/include/mapnik/util/container_adapter.hpp
index 8c70c4c2a..63d25163c 100644
--- a/include/mapnik/util/container_adapter.hpp
+++ b/include/mapnik/util/container_adapter.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/conversions.hpp b/include/mapnik/util/conversions.hpp
index 49df4a49a..009e9315c 100644
--- a/include/mapnik/util/conversions.hpp
+++ b/include/mapnik/util/conversions.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/dasharray_parser.hpp b/include/mapnik/util/dasharray_parser.hpp
index 7c5d26711..191da098f 100644
--- a/include/mapnik/util/dasharray_parser.hpp
+++ b/include/mapnik/util/dasharray_parser.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/featureset_buffer.hpp b/include/mapnik/util/featureset_buffer.hpp
index 8689a41e9..ff2a8b39e 100644
--- a/include/mapnik/util/featureset_buffer.hpp
+++ b/include/mapnik/util/featureset_buffer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/file_io.hpp b/include/mapnik/util/file_io.hpp
index b8bc22f01..5dfe782eb 100644
--- a/include/mapnik/util/file_io.hpp
+++ b/include/mapnik/util/file_io.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/fs.hpp b/include/mapnik/util/fs.hpp
index 03905cb45..57abef0a4 100644
--- a/include/mapnik/util/fs.hpp
+++ b/include/mapnik/util/fs.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/geometry_to_ds_type.hpp b/include/mapnik/util/geometry_to_ds_type.hpp
index e09808f3e..cbd0841a9 100644
--- a/include/mapnik/util/geometry_to_ds_type.hpp
+++ b/include/mapnik/util/geometry_to_ds_type.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/geometry_to_geojson.hpp b/include/mapnik/util/geometry_to_geojson.hpp
index 71c867eb7..02d3bd34f 100644
--- a/include/mapnik/util/geometry_to_geojson.hpp
+++ b/include/mapnik/util/geometry_to_geojson.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/geometry_to_svg.hpp b/include/mapnik/util/geometry_to_svg.hpp
index 9efb55134..f95567ab3 100644
--- a/include/mapnik/util/geometry_to_svg.hpp
+++ b/include/mapnik/util/geometry_to_svg.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/geometry_to_wkb.hpp b/include/mapnik/util/geometry_to_wkb.hpp
index a01509d16..cbb29963a 100644
--- a/include/mapnik/util/geometry_to_wkb.hpp
+++ b/include/mapnik/util/geometry_to_wkb.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/geometry_to_wkt.hpp b/include/mapnik/util/geometry_to_wkt.hpp
index 9b92a8868..73637d04e 100644
--- a/include/mapnik/util/geometry_to_wkt.hpp
+++ b/include/mapnik/util/geometry_to_wkt.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/hsl.hpp b/include/mapnik/util/hsl.hpp
index d060da92f..5776570cf 100644
--- a/include/mapnik/util/hsl.hpp
+++ b/include/mapnik/util/hsl.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/is_clockwise.hpp b/include/mapnik/util/is_clockwise.hpp
index 93951df38..6ec532769 100644
--- a/include/mapnik/util/is_clockwise.hpp
+++ b/include/mapnik/util/is_clockwise.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/math.hpp b/include/mapnik/util/math.hpp
index 4b24893b1..fed1c7bbf 100644
--- a/include/mapnik/util/math.hpp
+++ b/include/mapnik/util/math.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/noncopyable.hpp b/include/mapnik/util/noncopyable.hpp
index 7a6a9f8f7..44bb3654e 100644
--- a/include/mapnik/util/noncopyable.hpp
+++ b/include/mapnik/util/noncopyable.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/path_iterator.hpp b/include/mapnik/util/path_iterator.hpp
index 19b69ce26..e7c6b92b5 100644
--- a/include/mapnik/util/path_iterator.hpp
+++ b/include/mapnik/util/path_iterator.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/rounding_cast.hpp b/include/mapnik/util/rounding_cast.hpp
index d67c066cc..512363b23 100644
--- a/include/mapnik/util/rounding_cast.hpp
+++ b/include/mapnik/util/rounding_cast.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/singleton.hpp b/include/mapnik/util/singleton.hpp
index fcb0275ef..61c5b6962 100644
--- a/include/mapnik/util/singleton.hpp
+++ b/include/mapnik/util/singleton.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/spatial_index.hpp b/include/mapnik/util/spatial_index.hpp
index 720667768..7544b6836 100644
--- a/include/mapnik/util/spatial_index.hpp
+++ b/include/mapnik/util/spatial_index.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/spirit_transform_attribute.hpp b/include/mapnik/util/spirit_transform_attribute.hpp
index c4176f1fa..75877e007 100644
--- a/include/mapnik/util/spirit_transform_attribute.hpp
+++ b/include/mapnik/util/spirit_transform_attribute.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/timer.hpp b/include/mapnik/util/timer.hpp
index e29a8eae1..7c8ff67d3 100644
--- a/include/mapnik/util/timer.hpp
+++ b/include/mapnik/util/timer.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/trim.hpp b/include/mapnik/util/trim.hpp
index 60320331b..9b0e5c7c5 100644
--- a/include/mapnik/util/trim.hpp
+++ b/include/mapnik/util/trim.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/utf_conv_win.hpp b/include/mapnik/util/utf_conv_win.hpp
index 68e28ec15..f6c0ea19a 100644
--- a/include/mapnik/util/utf_conv_win.hpp
+++ b/include/mapnik/util/utf_conv_win.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/variant.hpp b/include/mapnik/util/variant.hpp
index b73533d71..2451cea0c 100644
--- a/include/mapnik/util/variant.hpp
+++ b/include/mapnik/util/variant.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/util/variant_io.hpp b/include/mapnik/util/variant_io.hpp
index 98978e3ac..bdbfcdbbc 100644
--- a/include/mapnik/util/variant_io.hpp
+++ b/include/mapnik/util/variant_io.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/value.hpp b/include/mapnik/value.hpp
index 8341a557b..0618e8abe 100644
--- a/include/mapnik/value.hpp
+++ b/include/mapnik/value.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/value/error.hpp b/include/mapnik/value/error.hpp
index 58df3fafa..aff9c9dc4 100644
--- a/include/mapnik/value/error.hpp
+++ b/include/mapnik/value/error.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/value/hash.hpp b/include/mapnik/value/hash.hpp
index a035f1657..86bb190ad 100644
--- a/include/mapnik/value/hash.hpp
+++ b/include/mapnik/value/hash.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/value/types.hpp b/include/mapnik/value/types.hpp
index d1c0c59bd..4aaba16f4 100644
--- a/include/mapnik/value/types.hpp
+++ b/include/mapnik/value/types.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/version.hpp b/include/mapnik/version.hpp
index 828ff9bac..c6eecef02 100644
--- a/include/mapnik/version.hpp
+++ b/include/mapnik/version.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/vertex.hpp b/include/mapnik/vertex.hpp
index 2e1d37844..3190b164b 100644
--- a/include/mapnik/vertex.hpp
+++ b/include/mapnik/vertex.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/vertex_adapters.hpp b/include/mapnik/vertex_adapters.hpp
index 5a4307ee0..ff36dec4b 100644
--- a/include/mapnik/vertex_adapters.hpp
+++ b/include/mapnik/vertex_adapters.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/vertex_cache.hpp b/include/mapnik/vertex_cache.hpp
index 9df786e62..abacb14de 100644
--- a/include/mapnik/vertex_cache.hpp
+++ b/include/mapnik/vertex_cache.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/vertex_converters.hpp b/include/mapnik/vertex_converters.hpp
index 1ebe96190..db0428788 100644
--- a/include/mapnik/vertex_converters.hpp
+++ b/include/mapnik/vertex_converters.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/vertex_processor.hpp b/include/mapnik/vertex_processor.hpp
index 7cd2c40a4..c9c1c6330 100644
--- a/include/mapnik/vertex_processor.hpp
+++ b/include/mapnik/vertex_processor.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/vertex_vector.hpp b/include/mapnik/vertex_vector.hpp
index 67e30fc54..f625b68a4 100644
--- a/include/mapnik/vertex_vector.hpp
+++ b/include/mapnik/vertex_vector.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/view_strategy.hpp b/include/mapnik/view_strategy.hpp
index 0d1125b97..951012d97 100644
--- a/include/mapnik/view_strategy.hpp
+++ b/include/mapnik/view_strategy.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/view_transform.hpp b/include/mapnik/view_transform.hpp
index 74fa89cf7..1c920bb32 100644
--- a/include/mapnik/view_transform.hpp
+++ b/include/mapnik/view_transform.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/warning_ignore.hpp b/include/mapnik/warning_ignore.hpp
index ccbf16925..fe0f4f83d 100644
--- a/include/mapnik/warning_ignore.hpp
+++ b/include/mapnik/warning_ignore.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/warning_ignore_agg.hpp b/include/mapnik/warning_ignore_agg.hpp
index 2f44c5c78..f741e7a07 100644
--- a/include/mapnik/warning_ignore_agg.hpp
+++ b/include/mapnik/warning_ignore_agg.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/warp.hpp b/include/mapnik/warp.hpp
index abf010851..f6974b1e7 100644
--- a/include/mapnik/warp.hpp
+++ b/include/mapnik/warp.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/webp_io.hpp b/include/mapnik/webp_io.hpp
index 225ff2f50..81862e08a 100644
--- a/include/mapnik/webp_io.hpp
+++ b/include/mapnik/webp_io.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/well_known_srs.hpp b/include/mapnik/well_known_srs.hpp
index 235a90859..12e9e86d5 100644
--- a/include/mapnik/well_known_srs.hpp
+++ b/include/mapnik/well_known_srs.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/wkb.hpp b/include/mapnik/wkb.hpp
index 98b3d30c9..dcbe45d8b 100644
--- a/include/mapnik/wkb.hpp
+++ b/include/mapnik/wkb.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/wkt/wkt_generator_grammar.hpp b/include/mapnik/wkt/wkt_generator_grammar.hpp
index bb40e7965..d392bbb36 100644
--- a/include/mapnik/wkt/wkt_generator_grammar.hpp
+++ b/include/mapnik/wkt/wkt_generator_grammar.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/wkt/wkt_generator_grammar_impl.hpp b/include/mapnik/wkt/wkt_generator_grammar_impl.hpp
index bc62cd64f..d627aa95c 100644
--- a/include/mapnik/wkt/wkt_generator_grammar_impl.hpp
+++ b/include/mapnik/wkt/wkt_generator_grammar_impl.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/xml_attribute_cast.hpp b/include/mapnik/xml_attribute_cast.hpp
index 0b3531189..1beafe5be 100644
--- a/include/mapnik/xml_attribute_cast.hpp
+++ b/include/mapnik/xml_attribute_cast.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/xml_loader.hpp b/include/mapnik/xml_loader.hpp
index 5fe98af0c..2cb73a3c4 100644
--- a/include/mapnik/xml_loader.hpp
+++ b/include/mapnik/xml_loader.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/xml_node.hpp b/include/mapnik/xml_node.hpp
index b0952f289..26b5b9810 100644
--- a/include/mapnik/xml_node.hpp
+++ b/include/mapnik/xml_node.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/include/mapnik/xml_tree.hpp b/include/mapnik/xml_tree.hpp
index 042421836..e0e00a914 100644
--- a/include/mapnik/xml_tree.hpp
+++ b/include/mapnik/xml_tree.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/csv/csv_datasource.cpp b/plugins/input/csv/csv_datasource.cpp
index cb763f08c..49c6c660d 100644
--- a/plugins/input/csv/csv_datasource.cpp
+++ b/plugins/input/csv/csv_datasource.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/csv/csv_datasource.hpp b/plugins/input/csv/csv_datasource.hpp
index bbb47339b..d4b9c4cf2 100644
--- a/plugins/input/csv/csv_datasource.hpp
+++ b/plugins/input/csv/csv_datasource.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/csv/csv_featureset.cpp b/plugins/input/csv/csv_featureset.cpp
index 151811201..f82f345d6 100644
--- a/plugins/input/csv/csv_featureset.cpp
+++ b/plugins/input/csv/csv_featureset.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/csv/csv_featureset.hpp b/plugins/input/csv/csv_featureset.hpp
index 8828fa4a5..f9850a2bc 100644
--- a/plugins/input/csv/csv_featureset.hpp
+++ b/plugins/input/csv/csv_featureset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/csv/csv_getline.hpp b/plugins/input/csv/csv_getline.hpp
index 9dfe5de49..8259cb305 100644
--- a/plugins/input/csv/csv_getline.hpp
+++ b/plugins/input/csv/csv_getline.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/csv/csv_index_featureset.cpp b/plugins/input/csv/csv_index_featureset.cpp
index e94f41bc5..2d210e251 100644
--- a/plugins/input/csv/csv_index_featureset.cpp
+++ b/plugins/input/csv/csv_index_featureset.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/csv/csv_index_featureset.hpp b/plugins/input/csv/csv_index_featureset.hpp
index e57a356c9..ac1a1ed91 100644
--- a/plugins/input/csv/csv_index_featureset.hpp
+++ b/plugins/input/csv/csv_index_featureset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/csv/csv_inline_featureset.cpp b/plugins/input/csv/csv_inline_featureset.cpp
index 2d91efcf4..893410fb9 100644
--- a/plugins/input/csv/csv_inline_featureset.cpp
+++ b/plugins/input/csv/csv_inline_featureset.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/csv/csv_inline_featureset.hpp b/plugins/input/csv/csv_inline_featureset.hpp
index 4873cecaa..342a5b2bb 100644
--- a/plugins/input/csv/csv_inline_featureset.hpp
+++ b/plugins/input/csv/csv_inline_featureset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/csv/csv_utils.cpp b/plugins/input/csv/csv_utils.cpp
index b9e7ea762..f52308f34 100644
--- a/plugins/input/csv/csv_utils.cpp
+++ b/plugins/input/csv/csv_utils.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/csv/csv_utils.hpp b/plugins/input/csv/csv_utils.hpp
index 73f9530e6..2fa6dfb9b 100644
--- a/plugins/input/csv/csv_utils.hpp
+++ b/plugins/input/csv/csv_utils.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/gdal/gdal_datasource.cpp b/plugins/input/gdal/gdal_datasource.cpp
index 2514b9455..b98ed1e93 100644
--- a/plugins/input/gdal/gdal_datasource.cpp
+++ b/plugins/input/gdal/gdal_datasource.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/gdal/gdal_datasource.hpp b/plugins/input/gdal/gdal_datasource.hpp
index 3fc3036c8..01b11924d 100644
--- a/plugins/input/gdal/gdal_datasource.hpp
+++ b/plugins/input/gdal/gdal_datasource.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/gdal/gdal_featureset.cpp b/plugins/input/gdal/gdal_featureset.cpp
index 1377322e3..70d8ef73b 100644
--- a/plugins/input/gdal/gdal_featureset.cpp
+++ b/plugins/input/gdal/gdal_featureset.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/gdal/gdal_featureset.hpp b/plugins/input/gdal/gdal_featureset.hpp
index f2f66f796..3d0ebeafc 100644
--- a/plugins/input/gdal/gdal_featureset.hpp
+++ b/plugins/input/gdal/gdal_featureset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/geojson/geojson_datasource.cpp b/plugins/input/geojson/geojson_datasource.cpp
index 6c5ce0727..c3b2b6664 100644
--- a/plugins/input/geojson/geojson_datasource.cpp
+++ b/plugins/input/geojson/geojson_datasource.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/geojson/geojson_datasource.hpp b/plugins/input/geojson/geojson_datasource.hpp
index e295cb1d6..122afec8f 100644
--- a/plugins/input/geojson/geojson_datasource.hpp
+++ b/plugins/input/geojson/geojson_datasource.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/geojson/geojson_featureset.cpp b/plugins/input/geojson/geojson_featureset.cpp
index 1976f03ba..1d718527b 100644
--- a/plugins/input/geojson/geojson_featureset.cpp
+++ b/plugins/input/geojson/geojson_featureset.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/geojson/geojson_featureset.hpp b/plugins/input/geojson/geojson_featureset.hpp
index e055b9777..995df35ce 100644
--- a/plugins/input/geojson/geojson_featureset.hpp
+++ b/plugins/input/geojson/geojson_featureset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/geojson/geojson_index_featureset.cpp b/plugins/input/geojson/geojson_index_featureset.cpp
index 1f623aa62..2b250e1d1 100644
--- a/plugins/input/geojson/geojson_index_featureset.cpp
+++ b/plugins/input/geojson/geojson_index_featureset.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/geojson/geojson_index_featureset.hpp b/plugins/input/geojson/geojson_index_featureset.hpp
index 41e8e84ba..9b9b03428 100644
--- a/plugins/input/geojson/geojson_index_featureset.hpp
+++ b/plugins/input/geojson/geojson_index_featureset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/geojson/geojson_memory_index_featureset.cpp b/plugins/input/geojson/geojson_memory_index_featureset.cpp
index d4872c30d..194669364 100644
--- a/plugins/input/geojson/geojson_memory_index_featureset.cpp
+++ b/plugins/input/geojson/geojson_memory_index_featureset.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/geojson/geojson_memory_index_featureset.hpp b/plugins/input/geojson/geojson_memory_index_featureset.hpp
index a29751d67..888ccd52d 100644
--- a/plugins/input/geojson/geojson_memory_index_featureset.hpp
+++ b/plugins/input/geojson/geojson_memory_index_featureset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/ogr/ogr_converter.cpp b/plugins/input/ogr/ogr_converter.cpp
index 207c0e1e4..d3ec5ac2d 100644
--- a/plugins/input/ogr/ogr_converter.cpp
+++ b/plugins/input/ogr/ogr_converter.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/ogr/ogr_converter.hpp b/plugins/input/ogr/ogr_converter.hpp
index 8b7f909af..452ee250e 100644
--- a/plugins/input/ogr/ogr_converter.hpp
+++ b/plugins/input/ogr/ogr_converter.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/ogr/ogr_datasource.cpp b/plugins/input/ogr/ogr_datasource.cpp
index 706a376e3..b23304968 100644
--- a/plugins/input/ogr/ogr_datasource.cpp
+++ b/plugins/input/ogr/ogr_datasource.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/ogr/ogr_datasource.hpp b/plugins/input/ogr/ogr_datasource.hpp
index 0edeae9dc..b382d5faf 100644
--- a/plugins/input/ogr/ogr_datasource.hpp
+++ b/plugins/input/ogr/ogr_datasource.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/ogr/ogr_featureset.cpp b/plugins/input/ogr/ogr_featureset.cpp
index f5b28041d..8b97a79e6 100644
--- a/plugins/input/ogr/ogr_featureset.cpp
+++ b/plugins/input/ogr/ogr_featureset.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/ogr/ogr_featureset.hpp b/plugins/input/ogr/ogr_featureset.hpp
index 6a594ec52..8f73cc6df 100644
--- a/plugins/input/ogr/ogr_featureset.hpp
+++ b/plugins/input/ogr/ogr_featureset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/ogr/ogr_index.hpp b/plugins/input/ogr/ogr_index.hpp
index e661d21b0..3df1b5b2c 100644
--- a/plugins/input/ogr/ogr_index.hpp
+++ b/plugins/input/ogr/ogr_index.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/ogr/ogr_index_featureset.cpp b/plugins/input/ogr/ogr_index_featureset.cpp
index a2442475b..e03713e7f 100644
--- a/plugins/input/ogr/ogr_index_featureset.cpp
+++ b/plugins/input/ogr/ogr_index_featureset.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/ogr/ogr_index_featureset.hpp b/plugins/input/ogr/ogr_index_featureset.hpp
index 93d3a327f..961e1c259 100644
--- a/plugins/input/ogr/ogr_index_featureset.hpp
+++ b/plugins/input/ogr/ogr_index_featureset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/ogr/ogr_layer_ptr.hpp b/plugins/input/ogr/ogr_layer_ptr.hpp
index 28df28b21..2c50816d9 100644
--- a/plugins/input/ogr/ogr_layer_ptr.hpp
+++ b/plugins/input/ogr/ogr_layer_ptr.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/pgraster/pgraster_datasource.cpp b/plugins/input/pgraster/pgraster_datasource.cpp
index 21ee69aa6..2841a1da7 100644
--- a/plugins/input/pgraster/pgraster_datasource.cpp
+++ b/plugins/input/pgraster/pgraster_datasource.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/pgraster/pgraster_datasource.hpp b/plugins/input/pgraster/pgraster_datasource.hpp
index 321e36635..3fc6d114f 100644
--- a/plugins/input/pgraster/pgraster_datasource.hpp
+++ b/plugins/input/pgraster/pgraster_datasource.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/pgraster/pgraster_featureset.cpp b/plugins/input/pgraster/pgraster_featureset.cpp
index 781f06958..8cf596ead 100644
--- a/plugins/input/pgraster/pgraster_featureset.cpp
+++ b/plugins/input/pgraster/pgraster_featureset.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/pgraster/pgraster_featureset.hpp b/plugins/input/pgraster/pgraster_featureset.hpp
index 25319b31a..5e784919e 100644
--- a/plugins/input/pgraster/pgraster_featureset.hpp
+++ b/plugins/input/pgraster/pgraster_featureset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/pgraster/pgraster_wkb_reader.cpp b/plugins/input/pgraster/pgraster_wkb_reader.cpp
index 4a9fd1c8f..6792e93aa 100644
--- a/plugins/input/pgraster/pgraster_wkb_reader.cpp
+++ b/plugins/input/pgraster/pgraster_wkb_reader.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/pgraster/pgraster_wkb_reader.hpp b/plugins/input/pgraster/pgraster_wkb_reader.hpp
index 02a22bc4a..35480fcfa 100644
--- a/plugins/input/pgraster/pgraster_wkb_reader.hpp
+++ b/plugins/input/pgraster/pgraster_wkb_reader.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/postgis/asyncresultset.hpp b/plugins/input/postgis/asyncresultset.hpp
index 9c30d57f3..68a5058e0 100644
--- a/plugins/input/postgis/asyncresultset.hpp
+++ b/plugins/input/postgis/asyncresultset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
-  * Copyright (C) 2015 Artem Pavlenko
+  * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/postgis/connection.hpp b/plugins/input/postgis/connection.hpp
index 3d33a2d67..d241eced2 100644
--- a/plugins/input/postgis/connection.hpp
+++ b/plugins/input/postgis/connection.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/postgis/connection_manager.hpp b/plugins/input/postgis/connection_manager.hpp
index 73656cbbc..e3de59191 100644
--- a/plugins/input/postgis/connection_manager.hpp
+++ b/plugins/input/postgis/connection_manager.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/postgis/cursorresultset.hpp b/plugins/input/postgis/cursorresultset.hpp
index 63bb9429c..b4bd1d5da 100644
--- a/plugins/input/postgis/cursorresultset.hpp
+++ b/plugins/input/postgis/cursorresultset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/postgis/numeric2string.hpp b/plugins/input/postgis/numeric2string.hpp
index 76c204f0c..35381f07e 100644
--- a/plugins/input/postgis/numeric2string.hpp
+++ b/plugins/input/postgis/numeric2string.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/postgis/postgis_datasource.cpp b/plugins/input/postgis/postgis_datasource.cpp
index 02fc0c3b3..6a1a9b645 100644
--- a/plugins/input/postgis/postgis_datasource.cpp
+++ b/plugins/input/postgis/postgis_datasource.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/postgis/postgis_datasource.hpp b/plugins/input/postgis/postgis_datasource.hpp
index 229fc831a..f16be4e73 100644
--- a/plugins/input/postgis/postgis_datasource.hpp
+++ b/plugins/input/postgis/postgis_datasource.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/postgis/postgis_featureset.cpp b/plugins/input/postgis/postgis_featureset.cpp
index 1b00cdb01..d0eed531a 100644
--- a/plugins/input/postgis/postgis_featureset.cpp
+++ b/plugins/input/postgis/postgis_featureset.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/postgis/postgis_featureset.hpp b/plugins/input/postgis/postgis_featureset.hpp
index 9ef8cb392..bc64132e6 100644
--- a/plugins/input/postgis/postgis_featureset.hpp
+++ b/plugins/input/postgis/postgis_featureset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/postgis/resultset.hpp b/plugins/input/postgis/resultset.hpp
index 915a5962d..dbbc8771b 100644
--- a/plugins/input/postgis/resultset.hpp
+++ b/plugins/input/postgis/resultset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/raster/raster_datasource.cpp b/plugins/input/raster/raster_datasource.cpp
index e059247cd..cfdfccda7 100644
--- a/plugins/input/raster/raster_datasource.cpp
+++ b/plugins/input/raster/raster_datasource.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/raster/raster_datasource.hpp b/plugins/input/raster/raster_datasource.hpp
index 7ff099086..16de84cb3 100644
--- a/plugins/input/raster/raster_datasource.hpp
+++ b/plugins/input/raster/raster_datasource.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/raster/raster_featureset.cpp b/plugins/input/raster/raster_featureset.cpp
index 26cac964f..4a4cf441e 100644
--- a/plugins/input/raster/raster_featureset.cpp
+++ b/plugins/input/raster/raster_featureset.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/raster/raster_featureset.hpp b/plugins/input/raster/raster_featureset.hpp
index 007689275..1b0b0222a 100644
--- a/plugins/input/raster/raster_featureset.hpp
+++ b/plugins/input/raster/raster_featureset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/raster/raster_info.cpp b/plugins/input/raster/raster_info.cpp
index 54b17c412..529f36dec 100644
--- a/plugins/input/raster/raster_info.cpp
+++ b/plugins/input/raster/raster_info.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/raster/raster_info.hpp b/plugins/input/raster/raster_info.hpp
index f0208425a..356d4193d 100644
--- a/plugins/input/raster/raster_info.hpp
+++ b/plugins/input/raster/raster_info.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/shape/dbf_test.cpp b/plugins/input/shape/dbf_test.cpp
index c5e22f576..5c37bf293 100644
--- a/plugins/input/shape/dbf_test.cpp
+++ b/plugins/input/shape/dbf_test.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/shape/dbfile.cpp b/plugins/input/shape/dbfile.cpp
index 36d9a964c..eba91d1cf 100644
--- a/plugins/input/shape/dbfile.cpp
+++ b/plugins/input/shape/dbfile.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/shape/dbfile.hpp b/plugins/input/shape/dbfile.hpp
index 9ff022400..d19817a27 100644
--- a/plugins/input/shape/dbfile.hpp
+++ b/plugins/input/shape/dbfile.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/shape/shape_datasource.cpp b/plugins/input/shape/shape_datasource.cpp
index 9c9015879..bc52acf50 100644
--- a/plugins/input/shape/shape_datasource.cpp
+++ b/plugins/input/shape/shape_datasource.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/shape/shape_datasource.hpp b/plugins/input/shape/shape_datasource.hpp
index 016d5cb57..a5332eb8b 100644
--- a/plugins/input/shape/shape_datasource.hpp
+++ b/plugins/input/shape/shape_datasource.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/shape/shape_featureset.cpp b/plugins/input/shape/shape_featureset.cpp
index 490fa3d5e..46e482d3d 100644
--- a/plugins/input/shape/shape_featureset.cpp
+++ b/plugins/input/shape/shape_featureset.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/shape/shape_featureset.hpp b/plugins/input/shape/shape_featureset.hpp
index cfd440bca..b1f0b9f6f 100644
--- a/plugins/input/shape/shape_featureset.hpp
+++ b/plugins/input/shape/shape_featureset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/shape/shape_index_featureset.cpp b/plugins/input/shape/shape_index_featureset.cpp
index c4b1918d8..d32bcba78 100644
--- a/plugins/input/shape/shape_index_featureset.cpp
+++ b/plugins/input/shape/shape_index_featureset.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/shape/shape_index_featureset.hpp b/plugins/input/shape/shape_index_featureset.hpp
index bd8eecfe7..660204a82 100644
--- a/plugins/input/shape/shape_index_featureset.hpp
+++ b/plugins/input/shape/shape_index_featureset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/shape/shape_io.cpp b/plugins/input/shape/shape_io.cpp
index 9ccfb91dd..cd4e910ef 100644
--- a/plugins/input/shape/shape_io.cpp
+++ b/plugins/input/shape/shape_io.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/shape/shape_io.hpp b/plugins/input/shape/shape_io.hpp
index 1828ebd54..772bcb508 100644
--- a/plugins/input/shape/shape_io.hpp
+++ b/plugins/input/shape/shape_io.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/shape/shape_utils.cpp b/plugins/input/shape/shape_utils.cpp
index 40d8fc6c3..4a6c8acd1 100644
--- a/plugins/input/shape/shape_utils.cpp
+++ b/plugins/input/shape/shape_utils.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/shape/shape_utils.hpp b/plugins/input/shape/shape_utils.hpp
index edb22225b..c77625e14 100644
--- a/plugins/input/shape/shape_utils.hpp
+++ b/plugins/input/shape/shape_utils.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/shape/shapefile.hpp b/plugins/input/shape/shapefile.hpp
index 15e5c7757..2db0f0419 100644
--- a/plugins/input/shape/shapefile.hpp
+++ b/plugins/input/shape/shapefile.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/sqlite/sqlite_connection.hpp b/plugins/input/sqlite/sqlite_connection.hpp
index c87086d78..bc3c0d89b 100644
--- a/plugins/input/sqlite/sqlite_connection.hpp
+++ b/plugins/input/sqlite/sqlite_connection.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/sqlite/sqlite_datasource.cpp b/plugins/input/sqlite/sqlite_datasource.cpp
index 74b936668..e76ef41bb 100644
--- a/plugins/input/sqlite/sqlite_datasource.cpp
+++ b/plugins/input/sqlite/sqlite_datasource.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/sqlite/sqlite_datasource.hpp b/plugins/input/sqlite/sqlite_datasource.hpp
index 5551d65aa..fc52eb873 100644
--- a/plugins/input/sqlite/sqlite_datasource.hpp
+++ b/plugins/input/sqlite/sqlite_datasource.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/sqlite/sqlite_featureset.cpp b/plugins/input/sqlite/sqlite_featureset.cpp
index 93d977a02..80cdcfcdd 100644
--- a/plugins/input/sqlite/sqlite_featureset.cpp
+++ b/plugins/input/sqlite/sqlite_featureset.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/sqlite/sqlite_featureset.hpp b/plugins/input/sqlite/sqlite_featureset.hpp
index dc168676e..9e2f1c20a 100644
--- a/plugins/input/sqlite/sqlite_featureset.hpp
+++ b/plugins/input/sqlite/sqlite_featureset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/sqlite/sqlite_prepared.hpp b/plugins/input/sqlite/sqlite_prepared.hpp
index db1355d67..8cb6a64c2 100644
--- a/plugins/input/sqlite/sqlite_prepared.hpp
+++ b/plugins/input/sqlite/sqlite_prepared.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/sqlite/sqlite_resultset.hpp b/plugins/input/sqlite/sqlite_resultset.hpp
index 6046387f9..042e02d07 100644
--- a/plugins/input/sqlite/sqlite_resultset.hpp
+++ b/plugins/input/sqlite/sqlite_resultset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/sqlite/sqlite_utils.hpp b/plugins/input/sqlite/sqlite_utils.hpp
index 58091a42d..235b9c035 100644
--- a/plugins/input/sqlite/sqlite_utils.hpp
+++ b/plugins/input/sqlite/sqlite_utils.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/topojson/topojson_datasource.cpp b/plugins/input/topojson/topojson_datasource.cpp
index 0c9b99a5e..863b0060e 100644
--- a/plugins/input/topojson/topojson_datasource.cpp
+++ b/plugins/input/topojson/topojson_datasource.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/topojson/topojson_datasource.hpp b/plugins/input/topojson/topojson_datasource.hpp
index ebc92aea2..b4604a48a 100644
--- a/plugins/input/topojson/topojson_datasource.hpp
+++ b/plugins/input/topojson/topojson_datasource.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/topojson/topojson_featureset.cpp b/plugins/input/topojson/topojson_featureset.cpp
index 36dbdf9db..2cad74123 100644
--- a/plugins/input/topojson/topojson_featureset.cpp
+++ b/plugins/input/topojson/topojson_featureset.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/plugins/input/topojson/topojson_featureset.hpp b/plugins/input/topojson/topojson_featureset.hpp
index 44f833512..f767f0881 100644
--- a/plugins/input/topojson/topojson_featureset.hpp
+++ b/plugins/input/topojson/topojson_featureset.hpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp
index dc2c21514..e243b227a 100644
--- a/src/agg/agg_renderer.cpp
+++ b/src/agg/agg_renderer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/agg/process_building_symbolizer.cpp b/src/agg/process_building_symbolizer.cpp
index 6bcee3457..0ef057a26 100644
--- a/src/agg/process_building_symbolizer.cpp
+++ b/src/agg/process_building_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/agg/process_debug_symbolizer.cpp b/src/agg/process_debug_symbolizer.cpp
index 3c3f898f8..df5e980c7 100644
--- a/src/agg/process_debug_symbolizer.cpp
+++ b/src/agg/process_debug_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/agg/process_dot_symbolizer.cpp b/src/agg/process_dot_symbolizer.cpp
index cfb58c6e9..c612a0e26 100644
--- a/src/agg/process_dot_symbolizer.cpp
+++ b/src/agg/process_dot_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/agg/process_group_symbolizer.cpp b/src/agg/process_group_symbolizer.cpp
index 6ba5605dc..2367c39e4 100644
--- a/src/agg/process_group_symbolizer.cpp
+++ b/src/agg/process_group_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/agg/process_line_pattern_symbolizer.cpp b/src/agg/process_line_pattern_symbolizer.cpp
index e8770e2cd..bfd344203 100644
--- a/src/agg/process_line_pattern_symbolizer.cpp
+++ b/src/agg/process_line_pattern_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/agg/process_line_symbolizer.cpp b/src/agg/process_line_symbolizer.cpp
index e8435a0a0..8bc73c2a7 100644
--- a/src/agg/process_line_symbolizer.cpp
+++ b/src/agg/process_line_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp
index 3fc122dcb..ba1fa884c 100644
--- a/src/agg/process_markers_symbolizer.cpp
+++ b/src/agg/process_markers_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/agg/process_point_symbolizer.cpp b/src/agg/process_point_symbolizer.cpp
index bb54db51c..2ed9675ab 100644
--- a/src/agg/process_point_symbolizer.cpp
+++ b/src/agg/process_point_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/agg/process_polygon_pattern_symbolizer.cpp b/src/agg/process_polygon_pattern_symbolizer.cpp
index 5e017cf7e..5675bdb00 100644
--- a/src/agg/process_polygon_pattern_symbolizer.cpp
+++ b/src/agg/process_polygon_pattern_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/agg/process_polygon_symbolizer.cpp b/src/agg/process_polygon_symbolizer.cpp
index bd2d2bc15..94451641f 100644
--- a/src/agg/process_polygon_symbolizer.cpp
+++ b/src/agg/process_polygon_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/agg/process_raster_symbolizer.cpp b/src/agg/process_raster_symbolizer.cpp
index 746a5cc2b..18c2926cf 100644
--- a/src/agg/process_raster_symbolizer.cpp
+++ b/src/agg/process_raster_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/agg/process_shield_symbolizer.cpp b/src/agg/process_shield_symbolizer.cpp
index 3d28eff60..c583a6a34 100644
--- a/src/agg/process_shield_symbolizer.cpp
+++ b/src/agg/process_shield_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/agg/process_text_symbolizer.cpp b/src/agg/process_text_symbolizer.cpp
index 685b66c95..e9b3d8f0f 100644
--- a/src/agg/process_text_symbolizer.cpp
+++ b/src/agg/process_text_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/cairo/cairo_context.cpp b/src/cairo/cairo_context.cpp
index cb9216df4..3dae97105 100644
--- a/src/cairo/cairo_context.cpp
+++ b/src/cairo/cairo_context.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/cairo/cairo_render_vector.cpp b/src/cairo/cairo_render_vector.cpp
index 160002dd2..22f2e7da7 100644
--- a/src/cairo/cairo_render_vector.cpp
+++ b/src/cairo/cairo_render_vector.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/cairo/cairo_renderer.cpp b/src/cairo/cairo_renderer.cpp
index 2f845a53a..ff29f7457 100644
--- a/src/cairo/cairo_renderer.cpp
+++ b/src/cairo/cairo_renderer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/cairo/process_building_symbolizer.cpp b/src/cairo/process_building_symbolizer.cpp
index cc4c6baf5..af305a2e6 100644
--- a/src/cairo/process_building_symbolizer.cpp
+++ b/src/cairo/process_building_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/cairo/process_debug_symbolizer.cpp b/src/cairo/process_debug_symbolizer.cpp
index 8c78a82b5..627c4586f 100644
--- a/src/cairo/process_debug_symbolizer.cpp
+++ b/src/cairo/process_debug_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/cairo/process_group_symbolizer.cpp b/src/cairo/process_group_symbolizer.cpp
index 0885df49d..fa7b1e628 100644
--- a/src/cairo/process_group_symbolizer.cpp
+++ b/src/cairo/process_group_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/cairo/process_line_pattern_symbolizer.cpp b/src/cairo/process_line_pattern_symbolizer.cpp
index e4ae6f609..65ec43500 100644
--- a/src/cairo/process_line_pattern_symbolizer.cpp
+++ b/src/cairo/process_line_pattern_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/cairo/process_line_symbolizer.cpp b/src/cairo/process_line_symbolizer.cpp
index d567ced88..6a798582e 100644
--- a/src/cairo/process_line_symbolizer.cpp
+++ b/src/cairo/process_line_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/cairo/process_markers_symbolizer.cpp b/src/cairo/process_markers_symbolizer.cpp
index 73b84ecb7..f6b18fd2a 100644
--- a/src/cairo/process_markers_symbolizer.cpp
+++ b/src/cairo/process_markers_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/cairo/process_point_symbolizer.cpp b/src/cairo/process_point_symbolizer.cpp
index b0ffefb80..a9ee159d1 100644
--- a/src/cairo/process_point_symbolizer.cpp
+++ b/src/cairo/process_point_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/cairo/process_polygon_pattern_symbolizer.cpp b/src/cairo/process_polygon_pattern_symbolizer.cpp
index 4e21234b8..4578cac5a 100644
--- a/src/cairo/process_polygon_pattern_symbolizer.cpp
+++ b/src/cairo/process_polygon_pattern_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/cairo/process_polygon_symbolizer.cpp b/src/cairo/process_polygon_symbolizer.cpp
index b2558a46a..360b28d3f 100644
--- a/src/cairo/process_polygon_symbolizer.cpp
+++ b/src/cairo/process_polygon_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/cairo/process_raster_symbolizer.cpp b/src/cairo/process_raster_symbolizer.cpp
index 658ad8373..bd297ec6d 100644
--- a/src/cairo/process_raster_symbolizer.cpp
+++ b/src/cairo/process_raster_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/cairo/process_text_symbolizer.cpp b/src/cairo/process_text_symbolizer.cpp
index 2d34e213c..548c2bf94 100644
--- a/src/cairo/process_text_symbolizer.cpp
+++ b/src/cairo/process_text_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/cairo_io.cpp b/src/cairo_io.cpp
index 96152cc92..30f54d8f0 100644
--- a/src/cairo_io.cpp
+++ b/src/cairo_io.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/color.cpp b/src/color.cpp
index 1804d5107..325f690f5 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/color_factory.cpp b/src/color_factory.cpp
index 83956d71f..e3607fa26 100644
--- a/src/color_factory.cpp
+++ b/src/color_factory.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/dasharray_parser.cpp b/src/dasharray_parser.cpp
index 3c884cb3f..e42182c0c 100644
--- a/src/dasharray_parser.cpp
+++ b/src/dasharray_parser.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/datasource_cache.cpp b/src/datasource_cache.cpp
index 3759a6ceb..ccb6a19c2 100644
--- a/src/datasource_cache.cpp
+++ b/src/datasource_cache.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/datasource_cache_static.cpp b/src/datasource_cache_static.cpp
index ba79d1d01..38d87f273 100644
--- a/src/datasource_cache_static.cpp
+++ b/src/datasource_cache_static.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/debug.cpp b/src/debug.cpp
index d1ae15fa4..affb39491 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/expression.cpp b/src/expression.cpp
index c935324af..7c3726682 100644
--- a/src/expression.cpp
+++ b/src/expression.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/expression_grammar_x3.cpp b/src/expression_grammar_x3.cpp
index f55e7cc3b..07d4a8ece 100644
--- a/src/expression_grammar_x3.cpp
+++ b/src/expression_grammar_x3.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/expression_node.cpp b/src/expression_node.cpp
index 9b78b5a04..62d19fd4f 100644
--- a/src/expression_node.cpp
+++ b/src/expression_node.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/expression_string.cpp b/src/expression_string.cpp
index a10a85da2..471acc50e 100644
--- a/src/expression_string.cpp
+++ b/src/expression_string.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/feature_kv_iterator.cpp b/src/feature_kv_iterator.cpp
index 4ae384254..6853bc503 100644
--- a/src/feature_kv_iterator.cpp
+++ b/src/feature_kv_iterator.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/feature_style_processor.cpp b/src/feature_style_processor.cpp
index c041016d6..f923128da 100644
--- a/src/feature_style_processor.cpp
+++ b/src/feature_style_processor.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/feature_type_style.cpp b/src/feature_type_style.cpp
index 6d0ee13fd..0fdf67536 100644
--- a/src/feature_type_style.cpp
+++ b/src/feature_type_style.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/font_engine_freetype.cpp b/src/font_engine_freetype.cpp
index 29e34a769..a325ada42 100644
--- a/src/font_engine_freetype.cpp
+++ b/src/font_engine_freetype.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/font_set.cpp b/src/font_set.cpp
index 9236cac32..cb06be77f 100644
--- a/src/font_set.cpp
+++ b/src/font_set.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/fs.cpp b/src/fs.cpp
index 640345396..3ed841e1e 100644
--- a/src/fs.cpp
+++ b/src/fs.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/function_call.cpp b/src/function_call.cpp
index e813deef7..6326becfa 100644
--- a/src/function_call.cpp
+++ b/src/function_call.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/geometry/envelope.cpp b/src/geometry/envelope.cpp
index b2049821b..cb4b61371 100644
--- a/src/geometry/envelope.cpp
+++ b/src/geometry/envelope.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/geometry/reprojection.cpp b/src/geometry/reprojection.cpp
index 59cbd1ef5..8f4ae742c 100644
--- a/src/geometry/reprojection.cpp
+++ b/src/geometry/reprojection.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/gradient.cpp b/src/gradient.cpp
index 0c9c6b8fa..3066f87ce 100644
--- a/src/gradient.cpp
+++ b/src/gradient.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/grid/grid.cpp b/src/grid/grid.cpp
index b0d3d598d..678584412 100644
--- a/src/grid/grid.cpp
+++ b/src/grid/grid.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/grid/grid_renderer.cpp b/src/grid/grid_renderer.cpp
index fd970f580..593a7ee21 100644
--- a/src/grid/grid_renderer.cpp
+++ b/src/grid/grid_renderer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/grid/process_building_symbolizer.cpp b/src/grid/process_building_symbolizer.cpp
index f3fb0f76d..14893ce0f 100644
--- a/src/grid/process_building_symbolizer.cpp
+++ b/src/grid/process_building_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/grid/process_group_symbolizer.cpp b/src/grid/process_group_symbolizer.cpp
index ba7f48ece..0c484445b 100644
--- a/src/grid/process_group_symbolizer.cpp
+++ b/src/grid/process_group_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/grid/process_line_pattern_symbolizer.cpp b/src/grid/process_line_pattern_symbolizer.cpp
index af54ac5b6..d45025bb3 100644
--- a/src/grid/process_line_pattern_symbolizer.cpp
+++ b/src/grid/process_line_pattern_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/grid/process_line_symbolizer.cpp b/src/grid/process_line_symbolizer.cpp
index 7bb126298..3901ff3a3 100644
--- a/src/grid/process_line_symbolizer.cpp
+++ b/src/grid/process_line_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/grid/process_markers_symbolizer.cpp b/src/grid/process_markers_symbolizer.cpp
index 380923211..05570a1a1 100644
--- a/src/grid/process_markers_symbolizer.cpp
+++ b/src/grid/process_markers_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/grid/process_point_symbolizer.cpp b/src/grid/process_point_symbolizer.cpp
index 60328009d..e8c364965 100644
--- a/src/grid/process_point_symbolizer.cpp
+++ b/src/grid/process_point_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/grid/process_polygon_pattern_symbolizer.cpp b/src/grid/process_polygon_pattern_symbolizer.cpp
index 03e27c65d..d0ff02107 100644
--- a/src/grid/process_polygon_pattern_symbolizer.cpp
+++ b/src/grid/process_polygon_pattern_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/grid/process_polygon_symbolizer.cpp b/src/grid/process_polygon_symbolizer.cpp
index ab8526252..c951d1a81 100644
--- a/src/grid/process_polygon_symbolizer.cpp
+++ b/src/grid/process_polygon_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/grid/process_raster_symbolizer.cpp b/src/grid/process_raster_symbolizer.cpp
index 9e392a720..413f6e1ff 100644
--- a/src/grid/process_raster_symbolizer.cpp
+++ b/src/grid/process_raster_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/grid/process_shield_symbolizer.cpp b/src/grid/process_shield_symbolizer.cpp
index 0463bee8e..54c2dea12 100644
--- a/src/grid/process_shield_symbolizer.cpp
+++ b/src/grid/process_shield_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/grid/process_text_symbolizer.cpp b/src/grid/process_text_symbolizer.cpp
index d1b6a17b4..a28165f92 100644
--- a/src/grid/process_text_symbolizer.cpp
+++ b/src/grid/process_text_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/group/group_layout_manager.cpp b/src/group/group_layout_manager.cpp
index a6b60d0ae..dd5f2099a 100644
--- a/src/group/group_layout_manager.cpp
+++ b/src/group/group_layout_manager.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/group/group_rule.cpp b/src/group/group_rule.cpp
index a1a6bf940..56beb819b 100644
--- a/src/group/group_rule.cpp
+++ b/src/group/group_rule.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/group/group_symbolizer_helper.cpp b/src/group/group_symbolizer_helper.cpp
index c1c360d19..4643595a4 100644
--- a/src/group/group_symbolizer_helper.cpp
+++ b/src/group/group_symbolizer_helper.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/image.cpp b/src/image.cpp
index 9772fb7dc..086749cd0 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/image_any.cpp b/src/image_any.cpp
index 5ba0c3947..4dfb39fa1 100644
--- a/src/image_any.cpp
+++ b/src/image_any.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/image_compositing.cpp b/src/image_compositing.cpp
index d6c8a3333..6fe319b52 100644
--- a/src/image_compositing.cpp
+++ b/src/image_compositing.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/image_copy.cpp b/src/image_copy.cpp
index 04fa75c32..8611e83e8 100644
--- a/src/image_copy.cpp
+++ b/src/image_copy.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/image_options.cpp b/src/image_options.cpp
index 7494838cf..f3b76dd45 100644
--- a/src/image_options.cpp
+++ b/src/image_options.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/image_reader.cpp b/src/image_reader.cpp
index d0ec815b9..b37ad06e1 100644
--- a/src/image_reader.cpp
+++ b/src/image_reader.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/image_scaling.cpp b/src/image_scaling.cpp
index 413948c64..a2ed8ea53 100644
--- a/src/image_scaling.cpp
+++ b/src/image_scaling.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/image_util.cpp b/src/image_util.cpp
index 1fec8b130..1eddb4c0c 100644
--- a/src/image_util.cpp
+++ b/src/image_util.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/image_util_jpeg.cpp b/src/image_util_jpeg.cpp
index 32d1979a3..5abf8a21d 100644
--- a/src/image_util_jpeg.cpp
+++ b/src/image_util_jpeg.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/image_util_png.cpp b/src/image_util_png.cpp
index 322acd226..412060f13 100644
--- a/src/image_util_png.cpp
+++ b/src/image_util_png.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/image_util_tiff.cpp b/src/image_util_tiff.cpp
index 68ef9d9f8..1a0573cb8 100644
--- a/src/image_util_tiff.cpp
+++ b/src/image_util_tiff.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/image_util_webp.cpp b/src/image_util_webp.cpp
index 99e6690cc..86713ed85 100644
--- a/src/image_util_webp.cpp
+++ b/src/image_util_webp.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/image_view.cpp b/src/image_view.cpp
index 345b2a5d1..5e51327c7 100644
--- a/src/image_view.cpp
+++ b/src/image_view.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/image_view_any.cpp b/src/image_view_any.cpp
index 6fbbd7be4..80391e164 100644
--- a/src/image_view_any.cpp
+++ b/src/image_view_any.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/jpeg_reader.cpp b/src/jpeg_reader.cpp
index 6b6e1b127..57c358fb9 100644
--- a/src/jpeg_reader.cpp
+++ b/src/jpeg_reader.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/json/mapnik_geometry_to_geojson.cpp b/src/json/mapnik_geometry_to_geojson.cpp
index ab2618093..9b76b0648 100644
--- a/src/json/mapnik_geometry_to_geojson.cpp
+++ b/src/json/mapnik_geometry_to_geojson.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/json/mapnik_json_generator_grammar.cpp b/src/json/mapnik_json_generator_grammar.cpp
index 6b8edd136..5e5241fc5 100644
--- a/src/json/mapnik_json_generator_grammar.cpp
+++ b/src/json/mapnik_json_generator_grammar.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/layer.cpp b/src/layer.cpp
index a923ae11b..78cdd2cd2 100644
--- a/src/layer.cpp
+++ b/src/layer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/libxml2_loader.cpp b/src/libxml2_loader.cpp
index 3c904074c..b1216e6d4 100644
--- a/src/libxml2_loader.cpp
+++ b/src/libxml2_loader.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/load_map.cpp b/src/load_map.cpp
index bf6324d20..f70835ab3 100644
--- a/src/load_map.cpp
+++ b/src/load_map.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/map.cpp b/src/map.cpp
index dc3d53040..23d6d92f1 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/mapped_memory_cache.cpp b/src/mapped_memory_cache.cpp
index f35a379af..03654a6d7 100644
--- a/src/mapped_memory_cache.cpp
+++ b/src/mapped_memory_cache.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/marker_cache.cpp b/src/marker_cache.cpp
index 059280c6b..74ccf642d 100644
--- a/src/marker_cache.cpp
+++ b/src/marker_cache.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/marker_helpers.cpp b/src/marker_helpers.cpp
index eb0202169..86dcc8795 100644
--- a/src/marker_helpers.cpp
+++ b/src/marker_helpers.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/math.cpp b/src/math.cpp
index 1fd2a4fff..b8d1950cb 100644
--- a/src/math.cpp
+++ b/src/math.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/memory_datasource.cpp b/src/memory_datasource.cpp
index d4a2fdcf5..ded331e04 100644
--- a/src/memory_datasource.cpp
+++ b/src/memory_datasource.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/palette.cpp b/src/palette.cpp
index 1fc5b8b21..e1b8cad9e 100644
--- a/src/palette.cpp
+++ b/src/palette.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/params.cpp b/src/params.cpp
index 4a25c64a6..61a2dc61a 100644
--- a/src/params.cpp
+++ b/src/params.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/parse_image_filters.cpp b/src/parse_image_filters.cpp
index 09b2fe3a5..74c29261c 100644
--- a/src/parse_image_filters.cpp
+++ b/src/parse_image_filters.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/parse_transform.cpp b/src/parse_transform.cpp
index 06b189f35..a3698d0f4 100644
--- a/src/parse_transform.cpp
+++ b/src/parse_transform.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/plugin.cpp b/src/plugin.cpp
index b2186304d..2951979d3 100644
--- a/src/plugin.cpp
+++ b/src/plugin.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/png_reader.cpp b/src/png_reader.cpp
index 8c58b2238..4f70dd928 100644
--- a/src/png_reader.cpp
+++ b/src/png_reader.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/proj_transform.cpp b/src/proj_transform.cpp
index 9c23d805a..59e534e0c 100644
--- a/src/proj_transform.cpp
+++ b/src/proj_transform.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/projection.cpp b/src/projection.cpp
index 07f78ba11..10e7fd12b 100644
--- a/src/projection.cpp
+++ b/src/projection.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/rapidxml_loader.cpp b/src/rapidxml_loader.cpp
index 94e829405..976e14f96 100644
--- a/src/rapidxml_loader.cpp
+++ b/src/rapidxml_loader.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/raster_colorizer.cpp b/src/raster_colorizer.cpp
index b8dc077f9..897714605 100644
--- a/src/raster_colorizer.cpp
+++ b/src/raster_colorizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/renderer_common.cpp b/src/renderer_common.cpp
index d45e3a03c..4f19e82c5 100644
--- a/src/renderer_common.cpp
+++ b/src/renderer_common.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/renderer_common/render_pattern.cpp b/src/renderer_common/render_pattern.cpp
index 5e6f95820..60729c057 100644
--- a/src/renderer_common/render_pattern.cpp
+++ b/src/renderer_common/render_pattern.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/request.cpp b/src/request.cpp
index f74f62c38..2f5e2eddc 100644
--- a/src/request.cpp
+++ b/src/request.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/rule.cpp b/src/rule.cpp
index 2fec472a0..e6b2c0244 100644
--- a/src/rule.cpp
+++ b/src/rule.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/save_map.cpp b/src/save_map.cpp
index 4594a1e65..8e53630bf 100644
--- a/src/save_map.cpp
+++ b/src/save_map.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/scale_denominator.cpp b/src/scale_denominator.cpp
index 7e7b2f14d..fdd7fba7a 100644
--- a/src/scale_denominator.cpp
+++ b/src/scale_denominator.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/svg/output/process_line_symbolizer.cpp b/src/svg/output/process_line_symbolizer.cpp
index 5db205eff..e2063a6ce 100644
--- a/src/svg/output/process_line_symbolizer.cpp
+++ b/src/svg/output/process_line_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/svg/output/process_polygon_symbolizer.cpp b/src/svg/output/process_polygon_symbolizer.cpp
index c5a1f8709..be994ec1e 100644
--- a/src/svg/output/process_polygon_symbolizer.cpp
+++ b/src/svg/output/process_polygon_symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/svg/output/process_symbolizers.cpp b/src/svg/output/process_symbolizers.cpp
index 85f57768e..c7f7ec9a7 100644
--- a/src/svg/output/process_symbolizers.cpp
+++ b/src/svg/output/process_symbolizers.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/svg/output/svg_generator.cpp b/src/svg/output/svg_generator.cpp
index cb8eb79ec..9a353c087 100644
--- a/src/svg/output/svg_generator.cpp
+++ b/src/svg/output/svg_generator.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/svg/output/svg_output_attributes.cpp b/src/svg/output/svg_output_attributes.cpp
index bf05d874b..2612a71a3 100644
--- a/src/svg/output/svg_output_attributes.cpp
+++ b/src/svg/output/svg_output_attributes.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/svg/output/svg_output_grammars.cpp b/src/svg/output/svg_output_grammars.cpp
index 398c41a7e..b048968a1 100644
--- a/src/svg/output/svg_output_grammars.cpp
+++ b/src/svg/output/svg_output_grammars.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/svg/output/svg_renderer.cpp b/src/svg/output/svg_renderer.cpp
index 569164645..2519d54fa 100644
--- a/src/svg/output/svg_renderer.cpp
+++ b/src/svg/output/svg_renderer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/svg/svg_parser.cpp b/src/svg/svg_parser.cpp
index 0d4db78d4..b4d90cda7 100644
--- a/src/svg/svg_parser.cpp
+++ b/src/svg/svg_parser.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/svg/svg_path_parser.cpp b/src/svg/svg_path_parser.cpp
index 52f95ef6e..ba9b9c6f0 100644
--- a/src/svg/svg_path_parser.cpp
+++ b/src/svg/svg_path_parser.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/svg/svg_points_parser.cpp b/src/svg/svg_points_parser.cpp
index 3e292ba70..85e6663bb 100644
--- a/src/svg/svg_points_parser.cpp
+++ b/src/svg/svg_points_parser.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/svg/svg_transform_parser.cpp b/src/svg/svg_transform_parser.cpp
index 7b90ca4cb..78ac34609 100644
--- a/src/svg/svg_transform_parser.cpp
+++ b/src/svg/svg_transform_parser.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/symbolizer.cpp b/src/symbolizer.cpp
index 6d3109f8e..0dd2ae73b 100644
--- a/src/symbolizer.cpp
+++ b/src/symbolizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/symbolizer_enumerations.cpp b/src/symbolizer_enumerations.cpp
index 94227dfd2..1c8098271 100644
--- a/src/symbolizer_enumerations.cpp
+++ b/src/symbolizer_enumerations.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/symbolizer_keys.cpp b/src/symbolizer_keys.cpp
index fa5c73d32..46d15fa4c 100644
--- a/src/symbolizer_keys.cpp
+++ b/src/symbolizer_keys.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/face.cpp b/src/text/face.cpp
index b05f0d169..e79c99b6d 100644
--- a/src/text/face.cpp
+++ b/src/text/face.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/font_feature_settings.cpp b/src/text/font_feature_settings.cpp
index cf70c5d01..8a9b32b17 100644
--- a/src/text/font_feature_settings.cpp
+++ b/src/text/font_feature_settings.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/font_library.cpp b/src/text/font_library.cpp
index 37fd6a43b..2dca13fe6 100644
--- a/src/text/font_library.cpp
+++ b/src/text/font_library.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/formatting/base.cpp b/src/text/formatting/base.cpp
index 8d8f0a1bb..c4e59fcc5 100644
--- a/src/text/formatting/base.cpp
+++ b/src/text/formatting/base.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/formatting/format.cpp b/src/text/formatting/format.cpp
index 8a6a8cc9d..4f054af5f 100644
--- a/src/text/formatting/format.cpp
+++ b/src/text/formatting/format.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/formatting/layout.cpp b/src/text/formatting/layout.cpp
index 9a5ca10aa..711422b8e 100644
--- a/src/text/formatting/layout.cpp
+++ b/src/text/formatting/layout.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/formatting/list.cpp b/src/text/formatting/list.cpp
index 4bf7c4d2d..d1820d081 100644
--- a/src/text/formatting/list.cpp
+++ b/src/text/formatting/list.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/formatting/registry.cpp b/src/text/formatting/registry.cpp
index 6114f97e5..09c1ee89a 100644
--- a/src/text/formatting/registry.cpp
+++ b/src/text/formatting/registry.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/formatting/text.cpp b/src/text/formatting/text.cpp
index 3158f20e2..6cc70b09d 100644
--- a/src/text/formatting/text.cpp
+++ b/src/text/formatting/text.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/glyph_positions.cpp b/src/text/glyph_positions.cpp
index fdcb3a811..e56393c7c 100644
--- a/src/text/glyph_positions.cpp
+++ b/src/text/glyph_positions.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/itemizer.cpp b/src/text/itemizer.cpp
index 9f01035f1..bf8d4b725 100644
--- a/src/text/itemizer.cpp
+++ b/src/text/itemizer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/placement_finder.cpp b/src/text/placement_finder.cpp
index e6ae4d185..a580ac297 100644
--- a/src/text/placement_finder.cpp
+++ b/src/text/placement_finder.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/placements/base.cpp b/src/text/placements/base.cpp
index 861c5664a..b01adee66 100644
--- a/src/text/placements/base.cpp
+++ b/src/text/placements/base.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/placements/dummy.cpp b/src/text/placements/dummy.cpp
index dd51db8b8..76b8537cf 100644
--- a/src/text/placements/dummy.cpp
+++ b/src/text/placements/dummy.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/placements/list.cpp b/src/text/placements/list.cpp
index 7d609f2c4..ca3cda4b4 100644
--- a/src/text/placements/list.cpp
+++ b/src/text/placements/list.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/placements/registry.cpp b/src/text/placements/registry.cpp
index e24131d03..cd5f44d1a 100644
--- a/src/text/placements/registry.cpp
+++ b/src/text/placements/registry.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/placements/simple.cpp b/src/text/placements/simple.cpp
index 766d1381d..1edb0c19b 100644
--- a/src/text/placements/simple.cpp
+++ b/src/text/placements/simple.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/properties_util.cpp b/src/text/properties_util.cpp
index e08d4fd55..fa3e60d08 100644
--- a/src/text/properties_util.cpp
+++ b/src/text/properties_util.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/renderer.cpp b/src/text/renderer.cpp
index 163d11c6f..cace1e258 100644
--- a/src/text/renderer.cpp
+++ b/src/text/renderer.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/symbolizer_helpers.cpp b/src/text/symbolizer_helpers.cpp
index 384a7fe96..caa29da0f 100644
--- a/src/text/symbolizer_helpers.cpp
+++ b/src/text/symbolizer_helpers.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/text_layout.cpp b/src/text/text_layout.cpp
index 0846ea8d7..837ba0f45 100644
--- a/src/text/text_layout.cpp
+++ b/src/text/text_layout.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/text_line.cpp b/src/text/text_line.cpp
index 2d0516731..1325a23a7 100644
--- a/src/text/text_line.cpp
+++ b/src/text/text_line.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/text/text_properties.cpp b/src/text/text_properties.cpp
index db37f7e26..b25478db8 100644
--- a/src/text/text_properties.cpp
+++ b/src/text/text_properties.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/tiff_reader.cpp b/src/tiff_reader.cpp
index 157e4d0cb..b6ccef80e 100644
--- a/src/tiff_reader.cpp
+++ b/src/tiff_reader.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/transform_expression.cpp b/src/transform_expression.cpp
index 34c704866..d5f90879c 100644
--- a/src/transform_expression.cpp
+++ b/src/transform_expression.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/transform_expression_grammar_x3.cpp b/src/transform_expression_grammar_x3.cpp
index ab3d6a77b..7336dd005 100644
--- a/src/transform_expression_grammar_x3.cpp
+++ b/src/transform_expression_grammar_x3.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/unicode.cpp b/src/unicode.cpp
index 969926788..0c0d4a1ef 100644
--- a/src/unicode.cpp
+++ b/src/unicode.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/util/utf_conv_win.cpp b/src/util/utf_conv_win.cpp
index 7bfcbc29f..f3a41ec55 100644
--- a/src/util/utf_conv_win.cpp
+++ b/src/util/utf_conv_win.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/vertex_cache.cpp b/src/vertex_cache.cpp
index c0d575892..b6516953b 100644
--- a/src/vertex_cache.cpp
+++ b/src/vertex_cache.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/warp.cpp b/src/warp.cpp
index 29cfa44cc..26a76d401 100644
--- a/src/warp.cpp
+++ b/src/warp.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/webp_reader.cpp b/src/webp_reader.cpp
index f5fec3416..a1077bb5f 100644
--- a/src/webp_reader.cpp
+++ b/src/webp_reader.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/well_known_srs.cpp b/src/well_known_srs.cpp
index 445d84aee..7f8dec2a8 100644
--- a/src/well_known_srs.cpp
+++ b/src/well_known_srs.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/wkb.cpp b/src/wkb.cpp
index cf2fc9704..96f2a0c22 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/xml_tree.cpp b/src/xml_tree.cpp
index cd6cdaca3..8254c83ca 100644
--- a/src/xml_tree.cpp
+++ b/src/xml_tree.cpp
@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

From 84524107840d4a6511d8d16f6d39dfaeb291879a Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 20 Dec 2016 18:37:20 +0100
Subject: [PATCH 177/328] minor formatting

---
 plugins/input/ogr/ogr_index.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/input/ogr/ogr_index.hpp b/plugins/input/ogr/ogr_index.hpp
index 3df1b5b2c..f79db4efa 100644
--- a/plugins/input/ogr/ogr_index.hpp
+++ b/plugins/input/ogr/ogr_index.hpp
@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#ifndef OGR_INDEX_HH
-#define OGR_INDEX_HH
+#ifndef OGR_INDEX_HPP
+#define OGR_INDEX_HPP
 
 // stl
 #include <fstream>
@@ -102,4 +102,4 @@ void ogr_index<filterT, IStream>::read_envelope(IStream& file, box2d<double>& en
     file.read(reinterpret_cast<char*>(&envelope), sizeof(envelope));
 }
 
-#endif // OGR_INDEX_HH
+#endif // OGR_INDEX_HPP

From 506390b7353e77a6bf87d5c008ea407dce3ab237 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 21 Dec 2016 09:05:31 +0100
Subject: [PATCH 178/328] use curly braces initialiser (c++ style)

---
 include/mapnik/symbolizer.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/mapnik/symbolizer.hpp b/include/mapnik/symbolizer.hpp
index d277fe678..9cdb96f70 100644
--- a/include/mapnik/symbolizer.hpp
+++ b/include/mapnik/symbolizer.hpp
@@ -462,7 +462,7 @@ T get(symbolizer_base const& sym, keys key)
     {
         return util::apply_visitor(extract_raw_value<T>(), itr->second);
     }
-    return T();
+    return T{};
 }
 
 
@@ -487,7 +487,7 @@ boost::optional<T> get_optional(symbolizer_base const& sym, keys key)
     {
         return util::apply_visitor(extract_raw_value<T>(), itr->second);
     }
-    return boost::optional<T>();
+    return boost::optional<T>{};
 }
 
 }

From 9d0096eff6457f6aa89ca42193e64c7123d91cd3 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 21 Dec 2016 15:20:52 +0100
Subject: [PATCH 179/328] remove unused include directive

---
 include/mapnik/svg/svg_path_parser.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/mapnik/svg/svg_path_parser.hpp b/include/mapnik/svg/svg_path_parser.hpp
index a56051c24..bb0ec8c12 100644
--- a/include/mapnik/svg/svg_path_parser.hpp
+++ b/include/mapnik/svg/svg_path_parser.hpp
@@ -26,7 +26,6 @@
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/svg/svg_converter.hpp>
-#include <mapnik/svg/svg_path_attributes.hpp>
 // stl
 #include <string>
 

From 30749031cfe98ece52ed1e15ba1a6bf6541f8d59 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 22 Dec 2016 14:57:26 +0100
Subject: [PATCH 180/328] SVG path parser - boost::spirit::x3 based
 implementation

---
 include/mapnik/svg/svg_path_grammar.hpp       |  61 ------
 include/mapnik/svg/svg_path_grammar_impl.hpp  | 111 ----------
 include/mapnik/svg/svg_path_grammar_x3.hpp    |  48 +++++
 .../mapnik/svg/svg_path_grammar_x3_def.hpp    | 195 ++++++++++++++++++
 src/svg/svg_path_parser.cpp                   |  29 ++-
 5 files changed, 266 insertions(+), 178 deletions(-)
 delete mode 100644 include/mapnik/svg/svg_path_grammar.hpp
 delete mode 100644 include/mapnik/svg/svg_path_grammar_impl.hpp
 create mode 100644 include/mapnik/svg/svg_path_grammar_x3.hpp
 create mode 100644 include/mapnik/svg/svg_path_grammar_x3_def.hpp

diff --git a/include/mapnik/svg/svg_path_grammar.hpp b/include/mapnik/svg/svg_path_grammar.hpp
deleted file mode 100644
index a65b27266..000000000
--- a/include/mapnik/svg/svg_path_grammar.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2016 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_SVG_PATH_GRAMMAR_HPP
-#define MAPNIK_SVG_PATH_GRAMMAR_HPP
-
-// spirit
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#pragma GCC diagnostic pop
-
-namespace mapnik { namespace svg {
-
-using namespace boost::spirit;
-
-template <typename Iterator, typename PathType, typename SkipType>
-struct svg_path_grammar : qi::grammar<Iterator, void(PathType&), SkipType>
-{
-    // ctor
-    svg_path_grammar();
-    // rules
-    qi::rule<Iterator, void(PathType&), SkipType> start;
-    qi::rule<Iterator, void(PathType&), SkipType> cmd;
-    qi::rule<Iterator, void(PathType&), SkipType> drawto_cmd;
-    qi::rule<Iterator, qi::locals<bool>, void(PathType&), SkipType> M; // M,m
-    qi::rule<Iterator, qi::locals<bool>, void(PathType&), SkipType> L; // L,l
-    qi::rule<Iterator, qi::locals<bool>, void(PathType&), SkipType> H; // H,h
-    qi::rule<Iterator, qi::locals<bool>, void(PathType&), SkipType> V; // V,v
-    qi::rule<Iterator, qi::locals<bool>, void(PathType&), SkipType> C; // C,c
-    qi::rule<Iterator, qi::locals<bool>, void(PathType&), SkipType> S; // S,s
-    qi::rule<Iterator, qi::locals<bool>, void(PathType&), SkipType> Q; // Q,q
-    qi::rule<Iterator, qi::locals<bool>, void(PathType&), SkipType> T; // T,t
-    qi::rule<Iterator, qi::locals<bool>, void(PathType&), SkipType> A; // A,a
-    qi::rule<Iterator, void(PathType&), SkipType> Z;                   // Z,z
-    qi::rule<Iterator, boost::fusion::vector2<double, double>(), SkipType> coord;
-};
-
-}}
-
-
-#endif // MAPNIK_SVG_PATH_GRAMMAR_HPP
diff --git a/include/mapnik/svg/svg_path_grammar_impl.hpp b/include/mapnik/svg/svg_path_grammar_impl.hpp
deleted file mode 100644
index 5d1de4b7d..000000000
--- a/include/mapnik/svg/svg_path_grammar_impl.hpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2016 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-// NOTE: This is an implementation header file and is only meant to be included
-//    from implementation files. It therefore doesn't have an include guard.
-
-// mapnik
-#include <mapnik/svg/svg_path_grammar.hpp>
-#include <mapnik/svg/svg_path_commands.hpp>
-
-// spirit
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#pragma GCC diagnostic pop
-
-namespace mapnik { namespace svg {
-
-using namespace boost::spirit;
-using namespace boost::phoenix;
-
-
-template <typename Iterator, typename PathType, typename SkipType>
-svg_path_grammar<Iterator, PathType, SkipType>::svg_path_grammar()
-    : svg_path_grammar::base_type(start)
-{
-    qi::_1_type _1;
-    qi::_2_type _2;
-    qi::_3_type _3;
-    qi::_4_type _4;
-    qi::_5_type _5;
-    qi::_a_type _a;
-    qi::lit_type lit;
-    qi::_r1_type _r1;
-    qi::double_type double_;
-    qi::int_type int_;
-    qi::no_case_type no_case;
-
-    // commands
-    function<move_to> move_to_;
-    function<hline_to> hline_to_;
-    function<vline_to> vline_to_;
-    function<line_to> line_to_;
-    function<curve4> curve4_;
-    function<curve4_smooth> curve4_smooth_;
-    function<curve3> curve3_;
-    function<curve3_smooth> curve3_smooth_;
-    function<arc_to> arc_to_;
-    function<close> close_;
-    //
-    start = +cmd(_r1);
-
-    cmd = M(_r1) >> *drawto_cmd(_r1);
-
-    drawto_cmd = L(_r1) | H(_r1) | V(_r1) | C(_r1) | S(_r1) | Q(_r1) | T(_r1) | A(_r1) | Z(_r1);
-
-    M = (lit('M')[_a = false] | lit('m')[_a = true]) >> coord[move_to_(_r1, _1, _a)] // move_to
-        >> *(-lit(',') >> coord[line_to_(_r1, _1, _a)]);                             // *line_to
-
-    H = (lit('H')[_a = false] | lit('h')[_a = true])
-        >> (double_[ hline_to_(_r1, _1,_a) ] % -lit(',')) ; // +hline_to
-
-    V = (lit('V')[_a = false] | lit('v')[_a = true])
-        >> (double_ [ vline_to_(_r1, _1,_a) ] % -lit(',')); // +vline_to
-
-    L = (lit('L')[_a = false] | lit('l')[_a = true])
-        >> (coord [ line_to_(_r1, _1, _a) ] % -lit(',')); // +line_to
-
-    C = (lit('C')[_a = false] | lit('c')[_a = true])
-        >> ((coord >> -lit(',') >> coord >> -lit(',') >> coord)[curve4_(_r1, _1, _2, _3, _a)] % -lit(',')); // +curve4
-
-    S = (lit('S')[_a = false] | lit('s')[_a = true])
-        >> ((coord >> -lit(',') >> coord) [ curve4_smooth_(_r1, _1,_2,_a) ] % -lit(',')); // +curve4_smooth (smooth curveto)
-
-    Q = (lit('Q')[_a = false] | lit('q')[_a = true])
-        >> ((coord >> -lit(',') >> coord) [ curve3_(_r1, _1,_2,_a) ] % -lit(',')); // +curve3 (quadratic-bezier-curveto)
-
-    T = (lit('T')[_a = false] | lit('t')[_a = true])
-        >> ((coord ) [ curve3_smooth_(_r1, _1,_a) ] % -lit(',')); // +curve3_smooth (smooth-quadratic-bezier-curveto)
-
-    A = (lit('A')[_a = false] | lit('a')[_a = true])
-        >> ((coord >> -lit(',') >> double_ >> -lit(',') >> int_ >> -lit(',') >> int_ >> -lit(',') >> coord)
-            [arc_to_(_r1, _1, _2, _3, _4, _5, _a)] % -lit(',')); // arc_to;
-
-    Z = no_case[lit('z')] [close_(_r1)]; // close path
-
-    coord = double_ >> -lit(',') >> double_;
-}
-
-} // namespace svg
-} // namespace mapnik
diff --git a/include/mapnik/svg/svg_path_grammar_x3.hpp b/include/mapnik/svg/svg_path_grammar_x3.hpp
new file mode 100644
index 000000000..0aaa20396
--- /dev/null
+++ b/include/mapnik/svg/svg_path_grammar_x3.hpp
@@ -0,0 +1,48 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_SVG_PATH_GRAMMAR_X3_HPP
+#define MAPNIK_SVG_PATH_GRAMMAR_X3_HPP
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#pragma GCC diagnostic pop
+
+namespace mapnik { namespace svg { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+
+class relative_tag;
+class svg_path_tag;
+
+using svg_path_grammar_type = x3::rule<class svg_rule_tag>;
+
+BOOST_SPIRIT_DECLARE(svg_path_grammar_type);
+
+}
+
+grammar::svg_path_grammar_type svg_path_grammar();
+
+}}
+
+#endif // MAPNIK_SVG_PATH_GRAMMAR_X3_HPP
diff --git a/include/mapnik/svg/svg_path_grammar_x3_def.hpp b/include/mapnik/svg/svg_path_grammar_x3_def.hpp
new file mode 100644
index 000000000..aef25e4a4
--- /dev/null
+++ b/include/mapnik/svg/svg_path_grammar_x3_def.hpp
@@ -0,0 +1,195 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_SVG_PATH_GRAMMAR_X3_DEF_HPP
+#define MAPNIK_SVG_PATH_GRAMMAR_X3_DEF_HPP
+
+#include <mapnik/global.hpp>
+#include <mapnik/config.hpp>
+#include <mapnik/svg/svg_path_grammar_x3.hpp>
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/fusion/adapted/std_tuple.hpp>
+#pragma GCC diagnostic pop
+
+namespace mapnik { namespace svg { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+
+using x3::lit;
+using x3::double_;
+using x3::int_;
+using x3::no_case;
+
+using coord_type = std::tuple<double,double>;
+
+auto const move_to = [] (auto const& ctx)
+{
+    x3::get<svg_path_tag>(ctx).get().move_to(std::get<0>(_attr(ctx)), std::get<1>(_attr(ctx)), x3::get<relative_tag>(ctx));
+};
+
+auto const line_to = [] (auto const & ctx)
+{
+    x3::get<svg_path_tag>(ctx).get().line_to(std::get<0>(_attr(ctx)), std::get<1>(_attr(ctx)), x3::get<relative_tag>(ctx));
+};
+
+auto const hline_to = [] (auto const& ctx)
+{
+    x3::get<svg_path_tag>(ctx).get().hline_to(_attr(ctx), x3::get<relative_tag>(ctx));
+};
+
+auto const vline_to = [] (auto const& ctx)
+{
+    x3::get<svg_path_tag>(ctx).get().vline_to(_attr(ctx), x3::get<relative_tag>(ctx));
+};
+
+auto const curve4 = [] (auto const& ctx)
+{
+    auto const& attr = _attr(ctx);
+    auto const& p0 = boost::fusion::at_c<0>(attr);
+    auto const& p1 = boost::fusion::at_c<1>(attr);
+    auto const& p2 = boost::fusion::at_c<2>(attr);
+    x3::get<svg_path_tag>(ctx).get().curve4(std::get<0>(p0),std::get<1>(p0),
+                                            std::get<0>(p1),std::get<1>(p1),
+                                            std::get<0>(p2),std::get<1>(p2),
+                                            x3::get<relative_tag>(ctx));
+};
+
+auto const curve4_smooth = [] (auto const& ctx)
+{
+    auto const& attr = _attr(ctx);
+    auto const& p0 = boost::fusion::at_c<0>(attr);
+    auto const& p1 = boost::fusion::at_c<1>(attr);
+    x3::get<svg_path_tag>(ctx).get().curve4(std::get<0>(p0),std::get<1>(p0),
+                                            std::get<0>(p1),std::get<1>(p1),
+                                            x3::get<relative_tag>(ctx));
+};
+
+auto const curve3 = [] (auto const& ctx)
+{
+    auto const& attr = _attr(ctx);
+    auto const& p0 = boost::fusion::at_c<0>(attr);
+    auto const& p1 = boost::fusion::at_c<1>(attr);
+    x3::get<svg_path_tag>(ctx).get().curve3(std::get<0>(p0),std::get<1>(p0),
+                                            std::get<0>(p1),std::get<1>(p1),
+                                            x3::get<relative_tag>(ctx));
+};
+
+auto const curve3_smooth = [] (auto const& ctx)
+{
+    auto const& attr = _attr(ctx);
+    x3::get<svg_path_tag>(ctx).get().curve3(std::get<0>(attr),std::get<1>(attr),
+                                            x3::get<relative_tag>(ctx));
+};
+
+inline double deg2rad(double deg)
+{
+    return (M_PI * deg) / 180.0;
+}
+
+auto const arc_to = [] (auto & ctx)
+{
+    auto const& attr = _attr(ctx);
+    auto const& p = boost::fusion::at_c<0>(attr);
+    double angle = boost::fusion::at_c<1>(attr);
+    int large_arc_flag = boost::fusion::at_c<2>(attr);
+    int sweep_flag = boost::fusion::at_c<3>(attr);
+    auto const& v = boost::fusion::at_c<4>(attr);
+    x3::get<svg_path_tag>(ctx).get().arc_to(std::get<0>(p),std::get<1>(p),
+                                            deg2rad(angle), large_arc_flag, sweep_flag,
+                                            std::get<0>(v),std::get<1>(v),
+                                            x3::get<relative_tag>(ctx));
+};
+
+auto const close_path = [] (auto const& ctx)
+{
+    x3::get<svg_path_tag>(ctx).get().close_subpath();
+};
+
+auto const relative = [] (auto const& ctx)
+{
+    x3::get<relative_tag>(ctx).get() = true;
+};
+
+auto const absolute = [] (auto const& ctx)
+{
+    x3::get<relative_tag>(ctx).get() = false;
+};
+
+svg_path_grammar_type const svg_path = "SVG Path";
+
+auto const coord = x3::rule<class coord_tag, coord_type>{} = double_ > -lit(',') > double_;
+
+auto const M = x3::rule<class M_tag> {} = (lit('M')[absolute] | lit('m')[relative])
+    > coord[move_to]                     // move_to
+    > *(-lit(',') >> coord[line_to]);    // *line_to
+
+auto const H = x3::rule<class H_tag> {} = (lit('H')[absolute] | lit('h')[relative])
+    > (double_[ hline_to] % -lit(',')) ; // +hline_to
+
+auto const V = x3::rule<class V_tag> {} = (lit('V')[absolute] | lit('v')[relative])
+    > (double_[ vline_to] % -lit(',')) ; // +vline_to
+
+auto const L = x3::rule<class L_tag> {} = (lit('L')[absolute] | lit('l')[relative])
+    > (coord [line_to] % -lit(','));     // +line_to
+
+auto const C = x3::rule<class C_tag> {} = (lit('C')[absolute] | lit('c')[relative])
+    > ((coord > -lit(',') > coord > -lit(',') > coord)[curve4] % -lit(',')); // +curve4
+
+auto const S = x3::rule<class S_tag> {} = (lit('S')[absolute] | lit('s')[relative])
+    > ((coord > -lit(',') > coord) [curve4_smooth] % -lit(',')); // +curve4_smooth (smooth curveto)
+
+auto const Q = x3::rule<class Q_tag> {} = (lit('Q')[absolute] | lit('q')[relative])
+    > ((coord > -lit(',') > coord) [curve3] % -lit(',')); // +curve3 (quadratic-bezier-curveto)
+
+auto const T = x3::rule<class T_tag> {} = (lit('T')[absolute] | lit('t')[relative])
+    > ((coord ) [curve3_smooth] % -lit(',')); // +curve3_smooth (smooth-quadratic-bezier-curveto)
+
+auto const A = x3::rule<class A_tag> {} = (lit('A')[absolute] | lit('a')[relative])
+    > ((coord > -lit(',') > double_ > -lit(',') > int_ > -lit(',') > int_ > -lit(',') > coord)
+        [arc_to] % -lit(',')); // arc_to;
+
+auto const Z = x3::rule<class Z_tag>{} = no_case[lit('z')] [close_path]; // close path
+
+auto const drawto_cmd = x3::rule<class drawto_cmd_tag> {} = L | H | V | C | S | Q | T | A | Z;
+
+auto const cmd = x3::rule<class cmd_tag> {} = M > *drawto_cmd ;
+
+auto const svg_path_def = +cmd;
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+BOOST_SPIRIT_DEFINE(
+    svg_path
+    );
+#pragma GCC diagnostic pop
+
+}
+
+grammar::svg_path_grammar_type svg_path_grammar()
+{
+    return grammar::svg_path;
+}
+
+}}
+
+#endif // MAPNIK_SVG_PATH_GRAMMAR_X3_HPP
diff --git a/src/svg/svg_path_parser.cpp b/src/svg/svg_path_parser.cpp
index ba9b9c6f0..602a05115 100644
--- a/src/svg/svg_path_parser.cpp
+++ b/src/svg/svg_path_parser.cpp
@@ -23,7 +23,7 @@
 // mapnik
 
 #include <mapnik/svg/svg_path_parser.hpp>
-#include <mapnik/svg/svg_path_grammar_impl.hpp>
+#include <mapnik/svg/svg_path_grammar_x3_def.hpp>
 // stl
 #include <cstring>
 #include <string>
@@ -35,14 +35,31 @@ template <typename PathType>
 bool parse_path(const char* wkt, PathType& p)
 {
     using namespace boost::spirit;
-    using iterator_type = const char*;
-    using skip_type = ascii::space_type;
-    static const svg_path_grammar<iterator_type, PathType, skip_type> g;
+    using iterator_type = char const*;
+    using skip_type = x3::ascii::space_type;
+    skip_type space;
     iterator_type first = wkt;
     iterator_type last = wkt + std::strlen(wkt);
-    bool status = qi::phrase_parse(first, last, (g)(boost::phoenix::ref(p)), skip_type());
-    return (status && (first == last));
+    bool relative = false;
+    auto const grammar = x3::with<mapnik::svg::grammar::svg_path_tag>(std::ref(p))
+        [ x3::with<mapnik::svg::grammar::relative_tag>(std::ref(relative))
+          [mapnik::svg::svg_path_grammar()]];
+
+    try
+    {
+        if (!x3::phrase_parse(first, last, grammar, space)
+            || first != last)
+        {
+            throw std::runtime_error("Failed to parse svg-path");
+        }
+    }
+    catch (...)
+    {
+        return false;
+    }
+    return true;
 }
+
 template bool MAPNIK_DECL parse_path<svg_converter_type>(const char*, svg_converter_type&);
 
 } // namespace svg

From 584fda88e0a442ab822d25766543317ee727f3e1 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 23 Dec 2016 13:26:37 +0100
Subject: [PATCH 181/328] SVG path grammar - return start rule by const&

---
 include/mapnik/svg/svg_path_grammar_x3.hpp     | 4 ++--
 include/mapnik/svg/svg_path_grammar_x3_def.hpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/mapnik/svg/svg_path_grammar_x3.hpp b/include/mapnik/svg/svg_path_grammar_x3.hpp
index 0aaa20396..9ef050c96 100644
--- a/include/mapnik/svg/svg_path_grammar_x3.hpp
+++ b/include/mapnik/svg/svg_path_grammar_x3.hpp
@@ -35,13 +35,13 @@ namespace x3 = boost::spirit::x3;
 class relative_tag;
 class svg_path_tag;
 
-using svg_path_grammar_type = x3::rule<class svg_rule_tag>;
+using svg_path_grammar_type = x3::rule<class svg_path_rule_tag>;
 
 BOOST_SPIRIT_DECLARE(svg_path_grammar_type);
 
 }
 
-grammar::svg_path_grammar_type svg_path_grammar();
+grammar::svg_path_grammar_type const& svg_path_grammar();
 
 }}
 
diff --git a/include/mapnik/svg/svg_path_grammar_x3_def.hpp b/include/mapnik/svg/svg_path_grammar_x3_def.hpp
index aef25e4a4..36a021913 100644
--- a/include/mapnik/svg/svg_path_grammar_x3_def.hpp
+++ b/include/mapnik/svg/svg_path_grammar_x3_def.hpp
@@ -185,7 +185,7 @@ BOOST_SPIRIT_DEFINE(
 
 }
 
-grammar::svg_path_grammar_type svg_path_grammar()
+grammar::svg_path_grammar_type const& svg_path_grammar()
 {
     return grammar::svg_path;
 }

From 95cc560167c6624939dfc6e805115a7d4afa1de9 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 23 Dec 2016 14:40:19 +0100
Subject: [PATCH 182/328] SVG points - implement using boost::spirit::x3 +
 refactor `parse_rule` instantiations into separate *.cpp

---
 include/mapnik/svg/svg_path_grammar_x3.hpp    | 14 ++---
 .../mapnik/svg/svg_path_grammar_x3_def.hpp    | 17 +++++-
 .../mapnik/svg/svg_points_grammar_impl.hpp    | 58 -------------------
 src/build.py                                  |  1 +
 .../svg/svg_path_grammar_x3.cpp               | 32 ++++------
 src/svg/svg_path_parser.cpp                   |  7 +--
 src/svg/svg_points_parser.cpp                 | 27 +++++++--
 7 files changed, 57 insertions(+), 99 deletions(-)
 delete mode 100644 include/mapnik/svg/svg_points_grammar_impl.hpp
 rename include/mapnik/svg/svg_points_grammar.hpp => src/svg/svg_path_grammar_x3.cpp (58%)

diff --git a/include/mapnik/svg/svg_path_grammar_x3.hpp b/include/mapnik/svg/svg_path_grammar_x3.hpp
index 9ef050c96..80882fce1 100644
--- a/include/mapnik/svg/svg_path_grammar_x3.hpp
+++ b/include/mapnik/svg/svg_path_grammar_x3.hpp
@@ -23,26 +23,24 @@
 #ifndef MAPNIK_SVG_PATH_GRAMMAR_X3_HPP
 #define MAPNIK_SVG_PATH_GRAMMAR_X3_HPP
 
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/home/x3.hpp>
-#pragma GCC diagnostic pop
+#include <mapnik/svg/svg_grammar_config_x3.hpp>
 
 namespace mapnik { namespace svg { namespace grammar {
 
 namespace x3 = boost::spirit::x3;
 
-class relative_tag;
-class svg_path_tag;
-
 using svg_path_grammar_type = x3::rule<class svg_path_rule_tag>;
+using svg_points_grammar_type = x3::rule<class svg_points_rule_tag>;
 
-BOOST_SPIRIT_DECLARE(svg_path_grammar_type);
+BOOST_SPIRIT_DECLARE(svg_path_grammar_type,
+                     svg_points_grammar_type);
 
 }
 
 grammar::svg_path_grammar_type const& svg_path_grammar();
 
+grammar::svg_points_grammar_type const& svg_points_grammar();
+
 }}
 
 #endif // MAPNIK_SVG_PATH_GRAMMAR_X3_HPP
diff --git a/include/mapnik/svg/svg_path_grammar_x3_def.hpp b/include/mapnik/svg/svg_path_grammar_x3_def.hpp
index 36a021913..d3d685ce7 100644
--- a/include/mapnik/svg/svg_path_grammar_x3_def.hpp
+++ b/include/mapnik/svg/svg_path_grammar_x3_def.hpp
@@ -23,6 +23,7 @@
 #ifndef MAPNIK_SVG_PATH_GRAMMAR_X3_DEF_HPP
 #define MAPNIK_SVG_PATH_GRAMMAR_X3_DEF_HPP
 
+// mapnik
 #include <mapnik/global.hpp>
 #include <mapnik/config.hpp>
 #include <mapnik/svg/svg_path_grammar_x3.hpp>
@@ -137,11 +138,15 @@ auto const absolute = [] (auto const& ctx)
 
 svg_path_grammar_type const svg_path = "SVG Path";
 
+svg_points_grammar_type const svg_points = "SVG_Points";
+
 auto const coord = x3::rule<class coord_tag, coord_type>{} = double_ > -lit(',') > double_;
 
+auto const svg_points_def = coord[move_to] // move_to
+    > *(-lit(',') >> coord[line_to]);      // *line_to
+
 auto const M = x3::rule<class M_tag> {} = (lit('M')[absolute] | lit('m')[relative])
-    > coord[move_to]                     // move_to
-    > *(-lit(',') >> coord[line_to]);    // *line_to
+    > svg_points ;
 
 auto const H = x3::rule<class H_tag> {} = (lit('H')[absolute] | lit('h')[relative])
     > (double_[ hline_to] % -lit(',')) ; // +hline_to
@@ -179,7 +184,8 @@ auto const svg_path_def = +cmd;
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 BOOST_SPIRIT_DEFINE(
-    svg_path
+    svg_path,
+    svg_points
     );
 #pragma GCC diagnostic pop
 
@@ -190,6 +196,11 @@ grammar::svg_path_grammar_type const& svg_path_grammar()
     return grammar::svg_path;
 }
 
+grammar::svg_points_grammar_type const& svg_points_grammar()
+{
+    return grammar::svg_points;
+}
+
 }}
 
 #endif // MAPNIK_SVG_PATH_GRAMMAR_X3_HPP
diff --git a/include/mapnik/svg/svg_points_grammar_impl.hpp b/include/mapnik/svg/svg_points_grammar_impl.hpp
deleted file mode 100644
index f6f09583a..000000000
--- a/include/mapnik/svg/svg_points_grammar_impl.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2016 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-// NOTE: This is an implementation header file and is only meant to be included
-//    from implementation files. It therefore doesn't have an include guard.
-// mapnik
-#include <mapnik/svg/svg_points_grammar.hpp>
-#include <mapnik/svg/svg_path_commands.hpp>
-
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#pragma GCC diagnostic pop
-
-namespace mapnik { namespace svg {
-
-using namespace boost::spirit;
-using namespace boost::phoenix;
-
-template <typename Iterator, typename PathType, typename SkipType>
-svg_points_grammar<Iterator, PathType,SkipType>::svg_points_grammar()
-    : svg_points_grammar::base_type(start)
-{
-    qi::_1_type _1;
-    qi::_r1_type _r1;
-    qi::lit_type lit;
-    qi::double_type double_;
-    // commands
-    function<move_to> move_to_;
-    function<line_to> line_to_;
-    function<close> close_;
-
-    start = coord[move_to_(_r1, _1, false)] // move_to
-        >> *(-lit(',') >> coord [ line_to_(_r1, _1,false) ] ); // *line_to
-
-    coord = double_ >> -lit(',') >> double_;
-}
-
-}}
diff --git a/src/build.py b/src/build.py
index 45ba882ee..a21583344 100644
--- a/src/build.py
+++ b/src/build.py
@@ -226,6 +226,7 @@ source = Split(
     svg/svg_path_parser.cpp
     svg/svg_points_parser.cpp
     svg/svg_transform_parser.cpp
+    svg/svg_path_grammar_x3.cpp
     warp.cpp
     css_color_grammar_x3.cpp
     vertex_cache.cpp
diff --git a/include/mapnik/svg/svg_points_grammar.hpp b/src/svg/svg_path_grammar_x3.cpp
similarity index 58%
rename from include/mapnik/svg/svg_points_grammar.hpp
rename to src/svg/svg_path_grammar_x3.cpp
index 07c93cc08..b1b04434d 100644
--- a/include/mapnik/svg/svg_points_grammar.hpp
+++ b/src/svg/svg_path_grammar_x3.cpp
@@ -20,28 +20,18 @@
  *
  *****************************************************************************/
 
-#ifndef SVG_POINTS_GRAMMAR_HPP
-#define SVG_POINTS_GRAMMAR_HPP
+#include <mapnik/svg/svg_path_grammar_x3_def.hpp>
 
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#pragma GCC diagnostic pop
+namespace mapnik { namespace svg { namespace grammar {
 
-namespace mapnik { namespace svg {
+#define BOOST_SPIRIT_INSTANTIATE_UNUSED(rule_type, Iterator, Context)   \
+    template bool parse_rule<Iterator, Context, boost::spirit::x3::unused_type const>( \
+        rule_type rule_                                                 \
+        , Iterator& first, Iterator const& last                         \
+        , Context const& context, boost::spirit::x3::unused_type const& ); \
+    /***/
 
-using namespace boost::spirit;
-using namespace boost::phoenix;
+BOOST_SPIRIT_INSTANTIATE_UNUSED(svg_path_grammar_type, iterator_type, svg_parse_context_type);
+BOOST_SPIRIT_INSTANTIATE_UNUSED(svg_points_grammar_type, iterator_type, svg_parse_context_type);
 
-template <typename Iterator, typename PathType, typename SkipType>
-struct svg_points_grammar : qi::grammar<Iterator, void(PathType&), SkipType>
-{
-    // ctor
-    svg_points_grammar();
-    // rules
-    qi::rule<Iterator, void(PathType&), SkipType> start;
-    qi::rule<Iterator, boost::fusion::vector2<double, double>(), SkipType> coord;
-};
-}}
-
-#endif // SVG_POINTS_GRAMMAR_HPP
+}}}
diff --git a/src/svg/svg_path_parser.cpp b/src/svg/svg_path_parser.cpp
index 602a05115..53c3a94ee 100644
--- a/src/svg/svg_path_parser.cpp
+++ b/src/svg/svg_path_parser.cpp
@@ -23,7 +23,7 @@
 // mapnik
 
 #include <mapnik/svg/svg_path_parser.hpp>
-#include <mapnik/svg/svg_path_grammar_x3_def.hpp>
+#include <mapnik/svg/svg_path_grammar_x3.hpp>
 // stl
 #include <cstring>
 #include <string>
@@ -36,18 +36,17 @@ bool parse_path(const char* wkt, PathType& p)
 {
     using namespace boost::spirit;
     using iterator_type = char const*;
-    using skip_type = x3::ascii::space_type;
-    skip_type space;
     iterator_type first = wkt;
     iterator_type last = wkt + std::strlen(wkt);
     bool relative = false;
+    using space_type = mapnik::svg::grammar::space_type;
     auto const grammar = x3::with<mapnik::svg::grammar::svg_path_tag>(std::ref(p))
         [ x3::with<mapnik::svg::grammar::relative_tag>(std::ref(relative))
           [mapnik::svg::svg_path_grammar()]];
 
     try
     {
-        if (!x3::phrase_parse(first, last, grammar, space)
+        if (!x3::phrase_parse(first, last, grammar, space_type())
             || first != last)
         {
             throw std::runtime_error("Failed to parse svg-path");
diff --git a/src/svg/svg_points_parser.cpp b/src/svg/svg_points_parser.cpp
index 85e6663bb..9ede3b7de 100644
--- a/src/svg/svg_points_parser.cpp
+++ b/src/svg/svg_points_parser.cpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/svg/svg_path_parser.hpp>
-#include <mapnik/svg/svg_points_grammar_impl.hpp>
+#include <mapnik/svg/svg_path_grammar_x3.hpp>
 // stl
 #include <string>
 #include <cstring>
@@ -34,12 +34,29 @@ template <typename PathType>
 bool parse_points(const char* wkt, PathType& p)
 {
     using namespace boost::spirit;
-    using iterator_type = const char*;
-    using skip_type = ascii::space_type;
-    static const svg_points_grammar<iterator_type, PathType, skip_type> g;
+    using iterator_type = char const*;
+    using space_type = mapnik::svg::grammar::space_type;
     iterator_type first = wkt;
     iterator_type last = wkt + std::strlen(wkt);
-    return qi::phrase_parse(first, last, (g)(boost::phoenix::ref(p)), skip_type());
+    bool relative = false;
+
+    auto const grammar = x3::with<mapnik::svg::grammar::svg_path_tag>(std::ref(p))
+        [ x3::with<mapnik::svg::grammar::relative_tag>(std::ref(relative))
+          [mapnik::svg::svg_points_grammar()]];
+
+    try
+    {
+        if (!x3::phrase_parse(first, last, grammar, space_type())
+            || first != last)
+        {
+            throw std::runtime_error("Failed to parse svg-path");
+        }
+    }
+    catch (...)
+    {
+        return false;
+    }
+    return true;
 }
 
 template bool parse_points<svg_converter_type>(const char*, svg_converter_type&);

From 3b52ae97c021004928696b93f4d9de8633bae10b Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 23 Dec 2016 14:42:18 +0100
Subject: [PATCH 183/328] add missing header

---
 include/mapnik/svg/svg_grammar_config_x3.hpp | 47 ++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 include/mapnik/svg/svg_grammar_config_x3.hpp

diff --git a/include/mapnik/svg/svg_grammar_config_x3.hpp b/include/mapnik/svg/svg_grammar_config_x3.hpp
new file mode 100644
index 000000000..87444b0ca
--- /dev/null
+++ b/include/mapnik/svg/svg_grammar_config_x3.hpp
@@ -0,0 +1,47 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_SVG_GRAMMAR_CONFIG_X3_HPP
+#define MAPNIK_SVG_GRAMMAR_CONFIG_X3_HPP
+
+#include <mapnik/svg/svg_path_parser.hpp>
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#pragma GCC diagnostic pop
+
+namespace mapnik { namespace svg { namespace grammar {
+
+class relative_tag;
+class svg_path_tag;
+
+namespace x3 = boost::spirit::x3;
+using space_type = x3::standard::space_type;
+using iterator_type = char const*;
+
+using phrase_parse_context_type = x3::phrase_parse_context<space_type>::type;
+using svg_parse_context_type = x3::with_context<relative_tag, std::reference_wrapper<bool> const,
+                                                x3::with_context<svg_path_tag,std::reference_wrapper<svg_converter_type> const,
+                                                                 phrase_parse_context_type>::type>::type;
+}}}
+
+#endif // MAPNIK_SVG_GRAMMAR_CONFIG_X3_HPP

From ed648ced467d37b54fa933323671050e6b0d2042 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 23 Dec 2016 16:32:05 +0100
Subject: [PATCH 184/328] SVG transform - implement in terms of
 boost::spirit::x3

---
 include/mapnik/svg/svg_grammar_config_x3.hpp  |   4 +
 .../mapnik/svg/svg_path_grammar_x3_def.hpp    |   7 +-
 include/mapnik/svg/svg_path_parser.hpp        |   4 +-
 include/mapnik/svg/svg_transform_grammar.hpp  |  56 ------
 .../mapnik/svg/svg_transform_grammar_impl.hpp | 171 ------------------
 .../mapnik/svg/svg_transform_grammar_x3.hpp   |  43 +++++
 .../svg/svg_transform_grammar_x3_def.hpp      | 163 +++++++++++++++++
 src/svg/svg_transform_parser.cpp              |  31 +++-
 8 files changed, 236 insertions(+), 243 deletions(-)
 delete mode 100644 include/mapnik/svg/svg_transform_grammar.hpp
 delete mode 100644 include/mapnik/svg/svg_transform_grammar_impl.hpp
 create mode 100644 include/mapnik/svg/svg_transform_grammar_x3.hpp
 create mode 100644 include/mapnik/svg/svg_transform_grammar_x3_def.hpp

diff --git a/include/mapnik/svg/svg_grammar_config_x3.hpp b/include/mapnik/svg/svg_grammar_config_x3.hpp
index 87444b0ca..3666cebb9 100644
--- a/include/mapnik/svg/svg_grammar_config_x3.hpp
+++ b/include/mapnik/svg/svg_grammar_config_x3.hpp
@@ -33,6 +33,7 @@ namespace mapnik { namespace svg { namespace grammar {
 
 class relative_tag;
 class svg_path_tag;
+class svg_transform_tag;
 
 namespace x3 = boost::spirit::x3;
 using space_type = x3::standard::space_type;
@@ -42,6 +43,9 @@ using phrase_parse_context_type = x3::phrase_parse_context<space_type>::type;
 using svg_parse_context_type = x3::with_context<relative_tag, std::reference_wrapper<bool> const,
                                                 x3::with_context<svg_path_tag,std::reference_wrapper<svg_converter_type> const,
                                                                  phrase_parse_context_type>::type>::type;
+
+inline double deg2rad(double deg) {return (M_PI * deg) / 180.0;}
+
 }}}
 
 #endif // MAPNIK_SVG_GRAMMAR_CONFIG_X3_HPP
diff --git a/include/mapnik/svg/svg_path_grammar_x3_def.hpp b/include/mapnik/svg/svg_path_grammar_x3_def.hpp
index d3d685ce7..b1bed97aa 100644
--- a/include/mapnik/svg/svg_path_grammar_x3_def.hpp
+++ b/include/mapnik/svg/svg_path_grammar_x3_def.hpp
@@ -102,10 +102,6 @@ auto const curve3_smooth = [] (auto const& ctx)
                                             x3::get<relative_tag>(ctx));
 };
 
-inline double deg2rad(double deg)
-{
-    return (M_PI * deg) / 180.0;
-}
 
 auto const arc_to = [] (auto & ctx)
 {
@@ -136,10 +132,11 @@ auto const absolute = [] (auto const& ctx)
     x3::get<relative_tag>(ctx).get() = false;
 };
 
+// exported rules
 svg_path_grammar_type const svg_path = "SVG Path";
-
 svg_points_grammar_type const svg_points = "SVG_Points";
 
+// rules
 auto const coord = x3::rule<class coord_tag, coord_type>{} = double_ > -lit(',') > double_;
 
 auto const svg_points_def = coord[move_to] // move_to
diff --git a/include/mapnik/svg/svg_path_parser.hpp b/include/mapnik/svg/svg_path_parser.hpp
index bb0ec8c12..444badbf5 100644
--- a/include/mapnik/svg/svg_path_parser.hpp
+++ b/include/mapnik/svg/svg_path_parser.hpp
@@ -39,12 +39,12 @@ template <typename PathType>
 bool parse_points(const char* wkt, PathType& p);
 
 template <typename TransformType>
-bool MAPNIK_DECL parse_svg_transform(const char* wkt, TransformType& tr);
+bool parse_svg_transform(const char* wkt, TransformType& tr);
 
 //
 extern template bool MAPNIK_DECL parse_path<svg_converter_type>(const char*, svg_converter_type&);
 extern template bool MAPNIK_DECL parse_points<svg_converter_type>(const char*, svg_converter_type&);
-extern template bool MAPNIK_DECL parse_svg_transform<svg_converter_type>(const char*, svg_converter_type&);
+extern template bool MAPNIK_DECL parse_svg_transform<agg::trans_affine>(const char*, agg::trans_affine&);
 }
 }
 
diff --git a/include/mapnik/svg/svg_transform_grammar.hpp b/include/mapnik/svg/svg_transform_grammar.hpp
deleted file mode 100644
index 18fce6bb6..000000000
--- a/include/mapnik/svg/svg_transform_grammar.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2016 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_SVG_TRANSFORM_GRAMMAR_HPP
-#define MAPNIK_SVG_TRANSFORM_GRAMMAR_HPP
-
-// mapnik
-#include <mapnik/global.hpp>
-
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#pragma GCC diagnostic pop
-
-namespace mapnik { namespace svg {
-
-using namespace boost::spirit;
-
-template <typename Iterator, typename TransformType, typename SkipType>
-struct svg_transform_grammar : qi::grammar<Iterator, void(TransformType&), SkipType>
-{
-    // ctor
-    svg_transform_grammar();
-    // rules
-    qi::rule<Iterator, void(TransformType&), SkipType> start;
-    qi::rule<Iterator, void(TransformType&), SkipType> transform_;
-    qi::rule<Iterator, void(TransformType&), SkipType> matrix;
-    qi::rule<Iterator, void(TransformType&), SkipType> translate;
-    qi::rule<Iterator, void(TransformType&), SkipType> scale;
-    qi::rule<Iterator, qi::locals<double, double, double>, void(TransformType&), SkipType> rotate;
-    qi::rule<Iterator, void(TransformType&), SkipType> skewX;
-    qi::rule<Iterator, void(TransformType&), SkipType> skewY;
-};
-
-}}
-
-#endif // MAPNIK_SVG_TRANSFORM_GRAMMAR_HPP
diff --git a/include/mapnik/svg/svg_transform_grammar_impl.hpp b/include/mapnik/svg/svg_transform_grammar_impl.hpp
deleted file mode 100644
index 39c731928..000000000
--- a/include/mapnik/svg/svg_transform_grammar_impl.hpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2016 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-// NOTE: This is an implementation header file and is only meant to be included
-//    from implementation files. It therefore doesn't have an include guard.
-// mapnik
-#include <mapnik/svg/svg_transform_grammar.hpp>
-
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_object.hpp>
-#pragma GCC diagnostic pop
-
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore_agg.hpp>
-#include <agg_trans_affine.h>
-#pragma GCC diagnostic pop
-
-namespace mapnik { namespace svg {
-
-using namespace boost::spirit;
-using namespace boost::fusion;
-using namespace boost::phoenix;
-
-inline double deg2rad(double d)
-{
-    return M_PI * d / 180.0;
-}
-
-struct process_matrix
-{
-    using result_type = void;
-    template <typename TransformType>
-    void operator () (TransformType & tr, double a, double b, double c, double d, double e, double f) const
-    {
-        tr = agg::trans_affine(a,b,c,d,e,f) * tr;
-    }
-};
-
-struct process_rotate
-{
-    using result_type = void;
-
-    template <typename TransformType, typename T0,typename T1,typename T2>
-    void operator () (TransformType & tr, T0 a, T1 cx, T2 cy) const
-    {
-        if (cx == 0.0 && cy == 0.0)
-        {
-            tr = agg::trans_affine_rotation(deg2rad(a)) * tr;
-        }
-        else
-        {
-            agg::trans_affine t = agg::trans_affine_translation(-cx,-cy);
-            t *= agg::trans_affine_rotation(deg2rad(a));
-            t *= agg::trans_affine_translation(cx, cy);
-            tr = t * tr;
-        }
-    }
-};
-
-struct process_translate
-{
-    using result_type = void;
-    template <typename TransformType, typename T0,typename T1>
-    void operator () (TransformType & tr, T0 tx, T1 ty) const
-    {
-        if (ty) tr = agg::trans_affine_translation(tx,*ty) * tr;
-        else tr = agg::trans_affine_translation(tx,0.0) * tr;
-    }
-};
-
-struct process_scale
-{
-    using result_type = void;
-    template <typename TransformType, typename T0,typename T1>
-    void operator () (TransformType & tr, T0 sx, T1 sy) const
-    {
-        if (sy) tr = agg::trans_affine_scaling(sx,*sy) * tr;
-        else tr = agg::trans_affine_scaling(sx,sx) * tr;
-    }
-};
-
-
-struct process_skew
-{
-    using result_type = void;
-
-    template <typename TransformType, typename T0,typename T1>
-    void operator () (TransformType & tr, T0 skew_x, T1 skew_y) const
-    {
-        tr = agg::trans_affine_skewing(deg2rad(skew_x),deg2rad(skew_y)) * tr;
-    }
-};
-
-template <typename Iterator, typename TransformType, typename SkipType>
-svg_transform_grammar<Iterator, TransformType, SkipType>::svg_transform_grammar()
-    : svg_transform_grammar::base_type(start)
-{
-    qi::_1_type _1;
-    qi::_2_type _2;
-    qi::_3_type _3;
-    qi::_4_type _4;
-    qi::_5_type _5;
-    qi::_6_type _6;
-    qi::_a_type _a;
-    qi::_b_type _b;
-    qi::_c_type _c;
-    qi::_r1_type _r1;
-    qi::lit_type lit;
-    qi::double_type double_;
-    qi::no_case_type no_case;
-
-    // actions
-    function<process_matrix> matrix_action;
-    function<process_rotate> rotate_action;
-    function<process_translate> translate_action;
-    function<process_scale> scale_action;
-    function<process_skew> skew_action;
-
-    start =  +transform_(_r1) ;
-
-    transform_ = matrix(_r1) | rotate(_r1) | translate(_r1) | scale(_r1) | rotate(_r1) | skewX(_r1) | skewY (_r1) ;
-
-    matrix = no_case[lit("matrix")] >> lit('(')
-                                    >> (double_ >> -lit(',')
-                                        >> double_ >> -lit(',')
-                                        >> double_ >> -lit(',')
-                                        >> double_ >> -lit(',')
-                                        >> double_ >> -lit(',')
-                                        >> double_)[matrix_action(_r1, _1, _2, _3, _4, _5, _6)] >> lit(')');
-
-    translate = no_case[lit("translate")]
-        >> lit('(') >> (double_ >> -lit(',') >> -double_)[translate_action(_r1, _1, _2)] >> lit(')');
-
-    scale = no_case[lit("scale")]
-        >> lit('(') >> (double_ >> -lit(',') >> -double_)[scale_action(_r1, _1, _2)] >> lit(')');
-
-    rotate = no_case[lit("rotate")]
-        >> lit('(')
-        >> double_[_a = _1] >> -lit(',')
-        >> -(double_ [_b = _1] >> -lit(',') >> double_[_c = _1])
-        >> lit(')') [ rotate_action(_r1, _a,_b,_c)];
-
-    skewX = no_case[lit("skewX")] >> lit('(') >> double_ [ skew_action(_r1, _1, 0.0)] >> lit(')');
-
-    skewY = no_case[lit("skewY")] >> lit('(') >> double_ [ skew_action(_r1, 0.0, _1)] >> lit(')');
-
-}
-
-}}
diff --git a/include/mapnik/svg/svg_transform_grammar_x3.hpp b/include/mapnik/svg/svg_transform_grammar_x3.hpp
new file mode 100644
index 000000000..c0fb12915
--- /dev/null
+++ b/include/mapnik/svg/svg_transform_grammar_x3.hpp
@@ -0,0 +1,43 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_SVG_TRANSFORM_GRAMMAR_X3_HPP
+#define MAPNIK_SVG_TRANSFORM_GRAMMAR_X3_HPP
+
+// mapnik
+#include <mapnik/svg/svg_grammar_config_x3.hpp>
+
+namespace mapnik { namespace svg { namespace grammar {
+
+using namespace boost::spirit::x3;
+
+using svg_transform_grammar_type = x3::rule<class svg_transform_rule_tag>;
+
+BOOST_SPIRIT_DECLARE(svg_transform_grammar_type);
+
+}
+
+grammar::svg_transform_grammar_type const& svg_transform_grammar();
+
+}}
+
+#endif // MAPNIK_SVG_TRANSFORM_GRAMMAR_X3_HPP
diff --git a/include/mapnik/svg/svg_transform_grammar_x3_def.hpp b/include/mapnik/svg/svg_transform_grammar_x3_def.hpp
new file mode 100644
index 000000000..47b6030ce
--- /dev/null
+++ b/include/mapnik/svg/svg_transform_grammar_x3_def.hpp
@@ -0,0 +1,163 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2016 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_SVG_TRANSFORM_GRAMMAR_X3_DEF_HPP
+#define MAPNIK_SVG_TRANSFORM_GRAMMAR_X3_DEF_HPP
+
+// mapnik
+#include <mapnik/svg/svg_transform_grammar_x3.hpp>
+// boost::fusion
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/fusion/sequence.hpp>
+#pragma GCC diagnostic pop
+// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
+#include <agg_trans_affine.h>
+#pragma GCC diagnostic pop
+
+namespace mapnik { namespace svg { namespace grammar {
+
+namespace x3 = boost::spirit::x3;
+
+using x3::lit;
+using x3::double_;
+using x3::no_case;
+
+auto const matrix_action = [] (auto const& ctx)
+{
+    auto & tr = x3::get<svg_transform_tag>(ctx).get();
+    auto const& attr = _attr(ctx);
+    auto a = boost::fusion::at_c<0>(attr);
+    auto b = boost::fusion::at_c<1>(attr);
+    auto c = boost::fusion::at_c<2>(attr);
+    auto d = boost::fusion::at_c<3>(attr);
+    auto e = boost::fusion::at_c<4>(attr);
+    auto f = boost::fusion::at_c<5>(attr);
+    tr = agg::trans_affine(a, b, c, d, e, f) * tr;
+};
+
+auto const rotate_action = [] (auto const& ctx)
+{
+    auto & tr = x3::get<svg_transform_tag>(ctx).get();
+    auto const& attr = _attr(ctx);
+    auto a = boost::fusion::at_c<0>(attr);
+    auto cx = boost::fusion::at_c<1>(attr) ? *boost::fusion::at_c<1>(attr) : 0.0;
+    auto cy = boost::fusion::at_c<2>(attr) ? *boost::fusion::at_c<2>(attr) : 0.0;
+    if (cx == 0.0 && cy == 0.0)
+    {
+        tr = agg::trans_affine_rotation(deg2rad(a)) * tr;
+    }
+    else
+    {
+        agg::trans_affine t = agg::trans_affine_translation(-cx,-cy);
+        t *= agg::trans_affine_rotation(deg2rad(a));
+        t *= agg::trans_affine_translation(cx, cy);
+        tr = t * tr;
+    }
+};
+
+auto const translate_action = [] (auto const& ctx)
+{
+    auto & tr = x3::get<svg_transform_tag>(ctx).get();
+    auto const& attr = _attr(ctx);
+    auto tx = boost::fusion::at_c<0>(attr);
+    auto ty = boost::fusion::at_c<1>(attr);
+    if (ty) tr = agg::trans_affine_translation(tx, *ty) * tr;
+    else tr = agg::trans_affine_translation(tx,0.0) * tr;
+};
+
+auto const scale_action = [] (auto const& ctx)
+{
+    auto & tr = x3::get<svg_transform_tag>(ctx).get();
+    auto const& attr = _attr(ctx);
+    auto sx = boost::fusion::at_c<0>(attr);
+    auto sy = boost::fusion::at_c<1>(attr);
+    if (sy) tr = agg::trans_affine_scaling(sx, *sy) * tr;
+    else tr = agg::trans_affine_scaling(sx, sx) * tr;
+};
+
+auto const skewX_action = [] (auto const& ctx)
+{
+    auto & tr = x3::get<svg_transform_tag>(ctx).get();
+    auto skew_x = _attr(ctx);
+    tr = agg::trans_affine_skewing(deg2rad(skew_x), 0.0) * tr;
+};
+
+auto const skewY_action = [] (auto const& ctx)
+{
+    auto & tr = x3::get<svg_transform_tag>(ctx).get();
+    auto skew_y= _attr(ctx);
+    tr = agg::trans_affine_skewing(0.0, deg2rad(skew_y)) * tr;
+};
+
+//exported rule
+svg_transform_grammar_type const svg_transform = "SVG Transform";
+// rules
+auto const matrix = x3::rule<class matrix_tag> {} = no_case[lit("matrix")]
+    > lit('(') > (double_ > -lit(',')
+                  > double_ > -lit(',')
+                  > double_ > -lit(',')
+                  > double_ > -lit(',')
+                  > double_ > -lit(',')
+                  > double_)[matrix_action]
+    > lit(')');
+
+auto const translate = x3::rule<class translate_tag> {} = no_case[lit("translate")]
+    > lit('(') > (double_ > -lit(',') >> -double_)[translate_action] > lit(')');
+
+auto const scale = x3::rule<class scale_tag> {} = no_case[lit("scale")]
+    > lit('(') >  (double_ >  -lit(',') >  -double_)[scale_action] > lit(')');
+
+auto const rotate = x3::rule<class rotate_tag> {} = no_case[lit("rotate")]
+    > lit('(')
+    > (double_ > -(lit(',') > double_) > -(lit(',') > double_))[rotate_action]
+    > lit(')') ;
+
+auto const skewX = x3::rule<class skewX_tag> {} = no_case[lit("skewX")]
+    > lit('(') > double_ [ skewX_action] > lit(')');
+auto const skewY = x3::rule<class skewY_tag> {} = no_case[lit("skewY")]
+    > lit('(') > double_ [ skewY_action] > lit(')');
+
+auto const transform = x3::rule<class transform_tag> {} = matrix | rotate | translate | scale /*| rotate*/ | skewX | skewY ;
+
+auto const svg_transform_def = +transform ;
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+BOOST_SPIRIT_DEFINE(
+    svg_transform
+    );
+#pragma GCC diagnostic pop
+
+}
+
+grammar::svg_transform_grammar_type const& svg_transform_grammar()
+{
+    return grammar::svg_transform;
+}
+
+}}
+
+
+#endif // MAPNIK_SVG_TRANSFORM_GRAMMAR_X3_HPP
diff --git a/src/svg/svg_transform_parser.cpp b/src/svg/svg_transform_parser.cpp
index 78ac34609..46aca7fd6 100644
--- a/src/svg/svg_transform_parser.cpp
+++ b/src/svg/svg_transform_parser.cpp
@@ -22,24 +22,37 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/svg/svg_transform_grammar_impl.hpp>
+#include <mapnik/svg/svg_transform_grammar_x3_def.hpp>
 // stl
 #include <string>
 #include <cstring>
 
-namespace mapnik {
-namespace svg {
+namespace mapnik { namespace svg {
 
-template <typename TransformType>
-bool parse_svg_transform(const char* wkt, TransformType& tr)
+template <typename Transform>
+bool parse_svg_transform(const char* wkt, Transform& tr)
 {
     using namespace boost::spirit;
-    using iterator_type = const char*;
-    using skip_type = ascii::space_type;
-    static const svg_transform_grammar<iterator_type, TransformType, skip_type> g;
+    using iterator_type = char const*;
     iterator_type first = wkt;
     iterator_type last = wkt + std::strlen(wkt);
-    return qi::phrase_parse(first, last, (g)(boost::phoenix::ref(tr)), skip_type());
+    using space_type = mapnik::svg::grammar::space_type;
+    auto const grammar = x3::with<mapnik::svg::grammar::svg_transform_tag>(std::ref(tr))
+          [mapnik::svg::svg_transform_grammar()];
+
+    try
+    {
+        if (!x3::phrase_parse(first, last, grammar, space_type())
+            || first != last)
+        {
+            throw std::runtime_error("Failed to parse svg-transform");
+        }
+    }
+    catch (...)
+    {
+        return false;
+    }
+    return true;
 }
 
 template bool MAPNIK_DECL parse_svg_transform<agg::trans_affine>(const char*, agg::trans_affine&);

From d5405d55c7be37df72ec6da14a4b48ed60101534 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 2 Jan 2017 11:47:26 +0100
Subject: [PATCH 185/328] use a copy of `start` iterator when extracting
 bounding boxes + increase verbose output on failures

---
 utils/mapnik-index/process_geojson_file_x3.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/utils/mapnik-index/process_geojson_file_x3.cpp b/utils/mapnik-index/process_geojson_file_x3.cpp
index 51fe30e1e..0079d01c0 100644
--- a/utils/mapnik-index/process_geojson_file_x3.cpp
+++ b/utils/mapnik-index/process_geojson_file_x3.cpp
@@ -256,10 +256,10 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
     base_iterator_type start = file_buffer.c_str();
     base_iterator_type end = start + file_buffer.length();
 #endif
-
+    base_iterator_type itr = start; // make a copy to preserve `start` iterator state
     try
     {
-        mapnik::json::extract_bounding_boxes(start, end, boxes);
+        mapnik::json::extract_bounding_boxes(itr, end, boxes);
     }
     catch (boost::spirit::x3::expectation_failure<base_iterator_type> const& ex)
     {
@@ -275,7 +275,6 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
     }
 
     using namespace boost::spirit;
-
     using space_type = mapnik::json::grammar::space_type;
     auto keys = mapnik::json::get_keys();
     auto feature_grammar = x3::with<mapnik::json::grammar::keys_tag>(std::ref(keys))
@@ -296,7 +295,7 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
                     bool result = x3::phrase_parse(feat_itr, feat_end, feature_grammar, space_type(), feature_value);
                     if (!result || feat_itr != feat_end)
                     {
-                        if (verbose) std::clog << std::string(start + item.second.first, feat_end ) << std::endl;
+                        if (verbose) std::clog << "Failed to parse: offset=" << item.second.first << " size=" << item.second.second << std::endl;
                         return std::make_pair(false, extent);
                     }
                 }
@@ -307,10 +306,12 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
                 }
                 catch (...)
                 {
+                    if (verbose) std::clog << "Failed to parse: offset=" << item.second.first << " size=" << item.second.second << std::endl;
                     return std::make_pair(false, extent);
                 }
                 if (!validate_geojson_feature(feature_value, keys, verbose))
                 {
+                    if (verbose) std::clog << "Failed to validate: [" << std::string(start + item.second.first, feat_end ) << "]" << std::endl;
                     return std::make_pair(false, extent);
                 }
             }

From b3c4aff2c7932a3e08664a8bb7335f6e5fa1a23e Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 3 Jan 2017 11:24:32 +0100
Subject: [PATCH 186/328] add  ```template <typename T>        
 transform_node(boost::value_initialized<T> const&)           : base_() {} ```
 to address

```c:\mb\windows-builds-64\packages\mapnik-windows\include\mapnik/transform_expression.hpp(175):
error C2664: 'mapbox::util::variant<mapnik::identity_node,mapnik::matrix_node,mapnik::translate_node,mapnik::scale_node,mapnik::rotate_node,mapnik::skewX_node,mapnik::skewY_node>::variant(mapbox::util::variant<mapnik::identity_node,mapnik::matrix_node,mapnik::translate_node,mapnik::scale_node,mapnik::rotate_node,mapnik::skewX_node,mapnik::skewY_node> &&) noexcept(false)':
cannot convert argument 1 from 'const boost::value_initialized<T>' to 'mapbox::util::no_init' [c:\mb\windows-builds-64\packages\mapnik-windows\mapnik-gyp\build\mapnik.vcxproj]
```
when building with VS2017 RC
---
 include/mapnik/transform_expression.hpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/include/mapnik/transform_expression.hpp b/include/mapnik/transform_expression.hpp
index 18256efee..e5007f577 100644
--- a/include/mapnik/transform_expression.hpp
+++ b/include/mapnik/transform_expression.hpp
@@ -38,6 +38,8 @@
 #include <boost/fusion/include/vector.hpp>
 #pragma GCC diagnostic pop
 
+//
+#include <boost/utility/value_init.hpp>
 // stl
 #include <vector>
 #include <memory>
@@ -170,6 +172,10 @@ struct transform_node
     transform_node()
         : base_() {}
 
+    template <typename T>
+    transform_node(boost::value_initialized<T> const&)
+        : base_() {}
+
     template <typename T>
     transform_node(T const& val)
         : base_(val) {}

From 7a8e8014b7103989cf744144aba31f784ea47c70 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 3 Jan 2017 11:28:40 +0100
Subject: [PATCH 187/328] Revert "add  ```template <typename T>" - oops we
 don't need this in master!

This reverts commit b3c4aff2c7932a3e08664a8bb7335f6e5fa1a23e.
---
 include/mapnik/transform_expression.hpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/include/mapnik/transform_expression.hpp b/include/mapnik/transform_expression.hpp
index e5007f577..18256efee 100644
--- a/include/mapnik/transform_expression.hpp
+++ b/include/mapnik/transform_expression.hpp
@@ -38,8 +38,6 @@
 #include <boost/fusion/include/vector.hpp>
 #pragma GCC diagnostic pop
 
-//
-#include <boost/utility/value_init.hpp>
 // stl
 #include <vector>
 #include <memory>
@@ -172,10 +170,6 @@ struct transform_node
     transform_node()
         : base_() {}
 
-    template <typename T>
-    transform_node(boost::value_initialized<T> const&)
-        : base_() {}
-
     template <typename T>
     transform_node(T const& val)
         : base_(val) {}

From d3a9e4c4d70b8b3414bbb6ea41862d6e2ae5f418 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 3 Jan 2017 16:17:46 +0100
Subject: [PATCH 188/328] revive support for an empty array => geometry_empty
 RFC 7946 "...GeoJSON processors MAY interpret Geometry objects with          
 empty "coordinates" arrays as null objects."

---
 include/mapnik/json/positions_grammar_x3_def.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/mapnik/json/positions_grammar_x3_def.hpp b/include/mapnik/json/positions_grammar_x3_def.hpp
index ab012c061..7312ee79d 100644
--- a/include/mapnik/json/positions_grammar_x3_def.hpp
+++ b/include/mapnik/json/positions_grammar_x3_def.hpp
@@ -44,7 +44,7 @@ x3::rule<class rings_array_class, rings_array> const rings_array("RingsArray");
 
 auto const positions_def = rings_array | rings | ring | point ;
 auto const point_def = lit('[') > double_ > lit(',') > double_ > omit[*(lit(',') > double_)] > lit(']');
-auto const ring_def = lit('[') >> (point % lit(',') > lit(']'));
+auto const ring_def = lit('[') >> -(point % lit(',')) >> lit(']');
 auto const rings_def = lit('[') >> (ring % lit(',') > lit(']'));
 auto const rings_array_def = lit('[') >> (rings % lit(',') > lit(']'));
 

From 962bcf84c5f179f97cb948ec70cd34a32bc91355 Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Tue, 3 Jan 2017 20:53:55 +0100
Subject: [PATCH 189/328] change render_thunk_list to std::list<render_thunk>

Wrapping render_thunk in std::unique_ptr is one extra allocation per
element, with no purpose. The somewhat costly xyz_render_thunk move
constructor is only called once upon insertion, regardless of whether
we're emplacing render_thunk or unique_ptr.
---
 include/mapnik/renderer_common/render_group_symbolizer.hpp | 4 ++--
 include/mapnik/renderer_common/render_thunk.hpp            | 3 +--
 src/renderer_common/render_thunk_extractor.cpp             | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/include/mapnik/renderer_common/render_group_symbolizer.hpp b/include/mapnik/renderer_common/render_group_symbolizer.hpp
index e7b1b2248..65cc0f94f 100644
--- a/include/mapnik/renderer_common/render_group_symbolizer.hpp
+++ b/include/mapnik/renderer_common/render_group_symbolizer.hpp
@@ -42,9 +42,9 @@ struct render_thunk_list_dispatch
     {
         offset_ = offset;
 
-        for (render_thunk_ptr const& thunk : thunks)
+        for (render_thunk const& thunk : thunks)
         {
-            util::apply_visitor(std::ref(*this), *thunk);
+            util::apply_visitor(std::ref(*this), thunk);
         }
     }
 
diff --git a/include/mapnik/renderer_common/render_thunk.hpp b/include/mapnik/renderer_common/render_thunk.hpp
index 2a957d260..66b108bb9 100644
--- a/include/mapnik/renderer_common/render_thunk.hpp
+++ b/include/mapnik/renderer_common/render_thunk.hpp
@@ -107,8 +107,7 @@ struct text_render_thunk : util::movable
 using render_thunk = util::variant<vector_marker_render_thunk,
                                    raster_marker_render_thunk,
                                    text_render_thunk>;
-using render_thunk_ptr = std::unique_ptr<render_thunk>;
-using render_thunk_list = std::list<render_thunk_ptr>;
+using render_thunk_list = std::list<render_thunk>;
 
 } // namespace mapnik
 
diff --git a/src/renderer_common/render_thunk_extractor.cpp b/src/renderer_common/render_thunk_extractor.cpp
index c437262da..1a5d1b854 100644
--- a/src/renderer_common/render_thunk_extractor.cpp
+++ b/src/renderer_common/render_thunk_extractor.cpp
@@ -55,7 +55,7 @@ struct thunk_markers_renderer_context : markers_renderer_context
     {
         vector_marker_render_thunk thunk(src, attrs, marker_tr, params.opacity,
                                          comp_op_, params.snap_to_pixels);
-        thunks_.push_back(std::make_unique<render_thunk>(std::move(thunk)));
+        thunks_.emplace_back(std::move(thunk));
     }
 
     virtual void render_marker(image_rgba8 const& src,
@@ -64,7 +64,7 @@ struct thunk_markers_renderer_context : markers_renderer_context
     {
         raster_marker_render_thunk thunk(src, marker_tr, params.opacity,
                                          comp_op_, params.snap_to_pixels);
-        thunks_.push_back(std::make_unique<render_thunk>(std::move(thunk)));
+        thunks_.emplace_back(std::move(thunk));
     }
 
 private:
@@ -128,7 +128,7 @@ void render_thunk_extractor::extract_text_thunk(text_render_thunk::helper_ptr &&
     halo_rasterizer_enum halo_rasterizer = get<halo_rasterizer_enum>(sym, keys::halo_rasterizer, feature_, common_.vars_, HALO_RASTERIZER_FULL);
 
     text_render_thunk thunk(std::move(helper), opacity, comp_op, halo_rasterizer);
-    thunks_.push_back(std::make_unique<render_thunk>(std::move(thunk)));
+    thunks_.emplace_back(std::move(thunk));
 
     update_box();
 }

From ca89c587bd2fb3517642bbf8c2391d69fcb78044 Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Tue, 3 Jan 2017 21:43:14 +0100
Subject: [PATCH 190/328] can't store noncopyable list in std::vector

std::list can have a throwing move constructor.
std::vector of such lists makes copies when growing its storage array,
it doesn't move them.
render_thunk_list is noncopyable (because render_thunk is noncopyable),
and so can't be stored in std::vector in some STL implementations.
---
 src/renderer_common/render_group_symbolizer.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/renderer_common/render_group_symbolizer.cpp b/src/renderer_common/render_group_symbolizer.cpp
index 9892dfc8d..8e3aba9bd 100644
--- a/src/renderer_common/render_group_symbolizer.cpp
+++ b/src/renderer_common/render_group_symbolizer.cpp
@@ -66,7 +66,7 @@ void render_group_symbolizer(group_symbolizer const& sym,
 
     // keep track of which lists of render thunks correspond to
     // entries in the group_layout_manager.
-    std::vector<render_thunk_list> layout_thunks;
+    std::list<render_thunk_list> layout_thunks;
 
     // layout manager to store and arrange bboxes of matched features
     group_layout_manager layout_manager(props->get_layout());
@@ -182,11 +182,13 @@ void render_group_symbolizer(group_symbolizer const& sym,
     pixel_position_list const& positions = helper.get();
     for (pixel_position const& pos : positions)
     {
-        for (size_t layout_i = 0; layout_i < layout_thunks.size(); ++layout_i)
+        size_t layout_i = 0;
+        for (auto const& thunks : layout_thunks)
         {
             pixel_position const& offset = layout_manager.offset_at(layout_i);
             pixel_position render_offset = pos + offset;
-            render_thunks.render_list(layout_thunks[layout_i], render_offset);
+            render_thunks.render_list(thunks, render_offset);
+            ++layout_i;
         }
     }
 }

From e210dfaf8c8bf4fea36f4933c1c0114e6e208504 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 4 Jan 2017 18:18:47 +0100
Subject: [PATCH 191/328] fix GCC warning by adding missing parentheses around
 comparison in operand of '|'

---
 include/mapnik/json/topojson_grammar_x3_def.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/mapnik/json/topojson_grammar_x3_def.hpp b/include/mapnik/json/topojson_grammar_x3_def.hpp
index d891cc629..bddbed3eb 100644
--- a/include/mapnik/json/topojson_grammar_x3_def.hpp
+++ b/include/mapnik/json/topojson_grammar_x3_def.hpp
@@ -373,7 +373,7 @@ auto const geometry_tuple_def =
      |
      properties[assign_properties]
      |
-     omit[json_string] > lit(':') > omit[json_value]) % lit(',')
+     (omit[json_string] > lit(':') > omit[json_value])) % lit(',')
     ;
 
 auto const geometry_def = lit("{") > geometry_tuple[create_geometry] > lit("}");

From 07ab49830f96b822ecf6bde73b184535db802652 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 4 Jan 2017 18:37:44 +0100
Subject: [PATCH 192/328] disable `is_substitute` instantiation for
 BOOST_VERSION > 106300, fixes gcc6+boost-1_63 build

---
 include/mapnik/wkt/wkt_grammar_x3_def.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/mapnik/wkt/wkt_grammar_x3_def.hpp b/include/mapnik/wkt/wkt_grammar_x3_def.hpp
index db44a4ce4..54b4acfb5 100644
--- a/include/mapnik/wkt/wkt_grammar_x3_def.hpp
+++ b/include/mapnik/wkt/wkt_grammar_x3_def.hpp
@@ -26,9 +26,9 @@
 #include <mapnik/wkt/wkt_grammar_x3.hpp>
 #include <mapnik/geometry/fusion_adapted.hpp>
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && BOOST_VERSION < 106300
 // instantiate `is_substitute` for reference T and reference Attribute
-// fixes gcc6 compilation issue
+// fixes gcc6 compilation issue with boost 1_61 and boost_1_62
 namespace boost { namespace spirit { namespace x3 { namespace traits {
 template <typename T, typename Attribute, typename Enable>
 struct is_substitute<T&, Attribute&, Enable>

From 4a99e0017784127dbfc3aa4900368fb42deeb005 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <springmeyer@users.noreply.github.com>
Date: Wed, 4 Jan 2017 11:45:03 -0800
Subject: [PATCH 193/328] Point as latest mason rather than branch

---
 bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 4a7bfa49c..f7d0ce334 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -11,7 +11,7 @@ todo
 - shrink icu data
 '
 
-MASON_VERSION="new-pkgs"
+MASON_VERSION="3e2944322"
 
 function setup_mason() {
     if [[ ! -d ./.mason ]]; then

From 6e3dc91325eb84ff84c893d7be8af3358155f95b Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 5 Jan 2017 16:51:20 +0100
Subject: [PATCH 194/328] remove demo/python (moved to python-mapnik)

---
 demo/python/README.txt |  20 ---
 demo/python/rundemo.py | 379 -----------------------------------------
 2 files changed, 399 deletions(-)
 delete mode 100644 demo/python/README.txt
 delete mode 100755 demo/python/rundemo.py

diff --git a/demo/python/README.txt b/demo/python/README.txt
deleted file mode 100644
index 4a13579cb..000000000
--- a/demo/python/README.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-This directory contains a sample python script implementing the Mapnik API.
-
-The script is thoroughly commented and also acts as a mini tutorial.  Reading
-it should get you on your way, and you can use it as a base for your work.
-
-You must compile and install mapnik and the python bindings FIRST.
-
-Once this is done, run it:
-
-/path/to/python rundemo.py
-
-If all goes well, it should render 2 map images:
-
-demo.jpg
-demo.png
-
-Have a look!
-
-Cheers,
-J.F.
diff --git a/demo/python/rundemo.py b/demo/python/rundemo.py
deleted file mode 100755
index 910d846a5..000000000
--- a/demo/python/rundemo.py
+++ /dev/null
@@ -1,379 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-#
-#
-# This file is part of Mapnik (c++ mapping toolkit)
-# Copyright (C) 2005 Jean-Francois Doyon
-#
-# Mapnik is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-from __future__ import print_function
-import sys
-from os import path
-import mapnik
-
-# Instanciate a map, giving it a width and height. Remember: the word "map" is
-# reserved in Python! :)
-
-root = path.dirname(__file__)
-m = mapnik.Map(800,600,"+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs")
-
-# Set its background colour. More on colours later ...
-
-m.background = mapnik.Color('white')
-
-# Now we can start adding layers, in stacking order (i.e. bottom layer first)
-
-# Canadian Provinces (Polygons)
-
-# Instanciate a layer.  The parameters depend on the type of data:
-# shape:
-#     type='shape'
-#     file='/path/to/shape'
-# raster:
-#     type='raster'
-#     file='/path/to/raster'
-# postgis:
-#     type='postgis'
-#     host='127.0.0.1'
-#     dbname='mydatabase'
-#     user='myusername'
-#     password='mypassword'
-#     table= TODO
-
-provpoly_lyr = mapnik.Layer('Provinces')
-provpoly_lyr.srs = "+proj=lcc +ellps=GRS80 +lat_0=49 +lon_0=-95 +lat+1=49 +lat_2=77 +datum=NAD83 +units=m +no_defs"
-provpoly_lyr.datasource = mapnik.Shapefile(file=path.join(root,'../data/boundaries'), encoding='latin1')
-
-# We then define a style for the layer.  A layer can have one or many styles.
-# Styles are named, so they can be shared across different layers.
-# Multiple styles per layer behaves functionally like multiple layers.  The
-# data is completely re-scanned for each style within one layer, and a style
-# will be drawn entirely "above" the previous one.  Performance wise using
-# multiple styles in one layer is the same has having multiple layers.
-# The paradigm is useful mostly as a convenience.
-
-provpoly_style = mapnik.Style()
-
-# A Style needs one or more rules.  A rule will normally consist of a filter
-# for feature selection, and one or more symbolizers.
-
-provpoly_rule_on = mapnik.Rule()
-
-# A Expression() allows the selection of features to which the symbology will
-# be applied.  More on Mapnik expressions can be found in Tutorial #2.
-# A given feature can only match one filter per rule per style.
-
-provpoly_rule_on.filter = mapnik.Expression("[NAME_EN] = 'Ontario'")
-
-# Here a symbolizer is defined.  Available are:
-#     - LineSymbolizer(Color(),<width>)
-#     - LineSymbolizer(Stroke())
-#     - PolygonSymbolizer(Color())
-#     - PointSymbolizer(<file>,<type>,<width>,<height>)
-
-# Some of them can accept a Color() instance, which can be created with:
-#     - Color(<red>, <green>, <blue>)
-#     - Color(<red>, <green>, <blue>, <alpha>)
-#     - Color(<string>) where <string> will be something like '#00FF00'
-#       or '#0f0' or 'green'
-
-sym = mapnik.PolygonSymbolizer()
-sym.fill = mapnik.Color(250, 190, 183);
-provpoly_rule_on.symbols.append(sym)
-provpoly_style.rules.append(provpoly_rule_on)
-
-provpoly_rule_qc = mapnik.Rule()
-provpoly_rule_qc.filter = mapnik.Expression("[NOM_FR] = 'Québec'")
-sym = mapnik.PolygonSymbolizer()
-sym.fill = mapnik.Color(217, 235, 203)
-provpoly_rule_qc.symbols.append(sym)
-provpoly_style.rules.append(provpoly_rule_qc)
-
-# Add the style to the map, giving it a name.  This is the name that will be
-# used to refer to it from here on.  Having named styles allows them to be
-# re-used throughout the map.
-
-m.append_style('provinces', provpoly_style)
-
-# Then associate the style to the layer itself.
-
-provpoly_lyr.styles.append('provinces')
-
-# Then add the layer to the map.  In reality, it's the order in which you
-# append them to the map that will determine the drawing order, though by
-# convention it is recommended to define them in drawing order as well.
-
-m.layers.append(provpoly_lyr)
-
-# Drainage
-
-# A simple example ...
-
-qcdrain_lyr = mapnik.Layer('Quebec Hydrography')
-qcdrain_lyr.srs = "+proj=lcc +ellps=GRS80 +lat_0=49 +lon_0=-95 +lat+1=49 +lat_2=77 +datum=NAD83 +units=m +no_defs"
-qcdrain_lyr.datasource = mapnik.Shapefile(file=path.join(root,'../data/qcdrainage'))
-
-qcdrain_style = mapnik.Style()
-qcdrain_rule = mapnik.Rule()
-qcdrain_rule.filter = mapnik.Expression('[HYC] = 8')
-sym = mapnik.PolygonSymbolizer()
-sym.fill = mapnik.Color(153, 204, 255)
-sym.smooth = 1.0 # very smooth
-qcdrain_rule.symbols.append(sym)
-qcdrain_style.rules.append(qcdrain_rule)
-
-m.append_style('drainage', qcdrain_style)
-qcdrain_lyr.styles.append('drainage')
-m.layers.append(qcdrain_lyr)
-
-# In this case, we have 2 data sets with similar schemas (same filtering
-# attributes, and same desired style), so we're going to
-# re-use the style defined in the above layer for the next one.
-
-ondrain_lyr = mapnik.Layer('Ontario Hydrography')
-ondrain_lyr.srs = "+proj=lcc +ellps=GRS80 +lat_0=49 +lon_0=-95 +lat+1=49 +lat_2=77 +datum=NAD83 +units=m +no_defs"
-ondrain_lyr.datasource = mapnik.Shapefile(file=path.join(root,'../data/ontdrainage'))
-
-ondrain_lyr.styles.append('drainage')
-m.layers.append(ondrain_lyr)
-
-# Provincial boundaries
-
-provlines_lyr = mapnik.Layer('Provincial borders')
-provlines_lyr.srs = "+proj=lcc +ellps=GRS80 +lat_0=49 +lon_0=-95 +lat+1=49 +lat_2=77 +datum=NAD83 +units=m +no_defs"
-provlines_lyr.datasource = mapnik.Shapefile(file=path.join(root,'../data/boundaries_l'))
-
-# Here we define a "dash dot dot dash" pattern for the provincial boundaries.
-
-provlines_style = mapnik.Style()
-provlines_rule = mapnik.Rule()
-sym = mapnik.LineSymbolizer()
-# FIXME - currently adding dash arrays is broken
-# https://github.com/mapnik/mapnik/issues/2324
-sym.stroke = mapnik.Color('black')
-sym.stroke_width = 1.0
-provlines_rule.symbols.append(sym)
-provlines_style.rules.append(provlines_rule)
-
-m.append_style('provlines', provlines_style)
-provlines_lyr.styles.append('provlines')
-m.layers.append(provlines_lyr)
-
-# Roads 3 and 4 (The "grey" roads)
-
-roads34_lyr = mapnik.Layer('Roads')
-roads34_lyr.srs = "+proj=lcc +ellps=GRS80 +lat_0=49 +lon_0=-95 +lat+1=49 +lat_2=77 +datum=NAD83 +units=m +no_defs"
-# create roads datasource (we're going to re-use it later)
-
-roads34_lyr.datasource = mapnik.Shapefile(file=path.join(root,'../data/roads'))
-
-roads34_style = mapnik.Style()
-roads34_rule = mapnik.Rule()
-roads34_rule.filter = mapnik.Expression('([CLASS] = 3) or ([CLASS] = 4)')
-
-# With lines of a certain width, you can control how the ends
-# are closed off using line_cap as below.
-
-# Available options are:
-# line_cap: BUTT_CAP, SQUARE_CAP, ROUND_CAP
-# line_join: MITER_JOIN, MITER_REVERT_JOIN, ROUND_JOIN, BEVEL_JOIN
-
-# And one last Stroke() attribute not used here is "opacity", which
-# can be set to a numerical value.
-
-sym = mapnik.LineSymbolizer()
-sym.stroke = mapnik.Color(171,158,137)
-sym.stroke_width = 2.0
-sym.stroke_linecap = mapnik.stroke_linecap.ROUND_CAP
-
-roads34_rule.symbols.append(sym)
-roads34_style.rules.append(roads34_rule)
-
-m.append_style('smallroads', roads34_style)
-roads34_lyr.styles.append('smallroads')
-m.layers.append(roads34_lyr)
-
-# Roads 2 (The thin yellow ones)
-
-roads2_lyr = mapnik.Layer('Roads')
-roads2_lyr.srs = "+proj=lcc +ellps=GRS80 +lat_0=49 +lon_0=-95 +lat+1=49 +lat_2=77 +datum=NAD83 +units=m +no_defs"
-# Just get a copy from roads34_lyr
-roads2_lyr.datasource = roads34_lyr.datasource
-
-roads2_style_1 = mapnik.Style()
-roads2_rule_1 = mapnik.Rule()
-roads2_rule_1.filter = mapnik.Expression('[CLASS] = 2')
-
-sym = mapnik.LineSymbolizer()
-sym.stroke = mapnik.Color(171,158,137)
-sym.stroke_width = 4.0
-sym.stroke_linecap = mapnik.stroke_linecap.ROUND_CAP
-roads2_rule_1.symbols.append(sym)
-roads2_style_1.rules.append(roads2_rule_1)
-
-m.append_style('road-border', roads2_style_1)
-
-roads2_style_2 = mapnik.Style()
-roads2_rule_2 = mapnik.Rule()
-roads2_rule_2.filter = mapnik.Expression('[CLASS] = 2')
-sym = mapnik.LineSymbolizer()
-sym.stroke = mapnik.Color(255,250,115)
-sym.stroke_linecap = mapnik.stroke_linecap.ROUND_CAP
-sym.stroke_width = 2.0
-roads2_rule_2.symbols.append(sym)
-roads2_style_2.rules.append(roads2_rule_2)
-
-m.append_style('road-fill', roads2_style_2)
-
-roads2_lyr.styles.append('road-border')
-roads2_lyr.styles.append('road-fill')
-
-m.layers.append(roads2_lyr)
-
-# Roads 1 (The big orange ones, the highways)
-
-roads1_lyr = mapnik.Layer('Roads')
-roads1_lyr.srs = "+proj=lcc +ellps=GRS80 +lat_0=49 +lon_0=-95 +lat+1=49 +lat_2=77 +datum=NAD83 +units=m +no_defs"
-roads1_lyr.datasource = roads34_lyr.datasource
-
-roads1_style_1 = mapnik.Style()
-roads1_rule_1 = mapnik.Rule()
-roads1_rule_1.filter = mapnik.Expression('[CLASS] = 1')
-sym = mapnik.LineSymbolizer()
-sym.stroke = mapnik.Color(188,149,28)
-sym.stroke_linecap = mapnik.stroke_linecap.ROUND_CAP
-sym.stroke_width = 7.0
-roads1_rule_1.symbols.append(sym)
-roads1_style_1.rules.append(roads1_rule_1)
-m.append_style('highway-border', roads1_style_1)
-
-roads1_style_2 = mapnik.Style()
-roads1_rule_2 = mapnik.Rule()
-roads1_rule_2.filter = mapnik.Expression('[CLASS] = 1')
-sym.stroke = mapnik.Color(242,191,36)
-sym.stroke_linecap = mapnik.stroke_linecap.ROUND_CAP
-sym.stroke_width = 5.0
-roads1_rule_2.symbols.append(sym)
-roads1_style_2.rules.append(roads1_rule_2)
-
-m.append_style('highway-fill', roads1_style_2)
-
-roads1_lyr.styles.append('highway-border')
-roads1_lyr.styles.append('highway-fill')
-
-m.layers.append(roads1_lyr)
-
-# Populated Places
-
-popplaces_lyr = mapnik.Layer('Populated Places')
-popplaces_lyr.srs = "+proj=lcc +ellps=GRS80 +lat_0=49 +lon_0=-95 +lat+1=49 +lat_2=77 +datum=NAD83 +units=m +no_defs"
-popplaces_lyr.datasource = mapnik.Shapefile(file=path.join(root,'../data/popplaces'),encoding='latin1')
-
-popplaces_style = mapnik.Style()
-popplaces_rule = mapnik.Rule()
-
-# And here we have a TextSymbolizer, used for labeling.
-# The first parameter is the name of the attribute to use as the source of the
-# text to label with.  Then there is font size in points (I think?), and colour.
-
-# TODO - currently broken: https://github.com/mapnik/mapnik/issues/2324
-#popplaces_text_symbolizer = mapnik.TextSymbolizer(mapnik.Expression("[GEONAME]"),
-#                                           'DejaVu Sans Book',
-#                                           10, mapnik.Color('black'))
-
-# We set a "halo" around the text, which looks like an outline if thin enough,
-# or an outright background if large enough.
-#popplaces_text_symbolizer.label_placement= mapnik.label_placement.POINT_PLACEMENT
-#popplaces_text_symbolizer.halo_fill = mapnik.Color(255,255,200)
-#popplaces_text_symbolizer.halo_radius = 1
-#popplaces_text_symbolizer.avoid_edges = True
-#popplaces_text_symbolizer.minimum_padding = 30
-#popplaces_rule.symbols.append(popplaces_text_symbolizer)
-
-popplaces_style.rules.append(popplaces_rule)
-
-m.append_style('popplaces', popplaces_style)
-popplaces_lyr.styles.append('popplaces')
-m.layers.append(popplaces_lyr)
-
-# Draw map
-
-# Set the initial extent of the map in 'master' spherical Mercator projection
-m.zoom_to_box(mapnik.Box2d(-8024477.28459,5445190.38849,-7381388.20071,5662941.44855))
-
-# Render map
-im = mapnik.Image(m.width,m.height)
-mapnik.render(m, im)
-
-# Save image to files
-images_ = []
-if mapnik.has_png():
-    im.save('demo.png', 'png') # true-colour RGBA
-    images_.append('demo.png')
-
-    # old behavior, now can do 'png8:c=256'
-    im.save('demo256.png', 'png256') # save to palette based (max 256 colours) png
-    images_.append('demo256.png')
-
-    im.save('demo64_binary_transparency.png', 'png8:c=64:t=1')
-    images_.append('demo64_binary_transparency.png')
-
-    im.save('demo128_colors_hextree_no_alpha.png', 'png8:c=100:m=h:t=0')
-    images_.append('demo128_colors_hextree_no_alpha.png')
-
-if mapnik.has_jpeg():
-    im.save('demo_high.jpg', 'jpeg100')
-    images_.append('demo_high.jpg')
-
-    im.save('demo_low.jpg', 'jpeg50')
-    images_.append('demo_low.jpg')
-
-if mapnik.has_tiff():
-    im.save('demo.tif', 'tiff')
-    images_.append('demo.tif')
-
-if mapnik.has_webp():
-    im.save('demo.webp', 'webp') # default quality is 90
-    images_.append('demo.webp')
-
-    im.save('demo_highest.webp', 'webp:quality=100')
-    images_.append('demo_med.webp')
-
-    im.save('demo_low.webp', 'webp:quality=50')
-    images_.append('demo_low.webp')
-
-
-# Render cairo examples
-if  mapnik.has_cairo():
-    mapnik.render_to_file(m,'demo.pdf')
-    images_.append('demo.pdf')
-    mapnik.render_to_file(m,'demo.ps')
-    images_.append('demo.ps')
-    mapnik.render_to_file(m,'demo.svg')
-    images_.append('demo.svg')
-    mapnik.render_to_file(m,'demo_cairo_rgb24.png','RGB24')
-    images_.append('demo_cairo_rgb.png')
-    mapnik.render_to_file(m,'demo_cairo_argb32.png','ARGB32')
-    images_.append('demo_cairo_argb.png')
-
-print ("\n\n", len(images_), "maps have been rendered in the current directory:")
-
-for im_ in images_:
-    print ("-", im_)
-
-print ("\n\nHave a look!\n\n")
-
-mapnik.save_map(m,"map.xml")

From d9d842f29c196f6c50fa7bc40ba4cd58d92f2ccc Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 6 Jan 2017 19:06:49 +0100
Subject: [PATCH 195/328] dynamic exceptions deprecated in c++11 and removed in
 c++17 (http://en.cppreference.com/w/cpp/language/except_spec)

---
 src/load_map.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/load_map.cpp b/src/load_map.cpp
index f70835ab3..9e303bfa3 100644
--- a/src/load_map.cpp
+++ b/src/load_map.cpp
@@ -133,7 +133,7 @@ private:
     void find_unused_nodes_recursive(xml_node const& node, std::string & error_text);
     std::string ensure_relative_to_xml(boost::optional<std::string> const& opt_path);
     void ensure_exists(std::string const& file_path);
-    void check_styles(Map const & map) const throw (config_error);
+    void check_styles(Map const & map);
     boost::optional<color> get_opt_color_attr(boost::property_tree::ptree const& node,
                                               std::string const& name);
 
@@ -1691,7 +1691,7 @@ void map_parser::find_unused_nodes_recursive(xml_node const& node, std::string &
     }
 }
 
-void map_parser::check_styles(Map const & map) const throw (config_error)
+void map_parser::check_styles(Map const & map)
 {
     for (auto const & layer : map.layers())
     {

From 10deff9d5dfe220db0e12d483d3c5137fb8feb95 Mon Sep 17 00:00:00 2001
From: Jiri Drbalek <jiri.drbalek@firma.seznam.cz>
Date: Sun, 8 Jan 2017 09:04:12 +0000
Subject: [PATCH 196/328] remove unnecessary breaks

---
 src/text/text_layout.cpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/text/text_layout.cpp b/src/text/text_layout.cpp
index 837ba0f45..34f77af39 100644
--- a/src/text/text_layout.cpp
+++ b/src/text/text_layout.cpp
@@ -63,31 +63,22 @@ pixel_position evaluate_displacement(double dx, double dy, directions_e dir)
     {
     case EXACT_POSITION:
         return pixel_position(dx,dy);
-        break;
     case NORTH:
         return pixel_position(0,-std::abs(dy));
-        break;
     case EAST:
         return pixel_position(std::abs(dx),0);
-        break;
     case SOUTH:
         return pixel_position(0,std::abs(dy));
-        break;
     case WEST:
         return pixel_position(-std::abs(dx),0);
-        break;
     case NORTHEAST:
         return pixel_position(std::abs(dx),-std::abs(dy));
-        break;
     case SOUTHEAST:
         return pixel_position(std::abs(dx),std::abs(dy));
-        break;
     case NORTHWEST:
         return pixel_position(-std::abs(dx),-std::abs(dy));
-        break;
     case SOUTHWEST:
         return pixel_position(-std::abs(dx),std::abs(dy));
-        break;
     default:
         return pixel_position(dx,dy);
     }

From 4eae86b7bc750a08a7ab103a780d6b4bf951e1b1 Mon Sep 17 00:00:00 2001
From: Jiri Drbalek <jiri.drbalek@firma.seznam.cz>
Date: Sun, 8 Jan 2017 09:05:44 +0000
Subject: [PATCH 197/328] text simple placement: add center 'C' placement

---
 include/mapnik/text/text_properties.hpp | 3 ++-
 src/text/placements/simple.cpp          | 1 +
 src/text/text_layout.cpp                | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/mapnik/text/text_properties.hpp b/include/mapnik/text/text_properties.hpp
index cd63ae93a..677cd3230 100644
--- a/include/mapnik/text/text_properties.hpp
+++ b/include/mapnik/text/text_properties.hpp
@@ -96,7 +96,8 @@ enum directions_e : std::uint8_t
     SOUTHEAST,
     NORTHWEST,
     SOUTHWEST,
-    EXACT_POSITION
+    EXACT_POSITION,
+    CENTER
 };
 
 using fontset_map = std::map<std::string, font_set>;
diff --git a/src/text/placements/simple.cpp b/src/text/placements/simple.cpp
index 1edb0c19b..24b3af621 100644
--- a/src/text/placements/simple.cpp
+++ b/src/text/placements/simple.cpp
@@ -57,6 +57,7 @@ struct direction_name : x3::symbols<directions_e>
             ("NW", NORTHWEST)
             ("SW", SOUTHWEST)
             ("X" , EXACT_POSITION)
+            ("C" , CENTER)
             ;
     }
 } names;
diff --git a/src/text/text_layout.cpp b/src/text/text_layout.cpp
index 34f77af39..9de48d44f 100644
--- a/src/text/text_layout.cpp
+++ b/src/text/text_layout.cpp
@@ -79,6 +79,8 @@ pixel_position evaluate_displacement(double dx, double dy, directions_e dir)
         return pixel_position(-std::abs(dx),-std::abs(dy));
     case SOUTHWEST:
         return pixel_position(-std::abs(dx),std::abs(dy));
+    case CENTER:
+        return pixel_position(0, 0);
     default:
         return pixel_position(dx,dy);
     }

From 4bc3a79f8ce1fde17e71a0070ce622dadfa55641 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 9 Jan 2017 11:35:14 +0100
Subject: [PATCH 198/328] remove bogus `throw()` specifier from 'add_attribute'

---
 plugins/input/shape/dbfile.cpp | 4 ++--
 plugins/input/shape/dbfile.hpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/input/shape/dbfile.cpp b/plugins/input/shape/dbfile.cpp
index eba91d1cf..8d138d759 100644
--- a/plugins/input/shape/dbfile.cpp
+++ b/plugins/input/shape/dbfile.cpp
@@ -137,7 +137,7 @@ const field_descriptor& dbf_file::descriptor(int col) const
 }
 
 
-void dbf_file::add_attribute(int col, mapnik::transcoder const& tr, mapnik::feature_impl & f) const throw()
+void dbf_file::add_attribute(int col, mapnik::transcoder const& tr, mapnik::feature_impl & f) const
 {
     using namespace boost::spirit;
 
@@ -167,7 +167,7 @@ void dbf_file::add_attribute(int col, mapnik::transcoder const& tr, mapnik::feat
             else
             {
                 // NOTE: null logical fields use '?'
-                f.put(name,false);
+                f.put(name,false);x
             }
             break;
         }
diff --git a/plugins/input/shape/dbfile.hpp b/plugins/input/shape/dbfile.hpp
index d19817a27..fec46cc96 100644
--- a/plugins/input/shape/dbfile.hpp
+++ b/plugins/input/shape/dbfile.hpp
@@ -77,7 +77,7 @@ public:
     field_descriptor const& descriptor(int col) const;
     void move_to(int index);
     std::string string_value(int col) const;
-    void add_attribute(int col, mapnik::transcoder const& tr, mapnik::feature_impl & f) const throw();
+    void add_attribute(int col, mapnik::transcoder const& tr, mapnik::feature_impl & f) const;
 private:
     void read_header();
     int read_short();

From baded7d9ab8557522c135bd5b01cb886ceb5783f Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 9 Jan 2017 11:43:46 +0100
Subject: [PATCH 199/328] fix typo

---
 plugins/input/shape/dbfile.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/input/shape/dbfile.cpp b/plugins/input/shape/dbfile.cpp
index 8d138d759..3da607417 100644
--- a/plugins/input/shape/dbfile.cpp
+++ b/plugins/input/shape/dbfile.cpp
@@ -167,7 +167,7 @@ void dbf_file::add_attribute(int col, mapnik::transcoder const& tr, mapnik::feat
             else
             {
                 // NOTE: null logical fields use '?'
-                f.put(name,false);x
+                f.put(name,false);
             }
             break;
         }

From 6190784350d5e2ef6b84b5f8d453eadc1f9ac777 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 9 Jan 2017 11:47:52 +0100
Subject: [PATCH 200/328] remove remaining usage of deprecated dymamic
 exceptions: dtors are implicitely `noexcept` + qualify `what` methods with
 `noexcept`

---
 include/mapnik/config_error.hpp             |  6 ++----
 include/mapnik/datasource.hpp               |  9 +++------
 include/mapnik/enumeration.hpp              |  4 ++--
 include/mapnik/gradient.hpp                 |  2 +-
 include/mapnik/image_reader.hpp             |  4 ++--
 include/mapnik/image_util.hpp               |  4 ++--
 include/mapnik/svg/svg_parser_exception.hpp |  4 ++--
 include/mapnik/value/error.hpp              |  4 ++--
 include/mapnik/xml_node.hpp                 | 12 ++++++------
 plugins/input/raster/raster_info.cpp        |  2 +-
 src/config_error.cpp                        |  2 +-
 src/gradient.cpp                            |  2 +-
 src/xml_tree.cpp                            | 12 ++++++------
 13 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/include/mapnik/config_error.hpp b/include/mapnik/config_error.hpp
index 82ea9a859..0d1d4c1dc 100644
--- a/include/mapnik/config_error.hpp
+++ b/include/mapnik/config_error.hpp
@@ -41,10 +41,8 @@ public:
     config_error(std::string const& what,
                  unsigned line_number,
                  std::string const& filename);
-    virtual ~config_error() throw() {}
-
-    virtual const char * what() const throw();
-
+    virtual ~config_error() {}
+    virtual const char * what() const noexcept;
     void append_context(std::string const& ctx) const;
     void append_context(std::string const& ctx, xml_node const& node) const;
     void append_context(xml_node const& node) const;
diff --git a/include/mapnik/datasource.hpp b/include/mapnik/datasource.hpp
index 728405561..2917ab976 100644
--- a/include/mapnik/datasource.hpp
+++ b/include/mapnik/datasource.hpp
@@ -46,14 +46,11 @@ class MAPNIK_DECL datasource_exception : public std::exception
 public:
     datasource_exception(std::string const& message)
       : message_(message)
-    {
-    }
+    {}
 
-    ~datasource_exception() throw()
-    {
-    }
+    ~datasource_exception() {}
 
-    virtual const char* what() const throw()
+    virtual const char* what() const noexcept
     {
         return message_.c_str();
     }
diff --git a/include/mapnik/enumeration.hpp b/include/mapnik/enumeration.hpp
index 6befe2617..c4b736025 100644
--- a/include/mapnik/enumeration.hpp
+++ b/include/mapnik/enumeration.hpp
@@ -44,9 +44,9 @@ public:
         what_( _what )
     {
     }
-    virtual ~illegal_enum_value() throw() {}
+    virtual ~illegal_enum_value() {}
 
-    virtual const char * what() const throw()
+    virtual const char * what() const noexcept
     {
         return what_.c_str();
     }
diff --git a/include/mapnik/gradient.hpp b/include/mapnik/gradient.hpp
index 3cdddadc7..cad7dd3ea 100644
--- a/include/mapnik/gradient.hpp
+++ b/include/mapnik/gradient.hpp
@@ -96,7 +96,7 @@ public:
     void get_control_points(double &x1, double &y1, double &x2, double &y2) const;
 
 private:
-    void swap(gradient& other) throw();
+    void swap(gradient& other) noexcept;
 };
 }
 
diff --git a/include/mapnik/image_reader.hpp b/include/mapnik/image_reader.hpp
index 731b87940..99aa99c23 100644
--- a/include/mapnik/image_reader.hpp
+++ b/include/mapnik/image_reader.hpp
@@ -50,9 +50,9 @@ public:
     image_reader_exception(std::string const& message)
         : message_(message) {}
 
-    ~image_reader_exception() throw() {}
+    ~image_reader_exception() {}
 
-    virtual const char* what() const throw()
+    virtual const char* what() const noexcept
     {
         return message_.c_str();
     }
diff --git a/include/mapnik/image_util.hpp b/include/mapnik/image_util.hpp
index aa224ae4d..b36ba75d6 100644
--- a/include/mapnik/image_util.hpp
+++ b/include/mapnik/image_util.hpp
@@ -56,9 +56,9 @@ public:
     image_writer_exception(std::string const& message)
         : message_(message) {}
 
-    ~image_writer_exception() throw() {}
+    ~image_writer_exception(){}
 
-    virtual const char* what() const throw()
+    virtual const char* what() const noexcept
     {
         return message_.c_str();
     }
diff --git a/include/mapnik/svg/svg_parser_exception.hpp b/include/mapnik/svg/svg_parser_exception.hpp
index 70de6efff..8732e0259 100644
--- a/include/mapnik/svg/svg_parser_exception.hpp
+++ b/include/mapnik/svg/svg_parser_exception.hpp
@@ -38,9 +38,9 @@ public:
     svg_parser_exception(std::string const& message)
       : message_(message) {}
 
-    ~svg_parser_exception() throw() {}
+    ~svg_parser_exception() {}
 
-    virtual const char* what() const throw()
+    virtual const char* what() const noexcept
     {
         return message_.c_str();
     }
diff --git a/include/mapnik/value/error.hpp b/include/mapnik/value/error.hpp
index aff9c9dc4..f371f7bae 100644
--- a/include/mapnik/value/error.hpp
+++ b/include/mapnik/value/error.hpp
@@ -40,9 +40,9 @@ public:
         what_( what )
     {}
 
-    virtual ~value_error() throw() {}
+    virtual ~value_error() {}
 
-    virtual const char * what() const throw()
+    virtual const char * what() const noexcept
     {
         return what_.c_str();
     }
diff --git a/include/mapnik/xml_node.hpp b/include/mapnik/xml_node.hpp
index 26b5b9810..8aa2048b6 100644
--- a/include/mapnik/xml_node.hpp
+++ b/include/mapnik/xml_node.hpp
@@ -53,8 +53,8 @@ class MAPNIK_DECL node_not_found: public std::exception
 {
 public:
     node_not_found(std::string const& node_name);
-    virtual const char* what() const throw();
-    ~node_not_found() throw ();
+    virtual const char* what() const noexcept;
+    ~node_not_found();
 private:
     std::string node_name_;
 protected:
@@ -65,8 +65,8 @@ class MAPNIK_DECL attribute_not_found: public std::exception
 {
 public:
     attribute_not_found(std::string const& node_name, std::string const& attribute_name);
-    virtual const char* what() const throw();
-    ~attribute_not_found() throw ();
+    virtual const char* what() const noexcept;
+    ~attribute_not_found();
 private:
     std::string node_name_;
     std::string attribute_name_;
@@ -78,8 +78,8 @@ class MAPNIK_DECL more_than_one_child: public std::exception
 {
 public:
     more_than_one_child(std::string const& node_name);
-    virtual const char* what() const throw();
-    ~more_than_one_child() throw ();
+    virtual const char* what() const noexcept;
+    ~more_than_one_child();
 private:
     std::string node_name_;
 protected:
diff --git a/plugins/input/raster/raster_info.cpp b/plugins/input/raster/raster_info.cpp
index 529f36dec..984eb59b6 100644
--- a/plugins/input/raster/raster_info.cpp
+++ b/plugins/input/raster/raster_info.cpp
@@ -44,7 +44,7 @@ raster_info::raster_info(const raster_info& rhs)
 {
 }
 
-void raster_info::swap(raster_info& other) //throw()
+void raster_info::swap(raster_info& other)
 {
     std::swap(file_,other.file_);
     std::swap(format_,other.format_);
diff --git a/src/config_error.cpp b/src/config_error.cpp
index 8de797072..b5b069ffa 100644
--- a/src/config_error.cpp
+++ b/src/config_error.cpp
@@ -37,7 +37,7 @@ config_error::config_error(std::string const& what,
 {
 }
 
-char const* config_error::what() const throw()
+char const* config_error::what() const noexcept
 {
     msg_ = what_;
     if (!node_name_.empty())
diff --git a/src/gradient.cpp b/src/gradient.cpp
index 3066f87ce..6e3ca355a 100644
--- a/src/gradient.cpp
+++ b/src/gradient.cpp
@@ -121,7 +121,7 @@ stop_array const& gradient::get_stop_array() const
     return stops_;
 }
 
-void gradient::swap(gradient& other) throw()
+void gradient::swap(gradient& other) noexcept
 {
     std::swap(gradient_type_, other.gradient_type_);
     std::swap(stops_, other.stops_);
diff --git a/src/xml_tree.cpp b/src/xml_tree.cpp
index 8254c83ca..a6f86edc4 100644
--- a/src/xml_tree.cpp
+++ b/src/xml_tree.cpp
@@ -134,13 +134,13 @@ node_not_found::node_not_found(std::string const& node_name)
     : node_name_(node_name),
       msg_() {}
 
-const char* node_not_found::what() const throw()
+const char* node_not_found::what() const noexcept
 {
     msg_ = std::string("Node "+node_name_+ "not found");
     return msg_.c_str();
 }
 
-node_not_found::~node_not_found() throw() {}
+node_not_found::~node_not_found() {}
 
 
 attribute_not_found::attribute_not_found(std::string const& node_name,
@@ -149,25 +149,25 @@ attribute_not_found::attribute_not_found(std::string const& node_name,
       attribute_name_(attribute_name),
       msg_() {}
 
-const char* attribute_not_found::what() const throw()
+const char* attribute_not_found::what() const noexcept
 {
     msg_ = std::string("Attribute '" + attribute_name_ +"' not found in node '"+node_name_+ "'");
     return msg_.c_str();
 }
 
-attribute_not_found::~attribute_not_found() throw() {}
+attribute_not_found::~attribute_not_found() {}
 
 more_than_one_child::more_than_one_child(std::string const& node_name)
     : node_name_(node_name),
       msg_() {}
 
-const char* more_than_one_child::what() const throw()
+const char* more_than_one_child::what() const noexcept
 {
     msg_ = std::string("More than one child node in node '" + node_name_ +"'");
     return msg_.c_str();
 }
 
-more_than_one_child::~more_than_one_child() throw() {}
+more_than_one_child::~more_than_one_child() {}
 
 xml_node::xml_node(xml_tree &tree, std::string && name, unsigned line, bool is_text)
     : tree_(tree),

From 7326c0d5585d2ceaedd3d5fc0066214d128fbb87 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 10 Jan 2017 11:54:08 +0100
Subject: [PATCH 201/328] expressions - simplify attribute parsing by combining
 feature attribute and geometry_type attribute processing.

---
 include/mapnik/expression_grammar_x3_def.hpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/include/mapnik/expression_grammar_x3_def.hpp b/include/mapnik/expression_grammar_x3_def.hpp
index 6c25b4812..df89e877d 100644
--- a/include/mapnik/expression_grammar_x3_def.hpp
+++ b/include/mapnik/expression_grammar_x3_def.hpp
@@ -77,7 +77,15 @@ namespace mapnik { namespace grammar {
 
     auto do_attribute = [] (auto const& ctx)
     {
-        _val(ctx) = std::move(attribute(_attr(ctx)));
+        auto & attr = _attr(ctx);
+        if (attr == "mapnik::geometry_type")
+        {
+            _val(ctx) = std::move(geometry_type_attribute());
+        }
+        else
+        {
+            _val(ctx) = std::move(attribute(attr));
+        }
     };
 
     auto do_global_attribute = [] (auto const& ctx)
@@ -85,11 +93,6 @@ namespace mapnik { namespace grammar {
         _val(ctx) = std::move(global_attribute(_attr(ctx)));
     };
 
-    auto do_geometry_type_attribute = [] (auto const& ctx)
-    {
-        _val(ctx) = std::move(geometry_type_attribute());
-    };
-
     auto do_add = [] (auto const& ctx)
     {
         _val(ctx) = std::move(mapnik::binary_node<mapnik::tags::plus>(std::move(_val(ctx)), std::move(_attr(ctx))));
@@ -387,8 +390,6 @@ namespace mapnik { namespace grammar {
         |
         quoted_string[do_unicode]
         |
-        lit("[mapnik::geometry_type]")[do_geometry_type_attribute]
-        |
         feature_attr[do_attribute]
         |
         global_attr[do_global_attribute]

From 243963fc2b2d34e2009451d010d0680c75c4b1c3 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 10 Jan 2017 11:57:54 +0100
Subject: [PATCH 202/328] expression_test - add tests for arbitrary space in
 mapnik::geometry_type attributes

---
 test/unit/core/expressions_test.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/unit/core/expressions_test.cpp b/test/unit/core/expressions_test.cpp
index 22ba3c00d..f5e84d5d4 100644
--- a/test/unit/core/expressions_test.cpp
+++ b/test/unit/core/expressions_test.cpp
@@ -125,9 +125,9 @@ TEST_CASE("expressions")
 
     // geometry types
     TRY_CHECK(eval(" [mapnik::geometry_type] = point ") == true);
-    TRY_CHECK(eval(" [mapnik::geometry_type] <> linestring ") == true);
-    TRY_CHECK(eval(" [mapnik::geometry_type] != polygon ") == true);
-    TRY_CHECK(eval(" [mapnik::geometry_type] neq collection ") == true);
+    TRY_CHECK(eval(" [ mapnik::geometry_type] <> linestring ") == true);
+    TRY_CHECK(eval(" [mapnik::geometry_type ] != polygon ") == true);
+    TRY_CHECK(eval(" [ mapnik::geometry_type ] neq collection ") == true);
     TRY_CHECK(eval(" [mapnik::geometry_type] eq collection ") == false);
 
     //unary expression

From 65dcb1c9356a621ba1fb863b309089bff0f4f477 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 10 Jan 2017 17:13:45 +0100
Subject: [PATCH 203/328] fix transform grammar to support whitespace/comma
 argument separation rules (https://github.com/mapnik/mapnik/pull/1416) ref
 #3569

---
 .../transform_expression_grammar_x3_def.hpp   | 208 +++++++++++-------
 1 file changed, 124 insertions(+), 84 deletions(-)

diff --git a/include/mapnik/transform_expression_grammar_x3_def.hpp b/include/mapnik/transform_expression_grammar_x3_def.hpp
index 14244730b..fa150e628 100644
--- a/include/mapnik/transform_expression_grammar_x3_def.hpp
+++ b/include/mapnik/transform_expression_grammar_x3_def.hpp
@@ -33,30 +33,6 @@
 #include <boost/fusion/include/adapt_struct.hpp>
 #pragma GCC diagnostic pop
 
-// adapt transform nodes
-// martrix
-BOOST_FUSION_ADAPT_STRUCT(mapnik::matrix_node,
-                          (mapnik::expr_node, a_)
-                          (mapnik::expr_node, b_)
-                          (mapnik::expr_node, c_)
-                          (mapnik::expr_node, d_)
-                          (mapnik::expr_node, e_)
-                          (mapnik::expr_node, f_))
-// translate
-BOOST_FUSION_ADAPT_STRUCT(mapnik::translate_node,
-                          (mapnik::expr_node, tx_)
-                          (mapnik::expr_node, ty_))
-
-// scale
-BOOST_FUSION_ADAPT_STRUCT(mapnik::scale_node,
-                          (mapnik::expr_node, sx_)
-                          (mapnik::expr_node, sy_))
-
-// rotate
-BOOST_FUSION_ADAPT_STRUCT(mapnik::rotate_node,
-                          (mapnik::expr_node, angle_)
-                          (mapnik::expr_node, cx_)
-                          (mapnik::expr_node, cy_))
 // skewX
 BOOST_FUSION_ADAPT_STRUCT(mapnik::skewX_node,
                           (mapnik::expr_node, angle_))
@@ -94,82 +70,146 @@ inline void move_to<mapnik::skewY_node, mapnik::detail::transform_node>(mapnik::
 
 namespace mapnik { namespace grammar {
 
-    namespace x3 = boost::spirit::x3;
-    namespace ascii = boost::spirit::x3::ascii;
+namespace x3 = boost::spirit::x3;
+namespace ascii = boost::spirit::x3::ascii;
 
-    // [http://www.w3.org/TR/SVG/coords.html#TransformAttribute]
+// [http://www.w3.org/TR/SVG/coords.html#TransformAttribute]
 
-    // The value of the ‘transform’ attribute is a <transform-list>, which
-    // is defined as a list of transform definitions, which are applied in
-    // the order provided.  The individual transform definitions are
-    // separated by whitespace and/or a comma.
+// The value of the ‘transform’ attribute is a <transform-list>, which
+// is defined as a list of transform definitions, which are applied in
+// the order provided.  The individual transform definitions are
+// separated by whitespace and/or a comma.
 
-    using x3::double_;
-    using x3::no_skip;
-    using x3::no_case;
-    using x3::lit;
+using x3::double_;
+using x3::no_skip;
+using x3::no_case;
+using x3::lit;
 
-    // starting rule
-    transform_expression_grammar_type const transform("transform");
-    // rules
-    x3::rule<class transform_list_class, mapnik::transform_list> transform_list_rule("transform list");
-    x3::rule<class transform_node_class, mapnik::transform_node> transform_node_rule("transform node");
-    x3::rule<class matrix_node_class, mapnik::matrix_node> matrix("matrix node");
-    x3::rule<class translate_node_class, mapnik::translate_node> translate("translate node");
-    x3::rule<class scale_node_class, mapnik::scale_node> scale("scale node");
-    x3::rule<class rotate_node_class, mapnik::rotate_node> rotate("rotate node");
-    x3::rule<class skewX_node_class, mapnik::skewX_node> skewX("skew X node");
-    x3::rule<class skewY_node_class, mapnik::skewY_node> skewY("skew Y node");
+auto const create_expr_node = [](auto const& ctx)
+{
+    _val(ctx) = _attr(ctx);
+};
 
-    // Import the expression rule
-    namespace { auto const& expr = expression_grammar(); }
+auto const construct_matrix = [] (auto const& ctx)
+{
+    auto const& attr = _attr(ctx);
+    auto const& a = boost::fusion::at<boost::mpl::int_<0>>(attr);
+    auto const& b = boost::fusion::at<boost::mpl::int_<1>>(attr);
+    auto const& c = boost::fusion::at<boost::mpl::int_<2>>(attr);
+    auto const& d = boost::fusion::at<boost::mpl::int_<3>>(attr);
+    auto const& e = boost::fusion::at<boost::mpl::int_<4>>(attr);
+    auto const& f = boost::fusion::at<boost::mpl::int_<5>>(attr);
+    _val(ctx) = mapnik::matrix_node(a, b, c, d, e, f);
+};
 
-    // start
-    auto const transform_def = transform_list_rule;
+auto const construct_translate = [](auto const& ctx)
+{
+    auto const& attr = _attr(ctx);
+    auto const& dx = boost::fusion::at<boost::mpl::int_<0>>(attr);
+    auto const& dy = boost::fusion::at<boost::mpl::int_<1>>(attr); //optional
+    _val(ctx) = mapnik::translate_node(dx, dy);
+};
 
-    auto const transform_list_rule_def = transform_node_rule % *lit(',');
+auto const construct_scale = [](auto const& ctx)
+{
+    auto const& attr = _attr(ctx);
+    auto const& sx = boost::fusion::at<boost::mpl::int_<0>>(attr);
+    auto const& sy = boost::fusion::at<boost::mpl::int_<1>>(attr); //optional
+    _val(ctx) = mapnik::scale_node(sx, sy);
+};
 
-    auto const transform_node_rule_def = matrix | translate  | scale | rotate | skewX | skewY ;
+auto const construct_rotate = [](auto const& ctx)
+{
+    auto const& attr = _attr(ctx);
+    auto const& a = boost::fusion::at<boost::mpl::int_<0>>(attr);
+    auto const& sx = boost::fusion::at<boost::mpl::int_<1>>(attr); //optional
+    auto const& sy = boost::fusion::at<boost::mpl::int_<2>>(attr); //optional
+    _val(ctx) = mapnik::rotate_node(a, sx, sy);
+};
 
-    // matrix(<a> <b> <c> <d> <e> <f>)
-    auto const matrix_def = no_case[lit("matrix")]
-        > '(' > expr > ',' >  expr > ',' > expr > ',' > expr > ',' > expr > ',' > expr > ')'
-        ;
+// starting rule
+transform_expression_grammar_type const transform("transform");
+// rules
+x3::rule<class transform_list_class, mapnik::transform_list> transform_list_rule("transform list");
+x3::rule<class transform_node_class, mapnik::transform_node> transform_node_rule("transform node");
+x3::rule<class matrix_node_class, mapnik::matrix_node> matrix("matrix node");
+x3::rule<class translate_node_class, mapnik::translate_node> translate("translate node");
+x3::rule<class scale_node_class, mapnik::scale_node> scale("scale node");
+x3::rule<class rotate_node_class, mapnik::rotate_node> rotate("rotate node");
+x3::rule<class skewX_node_class, mapnik::skewX_node> skewX("skew X node");
+x3::rule<class skewY_node_class, mapnik::skewY_node> skewY("skew Y node");
+x3::rule<class expr_tag, mapnik::expr_node> expr("Expression");
+x3::rule<class sep_expr_tag, mapnik::expr_node> sep_expr("Separated Expression");
 
-    // translate(<tx> [<ty>])
-    auto const translate_def = no_case[lit("translate")]
-        > '(' > expr > -(',' > expr )  > ')'
-        ;
+// start
+auto const transform_def = transform_list_rule;
 
-    // scale(<sx> [<sy>])
-    auto const scale_def = no_case[lit("scale")]
-        > '(' > expr >  -(',' > expr )  > ')'
-        ;
+auto const transform_list_rule_def = transform_node_rule % *lit(',');
 
-    // rotate(<rotate-angle> [<cx> <cy>])
-    auto const rotate_def = no_case[lit("rotate")]
-        > '(' > expr > -(',' > expr > ',' > expr) > ')'
-        ;
+auto const transform_node_rule_def = matrix | translate  | scale | rotate | skewX | skewY ;
 
-    // skewX(<skew-angle>)
-    auto const skewX_def = no_case[lit("skewX")]
-        > '(' > expr > ')';
+// number or attribute
+auto const atom = x3::rule<class atom_tag, expr_node> {} = double_[create_expr_node]
+    ;
+// FIXME - ^ add feature attribute support e.g attr [ _val = construct<mapnik::attribute>(_1) ];
 
-    // skewY(<skew-angle>)
-    auto const skewY_def = no_case[lit("skewY")]
-        > '(' >  expr  > ')';
+auto const sep_atom = x3::rule<class sep_atom_tag, expr_node> {} = -lit(',') >> double_[create_expr_node]
+    ;
 
+auto const expr_def = expression_grammar();
+// Individual arguments in lists containing one or more compound
+// expressions are separated by a comma.
+auto const sep_expr_def = lit(',') > expr
+    ;
 
-    BOOST_SPIRIT_DEFINE (
-        transform,
-        transform_list_rule,
-        transform_node_rule,
-        matrix,
-        translate,
-        scale,
-        rotate,
-        skewX,
-        skewY);
+// matrix(<a> <b> <c> <d> <e> <f>)
+auto const matrix_def = no_case[lit("matrix")] > '('
+    > ((atom >> sep_atom >> sep_atom >> sep_atom >> sep_atom >> sep_atom >> lit(')'))[construct_matrix]
+       |
+       (expr > sep_expr > sep_expr > sep_expr > sep_expr > sep_expr > lit(')'))[construct_matrix])
+    ;
+
+// translate(<tx> [<ty>])
+auto const translate_def = no_case[lit("translate")] > lit('(')
+    > (( atom >> -sep_atom  >> lit(')'))[construct_translate]
+       |
+       ( expr > -sep_expr > lit(')'))[construct_translate]
+        );
+
+// scale(<sx> [<sy>])
+auto const scale_def = no_case[lit("scale")] > lit('(')
+    > (( atom >> -sep_atom  >> lit(')'))[construct_scale]
+       |
+       ( expr > -sep_expr > lit(')'))[construct_scale]
+        );
+
+// rotate(<rotate-angle> [<cx> <cy>])
+auto const rotate_def = no_case[lit("rotate")] > lit('(')
+    > ((atom >> -sep_atom >> -sep_atom >>  lit(')'))[construct_rotate]
+       |
+       (expr > -sep_expr > -sep_expr > lit(')'))[construct_rotate]
+        );
+
+// skewX(<skew-angle>)
+auto const skewX_def = no_case[lit("skewX")]
+    > '(' > expr > ')';
+
+// skewY(<skew-angle>)
+auto const skewY_def = no_case[lit("skewY")]
+    > '(' >  expr  > ')';
+
+BOOST_SPIRIT_DEFINE (
+    expr,
+    sep_expr,
+    transform,
+    transform_list_rule,
+    transform_node_rule,
+    matrix,
+    translate,
+    scale,
+    rotate,
+    skewX,
+    skewY);
 
 }} // ns
 

From fa7851ea067f8bfc71194622158afaecba650446 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 10 Jan 2017 17:15:05 +0100
Subject: [PATCH 204/328] add transform expressions tests
 (https://github.com/mapnik/mapnik/pull/141\ 6) (ref #3569)

---
 test/unit/core/transform_expressions_test.cpp | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 test/unit/core/transform_expressions_test.cpp

diff --git a/test/unit/core/transform_expressions_test.cpp b/test/unit/core/transform_expressions_test.cpp
new file mode 100644
index 000000000..748fea2af
--- /dev/null
+++ b/test/unit/core/transform_expressions_test.cpp
@@ -0,0 +1,57 @@
+#include "catch.hpp"
+
+#include <mapnik/parse_transform.hpp>
+#include <mapnik/transform_expression.hpp>
+
+namespace {
+
+
+bool test_transform_expressions(std::string const& in, std::string const& out)
+{
+    auto tr_list = mapnik::parse_transform(in);
+    return mapnik::to_expression_string(*tr_list) == out;
+}
+
+}
+
+TEST_CASE("transform-expressions")
+{
+    // matrix
+    CHECK(test_transform_expressions("matrix( 1,2,3,4,5, 6)", "matrix(1, 2, 3, 4, 5, 6)"));
+    CHECK(test_transform_expressions("matrix(1 2 3 4 5  6)", "matrix(1, 2, 3, 4, 5, 6)"));
+    CHECK(test_transform_expressions("matrix(1,2,3,4,5,4*2-1)", "matrix(1, 2, 3, 4, 5, (4*2-1))"));
+
+    // translate
+    CHECK(test_transform_expressions("translate(100)", "translate(100)"));
+    CHECK(test_transform_expressions("translate([tx])", "translate([tx])"));
+    CHECK(test_transform_expressions("translate(100 200)", "translate(100, 200)"));
+    CHECK(test_transform_expressions("translate([tx],[ty])", "translate([tx], [ty])"));
+    CHECK(test_transform_expressions("translate([tx],200)", "translate([tx], 200)"));
+    CHECK(test_transform_expressions("translate(100,[ty])", "translate(100, [ty])"));
+
+    // scale
+    CHECK(test_transform_expressions("scale(1.5)", "scale(1.5)"));
+    CHECK(test_transform_expressions("scale([sx])", "scale([sx])"));
+    CHECK(test_transform_expressions("scale([sx],1.5)", "scale([sx], 1.5)"));
+    CHECK(test_transform_expressions("scale(1.5,[sy])", "scale(1.5, [sy])"));
+    CHECK(test_transform_expressions("scale([sx],[sy]/2)", "scale([sx], [sy]/2)"));
+
+    // rotate
+    CHECK(test_transform_expressions("rotate([a] -2)", "rotate(([a]-2))"));
+    CHECK(test_transform_expressions("rotate([a] -2 -3)", "rotate((([a]-2)-3))"));
+    CHECK(test_transform_expressions("rotate([a],-2,-3)", "rotate([a], -2, -3)"));
+    CHECK(test_transform_expressions("rotate([a] -2 -3 -4)", "rotate(((([a]-2)-3)-4))"));
+    CHECK(test_transform_expressions("rotate([a] -2, 3, 4)", "rotate(([a]-2), 3, 4)"));
+
+    // skewX
+    CHECK(test_transform_expressions("skewX(2)", "skewX(2)"));
+    CHECK(test_transform_expressions("skewX(2*[x]+[y])", "skewX((2*[x]+[y]))"));
+
+    // skewY
+    CHECK(test_transform_expressions("skewY(2)", "skewY(2)"));
+    CHECK(test_transform_expressions("skewY(2*[x]+[y])", "skewY((2*[x]+[y]))"));
+
+    // compound
+    CHECK(test_transform_expressions("translate([tx]) rotate([a])", "translate([tx]) rotate([a])"));
+    CHECK(test_transform_expressions("rotate(30+[a]) scale(2*[sx],[sy])", "rotate((30+[a])) scale(2*[sx], [sy])"));
+}

From f207ec2da26365b18a4af9de7205ee2e1eab4111 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 10 Jan 2017 17:19:28 +0100
Subject: [PATCH 205/328] cleanup

---
 include/mapnik/transform_expression_grammar_x3_def.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/mapnik/transform_expression_grammar_x3_def.hpp b/include/mapnik/transform_expression_grammar_x3_def.hpp
index fa150e628..5481e9ad6 100644
--- a/include/mapnik/transform_expression_grammar_x3_def.hpp
+++ b/include/mapnik/transform_expression_grammar_x3_def.hpp
@@ -151,7 +151,6 @@ auto const transform_node_rule_def = matrix | translate  | scale | rotate | skew
 // number or attribute
 auto const atom = x3::rule<class atom_tag, expr_node> {} = double_[create_expr_node]
     ;
-// FIXME - ^ add feature attribute support e.g attr [ _val = construct<mapnik::attribute>(_1) ];
 
 auto const sep_atom = x3::rule<class sep_atom_tag, expr_node> {} = -lit(',') >> double_[create_expr_node]
     ;

From 11c3d97654ea837d525de8313634919575690fb6 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 11 Jan 2017 10:25:21 +0100
Subject: [PATCH 206/328] transform_expressions_test - add global attribute
 tests ( e.g @value ) ref #3569

---
 test/unit/core/transform_expressions_test.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/unit/core/transform_expressions_test.cpp b/test/unit/core/transform_expressions_test.cpp
index 748fea2af..836c3ba17 100644
--- a/test/unit/core/transform_expressions_test.cpp
+++ b/test/unit/core/transform_expressions_test.cpp
@@ -20,6 +20,9 @@ TEST_CASE("transform-expressions")
     CHECK(test_transform_expressions("matrix( 1,2,3,4,5, 6)", "matrix(1, 2, 3, 4, 5, 6)"));
     CHECK(test_transform_expressions("matrix(1 2 3 4 5  6)", "matrix(1, 2, 3, 4, 5, 6)"));
     CHECK(test_transform_expressions("matrix(1,2,3,4,5,4*2-1)", "matrix(1, 2, 3, 4, 5, (4*2-1))"));
+    CHECK(test_transform_expressions("matrix(1,2,3,4,5,[value])", "matrix(1, 2, 3, 4, 5, [value])"));
+    CHECK(test_transform_expressions("matrix(1,2,@value,4,5,6)", "matrix(1, 2, @value, 4, 5, 6)"));
+    CHECK(test_transform_expressions("matrix(1,2,3,4,5,@value)", "matrix(1, 2, 3, 4, 5, @value)"));
 
     // translate
     CHECK(test_transform_expressions("translate(100)", "translate(100)"));
@@ -53,5 +56,5 @@ TEST_CASE("transform-expressions")
 
     // compound
     CHECK(test_transform_expressions("translate([tx]) rotate([a])", "translate([tx]) rotate([a])"));
-    CHECK(test_transform_expressions("rotate(30+[a]) scale(2*[sx],[sy])", "rotate((30+[a])) scale(2*[sx], [sy])"));
+    CHECK(test_transform_expressions("rotate(30+@value) scale(2*[sx],[sy])", "rotate((30+@value)) scale(2*[sx], [sy])"));
 }

From 91f9508654e17d5acd51623170a7d0413c075e5a Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 11 Jan 2017 10:38:11 +0100
Subject: [PATCH 207/328] relax expression_grammar: allow `_` underscore
 characters in global attribute names

---
 include/mapnik/expression_grammar_x3_def.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/mapnik/expression_grammar_x3_def.hpp b/include/mapnik/expression_grammar_x3_def.hpp
index df89e877d..0be7fb483 100644
--- a/include/mapnik/expression_grammar_x3_def.hpp
+++ b/include/mapnik/expression_grammar_x3_def.hpp
@@ -348,7 +348,7 @@ namespace mapnik { namespace grammar {
              ('-' > multiplicative_expression[do_subt]));
 
     auto const feature_attr = lexeme['[' > +~char_(']') > ']'];
-    auto const global_attr = x3::rule<class global_attr, std::string> {} = lexeme[lit('@') > alpha > *alnum];
+    auto const global_attr = x3::rule<class global_attr, std::string> {} = lexeme[lit('@') > char_("a-zA-Z_") > *char_("a-zA-Z0-9_")];
 
     auto const regex_match_expression_def = lit(".match") > '(' > quoted_string > ')';
     auto const regex_replace_expression_def = lit(".replace") > '(' > quoted_string > ',' > quoted_string > ')';

From e582ca65b5cab1c94b1758b52aad984d0c5a3c85 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 11 Jan 2017 10:39:02 +0100
Subject: [PATCH 208/328] update test to include underscore characters in
 global attributes

---
 test/unit/core/transform_expressions_test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/core/transform_expressions_test.cpp b/test/unit/core/transform_expressions_test.cpp
index 836c3ba17..f63a7d15b 100644
--- a/test/unit/core/transform_expressions_test.cpp
+++ b/test/unit/core/transform_expressions_test.cpp
@@ -56,5 +56,5 @@ TEST_CASE("transform-expressions")
 
     // compound
     CHECK(test_transform_expressions("translate([tx]) rotate([a])", "translate([tx]) rotate([a])"));
-    CHECK(test_transform_expressions("rotate(30+@value) scale(2*[sx],[sy])", "rotate((30+@value)) scale(2*[sx], [sy])"));
+    CHECK(test_transform_expressions("rotate(30+@global_value) scale(2*[sx],[sy])", "rotate((30+@global_value)) scale(2*[sx], [sy])"));
 }

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 209/328] 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 {
 

From 7db3beda01783601f986c9dd7789d64a387f11b3 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 12 Jan 2017 10:55:33 +0100
Subject: [PATCH 210/328] add parentheses to supress gcc warning
 [-Wparentheses]

---
 include/mapnik/path_expression_grammar_x3_def.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/mapnik/path_expression_grammar_x3_def.hpp b/include/mapnik/path_expression_grammar_x3_def.hpp
index 324e44e35..73e940a5c 100644
--- a/include/mapnik/path_expression_grammar_x3_def.hpp
+++ b/include/mapnik/path_expression_grammar_x3_def.hpp
@@ -41,7 +41,7 @@ x3::rule<class str_expression, std::string> const str_expression("string");
 
 auto const attr_expression_def = +(char_ - ']');
 auto const str_expression_def = lexeme[+(char_ -'[')];
-auto const path_expression_def = *(str_expression[create_string] | '[' > attr_expression[create_attribute] > ']');
+auto const path_expression_def = *(str_expression[create_string] | ('[' > attr_expression[create_attribute] > ']'));
 
 BOOST_SPIRIT_DEFINE(
     path_expression,

From 3c76e8d7ef0bf54d68612e48588b9b377502559a Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 12 Jan 2017 11:12:58 +0100
Subject: [PATCH 211/328] disable [-Wunused-result] warning GCC :
 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25509

---
 include/mapnik/util/file_io.hpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/mapnik/util/file_io.hpp b/include/mapnik/util/file_io.hpp
index 5dfe782eb..41a189b02 100644
--- a/include/mapnik/util/file_io.hpp
+++ b/include/mapnik/util/file_io.hpp
@@ -83,7 +83,11 @@ public:
         if (!size_) return nullptr;
         std::fseek(file_.get(), 0, SEEK_SET);
         data_type buffer(new char[size_]);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
+#pragma GCC diagnostics ignored "-Wunused-result"
         std::fread(buffer.get(), size_, 1, file_.get());
+#pragma GCC diagnostic pop
         return buffer;
     }
 private:

From 2f55f0962ec965c54f7b8f068341e0e687fc9398 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 12 Jan 2017 11:39:57 +0100
Subject: [PATCH 212/328] It doesn't work with GCC reverting back "disable
 [-Wunused-result] warning GCC :
 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25509"

This reverts commit 3c76e8d7ef0bf54d68612e48588b9b377502559a.
---
 include/mapnik/util/file_io.hpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/include/mapnik/util/file_io.hpp b/include/mapnik/util/file_io.hpp
index 41a189b02..5dfe782eb 100644
--- a/include/mapnik/util/file_io.hpp
+++ b/include/mapnik/util/file_io.hpp
@@ -83,11 +83,7 @@ public:
         if (!size_) return nullptr;
         std::fseek(file_.get(), 0, SEEK_SET);
         data_type buffer(new char[size_]);
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunknown-pragmas"
-#pragma GCC diagnostics ignored "-Wunused-result"
         std::fread(buffer.get(), size_, 1, file_.get());
-#pragma GCC diagnostic pop
         return buffer;
     }
 private:

From 0a7e8bb429aebe691fb97cc99180e1c5ae6ed384 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 12 Jan 2017 17:15:05 +0100
Subject: [PATCH 213/328] fix GCC shadows a member warning `[-Wshadow]`

---
 include/mapnik/evaluate_global_attributes.hpp | 40 +++++++++----------
 include/mapnik/marker_helpers.hpp             |  2 -
 src/agg/agg_renderer.cpp                      |  1 -
 src/agg/process_group_symbolizer.cpp          |  1 -
 src/agg/process_markers_symbolizer.cpp        |  2 -
 src/grid/process_group_symbolizer.cpp         |  1 -
 src/grid/process_markers_symbolizer.cpp       |  1 -
 src/plugin.cpp                                |  8 ++--
 src/text/formatting/list.cpp                  | 12 +++---
 src/xml_tree.cpp                              |  8 ++--
 10 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/include/mapnik/evaluate_global_attributes.hpp b/include/mapnik/evaluate_global_attributes.hpp
index 18eaa436a..a73ac1262 100644
--- a/include/mapnik/evaluate_global_attributes.hpp
+++ b/include/mapnik/evaluate_global_attributes.hpp
@@ -43,8 +43,8 @@ struct evaluate_expression
 {
     using value_type = T;
 
-    explicit evaluate_expression(Attributes const& _attributes)
-        : attributes_(_attributes) {}
+    explicit evaluate_expression(Attributes const& attrs)
+        : attrs_(attrs) {}
 
     value_type operator() (attribute const&) const
     {
@@ -53,8 +53,8 @@ struct evaluate_expression
 
     value_type operator() (global_attribute const& attr) const
     {
-        auto itr = attributes_.find(attr.name);
-        if (itr != attributes_.end())
+        auto itr = attrs_.find(attr.name);
+        if (itr != attrs_.end())
         {
             return itr->second;
         }
@@ -129,7 +129,7 @@ struct evaluate_expression
         return value_type(val);
     }
 
-    Attributes const& attributes_;
+    Attributes const& attrs_;
 };
 
 template <typename T>
@@ -221,7 +221,7 @@ struct evaluate_expression<T, boost::none_t>
 struct assign_value
 {
     template<typename Attributes>
-    static void apply(symbolizer_base::value_type & val, expression_ptr const& expr, Attributes const& attributes, property_types target )
+    static void apply(symbolizer_base::value_type & val, expression_ptr const& expr, Attributes const& attrs, property_types target )
     {
 
         switch (target)
@@ -230,24 +230,24 @@ struct assign_value
         {
             // evaluate expression as a string then parse as css color
             std::string str = util::apply_visitor(mapnik::evaluate_expression<mapnik::value,
-                                               Attributes>(attributes),*expr).to_string();
+                                               Attributes>(attrs),*expr).to_string();
             try { val = parse_color(str); }
             catch (...) { val = color(0,0,0);}
             break;
         }
         case property_types::target_double:
         {
-            val = util::apply_visitor(mapnik::evaluate_expression<mapnik::value, Attributes>(attributes),*expr).to_double();
+            val = util::apply_visitor(mapnik::evaluate_expression<mapnik::value, Attributes>(attrs),*expr).to_double();
             break;
         }
         case property_types::target_integer:
         {
-            val = util::apply_visitor(mapnik::evaluate_expression<mapnik::value, Attributes>(attributes),*expr).to_int();
+            val = util::apply_visitor(mapnik::evaluate_expression<mapnik::value, Attributes>(attrs),*expr).to_int();
             break;
         }
         case property_types::target_bool:
         {
-            val = util::apply_visitor(mapnik::evaluate_expression<mapnik::value, Attributes>(attributes),*expr).to_bool();
+            val = util::apply_visitor(mapnik::evaluate_expression<mapnik::value, Attributes>(attrs),*expr).to_bool();
             break;
         }
         default: // no-op
@@ -276,14 +276,14 @@ struct evaluate_global_attributes : util::noncopyable
     template <typename Attributes>
     struct evaluator
     {
-        evaluator(symbolizer_base::cont_type::value_type & prop, Attributes const& attributes)
+        evaluator(symbolizer_base::cont_type::value_type & prop, Attributes const& attrs)
             : prop_(prop),
-              attributes_(attributes) {}
+              attrs_(attrs) {}
 
         void operator() (expression_ptr const& expr) const
         {
             auto const& meta = get_meta(prop_.first);
-            assign_value::apply(prop_.second, expr, attributes_, std::get<2>(meta));
+            assign_value::apply(prop_.second, expr, attrs_, std::get<2>(meta));
         }
 
         template <typename T>
@@ -292,28 +292,28 @@ struct evaluate_global_attributes : util::noncopyable
             // no-op
         }
         symbolizer_base::cont_type::value_type & prop_;
-        Attributes const& attributes_;
+        Attributes const& attrs_;
     };
 
     template <typename Attributes>
     struct extract_symbolizer
     {
-        extract_symbolizer(Attributes const& attributes)
-            : attributes_(attributes) {}
+        extract_symbolizer(Attributes const& attrs)
+            : attrs_(attrs) {}
 
         template <typename Symbolizer>
         void operator() (Symbolizer & sym) const
         {
             for (auto & prop : sym.properties)
             {
-                util::apply_visitor(evaluator<Attributes>(prop, attributes_), prop.second);
+                util::apply_visitor(evaluator<Attributes>(prop, attrs_), prop.second);
             }
         }
-        Attributes const& attributes_;
+        Attributes const& attrs_;
     };
 
     template <typename Attributes>
-    static void apply(Map & m, Attributes const& attributes)
+    static void apply(Map & m, Attributes const& attrs)
     {
         for ( auto & val :  m.styles() )
         {
@@ -321,7 +321,7 @@ struct evaluate_global_attributes : util::noncopyable
             {
                 for (auto & sym : rule)
                 {
-                    util::apply_visitor(extract_symbolizer<Attributes>(attributes), sym);
+                    util::apply_visitor(extract_symbolizer<Attributes>(attrs), sym);
                 }
             }
         }
diff --git a/include/mapnik/marker_helpers.hpp b/include/mapnik/marker_helpers.hpp
index 2e935fd6e..6a509e040 100644
--- a/include/mapnik/marker_helpers.hpp
+++ b/include/mapnik/marker_helpers.hpp
@@ -50,8 +50,6 @@ namespace mapnik {
 
 struct clip_poly_tag;
 
-using svg_attribute_type = agg::pod_bvector<svg::path_attributes>;
-
 template <typename Detector>
 struct vector_markers_dispatch : util::noncopyable
 {
diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp
index e243b227a..e9ea69526 100644
--- a/src/agg/agg_renderer.cpp
+++ b/src/agg/agg_renderer.cpp
@@ -377,7 +377,6 @@ struct agg_render_marker_visitor
         using pixfmt_comp_type = agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer>;
         using renderer_base = agg::renderer_base<pixfmt_comp_type>;
         using renderer_type = agg::renderer_scanline_aa_solid<renderer_base>;
-        using svg_attribute_type = agg::pod_bvector<mapnik::svg::path_attributes>;
 
         ras_ptr_->reset();
         if (gamma_method_ != GAMMA_POWER || gamma_ != 1.0)
diff --git a/src/agg/process_group_symbolizer.cpp b/src/agg/process_group_symbolizer.cpp
index 2367c39e4..b00557eeb 100644
--- a/src/agg/process_group_symbolizer.cpp
+++ b/src/agg/process_group_symbolizer.cpp
@@ -75,7 +75,6 @@ struct thunk_renderer<image_rgba8> : render_thunk_list_dispatch
         using pixfmt_comp_type = agg::pixfmt_custom_blend_rgba<blender_type, buf_type>;
         using renderer_base = agg::renderer_base<pixfmt_comp_type>;
         using renderer_type = agg::renderer_scanline_aa_solid<renderer_base>;
-        using svg_attribute_type = agg::pod_bvector<svg::path_attributes>;
         using svg_renderer_type = svg::svg_renderer_agg<svg_path_adapter,
                                                         svg_attribute_type,
                                                         renderer_type,
diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp
index ba1fa884c..d45e995d2 100644
--- a/src/agg/process_markers_symbolizer.cpp
+++ b/src/agg/process_markers_symbolizer.cpp
@@ -56,7 +56,6 @@ struct agg_markers_renderer_context : markers_renderer_context
 {
     using renderer_base = typename SvgRenderer::renderer_base;
     using vertex_source_type = typename SvgRenderer::vertex_source_type;
-    using attribute_source_type = typename SvgRenderer::attribute_source_type;
     using pixfmt_type = typename renderer_base::pixfmt_type;
 
     agg_markers_renderer_context(symbolizer_base const& sym,
@@ -117,7 +116,6 @@ void agg_renderer<T0,T1>::process(markers_symbolizer const& sym,
     using pixfmt_comp_type = agg::pixfmt_custom_blend_rgba<blender_type, buf_type>;
     using renderer_base = agg::renderer_base<pixfmt_comp_type>;
     using renderer_type = agg::renderer_scanline_aa_solid<renderer_base>;
-    using svg_attribute_type = agg::pod_bvector<path_attributes>;
     using svg_renderer_type = svg_renderer_agg<svg_path_adapter,
                                                svg_attribute_type,
                                                renderer_type,
diff --git a/src/grid/process_group_symbolizer.cpp b/src/grid/process_group_symbolizer.cpp
index 0c484445b..46f90bbc7 100644
--- a/src/grid/process_group_symbolizer.cpp
+++ b/src/grid/process_group_symbolizer.cpp
@@ -74,7 +74,6 @@ struct thunk_renderer : render_thunk_list_dispatch
         using renderer_type = agg::renderer_scanline_bin_solid<grid_renderer_base_type>;
 
         using namespace mapnik::svg;
-        using svg_attribute_type = agg::pod_bvector<path_attributes>;
         using svg_renderer_type = svg_renderer_agg<svg_path_adapter,
                                                    svg_attribute_type,
                                                    renderer_type,
diff --git a/src/grid/process_markers_symbolizer.cpp b/src/grid/process_markers_symbolizer.cpp
index 05570a1a1..1d8ad2c5d 100644
--- a/src/grid/process_markers_symbolizer.cpp
+++ b/src/grid/process_markers_symbolizer.cpp
@@ -143,7 +143,6 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
     using renderer_type = agg::renderer_scanline_bin_solid<grid_renderer_base_type>;
 
     using namespace mapnik::svg;
-    using svg_attribute_type = agg::pod_bvector<path_attributes>;
     using svg_renderer_type = svg_renderer_agg<svg_path_adapter,
                                                svg_attribute_type,
                                                renderer_type,
diff --git a/src/plugin.cpp b/src/plugin.cpp
index 2951979d3..ee39a7727 100644
--- a/src/plugin.cpp
+++ b/src/plugin.cpp
@@ -58,8 +58,8 @@ PluginInfo::PluginInfo(std::string const& filename,
           if (module_) module_->dl = LoadLibraryA(filename.c_str());
           if (module_ && module_->dl)
           {
-                callable_returning_string name = reinterpret_cast<callable_returning_string>(dlsym(module_->dl, library_name.c_str()));
-                if (name) name_ = name();
+              callable_returning_string name_call = reinterpret_cast<callable_returning_string>(dlsym(module_->dl, library_name.c_str()));
+                if (name_call) name_ = name_call();
                 callable_returning_void init_once = reinterpret_cast<callable_returning_void>(dlsym(module_->dl, "on_plugin_load"));
                 if (init_once) {
                     init_once();
@@ -70,8 +70,8 @@ PluginInfo::PluginInfo(std::string const& filename,
           if (module_) module_->dl = dlopen(filename.c_str(),RTLD_LAZY);
           if (module_ && module_->dl)
           {
-                callable_returning_string name = reinterpret_cast<callable_returning_string>(dlsym(module_->dl, library_name.c_str()));
-                if (name) name_ = name();
+                callable_returning_string name_call = reinterpret_cast<callable_returning_string>(dlsym(module_->dl, library_name.c_str()));
+                if (name_call) name_ = name_call();
                 callable_returning_void init_once = reinterpret_cast<callable_returning_void>(dlsym(module_->dl, "on_plugin_load"));
                 if (init_once) {
                     init_once();
diff --git a/src/text/formatting/list.cpp b/src/text/formatting/list.cpp
index d1820d081..686e5424c 100644
--- a/src/text/formatting/list.cpp
+++ b/src/text/formatting/list.cpp
@@ -37,27 +37,27 @@ namespace formatting {
 
 void list_node::to_xml(boost::property_tree::ptree & xml) const
 {
-    for (node_ptr const& node : children_)
+    for (node_ptr const& n : children_)
     {
-        node->to_xml(xml);
+        n->to_xml(xml);
     }
 }
 
 
 void list_node::apply(evaluated_format_properties_ptr const& p, feature_impl const& feature, attributes const& vars, text_layout & output) const
 {
-    for (node_ptr const& node : children_)
+    for (node_ptr const& n : children_)
     {
-        node->apply(p, feature, vars, output);
+        n->apply(p, feature, vars, output);
     }
 }
 
 
 void list_node::add_expressions(expression_set &output) const
 {
-    for (node_ptr const& node : children_)
+    for (node_ptr const& n : children_)
     {
-        node->add_expressions(output);
+        n->add_expressions(output);
     }
 }
 
diff --git a/src/xml_tree.cpp b/src/xml_tree.cpp
index a6f86edc4..0c01a9b1a 100644
--- a/src/xml_tree.cpp
+++ b/src/xml_tree.cpp
@@ -346,16 +346,16 @@ boost::optional<T> xml_node::get_opt_attr(std::string const& name) const
 template <typename T>
 T xml_node::get_attr(std::string const& name, T const& default_opt_value) const
 {
-    boost::optional<T> value = get_opt_attr<T>(name);
-    if (value) return *value;
+    boost::optional<T> val = get_opt_attr<T>(name);
+    if (val) return *val;
     return default_opt_value;
 }
 
 template <typename T>
 T xml_node::get_attr(std::string const& name) const
 {
-    boost::optional<T> value = get_opt_attr<T>(name);
-    if (value) return *value;
+    boost::optional<T> val = get_opt_attr<T>(name);
+    if (val) return *val;
     throw attribute_not_found(name_, name);
 }
 

From 1c704447b7b343f1d3d18995af3d341808bd2887 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 12 Jan 2017 18:01:42 +0100
Subject: [PATCH 214/328] more fix GCC shadows a member warning `[-Wshadow]`

---
 src/agg/process_line_pattern_symbolizer.cpp    |  4 ++--
 src/agg/process_markers_symbolizer.cpp         |  4 ++--
 src/agg/process_polygon_pattern_symbolizer.cpp |  4 ++--
 src/cairo/cairo_render_vector.cpp              | 10 +++++-----
 src/cairo/cairo_renderer.cpp                   |  4 ++--
 src/grid/process_markers_symbolizer.cpp        |  4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/agg/process_line_pattern_symbolizer.cpp b/src/agg/process_line_pattern_symbolizer.cpp
index bfd344203..4af6a0074 100644
--- a/src/agg/process_line_pattern_symbolizer.cpp
+++ b/src/agg/process_line_pattern_symbolizer.cpp
@@ -96,9 +96,9 @@ struct agg_renderer_process_visitor_l
 private:
     void render(mapnik::image_rgba8 const& marker, double width, double height) const
     {
-        using color = agg::rgba8;
+        using col = agg::rgba8;
         using order = agg::order_rgba;
-        using blender_type = agg::comp_op_adaptor_rgba_pre<color, order>;
+        using blender_type = agg::comp_op_adaptor_rgba_pre<col, order>;
         using pattern_filter_type = agg::pattern_filter_bilinear_rgba8;
         using pattern_type = agg::line_image_pattern<pattern_filter_type>;
         using pixfmt_type = agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer>;
diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp
index d45e995d2..81a2d6989 100644
--- a/src/agg/process_markers_symbolizer.cpp
+++ b/src/agg/process_markers_symbolizer.cpp
@@ -135,10 +135,10 @@ void agg_renderer<T0,T1>::process(markers_symbolizer const& sym,
     buf_type render_buffer(current_buffer_->bytes(), current_buffer_->width(), current_buffer_->height(), current_buffer_->row_size());
     box2d<double> clip_box = clipping_extent(common_);
 
-    using context_type = detail::agg_markers_renderer_context<svg_renderer_type,
+    using renderer_context_type = detail::agg_markers_renderer_context<svg_renderer_type,
                                                               buf_type,
                                                               rasterizer>;
-    context_type renderer_context(sym, feature, common_.vars_, render_buffer, *ras_ptr);
+    renderer_context_type renderer_context(sym, feature, common_.vars_, render_buffer, *ras_ptr);
 
     render_markers_symbolizer(
         sym, feature, prj_trans, common_, clip_box, renderer_context);
diff --git a/src/agg/process_polygon_pattern_symbolizer.cpp b/src/agg/process_polygon_pattern_symbolizer.cpp
index 5675bdb00..d06bc9033 100644
--- a/src/agg/process_polygon_pattern_symbolizer.cpp
+++ b/src/agg/process_polygon_pattern_symbolizer.cpp
@@ -118,9 +118,9 @@ private:
 
         box2d<double> clip_box = clipping_extent(common_);
 
-        using color = agg::rgba8;
+        using col = agg::rgba8;
         using order = agg::order_rgba;
-        using blender_type = agg::comp_op_adaptor_rgba_pre<color, order>;
+        using blender_type = agg::comp_op_adaptor_rgba_pre<col, order>;
         using pixfmt_type = agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer>;
 
         using wrap_x_type = agg::wrap_mode_repeat;
diff --git a/src/cairo/cairo_render_vector.cpp b/src/cairo/cairo_render_vector.cpp
index 22f2e7da7..cbbafca84 100644
--- a/src/cairo/cairo_render_vector.cpp
+++ b/src/cairo/cairo_render_vector.cpp
@@ -35,7 +35,7 @@ namespace mapnik
 void render_vector_marker(cairo_context & context, svg::svg_path_adapter & svg_path,
                           agg::pod_bvector<svg::path_attributes> const & attributes,
                           box2d<double> const& bbox, agg::trans_affine const& tr,
-                          double opacity)
+                          double opacity_)
 {
     using namespace mapnik::svg;
     agg::trans_affine transform;
@@ -75,14 +75,14 @@ void render_vector_marker(cairo_context & context, svg::svg_path_adapter & svg_p
             }
             if(attr.fill_gradient.get_gradient_type() != NO_GRADIENT)
             {
-                cairo_gradient g(attr.fill_gradient,attr.fill_opacity * attr.opacity * opacity);
+                cairo_gradient g(attr.fill_gradient,attr.fill_opacity * attr.opacity * opacity_);
 
                 context.set_gradient(g,bbox);
                 context.fill();
             }
             else if(attr.fill_flag)
             {
-                double fill_opacity = attr.fill_opacity * attr.opacity * opacity * attr.fill_color.opacity();
+                double fill_opacity = attr.fill_opacity * attr.opacity * opacity_ * attr.fill_color.opacity();
                 context.set_color(attr.fill_color.r/255.0,attr.fill_color.g/255.0,
                                   attr.fill_color.b/255.0, fill_opacity);
                 context.fill();
@@ -98,13 +98,13 @@ void render_vector_marker(cairo_context & context, svg::svg_path_adapter & svg_p
                 context.set_line_cap(line_cap_enum(attr.line_cap));
                 context.set_line_join(line_join_enum(attr.line_join));
                 context.set_miter_limit(attr.miter_limit);
-                cairo_gradient g(attr.stroke_gradient,attr.fill_opacity * attr.opacity * opacity);
+                cairo_gradient g(attr.stroke_gradient,attr.fill_opacity * attr.opacity * opacity_);
                 context.set_gradient(g,bbox);
                 context.stroke();
             }
             else if (attr.stroke_flag)
             {
-                double stroke_opacity = attr.stroke_opacity * attr.opacity * opacity * attr.stroke_color.opacity();
+                double stroke_opacity = attr.stroke_opacity * attr.opacity * opacity_ * attr.stroke_color.opacity();
                 context.set_color(attr.stroke_color.r/255.0,attr.stroke_color.g/255.0,
                                   attr.stroke_color.b/255.0, stroke_opacity);
                 context.set_line_width(attr.stroke_width);
diff --git a/src/cairo/cairo_renderer.cpp b/src/cairo/cairo_renderer.cpp
index ff29f7457..0fbb00972 100644
--- a/src/cairo/cairo_renderer.cpp
+++ b/src/cairo/cairo_renderer.cpp
@@ -254,11 +254,11 @@ struct cairo_render_marker_visitor
                 marker_tr *= tr_;
             }
             marker_tr *= agg::trans_affine_scaling(common_.scale_factor_);
-            agg::pod_bvector<svg::path_attributes> const & attributes = vmarker->attributes();
+            agg::pod_bvector<svg::path_attributes> const & attrs = vmarker->attributes();
             svg::vertex_stl_adapter<svg::svg_path_storage> stl_storage(vmarker->source());
             svg::svg_path_adapter svg_path(stl_storage);
             marker_tr.translate(pos_.x, pos_.y);
-            render_vector_marker(context_, svg_path, attributes, bbox, marker_tr, opacity_);
+            render_vector_marker(context_, svg_path, attrs, bbox, marker_tr, opacity_);
         }
     }
 
diff --git a/src/grid/process_markers_symbolizer.cpp b/src/grid/process_markers_symbolizer.cpp
index 1d8ad2c5d..7b8d7ed8a 100644
--- a/src/grid/process_markers_symbolizer.cpp
+++ b/src/grid/process_markers_symbolizer.cpp
@@ -152,12 +152,12 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
     ras_ptr->reset();
     box2d<double> clip_box = common_.query_extent_;
 
-    using context_type = detail::grid_markers_renderer_context<svg_renderer_type,
+    using renderer_context_type = detail::grid_markers_renderer_context<svg_renderer_type,
                                                                renderer_type,
                                                                buf_type,
                                                                grid_rasterizer,
                                                                buffer_type>;
-    context_type renderer_context(feature, render_buf, *ras_ptr, pixmap_);
+    renderer_context_type renderer_context(feature, render_buf, *ras_ptr, pixmap_);
 
     render_markers_symbolizer(
         sym, feature, prj_trans, common_, clip_box, renderer_context);

From 1b940bebcca5c6f4c088cfc978dd88e31efeb7db Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 12 Jan 2017 18:18:39 +0100
Subject: [PATCH 215/328] attributes not opacity (ref 
 1c704447b7b343f1d3d18995af3d341808bd2887)

---
 src/cairo/cairo_render_vector.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/cairo/cairo_render_vector.cpp b/src/cairo/cairo_render_vector.cpp
index cbbafca84..f1779d96e 100644
--- a/src/cairo/cairo_render_vector.cpp
+++ b/src/cairo/cairo_render_vector.cpp
@@ -33,16 +33,16 @@ namespace mapnik
 {
 
 void render_vector_marker(cairo_context & context, svg::svg_path_adapter & svg_path,
-                          agg::pod_bvector<svg::path_attributes> const & attributes,
+                          agg::pod_bvector<svg::path_attributes> const & attrs,
                           box2d<double> const& bbox, agg::trans_affine const& tr,
-                          double opacity_)
+                          double opacity)
 {
     using namespace mapnik::svg;
     agg::trans_affine transform;
 
-    for(unsigned i = 0; i < attributes.size(); ++i)
+    for(unsigned i = 0; i < attrs.size(); ++i)
     {
-        mapnik::svg::path_attributes const& attr = attributes[i];
+        mapnik::svg::path_attributes const& attr = attrs[i];
         if (!attr.visibility_flag)
             continue;
         cairo_save_restore guard(context);
@@ -75,14 +75,14 @@ void render_vector_marker(cairo_context & context, svg::svg_path_adapter & svg_p
             }
             if(attr.fill_gradient.get_gradient_type() != NO_GRADIENT)
             {
-                cairo_gradient g(attr.fill_gradient,attr.fill_opacity * attr.opacity * opacity_);
+                cairo_gradient g(attr.fill_gradient,attr.fill_opacity * attr.opacity * opacity);
 
                 context.set_gradient(g,bbox);
                 context.fill();
             }
             else if(attr.fill_flag)
             {
-                double fill_opacity = attr.fill_opacity * attr.opacity * opacity_ * attr.fill_color.opacity();
+                double fill_opacity = attr.fill_opacity * attr.opacity * opacity * attr.fill_color.opacity();
                 context.set_color(attr.fill_color.r/255.0,attr.fill_color.g/255.0,
                                   attr.fill_color.b/255.0, fill_opacity);
                 context.fill();
@@ -98,13 +98,13 @@ void render_vector_marker(cairo_context & context, svg::svg_path_adapter & svg_p
                 context.set_line_cap(line_cap_enum(attr.line_cap));
                 context.set_line_join(line_join_enum(attr.line_join));
                 context.set_miter_limit(attr.miter_limit);
-                cairo_gradient g(attr.stroke_gradient,attr.fill_opacity * attr.opacity * opacity_);
+                cairo_gradient g(attr.stroke_gradient,attr.fill_opacity * attr.opacity * opacity);
                 context.set_gradient(g,bbox);
                 context.stroke();
             }
             else if (attr.stroke_flag)
             {
-                double stroke_opacity = attr.stroke_opacity * attr.opacity * opacity_ * attr.stroke_color.opacity();
+                double stroke_opacity = attr.stroke_opacity * attr.opacity * opacity * attr.stroke_color.opacity();
                 context.set_color(attr.stroke_color.r/255.0,attr.stroke_color.g/255.0,
                                   attr.stroke_color.b/255.0, stroke_opacity);
                 context.set_line_width(attr.stroke_width);

From 28c51df98642667fea8566357740da2ca77afc64 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 13 Jan 2017 09:38:54 +0100
Subject: [PATCH 216/328] more fix GCC shadows a member warning `[-Wshadow]`

---
 src/cairo/process_markers_symbolizer.cpp      |  4 ++--
 src/load_map.cpp                              | 20 ++++++++--------
 src/raster_colorizer.cpp                      | 24 +++++++++----------
 .../render_thunk_extractor.cpp                |  4 ++--
 src/text/placements/simple.cpp                |  8 +++----
 src/xml_tree.cpp                              |  4 ++--
 6 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/cairo/process_markers_symbolizer.cpp b/src/cairo/process_markers_symbolizer.cpp
index f6b18fd2a..e598b0cbd 100644
--- a/src/cairo/process_markers_symbolizer.cpp
+++ b/src/cairo/process_markers_symbolizer.cpp
@@ -76,8 +76,8 @@ void cairo_renderer<T>::process(markers_symbolizer const& sym,
     context_.set_operator(comp_op);
     box2d<double> clip_box = common_.query_extent_;
 
-    using context_type = detail::cairo_markers_renderer_context;
-    context_type renderer_context(context_);
+    using renderer_context_type = detail::cairo_markers_renderer_context;
+    renderer_context_type renderer_context(context_);
 
     render_markers_symbolizer(
         sym, feature, prj_trans, common_, clip_box,
diff --git a/src/load_map.cpp b/src/load_map.cpp
index 2f1e0f8fa..c9e3d70f5 100644
--- a/src/load_map.cpp
+++ b/src/load_map.cpp
@@ -1483,32 +1483,32 @@ bool map_parser::parse_raster_colorizer(raster_colorizer_ptr const& rc,
                 colorizer_mode mode = n.get_attr<colorizer_mode>("mode", COLORIZER_INHERIT);
 
                 // value is required, and it must be bigger than the previous
-                optional<float> value = n.get_opt_attr<float>("value");
+                optional<float> val = n.get_opt_attr<float>("value");
 
-                if(!value)
+                if (!val)
                 {
                     throw config_error("stop tag missing value");
                 }
 
-                if(value < maximumValue)
+                if (val < maximumValue)
                 {
                     throw config_error("stop tag values must be in ascending order");
                 }
-                maximumValue = *value;
+                maximumValue = *val;
 
                 optional<std::string> label = n.get_opt_attr<std::string>("label");
 
                 //append the stop
-                colorizer_stop tmpStop;
-                tmpStop.set_color(*stopcolor);
-                tmpStop.set_mode(mode);
-                tmpStop.set_value(*value);
+                colorizer_stop stop;
+                stop.set_color(*stopcolor);
+                stop.set_mode(mode);
+                stop.set_value(*val);
                 if (label)
                 {
-                    tmpStop.set_label(*label);
+                    stop.set_label(*label);
                 }
 
-                rc->add_stop(tmpStop);
+                rc->add_stop(stop);
             }
         }
     }
diff --git a/src/raster_colorizer.cpp b/src/raster_colorizer.cpp
index 897714605..879da7fdb 100644
--- a/src/raster_colorizer.cpp
+++ b/src/raster_colorizer.cpp
@@ -48,10 +48,10 @@ static const char *colorizer_mode_strings[] = {
 IMPLEMENT_ENUM( colorizer_mode, colorizer_mode_strings )
 
 
-colorizer_stop::colorizer_stop(float value, colorizer_mode mode,
+colorizer_stop::colorizer_stop(float val, colorizer_mode mode,
                                color const& _color,
                                std::string const& label)
-: value_(value)
+: value_(val)
     , mode_(mode)
     , color_(_color)
     , label_(label)
@@ -135,14 +135,14 @@ void raster_colorizer::colorize(image_rgba8 & out, T const& in,
     int len = out.width() * out.height();
     for (int i=0; i<len; ++i)
     {
-        pixel_type value = in_data[i];
-        if (nodata && (std::fabs(value - *nodata) < epsilon_))
+        pixel_type val = in_data[i];
+        if (nodata && (std::fabs(val - *nodata) < epsilon_))
         {
             out_data[i] = 0; // rgba(0,0,0,0)
         }
         else
         {
-            out_data[i] = get_color(value);
+            out_data[i] = get_color(val);
         }
     }
 }
@@ -152,7 +152,7 @@ inline unsigned interpolate(unsigned start, unsigned end, float fraction)
     return static_cast<unsigned>(fraction * (static_cast<float>(end) - static_cast<float>(start)) + static_cast<float>(start));
 }
 
-unsigned raster_colorizer::get_color(float value) const
+unsigned raster_colorizer::get_color(float val) const
 {
     int stopCount = stops_.size();
 
@@ -162,13 +162,13 @@ unsigned raster_colorizer::get_color(float value) const
         return default_color_.rgba();
     }
 
-    //1 - Find the stop that the value is in
+    //1 - Find the stop that the val is in
     int stopIdx = -1;
     bool foundStopIdx = false;
 
     for(int i=0; i<stopCount; ++i)
     {
-        if(value < stops_[i].get_value())
+        if (val < stops_[i].get_value())
         {
             stopIdx = i-1;
             foundStopIdx = true;
@@ -215,7 +215,7 @@ unsigned raster_colorizer::get_color(float value) const
     {
         stopColor = default_color_;
         nextStopColor = stops_[nextStopIdx].get_color();
-        stopValue = value;
+        stopValue = val;
         nextStopValue = stops_[nextStopIdx].get_value();
     }
     else
@@ -237,7 +237,7 @@ unsigned raster_colorizer::get_color(float value) const
         }
         else
         {
-            float fraction = (value - stopValue) / (nextStopValue - stopValue);
+            float fraction = (val - stopValue) / (nextStopValue - stopValue);
 
             unsigned r = interpolate(stopColor.red(), nextStopColor.red(),fraction);
             unsigned g = interpolate(stopColor.green(), nextStopColor.green(),fraction);
@@ -258,7 +258,7 @@ unsigned raster_colorizer::get_color(float value) const
     case COLORIZER_EXACT:
     default:
         //approximately equal (within epsilon)
-        if(std::fabs(value - stopValue) < epsilon_)
+        if (std::fabs(val - stopValue) < epsilon_)
         {
             outputColor = stopColor;
         }
@@ -271,7 +271,7 @@ unsigned raster_colorizer::get_color(float value) const
 
 
     /*
-      MAPNIK_LOG_DEBUG(raster_colorizer) << "raster_colorizer: get_color " << value;
+      MAPNIK_LOG_DEBUG(raster_colorizer) << "raster_colorizer: get_color " << val;
       MAPNIK_LOG_DEBUG(raster_colorizer) << "\tstopIdx: " << stopIdx;
       MAPNIK_LOG_DEBUG(raster_colorizer) << "\tnextStopIdx: " << nextStopIdx;
       MAPNIK_LOG_DEBUG(raster_colorizer) << "\tstopValue: " << stopValue;
diff --git a/src/renderer_common/render_thunk_extractor.cpp b/src/renderer_common/render_thunk_extractor.cpp
index 1a5d1b854..9307064eb 100644
--- a/src/renderer_common/render_thunk_extractor.cpp
+++ b/src/renderer_common/render_thunk_extractor.cpp
@@ -87,8 +87,8 @@ render_thunk_extractor::render_thunk_extractor(box2d<double> & box,
 
 void render_thunk_extractor::operator()(markers_symbolizer const& sym) const
 {
-    using context_type = detail::thunk_markers_renderer_context;
-    context_type renderer_context(sym, feature_, vars_, thunks_);
+    using renderer_context_type = detail::thunk_markers_renderer_context;
+    renderer_context_type renderer_context(sym, feature_, vars_, thunks_);
 
     render_markers_symbolizer(
             sym, feature_, prj_trans_, common_, clipping_extent_, renderer_context);
diff --git a/src/text/placements/simple.cpp b/src/text/placements/simple.cpp
index 24b3af621..0bec3423d 100644
--- a/src/text/placements/simple.cpp
+++ b/src/text/placements/simple.cpp
@@ -91,8 +91,8 @@ bool parse_positions(std::string const& evaluated_positions,
 
 text_placement_info_simple::text_placement_info_simple(text_placements_simple const* parent,
                            std::string const& evaluated_positions,
-                           double scale_factor)
-: text_placement_info(parent, scale_factor),
+                           double scale_factor_)
+: text_placement_info(parent, scale_factor_),
   state(0),
   position_state(0),
   direction_(parent->direction_),
@@ -136,10 +136,10 @@ bool text_placement_info_simple::next_position_only() const
     return true;
 }
 
-text_placement_info_ptr text_placements_simple::get_placement_info(double scale_factor, feature_impl const& feature, attributes const& vars) const
+text_placement_info_ptr text_placements_simple::get_placement_info(double scale_factor_, feature_impl const& feature, attributes const& vars) const
 {
     std::string evaluated_positions = util::apply_visitor(extract_value<std::string>(feature,vars), positions_);
-    return std::make_shared<text_placement_info_simple>(this, evaluated_positions, scale_factor);
+    return std::make_shared<text_placement_info_simple>(this, evaluated_positions, scale_factor_);
 }
 
 text_placements_simple::text_placements_simple(symbolizer_base::value_type const& positions)
diff --git a/src/xml_tree.cpp b/src/xml_tree.cpp
index 0c01a9b1a..84e1f0d4d 100644
--- a/src/xml_tree.cpp
+++ b/src/xml_tree.cpp
@@ -230,9 +230,9 @@ xml_node & xml_node::add_child(const char * name, unsigned line, bool is_text)
     return children_.back();
 }
 
-void xml_node::add_attribute(const char * name, const char * value)
+void xml_node::add_attribute(const char * name, const char * value_)
 {
-    auto result = attributes_.emplace(name,xml_attribute(value));
+    auto result = attributes_.emplace(name,xml_attribute(value_));
     if (!result.second)
     {
         MAPNIK_LOG_ERROR(xml_tree) << "ignoring duplicate attribute '" << name << "'";

From f76060274d22376c1bf36e2cad73173d692b3f03 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 13 Jan 2017 09:40:55 +0100
Subject: [PATCH 217/328] Revert back again fixing a typo! (thanks @springmeyer
 https://github.com/mapnik/mapnik/commit/2f55f0962ec965c54f7b8f068341e0e687fc9398#commitcomment-20461372)
 "It doesn't work with GCC reverting back "disable [-Wunused-result] warning
 GCC : https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25509""

This reverts commit 2f55f0962ec965c54f7b8f068341e0e687fc9398.
---
 include/mapnik/util/file_io.hpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/mapnik/util/file_io.hpp b/include/mapnik/util/file_io.hpp
index 5dfe782eb..bb496b3a2 100644
--- a/include/mapnik/util/file_io.hpp
+++ b/include/mapnik/util/file_io.hpp
@@ -83,7 +83,11 @@ public:
         if (!size_) return nullptr;
         std::fseek(file_.get(), 0, SEEK_SET);
         data_type buffer(new char[size_]);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
+#pragma GCC diagnostic ignored "-Wunused-result"
         std::fread(buffer.get(), size_, 1, file_.get());
+#pragma GCC diagnostic pop
         return buffer;
     }
 private:

From bfc7ad397a9c49bde549b360de93c86d5f7149ee Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 13 Jan 2017 09:52:16 +0100
Subject: [PATCH 218/328] update variant

---
 deps/mapbox/variant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index 6317a0b74..d2588a8f1 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit 6317a0b7406395729139327a83a71cfa14513fac
+Subproject commit d2588a8f1d6b5d480d228e6d8a906ce634bdea9a

From a220bda05d2aa185a2fb9aa721928f139fe926a9 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 13 Jan 2017 14:38:00 +0100
Subject: [PATCH 219/328] check return value from std::fread

---
 include/mapnik/util/file_io.hpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/include/mapnik/util/file_io.hpp b/include/mapnik/util/file_io.hpp
index bb496b3a2..00c925006 100644
--- a/include/mapnik/util/file_io.hpp
+++ b/include/mapnik/util/file_io.hpp
@@ -83,11 +83,8 @@ public:
         if (!size_) return nullptr;
         std::fseek(file_.get(), 0, SEEK_SET);
         data_type buffer(new char[size_]);
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunknown-pragmas"
-#pragma GCC diagnostic ignored "-Wunused-result"
-        std::fread(buffer.get(), size_, 1, file_.get());
-#pragma GCC diagnostic pop
+        auto count = std::fread(buffer.get(), size_, 1, file_.get());
+        if (count != 1) return nullptr;
         return buffer;
     }
 private:

From a108068cf6b7baa33c8047cece64b639f0c008fa Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 13 Jan 2017 14:57:15 +0100
Subject: [PATCH 220/328] fix remaning `std::fread` usage  - check return value

---
 plugins/input/csv/csv_featureset.cpp            |  5 ++++-
 plugins/input/csv/csv_index_featureset.cpp      |  5 ++++-
 plugins/input/geojson/geojson_datasource.cpp    | 17 ++++++++---------
 .../input/geojson/geojson_index_featureset.cpp  |  4 ++--
 .../geojson/geojson_memory_index_featureset.cpp |  4 ++--
 plugins/input/topojson/topojson_datasource.cpp  |  4 ++--
 utils/mapnik-index/process_geojson_file_x3.cpp  |  4 ++--
 7 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/plugins/input/csv/csv_featureset.cpp b/plugins/input/csv/csv_featureset.cpp
index f82f345d6..b73f2e4b3 100644
--- a/plugins/input/csv/csv_featureset.cpp
+++ b/plugins/input/csv/csv_featureset.cpp
@@ -97,7 +97,10 @@ mapnik::feature_ptr csv_featureset::next()
         std::fseek(file_.get(), file_offset, SEEK_SET);
         std::vector<char> record;
         record.resize(size);
-        std::fread(record.data(), size, 1, file_.get());
+        if (std::fread(record.data(), size, 1, file_.get()) != 1)
+        {
+            return mapnik::feature_ptr();
+        }
         auto const* start = record.data();
         auto const*  end = start + record.size();
 #endif
diff --git a/plugins/input/csv/csv_index_featureset.cpp b/plugins/input/csv/csv_index_featureset.cpp
index 2d210e251..3498dc37f 100644
--- a/plugins/input/csv/csv_index_featureset.cpp
+++ b/plugins/input/csv/csv_index_featureset.cpp
@@ -119,7 +119,10 @@ mapnik::feature_ptr csv_index_featureset::next()
         std::fseek(file_.get(), pos.first, SEEK_SET);
         std::vector<char> record;
         record.resize(pos.second);
-        std::fread(record.data(), pos.second, 1, file_.get());
+        if (std::fread(record.data(), pos.second, 1, file_.get()) != 1)
+        {
+            return mapnik::feature_ptr();
+        }
         auto const* start = record.data();
         auto const*  end = start + record.size();
 #endif
diff --git a/plugins/input/geojson/geojson_datasource.cpp b/plugins/input/geojson/geojson_datasource.cpp
index c3b2b6664..10995fda1 100644
--- a/plugins/input/geojson/geojson_datasource.cpp
+++ b/plugins/input/geojson/geojson_datasource.cpp
@@ -155,9 +155,9 @@ geojson_datasource::geojson_datasource(parameters const& params)
 
         std::string file_buffer;
         file_buffer.resize(file.size());
-        std::fread(&file_buffer[0], file.size(), 1, file.get());
+        auto count = std::fread(&file_buffer[0], file.size(), 1, file.get());
         char const* start = file_buffer.c_str();
-        char const* end = start + file_buffer.length();
+        char const* end = (count == 1) ? start + file_buffer.length() : start;
 #else
         boost::optional<mapnik::mapped_region_ptr> mapped_region =
             mapnik::mapped_memory_cache::instance().find(filename_, false);
@@ -226,9 +226,9 @@ void geojson_datasource::initialise_disk_index(std::string const& filename)
         std::fseek(file.get(), pos.first, SEEK_SET);
         std::vector<char> record;
         record.resize(pos.second);
-        std::fread(record.data(), pos.second, 1, file.get());
+        auto count = std::fread(record.data(), pos.second, 1, file.get());
         auto const* start = record.data();
-        auto const*  end = start + record.size();
+        auto const*  end = (count == 1) ? start + record.size() : start;
         mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx, -1));
         try
         {
@@ -471,9 +471,9 @@ boost::optional<mapnik::datasource_geometry_t> geojson_datasource::get_geometry_
             std::fseek(file.get(), pos.first, SEEK_SET);
             std::vector<char> record;
             record.resize(pos.second);
-            std::fread(record.data(), pos.second, 1, file.get());
+            auto count = std::fread(record.data(), pos.second, 1, file.get());
             auto const* start = record.data();
-            auto const*  end = start + record.size();
+            auto const*  end = (count == 1) ? start + record.size() : start;
             mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx, -1)); // temp feature
             try
             {
@@ -533,11 +533,10 @@ boost::optional<mapnik::datasource_geometry_t> geojson_datasource::get_geometry_
             std::fseek(file.get(), file_offset, SEEK_SET);
             std::vector<char> json;
             json.resize(size);
-            std::fread(json.data(), size, 1, file.get());
-
+            auto count_objects = std::fread(json.data(), size, 1, file.get());
             using chr_iterator_type = char const*;
             chr_iterator_type start2 = json.data();
-            chr_iterator_type end2 = start2 + json.size();
+            chr_iterator_type end2 = (count_objects == 1) ? start2 + json.size() : start2;
 
             mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx, -1)); // temp feature
             try
diff --git a/plugins/input/geojson/geojson_index_featureset.cpp b/plugins/input/geojson/geojson_index_featureset.cpp
index 2b250e1d1..b5e0fc66a 100644
--- a/plugins/input/geojson/geojson_index_featureset.cpp
+++ b/plugins/input/geojson/geojson_index_featureset.cpp
@@ -87,9 +87,9 @@ mapnik::feature_ptr geojson_index_featureset::next()
         std::fseek(file_.get(), pos.first, SEEK_SET);
         std::vector<char> record;
         record.resize(pos.second);
-        std::fread(record.data(), pos.second, 1, file_.get());
+        auto count = std::fread(record.data(), pos.second, 1, file_.get());
         auto const* start = record.data();
-        auto const*  end = start + record.size();
+        auto const*  end = (count == 1) ? start + record.size() : start;
 #endif
         static const mapnik::transcoder tr("utf8");
         mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx_, feature_id_++));
diff --git a/plugins/input/geojson/geojson_memory_index_featureset.cpp b/plugins/input/geojson/geojson_memory_index_featureset.cpp
index 194669364..f26e098e2 100644
--- a/plugins/input/geojson/geojson_memory_index_featureset.cpp
+++ b/plugins/input/geojson/geojson_memory_index_featureset.cpp
@@ -61,10 +61,10 @@ mapnik::feature_ptr geojson_memory_index_featureset::next()
         std::fseek(file_.get(), file_offset, SEEK_SET);
         std::vector<char> json;
         json.resize(size);
-        std::fread(json.data(), size, 1, file_.get());
+        auto count = std::fread(json.data(), size, 1, file_.get());
         using chr_iterator_type = char const*;
         chr_iterator_type start = json.data();
-        chr_iterator_type end = start + json.size();
+        chr_iterator_type end = (count == 1) ? start + json.size() : start;
         static const mapnik::transcoder tr("utf8");
         mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx_, feature_id_++));
         mapnik::json::parse_feature(start, end, *feature, tr); // throw on failure
diff --git a/plugins/input/topojson/topojson_datasource.cpp b/plugins/input/topojson/topojson_datasource.cpp
index 863b0060e..53e4cd944 100644
--- a/plugins/input/topojson/topojson_datasource.cpp
+++ b/plugins/input/topojson/topojson_datasource.cpp
@@ -171,8 +171,8 @@ topojson_datasource::topojson_datasource(parameters const& params)
         }
         std::string file_buffer;
         file_buffer.resize(file.size());
-        std::fread(&file_buffer[0], file.size(), 1, file.get());
-        parse_topojson(file_buffer.c_str());
+        auto count = std::fread(&file_buffer[0], file.size(), 1, file.get());
+        if (count == 1) parse_topojson(file_buffer.c_str());
     }
 }
 
diff --git a/utils/mapnik-index/process_geojson_file_x3.cpp b/utils/mapnik-index/process_geojson_file_x3.cpp
index 0079d01c0..d0472738e 100644
--- a/utils/mapnik-index/process_geojson_file_x3.cpp
+++ b/utils/mapnik-index/process_geojson_file_x3.cpp
@@ -252,9 +252,9 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
     }
     std::string file_buffer;
     file_buffer.resize(file.size());
-    std::fread(&file_buffer[0], file.size(), 1, file.get());
+    auto count = std::fread(&file_buffer[0], file.size(), 1, file.get());
     base_iterator_type start = file_buffer.c_str();
-    base_iterator_type end = start + file_buffer.length();
+    base_iterator_type end = (count == 1) ? start + file_buffer.length() : start;
 #endif
     base_iterator_type itr = start; // make a copy to preserve `start` iterator state
     try

From 7c6f335fa5b2194a2d52a6b78d2c02f056c29289 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 17 Jan 2017 17:54:09 +0100
Subject: [PATCH 221/328] fix `blank` line test for require `headers.size() ==
 1` +  reduce stderr verbosity.

---
 plugins/input/csv/csv_utils.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/input/csv/csv_utils.cpp b/plugins/input/csv/csv_utils.cpp
index f52308f34..f85cee4ec 100644
--- a/plugins/input/csv/csv_utils.cpp
+++ b/plugins/input/csv/csv_utils.cpp
@@ -288,7 +288,10 @@ void csv_file_parser::parse_csv_and_boxes(std::istream & csv_file, T & boxes)
             {
                 auto headers = csv_utils::parse_line(csv_line, separator_, quote_);
                 // skip blank lines
-                if (headers.size() > 0 && headers[0].empty()) ++line_number;
+                if (headers.size() == 1 && headers[0].empty())
+                {
+                    ++line_number;
+                }
                 else
                 {
                     std::size_t index = 0;
@@ -303,7 +306,7 @@ void csv_file_parser::parse_csv_and_boxes(std::istream & csv_file, T & boxes)
                                 std::ostringstream s;
                                 s << "CSV Plugin: expected a column header at line ";
                                 s << line_number << ", column " << index;
-                                s << " - ensure this row contains valid header fields: '";
+                                s << " - expected fields: '";
                                 s << csv_line;
                                 throw mapnik::datasource_exception(s.str());
                             }
@@ -341,7 +344,6 @@ void csv_file_parser::parse_csv_and_boxes(std::istream & csv_file, T & boxes)
         std::string str("CSV Plugin: could not detect column(s) with the name(s) of wkt, geojson, x/y, or ");
         str += "latitude/longitude in:\n";
         str += csv_line;
-        str += "\n - this is required for reading geometry data";
         throw mapnik::datasource_exception(str);
     }
 

From 69bb8f4328b42babc973778e00eb455db08847aa Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 20 Jan 2017 09:43:37 +0100
Subject: [PATCH 222/328] update test data

---
 test/data | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/data b/test/data
index 6ce59adfc..5ad14e6bd 160000
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit 6ce59adfc4f11b16a5dc0e2020c36dc614850989
+Subproject commit 5ad14e6bdf2c5e6babd8ac04aa057ed6c67ac617

From f13848e2108c4863da2adb243284392a3a157885 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 26 Jan 2017 09:51:37 +0100
Subject: [PATCH 223/328] move `box2.hpp` and related files into `geometry` dir

---
 benchmark/test_proj_transform1.cpp                       | 2 +-
 include/mapnik/agg_render_marker.hpp                     | 2 +-
 include/mapnik/agg_renderer.hpp                          | 2 +-
 include/mapnik/feature.hpp                               | 2 +-
 include/mapnik/feature_style_processor.hpp               | 2 +-
 include/mapnik/feature_style_processor_impl.hpp          | 2 +-
 include/mapnik/geom_util.hpp                             | 2 +-
 include/mapnik/geometry/boost_adapters.hpp               | 2 +-
 include/mapnik/{ => geometry}/box2d.hpp                  | 0
 include/mapnik/{ => geometry}/box2d_impl.hpp             | 2 +-
 include/mapnik/geometry/envelope.hpp                     | 2 +-
 include/mapnik/geometry/envelope_impl.hpp                | 2 +-
 include/mapnik/grid/grid.hpp                             | 2 +-
 include/mapnik/grid/grid_renderer.hpp                    | 2 +-
 include/mapnik/grid/grid_view.hpp                        | 2 +-
 include/mapnik/group/group_layout_manager.hpp            | 2 +-
 include/mapnik/image_reader.hpp                          | 2 +-
 include/mapnik/json/extract_bounding_boxes_x3_config.hpp | 2 +-
 include/mapnik/json/topojson_utils.hpp                   | 2 +-
 include/mapnik/layer.hpp                                 | 2 +-
 include/mapnik/map.hpp                                   | 2 +-
 include/mapnik/marker_helpers.hpp                        | 2 +-
 include/mapnik/markers_placements/basic.hpp              | 2 +-
 include/mapnik/memory_featureset.hpp                     | 2 +-
 include/mapnik/path.hpp                                  | 2 +-
 include/mapnik/quad_tree.hpp                             | 2 +-
 include/mapnik/query.hpp                                 | 2 +-
 include/mapnik/raster.hpp                                | 2 +-
 include/mapnik/renderer_common.hpp                       | 2 +-
 include/mapnik/renderer_common/clipping_extent.hpp       | 2 +-
 include/mapnik/request.hpp                               | 2 +-
 include/mapnik/svg/output/svg_renderer.hpp               | 2 +-
 include/mapnik/svg/svg_path_adapter.hpp                  | 2 +-
 include/mapnik/svg/svg_renderer_agg.hpp                  | 2 +-
 include/mapnik/svg/svg_storage.hpp                       | 2 +-
 include/mapnik/text/glyph_positions.hpp                  | 2 +-
 include/mapnik/text/placement_finder.hpp                 | 2 +-
 include/mapnik/text/text_layout.hpp                      | 2 +-
 include/mapnik/util/spatial_index.hpp                    | 2 +-
 include/mapnik/view_transform.hpp                        | 2 +-
 include/mapnik/warp.hpp                                  | 2 +-
 plugins/input/csv/csv_datasource.hpp                     | 2 +-
 plugins/input/csv/csv_utils.hpp                          | 2 +-
 plugins/input/gdal/gdal_datasource.hpp                   | 2 +-
 plugins/input/geojson/geojson_datasource.cpp             | 2 +-
 plugins/input/geojson/geojson_datasource.hpp             | 2 +-
 plugins/input/ogr/ogr_datasource.hpp                     | 2 +-
 plugins/input/ogr/ogr_featureset.cpp                     | 2 +-
 plugins/input/ogr/ogr_index.hpp                          | 2 +-
 plugins/input/ogr/ogr_index_featureset.cpp               | 2 +-
 plugins/input/pgraster/pgraster_datasource.hpp           | 2 +-
 plugins/input/pgraster/pgraster_featureset.hpp           | 2 +-
 plugins/input/pgraster/pgraster_wkb_reader.cpp           | 2 +-
 plugins/input/pgraster/pgraster_wkb_reader.hpp           | 2 +-
 plugins/input/postgis/postgis_datasource.hpp             | 2 +-
 plugins/input/postgis/postgis_featureset.hpp             | 2 +-
 plugins/input/raster/raster_datasource.hpp               | 2 +-
 plugins/input/shape/shape_datasource.hpp                 | 2 +-
 plugins/input/shape/shape_io.hpp                         | 2 +-
 plugins/input/shape/shapefile.hpp                        | 2 +-
 plugins/input/sqlite/sqlite_datasource.hpp               | 2 +-
 plugins/input/sqlite/sqlite_featureset.cpp               | 2 +-
 plugins/input/sqlite/sqlite_prepared.hpp                 | 2 +-
 plugins/input/topojson/topojson_datasource.cpp           | 2 +-
 plugins/input/topojson/topojson_datasource.hpp           | 2 +-
 src/agg/process_raster_symbolizer.cpp                    | 2 +-
 src/build.py                                             | 2 +-
 src/{ => geometry}/box2d.cpp                             | 2 +-
 src/image_util.cpp                                       | 2 +-
 src/json/extract_bounding_boxes_x3.cpp                   | 2 +-
 src/memory_datasource.cpp                                | 2 +-
 src/proj_transform.cpp                                   | 2 +-
 src/renderer_common/render_pattern.cpp                   | 2 +-
 src/warp.cpp                                             | 2 +-
 test/unit/core/box2d_test.cpp                            | 3 +--
 test/unit/projection/proj_transform.cpp                  | 3 +--
 utils/mapnik-index/process_csv_file.hpp                  | 2 +-
 utils/ogrindex/ogrindex.cpp                              | 2 +-
 78 files changed, 77 insertions(+), 79 deletions(-)
 rename include/mapnik/{ => geometry}/box2d.hpp (100%)
 rename include/mapnik/{ => geometry}/box2d_impl.hpp (99%)
 rename src/{ => geometry}/box2d.cpp (96%)

diff --git a/benchmark/test_proj_transform1.cpp b/benchmark/test_proj_transform1.cpp
index 37f4b0c4c..fa050da12 100644
--- a/benchmark/test_proj_transform1.cpp
+++ b/benchmark/test_proj_transform1.cpp
@@ -1,5 +1,5 @@
 #include "bench_framework.hpp"
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/projection.hpp>
 #include <mapnik/proj_transform.hpp>
 
diff --git a/include/mapnik/agg_render_marker.hpp b/include/mapnik/agg_render_marker.hpp
index e6f0d404e..d11789df4 100644
--- a/include/mapnik/agg_render_marker.hpp
+++ b/include/mapnik/agg_render_marker.hpp
@@ -29,7 +29,7 @@
 #include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/svg/svg_converter.hpp>
 #include <mapnik/vertex_converters.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/safe_cast.hpp>
 #include <mapnik/util/const_rendering_buffer.hpp>
 
diff --git a/include/mapnik/agg_renderer.hpp b/include/mapnik/agg_renderer.hpp
index 4d1a1f65f..0eef75d29 100644
--- a/include/mapnik/agg_renderer.hpp
+++ b/include/mapnik/agg_renderer.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/feature_style_processor.hpp>
 #include <mapnik/util/noncopyable.hpp>       // for noncopyable
 #include <mapnik/rule.hpp>              // for rule, symbolizers
-#include <mapnik/box2d.hpp>     // for box2d
+#include <mapnik/geometry/box2d.hpp>     // for box2d
 #include <mapnik/view_transform.hpp>    // for view_transform
 #include <mapnik/image_compositing.hpp>  // for composite_mode_e
 #include <mapnik/pixel_position.hpp>
diff --git a/include/mapnik/feature.hpp b/include/mapnik/feature.hpp
index c6ee3111b..657cc906f 100644
--- a/include/mapnik/feature.hpp
+++ b/include/mapnik/feature.hpp
@@ -27,7 +27,7 @@
 #include <mapnik/config.hpp>
 #include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/geometry/envelope.hpp>
 //
diff --git a/include/mapnik/feature_style_processor.hpp b/include/mapnik/feature_style_processor.hpp
index 474ba62a3..f0cf91b6c 100644
--- a/include/mapnik/feature_style_processor.hpp
+++ b/include/mapnik/feature_style_processor.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_FEATURE_STYLE_PROCESSOR_HPP
 
 // mapnik
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/featureset.hpp>
 #include <mapnik/config.hpp>
 #include <mapnik/feature_style_processor_context.hpp>
diff --git a/include/mapnik/feature_style_processor_impl.hpp b/include/mapnik/feature_style_processor_impl.hpp
index ba5b40528..3e3743b72 100644
--- a/include/mapnik/feature_style_processor_impl.hpp
+++ b/include/mapnik/feature_style_processor_impl.hpp
@@ -33,7 +33,7 @@
 #include <mapnik/query.hpp>
 #include <mapnik/datasource.hpp>
 #include <mapnik/feature_type_style.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/layer.hpp>
 #include <mapnik/rule.hpp>
 #include <mapnik/rule_cache.hpp>
diff --git a/include/mapnik/geom_util.hpp b/include/mapnik/geom_util.hpp
index 6b15b30f5..da2b0f4e1 100644
--- a/include/mapnik/geom_util.hpp
+++ b/include/mapnik/geom_util.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_GEOM_UTIL_HPP
 
 // mapnik
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/coord.hpp>
 #include <mapnik/vertex.hpp>
 #include <mapnik/geometry/geometry_types.hpp>
diff --git a/include/mapnik/geometry/boost_adapters.hpp b/include/mapnik/geometry/boost_adapters.hpp
index d3dbde86e..dd7e9265a 100644
--- a/include/mapnik/geometry/boost_adapters.hpp
+++ b/include/mapnik/geometry/boost_adapters.hpp
@@ -40,7 +40,7 @@
 
 #include <mapnik/geometry.hpp>
 #include <mapnik/coord.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 
 #include <cstdint>
 
diff --git a/include/mapnik/box2d.hpp b/include/mapnik/geometry/box2d.hpp
similarity index 100%
rename from include/mapnik/box2d.hpp
rename to include/mapnik/geometry/box2d.hpp
diff --git a/include/mapnik/box2d_impl.hpp b/include/mapnik/geometry/box2d_impl.hpp
similarity index 99%
rename from include/mapnik/box2d_impl.hpp
rename to include/mapnik/geometry/box2d_impl.hpp
index 232a25d58..dccc8d270 100644
--- a/include/mapnik/box2d_impl.hpp
+++ b/include/mapnik/geometry/box2d_impl.hpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/safe_cast.hpp>
 
 // stl
diff --git a/include/mapnik/geometry/envelope.hpp b/include/mapnik/geometry/envelope.hpp
index 3b76fca34..6bf489c1d 100644
--- a/include/mapnik/geometry/envelope.hpp
+++ b/include/mapnik/geometry/envelope.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_GEOMETRY_ENVELOPE_HPP
 
 #include <mapnik/config.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 
 namespace mapnik {
 namespace geometry {
diff --git a/include/mapnik/geometry/envelope_impl.hpp b/include/mapnik/geometry/envelope_impl.hpp
index 23f3850d2..8c030eb77 100644
--- a/include/mapnik/geometry/envelope_impl.hpp
+++ b/include/mapnik/geometry/envelope_impl.hpp
@@ -22,7 +22,7 @@
 
 #include <mapnik/geometry/envelope.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 
 namespace mapnik { namespace geometry {
 
diff --git a/include/mapnik/grid/grid.hpp b/include/mapnik/grid/grid.hpp
index 628e434ae..39a32bcef 100644
--- a/include/mapnik/grid/grid.hpp
+++ b/include/mapnik/grid/grid.hpp
@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/image.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/grid/grid_view.hpp>
 #include <mapnik/global.hpp>
 #include <mapnik/value.hpp>
diff --git a/include/mapnik/grid/grid_renderer.hpp b/include/mapnik/grid/grid_renderer.hpp
index b3bd66157..9c2e4dbf8 100644
--- a/include/mapnik/grid/grid_renderer.hpp
+++ b/include/mapnik/grid/grid_renderer.hpp
@@ -29,7 +29,7 @@
 #include <mapnik/grid/grid.hpp>
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/rule.hpp>              // for rule, symbolizers
-#include <mapnik/box2d.hpp>     // for box2d
+#include <mapnik/geometry/box2d.hpp>     // for box2d
 #include <mapnik/color.hpp>     // for color
 #include <mapnik/view_transform.hpp>    // for view_transform
 #include <mapnik/image_compositing.hpp>  // for composite_mode_e
diff --git a/include/mapnik/grid/grid_view.hpp b/include/mapnik/grid/grid_view.hpp
index dea9ab028..bd5575d56 100644
--- a/include/mapnik/grid/grid_view.hpp
+++ b/include/mapnik/grid/grid_view.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_GRID_VIEW_HPP
 
 #include <mapnik/image.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/global.hpp>
 #include <mapnik/value.hpp>
 #include <mapnik/feature.hpp>
diff --git a/include/mapnik/group/group_layout_manager.hpp b/include/mapnik/group/group_layout_manager.hpp
index f264a1e66..6037718a3 100644
--- a/include/mapnik/group/group_layout_manager.hpp
+++ b/include/mapnik/group/group_layout_manager.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_GROUP_LAYOUT_MANAGER_HPP
 
 // mapnik
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/pixel_position.hpp>
 #include <mapnik/group/group_layout.hpp>
 
diff --git a/include/mapnik/image_reader.hpp b/include/mapnik/image_reader.hpp
index 99aa99c23..77cc1073b 100644
--- a/include/mapnik/image_reader.hpp
+++ b/include/mapnik/image_reader.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/config.hpp>
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/factory.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/include/mapnik/json/extract_bounding_boxes_x3_config.hpp b/include/mapnik/json/extract_bounding_boxes_x3_config.hpp
index 0f460c7c8..885c066c1 100644
--- a/include/mapnik/json/extract_bounding_boxes_x3_config.hpp
+++ b/include/mapnik/json/extract_bounding_boxes_x3_config.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_JSON_EXTRACT_BOUNDING_BOXES_CONFIG_HPP
 
 #include <mapnik/json/json_grammar_config.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/include/mapnik/json/topojson_utils.hpp b/include/mapnik/json/topojson_utils.hpp
index 557e09067..72737bb02 100644
--- a/include/mapnik/json/topojson_utils.hpp
+++ b/include/mapnik/json/topojson_utils.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_TOPOJSON_UTILS_HPP
 
 // mapnik
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/unicode.hpp>
 #include <mapnik/json/topology.hpp>
 #include <mapnik/json/attribute_value_visitor.hpp>
diff --git a/include/mapnik/layer.hpp b/include/mapnik/layer.hpp
index 38a8360f9..68746431f 100644
--- a/include/mapnik/layer.hpp
+++ b/include/mapnik/layer.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/well_known_srs.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 
 // stl
 #include <vector>
diff --git a/include/mapnik/map.hpp b/include/mapnik/map.hpp
index 6c4cfda7c..309be53de 100644
--- a/include/mapnik/map.hpp
+++ b/include/mapnik/map.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/color.hpp>
 #include <mapnik/font_set.hpp>
 #include <mapnik/enumeration.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/params.hpp>
 #include <mapnik/well_known_srs.hpp>
 #include <mapnik/image_compositing.hpp>
diff --git a/include/mapnik/marker_helpers.hpp b/include/mapnik/marker_helpers.hpp
index 6a509e040..fc688c16c 100644
--- a/include/mapnik/marker_helpers.hpp
+++ b/include/mapnik/marker_helpers.hpp
@@ -32,7 +32,7 @@
 #include <mapnik/marker.hpp> // for svg_storage_type
 #include <mapnik/markers_placement.hpp>
 #include <mapnik/attribute.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/vertex_processor.hpp>
 #include <mapnik/renderer_common/apply_vertex_converter.hpp>
 #include <mapnik/renderer_common/render_markers_symbolizer.hpp>
diff --git a/include/mapnik/markers_placements/basic.hpp b/include/mapnik/markers_placements/basic.hpp
index abcef5ea6..15233bafa 100644
--- a/include/mapnik/markers_placements/basic.hpp
+++ b/include/mapnik/markers_placements/basic.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_MARKERS_PLACEMENTS_BASIC_HPP
 
 // mapnik
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/symbolizer_enumerations.hpp>
 #include <mapnik/util/math.hpp>
 #include <mapnik/util/noncopyable.hpp>
diff --git a/include/mapnik/memory_featureset.hpp b/include/mapnik/memory_featureset.hpp
index 9f0a1bc0b..2f3cb6f07 100644
--- a/include/mapnik/memory_featureset.hpp
+++ b/include/mapnik/memory_featureset.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_MEMORY_FEATURESET_HPP
 
 // mapnik
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/geometry/envelope.hpp>
 #include <mapnik/featureset.hpp>
diff --git a/include/mapnik/path.hpp b/include/mapnik/path.hpp
index 76381dcac..6d93d66d0 100644
--- a/include/mapnik/path.hpp
+++ b/include/mapnik/path.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/vertex_vector.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/util/noncopyable.hpp>
 
 namespace mapnik { namespace detail {
diff --git a/include/mapnik/quad_tree.hpp b/include/mapnik/quad_tree.hpp
index ba92ca8cf..1d72b3f46 100644
--- a/include/mapnik/quad_tree.hpp
+++ b/include/mapnik/quad_tree.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_QUAD_TREE_HPP
 
 // mapnik
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/make_unique.hpp>
 
diff --git a/include/mapnik/query.hpp b/include/mapnik/query.hpp
index 9ecc310f3..07da0caac 100644
--- a/include/mapnik/query.hpp
+++ b/include/mapnik/query.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_QUERY_HPP
 
 //mapnik
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/attribute.hpp>
 
 // stl
diff --git a/include/mapnik/raster.hpp b/include/mapnik/raster.hpp
index d0cfc38dd..35a067f03 100644
--- a/include/mapnik/raster.hpp
+++ b/include/mapnik/raster.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_RASTER_HPP
 
 // mapnik
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/image_any.hpp>
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/util/variant.hpp>
diff --git a/include/mapnik/renderer_common.hpp b/include/mapnik/renderer_common.hpp
index 2cd695cb3..1c48ad3f5 100644
--- a/include/mapnik/renderer_common.hpp
+++ b/include/mapnik/renderer_common.hpp
@@ -25,7 +25,7 @@
 
 #include <mapnik/config.hpp>            // for MAPNIK_DECL
 #include <mapnik/font_engine_freetype.hpp>  // for face_manager, etc
-#include <mapnik/box2d.hpp>     // for box2d
+#include <mapnik/geometry/box2d.hpp>     // for box2d
 #include <mapnik/view_transform.hpp>    // for view_transform
 #include <mapnik/attribute.hpp>
 #include <mapnik/util/noncopyable.hpp>
diff --git a/include/mapnik/renderer_common/clipping_extent.hpp b/include/mapnik/renderer_common/clipping_extent.hpp
index ead1a80ed..dcd678103 100644
--- a/include/mapnik/renderer_common/clipping_extent.hpp
+++ b/include/mapnik/renderer_common/clipping_extent.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_CLIPPING_EXTENT_HPP
 
 
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 
 namespace mapnik {
 
diff --git a/include/mapnik/request.hpp b/include/mapnik/request.hpp
index 697ce9cca..c1b70c268 100644
--- a/include/mapnik/request.hpp
+++ b/include/mapnik/request.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 
 namespace mapnik
 {
diff --git a/include/mapnik/svg/output/svg_renderer.hpp b/include/mapnik/svg/output/svg_renderer.hpp
index 7ed568810..dbfa3477b 100644
--- a/include/mapnik/svg/output/svg_renderer.hpp
+++ b/include/mapnik/svg/output/svg_renderer.hpp
@@ -30,7 +30,7 @@
 #include <mapnik/svg/output/svg_output_attributes.hpp>
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/rule.hpp>              // for rule, symbolizers
-#include <mapnik/box2d.hpp>     // for box2d
+#include <mapnik/geometry/box2d.hpp>     // for box2d
 #include <mapnik/color.hpp>     // for color
 #include <mapnik/view_transform.hpp>    // for view_transform
 #include <mapnik/image_compositing.hpp>  // for composite_mode_e
diff --git a/include/mapnik/svg/svg_path_adapter.hpp b/include/mapnik/svg/svg_path_adapter.hpp
index 54fdf3f6d..288491030 100644
--- a/include/mapnik/svg/svg_path_adapter.hpp
+++ b/include/mapnik/svg/svg_path_adapter.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/util/noncopyable.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/safe_cast.hpp>
 
 #pragma GCC diagnostic push
diff --git a/include/mapnik/svg/svg_renderer_agg.hpp b/include/mapnik/svg/svg_renderer_agg.hpp
index a71777ef7..9183dd7e6 100644
--- a/include/mapnik/svg/svg_renderer_agg.hpp
+++ b/include/mapnik/svg/svg_renderer_agg.hpp
@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/gradient.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/value/types.hpp>
 #include <mapnik/util/noncopyable.hpp>
 
diff --git a/include/mapnik/svg/svg_storage.hpp b/include/mapnik/svg/svg_storage.hpp
index eb6506d96..120c27b1c 100644
--- a/include/mapnik/svg/svg_storage.hpp
+++ b/include/mapnik/svg/svg_storage.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_SVG_STORAGE_HPP
 
 // mapnik
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/util/noncopyable.hpp>
 
 namespace mapnik {
diff --git a/include/mapnik/text/glyph_positions.hpp b/include/mapnik/text/glyph_positions.hpp
index 08caa10cc..e8d732cf3 100644
--- a/include/mapnik/text/glyph_positions.hpp
+++ b/include/mapnik/text/glyph_positions.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_TEXT_GLYPH_POSITIONS_HPP
 
 //mapnik
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/pixel_position.hpp>
 #include <mapnik/text/rotation.hpp>
 #include <mapnik/marker_cache.hpp>
diff --git a/include/mapnik/text/placement_finder.hpp b/include/mapnik/text/placement_finder.hpp
index 240668330..195dba80d 100644
--- a/include/mapnik/text/placement_finder.hpp
+++ b/include/mapnik/text/placement_finder.hpp
@@ -23,7 +23,7 @@
 #define MAPNIK_PLACEMENT_FINDER_HPP
 
 //mapnik
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/pixel_position.hpp>
 #include <mapnik/text/text_layout.hpp>
 #include <mapnik/text/glyph_positions.hpp>
diff --git a/include/mapnik/text/text_layout.hpp b/include/mapnik/text/text_layout.hpp
index 0711a252f..3e2011a2f 100644
--- a/include/mapnik/text/text_layout.hpp
+++ b/include/mapnik/text/text_layout.hpp
@@ -25,7 +25,7 @@
 //mapnik
 #include <mapnik/value/types.hpp>
 #include <mapnik/pixel_position.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/attribute.hpp>
 #include <mapnik/symbolizer_enumerations.hpp>
 #include <mapnik/text/text_properties.hpp>
diff --git a/include/mapnik/util/spatial_index.hpp b/include/mapnik/util/spatial_index.hpp
index 7544b6836..0f271526e 100644
--- a/include/mapnik/util/spatial_index.hpp
+++ b/include/mapnik/util/spatial_index.hpp
@@ -25,7 +25,7 @@
 
 //mapnik
 #include <mapnik/coord.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/query.hpp>
 #include <mapnik/geom_util.hpp>
 // stl
diff --git a/include/mapnik/view_transform.hpp b/include/mapnik/view_transform.hpp
index 1c920bb32..96cde0a4c 100644
--- a/include/mapnik/view_transform.hpp
+++ b/include/mapnik/view_transform.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/coord.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/proj_transform.hpp>
 
 namespace mapnik
diff --git a/include/mapnik/warp.hpp b/include/mapnik/warp.hpp
index f6974b1e7..46c11e8b3 100644
--- a/include/mapnik/warp.hpp
+++ b/include/mapnik/warp.hpp
@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/image_scaling.hpp>
 #include <mapnik/config.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 
 namespace mapnik {
 
diff --git a/plugins/input/csv/csv_datasource.hpp b/plugins/input/csv/csv_datasource.hpp
index d4b9c4cf2..b21570d05 100644
--- a/plugins/input/csv/csv_datasource.hpp
+++ b/plugins/input/csv/csv_datasource.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/params.hpp>
 #include <mapnik/query.hpp>
 #include <mapnik/feature.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/value/types.hpp>
diff --git a/plugins/input/csv/csv_utils.hpp b/plugins/input/csv/csv_utils.hpp
index 2fa6dfb9b..0200cca1e 100644
--- a/plugins/input/csv/csv_utils.hpp
+++ b/plugins/input/csv/csv_utils.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_CSV_UTILS_DATASOURCE_HPP
 
 // mapnik
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/value/types.hpp>
 #include <mapnik/util/conversions.hpp>
diff --git a/plugins/input/gdal/gdal_datasource.hpp b/plugins/input/gdal/gdal_datasource.hpp
index 01b11924d..53cdece2c 100644
--- a/plugins/input/gdal/gdal_datasource.hpp
+++ b/plugins/input/gdal/gdal_datasource.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/params.hpp>
 #include <mapnik/query.hpp>
 #include <mapnik/feature.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 
diff --git a/plugins/input/geojson/geojson_datasource.cpp b/plugins/input/geojson/geojson_datasource.cpp
index 10995fda1..906b204b9 100644
--- a/plugins/input/geojson/geojson_datasource.cpp
+++ b/plugins/input/geojson/geojson_datasource.cpp
@@ -40,7 +40,7 @@
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/feature_kv_iterator.hpp>
 #include <mapnik/value/types.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/proj_transform.hpp>
 #include <mapnik/projection.hpp>
diff --git a/plugins/input/geojson/geojson_datasource.hpp b/plugins/input/geojson/geojson_datasource.hpp
index 122afec8f..cbe7b9b12 100644
--- a/plugins/input/geojson/geojson_datasource.hpp
+++ b/plugins/input/geojson/geojson_datasource.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/params.hpp>
 #include <mapnik/query.hpp>
 #include <mapnik/feature.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/unicode.hpp>
diff --git a/plugins/input/ogr/ogr_datasource.hpp b/plugins/input/ogr/ogr_datasource.hpp
index b382d5faf..35f48f644 100644
--- a/plugins/input/ogr/ogr_datasource.hpp
+++ b/plugins/input/ogr/ogr_datasource.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/params.hpp>
 #include <mapnik/query.hpp>
 #include <mapnik/feature.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 
diff --git a/plugins/input/ogr/ogr_featureset.cpp b/plugins/input/ogr/ogr_featureset.cpp
index 8b97a79e6..f3182b1f2 100644
--- a/plugins/input/ogr/ogr_featureset.cpp
+++ b/plugins/input/ogr/ogr_featureset.cpp
@@ -24,7 +24,7 @@
 #include <mapnik/global.hpp>
 #include <mapnik/value/types.hpp>
 #include <mapnik/debug.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/wkb.hpp>
diff --git a/plugins/input/ogr/ogr_index.hpp b/plugins/input/ogr/ogr_index.hpp
index f79db4efa..7a6f0047c 100644
--- a/plugins/input/ogr/ogr_index.hpp
+++ b/plugins/input/ogr/ogr_index.hpp
@@ -28,7 +28,7 @@
 #include <vector>
 
 // mapnik
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/query.hpp>
 
 using mapnik::box2d;
diff --git a/plugins/input/ogr/ogr_index_featureset.cpp b/plugins/input/ogr/ogr_index_featureset.cpp
index e03713e7f..6f087fd25 100644
--- a/plugins/input/ogr/ogr_index_featureset.cpp
+++ b/plugins/input/ogr/ogr_index_featureset.cpp
@@ -24,7 +24,7 @@
 #include <mapnik/value/types.hpp>
 #include <mapnik/global.hpp>
 #include <mapnik/debug.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/wkb.hpp>
diff --git a/plugins/input/pgraster/pgraster_datasource.hpp b/plugins/input/pgraster/pgraster_datasource.hpp
index 3fc6d114f..cc86abf63 100644
--- a/plugins/input/pgraster/pgraster_datasource.hpp
+++ b/plugins/input/pgraster/pgraster_datasource.hpp
@@ -32,7 +32,7 @@
 #include <mapnik/params.hpp>
 #include <mapnik/query.hpp>
 #include <mapnik/feature.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/unicode.hpp>
diff --git a/plugins/input/pgraster/pgraster_featureset.hpp b/plugins/input/pgraster/pgraster_featureset.hpp
index 5e784919e..d218b667d 100644
--- a/plugins/input/pgraster/pgraster_featureset.hpp
+++ b/plugins/input/pgraster/pgraster_featureset.hpp
@@ -28,7 +28,7 @@
 #define PGRASTER_FEATURESET_HPP
 
 // mapnik
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/datasource.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/unicode.hpp>
diff --git a/plugins/input/pgraster/pgraster_wkb_reader.cpp b/plugins/input/pgraster/pgraster_wkb_reader.cpp
index 6792e93aa..aa2891c0e 100644
--- a/plugins/input/pgraster/pgraster_wkb_reader.cpp
+++ b/plugins/input/pgraster/pgraster_wkb_reader.cpp
@@ -35,7 +35,7 @@
 #include <mapnik/image.hpp>
 #include <mapnik/util/conversions.hpp>
 #include <mapnik/util/trim.hpp>
-#include <mapnik/box2d.hpp> // for box2d
+#include <mapnik/geometry/box2d.hpp> // for box2d
 #include <functional>
 
 #include <cstdint>
diff --git a/plugins/input/pgraster/pgraster_wkb_reader.hpp b/plugins/input/pgraster/pgraster_wkb_reader.hpp
index 35480fcfa..d4cff13ad 100644
--- a/plugins/input/pgraster/pgraster_wkb_reader.hpp
+++ b/plugins/input/pgraster/pgraster_wkb_reader.hpp
@@ -29,7 +29,7 @@
 
 // mapnik
 #include <mapnik/feature.hpp> // for raster_ptr
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 
 enum pgraster_color_interp {
   // Automatic color interpretation:
diff --git a/plugins/input/postgis/postgis_datasource.hpp b/plugins/input/postgis/postgis_datasource.hpp
index f16be4e73..db41e1233 100644
--- a/plugins/input/postgis/postgis_datasource.hpp
+++ b/plugins/input/postgis/postgis_datasource.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/params.hpp>
 #include <mapnik/query.hpp>
 #include <mapnik/feature.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/unicode.hpp>
diff --git a/plugins/input/postgis/postgis_featureset.hpp b/plugins/input/postgis/postgis_featureset.hpp
index bc64132e6..53b961c8a 100644
--- a/plugins/input/postgis/postgis_featureset.hpp
+++ b/plugins/input/postgis/postgis_featureset.hpp
@@ -24,7 +24,7 @@
 #define POSTGIS_FEATURESET_HPP
 
 // mapnik
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/datasource.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/unicode.hpp>
diff --git a/plugins/input/raster/raster_datasource.hpp b/plugins/input/raster/raster_datasource.hpp
index 16de84cb3..cd2149c88 100644
--- a/plugins/input/raster/raster_datasource.hpp
+++ b/plugins/input/raster/raster_datasource.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/params.hpp>
 #include <mapnik/query.hpp>
 #include <mapnik/feature.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 
diff --git a/plugins/input/shape/shape_datasource.hpp b/plugins/input/shape/shape_datasource.hpp
index a5332eb8b..ea3fb5c39 100644
--- a/plugins/input/shape/shape_datasource.hpp
+++ b/plugins/input/shape/shape_datasource.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/params.hpp>
 #include <mapnik/query.hpp>
 #include <mapnik/feature.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/value/types.hpp>
diff --git a/plugins/input/shape/shape_io.hpp b/plugins/input/shape/shape_io.hpp
index 772bcb508..f85d7eed9 100644
--- a/plugins/input/shape/shape_io.hpp
+++ b/plugins/input/shape/shape_io.hpp
@@ -27,7 +27,7 @@
 #include <memory>
 #include <ios>
 // mapnik
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/util/spatial_index.hpp>
 // boost
diff --git a/plugins/input/shape/shapefile.hpp b/plugins/input/shape/shapefile.hpp
index 2db0f0419..c00ffc3e4 100644
--- a/plugins/input/shape/shapefile.hpp
+++ b/plugins/input/shape/shapefile.hpp
@@ -32,7 +32,7 @@
 // mapnik
 #include <mapnik/global.hpp>
 #include <mapnik/util/utf_conv_win.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 
 #if defined(MAPNIK_MEMORY_MAPPED_FILE)
 #pragma GCC diagnostic push
diff --git a/plugins/input/sqlite/sqlite_datasource.hpp b/plugins/input/sqlite/sqlite_datasource.hpp
index fc52eb873..e73e0c3e8 100644
--- a/plugins/input/sqlite/sqlite_datasource.hpp
+++ b/plugins/input/sqlite/sqlite_datasource.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/params.hpp>
 #include <mapnik/query.hpp>
 #include <mapnik/feature.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/wkb.hpp>
diff --git a/plugins/input/sqlite/sqlite_featureset.cpp b/plugins/input/sqlite/sqlite_featureset.cpp
index 80cdcfcdd..9226f40d0 100644
--- a/plugins/input/sqlite/sqlite_featureset.cpp
+++ b/plugins/input/sqlite/sqlite_featureset.cpp
@@ -23,7 +23,7 @@
 // mapnik
 #include <mapnik/global.hpp>
 #include <mapnik/debug.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/wkb.hpp>
diff --git a/plugins/input/sqlite/sqlite_prepared.hpp b/plugins/input/sqlite/sqlite_prepared.hpp
index 8cb6a64c2..9ddecbffd 100644
--- a/plugins/input/sqlite/sqlite_prepared.hpp
+++ b/plugins/input/sqlite/sqlite_prepared.hpp
@@ -27,7 +27,7 @@
 #include <mapnik/debug.hpp>
 #include <mapnik/datasource.hpp>
 #include <mapnik/params.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/util/noncopyable.hpp>
 
 // boost
diff --git a/plugins/input/topojson/topojson_datasource.cpp b/plugins/input/topojson/topojson_datasource.cpp
index 53e4cd944..8a16dd3e2 100644
--- a/plugins/input/topojson/topojson_datasource.cpp
+++ b/plugins/input/topojson/topojson_datasource.cpp
@@ -32,7 +32,7 @@
 // mapnik
 #include <mapnik/unicode.hpp>
 #include <mapnik/value/types.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/geometry/boost_adapters.hpp>
 #include <mapnik/json/topojson_grammar_x3.hpp>
 #include <mapnik/json/topojson_utils.hpp>
diff --git a/plugins/input/topojson/topojson_datasource.hpp b/plugins/input/topojson/topojson_datasource.hpp
index b4604a48a..c9b9165ae 100644
--- a/plugins/input/topojson/topojson_datasource.hpp
+++ b/plugins/input/topojson/topojson_datasource.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/params.hpp>
 #include <mapnik/query.hpp>
 #include <mapnik/feature.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/unicode.hpp>
diff --git a/src/agg/process_raster_symbolizer.cpp b/src/agg/process_raster_symbolizer.cpp
index 18c2926cf..9f9c9f8df 100644
--- a/src/agg/process_raster_symbolizer.cpp
+++ b/src/agg/process_raster_symbolizer.cpp
@@ -31,7 +31,7 @@
 #include <mapnik/image.hpp>
 #include <mapnik/image_util.hpp>
 #include <mapnik/raster.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/config.hpp>
 #include <mapnik/renderer_common/process_raster_symbolizer.hpp>
 
diff --git a/src/build.py b/src/build.py
index a21583344..00c9134a4 100644
--- a/src/build.py
+++ b/src/build.py
@@ -166,10 +166,10 @@ source = Split(
     image_copy.cpp
     image_compositing.cpp
     image_scaling.cpp
-    box2d.cpp
     datasource_cache.cpp
     datasource_cache_static.cpp
     debug.cpp
+    geometry/box2d.cpp
     geometry/reprojection.cpp
     geometry/envelope.cpp
     expression_node.cpp
diff --git a/src/box2d.cpp b/src/geometry/box2d.cpp
similarity index 96%
rename from src/box2d.cpp
rename to src/geometry/box2d.cpp
index 407c054ba..754a6d4da 100644
--- a/src/box2d.cpp
+++ b/src/geometry/box2d.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/box2d_impl.hpp>
+#include <mapnik/geometry/box2d_impl.hpp>
 
 namespace mapnik {
 
diff --git a/src/image_util.cpp b/src/image_util.cpp
index 1eddb4c0c..954d5321c 100644
--- a/src/image_util.cpp
+++ b/src/image_util.cpp
@@ -32,7 +32,7 @@
 #include <mapnik/image_view.hpp>
 #include <mapnik/palette.hpp>
 #include <mapnik/color.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/util/variant.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/safe_cast.hpp>
diff --git a/src/json/extract_bounding_boxes_x3.cpp b/src/json/extract_bounding_boxes_x3.cpp
index 8346f1061..500bb8f68 100644
--- a/src/json/extract_bounding_boxes_x3.cpp
+++ b/src/json/extract_bounding_boxes_x3.cpp
@@ -20,7 +20,7 @@
  *
  *****************************************************************************/
 
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/json/extract_bounding_boxes_x3.hpp>
 #include <mapnik/json/json_grammar_config.hpp>
 #include <mapnik/json/extract_bounding_boxes_x3_config.hpp>
diff --git a/src/memory_datasource.cpp b/src/memory_datasource.cpp
index ded331e04..21acfd7f6 100644
--- a/src/memory_datasource.cpp
+++ b/src/memory_datasource.cpp
@@ -23,7 +23,7 @@
 // mapnik
 #include <mapnik/debug.hpp>
 #include <mapnik/query.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/memory_datasource.hpp>
 #include <mapnik/memory_featureset.hpp>
 #include <mapnik/boolean.hpp>
diff --git a/src/proj_transform.cpp b/src/proj_transform.cpp
index 59e534e0c..a81612806 100644
--- a/src/proj_transform.cpp
+++ b/src/proj_transform.cpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/global.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/projection.hpp>
 #include <mapnik/proj_transform.hpp>
 #include <mapnik/coord.hpp>
diff --git a/src/renderer_common/render_pattern.cpp b/src/renderer_common/render_pattern.cpp
index 60729c057..f33645996 100644
--- a/src/renderer_common/render_pattern.cpp
+++ b/src/renderer_common/render_pattern.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 // mapnik
 #include <mapnik/renderer_common/render_pattern.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/marker.hpp>
 #include <mapnik/svg/svg_converter.hpp>
 #include <mapnik/svg/svg_renderer_agg.hpp>
diff --git a/src/warp.cpp b/src/warp.cpp
index 26a76d401..f4ecc22fe 100644
--- a/src/warp.cpp
+++ b/src/warp.cpp
@@ -26,7 +26,7 @@
 #include <mapnik/image.hpp>
 #include <mapnik/image_scaling_traits.hpp>
 #include <mapnik/image_util.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/view_transform.hpp>
 #include <mapnik/raster.hpp>
 #include <mapnik/proj_transform.hpp>
diff --git a/test/unit/core/box2d_test.cpp b/test/unit/core/box2d_test.cpp
index 8385bba7c..1db9a0a93 100644
--- a/test/unit/core/box2d_test.cpp
+++ b/test/unit/core/box2d_test.cpp
@@ -1,8 +1,7 @@
-
 #include "catch.hpp"
 
 #include <mapnik/coord.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include "agg_trans_affine.h"
 
 TEST_CASE("box2d") {
diff --git a/test/unit/projection/proj_transform.cpp b/test/unit/projection/proj_transform.cpp
index 95c959587..bb56b888c 100644
--- a/test/unit/projection/proj_transform.cpp
+++ b/test/unit/projection/proj_transform.cpp
@@ -1,9 +1,8 @@
-
 #include "catch.hpp"
 
 #include <mapnik/projection.hpp>
 #include <mapnik/proj_transform.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 
 #ifdef MAPNIK_USE_PROJ4
 // proj4
diff --git a/utils/mapnik-index/process_csv_file.hpp b/utils/mapnik-index/process_csv_file.hpp
index 395bf55c7..24cb71509 100644
--- a/utils/mapnik-index/process_csv_file.hpp
+++ b/utils/mapnik-index/process_csv_file.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_UTILS_PROCESS_CSV_FILE_HPP
 
 #include <utility>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 
 namespace mapnik { namespace detail {
 
diff --git a/utils/ogrindex/ogrindex.cpp b/utils/ogrindex/ogrindex.cpp
index 3e7fd503c..4aa685abe 100644
--- a/utils/ogrindex/ogrindex.cpp
+++ b/utils/ogrindex/ogrindex.cpp
@@ -29,7 +29,7 @@
 #include <boost/program_options.hpp>
 
 #include <mapnik/datasource.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/util/fs.hpp>
 #include <mapnik/feature_layer_desc.hpp>

From 2ede054e9380a554b97d41b978bc02577307134a Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 26 Jan 2017 14:19:28 +0100
Subject: [PATCH 224/328] c++ style - use pre-(de)increment operators by
 default

---
 include/mapnik/png_io.hpp | 52 +++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/include/mapnik/png_io.hpp b/include/mapnik/png_io.hpp
index 2e5712e24..a9e8bafac 100644
--- a/include/mapnik/png_io.hpp
+++ b/include/mapnik/png_io.hpp
@@ -120,7 +120,7 @@ void save_as_png(T1 & file,
                  (opts.trans_mode == 0) ? PNG_COLOR_TYPE_RGB : PNG_COLOR_TYPE_RGB_ALPHA,PNG_INTERLACE_NONE,
                  PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT);
     const std::unique_ptr<png_bytep[]> row_pointers(new png_bytep[image.height()]);
-    for (unsigned int i = 0; i < image.height(); i++)
+    for (unsigned int i = 0; i < image.height(); ++i)
     {
         row_pointers[i] = const_cast<png_bytep>(reinterpret_cast<const unsigned char *>(image.get_row(i)));
     }
@@ -141,7 +141,7 @@ void reduce_8(T const& in,
     unsigned height = in.height();
 
     std::vector<unsigned> alphaCount(alpha.size());
-    for(unsigned i=0; i<alpha.size(); i++)
+    for(unsigned i=0; i<alpha.size(); ++i)
     {
         alpha[i] = 0;
         alphaCount[i] = 0;
@@ -155,7 +155,7 @@ void reduce_8(T const& in,
             unsigned val = row[x];
             std::uint8_t index = 0;
             int idx = -1;
-            for(int j=levels-1; j>0; j--)
+            for(int j=levels-1; j>0; --j)
             {
                 if (U2ALPHA(val)>=limits[j] && trees[j].colors()>0)
                 {
@@ -166,12 +166,12 @@ void reduce_8(T const& in,
             if (idx>=0 && idx < static_cast<int>(alpha.size()))
             {
                 alpha[idx]+=U2ALPHA(val);
-                alphaCount[idx]++;
+                ++alphaCount[idx];
             }
             row_out[x] = index;
         }
     }
-    for(unsigned i=0; i<alpha.size(); i++)
+    for(unsigned i=0; i<alpha.size(); ++i)
     {
         if (alphaCount[i]!=0)
         {
@@ -192,7 +192,7 @@ void reduce_4(T const& in,
     unsigned height = in.height();
 
     std::vector<unsigned> alphaCount(alpha.size());
-    for(unsigned i=0; i<alpha.size(); i++)
+    for(unsigned i=0; i<alpha.size(); ++i)
     {
         alpha[i] = 0;
         alphaCount[i] = 0;
@@ -206,7 +206,7 @@ void reduce_4(T const& in,
             unsigned val = row[x];
             std::uint8_t index = 0;
             int idx=-1;
-            for(int j=levels-1; j>0; j--)
+            for(int j=levels-1; j>0; --j)
             {
                 if (U2ALPHA(val)>=limits[j] && trees[j].colors()>0)
                 {
@@ -217,7 +217,7 @@ void reduce_4(T const& in,
             if (idx>=0 && idx < static_cast<int>(alpha.size()))
             {
                 alpha[idx]+=U2ALPHA(val);
-                alphaCount[idx]++;
+                ++alphaCount[idx];
             }
             if (x%2 == 0)
             {
@@ -226,7 +226,7 @@ void reduce_4(T const& in,
             row_out[x>>1] |= index;
         }
     }
-    for(unsigned i=0; i<alpha.size(); i++)
+    for(unsigned i=0; i<alpha.size(); ++i)
     {
         if (alphaCount[i]!=0)
         {
@@ -252,7 +252,7 @@ void save_as_png(T & file, std::vector<mapnik::rgb> const& palette,
                  unsigned width,
                  unsigned height,
                  unsigned color_depth,
-                 std::vector<unsigned> const&alpha,
+                 std::vector<unsigned> const& alpha,
                  png_options const& opts)
 {
     png_voidp error_ptr=0;
@@ -302,7 +302,7 @@ void save_as_png(T & file, std::vector<mapnik::rgb> const& palette,
     {
         std::vector<png_byte> trans(alpha.size());
         unsigned alphaSize=0;//truncate to nonopaque values
-        for(unsigned i=0; i < alpha.size(); i++)
+        for(unsigned i=0; i < alpha.size(); ++i)
         {
             trans[i]=alpha[i];
             if (alpha[i]<255)
@@ -317,7 +317,7 @@ void save_as_png(T & file, std::vector<mapnik::rgb> const& palette,
     }
 
     png_write_info(png_ptr, info_ptr);
-    for (unsigned i=0;i<height;i++)
+    for (unsigned i=0;i<height; ++i)
     {
         png_write_row(png_ptr,const_cast<png_bytep>(image.get_row(i)));
     }
@@ -346,7 +346,7 @@ void save_as_png8_oct(T1 & file,
     }
     else
     {
-        for(int i=0; i<256; i++)
+        for(int i=0; i<256; ++i)
         {
             alphaHist[i] = 0;
         }
@@ -355,11 +355,11 @@ void save_as_png8_oct(T1 & file,
             for (unsigned x = 0; x < width; ++x)
             {
                 unsigned val = U2ALPHA(static_cast<unsigned>(image.get_row(y)[x]));
-                alphaHist[val]++;
+                ++alphaHist[val];
                 meanAlpha += val;
                 if (val>0 && val<255)
                 {
-                    semiCount++;
+                    ++semiCount;
                 }
             }
         }
@@ -371,17 +371,17 @@ void save_as_png8_oct(T1 & file,
     limits[0] = 0;
     limits[1] = (opts.trans_mode!=0 && alphaHist[0]>0)?1:0;
     limits[TRANSPARENCY_LEVELS] = 256;
-    for(unsigned j=2; j<TRANSPARENCY_LEVELS; j++)
+    for(unsigned j=2; j<TRANSPARENCY_LEVELS; ++j)
     {
         limits[j] = limits[1];
     }
     if (opts.trans_mode != 0)
     {
         unsigned alphaHistSum = 0;
-        for(unsigned i=1; i<256; i++)
+        for(unsigned i=1; i<256; ++i)
         {
             alphaHistSum += alphaHist[i];
-            for(unsigned j=1; j<TRANSPARENCY_LEVELS; j++)
+            for(unsigned j=1; j<TRANSPARENCY_LEVELS; ++j)
             {
                 if (alphaHistSum<semiCount*(j)/4)
                 {
@@ -409,7 +409,7 @@ void save_as_png8_oct(T1 & file,
     // count colors
     if (opts.trans_mode == 0)
     {
-        for (unsigned j=0; j<TRANSPARENCY_LEVELS; j++)
+        for (unsigned j=0; j<TRANSPARENCY_LEVELS; ++j)
         {
             cols[j] = 0;
         }
@@ -417,10 +417,10 @@ void save_as_png8_oct(T1 & file,
     }
     else
     {
-        for (unsigned j=0; j<TRANSPARENCY_LEVELS; j++)
+        for (unsigned j=0; j<TRANSPARENCY_LEVELS; ++j)
         {
             cols[j] = 0;
-            for (unsigned i=limits[j]; i<limits[j+1]; i++)
+            for (unsigned i=limits[j]; i<limits[j+1]; ++i)
             {
                 cols[j] += alphaHist[i];
             }
@@ -438,7 +438,7 @@ void save_as_png8_oct(T1 & file,
     {
         // give chance less populated but not empty cols to have at least few colors(12)
         unsigned minCols = (12+1)*divCoef/(opts.colors-cols[0]);
-        for(unsigned j=1; j<TRANSPARENCY_LEVELS; j++)
+        for(unsigned j=1; j<TRANSPARENCY_LEVELS; ++j)
         {
             if (cols[j]>12 && cols[j]<minCols)
             {
@@ -448,7 +448,7 @@ void save_as_png8_oct(T1 & file,
         }
     }
     unsigned usedColors = cols[0];
-    for(unsigned j=1; j<TRANSPARENCY_LEVELS-1; j++)
+    for(unsigned j=1; j<TRANSPARENCY_LEVELS-1; ++j)
     {
         cols[j] = cols[j]*(opts.colors-cols[0])/divCoef;
         usedColors += cols[j];
@@ -466,7 +466,7 @@ void save_as_png8_oct(T1 & file,
 
     // octree table for separate alpha range with 1-based index (0 is fully transparent: no color)
     octree<rgb> trees[MAX_OCTREE_LEVELS];
-    for(unsigned j=1; j<TRANSPARENCY_LEVELS; j++)
+    for(unsigned j=1; j<TRANSPARENCY_LEVELS; ++j)
     {
         trees[j].setMaxColors(cols[j]);
     }
@@ -477,7 +477,7 @@ void save_as_png8_oct(T1 & file,
         {
             unsigned val = row[x];
             // insert to proper tree based on alpha range
-            for(unsigned j=TRANSPARENCY_LEVELS-1; j>0; j--)
+            for(unsigned j=TRANSPARENCY_LEVELS-1; j>0; --j)
             {
                 if (cols[j]>0 && U2ALPHA(val)>=limits[j])
                 {
@@ -495,7 +495,7 @@ void save_as_png8_oct(T1 & file,
         palette.push_back(rgb(0,0,0));
     }
 
-    for(unsigned j=1; j<TRANSPARENCY_LEVELS; j++)
+    for(unsigned j=1; j<TRANSPARENCY_LEVELS; ++j)
     {
         if (cols[j]>0)
         {

From d053bddb4301b3a45bf0805d44b73e5485e4093c Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 26 Jan 2017 15:45:08 +0100
Subject: [PATCH 225/328] add support for PNG filters
 (http://www.libpng.org/pub/png/libpng-manual.txt) ref #3479

---
 include/mapnik/image_options.hpp |  4 +++
 include/mapnik/png_io.hpp        |  7 ++--
 src/image_options.cpp            | 57 +++++++++++++++++++++++++++++---
 src/image_util_png.cpp           | 13 ++++++++
 4 files changed, 74 insertions(+), 7 deletions(-)

diff --git a/include/mapnik/image_options.hpp b/include/mapnik/image_options.hpp
index b860ee684..17b279ce1 100644
--- a/include/mapnik/image_options.hpp
+++ b/include/mapnik/image_options.hpp
@@ -38,6 +38,10 @@ using image_options_map = std::map<std::string, boost::optional<std::string> >;
 inline std::string to_string(boost::optional<std::string> const& val) { return val ? *val : "<unitialised>";}
 image_options_map parse_image_options(std::string const& options);
 
+#if defined(HAVE_PNG)
+int parse_png_filters(std::string const& str);
+#endif
+
 }
 
 #endif // MAPNIK_IMAGE_OPTIONS_HPP
diff --git a/include/mapnik/png_io.hpp b/include/mapnik/png_io.hpp
index a9e8bafac..827df4cdb 100644
--- a/include/mapnik/png_io.hpp
+++ b/include/mapnik/png_io.hpp
@@ -48,14 +48,17 @@ namespace mapnik {
 
 struct png_options {
     int colors;
+    int filters;
     int compression;
     int strategy;
     int trans_mode;
     double gamma;
     bool paletted;
     bool use_hextree;
+
     png_options() :
         colors(256),
+        filters(PNG_FILTER_NONE),
         compression(Z_DEFAULT_COMPRESSION),
         strategy(Z_DEFAULT_STRATEGY),
         trans_mode(-1),
@@ -97,7 +100,7 @@ void save_as_png(T1 & file,
     mask = png_get_asm_flagmask(PNG_SELECT_READ | PNG_SELECT_WRITE);
     png_set_asm_flags(png_ptr, flags | mask);
 #endif
-    png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE, PNG_FILTER_NONE);
+    png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE, opts.filters);
     png_infop info_ptr = png_create_info_struct(png_ptr);
     if (!info_ptr)
     {
@@ -271,7 +274,7 @@ void save_as_png(T & file, std::vector<mapnik::rgb> const& palette,
     mask = png_get_asm_flagmask(PNG_SELECT_READ | PNG_SELECT_WRITE);
     png_set_asm_flags(png_ptr, flags | mask);
 #endif
-    png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE, PNG_FILTER_NONE);
+    png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE, opts.filters);
     png_infop info_ptr = png_create_info_struct(png_ptr);
     if (!info_ptr)
     {
diff --git a/src/image_options.cpp b/src/image_options.cpp
index f3b76dd45..441a6f0e4 100644
--- a/src/image_options.cpp
+++ b/src/image_options.cpp
@@ -42,7 +42,7 @@ x3::rule<class key, std::string> const key("key");
 x3::rule<class value, std::string> const value("value");
 
 auto const key_def = char_("a-zA-Z_") > *char_("a-zA-Z_0-9\\.\\-");
-auto const value_def = +char_("a-zA-Z_0-9\\.\\-");
+auto const value_def = +char_("a-zA-Z_0-9\\.\\-|");
 auto const key_value_def = key > -('=' > value);
 auto const image_options_def = key_value % lit(':');
 
@@ -55,17 +55,64 @@ BOOST_SPIRIT_DEFINE(image_options);
 
 image_options_map parse_image_options(std::string const& str)
 {
-     auto const begin = str.begin();
+     auto begin = str.begin();
      auto const end = str.end();
      using boost::spirit::x3::space;
      using mapnik::grammar::image_options;
      image_options_map options;
-     bool success = boost::spirit::x3::phrase_parse(begin, end, image_options, space, options);
-     if (!success)
+     try
      {
-         throw std::runtime_error("Can't parse image options: " + str);
+         bool success = boost::spirit::x3::phrase_parse(begin, end, image_options, space, options);
+         if (!success || begin != end)
+         {
+             throw std::runtime_error("Can't parse image options: " + str);
+         }
+     }
+     catch (boost::spirit::x3::expectation_failure<std::string> const& ex)
+     {
+         throw std::runtime_error("Can't parse image options: " + str + " " + ex.what());
      }
      return options;   // RVO
 }
 
+#if defined(HAVE_PNG)
+extern "C"
+{
+#include <png.h>
+}
+
+int parse_png_filters(std::string const& str)
+{
+    auto begin = str.begin();
+    auto const end = str.end();
+    using boost::spirit::x3::space;
+    using boost::spirit::x3::symbols;
+    symbols<int> filter;
+    filter.add
+        ("none", PNG_FILTER_NONE)
+        ("sub", PNG_FILTER_SUB)
+        ("up", PNG_FILTER_UP)
+        ("avg", PNG_FILTER_AVG)
+        ("paeth", PNG_FILTER_PAETH)
+        ;
+
+    std::vector<int> opts;
+    try
+    {
+        bool success = boost::spirit::x3::phrase_parse(begin, end, filter % "|" , space , opts);
+        if (!success || begin != end)
+        {
+            throw std::runtime_error("Can't parse PNG filters: " + str);
+        }
+    }
+    catch (boost::spirit::x3::expectation_failure<std::string> const& ex)
+    {
+        throw std::runtime_error("Can't parse PNG filters: " + str + " " + ex.what());
+    }
+    int filters = 0;
+    std::for_each(opts.begin(), opts.end(), [&filters] (int f) { filters |= f;});
+    return filters;
+}
+#endif
+
 } // ns mapnik
diff --git a/src/image_util_png.cpp b/src/image_util_png.cpp
index 412060f13..77882b3f3 100644
--- a/src/image_util_png.cpp
+++ b/src/image_util_png.cpp
@@ -154,6 +154,19 @@ void handle_png_options(std::string const& type,
                 throw image_writer_exception("invalid compression strategy parameter: " + *val);
             }
         }
+        else if (key == "f")
+        {
+            // filters = PNG_NO_FILTERS;
+            // filters = PNG_ALL_FILTERS;
+            // filters = PNG_FAST_FILTERS;
+            // filters = PNG_FILTER_NONE | PNG_FILTER_SUB | PNG_FILTER_UP | PNG_FILTER_AVG | PNG_FILTER_PAETH;
+
+            if (!val) throw image_writer_exception("invalid filters parameter: <uninitialised>");
+            if (*val == "no") opts.filters = PNG_NO_FILTERS;
+            else if (*val == "all") opts.filters = PNG_ALL_FILTERS;
+            else if (*val == "fast") opts.filters = PNG_FAST_FILTERS;
+            else opts.filters = parse_png_filters(*val); // none | sub | up | avg | paeth
+        }
         else
         {
             throw image_writer_exception("unhandled png option: " + key);

From df51f6087c509b2105b2a72d46c27fe585babe1f Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 31 Jan 2017 17:42:24 +0100
Subject: [PATCH 226/328] minor c++ style

---
 src/text/scrptrun.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/text/scrptrun.cpp b/src/text/scrptrun.cpp
index 0cbb2c839..750998764 100644
--- a/src/text/scrptrun.cpp
+++ b/src/text/scrptrun.cpp
@@ -22,7 +22,7 @@
 
 #include <mapnik/text/scrptrun.hpp>
 
-#define ARRAY_SIZE(array) (sizeof array  / sizeof array[0])
+#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
 
 const char ScriptRun::fgClassID=0;
 
@@ -124,7 +124,7 @@ UBool ScriptRun::next()
     if (scriptEnd >= charLimit) {
         return false;
     }
-    
+
     scriptCode = USCRIPT_COMMON;
 
     for (scriptStart = scriptEnd; scriptEnd < charLimit; scriptEnd += 1) {
@@ -178,7 +178,6 @@ UBool ScriptRun::next()
         if (sameScript(scriptCode, sc)) {
             if (scriptCode <= USCRIPT_INHERITED && sc > USCRIPT_INHERITED) {
                 scriptCode = sc;
-
                 // now that we have a final script code, fix any open
                 // characters we pushed before we knew the script code.
                 while (startSP < parenSP) {
@@ -205,4 +204,3 @@ UBool ScriptRun::next()
 
     return true;
 }
-

From 755d178d20ec12b8afe8bcac87f77a7fe0356c3a Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 31 Jan 2017 17:44:25 +0100
Subject: [PATCH 227/328] alternative exaustive face fallback implementation
 ref #3534 #3559

---
 include/mapnik/text/harfbuzz_shaper.hpp | 81 +++++++++++--------------
 1 file changed, 37 insertions(+), 44 deletions(-)

diff --git a/include/mapnik/text/harfbuzz_shaper.hpp b/include/mapnik/text/harfbuzz_shaper.hpp
index 56887e5fc..e4672526f 100644
--- a/include/mapnik/text/harfbuzz_shaper.hpp
+++ b/include/mapnik/text/harfbuzz_shaper.hpp
@@ -80,17 +80,17 @@ static void shape_text(text_line & line,
     line.reserve(length);
 
     auto hb_buffer_deleter = [](hb_buffer_t * buffer) { hb_buffer_destroy(buffer);};
-    const std::unique_ptr<hb_buffer_t, decltype(hb_buffer_deleter)> buffer(hb_buffer_create(),hb_buffer_deleter);
+    const std::unique_ptr<hb_buffer_t, decltype(hb_buffer_deleter)> buffer(hb_buffer_create(), hb_buffer_deleter);
     hb_buffer_pre_allocate(buffer.get(), safe_cast<int>(length));
     mapnik::value_unicode_string const& text = itemizer.text();
-
     for (auto const& text_item : list)
     {
+        auto item_length = static_cast<int>(text_item.end - text_item.start);
         face_set_ptr face_set = font_manager.get_face_set(text_item.format_->face_name, text_item.format_->fontset);
         double size = text_item.format_->text_size * scale_factor;
         face_set->set_unscaled_character_sizes();
         std::size_t num_faces = face_set->size();
-        std::size_t pos = 0;
+
         font_feature_settings const& ff_settings = text_item.format_->ff_settings;
         int ff_count = safe_cast<int>(ff_settings.count());
 
@@ -101,41 +101,37 @@ static void shape_text(text_line & line,
             hb_glyph_info_t glyph;
             hb_glyph_position_t position;
         };
-        // this table is filled with information for rendering each glyph, so that 
+        // this table is filled with information for rendering each glyph, so that
         // several font faces can be used in a single text_item
         std::vector<glyph_face_info> glyphinfos;
-        unsigned valid_glyphs = 0;
-
+        int valid_glyphs = 0;
+        std::size_t pos = 0;
         for (auto const& face : *face_set)
         {
             ++pos;
             hb_buffer_clear_contents(buffer.get());
-            hb_buffer_add_utf16(buffer.get(), uchar_to_utf16(text.getBuffer()), text.length(), text_item.start, static_cast<int>(text_item.end - text_item.start));
-            hb_buffer_set_direction(buffer.get(), (text_item.dir == UBIDI_RTL)?HB_DIRECTION_RTL:HB_DIRECTION_LTR);
+            hb_buffer_add_utf16(buffer.get(), uchar_to_utf16(text.getBuffer()), text.length(), text_item.start, item_length);
+            hb_buffer_set_direction(buffer.get(), (text_item.dir == UBIDI_RTL) ? HB_DIRECTION_RTL : HB_DIRECTION_LTR);
             hb_buffer_set_script(buffer.get(), _icu_script_to_script(text_item.script));
             hb_font_t *font(hb_ft_font_create(face->get_face(), nullptr));
             // https://github.com/mapnik/test-data-visual/pull/25
-            #if HB_VERSION_MAJOR > 0
-             #if HB_VERSION_ATLEAST(1, 0 , 5)
-            hb_ft_font_set_load_flags(font,FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING);
-             #endif
-            #endif
+#if (HB_VERSION_MAJOR > 0 && HB_VERSION_ATLEAST(1, 0, 5))
+            hb_ft_font_set_load_flags(font, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING);
+#endif
             hb_shape(font, buffer.get(), ff_settings.get_features(), ff_count);
             hb_font_destroy(font);
 
             unsigned num_glyphs = hb_buffer_get_length(buffer.get());
+            hb_glyph_info_t *glyphs = hb_buffer_get_glyph_infos(buffer.get(), &num_glyphs);
+            hb_glyph_position_t *positions = hb_buffer_get_glyph_positions(buffer.get(), &num_glyphs);
 
-            // if the number of rendered glyphs has increased, we need to resize the table 
+            // if the number of rendered glyphs has increased, we need to resize the table
             if (num_glyphs > glyphinfos.size())
             {
                 glyphinfos.resize(num_glyphs);
             }
-
-            hb_glyph_info_t *glyphs = hb_buffer_get_glyph_infos(buffer.get(), nullptr);
-            hb_glyph_position_t *positions = hb_buffer_get_glyph_positions(buffer.get(), nullptr);
-
             // Check if all glyphs are valid.
-            for (unsigned i=0; i<num_glyphs; ++i)
+            for (unsigned i = 0; i < num_glyphs; ++i)
             {
                 // if we have a valid codepoint, save rendering info.
                 if (glyphs[i].codepoint)
@@ -143,41 +139,38 @@ static void shape_text(text_line & line,
                     if (!glyphinfos[i].glyph.codepoint)
                     {
                         ++valid_glyphs;
+                        glyphinfos[i] = { face, glyphs[i], positions[i] };
                     }
-                    glyphinfos[i] = { face, glyphs[i], positions[i] };
                 }
             }
-            if (valid_glyphs < num_glyphs && (pos < num_faces))
+            if (valid_glyphs < item_length && (pos < num_faces))
             {
                 //Try next font in fontset
                 continue;
             }
-
             double max_glyph_height = 0;
-            for (unsigned i=0; i<num_glyphs; ++i)
+            for (auto const& info : glyphinfos)
             {
-                auto& gpos = positions[i];
-                auto& glyph = glyphs[i];
-                face_ptr theface = face;
-                if (glyphinfos[i].glyph.codepoint)
+                if (info.glyph.codepoint)
                 {
-                    gpos = glyphinfos[i].position;
-                    glyph = glyphinfos[i].glyph;
-                    theface = glyphinfos[i].face;
-                }
-                unsigned char_index = glyph.cluster;
-                glyph_info g(glyph.codepoint,char_index,text_item.format_);
-                if (theface->glyph_dimensions(g))
-                {
-                    g.face = theface;
-                    g.scale_multiplier = size / theface->get_face()->units_per_EM;
-                    //Overwrite default advance with better value provided by HarfBuzz
-                    g.unscaled_advance = gpos.x_advance;
-                    g.offset.set(gpos.x_offset * g.scale_multiplier, gpos.y_offset * g.scale_multiplier);
-                    double tmp_height = g.height();
-                    if (tmp_height > max_glyph_height) max_glyph_height = tmp_height;
-                    width_map[char_index] += g.advance();
-                    line.add_glyph(std::move(g), scale_factor);
+                    auto const& gpos = info.position;
+                    auto const& glyph = info.glyph;
+                    auto const& theface = info.face;
+
+                    unsigned char_index = glyph.cluster;
+                    glyph_info g(glyph.codepoint, char_index, text_item.format_);
+                    if (theface->glyph_dimensions(g))
+                    {
+                        g.face = theface;
+                        g.scale_multiplier = size / theface->get_face()->units_per_EM;
+                        //Overwrite default advance with better value provided by HarfBuzz
+                        g.unscaled_advance = gpos.x_advance;
+                        g.offset.set(gpos.x_offset * g.scale_multiplier, gpos.y_offset * g.scale_multiplier);
+                        double tmp_height = g.height();
+                        if (tmp_height > max_glyph_height) max_glyph_height = tmp_height;
+                        width_map[char_index] += g.advance();
+                        line.add_glyph(std::move(g), scale_factor);
+                    }
                 }
             }
             line.update_max_char_height(max_glyph_height);

From 5c9e48ef0c5d63bf8b67f0ea7a0a1587dc28ffc2 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 31 Jan 2017 17:42:24 +0100
Subject: [PATCH 228/328] minor c++ style


From 7e2aab171fd9a46c934f5d2c8c94f161f282482d Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Wed, 1 Feb 2017 03:01:38 +0100
Subject: [PATCH 229/328] include png.h outside any namespace

---
 src/image_options.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/image_options.cpp b/src/image_options.cpp
index 441a6f0e4..fedf1f976 100644
--- a/src/image_options.cpp
+++ b/src/image_options.cpp
@@ -28,6 +28,13 @@
 #include <boost/fusion/include/std_pair.hpp>
 #pragma GCC diagnostic pop
 
+#if defined(HAVE_PNG)
+extern "C"
+{
+#include <png.h>
+}
+#endif // HAVE_PNG
+
 namespace mapnik { namespace grammar {
 
 namespace x3 = boost::spirit::x3;
@@ -76,10 +83,6 @@ image_options_map parse_image_options(std::string const& str)
 }
 
 #if defined(HAVE_PNG)
-extern "C"
-{
-#include <png.h>
-}
 
 int parse_png_filters(std::string const& str)
 {
@@ -113,6 +116,7 @@ int parse_png_filters(std::string const& str)
     std::for_each(opts.begin(), opts.end(), [&filters] (int f) { filters |= f;});
     return filters;
 }
-#endif
+
+#endif // HAVE_PNG
 
 } // ns mapnik

From 8e34b323b515cf4d5c1f694fada63227f7d15f1b Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Wed, 1 Feb 2017 03:02:37 +0100
Subject: [PATCH 230/328] define PNG_FAST_FILTERS if png.h doesn't have it

---
 src/image_util_png.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/image_util_png.cpp b/src/image_util_png.cpp
index 77882b3f3..0586ded06 100644
--- a/src/image_util_png.cpp
+++ b/src/image_util_png.cpp
@@ -25,7 +25,10 @@ extern "C"
 {
 #include <png.h>
 }
+#ifndef PNG_FAST_FILTERS // libpng < 1.6
+#define PNG_FAST_FILTERS ( PNG_FILTER_NONE | PNG_FILTER_SUB | PNG_FILTER_UP )
 #endif
+#endif // HAVE_PNG
 
 // mapnik
 #if defined(HAVE_PNG)

From f85636f769efa49af8f9da8410cf1ca1e04ed982 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 3 Feb 2017 10:10:09 +0100
Subject: [PATCH 231/328] mapnik-index - log and return on invalid bounding box
 if `validate_features` is set.

---
 utils/mapnik-index/process_geojson_file_x3.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/utils/mapnik-index/process_geojson_file_x3.cpp b/utils/mapnik-index/process_geojson_file_x3.cpp
index d0472738e..c55989bc7 100644
--- a/utils/mapnik-index/process_geojson_file_x3.cpp
+++ b/utils/mapnik-index/process_geojson_file_x3.cpp
@@ -316,6 +316,11 @@ std::pair<bool,typename T::value_type::first_type> process_geojson_file_x3(T & b
                 }
             }
         }
+        else if (validate_features)
+        {
+            if (verbose) std::clog << "Invalid bbox encountered " << item.first << std::endl;
+            return std::make_pair(false, extent);
+        }
     }
     return std::make_pair(true, extent);
 }

From 7b217133e2749b82c2638551045c4edbece15086 Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Thu, 2 Feb 2017 19:33:37 +0100
Subject: [PATCH 232/328] sql_utils: on-the-fly quoting via operator <<

---
 include/mapnik/sql_utils.hpp | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/include/mapnik/sql_utils.hpp b/include/mapnik/sql_utils.hpp
index d54cdbc04..56bf980f8 100644
--- a/include/mapnik/sql_utils.hpp
+++ b/include/mapnik/sql_utils.hpp
@@ -39,6 +39,41 @@
 
 namespace mapnik { namespace sql_utils {
 
+    struct quoted_string
+    {
+        std::string const* operator-> () const { return &str; }
+        std::string const& str;
+        char const quot;
+    };
+
+    inline quoted_string identifier(std::string const& str)
+    {
+        return { str, '"' };
+    }
+
+    inline quoted_string literal(std::string const& str)
+    {
+        return { str, '\'' };
+    }
+
+    inline std::ostream& operator << (std::ostream& os, quoted_string qs)
+    {
+        std::size_t pos = 0, next;
+
+        os.put(qs.quot);
+        while ((next = qs->find(qs.quot, pos)) != std::string::npos)
+        {
+            os.write(qs->data() + pos, next - pos + 1);
+            os.put(qs.quot);
+            pos = next + 1;
+        }
+        if ((next = qs->size()) > pos)
+        {
+            os.write(qs->data() + pos, next - pos);
+        }
+        return os.put(qs.quot);
+    }
+
     inline std::string unquote_double(std::string const& sql)
     {
         std::string table_name = sql;

From 195c3e14ce0fabe88a586bf376bd0144b859260a Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Thu, 2 Feb 2017 22:37:01 +0100
Subject: [PATCH 233/328] postgis: test query containing 'email@domain'

---
 test/unit/datasource/postgis.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/test/unit/datasource/postgis.cpp b/test/unit/datasource/postgis.cpp
index 219dcda8e..f3ba58c7c 100644
--- a/test/unit/datasource/postgis.cpp
+++ b/test/unit/datasource/postgis.cpp
@@ -270,6 +270,21 @@ TEST_CASE("postgis") {
             REQUIRE(ext.maxy() == 4);
         }
 
+        SECTION("Postgis doesn't interpret @domain in email address as @variable")
+        {
+            mapnik::parameters params(base_params);
+            params["table"] = "(SELECT gid, geom, 'fake@mail.ru' as email"
+                              " FROM public.test LIMIT 1) AS data";
+            auto ds = mapnik::datasource_cache::instance().create(params);
+            REQUIRE(ds != nullptr);
+            auto featureset = all_features(ds);
+            auto feature = featureset->next();
+            CHECKED_IF(feature != nullptr)
+            {
+                CHECK(feature->get("email").to_string() == "fake@mail.ru");
+            }
+        }
+
         SECTION("Postgis query extent: full dataset")
         {
             //include schema to increase coverage

From d331b9d66a8aa7fb097239005138e8c85325441f Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Thu, 2 Feb 2017 22:37:01 +0100
Subject: [PATCH 234/328] postgis: revamp substitution of special tokens in
 query

- replace boost::regex with std::regex
- use regex to match both  !mapnikvar!  and  !@uservar!
- no longer support @uservar (without surrounding !s)
---
 plugins/input/postgis/build.py               |   1 -
 plugins/input/postgis/postgis_datasource.cpp | 161 ++++++++-----------
 plugins/input/postgis/postgis_datasource.hpp |  12 +-
 3 files changed, 69 insertions(+), 105 deletions(-)

diff --git a/plugins/input/postgis/build.py b/plugins/input/postgis/build.py
index 157952f45..635efb848 100644
--- a/plugins/input/postgis/build.py
+++ b/plugins/input/postgis/build.py
@@ -52,7 +52,6 @@ libraries = copy(plugin_env['LIBS'])
 
 if env['PLUGIN_LINKING'] == 'shared':
     libraries.append('boost_system%s' % env['BOOST_APPEND'])
-    libraries.append('boost_regex%s' % env['BOOST_APPEND'])
     libraries.insert(0,env['MAPNIK_NAME'])
     libraries.append(env['ICU_LIB_NAME'])
 
diff --git a/plugins/input/postgis/postgis_datasource.cpp b/plugins/input/postgis/postgis_datasource.cpp
index 6a1a9b645..47b5dc6de 100644
--- a/plugins/input/postgis/postgis_datasource.cpp
+++ b/plugins/input/postgis/postgis_datasource.cpp
@@ -38,11 +38,10 @@
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/algorithm/string.hpp>
-#include <boost/tokenizer.hpp>
-#include <boost/regex.hpp>
 #pragma GCC diagnostic pop
 
 // stl
+#include <cfloat> // FLT_MAX
 #include <memory>
 #include <string>
 #include <algorithm>
@@ -52,12 +51,13 @@
 
 DATASOURCE_PLUGIN(postgis_datasource)
 
-const double postgis_datasource::FMAX = std::numeric_limits<float>::max();
 const std::string postgis_datasource::GEOMETRY_COLUMNS = "geometry_columns";
 const std::string postgis_datasource::SPATIAL_REF_SYS = "spatial_ref_system";
 
 using std::shared_ptr;
 using mapnik::attribute_descriptor;
+using mapnik::sql_utils::identifier;
+using mapnik::sql_utils::literal;
 
 postgis_datasource::postgis_datasource(parameters const& params)
     : datasource(params),
@@ -79,10 +79,6 @@ postgis_datasource::postgis_datasource(parameters const& params)
              params.get<std::string>("user"),
              params.get<std::string>("password"),
              params.get<std::string>("connect_timeout", "4")),
-      bbox_token_("!bbox!"),
-      scale_denom_token_("!scale_denominator!"),
-      pixel_width_token_("!pixel_width!"),
-      pixel_height_token_("!pixel_height!"),
       pool_max_size_(*params_.get<mapnik::value_integer>("max_size", 10)),
       persist_connection_(*params.get<mapnik::boolean_type>("persist_connection", true)),
       extent_from_subquery_(*params.get<mapnik::boolean_type>("extent_from_subquery", false)),
@@ -99,8 +95,7 @@ postgis_datasource::postgis_datasource(parameters const& params)
       simplify_prefilter_(*params_.get<mapnik::value_double>("simplify_prefilter", 0.0)),
       simplify_dp_preserve_(false),
       simplify_clip_resolution_(*params_.get<mapnik::value_double>("simplify_clip_resolution", 0.0)),
-      // TODO - use for known tokens too: "(@\\w+|!\\w+!)"
-      pattern_(boost::regex("(@\\w+)",boost::regex::normal | boost::regbase::icase)),
+      re_tokens_("!(@?\\w+)!"), // matches  !mapnik_var!  or  !@user_var!
       // params below are for testing purposes only and may be removed at any time
       intersect_min_scale_(*params.get<mapnik::value_integer>("intersect_min_scale", 0)),
       intersect_max_scale_(*params.get<mapnik::value_integer>("intersect_max_scale", 0)),
@@ -551,43 +546,9 @@ std::string postgis_datasource::sql_bbox(box2d<double> const& env) const
 
 std::string postgis_datasource::populate_tokens(std::string const& sql) const
 {
-    std::string populated_sql = sql;
-
-    if (boost::algorithm::icontains(sql, bbox_token_))
-    {
-        box2d<double> max_env(-1.0 * FMAX, -1.0 * FMAX, FMAX, FMAX);
-        const std::string max_box = sql_bbox(max_env);
-        boost::algorithm::replace_all(populated_sql, bbox_token_, max_box);
-    }
-
-    if (boost::algorithm::icontains(sql, scale_denom_token_))
-    {
-        std::ostringstream ss;
-        ss << FMAX;
-        boost::algorithm::replace_all(populated_sql, scale_denom_token_, ss.str());
-    }
-
-    if (boost::algorithm::icontains(sql, pixel_width_token_))
-    {
-        boost::algorithm::replace_all(populated_sql, pixel_width_token_, "0");
-    }
-
-    if (boost::algorithm::icontains(sql, pixel_height_token_))
-    {
-        boost::algorithm::replace_all(populated_sql, pixel_height_token_, "0");
-    }
-
-    std::string copy2 = populated_sql;
-    std::list<std::string> l;
-    boost::regex_split(std::back_inserter(l), copy2, pattern_);
-    if (!l.empty())
-    {
-        for (auto const & token: l)
-        {
-            boost::algorithm::replace_all(populated_sql, token, "null");
-        }
-    }
-    return populated_sql;
+    return populate_tokens(sql, FLT_MAX,
+                           box2d<double>(-FLT_MAX, -FLT_MAX, FLT_MAX, FLT_MAX),
+                           0, 0, mapnik::attributes{}, false);
 }
 
 std::string postgis_datasource::populate_tokens(
@@ -596,43 +557,66 @@ std::string postgis_datasource::populate_tokens(
                                 box2d<double> const& env,
                                 double pixel_width,
                                 double pixel_height,
-                                mapnik::attributes const& vars) const
+                                mapnik::attributes const& vars,
+                                bool intersect) const
 {
-    std::string populated_sql = sql;
-    std::string box = sql_bbox(env);
+    std::ostringstream populated_sql;
+    std::cmatch m;
+    char const* start = sql.data();
+    char const* end = start + sql.size();
 
-    if (boost::algorithm::icontains(populated_sql, scale_denom_token_))
+    while (std::regex_search(start, end, m, re_tokens_))
     {
-        std::ostringstream ss;
-        ss << scale_denom;
-        boost::algorithm::replace_all(populated_sql, scale_denom_token_, ss.str());
+        populated_sql.write(start, m[0].first - start);
+        start = m[0].second;
+
+        auto m1 = boost::make_iterator_range(m[1].first, m[1].second);
+        if (m1.front() == '@')
+        {
+            std::string var_name(m1.begin() + 1, m1.end());
+            auto itr = vars.find(var_name);
+            if (itr != vars.end())
+            {
+                auto var_value = itr->second.to_string();
+                populated_sql << literal(var_value);
+            }
+            else
+            {
+                populated_sql << "NULL"; // undefined @variable
+            }
+        }
+        else if (boost::algorithm::equals(m1, "bbox"))
+        {
+            populated_sql << sql_bbox(env);
+            intersect = false;
+        }
+        else if (boost::algorithm::equals(m1, "pixel_height"))
+        {
+            populated_sql << pixel_height;
+        }
+        else if (boost::algorithm::equals(m1, "pixel_width"))
+        {
+            populated_sql << pixel_width;
+        }
+        else if (boost::algorithm::equals(m1, "scale_denominator"))
+        {
+            populated_sql << scale_denom;
+        }
+        else
+        {
+            populated_sql << "NULL"; // unrecognized !token!
+        }
     }
 
-    if (boost::algorithm::icontains(sql, pixel_width_token_))
-    {
-        std::ostringstream ss;
-        ss << pixel_width;
-        boost::algorithm::replace_all(populated_sql, pixel_width_token_, ss.str());
-    }
+    populated_sql.write(start, end - start);
 
-    if (boost::algorithm::icontains(sql, pixel_height_token_))
+    if (intersect)
     {
-        std::ostringstream ss;
-        ss << pixel_height;
-        boost::algorithm::replace_all(populated_sql, pixel_height_token_, ss.str());
-    }
-
-    if (boost::algorithm::icontains(populated_sql, bbox_token_))
-    {
-        boost::algorithm::replace_all(populated_sql, bbox_token_, box);
-    }
-    else
-    {
-        std::ostringstream s;
-
         if (intersect_min_scale_ > 0 && (scale_denom <= intersect_min_scale_))
         {
-            s << " WHERE ST_Intersects(\"" << geometryColumn_ << "\"," << box << ")";
+            populated_sql << " WHERE ST_Intersects("
+                          << identifier(geometryColumn_) << ", "
+                          << sql_bbox(env) << ")";
         }
         else if (intersect_max_scale_ > 0 && (scale_denom >= intersect_max_scale_))
         {
@@ -640,29 +624,13 @@ std::string postgis_datasource::populate_tokens(
         }
         else
         {
-            s << " WHERE \"" << geometryColumn_ << "\" && " << box;
-        }
-        populated_sql += s.str();
-    }
-    std::string copy2 = populated_sql;
-    std::list<std::string> l;
-    boost::regex_split(std::back_inserter(l), copy2, pattern_);
-    if (!l.empty())
-    {
-        for (auto const & token: l)
-        {
-            auto itr = vars.find(token.substr(1,std::string::npos));
-            if (itr != vars.end())
-            {
-                boost::algorithm::replace_all(populated_sql, token, itr->second.to_string());
-            }
-            else
-            {
-                boost::algorithm::replace_all(populated_sql, token, "null");
-            }
+            populated_sql << " WHERE "
+                          << identifier(geometryColumn_) << " && "
+                          << sql_bbox(env);
         }
     }
-    return populated_sql;
+
+    return populated_sql.str();
 }
 
 
@@ -1015,7 +983,8 @@ featureset_ptr postgis_datasource::features_at_point(coord2d const& pt, double t
             }
 
             box2d<double> box(pt.x - tol, pt.y - tol, pt.x + tol, pt.y + tol);
-            std::string table_with_bbox = populate_tokens(table_, FMAX, box, 0, 0, mapnik::attributes());
+            std::string table_with_bbox = populate_tokens(table_, FLT_MAX, box, 0, 0,
+                                                          mapnik::attributes{});
 
             s << " FROM " << table_with_bbox;
 
diff --git a/plugins/input/postgis/postgis_datasource.hpp b/plugins/input/postgis/postgis_datasource.hpp
index db41e1233..025d8b4bd 100644
--- a/plugins/input/postgis/postgis_datasource.hpp
+++ b/plugins/input/postgis/postgis_datasource.hpp
@@ -37,10 +37,10 @@
 
 // boost
 #include <boost/optional.hpp>
-#include <boost/regex.hpp>
 
 // stl
 #include <memory>
+#include <regex>
 #include <vector>
 #include <string>
 
@@ -84,12 +84,12 @@ private:
                                 box2d<double> const& env,
                                 double pixel_width,
                                 double pixel_height,
-                                mapnik::attributes const& vars) const;
+                                mapnik::attributes const& vars,
+                                bool intersect = true) const;
     std::string populate_tokens(std::string const& sql) const;
     std::shared_ptr<IResultSet> get_resultset(std::shared_ptr<Connection> &conn, std::string const& sql, CnxPool_ptr const& pool, processor_context_ptr ctx= processor_context_ptr()) const;
     static const std::string GEOMETRY_COLUMNS;
     static const std::string SPATIAL_REF_SYS;
-    static const double FMAX;
 
     const std::string uri_;
     const std::string username_;
@@ -109,10 +109,6 @@ private:
     bool simplify_geometries_;
     layer_descriptor desc_;
     ConnectionCreator<Connection> creator_;
-    const std::string bbox_token_;
-    const std::string scale_denom_token_;
-    const std::string pixel_width_token_;
-    const std::string pixel_height_token_;
     int pool_max_size_;
     bool persist_connection_;
     bool extent_from_subquery_;
@@ -126,7 +122,7 @@ private:
     mapnik::value_double simplify_prefilter_;
     bool simplify_dp_preserve_;
     mapnik::value_double simplify_clip_resolution_;
-    boost::regex pattern_;
+    std::regex re_tokens_;
     int intersect_min_scale_;
     int intersect_max_scale_;
     bool key_field_as_attribute_;

From d0e7b715dd5a429a4d5bb56763179d57fa6e612d Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Wed, 8 Feb 2017 16:19:23 +0100
Subject: [PATCH 235/328] postgis: test table/column names containing quotes

---
 test/data                        |  2 +-
 test/unit/datasource/postgis.cpp | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/test/data b/test/data
index 5ad14e6bd..29df37a4a 160000
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit 5ad14e6bdf2c5e6babd8ac04aa057ed6c67ac617
+Subproject commit 29df37a4a4007c5f97ea9cab7b3761a5954082f3
diff --git a/test/unit/datasource/postgis.cpp b/test/unit/datasource/postgis.cpp
index f3ba58c7c..f945f3763 100644
--- a/test/unit/datasource/postgis.cpp
+++ b/test/unit/datasource/postgis.cpp
@@ -185,6 +185,24 @@ TEST_CASE("postgis") {
             CHECK(ds->get_geometry_type() == mapnik::datasource_geometry_t::Point);
         }
 
+        SECTION("Postgis properly escapes names with single quotes")
+        {
+            mapnik::parameters params(base_params);
+            params["table"] = "\"test'single'quotes\"";
+            auto ds = mapnik::datasource_cache::instance().create(params);
+            REQUIRE(ds != nullptr);
+            CHECK(ds->get_geometry_type() == mapnik::datasource_geometry_t::Point);
+        }
+
+        SECTION("Postgis properly escapes names with double quotes")
+        {
+            mapnik::parameters params(base_params);
+            params["table"] = "\"test\"\"double\"\"quotes\"";
+            auto ds = mapnik::datasource_cache::instance().create(params);
+            REQUIRE(ds != nullptr);
+            CHECK(ds->get_geometry_type() == mapnik::datasource_geometry_t::Point);
+        }
+
         SECTION("Postgis query field names")
         {
             mapnik::parameters params(base_params);

From a4e8ea21be297d89bbf36ba594d6c661a7a9ac81 Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Wed, 8 Feb 2017 17:03:10 +0100
Subject: [PATCH 236/328] sql_utils: deprecate flawed un-quote functions

unquote* just strip all quotes from both ends of the string,
and don't collapse inner quotes.

quote_attr doesn't duplicate inner quotes.
---
 include/mapnik/sql_utils.hpp | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/include/mapnik/sql_utils.hpp b/include/mapnik/sql_utils.hpp
index 56bf980f8..9e638a3a4 100644
--- a/include/mapnik/sql_utils.hpp
+++ b/include/mapnik/sql_utils.hpp
@@ -74,6 +74,36 @@ namespace mapnik { namespace sql_utils {
         return os.put(qs.quot);
     }
 
+    // Does nothing if `str` doesn't start with `quot`.
+    // Otherwise erases the opening quote, collapses inner quote pairs,
+    // and erases everything from the closing quote to the end of the
+    // string. The closing quote is the first non-paired quote after the
+    // opening one. For a well-formed quoted string, it is also the last
+    // character, so nothing gets lost.
+    inline void unquote(char quot, std::string & str)
+    {
+        if (!str.empty() && str.front() == quot)
+        {
+            std::size_t di = 0;
+            for (std::size_t si = 1; si < str.size(); ++si)
+            {
+                char c = str[si];
+                if (c == quot && (++si >= str.size() || str[si] != quot))
+                    break;
+                str[di++] = c;
+            }
+            str.erase(di);
+        }
+    }
+
+    inline std::string unquote_copy(char quot, std::string const& str)
+    {
+        std::string tmp(str);
+        sql_utils::unquote(quot, tmp);
+        return tmp;
+    }
+
+    [[deprecated("flawed")]]
     inline std::string unquote_double(std::string const& sql)
     {
         std::string table_name = sql;
@@ -81,6 +111,7 @@ namespace mapnik { namespace sql_utils {
         return table_name;
     }
 
+    [[deprecated("flawed")]]
     inline std::string unquote(std::string const& sql)
     {
         std::string table_name = sql;
@@ -88,6 +119,7 @@ namespace mapnik { namespace sql_utils {
         return table_name;
     }
 
+    [[deprecated("flawed")]]
     inline void quote_attr(std::ostringstream & s, std::string const& field)
     {
         s << ",\"" << field << "\"";

From 2587bb3a1d8db397acfa8dcc2d332da3a8a9399f Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Wed, 8 Feb 2017 17:30:25 +0100
Subject: [PATCH 237/328] sql_utils: improved table_from_sql

---
 include/mapnik/sql_utils.hpp | 67 ++++++++++++++++++++++++++++++++++--
 1 file changed, 65 insertions(+), 2 deletions(-)

diff --git a/include/mapnik/sql_utils.hpp b/include/mapnik/sql_utils.hpp
index 9e638a3a4..96ec79342 100644
--- a/include/mapnik/sql_utils.hpp
+++ b/include/mapnik/sql_utils.hpp
@@ -33,8 +33,8 @@
 #pragma GCC diagnostic pop
 
 // stl
-#include <sstream>
-#include <vector>
+#include <iosfwd>
+#include <regex>
 #include <string>
 
 namespace mapnik { namespace sql_utils {
@@ -125,6 +125,69 @@ namespace mapnik { namespace sql_utils {
         s << ",\"" << field << "\"";
     }
 
+    const std::regex re_from{
+        "\\bFROM\\b"
+        , std::regex::icase
+    };
+
+    const std::regex re_table_name{
+        "\\s*(\\w+|(\"[^\"]*\")+)"      // $1 = schema
+        "(\\.(\\w+|(\"[^\"]*\")+))?"    // $4 = table
+        "\\s*"
+    };
+
+    inline bool table_from_sql(std::string const& sql,
+                               std::string & schema,
+                               std::string & table)
+    {
+        std::smatch m;
+        auto start = sql.begin();
+        auto end = sql.end();
+        auto flags = std::regex_constants::match_default;
+        auto found = std::regex_match(start, end, m, re_table_name);
+        auto extract_matched_parts = [&]()
+        {
+            if (m[4].matched)
+            {
+                table.assign(m[4].first, m[4].second);
+                schema.assign(m[1].first, m[1].second);
+            }
+            else
+            {
+                table.assign(m[1].first, m[1].second);
+                schema.clear();
+            }
+        };
+
+        if (found)
+        {
+            // input is not subquery, just "[schema.]table"
+            extract_matched_parts();
+        }
+        else
+        {
+            // search "FROM [schema.]table" in subquery
+            while (std::regex_search(start, end, m, re_from, flags))
+            {
+                start = m[0].second;
+                if (std::regex_search(start, end, m, re_table_name,
+                                      std::regex_constants::match_continuous))
+                {
+                    extract_matched_parts();
+                    found = true;
+                    start = m[0].second;
+                }
+                flags = std::regex_constants::match_prev_avail;
+            }
+        }
+        if (found)
+        {
+            sql_utils::unquote('"', schema);
+            sql_utils::unquote('"', table);
+        }
+        return found;
+    }
+
     inline std::string table_from_sql(std::string const& sql)
     {
         std::string table_name = sql;

From 6bbb3910053731f1099242403e0ae4854931fff7 Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Wed, 8 Feb 2017 17:30:25 +0100
Subject: [PATCH 238/328] postgis: consistently quote parameters in sql

---
 plugins/input/postgis/postgis_datasource.cpp | 202 ++++++++-----------
 plugins/input/postgis/postgis_datasource.hpp |   6 +-
 2 files changed, 91 insertions(+), 117 deletions(-)

diff --git a/plugins/input/postgis/postgis_datasource.cpp b/plugins/input/postgis/postgis_datasource.cpp
index 47b5dc6de..3ed0a361c 100644
--- a/plugins/input/postgis/postgis_datasource.cpp
+++ b/plugins/input/postgis/postgis_datasource.cpp
@@ -62,7 +62,6 @@ using mapnik::sql_utils::literal;
 postgis_datasource::postgis_datasource(parameters const& params)
     : datasource(params),
       table_(*params.get<std::string>("table", "")),
-      schema_(""),
       geometry_table_(*params.get<std::string>("geometry_table", "")),
       geometry_field_(*params.get<std::string>("geometry_field", "")),
       key_field_(*params.get<std::string>("key_field", "")),
@@ -154,21 +153,13 @@ postgis_datasource::postgis_datasource(parameters const& params)
 
             desc_.set_encoding(conn->client_encoding());
 
-            if (geometry_table_.empty())
-            {
-                geometry_table_ = mapnik::sql_utils::table_from_sql(table_);
-            }
+            mapnik::sql_utils::table_from_sql(
+                    geometry_table_.empty() ? table_ : geometry_table_,
+                    parsed_schema_, parsed_table_);
 
-            std::string::size_type idx = geometry_table_.find_last_of('.');
-            if (idx != std::string::npos)
-            {
-                schema_ = geometry_table_.substr(0, idx);
-                geometry_table_ = geometry_table_.substr(idx + 1);
-            }
-
-            // NOTE: geometry_table_ how should ideally be a table name, but
+            // NOTE: parsed_table_ now should ideally be a table name, but
             // there are known edge cases where this will break down and
-            // geometry_table_ may even be empty: https://github.com/mapnik/mapnik/issues/2718
+            // it may even be empty: https://github.com/mapnik/mapnik/issues/2718
 
             // If we do not know both the geometry_field and the srid
             // then first attempt to fetch the geometry name from a geometry_columns entry.
@@ -176,8 +167,8 @@ postgis_datasource::postgis_datasource(parameters const& params)
             // from the simplistic table parsing in table_from_sql() or if
             // the table parameter references a table, view, or subselect not
             // registered in the geometry columns.
-            geometryColumn_ = geometry_field_;
-            if (!geometry_table_.empty() && (geometryColumn_.empty() || srid_ == 0))
+            geometryColumn_ = mapnik::sql_utils::unquote_copy('"', geometry_field_);
+            if (!parsed_table_.empty() && (geometryColumn_.empty() || srid_ == 0))
             {
 #ifdef MAPNIK_STATS
                 mapnik::progress_timer __stats2__(std::clog, "postgis_datasource::init(get_srid_and_geometry_column)");
@@ -186,21 +177,15 @@ postgis_datasource::postgis_datasource(parameters const& params)
 
                 try
                 {
-                    s << "SELECT f_geometry_column, srid FROM "
-                      << GEOMETRY_COLUMNS <<" WHERE f_table_name='"
-                      << mapnik::sql_utils::unquote_double(geometry_table_)
-                      << "'";
-                    if (! schema_.empty())
+                    s << "SELECT f_geometry_column, srid FROM " << GEOMETRY_COLUMNS
+                      << " WHERE f_table_name=" << literal(parsed_table_);
+                    if (!parsed_schema_.empty())
                     {
-                        s << " AND f_table_schema='"
-                          << mapnik::sql_utils::unquote_double(schema_)
-                          << "'";
+                        s << " AND f_table_schema=" << literal(parsed_schema_);
                     }
-                    if (! geometry_field_.empty())
+                    if (!geometryColumn_.empty())
                     {
-                        s << " AND f_geometry_column='"
-                          << mapnik::sql_utils::unquote_double(geometry_field_)
-                          << "'";
+                        s << " AND f_geometry_column=" << literal(geometryColumn_);
                     }
                     shared_ptr<ResultSet> rs = conn->executeQuery(s.str());
                     if (rs->next())
@@ -232,26 +217,24 @@ postgis_datasource::postgis_datasource(parameters const& params)
             }
 
             // If we still do not know the srid then we can try to fetch
-            // it from the 'geometry_table_' parameter, which should work even if it is
+            // it from the 'parsed_table_' parameter, which should work even if it is
             // a subselect as long as we know the geometry_field to query
             if (!geometryColumn_.empty() && srid_ <= 0)
             {
                 std::ostringstream s;
 
-                s << "SELECT ST_SRID(\"" << geometryColumn_ << "\") AS srid FROM ";
-                if (!geometry_table_.empty())
+                s << "SELECT ST_SRID(" << identifier(geometryColumn_)
+                  << ") AS srid FROM ";
+                if (!parsed_table_.empty())
                 {
-                    if (!schema_.empty())
-                    {
-                        s << schema_ << '.';
-                    }
-                    s << geometry_table_;
+                    append_geometry_table(s);
                 }
                 else
                 {
                     s << populate_tokens(table_);
                 }
-                s << " WHERE \"" << geometryColumn_ << "\" IS NOT NULL LIMIT 1;";
+                s << " WHERE " << identifier(geometryColumn_)
+                  << " IS NOT NULL LIMIT 1";
 
                 shared_ptr<ResultSet> rs = conn->executeQuery(s.str());
                 if (rs->next())
@@ -283,18 +266,16 @@ postgis_datasource::postgis_datasource(parameters const& params)
                     "WHERE a.attnum > 0 AND a.attrelid = c.oid "
                     "AND a.atttypid = t.oid AND c.relnamespace = n.oid "
                     "AND c.oid = i.indrelid AND i.indisprimary = 't' "
-                    "AND t.typname !~ '^geom' AND c.relname ="
-                  << " '" << mapnik::sql_utils::unquote_double(geometry_table_) << "' "
+                    "AND t.typname !~ '^geom' AND c.relname = "
+                  << literal(parsed_table_) << " "
                     //"AND a.attnum = ANY (i.indkey) " // postgres >= 8.1
                   << "AND (i.indkey[0]=a.attnum OR i.indkey[1]=a.attnum OR i.indkey[2]=a.attnum "
                     "OR i.indkey[3]=a.attnum OR i.indkey[4]=a.attnum OR i.indkey[5]=a.attnum "
                     "OR i.indkey[6]=a.attnum OR i.indkey[7]=a.attnum OR i.indkey[8]=a.attnum "
                     "OR i.indkey[9]=a.attnum) ";
-                if (! schema_.empty())
+                if (!parsed_schema_.empty())
                 {
-                    s << "AND n.nspname='"
-                      << mapnik::sql_utils::unquote_double(schema_)
-                      << "' ";
+                    s << "AND n.nspname=" << literal(parsed_schema_) << ' ';
                 }
                 s << "ORDER BY a.attnum";
 
@@ -313,7 +294,7 @@ postgis_datasource::postgis_datasource(parameters const& params)
                                 key_field_ = std::string(key_field_string);
 
                                 MAPNIK_LOG_DEBUG(postgis) << "postgis_datasource: auto-detected key field of '"
-                                                          << key_field_ << "' on table '" << geometry_table_ << "'";
+                                                          << key_field_ << "' on table '" << parsed_table_ << "'";
                             }
                         }
                         else
@@ -324,7 +305,7 @@ postgis_datasource::postgis_datasource(parameters const& params)
                             err << "PostGIS Plugin: Error: '"
                                 << rs_key->getValue(0)
                                 << "' on table '"
-                                << geometry_table_
+                                << parsed_table_
                                 << "' is not a valid integer primary key field\n";
                             throw mapnik::datasource_exception(err.str());
                         }
@@ -344,9 +325,11 @@ postgis_datasource::postgis_datasource(parameters const& params)
             // but still not known at this point, then throw
             if (*autodetect_key_field && key_field_.empty())
             {
-                throw mapnik::datasource_exception(std::string("PostGIS Plugin: Error: primary key required")
-                                                   + " but could not be detected for table '" +
-                                                   geometry_table_ + "', please supply 'key_field' option to specify field to use for primary key");
+                throw mapnik::datasource_exception(
+                        "PostGIS Plugin: Error: primary key required"
+                        " but could not be detected for table '"
+                        + parsed_table_ + "', please supply 'key_field'"
+                        " option to specify field to use for primary key");
             }
 
             if (srid_ == 0)
@@ -633,6 +616,25 @@ std::string postgis_datasource::populate_tokens(
     return populated_sql.str();
 }
 
+void postgis_datasource::append_geometry_table(std::ostream & os) const
+{
+    if (!geometry_table_.empty())
+    {
+        os << geometry_table_; // assume datasource parameter is valid SQL
+    }
+    else if (!parsed_schema_.empty())
+    {
+        os << identifier(parsed_schema_) << '.' << identifier(parsed_table_);
+    }
+    else if (!parsed_table_.empty())
+    {
+        os << identifier(parsed_table_);
+    }
+    else
+    {
+        os << table_; // assume datasource parameter is valid SQL
+    }
+}
 
 std::shared_ptr<IResultSet> postgis_datasource::get_resultset(std::shared_ptr<Connection> &conn, std::string const& sql, CnxPool_ptr const& pool, processor_context_ptr ctx) const
 {
@@ -757,20 +759,11 @@ featureset_ptr postgis_datasource::features_with_context(query const& q,processo
         {
             std::ostringstream s_error;
             s_error << "PostGIS: geometry name lookup failed for table '";
-
-            if (! schema_.empty())
-            {
-                s_error << schema_ << ".";
-            }
-            s_error << geometry_table_
-                    << "'. Please manually provide the 'geometry_field' parameter or add an entry "
+            append_geometry_table(s_error);
+            s_error << "'. Please manually provide the 'geometry_field' parameter or add an entry "
                     << "in the geometry_columns for '";
-
-            if (! schema_.empty())
-            {
-                s_error << schema_ << ".";
-            }
-            s_error << geometry_table_ << "'.";
+            append_geometry_table(s_error);
+            s_error << "'.";
 
             throw mapnik::datasource_exception(s_error.str());
         }
@@ -801,7 +794,7 @@ featureset_ptr postgis_datasource::features_with_context(query const& q,processo
             {
                 s << "ST_ClipByBox2D(";
             }
-            s << "\"" << geometryColumn_ << "\"";
+            s << identifier(geometryColumn_);
 
             // ! ST_ClipByBox2D()
             if (simplify_clip_resolution_ > 0.0 && simplify_clip_resolution_ > px_sz)
@@ -833,7 +826,7 @@ featureset_ptr postgis_datasource::features_with_context(query const& q,processo
             }
 
             // Geometry column!
-            s << "\"" << geometryColumn_ << "\"";
+            s << identifier(geometryColumn_);
 
             // ! ST_SnapToGrid()
             if (simplify_geometries_ && simplify_snap_ratio_ > 0.0)
@@ -871,7 +864,7 @@ featureset_ptr postgis_datasource::features_with_context(query const& q,processo
 
         if (! key_field_.empty())
         {
-            mapnik::sql_utils::quote_attr(s, key_field_);
+            s << ',' << identifier(key_field_);
             if (key_field_as_attribute_)
             {
                 ctx->push(key_field_);
@@ -881,7 +874,7 @@ featureset_ptr postgis_datasource::features_with_context(query const& q,processo
             {
                 if (*pos != key_field_)
                 {
-                    mapnik::sql_utils::quote_attr(s, *pos);
+                    s << ',' << identifier(*pos);
                     ctx->push(*pos);
                 }
             }
@@ -890,7 +883,7 @@ featureset_ptr postgis_datasource::features_with_context(query const& q,processo
         {
             for (; pos != end; ++pos)
             {
-                mapnik::sql_utils::quote_attr(s, *pos);
+                s << ',' << identifier(*pos);
                 ctx->push(*pos);
             }
         }
@@ -931,33 +924,25 @@ featureset_ptr postgis_datasource::features_at_point(coord2d const& pt, double t
             {
                 std::ostringstream s_error;
                 s_error << "PostGIS: geometry name lookup failed for table '";
-
-                if (! schema_.empty())
-                {
-                    s_error << schema_ << ".";
-                }
-                s_error << geometry_table_
-                        << "'. Please manually provide the 'geometry_field' parameter or add an entry "
+                append_geometry_table(s_error);
+                s_error << "'. Please manually provide the 'geometry_field' parameter or add an entry "
                         << "in the geometry_columns for '";
-
-                if (! schema_.empty())
-                {
-                    s_error << schema_ << ".";
-                }
-                s_error << geometry_table_ << "'.";
+                append_geometry_table(s_error);
+                s_error << "'.";
 
                 throw mapnik::datasource_exception(s_error.str());
             }
 
             std::ostringstream s;
-            s << "SELECT ST_AsBinary(\"" << geometryColumn_ << "\") AS geom";
+            s << "SELECT ST_AsBinary(" << identifier(geometryColumn_)
+              << ") AS geom";
 
             mapnik::context_ptr ctx = std::make_shared<mapnik::context_type>();
             auto const& desc = desc_.get_descriptors();
 
             if (!key_field_.empty())
             {
-                mapnik::sql_utils::quote_attr(s, key_field_);
+                s << ',' << identifier(key_field_);
                 if (key_field_as_attribute_)
                 {
                     ctx->push(key_field_);
@@ -967,7 +952,7 @@ featureset_ptr postgis_datasource::features_at_point(coord2d const& pt, double t
                     std::string const& name = attr_info.get_name();
                     if (name != key_field_)
                     {
-                        mapnik::sql_utils::quote_attr(s, name);
+                        s << ',' << identifier(name);
                         ctx->push(name);
                     }
                 }
@@ -977,7 +962,7 @@ featureset_ptr postgis_datasource::features_at_point(coord2d const& pt, double t
                 for (auto const& attr_info : desc)
                 {
                     std::string const& name = attr_info.get_name();
-                    mapnik::sql_utils::quote_attr(s, name);
+                    s << ',' << identifier(name);
                     ctx->push(name);
                 }
             }
@@ -1022,12 +1007,8 @@ box2d<double> postgis_datasource::envelope() const
             {
                 std::ostringstream s_error;
                 s_error << "PostGIS: unable to query the layer extent of table '";
-
-                if (! schema_.empty())
-                {
-                    s_error << schema_ << ".";
-                }
-                s_error << geometry_table_ << "' because we cannot determine the geometry field name."
+                append_geometry_table(s_error);
+                s_error << "' because we cannot determine the geometry field name."
                         << "\nPlease provide either an 'extent' parameter to skip this query, "
                         << "a 'geometry_field' and/or 'geometry_table' parameter, or add a "
                         << "record to the 'geometry_columns' for your table.";
@@ -1038,20 +1019,21 @@ box2d<double> postgis_datasource::envelope() const
             if (estimate_extent_)
             {
                 s << "SELECT ST_XMin(ext),ST_YMin(ext),ST_XMax(ext),ST_YMax(ext)"
-                  << " FROM (SELECT ST_Estimated_Extent('";
+                  << " FROM (SELECT ST_Estimated_Extent(";
 
-                if (! schema_.empty())
+                if (!parsed_schema_.empty())
                 {
-                    s << mapnik::sql_utils::unquote_double(schema_) << "','";
+                    s << literal(parsed_schema_) << ',';
                 }
 
-                s << mapnik::sql_utils::unquote_double(geometry_table_) << "','"
-                  << mapnik::sql_utils::unquote_double(geometryColumn_) << "') as ext) as tmp";
+                s << literal(parsed_table_) << ','
+                  << literal(geometryColumn_) << ") as ext) as tmp";
             }
             else
             {
                 s << "SELECT ST_XMin(ext),ST_YMin(ext),ST_XMax(ext),ST_YMax(ext)"
-                  << " FROM (SELECT ST_Extent(" <<geometryColumn_<< ") as ext from ";
+                  << " FROM (SELECT ST_Extent("
+                  << identifier(geometryColumn_) << ") as ext from ";
 
                 if (extent_from_subquery_)
                 {
@@ -1061,14 +1043,10 @@ box2d<double> postgis_datasource::envelope() const
                 }
                 else
                 {
-                    if (! schema_.empty())
-                    {
-                        s << schema_ << ".";
-                    }
-
                     // but if the subquery does not limit records then querying the
                     // actual table will be faster as indexes can be used
-                    s << geometry_table_ << ") as tmp";
+                    append_geometry_table(s);
+                    s << ") as tmp";
                 }
             }
 
@@ -1111,21 +1089,15 @@ boost::optional<mapnik::datasource_geometry_t> postgis_datasource::get_geometry_
             std::string g_type;
             try
             {
-                s << "SELECT lower(type) as type FROM "
-                  << GEOMETRY_COLUMNS <<" WHERE f_table_name='"
-                  << mapnik::sql_utils::unquote_double(geometry_table_)
-                  << "'";
-                if (! schema_.empty())
+                s << "SELECT lower(type) as type FROM " << GEOMETRY_COLUMNS
+                  << " WHERE f_table_name=" << literal(parsed_table_);
+                if (!parsed_schema_.empty())
                 {
-                    s << " AND f_table_schema='"
-                      << mapnik::sql_utils::unquote_double(schema_)
-                      << "'";
+                    s << " AND f_table_schema=" << literal(parsed_schema_);
                 }
-                if (! geometry_field_.empty())
+                if (!geometryColumn_.empty())
                 {
-                    s << " AND f_geometry_column='"
-                      << mapnik::sql_utils::unquote_double(geometry_field_)
-                      << "'";
+                    s << " AND f_geometry_column=" << literal(geometryColumn_);
                 }
                 shared_ptr<ResultSet> rs = conn->executeQuery(s.str());
                 if (rs->next())
@@ -1164,8 +1136,8 @@ boost::optional<mapnik::datasource_geometry_t> postgis_datasource::get_geometry_
 
                 std::string prev_type("");
 
-                s << "SELECT ST_GeometryType(\""
-                  << geometryColumn_ << "\") AS geom"
+                s << "SELECT ST_GeometryType("
+                  << identifier(geometryColumn_) << ") AS geom"
                   << " FROM " << populate_tokens(table_);
 
                 if (row_limit_ > 0 && row_limit_ < 5)
diff --git a/plugins/input/postgis/postgis_datasource.hpp b/plugins/input/postgis/postgis_datasource.hpp
index 025d8b4bd..636ccd4e8 100644
--- a/plugins/input/postgis/postgis_datasource.hpp
+++ b/plugins/input/postgis/postgis_datasource.hpp
@@ -87,6 +87,7 @@ private:
                                 mapnik::attributes const& vars,
                                 bool intersect = true) const;
     std::string populate_tokens(std::string const& sql) const;
+    void append_geometry_table(std::ostream & os) const;
     std::shared_ptr<IResultSet> get_resultset(std::shared_ptr<Connection> &conn, std::string const& sql, CnxPool_ptr const& pool, processor_context_ptr ctx= processor_context_ptr()) const;
     static const std::string GEOMETRY_COLUMNS;
     static const std::string SPATIAL_REF_SYS;
@@ -95,9 +96,10 @@ private:
     const std::string username_;
     const std::string password_;
     const std::string table_;
-    std::string schema_;
-    std::string geometry_table_;
+    const std::string geometry_table_;
     const std::string geometry_field_;
+    std::string parsed_schema_;
+    std::string parsed_table_;
     std::string key_field_;
     mapnik::value_integer cursor_fetch_size_;
     mapnik::value_integer row_limit_;

From a13cb382e0920675165e5e2844006ae8a5d799da Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Wed, 8 Feb 2017 21:05:52 +0100
Subject: [PATCH 239/328] postgis: test !@uservar! interpolation

---
 test/unit/datasource/postgis.cpp | 35 ++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/test/unit/datasource/postgis.cpp b/test/unit/datasource/postgis.cpp
index f945f3763..f74ee1548 100644
--- a/test/unit/datasource/postgis.cpp
+++ b/test/unit/datasource/postgis.cpp
@@ -26,6 +26,7 @@
 #include <mapnik/datasource.hpp>
 #include <mapnik/datasource_cache.hpp>
 #include <mapnik/geometry/geometry_type.hpp>
+#include <mapnik/unicode.hpp>
 #include <mapnik/util/fs.hpp>
 
 /*
@@ -303,6 +304,40 @@ TEST_CASE("postgis") {
             }
         }
 
+        SECTION("Postgis interpolates !@uservar! tokens in query")
+        {
+            mapnik::parameters params(base_params);
+            params["table"] = "(SELECT * FROM public.test"
+                              " WHERE GeometryType(geom) = !@wantedGeomType!"
+                              " LIMIT 1) AS data";
+            auto ds = mapnik::datasource_cache::instance().create(params);
+            REQUIRE(ds != nullptr);
+
+            mapnik::transcoder tr("utf8");
+            mapnik::query qry(ds->envelope());
+            qry.set_variables({{"wantedGeomType", tr.transcode("POINT")}});
+            CHECK(qry.variables().count("wantedGeomType") == 1);
+
+            auto featureset = ds->features(qry);
+            auto feature = featureset->next();
+            CHECKED_IF(feature != nullptr)
+            {
+                auto const& geom = feature->get_geometry();
+                CHECK(mapnik::geometry::geometry_type(geom) == mapnik::geometry::Point);
+            }
+
+            qry.set_variables({{"wantedGeomType", tr.transcode("POLYGON")}});
+            CHECK(qry.variables().count("wantedGeomType") == 1);
+
+            featureset = ds->features(qry);
+            feature = featureset->next();
+            CHECKED_IF(feature != nullptr)
+            {
+                auto const& geom = feature->get_geometry();
+                CHECK(mapnik::geometry::geometry_type(geom) == mapnik::geometry::Polygon);
+            }
+        }
+
         SECTION("Postgis query extent: full dataset")
         {
             //include schema to increase coverage

From e35c1ca106be37b30e4a0da52e1a54d8e8e8a096 Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Thu, 9 Feb 2017 15:23:39 +0100
Subject: [PATCH 240/328] pgraster: indentation

---
 .../input/pgraster/pgraster_datasource.cpp    | 765 +++++++++---------
 1 file changed, 381 insertions(+), 384 deletions(-)

diff --git a/plugins/input/pgraster/pgraster_datasource.cpp b/plugins/input/pgraster/pgraster_datasource.cpp
index 2841a1da7..2be3df9a9 100644
--- a/plugins/input/pgraster/pgraster_datasource.cpp
+++ b/plugins/input/pgraster/pgraster_datasource.cpp
@@ -141,160 +141,118 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
 
     ConnectionManager::instance().registerPool(creator_, *initial_size, pool_max_size_);
     CnxPool_ptr pool = ConnectionManager::instance().getPool(creator_.id());
-    if (pool)
+    if (!pool) return;
+
+    shared_ptr<Connection> conn = pool->borrowObject();
+    if (!conn) return;
+
+    if (conn->isOK())
     {
-        shared_ptr<Connection> conn = pool->borrowObject();
-        if (!conn) return;
+        desc_.set_encoding(conn->client_encoding());
 
-        if (conn->isOK())
+        if (raster_table_.empty())
         {
-
-            desc_.set_encoding(conn->client_encoding());
-
-            if (raster_table_.empty())
+            raster_table_ = mapnik::sql_utils::table_from_sql(table_);
+            // non-trivial subqueries (having no FROM) make it
+            // impossible to use overviews
+            // TODO: improve "table_from_sql" ?
+            if ( raster_table_[raster_table_.find_first_not_of(" \t\r\n")] == '(' )
             {
-              raster_table_ = mapnik::sql_utils::table_from_sql(table_);
-              // non-trivial subqueries (having no FROM) make it
-              // impossible to use overviews
-              // TODO: improve "table_from_sql" ?
-              if ( raster_table_[raster_table_.find_first_not_of(" \t\r\n")] == '(' )
-              {
                 raster_table_.clear();
                 if ( use_overviews_ )
                 {
-                  std::ostringstream err;
-                  err << "Pgraster Plugin: overviews cannot be used "
-                         "with non-trivial subqueries";
-                  MAPNIK_LOG_WARN(pgraster) << err.str();
-                  use_overviews_ = false;
+                    std::ostringstream err;
+                    err << "Pgraster Plugin: overviews cannot be used "
+                           "with non-trivial subqueries";
+                    MAPNIK_LOG_WARN(pgraster) << err.str();
+                    use_overviews_ = false;
                 }
                 if ( ! extent_from_subquery_ ) {
-                  std::ostringstream err;
-                  err << "Pgraster Plugin: extent can only be computed "
-                         "from subquery as we could not found table source";
-                  MAPNIK_LOG_WARN(pgraster) << err.str();
-                  extent_from_subquery_ = true;
+                    std::ostringstream err;
+                    err << "Pgraster Plugin: extent can only be computed "
+                           "from subquery as we could not found table source";
+                    MAPNIK_LOG_WARN(pgraster) << err.str();
+                    extent_from_subquery_ = true;
                 }
-
-              }
             }
+        }
 
-            std::string::size_type idx = raster_table_.find_last_of('.');
-            if (idx != std::string::npos)
-            {
-                schema_ = raster_table_.substr(0, idx);
-                raster_table_ = raster_table_.substr(idx + 1);
-            }
+        std::string::size_type idx = raster_table_.find_last_of('.');
+        if (idx != std::string::npos)
+        {
+            schema_ = raster_table_.substr(0, idx);
+            raster_table_ = raster_table_.substr(idx + 1);
+        }
 
-            // If we do not know either the geometry_field or the srid or we
-            // want to use overviews but do not know about schema, or
-            // no extent was specified, then attempt to fetch the missing
-            // information from a raster_columns entry.
-            //
-            // This will return no records if we are querying a bogus table returned
-            // from the simplistic table parsing in table_from_sql() or if
-            // the table parameter references a table, view, or subselect not
-            // registered in the geometry columns.
-            //
-            geometryColumn_ = mapnik::sql_utils::unquote_double(raster_field_);
-            if (!raster_table_.empty() && (
-                  geometryColumn_.empty() || srid_ == 0 ||
-                  (schema_.empty() && use_overviews_) ||
-                  ! extent_initialized_
-               ))
-            {
+        // If we do not know either the geometry_field or the srid or we
+        // want to use overviews but do not know about schema, or
+        // no extent was specified, then attempt to fetch the missing
+        // information from a raster_columns entry.
+        //
+        // This will return no records if we are querying a bogus table returned
+        // from the simplistic table parsing in table_from_sql() or if
+        // the table parameter references a table, view, or subselect not
+        // registered in the geometry columns.
+        //
+        geometryColumn_ = mapnik::sql_utils::unquote_double(raster_field_);
+        if (!raster_table_.empty() && (
+              geometryColumn_.empty() || srid_ == 0 ||
+              (schema_.empty() && use_overviews_) ||
+              ! extent_initialized_
+           ))
+        {
 #ifdef MAPNIK_STATS
-                mapnik::progress_timer __stats2__(std::clog, "pgraster_datasource::init(get_srid_and_geometry_column)");
+            mapnik::progress_timer __stats2__(std::clog, "pgraster_datasource::init(get_srid_and_geometry_column)");
 #endif
-                std::ostringstream s;
+            std::ostringstream s;
 
-                try
+            try
+            {
+                s << "SELECT r_raster_column col, srid, r_table_schema";
+                if ( ! extent_initialized_ ) {
+                    s << ", st_xmin(extent) xmin, st_ymin(extent) ymin"
+                      << ", st_xmax(extent) xmax, st_ymax(extent) ymax";
+                }
+                s << " FROM "
+                  << RASTER_COLUMNS << " WHERE r_table_name='"
+                  << mapnik::sql_utils::unquote_double(raster_table_)
+                  << "'";
+                if (! schema_.empty())
                 {
-                    s << "SELECT r_raster_column col, srid, r_table_schema";
-                    if ( ! extent_initialized_ ) {
-                      s << ", st_xmin(extent) xmin, st_ymin(extent) ymin"
-                        << ", st_xmax(extent) xmax, st_ymax(extent) ymax";
-                    }
-                    s << " FROM "
-                      << RASTER_COLUMNS << " WHERE r_table_name='"
-                      << mapnik::sql_utils::unquote_double(raster_table_)
+                    s << " AND r_table_schema='"
+                      << mapnik::sql_utils::unquote_double(schema_)
                       << "'";
-                    if (! schema_.empty())
+                }
+                if (! raster_field_.empty())
+                {
+                    s << " AND r_raster_column='"
+                      << mapnik::sql_utils::unquote_double(raster_field_)
+                      << "'";
+                }
+                MAPNIK_LOG_DEBUG(pgraster) <<
+                  "pgraster_datasource: running query " << s.str();
+                shared_ptr<ResultSet> rs = conn->executeQuery(s.str());
+                if (rs->next())
+                {
+                    geometryColumn_ = rs->getValue("col");
+                    if ( ! extent_initialized_ )
                     {
-                        s << " AND r_table_schema='"
-                          << mapnik::sql_utils::unquote_double(schema_)
-                          << "'";
-                    }
-                    if (! raster_field_.empty())
-                    {
-                        s << " AND r_raster_column='"
-                          << mapnik::sql_utils::unquote_double(raster_field_)
-                          << "'";
-                    }
-                    MAPNIK_LOG_DEBUG(pgraster) <<
-                      "pgraster_datasource: running query " << s.str();
-                    shared_ptr<ResultSet> rs = conn->executeQuery(s.str());
-                    if (rs->next())
-                    {
-                        geometryColumn_ = rs->getValue("col");
-                        if ( ! extent_initialized_ )
+                        double lox, loy, hix, hiy;
+                        if (mapnik::util::string2double(rs->getValue("xmin"), lox) &&
+                            mapnik::util::string2double(rs->getValue("ymin"), loy) &&
+                            mapnik::util::string2double(rs->getValue("xmax"), hix) &&
+                            mapnik::util::string2double(rs->getValue("ymax"), hiy))
                         {
-                          double lox, loy, hix, hiy;
-                          if (mapnik::util::string2double(rs->getValue("xmin"), lox) &&
-                              mapnik::util::string2double(rs->getValue("ymin"), loy) &&
-                              mapnik::util::string2double(rs->getValue("xmax"), hix) &&
-                              mapnik::util::string2double(rs->getValue("ymax"), hiy))
-                          {
                             extent_.init(lox, loy, hix, hiy);
                             extent_initialized_ = true;
                             MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: Layer extent=" << extent_;
-                          }
-                          else
-                          {
+                        }
+                        else
+                        {
                             MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: Could not determine extent from query: " << s.str();
-                          }
-                        }
-                        if (srid_ == 0)
-                        {
-                            const char* srid_c = rs->getValue("srid");
-                            if (srid_c != nullptr)
-                            {
-                                int result = 0;
-                                const char * end = srid_c + std::strlen(srid_c);
-                                if (mapnik::util::string2int(srid_c, end, result))
-                                {
-                                    srid_ = result;
-                                }
-                            }
-                        }
-                        if ( schema_.empty() )
-                        {
-                            schema_ = rs->getValue("r_table_schema");
                         }
                     }
-                    else
-                    {
-                        MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: no response from metadata query " << s.str();
-                    }
-                    rs->close();
-                }
-                catch (mapnik::datasource_exception const& ex) {
-                    // let this pass on query error and use the fallback below
-                    MAPNIK_LOG_WARN(pgraster) << "pgraster_datasource: metadata query failed: " << ex.what();
-                }
-
-                // If we still do not know the srid then we can try to fetch
-                // it from the 'table_' parameter, which should work even if it is
-                // a subselect as long as we know the geometry_field to query
-                if (! geometryColumn_.empty() && srid_ <= 0)
-                {
-                    s.str("");
-
-                    s << "SELECT ST_SRID(\"" << geometryColumn_ << "\") AS srid FROM "
-                      << populate_tokens(table_) << " WHERE \"" << geometryColumn_ << "\" IS NOT NULL LIMIT 1;";
-
-                    shared_ptr<ResultSet> rs = conn->executeQuery(s.str());
-                    if (rs->next())
+                    if (srid_ == 0)
                     {
                         const char* srid_c = rs->getValue("srid");
                         if (srid_c != nullptr)
@@ -307,275 +265,314 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
                             }
                         }
                     }
-                    rs->close();
-                }
-            }
-
-            // If overviews were requested, take note of the max scale
-            // of each available overview, sorted by scale descending
-            if ( use_overviews_ )
-            {
-                std::ostringstream err;
-                if ( schema_.empty() )
-                {
-                  err << "Pgraster Plugin: unable to lookup available table"
-                      << " overviews due to unknown schema";
-                  throw mapnik::datasource_exception(err.str());
-                }
-                if ( geometryColumn_.empty() )
-                {
-                  err << "Pgraster Plugin: unable to lookup available table"
-                      << " overviews due to unknown column name";
-                  throw mapnik::datasource_exception(err.str());
-                }
-
-                std::ostringstream s;
-                s << "select "
-                     "r.r_table_schema sch, "
-                     "r.r_table_name tab, "
-                     "r.r_raster_column col, "
-                     "greatest(abs(r.scale_x), abs(r.scale_y)) scl "
-                     "from"
-                     " raster_overviews o,"
-                     " raster_columns r "
-                     "where"
-                     " o.r_table_schema = '"
-                  << mapnik::sql_utils::unquote_double(schema_)
-                  << "' and o.r_table_name = '"
-                  << mapnik::sql_utils::unquote_double(raster_table_)
-                  << "' and o.r_raster_column = '"
-                  << mapnik::sql_utils::unquote_double(geometryColumn_)
-                  << "' and r.r_table_schema = o.o_table_schema"
-                     " and r.r_table_name = o.o_table_name"
-                     " and r.r_raster_column = o.o_raster_column"
-                     " ORDER BY scl ASC";
-                MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: running query " << s.str();
-                shared_ptr<ResultSet> rs = conn->executeQuery(s.str());
-                while (rs->next())
-                {
-                  pgraster_overview ov = pgraster_overview();
-
-                  ov.schema = rs->getValue("sch");
-                  ov.table = rs->getValue("tab");
-                  ov.column = rs->getValue("col");
-                  ov.scale = atof(rs->getValue("scl"));
-
-                  if(ov.scale == 0.0f)
-                  {
-                    MAPNIK_LOG_WARN(pgraster) << "pgraster_datasource: found invalid overview "
-                      << ov.schema << "." << ov.table << "." << ov.column << " with scale " << ov.scale;
-                    continue;
-                  }
-
-                  overviews_.push_back(ov);
-
-                  MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: found overview " << ov.schema << "." << ov.table << "." << ov.column << " with scale " << ov.scale;
-                }
-                rs->close();
-                if ( overviews_.empty() ) {
-                  MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: no overview found for " << schema_ << "." << raster_table_ << "." << geometryColumn_;
-                }
-            }
-
-            // detect primary key
-            if (*autodetect_key_field && key_field_.empty())
-            {
-#ifdef MAPNIK_STATS
-                mapnik::progress_timer __stats2__(std::clog, "pgraster_datasource::bind(get_primary_key)");
-#endif
-
-                std::ostringstream s;
-                s << "SELECT a.attname, a.attnum, t.typname, t.typname in ('int2','int4','int8') "
-                    "AS is_int FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n, pg_index i "
-                    "WHERE a.attnum > 0 AND a.attrelid = c.oid "
-                    "AND a.atttypid = t.oid AND c.relnamespace = n.oid "
-                    "AND c.oid = i.indrelid AND i.indisprimary = 't' "
-                    "AND t.typname !~ '^geom' AND c.relname ="
-                  << " '" << mapnik::sql_utils::unquote_double(raster_table_) << "' "
-                    //"AND a.attnum = ANY (i.indkey) " // postgres >= 8.1
-                  << "AND (i.indkey[0]=a.attnum OR i.indkey[1]=a.attnum OR i.indkey[2]=a.attnum "
-                    "OR i.indkey[3]=a.attnum OR i.indkey[4]=a.attnum OR i.indkey[5]=a.attnum "
-                    "OR i.indkey[6]=a.attnum OR i.indkey[7]=a.attnum OR i.indkey[8]=a.attnum "
-                    "OR i.indkey[9]=a.attnum) ";
-                if (! schema_.empty())
-                {
-                    s << "AND n.nspname='"
-                      << mapnik::sql_utils::unquote_double(schema_)
-                      << "' ";
-                }
-                s << "ORDER BY a.attnum";
-
-                shared_ptr<ResultSet> rs_key = conn->executeQuery(s.str());
-                if (rs_key->next())
-                {
-                    unsigned int result_rows = rs_key->size();
-                    if (result_rows == 1)
+                    if ( schema_.empty() )
                     {
-                        bool is_int = (std::string(rs_key->getValue(3)) == "t");
-                        if (is_int)
-                        {
-                            const char* key_field_string = rs_key->getValue(0);
-                            if (key_field_string)
-                            {
-                                key_field_ = std::string(key_field_string);
-
-                                MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: auto-detected key field of '"
-                                                          << key_field_ << "' on table '" << raster_table_ << "'";
-                            }
-                        }
-                        else
-                        {
-                            // throw for cases like a numeric primary key, which is invalid
-                            // as it should be floating point (int numerics are useless)
-                            std::ostringstream err;
-                            err << "PostGIS Plugin: Error: '"
-                                << rs_key->getValue(0)
-                                << "' on table '"
-                                << raster_table_
-                                << "' is not a valid integer primary key field\n";
-                            throw mapnik::datasource_exception(err.str());
-                        }
-                    }
-                    else if (result_rows > 1)
-                    {
-                        std::ostringstream err;
-                        err << "PostGIS Plugin: Error: '"
-                            << "multi column primary key detected but is not supported";
-                        throw mapnik::datasource_exception(err.str());
-                    }
-                }
-                rs_key->close();
-            }
-
-            // if a globally unique key field/primary key is required
-            // but still not known at this point, then throw
-            if (*autodetect_key_field && key_field_.empty())
-            {
-                throw mapnik::datasource_exception(std::string("PostGIS Plugin: Error: primary key required")
-                                                   + " but could not be detected for table '" +
-                                                   raster_table_ + "', please supply 'key_field' option to specify field to use for primary key");
-            }
-
-            if (srid_ == 0)
-            {
-                srid_ = -1;
-
-                MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: Table " << table_ << " is using SRID=" << srid_;
-            }
-
-            // At this point the geometry_field may still not be known
-            // but we'll catch that where more useful...
-            MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: Using SRID=" << srid_;
-            MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: Using geometry_column=" << geometryColumn_;
-
-            // collect attribute desc
-#ifdef MAPNIK_STATS
-            mapnik::progress_timer __stats2__(std::clog, "pgraster_datasource::bind(get_column_description)");
-#endif
-
-            std::ostringstream s;
-            s << "SELECT * FROM " << populate_tokens(table_) << " LIMIT 0";
-
-            shared_ptr<ResultSet> rs = conn->executeQuery(s.str());
-            int count = rs->getNumFields();
-            bool found_key_field = false;
-            for (int i = 0; i < count; ++i)
-            {
-                std::string fld_name = rs->getFieldName(i);
-                int type_oid = rs->getTypeOID(i);
-
-                // validate type of key_field
-                if (! found_key_field && ! key_field_.empty() && fld_name == key_field_)
-                {
-                    if (type_oid == 20 || type_oid == 21 || type_oid == 23)
-                    {
-                        found_key_field = true;
-                        desc_.add_descriptor(attribute_descriptor(fld_name, mapnik::Integer));
-                    }
-                    else
-                    {
-                        std::ostringstream error_s;
-                        error_s << "invalid type '";
-
-                        std::ostringstream type_s;
-                        type_s << "SELECT oid, typname FROM pg_type WHERE oid = " << type_oid;
-
-                        shared_ptr<ResultSet> rs_oid = conn->executeQuery(type_s.str());
-                        if (rs_oid->next())
-                        {
-                            error_s << rs_oid->getValue("typname")
-                                    << "' (oid:" << rs_oid->getValue("oid") << ")";
-                        }
-                        else
-                        {
-                            error_s << "oid:" << type_oid << "'";
-                        }
-
-                        rs_oid->close();
-                        error_s << " for key_field '" << fld_name << "' - "
-                                << "must be an integer primary key";
-
-                        rs->close();
-                        throw mapnik::datasource_exception(error_s.str());
+                        schema_ = rs->getValue("r_table_schema");
                     }
                 }
                 else
                 {
-                    switch (type_oid)
-                    {
-                    case 16:    // bool
-                        desc_.add_descriptor(attribute_descriptor(fld_name, mapnik::Boolean));
-                        break;
-                    case 20:    // int8
-                    case 21:    // int2
-                    case 23:    // int4
-                        desc_.add_descriptor(attribute_descriptor(fld_name, mapnik::Integer));
-                        break;
-                    case 700:   // float4
-                    case 701:   // float8
-                    case 1700:  // numeric
-                        desc_.add_descriptor(attribute_descriptor(fld_name, mapnik::Double));
-                        break;
-                    case 1042:  // bpchar
-                    case 1043:  // varchar
-                    case 25:    // text
-                    case 705:   // literal
-                        desc_.add_descriptor(attribute_descriptor(fld_name, mapnik::String));
-                        break;
-                    default: // should not get here
-#ifdef MAPNIK_LOG
-                        s.str("");
-                        s << "SELECT oid, typname FROM pg_type WHERE oid = " << type_oid;
-
-                        shared_ptr<ResultSet> rs_oid = conn->executeQuery(s.str());
-                        if (rs_oid->next())
-                        {
-                            std::string typname(rs_oid->getValue("typname"));
-                            if (typname != "geometry" && typname != "raster")
-                            {
-                                MAPNIK_LOG_WARN(pgraster) << "pgraster_datasource: Unknown type=" << typname
-                                                         << " (oid:" << rs_oid->getValue("oid") << ")";
-                            }
-                        }
-                        else
-                        {
-                            MAPNIK_LOG_WARN(pgraster) << "pgraster_datasource: Unknown type_oid=" << type_oid;
-                        }
-                        rs_oid->close();
-#endif
-                        break;
-                    }
+                    MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: no response from metadata query " << s.str();
                 }
+                rs->close();
+            }
+            catch (mapnik::datasource_exception const& ex) {
+                // let this pass on query error and use the fallback below
+                MAPNIK_LOG_WARN(pgraster) << "pgraster_datasource: metadata query failed: " << ex.what();
             }
 
-            rs->close();
+            // If we still do not know the srid then we can try to fetch
+            // it from the 'table_' parameter, which should work even if it is
+            // a subselect as long as we know the geometry_field to query
+            if (! geometryColumn_.empty() && srid_ <= 0)
+            {
+                s.str("");
 
+                s << "SELECT ST_SRID(\"" << geometryColumn_ << "\") AS srid FROM "
+                  << populate_tokens(table_) << " WHERE \"" << geometryColumn_ << "\" IS NOT NULL LIMIT 1;";
+
+                shared_ptr<ResultSet> rs = conn->executeQuery(s.str());
+                if (rs->next())
+                {
+                    const char* srid_c = rs->getValue("srid");
+                    if (srid_c != nullptr)
+                    {
+                        int result = 0;
+                        const char * end = srid_c + std::strlen(srid_c);
+                        if (mapnik::util::string2int(srid_c, end, result))
+                        {
+                            srid_ = result;
+                        }
+                    }
+                }
+                rs->close();
+            }
         }
 
-        // Close explicitly the connection so we can 'fork()' without sharing open connections
-        conn->close();
+        // If overviews were requested, take note of the max scale
+        // of each available overview, sorted by scale descending
+        if ( use_overviews_ )
+        {
+            std::ostringstream err;
+            if ( schema_.empty() )
+            {
+                err << "Pgraster Plugin: unable to lookup available table"
+                    << " overviews due to unknown schema";
+                throw mapnik::datasource_exception(err.str());
+            }
+            if ( geometryColumn_.empty() )
+            {
+                err << "Pgraster Plugin: unable to lookup available table"
+                    << " overviews due to unknown column name";
+                throw mapnik::datasource_exception(err.str());
+            }
 
+            std::ostringstream s;
+            s << "select "
+                 "r.r_table_schema sch, "
+                 "r.r_table_name tab, "
+                 "r.r_raster_column col, "
+                 "greatest(abs(r.scale_x), abs(r.scale_y)) scl "
+                 "from"
+                 " raster_overviews o,"
+                 " raster_columns r "
+                 "where"
+                 " o.r_table_schema = '"
+              << mapnik::sql_utils::unquote_double(schema_)
+              << "' and o.r_table_name = '"
+              << mapnik::sql_utils::unquote_double(raster_table_)
+              << "' and o.r_raster_column = '"
+              << mapnik::sql_utils::unquote_double(geometryColumn_)
+              << "' and r.r_table_schema = o.o_table_schema"
+                 " and r.r_table_name = o.o_table_name"
+                 " and r.r_raster_column = o.o_raster_column"
+                 " ORDER BY scl ASC";
+            MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: running query " << s.str();
+            shared_ptr<ResultSet> rs = conn->executeQuery(s.str());
+            while (rs->next())
+            {
+                pgraster_overview ov = pgraster_overview();
+
+                ov.schema = rs->getValue("sch");
+                ov.table = rs->getValue("tab");
+                ov.column = rs->getValue("col");
+                ov.scale = atof(rs->getValue("scl"));
+
+                if(ov.scale == 0.0f)
+                {
+                    MAPNIK_LOG_WARN(pgraster) << "pgraster_datasource: found invalid overview "
+                      << ov.schema << "." << ov.table << "." << ov.column << " with scale " << ov.scale;
+                    continue;
+                }
+
+                overviews_.push_back(ov);
+
+                MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: found overview "
+                  << ov.schema << "." << ov.table << "." << ov.column << " with scale " << ov.scale;
+            }
+            rs->close();
+            if ( overviews_.empty() ) {
+                MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: no overview found for "
+                  << schema_ << "." << raster_table_ << "." << geometryColumn_;
+            }
+        }
+
+        // detect primary key
+        if (*autodetect_key_field && key_field_.empty())
+        {
+#ifdef MAPNIK_STATS
+            mapnik::progress_timer __stats2__(std::clog, "pgraster_datasource::bind(get_primary_key)");
+#endif
+
+            std::ostringstream s;
+            s << "SELECT a.attname, a.attnum, t.typname, t.typname in ('int2','int4','int8') "
+                "AS is_int FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n, pg_index i "
+                "WHERE a.attnum > 0 AND a.attrelid = c.oid "
+                "AND a.atttypid = t.oid AND c.relnamespace = n.oid "
+                "AND c.oid = i.indrelid AND i.indisprimary = 't' "
+                "AND t.typname !~ '^geom' AND c.relname ="
+              << " '" << mapnik::sql_utils::unquote_double(raster_table_) << "' "
+                //"AND a.attnum = ANY (i.indkey) " // postgres >= 8.1
+              << "AND (i.indkey[0]=a.attnum OR i.indkey[1]=a.attnum OR i.indkey[2]=a.attnum "
+                "OR i.indkey[3]=a.attnum OR i.indkey[4]=a.attnum OR i.indkey[5]=a.attnum "
+                "OR i.indkey[6]=a.attnum OR i.indkey[7]=a.attnum OR i.indkey[8]=a.attnum "
+                "OR i.indkey[9]=a.attnum) ";
+            if (! schema_.empty())
+            {
+                s << "AND n.nspname='"
+                  << mapnik::sql_utils::unquote_double(schema_)
+                  << "' ";
+            }
+            s << "ORDER BY a.attnum";
+
+            shared_ptr<ResultSet> rs_key = conn->executeQuery(s.str());
+            if (rs_key->next())
+            {
+                unsigned int result_rows = rs_key->size();
+                if (result_rows == 1)
+                {
+                    bool is_int = (std::string(rs_key->getValue(3)) == "t");
+                    if (is_int)
+                    {
+                        const char* key_field_string = rs_key->getValue(0);
+                        if (key_field_string)
+                        {
+                            key_field_ = std::string(key_field_string);
+
+                            MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: auto-detected key field of '"
+                                                      << key_field_ << "' on table '" << raster_table_ << "'";
+                        }
+                    }
+                    else
+                    {
+                        // throw for cases like a numeric primary key, which is invalid
+                        // as it should be floating point (int numerics are useless)
+                        std::ostringstream err;
+                        err << "PostGIS Plugin: Error: '"
+                            << rs_key->getValue(0)
+                            << "' on table '"
+                            << raster_table_
+                            << "' is not a valid integer primary key field\n";
+                        throw mapnik::datasource_exception(err.str());
+                    }
+                }
+                else if (result_rows > 1)
+                {
+                    std::ostringstream err;
+                    err << "PostGIS Plugin: Error: '"
+                        << "multi column primary key detected but is not supported";
+                    throw mapnik::datasource_exception(err.str());
+                }
+            }
+            rs_key->close();
+        }
+
+        // if a globally unique key field/primary key is required
+        // but still not known at this point, then throw
+        if (*autodetect_key_field && key_field_.empty())
+        {
+            throw mapnik::datasource_exception(std::string("PostGIS Plugin: Error: primary key required")
+                                               + " but could not be detected for table '" +
+                                               raster_table_ + "', please supply 'key_field' option to specify field to use for primary key");
+        }
+
+        if (srid_ == 0)
+        {
+            srid_ = -1;
+
+            MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: Table " << table_ << " is using SRID=" << srid_;
+        }
+
+        // At this point the geometry_field may still not be known
+        // but we'll catch that where more useful...
+        MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: Using SRID=" << srid_;
+        MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: Using geometry_column=" << geometryColumn_;
+
+        // collect attribute desc
+#ifdef MAPNIK_STATS
+        mapnik::progress_timer __stats2__(std::clog, "pgraster_datasource::bind(get_column_description)");
+#endif
+
+        std::ostringstream s;
+        s << "SELECT * FROM " << populate_tokens(table_) << " LIMIT 0";
+
+        shared_ptr<ResultSet> rs = conn->executeQuery(s.str());
+        int count = rs->getNumFields();
+        bool found_key_field = false;
+        for (int i = 0; i < count; ++i)
+        {
+            std::string fld_name = rs->getFieldName(i);
+            int type_oid = rs->getTypeOID(i);
+
+            // validate type of key_field
+            if (! found_key_field && ! key_field_.empty() && fld_name == key_field_)
+            {
+                if (type_oid == 20 || type_oid == 21 || type_oid == 23)
+                {
+                    found_key_field = true;
+                    desc_.add_descriptor(attribute_descriptor(fld_name, mapnik::Integer));
+                }
+                else
+                {
+                    std::ostringstream error_s;
+                    error_s << "invalid type '";
+
+                    std::ostringstream type_s;
+                    type_s << "SELECT oid, typname FROM pg_type WHERE oid = " << type_oid;
+
+                    shared_ptr<ResultSet> rs_oid = conn->executeQuery(type_s.str());
+                    if (rs_oid->next())
+                    {
+                        error_s << rs_oid->getValue("typname")
+                                << "' (oid:" << rs_oid->getValue("oid") << ")";
+                    }
+                    else
+                    {
+                        error_s << "oid:" << type_oid << "'";
+                    }
+
+                    rs_oid->close();
+                    error_s << " for key_field '" << fld_name << "' - "
+                            << "must be an integer primary key";
+
+                    rs->close();
+                    throw mapnik::datasource_exception(error_s.str());
+                }
+            }
+            else
+            {
+                switch (type_oid)
+                {
+                case 16:    // bool
+                    desc_.add_descriptor(attribute_descriptor(fld_name, mapnik::Boolean));
+                    break;
+                case 20:    // int8
+                case 21:    // int2
+                case 23:    // int4
+                    desc_.add_descriptor(attribute_descriptor(fld_name, mapnik::Integer));
+                    break;
+                case 700:   // float4
+                case 701:   // float8
+                case 1700:  // numeric
+                    desc_.add_descriptor(attribute_descriptor(fld_name, mapnik::Double));
+                    break;
+                case 1042:  // bpchar
+                case 1043:  // varchar
+                case 25:    // text
+                case 705:   // literal
+                    desc_.add_descriptor(attribute_descriptor(fld_name, mapnik::String));
+                    break;
+                default: // should not get here
+#ifdef MAPNIK_LOG
+                    s.str("");
+                    s << "SELECT oid, typname FROM pg_type WHERE oid = " << type_oid;
+
+                    shared_ptr<ResultSet> rs_oid = conn->executeQuery(s.str());
+                    if (rs_oid->next())
+                    {
+                        std::string typname(rs_oid->getValue("typname"));
+                        if (typname != "geometry" && typname != "raster")
+                        {
+                            MAPNIK_LOG_WARN(pgraster) << "pgraster_datasource: Unknown type=" << typname
+                                                     << " (oid:" << rs_oid->getValue("oid") << ")";
+                        }
+                    }
+                    else
+                    {
+                        MAPNIK_LOG_WARN(pgraster) << "pgraster_datasource: Unknown type_oid=" << type_oid;
+                    }
+                    rs_oid->close();
+#endif
+                    break;
+                }
+            }
+        }
+
+        rs->close();
     }
+
+    // Close explicitly the connection so we can 'fork()' without sharing open connections
+    conn->close();
 }
 
 pgraster_datasource::~pgraster_datasource()

From 428ba432b18e520b5df3a6c6512f0738cd26dc24 Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Thu, 9 Feb 2017 15:23:39 +0100
Subject: [PATCH 241/328] pgraster: copy quoting and interpolation changes from
 postgis

---
 .../input/pgraster/pgraster_datasource.cpp    | 331 ++++++++----------
 .../input/pgraster/pgraster_datasource.hpp    |  20 +-
 2 files changed, 164 insertions(+), 187 deletions(-)

diff --git a/plugins/input/pgraster/pgraster_datasource.cpp b/plugins/input/pgraster/pgraster_datasource.cpp
index 2be3df9a9..0abd5032a 100644
--- a/plugins/input/pgraster/pgraster_datasource.cpp
+++ b/plugins/input/pgraster/pgraster_datasource.cpp
@@ -41,10 +41,10 @@
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/algorithm/string.hpp>
-#include <boost/tokenizer.hpp>
 #pragma GCC diagnostic pop
 
 // stl
+#include <cfloat> // FLT_MAX
 #include <string>
 #include <algorithm>
 #include <set>
@@ -53,28 +53,19 @@
 
 DATASOURCE_PLUGIN(pgraster_datasource)
 
-const double pgraster_datasource::FMAX = std::numeric_limits<float>::max();
 const std::string pgraster_datasource::RASTER_COLUMNS = "raster_columns";
 const std::string pgraster_datasource::RASTER_OVERVIEWS = "raster_overviews";
 const std::string pgraster_datasource::SPATIAL_REF_SYS = "spatial_ref_system";
 
 using std::shared_ptr;
 using mapnik::attribute_descriptor;
+using mapnik::sql_utils::identifier;
+using mapnik::sql_utils::literal;
 using mapnik::value_integer;
 
-namespace {
-
-  // TODO: move to sql_utils
-  std::string quote_ident(std::string& s) {
-    return "\"" + s + "\""; // TODO: escape internal quotes
-  }
-
-};
-
 pgraster_datasource::pgraster_datasource(parameters const& params)
     : datasource(params),
       table_(*params.get<std::string>("table", "")),
-      schema_(""),
       raster_table_(*params.get<std::string>("raster_table", "")),
       raster_field_(*params.get<std::string>("raster_field", "")),
       key_field_(*params.get<std::string>("key_field", "")),
@@ -94,10 +85,7 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
              params.get<std::string>("user"),
              params.get<std::string>("password"),
              params.get<std::string>("connect_timeout", "4")),
-      bbox_token_("!bbox!"),
-      scale_denom_token_("!scale_denominator!"),
-      pixel_width_token_("!pixel_width!"),
-      pixel_height_token_("!pixel_height!"),
+      re_tokens_("!(@?\\w+)!"), // matches  !mapnik_var!  or  !@user_var!
       pool_max_size_(*params_.get<value_integer>("max_size", 10)),
       persist_connection_(*params.get<mapnik::boolean_type>("persist_connection", true)),
       extent_from_subquery_(*params.get<mapnik::boolean_type>("extent_from_subquery", false)),
@@ -152,13 +140,15 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
 
         if (raster_table_.empty())
         {
-            raster_table_ = mapnik::sql_utils::table_from_sql(table_);
+            mapnik::sql_utils::table_from_sql
+                (table_, parsed_schema_, parsed_table_);
+
             // non-trivial subqueries (having no FROM) make it
             // impossible to use overviews
             // TODO: improve "table_from_sql" ?
-            if ( raster_table_[raster_table_.find_first_not_of(" \t\r\n")] == '(' )
+            auto nsp = table_.find_first_not_of(" \t\r\n");
+            if (nsp != std::string::npos && table_[nsp] == '(')
             {
-                raster_table_.clear();
                 if ( use_overviews_ )
                 {
                     std::ostringstream err;
@@ -176,12 +166,10 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
                 }
             }
         }
-
-        std::string::size_type idx = raster_table_.find_last_of('.');
-        if (idx != std::string::npos)
+        else
         {
-            schema_ = raster_table_.substr(0, idx);
-            raster_table_ = raster_table_.substr(idx + 1);
+            mapnik::sql_utils::table_from_sql
+                (raster_table_, parsed_schema_, parsed_table_);
         }
 
         // If we do not know either the geometry_field or the srid or we
@@ -194,10 +182,10 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
         // the table parameter references a table, view, or subselect not
         // registered in the geometry columns.
         //
-        geometryColumn_ = mapnik::sql_utils::unquote_double(raster_field_);
-        if (!raster_table_.empty() && (
+        geometryColumn_ = mapnik::sql_utils::unquote_copy('"', raster_field_);
+        if (!parsed_table_.empty() && (
               geometryColumn_.empty() || srid_ == 0 ||
-              (schema_.empty() && use_overviews_) ||
+              (parsed_schema_.empty() && use_overviews_) ||
               ! extent_initialized_
            ))
         {
@@ -213,21 +201,15 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
                     s << ", st_xmin(extent) xmin, st_ymin(extent) ymin"
                       << ", st_xmax(extent) xmax, st_ymax(extent) ymax";
                 }
-                s << " FROM "
-                  << RASTER_COLUMNS << " WHERE r_table_name='"
-                  << mapnik::sql_utils::unquote_double(raster_table_)
-                  << "'";
-                if (! schema_.empty())
+                s << " FROM " << RASTER_COLUMNS
+                  << " WHERE r_table_name=" << literal(parsed_table_);
+                if (!parsed_schema_.empty())
                 {
-                    s << " AND r_table_schema='"
-                      << mapnik::sql_utils::unquote_double(schema_)
-                      << "'";
+                    s << " AND r_table_schema=" << literal(parsed_schema_);
                 }
-                if (! raster_field_.empty())
+                if (!geometryColumn_.empty())
                 {
-                    s << " AND r_raster_column='"
-                      << mapnik::sql_utils::unquote_double(raster_field_)
-                      << "'";
+                    s << " AND r_raster_column=" << literal(geometryColumn_);
                 }
                 MAPNIK_LOG_DEBUG(pgraster) <<
                   "pgraster_datasource: running query " << s.str();
@@ -265,9 +247,9 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
                             }
                         }
                     }
-                    if ( schema_.empty() )
+                    if (parsed_schema_.empty())
                     {
-                        schema_ = rs->getValue("r_table_schema");
+                        parsed_schema_ = rs->getValue("r_table_schema");
                     }
                 }
                 else
@@ -288,8 +270,10 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
             {
                 s.str("");
 
-                s << "SELECT ST_SRID(\"" << geometryColumn_ << "\") AS srid FROM "
-                  << populate_tokens(table_) << " WHERE \"" << geometryColumn_ << "\" IS NOT NULL LIMIT 1;";
+                s << "SELECT ST_SRID(" << identifier(geometryColumn_)
+                  << ") AS srid FROM " << populate_tokens(table_)
+                  << " WHERE " << identifier(geometryColumn_)
+                  << " IS NOT NULL LIMIT 1";
 
                 shared_ptr<ResultSet> rs = conn->executeQuery(s.str());
                 if (rs->next())
@@ -314,13 +298,13 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
         if ( use_overviews_ )
         {
             std::ostringstream err;
-            if ( schema_.empty() )
+            if (parsed_schema_.empty())
             {
                 err << "Pgraster Plugin: unable to lookup available table"
                     << " overviews due to unknown schema";
                 throw mapnik::datasource_exception(err.str());
             }
-            if ( geometryColumn_.empty() )
+            if (geometryColumn_.empty())
             {
                 err << "Pgraster Plugin: unable to lookup available table"
                     << " overviews due to unknown column name";
@@ -337,13 +321,10 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
                  " raster_overviews o,"
                  " raster_columns r "
                  "where"
-                 " o.r_table_schema = '"
-              << mapnik::sql_utils::unquote_double(schema_)
-              << "' and o.r_table_name = '"
-              << mapnik::sql_utils::unquote_double(raster_table_)
-              << "' and o.r_raster_column = '"
-              << mapnik::sql_utils::unquote_double(geometryColumn_)
-              << "' and r.r_table_schema = o.o_table_schema"
+                 " o.r_table_schema = " << literal(parsed_schema_)
+              << " and o.r_table_name = " << literal(parsed_table_)
+              << " and o.r_raster_column = " << literal(geometryColumn_)
+              << " and r.r_table_schema = o.o_table_schema"
                  " and r.r_table_name = o.o_table_name"
                  " and r.r_raster_column = o.o_raster_column"
                  " ORDER BY scl ASC";
@@ -373,7 +354,7 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
             rs->close();
             if ( overviews_.empty() ) {
                 MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: no overview found for "
-                  << schema_ << "." << raster_table_ << "." << geometryColumn_;
+                  << parsed_schema_ << "." << parsed_table_ << "." << geometryColumn_;
             }
         }
 
@@ -390,18 +371,15 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
                 "WHERE a.attnum > 0 AND a.attrelid = c.oid "
                 "AND a.atttypid = t.oid AND c.relnamespace = n.oid "
                 "AND c.oid = i.indrelid AND i.indisprimary = 't' "
-                "AND t.typname !~ '^geom' AND c.relname ="
-              << " '" << mapnik::sql_utils::unquote_double(raster_table_) << "' "
+                "AND t.typname !~ '^geom' AND c.relname = " << literal(parsed_table_) << " "
                 //"AND a.attnum = ANY (i.indkey) " // postgres >= 8.1
               << "AND (i.indkey[0]=a.attnum OR i.indkey[1]=a.attnum OR i.indkey[2]=a.attnum "
                 "OR i.indkey[3]=a.attnum OR i.indkey[4]=a.attnum OR i.indkey[5]=a.attnum "
                 "OR i.indkey[6]=a.attnum OR i.indkey[7]=a.attnum OR i.indkey[8]=a.attnum "
                 "OR i.indkey[9]=a.attnum) ";
-            if (! schema_.empty())
+            if (!parsed_schema_.empty())
             {
-                s << "AND n.nspname='"
-                  << mapnik::sql_utils::unquote_double(schema_)
-                  << "' ";
+                s << "AND n.nspname=" << literal(parsed_schema_) << ' ';
             }
             s << "ORDER BY a.attnum";
 
@@ -420,7 +398,7 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
                             key_field_ = std::string(key_field_string);
 
                             MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: auto-detected key field of '"
-                                                      << key_field_ << "' on table '" << raster_table_ << "'";
+                                                       << key_field_ << "' on table '" << parsed_table_ << "'";
                         }
                     }
                     else
@@ -431,7 +409,7 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
                         err << "PostGIS Plugin: Error: '"
                             << rs_key->getValue(0)
                             << "' on table '"
-                            << raster_table_
+                            << parsed_table_
                             << "' is not a valid integer primary key field\n";
                         throw mapnik::datasource_exception(err.str());
                     }
@@ -451,9 +429,11 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
         // but still not known at this point, then throw
         if (*autodetect_key_field && key_field_.empty())
         {
-            throw mapnik::datasource_exception(std::string("PostGIS Plugin: Error: primary key required")
-                                               + " but could not be detected for table '" +
-                                               raster_table_ + "', please supply 'key_field' option to specify field to use for primary key");
+            throw mapnik::datasource_exception(
+                "PostGIS Plugin: Error: primary key required"
+                " but could not be detected for table '"
+                + parsed_table_ + "', please supply 'key_field'"
+                " option to specify field to use for primary key");
         }
 
         if (srid_ == 0)
@@ -639,77 +619,76 @@ std::string pgraster_datasource::sql_bbox(box2d<double> const& env) const
 
 std::string pgraster_datasource::populate_tokens(std::string const& sql) const
 {
-    std::string populated_sql = sql;
-
-    if (boost::algorithm::icontains(sql, bbox_token_))
-    {
-        box2d<double> max_env(-1.0 * FMAX, -1.0 * FMAX, FMAX, FMAX);
-        const std::string max_box = sql_bbox(max_env);
-        boost::algorithm::replace_all(populated_sql, bbox_token_, max_box);
-    }
-
-    if (boost::algorithm::icontains(sql, scale_denom_token_))
-    {
-        std::ostringstream ss;
-        ss << FMAX;
-        boost::algorithm::replace_all(populated_sql, scale_denom_token_, ss.str());
-    }
-
-    if (boost::algorithm::icontains(sql, pixel_width_token_))
-    {
-        std::ostringstream ss;
-        ss << 0;
-        boost::algorithm::replace_all(populated_sql, pixel_width_token_, ss.str());
-    }
-
-    if (boost::algorithm::icontains(sql, pixel_height_token_))
-    {
-        std::ostringstream ss;
-        ss << 0;
-        boost::algorithm::replace_all(populated_sql, pixel_height_token_, ss.str());
-    }
-
-    return populated_sql;
+    return populate_tokens(sql, FLT_MAX,
+                           box2d<double>(-FLT_MAX, -FLT_MAX, FLT_MAX, FLT_MAX),
+                           0, 0, mapnik::attributes{}, false);
 }
 
-std::string pgraster_datasource::populate_tokens(std::string const& sql, double scale_denom, box2d<double> const& env, double pixel_width, double pixel_height) const
+std::string pgraster_datasource::populate_tokens(std::string const& sql,
+                                                 double scale_denom,
+                                                 box2d<double> const& env,
+                                                 double pixel_width,
+                                                 double pixel_height,
+                                                 mapnik::attributes const& vars,
+                                                 bool intersect) const
 {
-    std::string populated_sql = sql;
-    std::string box = sql_bbox(env);
+    std::ostringstream populated_sql;
+    std::cmatch m;
+    char const* start = sql.data();
+    char const* end = start + sql.size();
 
-    if (boost::algorithm::icontains(populated_sql, scale_denom_token_))
+    while (std::regex_search(start, end, m, re_tokens_))
     {
-        std::ostringstream ss;
-        ss << scale_denom;
-        boost::algorithm::replace_all(populated_sql, scale_denom_token_, ss.str());
+        populated_sql.write(start, m[0].first - start);
+        start = m[0].second;
+
+        auto m1 = boost::make_iterator_range(m[1].first, m[1].second);
+        if (m1.front() == '@')
+        {
+            std::string var_name(m1.begin() + 1, m1.end());
+            auto itr = vars.find(var_name);
+            if (itr != vars.end())
+            {
+                auto var_value = itr->second.to_string();
+                populated_sql << literal(var_value);
+            }
+            else
+            {
+                populated_sql << "NULL"; // undefined @variable
+            }
+        }
+        else if (boost::algorithm::equals(m1, "bbox"))
+        {
+            populated_sql << sql_bbox(env);
+            intersect = false;
+        }
+        else if (boost::algorithm::equals(m1, "pixel_height"))
+        {
+            populated_sql << pixel_height;
+        }
+        else if (boost::algorithm::equals(m1, "pixel_width"))
+        {
+            populated_sql << pixel_width;
+        }
+        else if (boost::algorithm::equals(m1, "scale_denominator"))
+        {
+            populated_sql << scale_denom;
+        }
+        else
+        {
+            populated_sql << "NULL"; // unrecognized !token!
+        }
     }
 
-    if (boost::algorithm::icontains(sql, pixel_width_token_))
-    {
-        std::ostringstream ss;
-        ss << pixel_width;
-        boost::algorithm::replace_all(populated_sql, pixel_width_token_, ss.str());
-    }
+    populated_sql.write(start, end - start);
 
-    if (boost::algorithm::icontains(sql, pixel_height_token_))
+    if (intersect)
     {
-        std::ostringstream ss;
-        ss << pixel_height;
-        boost::algorithm::replace_all(populated_sql, pixel_height_token_, ss.str());
-    }
-
-    if (boost::algorithm::icontains(populated_sql, bbox_token_))
-    {
-        boost::algorithm::replace_all(populated_sql, bbox_token_, box);
-        return populated_sql;
-    }
-    else
-    {
-        std::ostringstream s;
-
         if (intersect_min_scale_ > 0 && (scale_denom <= intersect_min_scale_))
         {
-            s << " WHERE ST_Intersects(\"" << geometryColumn_ << "\"," << box << ")";
+            populated_sql << " WHERE ST_Intersects("
+                          << identifier(geometryColumn_) << ", "
+                          << sql_bbox(env) << ")";
         }
         else if (intersect_max_scale_ > 0 && (scale_denom >= intersect_max_scale_))
         {
@@ -717,11 +696,13 @@ std::string pgraster_datasource::populate_tokens(std::string const& sql, double
         }
         else
         {
-            s << " WHERE \"" << geometryColumn_ << "\" && " << box;
+            populated_sql << " WHERE "
+                          << identifier(geometryColumn_) << " && "
+                          << sql_bbox(env);
         }
-
-        return populated_sql + s.str();
     }
+
+    return populated_sql.str();
 }
 
 
@@ -849,19 +830,19 @@ featureset_ptr pgraster_datasource::features_with_context(query const& q,process
             std::ostringstream s_error;
             s_error << "PostGIS: geometry name lookup failed for table '";
 
-            if (! schema_.empty())
+            if (!parsed_schema_.empty())
             {
-                s_error << schema_ << ".";
+                s_error << parsed_schema_ << ".";
             }
-            s_error << raster_table_
+            s_error << parsed_table_
                     << "'. Please manually provide the 'geometry_field' parameter or add an entry "
                     << "in the geometry_columns for '";
 
-            if (! schema_.empty())
+            if (!parsed_schema_.empty())
             {
-                s_error << schema_ << ".";
+                s_error << parsed_schema_ << ".";
             }
-            s_error << raster_table_ << "'.";
+            s_error << parsed_table_ << "'.";
 
             throw mapnik::datasource_exception(s_error.str());
         }
@@ -874,6 +855,7 @@ featureset_ptr pgraster_datasource::features_with_context(query const& q,process
 
         std::string table_with_bbox;
         std::string col = geometryColumn_;
+        table_with_bbox = table_; // possibly a subquery
 
         if ( use_overviews_ && !overviews_.empty()) {
           std::string sch = overviews_[0].schema;
@@ -901,18 +883,12 @@ featureset_ptr pgraster_datasource::features_with_context(query const& q,process
                 << " not good for min out scale " << scale;
             }
           }
-          table_with_bbox = table_; // possibly a subquery
-          boost::algorithm::replace_all(table_with_bbox,
-              mapnik::sql_utils::unquote_double(raster_table_), tab);
-          boost::algorithm::replace_all(table_with_bbox,
-              mapnik::sql_utils::unquote_double(schema_), sch);
-          boost::algorithm::replace_all(table_with_bbox,
-              mapnik::sql_utils::unquote_double(geometryColumn_), col);
-          table_with_bbox = populate_tokens(table_with_bbox,
-              scale_denom, box, px_gw, px_gh);
-        } else {
-          table_with_bbox = populate_tokens(table_, scale_denom, box, px_gw, px_gh);
+          boost::algorithm::replace_all(table_with_bbox, parsed_table_, tab);
+          boost::algorithm::replace_all(table_with_bbox, parsed_schema_, sch);
+          boost::algorithm::replace_all(table_with_bbox, geometryColumn_, col);
         }
+        table_with_bbox = populate_tokens(table_with_bbox, scale_denom, box,
+                                          px_gw, px_gh, q.variables());
 
         std::ostringstream s;
 
@@ -924,21 +900,21 @@ featureset_ptr pgraster_datasource::features_with_context(query const& q,process
 
         if (clip_rasters_) s << "ST_Clip(";
 
-        s << "\"" << col << "\"";
+        s << identifier(col);
 
         if (clip_rasters_) {
           s << ", ST_Expand(" << sql_bbox(box)
-            << ", greatest(abs(ST_ScaleX(\""
-            << col << "\")), abs(ST_ScaleY(\""
-            << col << "\")))))";
+            << ", greatest(abs(ST_ScaleX("
+            << identifier(col) << ")), abs(ST_ScaleY("
+            << identifier(col) << ")))))";
         }
 
         if (prescale_rasters_) {
           const double scale = std::min(px_gw, px_gh);
-          s << ", least(abs(ST_ScaleX(\"" << col
-            << "\"))::float8/" << scale
-            << ", 1.0), least(abs(ST_ScaleY(\"" << col
-            << "\"))::float8/" << scale << ", 1.0))";
+          s << ", least(1.0, abs(ST_ScaleX(" << identifier(col)
+            << "))::float8/" << scale
+            << "), least(1.0, abs(ST_ScaleY(" << identifier(col)
+            << "))::float8/" << scale << "))";
           // TODO: if band_ is given, we'll interpret as indexed so
           //       the rescaling must NOT ruin it (use algorithm mode!)
         }
@@ -954,14 +930,14 @@ featureset_ptr pgraster_datasource::features_with_context(query const& q,process
 
         if (! key_field_.empty())
         {
-            mapnik::sql_utils::quote_attr(s, key_field_);
+            s << ',' << identifier(key_field_);
             ctx->push(key_field_);
 
             for (; pos != end; ++pos)
             {
                 if (*pos != key_field_)
                 {
-                    mapnik::sql_utils::quote_attr(s, *pos);
+                    s << ',' << identifier(*pos);
                     ctx->push(*pos);
                 }
             }
@@ -970,7 +946,7 @@ featureset_ptr pgraster_datasource::features_with_context(query const& q,process
         {
             for (; pos != end; ++pos)
             {
-                mapnik::sql_utils::quote_attr(s, *pos);
+                s << ',' << identifier(*pos);
                 ctx->push(*pos);
             }
         }
@@ -1017,39 +993,39 @@ featureset_ptr pgraster_datasource::features_at_point(coord2d const& pt, double
                 std::ostringstream s_error;
                 s_error << "PostGIS: geometry name lookup failed for table '";
 
-                if (! schema_.empty())
+                if (!parsed_schema_.empty())
                 {
-                    s_error << schema_ << ".";
+                    s_error << parsed_schema_ << ".";
                 }
-                s_error << raster_table_
+                s_error << parsed_table_
                         << "'. Please manually provide the 'geometry_field' parameter or add an entry "
                         << "in the geometry_columns for '";
 
-                if (! schema_.empty())
+                if (!parsed_schema_.empty())
                 {
-                    s_error << schema_ << ".";
+                    s_error << parsed_schema_ << ".";
                 }
-                s_error << raster_table_ << "'.";
+                s_error << parsed_table_ << "'.";
 
                 throw mapnik::datasource_exception(s_error.str());
             }
 
             std::ostringstream s;
-            s << "SELECT ST_AsBinary(\"" << geometryColumn_ << "\") AS geom";
+            s << "SELECT ST_AsBinary(" << identifier(geometryColumn_) << ") AS geom";
 
             mapnik::context_ptr ctx = std::make_shared<mapnik::context_type>();
             auto const& desc = desc_.get_descriptors();
 
             if (!key_field_.empty())
             {
-                mapnik::sql_utils::quote_attr(s, key_field_);
+                s << ',' << identifier(key_field_);
                 ctx->push(key_field_);
                 for (auto const& attr_info : desc)
                 {
                     std::string const& name = attr_info.get_name();
                     if (name != key_field_)
                     {
-                        mapnik::sql_utils::quote_attr(s, name);
+                        s << ',' << identifier(name);
                         ctx->push(name);
                     }
                 }
@@ -1059,13 +1035,14 @@ featureset_ptr pgraster_datasource::features_at_point(coord2d const& pt, double
                 for (auto const& attr_info : desc)
                 {
                     std::string const& name = attr_info.get_name();
-                    mapnik::sql_utils::quote_attr(s, name);
+                    s << ',' << identifier(name);
                     ctx->push(name);
                 }
             }
 
             box2d<double> box(pt.x - tol, pt.y - tol, pt.x + tol, pt.y + tol);
-            std::string table_with_bbox = populate_tokens(table_, FMAX, box, 0, 0);
+            std::string table_with_bbox = populate_tokens(table_, FLT_MAX, box, 0, 0,
+                                                          mapnik::attributes{});
 
             s << " FROM " << table_with_bbox;
 
@@ -1098,9 +1075,9 @@ box2d<double> pgraster_datasource::envelope() const
         {
             std::ostringstream s;
 
-            std::string col = mapnik::sql_utils::unquote_double(geometryColumn_);
-            std::string sch = mapnik::sql_utils::unquote_double(schema_);
-            std::string tab = mapnik::sql_utils::unquote_double(raster_table_);
+            std::string col = geometryColumn_;
+            std::string sch = parsed_schema_;
+            std::string tab = parsed_table_;
 
             if ( ! overviews_.empty() )
             {
@@ -1120,7 +1097,7 @@ box2d<double> pgraster_datasource::envelope() const
                 {
                     s_error << sch << ".";
                 }
-                s_error << raster_table_ << "' because we cannot determine the raster field name."
+                s_error << parsed_table_ << "' because we cannot determine the raster field name."
                         << "\nPlease provide either an 'extent' parameter to skip this query, "
                         << "a 'raster_field' and/or 'raster_table' parameter, or add "
                         << "standard constraints to your raster table.";
@@ -1140,20 +1117,20 @@ box2d<double> pgraster_datasource::envelope() const
                   throw mapnik::datasource_exception("Pgraster Plugin: " + s_error.str());
                 }
                 s << "SELECT ST_XMin(ext),ST_YMin(ext),ST_XMax(ext),ST_YMax(ext)"
-                  << " FROM (SELECT ST_Estimated_Extent('";
+                  << " FROM (SELECT ST_Estimated_Extent(";
 
                 if (! sch.empty())
                 {
-                    s << mapnik::sql_utils::unquote_double(sch) << "','";
+                    s << literal(sch) << ',';
                 }
 
-                s << mapnik::sql_utils::unquote_double(tab) << "','"
-                  << mapnik::sql_utils::unquote_double(col) << "') as ext) as tmp";
+                s << literal(tab) << ','
+                  << literal(col) << ") as ext) as tmp";
             }
             else
             {
                 s << "SELECT ST_XMin(ext),ST_YMin(ext),ST_XMax(ext),ST_YMax(ext)"
-                  << " FROM (SELECT ST_Extent(" << quote_ident(col) << "::geometry) as ext from ";
+                  << " FROM (SELECT ST_Extent(" << identifier(col) << "::geometry) as ext from ";
 
                 if (extent_from_subquery_)
                 {
@@ -1165,12 +1142,12 @@ box2d<double> pgraster_datasource::envelope() const
                 {
                     if (! sch.empty())
                     {
-                        s << quote_ident(sch) << ".";
+                        s << identifier(sch) << ".";
                     }
 
                     // but if the subquery does not limit records then querying the
                     // actual table will be faster as indexes can be used
-                    s << quote_ident(tab) << ") as tmp";
+                    s << identifier(tab) << ") as tmp";
                 }
             }
 
diff --git a/plugins/input/pgraster/pgraster_datasource.hpp b/plugins/input/pgraster/pgraster_datasource.hpp
index cc86abf63..0ffe762b5 100644
--- a/plugins/input/pgraster/pgraster_datasource.hpp
+++ b/plugins/input/pgraster/pgraster_datasource.hpp
@@ -42,6 +42,7 @@
 #include <boost/optional.hpp>
 
 // stl
+#include <regex>
 #include <vector>
 #include <string>
 #include <memory>
@@ -90,24 +91,26 @@ public:
 
 private:
     std::string sql_bbox(box2d<double> const& env) const;
-    std::string populate_tokens(std::string const& sql, double scale_denom, box2d<double> const& env, double pixel_width, double pixel_height) const;
+    std::string populate_tokens(std::string const& sql, double scale_denom,
+                                box2d<double> const& env,
+                                double pixel_width, double pixel_height,
+                                mapnik::attributes const& vars,
+                                bool intersect = true) const;
     std::string populate_tokens(std::string const& sql) const;
     std::shared_ptr<IResultSet> get_resultset(std::shared_ptr<Connection> &conn, std::string const& sql, CnxPool_ptr const& pool, processor_context_ptr ctx= processor_context_ptr()) const;
     static const std::string RASTER_COLUMNS;
     static const std::string RASTER_OVERVIEWS;
     static const std::string SPATIAL_REF_SYS;
-    static const double FMAX;
 
     const std::string uri_;
     const std::string username_;
     const std::string password_;
     // table name (schema qualified or not) or subquery
     const std::string table_;
-    // schema name (possibly extracted from table_)
-    std::string schema_;
-    // table name (possibly extracted from table_)
-    std::string raster_table_;
+    const std::string raster_table_; // possibly schema-qualified
     const std::string raster_field_;
+    std::string parsed_schema_; // extracted from raster_table_ or table_
+    std::string parsed_table_; // extracted from raster_table_ or table_
     std::string key_field_;
     mapnik::value_integer cursor_fetch_size_;
     mapnik::value_integer row_limit_;
@@ -129,10 +132,7 @@ private:
     bool clip_rasters_;
     layer_descriptor desc_;
     ConnectionCreator<Connection> creator_;
-    const std::string bbox_token_;
-    const std::string scale_denom_token_;
-    const std::string pixel_width_token_;
-    const std::string pixel_height_token_;
+    std::regex re_tokens_;
     int pool_max_size_;
     bool persist_connection_;
     bool extent_from_subquery_;

From 49c28cb6addc24b800a725e20f446061be64ebea Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 17 Feb 2017 14:17:20 +0100
Subject: [PATCH 242/328] new font fallback implementation - it is rather
 inefficient but attempting to do a right thing. (NOTE: some visual text
 failures need further look to see if latest implementation is correct)

---
 include/mapnik/text/harfbuzz_shaper.hpp | 129 ++++++++++++++++++------
 1 file changed, 96 insertions(+), 33 deletions(-)

diff --git a/include/mapnik/text/harfbuzz_shaper.hpp b/include/mapnik/text/harfbuzz_shaper.hpp
index e4672526f..9edf8eb87 100644
--- a/include/mapnik/text/harfbuzz_shaper.hpp
+++ b/include/mapnik/text/harfbuzz_shaper.hpp
@@ -85,7 +85,6 @@ static void shape_text(text_line & line,
     mapnik::value_unicode_string const& text = itemizer.text();
     for (auto const& text_item : list)
     {
-        auto item_length = static_cast<int>(text_item.end - text_item.start);
         face_set_ptr face_set = font_manager.get_face_set(text_item.format_->face_name, text_item.format_->fontset);
         double size = text_item.format_->text_size * scale_factor;
         face_set->set_unscaled_character_sizes();
@@ -101,22 +100,24 @@ static void shape_text(text_line & line,
             hb_glyph_info_t glyph;
             hb_glyph_position_t position;
         };
+
         // this table is filled with information for rendering each glyph, so that
         // several font faces can be used in a single text_item
-        std::vector<glyph_face_info> glyphinfos;
-        int valid_glyphs = 0;
         std::size_t pos = 0;
+        std::map<unsigned, std::vector<glyph_face_info>> glyphinfos;
+
         for (auto const& face : *face_set)
         {
             ++pos;
             hb_buffer_clear_contents(buffer.get());
-            hb_buffer_add_utf16(buffer.get(), uchar_to_utf16(text.getBuffer()), text.length(), text_item.start, item_length);
+            hb_buffer_add_utf16(buffer.get(), uchar_to_utf16(text.getBuffer()), text.length(), text_item.start, static_cast<int>(text_item.end - text_item.start));
             hb_buffer_set_direction(buffer.get(), (text_item.dir == UBIDI_RTL) ? HB_DIRECTION_RTL : HB_DIRECTION_LTR);
             hb_buffer_set_script(buffer.get(), _icu_script_to_script(text_item.script));
             hb_font_t *font(hb_ft_font_create(face->get_face(), nullptr));
             // https://github.com/mapnik/test-data-visual/pull/25
+
 #if (HB_VERSION_MAJOR > 0 && HB_VERSION_ATLEAST(1, 0, 5))
-            hb_ft_font_set_load_flags(font, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING);
+            hb_ft_font_set_load_flags(font,FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING);
 #endif
             hb_shape(font, buffer.get(), ff_settings.get_features(), ff_count);
             hb_font_destroy(font);
@@ -125,51 +126,113 @@ static void shape_text(text_line & line,
             hb_glyph_info_t *glyphs = hb_buffer_get_glyph_infos(buffer.get(), &num_glyphs);
             hb_glyph_position_t *positions = hb_buffer_get_glyph_positions(buffer.get(), &num_glyphs);
 
-            // if the number of rendered glyphs has increased, we need to resize the table
-            if (num_glyphs > glyphinfos.size())
-            {
-                glyphinfos.resize(num_glyphs);
-            }
-            // Check if all glyphs are valid.
+            unsigned cluster = 0;
+            bool in_cluster = false;
+            std::vector<unsigned> clusters;
+
             for (unsigned i = 0; i < num_glyphs; ++i)
             {
+                if (i == 0)
+                {
+                    cluster = glyphs[0].cluster;
+                    clusters.push_back(cluster);
+                }
+                if (cluster != glyphs[i].cluster)
+                {
+                    cluster = glyphs[i].cluster;
+                    clusters.push_back(cluster);
+                    in_cluster = false;
+                }
+                else if (i != 0)
+                {
+                    in_cluster = true;
+                }
+
                 // if we have a valid codepoint, save rendering info.
                 if (glyphs[i].codepoint)
                 {
-                    if (!glyphinfos[i].glyph.codepoint)
+                    auto itr = glyphinfos.find(cluster);
+                    if (itr == glyphinfos.end())
                     {
-                        ++valid_glyphs;
-                        glyphinfos[i] = { face, glyphs[i], positions[i] };
+                        std::vector<glyph_face_info> v = {{ face, glyphs[i], positions[i] }};
+                        bool result = false;
+                        std::tie(itr, result) = glyphinfos.insert(std::make_pair(cluster, v));
+
+                    }
+                    if (itr->second.front().glyph.codepoint == 0)
+                    {
+                        itr->second.front() = { face, glyphs[i], positions[i] };
+                    }
+                    else if (in_cluster)
+                    {
+                        itr->second.push_back({ face, glyphs[i], positions[i] });
+                    }
+                }
+                else
+                {
+                    auto itr = glyphinfos.find(cluster);
+                    if (itr == glyphinfos.end())
+                    {
+                        std::vector<glyph_face_info> v = {{ face, glyphs[i], positions[i] }};
+                        bool result = false;
+                        std::tie(itr, result) = glyphinfos.insert(std::make_pair(cluster, v));
+                    }
+                    if (itr != glyphinfos.end() && itr->second.front().glyph.codepoint == 0)
+                    {
+                        itr->second.front() = { face, glyphs[i], positions[i] };
                     }
                 }
             }
-            if (valid_glyphs < item_length && (pos < num_faces))
+
+            bool all_set = true;
+            for (auto c : clusters)
+            {
+                auto itr = glyphinfos.find(c);
+                if (itr == glyphinfos.end())
+                {
+                    all_set = false;
+                    break;
+                }
+                if (!itr->second.empty() && itr->second.front().glyph.codepoint == 0)
+                {
+                    all_set = false;
+                    break;
+                }
+            }
+            if (!all_set && (pos < num_faces))
             {
                 //Try next font in fontset
                 continue;
             }
             double max_glyph_height = 0;
-            for (auto const& info : glyphinfos)
+            for (auto const& c : clusters)
             {
-                if (info.glyph.codepoint)
+                auto itr = glyphinfos.find(c);
+                if (itr != glyphinfos.end())
                 {
-                    auto const& gpos = info.position;
-                    auto const& glyph = info.glyph;
-                    auto const& theface = info.face;
-
-                    unsigned char_index = glyph.cluster;
-                    glyph_info g(glyph.codepoint, char_index, text_item.format_);
-                    if (theface->glyph_dimensions(g))
+                    for (auto const& info : itr->second)
                     {
-                        g.face = theface;
-                        g.scale_multiplier = size / theface->get_face()->units_per_EM;
-                        //Overwrite default advance with better value provided by HarfBuzz
-                        g.unscaled_advance = gpos.x_advance;
-                        g.offset.set(gpos.x_offset * g.scale_multiplier, gpos.y_offset * g.scale_multiplier);
-                        double tmp_height = g.height();
-                        if (tmp_height > max_glyph_height) max_glyph_height = tmp_height;
-                        width_map[char_index] += g.advance();
-                        line.add_glyph(std::move(g), scale_factor);
+                        face_ptr theface = face;
+                        auto & gpos = info.position;
+                        auto & glyph = info.glyph;
+                        if (info.glyph.codepoint != 0)
+                        {
+                            theface = info.face;
+                        }
+                        unsigned char_index = glyph.cluster;
+                        glyph_info g(glyph.codepoint,char_index,text_item.format_);
+                        if (theface->glyph_dimensions(g))
+                        {
+                            g.face = theface;
+                            g.scale_multiplier = size / theface->get_face()->units_per_EM;
+                            //Overwrite default advance with better value provided by HarfBuzz
+                            g.unscaled_advance = gpos.x_advance;
+                            g.offset.set(gpos.x_offset * g.scale_multiplier, gpos.y_offset * g.scale_multiplier);
+                            double tmp_height = g.height();
+                            if (tmp_height > max_glyph_height) max_glyph_height = tmp_height;
+                            width_map[char_index] += g.advance();
+                            line.add_glyph(std::move(g), scale_factor);
+                        }
                     }
                 }
             }

From fe7d1e2f53e2de416e4f6dc5dd2dea8622a84141 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 17 Feb 2017 15:23:00 +0100
Subject: [PATCH 243/328] simplify logic

---
 include/mapnik/text/harfbuzz_shaper.hpp | 44 ++++++++-----------------
 1 file changed, 14 insertions(+), 30 deletions(-)

diff --git a/include/mapnik/text/harfbuzz_shaper.hpp b/include/mapnik/text/harfbuzz_shaper.hpp
index 9edf8eb87..a17ad870f 100644
--- a/include/mapnik/text/harfbuzz_shaper.hpp
+++ b/include/mapnik/text/harfbuzz_shaper.hpp
@@ -149,38 +149,22 @@ static void shape_text(text_line & line,
                 }
 
                 // if we have a valid codepoint, save rendering info.
-                if (glyphs[i].codepoint)
-                {
-                    auto itr = glyphinfos.find(cluster);
-                    if (itr == glyphinfos.end())
-                    {
-                        std::vector<glyph_face_info> v = {{ face, glyphs[i], positions[i] }};
-                        bool result = false;
-                        std::tie(itr, result) = glyphinfos.insert(std::make_pair(cluster, v));
 
-                    }
-                    if (itr->second.front().glyph.codepoint == 0)
-                    {
-                        itr->second.front() = { face, glyphs[i], positions[i] };
-                    }
-                    else if (in_cluster)
-                    {
-                        itr->second.push_back({ face, glyphs[i], positions[i] });
-                    }
-                }
-                else
+                auto itr = glyphinfos.find(cluster);
+                if (itr == glyphinfos.end())
                 {
-                    auto itr = glyphinfos.find(cluster);
-                    if (itr == glyphinfos.end())
-                    {
-                        std::vector<glyph_face_info> v = {{ face, glyphs[i], positions[i] }};
-                        bool result = false;
-                        std::tie(itr, result) = glyphinfos.insert(std::make_pair(cluster, v));
-                    }
-                    if (itr != glyphinfos.end() && itr->second.front().glyph.codepoint == 0)
-                    {
-                        itr->second.front() = { face, glyphs[i], positions[i] };
-                    }
+                    std::vector<glyph_face_info> v = {{ face, glyphs[i], positions[i] }};
+                    bool result = false;
+                    std::tie(itr, result) = glyphinfos.insert(std::make_pair(cluster, v));
+
+                }
+                if (itr->second.front().glyph.codepoint == 0)
+                {
+                    itr->second.front() = { face, glyphs[i], positions[i] };
+                }
+                else if (in_cluster)
+                {
+                    itr->second.push_back({ face, glyphs[i], positions[i] });
                 }
             }
 

From 302e4c75dd3d0256370222ea7aca99525660b940 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 17 Feb 2017 15:28:13 +0100
Subject: [PATCH 244/328] simplify further

---
 include/mapnik/text/harfbuzz_shaper.hpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/include/mapnik/text/harfbuzz_shaper.hpp b/include/mapnik/text/harfbuzz_shaper.hpp
index a17ad870f..83169cede 100644
--- a/include/mapnik/text/harfbuzz_shaper.hpp
+++ b/include/mapnik/text/harfbuzz_shaper.hpp
@@ -172,12 +172,7 @@ static void shape_text(text_line & line,
             for (auto c : clusters)
             {
                 auto itr = glyphinfos.find(c);
-                if (itr == glyphinfos.end())
-                {
-                    all_set = false;
-                    break;
-                }
-                if (!itr->second.empty() && itr->second.front().glyph.codepoint == 0)
+                if (itr == glyphinfos.end() || (!itr->second.empty() && itr->second.front().glyph.codepoint == 0))
                 {
                     all_set = false;
                     break;

From e55918788c7c8bf13e135f8dc6fc524dd13c6a65 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 17 Feb 2017 15:32:03 +0100
Subject: [PATCH 245/328] fix test logic

---
 include/mapnik/text/harfbuzz_shaper.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/mapnik/text/harfbuzz_shaper.hpp b/include/mapnik/text/harfbuzz_shaper.hpp
index 83169cede..b8c8236e4 100644
--- a/include/mapnik/text/harfbuzz_shaper.hpp
+++ b/include/mapnik/text/harfbuzz_shaper.hpp
@@ -172,7 +172,7 @@ static void shape_text(text_line & line,
             for (auto c : clusters)
             {
                 auto itr = glyphinfos.find(c);
-                if (itr == glyphinfos.end() || (!itr->second.empty() && itr->second.front().glyph.codepoint == 0))
+                if (itr == glyphinfos.end() || itr->second.empty() || (itr->second.front().glyph.codepoint == 0))
                 {
                     all_set = false;
                     break;

From 20cafae7804376b79073611f52499d244015d909 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 17 Feb 2017 15:40:37 +0100
Subject: [PATCH 246/328] ensure `insert` has worked

---
 include/mapnik/text/harfbuzz_shaper.hpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/include/mapnik/text/harfbuzz_shaper.hpp b/include/mapnik/text/harfbuzz_shaper.hpp
index b8c8236e4..1324d2560 100644
--- a/include/mapnik/text/harfbuzz_shaper.hpp
+++ b/include/mapnik/text/harfbuzz_shaper.hpp
@@ -151,20 +151,23 @@ static void shape_text(text_line & line,
                 // if we have a valid codepoint, save rendering info.
 
                 auto itr = glyphinfos.find(cluster);
+                bool status = true;
                 if (itr == glyphinfos.end())
                 {
                     std::vector<glyph_face_info> v = {{ face, glyphs[i], positions[i] }};
-                    bool result = false;
-                    std::tie(itr, result) = glyphinfos.insert(std::make_pair(cluster, v));
+                    std::tie(itr,  status) = glyphinfos.insert(std::make_pair(cluster, v));
 
                 }
-                if (itr->second.front().glyph.codepoint == 0)
+                if (status)
                 {
-                    itr->second.front() = { face, glyphs[i], positions[i] };
-                }
-                else if (in_cluster)
-                {
-                    itr->second.push_back({ face, glyphs[i], positions[i] });
+                    if (itr->second.front().glyph.codepoint == 0)
+                    {
+                        itr->second.front() = { face, glyphs[i], positions[i] };
+                    }
+                    else if (in_cluster)
+                    {
+                        itr->second.push_back({ face, glyphs[i], positions[i] });
+                    }
                 }
             }
 

From fbdff42d47f120ca4013bdbbd51309742ac6d3d7 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 17 Feb 2017 16:52:31 +0100
Subject: [PATCH 247/328] use `std::vector<std::vector<T>>` instead of
 `std::map<unsigned,std::vector>` to simplify lookups

---
 include/mapnik/text/harfbuzz_shaper.hpp | 81 +++++++++++--------------
 1 file changed, 36 insertions(+), 45 deletions(-)

diff --git a/include/mapnik/text/harfbuzz_shaper.hpp b/include/mapnik/text/harfbuzz_shaper.hpp
index 1324d2560..ff0ac65aa 100644
--- a/include/mapnik/text/harfbuzz_shaper.hpp
+++ b/include/mapnik/text/harfbuzz_shaper.hpp
@@ -104,8 +104,9 @@ static void shape_text(text_line & line,
         // this table is filled with information for rendering each glyph, so that
         // several font faces can be used in a single text_item
         std::size_t pos = 0;
-        std::map<unsigned, std::vector<glyph_face_info>> glyphinfos;
+        std::vector<std::vector<glyph_face_info>> glyphinfos;
 
+        glyphinfos.resize(text.length());
         for (auto const& face : *face_set)
         {
             ++pos;
@@ -147,35 +148,28 @@ static void shape_text(text_line & line,
                 {
                     in_cluster = true;
                 }
-
-                // if we have a valid codepoint, save rendering info.
-
-                auto itr = glyphinfos.find(cluster);
-                bool status = true;
-                if (itr == glyphinfos.end())
+                if (glyphinfos.size() > cluster)
                 {
-                    std::vector<glyph_face_info> v = {{ face, glyphs[i], positions[i] }};
-                    std::tie(itr,  status) = glyphinfos.insert(std::make_pair(cluster, v));
-
-                }
-                if (status)
-                {
-                    if (itr->second.front().glyph.codepoint == 0)
+                    auto & c = glyphinfos[cluster];
+                    if (c.empty())
                     {
-                        itr->second.front() = { face, glyphs[i], positions[i] };
+                        c.push_back({face, glyphs[i], positions[i]});
+                    }
+                    if (c.front().glyph.codepoint == 0)
+                    {
+                        c.front() = { face, glyphs[i], positions[i] };
                     }
                     else if (in_cluster)
                     {
-                        itr->second.push_back({ face, glyphs[i], positions[i] });
+                        c.push_back({ face, glyphs[i], positions[i] });
                     }
                 }
             }
-
             bool all_set = true;
-            for (auto c : clusters)
+            for (auto c_id : clusters)
             {
-                auto itr = glyphinfos.find(c);
-                if (itr == glyphinfos.end() || itr->second.empty() || (itr->second.front().glyph.codepoint == 0))
+                auto const& c = glyphinfos[c_id];
+                if (c.empty() || c.front().glyph.codepoint == 0)
                 {
                     all_set = false;
                     break;
@@ -187,34 +181,31 @@ static void shape_text(text_line & line,
                 continue;
             }
             double max_glyph_height = 0;
-            for (auto const& c : clusters)
+            for (auto const& c_id : clusters)
             {
-                auto itr = glyphinfos.find(c);
-                if (itr != glyphinfos.end())
+                auto const& c = glyphinfos[c_id];
+                for (auto const& info : c)
                 {
-                    for (auto const& info : itr->second)
+                    face_ptr theface = face;
+                    auto & gpos = info.position;
+                    auto & glyph = info.glyph;
+                    if (info.glyph.codepoint != 0)
                     {
-                        face_ptr theface = face;
-                        auto & gpos = info.position;
-                        auto & glyph = info.glyph;
-                        if (info.glyph.codepoint != 0)
-                        {
-                            theface = info.face;
-                        }
-                        unsigned char_index = glyph.cluster;
-                        glyph_info g(glyph.codepoint,char_index,text_item.format_);
-                        if (theface->glyph_dimensions(g))
-                        {
-                            g.face = theface;
-                            g.scale_multiplier = size / theface->get_face()->units_per_EM;
-                            //Overwrite default advance with better value provided by HarfBuzz
-                            g.unscaled_advance = gpos.x_advance;
-                            g.offset.set(gpos.x_offset * g.scale_multiplier, gpos.y_offset * g.scale_multiplier);
-                            double tmp_height = g.height();
-                            if (tmp_height > max_glyph_height) max_glyph_height = tmp_height;
-                            width_map[char_index] += g.advance();
-                            line.add_glyph(std::move(g), scale_factor);
-                        }
+                        theface = info.face;
+                    }
+                    unsigned char_index = glyph.cluster;
+                    glyph_info g(glyph.codepoint,char_index,text_item.format_);
+                    if (theface->glyph_dimensions(g))
+                    {
+                        g.face = theface;
+                        g.scale_multiplier = size / theface->get_face()->units_per_EM;
+                        //Overwrite default advance with better value provided by HarfBuzz
+                        g.unscaled_advance = gpos.x_advance;
+                        g.offset.set(gpos.x_offset * g.scale_multiplier, gpos.y_offset * g.scale_multiplier);
+                        double tmp_height = g.height();
+                        if (tmp_height > max_glyph_height) max_glyph_height = tmp_height;
+                        width_map[char_index] += g.advance();
+                        line.add_glyph(std::move(g), scale_factor);
                     }
                 }
             }

From 86e5f9305b8db5ac27a157b84d666fe6ae132ebe Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 17 Feb 2017 17:16:36 +0100
Subject: [PATCH 248/328] quarantee `glyphinfos` has enough capacity to hold
 `cluster`

---
 include/mapnik/text/harfbuzz_shaper.hpp | 29 +++++++++++++------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/include/mapnik/text/harfbuzz_shaper.hpp b/include/mapnik/text/harfbuzz_shaper.hpp
index ff0ac65aa..57088dd2b 100644
--- a/include/mapnik/text/harfbuzz_shaper.hpp
+++ b/include/mapnik/text/harfbuzz_shaper.hpp
@@ -148,21 +148,22 @@ static void shape_text(text_line & line,
                 {
                     in_cluster = true;
                 }
-                if (glyphinfos.size() > cluster)
+                if (glyphinfos.size() <= cluster)
                 {
-                    auto & c = glyphinfos[cluster];
-                    if (c.empty())
-                    {
-                        c.push_back({face, glyphs[i], positions[i]});
-                    }
-                    if (c.front().glyph.codepoint == 0)
-                    {
-                        c.front() = { face, glyphs[i], positions[i] };
-                    }
-                    else if (in_cluster)
-                    {
-                        c.push_back({ face, glyphs[i], positions[i] });
-                    }
+                    glyphinfos.resize(cluster + 1);
+                }
+                auto & c = glyphinfos[cluster];
+                if (c.empty())
+                {
+                    c.push_back({face, glyphs[i], positions[i]});
+                }
+                if (c.front().glyph.codepoint == 0)
+                {
+                    c.front() = { face, glyphs[i], positions[i] };
+                }
+                else if (in_cluster)
+                {
+                    c.push_back({ face, glyphs[i], positions[i] });
                 }
             }
             bool all_set = true;

From f776977982fcac5f834bb45dcb4ac7e6204d1ed9 Mon Sep 17 00:00:00 2001
From: Peter Hicks <peter.hicks@poggs.co.uk>
Date: Sun, 19 Feb 2017 20:46:30 +0000
Subject: [PATCH 249/328] Rename PostGIS' ST_Estimate_Extent to
 ST_EstimateExtent

---
 plugins/input/pgraster/pgraster_datasource.cpp | 2 +-
 plugins/input/postgis/postgis_datasource.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/input/pgraster/pgraster_datasource.cpp b/plugins/input/pgraster/pgraster_datasource.cpp
index 2841a1da7..093c8bd00 100644
--- a/plugins/input/pgraster/pgraster_datasource.cpp
+++ b/plugins/input/pgraster/pgraster_datasource.cpp
@@ -1143,7 +1143,7 @@ box2d<double> pgraster_datasource::envelope() const
                   throw mapnik::datasource_exception("Pgraster Plugin: " + s_error.str());
                 }
                 s << "SELECT ST_XMin(ext),ST_YMin(ext),ST_XMax(ext),ST_YMax(ext)"
-                  << " FROM (SELECT ST_Estimated_Extent('";
+                  << " FROM (SELECT ST_EstimatedExtent('";
 
                 if (! sch.empty())
                 {
diff --git a/plugins/input/postgis/postgis_datasource.cpp b/plugins/input/postgis/postgis_datasource.cpp
index 6a1a9b645..c9f20b76d 100644
--- a/plugins/input/postgis/postgis_datasource.cpp
+++ b/plugins/input/postgis/postgis_datasource.cpp
@@ -1069,7 +1069,7 @@ box2d<double> postgis_datasource::envelope() const
             if (estimate_extent_)
             {
                 s << "SELECT ST_XMin(ext),ST_YMin(ext),ST_XMax(ext),ST_YMax(ext)"
-                  << " FROM (SELECT ST_Estimated_Extent('";
+                  << " FROM (SELECT ST_EstimatedExtent('";
 
                 if (! schema_.empty())
                 {

From d9c81d46fdc91a96c63362802d71f018a94fd877 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 20 Feb 2017 12:12:22 +0100
Subject: [PATCH 250/328] use `else if`

---
 include/mapnik/text/harfbuzz_shaper.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/mapnik/text/harfbuzz_shaper.hpp b/include/mapnik/text/harfbuzz_shaper.hpp
index 57088dd2b..dfcc79ec0 100644
--- a/include/mapnik/text/harfbuzz_shaper.hpp
+++ b/include/mapnik/text/harfbuzz_shaper.hpp
@@ -157,7 +157,7 @@ static void shape_text(text_line & line,
                 {
                     c.push_back({face, glyphs[i], positions[i]});
                 }
-                if (c.front().glyph.codepoint == 0)
+                else if (c.front().glyph.codepoint == 0)
                 {
                     c.front() = { face, glyphs[i], positions[i] };
                 }

From 3584970fee943a99e61a18d08d06e549150efb81 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 20 Feb 2017 12:13:00 +0100
Subject: [PATCH 251/328] make `shaping` unit test test something
 (work-in-progress)

---
 test/unit/text/shaping.cpp | 72 ++++++++++++++++++++++++++++++--------
 1 file changed, 57 insertions(+), 15 deletions(-)

diff --git a/test/unit/text/shaping.cpp b/test/unit/text/shaping.cpp
index d9da17efb..f8ba45e08 100644
--- a/test/unit/text/shaping.cpp
+++ b/test/unit/text/shaping.cpp
@@ -1,25 +1,67 @@
-
 #include "catch.hpp"
 #include <mapnik/text/icu_shaper.hpp>
 #include <mapnik/text/harfbuzz_shaper.hpp>
 #include <mapnik/text/font_library.hpp>
+#include <mapnik/unicode.hpp>
 
-TEST_CASE("shapers compile") {
-
-    mapnik::text_line line(0,0);
-    mapnik::text_itemizer itemizer;
+TEST_CASE("shaping")
+{
+    mapnik::freetype_engine::register_fonts("test/data/fonts/Noto");
+    mapnik::freetype_engine::register_font("test/data/fonts/NotoSans-Regular.ttc");
+    mapnik::font_set fontset("fontset");
+    for (auto const& name : mapnik::freetype_engine::face_names())
+    {
+        fontset.add_face_name(name);
+    }
+    mapnik::transcoder tr("utf8");
     std::map<unsigned,double> width_map;
     double scale_factor = 1;
     mapnik::font_library fl;
     mapnik::freetype_engine::font_file_mapping_type font_file_mapping;
     mapnik::freetype_engine::font_memory_cache_type font_memory_cache;
-    mapnik::face_manager fm(fl,font_file_mapping,font_memory_cache);
-    mapnik::harfbuzz_shaper::shape_text(line,itemizer,
-                                width_map,
-                                fm,
-                                scale_factor);
-    mapnik::icu_shaper::shape_text(line,itemizer,
-                                width_map,
-                                fm,
-                                scale_factor);
-}
\ No newline at end of file
+    mapnik::face_manager fm(fl, font_file_mapping, font_memory_cache);
+
+    mapnik::text_itemizer itemizer;
+    auto props = std::make_unique<mapnik::detail::evaluated_format_properties>();
+    props->fontset = fontset;
+    props->text_size = 64;
+
+    std::vector<std::tuple<unsigned, unsigned>> expected =
+        {{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}};
+    // with default NotoSans-Regular.ttc and NotoNaskhArabic-Regular.ttf ^^^
+
+    //std::vector<std::tuple<unsigned, unsigned>> expected =
+    //    {{977,0},{1094,3}{1038,4},{1168,4},{9,7},{3,8},{9,9},{20827,10},{11294,11},{42895,12},{10,13}};
+    // expected results if NotoSansCJKjp-Regular.otf and "NotoSansTibetan-Regular.ttf available and registered^^
+    auto ustr = tr.transcode("སྤུ་ཧྲེང (普兰镇)");
+    auto length = ustr.length();
+    itemizer.add_text(ustr, props);
+
+    {
+        mapnik::text_line line(0, length);
+        mapnik::harfbuzz_shaper::shape_text(line, itemizer,
+                                            width_map,
+                                            fm,
+                                            scale_factor);
+
+        std::size_t index = 0;
+        for (auto const& g : line)
+        {
+            unsigned glyph_index, char_index;
+            std::tie(glyph_index, char_index) = expected[index++];
+            //std::cerr << g.glyph_index << ":" << g.char_index << std::endl;
+            REQUIRE(glyph_index == g.glyph_index);
+            REQUIRE(char_index == g.char_index);
+        }
+    }
+#if 0
+    {
+        mapnik::text_line line(0, length);
+        mapnik::icu_shaper::shape_text(line,itemizer,
+                                       width_map,
+                                       fm,
+                                       scale_factor);
+
+    }
+#endif
+}

From 745c291b1af94b42b5a8d6d28bb35a6e8e5a8be6 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 20 Feb 2017 14:23:09 +0100
Subject: [PATCH 252/328] simplify test

---
 test/unit/text/shaping.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/unit/text/shaping.cpp b/test/unit/text/shaping.cpp
index f8ba45e08..f6336ec2b 100644
--- a/test/unit/text/shaping.cpp
+++ b/test/unit/text/shaping.cpp
@@ -6,8 +6,8 @@
 
 TEST_CASE("shaping")
 {
-    mapnik::freetype_engine::register_fonts("test/data/fonts/Noto");
     mapnik::freetype_engine::register_font("test/data/fonts/NotoSans-Regular.ttc");
+    mapnik::freetype_engine::register_fonts("test/data/fonts/Noto");
     mapnik::font_set fontset("fontset");
     for (auto const& name : mapnik::freetype_engine::face_names())
     {
@@ -27,13 +27,13 @@ TEST_CASE("shaping")
     props->text_size = 64;
 
     std::vector<std::tuple<unsigned, unsigned>> expected =
-        {{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}};
+        {{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}};
     // with default NotoSans-Regular.ttc and NotoNaskhArabic-Regular.ttf ^^^
 
     //std::vector<std::tuple<unsigned, unsigned>> expected =
-    //    {{977,0},{1094,3}{1038,4},{1168,4},{9,7},{3,8},{9,9},{20827,10},{11294,11},{42895,12},{10,13}};
-    // expected results if NotoSansCJKjp-Regular.otf and "NotoSansTibetan-Regular.ttf available and registered^^
-    auto ustr = tr.transcode("སྤུ་ཧྲེང (普兰镇)");
+    //  {{977,0}, {1094,3}, {1038,4}, {1168,4}, {9,7}, {3,8}, {11,9}, {68,10}, {69,11}, {70,12}, {12,13}};
+    // expected results if "NotoSansTibetan-Regular.ttf is registered^^
+    auto ustr = tr.transcode("སྤུ་ཧྲེང (abc)");
     auto length = ustr.length();
     itemizer.add_text(ustr, props);
 
@@ -49,7 +49,6 @@ TEST_CASE("shaping")
         {
             unsigned glyph_index, char_index;
             std::tie(glyph_index, char_index) = expected[index++];
-            //std::cerr << g.glyph_index << ":" << g.char_index << std::endl;
             REQUIRE(glyph_index == g.glyph_index);
             REQUIRE(char_index == g.char_index);
         }

From 677ed0ebaba00a8ac449268bcb6df55c8b9cb895 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 21 Feb 2017 12:43:54 +0100
Subject: [PATCH 253/328] refactor to make it easier to run multiple tests

---
 test/unit/text/shaping.cpp | 89 ++++++++++++++++++++------------------
 1 file changed, 48 insertions(+), 41 deletions(-)

diff --git a/test/unit/text/shaping.cpp b/test/unit/text/shaping.cpp
index f6336ec2b..74301d979 100644
--- a/test/unit/text/shaping.cpp
+++ b/test/unit/text/shaping.cpp
@@ -4,6 +4,41 @@
 #include <mapnik/text/font_library.hpp>
 #include <mapnik/unicode.hpp>
 
+namespace {
+
+void test_shaping( mapnik::font_set const& fontset, mapnik::face_manager& fm,
+                  std::vector<std::tuple<unsigned, unsigned>> const& expected, char const* str)
+{
+    mapnik::transcoder tr("utf8");
+    std::map<unsigned,double> width_map;
+    mapnik::text_itemizer itemizer;
+    auto props = std::make_unique<mapnik::detail::evaluated_format_properties>();
+    props->fontset = fontset;
+    props->text_size = 32;
+
+    double scale_factor = 1;
+    auto ustr = tr.transcode(str);
+    auto length = ustr.length();
+    itemizer.add_text(ustr, props);
+
+    mapnik::text_line line(0, length);
+    mapnik::harfbuzz_shaper::shape_text(line, itemizer,
+                                        width_map,
+                                        fm,
+                                        scale_factor);
+
+    std::size_t index = 0;
+    for (auto const& g : line)
+    {
+        unsigned glyph_index, char_index;
+        CHECK(index < expected.size());
+        std::tie(glyph_index, char_index) = expected[index++];
+        REQUIRE(glyph_index == g.glyph_index);
+        REQUIRE(char_index == g.char_index);
+    }
+}
+}
+
 TEST_CASE("shaping")
 {
     mapnik::freetype_engine::register_font("test/data/fonts/NotoSans-Regular.ttc");
@@ -13,54 +48,26 @@ TEST_CASE("shaping")
     {
         fontset.add_face_name(name);
     }
-    mapnik::transcoder tr("utf8");
-    std::map<unsigned,double> width_map;
-    double scale_factor = 1;
+
     mapnik::font_library fl;
     mapnik::freetype_engine::font_file_mapping_type font_file_mapping;
     mapnik::freetype_engine::font_memory_cache_type font_memory_cache;
     mapnik::face_manager fm(fl, font_file_mapping, font_memory_cache);
 
-    mapnik::text_itemizer itemizer;
-    auto props = std::make_unique<mapnik::detail::evaluated_format_properties>();
-    props->fontset = fontset;
-    props->text_size = 64;
-
-    std::vector<std::tuple<unsigned, unsigned>> expected =
-        {{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}};
-    // with default NotoSans-Regular.ttc and NotoNaskhArabic-Regular.ttf ^^^
-
-    //std::vector<std::tuple<unsigned, unsigned>> expected =
-    //  {{977,0}, {1094,3}, {1038,4}, {1168,4}, {9,7}, {3,8}, {11,9}, {68,10}, {69,11}, {70,12}, {12,13}};
-    // expected results if "NotoSansTibetan-Regular.ttf is registered^^
-    auto ustr = tr.transcode("སྤུ་ཧྲེང (abc)");
-    auto length = ustr.length();
-    itemizer.add_text(ustr, props);
+    {
+        std::vector<std::tuple<unsigned, unsigned>> expected =
+            {{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}};
+        // with default NotoSans-Regular.ttc and NotoNaskhArabic-Regular.ttf ^^^
+        //std::vector<std::tuple<unsigned, unsigned>> expected =
+        //  {{977,0}, {1094,3}, {1038,4}, {1168,4}, {9,7}, {3,8}, {11,9}, {68,10}, {69,11}, {70,12}, {12,13}};
+        // expected results if "NotoSansTibetan-Regular.ttf is registered^^
+        test_shaping(fontset, fm, expected, "སྤུ་ཧྲེང (abc)");
+    }
 
     {
-        mapnik::text_line line(0, length);
-        mapnik::harfbuzz_shaper::shape_text(line, itemizer,
-                                            width_map,
-                                            fm,
-                                            scale_factor);
-
-        std::size_t index = 0;
-        for (auto const& g : line)
-        {
-            unsigned glyph_index, char_index;
-            std::tie(glyph_index, char_index) = expected[index++];
-            REQUIRE(glyph_index == g.glyph_index);
-            REQUIRE(char_index == g.char_index);
-        }
+        std::vector<std::tuple<unsigned, unsigned>> expected =
+            {{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}};
+        test_shaping(fontset, fm, expected, "སྤུ་ཧྲེང (普兰镇)");
     }
-#if 0
-    {
-        mapnik::text_line line(0, length);
-        mapnik::icu_shaper::shape_text(line,itemizer,
-                                       width_map,
-                                       fm,
-                                       scale_factor);
 
-    }
-#endif
 }

From 8af91146c45d1be0026c5d208e5d48a83f3e68dd Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 21 Feb 2017 12:56:36 +0100
Subject: [PATCH 254/328] add an extra test

---
 test/unit/text/shaping.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/unit/text/shaping.cpp b/test/unit/text/shaping.cpp
index 74301d979..3cee600d9 100644
--- a/test/unit/text/shaping.cpp
+++ b/test/unit/text/shaping.cpp
@@ -70,4 +70,10 @@ TEST_CASE("shaping")
         test_shaping(fontset, fm, expected, "སྤུ་ཧྲེང (普兰镇)");
     }
 
+    {
+        std::vector<std::tuple<unsigned, unsigned>> expected =
+            {{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {0, 5}, {0, 6}, {0, 7}, {12, 8}};
+        test_shaping(fontset, fm, expected, "abc (普兰镇)");
+    }
+
 }

From 10b1ed2fa99dbe9fd858f12bb06ce9165ddd0b32 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 21 Feb 2017 13:17:41 +0100
Subject: [PATCH 255/328] add `debug` mode to generate expected result + add
 one more test

---
 test/unit/text/shaping.cpp | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/test/unit/text/shaping.cpp b/test/unit/text/shaping.cpp
index 3cee600d9..32cb402c6 100644
--- a/test/unit/text/shaping.cpp
+++ b/test/unit/text/shaping.cpp
@@ -7,7 +7,7 @@
 namespace {
 
 void test_shaping( mapnik::font_set const& fontset, mapnik::face_manager& fm,
-                  std::vector<std::tuple<unsigned, unsigned>> const& expected, char const* str)
+                   std::vector<std::tuple<unsigned, unsigned>> const& expected, char const* str, bool debug = false)
 {
     mapnik::transcoder tr("utf8");
     std::map<unsigned,double> width_map;
@@ -30,11 +30,19 @@ void test_shaping( mapnik::font_set const& fontset, mapnik::face_manager& fm,
     std::size_t index = 0;
     for (auto const& g : line)
     {
-        unsigned glyph_index, char_index;
-        CHECK(index < expected.size());
-        std::tie(glyph_index, char_index) = expected[index++];
-        REQUIRE(glyph_index == g.glyph_index);
-        REQUIRE(char_index == g.char_index);
+        if (debug)
+        {
+            if (index++ > 0) std::cerr << ",";
+            std::cerr << "{" << g.glyph_index << ", " << g.char_index << "}";
+        }
+        else
+        {
+            unsigned glyph_index, char_index;
+            CHECK(index < expected.size());
+            std::tie(glyph_index, char_index) = expected[index++];
+            REQUIRE(glyph_index == g.glyph_index);
+            REQUIRE(char_index == g.char_index);
+        }
     }
 }
 }
@@ -76,4 +84,11 @@ TEST_CASE("shaping")
         test_shaping(fontset, fm, expected, "abc (普兰镇)");
     }
 
+    {
+        std::vector<std::tuple<unsigned, unsigned>> expected =
+            {{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {68, 5}, {69, 6}, {70, 7}, {12, 8}};
+        test_shaping(fontset, fm, expected, "abc (abc)");
+    }
+
+
 }

From 5e709997f2c82ff210f4c024c0419a3de695ee99 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 21 Feb 2017 13:37:22 +0100
Subject: [PATCH 256/328] add explicit `u8` (utf8) qualifier

---
 test/unit/text/shaping.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/unit/text/shaping.cpp b/test/unit/text/shaping.cpp
index 32cb402c6..409448af9 100644
--- a/test/unit/text/shaping.cpp
+++ b/test/unit/text/shaping.cpp
@@ -69,19 +69,19 @@ TEST_CASE("shaping")
         //std::vector<std::tuple<unsigned, unsigned>> expected =
         //  {{977,0}, {1094,3}, {1038,4}, {1168,4}, {9,7}, {3,8}, {11,9}, {68,10}, {69,11}, {70,12}, {12,13}};
         // expected results if "NotoSansTibetan-Regular.ttf is registered^^
-        test_shaping(fontset, fm, expected, "སྤུ་ཧྲེང (abc)");
+        test_shaping(fontset, fm, expected, u8"སྤུ་ཧྲེང (abc)");
     }
 
     {
         std::vector<std::tuple<unsigned, unsigned>> expected =
             {{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}};
-        test_shaping(fontset, fm, expected, "སྤུ་ཧྲེང (普兰镇)");
+        test_shaping(fontset, fm, expected, u8"སྤུ་ཧྲེང (普兰镇)");
     }
 
     {
         std::vector<std::tuple<unsigned, unsigned>> expected =
             {{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {0, 5}, {0, 6}, {0, 7}, {12, 8}};
-        test_shaping(fontset, fm, expected, "abc (普兰镇)");
+        test_shaping(fontset, fm, expected, u8"abc (普兰镇)");
     }
 
     {

From 43d940fe358918232f0117aab53b0a5e116bc750 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 22 Feb 2017 11:31:06 +0100
Subject: [PATCH 257/328] add berber+arabic shaping test

---
 test/unit/text/shaping.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/test/unit/text/shaping.cpp b/test/unit/text/shaping.cpp
index 409448af9..a14099884 100644
--- a/test/unit/text/shaping.cpp
+++ b/test/unit/text/shaping.cpp
@@ -33,7 +33,9 @@ void test_shaping( mapnik::font_set const& fontset, mapnik::face_manager& fm,
         if (debug)
         {
             if (index++ > 0) std::cerr << ",";
-            std::cerr << "{" << g.glyph_index << ", " << g.char_index << "}";
+            std::cerr << "{" << g.glyph_index << ", " << g.char_index
+                //<< ", " << g.face->family_name() << ":" << g.face->style_name()
+                      <<  "}";
         }
         else
         {
@@ -90,5 +92,12 @@ TEST_CASE("shaping")
         test_shaping(fontset, fm, expected, "abc (abc)");
     }
 
+    {
+        //    "ⵃⴰⵢ ⵚⵉⵏⴰⵄⵉ الحي الصناعي"
+        std::vector<std::tuple<unsigned, unsigned>> expected =
+            {{0, 0},{0, 1},{0, 2},{3, 3},{0, 4},{0, 5},{0, 6},{0, 7},{0, 8},{0, 9},{3, 10},{509, 22},{481, 21},{438, 20},{503, 19},{470, 18},{496, 17},{43, 16},{3, 15},{509, 14},{454, 13},{496, 12},{43, 11}};
+        test_shaping(fontset, fm, expected, "ⵃⴰⵢ ⵚⵉⵏⴰⵄⵉ الحي الصناعي");
+    }
+
 
 }

From b8523682cd7cb3ea7eb9310298a824d9b6579ecf Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 22 Feb 2017 11:32:00 +0100
Subject: [PATCH 258/328] use latest variant

---
 deps/mapbox/variant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index d2588a8f1..916139a2e 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit d2588a8f1d6b5d480d228e6d8a906ce634bdea9a
+Subproject commit 916139a2e51e125816efce6e19d428385601273f

From 0c0f3f129880a2a9d44ae84c4fe03c98b62c5193 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 22 Feb 2017 11:34:01 +0100
Subject: [PATCH 259/328] update test/data

---
 test/data | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/data b/test/data
index 5ad14e6bd..29df37a4a 160000
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit 5ad14e6bdf2c5e6babd8ac04aa057ed6c67ac617
+Subproject commit 29df37a4a4007c5f97ea9cab7b3761a5954082f3

From 4faf5b054beb9ae64d5fce29ce687a5ca275b2e7 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 22 Feb 2017 11:34:47 +0100
Subject: [PATCH 260/328] add utf8 qualifier

---
 test/unit/text/shaping.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/text/shaping.cpp b/test/unit/text/shaping.cpp
index a14099884..4e4f9b7bc 100644
--- a/test/unit/text/shaping.cpp
+++ b/test/unit/text/shaping.cpp
@@ -96,7 +96,7 @@ TEST_CASE("shaping")
         //    "ⵃⴰⵢ ⵚⵉⵏⴰⵄⵉ الحي الصناعي"
         std::vector<std::tuple<unsigned, unsigned>> expected =
             {{0, 0},{0, 1},{0, 2},{3, 3},{0, 4},{0, 5},{0, 6},{0, 7},{0, 8},{0, 9},{3, 10},{509, 22},{481, 21},{438, 20},{503, 19},{470, 18},{496, 17},{43, 16},{3, 15},{509, 14},{454, 13},{496, 12},{43, 11}};
-        test_shaping(fontset, fm, expected, "ⵃⴰⵢ ⵚⵉⵏⴰⵄⵉ الحي الصناعي");
+        test_shaping(fontset, fm, expected, u8"ⵃⴰⵢ ⵚⵉⵏⴰⵄⵉ الحي الصناعي");
     }
 
 

From 5464ae9cdfd32983883463bcc2396dc0e51d885f Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Wed, 22 Feb 2017 03:21:48 +0100
Subject: [PATCH 261/328] load_map: avoid segfault when ShieldSymbolizer has
 invalid placements

---
 src/load_map.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/load_map.cpp b/src/load_map.cpp
index c9e3d70f5..566caae88 100644
--- a/src/load_map.cpp
+++ b/src/load_map.cpp
@@ -1155,10 +1155,14 @@ void map_parser::parse_shield_symbolizer(rule & rule, xml_node const& node)
         if (placement_type)
         {
             placements = placements::registry::instance().from_xml(*placement_type, node, fontsets_, true);
-        } else {
-            placements = std::make_shared<text_placements_dummy>();
+            if (!placements)
+                return;
+        }
+        else
+        {
+            placements = std::make_shared<text_placements_dummy>();
+            placements->defaults.from_xml(node, fontsets_, true);
         }
-        placements->defaults.from_xml(node, fontsets_, true);
         if (strict_ &&
             !placements->defaults.format_defaults.fontset)
         {

From 32e592fb7a151cc7c9fb58456aeb1592d4666435 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 22 Feb 2017 12:33:18 +0100
Subject: [PATCH 262/328] use explicit const&

---
 include/mapnik/text/harfbuzz_shaper.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/mapnik/text/harfbuzz_shaper.hpp b/include/mapnik/text/harfbuzz_shaper.hpp
index dfcc79ec0..c1544179c 100644
--- a/include/mapnik/text/harfbuzz_shaper.hpp
+++ b/include/mapnik/text/harfbuzz_shaper.hpp
@@ -188,8 +188,8 @@ static void shape_text(text_line & line,
                 for (auto const& info : c)
                 {
                     face_ptr theface = face;
-                    auto & gpos = info.position;
-                    auto & glyph = info.glyph;
+                    auto const& gpos = info.position;
+                    auto const& glyph = info.glyph;
                     if (info.glyph.codepoint != 0)
                     {
                         theface = info.face;

From 8292edaa1a2fa349110f32300d7e044ab6d13f4c Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Wed, 22 Feb 2017 13:37:52 +0100
Subject: [PATCH 263/328] strip boost::optional from non-optional marker ptr

---
 src/renderer_common/render_markers_symbolizer.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/renderer_common/render_markers_symbolizer.cpp b/src/renderer_common/render_markers_symbolizer.cpp
index 965ff45b4..c0c148b0a 100644
--- a/src/renderer_common/render_markers_symbolizer.cpp
+++ b/src/renderer_common/render_markers_symbolizer.cpp
@@ -128,12 +128,12 @@ struct render_marker_symbolizer_visitor
 
         agg::trans_affine image_tr = agg::trans_affine_scaling(common_.scale_factor_);
 
-        boost::optional<svg_path_ptr> const& stock_vector_marker = mark.get_data();
-        svg_path_ptr marker_ptr = *stock_vector_marker;
+        svg_path_ptr stock_vector_marker = mark.get_data();
+        svg_path_ptr marker_ptr = stock_vector_marker;
         bool is_ellipse = false;
 
         svg_attribute_type s_attributes;
-        auto const& r_attributes = get_marker_attributes(*stock_vector_marker, s_attributes);
+        auto const& r_attributes = get_marker_attributes(stock_vector_marker, s_attributes);
 
         // special case for simple ellipse markers
         // to allow for full control over rx/ry dimensions

From 3eabd3141adbce3d25141ac50dc620bc9f937dbf Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 27 Feb 2017 13:22:55 +0100
Subject: [PATCH 264/328] sync `mapnik-index` and `shapeindex` versions with
 mapnik via MAPNIK_VERSION_STRING

---
 utils/mapnik-index/mapnik-index.cpp | 4 ++--
 utils/shapeindex/shapeindex.cpp     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/utils/mapnik-index/mapnik-index.cpp b/utils/mapnik-index/mapnik-index.cpp
index 01397ed63..1de90b6c4 100644
--- a/utils/mapnik-index/mapnik-index.cpp
+++ b/utils/mapnik-index/mapnik-index.cpp
@@ -24,7 +24,7 @@
 #include <vector>
 #include <string>
 #include <fstream>
-
+#include <mapnik/version.hpp>
 #include <mapnik/util/fs.hpp>
 #include <mapnik/quad_tree.hpp>
 
@@ -96,7 +96,7 @@ int main (int argc, char** argv)
 
         if (vm.count("version"))
         {
-            std::clog << "version 1.0.0" << std::endl;
+            std::clog << "version " << MAPNIK_VERSION_STRING << std::endl;
             return 1;
         }
         if (vm.count("help"))
diff --git a/utils/shapeindex/shapeindex.cpp b/utils/shapeindex/shapeindex.cpp
index bc086fccf..b8fef4a1a 100644
--- a/utils/shapeindex/shapeindex.cpp
+++ b/utils/shapeindex/shapeindex.cpp
@@ -23,6 +23,7 @@
 #include <iostream>
 #include <vector>
 #include <string>
+#include <mapnik/version.hpp>
 #include <mapnik/util/fs.hpp>
 #include <mapnik/quad_tree.hpp>
 #include <mapnik/geometry/envelope.hpp>
@@ -70,7 +71,7 @@ int main (int argc,char** argv)
 
         if (vm.count("version"))
         {
-            std::clog << "version 0.3.0" <<std::endl;
+            std::clog << "version " << MAPNIK_VERSION_STRING << std::endl;
             return EXIT_FAILURE;
         }
 

From 8e97803e81527c396d78f902c607ac44f56e12da Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 28 Feb 2017 14:59:14 +0100
Subject: [PATCH 265/328] add color_font_ member

---
 include/mapnik/text/face.hpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/mapnik/text/face.hpp b/include/mapnik/text/face.hpp
index 210c3479b..9158e258b 100644
--- a/include/mapnik/text/face.hpp
+++ b/include/mapnik/text/face.hpp
@@ -72,10 +72,13 @@ public:
 
     bool glyph_dimensions(glyph_info &glyph) const;
 
+    inline bool is_color() const { return color_font_;}
+
     ~font_face();
 
 private:
     FT_Face face_;
+    bool color_font_ = false;
 };
 using face_ptr = std::shared_ptr<font_face>;
 

From a6519c3f6bd6a7c5634fb9bbb4319bea1e235899 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 28 Feb 2017 15:00:03 +0100
Subject: [PATCH 266/328] use FT_Load_Sfnt_Table to identify color fonts + load
 color glyphs with FT_LOAD_COLOR

---
 src/text/face.cpp | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/text/face.cpp b/src/text/face.cpp
index e79c99b6d..4c5836607 100644
--- a/src/text/face.cpp
+++ b/src/text/face.cpp
@@ -29,6 +29,7 @@
 extern "C"
 {
 #include FT_GLYPH_H
+#include FT_TRUETYPE_TABLES_H
 }
 
 #pragma GCC diagnostic pop
@@ -37,16 +38,23 @@ namespace mapnik
 {
 
 font_face::font_face(FT_Face face)
-    : face_(face) {}
+    : face_(face)
+{
+    static const uint32_t tag = FT_MAKE_TAG('C', 'B', 'D', 'T');
+    unsigned long length = 0;
+    FT_Load_Sfnt_Table(face_, tag, 0, nullptr, &length);
+    if (length) color_font_ = true;
+}
 
 bool font_face::set_character_sizes(double size)
 {
-    return (FT_Set_Char_Size(face_,0,static_cast<FT_F26Dot6>(size * (1<<6)),0,0) == 0);
+    return (FT_Set_Char_Size(face_, 0, static_cast<FT_F26Dot6>(size * (1 << 6)), 0, 0) == 0);
 }
 
 bool font_face::set_unscaled_character_sizes()
 {
-    return (FT_Set_Char_Size(face_,0,face_->units_per_EM,0,0) == 0);
+    FT_F26Dot6 char_height = face_->units_per_EM > 0 ? face_->units_per_EM : 2048.0;
+    return (FT_Set_Char_Size(face_, 0, char_height, 0, 0) == 0);
 }
 
 bool font_face::glyph_dimensions(glyph_info & glyph) const
@@ -54,11 +62,14 @@ bool font_face::glyph_dimensions(glyph_info & glyph) const
     FT_Vector pen;
     pen.x = 0;
     pen.y = 0;
+    if (color_font_) FT_Select_Size(face_, 0);
     FT_Set_Transform(face_, 0, &pen);
-
-    if (FT_Load_Glyph(face_, glyph.glyph_index, FT_LOAD_NO_HINTING))
+    FT_Int32 load_flags = FT_LOAD_DEFAULT;// | FT_LOAD_NO_HINTING;
+    if (color_font_) load_flags |= FT_LOAD_COLOR ;
+    if (FT_Load_Glyph(face_, glyph.glyph_index, load_flags))
     {
-        MAPNIK_LOG_ERROR(font_face) << "FT_Load_Glyph failed";
+        MAPNIK_LOG_ERROR(font_face) << "FT_Load_Glyph failed :( index=" << glyph.glyph_index << " " << load_flags
+                                    << " " << face_->family_name << " " << face_->style_name  ;
         return false;
     }
     FT_Glyph image;

From 7c93514fbc8498ac56ee7f6effa3d11b742c7c4f Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 28 Feb 2017 15:01:46 +0100
Subject: [PATCH 267/328] avoid division by zero (units_per_EM is set to 0 for
 bitmap fonts)

---
 include/mapnik/text/harfbuzz_shaper.hpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/mapnik/text/harfbuzz_shaper.hpp b/include/mapnik/text/harfbuzz_shaper.hpp
index c1544179c..2752af964 100644
--- a/include/mapnik/text/harfbuzz_shaper.hpp
+++ b/include/mapnik/text/harfbuzz_shaper.hpp
@@ -199,11 +199,16 @@ static void shape_text(text_line & line,
                     if (theface->glyph_dimensions(g))
                     {
                         g.face = theface;
-                        g.scale_multiplier = size / theface->get_face()->units_per_EM;
+                        g.scale_multiplier = theface->get_face()->units_per_EM > 0 ?
+                            (size / theface->get_face()->units_per_EM) : (size / 2048.0) ;
                         //Overwrite default advance with better value provided by HarfBuzz
                         g.unscaled_advance = gpos.x_advance;
                         g.offset.set(gpos.x_offset * g.scale_multiplier, gpos.y_offset * g.scale_multiplier);
                         double tmp_height = g.height();
+                        if (theface->is_color())
+                        {
+                            tmp_height = size;
+                        }
                         if (tmp_height > max_glyph_height) max_glyph_height = tmp_height;
                         width_map[char_index] += g.advance();
                         line.add_glyph(std::move(g), scale_factor);

From 639dcae83fd1c047a98f039756aca6fd2a0280f6 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 28 Feb 2017 15:03:26 +0100
Subject: [PATCH 268/328] c++ style

---
 src/text/text_line.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/text/text_line.cpp b/src/text/text_line.cpp
index 1325a23a7..77300aaf5 100644
--- a/src/text/text_line.cpp
+++ b/src/text/text_line.cpp
@@ -64,7 +64,7 @@ void text_line::add_glyph(glyph_info && glyph, double scale_factor_)
         // Only add character spacing if the character is not a zero-width part of a cluster.
         width_ += advance + glyphs_.back().format->character_spacing  * scale_factor_;
         glyphs_width_ += advance;
-        space_count_++;
+        ++space_count_;
     }
     glyphs_.emplace_back(std::move(glyph));
 }

From 1b677792909d92a5f301486423f07c883d8d2b09 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 28 Feb 2017 15:04:49 +0100
Subject: [PATCH 269/328] implement color bitmap extraction/scaling/compositing
 into target pixmap

---
 include/mapnik/text/renderer.hpp |  10 ++-
 src/text/renderer.cpp            | 105 +++++++++++++++++++++++++------
 2 files changed, 95 insertions(+), 20 deletions(-)

diff --git a/include/mapnik/text/renderer.hpp b/include/mapnik/text/renderer.hpp
index 9d480f4c9..267a1bae5 100644
--- a/include/mapnik/text/renderer.hpp
+++ b/include/mapnik/text/renderer.hpp
@@ -28,6 +28,7 @@
 #include <mapnik/image_compositing.hpp>
 #include <mapnik/symbolizer_enumerations.hpp>
 #include <mapnik/util/noncopyable.hpp>
+#include <mapnik/pixel_position.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
@@ -51,8 +52,13 @@ struct glyph_t
 {
     FT_Glyph image;
     detail::evaluated_format_properties const& properties;
-    glyph_t(FT_Glyph image_, detail::evaluated_format_properties const& properties_)
-        : image(image_), properties(properties_) {}
+    pixel_position pos;
+    double size;
+    glyph_t(FT_Glyph image_, detail::evaluated_format_properties const& properties_, pixel_position const& pos_, double size_)
+        : image(image_),
+          properties(properties_),
+          pos(pos_),
+          size(size_) {}
 };
 
 class text_renderer : private util::noncopyable
diff --git a/src/text/renderer.cpp b/src/text/renderer.cpp
index cace1e258..32e57f3ba 100644
--- a/src/text/renderer.cpp
+++ b/src/text/renderer.cpp
@@ -25,6 +25,8 @@
 #include <mapnik/grid/grid.hpp>
 #include <mapnik/text/text_properties.hpp>
 #include <mapnik/font_engine_freetype.hpp>
+#include <mapnik/image_compositing.hpp>
+#include <mapnik/image_scaling.hpp>
 #include <mapnik/text/face.hpp>
 #include <mapnik/image_util.hpp>
 #include <mapnik/image_any.hpp>
@@ -66,8 +68,35 @@ void text_renderer::prepare_glyphs(glyph_positions const& positions)
     for (auto const& glyph_pos : positions)
     {
         glyph_info const& glyph = glyph_pos.glyph;
-        glyph.face->set_character_sizes(glyph.format->text_size * scale_factor_); //TODO: Optimize this?
+        FT_Int32 load_flags = FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING;
 
+        FT_Face face = glyph.face->get_face();
+        if (glyph.face->is_color())
+        {
+            load_flags |= FT_LOAD_COLOR ;
+            if (face->num_fixed_sizes > 0)
+            {
+                int scaled_size = static_cast<int>(glyph.format->text_size * scale_factor_);
+                int best_match = 0;
+                int diff = std::abs(scaled_size - face->available_sizes[0].width);
+                for (int i = 1; i < face->num_fixed_sizes; ++i)
+                {
+                    int ndiff = std::abs(scaled_size - face->available_sizes[i].height);
+                    if (ndiff < diff)
+                    {
+                        best_match = i;
+                        diff = ndiff;
+                    }
+                }
+                error = FT_Select_Size(face, best_match);
+            }
+        }
+        else
+        {
+            glyph.face->set_character_sizes(glyph.format->text_size * scale_factor_);
+        }
+
+        double size = glyph.format->text_size * scale_factor_;
         matrix.xx = static_cast<FT_Fixed>( glyph_pos.rot.cos * 0x10000L);
         matrix.xy = static_cast<FT_Fixed>(-glyph_pos.rot.sin * 0x10000L);
         matrix.yx = static_cast<FT_Fixed>( glyph_pos.rot.sin * 0x10000L);
@@ -77,17 +106,13 @@ void text_renderer::prepare_glyphs(glyph_positions const& positions)
         pen.x = static_cast<FT_Pos>(pos.x * 64);
         pen.y = static_cast<FT_Pos>(pos.y * 64);
 
-        FT_Face face = glyph.face->get_face();
         FT_Set_Transform(face, &matrix, &pen);
-
-        error = FT_Load_Glyph(face, glyph.glyph_index, FT_LOAD_NO_HINTING);
+        error = FT_Load_Glyph(face, glyph.glyph_index, load_flags);
         if (error) continue;
-
         FT_Glyph image;
         error = FT_Get_Glyph(face->glyph, &image);
         if (error) continue;
-
-        glyphs_.emplace_back(image, *glyph.format);
+        glyphs_.emplace_back(image, *glyph.format, pos, size);
     }
 }
 
@@ -101,7 +126,7 @@ void composite_bitmap(T & pixmap, FT_Bitmap *bitmap, unsigned rgba, int x, int y
     {
         for (int j = y, q = 0; j < y_max; ++j, ++q)
         {
-            unsigned gray=bitmap->buffer[q*bitmap->width+p];
+            unsigned gray = bitmap->buffer[q * bitmap->width + p];
             if (gray)
             {
                 mapnik::composite_pixel(pixmap, comp_op, i, j, rgba, gray, opacity);
@@ -110,6 +135,31 @@ void composite_bitmap(T & pixmap, FT_Bitmap *bitmap, unsigned rgba, int x, int y
     }
 }
 
+template <typename T>
+void composite_color_bitmap(T & pixmap, FT_Bitmap *bitmap, int x, int y, double size, double opacity, composite_mode_e comp_op)
+{
+  image_rgba8 image(bitmap->width, bitmap->rows);
+
+  for (unsigned i = 0, p = 0; i < bitmap->width; ++i, p += 4)
+  {
+      for (unsigned j = 0, q = 0; j < bitmap->rows; ++j, ++q)
+      {
+          std::uint8_t b = bitmap->buffer[q * bitmap->width * 4 + p];
+          std::uint8_t g = bitmap->buffer[q * bitmap->width * 4 + p + 1];
+          std::uint8_t r = bitmap->buffer[q * bitmap->width * 4 + p + 2];
+          std::uint8_t a = bitmap->buffer[q * bitmap->width * 4 + p + 3];
+          unsigned c = static_cast<unsigned>((a << 24) | (b << 16) | (g << 8) | (r));
+          image(i, j) = c;
+      }
+  }
+  double scale = size/image.height();
+  int scaled_width = bitmap->width * scale;
+  int scaled_height = bitmap->rows * scale;
+  image_rgba8 scaled_image(scaled_width, scaled_height);
+  scale_image_agg(scaled_image, image , SCALING_BILINEAR , scale, scale, 0.0, 0.0, 1.0, 0);
+  composite(pixmap, scaled_image, comp_op, opacity, x, y);
+}
+
 template <typename T>
 agg_text_renderer<T>::agg_text_renderer (pixmap_type & pixmap,
                                          halo_rasterizer_e rasterizer,
@@ -211,18 +261,38 @@ void agg_text_renderer<T>::render(glyph_positions const& pos)
     {
         fill = glyph.properties.fill.rgba();
         text_opacity = glyph.properties.text_opacity;
+
         FT_Glyph_Transform(glyph.image, &matrix, &start);
-        error = FT_Glyph_To_Bitmap(&glyph.image ,FT_RENDER_MODE_NORMAL, 0, 1);
-        if (!error)
+        error = 0;
+        if ( glyph.image->format != FT_GLYPH_FORMAT_BITMAP )
+        {
+
+            error = FT_Glyph_To_Bitmap(&glyph.image ,FT_RENDER_MODE_NORMAL, 0, 1);
+        }
+        if (error == 0)
         {
             FT_BitmapGlyph bit = reinterpret_cast<FT_BitmapGlyph>(glyph.image);
-            composite_bitmap(pixmap_,
-                             &bit->bitmap,
-                             fill,
-                             bit->left,
-                             height - bit->top,
-                             text_opacity,
-                             comp_op_);
+            int pixel_mode = bit->bitmap.pixel_mode;
+            if (pixel_mode == 7)
+            {
+                int x = (start.x >> 6) + glyph.pos.x;
+                int y = height - (start.y >> 6) + glyph.pos.y;
+                composite_color_bitmap(pixmap_,
+                                       &bit->bitmap,
+                                       x,y, glyph.size,
+                                       text_opacity,
+                                       comp_op_);
+            }
+            else
+            {
+                composite_bitmap(pixmap_,
+                                 &bit->bitmap,
+                                 fill,
+                                 bit->left,
+                                 height - bit->top,
+                                 text_opacity,
+                                 comp_op_);
+            }
         }
         FT_Done_Glyph(glyph.image);
     }
@@ -257,7 +327,6 @@ void grid_text_renderer<T>::render(glyph_positions const& pos, value_integer fea
         error = FT_Glyph_To_Bitmap(&glyph.image, FT_RENDER_MODE_NORMAL, 0, 1);
         if (!error)
         {
-
             FT_BitmapGlyph bit = reinterpret_cast<FT_BitmapGlyph>(glyph.image);
             render_halo_id(&bit->bitmap,
                            feature_id,

From cbacaaf0c5f43b8cce6160eee811c2e7d4f501f6 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 28 Feb 2017 15:05:37 +0100
Subject: [PATCH 270/328] initialize to reasonable values.

---
 include/mapnik/text/text_layout.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/mapnik/text/text_layout.hpp b/include/mapnik/text/text_layout.hpp
index 3e2011a2f..a79a0caf8 100644
--- a/include/mapnik/text/text_layout.hpp
+++ b/include/mapnik/text/text_layout.hpp
@@ -143,8 +143,8 @@ private:
     // note: this probably isn't the best solution. it would be better to have an object for each cluster, but
     // it needs to be implemented with no overhead.
     std::map<unsigned, double> width_map_;
-    double width_;
-    double height_;
+    double width_ = 0.0;
+    double height_ = 0.0;
     unsigned glyphs_count_;
 
     // output
@@ -173,7 +173,7 @@ private:
     bool rotate_displacement_ = false;
     double text_ratio_ = 0.0;
     pixel_position displacement_ = {0,0};
-    box2d<double> bounds_;
+    box2d<double> bounds_ = {0, 0, 0, 0};
 
     // children
     text_layout_vector child_layout_list_;

From 87c619cdc23cd10bf2384deac9e2a5edebe0d502 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 28 Feb 2017 15:13:40 +0100
Subject: [PATCH 271/328] don't forget FT_LOAD_NO_HINTING

---
 src/text/face.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/text/face.cpp b/src/text/face.cpp
index 4c5836607..1c3a4ba25 100644
--- a/src/text/face.cpp
+++ b/src/text/face.cpp
@@ -64,7 +64,7 @@ bool font_face::glyph_dimensions(glyph_info & glyph) const
     pen.y = 0;
     if (color_font_) FT_Select_Size(face_, 0);
     FT_Set_Transform(face_, 0, &pen);
-    FT_Int32 load_flags = FT_LOAD_DEFAULT;// | FT_LOAD_NO_HINTING;
+    FT_Int32 load_flags = FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING;
     if (color_font_) load_flags |= FT_LOAD_COLOR ;
     if (FT_Load_Glyph(face_, glyph.glyph_index, load_flags))
     {

From 570126bd76c5b6078e00b6dd8dfc4bf258b66c13 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 1 Mar 2017 10:27:12 +0100
Subject: [PATCH 272/328] make hex parser strict (expecting two characters
 after \x) to avoid greedy parsing of trailing characters as in
 "\xF0\x9F\x8D\xB7abc" ==>  ... + "\xB7" +  "abc" not "\xB7abc"

---
 include/mapnik/expression_grammar_x3_def.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/mapnik/expression_grammar_x3_def.hpp b/include/mapnik/expression_grammar_x3_def.hpp
index 0be7fb483..23735e5de 100644
--- a/include/mapnik/expression_grammar_x3_def.hpp
+++ b/include/mapnik/expression_grammar_x3_def.hpp
@@ -63,7 +63,7 @@ namespace mapnik { namespace grammar {
     using x3::no_case;
     using x3::alpha;
     using x3::alnum;
-    using x3::hex;
+    x3::uint_parser<char, 16, 2, 2> const hex2 {};
 
     auto do_assign = [] (auto const& ctx)
     {
@@ -302,8 +302,8 @@ namespace mapnik { namespace grammar {
     x3::rule<class regex_replace_expression, std::pair<std::string,std::string> > const regex_replace_expression("regex replace expression");
 
     // strings
-    auto const single_quoted_string = x3::rule<class single_quoted_string, std::string> {} = lit('\'') >> no_skip[*(unesc_char | ("\\x" > hex) | (char_ - '\''))] > '\'';
-    auto const double_quoted_string = x3::rule<class double_quoted_string, std::string> {} = lit('"') >> no_skip[*(unesc_char | ("\\x" > hex) | (char_ - '"'))] > '"';
+    auto const single_quoted_string = x3::rule<class single_quoted_string, std::string> {} = lit('\'') >> no_skip[*(unesc_char | ("\\x" > hex2) | (char_ - '\''))] > '\'';
+    auto const double_quoted_string = x3::rule<class double_quoted_string, std::string> {} = lit('"') >> no_skip[*(unesc_char | ("\\x" > hex2) | (char_ - '"'))] > '"';
     auto const quoted_string = x3::rule<class quoted_string, std::string> {} = single_quoted_string | double_quoted_string;
 
     auto const unquoted_ustring = x3::rule<class ustring, std::string> {} = no_skip[alpha > *alnum] - lit("not");

From 0076a5a91630457715d6cbc01b906a43888c338b Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 1 Mar 2017 10:27:12 +0100
Subject: [PATCH 273/328] make hex parser strict (expecting two characters
 after \x) to avoid greedy parsing of trailing characters as in
 "\xF0\x9F\x8D\xB7abc" ==>  ... + "\xB7" +  "abc" not "\xB7abc"

---
 include/mapnik/expression_grammar_x3_def.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/mapnik/expression_grammar_x3_def.hpp b/include/mapnik/expression_grammar_x3_def.hpp
index 0be7fb483..23735e5de 100644
--- a/include/mapnik/expression_grammar_x3_def.hpp
+++ b/include/mapnik/expression_grammar_x3_def.hpp
@@ -63,7 +63,7 @@ namespace mapnik { namespace grammar {
     using x3::no_case;
     using x3::alpha;
     using x3::alnum;
-    using x3::hex;
+    x3::uint_parser<char, 16, 2, 2> const hex2 {};
 
     auto do_assign = [] (auto const& ctx)
     {
@@ -302,8 +302,8 @@ namespace mapnik { namespace grammar {
     x3::rule<class regex_replace_expression, std::pair<std::string,std::string> > const regex_replace_expression("regex replace expression");
 
     // strings
-    auto const single_quoted_string = x3::rule<class single_quoted_string, std::string> {} = lit('\'') >> no_skip[*(unesc_char | ("\\x" > hex) | (char_ - '\''))] > '\'';
-    auto const double_quoted_string = x3::rule<class double_quoted_string, std::string> {} = lit('"') >> no_skip[*(unesc_char | ("\\x" > hex) | (char_ - '"'))] > '"';
+    auto const single_quoted_string = x3::rule<class single_quoted_string, std::string> {} = lit('\'') >> no_skip[*(unesc_char | ("\\x" > hex2) | (char_ - '\''))] > '\'';
+    auto const double_quoted_string = x3::rule<class double_quoted_string, std::string> {} = lit('"') >> no_skip[*(unesc_char | ("\\x" > hex2) | (char_ - '"'))] > '"';
     auto const quoted_string = x3::rule<class quoted_string, std::string> {} = single_quoted_string | double_quoted_string;
 
     auto const unquoted_ustring = x3::rule<class ustring, std::string> {} = no_skip[alpha > *alnum] - lit("not");

From e95b16c5ca94ff060cf18bec57875e90d63f8741 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 1 Mar 2017 10:27:12 +0100
Subject: [PATCH 274/328] make hex parser strict (expecting two characters
 after \x) to avoid greedy parsing of trailing characters as in
 "\xF0\x9F\x8D\xB7abc" ==>  ... + "\xB7" +  "abc" not "\xB7abc"

---
 include/mapnik/expression_grammar_x3_def.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/mapnik/expression_grammar_x3_def.hpp b/include/mapnik/expression_grammar_x3_def.hpp
index 0be7fb483..23735e5de 100644
--- a/include/mapnik/expression_grammar_x3_def.hpp
+++ b/include/mapnik/expression_grammar_x3_def.hpp
@@ -63,7 +63,7 @@ namespace mapnik { namespace grammar {
     using x3::no_case;
     using x3::alpha;
     using x3::alnum;
-    using x3::hex;
+    x3::uint_parser<char, 16, 2, 2> const hex2 {};
 
     auto do_assign = [] (auto const& ctx)
     {
@@ -302,8 +302,8 @@ namespace mapnik { namespace grammar {
     x3::rule<class regex_replace_expression, std::pair<std::string,std::string> > const regex_replace_expression("regex replace expression");
 
     // strings
-    auto const single_quoted_string = x3::rule<class single_quoted_string, std::string> {} = lit('\'') >> no_skip[*(unesc_char | ("\\x" > hex) | (char_ - '\''))] > '\'';
-    auto const double_quoted_string = x3::rule<class double_quoted_string, std::string> {} = lit('"') >> no_skip[*(unesc_char | ("\\x" > hex) | (char_ - '"'))] > '"';
+    auto const single_quoted_string = x3::rule<class single_quoted_string, std::string> {} = lit('\'') >> no_skip[*(unesc_char | ("\\x" > hex2) | (char_ - '\''))] > '\'';
+    auto const double_quoted_string = x3::rule<class double_quoted_string, std::string> {} = lit('"') >> no_skip[*(unesc_char | ("\\x" > hex2) | (char_ - '"'))] > '"';
     auto const quoted_string = x3::rule<class quoted_string, std::string> {} = single_quoted_string | double_quoted_string;
 
     auto const unquoted_ustring = x3::rule<class ustring, std::string> {} = no_skip[alpha > *alnum] - lit("not");

From 131f785dcee698b2bb6545511c948c45978b7303 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 1 Mar 2017 11:25:43 +0100
Subject: [PATCH 275/328] Make parsing `\xXX` format strict via hex2 parser +
 append UTF8 encoded `\xXX` characters directly (fixes #3631)

---
 include/mapnik/json/unicode_string_grammar_x3_def.hpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/mapnik/json/unicode_string_grammar_x3_def.hpp b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
index d58293cf3..788ea7247 100644
--- a/include/mapnik/json/unicode_string_grammar_x3_def.hpp
+++ b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
@@ -48,6 +48,8 @@ void push_utf8_impl(std::string & str, uchar code_point)
 }
 }
 
+auto push_char = [](auto const& ctx) { _val(ctx).push_back(_attr(ctx));};
+
 auto push_utf8 = [](auto const& ctx) { detail::push_utf8_impl(_val(ctx), _attr(ctx));};
 
 auto push_esc = [] (auto const& ctx)
@@ -79,10 +81,10 @@ auto push_esc = [] (auto const& ctx)
 
 using x3::lit;
 using x3::char_;
-using x3::hex;
 using x3::eol;
 using x3::no_skip;
 
+x3::uint_parser<char,  16, 2, 2> const hex2 {};
 x3::uint_parser<uchar, 16, 4, 4> const hex4 {};
 x3::uint_parser<uchar, 16, 8, 8> const hex8 {};
 
@@ -95,7 +97,7 @@ x3::rule<class escaped_tag, std::string> const escaped("Escaped Characted");
 auto unicode_string_def = double_quoted
     ;
 auto const escaped_def = lit('\\') >
-    ((lit('x') > hex[push_utf8])
+    ((lit('x') > hex2[push_char])
      |
      (lit('u') > hex4[push_utf8])
      |

From 378fa41db6656ec26f2c65106b02e17f1125617b Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 1 Mar 2017 11:53:27 +0100
Subject: [PATCH 276/328] relax hex4 parser to allow 5 character \unnnnn code
 points

---
 include/mapnik/json/unicode_string_grammar_x3_def.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/mapnik/json/unicode_string_grammar_x3_def.hpp b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
index 788ea7247..3c90e2f21 100644
--- a/include/mapnik/json/unicode_string_grammar_x3_def.hpp
+++ b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
@@ -85,7 +85,7 @@ using x3::eol;
 using x3::no_skip;
 
 x3::uint_parser<char,  16, 2, 2> const hex2 {};
-x3::uint_parser<uchar, 16, 4, 4> const hex4 {};
+x3::uint_parser<uchar, 16, 4, 5> const hex4 {};
 x3::uint_parser<uchar, 16, 8, 8> const hex8 {};
 
 // start rule

From 2d2c5a191be83f182a1c4d22e5ae42fe81a45107 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 1 Mar 2017 11:58:18 +0100
Subject: [PATCH 277/328] expression_grammar: re-use unicode_string_grammar and
 add initial support for `\uNNNNN` code points (TODO)

---
 include/mapnik/expression_grammar_x3_def.hpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/mapnik/expression_grammar_x3_def.hpp b/include/mapnik/expression_grammar_x3_def.hpp
index 23735e5de..2b5f24236 100644
--- a/include/mapnik/expression_grammar_x3_def.hpp
+++ b/include/mapnik/expression_grammar_x3_def.hpp
@@ -24,6 +24,7 @@
 #define MAPNIK_EXPRESSIONS_GRAMMAR_X3_DEF_HPP
 
 #include <mapnik/expression_grammar_x3.hpp>
+#include <mapnik/json/unicode_string_grammar_x3_def.hpp>
 #include <mapnik/expression_node.hpp>
 #include <mapnik/function_call.hpp>
 #include <mapnik/unicode.hpp>
@@ -65,6 +66,9 @@ namespace mapnik { namespace grammar {
     using x3::alnum;
     x3::uint_parser<char, 16, 2, 2> const hex2 {};
 
+    namespace {
+    auto const& double_quoted = json::unicode_string_grammar();
+    }
     auto do_assign = [] (auto const& ctx)
     {
         _val(ctx) = std::move(_attr(ctx));
@@ -303,8 +307,8 @@ namespace mapnik { namespace grammar {
 
     // strings
     auto const single_quoted_string = x3::rule<class single_quoted_string, std::string> {} = lit('\'') >> no_skip[*(unesc_char | ("\\x" > hex2) | (char_ - '\''))] > '\'';
-    auto const double_quoted_string = x3::rule<class double_quoted_string, std::string> {} = lit('"') >> no_skip[*(unesc_char | ("\\x" > hex2) | (char_ - '"'))] > '"';
-    auto const quoted_string = x3::rule<class quoted_string, std::string> {} = single_quoted_string | double_quoted_string;
+    //auto const double_quoted_string = x3::rule<class double_quoted_string, std::string> {} = lit('"') >> no_skip[*(unesc_char | ("\\x" > hex2) | (char_ - '"'))] > '"';
+    auto const quoted_string = x3::rule<class quoted_string, std::string> {} = single_quoted_string | double_quoted;//_string;
 
     auto const unquoted_ustring = x3::rule<class ustring, std::string> {} = no_skip[alpha > *alnum] - lit("not");
 

From d29be8a68933936eef92e04716901ca94275da57 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 1 Mar 2017 12:08:22 +0100
Subject: [PATCH 278/328] If I'm reading docs correctly `\uNNNN` + `\UNNNNNNNN`
 are correct Revert "relax hex4 parser to allow 5 character \unnnnn code
 points"

This reverts commit 378fa41db6656ec26f2c65106b02e17f1125617b.
---
 include/mapnik/json/unicode_string_grammar_x3_def.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/mapnik/json/unicode_string_grammar_x3_def.hpp b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
index 3c90e2f21..788ea7247 100644
--- a/include/mapnik/json/unicode_string_grammar_x3_def.hpp
+++ b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
@@ -85,7 +85,7 @@ using x3::eol;
 using x3::no_skip;
 
 x3::uint_parser<char,  16, 2, 2> const hex2 {};
-x3::uint_parser<uchar, 16, 4, 5> const hex4 {};
+x3::uint_parser<uchar, 16, 4, 4> const hex4 {};
 x3::uint_parser<uchar, 16, 8, 8> const hex8 {};
 
 // start rule

From 04dd05c9714b4e23aff127bd36ee10316ff26622 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 1 Mar 2017 12:59:34 +0100
Subject: [PATCH 279/328] minimise shared_ptr assignments and simplify code

---
 include/mapnik/text/harfbuzz_shaper.hpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/include/mapnik/text/harfbuzz_shaper.hpp b/include/mapnik/text/harfbuzz_shaper.hpp
index 2752af964..af3b4d6b1 100644
--- a/include/mapnik/text/harfbuzz_shaper.hpp
+++ b/include/mapnik/text/harfbuzz_shaper.hpp
@@ -187,25 +187,21 @@ static void shape_text(text_line & line,
                 auto const& c = glyphinfos[c_id];
                 for (auto const& info : c)
                 {
-                    face_ptr theface = face;
                     auto const& gpos = info.position;
                     auto const& glyph = info.glyph;
-                    if (info.glyph.codepoint != 0)
-                    {
-                        theface = info.face;
-                    }
                     unsigned char_index = glyph.cluster;
                     glyph_info g(glyph.codepoint,char_index,text_item.format_);
-                    if (theface->glyph_dimensions(g))
+                    if (info.glyph.codepoint != 0) g.face = info.face;
+                    else g.face = face;
+                    if (g.face->glyph_dimensions(g))
                     {
-                        g.face = theface;
-                        g.scale_multiplier = theface->get_face()->units_per_EM > 0 ?
-                            (size / theface->get_face()->units_per_EM) : (size / 2048.0) ;
+                        g.scale_multiplier = g.face->get_face()->units_per_EM > 0 ?
+                            (size / g.face->get_face()->units_per_EM) : (size / 2048.0) ;
                         //Overwrite default advance with better value provided by HarfBuzz
                         g.unscaled_advance = gpos.x_advance;
                         g.offset.set(gpos.x_offset * g.scale_multiplier, gpos.y_offset * g.scale_multiplier);
                         double tmp_height = g.height();
-                        if (theface->is_color())
+                        if (g.face->is_color())
                         {
                             tmp_height = size;
                         }

From 92f07b7a7a3b364331409a59f457ae4e1802b245 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 1 Mar 2017 18:46:48 +0100
Subject: [PATCH 280/328] handle utf16 encoding correctly by parsing as
 sequence and applying utf16->utf32->utf8 conversion.

---
 .../json/unicode_string_grammar_x3_def.hpp    | 35 ++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/include/mapnik/json/unicode_string_grammar_x3_def.hpp b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
index 788ea7247..43d40c9aa 100644
--- a/include/mapnik/json/unicode_string_grammar_x3_def.hpp
+++ b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
@@ -24,8 +24,9 @@
 #define MAPNIK_JSON_UNICODE_STRING_GRAMMAR_X3_DEF_HPP
 
 #include <mapnik/json/unicode_string_grammar_x3.hpp>
-#include <iostream>
-
+// boost
+#include <boost/regex/pending/unicode_iterator.hpp>
+//
 namespace mapnik { namespace json { namespace grammar {
 
 namespace x3 = boost::spirit::x3;
@@ -52,6 +53,25 @@ auto push_char = [](auto const& ctx) { _val(ctx).push_back(_attr(ctx));};
 
 auto push_utf8 = [](auto const& ctx) { detail::push_utf8_impl(_val(ctx), _attr(ctx));};
 
+auto push_utf16 = [](auto const& ctx)
+{
+    using iterator_type = std::vector<std::uint16_t>::const_iterator;
+    auto const& utf16 = _attr(ctx);
+    try
+    {
+        boost::u16_to_u32_iterator<iterator_type> itr(utf16.begin());
+        boost::u16_to_u32_iterator<iterator_type> end(utf16.end());
+        for (; itr != end; ++itr)
+        {
+            detail::push_utf8_impl(_val(ctx), *itr);
+        }
+    }
+    catch( ... )
+    {
+        // caught
+    }
+};
+
 auto push_esc = [] (auto const& ctx)
 {
     std::string & utf8 = _val(ctx);
@@ -85,7 +105,7 @@ using x3::eol;
 using x3::no_skip;
 
 x3::uint_parser<char,  16, 2, 2> const hex2 {};
-x3::uint_parser<uchar, 16, 4, 4> const hex4 {};
+x3::uint_parser<std::uint16_t, 16, 4, 4> const hex4 {};
 x3::uint_parser<uchar, 16, 8, 8> const hex8 {};
 
 // start rule
@@ -93,13 +113,17 @@ unicode_string_grammar_type const unicode_string("Unicode String");
 // rules
 x3::rule<class double_quoted_tag, std::string> const double_quoted("Double-quoted string");
 x3::rule<class escaped_tag, std::string> const escaped("Escaped Characted");
+x3::rule<class utf16_string_tag, std::vector<std::uint16_t>> const utf16_string("UTF16 encoded string");
 
 auto unicode_string_def = double_quoted
     ;
+
+auto utf16_string_def = lit('u') > hex4 > *(lit("\\u") > hex4);
+
 auto const escaped_def = lit('\\') >
     ((lit('x') > hex2[push_char])
      |
-     (lit('u') > hex4[push_utf8])
+     utf16_string[push_utf16]
      |
      (lit('U') > hex8[push_utf8])
      |
@@ -116,7 +140,8 @@ auto const double_quoted_def = lit('"') > no_skip[*(escaped[append] | (~char_('"
 BOOST_SPIRIT_DEFINE(
     unicode_string,
     double_quoted,
-    escaped
+    escaped,
+    utf16_string
     );
 
 #pragma GCC diagnostic pop

From 1bdc8e6badc4fb34368dd88e69a3cd6d2144226c Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 1 Mar 2017 18:46:48 +0100
Subject: [PATCH 281/328] handle utf16 encoding correctly by parsing as
 sequence and applying utf16->utf32->utf8 conversion.

---
 .../json/unicode_string_grammar_x3_def.hpp    | 35 ++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/include/mapnik/json/unicode_string_grammar_x3_def.hpp b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
index 788ea7247..43d40c9aa 100644
--- a/include/mapnik/json/unicode_string_grammar_x3_def.hpp
+++ b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
@@ -24,8 +24,9 @@
 #define MAPNIK_JSON_UNICODE_STRING_GRAMMAR_X3_DEF_HPP
 
 #include <mapnik/json/unicode_string_grammar_x3.hpp>
-#include <iostream>
-
+// boost
+#include <boost/regex/pending/unicode_iterator.hpp>
+//
 namespace mapnik { namespace json { namespace grammar {
 
 namespace x3 = boost::spirit::x3;
@@ -52,6 +53,25 @@ auto push_char = [](auto const& ctx) { _val(ctx).push_back(_attr(ctx));};
 
 auto push_utf8 = [](auto const& ctx) { detail::push_utf8_impl(_val(ctx), _attr(ctx));};
 
+auto push_utf16 = [](auto const& ctx)
+{
+    using iterator_type = std::vector<std::uint16_t>::const_iterator;
+    auto const& utf16 = _attr(ctx);
+    try
+    {
+        boost::u16_to_u32_iterator<iterator_type> itr(utf16.begin());
+        boost::u16_to_u32_iterator<iterator_type> end(utf16.end());
+        for (; itr != end; ++itr)
+        {
+            detail::push_utf8_impl(_val(ctx), *itr);
+        }
+    }
+    catch( ... )
+    {
+        // caught
+    }
+};
+
 auto push_esc = [] (auto const& ctx)
 {
     std::string & utf8 = _val(ctx);
@@ -85,7 +105,7 @@ using x3::eol;
 using x3::no_skip;
 
 x3::uint_parser<char,  16, 2, 2> const hex2 {};
-x3::uint_parser<uchar, 16, 4, 4> const hex4 {};
+x3::uint_parser<std::uint16_t, 16, 4, 4> const hex4 {};
 x3::uint_parser<uchar, 16, 8, 8> const hex8 {};
 
 // start rule
@@ -93,13 +113,17 @@ unicode_string_grammar_type const unicode_string("Unicode String");
 // rules
 x3::rule<class double_quoted_tag, std::string> const double_quoted("Double-quoted string");
 x3::rule<class escaped_tag, std::string> const escaped("Escaped Characted");
+x3::rule<class utf16_string_tag, std::vector<std::uint16_t>> const utf16_string("UTF16 encoded string");
 
 auto unicode_string_def = double_quoted
     ;
+
+auto utf16_string_def = lit('u') > hex4 > *(lit("\\u") > hex4);
+
 auto const escaped_def = lit('\\') >
     ((lit('x') > hex2[push_char])
      |
-     (lit('u') > hex4[push_utf8])
+     utf16_string[push_utf16]
      |
      (lit('U') > hex8[push_utf8])
      |
@@ -116,7 +140,8 @@ auto const double_quoted_def = lit('"') > no_skip[*(escaped[append] | (~char_('"
 BOOST_SPIRIT_DEFINE(
     unicode_string,
     double_quoted,
-    escaped
+    escaped,
+    utf16_string
     );
 
 #pragma GCC diagnostic pop

From ab36ef92745ec664ad5468ba577272d988dffcb9 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 2 Mar 2017 12:25:44 +0100
Subject: [PATCH 282/328] update visual test data to track `harfbuzz-shaper`
 branch.

---
 .gitmodules      | 2 +-
 test/data-visual | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index baac64f8a..2d66e5fc0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,7 +5,7 @@
 [submodule "test/data-visual"]
 	path = test/data-visual
 	url = https://github.com/mapnik/test-data-visual.git
-	branch = master
+	branch = harfbuzz-shaper
 [submodule "deps/mapbox/variant"]
 	path = deps/mapbox/variant
 	url = https://github.com/mapbox/variant.git
diff --git a/test/data-visual b/test/data-visual
index f9a3c203b..7acfb4c48 160000
--- a/test/data-visual
+++ b/test/data-visual
@@ -1 +1 @@
-Subproject commit f9a3c203b3657dd1748d788304f83a26efb6439f
+Subproject commit 7acfb4c48d688463c1fa3c3bade27afde9563269

From f1de5758b27efa98557cf01cf21c49efd8c106fb Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 2 Mar 2017 14:55:00 +0100
Subject: [PATCH 283/328] attempting to pacify some compilers with an extra
 pair of brackets.

---
 test/unit/text/shaping.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/unit/text/shaping.cpp b/test/unit/text/shaping.cpp
index 4e4f9b7bc..4446d9b8e 100644
--- a/test/unit/text/shaping.cpp
+++ b/test/unit/text/shaping.cpp
@@ -66,7 +66,7 @@ TEST_CASE("shaping")
 
     {
         std::vector<std::tuple<unsigned, unsigned>> expected =
-            {{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}};
+            {{{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}}};
         // with default NotoSans-Regular.ttc and NotoNaskhArabic-Regular.ttf ^^^
         //std::vector<std::tuple<unsigned, unsigned>> expected =
         //  {{977,0}, {1094,3}, {1038,4}, {1168,4}, {9,7}, {3,8}, {11,9}, {68,10}, {69,11}, {70,12}, {12,13}};
@@ -76,26 +76,28 @@ TEST_CASE("shaping")
 
     {
         std::vector<std::tuple<unsigned, unsigned>> expected =
-            {{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}};
+            {{{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}}};
         test_shaping(fontset, fm, expected, u8"སྤུ་ཧྲེང (普兰镇)");
     }
 
     {
         std::vector<std::tuple<unsigned, unsigned>> expected =
-            {{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {0, 5}, {0, 6}, {0, 7}, {12, 8}};
+            {{{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {0, 5}, {0, 6}, {0, 7}, {12, 8}}};
         test_shaping(fontset, fm, expected, u8"abc (普兰镇)");
     }
 
     {
         std::vector<std::tuple<unsigned, unsigned>> expected =
-            {{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {68, 5}, {69, 6}, {70, 7}, {12, 8}};
+            {{{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {68, 5}, {69, 6}, {70, 7}, {12, 8}}};
         test_shaping(fontset, fm, expected, "abc (abc)");
     }
 
     {
         //    "ⵃⴰⵢ ⵚⵉⵏⴰⵄⵉ الحي الصناعي"
         std::vector<std::tuple<unsigned, unsigned>> expected =
-            {{0, 0},{0, 1},{0, 2},{3, 3},{0, 4},{0, 5},{0, 6},{0, 7},{0, 8},{0, 9},{3, 10},{509, 22},{481, 21},{438, 20},{503, 19},{470, 18},{496, 17},{43, 16},{3, 15},{509, 14},{454, 13},{496, 12},{43, 11}};
+            {{{0, 0}, {0, 1}, {0, 2}, {3, 3}, {0, 4}, {0, 5}, {0, 6}, {0, 7},
+              {0, 8}, {0, 9}, {3, 10}, {509, 22}, {481, 21}, {438, 20}, {503, 19},
+              {470, 18}, {496, 17}, {43, 16}, {3, 15}, {509, 14}, {454, 13}, {496, 12}, {43, 11}}};
         test_shaping(fontset, fm, expected, u8"ⵃⴰⵢ ⵚⵉⵏⴰⵄⵉ الحي الصناعي");
     }
 

From 713b9e77888a6c71c7ef216ded842becc8decba3 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 2 Mar 2017 15:09:11 +0100
Subject: [PATCH 284/328] take #2 - try using pair instead of tuple

---
 test/unit/text/shaping.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/unit/text/shaping.cpp b/test/unit/text/shaping.cpp
index 4446d9b8e..795d65063 100644
--- a/test/unit/text/shaping.cpp
+++ b/test/unit/text/shaping.cpp
@@ -7,7 +7,7 @@
 namespace {
 
 void test_shaping( mapnik::font_set const& fontset, mapnik::face_manager& fm,
-                   std::vector<std::tuple<unsigned, unsigned>> const& expected, char const* str, bool debug = false)
+                   std::vector<std::pair<unsigned, unsigned>> const& expected, char const* str, bool debug = false)
 {
     mapnik::transcoder tr("utf8");
     std::map<unsigned,double> width_map;
@@ -65,39 +65,39 @@ TEST_CASE("shaping")
     mapnik::face_manager fm(fl, font_file_mapping, font_memory_cache);
 
     {
-        std::vector<std::tuple<unsigned, unsigned>> expected =
-            {{{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}}};
+        std::vector<std::pair<unsigned, unsigned>> expected =
+            {{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}};
         // with default NotoSans-Regular.ttc and NotoNaskhArabic-Regular.ttf ^^^
-        //std::vector<std::tuple<unsigned, unsigned>> expected =
+        //std::vector<std::pair<unsigned, unsigned>> expected =
         //  {{977,0}, {1094,3}, {1038,4}, {1168,4}, {9,7}, {3,8}, {11,9}, {68,10}, {69,11}, {70,12}, {12,13}};
         // expected results if "NotoSansTibetan-Regular.ttf is registered^^
         test_shaping(fontset, fm, expected, u8"སྤུ་ཧྲེང (abc)");
     }
 
     {
-        std::vector<std::tuple<unsigned, unsigned>> expected =
-            {{{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}}};
+        std::vector<std::pair<unsigned, unsigned>> expected =
+            {{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}};
         test_shaping(fontset, fm, expected, u8"སྤུ་ཧྲེང (普兰镇)");
     }
 
     {
-        std::vector<std::tuple<unsigned, unsigned>> expected =
-            {{{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {0, 5}, {0, 6}, {0, 7}, {12, 8}}};
+        std::vector<std::pair<unsigned, unsigned>> expected =
+            {{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {0, 5}, {0, 6}, {0, 7}, {12, 8}};
         test_shaping(fontset, fm, expected, u8"abc (普兰镇)");
     }
 
     {
-        std::vector<std::tuple<unsigned, unsigned>> expected =
-            {{{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {68, 5}, {69, 6}, {70, 7}, {12, 8}}};
+        std::vector<std::pair<unsigned, unsigned>> expected =
+            {{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {68, 5}, {69, 6}, {70, 7}, {12, 8}};
         test_shaping(fontset, fm, expected, "abc (abc)");
     }
 
     {
         //    "ⵃⴰⵢ ⵚⵉⵏⴰⵄⵉ الحي الصناعي"
-        std::vector<std::tuple<unsigned, unsigned>> expected =
-            {{{0, 0}, {0, 1}, {0, 2}, {3, 3}, {0, 4}, {0, 5}, {0, 6}, {0, 7},
+        std::vector<std::pair<unsigned, unsigned>> expected =
+            {{0, 0}, {0, 1}, {0, 2}, {3, 3}, {0, 4}, {0, 5}, {0, 6}, {0, 7},
               {0, 8}, {0, 9}, {3, 10}, {509, 22}, {481, 21}, {438, 20}, {503, 19},
-              {470, 18}, {496, 17}, {43, 16}, {3, 15}, {509, 14}, {454, 13}, {496, 12}, {43, 11}}};
+              {470, 18}, {496, 17}, {43, 16}, {3, 15}, {509, 14}, {454, 13}, {496, 12}, {43, 11}};
         test_shaping(fontset, fm, expected, u8"ⵃⴰⵢ ⵚⵉⵏⴰⵄⵉ الحي الصناعي");
     }
 

From fb7139bc6385f7bf0bcfa689692a92b43c0e57b2 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 3 Mar 2017 15:14:01 +0100
Subject: [PATCH 285/328] expressions - only import `escaped` rule from
 unicode_string_grammar and construct single/double quoted string rules
 locally to match expression grammar. NOTE: single quoted strings don't accept
 unicode encodings

---
 include/mapnik/expression_grammar_x3_def.hpp | 24 ++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/include/mapnik/expression_grammar_x3_def.hpp b/include/mapnik/expression_grammar_x3_def.hpp
index 2b5f24236..f468b5904 100644
--- a/include/mapnik/expression_grammar_x3_def.hpp
+++ b/include/mapnik/expression_grammar_x3_def.hpp
@@ -67,8 +67,14 @@ namespace mapnik { namespace grammar {
     x3::uint_parser<char, 16, 2, 2> const hex2 {};
 
     namespace {
-    auto const& double_quoted = json::unicode_string_grammar();
+    auto const& escaped = json::grammar::escaped;
     }
+
+    auto append = [](auto const& ctx)
+    {
+        _val(ctx) += _attr(ctx);
+    };
+
     auto do_assign = [] (auto const& ctx)
     {
         _val(ctx) = std::move(_attr(ctx));
@@ -306,9 +312,19 @@ namespace mapnik { namespace grammar {
     x3::rule<class regex_replace_expression, std::pair<std::string,std::string> > const regex_replace_expression("regex replace expression");
 
     // strings
-    auto const single_quoted_string = x3::rule<class single_quoted_string, std::string> {} = lit('\'') >> no_skip[*(unesc_char | ("\\x" > hex2) | (char_ - '\''))] > '\'';
-    //auto const double_quoted_string = x3::rule<class double_quoted_string, std::string> {} = lit('"') >> no_skip[*(unesc_char | ("\\x" > hex2) | (char_ - '"'))] > '"';
-    auto const quoted_string = x3::rule<class quoted_string, std::string> {} = single_quoted_string | double_quoted;//_string;
+    auto const single_quoted_string = x3::rule<class single_quoted_string, std::string> {} = lit('\'')
+        >> no_skip[*(unesc_char[append]
+                     |
+                     (~char_('\''))[append])] > lit('\'');
+
+    auto const double_quoted_string = x3::rule<class double_quoted_string, std::string> {} = lit('"')
+        >> no_skip[*(unesc_char[append]
+                     |
+                     escaped[append]
+                     |
+                     (~char_('"'))[append])] > lit('"');
+
+    auto const quoted_string = x3::rule<class quoted_string, std::string> {} = single_quoted_string | double_quoted_string;
 
     auto const unquoted_ustring = x3::rule<class ustring, std::string> {} = no_skip[alpha > *alnum] - lit("not");
 

From a50efcb2bbef24c23cb489598d53187c7828fe63 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 3 Mar 2017 15:41:46 +0100
Subject: [PATCH 286/328] refactor unicode string grammar - add
 `escaped_unicode` rule + use it in expressions.

---
 include/mapnik/expression_grammar_x3_def.hpp  |  6 +++--
 .../json/unicode_string_grammar_x3_def.hpp    | 23 +++++++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/include/mapnik/expression_grammar_x3_def.hpp b/include/mapnik/expression_grammar_x3_def.hpp
index f468b5904..a7efe6173 100644
--- a/include/mapnik/expression_grammar_x3_def.hpp
+++ b/include/mapnik/expression_grammar_x3_def.hpp
@@ -67,7 +67,7 @@ namespace mapnik { namespace grammar {
     x3::uint_parser<char, 16, 2, 2> const hex2 {};
 
     namespace {
-    auto const& escaped = json::grammar::escaped;
+    auto const& escaped_unicode = json::grammar::escaped_unicode;
     }
 
     auto append = [](auto const& ctx)
@@ -315,12 +315,14 @@ namespace mapnik { namespace grammar {
     auto const single_quoted_string = x3::rule<class single_quoted_string, std::string> {} = lit('\'')
         >> no_skip[*(unesc_char[append]
                      |
+                     //(lit('\\') > escaped_unicode[append]) // FIXME (!)
+                     //|
                      (~char_('\''))[append])] > lit('\'');
 
     auto const double_quoted_string = x3::rule<class double_quoted_string, std::string> {} = lit('"')
         >> no_skip[*(unesc_char[append]
                      |
-                     escaped[append]
+                     (lit('\\') > escaped_unicode[append])
                      |
                      (~char_('"'))[append])] > lit('"');
 
diff --git a/include/mapnik/json/unicode_string_grammar_x3_def.hpp b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
index 43d40c9aa..fd0bcebe1 100644
--- a/include/mapnik/json/unicode_string_grammar_x3_def.hpp
+++ b/include/mapnik/json/unicode_string_grammar_x3_def.hpp
@@ -112,26 +112,28 @@ x3::uint_parser<uchar, 16, 8, 8> const hex8 {};
 unicode_string_grammar_type const unicode_string("Unicode String");
 // rules
 x3::rule<class double_quoted_tag, std::string> const double_quoted("Double-quoted string");
-x3::rule<class escaped_tag, std::string> const escaped("Escaped Characted");
+x3::rule<class escaped_tag, std::string> const escaped("Escaped Character");
+x3::rule<class escaped_unicode_tag, std::string> const escaped_unicode("Escaped Unicode code point(s)");
 x3::rule<class utf16_string_tag, std::vector<std::uint16_t>> const utf16_string("UTF16 encoded string");
 
 auto unicode_string_def = double_quoted
     ;
-
-auto utf16_string_def = lit('u') > hex4 > *(lit("\\u") > hex4);
-
+auto utf16_string_def = lit('u') > hex4 > *(lit("\\u") > hex4)
+    ;
+auto escaped_unicode_def =
+    (lit('x') > hex2[push_char])
+    |
+    utf16_string[push_utf16]
+    |
+    (lit('U') > hex8[push_utf8])
+    ;
 auto const escaped_def = lit('\\') >
-    ((lit('x') > hex2[push_char])
-     |
-     utf16_string[push_utf16]
-     |
-     (lit('U') > hex8[push_utf8])
+    (escaped_unicode[append]
      |
      char_("0abtnvfre\"/\\N_LP \t")[push_esc]
      |
      eol) // continue to next line
     ;
-
 auto const double_quoted_def = lit('"') > no_skip[*(escaped[append] | (~char_('"'))[append])] > lit('"');
 
 #pragma GCC diagnostic push
@@ -141,6 +143,7 @@ BOOST_SPIRIT_DEFINE(
     unicode_string,
     double_quoted,
     escaped,
+    escaped_unicode,
     utf16_string
     );
 

From 4d57fb1a6c2bd0894cf0538717a34ae67377b528 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 6 Mar 2017 09:51:30 +0100
Subject: [PATCH 287/328] print compiler version during configure step (ref
 #3616)

---
 SConstruct | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/SConstruct b/SConstruct
index de19797a3..ff1135a2f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1129,6 +1129,7 @@ if not preconfigured:
     else:
         color_print(4,'SCons USE_CONFIG specified as false, will not inherit variables python config file...')
 
+
     conf = Configure(env, custom_tests = conf_tests)
 
     if env['DEBUG']:
@@ -1142,6 +1143,9 @@ if not preconfigured:
     env['PLATFORM'] = platform.uname()[0]
     color_print(4,"Configuring on %s in *%s*..." % (env['PLATFORM'],mode))
 
+    cxx_version = call("%s --version" % env["CXX"] ,silent=True)
+    color_print(5, "CXX %s" % cxx_version)
+
     env['MISSING_DEPS'] = []
     env['SKIPPED_DEPS'] = []
     env['HAS_CAIRO'] = False

From 7f28246407df490c9679a625aa4cb5c07a43e7b3 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 6 Mar 2017 09:51:30 +0100
Subject: [PATCH 288/328] print compiler version during configure step (ref
 #3616)

---
 SConstruct | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/SConstruct b/SConstruct
index de19797a3..ff1135a2f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1129,6 +1129,7 @@ if not preconfigured:
     else:
         color_print(4,'SCons USE_CONFIG specified as false, will not inherit variables python config file...')
 
+
     conf = Configure(env, custom_tests = conf_tests)
 
     if env['DEBUG']:
@@ -1142,6 +1143,9 @@ if not preconfigured:
     env['PLATFORM'] = platform.uname()[0]
     color_print(4,"Configuring on %s in *%s*..." % (env['PLATFORM'],mode))
 
+    cxx_version = call("%s --version" % env["CXX"] ,silent=True)
+    color_print(5, "CXX %s" % cxx_version)
+
     env['MISSING_DEPS'] = []
     env['SKIPPED_DEPS'] = []
     env['HAS_CAIRO'] = False

From 3433397c30461729183e1d1d0bc3a26dafba2875 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 6 Mar 2017 15:59:07 +0100
Subject: [PATCH 289/328] test (expressions) - add more tests (ref #3616)

---
 test/unit/core/expressions_test.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/test/unit/core/expressions_test.cpp b/test/unit/core/expressions_test.cpp
index f5e84d5d4..a01c5bdea 100644
--- a/test/unit/core/expressions_test.cpp
+++ b/test/unit/core/expressions_test.cpp
@@ -183,7 +183,16 @@ TEST_CASE("expressions")
     auto val1 = eval("'♜♞♝♛♚♝♞♜'.replace('♞','♘')"); // ==> expected ♜♘♝♛♚♝♘♜
     TRY_CHECK(val0 == val1);
     TRY_CHECK(val0.to_string() == val1.to_string()); // UTF-8
-    TRY_CHECK(val0.to_unicode() == val1.to_unicode()); // Unicode (UTF-16)
+    TRY_CHECK(val0.to_unicode() == val1.to_unicode()); // Unicode
+    // \u+NNNN \U+NNNNNNNN \xNN\xNN
+    auto val3 = eval(u8"'\u262f\xF0\x9F\x8D\xB7'");
+    auto val4 = eval(u8"'\U0000262f\U0001F377'");
+    // UTF16 surrogate pairs work also ;)
+    // \ud83d\udd7a\ud83c\udffc => \U0001F57A\U0001F3FC works also
+    // TODO: find a way to enter UTF16 pairs
+    TRY_CHECK(val3 == val4);
+    TRY_CHECK(val3.to_string() == val4.to_string()); // UTF-8
+    TRY_CHECK(val3.to_unicode() == val4.to_unicode()); // Unicode
 
     // following test will fail if boost_regex is built without ICU support (unpaired surrogates in output)
     TRY_CHECK(eval("[name].replace('(\\B)|( )',' ') ") == tr.transcode("Q u é b e c"));

From d9a000372cc9cfd06e84a7c105a97dbb4f0cadc0 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 7 Mar 2017 11:28:22 +0100
Subject: [PATCH 290/328] remove `-Wshadow` warning (ref #3628)

---
 SConstruct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SConstruct b/SConstruct
index ff1135a2f..892b0c01e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1787,7 +1787,7 @@ if not preconfigured:
         # Common flags for g++/clang++ CXX compiler.
         # TODO: clean up code more to make -Wextra -Wsign-compare -Wsign-conversion -Wconversion viable
         # -Wfloat-equal -Wold-style-cast -Wexit-time-destructors -Wglobal-constructors -Wreserved-id-macro -Wheader-hygiene -Wmissing-noreturn
-        common_cxx_flags = '-fvisibility=hidden -fvisibility-inlines-hidden -Wall %s %s -ftemplate-depth-300 -Wsign-compare -Wshadow ' % (env['WARNING_CXXFLAGS'], pthread)
+        common_cxx_flags = '-fvisibility=hidden -fvisibility-inlines-hidden -Wall %s %s -ftemplate-depth-300 -Wsign-compare ' % (env['WARNING_CXXFLAGS'], pthread)
 
         if 'clang++' in env['CXX']:
             common_cxx_flags += ' -Wno-unsequenced  -Wtautological-compare -Wheader-hygiene -Wc++14-extensions '

From 47763afef31e9d8390d4d1079825143f17e41788 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 7 Mar 2017 13:02:21 +0100
Subject: [PATCH 291/328] use `initializer_list const&` to hold expected values
 (via @lighmare) ref #3636

---
 test/unit/text/shaping.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/unit/text/shaping.cpp b/test/unit/text/shaping.cpp
index 795d65063..4dd8ff885 100644
--- a/test/unit/text/shaping.cpp
+++ b/test/unit/text/shaping.cpp
@@ -7,7 +7,7 @@
 namespace {
 
 void test_shaping( mapnik::font_set const& fontset, mapnik::face_manager& fm,
-                   std::vector<std::pair<unsigned, unsigned>> const& expected, char const* str, bool debug = false)
+                   std::vector<std::tuple<unsigned, unsigned>> const& expected, char const* str, bool debug = false)
 {
     mapnik::transcoder tr("utf8");
     std::map<unsigned,double> width_map;
@@ -65,8 +65,8 @@ TEST_CASE("shaping")
     mapnik::face_manager fm(fl, font_file_mapping, font_memory_cache);
 
     {
-        std::vector<std::pair<unsigned, unsigned>> expected =
-            {{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}};
+        auto const& expected =
+            {std::tuple<unsigned, unsigned>{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}};
         // with default NotoSans-Regular.ttc and NotoNaskhArabic-Regular.ttf ^^^
         //std::vector<std::pair<unsigned, unsigned>> expected =
         //  {{977,0}, {1094,3}, {1038,4}, {1168,4}, {9,7}, {3,8}, {11,9}, {68,10}, {69,11}, {70,12}, {12,13}};
@@ -75,27 +75,27 @@ TEST_CASE("shaping")
     }
 
     {
-        std::vector<std::pair<unsigned, unsigned>> expected =
-            {{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}};
+        auto const& expected =
+            {std::tuple<unsigned, unsigned>{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}};
         test_shaping(fontset, fm, expected, u8"སྤུ་ཧྲེང (普兰镇)");
     }
 
     {
-        std::vector<std::pair<unsigned, unsigned>> expected =
-            {{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {0, 5}, {0, 6}, {0, 7}, {12, 8}};
+        auto const& expected =
+            {std::tuple<unsigned, unsigned>{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {0, 5}, {0, 6}, {0, 7}, {12, 8}};
         test_shaping(fontset, fm, expected, u8"abc (普兰镇)");
     }
 
     {
-        std::vector<std::pair<unsigned, unsigned>> expected =
-            {{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {68, 5}, {69, 6}, {70, 7}, {12, 8}};
+        auto const& expected =
+            {std::tuple<unsigned, unsigned>{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {68, 5}, {69, 6}, {70, 7}, {12, 8}};
         test_shaping(fontset, fm, expected, "abc (abc)");
     }
 
     {
         //    "ⵃⴰⵢ ⵚⵉⵏⴰⵄⵉ الحي الصناعي"
-        std::vector<std::pair<unsigned, unsigned>> expected =
-            {{0, 0}, {0, 1}, {0, 2}, {3, 3}, {0, 4}, {0, 5}, {0, 6}, {0, 7},
+        auto const& expected =
+            {std::tuple<unsigned, unsigned>{0, 0}, {0, 1}, {0, 2}, {3, 3}, {0, 4}, {0, 5}, {0, 6}, {0, 7},
               {0, 8}, {0, 9}, {3, 10}, {509, 22}, {481, 21}, {438, 20}, {503, 19},
               {470, 18}, {496, 17}, {43, 16}, {3, 15}, {509, 14}, {454, 13}, {496, 12}, {43, 11}};
         test_shaping(fontset, fm, expected, u8"ⵃⴰⵢ ⵚⵉⵏⴰⵄⵉ الحي الصناعي");

From 8c4fa25c8d65e75978c0a82bc6391906595ff190 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 7 Mar 2017 13:34:43 +0100
Subject: [PATCH 292/328] attempt to fix "error: chosen constructor is explicit
 in copy-initialization" error with gcc

---
 test/unit/text/shaping.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/unit/text/shaping.cpp b/test/unit/text/shaping.cpp
index 4dd8ff885..e7b93c350 100644
--- a/test/unit/text/shaping.cpp
+++ b/test/unit/text/shaping.cpp
@@ -66,7 +66,7 @@ TEST_CASE("shaping")
 
     {
         auto const& expected =
-            {std::tuple<unsigned, unsigned>{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}};
+            {std::tuple<unsigned, unsigned>(0, 0), {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}};
         // with default NotoSans-Regular.ttc and NotoNaskhArabic-Regular.ttf ^^^
         //std::vector<std::pair<unsigned, unsigned>> expected =
         //  {{977,0}, {1094,3}, {1038,4}, {1168,4}, {9,7}, {3,8}, {11,9}, {68,10}, {69,11}, {70,12}, {12,13}};
@@ -76,19 +76,19 @@ TEST_CASE("shaping")
 
     {
         auto const& expected =
-            {std::tuple<unsigned, unsigned>{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}};
+            {std::tuple<unsigned, unsigned>(0, 0), {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}};
         test_shaping(fontset, fm, expected, u8"སྤུ་ཧྲེང (普兰镇)");
     }
 
     {
         auto const& expected =
-            {std::tuple<unsigned, unsigned>{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {0, 5}, {0, 6}, {0, 7}, {12, 8}};
+            {std::tuple<unsigned, unsigned>(68, 0), {69, 1}, {70, 2}, {3, 3}, {11, 4}, {0, 5}, {0, 6}, {0, 7}, {12, 8}};
         test_shaping(fontset, fm, expected, u8"abc (普兰镇)");
     }
 
     {
         auto const& expected =
-            {std::tuple<unsigned, unsigned>{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {68, 5}, {69, 6}, {70, 7}, {12, 8}};
+            {std::tuple<unsigned, unsigned>(68, 0), {69, 1}, {70, 2}, {3, 3}, {11, 4}, {68, 5}, {69, 6}, {70, 7}, {12, 8}};
         test_shaping(fontset, fm, expected, "abc (abc)");
     }
 

From 87263123934b374ed5dc0db20eaaeda080f25677 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 7 Mar 2017 13:37:20 +0100
Subject: [PATCH 293/328] fix following up
 8c4fa25c8d65e75978c0a82bc6391906595ff190

---
 test/unit/text/shaping.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/text/shaping.cpp b/test/unit/text/shaping.cpp
index e7b93c350..fd9818d3d 100644
--- a/test/unit/text/shaping.cpp
+++ b/test/unit/text/shaping.cpp
@@ -95,7 +95,7 @@ TEST_CASE("shaping")
     {
         //    "ⵃⴰⵢ ⵚⵉⵏⴰⵄⵉ الحي الصناعي"
         auto const& expected =
-            {std::tuple<unsigned, unsigned>{0, 0}, {0, 1}, {0, 2}, {3, 3}, {0, 4}, {0, 5}, {0, 6}, {0, 7},
+            {std::tuple<unsigned, unsigned>(0, 0), {0, 1}, {0, 2}, {3, 3}, {0, 4}, {0, 5}, {0, 6}, {0, 7},
               {0, 8}, {0, 9}, {3, 10}, {509, 22}, {481, 21}, {438, 20}, {503, 19},
               {470, 18}, {496, 17}, {43, 16}, {3, 15}, {509, 14}, {454, 13}, {496, 12}, {43, 11}};
         test_shaping(fontset, fm, expected, u8"ⵃⴰⵢ ⵚⵉⵏⴰⵄⵉ الحي الصناعي");

From 8dea5498877c4d200a9a032a65f1f5dad74b5aca Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 7 Mar 2017 13:50:27 +0100
Subject: [PATCH 294/328] one more time.

---
 test/unit/text/shaping.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/test/unit/text/shaping.cpp b/test/unit/text/shaping.cpp
index fd9818d3d..e320c4516 100644
--- a/test/unit/text/shaping.cpp
+++ b/test/unit/text/shaping.cpp
@@ -7,7 +7,8 @@
 namespace {
 
 void test_shaping( mapnik::font_set const& fontset, mapnik::face_manager& fm,
-                   std::vector<std::tuple<unsigned, unsigned>> const& expected, char const* str, bool debug = false)
+                   std::vector<std::tuple<unsigned, unsigned>> expected,
+                   char const* str, bool debug = false)
 {
     mapnik::transcoder tr("utf8");
     std::map<unsigned,double> width_map;
@@ -65,7 +66,7 @@ TEST_CASE("shaping")
     mapnik::face_manager fm(fl, font_file_mapping, font_memory_cache);
 
     {
-        auto const& expected =
+        auto expected =
             {std::tuple<unsigned, unsigned>(0, 0), {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}};
         // with default NotoSans-Regular.ttc and NotoNaskhArabic-Regular.ttf ^^^
         //std::vector<std::pair<unsigned, unsigned>> expected =
@@ -75,29 +76,29 @@ TEST_CASE("shaping")
     }
 
     {
-        auto const& expected =
+        auto expected =
             {std::tuple<unsigned, unsigned>(0, 0), {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}};
         test_shaping(fontset, fm, expected, u8"སྤུ་ཧྲེང (普兰镇)");
     }
 
     {
-        auto const& expected =
+        auto expected =
             {std::tuple<unsigned, unsigned>(68, 0), {69, 1}, {70, 2}, {3, 3}, {11, 4}, {0, 5}, {0, 6}, {0, 7}, {12, 8}};
         test_shaping(fontset, fm, expected, u8"abc (普兰镇)");
     }
 
     {
-        auto const& expected =
+        auto expected =
             {std::tuple<unsigned, unsigned>(68, 0), {69, 1}, {70, 2}, {3, 3}, {11, 4}, {68, 5}, {69, 6}, {70, 7}, {12, 8}};
         test_shaping(fontset, fm, expected, "abc (abc)");
     }
 
     {
         //    "ⵃⴰⵢ ⵚⵉⵏⴰⵄⵉ الحي الصناعي"
-        auto const& expected =
+        auto expected =
             {std::tuple<unsigned, unsigned>(0, 0), {0, 1}, {0, 2}, {3, 3}, {0, 4}, {0, 5}, {0, 6}, {0, 7},
-              {0, 8}, {0, 9}, {3, 10}, {509, 22}, {481, 21}, {438, 20}, {503, 19},
-              {470, 18}, {496, 17}, {43, 16}, {3, 15}, {509, 14}, {454, 13}, {496, 12}, {43, 11}};
+             {0, 8}, {0, 9}, {3, 10}, {509, 22}, {481, 21}, {438, 20}, {503, 19},
+             {470, 18}, {496, 17}, {43, 16}, {3, 15}, {509, 14}, {454, 13}, {496, 12}, {43, 11}};
         test_shaping(fontset, fm, expected, u8"ⵃⴰⵢ ⵚⵉⵏⴰⵄⵉ الحي الصناعي");
     }
 

From 791f7b51bbf99bbd303367965b53364709f58af7 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 7 Mar 2017 14:08:04 +0100
Subject: [PATCH 295/328] Revert "one more time."

This reverts commit 8dea5498877c4d200a9a032a65f1f5dad74b5aca.

Revert "fix following up 8c4fa25c8d65e75978c0a82bc6391906595ff190"

This reverts commit 87263123934b374ed5dc0db20eaaeda080f25677.

Revert "attempt to fix "error: chosen constructor is explicit in copy-initialization" error with gcc"

This reverts commit 8c4fa25c8d65e75978c0a82bc6391906595ff190.

Revert "use `initializer_list const&` to hold expected values (via @lighmare) ref #3636"

This reverts commit 47763afef31e9d8390d4d1079825143f17e41788.
---
 test/unit/text/shaping.cpp | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/test/unit/text/shaping.cpp b/test/unit/text/shaping.cpp
index e320c4516..795d65063 100644
--- a/test/unit/text/shaping.cpp
+++ b/test/unit/text/shaping.cpp
@@ -7,8 +7,7 @@
 namespace {
 
 void test_shaping( mapnik::font_set const& fontset, mapnik::face_manager& fm,
-                   std::vector<std::tuple<unsigned, unsigned>> expected,
-                   char const* str, bool debug = false)
+                   std::vector<std::pair<unsigned, unsigned>> const& expected, char const* str, bool debug = false)
 {
     mapnik::transcoder tr("utf8");
     std::map<unsigned,double> width_map;
@@ -66,8 +65,8 @@ TEST_CASE("shaping")
     mapnik::face_manager fm(fl, font_file_mapping, font_memory_cache);
 
     {
-        auto expected =
-            {std::tuple<unsigned, unsigned>(0, 0), {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}};
+        std::vector<std::pair<unsigned, unsigned>> expected =
+            {{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}};
         // with default NotoSans-Regular.ttc and NotoNaskhArabic-Regular.ttf ^^^
         //std::vector<std::pair<unsigned, unsigned>> expected =
         //  {{977,0}, {1094,3}, {1038,4}, {1168,4}, {9,7}, {3,8}, {11,9}, {68,10}, {69,11}, {70,12}, {12,13}};
@@ -76,29 +75,29 @@ TEST_CASE("shaping")
     }
 
     {
-        auto expected =
-            {std::tuple<unsigned, unsigned>(0, 0), {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}};
+        std::vector<std::pair<unsigned, unsigned>> expected =
+            {{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}};
         test_shaping(fontset, fm, expected, u8"སྤུ་ཧྲེང (普兰镇)");
     }
 
     {
-        auto expected =
-            {std::tuple<unsigned, unsigned>(68, 0), {69, 1}, {70, 2}, {3, 3}, {11, 4}, {0, 5}, {0, 6}, {0, 7}, {12, 8}};
+        std::vector<std::pair<unsigned, unsigned>> expected =
+            {{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {0, 5}, {0, 6}, {0, 7}, {12, 8}};
         test_shaping(fontset, fm, expected, u8"abc (普兰镇)");
     }
 
     {
-        auto expected =
-            {std::tuple<unsigned, unsigned>(68, 0), {69, 1}, {70, 2}, {3, 3}, {11, 4}, {68, 5}, {69, 6}, {70, 7}, {12, 8}};
+        std::vector<std::pair<unsigned, unsigned>> expected =
+            {{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {68, 5}, {69, 6}, {70, 7}, {12, 8}};
         test_shaping(fontset, fm, expected, "abc (abc)");
     }
 
     {
         //    "ⵃⴰⵢ ⵚⵉⵏⴰⵄⵉ الحي الصناعي"
-        auto expected =
-            {std::tuple<unsigned, unsigned>(0, 0), {0, 1}, {0, 2}, {3, 3}, {0, 4}, {0, 5}, {0, 6}, {0, 7},
-             {0, 8}, {0, 9}, {3, 10}, {509, 22}, {481, 21}, {438, 20}, {503, 19},
-             {470, 18}, {496, 17}, {43, 16}, {3, 15}, {509, 14}, {454, 13}, {496, 12}, {43, 11}};
+        std::vector<std::pair<unsigned, unsigned>> expected =
+            {{0, 0}, {0, 1}, {0, 2}, {3, 3}, {0, 4}, {0, 5}, {0, 6}, {0, 7},
+              {0, 8}, {0, 9}, {3, 10}, {509, 22}, {481, 21}, {438, 20}, {503, 19},
+              {470, 18}, {496, 17}, {43, 16}, {3, 15}, {509, 14}, {454, 13}, {496, 12}, {43, 11}};
         test_shaping(fontset, fm, expected, u8"ⵃⴰⵢ ⵚⵉⵏⴰⵄⵉ الحي الصناعي");
     }
 

From 3ac70bb7ceced70963c8264da43a8ecfe50499b2 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 8 Mar 2017 10:54:58 +0100
Subject: [PATCH 296/328] update font_registration testx

---
 test/standalone/font_registration_test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/standalone/font_registration_test.cpp b/test/standalone/font_registration_test.cpp
index a5ba0b271..765406443 100644
--- a/test/standalone/font_registration_test.cpp
+++ b/test/standalone/font_registration_test.cpp
@@ -57,7 +57,7 @@ SECTION("registration") {
         mapnik::load_map_string(m3,"<Map font-directory=\"test/data/fonts/Noto/\"></Map>");
         REQUIRE( m3.get_font_memory_cache().size() == 0 );
         REQUIRE( m3.load_fonts() );
-        REQUIRE( m3.get_font_memory_cache().size() == 1 );
+        REQUIRE( m3.get_font_memory_cache().size() == 2 );
 
         std::vector<std::string> face_names;
         std::string foo("foo");

From ae29012611e0247b118ced4540511001b0048dfc Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 8 Mar 2017 10:55:52 +0100
Subject: [PATCH 297/328] tests - update shaping test results

---
 test/unit/text/shaping.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/test/unit/text/shaping.cpp b/test/unit/text/shaping.cpp
index 795d65063..ea1fbd44a 100644
--- a/test/unit/text/shaping.cpp
+++ b/test/unit/text/shaping.cpp
@@ -66,17 +66,13 @@ TEST_CASE("shaping")
 
     {
         std::vector<std::pair<unsigned, unsigned>> expected =
-            {{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}};
-        // with default NotoSans-Regular.ttc and NotoNaskhArabic-Regular.ttf ^^^
-        //std::vector<std::pair<unsigned, unsigned>> expected =
-        //  {{977,0}, {1094,3}, {1038,4}, {1168,4}, {9,7}, {3,8}, {11,9}, {68,10}, {69,11}, {70,12}, {12,13}};
-        // expected results if "NotoSansTibetan-Regular.ttf is registered^^
+            {{977, 0}, {1094, 3}, {1038, 4}, {1168, 4}, {9, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}};
         test_shaping(fontset, fm, expected, u8"སྤུ་ཧྲེང (abc)");
     }
 
     {
         std::vector<std::pair<unsigned, unsigned>> expected =
-            {{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}};
+            {{977, 0}, {1094, 3}, {1038, 4}, {1168, 4}, {9, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}};
         test_shaping(fontset, fm, expected, u8"སྤུ་ཧྲེང (普兰镇)");
     }
 

From cdfe28098456a6100a73ee27cea65113d6630367 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 8 Mar 2017 10:56:32 +0100
Subject: [PATCH 298/328] use updated test data

---
 test/data | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/data b/test/data
index 29df37a4a..e61692e68 160000
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit 29df37a4a4007c5f97ea9cab7b3761a5954082f3
+Subproject commit e61692e688c39e737fb73394839bcffe90f6fe78

From 32f5703ed148f79f4647482e9436c4488228cd4c Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 14 Mar 2017 11:05:33 +0100
Subject: [PATCH 299/328] provide is_substitute specialisation for 
 mapnik::geometry::linear_ring<double> const& (gcc6)

---
 include/mapnik/wkt/wkt_grammar_x3_def.hpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/include/mapnik/wkt/wkt_grammar_x3_def.hpp b/include/mapnik/wkt/wkt_grammar_x3_def.hpp
index 54b4acfb5..be9bcd0c7 100644
--- a/include/mapnik/wkt/wkt_grammar_x3_def.hpp
+++ b/include/mapnik/wkt/wkt_grammar_x3_def.hpp
@@ -26,13 +26,16 @@
 #include <mapnik/wkt/wkt_grammar_x3.hpp>
 #include <mapnik/geometry/fusion_adapted.hpp>
 
-#if defined(__GNUC__) && BOOST_VERSION < 106300
-// instantiate `is_substitute` for reference T and reference Attribute
-// fixes gcc6 compilation issue with boost 1_61 and boost_1_62
+#if defined(__GNUC__)
+// instantiate `is_substitute` for const reference T and reference Attribute
+// fixes gcc6 compilation issue
 namespace boost { namespace spirit { namespace x3 { namespace traits {
-template <typename T, typename Attribute, typename Enable>
-struct is_substitute<T&, Attribute&, Enable>
-  : is_substitute<T, Attribute, Enable> {};
+
+using ring_type = mapnik::geometry::linear_ring<double>;
+template <>
+struct is_substitute<ring_type const&, ring_type const& , void>
+    : is_substitute<ring_type, ring_type, void>  {};
+
 }}}}
 #endif
 

From 203d767e733bdbf0d745354a1a76b08be48279f1 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 14 Mar 2017 10:26:09 +0000
Subject: [PATCH 300/328] follow up from
 32f5703ed148f79f4647482e9436c4488228cd4c - more generic specialisation

---
 include/mapnik/wkt/wkt_grammar_x3_def.hpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/include/mapnik/wkt/wkt_grammar_x3_def.hpp b/include/mapnik/wkt/wkt_grammar_x3_def.hpp
index be9bcd0c7..f2cff7b21 100644
--- a/include/mapnik/wkt/wkt_grammar_x3_def.hpp
+++ b/include/mapnik/wkt/wkt_grammar_x3_def.hpp
@@ -31,10 +31,14 @@
 // fixes gcc6 compilation issue
 namespace boost { namespace spirit { namespace x3 { namespace traits {
 
-using ring_type = mapnik::geometry::linear_ring<double>;
-template <>
-struct is_substitute<ring_type const&, ring_type const& , void>
-    : is_substitute<ring_type, ring_type, void>  {};
+template <typename T, typename Attribute, typename Enable>
+struct is_substitute<T&, Attribute&, Enable>
+  : is_substitute<T, Attribute, Enable> {};
+
+//using ring_type = mapnik::geometry::linear_ring<double>;
+//template <>
+//struct is_substitute<ring_type const&, ring_type const& , void>
+//    : is_substitute<ring_type, ring_type, void>  {};
 
 }}}}
 #endif

From 834f0ef312f63f19e14273a833e099e3d69ad3bb Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 14 Mar 2017 11:16:13 +0000
Subject: [PATCH 301/328] add '-fno-omit-frame-pointer' to sanitize address
 builds for nicer stack traces in error messages.

---
 SConstruct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SConstruct b/SConstruct
index 892b0c01e..b00dfecba 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1799,7 +1799,7 @@ if not preconfigured:
             env.Append(CXXFLAGS = '-fsanitize=undefined-trap -fsanitize-undefined-trap-on-error -ftrapv -fwrapv')
 
         if env['DEBUG_SANITIZE']:
-            env.Append(CXXFLAGS = ['-fsanitize=address'])
+            env.Append(CXXFLAGS = ['-fsanitize=address','-fno-omit-frame-pointer'])
             env.Append(LINKFLAGS = ['-fsanitize=address'])
 
 

From 0dff423c44d6a5bfaa3157a4a0b232e600d89fd2 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 14 Mar 2017 11:22:11 +0000
Subject: [PATCH 302/328] cleanup

---
 include/mapnik/wkt/wkt_grammar_x3_def.hpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/include/mapnik/wkt/wkt_grammar_x3_def.hpp b/include/mapnik/wkt/wkt_grammar_x3_def.hpp
index f2cff7b21..2b6addcf4 100644
--- a/include/mapnik/wkt/wkt_grammar_x3_def.hpp
+++ b/include/mapnik/wkt/wkt_grammar_x3_def.hpp
@@ -27,19 +27,13 @@
 #include <mapnik/geometry/fusion_adapted.hpp>
 
 #if defined(__GNUC__)
-// instantiate `is_substitute` for const reference T and reference Attribute
+// instantiate `is_substitute` for reference T and reference Attribute
 // fixes gcc6 compilation issue
 namespace boost { namespace spirit { namespace x3 { namespace traits {
 
 template <typename T, typename Attribute, typename Enable>
 struct is_substitute<T&, Attribute&, Enable>
   : is_substitute<T, Attribute, Enable> {};
-
-//using ring_type = mapnik::geometry::linear_ring<double>;
-//template <>
-//struct is_substitute<ring_type const&, ring_type const& , void>
-//    : is_substitute<ring_type, ring_type, void>  {};
-
 }}}}
 #endif
 

From 0e107135b22f2017b9e1eb5c7f78c291e252e2bc Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 14 Mar 2017 11:34:12 +0000
Subject: [PATCH 303/328] update deps

---
 deps/mapbox/variant | 2 +-
 test/data           | 2 +-
 test/data-visual    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index d2588a8f1..916139a2e 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit d2588a8f1d6b5d480d228e6d8a906ce634bdea9a
+Subproject commit 916139a2e51e125816efce6e19d428385601273f
diff --git a/test/data b/test/data
index 5ad14e6bd..e61692e68 160000
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit 5ad14e6bdf2c5e6babd8ac04aa057ed6c67ac617
+Subproject commit e61692e688c39e737fb73394839bcffe90f6fe78
diff --git a/test/data-visual b/test/data-visual
index f9a3c203b..e90ce60c5 160000
--- a/test/data-visual
+++ b/test/data-visual
@@ -1 +1 @@
-Subproject commit f9a3c203b3657dd1748d788304f83a26efb6439f
+Subproject commit e90ce60c5ebae0237d7a8b05e92ac7228351ecc1

From d009bb8231b9fa2b24302e1fc53ad037d8f7221d Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 14 Mar 2017 12:33:54 +0000
Subject: [PATCH 304/328] update visual data

---
 test/data-visual | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/data-visual b/test/data-visual
index e90ce60c5..0cfd572dd 160000
--- a/test/data-visual
+++ b/test/data-visual
@@ -1 +1 @@
-Subproject commit e90ce60c5ebae0237d7a8b05e92ac7228351ecc1
+Subproject commit 0cfd572dd51a252c00d538dab0e07a7d98c0722a

From f42344e1021c43cdda311a4d364c831bf54e6a44 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 10 Mar 2017 16:50:08 -0800
Subject: [PATCH 305/328] port 3614 to 3.1/master

---
 .travis.yml              |  8 ++----
 bootstrap.sh             | 60 +++++++++++++++++-----------------------
 scripts/travis-common.sh | 17 +-----------
 3 files changed, 30 insertions(+), 55 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 387e6772c..c9f0bc813 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,8 +60,7 @@ before_install:
      rvm get head || true
    fi
  - source scripts/travis-common.sh
- - export PYTHONUSERBASE=$(pwd)/mason_packages/.link
- - export PATH=${PREFIX}/bin:$(pwd)/mason_packages/.link/bin:${PYTHONUSERBASE}/bin:${PATH}
+ - export PATH=${PREFIX}/bin:$(pwd)/mason_packages/.link/bin:${PATH}
  - export COVERAGE=${COVERAGE:-false}
  - export MASON_PUBLISH=${MASON_PUBLISH:-false}
  - export BENCH=${BENCH:-false}
@@ -70,8 +69,6 @@ before_install:
  - git_submodule_update --init --depth=10
 
 install:
- - on 'linux' export PYTHONPATH=${PYTHONUSERBASE}/lib/python2.7/site-packages
- - on 'osx' export PYTHONPATH=${PYTHONUSERBASE}/lib/python/site-packages
  - on 'osx' export DATA_PATH=$(brew --prefix)/var/postgres
  - on 'osx' rm -rf ${DATA_PATH}
  - on 'osx' initdb ${DATA_PATH} -E utf8
@@ -80,7 +77,8 @@ install:
  - on 'osx' createuser -s postgres
  - psql -c 'create database template_postgis;' -U postgres
  - psql -c 'create extension postgis;' -d template_postgis -U postgres
- - enabled ${COVERAGE} pip install --user cpp-coveralls
+ - enabled ${COVERAGE} curl -S -f https://codecov.io/bash -o codecov
+ - enabled ${COVERAGE} chmod +x codecov
 
 before_script:
  - source bootstrap.sh
diff --git a/bootstrap.sh b/bootstrap.sh
index f7d0ce334..7a8582333 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -11,7 +11,7 @@ todo
 - shrink icu data
 '
 
-MASON_VERSION="3e2944322"
+MASON_VERSION="v0.8.0"
 
 function setup_mason() {
     if [[ ! -d ./.mason ]]; then
@@ -19,7 +19,7 @@ function setup_mason() {
         (cd ./.mason && git checkout ${MASON_VERSION})
     else
         echo "Updating to latest mason"
-        (cd ./.mason && git fetch && git checkout ${MASON_VERSION} && git pull)
+        (cd ./.mason && git fetch && git checkout ${MASON_VERSION} && git pull origin ${MASON_VERSION})
     fi
     export PATH=$(pwd)/.mason:$PATH
     export CXX=${CXX:-clang++}
@@ -47,42 +47,34 @@ function install() {
 ICU_VERSION="55.1"
 
 function install_mason_deps() {
-    FAIL=0
-    install ccache 3.3.0 &
-    install zlib system &
-    install jpeg_turbo 1.5.0 libjpeg &
-    install libpng 1.6.24 libpng &
-    install libtiff 4.0.6 libtiff &
-    install libpq 9.5.2 &
-    install sqlite 3.14.1 libsqlite3 &
-    install expat 2.2.0 libexpat &
-    install icu ${ICU_VERSION} &
-    install proj 4.9.2 libproj &
-    install pixman 0.34.0 libpixman-1 &
-    install cairo 1.14.6 libcairo &
-    install protobuf 2.6.1 &
+    install ccache 3.3.0
+    install zlib 1.2.8
+    install jpeg_turbo 1.5.1 libjpeg
+    install libpng 1.6.28 libpng
+    install libtiff 4.0.7 libtiff
+    install libpq 9.6.1
+    install sqlite 3.16.2 libsqlite3
+    install expat 2.2.0 libexpat
+    install icu ${ICU_VERSION}
+    install proj 4.9.3 libproj
+    install pixman 0.34.0 libpixman-1
+    install cairo 1.14.8 libcairo
+    install protobuf 3.2.0
     # technically protobuf is not a mapnik core dep, but installing
     # here by default helps make mapnik-vector-tile builds easier
-    install webp 0.5.1 libwebp &
-    install gdal 2.1.1 libgdal &
-    install boost 1.61.0 &
-    install boost_libsystem 1.61.0 &
-    install boost_libfilesystem 1.61.0 &
-    install boost_libprogram_options 1.61.0 &
-    install boost_libregex_icu 1.61.0 &
+    install webp 0.6.0 libwebp
+    install libgdal 2.1.3 libgdal
+    install boost 1.63.0
+    install boost_libsystem 1.63.0
+    install boost_libfilesystem 1.63.0
+    install boost_libprogram_options 1.63.0
+    install boost_libregex_icu 1.63.0
     # technically boost thread and python are not a core dep, but installing
     # here by default helps make python-mapnik builds easier
-    install boost_libthread 1.61.0 &
-    install boost_libpython 1.61.0 &
-    install freetype 2.6.5 libfreetype &
-    install harfbuzz 1.3.0 libharfbuzz &
-    for job in $(jobs -p)
-    do
-        wait $job || let "FAIL+=1"
-    done
-    if [[ "$FAIL" != "0" ]]; then
-        exit ${FAIL}
-    fi
+    install boost_libthread 1.63.0
+    install boost_libpython 1.63.0
+    install freetype 2.7.1 libfreetype
+    install harfbuzz 1.4.4-ft libharfbuzz
 }
 
 MASON_LINKED_ABS=$(pwd)/mason_packages/.link
diff --git a/scripts/travis-common.sh b/scripts/travis-common.sh
index 288fcc1ce..d3ce79f10 100644
--- a/scripts/travis-common.sh
+++ b/scripts/travis-common.sh
@@ -46,15 +46,6 @@ git_submodule_update () {
     git submodule update "$@"
 }
 
-# install and call pip
-pip () {
-    if ! which pip >/dev/null; then
-        easy_install --user pip && \
-        export PATH="$HOME/Library/Python/2.7/bin:$PATH"
-    fi
-    command pip "$@"
-}
-
 # commit_message_contains TEXT
 #   - returns 0 (true) if TEXT is found in commit message
 #   - case-insensitive, plain-text search, not regex
@@ -92,13 +83,7 @@ configure () {
 }
 
 coverage () {
-    ./mason_packages/.link/bin/cpp-coveralls \
-        --gcov ${LLVM_COV} \
-        --exclude mason_packages \
-        --exclude .sconf_temp --exclude benchmark --exclude deps \
-        --exclude scons --exclude test --exclude demo --exclude docs \
-        --exclude fonts \
-        > /dev/null
+    ./codecov -x "llvm-cov gcov" -Z
 }
 
 trigger_downstream() {

From 69fc58191f9347140fe7b5644192ac2b99bc75db Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 10 Mar 2017 16:53:31 -0800
Subject: [PATCH 306/328] update compiler in circle

---
 circle.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/circle.yml b/circle.yml
index d9d4bad81..5624c66ae 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,11 +7,7 @@ machine:
     JOBS: 8
     CCACHE_TEMPDIR: /tmp/.ccache-temp
     CCACHE_COMPRESS: 1
-    LLVM_VERSION: 3.8
-  pre:
-    - echo "here"
-  post:
-    - echo "there"
+    LLVM_VERSION: 3.9.1
 
 checkout:
   post:
@@ -32,9 +28,9 @@ dependencies:
 database:
   pre:
     - ./bootstrap.sh
-    - ./.mason/mason install clang ${LLVM_VERSION}.0
-    - ./.mason/mason link clang ${LLVM_VERSION}.0
-    - ./configure CC="$(pwd)/mason_packages/.link/bin/clang-${LLVM_VERSION}" CXX="$(pwd)/mason_packages/.link/bin/ccache $(pwd)/mason_packages/.link/bin/clang++-${LLVM_VERSION} -Qunused-arguments"
+    - ./.mason/mason install clang++ ${LLVM_VERSION}
+    - ./.mason/mason link clang++ ${LLVM_VERSION}
+    - ./configure CC="$(pwd)/mason_packages/.link/bin/clang" CXX="$(pwd)/mason_packages/.link/bin/ccache $(pwd)/mason_packages/.link/bin/clang++ -Qunused-arguments"
     - make
   override:
     - psql -c 'create database template_postgis;'

From 571ead47bc96475c0ab1131800c063f85bd8acbd Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Wed, 15 Mar 2017 09:44:33 -0700
Subject: [PATCH 307/328] use clang++ 3.9.1

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c9f0bc813..c6d540e38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -84,12 +84,12 @@ before_script:
  - source bootstrap.sh
  - |
    if [[ $(uname -s) == 'Linux' ]]; then
-     mason install clang++ 3.9.0
-     export PATH=$(mason prefix clang++ 3.9.0)/bin:${PATH}
-     mason install llvm-cov 3.9.0
-     export PATH=$(mason prefix llvm-cov 3.9.0)/bin:${PATH}
+     mason install clang++ 3.9.1
+     export PATH=$(mason prefix clang++ 3.9.1)/bin:${PATH}
+     mason install llvm-cov 3.9.1
+     export PATH=$(mason prefix llvm-cov 3.9.1)/bin:${PATH}
      which llvm-cov
-     export LLVM_COV="$(mason prefix llvm-cov 3.9.0)/bin/llvm-cov"
+     export LLVM_COV="$(mason prefix llvm-cov 3.9.1)/bin/llvm-cov"
    fi
  - ccache --version
  - ccache -p || true

From 710379dce2113b97b9400cedec27b3cfbf3dd8a1 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Wed, 15 Mar 2017 10:05:09 -0700
Subject: [PATCH 308/328] add codecov badge, drop coveralls [skip ci]

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b58be712a..300aac3e9 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ _/      _/    _/_/_/  _/_/_/    _/    _/  _/  _/    _/
 
 [![Build Status Linux](https://api.travis-ci.org/mapnik/mapnik.svg?branch=master)](http://travis-ci.org/mapnik/mapnik)
 [![Build Status Windows](https://ci.appveyor.com/api/projects/status/hc9l7okdjtucfqqn?branch=master&svg=true)](https://ci.appveyor.com/project/Mapbox/mapnik)
-[![Coverage Status](https://coveralls.io/repos/mapnik/mapnik/badge.svg?branch=master&service=github)](https://coveralls.io/github/mapnik/mapnik?branch=master)
+[![codecov](https://codecov.io/gh/mapnik/mapnik/branch/master/graph/badge.svg)](https://codecov.io/gh/mapnik/mapnik)
 
 Mapnik is an open source toolkit for developing mapping applications. At the core is a C++ shared library providing algorithms and patterns for spatial data access and visualization.
 

From ee65bd33e33af82c567f8708cea5421c42eee8dd Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Wed, 15 Mar 2017 14:15:22 -0700
Subject: [PATCH 309/328] remove auto-publishing to mason

---
 .travis.yml     | 11 ++------
 mason_latest.sh | 67 -------------------------------------------------
 2 files changed, 2 insertions(+), 76 deletions(-)
 delete mode 100755 mason_latest.sh

diff --git a/.travis.yml b/.travis.yml
index c6d540e38..174406b30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,6 @@ env:
    - CCACHE_COMPRESS=1
    - HEAVY_JOBS="2"
    - PREFIX=/tmp/mapnik
-   - secure: "D5CLP5lbyFru788iZO8RqDenY/YsHPREvr34zCEi93xMqOTxPmME/zyuEZSyjP5ZLyf8g/fxOuPYSDbOQ1QLwNDBWxB0JomWOahyimHKrMCrMcGHCjl//2W2mE+p9VwF5VLGgfy7CskGkS49Mye37FDK0ejwuq6MDI45DsH4Fkk="
-   - secure: "ZPHyAVL3ID5g3KEmwcnzG9z2tAQwSx526Qd3Y6tsZ3Yj+aSagVBiZQjZGKWgNX74lymtmYKnb2Md46apWLeImt6tjB3MWTu7WwWoZRnqUligz/8Nmg4Lgo7EOCkQcjN/gpA1i+cM5b+ZKDTZYOaHO6/+DAaunQzA7/p99hw/XYg="
    - secure: "F6ivqDNMBQQnrDGA9+7IX+GDswuIqQQd7YPJdQqa2Ked9jddAQDeJClb05ig3JlwfOlYLGZOd43ZX0pKuMtI2Gbkwz211agGP9S3YunwlRg8iWtJlO5kYFUdKCmJNhjg4icfkGELCgwXn+zuEWFSLpkPcjqAFKFlQrIJeAJJgKM="
 addons:
   postgresql: "9.4"
@@ -33,7 +31,7 @@ matrix:
     - os: linux
       sudo: false
       compiler: ": clang"
-      env: JOBS=8 MASON_PUBLISH=true CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9" TRIGGER=true
+      env: JOBS=8 CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9" TRIGGER=true
       addons:
         apt:
           sources: [ 'ubuntu-toolchain-r-test']
@@ -50,7 +48,7 @@ matrix:
       compiler: ": clang-osx"
       # https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions
       osx_image: xcode7.3 # upgrades clang from 6 -> 7
-      env: JOBS=4 MASON_PUBLISH=true CXX="ccache clang++ -Qunused-arguments"
+      env: JOBS=4 CXX="ccache clang++ -Qunused-arguments"
 
 before_install:
  # workaround travis rvm bug
@@ -115,8 +113,3 @@ script:
 
 after_success:
  - enabled ${TRIGGER} trigger_downstream
- - if enabled ${MASON_PUBLISH}; then
-     source ./.mason/mason.sh &&
-     ./mason_latest.sh build &&
-     ./mason_latest.sh publish;
-   fi
diff --git a/mason_latest.sh b/mason_latest.sh
deleted file mode 100755
index cf064953b..000000000
--- a/mason_latest.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env bash
-
-MASON_NAME=mapnik
-MASON_VERSION=latest
-MASON_LIB_FILE=lib/libmapnik-wkt.a
-
-# warning: may break when https://github.com/mapbox/mason/issues/141 lands
-# hence we are pinned for now to older mason in bootstrap.sh
-. ./.mason/mason.sh
-
-set -eu
-
-function mason_load_source {
-    export MASON_BUILD_PATH=$(pwd)
-}
-
-function mason_compile {
-    HERE=$(pwd)
-    make install
-    # this is to adapt to when mapnik is not installed in MASON_PREFIX
-    # originally (to make it easier to publish locally as a stopgap)
-    MAPNIK_PREFIX=$(mapnik-config --prefix)
-    if [[ ${MAPNIK_PREFIX} != ${MASON_PREFIX} ]]; then
-        mkdir -p ${MASON_PREFIX}/lib
-        mkdir -p ${MASON_PREFIX}/include
-        mkdir -p ${MASON_PREFIX}/bin
-        cp -r ${MAPNIK_PREFIX}/lib/*mapnik* ${MASON_PREFIX}/lib/
-        cp -r ${MAPNIK_PREFIX}/include/mapnik ${MASON_PREFIX}/include/
-        cp -r ${MAPNIK_PREFIX}/bin/mapnik* ${MASON_PREFIX}/bin/
-        cp -r ${MAPNIK_PREFIX}/bin/shapeindex ${MASON_PREFIX}/bin/
-    fi
-    if [[ $(uname -s) == 'Darwin' ]]; then
-        install_name_tool -id @loader_path/lib/libmapnik.dylib ${MASON_PREFIX}"/lib/libmapnik.dylib";
-        PLUGINDIR=${MASON_PREFIX}"/lib/mapnik/input/*.input";
-        for f in $PLUGINDIR; do
-            echo $f;
-            echo $(basename $f);
-            install_name_tool -id plugins/input/$(basename $f) $f;
-            install_name_tool -change "${MAPNIK_PREFIX}/lib/libmapnik.dylib" @loader_path/../../lib/libmapnik.dylib $f;
-        done;
-        BINDIR=${MASON_PREFIX}"/bin/*";
-        for f in $BINDIR; do
-            echo $f;
-            echo $(basename $f);
-            if [[ $(file $f) =~ 'Mach-O' ]]; then
-                install_name_tool -id bin/$(basename $f) $f;
-                install_name_tool -change "${MAPNIK_PREFIX}/lib/libmapnik.dylib" @loader_path/../lib/libmapnik.dylib $f;
-            fi
-        done;
-    fi;
-    python -c "data=open('$MASON_PREFIX/bin/mapnik-config','r').read();open('$MASON_PREFIX/bin/mapnik-config','w').write(data.replace('$HERE','.'))"
-    find ${MASON_PREFIX} -name "*.pyc" -exec rm {} \;
-}
-
-function mason_cflags {
-    :
-}
-
-function mason_ldflags {
-    :
-}
-
-function mason_clean {
-    echo "Done"
-}
-
-mason_run "$@"

From 03929b5c760bcfc20d4c9f3d762dfb42321ff883 Mon Sep 17 00:00:00 2001
From: Jiri Drbalek <jiri.drbalek@firma.seznam.cz>
Date: Fri, 29 Jul 2016 10:44:51 +0000
Subject: [PATCH 310/328] nested layers, layer level comp-op and opacity

---
 include/mapnik/agg_renderer.hpp               |   9 +-
 include/mapnik/feature_style_processor.hpp    |   8 +
 .../mapnik/feature_style_processor_impl.hpp   |  97 +++++++----
 include/mapnik/layer.hpp                      |  22 +++
 src/agg/agg_renderer.cpp                      | 164 +++++++++---------
 src/agg/process_building_symbolizer.cpp       |   3 +-
 src/agg/process_debug_symbolizer.cpp          |   6 +-
 src/agg/process_dot_symbolizer.cpp            |   3 +-
 src/agg/process_group_symbolizer.cpp          |  12 +-
 src/agg/process_line_pattern_symbolizer.cpp   |  16 +-
 src/agg/process_line_symbolizer.cpp           |   5 +-
 src/agg/process_markers_symbolizer.cpp        |   3 +-
 .../process_polygon_pattern_symbolizer.cpp    |  14 +-
 src/agg/process_polygon_symbolizer.cpp        |   5 +-
 src/agg/process_raster_symbolizer.cpp         |   2 +-
 src/agg/process_shield_symbolizer.cpp         |   2 +-
 src/agg/process_text_symbolizer.cpp           |   2 +-
 src/layer.cpp                                 |  59 ++++++-
 src/load_map.cpp                              |  34 +++-
 19 files changed, 300 insertions(+), 166 deletions(-)

diff --git a/include/mapnik/agg_renderer.hpp b/include/mapnik/agg_renderer.hpp
index 0eef75d29..c237cf4f4 100644
--- a/include/mapnik/agg_renderer.hpp
+++ b/include/mapnik/agg_renderer.hpp
@@ -37,6 +37,7 @@
 #include <mapnik/renderer_common.hpp>
 // stl
 #include <memory>
+#include <stack>
 
 // fwd declaration to avoid dependence on agg headers
 namespace agg { struct trans_affine; }
@@ -160,15 +161,13 @@ protected:
     void draw_geo_extent(box2d<double> const& extent,mapnik::color const& color);
 
 private:
-    buffer_type & pixmap_;
-    std::shared_ptr<buffer_type> internal_buffer_;
-    mutable buffer_type * current_buffer_;
-    mutable bool style_level_compositing_;
+    std::stack<std::reference_wrapper<buffer_type>> buffers_;
+    std::stack<buffer_type> internal_buffers_;
     const std::unique_ptr<rasterizer> ras_ptr;
     gamma_method_enum gamma_method_;
     double gamma_;
     renderer_common common_;
-    void setup(Map const& m);
+    void setup(Map const & m, buffer_type & pixmap);
 };
 
 extern template class MAPNIK_DECL agg_renderer<image<rgba8_t>>;
diff --git a/include/mapnik/feature_style_processor.hpp b/include/mapnik/feature_style_processor.hpp
index f0cf91b6c..4ae4fa9c0 100644
--- a/include/mapnik/feature_style_processor.hpp
+++ b/include/mapnik/feature_style_processor.hpp
@@ -30,6 +30,7 @@
 #include <mapnik/feature_style_processor_context.hpp>
 
 // stl
+#include <vector>
 #include <set>
 #include <string>
 
@@ -93,6 +94,12 @@ private:
                       featureset_ptr features,
                       proj_transform const& prj_trans);
 
+    void prepare_layers(layer_rendering_material & parent_mat,
+                        std::vector<layer> const & layers,
+                        feature_style_context_map & ctx_map,
+                        Processor & p,
+                        double scale_denom);
+
     /*!
      * \brief prepare features for rendering asynchronously.
      */
@@ -111,6 +118,7 @@ private:
      * \brief render features list queued when they are available.
      */
     void render_material(layer_rendering_material const & mat, Processor & p );
+    void render_submaterials(layer_rendering_material const & mat, Processor & p);
 
     Map const& m_;
 };
diff --git a/include/mapnik/feature_style_processor_impl.hpp b/include/mapnik/feature_style_processor_impl.hpp
index 3e3743b72..981595147 100644
--- a/include/mapnik/feature_style_processor_impl.hpp
+++ b/include/mapnik/feature_style_processor_impl.hpp
@@ -63,6 +63,7 @@ struct layer_rendering_material
     std::vector<feature_type_style const*> active_styles_;
     std::vector<featureset_ptr> featureset_ptr_list_;
     std::vector<rule_cache> rule_caches_;
+    std::vector<layer_rendering_material> materials_;
 
     layer_rendering_material(layer const& lay, projection const& dest)
         :
@@ -84,6 +85,41 @@ feature_style_processor<Processor>::feature_style_processor(Map const& m, double
     }
 }
 
+template <typename Processor>
+void feature_style_processor<Processor>::prepare_layers(layer_rendering_material & parent_mat,
+                                                        std::vector<layer> const & layers,
+                                                        feature_style_context_map & ctx_map,
+                                                        Processor & p,
+                                                        double scale_denom)
+{
+    for (layer const& lyr : layers)
+    {
+        if (lyr.visible(scale_denom))
+        {
+            std::set<std::string> names;
+            layer_rendering_material mat(lyr, parent_mat.proj0_);
+
+            prepare_layer(mat,
+                          ctx_map,
+                          p,
+                          m_.scale(),
+                          scale_denom,
+                          m_.width(),
+                          m_.height(),
+                          m_.get_current_extent(),
+                          m_.buffer_size(),
+                          names);
+
+            // Store active material
+            if (!mat.active_styles_.empty())
+            {
+                prepare_layers(mat, lyr.layers(), ctx_map, p, scale_denom);
+                parent_mat.materials_.emplace_back(std::move(mat));
+            }
+        }
+    }
+}
+
 template <typename Processor>
 void feature_style_processor<Processor>::apply(double scale_denom)
 {
@@ -101,44 +137,16 @@ void feature_style_processor<Processor>::apply(double scale_denom)
     // in a second time, we fetch the results and
     // do the actual rendering
 
-    std::vector<layer_rendering_material> mat_list;
-
     // Define processing context map used by datasources
     // implementing asynchronous queries
     feature_style_context_map ctx_map;
 
-    for ( layer const& lyr : m_.layers() )
+    if (!m_.layers().empty())
     {
-        if (lyr.visible(scale_denom))
-        {
-            std::set<std::string> names;
-            layer_rendering_material mat(lyr, proj);
+        layer_rendering_material root_mat(m_.layers().front(), proj);
+        prepare_layers(root_mat, m_.layers(), ctx_map, p, scale_denom);
 
-            prepare_layer(mat,
-                          ctx_map,
-                          p,
-                          m_.scale(),
-                          scale_denom,
-                          m_.width(),
-                          m_.height(),
-                          m_.get_current_extent(),
-                          m_.buffer_size(),
-                          names);
-
-            // Store active material
-            if (!mat.active_styles_.empty())
-            {
-                mat_list.emplace_back(std::move(mat));
-            }
-        }
-    }
-
-    for ( layer_rendering_material const & mat : mat_list )
-    {
-        if (!mat.active_styles_.empty())
-        {
-            render_material(mat, p);
-        }
+        render_submaterials(root_mat, p);
     }
 
     p.end_map_processing(m_);
@@ -201,9 +209,12 @@ void feature_style_processor<Processor>::apply_to_layer(layer const& lay,
                   buffer_size,
                   names);
 
+    prepare_layers(mat, lay.layers(), ctx_map, p, scale_denom);
+
     if (!mat.active_styles_.empty())
     {
         render_material(mat,p);
+        render_submaterials(mat, p);
     }
 }
 
@@ -441,10 +452,27 @@ void feature_style_processor<Processor>::prepare_layer(layer_rendering_material
     }
 }
 
+template <typename Processor>
+void feature_style_processor<Processor>::render_submaterials(layer_rendering_material const & parent_mat,
+                                                             Processor & p)
+{
+    for (layer_rendering_material const & mat : parent_mat.materials_)
+    {
+        if (!mat.active_styles_.empty())
+        {
+            p.start_layer_processing(mat.lay_, mat.layer_ext2_);
+
+            render_material(mat, p);
+            render_submaterials(mat, p);
+
+            p.end_layer_processing(mat.lay_);
+        }
+    }
+}
 
 template <typename Processor>
 void feature_style_processor<Processor>::render_material(layer_rendering_material const & mat,
-                                                         Processor & p )
+                                                         Processor & p)
 {
     std::vector<feature_type_style const*> const & active_styles = mat.active_styles_;
     std::vector<featureset_ptr> const & featureset_ptr_list = mat.featureset_ptr_list_;
@@ -460,8 +488,6 @@ void feature_style_processor<Processor>::render_material(layer_rendering_materia
         return;
     }
 
-    p.start_layer_processing(mat.lay_, mat.layer_ext2_);
-
     layer const& lay = mat.lay_;
 
     std::vector<rule_cache> const & rule_caches = mat.rule_caches_;
@@ -555,7 +581,6 @@ void feature_style_processor<Processor>::render_material(layer_rendering_materia
             ++i;
         }
     }
-    p.end_layer_processing(mat.lay_);
 }
 
 template <typename Processor>
diff --git a/include/mapnik/layer.hpp b/include/mapnik/layer.hpp
index 68746431f..43e8760c2 100644
--- a/include/mapnik/layer.hpp
+++ b/include/mapnik/layer.hpp
@@ -26,6 +26,7 @@
 // mapnik
 #include <mapnik/well_known_srs.hpp>
 #include <mapnik/geometry/box2d.hpp>
+#include <mapnik/image_compositing.hpp>
 
 // stl
 #include <vector>
@@ -96,6 +97,18 @@ public:
      */
     std::vector<std::string>& styles();
 
+    /*! \brief Add a child layer by copying it.
+     *  @param l The layer to add.
+     */
+    void add_layer(layer const& l);
+
+    /*! \brief Add a child layer by moving it.
+     *  @param l The layer to add.
+     */
+    void add_layer(layer && l);
+
+    std::vector<layer> const& layers() const;
+
     /*!
      * @param minimum_scale_denom The minimum scale denominator
      */
@@ -197,6 +210,12 @@ public:
      */
     box2d<double> envelope() const;
 
+    // compositing
+    void set_comp_op(composite_mode_e comp_op);
+    boost::optional<composite_mode_e> comp_op() const;
+    void set_opacity(double opacity);
+    double get_opacity() const;
+
     void set_maximum_extent(box2d<double> const& box);
     boost::optional<box2d<double> > const&  maximum_extent() const;
     void reset_maximum_extent();
@@ -215,9 +234,12 @@ private:
     bool cache_features_;
     std::string group_by_;
     std::vector<std::string> styles_;
+    std::vector<layer> layers_;
     datasource_ptr ds_;
     boost::optional<int> buffer_size_;
     boost::optional<box2d<double> > maximum_extent_;
+    boost::optional<composite_mode_e> comp_op_;
+    double opacity_;
 };
 }
 
diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp
index e9ea69526..de2430dad 100644
--- a/src/agg/agg_renderer.cpp
+++ b/src/agg/agg_renderer.cpp
@@ -71,47 +71,41 @@ namespace mapnik
 template <typename T0, typename T1>
 agg_renderer<T0,T1>::agg_renderer(Map const& m, T0 & pixmap, double scale_factor, unsigned offset_x, unsigned offset_y)
     : feature_style_processor<agg_renderer>(m, scale_factor),
-      pixmap_(pixmap),
-      internal_buffer_(),
-      current_buffer_(&pixmap),
-      style_level_compositing_(false),
+      buffers_(),
+      internal_buffers_(),
       ras_ptr(new rasterizer),
       gamma_method_(GAMMA_POWER),
       gamma_(1.0),
       common_(m, attributes(), offset_x, offset_y, m.width(), m.height(), scale_factor)
 {
-    setup(m);
+    setup(m, pixmap);
 }
 
 template <typename T0, typename T1>
 agg_renderer<T0,T1>::agg_renderer(Map const& m, request const& req, attributes const& vars, T0 & pixmap, double scale_factor, unsigned offset_x, unsigned offset_y)
     : feature_style_processor<agg_renderer>(m, scale_factor),
-      pixmap_(pixmap),
-      internal_buffer_(),
-      current_buffer_(&pixmap),
-      style_level_compositing_(false),
+      buffers_(),
+      internal_buffers_(),
       ras_ptr(new rasterizer),
       gamma_method_(GAMMA_POWER),
       gamma_(1.0),
       common_(m, req, vars, offset_x, offset_y, req.width(), req.height(), scale_factor)
 {
-    setup(m);
+    setup(m, pixmap);
 }
 
 template <typename T0, typename T1>
 agg_renderer<T0,T1>::agg_renderer(Map const& m, T0 & pixmap, std::shared_ptr<T1> detector,
                               double scale_factor, unsigned offset_x, unsigned offset_y)
     : feature_style_processor<agg_renderer>(m, scale_factor),
-      pixmap_(pixmap),
-      internal_buffer_(),
-      current_buffer_(&pixmap),
-      style_level_compositing_(false),
+      buffers_(),
+      internal_buffers_(),
       ras_ptr(new rasterizer),
       gamma_method_(GAMMA_POWER),
       gamma_(1.0),
       common_(m, attributes(), offset_x, offset_y, m.width(), m.height(), scale_factor, detector)
 {
-    setup(m);
+    setup(m, pixmap);
 }
 
 template <typename buffer_type>
@@ -157,9 +151,11 @@ struct setup_agg_bg_visitor
 };
 
 template <typename T0, typename T1>
-void agg_renderer<T0,T1>::setup(Map const &m)
+void agg_renderer<T0,T1>::setup(Map const &m, buffer_type & pixmap)
 {
-    mapnik::set_premultiplied_alpha(pixmap_, true);
+    buffers_.emplace(pixmap);
+
+    mapnik::set_premultiplied_alpha(pixmap, true);
     boost::optional<color> const& bg = m.background();
     if (bg)
     {
@@ -167,13 +163,13 @@ void agg_renderer<T0,T1>::setup(Map const &m)
         {
             mapnik::color bg_color = *bg;
             bg_color.premultiply();
-            mapnik::fill(pixmap_, bg_color);
+            mapnik::fill(pixmap, bg_color);
         }
         else
         {
             mapnik::color bg_color = *bg;
             bg_color.set_premultiplied(true);
-            mapnik::fill(pixmap_,bg_color);
+            mapnik::fill(pixmap, bg_color);
         }
     }
 
@@ -182,7 +178,7 @@ void agg_renderer<T0,T1>::setup(Map const &m)
     {
         // NOTE: marker_cache returns premultiplied image, if needed
         std::shared_ptr<mapnik::marker const> bg_marker = mapnik::marker_cache::instance().find(*image_filename,true);
-        setup_agg_bg_visitor<buffer_type> visitor(pixmap_,
+        setup_agg_bg_visitor<buffer_type> visitor(pixmap,
                                      common_,
                                      m.background_image_comp_op(),
                                      m.background_image_opacity());
@@ -204,7 +200,7 @@ void agg_renderer<T0,T1>::start_map_processing(Map const& map)
 template <typename T0, typename T1>
 void agg_renderer<T0,T1>::end_map_processing(Map const& map)
 {
-    mapnik::demultiply_alpha(pixmap_);
+    mapnik::demultiply_alpha(buffers_.top().get());
     MAPNIK_LOG_DEBUG(agg_renderer) << "agg_renderer: End map processing";
 }
 
@@ -226,28 +222,45 @@ void agg_renderer<T0,T1>::start_layer_processing(layer const& lay, box2d<double>
     {
         common_.query_extent_.clip(*maximum_extent);
     }
+
+    if (lay.comp_op() || lay.get_opacity() < 1.0)
+    {
+        internal_buffers_.emplace(common_.width_, common_.height_);
+        buffers_.emplace(internal_buffers_.top());
+        set_premultiplied_alpha(buffers_.top().get(), true);
+    }
+    else
+    {
+        buffers_.emplace(buffers_.top().get());
+    }
 }
 
 template <typename T0, typename T1>
-void agg_renderer<T0,T1>::end_layer_processing(layer const&)
+void agg_renderer<T0,T1>::end_layer_processing(layer const& lyr)
 {
     MAPNIK_LOG_DEBUG(agg_renderer) << "agg_renderer: End layer processing";
+
+    buffer_type & current_buffer = buffers_.top().get();
+    buffers_.pop();
+    buffer_type & previous_buffer = buffers_.top().get();
+
+    if (&current_buffer != &previous_buffer)
+    {
+        composite_mode_e comp_op = lyr.comp_op() ? *lyr.comp_op() : src_over;
+        composite(previous_buffer, current_buffer,
+                  comp_op, lyr.get_opacity(),
+                  -common_.t_.offset(),
+                  -common_.t_.offset());
+        internal_buffers_.pop();
+    }
 }
 
 template <typename T0, typename T1>
 void agg_renderer<T0,T1>::start_style_processing(feature_type_style const& st)
 {
     MAPNIK_LOG_DEBUG(agg_renderer) << "agg_renderer: Start processing style";
-    if (st.comp_op() || st.image_filters().size() > 0 || st.get_opacity() < 1)
-    {
-        style_level_compositing_ = true;
-    }
-    else
-    {
-        style_level_compositing_ = false;
-    }
 
-    if (style_level_compositing_)
+    if (st.comp_op() || st.image_filters().size() > 0 || st.get_opacity() < 1)
     {
         if (st.image_filters_inflate())
         {
@@ -266,81 +279,69 @@ void agg_renderer<T0,T1>::start_style_processing(feature_type_style const& st)
             unsigned target_width = common_.width_ + (offset * 2);
             unsigned target_height = common_.height_ + (offset * 2);
             ras_ptr->clip_box(-int(offset*2),-int(offset*2),target_width,target_height);
-            if (!internal_buffer_ ||
-               (internal_buffer_->width() < target_width ||
-                internal_buffer_->height() < target_height))
-            {
-                internal_buffer_ = std::make_shared<buffer_type>(target_width,target_height);
-            }
-            else
-            {
-                mapnik::fill(*internal_buffer_, 0); // fill with transparent colour
-            }
+            internal_buffers_.emplace(target_width, target_height);
         }
         else
         {
-            if (!internal_buffer_)
-            {
-                internal_buffer_ = std::make_shared<buffer_type>(common_.width_,common_.height_);
-            }
-            else
-            {
-                mapnik::fill(*internal_buffer_, 0); // fill with transparent colour
-            }
+            internal_buffers_.emplace(common_.width_, common_.height_);
             common_.t_.set_offset(0);
             ras_ptr->clip_box(0,0,common_.width_,common_.height_);
         }
-        current_buffer_ = internal_buffer_.get();
-        set_premultiplied_alpha(*current_buffer_,true);
+        buffers_.emplace(internal_buffers_.top());
+        set_premultiplied_alpha(buffers_.top().get(), true);
     }
     else
     {
         common_.t_.set_offset(0);
         ras_ptr->clip_box(0,0,common_.width_,common_.height_);
-        current_buffer_ = &pixmap_;
+        buffers_.emplace(buffers_.top().get());
     }
 }
 
 template <typename T0, typename T1>
 void agg_renderer<T0,T1>::end_style_processing(feature_type_style const& st)
 {
-    if (style_level_compositing_)
+    buffer_type & current_buffer = buffers_.top().get();
+    buffers_.pop();
+    buffer_type & previous_buffer = buffers_.top().get();
+    if (&current_buffer != &previous_buffer)
     {
         bool blend_from = false;
         if (st.image_filters().size() > 0)
         {
             blend_from = true;
-            mapnik::filter::filter_visitor<buffer_type> visitor(*current_buffer_, common_.scale_factor_);
+            mapnik::filter::filter_visitor<buffer_type> visitor(current_buffer, common_.scale_factor_);
             for (mapnik::filter::filter_type const& filter_tag : st.image_filters())
             {
                 util::apply_visitor(visitor, filter_tag);
             }
-            mapnik::premultiply_alpha(*current_buffer_);
+            mapnik::premultiply_alpha(current_buffer);
         }
         if (st.comp_op())
         {
-            composite(pixmap_, *current_buffer_,
+            composite(previous_buffer, current_buffer,
                       *st.comp_op(), st.get_opacity(),
                       -common_.t_.offset(),
                       -common_.t_.offset());
         }
         else if (blend_from || st.get_opacity() < 1.0)
         {
-            composite(pixmap_, *current_buffer_,
+            composite(previous_buffer, current_buffer,
                       src_over, st.get_opacity(),
                       -common_.t_.offset(),
                       -common_.t_.offset());
         }
+        internal_buffers_.pop();
     }
     if (st.direct_image_filters().size() > 0)
     {
         // apply any 'direct' image filters
-        mapnik::filter::filter_visitor<buffer_type> visitor(pixmap_, common_.scale_factor_);
+        mapnik::filter::filter_visitor<buffer_type> visitor(previous_buffer, common_.scale_factor_);
         for (mapnik::filter::filter_type const& filter_tag : st.direct_image_filters())
         {
             util::apply_visitor(visitor, filter_tag);
         }
-        mapnik::premultiply_alpha(pixmap_);
+        mapnik::premultiply_alpha(previous_buffer);
     }
     MAPNIK_LOG_DEBUG(agg_renderer) << "agg_renderer: End processing style";
 }
@@ -349,7 +350,7 @@ template <typename buffer_type>
 struct agg_render_marker_visitor
 {
     agg_render_marker_visitor(renderer_common & common,
-                              buffer_type * current_buffer,
+                              buffer_type & current_buffer,
                               std::unique_ptr<rasterizer> const& ras_ptr,
                               gamma_method_enum & gamma_method,
                               double & gamma,
@@ -386,10 +387,10 @@ struct agg_render_marker_visitor
             gamma_ = 1.0;
         }
         agg::scanline_u8 sl;
-        agg::rendering_buffer buf(current_buffer_->bytes(),
-                                  current_buffer_->width(),
-                                  current_buffer_->height(),
-                                  current_buffer_->row_size());
+        agg::rendering_buffer buf(current_buffer_.bytes(),
+                                  current_buffer_.width(),
+                                  current_buffer_.height(),
+                                  current_buffer_.row_size());
         pixfmt_comp_type pixf(buf);
         pixf.comp_op(static_cast<agg::comp_op_e>(comp_op_));
         renderer_base renb(pixf);
@@ -435,10 +436,10 @@ struct agg_render_marker_visitor
             gamma_ = 1.0;
         }
         agg::scanline_u8 sl;
-        agg::rendering_buffer buf(current_buffer_->bytes(),
-                                  current_buffer_->width(),
-                                  current_buffer_->height(),
-                                  current_buffer_->row_size());
+        agg::rendering_buffer buf(current_buffer_.bytes(),
+                                  current_buffer_.width(),
+                                  current_buffer_.height(),
+                                  current_buffer_.row_size());
         pixfmt_comp_type pixf(buf);
         pixf.comp_op(static_cast<agg::comp_op_e>(comp_op_));
         renderer_base renb(pixf);
@@ -453,7 +454,7 @@ struct agg_render_marker_visitor
         {
             double cx = 0.5 * width;
             double cy = 0.5 * height;
-            composite(*current_buffer_, marker.get_data(),
+            composite(current_buffer_, marker.get_data(),
                       comp_op_, opacity_,
                       std::floor(pos_.x - cx + .5),
                       std::floor(pos_.y - cy + .5));
@@ -517,7 +518,7 @@ struct agg_render_marker_visitor
 
   private:
     renderer_common & common_;
-    buffer_type * current_buffer_;
+    buffer_type & current_buffer_;
     std::unique_ptr<rasterizer> const& ras_ptr_;
     gamma_method_enum & gamma_method_;
     double & gamma_;
@@ -536,7 +537,7 @@ void agg_renderer<T0,T1>::render_marker(pixel_position const& pos,
                                     composite_mode_e comp_op)
 {
     agg_render_marker_visitor<buffer_type> visitor(common_,
-                                                   current_buffer_,
+                                                   buffers_.top().get(),
                                                    ras_ptr,
                                                    gamma_method_,
                                                    gamma_,
@@ -550,23 +551,24 @@ void agg_renderer<T0,T1>::render_marker(pixel_position const& pos,
 template <typename T0, typename T1>
 bool agg_renderer<T0,T1>::painted()
 {
-    return pixmap_.painted();
+    return buffers_.top().get().painted();
 }
 
 template <typename T0, typename T1>
 void agg_renderer<T0,T1>::painted(bool painted)
 {
-    pixmap_.painted(painted);
+    buffers_.top().get().painted(painted);
 }
 
 template <typename T0, typename T1>
 void agg_renderer<T0,T1>::debug_draw_box(box2d<double> const& box,
                                      double x, double y, double angle)
 {
-    agg::rendering_buffer buf(current_buffer_->bytes(),
-                              current_buffer_->width(),
-                              current_buffer_->height(),
-                              current_buffer_->row_size());
+    buffer_type & current_buffer = buffers_.top().get();
+    agg::rendering_buffer buf(current_buffer.bytes(),
+                              current_buffer.width(),
+                              current_buffer.height(),
+                              current_buffer.row_size());
     debug_draw_box(buf, box, x, y, angle);
 }
 
@@ -619,13 +621,13 @@ void agg_renderer<T0,T1>::draw_geo_extent(box2d<double> const& extent, mapnik::c
     unsigned rgba = color.rgba();
     for (double x=x0; x<x1; x++)
     {
-        mapnik::set_pixel(pixmap_, x, y0, rgba);
-        mapnik::set_pixel(pixmap_, x, y1, rgba);
+        mapnik::set_pixel(buffers_.top().get(), x, y0, rgba);
+        mapnik::set_pixel(buffers_.top().get(), x, y1, rgba);
     }
     for (double y=y0; y<y1; y++)
     {
-        mapnik::set_pixel(pixmap_, x0, y, rgba);
-        mapnik::set_pixel(pixmap_, x1, y, rgba);
+        mapnik::set_pixel(buffers_.top().get(), x0, y, rgba);
+        mapnik::set_pixel(buffers_.top().get(), x1, y, rgba);
     }
 }
 
diff --git a/src/agg/process_building_symbolizer.cpp b/src/agg/process_building_symbolizer.cpp
index 0ef057a26..556fb891d 100644
--- a/src/agg/process_building_symbolizer.cpp
+++ b/src/agg/process_building_symbolizer.cpp
@@ -62,7 +62,8 @@ void agg_renderer<T0,T1>::process(building_symbolizer const& sym,
     using ren_base = agg::renderer_base<agg::pixfmt_rgba32_pre>;
     using renderer = agg::renderer_scanline_aa_solid<ren_base>;
 
-    agg::rendering_buffer buf(current_buffer_->bytes(),current_buffer_->width(),current_buffer_->height(), current_buffer_->row_size());
+    buffer_type & current_buffer = buffers_.top().get();
+    agg::rendering_buffer buf(current_buffer.bytes(), current_buffer.width(), current_buffer.height(), current_buffer.row_size());
     agg::pixfmt_rgba32_pre pixf(buf);
     ren_base renb(pixf);
 
diff --git a/src/agg/process_debug_symbolizer.cpp b/src/agg/process_debug_symbolizer.cpp
index df5e980c7..42b45cd61 100644
--- a/src/agg/process_debug_symbolizer.cpp
+++ b/src/agg/process_debug_symbolizer.cpp
@@ -226,7 +226,7 @@ void agg_renderer<T0,T1>::process(debug_symbolizer const& sym,
 
     if (mode == DEBUG_SYM_MODE_RINGS)
     {
-        RingRenderer<buffer_type> renderer(*ras_ptr,*current_buffer_,common_.t_,prj_trans);
+        RingRenderer<buffer_type> renderer(*ras_ptr, buffers_.top().get(), common_.t_, prj_trans);
         render_ring_visitor<buffer_type> apply(renderer);
         mapnik::util::apply_visitor(apply,feature.get_geometry());
     }
@@ -234,13 +234,13 @@ void agg_renderer<T0,T1>::process(debug_symbolizer const& sym,
     {
         for (auto const& n : *common_.detector_)
         {
-            draw_rect(pixmap_, n.get().box);
+            draw_rect(buffers_.top().get(), n.get().box);
         }
     }
     else if (mode == DEBUG_SYM_MODE_VERTEX)
     {
         using apply_vertex_mode = apply_vertex_mode<buffer_type>;
-        apply_vertex_mode apply(pixmap_, common_.t_, prj_trans);
+        apply_vertex_mode apply(buffers_.top().get(), common_.t_, prj_trans);
         util::apply_visitor(geometry::vertex_processor<apply_vertex_mode>(apply), feature.get_geometry());
     }
 }
diff --git a/src/agg/process_dot_symbolizer.cpp b/src/agg/process_dot_symbolizer.cpp
index c612a0e26..7f5291806 100644
--- a/src/agg/process_dot_symbolizer.cpp
+++ b/src/agg/process_dot_symbolizer.cpp
@@ -119,7 +119,8 @@ void agg_renderer<T0,T1>::process(dot_symbolizer const& sym,
         gamma_method_ = GAMMA_POWER;
         gamma_ = 1.0;
     }
-    agg::rendering_buffer buf(current_buffer_->bytes(),current_buffer_->width(),current_buffer_->height(),current_buffer_->row_size());
+    buffer_type & current_buffer = buffers_.top().get();
+    agg::rendering_buffer buf(current_buffer.bytes(), current_buffer.width(), current_buffer.height(), current_buffer.row_size());
     using blender_type = agg::comp_op_adaptor_rgba_pre<agg::rgba8, agg::order_rgba>;
     using pixfmt_comp_type = agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer>;
     using renderer_base = agg::renderer_base<pixfmt_comp_type>;
diff --git a/src/agg/process_group_symbolizer.cpp b/src/agg/process_group_symbolizer.cpp
index b00557eeb..486d714f2 100644
--- a/src/agg/process_group_symbolizer.cpp
+++ b/src/agg/process_group_symbolizer.cpp
@@ -61,10 +61,10 @@ struct thunk_renderer<image_rgba8> : render_thunk_list_dispatch
 
     thunk_renderer(renderer_type &ren,
                    std::unique_ptr<rasterizer> const& ras_ptr,
-                   buffer_type *buf,
+                   buffer_type & buf,
                    renderer_common &common)
         : ren_(ren), ras_ptr_(ras_ptr), buf_(buf), common_(common),
-          tex_(*buf, HALO_RASTERIZER_FULL, src_over, src_over,
+          tex_(buf, HALO_RASTERIZER_FULL, src_over, src_over,
                common.scale_factor_, common.font_manager_.get_stroker())
     {}
 
@@ -80,7 +80,7 @@ struct thunk_renderer<image_rgba8> : render_thunk_list_dispatch
                                                         renderer_type,
                                                         pixfmt_comp_type>;
         ras_ptr_->reset();
-        buf_type render_buffer(buf_->bytes(), buf_->width(), buf_->height(), buf_->row_size());
+        buf_type render_buffer(buf_.bytes(), buf_.width(), buf_.height(), buf_.row_size());
         pixfmt_comp_type pixf(render_buffer);
         pixf.comp_op(static_cast<agg::comp_op_e>(thunk.comp_op_));
         renderer_base renb(pixf);
@@ -101,7 +101,7 @@ struct thunk_renderer<image_rgba8> : render_thunk_list_dispatch
         using renderer_base = agg::renderer_base<pixfmt_comp_type>;
 
         ras_ptr_->reset();
-        buf_type render_buffer(buf_->bytes(), buf_->width(), buf_->height(), buf_->row_size());
+        buf_type render_buffer(buf_.bytes(), buf_.width(), buf_.height(), buf_.row_size());
         pixfmt_comp_type pixf(render_buffer);
         pixf.comp_op(static_cast<agg::comp_op_e>(thunk.comp_op_));
         renderer_base renb(pixf);
@@ -135,7 +135,7 @@ struct thunk_renderer<image_rgba8> : render_thunk_list_dispatch
 private:
     renderer_type &ren_;
     std::unique_ptr<rasterizer> const& ras_ptr_;
-    buffer_type *buf_;
+    buffer_type & buf_;
     renderer_common &common_;
     text_renderer_type tex_;
 };
@@ -145,7 +145,7 @@ void agg_renderer<T0,T1>::process(group_symbolizer const& sym,
                                   mapnik::feature_impl & feature,
                                   proj_transform const& prj_trans)
 {
-    thunk_renderer<buffer_type> ren(*this, ras_ptr, current_buffer_, common_);
+    thunk_renderer<buffer_type> ren(*this, ras_ptr, buffers_.top().get(), common_);
 
     render_group_symbolizer(
         sym, feature, common_.vars_, prj_trans, clipping_extent(common_), common_,
diff --git a/src/agg/process_line_pattern_symbolizer.cpp b/src/agg/process_line_pattern_symbolizer.cpp
index 4af6a0074..5e304cb8f 100644
--- a/src/agg/process_line_pattern_symbolizer.cpp
+++ b/src/agg/process_line_pattern_symbolizer.cpp
@@ -61,14 +61,12 @@ template <typename buffer_type>
 struct agg_renderer_process_visitor_l
 {
     agg_renderer_process_visitor_l(renderer_common & common,
-                                 buffer_type & pixmap,
-                                 buffer_type * current_buffer,
+                                 buffer_type & current_buffer,
                                  std::unique_ptr<rasterizer> const& ras_ptr,
                                  line_pattern_symbolizer const& sym,
                                  mapnik::feature_impl & feature,
                                  proj_transform const& prj_trans)
         : common_(common),
-          pixmap_(pixmap),
           current_buffer_(current_buffer),
           ras_ptr_(ras_ptr),
           sym_(sym),
@@ -112,8 +110,8 @@ private:
         value_double simplify_tolerance = get<value_double, keys::simplify_tolerance>(sym_, feature_, common_.vars_);
         value_double smooth = get<value_double, keys::smooth>(sym_, feature_, common_.vars_);
 
-        agg::rendering_buffer buf(current_buffer_->bytes(),current_buffer_->width(),
-                                  current_buffer_->height(), current_buffer_->row_size());
+        agg::rendering_buffer buf(current_buffer_.bytes(), current_buffer_.width(),
+                                  current_buffer_.height(), current_buffer_.row_size());
         pixfmt_type pixf(buf);
         pixf.comp_op(static_cast<agg::comp_op_e>(get<composite_mode_e, keys::comp_op>(sym_, feature_, common_.vars_)));
         renderer_base ren_base(pixf);
@@ -134,7 +132,7 @@ private:
         box2d<double> clip_box = clipping_extent(common_);
         if (clip)
         {
-            double padding = (double)(common_.query_extent_.width()/pixmap_.width());
+            double padding = (double)(common_.query_extent_.width() / common_.width_);
             if (half_stroke > 1)
                 padding *= half_stroke;
             if (std::fabs(offset) > 0)
@@ -163,8 +161,7 @@ private:
     }
 
     renderer_common & common_;
-    buffer_type & pixmap_;
-    buffer_type * current_buffer_;
+    buffer_type & current_buffer_;
     std::unique_ptr<rasterizer> const& ras_ptr_;
     line_pattern_symbolizer const& sym_;
     mapnik::feature_impl & feature_;
@@ -189,8 +186,7 @@ void  agg_renderer<T0,T1>::process(line_pattern_symbolizer const& sym,
     }
     std::shared_ptr<mapnik::marker const> marker = marker_cache::instance().find(filename, true);
     agg_renderer_process_visitor_l<buffer_type> visitor(common_,
-                                         pixmap_,
-                                         current_buffer_,
+                                         buffers_.top().get(),
                                          ras_ptr,
                                          sym,
                                          feature,
diff --git a/src/agg/process_line_symbolizer.cpp b/src/agg/process_line_symbolizer.cpp
index 8bc73c2a7..5d8ebf073 100644
--- a/src/agg/process_line_symbolizer.cpp
+++ b/src/agg/process_line_symbolizer.cpp
@@ -112,7 +112,8 @@ void agg_renderer<T0,T1>::process(line_symbolizer const& sym,
         gamma_ = gamma;
     }
 
-    agg::rendering_buffer buf(current_buffer_->bytes(),current_buffer_->width(),current_buffer_->height(), current_buffer_->row_size());
+    buffer_type & current_buffer = buffers_.top().get();
+    agg::rendering_buffer buf(current_buffer.bytes(), current_buffer.width(), current_buffer.height(), current_buffer.row_size());
 
     using color_type = agg::rgba8;
     using order_type = agg::order_rgba;
@@ -139,7 +140,7 @@ void agg_renderer<T0,T1>::process(line_symbolizer const& sym,
     line_rasterizer_enum rasterizer_e = get<line_rasterizer_enum, keys::line_rasterizer>(sym, feature, common_.vars_);
     if (clip)
     {
-        double padding = static_cast<double>(common_.query_extent_.width()/pixmap_.width());
+        double padding = static_cast<double>(common_.query_extent_.width() / common_.width_);
         double half_stroke = 0.5 * width;
         if (half_stroke > 1)
         {
diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp
index 81a2d6989..8546f042b 100644
--- a/src/agg/process_markers_symbolizer.cpp
+++ b/src/agg/process_markers_symbolizer.cpp
@@ -132,7 +132,8 @@ void agg_renderer<T0,T1>::process(markers_symbolizer const& sym,
         gamma_ = gamma;
     }
 
-    buf_type render_buffer(current_buffer_->bytes(), current_buffer_->width(), current_buffer_->height(), current_buffer_->row_size());
+    buffer_type & current_buffer = buffers_.top().get();
+    buf_type render_buffer(current_buffer.bytes(), current_buffer.width(), current_buffer.height(), current_buffer.row_size());
     box2d<double> clip_box = clipping_extent(common_);
 
     using renderer_context_type = detail::agg_markers_renderer_context<svg_renderer_type,
diff --git a/src/agg/process_polygon_pattern_symbolizer.cpp b/src/agg/process_polygon_pattern_symbolizer.cpp
index d06bc9033..935e5294a 100644
--- a/src/agg/process_polygon_pattern_symbolizer.cpp
+++ b/src/agg/process_polygon_pattern_symbolizer.cpp
@@ -62,7 +62,7 @@ template <typename buffer_type>
 struct agg_renderer_process_visitor_p
 {
     agg_renderer_process_visitor_p(renderer_common & common,
-                                   buffer_type * current_buffer,
+                                   buffer_type & current_buffer,
                                    std::unique_ptr<rasterizer> const& ras_ptr,
                                    gamma_method_enum & gamma_method,
                                    double & gamma,
@@ -99,8 +99,8 @@ struct agg_renderer_process_visitor_p
 private:
     void render(mapnik::image_rgba8 const& image) const
     {
-        agg::rendering_buffer buf(current_buffer_->bytes(), current_buffer_->width(),
-                                  current_buffer_->height(), current_buffer_->row_size());
+        agg::rendering_buffer buf(current_buffer_.bytes(), current_buffer_.width(),
+                                  current_buffer_.height(), current_buffer_.row_size());
         ras_ptr_->reset();
         value_double gamma = get<value_double, keys::gamma>(sym_, feature_, common_.vars_);
         gamma_method_enum gamma_method = get<gamma_method_enum, keys::gamma_method>(sym_, feature_, common_.vars_);
@@ -158,8 +158,8 @@ private:
             apply_local_alignment apply(common_.t_,prj_trans_, clip_box, x0, y0);
             util::apply_visitor(geometry::vertex_processor<apply_local_alignment>(apply), feature_.get_geometry());
 
-            offset_x = unsigned(current_buffer_->width() - x0);
-            offset_y = unsigned(current_buffer_->height() - y0);
+            offset_x = unsigned(current_buffer_.width() - x0);
+            offset_y = unsigned(current_buffer_.height() - y0);
         }
 
         span_gen_type sg(img_src, offset_x, offset_y);
@@ -194,7 +194,7 @@ private:
     }
 
     renderer_common & common_;
-    buffer_type * current_buffer_;
+    buffer_type & current_buffer_;
     std::unique_ptr<rasterizer> const& ras_ptr_;
     gamma_method_enum & gamma_method_;
     double & gamma_;
@@ -212,7 +212,7 @@ void agg_renderer<T0,T1>::process(polygon_pattern_symbolizer const& sym,
     if (filename.empty()) return;
     std::shared_ptr<mapnik::marker const> marker = marker_cache::instance().find(filename, true);
     agg_renderer_process_visitor_p<buffer_type> visitor(common_,
-                                                        current_buffer_,
+                                                        buffers_.top().get(),
                                                         ras_ptr,
                                                         gamma_method_,
                                                         gamma_,
diff --git a/src/agg/process_polygon_symbolizer.cpp b/src/agg/process_polygon_symbolizer.cpp
index 94451641f..a3cf32fe0 100644
--- a/src/agg/process_polygon_symbolizer.cpp
+++ b/src/agg/process_polygon_symbolizer.cpp
@@ -63,9 +63,10 @@ void agg_renderer<T0,T1>::process(polygon_symbolizer const& sym,
         gamma_ = gamma;
     }
 
-    box2d<double> clip_box = clipping_extent(common_);
-    agg::rendering_buffer buf(current_buffer_->bytes(),current_buffer_->width(),current_buffer_->height(), current_buffer_->row_size());
+    buffer_type & current_buffer = buffers_.top().get();
+    agg::rendering_buffer buf(current_buffer.bytes(), current_buffer.width(), current_buffer.height(), current_buffer.row_size());
 
+    box2d<double> clip_box = clipping_extent(common_);
     render_polygon_symbolizer<vertex_converter_type>(
         sym, feature, prj_trans, common_, clip_box, *ras_ptr,
         [&](color const &fill, double opacity) {
diff --git a/src/agg/process_raster_symbolizer.cpp b/src/agg/process_raster_symbolizer.cpp
index 9f9c9f8df..ad3581065 100644
--- a/src/agg/process_raster_symbolizer.cpp
+++ b/src/agg/process_raster_symbolizer.cpp
@@ -55,7 +55,7 @@ void agg_renderer<T0,T1>::process(raster_symbolizer const& sym,
         sym, feature, prj_trans, common_,
         [&](image_rgba8 const & target, composite_mode_e comp_op, double opacity,
             int start_x, int start_y) {
-            composite(*current_buffer_, target,
+            composite(buffers_.top().get(), target,
                       comp_op, opacity, start_x, start_y);
         }
     );
diff --git a/src/agg/process_shield_symbolizer.cpp b/src/agg/process_shield_symbolizer.cpp
index c583a6a34..e331121e9 100644
--- a/src/agg/process_shield_symbolizer.cpp
+++ b/src/agg/process_shield_symbolizer.cpp
@@ -51,7 +51,7 @@ void  agg_renderer<T0,T1>::process(shield_symbolizer const& sym,
     halo_rasterizer_enum halo_rasterizer = get<halo_rasterizer_enum>(sym, keys::halo_rasterizer, feature, common_.vars_, HALO_RASTERIZER_FULL);
     composite_mode_e comp_op = get<composite_mode_e>(sym, keys::comp_op, feature, common_.vars_, src_over);
     composite_mode_e halo_comp_op = get<composite_mode_e>(sym, keys::halo_comp_op, feature, common_.vars_, src_over);
-    agg_text_renderer<T0> ren(*current_buffer_,
+    agg_text_renderer<T0> ren(buffers_.top().get(),
                               halo_rasterizer,
                               comp_op,
                               halo_comp_op,
diff --git a/src/agg/process_text_symbolizer.cpp b/src/agg/process_text_symbolizer.cpp
index e9b3d8f0f..afb6c85a3 100644
--- a/src/agg/process_text_symbolizer.cpp
+++ b/src/agg/process_text_symbolizer.cpp
@@ -52,7 +52,7 @@ void agg_renderer<T0,T1>::process(text_symbolizer const& sym,
     halo_rasterizer_enum halo_rasterizer = get<halo_rasterizer_enum>(sym, keys::halo_rasterizer,feature, common_.vars_, HALO_RASTERIZER_FULL);
     composite_mode_e comp_op = get<composite_mode_e>(sym, keys::comp_op, feature, common_.vars_, src_over);
     composite_mode_e halo_comp_op = get<composite_mode_e>(sym, keys::halo_comp_op, feature, common_.vars_, src_over);
-    agg_text_renderer<T0> ren(*current_buffer_,
+    agg_text_renderer<T0> ren(buffers_.top().get(),
                               halo_rasterizer,
                               comp_op,
                               halo_comp_op,
diff --git a/src/layer.cpp b/src/layer.cpp
index 78cdd2cd2..aa781860d 100644
--- a/src/layer.cpp
+++ b/src/layer.cpp
@@ -42,9 +42,13 @@ layer::layer(std::string const& _name, std::string const& _srs)
       cache_features_(false),
       group_by_(),
       styles_(),
+      layers_(),
       ds_(),
       buffer_size_(),
-      maximum_extent_() {}
+      maximum_extent_(),
+      comp_op_(),
+      opacity_(1.0f)
+{}
 
 layer::layer(layer const& rhs)
     : name_(rhs.name_),
@@ -57,9 +61,13 @@ layer::layer(layer const& rhs)
       cache_features_(rhs.cache_features_),
       group_by_(rhs.group_by_),
       styles_(rhs.styles_),
+      layers_(rhs.layers_),
       ds_(rhs.ds_),
       buffer_size_(rhs.buffer_size_),
-      maximum_extent_(rhs.maximum_extent_) {}
+      maximum_extent_(rhs.maximum_extent_),
+      comp_op_(rhs.comp_op_),
+      opacity_(rhs.opacity_)
+{}
 
 layer::layer(layer && rhs)
     : name_(std::move(rhs.name_)),
@@ -72,9 +80,13 @@ layer::layer(layer && rhs)
       cache_features_(std::move(rhs.cache_features_)),
       group_by_(std::move(rhs.group_by_)),
       styles_(std::move(rhs.styles_)),
+      layers_(std::move(rhs.layers_)),
       ds_(std::move(rhs.ds_)),
       buffer_size_(std::move(rhs.buffer_size_)),
-      maximum_extent_(std::move(rhs.maximum_extent_)) {}
+      maximum_extent_(std::move(rhs.maximum_extent_)),
+      comp_op_(std::move(rhs.comp_op_)),
+      opacity_(std::move(rhs.opacity_))
+{}
 
 layer& layer::operator=(layer rhs)
 {
@@ -92,6 +104,8 @@ layer& layer::operator=(layer rhs)
     std::swap(this->ds_, rhs.ds_);
     std::swap(this->buffer_size_, rhs.buffer_size_);
     std::swap(this->maximum_extent_, rhs.maximum_extent_);
+    std::swap(this->comp_op_, rhs.comp_op_);
+    std::swap(this->opacity_, rhs.opacity_);
     return *this;
 }
 
@@ -109,7 +123,9 @@ bool layer::operator==(layer const& rhs) const
         (styles_ == rhs.styles_) &&
         ((ds_ && rhs.ds_) ? *ds_ == *rhs.ds_ : ds_ == rhs.ds_) &&
         (buffer_size_ == rhs.buffer_size_) &&
-        (maximum_extent_ == rhs.maximum_extent_);
+        (maximum_extent_ == rhs.maximum_extent_) &&
+        (comp_op_ == rhs.comp_op_) &&
+        (opacity_ == rhs.opacity_);
 }
 
 layer::~layer() {}
@@ -149,6 +165,21 @@ std::vector<std::string> & layer::styles()
     return styles_;
 }
 
+void layer::add_layer(layer const& l)
+{
+    layers_.emplace_back(l);
+}
+
+void layer::add_layer(layer && l)
+{
+    layers_.push_back(std::move(l));
+}
+
+std::vector<layer> const& layer::layers() const
+{
+    return layers_;
+}
+
 void layer::set_minimum_scale_denominator(double minimum_scale_denom)
 {
     minimum_scale_denom_=minimum_scale_denom;
@@ -270,4 +301,24 @@ std::string const& layer::group_by() const
     return group_by_;
 }
 
+void layer::set_comp_op(composite_mode_e comp_op)
+{
+    comp_op_ = comp_op;
+}
+
+boost::optional<composite_mode_e> layer::comp_op() const
+{
+    return comp_op_;
+}
+
+void layer::set_opacity(double opacity)
+{
+    opacity_ = opacity;
+}
+
+double layer::get_opacity() const
+{
+    return opacity_;
+}
+
 }
diff --git a/src/load_map.cpp b/src/load_map.cpp
index c5f48e4ed..767d32366 100644
--- a/src/load_map.cpp
+++ b/src/load_map.cpp
@@ -104,7 +104,10 @@ public:
 private:
     void parse_map_include(Map & map, xml_node const& node);
     void parse_style(Map & map, xml_node const& node);
-    void parse_layer(Map & map, xml_node const& node);
+
+    template <typename Parent>
+    void parse_layer(Parent & parent, xml_node const& node);
+
     void parse_symbolizer_base(symbolizer_base &sym, xml_node const& node);
     void parse_fontset(Map & map, xml_node const & node);
     bool parse_font(font_set & fset, xml_node const& f);
@@ -559,7 +562,8 @@ bool map_parser::parse_font(font_set & fset, xml_node const& f)
     return false;
 }
 
-void map_parser::parse_layer(Map & map, xml_node const& node)
+template <typename Parent>
+void map_parser::parse_layer(Parent & parent, xml_node const& node)
 {
     std::string name;
     try
@@ -575,7 +579,7 @@ void map_parser::parse_layer(Map & map, xml_node const& node)
         name = node.get_attr("name", std::string("Unnamed"));
 
         // If no projection is given inherit from map
-        std::string srs = node.get_attr("srs", map.srs());
+        std::string srs = node.get_attr("srs", parent.srs());
         try
         {
             // create throwaway projection object here to ensure it is valid
@@ -679,6 +683,24 @@ void map_parser::parse_layer(Map & map, xml_node const& node)
             }
         }
 
+        // compositing
+        optional<std::string> comp_op_name = node.get_opt_attr<std::string>("comp-op");
+        if (comp_op_name)
+        {
+            optional<composite_mode_e> comp_op = comp_op_from_string(*comp_op_name);
+            if (comp_op)
+            {
+                lyr.set_comp_op(*comp_op);
+            }
+            else
+            {
+                throw config_error("failed to parse comp-op: '" + *comp_op_name + "'");
+            }
+        }
+
+        optional<double> opacity = node.get_opt_attr<double>("opacity");
+        if (opacity) lyr.set_opacity(*opacity);
+
         for (auto const& child: node)
         {
 
@@ -758,8 +780,12 @@ void map_parser::parse_layer(Map & map, xml_node const& node)
                     throw config_error("Unknown exception occurred attempting to create datasoure for layer '" + lyr.name() + "'");
                 }
             }
+            else if (child.is("Layer"))
+            {
+                parse_layer(lyr, child);
+            }
         }
-        map.add_layer(std::move(lyr));
+        parent.add_layer(std::move(lyr));
     }
     catch (config_error const& ex)
     {

From d7ba7dc0db62514aa50bbe3869dba3aaf1aedabd Mon Sep 17 00:00:00 2001
From: Jiri Drbalek <jiri.drbalek@firma.seznam.cz>
Date: Tue, 2 Aug 2016 12:46:39 +0000
Subject: [PATCH 311/328] agg renderer: recycle internal buffers

---
 include/mapnik/agg_renderer.hpp | 51 ++++++++++++++++++++++++++++++++-
 src/agg/agg_renderer.cpp        | 34 +++++++++++++++-------
 2 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/include/mapnik/agg_renderer.hpp b/include/mapnik/agg_renderer.hpp
index c237cf4f4..27a22b74a 100644
--- a/include/mapnik/agg_renderer.hpp
+++ b/include/mapnik/agg_renderer.hpp
@@ -35,6 +35,7 @@
 #include <mapnik/request.hpp>
 #include <mapnik/symbolizer_enumerations.hpp>
 #include <mapnik/renderer_common.hpp>
+#include <mapnik/image_util.hpp>
 // stl
 #include <memory>
 #include <stack>
@@ -59,6 +60,53 @@ namespace mapnik {
 
 namespace mapnik {
 
+template <typename T>
+class buffer_stack
+{
+public:
+    buffer_stack(std::size_t width, std::size_t height)
+        : width_(width),
+          height_(height),
+          buffers_(),
+          position_(buffers_.begin())
+    {
+    }
+
+    T & push()
+    {
+        if (position_ == buffers_.begin())
+        {
+            buffers_.emplace_front(width_, height_);
+            position_ = buffers_.begin();
+        }
+        else
+        {
+            position_--;
+            mapnik::fill(*position_, 0); // fill with transparent colour
+        }
+        return *position_;
+    }
+
+    void pop()
+    {
+        if (position_ != buffers_.end())
+        {
+            position_++;
+        }
+    }
+
+    T & top() const
+    {
+        return *position_;
+    }
+
+private:
+    const std::size_t width_;
+    const std::size_t height_;
+    std::deque<T> buffers_;
+    typename std::deque<T>::iterator position_;
+};
+
 template <typename T0, typename T1=label_collision_detector4>
 class MAPNIK_DECL agg_renderer : public feature_style_processor<agg_renderer<T0> >,
                                  private util::noncopyable
@@ -162,7 +210,8 @@ protected:
 
 private:
     std::stack<std::reference_wrapper<buffer_type>> buffers_;
-    std::stack<buffer_type> internal_buffers_;
+    buffer_stack<buffer_type> internal_buffers_;
+    std::unique_ptr<buffer_type> inflated_buffer_;
     const std::unique_ptr<rasterizer> ras_ptr;
     gamma_method_enum gamma_method_;
     double gamma_;
diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp
index de2430dad..ed28335ef 100644
--- a/src/agg/agg_renderer.cpp
+++ b/src/agg/agg_renderer.cpp
@@ -41,8 +41,8 @@
 #include <mapnik/pixel_position.hpp>
 #include <mapnik/image_compositing.hpp>
 #include <mapnik/image_filter.hpp>
-#include <mapnik/image_util.hpp>
 #include <mapnik/image_any.hpp>
+#include <mapnik/make_unique.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore_agg.hpp>
@@ -72,7 +72,8 @@ template <typename T0, typename T1>
 agg_renderer<T0,T1>::agg_renderer(Map const& m, T0 & pixmap, double scale_factor, unsigned offset_x, unsigned offset_y)
     : feature_style_processor<agg_renderer>(m, scale_factor),
       buffers_(),
-      internal_buffers_(),
+      internal_buffers_(m.width(), m.height()),
+      inflated_buffer_(),
       ras_ptr(new rasterizer),
       gamma_method_(GAMMA_POWER),
       gamma_(1.0),
@@ -85,7 +86,8 @@ template <typename T0, typename T1>
 agg_renderer<T0,T1>::agg_renderer(Map const& m, request const& req, attributes const& vars, T0 & pixmap, double scale_factor, unsigned offset_x, unsigned offset_y)
     : feature_style_processor<agg_renderer>(m, scale_factor),
       buffers_(),
-      internal_buffers_(),
+      internal_buffers_(req.width(), req.height()),
+      inflated_buffer_(),
       ras_ptr(new rasterizer),
       gamma_method_(GAMMA_POWER),
       gamma_(1.0),
@@ -99,7 +101,8 @@ agg_renderer<T0,T1>::agg_renderer(Map const& m, T0 & pixmap, std::shared_ptr<T1>
                               double scale_factor, unsigned offset_x, unsigned offset_y)
     : feature_style_processor<agg_renderer>(m, scale_factor),
       buffers_(),
-      internal_buffers_(),
+      internal_buffers_(m.width(), m.height()),
+      inflated_buffer_(),
       ras_ptr(new rasterizer),
       gamma_method_(GAMMA_POWER),
       gamma_(1.0),
@@ -225,8 +228,7 @@ void agg_renderer<T0,T1>::start_layer_processing(layer const& lay, box2d<double>
 
     if (lay.comp_op() || lay.get_opacity() < 1.0)
     {
-        internal_buffers_.emplace(common_.width_, common_.height_);
-        buffers_.emplace(internal_buffers_.top());
+        buffers_.emplace(internal_buffers_.push());
         set_premultiplied_alpha(buffers_.top().get(), true);
     }
     else
@@ -279,15 +281,24 @@ void agg_renderer<T0,T1>::start_style_processing(feature_type_style const& st)
             unsigned target_width = common_.width_ + (offset * 2);
             unsigned target_height = common_.height_ + (offset * 2);
             ras_ptr->clip_box(-int(offset*2),-int(offset*2),target_width,target_height);
-            internal_buffers_.emplace(target_width, target_height);
+            if (!inflated_buffer_ ||
+                (inflated_buffer_->width() < target_width ||
+                 inflated_buffer_->height() < target_height))
+            {
+                inflated_buffer_ = std::make_unique<buffer_type>(target_width, target_height);
+            }
+            else
+            {
+                mapnik::fill(*inflated_buffer_, 0); // fill with transparent colour
+            }
+            buffers_.emplace(*inflated_buffer_);
         }
         else
         {
-            internal_buffers_.emplace(common_.width_, common_.height_);
+            buffers_.emplace(internal_buffers_.push());
             common_.t_.set_offset(0);
             ras_ptr->clip_box(0,0,common_.width_,common_.height_);
         }
-        buffers_.emplace(internal_buffers_.top());
         set_premultiplied_alpha(buffers_.top().get(), true);
     }
     else
@@ -331,7 +342,10 @@ void agg_renderer<T0,T1>::end_style_processing(feature_type_style const& st)
                       -common_.t_.offset(),
                       -common_.t_.offset());
         }
-        internal_buffers_.pop();
+        if (&current_buffer == &internal_buffers_.top())
+        {
+            internal_buffers_.pop();
+        }
     }
     if (st.direct_image_filters().size() > 0)
     {

From 15daac26e7b6280dd02f7f2e3ca7171db297bac1 Mon Sep 17 00:00:00 2001
From: Jiri Drbalek <jiri.drbalek@firma.seznam.cz>
Date: Mon, 29 Aug 2016 15:24:49 +0000
Subject: [PATCH 312/328] cairo support for layer level comp-op and opacity

---
 src/cairo/cairo_renderer.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/cairo/cairo_renderer.cpp b/src/cairo/cairo_renderer.cpp
index 0fbb00972..43c3ffef4 100644
--- a/src/cairo/cairo_renderer.cpp
+++ b/src/cairo/cairo_renderer.cpp
@@ -188,12 +188,25 @@ void cairo_renderer<T>::start_layer_processing(layer const& lay, box2d<double> c
         common_.detector_->clear();
     }
     common_.query_extent_ = query_extent;
+
+    if (lay.comp_op() || lay.get_opacity() < 1.0)
+    {
+        context_.push_group();
+    }
 }
 
 template <typename T>
-void cairo_renderer<T>::end_layer_processing(layer const&)
+void cairo_renderer<T>::end_layer_processing(layer const& lay)
 {
     MAPNIK_LOG_DEBUG(cairo_renderer) << "cairo_renderer: End layer processing";
+
+    if (lay.comp_op() || lay.get_opacity() < 1.0)
+    {
+        context_.pop_group();
+        composite_mode_e comp_op = lay.comp_op() ? *lay.comp_op() : src_over;
+        context_.set_operator(comp_op);
+        context_.paint(lay.get_opacity());
+    }
 }
 
 template <typename T>

From bb19ff948e92b33c440c013e86d81122306b4650 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 16 Mar 2017 12:16:54 +0000
Subject: [PATCH 313/328] remove QMAKE_MAC_SDK version requirement - just build
 with what is available

---
 demo/viewer/viewer.pro | 1 -
 1 file changed, 1 deletion(-)

diff --git a/demo/viewer/viewer.pro b/demo/viewer/viewer.pro
index 8a9747752..aad00b424 100644
--- a/demo/viewer/viewer.pro
+++ b/demo/viewer/viewer.pro
@@ -1,7 +1,6 @@
 ######################################################################
 # Mapnik viewer - Copyright (C) 2007 Artem Pavlenko
 ######################################################################
-QMAKE_MAC_SDK = macosx10.11
 TEMPLATE = app
 QT += core gui widgets
 QMAKE_CXX = $$system(mapnik-config --cxx)

From a9aa1c69b8eaff0ba87aad57b1d3d0bc3984f1c8 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 16 Mar 2017 12:39:12 +0000
Subject: [PATCH 314/328] save_map - support nested layers + serialize layer
 compositing mode

---
 src/save_map.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/save_map.cpp b/src/save_map.cpp
index 008658849..f5825ce73 100644
--- a/src/save_map.cpp
+++ b/src/save_map.cpp
@@ -514,6 +514,17 @@ void serialize_layer( ptree & map_node, layer const& lyr, bool explicit_defaults
         set_attr( layer_node, "name", lyr.name() );
     }
 
+    auto const comp_op = lyr.comp_op();
+
+    if (comp_op)
+    {
+        set_attr(layer_node, "comp-op", *comp_op_to_string(*comp_op));
+    }
+    else if (explicit_defaults)
+    {
+        set_attr(layer_node, "comp-op", "src-over");
+    }
+
     if ( lyr.srs() != "" )
     {
         set_attr( layer_node, "srs", lyr.srs() );
@@ -583,6 +594,12 @@ void serialize_layer( ptree & map_node, layer const& lyr, bool explicit_defaults
     {
         serialize_datasource( layer_node, datasource );
     }
+
+    // serialize nested layers
+    for (auto const& child : lyr.layers())
+    {
+        serialize_layer(layer_node, child, explicit_defaults );
+    }
 }
 
 void serialize_map(ptree & pt, Map const& map, bool explicit_defaults)

From f8241a96fb280fd93aba0d1405ef427a8715dca8 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 16 Mar 2017 13:04:05 +0000
Subject: [PATCH 315/328] update visual data

---
 test/data-visual | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/data-visual b/test/data-visual
index 0cfd572dd..b399ad677 160000
--- a/test/data-visual
+++ b/test/data-visual
@@ -1 +1 @@
-Subproject commit 0cfd572dd51a252c00d538dab0e07a7d98c0722a
+Subproject commit b399ad677146c9d7b1c11470691b7a332d95b156

From edaca3a015114743f2864239de1125a7fefe51b6 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Sat, 18 Mar 2017 19:39:09 -0700
Subject: [PATCH 316/328] update sqlite, icu, ccache, and libpq

---
 bootstrap.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 7a8582333..b2b171f49 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -11,7 +11,7 @@ todo
 - shrink icu data
 '
 
-MASON_VERSION="v0.8.0"
+MASON_VERSION="3c6df04"
 
 function setup_mason() {
     if [[ ! -d ./.mason ]]; then
@@ -44,16 +44,16 @@ function install() {
     mason link $1 $2
 }
 
-ICU_VERSION="55.1"
+ICU_VERSION="57.1"
 
 function install_mason_deps() {
-    install ccache 3.3.0
+    install ccache 3.3.1
     install zlib 1.2.8
     install jpeg_turbo 1.5.1 libjpeg
     install libpng 1.6.28 libpng
     install libtiff 4.0.7 libtiff
-    install libpq 9.6.1
-    install sqlite 3.16.2 libsqlite3
+    install libpq 9.6.2
+    install sqlite 3.17.0 libsqlite3
     install expat 2.2.0 libexpat
     install icu ${ICU_VERSION}
     install proj 4.9.3 libproj
@@ -68,7 +68,7 @@ function install_mason_deps() {
     install boost_libsystem 1.63.0
     install boost_libfilesystem 1.63.0
     install boost_libprogram_options 1.63.0
-    install boost_libregex_icu 1.63.0
+    install boost_libregex_icu57 1.63.0
     # technically boost thread and python are not a core dep, but installing
     # here by default helps make python-mapnik builds easier
     install boost_libthread 1.63.0

From 5450255c5b4c36265c98547317783d92249a35fd Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 20 Mar 2017 14:24:34 +0000
Subject: [PATCH 317/328] revert back to separate tests #if HB_VERSION_MAJOR >
 0 #if HB_VERSION_ATLEAST(1, 0 , 5)  ref #3642

---
 include/mapnik/text/harfbuzz_shaper.hpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/mapnik/text/harfbuzz_shaper.hpp b/include/mapnik/text/harfbuzz_shaper.hpp
index af3b4d6b1..bee119557 100644
--- a/include/mapnik/text/harfbuzz_shaper.hpp
+++ b/include/mapnik/text/harfbuzz_shaper.hpp
@@ -116,9 +116,10 @@ static void shape_text(text_line & line,
             hb_buffer_set_script(buffer.get(), _icu_script_to_script(text_item.script));
             hb_font_t *font(hb_ft_font_create(face->get_face(), nullptr));
             // https://github.com/mapnik/test-data-visual/pull/25
-
-#if (HB_VERSION_MAJOR > 0 && HB_VERSION_ATLEAST(1, 0, 5))
+#if HB_VERSION_MAJOR > 0
+#if HB_VERSION_ATLEAST(1, 0 , 5)
             hb_ft_font_set_load_flags(font,FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING);
+#endif
 #endif
             hb_shape(font, buffer.get(), ff_settings.get_features(), ff_count);
             hb_font_destroy(font);

From 8a18ef93e0bd29fb6a88bc83afd71d31eb681cce Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 20 Mar 2017 15:03:28 +0000
Subject: [PATCH 318/328] update test data

---
 test/data | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/data b/test/data
index e61692e68..dac50a321 160000
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit e61692e688c39e737fb73394839bcffe90f6fe78
+Subproject commit dac50a321bdcc92c6183ded08200eb8fa117532c

From d9063db0a050ef7c85f2ab1527f9ca7120a10126 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 21 Mar 2017 12:40:58 +0000
Subject: [PATCH 319/328] GeoJSON - make `geometry` element stricter and throw
 on invalid input.

---
 include/mapnik/json/create_geometry.hpp | 44 +++++++++++++++++--------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/include/mapnik/json/create_geometry.hpp b/include/mapnik/json/create_geometry.hpp
index 780a1d4cc..54270a848 100644
--- a/include/mapnik/json/create_geometry.hpp
+++ b/include/mapnik/json/create_geometry.hpp
@@ -44,7 +44,10 @@ struct create_point
     }
 
     template <typename T>
-    void operator()(T const&) const {} // no-op - shouldn't get here
+    void operator()(T const&) const
+    {
+        throw std::runtime_error("Failed to parse geojson geometry");
+    }
     Geometry & geom_;
 };
 
@@ -56,21 +59,21 @@ struct create_linestring
 
     void operator() (ring const& points) const
     {
+        mapnik::geometry::line_string<double> line;
         std::size_t size = points.size();
-        if (size > 1)
+        line.reserve(size);
+        for (auto && pt : points)
         {
-            mapnik::geometry::line_string<double> line;
-            line.reserve(size);
-            for (auto && pt : points)
-            {
-                line.emplace_back(std::move(pt));
-            }
-            geom_ = std::move(line);
+            line.emplace_back(std::move(pt));
         }
+        geom_ = std::move(line);
     }
 
     template <typename T>
-    void operator()(T const&) const {}  // no-op - shouldn't get here
+    void operator()(T const&) const
+    {
+        throw std::runtime_error("Failed to parse geojson geometry");
+    }
 
     Geometry & geom_;
 };
@@ -107,7 +110,10 @@ struct create_polygon
     }
 
     template <typename T>
-    void operator()(T const&) const {}  // no-op - shouldn't get here
+    void operator()(T const&) const
+    {
+       throw std::runtime_error("Failed to parse geojson geometry");
+    }
 
     Geometry & geom_;
 };
@@ -131,7 +137,10 @@ struct create_multipoint
     }
 
     template <typename T>
-    void operator()(T const&) const {}  // no-op - shouldn't get here
+    void operator()(T const&) const
+    {
+        throw std::runtime_error("Failed to parse geojson geometry");
+    }
 
     Geometry & geom_;
 };
@@ -161,7 +170,10 @@ struct create_multilinestring
     }
 
     template <typename T>
-    void operator()(T const&) const {}  // no-op - shouldn't get here
+    void operator()(T const&) const
+    {
+        throw std::runtime_error("Failed to parse geojson geometry");
+    }
 
     Geometry & geom_;
 };
@@ -202,7 +214,10 @@ struct create_multipolygon
     }
 
     template <typename T>
-    void operator()(T const&) const {}  // no-op - shouldn't get here
+    void operator()(T const&) const
+    {
+        throw std::runtime_error("Failed to parse geojson geometry");
+    }
 
     Geometry & geom_;
 };
@@ -232,6 +247,7 @@ void create_geometry (Geometry & geom, int type, mapnik::json::positions const&
         util::apply_visitor(create_multipolygon<Geometry>(geom), coords);
         break;
     default:
+        throw std::runtime_error("Failed to parse geojson geometry");
         break;
     }
 }

From b4b5e33b05456947ea32aab583c5758fba166337 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 21 Mar 2017 12:43:42 +0000
Subject: [PATCH 320/328] refactor WKT generator to retain geometry type for
 `empty` geometries (avoid short-cutting to `POINT EMPTY`)

For example:

| in |   | out   |
|`POINT EMPTY` |  <--> | 'POINT EMPTY`|
|`LINESTRING EMPTY` |  --> | 'POINT EMPTY`|

| in |   | out   |
|`POINT EMPTY` |  <--> | 'POINT EMPTY`|
|`LINESTRING EMPTY` |  <--> | 'LINESTRING EMPTY`|
etc.
---
 .../mapnik/wkt/wkt_generator_grammar_impl.hpp | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/include/mapnik/wkt/wkt_generator_grammar_impl.hpp b/include/mapnik/wkt/wkt_generator_grammar_impl.hpp
index d627aa95c..4daa2547a 100644
--- a/include/mapnik/wkt/wkt_generator_grammar_impl.hpp
+++ b/include/mapnik/wkt/wkt_generator_grammar_impl.hpp
@@ -49,36 +49,51 @@ wkt_generator_grammar<OutputIterator, Geometry>::wkt_generator_grammar()
         lit("POINT EMPTY") // special case for geometry_empty
         ;
 
-    point = lit("POINT(") << coordinate << lit(' ') << coordinate << lit(")")
+    point = lit("POINT(") << point_coord << lit(")")
         ;
-    linestring = lit("LINESTRING(") << linestring_coord << lit(")")
+
+    linestring = lit("LINESTRING") << (linestring_coord | lit(" EMPTY"))
         ;
-    polygon = lit("POLYGON(") << polygon_coord << lit(")")
+
+    polygon = lit("POLYGON") << (polygon_coord | lit(" EMPTY"))
         ;
-    multi_point = lit("MULTIPOINT(") << multi_point_coord << lit(")")
+
+    multi_point = lit("MULTIPOINT") << (multi_point_coord | lit(" EMPTY"))
         ;
-    multi_linestring = lit("MULTILINESTRING(") << multi_linestring_coord << lit(")")
+
+    multi_linestring = lit("MULTILINESTRING") << (multi_linestring_coord | lit(" EMPTY"))
         ;
-    multi_polygon = lit("MULTIPOLYGON(") << multi_polygon_coord << lit(")")
+
+    multi_polygon = lit("MULTIPOLYGON") << (multi_polygon_coord | lit(" EMPTY"))
         ;
-    geometry_collection = lit("GEOMETRYCOLLECTION(") << geometries  << lit(")")
+
+    geometry_collection = lit("GEOMETRYCOLLECTION") << (lit("(") << geometries  << lit(")") | lit(" EMPTY"))
         ;
+
     point_coord = coordinate << lit(' ') << coordinate
         ;
-    linestring_coord = point_coord % lit(',')
+
+    linestring_coord = lit("(") << point_coord % lit(',') << lit(")")
         ;
-    polygon_coord = lit('(') << exterior_ring_coord << lit(')') << interior_ring_coord
+
+    polygon_coord = lit("(") << exterior_ring_coord << interior_ring_coord << lit(")")
         ;
+
     exterior_ring_coord = linestring_coord.alias()
         ;
-    interior_ring_coord =  *(lit(",(") << exterior_ring_coord << lit(')'))
+
+    interior_ring_coord =  *(lit(",") << exterior_ring_coord)
         ;
+
     multi_point_coord = linestring_coord.alias()
         ;
-    multi_linestring_coord = (lit('(') << linestring_coord  << lit(')')) % lit(',')
+
+    multi_linestring_coord = lit("(") << linestring_coord % lit(',') << lit(")")
         ;
-    multi_polygon_coord = (lit('(') << polygon_coord << lit(')')) % lit(',')
+
+    multi_polygon_coord = lit("(") << polygon_coord % lit(',') << lit(")")
         ;
+
     geometries = geometry % lit(',')
         ;
 

From 38b4b65911204d9064b286fcac05b2d73eda583c Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 21 Mar 2017 16:48:41 +0000
Subject: [PATCH 321/328] GeoJSON - refactor geometry generator to preserve
 geometry type in output (ref
 https://github.com/mapnik/python-mapnik/issues/139)

---
 .../json/geometry_generator_grammar_impl.hpp  | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/include/mapnik/json/geometry_generator_grammar_impl.hpp b/include/mapnik/json/geometry_generator_grammar_impl.hpp
index 3f0a84fcc..bb69e0309 100644
--- a/include/mapnik/json/geometry_generator_grammar_impl.hpp
+++ b/include/mapnik/json/geometry_generator_grammar_impl.hpp
@@ -50,39 +50,54 @@ geometry_generator_grammar<OutputIterator, Geometry>::geometry_generator_grammar
         |
         geometry_collection
         |
-        lit("null")
+        lit("null") // geometry_empty
         ;
 
     point = lit("{\"type\":\"Point\",\"coordinates\":") << point_coord << lit("}")
         ;
-    linestring = lit("{\"type\":\"LineString\",\"coordinates\":[") << linestring_coord << lit("]}")
+
+    linestring = lit("{\"type\":\"LineString\",\"coordinates\":") << linestring_coord << lit("}")
         ;
-    polygon = lit("{\"type\":\"Polygon\",\"coordinates\":[") << polygon_coord << lit("]}")
+
+    polygon = lit("{\"type\":\"Polygon\",\"coordinates\":") << polygon_coord << lit("}")
         ;
+
     multi_point = lit("{\"type\":\"MultiPoint\",\"coordinates\":[") << multi_point_coord << lit("]}")
         ;
+
     multi_linestring = lit("{\"type\":\"MultiLineString\",\"coordinates\":[") << multi_linestring_coord << lit("]}")
         ;
+
     multi_polygon = lit("{\"type\":\"MultiPolygon\",\"coordinates\":[") << multi_polygon_coord << lit("]}")
         ;
+
     geometry_collection = lit("{\"type\":\"GeometryCollection\",\"geometries\":[") << geometries  << lit("]}")
         ;
+
     point_coord = lit('[') << coordinate << lit(',') << coordinate  << lit(']')
         ;
-    linestring_coord = point_coord % lit(',')
+
+    linestring_coord = lit('[') << -(point_coord % lit(',')) << lit(']')
         ;
-    polygon_coord = lit('[') << exterior_ring_coord << lit(']') << interior_ring_coord
+
+    polygon_coord = lit('[') << exterior_ring_coord << interior_ring_coord << lit(']')
         ;
+
     exterior_ring_coord = linestring_coord.alias()
         ;
-    interior_ring_coord =  *(lit(",[") << exterior_ring_coord << lit(']'))
+
+    interior_ring_coord =  *(lit(",") << exterior_ring_coord)
         ;
+
     multi_point_coord = linestring_coord.alias()
         ;
-    multi_linestring_coord = (lit('[') << linestring_coord << lit(']')) % lit(',')
+
+    multi_linestring_coord = lit('[') << linestring_coord  % lit(',') << lit(']')
         ;
-    multi_polygon_coord = (lit('[') << polygon_coord << lit(']')) % lit(',')
+
+    multi_polygon_coord = lit('[') << polygon_coord  % lit(',') << lit("]")
         ;
+
     geometries =  geometry % lit(',')
         ;
 }

From 60e6f5a9ff4fea70ba6fef53466656f463108ba3 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 22 Mar 2017 15:09:15 +0000
Subject: [PATCH 322/328] geojson - fix geometry generator grammar.

---
 include/mapnik/json/geometry_generator_grammar_impl.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/mapnik/json/geometry_generator_grammar_impl.hpp b/include/mapnik/json/geometry_generator_grammar_impl.hpp
index bb69e0309..b00e2bb21 100644
--- a/include/mapnik/json/geometry_generator_grammar_impl.hpp
+++ b/include/mapnik/json/geometry_generator_grammar_impl.hpp
@@ -62,13 +62,13 @@ geometry_generator_grammar<OutputIterator, Geometry>::geometry_generator_grammar
     polygon = lit("{\"type\":\"Polygon\",\"coordinates\":") << polygon_coord << lit("}")
         ;
 
-    multi_point = lit("{\"type\":\"MultiPoint\",\"coordinates\":[") << multi_point_coord << lit("]}")
+    multi_point = lit("{\"type\":\"MultiPoint\",\"coordinates\":") << multi_point_coord << lit("}")
         ;
 
-    multi_linestring = lit("{\"type\":\"MultiLineString\",\"coordinates\":[") << multi_linestring_coord << lit("]}")
+    multi_linestring = lit("{\"type\":\"MultiLineString\",\"coordinates\":") << multi_linestring_coord << lit("}")
         ;
 
-    multi_polygon = lit("{\"type\":\"MultiPolygon\",\"coordinates\":[") << multi_polygon_coord << lit("]}")
+    multi_polygon = lit("{\"type\":\"MultiPolygon\",\"coordinates\":") << multi_polygon_coord << lit("}")
         ;
 
     geometry_collection = lit("{\"type\":\"GeometryCollection\",\"geometries\":[") << geometries  << lit("]}")

From 69e5340ceb682e8fa68617b6cf55473487e6fc9b Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 23 Mar 2017 13:44:51 +0000
Subject: [PATCH 323/328] add valid/invalid `empty` GeoJSON geometry tests

---
 test/unit/datasource/geojson.cpp | 36 ++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/test/unit/datasource/geojson.cpp b/test/unit/datasource/geojson.cpp
index d65977d93..05cd55d03 100644
--- a/test/unit/datasource/geojson.cpp
+++ b/test/unit/datasource/geojson.cpp
@@ -28,6 +28,7 @@
 #include <mapnik/datasource_cache.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/geometry/geometry_type.hpp>
+#include <mapnik/json/geometry_parser.hpp>
 #include <mapnik/util/fs.hpp>
 #include <cstdlib>
 
@@ -115,6 +116,41 @@ TEST_CASE("geojson") {
             }
         }
 
+        SECTION("GeoJSON empty Geometries handling")
+        {
+            auto valid_empty_geometries =
+                {
+                    "null", // Point can't be empty
+                    "{ \"type\": \"LineString\", \"coordinates\": [] }",
+                    "{ \"type\": \"Polygon\", \"coordinates\": [ [ ] ] } ",
+                    "{ \"type\": \"MultiPoint\", \"coordinates\": [ ] }",
+                    "{ \"type\": \"MultiLineString\", \"coordinates\": [ [] ] }",
+                    "{ \"type\": \"MultiPolygon\", \"coordinates\": [[ []] ] }"
+                };
+
+            for (auto const& json  : valid_empty_geometries)
+            {
+                mapnik::geometry::geometry<double> geom;
+                CHECK(mapnik::json::from_geojson(json, geom));
+            }
+
+            auto invalid_empty_geometries =
+                {
+                    "{ \"type\": \"Point\", \"coordinates\": [] }",
+                    "{ \"type\": \"LineString\", \"coordinates\": [[]] }"
+                    "{ \"type\": \"Polygon\", \"coordinates\": [[[]]] }",
+                    "{ \"type\": \"MultiPoint\", \"coordinates\": [[]] }",
+                    "{ \"type\": \"MultiLineString\", \"coordinates\": [[[]]] }",
+                    "{ \"type\": \"MultiPolygon\", \"coordinates\": [[[[]]]] }"
+                };
+
+            for (auto const& json  : invalid_empty_geometries)
+            {
+                mapnik::geometry::geometry<double> geom;
+                CHECK(!mapnik::json::from_geojson(json, geom));
+            }
+        }
+
         SECTION("GeoJSON num_features_to_query")
         {
             std::string filename = "./test/data/json/featurecollection-multipleprops.geojson";

From 1be4696d52858e92f02edacf355cade46849be66 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 23 Mar 2017 14:58:39 +0000
Subject: [PATCH 324/328] GeoJSON IO test - ensure geometries round-trip.

---
 test/unit/datasource/geojson.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/test/unit/datasource/geojson.cpp b/test/unit/datasource/geojson.cpp
index 05cd55d03..6d513bd02 100644
--- a/test/unit/datasource/geojson.cpp
+++ b/test/unit/datasource/geojson.cpp
@@ -29,9 +29,10 @@
 #include <mapnik/geometry.hpp>
 #include <mapnik/geometry/geometry_type.hpp>
 #include <mapnik/json/geometry_parser.hpp>
+#include <mapnik/util/geometry_to_geojson.hpp>
 #include <mapnik/util/fs.hpp>
 #include <cstdlib>
-
+#include <algorithm>
 #include <boost/optional/optional_io.hpp>
 
 /*
@@ -128,10 +129,19 @@ TEST_CASE("geojson") {
                     "{ \"type\": \"MultiPolygon\", \"coordinates\": [[ []] ] }"
                 };
 
-            for (auto const& json  : valid_empty_geometries)
+            for (auto const& in  : valid_empty_geometries)
             {
+                std::string json(in);
                 mapnik::geometry::geometry<double> geom;
                 CHECK(mapnik::json::from_geojson(json, geom));
+                // round trip
+                std::string json_out;
+                CHECK(mapnik::util::to_geojson(json_out, geom));
+                json.erase(std::remove_if(
+                               std::begin(json), std::end(json),
+                               [l = std::locale{}](auto ch) { return std::isspace(ch, l); }
+                               ), std::end(json));
+                REQUIRE(json == json_out);
             }
 
             auto invalid_empty_geometries =

From 641d7b647f54e0e3e90d2be67a8b2d99972c968a Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Sat, 18 Mar 2017 19:40:18 -0700
Subject: [PATCH 325/328] consistently use pkg-config in both postgis plugin
 and pgsql2sqlite + use GDAL_CONFIG var in plugins

---
 plugins/input/gdal/build.py |  2 +-
 plugins/input/ogr/build.py  |  2 +-
 utils/pgsql2sqlite/build.py | 25 +++++++++++++++----------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/plugins/input/gdal/build.py b/plugins/input/gdal/build.py
index 0db10c208..4dc631dde 100644
--- a/plugins/input/gdal/build.py
+++ b/plugins/input/gdal/build.py
@@ -38,7 +38,7 @@ plugin_env['LIBS'] = []
 plugin_env.Append(LIBS=env['PLUGINS']['gdal']['lib'])
 
 if env['RUNTIME_LINK'] == 'static':
-    cmd = 'gdal-config --dep-libs'
+    cmd = '%s --dep-libs' % plugin_env['GDAL_CONFIG']
     plugin_env.ParseConfig(cmd)
 
 # Link Library to Dependencies
diff --git a/plugins/input/ogr/build.py b/plugins/input/ogr/build.py
index 143289d69..1681d0b4d 100644
--- a/plugins/input/ogr/build.py
+++ b/plugins/input/ogr/build.py
@@ -42,7 +42,7 @@ plugin_env['LIBS'] = []
 plugin_env.Append(LIBS=env['PLUGINS']['ogr']['lib'])
 
 if env['RUNTIME_LINK'] == 'static':
-    cmd = 'gdal-config --dep-libs'
+    cmd = '%s --dep-libs' % plugin_env['GDAL_CONFIG']
     plugin_env.ParseConfig(cmd)
 
 # Link Library to Dependencies
diff --git a/utils/pgsql2sqlite/build.py b/utils/pgsql2sqlite/build.py
index 45d90035b..3dac9003a 100644
--- a/utils/pgsql2sqlite/build.py
+++ b/utils/pgsql2sqlite/build.py
@@ -39,6 +39,20 @@ source = Split(
 program_env['CXXFLAGS'] = copy(env['LIBMAPNIK_CXXFLAGS'])
 program_env['LINKFLAGS'] = copy(env['LIBMAPNIK_LINKFLAGS'])
 program_env.Append(CPPDEFINES = env['LIBMAPNIK_DEFINES'])
+program_env['LIBS'] = []
+
+if env['RUNTIME_LINK'] == 'static':
+    # pkg-config is more reliable than pg_config across platforms
+    cmd = 'pkg-config libpq --libs --static'
+    try:
+        program_env.ParseConfig(cmd)
+    except OSError, e:
+        program_env.Append(LIBS='pq')
+else:
+    program_env.Append(LIBS='pq')
+
+# Link Library to Dependencies
+libraries = copy(program_env['LIBS'])
 
 if env['HAS_CAIRO']:
     program_env.PrependUnique(CPPPATH=env['CAIRO_CPPPATHS'])
@@ -46,9 +60,8 @@ if env['HAS_CAIRO']:
 
 program_env.PrependUnique(CPPPATH=['#plugins/input/postgis'])
 
-libraries = []
 boost_program_options = 'boost_program_options%s' % env['BOOST_APPEND']
-libraries.extend([boost_program_options,'sqlite3','pq',env['MAPNIK_NAME'],'icuuc'])
+libraries.extend([boost_program_options,'sqlite3',env['MAPNIK_NAME'],'icuuc'])
 
 if env.get('BOOST_LIB_VERSION_FROM_HEADER'):
     boost_version_from_header = int(env['BOOST_LIB_VERSION_FROM_HEADER'].split('_')[1])
@@ -59,14 +72,6 @@ if env.get('BOOST_LIB_VERSION_FROM_HEADER'):
 if env['SQLITE_LINKFLAGS']:
     program_env.Append(LINKFLAGS=env['SQLITE_LINKFLAGS'])
 
-if env['RUNTIME_LINK'] == 'static':
-    if env['PLATFORM'] == 'Darwin':
-        libraries.extend(['ldap', 'pam', 'ssl', 'crypto', 'krb5'])
-    else:
-        # TODO - parse back into libraries variable
-        program_env.ParseConfig('pg_config --libs')
-        libraries.append('dl')
-
 pgsql2sqlite = program_env.Program('pgsql2sqlite', source, LIBS=libraries)
 Depends(pgsql2sqlite, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))
 

From a53c90172c664d29cd877302de9790a6ee9b5330 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Sun, 19 Mar 2017 13:06:25 -0700
Subject: [PATCH 326/328] remove obsolete python remnants

---
 Makefile | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/Makefile b/Makefile
index 090be8d5d..e3b4b53dc 100755
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
 OS := $(shell uname -s)
 
-PYTHON = python
-
 ifeq ($(JOBS),)
 	JOBS:=1
 endif
@@ -21,11 +19,6 @@ release:
 test-release:
 	./scripts/test_release.sh
 
-python:
-	if [ ! -d ./bindings/python ]; then git clone git@github.com:mapnik/python-mapnik.git --recursive ./bindings/python; else (cd bindings/python && git pull && git submodule update --init); fi;
-	make
-	python bindings/python/test/visual.py -q
-
 src/json/libmapnik-json.a:
 	# we first build memory intensive files with -j$(HEAVY_JOBS)
 	$(PYTHON) scons/scons.py -j$(HEAVY_JOBS) \
@@ -96,13 +89,6 @@ bench:
 demo:
 	cd demo/c++; ./rundemo `mapnik-config --prefix`
 
-pep8:
-	# https://gist.github.com/1903033
-	# gsed on osx
-	@pep8 -r --select=W293 -q --filename=*.py `pwd`/tests/ | xargs gsed -i 's/^[ \r\t]*$$//'
-	@pep8 -r --select=W391 -q --filename=*.py `pwd`/tests/ | xargs gsed -i -e :a -e '/^\n*$$/{$$d;N;ba' -e '}'
-	@pep8 -r --select=W391 -q --filename=*.py `pwd`/tests/ | xargs ged -i '/./,/^$$/!d'
-
 # note: pass --gen-suppressions=yes to create new suppression entries
 grind:
 	@source localize.sh && \

From d65fd4f7f77030291c957cfaaef028eb1157960c Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Tue, 28 Mar 2017 15:18:40 -0700
Subject: [PATCH 327/328] improve check padding script to see deps via
 submodules

---
 scripts/check-padding | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/check-padding b/scripts/check-padding
index b10d34b73..107d6369d 100755
--- a/scripts/check-padding
+++ b/scripts/check-padding
@@ -26,7 +26,7 @@ function add() {
 CXX=${CXX:-clang++}
 
 function compile() {
-    ${CXX} -o ${app} ${cpp} -Wpadded -I./ -isystem ./mason_packages/.link/include `mapnik-config --all-flags` -Ideps -Lsrc -Ideps/agg/include -Iinclude
+    ${CXX} -o ${app} ${cpp} -Wpadded -I./ -I./deps/mapbox/variant/include -isystem ./mason_packages/.link/include -std=c++11 -Ideps -Lsrc -Ideps/agg/include -Iinclude
 }
 
 if [[ ${1:-unset} == "unset" ]] || [[ ${2:-unset} == "unset" ]] || [[ $@ == '-h' ]] || [[ $@ == '--help' ]]; then

From 5c81e808372f2d8bb00bbf488a2a5022e8d52db1 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Tue, 28 Mar 2017 22:28:55 -0700
Subject: [PATCH 328/328] update test data to stay in sync with 3.0.x branch -
 mapnik/test-data-visual#46

---
 test/data-visual | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/data-visual b/test/data-visual
index b399ad677..13680134c 160000
--- a/test/data-visual
+++ b/test/data-visual
@@ -1 +1 @@
-Subproject commit b399ad677146c9d7b1c11470691b7a332d95b156
+Subproject commit 13680134c5d43c457dce3163b045b6ab70423a6b