partially rollback b93c760b33 - meaning that radii will continue (as in Mapnik 2.0.0) to be assumed for marker width/height in the Mapnik 2.0.x series (>= 2.0.2) - closes #1163, refs #1134

CHANGELOG

@@ -13,6 +13,8 @@ For a complete change history, see the SVN log.
 Mapnik 2.0.2
 ------------
 
+- Rolled back change made in 2.0.1 to marker width/height meaning that Mapnik > 2.0.2 will stick to assuming width/heigh are radii for back compatibility with 2.0.0. The reverted change is seen below as "Fix Markers rendering so that ellipse height/width units are pixels (previously were unintentionally radii)". Issue tracking this is #1163
+
 - XML: Fixed to avoid throwing if a `<Parameters>` element is encountered (which is supported in >= 2.1.x)
 
 - Support for PostGIS 2.0 in the pgsql2sqlite command (e69c44e/47e5b3c)
@@ -39,7 +41,7 @@ Mapnik 2.0.1
 
 - Cairo: Add full rendering support for markers to match AGG renderer functionality (#1071)
 
-- Fix Markers rendering so that ellipse height/width units are pixels (previously were unintentially radii) (#1134)
+- Fix Markers rendering so that ellipse height/width units are pixels (previously were unintentionally radii) (#1134)
 
 - Added 'ignore-placement` attribute to markers-symbolizer (#1135)
 

src/agg/process_markers_symbolizer.cpp

@@ -142,8 +142,8 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
         unsigned s_a=col.alpha();
         double w = sym.get_width();
         double h = sym.get_height();
-        double rx = w/2.0;
+        double rx = w;
-        double ry = h/2.0;
+        double ry = h;
 
         arrow arrow_;
         box2d<double> extent;

src/cairo_renderer.cpp

@@ -1529,8 +1529,8 @@ void cairo_renderer_base::process(markers_symbolizer const& sym,
         double strk_width = stroke_.get_width();
         double w = sym.get_width();
         double h = sym.get_height();
-        double rx = w/2.0;
+        double rx = w;
-        double ry = h/2.0;
+        double ry = h;
 
         arrow arrow_;
         box2d<double> extent;

src/grid/process_markers_symbolizer.cpp

@@ -146,8 +146,8 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
             h = sym.get_height()/res;
         }
 
-        double rx = w/2.0;
+        double rx = w;
-        double ry = h/2.0;
+        double ry = h;
 
         arrow arrow_;
         box2d<double> extent;

src/markers_symbolizer.cpp

@@ -51,8 +51,8 @@ markers_symbolizer::markers_symbolizer()
       fill_(color(0,0,255)), 
       spacing_(100.0), 
       max_error_(0.2),
-      width_(10.0),
+      width_(5.0),
-      height_(10.0),
+      height_(5.0),
       stroke_(),
       marker_p_(MARKER_LINE_PLACEMENT),
       marker_type_(ARROW) {}
@@ -65,8 +65,8 @@ markers_symbolizer::markers_symbolizer(path_expression_ptr filename)
       fill_(color(0,0,255)), 
       spacing_(100.0), 
       max_error_(0.2),
-      width_(10.0),
+      width_(5.0),
-      height_(10.0),
+      height_(5.0),
       stroke_(),
       marker_p_(MARKER_LINE_PLACEMENT),
       marker_type_(ARROW) {}

tests/python_tests/render_grid_test.py

@@ -44,8 +44,8 @@ def create_grid_map(width,height):
     r = mapnik.Rule()
     #symb = mapnik.PointSymbolizer()
     symb = mapnik.MarkersSymbolizer()
-    symb.width = 10
+    symb.width = 5
-    symb.height = 10
+    symb.height = 5
     symb.allow_overlap = True
     r.symbols.append(symb)
     label = mapnik.TextSymbolizer(mapnik.Expression('[Name]'),

tests/python_tests/render_test.py

@@ -127,8 +127,8 @@ def test_render_grid():
     r = mapnik.Rule()
     #symb = mapnik.PointSymbolizer()
     symb = mapnik.MarkersSymbolizer()
-    symb.width = 10
+    symb.width = 5
-    symb.height = 10
+    symb.height = 5
     symb.allow_overlap = True
     r.symbols.append(symb)
     label = mapnik.TextSymbolizer(mapnik.Expression('[Name]'),