From 2e76ff1958de5ead81208559c8666377f0927dda Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Mon, 2 Apr 2012 11:57:24 -0700
Subject: [PATCH 01/50] make stroke property on line_symbolizer a reference
 when accessed from python (not a copy)

---
 bindings/python/mapnik_line_symbolizer.cpp | 2 +-
 tests/python_tests/object_test.py          | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/bindings/python/mapnik_line_symbolizer.cpp b/bindings/python/mapnik_line_symbolizer.cpp
index 9c7053b90..7ce8d5dc7 100644
--- a/bindings/python/mapnik_line_symbolizer.cpp
+++ b/bindings/python/mapnik_line_symbolizer.cpp
@@ -60,7 +60,7 @@ void export_line_symbolizer()
                       "Set/get the rasterization method of the line of the point")
         .add_property("stroke",make_function
                       (&line_symbolizer::get_stroke,
-                       return_value_policy<copy_const_reference>()),
+                       return_value_policy<reference_existing_object>()),
                       &line_symbolizer::set_stroke)
         .add_property("smooth",
                       &line_symbolizer::smooth,
diff --git a/tests/python_tests/object_test.py b/tests/python_tests/object_test.py
index cf0920d55..9bcfc0cad 100644
--- a/tests/python_tests/object_test.py
+++ b/tests/python_tests/object_test.py
@@ -21,6 +21,15 @@ def test_line_symbolizer_init():
     s = mapnik.LineSymbolizer()
     eq_(s.rasterizer, mapnik.line_rasterizer.FULL)
 
+def test_line_symbolizer_stroke_reference():
+    l = mapnik.LineSymbolizer(mapnik.Color('green'),0.1)
+    l.stroke.add_dash(.1,.1)
+    l.stroke.add_dash(.1,.1)
+    eq_(l.stroke.get_dashes(), [(.1,.1),(.1,.1)])
+    eq_(l.stroke.color,mapnik.Color('green'))
+    eq_(l.stroke.opacity,1.0)
+    assert_almost_equal(l.stroke.width,0.1)
+
 # ShieldSymbolizer initialization
 def test_shieldsymbolizer_init():
     s = mapnik.ShieldSymbolizer(mapnik.Expression('[Field Name]'), 'DejaVu Sans Bold', 6, mapnik.Color('#000000'), mapnik.PathExpression('../data/images/dummy.png'))

From 8931509adce1a5e2753f80e503a484f335d81b27 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 30 Jul 2012 18:31:15 +0100
Subject: [PATCH 02/50] + move middle_point into label namespace

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

diff --git a/include/mapnik/geom_util.hpp b/include/mapnik/geom_util.hpp
index 31432aa33..c3dda724b 100644
--- a/include/mapnik/geom_util.hpp
+++ b/include/mapnik/geom_util.hpp
@@ -241,6 +241,8 @@ double path_length(PathType & path)
     return length;
 }
 
+namespace label {
+
 template <typename PathType>
 bool middle_point(PathType & path, double & x, double & y)
 {
@@ -271,8 +273,6 @@ bool middle_point(PathType & path, double & x, double & y)
     return true;
 }
 
-namespace label {
-
 template <typename PathType>
 bool centroid(PathType & path, double & x, double & y)
 {

From 822531a114a82090284139716706270c7b4a2949 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 30 Jul 2012 18:32:42 +0100
Subject: [PATCH 03/50] + filter on geometry type to use centroid (Polygon) or 
  middle_point (LineString) label placement

---
 src/symbolizer_helpers.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/symbolizer_helpers.cpp b/src/symbolizer_helpers.cpp
index 1cf014bb9..85a917787 100644
--- a/src/symbolizer_helpers.cpp
+++ b/src/symbolizer_helpers.cpp
@@ -244,7 +244,14 @@ void text_symbolizer_helper<FaceManagerT, DetectorT>::initialize_points()
         {
             if (how_placed == POINT_PLACEMENT)
             {
-                label::centroid(geom, label_x, label_y);
+                if (geom.type() == Polygon)
+                {
+                    label::centroid(geom, label_x, label_y);
+                }
+                else if (geom.type() == LineString)
+                {
+                    label::middle_point(geom, label_x,label_y);
+                }
             }
             else if (how_placed == INTERIOR_PLACEMENT)
             {

From ce7b6a93fbd5594c061d50a31d8222fabc567a1e Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Mon, 30 Jul 2012 14:48:32 -0700
Subject: [PATCH 04/50] Add test case for #1354

---
 .../good_maps/text_halo_and_collision.xml     | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 tests/data/good_maps/text_halo_and_collision.xml

diff --git a/tests/data/good_maps/text_halo_and_collision.xml b/tests/data/good_maps/text_halo_and_collision.xml
new file mode 100644
index 000000000..d7155566d
--- /dev/null
+++ b/tests/data/good_maps/text_halo_and_collision.xml
@@ -0,0 +1,53 @@
+<Map srs="+init=epsg:4326" background-color="steelblue">
+
+<! -- test case for https://github.com/mapnik/mapnik/issues/1354 -->
+
+    <Style name="labels">
+        <Rule>
+            <TextSymbolizer 
+              face-name="DejaVu Sans Book"
+              size="22"
+              halo-radius="10"
+              placement="point"
+              allow-overlap="false">
+                'this text halos should not overlap vertically'
+              </TextSymbolizer>
+        </Rule>
+    </Style>
+
+
+    <Layer name="points" srs="+init=epsg:4326">
+        <StyleName>labels</StyleName>
+        <Datasource>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="inline">
+x,y
+2,2
+2,2.3
+            </Parameter>
+        </Datasource>
+    </Layer>
+
+    <!-- points to frame data view -->
+
+    <Style name="frame">
+        <Rule>
+            <PointSymbolizer />
+        </Rule>
+    </Style>
+
+    <Layer name="frame" srs="+init=epsg:4326">
+        <StyleName>frame</StyleName>
+        <Datasource>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="inline">
+x,y
+0,0
+5,0
+0,5
+5,5
+            </Parameter>
+        </Datasource>
+    </Layer>
+    
+</Map>
\ No newline at end of file

From 1a6cbfb568325c62c11b2f20e4c39ae9644acee3 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Mon, 30 Jul 2012 15:54:08 -0700
Subject: [PATCH 05/50] fix xml comment

---
 tests/data/good_maps/text_halo_and_collision.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/data/good_maps/text_halo_and_collision.xml b/tests/data/good_maps/text_halo_and_collision.xml
index d7155566d..b44b3e2dd 100644
--- a/tests/data/good_maps/text_halo_and_collision.xml
+++ b/tests/data/good_maps/text_halo_and_collision.xml
@@ -1,6 +1,5 @@
 <Map srs="+init=epsg:4326" background-color="steelblue">
-
-<! -- test case for https://github.com/mapnik/mapnik/issues/1354 -->
+<!-- test case for https://github.com/mapnik/mapnik/issues/1354 -->
 
     <Style name="labels">
         <Rule>

From e6e7b4c700a4966690ffcc1857b3934801c6d7f8 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Mon, 30 Jul 2012 16:37:34 -0700
Subject: [PATCH 06/50] svg2png: inflate the rendering canvas to avoid edge
 affect for 100% w/h svgs

---
 utils/svg2png/svg2png.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/utils/svg2png/svg2png.cpp b/utils/svg2png/svg2png.cpp
index 2c9113b08..83a4b695e 100644
--- a/utils/svg2png/svg2png.cpp
+++ b/utils/svg2png/svg2png.cpp
@@ -155,8 +155,9 @@ int main (int argc,char** argv)
             {
                 std::clog << "found width of '" << w << "' and height of '" << h << "'\n";
             }
-            mapnik::image_32 im(w,h);
-            agg::rendering_buffer buf(im.raw_data(), w, h, w * 4);
+            // 10 pixel buffer to avoid edge clipping of 100% svg's
+            mapnik::image_32 im(w+10,h+10);
+            agg::rendering_buffer buf(im.raw_data(), im.width(), im.height(), im.width() * 4);
             pixfmt pixf(buf);
             renderer_base renb(pixf);
 
@@ -165,7 +166,7 @@ int main (int argc,char** argv)
             // center the svg marker on '0,0'
             agg::trans_affine mtx = agg::trans_affine_translation(-c.x,-c.y);
             // render the marker at the center of the marker box
-            mtx.translate(0.5 * w, 0.5 * h);
+            mtx.translate(0.5 * im.width(), 0.5 * im.height());
 
             mapnik::svg::vertex_stl_adapter<mapnik::svg::svg_path_storage> stl_storage((*marker.get_vector_data())->source());
             mapnik::svg::svg_path_adapter svg_path(stl_storage);

From 6f174287a2d2b32e8fd799d7f4a6979e7f2c71b8 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Mon, 30 Jul 2012 18:29:26 -0700
Subject: [PATCH 07/50] amend 822531a which broke polygon geometry labeling -
 refs #1350

---
 src/symbolizer_helpers.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/symbolizer_helpers.cpp b/src/symbolizer_helpers.cpp
index 85a917787..e1dcc79f7 100644
--- a/src/symbolizer_helpers.cpp
+++ b/src/symbolizer_helpers.cpp
@@ -242,16 +242,13 @@ void text_symbolizer_helper<FaceManagerT, DetectorT>::initialize_points()
         }
         else
         {
-            if (how_placed == POINT_PLACEMENT)
+            if (geom.type() == LineString)
             {
-                if (geom.type() == Polygon)
-                {
-                    label::centroid(geom, label_x, label_y);
-                }
-                else if (geom.type() == LineString)
-                {
-                    label::middle_point(geom, label_x,label_y);
-                }
+                label::middle_point(geom, label_x,label_y);
+            }
+            else if (how_placed == POINT_PLACEMENT)
+            {
+                label::centroid(geom, label_x, label_y);
             }
             else if (how_placed == INTERIOR_PLACEMENT)
             {

From 0d97b851fa5df1a866dcf494d0af753ca61106a1 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Mon, 30 Jul 2012 18:31:21 -0700
Subject: [PATCH 08/50] markers: support opacity on bitmaps, and move to
 supporting both opacity and fill-opacity

---
 CHANGELOG.md                                  |  4 ++
 bindings/python/mapnik_markers_symbolizer.cpp |  7 ++-
 bindings/python/mapnik_python.cpp             |  1 +
 include/mapnik/marker_helpers.hpp             | 50 +++++++++++++++----
 include/mapnik/markers_symbolizer.hpp         |  6 +++
 src/agg/process_markers_symbolizer.cpp        | 27 ++++++----
 src/cairo_renderer.cpp                        |  4 +-
 src/grid/process_markers_symbolizer.cpp       |  6 +--
 src/load_map.cpp                              |  4 ++
 src/markers_symbolizer.cpp                    | 22 ++++++++
 src/save_map.cpp                              |  4 ++
 tests/data/svg/octocat.svg                    | 17 +++++++
 tests/python_tests/object_test.py             |  5 +-
 13 files changed, 130 insertions(+), 27 deletions(-)
 create mode 100644 tests/data/svg/octocat.svg

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a8a48d2c..f6fce3b26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ For a complete change history, see the git log.
 
 Not yet released
 
+- Added support for overriding fill, stroke, and opacity for svg markers using marker properties
+
+- Added support for setting opacity dynamically on images in polygon pattern and markers symbolizers
+
 - Added support for filtering on a features geometry type, either `point`, `linestring`, 'polygon`,
   or `collection` using the expression keyword of `[mapnik::geometry_type]` (#546)
 
diff --git a/bindings/python/mapnik_markers_symbolizer.cpp b/bindings/python/mapnik_markers_symbolizer.cpp
index 698569378..9613e7476 100644
--- a/bindings/python/mapnik_markers_symbolizer.cpp
+++ b/bindings/python/mapnik_markers_symbolizer.cpp
@@ -86,7 +86,6 @@ struct markers_symbolizer_pickle_suite : boost::python::pickle_suite
 
 };
 
-
 void export_markers_symbolizer()
 {
     using namespace boost::python;
@@ -115,7 +114,11 @@ void export_markers_symbolizer()
         .add_property("opacity",
                       &markers_symbolizer::get_opacity,
                       &markers_symbolizer::set_opacity,
-                      "Set/get the text opacity")
+                      "Set/get the overall opacity")
+        .add_property("fill_opacity",
+                      &markers_symbolizer::get_fill_opacity,
+                      &markers_symbolizer::set_fill_opacity,
+                      "Set/get the fill opacity")
         .add_property("ignore_placement",
                       &markers_symbolizer::get_ignore_placement,
                       &markers_symbolizer::set_ignore_placement)
diff --git a/bindings/python/mapnik_python.cpp b/bindings/python/mapnik_python.cpp
index b86a7e33d..883946427 100644
--- a/bindings/python/mapnik_python.cpp
+++ b/bindings/python/mapnik_python.cpp
@@ -614,6 +614,7 @@ BOOST_PYTHON_MODULE(_mapnik)
     python_optional<std::string>();
     python_optional<unsigned>();
     python_optional<double>();
+    python_optional<float>();
     python_optional<bool>();
     python_optional<mapnik::text_transform_e>();
     register_ptr_to_python<mapnik::expression_ptr>();
diff --git a/include/mapnik/marker_helpers.hpp b/include/mapnik/marker_helpers.hpp
index efc565fc2..4d7a2be78 100644
--- a/include/mapnik/marker_helpers.hpp
+++ b/include/mapnik/marker_helpers.hpp
@@ -38,24 +38,54 @@ bool push_explicit_style(Attr const& src, Attr & dst, markers_symbolizer const&
 {
     boost::optional<stroke> const& strk = sym.get_stroke();
     boost::optional<color> const& fill = sym.get_fill();
-    if (strk || fill)
+    boost::optional<float> const& opacity = sym.get_opacity();
+    boost::optional<float> const& fill_opacity = sym.get_fill_opacity();
+    if (strk || fill || opacity || fill_opacity)
     {
         for(unsigned i = 0; i < src.size(); ++i)
         {
             mapnik::svg::path_attributes attr = src[i];
 
-            if (strk && attr.stroke_flag)
+            if (attr.stroke_flag)
             {
-                attr.stroke_width = strk->get_width();
-                color const& s_color = strk->get_color();
-                attr.stroke_color = agg::rgba(s_color.red()/255.0,s_color.green()/255.0,
-                                              s_color.blue()/255.0,(s_color.alpha()*strk->get_opacity())/255.0);
+                // TODO - stroke attributes need to be boost::optional
+                // for this to work properly
+                if (strk)
+                {
+                    attr.stroke_width = strk->get_width();
+                    color const& s_color = strk->get_color();
+                    attr.stroke_color = agg::rgba(s_color.red()/255.0,
+                                                  s_color.green()/255.0,
+                                                  s_color.blue()/255.0,
+                                                  s_color.alpha()/255.0);
+                }
+                if (opacity)
+                {
+                    attr.stroke_opacity = *opacity;
+                }
+                else if (strk)
+                {
+                    attr.stroke_opacity = strk->get_opacity();
+                }
             }
-            if (fill && attr.fill_flag)
+            if (attr.fill_flag)
             {
-                color const& f_color = *fill;
-                attr.fill_color = agg::rgba(f_color.red()/255.0,f_color.green()/255.0,
-                                            f_color.blue()/255.0,(f_color.alpha()*sym.get_opacity())/255.0);
+                if (fill)
+                {
+                    color const& f_color = *fill;
+                    attr.fill_color = agg::rgba(f_color.red()/255.0,
+                                                f_color.green()/255.0,
+                                                f_color.blue()/255.0,
+                                                f_color.alpha()/255.0);
+                }
+                if (opacity)
+                {
+                    attr.fill_opacity = *opacity;
+                }
+                else if (fill_opacity)
+                {
+                    attr.fill_opacity = *fill_opacity;
+                }
             }
             dst.push_back(attr);
         }
diff --git a/include/mapnik/markers_symbolizer.hpp b/include/mapnik/markers_symbolizer.hpp
index e8ba4cd0e..d11cf6f8f 100644
--- a/include/mapnik/markers_symbolizer.hpp
+++ b/include/mapnik/markers_symbolizer.hpp
@@ -65,8 +65,12 @@ public:
     double get_spacing() const;
     void set_max_error(double max_error);
     double get_max_error() const;
+    void set_opacity(float opacity);
+    boost::optional<float> get_opacity() const;
     void set_fill(color const& fill);
     boost::optional<color> get_fill() const;
+    void set_fill_opacity(float opacity);
+    boost::optional<float> get_fill_opacity() const;
     void set_stroke(stroke const& stroke);
     boost::optional<stroke> get_stroke() const;
     void set_marker_placement(marker_placement_e marker_p);
@@ -79,6 +83,8 @@ private:
     double spacing_;
     double max_error_;
     boost::optional<color> fill_;
+    boost::optional<float> fill_opacity_;
+    boost::optional<float> opacity_;
     boost::optional<stroke> stroke_;
     marker_placement_e marker_p_;
 };
diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp
index d57b22b11..46d76fc70 100644
--- a/src/agg/process_markers_symbolizer.cpp
+++ b/src/agg/process_markers_symbolizer.cpp
@@ -64,7 +64,6 @@ struct vector_markers_rasterizer_dispatch
     typedef agg::comp_op_adaptor_rgba_pre<color_type, order_type> blender_type; // comp blender
     typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_comp_type;
     typedef agg::renderer_base<pixfmt_comp_type> renderer_base;
-    typedef agg::renderer_scanline_aa_solid<renderer_base> renderer_type;
 
     vector_markers_rasterizer_dispatch(BufferType & image_buffer,
                                 SvgRenderer & svg_renderer,
@@ -105,7 +104,7 @@ struct vector_markers_rasterizer_dispatch
             if (sym_.get_allow_overlap() ||
                 detector_.has_placement(transformed_bbox))
             {
-                svg_renderer_.render(ras_, sl_, renb_, matrix, sym_.get_opacity(), bbox_);
+                svg_renderer_.render(ras_, sl_, renb_, matrix, 1, bbox_);
 
                 if (!sym_.get_ignore_placement())
                     detector_.insert(transformed_bbox);
@@ -123,7 +122,7 @@ struct vector_markers_rasterizer_dispatch
                 agg::trans_affine matrix = marker_trans_;
                 matrix.rotate(angle);
                 matrix.translate(x, y);
-                svg_renderer_.render(ras_, sl_, renb_, matrix, sym_.get_opacity(), bbox_);
+                svg_renderer_.render(ras_, sl_, renb_, matrix, 1, bbox_);
             }
         }
     }
@@ -146,7 +145,6 @@ void render_raster_marker(Rasterizer & ras, RendererBuffer & renb,
                           agg::scanline_u8 & sl, image_data_32 const& src,
                           agg::trans_affine const& marker_tr, double opacity)
 {
-
     double width  = src.width();
     double height = src.height();
     double p[8];
@@ -180,10 +178,19 @@ void render_raster_marker(Rasterizer & ras, RendererBuffer & renb,
     typedef agg::span_interpolator_linear<agg::trans_affine> interpolator_type;
     typedef agg::span_image_filter_rgba_2x2<img_accessor_type,
                                             interpolator_type> span_gen_type;
+    typedef agg::order_rgba order_type;
+    typedef agg::pixel32_type pixel_type;
+    typedef agg::comp_op_adaptor_rgba_pre<color_type, order_type> blender_type; // comp blender
+    typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_comp_type;
+    typedef agg::renderer_base<pixfmt_comp_type> renderer_base;
+    typedef agg::renderer_scanline_aa_alpha<renderer_base,
+            agg::span_allocator<agg::rgba8>,
+            span_gen_type> renderer_type;
     img_accessor_type ia(pixf);
     interpolator_type interpolator(agg::trans_affine(p, 0, 0, width, height) );
     span_gen_type sg(ia, interpolator, filter);
-    agg::render_scanlines_aa(ras, sl, renb, sa, sg);
+    renderer_type rp(renb,sa, sg, unsigned(opacity*255));
+    agg::render_scanlines(ras, sl, rp);
 }
 
 template <typename BufferType, typename Rasterizer, typename Detector>
@@ -195,7 +202,6 @@ struct raster_markers_rasterizer_dispatch
     typedef agg::comp_op_adaptor_rgba_pre<color_type, order_type> blender_type; // comp blender
     typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_comp_type;
     typedef agg::renderer_base<pixfmt_comp_type> renderer_base;
-    typedef agg::renderer_scanline_aa_solid<renderer_base> renderer_type;
 
     raster_markers_rasterizer_dispatch(BufferType & image_buffer,
                                        Rasterizer & ras,
@@ -236,8 +242,9 @@ struct raster_markers_rasterizer_dispatch
                 detector_.has_placement(transformed_bbox))
             {
 
+                float opacity = sym_.get_opacity() ? *sym_.get_opacity() : 1;
                 render_raster_marker(ras_, renb_, sl_, src_,
-                                     matrix, sym_.get_opacity());
+                                     matrix, opacity);
                 if (!sym_.get_ignore_placement())
                     detector_.insert(transformed_bbox);
             }
@@ -254,8 +261,9 @@ struct raster_markers_rasterizer_dispatch
                 agg::trans_affine matrix = marker_trans_;
                 matrix.rotate(angle);
                 matrix.translate(x,y);
+                float opacity = sym_.get_opacity() ? *sym_.get_opacity() : 1;
                 render_raster_marker(ras_, renb_, sl_, src_,
-                                     matrix, sym_.get_opacity());
+                                     matrix, opacity);
             }
         }
     }
@@ -284,7 +292,6 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
     typedef agg::comp_op_adaptor_rgba_pre<color_type, order_type> blender_type; // comp blender
     typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_comp_type;
     typedef agg::renderer_base<pixfmt_comp_type> renderer_base;
-    typedef agg::renderer_scanline_aa_solid<renderer_base> renderer_type;
     typedef label_collision_detector4 detector_type;
     typedef boost::mpl::vector<clip_line_tag,transform_tag,smooth_tag> conv_types;
 
@@ -311,6 +318,8 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
 
             if ((*mark)->is_vector())
             {
+                typedef agg::renderer_scanline_aa_solid<renderer_base> renderer_type;
+
                 using namespace mapnik::svg;
                 boost::optional<path_ptr> marker = (*mark)->get_vector_data();
 
diff --git a/src/cairo_renderer.cpp b/src/cairo_renderer.cpp
index 9529c9d69..d9a01d4c7 100644
--- a/src/cairo_renderer.cpp
+++ b/src/cairo_renderer.cpp
@@ -1452,7 +1452,7 @@ void cairo_renderer_base::process(markers_symbolizer const& sym,
                     if (sym.get_allow_overlap() ||
                         detector_.has_placement(extent))
                     {
-                        render_marker(pixel_position(x - 0.5 * w, y - 0.5 * h) ,**mark, tr, sym.get_opacity());
+                        render_marker(pixel_position(x - 0.5 * w, y - 0.5 * h) ,**mark, tr, 1);
 
                         if (!sym.get_ignore_placement())
                             detector_.insert(extent);
@@ -1471,7 +1471,7 @@ void cairo_renderer_base::process(markers_symbolizer const& sym,
                     while (placement.get_point(x, y, angle))
                     {
                         agg::trans_affine matrix = recenter * tr * agg::trans_affine_rotation(angle) * agg::trans_affine_translation(x, y);
-                        render_marker(pixel_position(x - 0.5 * w, y - 0.5 * h), **mark, matrix, sym.get_opacity(),false);
+                        render_marker(pixel_position(x - 0.5 * w, y - 0.5 * h), **mark, matrix, 1,false);
                     }
                 }
                 context.fill();
diff --git a/src/grid/process_markers_symbolizer.cpp b/src/grid/process_markers_symbolizer.cpp
index c3a81468d..edbad9852 100644
--- a/src/grid/process_markers_symbolizer.cpp
+++ b/src/grid/process_markers_symbolizer.cpp
@@ -140,7 +140,7 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
                         detector_.has_placement(transformed_bbox))
                     {
                         placed = true;
-                        svg_renderer.render_id(*ras_ptr, sl, renb, feature.id(), matrix, sym.get_opacity(), bbox);
+                        svg_renderer.render_id(*ras_ptr, sl, renb, feature.id(), matrix, 1, bbox);
                         if (!sym.get_ignore_placement())
                             detector_.insert(transformed_bbox);
                     }
@@ -166,7 +166,7 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
                         agg::trans_affine matrix = marker_trans;
                         matrix.rotate(angle);
                         matrix.translate(x, y);
-                        svg_renderer.render_id(*ras_ptr, sl, renb, feature.id(), matrix, sym.get_opacity(), bbox);
+                        svg_renderer.render_id(*ras_ptr, sl, renb, feature.id(), matrix, 1, bbox);
                     }
                 }
                 else
@@ -186,7 +186,7 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
                         agg::trans_affine matrix = marker_trans;
                         matrix.rotate(angle);
                         matrix.translate(x, y);
-                        svg_renderer.render_id(*ras_ptr, sl, renb, feature.id(), matrix, sym.get_opacity(), bbox);
+                        svg_renderer.render_id(*ras_ptr, sl, renb, feature.id(), matrix, 1, bbox);
                     }
                 }
             }
diff --git a/src/load_map.cpp b/src/load_map.cpp
index 7349d0f8e..315e85e9a 100644
--- a/src/load_map.cpp
+++ b/src/load_map.cpp
@@ -1013,9 +1013,13 @@ void map_parser::parse_markers_symbolizer(rule & rule, xml_node const& node)
             sym.set_filename(expr);
         }
 
+        // overall opacity - impacts both fill and stroke, like svg
         optional<float> opacity = node.get_opt_attr<float>("opacity");
         if (opacity) sym.set_opacity(*opacity);
 
+        optional<float> fill_opacity = node.get_opt_attr<float>("fill-opacity");
+        if (fill_opacity) sym.set_fill_opacity(*fill_opacity);
+
         optional<std::string> image_transform_wkt = node.get_opt_attr<std::string>("transform");
         if (image_transform_wkt)
         {
diff --git a/src/markers_symbolizer.cpp b/src/markers_symbolizer.cpp
index c494bf7fc..5ea1c4624 100644
--- a/src/markers_symbolizer.cpp
+++ b/src/markers_symbolizer.cpp
@@ -74,6 +74,8 @@ markers_symbolizer::markers_symbolizer(markers_symbolizer const& rhs)
       spacing_(rhs.spacing_),
       max_error_(rhs.max_error_),
       fill_(rhs.fill_),
+      fill_opacity_(rhs.fill_opacity_),
+      opacity_(rhs.opacity_),
       stroke_(rhs.stroke_),
       marker_p_(rhs.marker_p_) {}
 
@@ -117,6 +119,16 @@ double markers_symbolizer::get_max_error() const
     return max_error_;
 }
 
+void markers_symbolizer::set_opacity(float opacity)
+{
+    opacity_ = opacity;
+}
+
+boost::optional<float> markers_symbolizer::get_opacity() const
+{
+    return opacity_;
+}
+
 void markers_symbolizer::set_fill(color const& fill)
 {
     fill_ = fill;
@@ -127,6 +139,16 @@ boost::optional<color> markers_symbolizer::get_fill() const
     return fill_;
 }
 
+void markers_symbolizer::set_fill_opacity(float opacity)
+{
+    fill_opacity_ = opacity;
+}
+
+boost::optional<float> markers_symbolizer::get_fill_opacity() const
+{
+    return fill_opacity_;
+}
+
 void markers_symbolizer::set_width(expression_ptr const& width)
 {
     width_ = width;
diff --git a/src/save_map.cpp b/src/save_map.cpp
index 232aba2a7..f572c8fc0 100644
--- a/src/save_map.cpp
+++ b/src/save_map.cpp
@@ -283,6 +283,10 @@ public:
         {
             set_attr( sym_node, "fill", sym.get_fill() );
         }
+        if (sym.get_fill_opacity() != dfl.get_fill_opacity() || explicit_defaults_)
+        {
+            set_attr( sym_node, "fill-opacity", sym.get_fill_opacity() );
+        }
         if (sym.get_opacity() != dfl.get_opacity() || explicit_defaults_)
         {
             set_attr( sym_node, "opacity", sym.get_opacity() );
diff --git a/tests/data/svg/octocat.svg b/tests/data/svg/octocat.svg
new file mode 100644
index 000000000..1f883261b
--- /dev/null
+++ b/tests/data/svg/octocat.svg
@@ -0,0 +1,17 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-0.2 -1 379 334">
+ <path id="puddle" fill="#9CDAF1" d="m296.94 295.43c0 20.533-47.56 37.176-106.22 37.176-58.67 0-106.23-16.643-106.23-37.176s47.558-37.18 106.23-37.18c58.66 0 106.22 16.65 106.22 37.18z"/>
+ <g id="shadow-legs" fill="#7DBBE6">
+  <path d="m161.85 331.22v-26.5c0-3.422-.619-6.284-1.653-8.701 6.853 5.322 7.316 18.695 7.316 18.695v17.004c6.166.481 12.534.773 19.053.861l-.172-16.92c-.944-23.13-20.769-25.961-20.769-25.961-7.245-1.645-7.137 1.991-6.409 4.34-7.108-12.122-26.158-10.556-26.158-10.556-6.611 2.357-.475 6.607-.475 6.607 10.387 3.775 11.33 15.105 11.33 15.105v23.622c5.72.98 11.71 1.79 17.94 2.4z"/>
+  <path d="m245.4 283.48s-19.053-1.566-26.16 10.559c.728-2.35.839-5.989-6.408-4.343 0 0-19.824 2.832-20.768 25.961l-.174 16.946c6.509-.025 12.876-.254 19.054-.671v-17.219s.465-13.373 7.316-18.695c-1.034 2.417-1.653 5.278-1.653 8.701v26.775c6.214-.544 12.211-1.279 17.937-2.188v-24.113s.944-11.33 11.33-15.105c0-.01 6.13-4.26-.48-6.62z"/>
+ </g>
+ <path id="cat" d="m378.18 141.32l.28-1.389c-31.162-6.231-63.141-6.294-82.487-5.49 3.178-11.451 4.134-24.627 4.134-39.32 0-21.073-7.917-37.931-20.77-50.759 2.246-7.25 5.246-23.351-2.996-43.963 0 0-14.541-4.617-47.431 17.396-12.884-3.22-26.596-4.81-40.328-4.81-15.109 0-30.376 1.924-44.615 5.83-33.94-23.154-48.923-18.411-48.923-18.411-9.78 24.457-3.733 42.566-1.896 47.063-11.495 12.406-18.513 28.243-18.513 47.659 0 14.658 1.669 27.808 5.745 39.237-19.511-.71-50.323-.437-80.373 5.572l.276 1.389c30.231-6.046 61.237-6.256 80.629-5.522.898 2.366 1.899 4.661 3.021 6.879-19.177.618-51.922 3.062-83.303 11.915l.387 1.36c31.629-8.918 64.658-11.301 83.649-11.882 11.458 21.358 34.048 35.152 74.236 39.484-5.704 3.833-11.523 10.349-13.881 21.374-7.773 3.718-32.379 12.793-47.142-12.599 0 0-8.264-15.109-24.082-16.292 0 0-15.344-.235-1.059 9.562 0 0 10.267 4.838 17.351 23.019 0 0 9.241 31.01 53.835 21.061v32.032s-.943 11.33-11.33 15.105c0 0-6.137 4.249.475 6.606 0 0 28.792 2.361 28.792-21.238v-34.929s-1.142-13.852 5.663-18.667v57.371s-.47 13.688-7.551 18.881c0 0-4.723 8.494 5.663 6.137 0 0 19.824-2.832 20.769-25.961l.449-58.06h4.765l.453 58.06c.943 23.129 20.768 25.961 20.768 25.961 10.383 2.357 5.663-6.137 5.663-6.137-7.08-5.193-7.551-18.881-7.551-18.881v-56.876c6.801 5.296 5.663 18.171 5.663 18.171v34.929c0 23.6 28.793 21.238 28.793 21.238 6.606-2.357.474-6.606.474-6.606-10.386-3.775-11.33-15.105-11.33-15.105v-45.786c0-17.854-7.518-27.309-14.87-32.3 42.859-4.25 63.426-18.089 72.903-39.591 18.773.516 52.557 2.803 84.873 11.919l.384-1.36c-32.131-9.063-65.692-11.408-84.655-11.96.898-2.172 1.682-4.431 2.378-6.755 19.25-.80 51.38-.79 82.66 5.46z"/>
+ <path id="face" fill="#F4CBB2" d="m258.19 94.132c9.231 8.363 14.631 18.462 14.631 29.343 0 50.804-37.872 52.181-84.585 52.181-46.721 0-84.589-7.035-84.589-52.181 0-10.809 5.324-20.845 14.441-29.174 15.208-13.881 40.946-6.531 70.147-6.531 29.07-.004 54.72-7.429 69.95 6.357z"/>
+ <path id="eyes" fill="#FFF" d="m160.1 126.06 c0 13.994-7.88 25.336-17.6 25.336-9.72 0-17.6-11.342-17.6-25.336 0-13.992 7.88-25.33 17.6-25.33 9.72.01 17.6 11.34 17.6 25.33z m94.43 0 c0 13.994-7.88 25.336-17.6 25.336-9.72 0-17.6-11.342-17.6-25.336 0-13.992 7.88-25.33 17.6-25.33 9.72.01 17.6 11.34 17.6 25.33z"/>
+ <g fill="#AD5C51">
+   <path id="pupils" d="m154.46 126.38 c0 9.328-5.26 16.887-11.734 16.887s-11.733-7.559-11.733-16.887c0-9.331 5.255-16.894 11.733-16.894 6.47 0 11.73 7.56 11.73 16.89z m94.42 0 c0 9.328-5.26 16.887-11.734 16.887s-11.733-7.559-11.733-16.887c0-9.331 5.255-16.894 11.733-16.894 6.47 0 11.73 7.56 11.73 16.89z"/>
+   <circle id="nose" cx="188.5" cy="148.56" r="4.401"/>
+   <path id="mouth" d="m178.23 159.69c-.26-.738.128-1.545.861-1.805.737-.26 1.546.128 1.805.861 1.134 3.198 4.167 5.346 7.551 5.346s6.417-2.147 7.551-5.346c.26-.738 1.067-1.121 1.805-.861s1.121 1.067.862 1.805c-1.529 4.324-5.639 7.229-10.218 7.229s-8.68-2.89-10.21-7.22z"/>
+ </g>
+ <path id="octo" fill="#C3E4D8" d="m80.641 179.82 c0 1.174-1.376 2.122-3.07 2.122-1.693 0-3.07-.948-3.07-2.122 0-1.175 1.377-2.127 3.07-2.127 1.694 0 3.07.95 3.07 2.13z m8.5 4.72 c0 1.174-1.376 2.122-3.07 2.122-1.693 0-3.07-.948-3.07-2.122 0-1.175 1.377-2.127 3.07-2.127 1.694 0 3.07.95 3.07 2.13z m5.193 6.14 c0 1.174-1.376 2.122-3.07 2.122-1.693 0-3.07-.948-3.07-2.122 0-1.175 1.377-2.127 3.07-2.127 1.694 0 3.07.95 3.07 2.13z m4.72 7.08 c0 1.174-1.376 2.122-3.07 2.122-1.693 0-3.07-.948-3.07-2.122 0-1.175 1.377-2.127 3.07-2.127 1.694 0 3.07.95 3.07 2.13z m5.188 6.61 c0 1.174-1.376 2.122-3.07 2.122-1.693 0-3.07-.948-3.07-2.122 0-1.175 1.377-2.127 3.07-2.127 1.694 0 3.07.95 3.07 2.13z m7.09 5.66 c0 1.174-1.376 2.122-3.07 2.122-1.693 0-3.07-.948-3.07-2.122 0-1.175 1.377-2.127 3.07-2.127 1.694 0 3.07.95 3.07 2.13z m9.91 3.78 c0 1.174-1.376 2.122-3.07 2.122-1.693 0-3.07-.948-3.07-2.122 0-1.175 1.377-2.127 3.07-2.127 1.694 0 3.07.95 3.07 2.13z m9.87 0 c0 1.174-1.376 2.122-3.07 2.122-1.693 0-3.07-.948-3.07-2.122 0-1.175 1.377-2.127 3.07-2.127 1.694 0 3.07.95 3.07 2.13z m10.01 -1.64 c0 1.174-1.376 2.122-3.07 2.122-1.693 0-3.07-.948-3.07-2.122 0-1.175 1.377-2.127 3.07-2.127 1.694 0 3.07.95 3.07 2.13z"/>
+ <path id="drop" fill="#9CDAF1" d="m69.369 186.12l-3.066 10.683s-.8 3.861 2.84 4.546c3.8-.074 3.486-3.627 3.223-4.781z"/>
+</svg>
\ No newline at end of file
diff --git a/tests/python_tests/object_test.py b/tests/python_tests/object_test.py
index 7806ada66..3213ca86e 100644
--- a/tests/python_tests/object_test.py
+++ b/tests/python_tests/object_test.py
@@ -126,7 +126,8 @@ def test_pointsymbolizer_init():
 def test_markersymbolizer_init():
     p = mapnik.MarkersSymbolizer() 
     eq_(p.allow_overlap, False)
-    eq_(p.opacity,1)
+    eq_(p.opacity,None)
+    eq_(p.fill_opacity,None)
     eq_(p.filename,'shape://ellipse')
     eq_(p.placement,mapnik.marker_placement.POINT_PLACEMENT)
     eq_(p.fill,None)
@@ -154,9 +155,11 @@ def test_markersymbolizer_init():
     p.fill = mapnik.Color('white')
     p.allow_overlap = True
     p.opacity = 0.5
+    p.fill_opacity = .01
 
     eq_(p.allow_overlap, True)
     eq_(p.opacity, 0.5)
+    eq_(p.fill_opacity, 0.5)
 
 
 # PointSymbolizer missing image file

From e482998c5125e421c99120a475ede066048c630c Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Mon, 30 Jul 2012 21:45:46 -0700
Subject: [PATCH 09/50] rename path_ptr to the more explicit svg_path_ptr and
 set up markers_symbolizer rendering for upcoming changed

---
 include/mapnik/marker.hpp               | 16 ++++-----
 src/agg/process_markers_symbolizer.cpp  | 45 ++++++++++---------------
 src/cairo_renderer.cpp                  |  4 +--
 src/grid/process_markers_symbolizer.cpp |  2 +-
 src/marker_cache.cpp                    |  4 +--
 5 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/include/mapnik/marker.hpp b/include/mapnik/marker.hpp
index d26819892..3a0d8af86 100644
--- a/include/mapnik/marker.hpp
+++ b/include/mapnik/marker.hpp
@@ -49,13 +49,13 @@ namespace mapnik
 
 typedef agg::pod_bvector<mapnik::svg::path_attributes> attr_storage;
 typedef mapnik::svg::svg_storage<mapnik::svg::svg_path_storage,attr_storage> svg_storage_type;
-typedef boost::shared_ptr<svg_storage_type> path_ptr;
+typedef boost::shared_ptr<svg_storage_type> svg_path_ptr;
 typedef boost::shared_ptr<image_data_32> image_ptr;
 /**
  * A class to hold either vector or bitmap marker data. This allows these to be treated equally
  * in the image caches and most of the render paths.
  */
-class marker
+class marker: private boost::noncopyable
 {
 public:
     marker()
@@ -71,14 +71,15 @@ public:
 
     }
 
-    marker(const boost::optional<mapnik::path_ptr> &data)
+    marker(const boost::optional<mapnik::svg_path_ptr> &data)
         : vector_data_(data)
     {
 
     }
 
     marker(const marker& rhs)
-        : bitmap_data_(rhs.bitmap_data_), vector_data_(rhs.vector_data_)
+        : bitmap_data_(rhs.bitmap_data_),
+          vector_data_(rhs.vector_data_)
     {}
 
     box2d<double> bounding_box() const
@@ -128,17 +129,14 @@ public:
         return bitmap_data_;
     }
 
-    boost::optional<mapnik::path_ptr> get_vector_data() const
+    boost::optional<mapnik::svg_path_ptr> get_vector_data() const
     {
         return vector_data_;
     }
 
-
 private:
-    marker& operator=(const marker&);
-
     boost::optional<mapnik::image_ptr> bitmap_data_;
-    boost::optional<mapnik::path_ptr> vector_data_;
+    boost::optional<mapnik::svg_path_ptr> vector_data_;
 
 };
 
diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp
index 46d76fc70..bec7f92e1 100644
--- a/src/agg/process_markers_symbolizer.cpp
+++ b/src/agg/process_markers_symbolizer.cpp
@@ -304,49 +304,36 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
         {
             ras_ptr->reset();
             ras_ptr->gamma(agg::gamma_power());
-
             agg::trans_affine geom_tr;
             evaluate_transform(geom_tr, feature, sym.get_transform());
-
-            box2d<double> const& bbox = (*mark)->bounding_box();
             agg::trans_affine tr;
-            setup_label_transform(tr, bbox, feature, sym);
-            tr = agg::trans_affine_scaling(scale_factor_) * tr;
-            coord2d center = bbox.center();
-            agg::trans_affine_translation recenter(-center.x, -center.y);
-            agg::trans_affine marker_trans = recenter * tr;
+            tr *= agg::trans_affine_scaling(scale_factor_);
 
             if ((*mark)->is_vector())
             {
-                typedef agg::renderer_scanline_aa_solid<renderer_base> renderer_type;
-
                 using namespace mapnik::svg;
-                boost::optional<path_ptr> marker = (*mark)->get_vector_data();
-
-
-                vertex_stl_adapter<svg_path_storage> stl_storage((*marker)->source());
-                svg_path_adapter svg_path(stl_storage);
-
-                agg::pod_bvector<path_attributes> attributes;
-                bool result = push_explicit_style( (*marker)->attributes(), attributes, sym);
-
+                typedef agg::renderer_scanline_aa_solid<renderer_base> renderer_type;
                 typedef svg_renderer<svg_path_adapter,
                                      agg::pod_bvector<path_attributes>,
                                      renderer_type,
                                      agg::pixfmt_rgba32 > svg_renderer_type;
                 typedef vector_markers_rasterizer_dispatch<buffer_type, svg_renderer_type, rasterizer, detector_type> dispatch_type;
-
-
-                svg_renderer_type svg_renderer(svg_path, result ? attributes : (*marker)->attributes());
-
+                box2d<double> const& bbox = (*mark)->bounding_box();
+                setup_label_transform(tr, bbox, feature, sym);
+                coord2d center = bbox.center();
+                agg::trans_affine_translation recenter(-center.x, -center.y);
+                agg::trans_affine marker_trans = recenter * tr;
+                boost::optional<svg_path_ptr> vector_marker = (*mark)->get_vector_data();
+                vertex_stl_adapter<svg_path_storage> stl_storage((*vector_marker)->source());
+                svg_path_adapter svg_path(stl_storage);
+                agg::pod_bvector<path_attributes> attributes;
+                bool result = push_explicit_style( (*vector_marker)->attributes(), attributes, sym);
+                svg_renderer_type svg_renderer(svg_path, result ? attributes : (*vector_marker)->attributes());
                 dispatch_type rasterizer_dispatch(*current_buffer_,svg_renderer,*ras_ptr,
                                                   bbox, marker_trans, sym, *detector_, scale_factor_);
-
-
                 vertex_converter<box2d<double>, dispatch_type, markers_symbolizer,
                                  CoordTransform, proj_transform, agg::trans_affine, conv_types>
                     converter(query_extent_* 1.1,rasterizer_dispatch, sym,t_,prj_trans,tr,scale_factor_);
-
                 if (sym.clip()) converter.template set<clip_line_tag>(); //optional clip (default: true)
                 converter.template set<transform_tag>(); //always transform
                 if (sym.smooth() > 0.0) converter.template set<smooth_tag>(); // optional smooth converter
@@ -358,6 +345,11 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
             }
             else // raster markers
             {
+                box2d<double> const& bbox = (*mark)->bounding_box();
+                setup_label_transform(tr, bbox, feature, sym);
+                coord2d center = bbox.center();
+                agg::trans_affine_translation recenter(-center.x, -center.y);
+                agg::trans_affine marker_trans = recenter * tr;
                 boost::optional<mapnik::image_ptr> marker = (*mark)->get_bitmap_data();
                 typedef raster_markers_rasterizer_dispatch<buffer_type,rasterizer, detector_type> dispatch_type;
                 dispatch_type rasterizer_dispatch(*current_buffer_,*ras_ptr, **marker,
@@ -365,7 +357,6 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
                 vertex_converter<box2d<double>, dispatch_type, markers_symbolizer,
                                  CoordTransform, proj_transform, agg::trans_affine, conv_types>
                     converter(query_extent_* 1.1, rasterizer_dispatch, sym,t_,prj_trans,tr,scale_factor_);
-
                 if (sym.clip()) converter.template set<clip_line_tag>(); //optional clip (default: true)
                 converter.template set<transform_tag>(); //always transform
                 if (sym.smooth() > 0.0) converter.template set<smooth_tag>(); // optional smooth converter
diff --git a/src/cairo_renderer.cpp b/src/cairo_renderer.cpp
index d9a01d4c7..89fa90a9a 100644
--- a/src/cairo_renderer.cpp
+++ b/src/cairo_renderer.cpp
@@ -1048,7 +1048,7 @@ void cairo_renderer_base::render_marker(pixel_position const& pos, marker const&
 
         typedef coord_transform<CoordTransform,geometry_type> path_type;
         agg::trans_affine transform;
-        mapnik::path_ptr vmarker = *marker.get_vector_data();
+        mapnik::svg_path_ptr vmarker = *marker.get_vector_data();
         using namespace mapnik::svg;
         agg::pod_bvector<path_attributes> const & attributes_ = vmarker->attributes();
         for(unsigned i = 0; i < attributes_.size(); ++i)
@@ -1420,7 +1420,7 @@ void cairo_renderer_base::process(markers_symbolizer const& sym,
 
                 return;
             }
-            boost::optional<path_ptr> marker = (*mark)->get_vector_data();
+            boost::optional<svg_path_ptr> marker = (*mark)->get_vector_data();
             box2d<double> const& bbox = (*marker)->bounding_box();
             double x1 = bbox.minx();
             double y1 = bbox.miny();
diff --git a/src/grid/process_markers_symbolizer.cpp b/src/grid/process_markers_symbolizer.cpp
index edbad9852..e80d185b6 100644
--- a/src/grid/process_markers_symbolizer.cpp
+++ b/src/grid/process_markers_symbolizer.cpp
@@ -87,7 +87,7 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
             agg::trans_affine geom_tr;
             evaluate_transform(geom_tr, feature, sym.get_transform());
 
-            boost::optional<path_ptr> marker = (*mark)->get_vector_data();
+            boost::optional<svg_path_ptr> marker = (*mark)->get_vector_data();
             box2d<double> const& bbox = (*marker)->bounding_box();
 
             agg::trans_affine tr;
diff --git a/src/marker_cache.cpp b/src/marker_cache.cpp
index 96c0e0a45..9dcaea7f4 100644
--- a/src/marker_cache.cpp
+++ b/src/marker_cache.cpp
@@ -144,7 +144,7 @@ boost::optional<marker_ptr> marker_cache::find(std::string const& uri,
             }
             std::string known_svg_string = mark_itr->second;
             using namespace mapnik::svg;
-            path_ptr marker_path(boost::make_shared<svg_storage_type>());
+            svg_path_ptr marker_path(boost::make_shared<svg_storage_type>());
             vertex_stl_adapter<svg_path_storage> stl_storage(marker_path->source());
             svg_path_adapter svg_path(stl_storage);
             svg_converter_type svg(svg_path, marker_path->attributes());
@@ -173,7 +173,7 @@ boost::optional<marker_ptr> marker_cache::find(std::string const& uri,
             if (is_svg(uri))
             {
                 using namespace mapnik::svg;
-                path_ptr marker_path(boost::make_shared<svg_storage_type>());
+                svg_path_ptr marker_path(boost::make_shared<svg_storage_type>());
                 vertex_stl_adapter<svg_path_storage> stl_storage(marker_path->source());
                 svg_path_adapter svg_path(stl_storage);
                 svg_converter_type svg(svg_path, marker_path->attributes());

From e69c6037b7c39906bb3062b03c2d0a4d2ae8d924 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Mon, 30 Jul 2012 23:07:12 -0700
Subject: [PATCH 10/50] mapnik coding style

---
 include/mapnik/marker.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/mapnik/marker.hpp b/include/mapnik/marker.hpp
index 3a0d8af86..c882727a3 100644
--- a/include/mapnik/marker.hpp
+++ b/include/mapnik/marker.hpp
@@ -65,19 +65,19 @@ public:
         (*bitmap_data_)->set(0xff000000);
     }
 
-    marker(const boost::optional<mapnik::image_ptr> &data)
+    marker(boost::optional<mapnik::image_ptr> const& data)
         : bitmap_data_(data)
     {
 
     }
 
-    marker(const boost::optional<mapnik::svg_path_ptr> &data)
+    marker(boost::optional<mapnik::svg_path_ptr> const& data)
         : vector_data_(data)
     {
 
     }
 
-    marker(const marker& rhs)
+    marker(marker const& rhs)
         : bitmap_data_(rhs.bitmap_data_),
           vector_data_(rhs.vector_data_)
     {}

From 39a1477eb2147c7f85d2c9f38645e3f71034402f Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Mon, 30 Jul 2012 23:20:20 -0700
Subject: [PATCH 11/50] allow marker-width and marker-height to apply directly
 to ellipse rx/ry - maintaining ability to precisely control ellipse
 dimensions, combine with transforms, and avoid scaling line-widths - refs
 #1348 and #1347

---
 src/agg/process_markers_symbolizer.cpp | 110 ++++++++++++++++++++-----
 1 file changed, 89 insertions(+), 21 deletions(-)

diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp
index bec7f92e1..bc5f9c851 100644
--- a/src/agg/process_markers_symbolizer.cpp
+++ b/src/agg/process_markers_symbolizer.cpp
@@ -32,12 +32,16 @@
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/marker_helpers.hpp>
 #include <mapnik/svg/svg_renderer.hpp>
+#include <mapnik/svg/svg_storage.hpp>
+#include <mapnik/svg/svg_converter.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
+#include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/markers_placement.hpp>
 #include <mapnik/markers_symbolizer.hpp>
 
 // agg
 #include "agg_basics.h"
+#include "agg_ellipse.h"
 #include "agg_rendering_buffer.h"
 #include "agg_pixfmt_rgba.h"
 #include "agg_rasterizer_scanline_aa.h"
@@ -318,29 +322,92 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
                                      renderer_type,
                                      agg::pixfmt_rgba32 > svg_renderer_type;
                 typedef vector_markers_rasterizer_dispatch<buffer_type, svg_renderer_type, rasterizer, detector_type> dispatch_type;
-                box2d<double> const& bbox = (*mark)->bounding_box();
-                setup_label_transform(tr, bbox, feature, sym);
-                coord2d center = bbox.center();
-                agg::trans_affine_translation recenter(-center.x, -center.y);
-                agg::trans_affine marker_trans = recenter * tr;
-                boost::optional<svg_path_ptr> vector_marker = (*mark)->get_vector_data();
-                vertex_stl_adapter<svg_path_storage> stl_storage((*vector_marker)->source());
-                svg_path_adapter svg_path(stl_storage);
-                agg::pod_bvector<path_attributes> attributes;
-                bool result = push_explicit_style( (*vector_marker)->attributes(), attributes, sym);
-                svg_renderer_type svg_renderer(svg_path, result ? attributes : (*vector_marker)->attributes());
-                dispatch_type rasterizer_dispatch(*current_buffer_,svg_renderer,*ras_ptr,
-                                                  bbox, marker_trans, sym, *detector_, scale_factor_);
-                vertex_converter<box2d<double>, dispatch_type, markers_symbolizer,
-                                 CoordTransform, proj_transform, agg::trans_affine, conv_types>
-                    converter(query_extent_* 1.1,rasterizer_dispatch, sym,t_,prj_trans,tr,scale_factor_);
-                if (sym.clip()) converter.template set<clip_line_tag>(); //optional clip (default: true)
-                converter.template set<transform_tag>(); //always transform
-                if (sym.smooth() > 0.0) converter.template set<smooth_tag>(); // optional smooth converter
 
-                BOOST_FOREACH(geometry_type & geom, feature.paths())
+                boost::optional<svg_path_ptr> const& stock_vector_marker = (*mark)->get_vector_data();
+                expression_ptr const& width_expr = sym.get_width();
+                expression_ptr const& height_expr = sym.get_height();
+
+                // special case for simple ellipse markers
+                // to allow for full control over rx/ry dimensions
+                if (filename == "shape://ellipse"
+                   && (width_expr || height_expr))
                 {
-                    converter.apply(geom);
+                    double width = 0;
+                    double height = 0;
+                    if (width_expr && height_expr)
+                    {
+                        width = boost::apply_visitor(evaluate<Feature,value_type>(feature), *width_expr).to_double();
+                        height = boost::apply_visitor(evaluate<Feature,value_type>(feature), *height_expr).to_double();
+                    }
+                    else if (width_expr)
+                    {
+                        width = boost::apply_visitor(evaluate<Feature,value_type>(feature), *width_expr).to_double();
+                        height = width;
+                    }
+                    else if (height_expr)
+                    {
+                        height = boost::apply_visitor(evaluate<Feature,value_type>(feature), *height_expr).to_double();
+                        width = height;
+                    }
+                    // create a new marker
+                    svg_storage_type marker_ellipse;
+                    vertex_stl_adapter<svg_path_storage> stl_storage(marker_ellipse.source());
+                    svg_path_adapter svg_path(stl_storage);
+                    svg_converter_type styled_svg(svg_path, marker_ellipse.attributes());
+                    styled_svg.push_attr();
+                    styled_svg.begin_path();
+                    agg::ellipse c(0, 0, width/2.0, height/2.0);
+                    styled_svg.storage().concat_path(c);
+                    styled_svg.end_path();
+                    styled_svg.pop_attr();
+                    double lox,loy,hix,hiy;
+                    styled_svg.bounding_rect(&lox, &loy, &hix, &hiy);
+                    marker_ellipse.set_bounding_box(lox,loy,hix,hiy);
+                    agg::pod_bvector<path_attributes> attributes;
+                    bool result = push_explicit_style( (*stock_vector_marker)->attributes(), attributes, sym);
+                    svg_renderer_type svg_renderer(svg_path, result ? attributes : (*stock_vector_marker)->attributes());
+                    evaluate_transform(tr, feature, sym.get_image_transform());
+                    box2d<double> bbox = marker_ellipse.bounding_box();
+                    coord2d center = bbox.center();
+                    agg::trans_affine_translation recenter(-center.x, -center.y);
+                    agg::trans_affine marker_trans = recenter * tr;
+                    dispatch_type rasterizer_dispatch(*current_buffer_,svg_renderer,*ras_ptr,
+                                                      bbox, marker_trans, sym, *detector_, scale_factor_);
+                    vertex_converter<box2d<double>, dispatch_type, markers_symbolizer,
+                                     CoordTransform, proj_transform, agg::trans_affine, conv_types>
+                        converter(query_extent_* 1.1,rasterizer_dispatch, sym,t_,prj_trans,tr,scale_factor_);
+                    if (sym.clip()) converter.template set<clip_line_tag>(); //optional clip (default: true)
+                    converter.template set<transform_tag>(); //always transform
+                    if (sym.smooth() > 0.0) converter.template set<smooth_tag>(); // optional smooth converter
+                    BOOST_FOREACH(geometry_type & geom, feature.paths())
+                    {
+                        converter.apply(geom);
+                    }
+                }
+                else
+                {
+                    box2d<double> const& bbox = (*mark)->bounding_box();
+                    setup_label_transform(tr, bbox, feature, sym);
+                    coord2d center = bbox.center();
+                    agg::trans_affine_translation recenter(-center.x, -center.y);
+                    agg::trans_affine marker_trans = recenter * tr;
+                    vertex_stl_adapter<svg_path_storage> stl_storage((*stock_vector_marker)->source());
+                    svg_path_adapter svg_path(stl_storage);
+                    agg::pod_bvector<path_attributes> attributes;
+                    bool result = push_explicit_style( (*stock_vector_marker)->attributes(), attributes, sym);
+                    svg_renderer_type svg_renderer(svg_path, result ? attributes : (*stock_vector_marker)->attributes());
+                    dispatch_type rasterizer_dispatch(*current_buffer_,svg_renderer,*ras_ptr,
+                                                      bbox, marker_trans, sym, *detector_, scale_factor_);
+                    vertex_converter<box2d<double>, dispatch_type, markers_symbolizer,
+                                     CoordTransform, proj_transform, agg::trans_affine, conv_types>
+                        converter(query_extent_* 1.1,rasterizer_dispatch, sym,t_,prj_trans,tr,scale_factor_);
+                    if (sym.clip()) converter.template set<clip_line_tag>(); //optional clip (default: true)
+                    converter.template set<transform_tag>(); //always transform
+                    if (sym.smooth() > 0.0) converter.template set<smooth_tag>(); // optional smooth converter
+                    BOOST_FOREACH(geometry_type & geom, feature.paths())
+                    {
+                        converter.apply(geom);
+                    }
                 }
             }
             else // raster markers
@@ -357,6 +424,7 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
                 vertex_converter<box2d<double>, dispatch_type, markers_symbolizer,
                                  CoordTransform, proj_transform, agg::trans_affine, conv_types>
                     converter(query_extent_* 1.1, rasterizer_dispatch, sym,t_,prj_trans,tr,scale_factor_);
+
                 if (sym.clip()) converter.template set<clip_line_tag>(); //optional clip (default: true)
                 converter.template set<transform_tag>(); //always transform
                 if (sym.smooth() > 0.0) converter.template set<smooth_tag>(); // optional smooth converter

From a3b7d07da027b98f1bfd8cc6fe0124ef0f6fae26 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 31 Jul 2012 10:56:13 +0100
Subject: [PATCH 12/50] + select clipper based on geometry type

---
 src/agg/process_line_symbolizer.cpp | 34 ++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/agg/process_line_symbolizer.cpp b/src/agg/process_line_symbolizer.cpp
index 1d5388aa3..ec75035b4 100644
--- a/src/agg/process_line_symbolizer.cpp
+++ b/src/agg/process_line_symbolizer.cpp
@@ -60,7 +60,7 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
     unsigned g=col.green();
     unsigned b=col.blue();
     unsigned a=col.alpha();
-    
+
     ras_ptr->reset();
     set_gamma_method(stroke_, ras_ptr);
 
@@ -76,7 +76,7 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
     pixfmt_comp_type pixf(buf);
     pixf.comp_op(static_cast<agg::comp_op_e>(sym.comp_op()));
     renderer_base renb(pixf);
-    
+
     agg::trans_affine tr;
     evaluate_transform(tr, feature, sym.get_transform());
 
@@ -94,12 +94,23 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
         rasterizer_type ras(ren);
         set_join_caps_aa(stroke_,ras);
 
-        typedef boost::mpl::vector<clip_line_tag,transform_tag, offset_transform_tag, affine_transform_tag, smooth_tag, dash_tag, stroke_tag> conv_types;
+        typedef boost::mpl::vector<clip_line_tag, clip_poly_tag,transform_tag,
+                                   offset_transform_tag, affine_transform_tag,
+                                   smooth_tag, dash_tag, stroke_tag> conv_types;
         vertex_converter<box2d<double>, rasterizer_type, line_symbolizer,
                          CoordTransform, proj_transform, agg::trans_affine, conv_types>
             converter(ext,ras,sym,t_,prj_trans,tr,scaled);
 
-        if (sym.clip()) converter.set<clip_line_tag>(); // optional clip (default: true)
+        if (sym.clip() && feature.paths().size() > 0) // optional clip (default: true)
+        {
+            eGeomType type = feature.paths()[0].type();
+            if (type == Polygon)
+                converter.set<clip_poly_tag>();
+            else if (type == LineString)
+                converter.set<clip_line_tag>();
+            // don't clip if type==Point
+        }
+
         converter.set<transform_tag>(); // always transform
         if (fabs(sym.offset()) > 0.0) converter.set<offset_transform_tag>(); // parallel offset
         converter.set<affine_transform_tag>(); // optional affine transform
@@ -117,12 +128,23 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
     }
     else
     {
-        typedef boost::mpl::vector<clip_line_tag,transform_tag, offset_transform_tag, affine_transform_tag, smooth_tag, dash_tag, stroke_tag> conv_types;
+        typedef boost::mpl::vector<clip_line_tag, clip_poly_tag, transform_tag, offset_transform_tag,
+                                   affine_transform_tag, smooth_tag, dash_tag, stroke_tag> conv_types;
+
         vertex_converter<box2d<double>, rasterizer, line_symbolizer,
                          CoordTransform, proj_transform, agg::trans_affine, conv_types>
             converter(ext,*ras_ptr,sym,t_,prj_trans,tr,scale_factor_);
 
-        if (sym.clip()) converter.set<clip_line_tag>(); // optional clip (default: true)
+        if (sym.clip() && feature.paths().size() > 0) // optional clip (default: true)
+        {
+            eGeomType type = feature.paths()[0].type();
+            if (type == Polygon)
+                converter.set<clip_poly_tag>();
+            else if (type == LineString)
+                converter.set<clip_line_tag>();
+            // don't clip if type==Point
+        }
+
         converter.set<transform_tag>(); // always transform
         if (fabs(sym.offset()) > 0.0) converter.set<offset_transform_tag>(); // parallel offset
         converter.set<affine_transform_tag>(); // optional affine transform

From 76569cccb8c1cfc721d7455588c55b270f54a46c Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 31 Jul 2012 10:57:42 +0100
Subject: [PATCH 13/50] + select clipper based on geometry type + process
 SEG_CLOSE command

---
 src/cairo_renderer.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/cairo_renderer.cpp b/src/cairo_renderer.cpp
index 89fa90a9a..c32b3f949 100644
--- a/src/cairo_renderer.cpp
+++ b/src/cairo_renderer.cpp
@@ -498,7 +498,6 @@ public:
             }
             else if (cm == SEG_CLOSE)
             {
-                line_to(x, y);
                 close_path();
             }
         }
@@ -916,6 +915,10 @@ void cairo_renderer_base::process(building_symbolizer const& sym,
                 {
                     frame->line_to(x,y);
                 }
+                else if (cm == SEG_CLOSE)
+                {
+                    frame->close(x,y);
+                }
 
                 if (j != 0)
                 {
@@ -1000,14 +1003,21 @@ void cairo_renderer_base::process(line_symbolizer const& sym,
     evaluate_transform(tr, feature, sym.get_transform());
 
     box2d<double> ext = query_extent_ * 1.1;
-    typedef boost::mpl::vector<clip_line_tag,transform_tag, offset_transform_tag, affine_transform_tag, smooth_tag> conv_types;
+    typedef boost::mpl::vector<clip_line_tag, clip_poly_tag, transform_tag, offset_transform_tag, affine_transform_tag, smooth_tag> conv_types;
     vertex_converter<box2d<double>, cairo_context, line_symbolizer,
                      CoordTransform, proj_transform, agg::trans_affine, conv_types>
         converter(ext,context,sym,t_,prj_trans,tr,scale_factor_);
 
-    if (sym.clip()) converter.set<clip_line_tag>(); // optional clip (default: true)
+    if (sym.clip() && feature.paths().size() > 0) // optional clip (default: true)
+    {
+        eGeomType type = feature.paths()[0].type();
+        if (type == Polygon)
+            converter.set<clip_poly_tag>();
+        else if (type == LineString)
+            converter.set<clip_line_tag>();
+        // don't clip if type==Point
+    }
     converter.set<transform_tag>(); // always transform
-
     if (fabs(sym.offset()) > 0.0) converter.set<offset_transform_tag>(); // parallel offset
     converter.set<affine_transform_tag>(); // optional affine transform
     if (sym.smooth() > 0.0) converter.set<smooth_tag>(); // optional smooth converter

From c7af665cc753338fd2de4bf680b84b7f530f64d9 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 31 Jul 2012 10:59:09 +0100
Subject: [PATCH 14/50] + process SEG_CLOSE

---
 src/agg/process_building_symbolizer.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/agg/process_building_symbolizer.cpp b/src/agg/process_building_symbolizer.cpp
index 8f82ca2b8..b5f6ad678 100644
--- a/src/agg/process_building_symbolizer.cpp
+++ b/src/agg/process_building_symbolizer.cpp
@@ -82,8 +82,8 @@ void agg_renderer<T>::process(building_symbolizer const& sym,
             boost::scoped_ptr<geometry_type> frame(new geometry_type(LineString));
             boost::scoped_ptr<geometry_type> roof(new geometry_type(Polygon));
             std::deque<segment_t> face_segments;
-            double x0(0);
-            double y0(0);
+            double x0 = 0;
+            double y0 = 0;
 
             geom.rewind(0);
             unsigned cm = geom.vertex(&x0,&y0);
@@ -96,12 +96,11 @@ void agg_renderer<T>::process(building_symbolizer const& sym,
                 {
                     frame->move_to(x,y);
                 }
-                else if (cm == SEG_LINETO)
+                else if (cm == SEG_LINETO || cm == SEG_CLOSE)
                 {
                     frame->line_to(x,y);
                     face_segments.push_back(segment_t(x0,y0,x,y));
                 }
-
                 x0 = x;
                 y0 = y;
             }

From d7d833dd135dc808b0c5e4f0c51a9b9d97e5aee8 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Tue, 31 Jul 2012 13:31:22 +0100
Subject: [PATCH 15/50] + cleanup/small fixes

---
 src/agg/process_building_symbolizer.cpp | 25 +++++++------
 src/cairo_renderer.cpp                  | 49 ++++++++-----------------
 2 files changed, 29 insertions(+), 45 deletions(-)

diff --git a/src/agg/process_building_symbolizer.cpp b/src/agg/process_building_symbolizer.cpp
index b5f6ad678..4184bc42f 100644
--- a/src/agg/process_building_symbolizer.cpp
+++ b/src/agg/process_building_symbolizer.cpp
@@ -84,14 +84,11 @@ void agg_renderer<T>::process(building_symbolizer const& sym,
             std::deque<segment_t> face_segments;
             double x0 = 0;
             double y0 = 0;
-
+            double x,y;
             geom.rewind(0);
-            unsigned cm = geom.vertex(&x0,&y0);
-            for (unsigned j=1;j<geom.size();++j)
+            for (unsigned cm = geom.vertex(&x, &y); cm != SEG_END;
+                 cm = geom.vertex(&x, &y))
             {
-                double x(0);
-                double y(0);
-                cm = geom.vertex(&x,&y);
                 if (cm == SEG_MOVETO)
                 {
                     frame->move_to(x,y);
@@ -104,9 +101,12 @@ void agg_renderer<T>::process(building_symbolizer const& sym,
                 x0 = x;
                 y0 = y;
             }
+
             std::sort(face_segments.begin(),face_segments.end(), y_order);
             std::deque<segment_t>::const_iterator itr=face_segments.begin();
-            for (;itr!=face_segments.end();++itr)
+            std::deque<segment_t>::const_iterator end=face_segments.end();
+
+            for (; itr!=end; ++itr)
             {
                 boost::scoped_ptr<geometry_type> faces(new geometry_type(Polygon));
                 faces->move_to(itr->get<0>(),itr->get<1>());
@@ -119,22 +119,22 @@ void agg_renderer<T>::process(building_symbolizer const& sym,
                 ren.color(agg::rgba8(int(r*0.8), int(g*0.8), int(b*0.8), int(a * sym.get_opacity())));
                 agg::render_scanlines(*ras_ptr, sl, ren);
                 ras_ptr->reset();
-
+                //
                 frame->move_to(itr->get<0>(),itr->get<1>());
                 frame->line_to(itr->get<0>(),itr->get<1>()+height);
+
             }
 
             geom.rewind(0);
-            for (unsigned j=0;j<geom.size();++j)
+            for (unsigned cm = geom.vertex(&x, &y); cm != SEG_END;
+                 cm = geom.vertex(&x, &y))
             {
-                double x,y;
-                unsigned cm = geom.vertex(&x,&y);
                 if (cm == SEG_MOVETO)
                 {
                     frame->move_to(x,y+height);
                     roof->move_to(x,y+height);
                 }
-                else if (cm == SEG_LINETO)
+                else if (cm == SEG_LINETO || cm == SEG_CLOSE)
                 {
                     frame->line_to(x,y+height);
                     roof->line_to(x,y+height);
@@ -152,6 +152,7 @@ void agg_renderer<T>::process(building_symbolizer const& sym,
             ras_ptr->add_path(roof_path);
             ren.color(agg::rgba8(r, g, b, int(a * sym.get_opacity())));
             agg::render_scanlines(*ras_ptr, sl, ren);
+
         }
     }
 }
diff --git a/src/cairo_renderer.cpp b/src/cairo_renderer.cpp
index c32b3f949..a3fae2a76 100644
--- a/src/cairo_renderer.cpp
+++ b/src/cairo_renderer.cpp
@@ -894,47 +894,32 @@ void cairo_renderer_base::process(building_symbolizer const& sym,
             boost::scoped_ptr<geometry_type> frame(new geometry_type(LineString));
             boost::scoped_ptr<geometry_type> roof(new geometry_type(Polygon));
             std::deque<segment_t> face_segments;
-            double x0(0);
-            double y0(0);
-
+            double x0 = 0;
+            double y0 = 0;
+            double x, y;
             geom.rewind(0);
-            unsigned cm = geom.vertex(&x0, &y0);
-
-            for (unsigned j = 1; j < geom.size(); ++j)
+            for (unsigned cm = geom.vertex(&x, &y); cm != SEG_END;
+                 cm = geom.vertex(&x, &y))
             {
-                double x=0;
-                double y=0;
-
-                cm = geom.vertex(&x,&y);
-
                 if (cm == SEG_MOVETO)
                 {
                     frame->move_to(x,y);
                 }
-                else if (cm == SEG_LINETO)
+                else if (cm == SEG_LINETO || cm == SEG_CLOSE)
                 {
                     frame->line_to(x,y);
+                    face_segments.push_back(segment_t(x0,y0,x,y));
                 }
-                else if (cm == SEG_CLOSE)
-                {
-                    frame->close(x,y);
-                }
-
-                if (j != 0)
-                {
-                    face_segments.push_back(segment_t(x0, y0, x, y));
-                }
-
                 x0 = x;
                 y0 = y;
             }
 
             std::sort(face_segments.begin(), face_segments.end(), y_order);
             std::deque<segment_t>::const_iterator itr = face_segments.begin();
-            for (; itr != face_segments.end(); ++itr)
+            std::deque<segment_t>::const_iterator end=face_segments.end();
+            for (; itr != end; ++itr)
             {
                 boost::scoped_ptr<geometry_type> faces(new geometry_type(Polygon));
-
                 faces->move_to(itr->get<0>(), itr->get<1>());
                 faces->line_to(itr->get<2>(), itr->get<3>());
                 faces->line_to(itr->get<2>(), itr->get<3>() + height);
@@ -951,20 +936,18 @@ void cairo_renderer_base::process(building_symbolizer const& sym,
             }
 
             geom.rewind(0);
-            for (unsigned j = 0; j < geom.size(); ++j)
+            for (unsigned cm = geom.vertex(&x, &y); cm != SEG_END;
+                 cm = geom.vertex(&x, &y))
             {
-                double x, y;
-                unsigned cm = geom.vertex(&x, &y);
-
                 if (cm == SEG_MOVETO)
                 {
-                    frame->move_to(x, y + height);
-                    roof->move_to(x, y + height);
+                    frame->move_to(x,y+height);
+                    roof->move_to(x,y+height);
                 }
-                else if (cm == SEG_LINETO)
+                else if (cm == SEG_LINETO || cm == SEG_CLOSE)
                 {
-                    frame->line_to(x, y + height);
-                    roof->line_to(x, y + height);
+                    frame->line_to(x,y+height);
+                    roof->line_to(x,y+height);
                 }
             }
 

From e95886f327fe8247dcb1273f59812ac4b9251c54 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 31 Jul 2012 10:45:38 -0700
Subject: [PATCH 16/50] catch exceptions upon startup

---
 demo/viewer/main.cpp | 87 ++++++++++++++++++++++++--------------------
 1 file changed, 47 insertions(+), 40 deletions(-)

diff --git a/demo/viewer/main.cpp b/demo/viewer/main.cpp
index 905844720..c5cb4ad4c 100644
--- a/demo/viewer/main.cpp
+++ b/demo/viewer/main.cpp
@@ -36,52 +36,59 @@ int main( int argc, char **argv )
     using mapnik::datasource_cache;
     using mapnik::freetype_engine;
 
-    QCoreApplication::setOrganizationName("Mapnik");
-    QCoreApplication::setOrganizationDomain("mapnik.org");
-    QCoreApplication::setApplicationName("Viewer");
-
-    QSettings settings("viewer.ini",QSettings::IniFormat);
-
-    // register input plug-ins
-    QString plugins_dir = settings.value("mapnik/plugins_dir",
-                                         QVariant("/usr/local/lib/mapnik/input/")).toString();
-    datasource_cache::instance()->register_datasources(plugins_dir.toStdString());
-    // register fonts
-    int count = settings.beginReadArray("mapnik/fonts");
-    for (int index=0; index < count; ++index)
+    try
     {
-        settings.setArrayIndex(index);
-        QString font_dir = settings.value("dir").toString();
-        freetype_engine::register_fonts(font_dir.toStdString());
-    }
-    settings.endArray();
+        QCoreApplication::setOrganizationName("Mapnik");
+        QCoreApplication::setOrganizationDomain("mapnik.org");
+        QCoreApplication::setApplicationName("Viewer");
+        QSettings settings("viewer.ini",QSettings::IniFormat);
 
-    QApplication app( argc, argv );
-    MainWindow window;
-    window.show();
-    if (argc > 1) window.open(argv[1]);
-    if (argc >= 3)
-    {
-        QStringList list = QString(argv[2]).split(",");
-        if (list.size()==4)
+        // register input plug-ins
+        QString plugins_dir = settings.value("mapnik/plugins_dir",
+                                             QVariant("/usr/local/lib/mapnik/input/")).toString();
+        datasource_cache::instance()->register_datasources(plugins_dir.toStdString());
+        // register fonts
+        int count = settings.beginReadArray("mapnik/fonts");
+        for (int index=0; index < count; ++index)
+        {
+            settings.setArrayIndex(index);
+            QString font_dir = settings.value("dir").toString();
+            freetype_engine::register_fonts(font_dir.toStdString());
+        }
+        settings.endArray();
+
+        QApplication app( argc, argv );
+        MainWindow window;
+        window.show();
+        if (argc > 1) window.open(argv[1]);
+        if (argc >= 3)
+        {
+            QStringList list = QString(argv[2]).split(",");
+            if (list.size()==4)
+            {
+                bool ok;
+                double x0 = list[0].toDouble(&ok);
+                double y0 = list[1].toDouble(&ok);
+                double x1 = list[2].toDouble(&ok);
+                double y1 = list[3].toDouble(&ok);
+                if (ok) window.set_default_extent(x0,y0,x1,y1);
+            }
+        }
+        else
+        {
+            window.zoom_all();
+        }
+        if (argc == 4)
         {
             bool ok;
-            double x0 = list[0].toDouble(&ok);
-            double y0 = list[1].toDouble(&ok);
-            double x1 = list[2].toDouble(&ok);
-            double y1 = list[3].toDouble(&ok);
-            if (ok) window.set_default_extent(x0,y0,x1,y1);
+            double scaling_factor = QString(argv[3]).toDouble(&ok);
+            if (ok) window.set_scaling_factor(scaling_factor);
         }
+        return app.exec();
     }
-    else
+    catch (std::exception const& ex)
     {
-        window.zoom_all();
+        std::cerr << "Could not start viewer: '" << ex.what() << "'\n";
+        return 1;
     }
-    if (argc == 4)
-    {
-        bool ok;
-        double scaling_factor = QString(argv[3]).toDouble(&ok);
-        if (ok) window.set_scaling_factor(scaling_factor);
-    }
-    return app.exec();
 }

From 967589442cc1d10a3052df729ca1def7e91d0233 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 31 Jul 2012 11:23:53 -0700
Subject: [PATCH 17/50] serialize transform for points and sheild

---
 src/save_map.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/save_map.cpp b/src/save_map.cpp
index f572c8fc0..52d0482ec 100644
--- a/src/save_map.cpp
+++ b/src/save_map.cpp
@@ -78,6 +78,11 @@ public:
         {
             set_attr( sym_node, "placement", sym.get_point_placement() );
         }
+        if (sym.get_image_transform())
+        {
+            std::string tr_str = sym.get_image_transform_string();
+            set_attr( sym_node, "transform", tr_str );
+        }
         serialize_symbolizer_base(sym_node, sym);
     }
 
@@ -218,6 +223,11 @@ public:
         {
             set_attr(sym_node, "shield-dy", displacement.second);
         }
+        if (sym.get_image_transform())
+        {
+            std::string tr_str = sym.get_image_transform_string();
+            set_attr( sym_node, "transform", tr_str );
+        }
         serialize_symbolizer_base(sym_node, sym);
     }
 
@@ -249,7 +259,6 @@ public:
         {
             set_attr( sym_node, "height", mapnik::to_expression_string(*sym.height()) );
         }
-
         serialize_symbolizer_base(sym_node, sym);
     }
 

From cb246a436f9332bcbce6fe6853329318e652e607 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 31 Jul 2012 13:16:41 -0700
Subject: [PATCH 18/50] update the grid rendering tests with new expected
 results (should now be passing)

---
 tests/python_tests/render_grid_test.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/python_tests/render_grid_test.py b/tests/python_tests/render_grid_test.py
index f2ce75b3c..596480ab4 100644
--- a/tests/python_tests/render_grid_test.py
+++ b/tests/python_tests/render_grid_test.py
@@ -20,13 +20,13 @@ def setup():
 grid_correct_old = {"keys": ["", "North West", "North East", "South West", "South East"], "data": {"South East": {"Name": "South East"}, "North East": {"Name": "North East"}, "North West": {"Name": "North West"}, "South West": {"Name": "South West"}}, "grid": ["                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "         !!!                                 ###                ", "        !!!!!                               #####               ", "        !!!!!                               #####               ", "         !!!                                 ###                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "        $$$$                                %%%%                ", "        $$$$$                               %%%%%               ", "        $$$$$                               %%%%%               ", "         $$$                                 %%%                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                "]}
 
 # now using svg rendering
-grid_correct_old2 = {"data": {"North East": {"Name": "North East"}, "North West": {"Name": "North West"}, "South East": {"Name": "South East"}, "South West": {"Name": "South West"}}, "grid": ["                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "         !!!                                 ###                ", "         !!!                                 ###                ", "         !!!                                 ###                ", "         !!!                                 ###                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "         $$$                                 %%%                ", "         $$$                                 %%%                ", "         $$$                                 %%%                ", "          $                                   %                 ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                "], "keys": ["", "North West", "North East", "South West", "South East"]}
+grid_correct_old2 = {"data": {"North East": {"Name": "North East"}, "North West": {"Name": "North West"}, "South East": {"Name": "South East"}, "South West": {"Name": "South West"}}, "grid": ["                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "         !!!                                 ###                ", "         !!!                                 ###                ", "         !!!                                 ###                ", "         !!!                                 ###                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "         $$$                                 %%%                ", "         $$$                                 %%%                ", "         $$$                                 %%%                ", "         $$$                                 %%%                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                "], "keys": ["", "North West", "North East", "South West", "South East"]}
 
 # previous rendering using agg ellipse directly
-grid_correct_new = {"keys": ["", "North West", "North East", "South West", "South East"], "data": {"South East": {"Name": "South East"}, "North East": {"Name": "North East"}, "North West": {"Name": "North West"}, "South West": {"Name": "South West"}}, "grid": ["                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "          !!                                  ##                ", "         !!!                                 ###                ", "          !!                                  ##                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "         $$$                                  %%                ", "         $$$                                 %%%                ", "          $$                                  %%                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                "]}
+grid_correct_new = {"data": {"North East": {"Name": "North East"}, "North West": {"Name": "North West"}, "South East": {"Name": "South East"}, "South West": {"Name": "South West"}}, "grid": ["                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "          !!                                  ##                ", "         !!!                                 ###                ", "          !!                                  ##                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "          $$                                  %%                ", "         $$$                                  %%                ", "          $$                                  %%                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                "], "keys": ["", "North West", "North East", "South West", "South East"]}
 
 # newer rendering using svg
-grid_correct_new2 = {"data": {"North East": {"Name": "North East"}, "North West": {"Name": "North West"}, "South East": {"Name": "South East"}, "South West": {"Name": "South West"}}, "grid": ["                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "          !!                                  ##                ", "         !!!                                  ##                ", "          !!                                  ##                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "          $$                                  %%                ", "          $$                                  %%                ", "          $                                   %                 ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                "], "keys": ["", "North West", "North East", "South West", "South East"]}
+grid_correct_new2 = {"data": {"North East": {"Name": "North East"}, "North West": {"Name": "North West"}, "South East": {"Name": "South East"}, "South West": {"Name": "South West"}}, "grid": ["                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "          !!                                  ##                ", "         !!!                                 ###                ", "          !!                                  ##                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "          $$                                  %%                ", "         $$$                                  %%                ", "          $$                                  %%                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                "], "keys": ["", "North West", "North East", "South West", "South East"]}
 
 def resolve(grid,row,col):
     """ Resolve the attributes for a given pixel in a grid.
@@ -164,7 +164,7 @@ def test_render_grid2():
 
 grid_feat_id = {'keys': ['', '3', '4', '2', '1'], 'data': {'1': {'Name': 'South East'}, '3': {'Name': u'North West'}, '2': {'Name': 'South West'}, '4': {'Name': 'North East'}}, 'grid': ['                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '          !!                                  ##                ', '         !!!                                 ###                ', '          !!                                  ##                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '         $$$                                  %%                ', '         $$$                                 %%%                ', '          $$                                  %%                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ', '                                                                ']}
 
-grid_feat_id2 = {"data": {"1": {"Name": "South East"}, "2": {"Name": "South West"}, "3": {"Name": "North West"}, "4": {"Name": "North East"}}, "grid": ["                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "          !!                                  ##                ", "         !!!                                  ##                ", "          !!                                  ##                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "          $$                                  %%                ", "          $$                                  %%                ", "          $                                   %                 ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                "], "keys": ["", "3", "4", "2", "1"]}
+grid_feat_id2 = {"data": {"1": {"Name": "South East"}, "2": {"Name": "South West"}, "3": {"Name": "North West"}, "4": {"Name": "North East"}}, "grid": ["                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "          !!                                  ##                ", "         !!!                                 ###                ", "          !!                                  ##                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "          $$                                  %%                ", "         $$$                                  %%                ", "          $$                                  %%                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                "], "keys": ["", "3", "4", "2", "1"]}
 
 def test_render_grid3():
     """ test using feature id"""

From 6c984b4f13dc5660ccdb2c396d3b688f8251feb4 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 31 Jul 2012 16:03:51 -0700
Subject: [PATCH 19/50] add testcase for #1365

---
 .../good_maps/marker_ellipse_transform2.xml   | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 tests/data/good_maps/marker_ellipse_transform2.xml

diff --git a/tests/data/good_maps/marker_ellipse_transform2.xml b/tests/data/good_maps/marker_ellipse_transform2.xml
new file mode 100644
index 000000000..048353adf
--- /dev/null
+++ b/tests/data/good_maps/marker_ellipse_transform2.xml
@@ -0,0 +1,66 @@
+<Map srs="+init=epsg:4326" background-color="rgba(255,255,255,.5)">
+
+    <Style name="ellipse">
+        <Rule>
+            <MarkersSymbolizer
+              width="240"
+              height="240"
+              fill="steelblue"
+              fill-opacity=".7"
+              stroke="yellow"
+              stroke-width="16"
+              stroke-opacity=".3"
+            />
+            <MarkersSymbolizer
+              width="100"
+              opacity=".5"
+              fill="darkorange"
+              comp-op="grain-extract"
+              transform="skewX(50)"
+              allow-overlap="true"
+            />
+            <MarkersSymbolizer
+              width="100"
+              opacity=".5"
+              fill="darkred"
+              comp-op="color-burn"
+              transform="skewX(-50)"
+              allow-overlap="true"
+            />
+        </Rule>
+    </Style>
+
+    <Layer name="layer" srs="+init=epsg:4326">
+        <StyleName>ellipse</StyleName>
+        <Datasource>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="inline">
+x,y
+2.5,2.5
+            </Parameter>
+        </Datasource>
+    </Layer>
+
+    <!-- points to frame data view -->
+
+    <Style name="frame">
+        <Rule>
+            <PointSymbolizer />
+        </Rule>
+    </Style>
+
+    <Layer name="frame" srs="+init=epsg:4326">
+        <StyleName>frame</StyleName>
+        <Datasource>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="inline">
+x,y
+0,0
+5,0
+0,5
+5,5
+            </Parameter>
+        </Datasource>
+    </Layer>
+    
+</Map>
\ No newline at end of file

From 4d2eb73e3b3a4b787d0e617079d22ea4710e9072 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 31 Jul 2012 16:04:42 -0700
Subject: [PATCH 20/50] add tests for complex marker rendering functionality

---
 .../good_maps/marker_ellipse_transform.xml    |  66 ++++++++++++++++++
 .../support/mapnik-marker-ellipse-render1.png | Bin 0 -> 15130 bytes
 2 files changed, 66 insertions(+)
 create mode 100644 tests/data/good_maps/marker_ellipse_transform.xml
 create mode 100644 tests/python_tests/images/support/mapnik-marker-ellipse-render1.png

diff --git a/tests/data/good_maps/marker_ellipse_transform.xml b/tests/data/good_maps/marker_ellipse_transform.xml
new file mode 100644
index 000000000..e96595619
--- /dev/null
+++ b/tests/data/good_maps/marker_ellipse_transform.xml
@@ -0,0 +1,66 @@
+<Map srs="+init=epsg:4326" background-color="rgba(255,255,255,.5)">
+
+    <Style name="ellipse">
+        <Rule>
+            <MarkersSymbolizer
+              width="240"
+              height="240"
+              fill="steelblue"
+              fill-opacity=".7"
+              stroke="yellow"
+              stroke-width="16"
+              stroke-opacity=".3"
+            />
+            <MarkersSymbolizer
+              width="100"
+              opacity=".5"
+              fill="darkorange"
+              comp-op="multiply"
+              transform="skewX(50)"
+              allow-overlap="true"
+            />
+            <MarkersSymbolizer
+              width="100"
+              opacity=".5"
+              fill="darkred"
+              comp-op="color-burn"
+              transform="skewX(-50)"
+              allow-overlap="true"
+            />
+        </Rule>
+    </Style>
+
+    <Layer name="layer" srs="+init=epsg:4326">
+        <StyleName>ellipse</StyleName>
+        <Datasource>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="inline">
+x,y
+2.5,2.5
+            </Parameter>
+        </Datasource>
+    </Layer>
+
+    <!-- points to frame data view -->
+
+    <Style name="frame">
+        <Rule>
+            <PointSymbolizer />
+        </Rule>
+    </Style>
+
+    <Layer name="frame" srs="+init=epsg:4326">
+        <StyleName>frame</StyleName>
+        <Datasource>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="inline">
+x,y
+0,0
+5,0
+0,5
+5,5
+            </Parameter>
+        </Datasource>
+    </Layer>
+    
+</Map>
\ No newline at end of file
diff --git a/tests/python_tests/images/support/mapnik-marker-ellipse-render1.png b/tests/python_tests/images/support/mapnik-marker-ellipse-render1.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a74baad0e4ec3a6f51b74a06db7b060ce8dcd9f
GIT binary patch
literal 15130
zcmYLwWmHt(+xD5EySp1CrMr=m1_9|%q&p>smQE?@l<tu3?(UXO>719}|M~EKnpx|d
zHG9^*_rBwbFjZw)G-P6A007YB<)qaC0QB}11R%n{eds&={t5tsTk_HpnjYz=8DZME
z+RM;~1YfSD^#soek_F7<Z~6`}u!#n%?r^Y6U--hq2kC3VvD6$T@&XVM5n(w_O3T(Z
zLsHG-H98)rIjCTd*N-YH^wxa#(<f3>X(s2i?jGjbCaf$hEEs@GF$vO$zxi@Oa&>Y6
zgG6yx)J)XLh4OgvIPwHTm_xXKSmNoNzND2M`YHZ;T|=SXFNCgJ#(BgM#%WM*QFjsF
zpOMm}RDTy@1Mp!`*_3y`cNr&gOuBR#H!Y$18|&i=2>JNL1xUo|Y_LbeLh*okg6`C0
zj;@QsV70B&C_XMl8b0_F4oY?T026KOV*jV%)IhRhlubmc0F&crKB4ve#iUwZLuU|`
zBECE>sx1Ee-TGd&nGc8;8D9)lRLR&rk;Q*e0<%gAaiP<>THr*-2oeQY5Uu}PL^rb@
zUB0M8h6P2--eWgWNWlH~5HGM?1fO%=p^VHm3Gs}m7w8_!L;KnteFLXM<Y7&v2|qw)
z4O2s3#U;K=qX09pSW@-2*eA&*<HhybfAjl@-4qM3CeKNfF3HG}W~r2#nlXs(Bwnx1
zrNuivQAzW63r4&huUq@@J`#FsIuhUKjO{G?#N8GW*2~U94N}_*$PRtJ_~@>&yTI9=
zCdjY`O3Lq$Y?)+GCTgQdo@z*Z^JGEHz<@P5h^G9wiYrzNnR4&LI*RP{fe$wxcm%T$
z+9+1{X&>9N6F)qW1WZ2WQEF;MqZF_k&#E9)xcqGWNY?c7FaAiJquH0q?lngBc9jw{
zk8ax)zr;mMJk8jF(#g+1Zn3%@K!JVl)w@4NRDl!qvTz*I=qbaqK6uy1$BpvehA<k2
zZ*wyVm*52zGQe+jyK}C*bdRH`{lr8o!-)7_urTFDB}^j(@EzJIuQzaljw}{ypp3+r
z)-<2eWJOX%^19pLdz3-jUz45?2dJV=O^9{a@%`U+whA!5w+z^hz_Ykb8d&RCvuW=6
zhBARoN^!mYzTYALeFP<CKxZum(trOEEiixpcapKG+|MAgQJB=R3{BO#Gx>5Lu?H*q
zqf9X6mq*<iLzT4Nx6S*88I+djbn+Ludvk3gs3y(nGHPIXkR`aJD_vQ_!!YM!oKk61
z@`CTbBM{Q*hV|zjnT3~S)k2H^u7;Oh5g|uW;{Gtq!>IDzl}%yh`#Y?UW^du<7H={h
zoYydp*!bS@B-WUwLpVH^H2Rvm7tmgc*4Orj{p`+s?vqQwLhC`R=G?SnaY?;MK}q>b
zcWv}7%1;Ao5!-#{M``%w_{?@I#S%h0ktdgYJSYV;I!mS8?nKVda3xjisq9!`Ey3=2
z>^USpv%5ccokVHr#mY}CNN|fCD=0d2yKP)!(~~OR>}pF&4<8WrHcw7%j;+|zH=4J8
zWqmDAs`Iyw3ikQqiqXPlWhJQb?w3$JbIXcxYthI}iBq9>KF^<;T9MNS6gApR7Xsd-
zYh0ecH*0q9JEU+-KI}>&7M>$x4o59?e%=LVb6%YMQcp|>tQD#GJDL<kLp*&`7$Dl}
zX>!8Rz@;*v$>*}vO=-9j9DdeNm)0MB(k#0sqoh5S)Zx&`Qw}BAa*P7E2XJ?Nn2EGi
z0wm#P8lD8?#*2x@k2wZb$X4z~>a`3OD|XOEmQ#LG7n}aZ3y9Ub6UPnmu0;e-XX5>!
zq;&bF@e0zz25fF3$L1y^a-*lWTDFtQUY|q0i*TUhuXub7xVYBR`#cw+d}0@#=7f90
zQ0Lb)6|k0S?7c@7ABN3cW%vhRlx{Ls*RelPzB;xRW3Cr>R35MJS+(^TIZh#=v39_S
zXBJv^KBjOb;Im+&hrekK;FWq;Kh*--#R#%8esKbEVB;QVCzQw4-<vgF@~ZV8I6rOu
z486;!@3JKNA))X^QP%LKE%VnH5%MWwcrRJkis{aLXJP`!2N>&A6v)Smc@?g+oDSAA
z=*z7NJ$rl7tbf4U-X@kLlRYc3Q;>$Kmy!q~AKBk@i<u7BLh|M}S-1tQAm8G&LQu=q
z08_Y~^+&khetdHmSTr5#+EYI@-*;}@B7+#V|E3+WX<T8TZb@A$a14t<ZudWF>lrJ7
zA*@hc8gd(6Vgup#@1rp=e63u${8oNp1rg3<bsR{0%qCiB@uh8uo-%TO<#YH9W1WH0
zNxE6~zJJPnEdR8<X-xJTimq!}R8JCQkh%v;H>?m5l-U+10IOsD35%@`9wZJ9UEL!U
z7-aXGOto7DW21>xzWQSDdEZh7Kybg9$pAyrAIMSIP(H;9n;(K>8Lx7_<OwN_tWZRv
zALDVa9&W9BpE~B$G@^OJ^^0mtW%!@CeZAo6v+P8-Q3f{Se*T(Dj!5@0`(@ur5+zAA
zkCGvU9Z+#=9kmd(yp-dG182awfOl^Q!)w9?#$+Q5F&*|0?|@G7`_|8;$fzx<u146>
z9|w=+Ac%s^wTXXy`F8Myv1J?6vKODPqjMS-ps6>{yhAuAo-wOz5@?|?^qG%HH4`4B
z69*@~_k;~8q^+?=nUomLB~JJp4|Hx(GbD>4==qwh1D-b+Ew)U28_N>P9}Hg%mR>=m
z1aLWplCk@g((U3+@F#sGu)t2vF72KE>HFOG2>-4Vm{;!IHWVaY`fffv{2dB$G1b)#
z@=(*2etNHn3DF_q6D28bo#;LNRTjD$FX&KkW|>SkyW;#2W`d9`dY1ypNhoTNXwo}K
z{1}YMejd^&{6SxPJWwW-%w^7`jYHrlpuxgPBf>9Tfi5%6*PMqs`wJ)*XJ_K)uK|n!
z%zq=EM-`_5hCd$A{&~Z|cK~0B2C@Bh&=wP9kUEKo`1mm7Nu9{46SG2Z`MI(MkkU$q
zb)^DS!!m=M(gV|2nCEi=+M%XmxD*M7{VuACm?O^li0C}lNi1DEa9j>rYMHnHH?+m%
zLb%Pk$X}j#21dKWRm}B&y+<Y<7<EVnNn&dYCs`G;V=(on(h$GN1KS5t&=_kiPT`lu
zb%T;^c@a`U_0nI0yR;Z0zZ8fcUl53>vr{p1KEYC^t>25`nnaVH_DHNIYo9vq22j1@
zORH3Uf_qma4Zs)`%ZTIr4El@-k@FWE+PA&j$sCzA)Jr`17bzND-N{aAQQ=ReEndZl
zWy}hED-lm!5&QhFDnYbJtR*_@PM|Q5U~n$v*X%Jm7Y*!V&Gra*r=OYy4v@hia^bUj
zPD+QRKwU6ybKswcF{Dj#l5TlD>PKFN^BOQt>#W*hWCrmwsk)!Os9wwUH&DQ^>ar6?
zyT+?swI;aT=9sX7>Je#I;(_e1X>O?QROLMwhI+G*T0>gWV|Xm^XRJ<ICPy>^)e2Yo
zu@Ab4fNiddsBJn$e++$G83DooZ)ZfvCs^M!Mw_2h;1Uaz5?0`SA|G|*@xu1kG?GX{
zG4`#$ztNTxX2=zbM#3zoL)1Qy+LePb=_h%v2d9wkjxFt2LahIZ`jCFgUzm*O><F$Q
z9!{np-6?U!Q&$8W&QuCoK!4}zR(uU7drXu*D6!TfX6t9D!>Ysnd_*as0}^q*6Oa71
zEA)8XE^Z?&kJZ(aq63Gho37a^VDVeCg2hw!R{UZ<$#Yp9dHjyaW17?p_<Cvzn<1XX
z`t3Fi<ctD*aGNrJG{}p(F}t8Y4jtPXMX;r#`aFx`@})O5AT=RqlojB<dUX2CWc_$`
zMB#FEZ5aKjYk9P?L+XY)Fi$T#0yVu>6Lg=sJrbs=HNDF5ac`@CVoLBgS@x+g3*yaR
z7hcnLa_}BDgt3{O*CllCLyjXu<<X7~@^5MuyYbu-gB((g=sbw7WZ)hq5X3&s)UHWI
zN}W#<^y<?ZOfWFri3(0Dr2gWgp)8U1vFj>{8sN5Vb87a@8N9ZZC+mzdf8h`yHOn5u
zA|y~SQe8w<71q+R1c^6L$T-I=7jg5^m);WH-8-`oN2cZpA*(9UeUMg~%7aXU#oyQH
zxwizFO5e?en4Vql=m@7sOV8MP2#P@pz3&4)!9nP^7%Jm)QyILfGg$rlp6(sXz-3>E
zi#A=psm|p=)WN_2g^W8zb1X$aZ?*3?(&%{OS>ZLc?3P4HfD<;@3N8^F2v31lE?6#m
znaD95hxToy1isb6URo;dHoSvqFw$o%h=YIkrL4w=-)RxG@7cZ%Yl@8AjFq?7HfEI6
z<Sw@f9V}(AclBC9K6_L@xjY`s^Xf#km1<wfrrIW|H7NV=BEe`~R{4JDckvdUFX=Df
z>Ydyz#4rW?#~4xQTr~+CtBemg1!Cks{wo(7_>>}u%>4x?2Ao(ArpH4`r3P^Ap?7>|
zs=d$eL&9#Pwj5?*m2BkQE~}VpwX>ZOLuxT0+}$#2KOd+y!f$#u9du%!0=#iM(bFUW
zwzs2>D=(ITA!md>gtdrX?Tbl@j-t8?zu%Y`Md`wZ*fI5yoY!hRyBaKRb&(oKWJwDW
z*VdZH@b57}Ix>)RlT4*bDM<oUTVIAu#CBz!2Pg*SC9+TiLpOVskg;Odq$UYLl=Tn8
zo)T#XGx374`b%SGucXQXYu^5cThz3mSP?VT3Lss5`*ecLk90iCn8CZP7_#``BPRTr
z+7C#X<Bk&?<o<R*T)LRupN(nXv!5dLir`y!z)a5vc`&7QCWI7}eQ+gvb{aE@aQtg*
z>swrRh^grYAVJ7VwMf-}uC{<Uhy|F|#uP3r_|j**OlV(Q9-kT&T1P=0fAjqNB>UaL
zL`qiG*T6zYO;Pqb<E$Y_wiT<m00+9`a9kW;(J*;DM&|EXpCO@rEJSVBP(L6-YNO;W
z-2eReHBca#7L?6`n_GdKj|aj07mB`4m-VvL{&Kl_N4t0P=S+<A=(`6rWg{n}ne0jA
z<~zC#g_yU^FHw$3S7C0CV~<Is#>*Yh*<+xr$n{gq!@({2hDZbZ#pc0!_72SxO>PK!
zZxQOfMWUPR+L=u#q{@)L0U4FB+lTSNu<<Tz7t|<%B^7-pE6dwLO1O5=<UDE;*f?%7
z#{1HLzIsif-4bd4Ja6gU)2KH<_NnD)!F!+gbxqLy<x#0!5Mf`$%({_`_(tgG3V~yS
zEqi$DV@v#y1f9lCpD)8-ICDl;AdD9D&GQN7^3*S<M*F7GPu179$X#xmnLvypW5aI$
zax%MoXMf`UFh0SJcr3V9$Q5ZS^D%*8?Isk){Rll6Hj*?loNP5KcAdhbpp|(GOT|u|
z_+<KdCd=g^DF4=83{#|OZs&fGe#)b<%yFir!g1ld-SwQO?LRK!7&Ou5DCYEj?Q$1l
zBPQg~k*y$Ye}M_D2@MICNN?2N*+c00X>{VufaNp=uW!WjZAa<Rir8(J_^*}AgPc=C
zbR0*uGcOI)OhdwFm;16#V~Vw@i|jZlM*_o)LC@u%_bC)~yI`!F3C81p==^uXbIiu(
zBk=5NpDvZos;35MrHbIPzI3>}^d_~bNxd&PBG;?rQFsCuTEoiy3}8|~5{H$yr4N>^
zrv){sF6AvN2`6c-|J~f<CEq>g&k5O5JjLBM6TW_x@NK5SVhF{cGbHBstZ$&H{-|f6
z!Wv5%z8iLOguam-0aGCq5Xu)3a@IV5&DT=Q&$1$1?NWbyujY7{GvAhdNF**`C9IDG
zlB4#PGqjX#Hb<?^-io%ehh`u>_^_=kw26}K_l;f@z*3zhhQ2Ni8JNlD(u77EJm>J8
z`JaYJo1Nb_oJKI8thEby4?0F{EPlFd9bewuH(L?JSevG^HazG5xl+{cBVj16rcq(;
zMyY-Z_s^z_Rs#-*La5Cb%Ri;MJcX8N;0-7&MkSLSXYhVZ7djnTU9{|Ug%5o^icSwF
z74^MLQ~Cjl^tC^kGrY^#>QUa-U0Lh;^~Zk(a;$%U^B6Xnn}p7DhBMaW7+!6ftb_;A
zndXII3RfoxlL#weso*p??k7W#l~U%9spYkq>7|s!4eVZDL?A{<P7@zpBcD1z@mg~a
zMib~h;L{12n)uSgIdG{}fgn4FNRj(t^Q&`6KHvg%s}0*Gq|~L8!v-WfI*ck4G~d;J
zB2zhPziRw0+_up6)pk%JtZPV>VlD3X#g-XC#ce;7e{l83Uu^B=jb;Y=4)>?=Dk=sP
z-p4<S?4Pf^&hPq4NG;!H6fC_%wM1k^a+rKr%EU6ZX`k1)+tN>M9V1=YTL(XEOFW+D
zV5vqDa)ew5c2qDzaDSMVY_-C)62VjoA72Zna2(VPxxcIHUpD^PZ~3!yy=%X>iuevk
z-q{@Vjge;2vhXdp68}pL><|9z_$uJxam@1f#Gd8y{kk9&5gKQ<U-MMwBHfAa=WhNf
zE8=MiYvCqyG-@{8nBgkwo@}nU5$>juRw`hu((isL(F~FZ<jX^+a)fAICH({6@hNyS
zSGcctbMF@2R#4K8s<;dD`f~8!SrSATfYxt8hhGdb5lrDTcpr8CuDqJD7&drHmUEk?
zg-I5Y!idrXy|YFxOmWSO+ybhlTL}MdGgkRlB7sr*_v3mLn2t8Pi%Vs%I(XQh-YRe1
zL-3bt`!!#WS=WrB%=-5=#>FooVH)nUhZg=@xwID9OaqV@ByrL$jJ<?@?=K5KOOyDq
zoI4tATQFAgDds6r-qVh1?`JveX_-6LZksGrb%(fBN^LJ0u7XQ{Mipr#v2Ji;`DnM*
zxvBdA(-%z9pg1Sk&46o)<2IG$q~8WN`zJe=uIS=sVPUseF$i%|R1bLcvc^?o?i*z9
zcaJvvRxj$h!|TbtcouF8O6bGQAP!NKz|}3%eF~tT^k@dfAGXS8gMWFQZIv)SUhm19
zKZ8wF1V<yNN%Z(1(up`d!}4#CD>TpT>^Yk*erkN6fKe9LL@)W%VCe*g&6)ab*69t#
zlwVdBCK-)8F-f{?{d|Me(T+uckSl4x%84|%nyz#)1^0oJ{6=N`JfTE0(vM@Y`AO4l
zW8M})wy|>G{`tW{|1W3zi}XLp^083IYxM4WfQvs;0DhDK2)dvUcnFnQI**GSSd)!e
zEToCWm&OR_zKbRkOAy5T4xO+F3Lz2-P=`;?aF1Dv=i4Bh_o=nqo}|0^{<-iIvlFUZ
zJ{BOk(NV~tPM|iMI8%8$24aNXEafRLRTc#1=2szhRKFBq8+ww;d(^w;ou}YOIMfZ6
zywwq_WCR#em{=VKR-hNTtHTv7lNn%;U-|L6VGpHs#d-rhQe2;Jki&@tan8q9JL|?%
z`PtV%F<<OgJ6_G5#<a6O`nK)<YP2J1z1PhGO28R+eW=x+H{{9^YDB`_O#GP9)0lyL
z|18h^3kqxkoi)lj=Vj-~pXXpv$#}--(AH0_mo-oqr-f-h-^G_328|PJ-P+CCp)ZQs
ztxI-v0#AF!r|$@S7H^VAKZg{|aVwC+413i!Gd%+)>R<=u$K--qXq8OYr{Fm>@R=<5
z!$;ePFShB57gJ=H1`o^D4;JU{<DAcbP97h#C_b^@dr$iw4)dMyk{@TGc+-#wN5@p@
zucXk)-NHP3Wl#c+>fl(mml3?V_^pnta7_&87#&AZ&DFgl0Xdo+rzRfxjo!`j_rCpe
zceaP7t%*Jr+%S6?DxKGx626AaYp$M0`;37Xb}=*2k(%F3Ml}!7lrF-wh@F38kbui)
zBfd|ROAYr<O2J249UW?g)@$v46NID&WoWT@Z*}%4`t<dz{%)9k{b`8f`5|~SLjL>H
z`MQTqjR6A{X})!aTa0B+6u)KuJ-ehXT37Up7(I}G?*|fiUg)bU_=n2i^sX5Uw&kM6
zbaI&qx;tW*>4An$g@`4S<zliJUHpBjXXaC>;{AZ1UEbsu;#GXA9=nHV%Ek~(L1``u
z`jPxvP`#o~p}(45@c9x0&6nyj&;r|rff^I%tZ<{=v#W(n@pU6#Jw%M)t`B-&Wi!?7
z9&Np9LvLDT+g3DwWBg2cd?O6wWW)FmRDlgk=_LxH<c2=WbH4i3Z_!^}L2b6lTdh_+
z7aueHEp}R6o*Gs<E_ENnmQelJei6K0^-TBO@?r`0ZpJREpI%$_D&n*2S%N6hu|&AC
z06BUf?z5l8oaoeQuMzZm`YbkK-V;|mf2YY~{O<GX!;=AarjN7#kFIz8$Q@XfT?#KS
zzxv9dQxOGedJDl(bn(7`%MmqVXTbxkc+C^L<r#%(VwwG@_kAWJg|fo6iCvWfHr6Kp
zS?%7)oe(~=`#2x|1|9VNVl2R~&8TD8F}=R)U06$C^0=o3VQoGI6WhWkdADuJJi`D$
z|LwY%1Q`ud(E-(i&>~P9_?EN*-ALSfm-nTDHDW#dL(#HZ7CxU^<Ou<**M8mj+Pi4D
zV`<P2HnpO|Q2jTYj5g1)O3PoEYjf8IL}?EAGR8lO(*l-5AbtYq^>>k+oXk<QMIFp}
zp_AHw^~vG;-eyZx7c<4u)QadNf)!VjWP+83Vv2vV6(>)V^P2%v6V<mLx;K0b6{2{H
z8xMZT%+m%eM-vy@^1rkYX?USypLPx2G7CFQ-sini_6?yjw}vJ&|B=raBJi;_hLyD8
zX()(D5@wA^U`!!BAilt_NxkNUFCIr{1C#no^Sl8SmXrl+F9oFa#mCO5^k_|+I9Vp^
zBb$LKblxZL%PfHnLF0>_dnkq_)mA8Mu^tD#8y4*5wGC)6_R&Ng&iJb>+7+%m@g%BQ
zBQ!_tdcw?hQ$1a{*|FRDFG0NLQxZ5Ajv4=XVmIw42~UP}P~!gB3VO6Ds=%?Uf|T8w
z*-#D@ZXCq97H%_q79;uQi@dLng4Qp3PQdcVyTfl{2bD@7ew^dtmA`fOr|4*c4<Gw%
zr^G~A4C?MPN&|WIB5jv<OCwsBtll5<=k5J5|3KO7h6B4f9SOu*0Z#d%h*cFpqN1vu
z%tDy)sWd$148~%kUAOat#YfY}qf>a%hbpfwi-Zj}z0%@Uf7W9W7Z8yOPu!6r%2zwN
zCEC8u*ij-7BEz$B&MX36qq*g}2`5G91i`J0OpQA-b=`jBC3G~cyOgIj`A3U?F!XNR
z@|1V41yodj_9#*fm*#Fd5uAwq{5IJo8!u22f-&h{r0gRKL=pdnmDz_>lRk*nim|1w
zDFgOC-22A1v1K|fn=^-N0Ljh(As4EENgH~U$vfP|cm-s*cq?%CDeN|)!y!H8=L3*2
za;S0<T5q36vDN+H#@$NI<hzMSr=|9L3JQGo&)3SQ&0uZEm2(nr`J1zL1*bfLWK|pv
z#{^1X3KIf*NMZGz@rLS~_UPk>l;N)X2$)Mp!xB=2?q{-rwol%omSYw^e>(Z9PD<J7
z7kpY|e#-eD3u3gXOv*&?`l>Ffenf<GOMc4<Ah5%S$Izn@I%nXB!m>g~lK1UA1v(DF
zgk7$G#Q~XLow^&{_J?-dh=pHu`}ykByw#PxQR?1ooO8$(OcLfXL!34gf{9E!jw)=+
zfcXR@DK>ycO6J4~D1)Vq{YICxi*^zT{F@y3+8TquTvda0gKmvpj@tyh&?#XLJ)cjQ
ztvP%l$oiI`-#!YM5H3tegt}P%8zLd+BlkfmLxvVK72er?FjJ{Kz`TQVZ$EUlko0S8
z067#c>)mIoR-d;#_ac`&N7x|&yrV4z$928Ijc?PpW--OlV?mSdkrbO&wKa?#8`dHP
zo|wmcubpI(nTV_JFZ|Z}f{V;)57yU#P#F}0v~=Mh+znd<GlcS?dx@{*E}WBoK{flZ
zAbteUVB#ayHDSVI?C!8~#875D4LEdrqC?>aPlX-jQGV^Zvw-_G6NohE7JB!v>qUbS
zu}UiJYWOPu>1Hnr)MC%H;!Pu5MuXT1hX^sJiDhV;w(OM0TeeKj=a!xLduuY=K)Q3c
z(c;#PJ?zFB<%;t9U=lo<4vOU7z;o?0z0#D6g%4K!h}<lP3y~E`rdz?F)AIISF5|(B
z^(|$fj@K80kUzH=B(>lC)$^_OFQkdUXDtZFwprWE6T0`Q?hE~0(0Qph%&XQbiwVJH
z18`w2#17GsHh6BQu6*l4$F0XY)*ab99wZWtr?jC@zQ=+wF^_QRd=F7%D)j*u-2REf
zpN7W8PZN6Qjf?dGMx>{liW#x%a~Rof7}6WVk$X=grA-2z%enmo=O;{4NNB>$S#^SE
zl3J$SyNeF_rLQ~ECd?AR^dDewbN001wufO#rPKI%z^&Z(v_6sHw#szp?Oatsy>3Vd
z#f}~_^wA?ftllp@rcYD&Yhr4Oq%TNdLO!wqoMAqb3k~cC_k-v~GWPB)d;Jr{v)C*;
zRTmj~Pt|cLEh3+eV>2=MHw$cVe1s9f4*ziyRfAQFRR;~$*{qG_FjygkQi)XKWeW%d
z05klGqO9Yuuv+?tj748l1$1kgDy`POodvZ^!jK)p=r8=4TPgis8NcDgz`qem6_uk~
z2EIo6!Sm;C#x56t0;}*g9d7h*m&~QJcZ`mBDZvi2-6kVmZNEY8;1XC#1w>XK?!DG=
zshG)GbaEsPA;fyG@|OjnAVV?yB$+|{9KHGD{?!YPY-Gw*Sb4hqUL4vYO8LI1C%Dmm
zO&Gl70(-U3N(!Tr|M26RbSf#Fa}}s#S&P8u(XG?_+naREcch0Ua(Z8ES?1y2y?ePU
z{}r2%6vb_q?_6sryC+$!X>5qfjer~N@x;*PlwkP`y+J8+BbNoC+@Yk5&wBbj5G1HE
zG!oAhQHjp$g?6*ydQ=-~E97au$7DyyG<#+wTeHi*gzEm-E|z5~B@n|VL{lhMQ;(Xq
z(om>XTaLoEx5fb#4EuXZ#p?E-`|@w$rOBq4KKpH#N@<{QHyYc1ObSVUVMzE^7*P1G
zkPzy3%(LC*qA_MzCI_2nh1jhZphVI!Ff~&-`u-36X?c?O4LdnqHel#`&STUrOTt5k
z3T3Cp+%Mmt$oLQH*Hq;AWsfZAx`)9p1__B%Ac3ARf`|<TuX=N00z!(PM3UNaF8`6B
z5O?H)%6NW2)RiP`+gY1bHiJRhVgJ<WB#y1?I``1K#oqHjie^P3I*{@uZ$bOs6Ydv?
zr5G=9fgtL(UAA5vh#^u<@7(r^V5B%WPy-jR37sC?1=+kJOqi?)p{RuLfjJyy3t3Ez
zJcPYpWdlzU70<O-?kxhVb*ya{B@Qg1hvtyc#r9lk%+vB75B~Y%Ny0=@G<@ZIs!~$)
zaQ|4ng=TAG{=d9!FS&5%t+u~^#ZtB2`JHnR{``440RdGL;*NNU49g5{W%KfpljdbN
za(G`s$u^4DfDaaWwf3D3^UxEY&R16)h2XnHAaDCUXXZ_FVqpAESD<u-+zZE1c!4NO
z!LXA82aSD0gZ=EJ&Epa!>>rn@ZFjqfGJ8IV@T-Axgp%^ndjf=)7Z)`;GW^<TF01?m
zh)eg2*IU<=#tIOri$&&wi!nyZ>LbZ*F2&I6?VLpT!*A8fq71@$nE8~;bS}iU?K=NS
zg$VUEwl9RU(@RC$nYzsvZFTF4t=U0)@{nR!@|sv1&)!qP>c}X71^NE3U#U^&B-rfp
z84Cqt9d9(hAtP(OxJLC38wcfj&AqSXBh(`q?>B3&6NY?NPB&=#e(`>hXC0@1Ja7w^
zM%9&!7MFNol|-yMrIG-YC-5QXZynH;zd2)-+LJPFR_v^Aa{W>7<Ii4``m1|BBOgmO
z-5?E~rwyM6QO?EGKM5*qj&Cp-3=&bAyA1&k!L>X}=b~)@&^wL~Av~mbRi(W#Y5Y75
zKb~l<&4ZE2eCVjZ-?f?&1@~5~6t&xzs#Kq-q!LfbFLfW5)0e#W=(%S#_OpCdYFn0z
zF*irJ)e$d<B>-v*6mdc(>^DwWiSrOJL7M0LDw?a<yh6%izM|4?nbETDJC*DH*+wvc
zd)**9Vx3<4kKU@DpQszf?R?+r!d{wk#YyZ5EUaGe7`DyhTfYdzM@gg^8a=%gv8i;(
zO;jodLr1KMqQKoufN0PN!SnfdBeY%g6U@Fri_?zv(x3gM`0`<*&179$Qe_M0-ue~g
z@nv8esJIQBn`i%-1xhDfu~8Z>`J93e<GTc%jg&v63hfJRe}(uWgzjcc7<mlqH=XIH
z0+`NU|4pnj>(-R=C}+AXP)vAd|8X@~)S+G~jG+cQSc-z=;$I80GUa>@-pHl25~Lrj
zWZ(3PraU_0Z8kQ`YmH2yZX=R6krby*7)^T7?i;vn<jcho-!BxnWI^}K;lFATc>tKZ
zw+#LD|BpD~5!3NBlQ-g{o4iV2o>B>}Nvn+NF4lOt=&?-xU5<~TtoKPX8kJURjsKu-
z<YMuSz46NQPXr5}0<?30^aKMC7i9E~(&r+0m`%xC{lOy9-L_`Ayo1|X+b&I~U3{sE
zs@qGnw8NXi>*LCh@E$egq=6r`EJ<<qArCt(7ckY6U_9{O$VE8^YrYVLC+9`MzEIU6
zFL$rIbA1OQZwMNw^E2)XV5fiihzahX+ZOQqOK={elySw%S7z~!kiW(Uy8fP(7Ln>u
zc^KXgYuF0WEnReE4@wP4%s?40NATiLyXq!MI>l;ponIQqcgmtvQ7Hd<J}i{3d$(*l
z>q=H>aC@KQWp#)hH6GpknQ5@TuN80`{UXfR816YNG<;sr2qnu$?Q~WLiyvSxu93nb
zNt7|e@Oh9@TxJvQnkY6!NJ6A@wTyh|iQcDNo>06^+K>7H7|wY!*gssFD9{N_{xl@K
z3;8^>4>hX9fu&Sd01%1%CCQnn80*sveqB@@v#%_8x6IK`ymC{TR@oee^I7jDlI49|
z7<ru;f-z*a>8`bB`HtRvL}S;$dF31j@1J;sT?7i`U;<G-g5-Ys|8YIpE*yW#4Y3)z
zvS;}w|Fy$>X@$qghx73Drbr`-f6i{`OISMod7QfgOYLrUK!{NMzF)Y!c=G<@+b{%4
z!K6i0ihlrPlmtE^Gnt;<)tA?(O?2pQQm!>mxsUG1b(j7JmITY(M|Dm0EqAhjvP8}v
z7ZHwPdU~daWo-^m{YK0J0NNSEPRm2Ff5)y){HiacM^ee;Zk118cVMk|ra3R7_=Qf%
zuTYeUezecLY*^ra?`S-|Po4G8zGyR>Pn#>kl|{GD<d479xiPS_a!uI1^%Hzmc?T%G
z0XgcT;<vS3q(eI9{a03VJ^p9@Lom^$`b~F!<f~+@u52slQD*`_7YLv`10;soL?M1o
zzDCBqTT`{GNc`+-ITbrX)Eb)S^pUqu>bwh&uaAo1SAMin0IX6Lp6FxfD{JDMTnG$F
zWhptjexS10>JyZJV|8|HzxN_1e???4Cc8cBtugP66cPay1%%>kx4u#TG4Me$8F%DF
zTF$m+Pkyxmffu*-v}mBA^ojX59D*Pps&no$?Y8SJlT|VR`Ad9oQHrN8({s0o^By-v
z*Uo8GkhUXtMvT`AF|R?FB<qvI?agfIp9Xd<rkWQqW?5hx(T^ny7k#vXS^Ja_)2Fe>
zcIh80ug|OObj%FAea2l}ueM2WRCs6!b;Pfg7>0CmRHUnnqpX2tMBSRP0Y|X1Mg6?{
zn|xsCZD;gM5jH&=q3U2v$;ZG0!FR4|d}%dW%;<tz({l~8AIKmn76&yigM$?pqpvAK
zB43RXs|$Q=2gbkNAV`yv$k$En`0v~*;dmVWu5LJNfc6qWuI!)%u>T>iYKLXwkoCV-
ztF-C%1nes|TwuT`6i1MRB9aVsknud;wOu=$)4<x{Y^Gx85-E_O=h>wJS45{{&QY?w
z8K9kyYlL>Zh+{%%&0ryz=(tXq==yOd9|L;f>hX8^jzwJ0w((Qy9n)@X*?naR?#yUf
z@+z+TeqY1qQr-GDG4m&{?Ne-tVN;l`r3N{G1>eBr+2+RlvkqJsaq-0WU`&PA9<BJ(
z?zkq%^A{ewS+6Xd9_3Q~@^LKwn}&_u(ksz)4nmKDc+dC9VX*=G83Q=j2r40Gb;AY{
zF1@^MBVC&&JZE$UryZ9oe(?YV_fSk(8F{$Or(!sF?a9Y+f=_Y2^{Z`_0wg0c?+py`
zu{gL`Ukq4pn)clbVNJfLK+uaZVmT4PClhtyoRzg;)e1f{v^F{y^3(g7VQcq7Gqgof
zXa}`~g>VS!4}O4=EJkTv_t5&8`ZoCZ9XlDj^l-{Xe1uQq^ul_h8FHtLPUoiaH#8lj
z`F$@xpI4{+$k|jiiogp@U`QX}JLTst>3_)Te^_`~8Kc)|fO3N|SumU7%)m(U1#H5{
zngs#x>V6lPZ7m!##6I*dXBS5rwvMxMJQ{3CJ#8a@H#@hgMXQhR6(Rg4<aQalPE$l3
z8YszPVe!Uk>^GTEpY$tgk**|Lm(aafhcrSr4FWEq<@d4`04!4P*Br_Jku?cmo(z8>
z<-fPAcroA=Zhl1b5=4tJ-nJe5j_T7EnY@^euQ(srnc$fgzQ;(*qLZPl^WeJ=OI7ye
z(rSX5ZS?NEEF|0Cwde*-M5H;<UD;TLTnWNDo%;=)ij@P>u?<A|Nn08%5QUqDI@vc?
z&8KbI)mvm|k`i_OOH_;R2)$88sr^Njy~A*4*lJpI&_EK8vH=?QNdIRQ!}3%9#1ugX
z+IKFCVje|oqG{!no3${{jUV}&{zOrXc$IuMT`72%Hc3(a4<m?~3cwWr?KH{}MB32v
z5NLk1G+OzO7`s(mXkRZ;Pvxk&OxJEX<g>q+{^JD~eGgBM@y1%Z>JInnvc@sKkzMIU
z2BA3Y=%h#(#7Ky@Q+?8Zj^_p?gSH03vg*fXw(8$VJF5B-ze*l_#gJEWw=cJ*`$`<I
zxWp@kco6CMWlAzNb=c49sfkDkd&1|dUi@2gjk%5$pAWg)9fNn8ie;p@>~F`c-#E{{
z#-~q}kgd}<Qo}u{@a`$11tXHm!d849UYh$t!E?bsX!I4PXd40JKXwwC8}(f7$1S&K
z5hV7@x2miA=rz58#>a=FRu%eo<l#y!k&`t2B_*uK(%*$1PqH(MyyXBT&wcnc!W+?h
z4qlALk`-d;(D>u?ACYQs-fCgf_N{fJ+;yQ+_msEYu0CRYOK<-&Dp$@1I|hTK*B~(P
z+b%jut1Ahadz7u407rA*%fVp78;85j5Rbs&%J|RCLMVYnINJX$LukrtxA=Xqyz_5L
z^nZy{lll&hi8?{y=WpKdn^<f&6K#IujBf^B)^55aR{Es^8=?{JTOuh$j|w+@jGykK
zUoyQm0)<@LL+@h#qoJGkU3`sp%XtgSPvt$KbnF^3p!*Em$C2zhYby{iL_0?{hSAF=
ze)>)Vn`5&nG%%OHt{%al{2Xz#^c1yiebw<u+5MO1sqg@&oCi0j77PBT*=ejqqXi=U
z#YrsB(mWrl<U)VmjoL1Kv}wh}+*1NMj!-~4POJ$^eu$D?DR4~kKV}~Ou(reGN$j&^
zl~mBFN}3b^<QQeg&SbO43inWo+<ON<ip=qovIcew#9#I_Fs{E|&A%|y0Y!rZlLiX6
zaKf{zy;|s@ct4(u?BB(X7QAnL36m0&NFn`|#0+S*0HX{v58%yHbDtdnQdaS_JA_y#
z6_aPb<40?B(2q~11dw+B&uR3dTUCGn^joHs?~}@EJ|;xN3K5W_I|a)HN`n$(ZeZR7
z67gD3kttU(XL`8(Syqv(B+LMA3uGK2pZ(Kn`dpS~my|8(3TzvvU4ywo`^(h#1nM&k
z+S1oVd?5D2GF-N{fIFfS|CJQ+jqT!N@{IY50rz~g5*9E`sTTL9(`fzp^EqI%yB580
zNt-l!c{1pw(D}7e9Z{Sg1q2-KMle^>3&Em1HA%&qF>fv^?%$WP7je8g7cN#6gT<>+
z-UMb(H9yLuIIXPydj%((KExd3TNCrLGFw-JY8KA$o02`pp3*=Eb3B$dlWMTq>6_IH
znmzPPJv{lCNaIu+34}=S<7a@R+d^gESZ`jZii|KH#H{|K?aQx9%*NM5II(YcG8tF)
z${=7Pf&G5rIN#B9Qz64ELz|zJXUM)ucJ)#0?9VFAq`>QM=GR$FfE#0s(x~p5)Srk=
ztN!0_V4x&B^@7IiIP1Nwa~c*P9!E;MtA)OYd6ikMq~P@!{shDSscY$<wym5OP5JlX
zNHNU3#I<)!0A!I{8q=jwk<keTnIz(m7{u%{-BWNryqRFyi~V@)2>+nrl_0TBw*U?(
z_#qvdO*t!Cu!K&fl6C{L>+lhjTH&GxU4O#u#~3jBkpu_ChJ**CR~QYdffCV*G^<ai
z`nL!b-?UekO(^}r(*(G@c?a_w>0n@ATCgwq&traaI%QBKQ$2j76TgB#0fC`$q8=2C
z{9V8vUXLdN0K#AWjStYHB&oFsU1!QD-i1oRd|sd8e?isr+xB3GAa#V>y^OH}5NbY%
zDEAM6!&RoiDM1f46H2y>OO3yeFeT*B&p3d%6$S5KjBF+n_%~T&^B+WqI^_AUzAt2^
zH4|mA6qXGX9L0;F^+2}j7H3~_>+SD-&bg=-b?q)17*eHpEj@{oGZ^B5$_C`!DMKzj
zzl0edU1T6z9&@-bm5D>@gA!RK>Fzh=G{^PLu&zV*sB!w;yZf1308;B>)Knd*@Rman
zRJHmZbDa4pYa2q|t-4!Sl_j6?7F>=TomaYo#J|PP%DE6b!C*l^G($gI6EH(r>#BVN
zXJV}K`Q)&0hi?|b0l*yTtD5%%DZkt|yKjz)pTzcxs|{gESAq(&ps4?`sEkn*!J=Q0
z9;)#H@fiuk-RWx#;2Ukc{!lHPz)}2b`ucrQsMn;&^JM_4_6+^p+pUpi0zcg3BT3ap
z!+fh5^ip%M34GHwqo=WmLBf`FMiQ+JFEx!=k%4hu0w#O8Ew1o?TSNnt<fzAeUDbAP
zYR2DDeqJdIN@?u;W1aY^h=90F!Zg!;&JSK$AYZKVFO_7p?qHeEy1e!CVjHr{-!}2v
zk79}h03eGXLqNsh8&R0Ch?;C&>QRF!`#yFnSr7W7q>R9rB@=Z=1!pw<Bu@(j{6L*F
zM-Gon5<VHF<^7aGReFo0Lb8{F>hx5}yP9w4&eP*bw(Z55&;2?QFzUEIPY+P4XIoK&
z*YU-Y97zXDI~ICM5e51KO4^T=;536pvaL88HL@rE^`!AxWoFeQ0ofl3c<*63xczT)
zvN?~vWhl<s2jk%S=cei|GC^%@a9bD=oW86`z>hovf3XU!2tC&2&_I1qrr>A}T&8bO
zlI6leEz?d>+NO}%^Vf;XMrjbhecJoAN#Pd*N6*jYe{5$2o8G8pXv^X4L}?qZ5Pq>Y
zm1Mtt!?Le6CLsQc5f<4{{T4eVrz)o@xsh;Zl<v^dh(zgbed(jhMGn((hJ;3c<y#yq
z%vWby&o=CMhddn)xCT+e__-*{@4h<2-#mg2%;_cz?#8pdlCtPf0J%g*XXgz>jN@Hl
z@$^g8p0OC%29&QiQ*IZjU8>V7k9m>xNTxi-D)<ZlrQv$i>qA_65EUdOZ|LWmu!6Cf
z@iVDgfYbbN%$s9lP&Ur;*^#)4CISz@WIhk+U@asPyCwLnUPKxsY|;7Hm7mF6A5&cW
z`1N<%ziX)1T3Y0WIxNuXDVfS*?tp&#yr0C<0Wew(AMX_O&7*kT%($IojJXJ~mlsiF
zmuYk5h`z-DlWvj+H<d~jvm|TCXOXh;OoDF%O$Xymu4nsz=Kdw)1}c0mR*AVQ@T9td
zT><)DEeHazz^<pAsDbW|ZV68pad07V<7EWw10Iyy2h^+##ru_dua|oN=9e{tORd(t
zZPWl@md9W{@ZmHxiym1oY6*?f9ukVmiX!bcNg`R1U>_pCrB+VK-j2ahul-Zhw}A}+
z{wCn&4MHW^qG8<`KO{^H%!TN+wL-IRySU<iO>*_*WsZ^$GqpKC{3p!T0CNPU>-$@Z
z;?}pmY+0D$BM#a#9{y2X>gfp~-jV!buXh&lR5S6w)oIBxnS4184Akw3yv(xzz_>)J
zFNojO*Xv(4*V=DBxb6@}o;|IQldj9M?CRccJ+kYF^8u6-Q^_K2d)#VM7RO+KBOvlC
z`j&ph4b<_8!HfVS2*842gFOo1@>TfaJW!t%9*J{dd2tf;<J3Z>lBY0AxCwYB<2Pnx
zz#J=R!KL~2QTL-ZN%(hmEgsj4SyL|J*O}`1x_x%Rzubo@G0juYZjpt2cI8!;>y~U~
z^1xT|z3lY-93tf1d7M#MM`t&`Pp30%y_vcsk@b+HvB<O%HnX-zF5z^AzdTkg7?>L|
zvz?E7U~!2i<8KY$g1Y~60;~m@b(QT%NJz=6D11TLz#{~i-dpmZk^N|&blZL*eCvuV
z=&uHc_I{y#aN)9EwNx(C0)S}P#R{TYlEDwya!;Wotn?^diur{5w|P^rG30VEIlYkN
z|9lZnBhF$ULhn)GwqDTw^C9G^Bz$RAFc|}Lz@+o^^CK1!v03s`+3+WmjCuMj)yK4G
zywh8G81FQ`zS!NL7dc_G8|So)5F?Q?^35}S<T4hw_zgeLP5=apTUMuk4iLEBNLUGo
zgbn$%H@9&rF`vddM@}o^GZ#Wn`eTKF=P%>e>rT}sE)Q*vvviCqvyYRVUVp*H@Yx3h
zh$!OWq|&Gy_Yy-gD6y4>i#n?jIrP6j3u)Mi1ON==(&$tgn)>g2&LKG>$tSBXfAleJ
zHp|6G^l%_V4izKm7N9}QfUcIn?u>qH8jXmsx_orX)t}ma9SpS%g<Nm07BUl#`TmdK
zg&*+D8t_KY-z&4R8Mt!W@A>Z{!~aguD^&&Llbcn&C60@uVN3BxtVxviN8QvgPuRMa
zpkt-rTt?xO@!!RV(xuLXBoR9>qBw0=GuDPKhQ;5f4OIO~-H%S~atAWur7SXwGrjx0
zZY&@P?1nJbaVUUPH{3(848;=O^?LG3wk8wDQ}%DB4h$suMV@R_{C=cL!DXYIDWr5;
z#v}=D@Sm#`@4zd5uN}~{-?NY}x&1|C+VXhWvW3AxcHotux*ZBhgqKp(011rS=Me9g
zhR}d#g|-Lr=@hMy+ucsMO_kVP3898`pdo*vMAe{Q616OB?@dvPA4E@kp7Pj`1v0hA
zvusuP&mhK)I37SBg!Xo6)s-EUe{zkF&KGAASLtfxbT0YwS_TBy9jfC9%@bssROw7^
z$-GJZ16ic%QmnXZ1j2Y={BeWAtt3*KiZ?|Nn819`F{b}{&H!#&C7eWq#3lHBlM%CY
z>nK}w)1kzhFRn3f#xqorTfe-FQU-*e>oPWXBg_8`R&f54RO|E#?3%GL(lpXIs-eao
zF{H`^tIq_teA_5ny~{4<eR<`!CCo#!E}8x_^Wh`n6MRS>vX!L1Y655u*@C&SmTcdw
za$h5gn9)kkK5rQLSss*!9<{jh!R~NfeG?C1Sa#CYlu~B>KT{koNzSznQz%t1V`nTT
zd}-Ni#LE8dP%eIC;aArn@iVFax=laCzjOTKA63TGhV@jW(v0O+>K`03tN-(vF;nSt
z*oY|o=HbvH4YCf=)Hxw09)_J_j3bYrfs4eoHxHWKgm~vLf0J6V=3h7N<##d;^@m3J
z^+dzyM%xF6y21~vMijxr3~YR$LF4BN27lPVBTBb`MLBA#{PJHwe){uaagNL`<1Hfd
z+esMPavCh8|8HUVeKnUznQf%f41YS9P;%jiAKg0o9X^U(Z<e-2M4e8ZL63-3^&s=p
z&GpU$s`O|5O0ZiQd*_F)A6y>gGqATG2C!{TO)eaEgRM9JERw!GgK)WOcAfzNkk7Er
zAq2XCd6?1Cga_C;{@?Ad{#$aqHJb?zJ7)9r!@oGXM@-J5O0og+)-BIZnef#(P@4bz
znN$I+oa6nAOxcR8k<13h?C9T;qcTQP503+LuC7}8Q>(wT0rMbKbUiClI?Rxu_n8E!
z)F8|xX%me!V@xzc*7eEcBL5%ysjugehgm)6Ti(8QkLPsCP}`G_n9+fhj_0kxoMv}W
aioa$P)jk(7LT{c|Kwd^!x<b-8;Qs-;TqLdl

literal 0
HcmV?d00001


From c3c2902b9228bc48c903bf439392654bf0ba2e6b Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 31 Jul 2012 16:40:30 -0700
Subject: [PATCH 21/50] move ellipse contruction code to marker_helpers

---
 include/mapnik/marker_helpers.hpp      | 48 +++++++++++++++++++++++---
 src/agg/process_markers_symbolizer.cpp | 44 +++++------------------
 2 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/include/mapnik/marker_helpers.hpp b/include/mapnik/marker_helpers.hpp
index 4d7a2be78..f22dd6ec5 100644
--- a/include/mapnik/marker_helpers.hpp
+++ b/include/mapnik/marker_helpers.hpp
@@ -27,12 +27,51 @@
 #include <mapnik/markers_symbolizer.hpp>
 #include <mapnik/expression_evaluator.hpp>
 #include <mapnik/svg/svg_path_attributes.hpp>
+#include <mapnik/svg/svg_converter.hpp>
+#include <mapnik/svg/svg_storage.hpp>
+
+// agg
+#include "agg_ellipse.h"
 
 // boost
 #include <boost/optional.hpp>
 
 namespace mapnik {
 
+template <typename T>
+void build_ellipse(T const& sym, mapnik::feature_impl const& feature, svg_storage_type & marker_ellipse, svg::svg_path_adapter & svg_path)
+{
+    expression_ptr const& width_expr = sym.get_width();
+    expression_ptr const& height_expr = sym.get_height();
+    double width = 0;
+    double height = 0;
+    if (width_expr && height_expr)
+    {
+        width = boost::apply_visitor(evaluate<Feature,value_type>(feature), *width_expr).to_double();
+        height = boost::apply_visitor(evaluate<Feature,value_type>(feature), *height_expr).to_double();
+    }
+    else if (width_expr)
+    {
+        width = boost::apply_visitor(evaluate<Feature,value_type>(feature), *width_expr).to_double();
+        height = width;
+    }
+    else if (height_expr)
+    {
+        height = boost::apply_visitor(evaluate<Feature,value_type>(feature), *height_expr).to_double();
+        width = height;
+    }
+    svg::svg_converter_type styled_svg(svg_path, marker_ellipse.attributes());
+    styled_svg.push_attr();
+    styled_svg.begin_path();
+    agg::ellipse c(0, 0, width/2.0, height/2.0);
+    styled_svg.storage().concat_path(c);
+    styled_svg.end_path();
+    styled_svg.pop_attr();
+    double lox,loy,hix,hiy;
+    styled_svg.bounding_rect(&lox, &loy, &hix, &hiy);
+    marker_ellipse.set_bounding_box(lox,loy,hix,hiy);
+}
+
 template <typename Attr>
 bool push_explicit_style(Attr const& src, Attr & dst, markers_symbolizer const& sym)
 {
@@ -42,10 +81,12 @@ bool push_explicit_style(Attr const& src, Attr & dst, markers_symbolizer const&
     boost::optional<float> const& fill_opacity = sym.get_fill_opacity();
     if (strk || fill || opacity || fill_opacity)
     {
+        bool success = false;
         for(unsigned i = 0; i < src.size(); ++i)
         {
-            mapnik::svg::path_attributes attr = src[i];
-
+            success = true;
+            dst.push_back(src[i]);
+            mapnik::svg::path_attributes & attr = dst.last();
             if (attr.stroke_flag)
             {
                 // TODO - stroke attributes need to be boost::optional
@@ -87,9 +128,8 @@ bool push_explicit_style(Attr const& src, Attr & dst, markers_symbolizer const&
                     attr.fill_opacity = *fill_opacity;
                 }
             }
-            dst.push_back(attr);
         }
-        return true;
+        return success;
     }
     return false;
 }
diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp
index bc5f9c851..40c7336a7 100644
--- a/src/agg/process_markers_symbolizer.cpp
+++ b/src/agg/process_markers_symbolizer.cpp
@@ -33,7 +33,6 @@
 #include <mapnik/marker_helpers.hpp>
 #include <mapnik/svg/svg_renderer.hpp>
 #include <mapnik/svg/svg_storage.hpp>
-#include <mapnik/svg/svg_converter.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
 #include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/markers_placement.hpp>
@@ -41,7 +40,6 @@
 
 // agg
 #include "agg_basics.h"
-#include "agg_ellipse.h"
 #include "agg_rendering_buffer.h"
 #include "agg_pixfmt_rgba.h"
 #include "agg_rasterizer_scanline_aa.h"
@@ -317,12 +315,15 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
             {
                 using namespace mapnik::svg;
                 typedef agg::renderer_scanline_aa_solid<renderer_base> renderer_type;
+                typedef agg::pod_bvector<path_attributes> svg_attribute_type;
                 typedef svg_renderer<svg_path_adapter,
-                                     agg::pod_bvector<path_attributes>,
+                                     svg_attribute_type,
                                      renderer_type,
                                      agg::pixfmt_rgba32 > svg_renderer_type;
-                typedef vector_markers_rasterizer_dispatch<buffer_type, svg_renderer_type, rasterizer, detector_type> dispatch_type;
-
+                typedef vector_markers_rasterizer_dispatch<buffer_type,
+                                     svg_renderer_type,
+                                     rasterizer,
+                                     detector_type > dispatch_type;
                 boost::optional<svg_path_ptr> const& stock_vector_marker = (*mark)->get_vector_data();
                 expression_ptr const& width_expr = sym.get_width();
                 expression_ptr const& height_expr = sym.get_height();
@@ -332,38 +333,11 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
                 if (filename == "shape://ellipse"
                    && (width_expr || height_expr))
                 {
-                    double width = 0;
-                    double height = 0;
-                    if (width_expr && height_expr)
-                    {
-                        width = boost::apply_visitor(evaluate<Feature,value_type>(feature), *width_expr).to_double();
-                        height = boost::apply_visitor(evaluate<Feature,value_type>(feature), *height_expr).to_double();
-                    }
-                    else if (width_expr)
-                    {
-                        width = boost::apply_visitor(evaluate<Feature,value_type>(feature), *width_expr).to_double();
-                        height = width;
-                    }
-                    else if (height_expr)
-                    {
-                        height = boost::apply_visitor(evaluate<Feature,value_type>(feature), *height_expr).to_double();
-                        width = height;
-                    }
-                    // create a new marker
                     svg_storage_type marker_ellipse;
                     vertex_stl_adapter<svg_path_storage> stl_storage(marker_ellipse.source());
                     svg_path_adapter svg_path(stl_storage);
-                    svg_converter_type styled_svg(svg_path, marker_ellipse.attributes());
-                    styled_svg.push_attr();
-                    styled_svg.begin_path();
-                    agg::ellipse c(0, 0, width/2.0, height/2.0);
-                    styled_svg.storage().concat_path(c);
-                    styled_svg.end_path();
-                    styled_svg.pop_attr();
-                    double lox,loy,hix,hiy;
-                    styled_svg.bounding_rect(&lox, &loy, &hix, &hiy);
-                    marker_ellipse.set_bounding_box(lox,loy,hix,hiy);
-                    agg::pod_bvector<path_attributes> attributes;
+                    build_ellipse(sym, feature, marker_ellipse, svg_path);
+                    svg_attribute_type attributes;
                     bool result = push_explicit_style( (*stock_vector_marker)->attributes(), attributes, sym);
                     svg_renderer_type svg_renderer(svg_path, result ? attributes : (*stock_vector_marker)->attributes());
                     evaluate_transform(tr, feature, sym.get_image_transform());
@@ -393,7 +367,7 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
                     agg::trans_affine marker_trans = recenter * tr;
                     vertex_stl_adapter<svg_path_storage> stl_storage((*stock_vector_marker)->source());
                     svg_path_adapter svg_path(stl_storage);
-                    agg::pod_bvector<path_attributes> attributes;
+                    svg_attribute_type attributes;
                     bool result = push_explicit_style( (*stock_vector_marker)->attributes(), attributes, sym);
                     svg_renderer_type svg_renderer(svg_path, result ? attributes : (*stock_vector_marker)->attributes());
                     dispatch_type rasterizer_dispatch(*current_buffer_,svg_renderer,*ras_ptr,

From 3867a75adf90d807d156ee6fb52b1b432c66d718 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 31 Jul 2012 16:42:07 -0700
Subject: [PATCH 22/50] comment crashing test

---
 .../markers_complex_rendering_test.py         | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 tests/python_tests/markers_complex_rendering_test.py

diff --git a/tests/python_tests/markers_complex_rendering_test.py b/tests/python_tests/markers_complex_rendering_test.py
new file mode 100644
index 000000000..a3173abbd
--- /dev/null
+++ b/tests/python_tests/markers_complex_rendering_test.py
@@ -0,0 +1,39 @@
+#coding=utf8
+import os
+import mapnik
+from utilities import execution_path
+from nose.tools import *
+
+def setup():
+    # All of the paths used are relative, if we run the tests
+    # from another directory we need to chdir()
+    os.chdir(execution_path('.'))
+
+def test_marker_ellipse_render1():
+    m = mapnik.Map(256,256)
+    mapnik.load_map(m,'../data/good_maps/marker_ellipse_transform.xml')
+    m.zoom_all()
+    im = mapnik.Image(m.width,m.height)
+    mapnik.render(m,im)
+    actual = '/tmp/mapnik-marker-ellipse-render1.png'
+    expected = 'images/support/mapnik-marker-ellipse-render1.png'
+    im.save(actual)
+    expected_im = mapnik.Image.open(expected)
+    eq_(im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected))
+
+#def test_marker_ellipse_render2():
+#    # currently crashes https://github.com/mapnik/mapnik/issues/1365
+#    m = mapnik.Map(256,256)
+#    mapnik.load_map(m,'../data/good_maps/marker_ellipse_transform2.xml')
+#    m.zoom_all()
+#    im = mapnik.Image(m.width,m.height)
+#    mapnik.render(m,im)
+#    actual = '/tmp/mapnik-marker-ellipse-render2.png'
+#    expected = 'images/support/mapnik-marker-ellipse-render2.png'
+#    im.save(actual)
+#    expected_im = mapnik.Image.open(expected)
+#    eq_(im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected))
+
+if __name__ == "__main__":
+    setup()
+    [eval(run)() for run in dir() if 'test_' in run]

From 48c391da0d544d44d1fc9ac131cb951011c66b43 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 31 Jul 2012 16:56:22 -0700
Subject: [PATCH 23/50] reduce copying of svg attributes via @lightmare - refs
 #1360

---
 include/mapnik/svg/svg_converter.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/mapnik/svg/svg_converter.hpp b/include/mapnik/svg/svg_converter.hpp
index 7e61a09ff..4ba4c4bff 100644
--- a/include/mapnik/svg/svg_converter.hpp
+++ b/include/mapnik/svg/svg_converter.hpp
@@ -66,10 +66,10 @@ public:
         {
             throw std::runtime_error("end_path : The path was not begun");
         }
-        path_attributes attr = cur_attr();
-        unsigned idx = attributes_[attributes_.size() - 1].index;
+        path_attributes& attr = attributes_[attributes_.size() - 1];
+        unsigned idx = attr.index;
+        attr = cur_attr();
         attr.index = idx;
-        attributes_[attributes_.size() - 1] = attr;
     }
 
     void move_to(double x, double y, bool rel=false)  // M, m

From 64b990ef6c1387f4dde75c2d25645b1ab6227f09 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 31 Jul 2012 17:00:24 -0700
Subject: [PATCH 24/50] viewer ignores

---
 .gitignore | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitignore b/.gitignore
index 5d2536c3e..fe40dfa29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,4 +43,11 @@ demo/c++/demo.tif
 demo/c++/demo.jpg
 demo/c++/demo.png
 demo/c++/demo256.png
+demo/viewer/Makefile
+demo/viewer/Makefile.Debug
+demo/viewer/Makefile.Release
+demo/viewer/release/
+demo/viewer/ui_about.h
+demo/viewer/ui_info.h
+demo/viewer/ui_layer_info.h
 tests/cpp_tests/*-bin

From 9d9c525de0eaebfa21a6dad4f71e9ba97f762cba Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 31 Jul 2012 17:27:52 -0700
Subject: [PATCH 25/50] revert 1dfde78 and properly avoid clipping for point
 type geometries in markers_symbolizer while moving markers_placement to cpp
 file to avoid overhead of declaring all possible permutations of vertex
 convertors - closes #1341

---
 include/mapnik/markers_placement.hpp   | 219 ++++++++++++++++++++-
 src/agg/process_markers_symbolizer.cpp |  32 +++-
 src/build.py                           |   1 -
 src/markers_placement.cpp              | 253 -------------------------
 src/markers_symbolizer.cpp             |  10 +-
 5 files changed, 243 insertions(+), 272 deletions(-)
 delete mode 100644 src/markers_placement.cpp

diff --git a/include/mapnik/markers_placement.hpp b/include/mapnik/markers_placement.hpp
index a0828caba..5ac83a22d 100644
--- a/include/mapnik/markers_placement.hpp
+++ b/include/mapnik/markers_placement.hpp
@@ -24,13 +24,26 @@
 #define MAPNIK_MARKERS_PLACEMENT_HPP
 
 // mapnik
+#include <mapnik/markers_placement.hpp>
+#include <mapnik/geometry.hpp>
+#include <mapnik/ctrans.hpp>
+#include <mapnik/label_collision_detector.hpp>
+#include <mapnik/global.hpp> //round
 #include <mapnik/box2d.hpp>
 
 // boost
 #include <boost/utility.hpp>
 
 // agg
+#include "agg_basics.h"
+#include "agg_conv_clip_polygon.h"
+#include "agg_conv_clip_polyline.h"
+#include "agg_trans_affine.h"
 #include "agg_conv_transform.h"
+#include "agg_conv_smooth_poly1.h"
+
+// stl
+#include <cmath>
 
 namespace mapnik {
 
@@ -47,12 +60,40 @@ public:
      *                 converted to a positive value with similar magnitude, but
      *                 choosen to optimize marker placement. 0 = no markers
      */
-    markers_placement(Locator &locator, box2d<double> const& size, agg::trans_affine const& tr, Detector &detector, double spacing, double max_error, bool allow_overlap);
+    markers_placement(Locator &locator, box2d<double> const& size, agg::trans_affine const& tr, Detector &detector, double spacing, double max_error, bool allow_overlap)
+      : locator_(locator),
+        size_(size),
+        tr_(tr),
+        detector_(detector),
+        max_error_(max_error),
+        allow_overlap_(allow_overlap)
+    {
+      marker_width_ = (size_ * tr_).width();
+      if (spacing >= 0)
+      {
+          spacing_ = spacing;
+      } else if (spacing < 0)
+      {
+          spacing_ = find_optimal_spacing(-spacing);
+      }
+      rewind();
+    }
+
     /** Start again at first marker.
      * \note Returns the same list of markers only works when they were NOT added
      *       to the detector.
      */
-    void rewind();
+    void rewind()
+    {
+        locator_.rewind(0);
+        //Get first point
+        done_ = agg::is_stop(locator_.vertex(&next_x, &next_y)) || spacing_ < marker_width_;
+        last_x = next_x;
+        last_y = next_y; // Force request of new segment
+        error_ = 0;
+        marker_nr_ = 0;
+    }
+
     /** Get a point where the marker should be placed.
      * Each time this function is called a new point is returned.
      * \param x     Return value for x position
@@ -61,7 +102,115 @@ public:
      * \param add_to_detector Add selected position to detector
      * \return True if a place is found, false if none is found.
      */
-    bool get_point(double & x, double  & y, double & angle,  bool add_to_detector = true);
+    bool get_point(double & x, double  & y, double & angle,  bool add_to_detector = true)
+    {
+        if (done_) return false;
+        unsigned cmd;
+        /* This functions starts at the position of the previous marker,
+           walks along the path, counting how far it has to go in spacing_left.
+           If one marker can't be placed at the position it should go to it is
+           moved a bit. The error is compensated for in the next call to this
+           function.
+
+           error > 0: Marker too near to the end of the path.
+           error = 0: Perfect position.
+           error < 0: Marker too near to the beginning of the path.
+        */
+        if (marker_nr_++ == 0)
+        {
+            //First marker
+            spacing_left_ = spacing_ / 2;
+        } else
+        {
+            spacing_left_ = spacing_;
+        }
+        spacing_left_ -= error_;
+        error_ = 0;
+        //Loop exits when a position is found or when no more segments are available
+        while (true)
+        {
+            //Do not place markers too close to the beginning of a segment
+            if (spacing_left_ < marker_width_/2)
+            {
+                set_spacing_left(marker_width_/2); //Only moves forward
+            }
+            //Error for this marker is too large. Skip to the next position.
+            if (abs(error_) > max_error_ * spacing_)
+            {
+                if (error_ > spacing_)
+                {
+                    error_ = 0; //Avoid moving backwards
+                    MAPNIK_LOG_WARN(markers_placement) << "Extremely large error in markers_placement. Please file a bug report.";
+                }
+                spacing_left_ += spacing_ - error_;
+                error_ = 0;
+            }
+            double dx = next_x - last_x;
+            double dy = next_y - last_y;
+            double segment_length = std::sqrt(dx * dx + dy * dy);
+            if (segment_length <= spacing_left_)
+            {
+                //Segment is to short to place marker. Find next segment
+                spacing_left_ -= segment_length;
+                last_x = next_x;
+                last_y = next_y;
+                while (agg::is_move_to(cmd = locator_.vertex(&next_x, &next_y)))
+                {
+                    //Skip over "move" commands
+                    last_x = next_x;
+                    last_y = next_y;
+                }
+                if (agg::is_stop(cmd))
+                {
+                    done_ = true;
+                    return false;
+                }
+                continue; //Try again
+            }
+            /* At this point we know the following things:
+               - segment_length > spacing_left
+               - error is small enough
+               - at least half a marker fits into this segment
+            */
+            //Check if marker really fits in this segment
+            if (segment_length < marker_width_)
+            {
+                //Segment to short => Skip this segment
+                set_spacing_left(segment_length + marker_width_/2); //Only moves forward
+                continue;
+            } else if (segment_length - spacing_left_ < marker_width_/2)
+            {
+                //Segment is long enough, but we are to close to the end
+                //Note: This function moves backwards. This could lead to an infinite
+                // loop when another function adds a positive offset. Therefore we
+                // only move backwards when there is no offset
+                if (error_ == 0)
+                {
+                    set_spacing_left(segment_length - marker_width_/2, true);
+                } else
+                {
+                    //Skip this segment
+                    set_spacing_left(segment_length + marker_width_/2); //Only moves forward
+                }
+                continue; //Force checking of max_error constraint
+            }
+            angle = atan2(dy, dx);
+            x = last_x + dx * (spacing_left_ / segment_length);
+            y = last_y + dy * (spacing_left_ / segment_length);
+            box2d<double> box = perform_transform(angle, x, y);
+            if (!allow_overlap_ && !detector_.has_placement(box))
+            {
+                //10.0 is the approxmiate number of positions tried and choosen arbitrarily
+                set_spacing_left(spacing_left_ + spacing_ * max_error_ / 10.0); //Only moves forward
+                continue;
+            }
+            if (add_to_detector) detector_.insert(box);
+            last_x = x;
+            last_y = y;
+            return true;
+        }
+    }
+
 private:
     Locator &locator_;
     box2d<double> size_;
@@ -82,11 +231,69 @@ private:
     unsigned marker_nr_;
 
     /** Rotates the size_ box and translates the position. */
-    box2d<double> perform_transform(double angle, double dx, double dy);
+    box2d<double> perform_transform(double angle, double dx, double dy)
+    {
+        double x1 = size_.minx();
+        double x2 = size_.maxx();
+        double y1 = size_.miny();
+        double y2 = size_.maxy();
+        agg::trans_affine tr = tr_ * agg::trans_affine_rotation(angle).translate(dx, dy);
+        double xA = x1, yA = y1, xB = x2, yB = y1, xC = x2, yC = y2, xD = x1, yD = y2;
+        tr.transform(&xA, &yA);
+        tr.transform(&xB, &yB);
+        tr.transform(&xC, &yC);
+        tr.transform(&xD, &yD);
+        box2d<double> result(xA, yA, xC, yC);
+        result.expand_to_include(xB, yB);
+        result.expand_to_include(xD, yD);
+        return result;
+    }
+
     /** Automatically chooses spacing. */
-    double find_optimal_spacing(double s);
+    double find_optimal_spacing(double s)
+    {
+        rewind();
+        //Calculate total path length
+        unsigned cmd = agg::path_cmd_move_to;
+        double length = 0;
+        while (!agg::is_stop(cmd))
+        {
+            double dx = next_x - last_x;
+            double dy = next_y - last_y;
+            length += std::sqrt(dx * dx + dy * dy);
+            last_x = next_x;
+            last_y = next_y;
+            while (agg::is_move_to(cmd = locator_.vertex(&next_x, &next_y)))
+            {
+                //Skip over "move" commands
+                last_x = next_x;
+                last_y = next_y;
+            }
+        }
+        unsigned points = round(length / s);
+        if (points == 0) return 0.0; //Path to short
+        return length / points;
+    }
+
     /** Set spacing_left_, adjusts error_ and performs sanity checks. */
-    void set_spacing_left(double sl, bool allow_negative=false);
+    void set_spacing_left(double sl, bool allow_negative=false)
+    {
+        double delta_error = sl - spacing_left_;
+        if (!allow_negative && delta_error < 0)
+        {
+            MAPNIK_LOG_WARN(markers_placement) << "Unexpected negative error in markers_placement. Please file a bug report.";
+            return;
+        }
+    #ifdef MAPNIK_DEBUG
+        if (delta_error == 0.0)
+        {
+            MAPNIK_LOG_WARN(markers_placement) << "Not moving at all in set_spacing_left()! Please file a bug report.";
+        }
+    #endif
+        error_ += delta_error;
+        spacing_left_ = sl;
+    }
+
 };
 
 }
diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp
index 40c7336a7..79723f485 100644
--- a/src/agg/process_markers_symbolizer.cpp
+++ b/src/agg/process_markers_symbolizer.cpp
@@ -295,7 +295,7 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
     typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_comp_type;
     typedef agg::renderer_base<pixfmt_comp_type> renderer_base;
     typedef label_collision_detector4 detector_type;
-    typedef boost::mpl::vector<clip_line_tag,transform_tag,smooth_tag> conv_types;
+    typedef boost::mpl::vector<clip_line_tag,clip_poly_tag,transform_tag,smooth_tag> conv_types;
 
     std::string filename = path_processor_type::evaluate(*sym.get_filename(), feature);
 
@@ -350,7 +350,15 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
                     vertex_converter<box2d<double>, dispatch_type, markers_symbolizer,
                                      CoordTransform, proj_transform, agg::trans_affine, conv_types>
                         converter(query_extent_* 1.1,rasterizer_dispatch, sym,t_,prj_trans,tr,scale_factor_);
-                    if (sym.clip()) converter.template set<clip_line_tag>(); //optional clip (default: true)
+                    if (sym.clip() && feature.paths().size() > 0) // optional clip (default: true)
+                    {
+                        eGeomType type = feature.paths()[0].type();
+                        if (type == Polygon)
+                            converter.template set<clip_poly_tag>();
+                        else if (type == LineString)
+                            converter.template set<clip_line_tag>();
+                        // don't clip if type==Point
+                    }
                     converter.template set<transform_tag>(); //always transform
                     if (sym.smooth() > 0.0) converter.template set<smooth_tag>(); // optional smooth converter
                     BOOST_FOREACH(geometry_type & geom, feature.paths())
@@ -375,7 +383,15 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
                     vertex_converter<box2d<double>, dispatch_type, markers_symbolizer,
                                      CoordTransform, proj_transform, agg::trans_affine, conv_types>
                         converter(query_extent_* 1.1,rasterizer_dispatch, sym,t_,prj_trans,tr,scale_factor_);
-                    if (sym.clip()) converter.template set<clip_line_tag>(); //optional clip (default: true)
+                    if (sym.clip() && feature.paths().size() > 0) // optional clip (default: true)
+                    {
+                        eGeomType type = feature.paths()[0].type();
+                        if (type == Polygon)
+                            converter.template set<clip_poly_tag>();
+                        else if (type == LineString)
+                            converter.template set<clip_line_tag>();
+                        // don't clip if type==Point
+                    }
                     converter.template set<transform_tag>(); //always transform
                     if (sym.smooth() > 0.0) converter.template set<smooth_tag>(); // optional smooth converter
                     BOOST_FOREACH(geometry_type & geom, feature.paths())
@@ -399,7 +415,15 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
                                  CoordTransform, proj_transform, agg::trans_affine, conv_types>
                     converter(query_extent_* 1.1, rasterizer_dispatch, sym,t_,prj_trans,tr,scale_factor_);
 
-                if (sym.clip()) converter.template set<clip_line_tag>(); //optional clip (default: true)
+                if (sym.clip() && feature.paths().size() > 0) // optional clip (default: true)
+                {
+                    eGeomType type = feature.paths()[0].type();
+                    if (type == Polygon)
+                        converter.template set<clip_poly_tag>();
+                    else if (type == LineString)
+                        converter.template set<clip_line_tag>();
+                    // don't clip if type==Point
+                }
                 converter.template set<transform_tag>(); //always transform
                 if (sym.smooth() > 0.0) converter.template set<smooth_tag>(); // optional smooth converter
 
diff --git a/src/build.py b/src/build.py
index a56aac0ea..5a74be3c3 100644
--- a/src/build.py
+++ b/src/build.py
@@ -172,7 +172,6 @@ source = Split(
     json/feature_grammar.cpp
     json/feature_collection_parser.cpp
     json/geojson_generator.cpp
-    markers_placement.cpp
     processed_text.cpp
     formatting/base.cpp
     formatting/expression.cpp
diff --git a/src/markers_placement.cpp b/src/markers_placement.cpp
deleted file mode 100644
index 6ea4b0e14..000000000
--- a/src/markers_placement.cpp
+++ /dev/null
@@ -1,253 +0,0 @@
-// mapnik
-#include <mapnik/markers_placement.hpp>
-#include <mapnik/geometry.hpp>
-#include <mapnik/ctrans.hpp>
-#include <mapnik/label_collision_detector.hpp>
-#include <mapnik/global.hpp> //round
-// agg
-#include "agg_basics.h"
-#include "agg_conv_clip_polyline.h"
-#include "agg_trans_affine.h"
-#include "agg_conv_transform.h"
-#include "agg_conv_smooth_poly1.h"
-// stl
-#include <cmath>
-
-namespace mapnik
-{
-template <typename Locator,  typename Detector>
-markers_placement<Locator, Detector>::markers_placement(
-    Locator &locator, box2d<double> const& size, agg::trans_affine const& tr, Detector &detector, double spacing, double max_error, bool allow_overlap)
-    : locator_(locator), size_(size), tr_(tr), detector_(detector), max_error_(max_error), allow_overlap_(allow_overlap)
-{
-    marker_width_ = (size_ * tr_).width();
-    if (spacing >= 0)
-    {
-        spacing_ = spacing;
-    } else if (spacing < 0)
-    {
-        spacing_ = find_optimal_spacing(-spacing);
-    }
-    rewind();
-}
-
-template <typename Locator, typename Detector>
-double markers_placement<Locator, Detector>::find_optimal_spacing(double s)
-{
-    rewind();
-    //Calculate total path length
-    unsigned cmd = agg::path_cmd_move_to;
-    double length = 0;
-    while (!agg::is_stop(cmd))
-    {
-        double dx = next_x - last_x;
-        double dy = next_y - last_y;
-        length += std::sqrt(dx * dx + dy * dy);
-        last_x = next_x;
-        last_y = next_y;
-        while (agg::is_move_to(cmd = locator_.vertex(&next_x, &next_y)))
-        {
-            //Skip over "move" commands
-            last_x = next_x;
-            last_y = next_y;
-        }
-    }
-    unsigned points = round(length / s);
-    if (points == 0) return 0.0; //Path to short
-    return length / points;
-}
-
-
-template <typename Locator, typename Detector>
-void markers_placement<Locator, Detector>::rewind()
-{
-    locator_.rewind(0);
-    //Get first point
-    done_ = agg::is_stop(locator_.vertex(&next_x, &next_y)) || spacing_ < marker_width_;
-    last_x = next_x;
-    last_y = next_y; // Force request of new segment
-    error_ = 0;
-    marker_nr_ = 0;
-}
-
-template <typename Locator, typename Detector>
-bool markers_placement<Locator, Detector>::get_point(
-    double & x, double & y, double & angle,  bool add_to_detector)
-{
-    if (done_) return false;
-
-    unsigned cmd;
-
-    /* This functions starts at the position of the previous marker,
-       walks along the path, counting how far it has to go in spacing_left.
-       If one marker can't be placed at the position it should go to it is
-       moved a bit. The error is compensated for in the next call to this
-       function.
-
-       error > 0: Marker too near to the end of the path.
-       error = 0: Perfect position.
-       error < 0: Marker too near to the beginning of the path.
-    */
-
-    if (marker_nr_++ == 0)
-    {
-        //First marker
-        spacing_left_ = spacing_ / 2;
-    } else
-    {
-        spacing_left_ = spacing_;
-    }
-
-    spacing_left_ -= error_;
-    error_ = 0;
-
-    //Loop exits when a position is found or when no more segments are available
-    while (true)
-    {
-        //Do not place markers too close to the beginning of a segment
-        if (spacing_left_ < marker_width_/2)
-        {
-            set_spacing_left(marker_width_/2); //Only moves forward
-        }
-        //Error for this marker is too large. Skip to the next position.
-        if (abs(error_) > max_error_ * spacing_)
-        {
-            if (error_ > spacing_)
-            {
-                error_ = 0; //Avoid moving backwards
-
-                MAPNIK_LOG_WARN(markers_placement) << "Extremely large error in markers_placement. Please file a bug report.";
-            }
-            spacing_left_ += spacing_ - error_;
-            error_ = 0;
-        }
-        double dx = next_x - last_x;
-        double dy = next_y - last_y;
-        double segment_length = std::sqrt(dx * dx + dy * dy);
-        if (segment_length <= spacing_left_)
-        {
-            //Segment is to short to place marker. Find next segment
-            spacing_left_ -= segment_length;
-            last_x = next_x;
-            last_y = next_y;
-            while (agg::is_move_to(cmd = locator_.vertex(&next_x, &next_y)))
-            {
-                //Skip over "move" commands
-                last_x = next_x;
-                last_y = next_y;
-            }
-            if (agg::is_stop(cmd))
-            {
-                done_ = true;
-                return false;
-            }
-            continue; //Try again
-        }
-
-        /* At this point we know the following things:
-           - segment_length > spacing_left
-           - error is small enough
-           - at least half a marker fits into this segment
-        */
-
-        //Check if marker really fits in this segment
-        if (segment_length < marker_width_)
-        {
-            //Segment to short => Skip this segment
-            set_spacing_left(segment_length + marker_width_/2); //Only moves forward
-            continue;
-        } else if (segment_length - spacing_left_ < marker_width_/2)
-        {
-            //Segment is long enough, but we are to close to the end
-
-            //Note: This function moves backwards. This could lead to an infinite
-            // loop when another function adds a positive offset. Therefore we
-            // only move backwards when there is no offset
-            if (error_ == 0)
-            {
-                set_spacing_left(segment_length - marker_width_/2, true);
-            } else
-            {
-                //Skip this segment
-                set_spacing_left(segment_length + marker_width_/2); //Only moves forward
-            }
-            continue; //Force checking of max_error constraint
-        }
-        angle = atan2(dy, dx);
-        x = last_x + dx * (spacing_left_ / segment_length);
-        y = last_y + dy * (spacing_left_ / segment_length);
-
-        box2d<double> box = perform_transform(angle, x, y);
-
-        if (!allow_overlap_ && !detector_.has_placement(box))
-        {
-            //10.0 is the approxmiate number of positions tried and choosen arbitrarily
-            set_spacing_left(spacing_left_ + spacing_ * max_error_ / 10.0); //Only moves forward
-            continue;
-        }
-        if (add_to_detector) detector_.insert(box);
-        last_x = x;
-        last_y = y;
-        return true;
-    }
-}
-
-
-template <typename Locator, typename Detector>
-box2d<double> markers_placement<Locator, Detector>::perform_transform(double angle, double dx, double dy)
-{
-    double x1 = size_.minx();
-    double x2 = size_.maxx();
-    double y1 = size_.miny();
-    double y2 = size_.maxy();
-
-    agg::trans_affine tr = tr_ * agg::trans_affine_rotation(angle).translate(dx, dy);
-
-    double xA = x1, yA = y1, xB = x2, yB = y1, xC = x2, yC = y2, xD = x1, yD = y2;
-    tr.transform(&xA, &yA);
-    tr.transform(&xB, &yB);
-    tr.transform(&xC, &yC);
-    tr.transform(&xD, &yD);
-
-    box2d<double> result(xA, yA, xC, yC);
-    result.expand_to_include(xB, yB);
-    result.expand_to_include(xD, yD);
-    return result;
-}
-
-template <typename Locator, typename Detector>
-void markers_placement<Locator, Detector>::set_spacing_left(double sl, bool allow_negative)
-{
-    double delta_error = sl - spacing_left_;
-    if (!allow_negative && delta_error < 0)
-    {
-        MAPNIK_LOG_WARN(markers_placement) << "Unexpected negative error in markers_placement. Please file a bug report.";
-
-        return;
-    }
-#ifdef MAPNIK_DEBUG
-    if (delta_error == 0.0)
-    {
-        MAPNIK_LOG_WARN(markers_placement) << "Not moving at all in set_spacing_left()! Please file a bug report.";
-    }
-#endif
-    error_ += delta_error;
-    spacing_left_ = sl;
-}
-
-typedef agg::conv_clip_polyline<geometry_type> clipped_geometry_type;
-typedef coord_transform<CoordTransform,geometry_type> path_type;
-typedef coord_transform<CoordTransform,clipped_geometry_type> clipped_path_type;
-typedef agg::conv_transform<path_type, agg::trans_affine> transformed_path_type;
-
-template class markers_placement<geometry_type, label_collision_detector4>;
-template class markers_placement<path_type, label_collision_detector4>;
-template class markers_placement<clipped_geometry_type, label_collision_detector4>;
-template class markers_placement<transformed_path_type, label_collision_detector4>;
-template class markers_placement<clipped_path_type, label_collision_detector4>;
-template class markers_placement<agg::conv_transform<clipped_path_type,agg::trans_affine>, label_collision_detector4>;
-template class markers_placement<agg::conv_smooth_poly1_curve<clipped_path_type>, label_collision_detector4>;
-template class markers_placement<agg::conv_smooth_poly1_curve<geometry_type>, label_collision_detector4>;
-template class markers_placement<agg::conv_smooth_poly1_curve<path_type>, label_collision_detector4>;
-template class markers_placement<agg::conv_smooth_poly1_curve<clipped_geometry_type>, label_collision_detector4>;
-} //ns mapnik
diff --git a/src/markers_symbolizer.cpp b/src/markers_symbolizer.cpp
index 5ea1c4624..643c7d04b 100644
--- a/src/markers_symbolizer.cpp
+++ b/src/markers_symbolizer.cpp
@@ -45,10 +45,7 @@ markers_symbolizer::markers_symbolizer()
       allow_overlap_(false),
       spacing_(100.0),
       max_error_(0.2),
-      marker_p_(MARKER_POINT_PLACEMENT) {
-          // override the default for clipping in symbolizer base
-          this->set_clip(false);
-      }
+      marker_p_(MARKER_POINT_PLACEMENT) { }
 
 markers_symbolizer::markers_symbolizer(path_expression_ptr const& filename)
     : symbolizer_with_image(filename),
@@ -59,10 +56,7 @@ markers_symbolizer::markers_symbolizer(path_expression_ptr const& filename)
       allow_overlap_(false),
       spacing_(100.0),
       max_error_(0.2),
-      marker_p_(MARKER_POINT_PLACEMENT) {
-          // override the default for clipping in symbolizer base
-          this->set_clip(false);
-      }
+      marker_p_(MARKER_POINT_PLACEMENT) { }
 
 markers_symbolizer::markers_symbolizer(markers_symbolizer const& rhs)
     : symbolizer_with_image(rhs),

From b7aafe51bc2b7b2f3f1590ab0110c6354198a5fe Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 31 Jul 2012 17:53:20 -0700
Subject: [PATCH 26/50] update markers line placement tests

---
 tests/data/good_maps/markers_symbolizer_lines.xml     |  9 ++++++++-
 .../data/good_maps/markers_symbolizer_lines_file.xml  | 11 +++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/tests/data/good_maps/markers_symbolizer_lines.xml b/tests/data/good_maps/markers_symbolizer_lines.xml
index 74adff287..e1f879ad9 100644
--- a/tests/data/good_maps/markers_symbolizer_lines.xml
+++ b/tests/data/good_maps/markers_symbolizer_lines.xml
@@ -3,7 +3,14 @@
     <Style name="1">
         <Rule>
             <LineSymbolizer stroke-width=".2" stroke="grey"/>
-            <MarkersSymbolizer stroke="green" stroke-width="1.3" fill="yellow"/>
+            <MarkersSymbolizer
+                file="shape://arrow"
+                transform="scale(.8,.5)"
+                stroke="green"
+                stroke-width="1.3"
+                fill="yellow"
+                placement="line"
+            />
         </Rule>
     </Style>
 
diff --git a/tests/data/good_maps/markers_symbolizer_lines_file.xml b/tests/data/good_maps/markers_symbolizer_lines_file.xml
index 39d2f1dbd..e08621485 100644
--- a/tests/data/good_maps/markers_symbolizer_lines_file.xml
+++ b/tests/data/good_maps/markers_symbolizer_lines_file.xml
@@ -2,8 +2,15 @@
 <Map background-color="white" srs="+init=epsg:4326" minimum-version="0.7.2">
     <Style name="1">
         <Rule>
-            <LineSymbolizer stroke-width=".2" stroke="grey"/>
-            <MarkersSymbolizer file="../svg/crosshair16x16.svg"/>
+            <LineSymbolizer offset="-2" stroke-width="2" stroke="red"/>
+            <LineSymbolizer stroke-width="2" stroke="orange"/>
+            <LineSymbolizer offset="2" stroke-width="2" stroke="yellow"/>
+            <LineSymbolizer offset="4" stroke-width="2" stroke="green"/>
+            <MarkersSymbolizer
+                file="../svg/octocat.svg"
+                transform="scale(.13)"
+                placement="line"
+            />
         </Rule>
     </Style>
 

From 3821afd74d72430a2ca8da8f78173e30b0dd2d97 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 31 Jul 2012 18:06:52 -0700
Subject: [PATCH 27/50] inherit default placement types from class instance

---
 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 315e85e9a..2f4d9c8e2 100644
--- a/src/load_map.cpp
+++ b/src/load_map.cpp
@@ -889,7 +889,7 @@ void map_parser::parse_point_symbolizer(rule & rule, xml_node const & sym)
             symbol.set_ignore_placement(* ignore_placement);
         }
         point_placement_e placement =
-            sym.get_attr<point_placement_e>("placement", CENTROID_POINT_PLACEMENT);
+            sym.get_attr<point_placement_e>("placement", sym.get_point_placement());
         symbol.set_point_placement(placement);
 
         if (file && !file->empty())
@@ -1064,7 +1064,7 @@ void map_parser::parse_markers_symbolizer(rule & rule, xml_node const& node)
             sym.set_stroke(strk);
         }
 
-        marker_placement_e placement = node.get_attr<marker_placement_e>("placement", MARKER_POINT_PLACEMENT);
+        marker_placement_e placement = node.get_attr<marker_placement_e>("placement",sym.get_marker_placement());
         sym.set_marker_placement(placement);
         parse_symbolizer_base(sym, node);
         rule.append(sym);

From 16084ff335b004114996535f2e0a04b12cd91ffb Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 31 Jul 2012 18:13:50 -0700
Subject: [PATCH 28/50] support both interior placement and point for markers -
 helps prepare for #952

---
 bindings/python/mapnik_markers_symbolizer.cpp |  1 +
 include/mapnik/markers_symbolizer.hpp         |  1 +
 src/agg/process_markers_symbolizer.cpp        | 22 +++++++++++++++----
 src/load_map.cpp                              |  2 +-
 src/markers_symbolizer.cpp                    |  1 +
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/bindings/python/mapnik_markers_symbolizer.cpp b/bindings/python/mapnik_markers_symbolizer.cpp
index 9613e7476..2ab881c05 100644
--- a/bindings/python/mapnik_markers_symbolizer.cpp
+++ b/bindings/python/mapnik_markers_symbolizer.cpp
@@ -92,6 +92,7 @@ void export_markers_symbolizer()
 
     mapnik::enumeration_<mapnik::marker_placement_e>("marker_placement")
         .value("POINT_PLACEMENT",mapnik::MARKER_POINT_PLACEMENT)
+        .value("INTERIOR_PLACEMENT",mapnik::MARKER_INTERIOR_PLACEMENT)
         .value("LINE_PLACEMENT",mapnik::MARKER_LINE_PLACEMENT)
         ;
 
diff --git a/include/mapnik/markers_symbolizer.hpp b/include/mapnik/markers_symbolizer.hpp
index d11cf6f8f..0a441a98d 100644
--- a/include/mapnik/markers_symbolizer.hpp
+++ b/include/mapnik/markers_symbolizer.hpp
@@ -39,6 +39,7 @@ namespace mapnik {
 // TODO - consider merging with text_symbolizer label_placement_e
 enum marker_placement_enum {
     MARKER_POINT_PLACEMENT,
+    MARKER_INTERIOR_PLACEMENT,
     MARKER_LINE_PLACEMENT,
     marker_placement_enum_MAX
 };
diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp
index 79723f485..451323f5b 100644
--- a/src/agg/process_markers_symbolizer.cpp
+++ b/src/agg/process_markers_symbolizer.cpp
@@ -94,11 +94,18 @@ struct vector_markers_rasterizer_dispatch
     {
         marker_placement_e placement_method = sym_.get_marker_placement();
 
-        if (placement_method == MARKER_POINT_PLACEMENT)
+        if (placement_method != MARKER_LINE_PLACEMENT)
         {
             double x,y;
             path.rewind(0);
-            label::interior_position(path, x, y);
+            if (placement_method == MARKER_INTERIOR_PLACEMENT)
+            {
+                label::interior_position(path, x, y);
+            }
+            else
+            {
+                label::centroid(path, x, y);
+            }
             agg::trans_affine matrix = marker_trans_;
             matrix.translate(x,y);
             box2d<double> transformed_bbox = bbox_ * matrix;
@@ -231,11 +238,18 @@ struct raster_markers_rasterizer_dispatch
         marker_placement_e placement_method = sym_.get_marker_placement();
         box2d<double> bbox_(0,0, src_.width(),src_.height());
 
-        if (placement_method == MARKER_POINT_PLACEMENT)
+        if (placement_method != MARKER_LINE_PLACEMENT)
         {
             double x,y;
             path.rewind(0);
-            label::interior_position(path, x, y);
+            if (placement_method == MARKER_INTERIOR_PLACEMENT)
+            {
+                label::interior_position(path, x, y);
+            }
+            else
+            {
+                label::centroid(path, x, y);
+            }
             agg::trans_affine matrix = marker_trans_;
             matrix.translate(x,y);
             box2d<double> transformed_bbox = bbox_ * matrix;
diff --git a/src/load_map.cpp b/src/load_map.cpp
index 2f4d9c8e2..f834e8202 100644
--- a/src/load_map.cpp
+++ b/src/load_map.cpp
@@ -889,7 +889,7 @@ void map_parser::parse_point_symbolizer(rule & rule, xml_node const & sym)
             symbol.set_ignore_placement(* ignore_placement);
         }
         point_placement_e placement =
-            sym.get_attr<point_placement_e>("placement", sym.get_point_placement());
+            sym.get_attr<point_placement_e>("placement", symbol.get_point_placement());
         symbol.set_point_placement(placement);
 
         if (file && !file->empty())
diff --git a/src/markers_symbolizer.cpp b/src/markers_symbolizer.cpp
index 643c7d04b..9de55e492 100644
--- a/src/markers_symbolizer.cpp
+++ b/src/markers_symbolizer.cpp
@@ -30,6 +30,7 @@ namespace mapnik {
 
 static const char * marker_placement_strings[] = {
     "point",
+    "interior",
     "line",
     ""
 };

From a9f99848c238a4c0a4ef461b91abdca77d25fe87 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 31 Jul 2012 18:40:53 -0700
Subject: [PATCH 29/50] expose boost::optional<mapnik::stroke> for
 markers_symbolizer (which works as oopposed to boost::optional<double> and
 boost::optional<float> which are broken

---
 bindings/python/mapnik_python.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bindings/python/mapnik_python.cpp b/bindings/python/mapnik_python.cpp
index 883946427..71231aa25 100644
--- a/bindings/python/mapnik_python.cpp
+++ b/bindings/python/mapnik_python.cpp
@@ -608,6 +608,7 @@ BOOST_PYTHON_MODULE(_mapnik)
     def("has_cairo", &has_cairo, "Get cairo library status");
     def("has_pycairo", &has_pycairo, "Get pycairo module status");
 
+    python_optional<mapnik::stroke>();
     python_optional<mapnik::color>();
     python_optional<mapnik::box2d<double> >();
     python_optional<mapnik::datasource::geometry_t>();

From 295c661af2d95e31b256d8de49ef149ec16c23c5 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 31 Jul 2012 19:19:45 -0700
Subject: [PATCH 30/50] start setting up to sync markers_symbolizer between agg
 and grid renderer

---
 src/agg/process_markers_symbolizer.cpp  |  6 ++--
 src/grid/process_markers_symbolizer.cpp | 46 ++++++++++++++++++++++---
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp
index 451323f5b..ff0d46b18 100644
--- a/src/agg/process_markers_symbolizer.cpp
+++ b/src/agg/process_markers_symbolizer.cpp
@@ -21,11 +21,12 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/debug.hpp>
 #include <mapnik/graphics.hpp>
-#include <mapnik/geom_util.hpp>
 #include <mapnik/agg_renderer.hpp>
 #include <mapnik/agg_rasterizer.hpp>
+
+#include <mapnik/debug.hpp>
+#include <mapnik/geom_util.hpp>
 #include <mapnik/expression_evaluator.hpp>
 #include <mapnik/vertex_converters.hpp>
 #include <mapnik/marker.hpp>
@@ -52,6 +53,7 @@
 #include "agg_span_allocator.h"
 #include "agg_image_accessors.h"
 #include "agg_span_image_filter_rgba.h"
+
 // boost
 #include <boost/optional.hpp>
 
diff --git a/src/grid/process_markers_symbolizer.cpp b/src/grid/process_markers_symbolizer.cpp
index e80d185b6..9242d2027 100644
--- a/src/grid/process_markers_symbolizer.cpp
+++ b/src/grid/process_markers_symbolizer.cpp
@@ -20,22 +20,55 @@
  *
  *****************************************************************************/
 
+/*
+
+porting notes -->
+
+ - grid includes
+ - detector
+ - no gamma
+ - mapnik::pixfmt_gray32
+ - agg::scanline_bin sl
+ - grid_rendering_buffer
+ - agg::renderer_scanline_bin_solid
+ - clamping:
+    // - clamp sizes to > 4 pixels of interactivity
+    if (tr.scale() < 0.5)
+    {
+        agg::trans_affine tr2;
+        tr2 *= agg::trans_affine_scaling(0.5);
+        tr = tr2;
+    }
+    tr *= agg::trans_affine_scaling(scale_factor_*(1.0/pixmap_.get_resolution()));
+ - svg_renderer.render_id
+ - only encode feature if placements are found:
+    if (placed)
+    {
+        pixmap_.add_feature(feature);
+    }
+
+*/
+
 // mapnik
-#include <mapnik/debug.hpp>
 #include <mapnik/grid/grid_rasterizer.hpp>
 #include <mapnik/grid/grid_renderer.hpp>
 #include <mapnik/grid/grid_pixfmt.hpp>
 #include <mapnik/grid/grid_pixel.hpp>
 #include <mapnik/grid/grid.hpp>
+
+#include <mapnik/debug.hpp>
+#include <mapnik/geom_util.hpp>
+#include <mapnik/expression_evaluator.hpp>
+#include <mapnik/vertex_converters.hpp>
 #include <mapnik/marker.hpp>
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/marker_helpers.hpp>
-#include <mapnik/markers_symbolizer.hpp>
-#include <mapnik/expression_evaluator.hpp>
-#include <mapnik/marker_cache.hpp>
 #include <mapnik/svg/svg_renderer.hpp>
+#include <mapnik/svg/svg_storage.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
+#include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/markers_placement.hpp>
+#include <mapnik/markers_symbolizer.hpp>
 
 // agg
 #include "agg_basics.h"
@@ -46,6 +79,11 @@
 #include "agg_path_storage.h"
 #include "agg_conv_clip_polyline.h"
 #include "agg_conv_transform.h"
+#include "agg_image_filters.h"
+#include "agg_trans_bilinear.h"
+#include "agg_span_allocator.h"
+#include "agg_image_accessors.h"
+#include "agg_span_image_filter_rgba.h"
 
 // boost
 #include <boost/optional.hpp>

From fc6a22c014bd04b417eff13747d33be2a92502a2 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 1 Aug 2012 11:07:45 +0100
Subject: [PATCH 31/50] + c++ style

---
 include/mapnik/attribute_collector.hpp |  6 ++---
 src/feature_style_processor.cpp        | 35 +++++++++++++-------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/include/mapnik/attribute_collector.hpp b/include/mapnik/attribute_collector.hpp
index f814d1ac5..81cdad888 100644
--- a/include/mapnik/attribute_collector.hpp
+++ b/include/mapnik/attribute_collector.hpp
@@ -249,7 +249,7 @@ public:
 
 struct directive_collector : public boost::static_visitor<>
 {
-    directive_collector(double * filter_factor)
+    directive_collector(double & filter_factor)
         : filter_factor_(filter_factor) {}
 
     template <typename T>
@@ -257,10 +257,10 @@ struct directive_collector : public boost::static_visitor<>
 
     void operator () (raster_symbolizer const& sym)
     {
-        *filter_factor_ = sym.calculate_filter_factor();
+        filter_factor_ = sym.calculate_filter_factor();
     }
 private:
-    double * filter_factor_;
+    double & filter_factor_;
 };
 
 } // namespace mapnik
diff --git a/src/feature_style_processor.cpp b/src/feature_style_processor.cpp
index a8e0fc8cd..7bc161f6a 100644
--- a/src/feature_style_processor.cpp
+++ b/src/feature_style_processor.cpp
@@ -101,35 +101,35 @@ struct feature_style_processor<Processor>::symbol_dispatch : public boost::stati
         : output_(output),
           f_(f),
           prj_trans_(prj_trans)  {}
-    
+
     template <typename T>
     void operator () (T const& sym) const
     {
         process_impl<has_process<Processor,T>::value>::process(output_,sym,f_,prj_trans_);
     }
-    
+
     Processor & output_;
     mapnik::feature_impl & f_;
     proj_transform const& prj_trans_;
 };
 
-typedef char (&no_tag)[1]; 
-typedef char (&yes_tag)[2]; 
+typedef char (&no_tag)[1];
+typedef char (&yes_tag)[2];
 
 template <typename T0, typename T1, void (T0::*)(T1 const&, mapnik::feature_impl &, proj_transform const&) >
-struct process_memfun_helper {}; 
-    
-template <typename T0, typename T1> no_tag  has_process_helper(...); 
+struct process_memfun_helper {};
+
+template <typename T0, typename T1> no_tag  has_process_helper(...);
 template <typename T0, typename T1> yes_tag has_process_helper(process_memfun_helper<T0, T1, &T0::process>* p);
-    
-template<typename T0,typename T1> 
+
+template<typename T0,typename T1>
 struct has_process
-{      
+{
     typedef typename T0::processor_impl_type processor_impl_type;
-    BOOST_STATIC_CONSTANT(bool 
-                          , value = sizeof(has_process_helper<processor_impl_type,T1>(0)) == sizeof(yes_tag) 
-        ); 
-}; 
+    BOOST_STATIC_CONSTANT(bool
+                          , value = sizeof(has_process_helper<processor_impl_type,T1>(0)) == sizeof(yes_tag)
+        );
+};
 
 
 template <typename Processor>
@@ -350,8 +350,8 @@ void feature_style_processor<Processor>::apply_to_layer(layer const& lay, Proces
     query q(layer_ext,res,scale_denom,m_.get_current_extent());
     std::vector<feature_type_style*> active_styles;
     attribute_collector collector(names);
-    double filt_factor = 1;
-    directive_collector d_collector(&filt_factor);
+    double filt_factor = 1.0;
+    directive_collector d_collector(filt_factor);
 
     // iterate through all named styles collecting active styles and attribute names
     BOOST_FOREACH(std::string const& style_name, style_names)
@@ -519,7 +519,7 @@ void feature_style_processor<Processor>::render_style(
 {
 
     p.start_style_processing(*style);
-    
+
 #if defined(RENDERING_STATS)
     std::ostringstream s1;
     s1 << "rendering style for layer: '" << lay.name()
@@ -661,4 +661,3 @@ template class feature_style_processor<grid_renderer<grid> >;
 template class feature_style_processor<agg_renderer<image_32> >;
 
 }
-

From 5541ea027138c4d8f6d469152df7c58d0146f100 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 1 Aug 2012 15:44:36 +0100
Subject: [PATCH 32/50] + layer : minimum-extent and buffer-size +
 agg::process_xxx : remove ad-hoc query_extent modifiers + ctrans : simplify
 vertex skipping

---
 bindings/python/mapnik_layer.cpp              | 33 +++++++++++
 bindings/python/mapnik_map.cpp                |  7 +--
 include/mapnik/ctrans.hpp                     | 25 +++------
 include/mapnik/layer.hpp                      | 13 ++++-
 include/mapnik/map.hpp                        |  6 +-
 src/agg/agg_renderer.cpp                      | 17 ++++++
 src/agg/process_line_pattern_symbolizer.cpp   | 20 +++----
 src/agg/process_line_symbolizer.cpp           |  2 +-
 src/agg/process_markers_symbolizer.cpp        |  6 +-
 .../process_polygon_pattern_symbolizer.cpp    |  3 +-
 src/agg/process_polygon_symbolizer.cpp        |  6 +-
 src/feature_style_processor.cpp               |  4 +-
 src/layer.cpp                                 | 34 +++++++++++-
 src/load_map.cpp                              | 55 ++++++++++++++-----
 src/map.cpp                                   |  6 +-
 src/save_map.cpp                              | 18 +++++-
 16 files changed, 187 insertions(+), 68 deletions(-)

diff --git a/bindings/python/mapnik_layer.cpp b/bindings/python/mapnik_layer.cpp
index 0b2e8d63b..ae99e5971 100644
--- a/bindings/python/mapnik_layer.cpp
+++ b/bindings/python/mapnik_layer.cpp
@@ -91,6 +91,18 @@ struct layer_pickle_suite : boost::python::pickle_suite
 
 std::vector<std::string> & (mapnik::layer::*_styles_)() = &mapnik::layer::styles;
 
+void set_maximum_extent(mapnik::layer & l, boost::optional<mapnik::box2d<double> > const& box)
+{
+    if (box)
+    {
+        l.set_maximum_extent(*box);
+    }
+    else
+    {
+        l.reset_maximum_extent();
+    }
+}
+
 void export_layer()
 {
     using namespace boost::python;
@@ -196,6 +208,27 @@ void export_layer()
                       "<mapnik.Datasource object at 0x65470>\n"
             )
 
+        .add_property("buffer_size",
+                      &layer::buffer_size,
+                      &layer::set_buffer_size,
+                      "Get/Set the size of buffer around layer in pixels.\n"
+                      "\n"
+                      "Usage:\n"
+                      ">>> l.buffer_size\n"
+                      "0 # zero by default\n"
+                      ">>> l.buffer_size = 2\n"
+                      ">>> l.buffer_size\n"
+                      "2\n"
+            )
+        .add_property("maximum_extent",make_function
+                      (&layer::maximum_extent,return_value_policy<copy_const_reference>()),
+                      &set_maximum_extent,
+                      "The maximum extent of the map.\n"
+                      "\n"
+                      "Usage:\n"
+                      ">>> m.maximum_extent = Box2d(-180,-90,180,90)\n"
+            )
+
         .add_property("maxzoom",
                       &layer::max_zoom,
                       &layer::set_max_zoom,
diff --git a/bindings/python/mapnik_map.cpp b/bindings/python/mapnik_map.cpp
index 3bc1ca983..e2a21e674 100644
--- a/bindings/python/mapnik_map.cpp
+++ b/bindings/python/mapnik_map.cpp
@@ -117,7 +117,7 @@ struct map_pickle_suite : boost::python::pickle_suite
 std::vector<layer>& (Map::*layers_nonconst)() =  &Map::layers;
 std::vector<layer> const& (Map::*layers_const)() const =  &Map::layers;
 mapnik::parameters& (Map::*params_nonconst)() =  &Map::get_extra_parameters;
-boost::optional<mapnik::box2d<double> > const& (Map::*maximum_extent_const)() const =  &Map::maximum_extent;
+//boost::optional<mapnik::box2d<double> > const& (Map::*maximum_extent_const)() const =  &Map::maximum_extent;
 
 mapnik::feature_type_style find_style(mapnik::Map const& m, std::string const& name)
 {
@@ -192,7 +192,6 @@ mapnik::Map map_deepcopy(mapnik::Map & m, boost::python::dict memo)
     return result;
 }
 
-// TODO - find a simplier way to set optional to uninitialized
 void set_maximum_extent(mapnik::Map & m, boost::optional<mapnik::box2d<double> > const& box)
 {
     if (box)
@@ -201,7 +200,7 @@ void set_maximum_extent(mapnik::Map & m, boost::optional<mapnik::box2d<double> >
     }
     else
     {
-        m.maximum_extent().reset();
+        m.reset_maximum_extent();
     }
 }
 
@@ -562,7 +561,7 @@ void export_map()
             )
 
         .add_property("maximum_extent",make_function
-                      (maximum_extent_const,return_value_policy<copy_const_reference>()),
+                      (&Map::maximum_extent,return_value_policy<copy_const_reference>()),
                       &set_maximum_extent,
                       "The maximum extent of the map.\n"
                       "\n"
diff --git a/include/mapnik/ctrans.hpp b/include/mapnik/ctrans.hpp
index a06872422..a56bc4bc4 100644
--- a/include/mapnik/ctrans.hpp
+++ b/include/mapnik/ctrans.hpp
@@ -52,34 +52,25 @@ struct MAPNIK_DECL coord_transform
         : t_(0),
         geom_(geom),
         prj_trans_(0)  {}
-    
+
     void set_proj_trans(proj_transform const& prj_trans)
     {
         prj_trans_ = &prj_trans;
     }
-    
+
     void set_trans(Transform  const& t)
     {
         t_ = &t;
     }
-    
+
     unsigned vertex(double *x, double *y) const
     {
-        unsigned command = SEG_MOVETO;
-        bool ok = false;
-        bool skipped_points = false;
-        double z = 0;
-        while (!ok && command != SEG_END)
+        unsigned command = geom_.vertex(x, y);
+        if ( command != SEG_END)
         {
-            command = geom_.vertex(x, y);
-            ok = prj_trans_->backward(*x, *y, z);
-            if (!ok) {
-                skipped_points = true;
-            }
-        }
-        if (skipped_points && (command == SEG_LINETO))
-        {
-            command = SEG_MOVETO;
+            double z = 0;
+            if (!prj_trans_->backward(*x, *y, z))
+                return SEG_END;
         }
         t_->forward(x, y);
         return command;
diff --git a/include/mapnik/layer.hpp b/include/mapnik/layer.hpp
index ab0eb4a8e..1be1b23c0 100644
--- a/include/mapnik/layer.hpp
+++ b/include/mapnik/layer.hpp
@@ -43,7 +43,9 @@ namespace mapnik
 class MAPNIK_DECL layer
 {
 public:
-    explicit layer(std::string const& name, std::string const& srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs");
+    layer(std::string const& name,
+          std::string const& srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs");
+
     layer(layer const& l);
     layer& operator=(layer const& l);
     bool operator==(layer const& other) const;
@@ -57,7 +59,7 @@ public:
      * @return the name of the layer.
      */
 
-    const std::string& name() const;
+    std::string const& name() const;
 
     /*!
      * @brief Set the SRS of the layer.
@@ -188,6 +190,11 @@ public:
      */
     box2d<double> envelope() const;
 
+    void set_maximum_extent(box2d<double> const& box);
+    boost::optional<box2d<double> > const&  maximum_extent() const;
+    void reset_maximum_extent();
+    void set_buffer_size(int size);
+    int buffer_size() const;
     ~layer();
 private:
     void swap(const layer& other);
@@ -204,6 +211,8 @@ private:
     std::string group_by_;
     std::vector<std::string> styles_;
     datasource_ptr ds_;
+    int buffer_size_;
+    boost::optional<box2d<double> > maximum_extent_;
 };
 }
 
diff --git a/include/mapnik/map.hpp b/include/mapnik/map.hpp
index bfbf87edd..400f081ac 100644
--- a/include/mapnik/map.hpp
+++ b/include/mapnik/map.hpp
@@ -331,15 +331,13 @@ public:
     /*! \brief Set the map maximum extent.
      *  @param box The bounding box for the maximum extent.
      */
-    void set_maximum_extent(box2d<double>const& box);
+    void set_maximum_extent(box2d<double> const& box);
 
     /*! \brief Get the map maximum extent as box2d<double>
      */
     boost::optional<box2d<double> > const& maximum_extent() const;
 
-    /*! \brief Get the non-const map maximum extent as box2d<double>
-     */
-    boost::optional<box2d<double> > & maximum_extent();
+    void reset_maximum_extent();
 
     /*! \brief Get the map base path where paths should be relative to.
      */
diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp
index 92cda8973..77ae1e752 100644
--- a/src/agg/agg_renderer.cpp
+++ b/src/agg/agg_renderer.cpp
@@ -191,7 +191,24 @@ void agg_renderer<T>::start_layer_processing(layer const& lay, box2d<double> con
     {
         detector_->clear();
     }
+
     query_extent_ = query_extent;
+    int buffer_size = lay.buffer_size();
+    if (buffer_size != 0 )
+    {
+        double padding = buffer_size * (double)(query_extent.width()/pixmap_.width());
+        double x0 = query_extent_.minx();
+        double y0 = query_extent_.miny();
+        double x1 = query_extent_.maxx();
+        double y1 = query_extent_.maxy();
+        query_extent_.init(x0 - padding, y0 - padding, x1 + padding , y1 + padding);
+    }
+
+    boost::optional<box2d<double> > const& maximum_extent = lay.maximum_extent();
+    if (maximum_extent)
+    {
+        query_extent_.clip(*maximum_extent);
+    }
 }
 
 template <typename T>
diff --git a/src/agg/process_line_pattern_symbolizer.cpp b/src/agg/process_line_pattern_symbolizer.cpp
index 5f79a7755..e8c50209b 100644
--- a/src/agg/process_line_pattern_symbolizer.cpp
+++ b/src/agg/process_line_pattern_symbolizer.cpp
@@ -56,7 +56,7 @@ void  agg_renderer<T>::process(line_pattern_symbolizer const& sym,
 {
     typedef agg::rgba8 color;
     typedef agg::order_rgba order;
-    typedef agg::pixel32_type pixel_type;    
+    typedef agg::pixel32_type pixel_type;
     typedef agg::comp_op_adaptor_rgba_pre<color, order> blender_type;
     typedef agg::pattern_filter_bilinear_rgba8 pattern_filter_type;
     typedef agg::line_image_pattern<pattern_filter_type> pattern_type;
@@ -64,7 +64,7 @@ void  agg_renderer<T>::process(line_pattern_symbolizer const& sym,
     typedef agg::renderer_base<pixfmt_type> renderer_base;
     typedef agg::renderer_outline_image<renderer_base, pattern_type> renderer_type;
     typedef agg::rasterizer_outline_aa<renderer_type> rasterizer_type;
-    
+
     std::string filename = path_processor_type::evaluate( *sym.get_filename(), feature);
 
     boost::optional<marker_ptr> mark = marker_cache::instance()->find(filename,true);
@@ -81,8 +81,6 @@ void  agg_renderer<T>::process(line_pattern_symbolizer const& sym,
 
     if (!pat) return;
 
-    box2d<double> ext = query_extent_ * 1.0;
-    
     agg::rendering_buffer buf(current_buffer_->raw_data(),width_,height_, width_ * 4);
     pixfmt_type pixf(buf);
     pixf.comp_op(static_cast<agg::comp_op_e>(sym.comp_op()));
@@ -91,26 +89,26 @@ void  agg_renderer<T>::process(line_pattern_symbolizer const& sym,
 
     pattern_source source(*(*pat));
     pattern_type pattern (filter,source);
-    renderer_type ren(ren_base, pattern);    
+    renderer_type ren(ren_base, pattern);
     rasterizer_type ras(ren);
-    
+
     agg::trans_affine tr;
     evaluate_transform(tr, feature, sym.get_transform());
 
     typedef boost::mpl::vector<clip_line_tag,transform_tag,smooth_tag> conv_types;
     vertex_converter<box2d<double>, rasterizer_type, line_pattern_symbolizer,
                      CoordTransform, proj_transform, agg::trans_affine, conv_types>
-        converter(ext,ras,sym,t_,prj_trans,tr,scale_factor_);
-    
+        converter(query_extent_,ras,sym,t_,prj_trans,tr,scale_factor_);
+
     if (sym.clip()) converter.set<clip_line_tag>(); //optional clip (default: true)
-    converter.set<transform_tag>(); //always transform 
+    converter.set<transform_tag>(); //always transform
     if (sym.smooth() > 0.0) converter.set<smooth_tag>(); // optional smooth converter
-    
+
     BOOST_FOREACH(geometry_type & geom, feature.paths())
     {
         if (geom.size() > 1)
         {
-            converter.apply(geom);        
+            converter.apply(geom);
         }
     }
 }
diff --git a/src/agg/process_line_symbolizer.cpp b/src/agg/process_line_symbolizer.cpp
index ec75035b4..bc02c8739 100644
--- a/src/agg/process_line_symbolizer.cpp
+++ b/src/agg/process_line_symbolizer.cpp
@@ -80,7 +80,7 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
     agg::trans_affine tr;
     evaluate_transform(tr, feature, sym.get_transform());
 
-    box2d<double> ext = query_extent_ * 1.1;
+    box2d<double> ext = query_extent_ * 1.0;
 
     if (sym.get_rasterizer() == RASTERIZER_FAST)
     {
diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp
index 451323f5b..9a32f0424 100644
--- a/src/agg/process_markers_symbolizer.cpp
+++ b/src/agg/process_markers_symbolizer.cpp
@@ -363,7 +363,7 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
                                                       bbox, marker_trans, sym, *detector_, scale_factor_);
                     vertex_converter<box2d<double>, dispatch_type, markers_symbolizer,
                                      CoordTransform, proj_transform, agg::trans_affine, conv_types>
-                        converter(query_extent_* 1.1,rasterizer_dispatch, sym,t_,prj_trans,tr,scale_factor_);
+                        converter(query_extent_, rasterizer_dispatch, sym,t_,prj_trans,tr,scale_factor_);
                     if (sym.clip() && feature.paths().size() > 0) // optional clip (default: true)
                     {
                         eGeomType type = feature.paths()[0].type();
@@ -396,7 +396,7 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
                                                       bbox, marker_trans, sym, *detector_, scale_factor_);
                     vertex_converter<box2d<double>, dispatch_type, markers_symbolizer,
                                      CoordTransform, proj_transform, agg::trans_affine, conv_types>
-                        converter(query_extent_* 1.1,rasterizer_dispatch, sym,t_,prj_trans,tr,scale_factor_);
+                        converter(query_extent_, rasterizer_dispatch, sym,t_,prj_trans,tr,scale_factor_);
                     if (sym.clip() && feature.paths().size() > 0) // optional clip (default: true)
                     {
                         eGeomType type = feature.paths()[0].type();
@@ -427,7 +427,7 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
                                                   marker_trans, sym, *detector_, scale_factor_);
                 vertex_converter<box2d<double>, dispatch_type, markers_symbolizer,
                                  CoordTransform, proj_transform, agg::trans_affine, conv_types>
-                    converter(query_extent_* 1.1, rasterizer_dispatch, sym,t_,prj_trans,tr,scale_factor_);
+                    converter(query_extent_, rasterizer_dispatch, sym,t_,prj_trans,tr,scale_factor_);
 
                 if (sym.clip() && feature.paths().size() > 0) // optional clip (default: true)
                 {
diff --git a/src/agg/process_polygon_pattern_symbolizer.cpp b/src/agg/process_polygon_pattern_symbolizer.cpp
index 2a5ec53d3..a8b5a7c9f 100644
--- a/src/agg/process_polygon_pattern_symbolizer.cpp
+++ b/src/agg/process_polygon_pattern_symbolizer.cpp
@@ -139,11 +139,10 @@ void agg_renderer<T>::process(polygon_pattern_symbolizer const& sym,
     agg::trans_affine tr;
     evaluate_transform(tr, feature, sym.get_transform());
 
-    box2d<double> inflated_extent = query_extent_ * 1.0;
     typedef boost::mpl::vector<clip_poly_tag,transform_tag,smooth_tag> conv_types;
     vertex_converter<box2d<double>, rasterizer, polygon_pattern_symbolizer,
                      CoordTransform, proj_transform, agg::trans_affine, conv_types>
-        converter(inflated_extent,*ras_ptr,sym,t_,prj_trans,tr,scale_factor_);
+        converter(query_extent_,*ras_ptr,sym,t_,prj_trans,tr,scale_factor_);
 
     if (sym.clip()) converter.set<clip_poly_tag>(); //optional clip (default: true)
     converter.set<transform_tag>(); //always transform
diff --git a/src/agg/process_polygon_symbolizer.cpp b/src/agg/process_polygon_symbolizer.cpp
index 2b1266659..323f987ef 100644
--- a/src/agg/process_polygon_symbolizer.cpp
+++ b/src/agg/process_polygon_symbolizer.cpp
@@ -48,15 +48,13 @@ void agg_renderer<T>::process(polygon_symbolizer const& sym,
     ras_ptr->reset();
     set_gamma_method(sym,ras_ptr);
 
-    box2d<double> inflated_extent = query_extent_ * 1.0;
-
     agg::trans_affine tr;
     evaluate_transform(tr, feature, sym.get_transform());
 
     typedef boost::mpl::vector<clip_poly_tag,transform_tag,affine_transform_tag,smooth_tag> conv_types;
     vertex_converter<box2d<double>, rasterizer, polygon_symbolizer,
                      CoordTransform, proj_transform, agg::trans_affine, conv_types>
-        converter(inflated_extent,*ras_ptr,sym,t_,prj_trans,tr,scale_factor_);
+        converter(query_extent_,*ras_ptr,sym,t_,prj_trans,tr,scale_factor_);
 
     if (sym.clip()) converter.set<clip_poly_tag>(); //optional clip (default: true)
     converter.set<transform_tag>(); //always transform
@@ -72,7 +70,7 @@ void agg_renderer<T>::process(polygon_symbolizer const& sym,
     }
 
     agg::rendering_buffer buf(current_buffer_->raw_data(),width_,height_, width_ * 4);
-    
+
     color const& fill = sym.get_fill();
     unsigned r=fill.red();
     unsigned g=fill.green();
diff --git a/src/feature_style_processor.cpp b/src/feature_style_processor.cpp
index 7bc161f6a..d22d8caf1 100644
--- a/src/feature_style_processor.cpp
+++ b/src/feature_style_processor.cpp
@@ -320,9 +320,11 @@ void feature_style_processor<Processor>::apply_to_layer(layer const& lay, Proces
     // if we've got this far, now prepare the unbuffered extent
     // which is used as a bbox for clipping geometries
     box2d<double> query_ext = m_.get_current_extent(); // unbuffered
-    if (maximum_extent) {
+    if (maximum_extent)
+    {
         query_ext.clip(*maximum_extent);
     }
+
     box2d<double> layer_ext2 = lay.envelope();
     if (fw_success)
     {
diff --git a/src/layer.cpp b/src/layer.cpp
index 985eb5bad..09fbb0eb6 100644
--- a/src/layer.cpp
+++ b/src/layer.cpp
@@ -42,7 +42,8 @@ layer::layer(std::string const& name, std::string const& srs)
       clear_label_cache_(false),
       cache_features_(false),
       group_by_(""),
-      ds_() {}
+      ds_(),
+      buffer_size_(0) {}
 
 layer::layer(const layer& rhs)
     : name_(rhs.name_),
@@ -55,7 +56,9 @@ layer::layer(const layer& rhs)
       cache_features_(rhs.cache_features_),
       group_by_(rhs.group_by_),
       styles_(rhs.styles_),
-      ds_(rhs.ds_) {}
+      ds_(rhs.ds_),
+      buffer_size_(rhs.buffer_size_),
+      maximum_extent_(rhs.maximum_extent_) {}
 
 layer& layer::operator=(const layer& rhs)
 {
@@ -82,6 +85,8 @@ void layer::swap(const layer& rhs)
     group_by_ = rhs.group_by_;
     styles_=rhs.styles_;
     ds_=rhs.ds_;
+    buffer_size_ = rhs.buffer_size_;
+    maximum_extent_ = rhs.maximum_extent_;
 }
 
 layer::~layer() {}
@@ -176,6 +181,31 @@ void layer::set_datasource(datasource_ptr const& ds)
     ds_ = ds;
 }
 
+void layer::set_maximum_extent(box2d<double> const& box)
+{
+    maximum_extent_.reset(box);
+}
+
+boost::optional<box2d<double> > const& layer::maximum_extent() const
+{
+    return maximum_extent_;
+}
+
+void layer::reset_maximum_extent()
+{
+    maximum_extent_.reset();
+}
+
+void layer::set_buffer_size(int size)
+{
+    buffer_size_ = size;
+}
+
+int layer::buffer_size() const
+{
+    return buffer_size_;
+}
+
 box2d<double> layer::envelope() const
 {
     if (ds_) return ds_->envelope();
diff --git a/src/load_map.cpp b/src/load_map.cpp
index f834e8202..9c0cebd93 100644
--- a/src/load_map.cpp
+++ b/src/load_map.cpp
@@ -574,66 +574,95 @@ bool map_parser::parse_font(font_set &fset, xml_node const& f)
     return false;
 }
 
-void map_parser::parse_layer(Map & map, xml_node const& lay)
+void map_parser::parse_layer(Map & map, xml_node const& node)
 {
     std::string name;
     try
     {
-        name = lay.get_attr("name", std::string("Unnamed"));
+        name = node.get_attr("name", std::string("Unnamed"));
 
         // XXX if no projection is given inherit from map? [DS]
-        std::string srs = lay.get_attr("srs", map.srs());
+        std::string srs = node.get_attr("srs", map.srs());
 
         layer lyr(name, srs);
 
-        optional<boolean> status = lay.get_opt_attr<boolean>("status");
+        optional<boolean> status = node.get_opt_attr<boolean>("status");
         if (status)
         {
             lyr.set_active(* status);
         }
 
-        optional<double> min_zoom = lay.get_opt_attr<double>("minzoom");
+        optional<double> min_zoom = node.get_opt_attr<double>("minzoom");
         if (min_zoom)
         {
             lyr.set_min_zoom(* min_zoom);
         }
 
 
-        optional<double> max_zoom = lay.get_opt_attr<double>("maxzoom");
+        optional<double> max_zoom = node.get_opt_attr<double>("maxzoom");
         if (max_zoom)
         {
             lyr.set_max_zoom(* max_zoom);
         }
 
-        optional<boolean> queryable = lay.get_opt_attr<boolean>("queryable");
+        optional<boolean> queryable = node.get_opt_attr<boolean>("queryable");
         if (queryable)
         {
             lyr.set_queryable(* queryable);
         }
 
         optional<boolean> clear_cache =
-            lay.get_opt_attr<boolean>("clear-label-cache");
+            node.get_opt_attr<boolean>("clear-label-cache");
         if (clear_cache)
         {
             lyr.set_clear_label_cache(* clear_cache);
         }
 
         optional<boolean> cache_features =
-            lay.get_opt_attr<boolean>("cache-features");
+            node.get_opt_attr<boolean>("cache-features");
         if (cache_features)
         {
             lyr.set_cache_features(* cache_features);
         }
 
         optional<std::string> group_by =
-            lay.get_opt_attr<std::string>("group-by");
+            node.get_opt_attr<std::string>("group-by");
         if (group_by)
         {
             lyr.set_group_by(* group_by);
         }
 
-        xml_node::const_iterator child = lay.begin();
-        xml_node::const_iterator end = lay.end();
+        optional<unsigned> buffer_size = node.get_opt_attr<unsigned>("buffer-size");
+        if (buffer_size)
+        {
+            lyr.set_buffer_size(*buffer_size);
+        }
+
+        optional<std::string> maximum_extent = node.get_opt_attr<std::string>("maximum-extent");
+        if (maximum_extent)
+        {
+            box2d<double> box;
+            if (box.from_string(*maximum_extent))
+            {
+                lyr.set_maximum_extent(box);
+            }
+            else
+            {
+                std::ostringstream s_err;
+                s_err << "failed to parse 'maximum-extent' in layer " << name;
+                if (strict_)
+                {
+                    throw config_error(s_err.str());
+                }
+                else
+                {
+                    MAPNIK_LOG_WARN(load_map) << "map_parser: " << s_err.str();
+                }
+            }
+        }
+
+        xml_node::const_iterator child = node.begin();
+        xml_node::const_iterator end = node.end();
 
         for(; child != end; ++child)
         {
@@ -718,7 +747,7 @@ void map_parser::parse_layer(Map & map, xml_node const& lay)
     {
         if (!name.empty())
         {
-            ex.append_context(std::string(" encountered during parsing of layer '") + name + "'", lay);
+            ex.append_context(std::string(" encountered during parsing of layer '") + name + "'", node);
         }
         throw;
     }
diff --git a/src/map.cpp b/src/map.cpp
index 7a9d1f14b..c94509df7 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -352,7 +352,7 @@ void Map::set_background_image(std::string const& image_filename)
 
 void Map::set_maximum_extent(box2d<double> const& box)
 {
-    maximum_extent_ = box;
+    maximum_extent_.reset(box);
 }
 
 boost::optional<box2d<double> > const& Map::maximum_extent() const
@@ -360,9 +360,9 @@ boost::optional<box2d<double> > const& Map::maximum_extent() const
     return maximum_extent_;
 }
 
-boost::optional<box2d<double> > & Map::maximum_extent()
+void Map::reset_maximum_extent()
 {
-    return maximum_extent_;
+    maximum_extent_.reset();
 }
 
 std::string const&  Map::base_path() const
diff --git a/src/save_map.cpp b/src/save_map.cpp
index 52d0482ec..fef378e79 100644
--- a/src/save_map.cpp
+++ b/src/save_map.cpp
@@ -741,6 +741,22 @@ void serialize_layer( ptree & map_node, const layer & layer, bool explicit_defau
         set_attr( layer_node, "group-by", layer.group_by() );
     }
 
+    int buffer_size = layer.buffer_size();
+    if ( buffer_size || explicit_defaults)
+    {
+        set_attr( layer_node, "buffer-size", buffer_size );
+    }
+
+    optional<box2d<double> > const& maximum_extent = layer.maximum_extent();
+    if ( maximum_extent)
+    {
+        std::ostringstream s;
+        s << std::setprecision(16)
+          << maximum_extent->minx() << "," << maximum_extent->miny() << ","
+          << maximum_extent->maxx() << "," << maximum_extent->maxy();
+        set_attr( layer_node, "maximum-extent", s.str() );
+    }
+
     std::vector<std::string> const& style_names = layer.styles();
     for (unsigned i = 0; i < style_names.size(); ++i)
     {
@@ -788,7 +804,7 @@ void serialize_map(ptree & pt, Map const & map, bool explicit_defaults)
         set_attr( map_node, "background-image", *image_filename );
     }
 
-    unsigned buffer_size = map.buffer_size();
+    int buffer_size = map.buffer_size();
     if ( buffer_size || explicit_defaults)
     {
         set_attr( map_node, "buffer-size", buffer_size );

From 6c173cd9d457dfa1a9c03df1eda715d5b0bd1238 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 1 Aug 2012 16:30:11 +0100
Subject: [PATCH 33/50] + cleanup

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

diff --git a/src/agg/process_line_symbolizer.cpp b/src/agg/process_line_symbolizer.cpp
index bc02c8739..28ec848f7 100644
--- a/src/agg/process_line_symbolizer.cpp
+++ b/src/agg/process_line_symbolizer.cpp
@@ -80,8 +80,6 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
     agg::trans_affine tr;
     evaluate_transform(tr, feature, sym.get_transform());
 
-    box2d<double> ext = query_extent_ * 1.0;
-
     if (sym.get_rasterizer() == RASTERIZER_FAST)
     {
         typedef agg::renderer_outline_aa<renderer_base> renderer_type;
@@ -99,7 +97,7 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
                                    smooth_tag, dash_tag, stroke_tag> conv_types;
         vertex_converter<box2d<double>, rasterizer_type, line_symbolizer,
                          CoordTransform, proj_transform, agg::trans_affine, conv_types>
-            converter(ext,ras,sym,t_,prj_trans,tr,scaled);
+            converter(query_extent_,ras,sym,t_,prj_trans,tr,scaled);
 
         if (sym.clip() && feature.paths().size() > 0) // optional clip (default: true)
         {
@@ -133,7 +131,7 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
 
         vertex_converter<box2d<double>, rasterizer, line_symbolizer,
                          CoordTransform, proj_transform, agg::trans_affine, conv_types>
-            converter(ext,*ras_ptr,sym,t_,prj_trans,tr,scale_factor_);
+            converter(query_extent_,*ras_ptr,sym,t_,prj_trans,tr,scale_factor_);
 
         if (sym.clip() && feature.paths().size() > 0) // optional clip (default: true)
         {

From 3db39f2b7849fbacee988f9f0efbf568b3723714 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 1 Aug 2012 17:06:35 +0100
Subject: [PATCH 34/50] + revert using clip_poly_line to avoid rendering
 artifacts   (TODO: consider modifying agg::conv_clip_polyline)

---
 src/agg/process_line_symbolizer.cpp | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/agg/process_line_symbolizer.cpp b/src/agg/process_line_symbolizer.cpp
index 28ec848f7..36d2ae83e 100644
--- a/src/agg/process_line_symbolizer.cpp
+++ b/src/agg/process_line_symbolizer.cpp
@@ -92,23 +92,13 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
         rasterizer_type ras(ren);
         set_join_caps_aa(stroke_,ras);
 
-        typedef boost::mpl::vector<clip_line_tag, clip_poly_tag,transform_tag,
+        typedef boost::mpl::vector<clip_line_tag, transform_tag,
                                    offset_transform_tag, affine_transform_tag,
                                    smooth_tag, dash_tag, stroke_tag> conv_types;
         vertex_converter<box2d<double>, rasterizer_type, line_symbolizer,
                          CoordTransform, proj_transform, agg::trans_affine, conv_types>
             converter(query_extent_,ras,sym,t_,prj_trans,tr,scaled);
-
-        if (sym.clip() && feature.paths().size() > 0) // optional clip (default: true)
-        {
-            eGeomType type = feature.paths()[0].type();
-            if (type == Polygon)
-                converter.set<clip_poly_tag>();
-            else if (type == LineString)
-                converter.set<clip_line_tag>();
-            // don't clip if type==Point
-        }
-
+        if (sym.clip()) converter.set<clip_line_tag>(); // optional clip (default: true)
         converter.set<transform_tag>(); // always transform
         if (fabs(sym.offset()) > 0.0) converter.set<offset_transform_tag>(); // parallel offset
         converter.set<affine_transform_tag>(); // optional affine transform
@@ -126,23 +116,14 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
     }
     else
     {
-        typedef boost::mpl::vector<clip_line_tag, clip_poly_tag, transform_tag, offset_transform_tag,
+        typedef boost::mpl::vector<clip_line_tag, transform_tag, offset_transform_tag,
                                    affine_transform_tag, smooth_tag, dash_tag, stroke_tag> conv_types;
 
         vertex_converter<box2d<double>, rasterizer, line_symbolizer,
                          CoordTransform, proj_transform, agg::trans_affine, conv_types>
             converter(query_extent_,*ras_ptr,sym,t_,prj_trans,tr,scale_factor_);
 
-        if (sym.clip() && feature.paths().size() > 0) // optional clip (default: true)
-        {
-            eGeomType type = feature.paths()[0].type();
-            if (type == Polygon)
-                converter.set<clip_poly_tag>();
-            else if (type == LineString)
-                converter.set<clip_line_tag>();
-            // don't clip if type==Point
-        }
-
+        if (sym.clip()) converter.set<clip_line_tag>(); // optional clip (default: true)
         converter.set<transform_tag>(); // always transform
         if (fabs(sym.offset()) > 0.0) converter.set<offset_transform_tag>(); // parallel offset
         converter.set<affine_transform_tag>(); // optional affine transform

From 8ff71a24bd6c473f5d63824212d552c3be8c789a Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 1 Aug 2012 17:29:22 +0100
Subject: [PATCH 35/50] + fixed naming (as per SVG)

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

diff --git a/src/save_map.cpp b/src/save_map.cpp
index fef378e79..3138ca040 100644
--- a/src/save_map.cpp
+++ b/src/save_map.cpp
@@ -467,7 +467,7 @@ private:
         }
         if ( strk.dash_offset() != dfl.dash_offset() || explicit_defaults_ )
         {
-            set_attr( node, "stroke-dash-offset", strk.dash_offset());
+            set_attr( node, "stroke-dashoffset", strk.dash_offset());
         }
         if ( ! strk.get_dash_array().empty() )
         {

From 6f15731c37db5579cfacd1cc11e3c616e47ad359 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Wed, 1 Aug 2012 16:40:06 -0700
Subject: [PATCH 36/50] use std::fixed when outputting bbox's to string

---
 include/mapnik/agg_renderer.hpp | 1 +
 include/mapnik/box2d.hpp        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/mapnik/agg_renderer.hpp b/include/mapnik/agg_renderer.hpp
index c82f57239..15ca8c2d5 100644
--- a/include/mapnik/agg_renderer.hpp
+++ b/include/mapnik/agg_renderer.hpp
@@ -123,6 +123,7 @@ protected:
                         double x, double y, double angle = 0.0);
     void debug_draw_box(box2d<double> const& extent,
                         double x, double y, double angle = 0.0);
+    void draw_geo_extent(box2d<double> const& extent,mapnik::color const& color);
 
 private:
     buffer_type & pixmap_;
diff --git a/include/mapnik/box2d.hpp b/include/mapnik/box2d.hpp
index fa52573fb..9f6bdb599 100644
--- a/include/mapnik/box2d.hpp
+++ b/include/mapnik/box2d.hpp
@@ -109,7 +109,7 @@ operator << (std::basic_ostream<charT,traits>& out,
     std::basic_ostringstream<charT,traits> s;
     s.copyfmt(out);
     s.width(0);
-    s << "box2d(" << std::setprecision(16)
+    s << "box2d(" << std::fixed << std::setprecision(16)
       << e.minx() << ',' << e.miny() << ','
       << e.maxx() << ',' << e.maxy() << ')';
     out << s.str();

From 092a1bf625f5da3fe902a24c30f553c4a1c5a56b Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Wed, 1 Aug 2012 16:40:48 -0700
Subject: [PATCH 37/50] impl debug box drawing in geo extents

---
 src/agg/agg_renderer.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp
index 77ae1e752..a3af6c492 100644
--- a/src/agg/agg_renderer.cpp
+++ b/src/agg/agg_renderer.cpp
@@ -444,6 +444,27 @@ void agg_renderer<T>::debug_draw_box(R& buf, box2d<double> const& box,
     agg::render_scanlines(*ras_ptr, sl_line, ren);
 }
 
+template <typename T>
+void agg_renderer<T>::draw_geo_extent(box2d<double> const& extent, mapnik::color const& color)
+{
+    box2d<double> box = t_.forward(extent);
+    double x0 = box.minx();
+    double x1 = box.maxx();
+    double y0 = box.miny();
+    double y1 = box.maxy();
+    unsigned rgba = color.rgba();
+    for (double x=x0; x<x1; x++)
+    {
+        pixmap_.setPixel(x, y0, rgba);
+        pixmap_.setPixel(x, y1, rgba);
+    }
+    for (double y=y0; y<y1; y++)
+    {
+        pixmap_.setPixel(x0, y, rgba);
+        pixmap_.setPixel(x1, y, rgba);
+    }
+}
+
 template class agg_renderer<image_32>;
 template void agg_renderer<image_32>::debug_draw_box<agg::rendering_buffer>(
                 agg::rendering_buffer& buf,

From 72114363135ec83b37089f881c8e79e67d104df0 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Wed, 1 Aug 2012 16:43:00 -0700
Subject: [PATCH 38/50] avoid clipping artifacts with line_symbolizer by using
 stroke sensitive clipping extent - refs #1282, #1185, #1215

---
 src/agg/process_line_symbolizer.cpp | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/agg/process_line_symbolizer.cpp b/src/agg/process_line_symbolizer.cpp
index 36d2ae83e..776f0870e 100644
--- a/src/agg/process_line_symbolizer.cpp
+++ b/src/agg/process_line_symbolizer.cpp
@@ -47,7 +47,6 @@
 
 namespace mapnik {
 
-
 template <typename T>
 void agg_renderer<T>::process(line_symbolizer const& sym,
                               mapnik::feature_impl & feature,
@@ -80,6 +79,23 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
     agg::trans_affine tr;
     evaluate_transform(tr, feature, sym.get_transform());
 
+    box2d<double> clipping_extent = query_extent_;
+    if (sym.clip())
+    {
+        double padding = (double)(query_extent_.width()/pixmap_.width());
+        float half_stroke = stroke_.get_width()/2.0;
+        if (half_stroke > 1)
+            padding *= half_stroke;
+        double x0 = query_extent_.minx();
+        double y0 = query_extent_.miny();
+        double x1 = query_extent_.maxx();
+        double y1 = query_extent_.maxy();
+        clipping_extent.init(x0 - padding, y0 - padding, x1 + padding , y1 + padding);
+        // debugging
+        //box2d<double> inverse(x0 + padding, y0 + padding, x1 - padding , y1 - padding);
+        //draw_geo_extent(inverse,mapnik::color("red"));
+    }
+
     if (sym.get_rasterizer() == RASTERIZER_FAST)
     {
         typedef agg::renderer_outline_aa<renderer_base> renderer_type;
@@ -97,7 +113,7 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
                                    smooth_tag, dash_tag, stroke_tag> conv_types;
         vertex_converter<box2d<double>, rasterizer_type, line_symbolizer,
                          CoordTransform, proj_transform, agg::trans_affine, conv_types>
-            converter(query_extent_,ras,sym,t_,prj_trans,tr,scaled);
+            converter(clipping_extent,ras,sym,t_,prj_trans,tr,scaled);
         if (sym.clip()) converter.set<clip_line_tag>(); // optional clip (default: true)
         converter.set<transform_tag>(); // always transform
         if (fabs(sym.offset()) > 0.0) converter.set<offset_transform_tag>(); // parallel offset
@@ -121,7 +137,7 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
 
         vertex_converter<box2d<double>, rasterizer, line_symbolizer,
                          CoordTransform, proj_transform, agg::trans_affine, conv_types>
-            converter(query_extent_,*ras_ptr,sym,t_,prj_trans,tr,scale_factor_);
+            converter(clipping_extent,*ras_ptr,sym,t_,prj_trans,tr,scale_factor_);
 
         if (sym.clip()) converter.set<clip_line_tag>(); // optional clip (default: true)
         converter.set<transform_tag>(); // always transform

From a22b31b0cc431196516fecd108b29bad36e797df Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Wed, 1 Aug 2012 16:43:47 -0700
Subject: [PATCH 39/50] switch out new test image since there is no visual
 difference to the old one

---
 .../mapnik-wgs842merc-reprojection-render.png | Bin 48060 -> 48065 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/python_tests/images/support/mapnik-wgs842merc-reprojection-render.png b/tests/python_tests/images/support/mapnik-wgs842merc-reprojection-render.png
index b5f8a7c1b2b9914e8dae1733ee88f899117705e5..029212655128b6a28959f4f5e8de9abc5c01aff8 100644
GIT binary patch
delta 18929
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%0A`fc6-@`PAPCh(uO8bilzD^y
z@E>9J*esQqMyBb#7$KDZyW|HoouXThFjD>|dzid*IoA5~xu0+m7jZ<XCWh*j1a%`D
z(+gT;uf`A_hQBaMS%``GIr8Miq#WtEU5m34BLW?3fTS1&q1+H&W(a0_%>fI?BBH-P
zaCWE}`qL+AZ}Mx0@Ht=DrqKj7@6g*v`oqb?XT348FhrwRaRN$f2{_LrW}{d<JEaaE
zx$Q!xa3fu=-8qqfs9|$fS_nMRVp8&*)TTXh*F(}~=+}j!=0<H%CBP|o6BSf1Xhb0I
zLHIX4aOI&HYd)!uO7350$b43}3L*(G=A~v6E1=2DckB8c-#_+{7_P+{@{5D{Ip#9p
z_YH5N(iSYKztJOL8BSq7J4bsdH_P`N%%+Pqy9O%Y|E{M9t=>R8z4p8%vrSoH{`QWH
z;}j|l=BM&1twJ3G#Rk@On_Q+B4H@3h(G-^q2i$ve(e|9?hI)NmCBZG3Q{@B>T+F3f
zmas!hkr_CcB7LWHolw$5FET+3tSqyrnYbUIc(C~8Znj`VBNRm0a=krW-ptYPYk}4@
z;tv#S2DV;-^d<H;?i}0wX&l%6XZM^*W<);;h2%}EF$~o|S(q!DfbvrAyps?#3*Af*
zj^*DMbb3&<SNH}|d#hzj=Cr}{A3c<UH|?830mv~TeZN{O2Av37Sy3U8%KGeGeD3_c
zI~ail?ALF-8QblaFn`p(WcaBoi56M&pA1%iP36`VZ^Efssc?zvd!J6u)7ORC(Kn9{
z2SP;K-tMiOkm-<3Iw63N&g}W7wq;8GA^F%};>=t7?H!zBj-CChVgbm{G;%=N`0}Mm
zgLT6s?_Mh^3biK>6?S}?Ik&KV@S!JvdE5LV)feG0&qwyqB%$43Yj>FSnf8n}B45TI
zH$azBVS@*Y0|!OYx}C}lO#6ap%9h))#v3K11}Yzs&CaPki-wst*nCj?+Gt3^G@Ap(
zWEb1`-FcI5WQ<ski3jXd+q_C-{g%{cSa!L&v<AiP{)gX$+?jy;@#1|ul_Pw{9AzhF
zRyl-qrU2Q6)#RrQH?8SR$-)`6wZ0p%qW7}?X&(MnC4Z|aX|)!HpG3cH#SwTTgw+{I
z*d2TLvV&>=UJAUpkE@yM$7q6RoUqH>7?h0+AJuVcd(>?>@&RX(Idx2p<f(F1YkYa0
zB7!5h;{BU(Wwm^vYBi!&s%%vPVefDmwSogT*d=Wg7czVfY8o!9_BP#A!2p>JY)O(a
zUw=I-g#5naW1=iy!ki6|J0MTvKAAG4eB_9?m7bk2&7wxP9*&TfpqeQg+SV$+%b01-
zBczg)qMO&z1*XL7J$%(#u`9(3&WqErJ36(VKv7xkolH<X2XXG(k}*GaX=aeU33db7
z?Sly-^t5h3_Hd<>h}6=?gC9T_sGDA8{=f@*0O7~YpNnQ1!pUEgdIR(P(9b-4kfpJ{
z+0N+7#Ic$RTWoP}l7@w4HOq^(@(BX9RaNY&!lWbsZ|(+gX&j*F{!qN?=&=1B3{d?n
z7K3i7G<WZfL{|AjhJQkD+TFHE7BcxkZy)U0^-1@eAZM;NrTop{n&3gsTX?N=JFbiM
zV>4x}I;E}(=phhb_3{;lTR!NVddi?_DCL<Hbde8LRY)qg^udksb=$Fi1Yv!f{4>w-
z2$1Joq*>{A?m9yH!+F|tD2XmI6?ZG1N#Fn-YP`s~(E+6oCz+H9pV#6R7+0&2GPVfZ
zxFl!2Wn$B6Usi5;L}pcupn4^Y4|zgQ_@e|_{<qLNj|dXE9F!%)hPkci$J}8uNEBjb
zB#~oLlF1<Qq`t?8fEO(IW;#efP3Wt@WuyczQbC-dK6k@{WhH&;LCyO0H4XGGGIG+*
zYt$e9ucCm59>EPtRyc7O@V#j6dj^T%ZG8LO;_d0H0Eedu*Ii2j!fNSJ0|-P(>bo~$
zFXr%wNxE8ogD*5w9U@}JEDag9_)vfBm3ss);Jl<wgN!c{j1P7!IRo><z=RL^yn0>!
zlQ+3}RTT<t|62CtA@5MZ|GYQEs)+@3gTnCD0NT`)wIdxji`%xV8A&KYYsOP+j^WSG
z(btNR(b?g+HWS+(^Ma4<o6o&eBQ<^6^+qYkZ2ZyNQmfcPO*SLk7aG?fp7k07M5wLu
zkG=BYc`(*WK~I`TBNb?IOWQ))q@BHbO2vcRq<M6<%{q;~M{uMnk1QLG__FS-k;HZ@
z-1WvRQ*7x`cAifre(AWw%MZTuM};S4deF~}R;xzC{_ql{%=p*O!WK1w->bH^PYvT1
z+>SnppiW^e-x5H0(SC2>sDjc_Z4Qt=)v=rJCvx0~YAP%U@&dZly|fj7JT9J0@VqCh
zO>{G7AA5cEiumBBAXa9t|6R&5f!sYJ@!KsMD!B5+@z2yLoCWTY27W~HeKi?1au~jV
zX}_83v3$v-4#fk`dD?}G)K8Jclu0@J2H3r_GX18O0i_<-I{1;0k<m^h@3=vhH)Plt
zf5pTvsYn9^JX6`^;U+mhPhHA-YCXl7SYEYj|AMP7t+sVUlWGW)C)Mev%J<g~h7G}6
z*V{tUGNb|OYU#nevC8YhaZkfH)6h7(fRL|fET9j*`}ZS^%LoS8MaHmg#B^k`(hKCj
zOCLqHlZ+<(R&U#4K3H8yfENYe$N%Sy%^5W_Y6y71c)hS_OFw01)(g=HL@B(rsE5;u
z_*@G|Y<SZ^qWA9(89MKpsX*H;KE!Qs-q8+*-2J7RLvA*pIsEGnc5EdH>{*hz!^F?L
zNISq!CN<{r#*WN0%My+^^!m(NIeM0|th8qCG&N+V$;<3BO{^fgl<^_7VjHE=LH8RT
zTAf1RL|9A2;mn0(re7(o6TgYg9_4CbBo=QI;Y|kYV%^|_5&RJ1k4L(|ownNx57*Pk
zkJijA?OG91aR3waZL3c3<tc)l@3H=#5$XX=W1Q0^2A%6!9&`gSFycLu#rdL~!UM9s
z>u|<HrxO>1>R(a>8H^d7^Z$`IyC*g<Ent?0taiePY_9=F2hTb8gXO_`BBnJNq30)r
zo210h(!Io|UT?0MYHV0gB~exkidgnI?+i39V>%9#*u3GyM5=qP3=~z%hV<Rgw`Lfn
z89e(%siVlJWlb@plzgTCx?l)*0)92dQUxoF@^29|P9Gt3>XH3gd$AQ1Hg1aq_#Y;_
z{<yP~S6hwMsd$IBD2y=wFV-9O36%cn2aOnIhh=wXC<-mq79%%7TZohu$*E-^;h+K&
zgjHULv>Oy;@s3MpMDCqfqz3Gg{$vfupXYdS%2Mo-h50lze^wk2L5B-(Yx8OJQ<E9b
z3J`D#itM1K`K31tNX(0Aj9LXiDC+Vim{Cu7&GfpMwu%!cWzXrXQ0}-r^Jovu+kYsJ
zGfHP~GA<Rh*yAkpPysD%F`b{c>btaofESf8W@k$id^kbMFx<LVKF#8=y$9i~okyZF
zA_PAM{Ua~YjS0s?BiPzH$A+GhA(U*BRcK=da`&GYIJZMPEASQp1awNdI)zSlNg=M6
z(q*4;m49}VmY}vfefctdN2h<pFY@x3?~O~@Sk>N11&w<~THdi#yo|q*1vR6$R=>ta
z*~HakDbP)lAwhI*U`H+gB`vYXJ6&0NA|~-fA-L>C1H}tcv}~Vl`NoL?601vrf19&M
z8YSNib#E=W={oD?04kd~Nyf&tvKG$QO^`uWzvK7j;gY7I(MmSRQKsf${~m=tE1x7;
z$gcOR4B^()TIuV-g5bz};^LGHo@||vWd&a4@q_;|_7Q0Vv7T(K0jOJJ@(}Zrh^O~`
z)uEj~kW6s@!w!jN@q^k?<q>U;0HS?r8h2k)^6veAg8<TjrGr)3SWS@7+piZ8Hzj>?
z9gD%`fOH(QBl<EbbfCC_&+kW-Pi6kZPlloI^KS_4nhg8DEcj9fC1!JY*^)_uzXW`%
zQ9@YP1~DwkEyQN?Qqi7`RoA71p!d;n!kVWUCy~QRkDCSthTo$%AFB_AznIJ~pG0X1
zjCcB+jsfiQFNqWRkrp-$TW~#^uk9_uiueC&*~;Ug+}`+^$z%qVF{odgHQZa7E>cRC
zVNfYjlp13SrA1U^_YQ_evgMYg8g8_a(L|Q4_r{$hORHt9L&-E^XpCi;d-VCef4=Yc
zJnwVP^PJ~A=X{@oa%S^_Lv{LMBE$9BDY-7?#4$!Qt9RUK{an;83)3TM6h^rhmC@Ay
z1Xgx3)==VtdG0~}nEE)1$Eg_6Tns+kxkHd2>9f<T?%szB-5Fe|$T^r2cFmDDwY5l!
z7w0-*w7gwu;mC6@#Qsx_8pu*}q%zAjpK7#rCW0^OXG_jd{kF6vw`7bNk6&6pN;<l@
zRT5c7)Co!}Rx;R!(>l-ju0V(F$}c7Lq9sbgK~JvmQ_<{8{`bVD*ZSl2@&k_7nS<>w
zLse_XuRhUGS#W+pFEThNWuzW(Q12z?S?om7trurSPHhNL-TfX_HuC<)yoQThZqK-h
zGr=<^JG&I`;<WSUnh*#6;*40dgM&%iD*hNb^ffX>r%~yqT8#yq%CG9jFmL)`zCvm^
zx9zB)pnZbd7PE^Wo4)JfSCc)Tu0~nTF|tfY^X=HJ_sV92qWs~7+40sF6?#yQ_R_)D
zZZMD7fq`Y$(zl!aVgAIG>bR19I!9K@nN)mXTh=KS@|7iY_ms-dh-Zb;`O=w9j0;Kh
zSjK3q3IKy$`iDC|E4dxV;<zOy3ue0a_uoV>EEmQN`VWXhVNP%O+I80z-_WRSXb_Qd
zR*~?eVgw1%Y$|pMS1HH&jhrm@$%W+=h}~-e_cl4!2QJYYL^_-*3h2jzXK$6_*Xwmo
z;vSq>R7U@GTd-n4YzEy!UnKoefQr}zVn)kG^m9Vw-FQ5sZ<iDp%#M+0<;&Ho1y$#<
z!<$h7>K7h|T`DF5(aJv+s8v0OlncXlVp!%!zU*;3EGv)ja3*-AOCU8MM6$2)`ouqJ
z7+}DD_bzF@dhrnAdXTwJLQrv-Usx@go*d`S=Pjd|bY$%>t4uaEmkAlEL(69mt=0-|
z&XCxFTw_Y1P3$c%`P$Bmw3f1EwQrh`G-J(~-^kWR{j(FBnBKct$VC#?+Dr-)<^a4q
zMcpA;{^>`jjx7n+clr@-bV)dNFA`v|#Vt!}j}@`vP0gt&ka>e_#d+^peWs3HjBgPQ
z`?rr)Go#u<cb|lTPko}!`pmmLH6TfNII=o=CYIJ68mf6&-p*$2G)!XF1@72$97T`r
z`L1Xs{hQZ}xEl385C3Y)F6;=4tcKC$x5vz?p36qLaLOPZ0k5VY%%)iKd+R@m<a&4s
z;MGVY4uLR#@BO?a^o$#zFa)fe2tF}NR~<{wH9WWCrGpA-rDErhCt1MN2Nf8r(@k4C
z35h<VntQQkj=v{yi-MfQMF5+B3}f}s+I>J6Ioa|sK^0mMZOP|x93(}+L3NIm6Uax1
z1F1n9rH<F5?ZMO78Vf_%Jw4yd(`#;Thyw=gDw)UV@rVB1b93`yT@_MttnV~a8wB}%
zo5krbzIuI~?5?SehBO~EWK71Ozw20_DjLk!P;&zKmV$0$9a~0fo?Of1N-DT37xYKO
zDIzd((trd~{EXRR$1l<a@gVFo3%2XskDB=M*S`~n9J!5MgWfGuLojj^tv;ona7ERs
zf}?>bUDF%(NO+VILz%Be%tIQ=zkSuN&p;3C`aB_(BS3N~>I+QFcJiK?v}d5f0gq~n
zN`^9tnbQ@xc?p(WM8`og>4bLIk3k$=z8fqxDbrO%?gT0Rd;qXMojq}IrR3x}N1B_X
z0@U7-3vF~XA;ufO!Y?EQ4erJVrWpo~%0u#$ajbpxZLmXcEx-!+CXdH#vA=fyi_=ou
zUyA5>{zxp@J~DI*Q!ja}mtDjWG?W$kTHSA-lIs2f<o6?oSG+IN1MGj0Y=ci5ElHEm
z?Hk>FcO0T?{KUYnlho0P10igkgQV7Q%rOOe2`zF?cKN=>s*$myUR|vh?}O;<xd3Vo
z4QklXMzLR8h@&@KofX`9&}~IwSdgu@`FY&#_+C>GLHA(N-OdYV6E;DqQb&^=HQVe-
z3*wkD)FyB)$sW0cXE_c(@_jKkS<D=<*bx6l{3s52Tg0|)rpbbrq_g%7&3g5jXQW&1
z!`QbW3C$By%0iAMI!JUynvzXxDU9@BSLh4=-X-;SX8WJE9r*K3reR9#CjkHVTAQUI
zQ}rBfNU^g%aCo?yz4zp{bd3oO#+=CJr+ZzpX+9E``E)u>82mqWq6ThW&Rp8(lV3}~
zLj(9K+rpvloY>=nhbQ`#<Mt)ScyJ}YhP}#lrhmrr&A9WAa$$<k{;JKmd~0QB+vk~{
z#j+Pti<_f$jTTd=MMBe6_1e9UrV3ORZZB{$-ud6!{cJNH(3C%3Od0N{R`0Qf@{v@h
zmzNK6Nyl;EX<u*1ha)KQwW531!Gyh4LDseG8Av`e8f=r37!aFE&QDC&mB~J?ZDZG*
zH6rT!tg@wNt;=2xcXV2c)<60rnR<&K#wt#DuEIaNPDtbRED^@g%>t{4d`kmV;CzyC
zBm0c@fL7O}v_S=aiCTUJ)+x&Yhp$yEES=1bgJXuxdgh9v%_s<ugHG4&OYOaz(V%p9
z@tZW?474U|JS^(ek}F%51fjsGuHFNSn(p61|NkzwQYKsG!5r=91~x_j`0OPgv}KcM
GG5-M^az!ox

delta 18924
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


From 56e11423efc230575b145fe884c35d42fe3bef00 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Thu, 2 Aug 2012 07:26:55 -0700
Subject: [PATCH 40/50] inflate clipping extent for line patterns - refs #1282

---
 src/agg/process_line_pattern_symbolizer.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/agg/process_line_pattern_symbolizer.cpp b/src/agg/process_line_pattern_symbolizer.cpp
index e8c50209b..66dc01ca2 100644
--- a/src/agg/process_line_pattern_symbolizer.cpp
+++ b/src/agg/process_line_pattern_symbolizer.cpp
@@ -95,10 +95,24 @@ void  agg_renderer<T>::process(line_pattern_symbolizer const& sym,
     agg::trans_affine tr;
     evaluate_transform(tr, feature, sym.get_transform());
 
+    box2d<double> clipping_extent = query_extent_;
+    if (sym.clip())
+    {
+        double padding = (double)(query_extent_.width()/pixmap_.width());
+        float half_stroke = (*mark)->width()/2.0;
+        if (half_stroke > 1)
+            padding *= half_stroke;
+        double x0 = query_extent_.minx();
+        double y0 = query_extent_.miny();
+        double x1 = query_extent_.maxx();
+        double y1 = query_extent_.maxy();
+        clipping_extent.init(x0 - padding, y0 - padding, x1 + padding , y1 + padding);
+    }
+
     typedef boost::mpl::vector<clip_line_tag,transform_tag,smooth_tag> conv_types;
     vertex_converter<box2d<double>, rasterizer_type, line_pattern_symbolizer,
                      CoordTransform, proj_transform, agg::trans_affine, conv_types>
-        converter(query_extent_,ras,sym,t_,prj_trans,tr,scale_factor_);
+        converter(clipping_extent,ras,sym,t_,prj_trans,tr,scale_factor_);
 
     if (sym.clip()) converter.set<clip_line_tag>(); //optional clip (default: true)
     converter.set<transform_tag>(); //always transform

From c2c006f9c20cdb09c8a09692395d692e0ac4337d Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Thu, 2 Aug 2012 10:52:09 -0700
Subject: [PATCH 41/50] support setting opacity on bitmaps in render_marker -
 refs #1364

---
 src/agg/agg_renderer.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp
index a3af6c492..8b8469656 100644
--- a/src/agg/agg_renderer.cpp
+++ b/src/agg/agg_renderer.cpp
@@ -379,15 +379,18 @@ void agg_renderer<T>::render_marker(pixel_position const& pos, marker const& mar
                                              src.height(),
                                              src.width()*4);
             agg::pixfmt_rgba32_pre pixf(marker_buf);
-
             typedef agg::image_accessor_clone<agg::pixfmt_rgba32_pre> img_accessor_type;
             typedef agg::span_interpolator_linear<agg::trans_affine> interpolator_type;
             typedef agg::span_image_filter_rgba_2x2<img_accessor_type,
                                                     interpolator_type> span_gen_type;
+            typedef agg::renderer_scanline_aa_alpha<renderer_base,
+                        agg::span_allocator<agg::rgba8>,
+                        span_gen_type> renderer_type;
             img_accessor_type ia(pixf);
             interpolator_type interpolator(agg::trans_affine(p, 0, 0, width, height) );
             span_gen_type sg(ia, interpolator, filter);
-            agg::render_scanlines_aa(*ras_ptr, sl, renb, sa, sg);
+            renderer_type rp(renb,sa, sg, unsigned(opacity*255));
+            agg::render_scanlines(*ras_ptr, sl, rp);
         }
     }
 }

From 693cc881425af63b45a4234c85c23d10cafb85e7 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Thu, 2 Aug 2012 11:13:44 -0700
Subject: [PATCH 42/50] sync grid renderer with agg for point_symbolizer - refs
 #1309

---
 src/agg/process_point_symbolizer.cpp  | 18 +++++++-----------
 src/grid/process_point_symbolizer.cpp | 13 ++++++++++---
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/agg/process_point_symbolizer.cpp b/src/agg/process_point_symbolizer.cpp
index aac4355a2..58e1fe9cd 100644
--- a/src/agg/process_point_symbolizer.cpp
+++ b/src/agg/process_point_symbolizer.cpp
@@ -23,19 +23,16 @@
 // mapnik
 #include <mapnik/agg_renderer.hpp>
 #include <mapnik/agg_rasterizer.hpp>
-#include <mapnik/geom_util.hpp>
 #include <mapnik/image_util.hpp>
-#include <mapnik/metawriter.hpp>
+
+#include <mapnik/geom_util.hpp>
+#include <mapnik/point_symbolizer.hpp>
+#include <mapnik/expression_evaluator.hpp>
 #include <mapnik/marker.hpp>
 #include <mapnik/marker_cache.hpp>
-#include <mapnik/expression_evaluator.hpp>
 
 // agg
-#include "agg_basics.h"
-#include "agg_rendering_buffer.h"
-#include "agg_pixfmt_rgba.h"
-#include "agg_rasterizer_scanline_aa.h"
-#include "agg_scanline_u.h"
+#include "agg_trans_affine.h"
 
 // stl
 #include <string>
@@ -89,7 +86,6 @@ void agg_renderer<T>::process(point_symbolizer const& sym,
             prj_trans.backward(x,y,z);
             t_.forward(&x,&y);
             label_ext.re_center(x,y);
-
             if (sym.get_allow_overlap() ||
                 detector_->has_placement(label_ext))
             {
@@ -106,8 +102,8 @@ void agg_renderer<T>::process(point_symbolizer const& sym,
 
                 if (!sym.get_ignore_placement())
                     detector_->insert(label_ext);
-                metawriter_with_properties writer = sym.get_metawriter();
-                if (writer.first) writer.first->add_box(label_ext, feature, t_, writer.second);
+                //metawriter_with_properties writer = sym.get_metawriter();
+                //if (writer.first) writer.first->add_box(label_ext, feature, t_, writer.second);
             }
         }
     }
diff --git a/src/grid/process_point_symbolizer.cpp b/src/grid/process_point_symbolizer.cpp
index d1689f03b..79e895f67 100644
--- a/src/grid/process_point_symbolizer.cpp
+++ b/src/grid/process_point_symbolizer.cpp
@@ -26,15 +26,22 @@
 #include <mapnik/grid/grid_pixfmt.hpp>
 #include <mapnik/grid/grid_pixel.hpp>
 #include <mapnik/grid/grid.hpp>
+
 #include <mapnik/geom_util.hpp>
 #include <mapnik/point_symbolizer.hpp>
 #include <mapnik/expression_evaluator.hpp>
 #include <mapnik/marker.hpp>
 #include <mapnik/marker_cache.hpp>
 
+// agg
+#include "agg_trans_affine.h"
+
 // stl
 #include <string>
 
+// boost
+#include <boost/make_shared.hpp>
+
 namespace mapnik {
 
 template <typename T>
@@ -57,14 +64,14 @@ void grid_renderer<T>::process(point_symbolizer const& sym,
     if (marker)
     {
         box2d<double> const& bbox = (*marker)->bounding_box();
-        coord2d const center = bbox.center();
+        coord2d center = bbox.center();
 
         agg::trans_affine tr;
         evaluate_transform(tr, feature, sym.get_image_transform());
         tr = agg::trans_affine_scaling(scale_factor_) * tr;
 
-        agg::trans_affine_translation const recenter(-center.x, -center.y);
-        agg::trans_affine const recenter_tr = recenter * tr;
+        agg::trans_affine_translation recenter(-center.x, -center.y);
+        agg::trans_affine recenter_tr = recenter * tr;
         box2d<double> label_ext = bbox * recenter_tr;
 
         for (unsigned i=0; i<feature.num_geometries(); ++i)

From e62739d1466a9c09286899e0926990c72390130d Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Thu, 2 Aug 2012 13:10:05 -0700
Subject: [PATCH 43/50] fix render_marker for grid renderer and other minor
 syncing - refs #1309

---
 include/mapnik/grid/grid_renderer.hpp   |  3 +-
 src/agg/agg_renderer.cpp                |  9 +++--
 src/grid/grid_renderer.cpp              | 52 ++++++++++++++++++++-----
 src/grid/process_markers_symbolizer.cpp |  8 ++--
 src/grid/process_point_symbolizer.cpp   |  4 +-
 src/grid/process_shield_symbolizer.cpp  |  2 +-
 src/grid/process_text_symbolizer.cpp    |  2 +-
 tests/python_tests/render_grid_test.py  | 12 +++---
 8 files changed, 64 insertions(+), 28 deletions(-)

diff --git a/include/mapnik/grid/grid_renderer.hpp b/include/mapnik/grid/grid_renderer.hpp
index a5a31245f..a26eedc12 100644
--- a/include/mapnik/grid/grid_renderer.hpp
+++ b/include/mapnik/grid/grid_renderer.hpp
@@ -117,9 +117,10 @@ private:
     CoordTransform t_;
     freetype_engine font_engine_;
     face_manager<freetype_engine> font_manager_;
-    label_collision_detector4 detector_;
+    boost::shared_ptr<label_collision_detector4> detector_;
     boost::scoped_ptr<grid_rasterizer> ras_ptr;
     box2d<double> query_extent_;
+    void setup(Map const& m);
 };
 }
 
diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp
index 8b8469656..cd0c55e1e 100644
--- a/src/agg/agg_renderer.cpp
+++ b/src/agg/agg_renderer.cpp
@@ -21,12 +21,14 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/layer.hpp>
-#include <mapnik/feature_type_style.hpp>
-#include <mapnik/graphics.hpp>
 #include <mapnik/agg_renderer.hpp>
 #include <mapnik/agg_rasterizer.hpp>
 #include <mapnik/agg_helpers.hpp>
+#include <mapnik/graphics.hpp>
+
+#include <mapnik/debug.hpp>
+#include <mapnik/layer.hpp>
+#include <mapnik/feature_type_style.hpp>
 #include <mapnik/marker.hpp>
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/unicode.hpp>
@@ -36,6 +38,7 @@
 #include <mapnik/svg/svg_converter.hpp>
 #include <mapnik/svg/svg_renderer.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
+
 #include <mapnik/image_compositing.hpp>
 #include <mapnik/image_filter.hpp>
 #include <mapnik/image_util.hpp>
diff --git a/src/grid/grid_renderer.cpp b/src/grid/grid_renderer.cpp
index ab231e853..4e2b11663 100644
--- a/src/grid/grid_renderer.cpp
+++ b/src/grid/grid_renderer.cpp
@@ -21,14 +21,15 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/layer.hpp>
-#include <mapnik/feature_type_style.hpp>
-#include <mapnik/debug.hpp>
 #include <mapnik/grid/grid_rasterizer.hpp>
 #include <mapnik/grid/grid_renderer.hpp>
 #include <mapnik/grid/grid_pixfmt.hpp>
 #include <mapnik/grid/grid_pixel.hpp>
 #include <mapnik/grid/grid.hpp>
+
+#include <mapnik/debug.hpp>
+#include <mapnik/layer.hpp>
+#include <mapnik/feature_type_style.hpp>
 #include <mapnik/marker.hpp>
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/unicode.hpp>
@@ -56,13 +57,22 @@ grid_renderer<T>::grid_renderer(Map const& m, T & pixmap, double scale_factor, u
       width_(pixmap_.width()),
       height_(pixmap_.height()),
       scale_factor_(scale_factor),
+      // NOTE: can change this to m dims instead of pixmap_ if render-time
+      // resolution support is dropped from grid_renderer python interface
       t_(pixmap_.width(),pixmap_.height(),m.get_current_extent(),offset_x,offset_y),
       font_engine_(),
       font_manager_(font_engine_),
-      detector_(box2d<double>(-m.buffer_size(), -m.buffer_size(), pixmap_.width() + m.buffer_size(), pixmap_.height() + m.buffer_size())),
+      detector_(boost::make_shared<label_collision_detector4>(box2d<double>(-m.buffer_size(), -m.buffer_size(), m.width() + m.buffer_size() ,m.height() + m.buffer_size()))),
       ras_ptr(new grid_rasterizer)
+{
+    setup(m);
+}
+
+template <typename T>
+void grid_renderer<T>::setup(Map const& m)
 {
     MAPNIK_LOG_DEBUG(grid_renderer) << "grid_renderer: Scale=" << m.scale();
+    // nothing to do for grids yet on setup
 }
 
 template <typename T>
@@ -91,9 +101,25 @@ void grid_renderer<T>::start_layer_processing(layer const& lay, box2d<double> co
 
     if (lay.clear_label_cache())
     {
-        detector_.clear();
+        detector_->clear();
     }
     query_extent_ = query_extent;
+    int buffer_size = lay.buffer_size();
+    if (buffer_size != 0 )
+    {
+        double padding = buffer_size * (double)(query_extent.width()/pixmap_.width());
+        double x0 = query_extent_.minx();
+        double y0 = query_extent_.miny();
+        double x1 = query_extent_.maxx();
+        double y1 = query_extent_.maxy();
+        query_extent_.init(x0 - padding, y0 - padding, x1 + padding , y1 + padding);
+    }
+
+    boost::optional<box2d<double> > const& maximum_extent = lay.maximum_extent();
+    if (maximum_extent)
+    {
+        query_extent_.clip(*maximum_extent);
+    }
 }
 
 template <typename T>
@@ -144,21 +170,27 @@ void grid_renderer<T>::render_marker(mapnik::feature_impl & feature, unsigned in
     else
     {
         image_data_32 const& data = **marker.get_bitmap_data();
-        if (step == 1 && scale_factor_ == 1.0)
+        double width = data.width();
+        double height = data.height();
+        double cx = 0.5 * width;
+        double cy = 0.5 * height;
+        if (step == 1 && (std::fabs(1.0 - scale_factor_) < 0.001 && tr.is_identity()))
         {
+            // TODO - support opacity
             pixmap_.set_rectangle(feature.id(), data,
-                                  boost::math::iround(pos.x),
-                                  boost::math::iround(pos.y));
+                                  boost::math::iround(pos.x - cx),
+                                  boost::math::iround(pos.y - cy));
         }
         else
         {
+            // TODO - remove support for step != or add support for agg scaling with opacity
             double ratio = (1.0/step);
             image_data_32 target(ratio * data.width(), ratio * data.height());
             mapnik::scale_image_agg<image_data_32>(target,data, SCALING_NEAR,
                                                    scale_factor_, 0.0, 0.0, 1.0, ratio);
             pixmap_.set_rectangle(feature.id(), target,
-                                  boost::math::iround(pos.x),
-                                  boost::math::iround(pos.y));
+                                  boost::math::iround(pos.x - cx),
+                                  boost::math::iround(pos.y - cy));
         }
     }
     pixmap_.add_feature(feature);
diff --git a/src/grid/process_markers_symbolizer.cpp b/src/grid/process_markers_symbolizer.cpp
index 9242d2027..cef9cb478 100644
--- a/src/grid/process_markers_symbolizer.cpp
+++ b/src/grid/process_markers_symbolizer.cpp
@@ -175,12 +175,12 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
                     box2d<double> transformed_bbox = bbox * matrix;
 
                     if (sym.get_allow_overlap() ||
-                        detector_.has_placement(transformed_bbox))
+                        detector_->has_placement(transformed_bbox))
                     {
                         placed = true;
                         svg_renderer.render_id(*ras_ptr, sl, renb, feature.id(), matrix, 1, bbox);
                         if (!sym.get_ignore_placement())
-                            detector_.insert(transformed_bbox);
+                            detector_->insert(transformed_bbox);
                     }
                 }
                 else if (sym.clip())
@@ -193,7 +193,7 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
                     clipped.clip_box(query_extent_.minx(),query_extent_.miny(),query_extent_.maxx(),query_extent_.maxy());
                     path_type path(t_,clipped,prj_trans);
                     transformed_path_type path_transformed(path,geom_tr);
-                    markers_placement<transformed_path_type, label_collision_detector4> placement(path_transformed, bbox, marker_trans, detector_,
+                    markers_placement<transformed_path_type, label_collision_detector4> placement(path_transformed, bbox, marker_trans, *detector_,
                                                                                                   sym.get_spacing() * scale_factor_,
                                                                                                   sym.get_max_error(),
                                                                                                   sym.get_allow_overlap());
@@ -213,7 +213,7 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
                     typedef agg::conv_transform<path_type, agg::trans_affine> transformed_path_type;
                     path_type path(t_,geom,prj_trans);
                     transformed_path_type path_transformed(path,geom_tr);
-                    markers_placement<transformed_path_type, label_collision_detector4> placement(path_transformed, bbox, marker_trans, detector_,
+                    markers_placement<transformed_path_type, label_collision_detector4> placement(path_transformed, bbox, marker_trans, *detector_,
                                                                                                   sym.get_spacing() * scale_factor_,
                                                                                                   sym.get_max_error(),
                                                                                                   sym.get_allow_overlap());
diff --git a/src/grid/process_point_symbolizer.cpp b/src/grid/process_point_symbolizer.cpp
index 79e895f67..eec6bf685 100644
--- a/src/grid/process_point_symbolizer.cpp
+++ b/src/grid/process_point_symbolizer.cpp
@@ -89,7 +89,7 @@ void grid_renderer<T>::process(point_symbolizer const& sym,
             t_.forward(&x,&y);
             label_ext.re_center(x,y);
             if (sym.get_allow_overlap() ||
-                detector_.has_placement(label_ext))
+                detector_->has_placement(label_ext))
             {
 
                 render_marker(feature,
@@ -101,7 +101,7 @@ void grid_renderer<T>::process(point_symbolizer const& sym,
                               sym.comp_op());
 
                 if (!sym.get_ignore_placement())
-                    detector_.insert(label_ext);
+                    detector_->insert(label_ext);
             }
         }
     }
diff --git a/src/grid/process_shield_symbolizer.cpp b/src/grid/process_shield_symbolizer.cpp
index e57266509..ac092061b 100644
--- a/src/grid/process_shield_symbolizer.cpp
+++ b/src/grid/process_shield_symbolizer.cpp
@@ -46,7 +46,7 @@ void  grid_renderer<T>::process(shield_symbolizer const& sym,
             sym, feature, prj_trans,
             width_, height_,
             scale_factor_,
-            t_, font_manager_, detector_,
+            t_, font_manager_, *detector_,
             query_extent_);
     bool placement_found = false;
 
diff --git a/src/grid/process_text_symbolizer.cpp b/src/grid/process_text_symbolizer.cpp
index 22e6e7d18..28b709eed 100644
--- a/src/grid/process_text_symbolizer.cpp
+++ b/src/grid/process_text_symbolizer.cpp
@@ -36,7 +36,7 @@ void grid_renderer<T>::process(text_symbolizer const& sym,
             sym, feature, prj_trans,
             width_, height_,
             scale_factor_ * (1.0/pixmap_.get_resolution()),
-            t_, font_manager_, detector_,
+            t_, font_manager_, *detector_,
             query_extent_);
     bool placement_found = false;
 
diff --git a/tests/python_tests/render_grid_test.py b/tests/python_tests/render_grid_test.py
index 596480ab4..2a9369946 100644
--- a/tests/python_tests/render_grid_test.py
+++ b/tests/python_tests/render_grid_test.py
@@ -108,7 +108,7 @@ def show_grids(name,g1,g2):
     val += '\n\t%s\n\t%s' % (g1_file,g2_file)
     return val
 
-def test_render_grid():
+def test_render_grid_old():
     """ test old method """
     width,height = 256,256
     m = create_grid_map(width,height)
@@ -117,7 +117,7 @@ def test_render_grid():
     lr_lonlat = mapnik.Coord(143.40,-38.80)
     m.zoom_to_box(mapnik.Box2d(ul_lonlat,lr_lonlat))
     grid = mapnik.render_grid(m,0,key='Name',resolution=4,fields=['Name'])
-    eq_(grid,grid_correct_old2,show_grids('old',grid,grid_correct_old2))
+    eq_(grid,grid_correct_old2,show_grids('old-markers',grid,grid_correct_old2))
     eq_(resolve(grid,0,0),None)
 
     # check every pixel of the nw symbol
@@ -128,7 +128,7 @@ def test_render_grid():
     eq_(resolve(grid,23,10),expected)
     eq_(resolve(grid,23,11),expected)
 
-def test_render_grid2():
+def test_render_grid_new():
     """ test old against new"""
     width,height = 256,256
     m = create_grid_map(width,height)
@@ -140,7 +140,7 @@ def test_render_grid2():
     grid = mapnik.Grid(m.width,m.height,key='Name')
     mapnik.render_layer(m,grid,layer=0,fields=['Name'])
     utf1 = grid.encode('utf',resolution=4)
-    eq_(utf1,grid_correct_new2,show_grids('new',utf1,grid_correct_new2))
+    eq_(utf1,grid_correct_new2,show_grids('new-markers',utf1,grid_correct_new2))
 
     # check a full view is the same as a full image
     grid_view = grid.view(0,0,width,height)
@@ -177,7 +177,7 @@ def test_render_grid3():
     grid = mapnik.Grid(m.width,m.height,key='__id__')
     mapnik.render_layer(m,grid,layer=0,fields=['__id__','Name'])
     utf1 = grid.encode('utf',resolution=4)
-    eq_(utf1,grid_feat_id2,show_grids('id',utf1,grid_feat_id2))
+    eq_(utf1,grid_feat_id2,show_grids('id-markers',utf1,grid_feat_id2))
     # check a full view is the same as a full image
     grid_view = grid.view(0,0,width,height)
     # for kicks check at full res too
@@ -282,7 +282,7 @@ def test_line_rendering():
     eq_(utf1,line_expected,show_grids('line',utf1,line_expected))
     #open('test.json','w').write(json.dumps(grid.encode()))
 
-point_expected = {"keys": ["", "3", "4", "2", "1"], "data": {"1": {"Name": "South East"}, "3": {"Name": "North West"}, "2": {"Name": "South West"}, "4": {"Name": "North East"}}, "grid": ["                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "           !!!!                                ####             ", "           !!!!                                ####             ", "           !!!!                                ####             ", "           !!!!                                ####             ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "           $$$$                                %%%%             ", "           $$$$                                %%%%             ", "           $$$$                                %%%%             ", "           $$$$                                %%%%             ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                "]}
+point_expected = {"data": {"1": {"Name": "South East"}, "2": {"Name": "South West"}, "3": {"Name": "North West"}, "4": {"Name": "North East"}}, "grid": ["                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "         !!!!                                ####               ", "         !!!!                                ####               ", "         !!!!                                ####               ", "         !!!!                                ####               ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "         $$$$                                %%%%               ", "         $$$$                                %%%%               ", "         $$$$                                %%%%               ", "         $$$$                                %%%%               ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                ", "                                                                "], "keys": ["", "3", "4", "2", "1"]}
 
 def test_point_symbolizer_grid():
     width,height = 256,256

From c1d124f6d993b392f4b79d7ba9deaadbb1927a92 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Thu, 2 Aug 2012 21:00:52 -0700
Subject: [PATCH 44/50] Account for offset value to avoid severe clipping with
 large offsets - refs #1282

---
 src/agg/process_line_symbolizer.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/agg/process_line_symbolizer.cpp b/src/agg/process_line_symbolizer.cpp
index 776f0870e..02263be95 100644
--- a/src/agg/process_line_symbolizer.cpp
+++ b/src/agg/process_line_symbolizer.cpp
@@ -86,6 +86,8 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
         float half_stroke = stroke_.get_width()/2.0;
         if (half_stroke > 1)
             padding *= half_stroke;
+        if (fabs(sym.offset()) > 0)
+            padding *= fabs(sym.offset()) * 1.2;
         double x0 = query_extent_.minx();
         double y0 = query_extent_.miny();
         double x1 = query_extent_.maxx();

From 8ea21d866d8c966c214ea9c602c84b6ba23d5806 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Thu, 2 Aug 2012 22:52:21 -0700
Subject: [PATCH 45/50] move more code to marker_helpers.hpp to set up for grid
 impl of new markers code - refs #1282

---
 include/mapnik/marker_helpers.hpp      | 254 +++++++++++++++++++++++++
 src/agg/process_markers_symbolizer.cpp | 251 +-----------------------
 2 files changed, 258 insertions(+), 247 deletions(-)

diff --git a/include/mapnik/marker_helpers.hpp b/include/mapnik/marker_helpers.hpp
index f22dd6ec5..2a11c07d6 100644
--- a/include/mapnik/marker_helpers.hpp
+++ b/include/mapnik/marker_helpers.hpp
@@ -28,16 +28,270 @@
 #include <mapnik/expression_evaluator.hpp>
 #include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/svg/svg_converter.hpp>
+#include <mapnik/marker.hpp> // for svg_storage_type
 #include <mapnik/svg/svg_storage.hpp>
+#include <mapnik/markers_placement.hpp>
 
 // agg
 #include "agg_ellipse.h"
+#include "agg_basics.h"
+#include "agg_renderer_base.h"
+#include "agg_renderer_scanline.h"
+#include "agg_rendering_buffer.h"
+#include "agg_scanline_u.h"
+#include "agg_image_filters.h"
+#include "agg_trans_bilinear.h"
+#include "agg_span_allocator.h"
+#include "agg_image_accessors.h"
+#include "agg_pixfmt_rgba.h"
+#include "agg_span_image_filter_rgba.h"
 
 // boost
 #include <boost/optional.hpp>
 
 namespace mapnik {
 
+
+template <typename BufferType, typename SvgRenderer, typename Rasterizer, typename Detector>
+struct vector_markers_rasterizer_dispatch
+{
+    typedef agg::rgba8 color_type;
+    typedef agg::order_rgba order_type;
+    typedef agg::pixel32_type pixel_type;
+    typedef agg::comp_op_adaptor_rgba_pre<color_type, order_type> blender_type; // comp blender
+    typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_comp_type;
+    typedef agg::renderer_base<pixfmt_comp_type> renderer_base;
+
+    vector_markers_rasterizer_dispatch(BufferType & image_buffer,
+                                SvgRenderer & svg_renderer,
+                                Rasterizer & ras,
+                                box2d<double> const& bbox,
+                                agg::trans_affine const& marker_trans,
+                                markers_symbolizer const& sym,
+                                Detector & detector,
+                                double scale_factor)
+        : buf_(image_buffer.raw_data(), image_buffer.width(), image_buffer.height(), image_buffer.width() * 4),
+        pixf_(buf_),
+        renb_(pixf_),
+        svg_renderer_(svg_renderer),
+        ras_(ras),
+        bbox_(bbox),
+        marker_trans_(marker_trans),
+        sym_(sym),
+        detector_(detector),
+        scale_factor_(scale_factor)
+    {
+        pixf_.comp_op(static_cast<agg::comp_op_e>(sym_.comp_op()));
+    }
+
+    template <typename T>
+    void add_path(T & path)
+    {
+        marker_placement_e placement_method = sym_.get_marker_placement();
+
+        if (placement_method != MARKER_LINE_PLACEMENT)
+        {
+            double x,y;
+            path.rewind(0);
+            if (placement_method == MARKER_INTERIOR_PLACEMENT)
+            {
+                label::interior_position(path, x, y);
+            }
+            else
+            {
+                label::centroid(path, x, y);
+            }
+            agg::trans_affine matrix = marker_trans_;
+            matrix.translate(x,y);
+            box2d<double> transformed_bbox = bbox_ * matrix;
+
+            if (sym_.get_allow_overlap() ||
+                detector_.has_placement(transformed_bbox))
+            {
+                svg_renderer_.render(ras_, sl_, renb_, matrix, 1, bbox_);
+
+                if (!sym_.get_ignore_placement())
+                    detector_.insert(transformed_bbox);
+            }
+        }
+        else
+        {
+            markers_placement<T, label_collision_detector4> placement(path, bbox_, marker_trans_, detector_,
+                                                                      sym_.get_spacing() * scale_factor_,
+                                                                      sym_.get_max_error(),
+                                                                      sym_.get_allow_overlap());
+            double x, y, angle;
+            while (placement.get_point(x, y, angle))
+            {
+                agg::trans_affine matrix = marker_trans_;
+                matrix.rotate(angle);
+                matrix.translate(x, y);
+                svg_renderer_.render(ras_, sl_, renb_, matrix, 1, bbox_);
+            }
+        }
+    }
+private:
+    agg::scanline_u8 sl_;
+    agg::rendering_buffer buf_;
+    pixfmt_comp_type pixf_;
+    renderer_base renb_;
+    SvgRenderer & svg_renderer_;
+    Rasterizer & ras_;
+    box2d<double> const& bbox_;
+    agg::trans_affine const& marker_trans_;
+    markers_symbolizer const& sym_;
+    Detector & detector_;
+    double scale_factor_;
+};
+
+template <typename Rasterizer, typename RendererBuffer>
+void render_raster_marker(Rasterizer & ras, RendererBuffer & renb,
+                          agg::scanline_u8 & sl, image_data_32 const& src,
+                          agg::trans_affine const& marker_tr, double opacity)
+{
+    double width  = src.width();
+    double height = src.height();
+    double p[8];
+    p[0] = 0;     p[1] = 0;
+    p[2] = width; p[3] = 0;
+    p[4] = width; p[5] = height;
+    p[6] = 0;     p[7] = height;
+
+    marker_tr.transform(&p[0], &p[1]);
+    marker_tr.transform(&p[2], &p[3]);
+    marker_tr.transform(&p[4], &p[5]);
+    marker_tr.transform(&p[6], &p[7]);
+
+    ras.move_to_d(p[0],p[1]);
+    ras.line_to_d(p[2],p[3]);
+    ras.line_to_d(p[4],p[5]);
+    ras.line_to_d(p[6],p[7]);
+
+    typedef agg::rgba8 color_type;
+    agg::span_allocator<color_type> sa;
+    agg::image_filter_bilinear filter_kernel;
+    agg::image_filter_lut filter(filter_kernel, false);
+
+    agg::rendering_buffer marker_buf((unsigned char *)src.getBytes(),
+                                     src.width(),
+                                     src.height(),
+                                     src.width()*4);
+    agg::pixfmt_rgba32_pre pixf(marker_buf);
+
+    typedef agg::image_accessor_clone<agg::pixfmt_rgba32_pre> img_accessor_type;
+    typedef agg::span_interpolator_linear<agg::trans_affine> interpolator_type;
+    typedef agg::span_image_filter_rgba_2x2<img_accessor_type,
+                                            interpolator_type> span_gen_type;
+    typedef agg::order_rgba order_type;
+    typedef agg::pixel32_type pixel_type;
+    typedef agg::comp_op_adaptor_rgba_pre<color_type, order_type> blender_type; // comp blender
+    typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_comp_type;
+    typedef agg::renderer_base<pixfmt_comp_type> renderer_base;
+    typedef agg::renderer_scanline_aa_alpha<renderer_base,
+            agg::span_allocator<agg::rgba8>,
+            span_gen_type> renderer_type;
+    img_accessor_type ia(pixf);
+    interpolator_type interpolator(agg::trans_affine(p, 0, 0, width, height) );
+    span_gen_type sg(ia, interpolator, filter);
+    renderer_type rp(renb,sa, sg, unsigned(opacity*255));
+    agg::render_scanlines(ras, sl, rp);
+}
+
+template <typename BufferType, typename Rasterizer, typename Detector>
+struct raster_markers_rasterizer_dispatch
+{
+    typedef agg::rgba8 color_type;
+    typedef agg::order_rgba order_type;
+    typedef agg::pixel32_type pixel_type;
+    typedef agg::comp_op_adaptor_rgba_pre<color_type, order_type> blender_type; // comp blender
+    typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_comp_type;
+    typedef agg::renderer_base<pixfmt_comp_type> renderer_base;
+
+    raster_markers_rasterizer_dispatch(BufferType & image_buffer,
+                                       Rasterizer & ras,
+                                       image_data_32 const& src,
+                                       agg::trans_affine const& marker_trans,
+                                       markers_symbolizer const& sym,
+                                       Detector & detector,
+                                       double scale_factor)
+        : buf_(image_buffer.raw_data(), image_buffer.width(), image_buffer.height(), image_buffer.width() * 4),
+        pixf_(buf_),
+        renb_(pixf_),
+        ras_(ras),
+        src_(src),
+        marker_trans_(marker_trans),
+        sym_(sym),
+        detector_(detector),
+        scale_factor_(scale_factor)
+    {
+        pixf_.comp_op(static_cast<agg::comp_op_e>(sym_.comp_op()));
+    }
+
+    template <typename T>
+    void add_path(T & path)
+    {
+        marker_placement_e placement_method = sym_.get_marker_placement();
+        box2d<double> bbox_(0,0, src_.width(),src_.height());
+
+        if (placement_method != MARKER_LINE_PLACEMENT)
+        {
+            double x,y;
+            path.rewind(0);
+            if (placement_method == MARKER_INTERIOR_PLACEMENT)
+            {
+                label::interior_position(path, x, y);
+            }
+            else
+            {
+                label::centroid(path, x, y);
+            }
+            agg::trans_affine matrix = marker_trans_;
+            matrix.translate(x,y);
+            box2d<double> transformed_bbox = bbox_ * matrix;
+
+            if (sym_.get_allow_overlap() ||
+                detector_.has_placement(transformed_bbox))
+            {
+
+                float opacity = sym_.get_opacity() ? *sym_.get_opacity() : 1;
+                render_raster_marker(ras_, renb_, sl_, src_,
+                                     matrix, opacity);
+                if (!sym_.get_ignore_placement())
+                    detector_.insert(transformed_bbox);
+            }
+        }
+        else
+        {
+            markers_placement<T, label_collision_detector4> placement(path, bbox_, marker_trans_, detector_,
+                                                                      sym_.get_spacing() * scale_factor_,
+                                                                      sym_.get_max_error(),
+                                                                      sym_.get_allow_overlap());
+            double x, y, angle;
+            while (placement.get_point(x, y, angle))
+            {
+                agg::trans_affine matrix = marker_trans_;
+                matrix.rotate(angle);
+                matrix.translate(x,y);
+                float opacity = sym_.get_opacity() ? *sym_.get_opacity() : 1;
+                render_raster_marker(ras_, renb_, sl_, src_,
+                                     matrix, opacity);
+            }
+        }
+    }
+private:
+    agg::scanline_u8 sl_;
+    agg::rendering_buffer buf_;
+    pixfmt_comp_type pixf_;
+    renderer_base renb_;
+    Rasterizer & ras_;
+    image_data_32 const& src_;
+    agg::trans_affine const& marker_trans_;
+    markers_symbolizer const& sym_;
+    Detector & detector_;
+    double scale_factor_;
+};
+
+
 template <typename T>
 void build_ellipse(T const& sym, mapnik::feature_impl const& feature, svg_storage_type & marker_ellipse, svg::svg_path_adapter & svg_path)
 {
diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp
index 754b2445f..5a5b10810 100644
--- a/src/agg/process_markers_symbolizer.cpp
+++ b/src/agg/process_markers_symbolizer.cpp
@@ -29,18 +29,19 @@
 #include <mapnik/geom_util.hpp>
 #include <mapnik/expression_evaluator.hpp>
 #include <mapnik/vertex_converters.hpp>
+#include <mapnik/marker_helpers.hpp>
 #include <mapnik/marker.hpp>
 #include <mapnik/marker_cache.hpp>
-#include <mapnik/marker_helpers.hpp>
 #include <mapnik/svg/svg_renderer.hpp>
 #include <mapnik/svg/svg_storage.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
 #include <mapnik/svg/svg_path_attributes.hpp>
-#include <mapnik/markers_placement.hpp>
 #include <mapnik/markers_symbolizer.hpp>
 
 // agg
 #include "agg_basics.h"
+#include "agg_renderer_base.h"
+#include "agg_renderer_scanline.h"
 #include "agg_rendering_buffer.h"
 #include "agg_pixfmt_rgba.h"
 #include "agg_rasterizer_scanline_aa.h"
@@ -48,257 +49,13 @@
 #include "agg_path_storage.h"
 #include "agg_conv_clip_polyline.h"
 #include "agg_conv_transform.h"
-#include "agg_image_filters.h"
-#include "agg_trans_bilinear.h"
-#include "agg_span_allocator.h"
-#include "agg_image_accessors.h"
-#include "agg_span_image_filter_rgba.h"
+
 
 // boost
 #include <boost/optional.hpp>
 
 namespace mapnik {
 
-template <typename BufferType, typename SvgRenderer, typename Rasterizer, typename Detector>
-struct vector_markers_rasterizer_dispatch
-{
-    typedef agg::rgba8 color_type;
-    typedef agg::order_rgba order_type;
-    typedef agg::pixel32_type pixel_type;
-    typedef agg::comp_op_adaptor_rgba_pre<color_type, order_type> blender_type; // comp blender
-    typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_comp_type;
-    typedef agg::renderer_base<pixfmt_comp_type> renderer_base;
-
-    vector_markers_rasterizer_dispatch(BufferType & image_buffer,
-                                SvgRenderer & svg_renderer,
-                                Rasterizer & ras,
-                                box2d<double> const& bbox,
-                                agg::trans_affine const& marker_trans,
-                                markers_symbolizer const& sym,
-                                Detector & detector,
-                                double scale_factor)
-        : buf_(image_buffer.raw_data(), image_buffer.width(), image_buffer.height(), image_buffer.width() * 4),
-        pixf_(buf_),
-        renb_(pixf_),
-        svg_renderer_(svg_renderer),
-        ras_(ras),
-        bbox_(bbox),
-        marker_trans_(marker_trans),
-        sym_(sym),
-        detector_(detector),
-        scale_factor_(scale_factor)
-    {
-        pixf_.comp_op(static_cast<agg::comp_op_e>(sym_.comp_op()));
-    }
-
-    template <typename T>
-    void add_path(T & path)
-    {
-        marker_placement_e placement_method = sym_.get_marker_placement();
-
-        if (placement_method != MARKER_LINE_PLACEMENT)
-        {
-            double x,y;
-            path.rewind(0);
-            if (placement_method == MARKER_INTERIOR_PLACEMENT)
-            {
-                label::interior_position(path, x, y);
-            }
-            else
-            {
-                label::centroid(path, x, y);
-            }
-            agg::trans_affine matrix = marker_trans_;
-            matrix.translate(x,y);
-            box2d<double> transformed_bbox = bbox_ * matrix;
-
-            if (sym_.get_allow_overlap() ||
-                detector_.has_placement(transformed_bbox))
-            {
-                svg_renderer_.render(ras_, sl_, renb_, matrix, 1, bbox_);
-
-                if (!sym_.get_ignore_placement())
-                    detector_.insert(transformed_bbox);
-            }
-        }
-        else
-        {
-            markers_placement<T, label_collision_detector4> placement(path, bbox_, marker_trans_, detector_,
-                                                                      sym_.get_spacing() * scale_factor_,
-                                                                      sym_.get_max_error(),
-                                                                      sym_.get_allow_overlap());
-            double x, y, angle;
-            while (placement.get_point(x, y, angle))
-            {
-                agg::trans_affine matrix = marker_trans_;
-                matrix.rotate(angle);
-                matrix.translate(x, y);
-                svg_renderer_.render(ras_, sl_, renb_, matrix, 1, bbox_);
-            }
-        }
-    }
-private:
-    agg::scanline_u8 sl_;
-    agg::rendering_buffer buf_;
-    pixfmt_comp_type pixf_;
-    renderer_base renb_;
-    SvgRenderer & svg_renderer_;
-    Rasterizer & ras_;
-    box2d<double> const& bbox_;
-    agg::trans_affine const& marker_trans_;
-    markers_symbolizer const& sym_;
-    Detector & detector_;
-    double scale_factor_;
-};
-
-template <typename Rasterizer, typename RendererBuffer>
-void render_raster_marker(Rasterizer & ras, RendererBuffer & renb,
-                          agg::scanline_u8 & sl, image_data_32 const& src,
-                          agg::trans_affine const& marker_tr, double opacity)
-{
-    double width  = src.width();
-    double height = src.height();
-    double p[8];
-    p[0] = 0;     p[1] = 0;
-    p[2] = width; p[3] = 0;
-    p[4] = width; p[5] = height;
-    p[6] = 0;     p[7] = height;
-
-    marker_tr.transform(&p[0], &p[1]);
-    marker_tr.transform(&p[2], &p[3]);
-    marker_tr.transform(&p[4], &p[5]);
-    marker_tr.transform(&p[6], &p[7]);
-
-    ras.move_to_d(p[0],p[1]);
-    ras.line_to_d(p[2],p[3]);
-    ras.line_to_d(p[4],p[5]);
-    ras.line_to_d(p[6],p[7]);
-
-    typedef agg::rgba8 color_type;
-    agg::span_allocator<color_type> sa;
-    agg::image_filter_bilinear filter_kernel;
-    agg::image_filter_lut filter(filter_kernel, false);
-
-    agg::rendering_buffer marker_buf((unsigned char *)src.getBytes(),
-                                     src.width(),
-                                     src.height(),
-                                     src.width()*4);
-    agg::pixfmt_rgba32_pre pixf(marker_buf);
-
-    typedef agg::image_accessor_clone<agg::pixfmt_rgba32_pre> img_accessor_type;
-    typedef agg::span_interpolator_linear<agg::trans_affine> interpolator_type;
-    typedef agg::span_image_filter_rgba_2x2<img_accessor_type,
-                                            interpolator_type> span_gen_type;
-    typedef agg::order_rgba order_type;
-    typedef agg::pixel32_type pixel_type;
-    typedef agg::comp_op_adaptor_rgba_pre<color_type, order_type> blender_type; // comp blender
-    typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_comp_type;
-    typedef agg::renderer_base<pixfmt_comp_type> renderer_base;
-    typedef agg::renderer_scanline_aa_alpha<renderer_base,
-            agg::span_allocator<agg::rgba8>,
-            span_gen_type> renderer_type;
-    img_accessor_type ia(pixf);
-    interpolator_type interpolator(agg::trans_affine(p, 0, 0, width, height) );
-    span_gen_type sg(ia, interpolator, filter);
-    renderer_type rp(renb,sa, sg, unsigned(opacity*255));
-    agg::render_scanlines(ras, sl, rp);
-}
-
-template <typename BufferType, typename Rasterizer, typename Detector>
-struct raster_markers_rasterizer_dispatch
-{
-    typedef agg::rgba8 color_type;
-    typedef agg::order_rgba order_type;
-    typedef agg::pixel32_type pixel_type;
-    typedef agg::comp_op_adaptor_rgba_pre<color_type, order_type> blender_type; // comp blender
-    typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_comp_type;
-    typedef agg::renderer_base<pixfmt_comp_type> renderer_base;
-
-    raster_markers_rasterizer_dispatch(BufferType & image_buffer,
-                                       Rasterizer & ras,
-                                       image_data_32 const& src,
-                                       agg::trans_affine const& marker_trans,
-                                       markers_symbolizer const& sym,
-                                       Detector & detector,
-                                       double scale_factor)
-        : buf_(image_buffer.raw_data(), image_buffer.width(), image_buffer.height(), image_buffer.width() * 4),
-        pixf_(buf_),
-        renb_(pixf_),
-        ras_(ras),
-        src_(src),
-        marker_trans_(marker_trans),
-        sym_(sym),
-        detector_(detector),
-        scale_factor_(scale_factor)
-    {
-        pixf_.comp_op(static_cast<agg::comp_op_e>(sym_.comp_op()));
-    }
-
-    template <typename T>
-    void add_path(T & path)
-    {
-        marker_placement_e placement_method = sym_.get_marker_placement();
-        box2d<double> bbox_(0,0, src_.width(),src_.height());
-
-        if (placement_method != MARKER_LINE_PLACEMENT)
-        {
-            double x,y;
-            path.rewind(0);
-            if (placement_method == MARKER_INTERIOR_PLACEMENT)
-            {
-                label::interior_position(path, x, y);
-            }
-            else
-            {
-                label::centroid(path, x, y);
-            }
-            agg::trans_affine matrix = marker_trans_;
-            matrix.translate(x,y);
-            box2d<double> transformed_bbox = bbox_ * matrix;
-
-            if (sym_.get_allow_overlap() ||
-                detector_.has_placement(transformed_bbox))
-            {
-
-                float opacity = sym_.get_opacity() ? *sym_.get_opacity() : 1;
-                render_raster_marker(ras_, renb_, sl_, src_,
-                                     matrix, opacity);
-                if (!sym_.get_ignore_placement())
-                    detector_.insert(transformed_bbox);
-            }
-        }
-        else
-        {
-            markers_placement<T, label_collision_detector4> placement(path, bbox_, marker_trans_, detector_,
-                                                                      sym_.get_spacing() * scale_factor_,
-                                                                      sym_.get_max_error(),
-                                                                      sym_.get_allow_overlap());
-            double x, y, angle;
-            while (placement.get_point(x, y, angle))
-            {
-                agg::trans_affine matrix = marker_trans_;
-                matrix.rotate(angle);
-                matrix.translate(x,y);
-                float opacity = sym_.get_opacity() ? *sym_.get_opacity() : 1;
-                render_raster_marker(ras_, renb_, sl_, src_,
-                                     matrix, opacity);
-            }
-        }
-    }
-private:
-    agg::scanline_u8 sl_;
-    agg::rendering_buffer buf_;
-    pixfmt_comp_type pixf_;
-    renderer_base renb_;
-    Rasterizer & ras_;
-    image_data_32 const& src_;
-    agg::trans_affine const& marker_trans_;
-    markers_symbolizer const& sym_;
-    Detector & detector_;
-    double scale_factor_;
-};
-
-
 template <typename T>
 void agg_renderer<T>::process(markers_symbolizer const& sym,
                               feature_impl & feature,

From 5414912160267a219e8c418c3adfaecea3c9ebec Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 3 Aug 2012 15:34:21 +0100
Subject: [PATCH 46/50] + prevent division by zero in color-burn mode   (FIXME:
 re-implement using latest(corrected) math from    
 http://www.w3.org/TR/SVGCompositing/) + re-implemented grain-extract mode

---
 deps/agg/include/agg_pixfmt_rgba.h | 65 ++++++++++++++++++++----------
 1 file changed, 43 insertions(+), 22 deletions(-)

diff --git a/deps/agg/include/agg_pixfmt_rgba.h b/deps/agg/include/agg_pixfmt_rgba.h
index a134eb6fc..127638dc9 100644
--- a/deps/agg/include/agg_pixfmt_rgba.h
+++ b/deps/agg/include/agg_pixfmt_rgba.h
@@ -1015,18 +1015,34 @@ namespace agg
         //   Dca' = Sa.(Sca.Da + Dca.Sa - Sa.Da)/Sca + Sca.(1 - Da) + Dca.(1 - Sa)
         //
         // Da'  = Sa + Da - Sa.Da
+
+
+        // http://www.w3.org/TR/SVGCompositing/
+        // if Sca == 0 and Dca == Da
+        //   Dca' = Sa × Da + Sca × (1 - Da) + Dca × (1 - Sa)
+        //        = Sa × Da + Dca × (1 - Sa)
+        //        = Da = Dca
+        // otherwise if Sca == 0
+        //   Dca' = Sca × (1 - Da) + Dca × (1 - Sa)
+        //        = Dca × (1 - Sa)
+        // otherwise if Sca > 0
+        //   Dca' = Sa × Da - Sa × Da × min(1, (1 - Dca/Da) × Sa/Sca) + Sca × (1 - Da) + Dca × (1 - Sa)
+        //        = Sa × Da × (1 - min(1, (1 - Dca/Da) × Sa/Sca)) + Sca × (1 - Da) + Dca × (1 - Sa)
+
+        //   sa * da * (255 - std::min(255, (255 - p[0]/da)*(sa/(sc*sa)) +
         static AGG_INLINE void blend_pix(value_type* p,
                                          unsigned sr, unsigned sg, unsigned sb,
                                          unsigned sa, unsigned cover)
         {
-            if(cover < 255)
+            if (cover < 255)
             {
                 sr = (sr * cover + 255) >> 8;
                 sg = (sg * cover + 255) >> 8;
                 sb = (sb * cover + 255) >> 8;
                 sa = (sa * cover + 255) >> 8;
             }
-            if(sa)
+
+            if (sa)
             {
                 calc_type d1a  = base_mask - p[Order::A];
                 calc_type s1a  = base_mask - sa;
@@ -1042,15 +1058,15 @@ namespace agg
                 long_type sbda = sb * da;
                 long_type sada = sa * da;
 
-                p[Order::R] = (value_type)(((srda + drsa <= sada) ?
+                if ( sr > 0)  p[Order::R] = (value_type)(((srda + drsa <= sada) ?
                     sr * d1a + dr * s1a :
                     sa * (srda + drsa - sada) / sr + sr * d1a + dr * s1a + base_mask) >> base_shift);
 
-                p[Order::G] = (value_type)(((sgda + dgsa <= sada) ?
+                if ( sg > 0 ) p[Order::G] = (value_type)(((sgda + dgsa <= sada) ?
                     sg * d1a + dg * s1a :
                     sa * (sgda + dgsa - sada) / sg + sg * d1a + dg * s1a + base_mask) >> base_shift);
 
-                p[Order::B] = (value_type)(((sbda + dbsa <= sada) ?
+                if ( sb > 0) p[Order::B] = (value_type)(((sbda + dbsa <= sada) ?
                     sb * d1a + db * s1a :
                     sa * (sbda + dbsa - sada) / sb + sb * d1a + db * s1a + base_mask) >> base_shift);
 
@@ -1502,24 +1518,29 @@ namespace agg
                                          unsigned sr, unsigned sg, unsigned sb,
                                          unsigned sa, unsigned cover)
         {
-            if (cover < 255)
-            {
-                sr = (sr * cover + 255) >> 8;
-                sg = (sg * cover + 255) >> 8;
-                sb = (sb * cover + 255) >> 8;
-                sa = (sa * cover + 255) >> 8;
-            }
-            if (sa > 0)
-            {
-                calc_type da = p[Order::A];
-                int dr = p[Order::R] - sr + 128;
-                int dg = p[Order::G] - sg + 128;
-                int db = p[Order::B] - sb + 128;
+            calc_type da = (p[Order::A] * sa + 255) >> 8;
 
-                p[Order::R] = dr < 0 ? 0 : (dr > 255 ? 255 : dr);
-                p[Order::G] = dg < 0 ? 0 : (dg > 255 ? 255 : dg);
-                p[Order::B] = db < 0 ? 0 : (db > 255 ? 255 : db);
-                p[Order::A] = (value_type)(sa + da - ((sa * da + base_mask) >> base_shift));
+            int dr = p[Order::R] - sr + 128;
+            int dg = p[Order::G] - sg + 128;
+            int db = p[Order::B] - sb + 128;
+
+            dr = dr < 0 ? 0 : (dr > 255 ? 255 : dr);
+            dg = dg < 0 ? 0 : (dg > 255 ? 255 : dg);
+            db = db < 0 ? 0 : (db > 255 ? 255 : db);
+
+            p[Order::A] = da;
+
+            if (da < 255)
+            {
+                p[Order::R] = (dr * da + 255) >> 8;
+                p[Order::G] = (dg * da + 255) >> 8;
+                p[Order::B] = (db * da + 255) >> 8;
+            }
+            else
+            {
+                p[Order::R] = dr;
+                p[Order::G] = dg;
+                p[Order::B] = db;
             }
         }
     };

From 8c98d8a199226cd59c16f707bd1e87aa78cc12a3 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 3 Aug 2012 15:37:05 +0100
Subject: [PATCH 47/50] + pre-multiply rendering buffer after applying
 background color and/or pattern

---
 src/agg/agg_renderer.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp
index cd0c55e1e..a1ce58534 100644
--- a/src/agg/agg_renderer.cpp
+++ b/src/agg/agg_renderer.cpp
@@ -159,6 +159,10 @@ void agg_renderer<T>::setup(Map const &m)
         }
     }
 
+    agg::rendering_buffer buf(pixmap_.raw_data(),width_,height_, width_ * 4);
+    agg::pixfmt_rgba32 pixf(buf);
+    pixf.premultiply();
+
     MAPNIK_LOG_DEBUG(agg_renderer) << "agg_renderer: Scale=" << m.scale();
 }
 
@@ -169,7 +173,6 @@ template <typename T>
 void agg_renderer<T>::start_map_processing(Map const& map)
 {
     MAPNIK_LOG_DEBUG(agg_renderer) << "agg_renderer: Start map processing bbox=" << map.get_current_extent();
-
     ras_ptr->clip_box(0,0,width_,height_);
 }
 

From 5f26d82ca2930c3250be7d6a24345e13a7db22ab Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 3 Aug 2012 15:38:02 +0100
Subject: [PATCH 48/50] + correct typedef logic (avoid redefining types)

---
 include/mapnik/marker_helpers.hpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/include/mapnik/marker_helpers.hpp b/include/mapnik/marker_helpers.hpp
index 2a11c07d6..54a1201fe 100644
--- a/include/mapnik/marker_helpers.hpp
+++ b/include/mapnik/marker_helpers.hpp
@@ -55,12 +55,8 @@ namespace mapnik {
 template <typename BufferType, typename SvgRenderer, typename Rasterizer, typename Detector>
 struct vector_markers_rasterizer_dispatch
 {
-    typedef agg::rgba8 color_type;
-    typedef agg::order_rgba order_type;
-    typedef agg::pixel32_type pixel_type;
-    typedef agg::comp_op_adaptor_rgba_pre<color_type, order_type> blender_type; // comp blender
-    typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_comp_type;
-    typedef agg::renderer_base<pixfmt_comp_type> renderer_base;
+    typedef typename SvgRenderer::renderer_base renderer_base;
+    typedef typename renderer_base::pixfmt_type pixfmt_type;
 
     vector_markers_rasterizer_dispatch(BufferType & image_buffer,
                                 SvgRenderer & svg_renderer,
@@ -133,7 +129,7 @@ struct vector_markers_rasterizer_dispatch
 private:
     agg::scanline_u8 sl_;
     agg::rendering_buffer buf_;
-    pixfmt_comp_type pixf_;
+    pixfmt_type pixf_;
     renderer_base renb_;
     SvgRenderer & svg_renderer_;
     Rasterizer & ras_;

From 9e95d88acd912d7779b8e71968e17e5a5b5ff3b4 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 3 Aug 2012 15:39:04 +0100
Subject: [PATCH 49/50] + make typedefs public

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

diff --git a/include/mapnik/svg/svg_renderer.hpp b/include/mapnik/svg/svg_renderer.hpp
index fad181e02..f3b61c041 100644
--- a/include/mapnik/svg/svg_renderer.hpp
+++ b/include/mapnik/svg/svg_renderer.hpp
@@ -102,14 +102,14 @@ private:
 template <typename VertexSource, typename AttributeSource, typename ScanlineRenderer, typename PixelFormat>
 class svg_renderer : boost::noncopyable
 {
+public:
     typedef agg::conv_curve<VertexSource>            curved_type;
     typedef agg::conv_stroke<curved_type>            curved_stroked_type;
     typedef agg::conv_transform<curved_stroked_type> curved_stroked_trans_type;
     typedef agg::conv_transform<curved_type>         curved_trans_type;
     typedef agg::conv_contour<curved_trans_type>     curved_trans_contour_type;
     typedef agg::renderer_base<PixelFormat>          renderer_base;
-    
-public:
+
     svg_renderer(VertexSource & source, AttributeSource const& attributes)
         : source_(source),
           curved_(source_),

From 6fc8f3ab8978053f332207a23541f8f7e50a8aed Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 3 Aug 2012 15:39:44 +0100
Subject: [PATCH 50/50] + instantiate svg_renderer with pixfmt_comp_type

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

diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp
index 5a5b10810..a84787702 100644
--- a/src/agg/process_markers_symbolizer.cpp
+++ b/src/agg/process_markers_symbolizer.cpp
@@ -92,7 +92,7 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
                 typedef svg_renderer<svg_path_adapter,
                                      svg_attribute_type,
                                      renderer_type,
-                                     agg::pixfmt_rgba32 > svg_renderer_type;
+                                     pixfmt_comp_type > svg_renderer_type;
                 typedef vector_markers_rasterizer_dispatch<buffer_type,
                                      svg_renderer_type,
                                      rasterizer,