refactoring placement code

- all placement methods are supported by all relevant symbolizers

Author: talaj

include/mapnik/agg_renderer.hpp

@@ -183,6 +183,12 @@ class MAPNIK_DECL agg_renderer : public feature_style_processor<agg_renderer<T0>
         return false;
     }
 
+    template <typename Sym>
+    void process_marker(
+        Sym const& sym,
+        mapnik::feature_impl & feature,
+        proj_transform const& prj_trans);
+
     void painted(bool painted);
     bool painted();
 

include/mapnik/box2d.hpp

@@ -116,6 +116,7 @@ template <typename T> class MAPNIK_DECL box2d
     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);

include/mapnik/box2d_impl.hpp

@@ -393,6 +393,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)

include/mapnik/cairo/cairo_renderer.hpp

@@ -141,6 +141,12 @@ class MAPNIK_DECL cairo_renderer : public feature_style_processor<cairo_renderer
         return false;
     }
 
+    template <typename Sym>
+    void process_marker(
+        Sym const& sym,
+        mapnik::feature_impl & feature,
+        proj_transform const& prj_trans);
+
     bool painted()
     {
         return true;

include/mapnik/extend_converter.hpp

@@ -222,6 +222,11 @@ struct extend_converter
         extender_.start();
     }
 
+    unsigned type() const
+    {
+        return static_cast<unsigned>(geom_.type());
+    }
+
 private:
     Geometry & geom_;
     detail::extender extender_;

include/mapnik/geometry_cref.hpp

@@ -0,0 +1,105 @@
+/*****************************************************************************
+ *
+ * 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_CREF_HPP
+#define MAPNIK_GEOMETRY_CREF_HPP
+
+#include <mapnik/geometry.hpp>
+#include <mapnik/geometry_type.hpp>
+#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/box2d.hpp>
+
+#include <functional>
+
+namespace mapnik { namespace geometry {
+
+template <typename T>
+struct cref_geometry
+{
+    using empty_type = std::reference_wrapper<geometry_empty const>;
+    using point_type = std::reference_wrapper<point<T> const>;
+    using line_string_type = std::reference_wrapper<line_string<T> const>;
+    using polygon_type = std::reference_wrapper<polygon<T> const>;
+    using multi_point_type = std::reference_wrapper<multi_point<T> const>;
+    using multi_line_string_type = std::reference_wrapper<multi_line_string<T> const>;
+    using multi_polygon_type = std::reference_wrapper<multi_polygon<T> const>;
+    using collection_type = std::reference_wrapper<geometry_collection<T> const>;
+    using geometry_type = util::variant<
+        empty_type,
+        point_type,
+        line_string_type,
+        polygon_type,
+        multi_point_type,
+        multi_line_string_type,
+        multi_polygon_type,
+        collection_type>;
+};
+
+template <typename T>
+struct cref_geometry_cast
+{
+    using geometry_type = typename cref_geometry<T>::geometry_type;
+
+    template <typename Geometry>
+    geometry_type operator() (Geometry const& geom) const
+    {
+        return std::cref(geom);
+    }
+};
+
+template <typename Geom, typename T = double>
+inline typename cref_geometry<T>::geometry_type to_cref(Geom const & geom)
+{
+    cref_geometry_cast<T> visitor;
+    return util::apply_visitor(visitor, geom);
+}
+
+struct envelope_impl
+{
+    box2d<double> operator() (geometry_empty const& ref) const
+    {
+        return box2d<double>();
+    }
+
+    template <typename T>
+    box2d<double> operator() (T const& ref) const
+    {
+        return envelope<T>(ref);
+    }
+};
+
+mapnik::box2d<double> envelope(cref_geometry<double>::geometry_type const& geom);
+
+struct geometry_type_impl
+{
+    template <typename T>
+    auto operator() (T const& ref) const -> decltype(geometry_type<T>(ref))
+    {
+        return geometry_type<T>(ref);
+    }
+};
+
+mapnik::geometry::geometry_types geometry_type(cref_geometry<double>::geometry_type const& geom);
+
+} }
+
+#endif // MAPNIK_GEOMETRY_CREF_HPP

include/mapnik/geometry_split_multi.hpp

@@ -0,0 +1,98 @@
+/*****************************************************************************
+ *
+ * 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_SPLIT_MULTI_HPP
+#define MAPNIK_GEOMETRY_SPLIT_MULTI_HPP
+
+#include <mapnik/geometry_cref.hpp>
+
+namespace mapnik { namespace geometry {
+
+template <typename T, typename Container>
+struct split_multi_geometries
+{
+    using geometry_type = typename cref_geometry<T>::geometry_type;
+
+    split_multi_geometries(Container & cont)
+        : cont_(cont) { }
+
+    void operator() (geometry_empty const&) const {}
+    void operator() (multi_point<T> const& multi_pt) const
+    {
+        for (auto const& pt : multi_pt)
+        {
+            cont_.emplace_back(std::cref(pt));
+        }
+    }
+    void operator() (line_string<T> const& line) const
+    {
+        cont_.emplace_back(std::cref(line));
+    }
+
+    void operator() (multi_line_string<T> const& multi_line) const
+    {
+        for (auto const& line : multi_line)
+        {
+            (*this)(line);
+        }
+    }
+
+    void operator() (polygon<T> const& poly) const
+    {
+        cont_.emplace_back(std::cref(poly));
+    }
+
+    void operator() (multi_polygon<T> const& multi_poly) const
+    {
+        for (auto const& poly : multi_poly)
+        {
+            (*this)(poly);
+        }
+    }
+
+    void operator() (geometry_collection<T> const& collection) const
+    {
+        for (auto const& geom : collection)
+        {
+            util::apply_visitor(*this, geom);
+        }
+    }
+
+    template <typename Geometry>
+    void operator() (Geometry const& geom) const
+    {
+        cont_.emplace_back(std::cref(geom));
+    }
+
+    Container & cont_;
+};
+
+template <typename Geom, typename Container, typename T = double>
+inline void split(Geom const & geom, Container & container)
+{
+    split_multi_geometries<T, Container> visitor(container);
+    util::apply_visitor(visitor, geom);
+}
+
+}}
+
+#endif // MAPNIK_GEOMETRY_SPLIT_MULTI_HPP

include/mapnik/grid/grid_renderer.hpp

@@ -119,6 +119,12 @@ class MAPNIK_DECL grid_renderer : public feature_style_processor<grid_renderer<T
         return false;
     }
 
+    template <typename Sym>
+    void process_marker(
+        Sym const& sym,
+        mapnik::feature_impl & feature,
+        proj_transform const& prj_trans);
+
     bool painted()
     {
         return pixmap_.painted();