From f1cffaeb1fc2bafe74ce352ecc53c365ec9a0b2c Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Wed, 30 Jul 2014 21:57:16 -0700
Subject: [PATCH] Start fixing placement of raster markers with cairo renderer

---
 src/cairo/cairo_renderer.cpp                  |  28 ++++++++----------
 ...ssions-all-256-256-1.0-cairo-reference.png | Bin 2137 -> 2881 bytes
 ...ssions-all-256-256-2.0-cairo-reference.png | Bin 774 -> 4293 bytes
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/cairo/cairo_renderer.cpp b/src/cairo/cairo_renderer.cpp
index 8befa09a0..41d5eab85 100644
--- a/src/cairo/cairo_renderer.cpp
+++ b/src/cairo/cairo_renderer.cpp
@@ -50,7 +50,7 @@
 #include <mapnik/warp.hpp>
 #include <mapnik/config.hpp>
 #include <mapnik/vertex_converters.hpp>
-#include <mapnik/marker_helpers.hpp>
+#include <mapnik/marker_helpers.hpp> // todo - only need some of this expensive header
 #include <mapnik/noncopyable.hpp>
 #include <mapnik/pixel_position.hpp>
 #include <mapnik/feature_factory.hpp>
@@ -839,10 +839,10 @@ struct markers_dispatch : mapnik::noncopyable
     cairo_context & ctx_;
 };
 
-template <typename RendererContext, typename ImageMarker, typename Detector>
+template <typename RendererContext, typename Detector>
 struct raster_markers_dispatch : mapnik::noncopyable
 {
-    raster_markers_dispatch(ImageMarker & marker,
+    raster_markers_dispatch(mapnik::image_data_32 & src,
                        agg::trans_affine const& marker_trans,
                        markers_symbolizer const& sym,
                        Detector & detector,
@@ -850,10 +850,9 @@ struct raster_markers_dispatch : mapnik::noncopyable
                        feature_impl const& feature,
                        mapnik::attributes const& vars,
                        RendererContext const& renderer_context)
-        :marker_(marker),
+        : src_(src),
         detector_(detector),
         sym_(sym),
-        bbox_(std::get<1>(renderer_context)),
         marker_trans_(marker_trans),
         scale_factor_(scale_factor),
         feature_(feature),
@@ -869,6 +868,7 @@ struct raster_markers_dispatch : mapnik::noncopyable
         double max_error = get<double>(sym_, keys::max_error, feature_, vars_,  0.2);
         bool allow_overlap = get<bool>(sym_, keys::allow_overlap, feature_, vars_,  false);
         bool ignore_placement = get<bool>(sym_, keys::ignore_placement, feature_, vars_,  false);
+        box2d<double> bbox_(0,0, src_.width(),src_.height());
         markers_placement_finder<T, label_collision_detector4> placement_finder(
             placement_method,
             path,
@@ -881,20 +881,16 @@ struct raster_markers_dispatch : mapnik::noncopyable
         double x, y, angle = .0;
         while (placement_finder.get_point(x, y, angle, ignore_placement))
         {
-            coord2d center = bbox_.center();
-            agg::trans_affine matrix = agg::trans_affine_translation(
-                -center.x, -center.y);
-            matrix *= marker_trans_;
-            matrix *= agg::trans_affine_rotation(angle);
-            matrix *= agg::trans_affine_translation(x, y);
-            ctx_.add_image(matrix, marker_, opacity);
+            agg::trans_affine matrix = marker_trans_;
+            matrix.rotate(angle);
+            matrix.translate(x, y);
+            ctx_.add_image(matrix, src_, opacity);
         }
     }
 
-    ImageMarker & marker_;
+    image_data_32 & src_;
     Detector & detector_;
     markers_symbolizer const& sym_;
-    box2d<double> const& bbox_;
     agg::trans_affine const& marker_trans_;
     double scale_factor_;
     feature_impl const& feature_;
@@ -914,14 +910,14 @@ void cairo_renderer_base::process(markers_symbolizer const& sym,
     context_.set_operator(comp_op);
     box2d<double> clip_box = common_.query_extent_;
 
-    auto renderer_context = std::tie(context_, clip_box);
+    auto renderer_context = std::tie(context_);
 
     using RendererContextType = decltype(renderer_context);
     using vector_dispatch_type = detail::markers_dispatch<RendererContextType,
                                                           svg::path_adapter<svg::vertex_stl_adapter<svg::svg_path_storage> >,
                                                           svg_attribute_type,label_collision_detector4>;
 
-    using raster_dispatch_type = detail::raster_markers_dispatch<RendererContextType, mapnik::image_data_32,
+    using raster_dispatch_type = detail::raster_markers_dispatch<RendererContextType,
                                                                  label_collision_detector4>;
 
 
diff --git a/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-1.0-cairo-reference.png b/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-1.0-cairo-reference.png
index 3cdbd4c9c23f2ee3331a73b098ac5f32703b7274..eb8cb98f1a9013808d63f5af54bebab9094053ea 100644
GIT binary patch
literal 2881
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

literal 2137
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

diff --git a/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-2.0-cairo-reference.png b/tests/visual_tests/images/marker-symbolizer-expressions-all-256-256-2.0-cairo-reference.png
index 3576689e5b06c5edfd013ece3ce9e8b014cc11f5..a16bd411469aea781afb7e40ee15bb3c87290881 100644
GIT binary patch
literal 4293
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
Ks+Or(hx`i**0=Ql

literal 774
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Flk1;1lA?!0?}i<u^O~KOv!a
zA|mf?Y!17)><$WAo0&PSrlz@}p`p9GJ1p#HLBaR>`fq2?ez<%0{kwPXHtN}>FfcH6
zd%8G=RLpsM{jA?@2L`u`nk_S?&2RZ$e{)i3a^h9(nwHx4MNd59`{sBU+wtAIz+A%k
zf^iqa7lv4dss=p<TL<w5xdq$~{1;dku)km;L0X?Z|Bqz_l?<cIDML>8YliceO>FZw
zux#Zsm@6lLe!uyQq$qZa|5A@N8+ez^V2Y?!YG7dEP-tK<n~}to@U@ef>CU_Q|5d+O
zEYA9sm72@w$ItfrZrfuhm!|%__57b3$BtjWmw*4K{a)RgXUD}39J=}R>%Plx?GwsA
z?fZEuKZo-{)z0^CKi5{wof~5w|Fc(@@yzbO3T0m}o#zG`4z($w31kxklZC~B)co)J
rD_=8Q-+TA}v$f1`_7Im`-s$VUmQ?+__T7G9!e;Pv^>bP0l+XkKqoyVB