diff --git a/CHANGELOG b/CHANGELOG index d6206fd09..7b3b577b5 100644 --- a/CHANGELOG +++ b/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 `` 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) diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp index f69050f82..c27459ec3 100644 --- a/src/agg/process_markers_symbolizer.cpp +++ b/src/agg/process_markers_symbolizer.cpp @@ -142,8 +142,8 @@ void agg_renderer::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 ry = h/2.0; + double rx = w; + double ry = h; arrow arrow_; box2d extent; diff --git a/src/cairo_renderer.cpp b/src/cairo_renderer.cpp index d94e1d626..f2eb7c614 100644 --- a/src/cairo_renderer.cpp +++ b/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 ry = h/2.0; + double rx = w; + double ry = h; arrow arrow_; box2d extent; diff --git a/src/grid/process_markers_symbolizer.cpp b/src/grid/process_markers_symbolizer.cpp index 043ee814b..02f1b48df 100644 --- a/src/grid/process_markers_symbolizer.cpp +++ b/src/grid/process_markers_symbolizer.cpp @@ -146,8 +146,8 @@ void grid_renderer::process(markers_symbolizer const& sym, h = sym.get_height()/res; } - double rx = w/2.0; - double ry = h/2.0; + double rx = w; + double ry = h; arrow arrow_; box2d extent; diff --git a/src/markers_symbolizer.cpp b/src/markers_symbolizer.cpp index d28d3d6ab..7afeb5704 100644 --- a/src/markers_symbolizer.cpp +++ b/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), - height_(10.0), + width_(5.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), - height_(10.0), + width_(5.0), + height_(5.0), stroke_(), marker_p_(MARKER_LINE_PLACEMENT), marker_type_(ARROW) {} diff --git a/tests/python_tests/render_grid_test.py b/tests/python_tests/render_grid_test.py index 0f252f482..6233d8300 100644 --- a/tests/python_tests/render_grid_test.py +++ b/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.height = 10 + symb.width = 5 + symb.height = 5 symb.allow_overlap = True r.symbols.append(symb) label = mapnik.TextSymbolizer(mapnik.Expression('[Name]'), diff --git a/tests/python_tests/render_test.py b/tests/python_tests/render_test.py index abad9cea8..56ab62bfb 100644 --- a/tests/python_tests/render_test.py +++ b/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.height = 10 + symb.width = 5 + symb.height = 5 symb.allow_overlap = True r.symbols.append(symb) label = mapnik.TextSymbolizer(mapnik.Expression('[Name]'),