From 713881271f5d3e985a89809113bdf08f1612acbf Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 28 Nov 2012 19:54:01 -0800 Subject: [PATCH] set clipping off by default for markers, shields, and text (point/building do not support clipping so do not need this modification) - refs #1569 --- src/markers_symbolizer.cpp | 10 ++++++++-- src/shield_symbolizer.cpp | 3 +++ src/text_symbolizer.cpp | 7 +++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/markers_symbolizer.cpp b/src/markers_symbolizer.cpp index cf9d47e2ac..b1abeb60bc 100644 --- a/src/markers_symbolizer.cpp +++ b/src/markers_symbolizer.cpp @@ -58,7 +58,10 @@ markers_symbolizer::markers_symbolizer() marker_p_(MARKER_POINT_PLACEMENT), // TODO: consider defaulting to MARKER_WHOLE_MULTI, // for backward compatibility with 2.0.0 - marker_mp_(MARKER_EACH_MULTI) { } + marker_mp_(MARKER_EACH_MULTI) + { + this->set_clip(false); + } markers_symbolizer::markers_symbolizer(path_expression_ptr const& filename) : symbolizer_with_image(filename), @@ -72,7 +75,10 @@ markers_symbolizer::markers_symbolizer(path_expression_ptr const& filename) marker_p_(MARKER_POINT_PLACEMENT), // TODO: consider defaulting to MARKER_WHOLE_MULTI, // for backward compatibility with 2.0.0 - marker_mp_(MARKER_EACH_MULTI) { } + marker_mp_(MARKER_EACH_MULTI) + { + this->set_clip(false); + } markers_symbolizer::markers_symbolizer(markers_symbolizer const& rhs) : symbolizer_with_image(rhs), diff --git a/src/shield_symbolizer.cpp b/src/shield_symbolizer.cpp index 17238953bb..3a1b7d91d8 100644 --- a/src/shield_symbolizer.cpp +++ b/src/shield_symbolizer.cpp @@ -40,6 +40,7 @@ shield_symbolizer::shield_symbolizer(text_placements_ptr placements) unlock_image_(false), shield_displacement_(0,0) { + this->set_clip(false); } shield_symbolizer::shield_symbolizer( @@ -53,6 +54,7 @@ shield_symbolizer::shield_symbolizer( unlock_image_(false), shield_displacement_(0, 0) { + this->set_clip(false); } shield_symbolizer::shield_symbolizer( @@ -65,6 +67,7 @@ shield_symbolizer::shield_symbolizer( unlock_image_(false), shield_displacement_(0, 0) { + this->set_clip(false); } void shield_symbolizer::set_unlock_image(bool unlock_image) diff --git a/src/text_symbolizer.cpp b/src/text_symbolizer.cpp index 8aed6297b2..9c1ce350f5 100644 --- a/src/text_symbolizer.cpp +++ b/src/text_symbolizer.cpp @@ -94,7 +94,7 @@ text_symbolizer::text_symbolizer(text_placements_ptr placements) : symbolizer_base(), placement_options_(placements) { - + this->set_clip(false); } text_symbolizer::text_symbolizer(expression_ptr name, std::string const& face_name, @@ -107,6 +107,7 @@ text_symbolizer::text_symbolizer(expression_ptr name, std::string const& face_na set_face_name(face_name); set_text_size(size); set_fill(fill); + this->set_clip(false); } text_symbolizer::text_symbolizer(expression_ptr name, float size, color const& fill, @@ -117,6 +118,7 @@ text_symbolizer::text_symbolizer(expression_ptr name, float size, color const& f set_name(name); set_text_size(size); set_fill(fill); + this->set_clip(false); } text_symbolizer::text_symbolizer(text_symbolizer const& rhs) @@ -130,9 +132,6 @@ text_symbolizer& text_symbolizer::operator=(text_symbolizer const& other) if (this == &other) return *this; placement_options_ = other.placement_options_; /*TODO: Copy options? */ - - MAPNIK_LOG_DEBUG(text_symbolizer) << "text_symbolizer: TODO - Metawriter (text_symbolizer::operator=)"; - return *this; }