Browse files

set clipping off by default for markers, shields, and text (point/bui…

…lding do not support clipping so do not need this modification) - refs #1569
  • Loading branch information...
1 parent 5f90020 commit 713881271f5d3e985a89809113bdf08f1612acbf @springmeyer springmeyer committed Nov 28, 2012
Showing with 14 additions and 6 deletions.
  1. +8 −2 src/markers_symbolizer.cpp
  2. +3 −0 src/shield_symbolizer.cpp
  3. +3 −4 src/text_symbolizer.cpp
View
10 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),
View
3 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)
View
7 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;
}

0 comments on commit 7138812

Please sign in to comment.