Permalink
Browse files

remove arrow/ellipse ad-hoc markers - see #1285

  • Loading branch information...
1 parent 6bc3f06 commit 9b14a7206af77fc343de7d33f3807d43e4268b28 @artemp artemp committed Jul 4, 2012
@@ -96,11 +96,6 @@ void export_markers_symbolizer()
.value("LINE_PLACEMENT",mapnik::MARKER_LINE_PLACEMENT)
;
- mapnik::enumeration_<mapnik::marker_type_e>("marker_type")
- .value("ARROW",mapnik::MARKER_ARROW)
- .value("ELLIPSE",mapnik::MARKER_ELLIPSE)
- ;
-
class_<markers_symbolizer>("MarkersSymbolizer",
init<>("Default Markers Symbolizer - blue arrow"))
.def (init<mapnik::path_expression_ptr>("<path expression ptr>"))
@@ -145,10 +140,6 @@ void export_markers_symbolizer()
return_value_policy<copy_const_reference>()),
&markers_symbolizer::set_stroke,
"Set/get the marker stroke (outline)")
- .add_property("marker_type",
- &markers_symbolizer::get_marker_type,
- &markers_symbolizer::set_marker_type,
- "Set/get the marker-type")
.add_property("placement",
&markers_symbolizer::get_marker_placement,
&markers_symbolizer::set_marker_placement,
@@ -42,14 +42,6 @@ enum marker_placement_enum {
DEFINE_ENUM( marker_placement_e, marker_placement_enum );
-enum marker_type_enum {
- MARKER_ARROW,
- MARKER_ELLIPSE,
- marker_type_enum_MAX
-};
-
-DEFINE_ENUM( marker_type_e, marker_type_enum );
-
struct MAPNIK_DECL markers_symbolizer :
public symbolizer_with_image, public symbolizer_base
{
@@ -75,8 +67,6 @@ struct MAPNIK_DECL markers_symbolizer :
void set_stroke(stroke const& stroke);
void set_marker_placement(marker_placement_e marker_p);
marker_placement_e get_marker_placement() const;
- void set_marker_type(marker_type_e marker_p);
- marker_type_e get_marker_type() const;
private:
bool ignore_placement_;
@@ -88,7 +78,6 @@ struct MAPNIK_DECL markers_symbolizer :
expression_ptr height_;
stroke stroke_;
marker_placement_e marker_p_;
- marker_type_e marker_type_;
};
@@ -78,7 +78,7 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
tr = agg::trans_affine_scaling(scale_factor_) * tr;
agg::trans_affine geom_tr;
- evaluate_transform(geom_tr, feature, sym.get_transform());x
+ evaluate_transform(geom_tr, feature, sym.get_transform());
std::string filename = path_processor_type::evaluate(*sym.get_filename(), feature);
marker_placement_e placement_method = sym.get_marker_placement();
Oops, something went wrong.

0 comments on commit 9b14a72

Please sign in to comment.