add collision symbolizer

talaj · talaj · commit 7d369473fe5b · 2017-01-27T12:08:42.000Z
diff --git a/include/mapnik/agg_renderer.hpp b/include/mapnik/agg_renderer.hpp
@@ -173,6 +173,9 @@ class MAPNIK_DECL agg_renderer : public feature_style_processor<agg_renderer<T0>
     void process(dot_symbolizer const& sym,
                  mapnik::feature_impl & feature,
                  proj_transform const& prj_trans);
+    void process(collision_symbolizer const& sym,
+                 mapnik::feature_impl & feature,
+                 proj_transform const& prj_trans);
 
     inline bool process(rule::symbolizers const&,
                         mapnik::feature_impl&,
diff --git a/include/mapnik/cairo/cairo_renderer.hpp b/include/mapnik/cairo/cairo_renderer.hpp
@@ -129,6 +129,9 @@ class MAPNIK_DECL cairo_renderer : public feature_style_processor<cairo_renderer
     void process(group_symbolizer const& sym,
                  mapnik::feature_impl & feature,
                  proj_transform const& prj_trans);
+    void process(collision_symbolizer const& sym,
+                 mapnik::feature_impl & feature,
+                 proj_transform const& prj_trans);
     void process(debug_symbolizer const& sym,
                  mapnik::feature_impl & feature,
                  proj_transform const& prj_trans);
diff --git a/include/mapnik/grid/grid_renderer.hpp b/include/mapnik/grid/grid_renderer.hpp
@@ -111,6 +111,9 @@ class MAPNIK_DECL grid_renderer : public feature_style_processor<grid_renderer<T
     void process(group_symbolizer const& sym,
                  mapnik::feature_impl & feature,
                  proj_transform const& prj_trans);
+    void process(collision_symbolizer const& sym,
+                 mapnik::feature_impl & feature,
+                 proj_transform const& prj_trans);
     inline bool process(rule::symbolizers const& /*syms*/,
                         mapnik::feature_impl & /*feature*/,
                         proj_transform const& /*prj_trans*/)
diff --git a/include/mapnik/grid_vertex_adapter.hpp b/include/mapnik/grid_vertex_adapter.hpp
@@ -23,13 +23,12 @@
 #ifndef MAPNIK_GRID_ADAPTERS_HPP
 #define MAPNIK_GRID_ADAPTERS_HPP
 
-// mapnik
 #include <mapnik/vertex.hpp>
 #include <mapnik/image.hpp>
 #include <mapnik/image_util.hpp>
 #include <mapnik/geom_util.hpp>
+#include <mapnik/view_transform.hpp>
 
-// agg
 #include "agg_rendering_buffer.h"
 #include "agg_pixfmt_gray.h"
 #include "agg_renderer_base.h"
diff --git a/include/mapnik/label_placement.hpp b/include/mapnik/label_placement.hpp
@@ -32,7 +32,6 @@ namespace mapnik { namespace label_placement {
 template <typename T>
 struct finder
 {
-    using placements_type = typename T::placements_type;
     using layout_generator_type = typename T::layout_generator_type;
 
     struct dispatch
diff --git a/include/mapnik/label_placements/base.hpp b/include/mapnik/label_placements/base.hpp
@@ -28,6 +28,7 @@
 #include <mapnik/symbolizer.hpp>
 #include <mapnik/geometry_split_multi.hpp>
 #include <mapnik/view_transform.hpp>
+#include <mapnik/pixel_position.hpp>
 
 #include <list>
 
diff --git a/include/mapnik/label_placements/interior_geometry_visitor.hpp b/include/mapnik/label_placements/interior_geometry_visitor.hpp
@@ -22,6 +22,9 @@
 #ifndef MAPNIK_LABEL_PLACEMENT_INTERIOR_GEOMETRY_VISITOR_HPP
 #define MAPNIK_LABEL_PLACEMENT_INTERIOR_GEOMETRY_VISITOR_HPP
 
+#include <mapnik/vertex_adapters.hpp>
+#include <mapnik/geom_util.hpp>
+
 namespace mapnik { namespace label_placement {
 
 struct interior_geometry_visitor
diff --git a/include/mapnik/label_placements/point_geometry_visitor.hpp b/include/mapnik/label_placements/point_geometry_visitor.hpp
@@ -23,6 +23,8 @@
 #define MAPNIK_LABEL_PLACEMENT_POINT_GEOMETRY_VISITOR_HPP
 
 #include <mapnik/geometry_centroid.hpp>
+#include <mapnik/vertex_adapters.hpp>
+#include <mapnik/geom_util.hpp>
 
 namespace mapnik { namespace label_placement {
 
diff --git a/include/mapnik/marker_layout.hpp b/include/mapnik/marker_layout.hpp
@@ -77,4 +77,5 @@ class marker_layout : util::noncopyable
 };
 
 } //namespace
+
 #endif // MAPNIK_MARKER_LAYOUT_HPP
diff --git a/include/mapnik/marker_line_layout.hpp b/include/mapnik/marker_line_layout.hpp
@@ -61,8 +61,7 @@ class marker_line_layout : line_layout<SubLayout>
 
         double layout_width = this->sublayout_.get_length(layout_generator);
         vertex_cache path(geom);
-        marker_line_policy policy(path, layout_generator,
-            layout_width, spacing_, position_tolerance_, this->params_);
+        marker_line_policy policy(path, layout_width, spacing_, position_tolerance_);
         return line_layout<SubLayout>::try_placement(
             layout_generator, path, policy);
     }
diff --git a/include/mapnik/marker_line_policy.hpp b/include/mapnik/marker_line_policy.hpp
@@ -33,13 +33,10 @@ struct marker_line_policy
 
     marker_line_policy(
         vertex_cache & path,
-        marker_layout_generator const & lg,
         double layout_width,
         double spacing,
-        double position_tolerance,
-        params_type const & params)
+        double position_tolerance)
         : path_(path),
-          params_(params),
           layout_width_(layout_width),
           spacing_(spacing),
           position_tolerance_(position_tolerance)
@@ -73,7 +70,6 @@ struct marker_line_policy
     }
 
     vertex_cache & path_;
-    params_type const & params_;
     const double layout_width_;
     const double spacing_;
     const double position_tolerance_;
diff --git a/include/mapnik/renderer_common/process_collision_symbolizer.hpp b/include/mapnik/renderer_common/process_collision_symbolizer.hpp
@@ -0,0 +1,200 @@
+/*****************************************************************************
+ *
+ * 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_RENDERER_COMMON_PROCESS_COLLISION_SYMBOLIZER_HPP
+#define MAPNIK_RENDERER_COMMON_PROCESS_COLLISION_SYMBOLIZER_HPP
+
+#include <mapnik/renderer_common.hpp>
+#include <mapnik/text/line_layout.hpp>
+#include <mapnik/marker_grid_layout.hpp>
+#include <mapnik/grid_vertex_adapter.hpp>
+#include <mapnik/label_placement.hpp>
+#include <mapnik/label_placements/vertex_converter.hpp>
+#include <mapnik/label_placements/vertex_first_layout.hpp>
+#include <mapnik/label_placements/vertex_last_layout.hpp>
+#include <mapnik/label_placements/vertex_layout.hpp>
+#include <mapnik/label_placements/split_multi.hpp>
+#include <mapnik/label_placements/text_layout_iterator.hpp>
+#include <mapnik/label_placements/geom_iterator.hpp>
+#include <mapnik/label_placements/point_layout.hpp>
+#include <mapnik/label_placements/point_geometry_visitor.hpp>
+#include <mapnik/label_placements/interior_geometry_visitor.hpp>
+#include <mapnik/marker_line_policy.hpp>
+
+namespace mapnik {
+
+namespace collision {
+
+struct layout_generator : util::noncopyable
+{
+    using params_type = label_placement::placement_params;
+    using detector_type = keyed_collision_cache<label_collision_detector4>;
+
+    layout_generator(
+        params_type const & params,
+        detector_type & detector)
+        : multi_policy_(params.get<multi_policy_enum, keys::multipolicy>()),
+          detector_(detector)
+    {
+    }
+
+    inline multi_policy_enum multi_policy() const
+    {
+        return multi_policy_;
+    }
+
+    const multi_policy_enum multi_policy_;
+    detector_type & detector_;
+};
+
+class point_layout : util::noncopyable
+{
+public:
+    using box_type = box2d<double>;
+    using params_type = label_placement::placement_params;
+    using layout_generator_type = layout_generator;
+    using detector_type = layout_generator_type::detector_type;
+
+    point_layout(params_type const & params);
+
+    bool try_placement(
+        layout_generator_type & lg,
+        pixel_position const& pos);
+
+    inline bool try_placement(
+        layout_generator_type & lg,
+        point_position const& pos)
+    {
+        return try_placement(lg, pos.coords);
+    }
+
+    inline bool try_placement(
+        layout_generator_type & lg,
+        vertex_cache & path)
+    {
+        return try_placement(lg, path.current_position());
+    }
+
+    inline double get_length(layout_generator_type const &) const
+    {
+        return 0;
+    }
+
+protected:
+    const box2d<double> size_;
+    const value_bool allow_overlap_;
+    const std::vector<std::string> collision_cache_insert_;
+    const std::vector<std::string> collision_cache_detect_;
+};
+
+template <typename SubLayout>
+class line_layout : mapnik::line_layout<SubLayout>
+{
+public:
+    using params_type = label_placement::placement_params;
+
+    line_layout(params_type const & params)
+        : mapnik::line_layout<SubLayout>(params),
+          spacing_(get_spacing())
+    {
+    }
+
+    template <typename LayoutGenerator, typename Geom>
+    bool try_placement(
+        LayoutGenerator & layout_generator,
+        Geom & geom)
+    {
+        vertex_cache path(geom);
+        marker_line_policy policy(path, 0, spacing_, 0);
+        return mapnik::line_layout<SubLayout>::try_placement(
+            layout_generator, path, policy);
+    }
+
+protected:
+    double get_spacing()
+    {
+        double spacing = this->params_.get<value_double, keys::spacing>() *
+            this->params_.scale_factor;
+        return spacing < 1 ? 1 : spacing;
+    }
+
+    const double spacing_;
+};
+
+}
+
+namespace label_placement {
+
+struct collision_symbolizer_traits
+{
+    using point = split_multi<
+        point_layout<point_geometry_visitor,
+            geom_iterator<
+                collision::point_layout>>>;
+    using interior = split_multi<
+        point_layout<interior_geometry_visitor,
+            geom_iterator<
+                collision::point_layout>>>;
+    using vertex = split_multi<
+        geom_iterator<
+            vertex_layout<
+                collision::point_layout>>>;
+    using grid = split_multi<
+        geom_iterator<
+            vertex_converter<
+                marker_grid_layout<geometry::grid_vertex_adapter,
+                    collision::point_layout>>>>;
+    using alternating_grid = split_multi<
+        geom_iterator<
+            vertex_converter<
+                marker_grid_layout<geometry::alternating_grid_vertex_adapter,
+                    collision::point_layout>>>>;
+    using line = split_multi<
+        geom_iterator<
+            vertex_converter<
+                collision::line_layout<
+                    collision::point_layout>>>>;
+    using vertex_first = split_multi<
+        geom_iterator<
+            vertex_converter<
+                vertex_first_layout<
+                    collision::point_layout>>>>;
+    using vertex_last = split_multi<
+        geom_iterator<
+            vertex_converter<
+                vertex_last_layout<
+                    collision::point_layout>>>>;
+
+    using layout_generator_type = collision::layout_generator;
+};
+
+}
+
+void process_collision_symbolizer(
+    collision_symbolizer const & sym,
+    mapnik::feature_impl & feature,
+    proj_transform const & prj_trans,
+    renderer_common & common);
+
+} // namespace mapnik
+
+#endif // MAPNIK_RENDERER_COMMON_PROCESS_COLLISION_SYMBOLIZER_HPP
diff --git a/include/mapnik/symbolizer_base.hpp b/include/mapnik/symbolizer_base.hpp
@@ -150,6 +150,7 @@ struct MAPNIK_DECL building_symbolizer : public symbolizer_base {};
 struct MAPNIK_DECL group_symbolizer : public symbolizer_base {};
 struct MAPNIK_DECL debug_symbolizer : public symbolizer_base {};
 struct MAPNIK_DECL dot_symbolizer : public symbolizer_base {};
+struct MAPNIK_DECL collision_symbolizer : public symbolizer_base {};
 
 // symbolizer
 using symbolizer = util::variant<point_symbolizer,
@@ -164,7 +165,8 @@ using symbolizer = util::variant<point_symbolizer,
                                  markers_symbolizer,
                                  group_symbolizer,
                                  debug_symbolizer,
-                                 dot_symbolizer>;
+                                 dot_symbolizer,
+                                 collision_symbolizer>;
 
 }
 
diff --git a/include/mapnik/symbolizer_utils.hpp b/include/mapnik/symbolizer_utils.hpp
@@ -126,6 +126,12 @@ struct symbolizer_traits<dot_symbolizer>
     static char const* name() { return "DotSymbolizer";}
 };
 
+template<>
+struct symbolizer_traits<collision_symbolizer>
+{
+    static char const* name() { return "CollisionSymbolizer";}
+};
+
 // symbolizer name impl
 namespace detail {
 
diff --git a/include/mapnik/text/line_layout.hpp b/include/mapnik/text/line_layout.hpp
@@ -22,7 +22,6 @@
 #ifndef LINE_LAYOUT_HPP
 #define LINE_LAYOUT_HPP
 
-//mapnik
 #include <mapnik/box2d.hpp>
 #include <mapnik/pixel_position.hpp>
 #include <mapnik/text/text_layout.hpp>
diff --git a/src/agg/process_collision_symbolizer.cpp b/src/agg/process_collision_symbolizer.cpp
diff --git a/src/build.py b/src/build.py
diff --git a/src/cairo/process_collision_symbolizer.cpp b/src/cairo/process_collision_symbolizer.cpp
diff --git a/src/grid/process_collision_symbolizer.cpp b/src/grid/process_collision_symbolizer.cpp
diff --git a/src/load_map.cpp b/src/load_map.cpp
diff --git a/src/renderer_common/process_collision_symbolizer.cpp b/src/renderer_common/process_collision_symbolizer.cpp

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ namespace mapnik { namespace label_placement {`
`32`	`32`	`template <typename T>`
`33`	`33`	`struct finder`
`34`	`34`	`{`
`35`		`- using placements_type = typename T::placements_type;`
`36`	`35`	`using layout_generator_type = typename T::layout_generator_type;`
`37`	`36`
`38`	`37`	`struct dispatch`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,7 @@ class marker_line_layout : line_layout<SubLayout>`
`61`	`61`
`62`	`62`	`double layout_width = this->sublayout_.get_length(layout_generator);`
`63`	`63`	`vertex_cache path(geom);`
`64`		`- marker_line_policy policy(path, layout_generator,`
`65`		`- layout_width, spacing_, position_tolerance_, this->params_);`
	`64`	`+ marker_line_policy policy(path, layout_width, spacing_, position_tolerance_);`
`66`	`65`	`return line_layout<SubLayout>::try_placement(`
`67`	`66`	`layout_generator, path, policy);`
`68`	`67`	`}`