diff --git a/bindings/python/mapnik_rule.cpp b/bindings/python/mapnik_rule.cpp index fd42f46f5..86d5d3522 100644 --- a/bindings/python/mapnik_rule.cpp +++ b/bindings/python/mapnik_rule.cpp @@ -32,7 +32,6 @@ #include using mapnik::rule; -using mapnik::symbolizers; using mapnik::expr_node; using mapnik::expression_ptr; using mapnik::Feature; @@ -63,8 +62,8 @@ void export_rule() implicitly_convertible(); implicitly_convertible(); - class_("Symbolizers",init<>("TODO")) - .def(vector_indexing_suite()) + class_("Symbolizers",init<>("TODO")) + .def(vector_indexing_suite()) ; class_("Rule",init<>("default constructor")) diff --git a/demo/viewer/styles_model.cpp b/demo/viewer/styles_model.cpp index 931f54566..3468de005 100644 --- a/demo/viewer/styles_model.cpp +++ b/demo/viewer/styles_model.cpp @@ -323,7 +323,7 @@ StyleModel::StyleModel(boost::shared_ptr map, QObject * parent) for ( ; itr2 != rules.end();++itr2) { node* rule_n = style_n->add_child(new node(rule_node(QString("Rule"),*itr2),style_n)); - mapnik::symbolizers::const_iterator itr3 = (*itr2).begin(); + mapnik::rule::symbolizers::const_iterator itr3 = (*itr2).begin(); for ( ; itr3 !=itr2->end();++itr3) { rule_n->add_child(new node(symbolizer_node(*itr3),rule_n)); diff --git a/include/mapnik/agg_renderer.hpp b/include/mapnik/agg_renderer.hpp index a43f3bcd4..9ace3429a 100644 --- a/include/mapnik/agg_renderer.hpp +++ b/include/mapnik/agg_renderer.hpp @@ -110,7 +110,7 @@ public: feature_impl & feature, proj_transform const& prj_trans); - inline bool process(symbolizers const& /*syms*/, + inline bool process(rule::symbolizers const& /*syms*/, mapnik::feature_impl & /*feature*/, proj_transform const& /*prj_trans*/) { diff --git a/include/mapnik/attribute_collector.hpp b/include/mapnik/attribute_collector.hpp index b0cf0993c..9ad579c5f 100644 --- a/include/mapnik/attribute_collector.hpp +++ b/include/mapnik/attribute_collector.hpp @@ -220,8 +220,8 @@ public: template void operator() (RuleType const& r) { - symbolizers const& symbols = r.get_symbolizers(); - symbolizers::const_iterator symIter=symbols.begin(); + typename RuleType::symbolizers const& symbols = r.get_symbolizers(); + typename RuleType::symbolizers::const_iterator symIter=symbols.begin(); symbolizer_attributes s_attr(names_); while (symIter != symbols.end()) { diff --git a/include/mapnik/cairo_renderer.hpp b/include/mapnik/cairo_renderer.hpp index c4afc20b8..5adba78da 100644 --- a/include/mapnik/cairo_renderer.hpp +++ b/include/mapnik/cairo_renderer.hpp @@ -111,7 +111,7 @@ public: void process(markers_symbolizer const& sym, mapnik::feature_impl & feature, proj_transform const& prj_trans); - inline bool process(symbolizers const& /*syms*/, + inline bool process(rule::symbolizers const& /*syms*/, mapnik::feature_impl & /*feature*/, proj_transform const& /*prj_trans*/) { diff --git a/include/mapnik/feature_style_processor_impl.hpp b/include/mapnik/feature_style_processor_impl.hpp index 9451747c5..7c9d63b19 100644 --- a/include/mapnik/feature_style_processor_impl.hpp +++ b/include/mapnik/feature_style_processor_impl.hpp @@ -398,9 +398,9 @@ void feature_style_processor::apply_to_layer(layer const& lay, Proces ds->type() == datasource::Raster && ds->params().get("filter_factor",0.0) == 0.0) { - symbolizers const& symbols = r.get_symbolizers(); - symbolizers::const_iterator symIter = symbols.begin(); - symbolizers::const_iterator symEnd = symbols.end(); + rule::symbolizers const& symbols = r.get_symbolizers(); + rule::symbolizers::const_iterator symIter = symbols.begin(); + rule::symbolizers::const_iterator symEnd = symbols.end(); while (symIter != symEnd) { // if multiple raster symbolizers, last will be respected @@ -548,7 +548,7 @@ void feature_style_processor::render_style( do_else=false; do_also=true; - symbolizers const& symbols = r->get_symbolizers(); + rule::symbolizers const& symbols = r->get_symbolizers(); // if the underlying renderer is not able to process the complete set of symbolizers, // process one by one. @@ -577,7 +577,7 @@ void feature_style_processor::render_style( p.painted(true); - symbolizers const& symbols = r->get_symbolizers(); + rule::symbolizers const& symbols = r->get_symbolizers(); // if the underlying renderer is not able to process the complete set of symbolizers, // process one by one. if(!p.process(symbols,*feature,prj_trans)) @@ -599,7 +599,7 @@ void feature_style_processor::render_style( p.painted(true); - symbolizers const& symbols = r->get_symbolizers(); + rule::symbolizers const& symbols = r->get_symbolizers(); // if the underlying renderer is not able to process the complete set of symbolizers, // process one by one. if(!p.process(symbols,*feature,prj_trans)) diff --git a/include/mapnik/grid/grid_renderer.hpp b/include/mapnik/grid/grid_renderer.hpp index caf3a2e10..d8d6af67a 100644 --- a/include/mapnik/grid/grid_renderer.hpp +++ b/include/mapnik/grid/grid_renderer.hpp @@ -98,7 +98,7 @@ public: void process(markers_symbolizer const& sym, mapnik::feature_impl & feature, proj_transform const& prj_trans); - inline bool process(symbolizers const& /*syms*/, + inline bool process(rule::symbolizers const& /*syms*/, mapnik::feature_impl & /*feature*/, proj_transform const& /*prj_trans*/) { diff --git a/include/mapnik/svg/output/svg_renderer.hpp b/include/mapnik/svg/output/svg_renderer.hpp index 4e8f69664..d44034048 100644 --- a/include/mapnik/svg/output/svg_renderer.hpp +++ b/include/mapnik/svg/output/svg_renderer.hpp @@ -88,7 +88,7 @@ public: * @brief Overload that process the whole set of symbolizers of a rule. * @return true, meaning that this renderer can process multiple symbolizers. */ - bool process(symbolizers const& syms, + bool process(rule::symbolizers const& syms, Feature const& feature, proj_transform const& prj_trans); diff --git a/src/save_map.cpp b/src/save_map.cpp index eae90eedb..55996e471 100644 --- a/src/save_map.cpp +++ b/src/save_map.cpp @@ -543,8 +543,8 @@ void serialize_rule( ptree & style_node, const rule & r, bool explicit_defaults) max_scale.put_value( r.get_max_scale() ); } - symbolizers::const_iterator begin = r.get_symbolizers().begin(); - symbolizers::const_iterator end = r.get_symbolizers().end(); + rule::symbolizers::const_iterator begin = r.get_symbolizers().begin(); + rule::symbolizers::const_iterator end = r.get_symbolizers().end(); serialize_symbolizer serializer( rule_node, explicit_defaults); std::for_each( begin, end , boost::apply_visitor( serializer )); } diff --git a/src/svg/output/process_symbolizers.cpp b/src/svg/output/process_symbolizers.cpp index 3bb16660e..7ee1406ad 100644 --- a/src/svg/output/process_symbolizers.cpp +++ b/src/svg/output/process_symbolizers.cpp @@ -26,7 +26,7 @@ namespace mapnik { template -bool svg_renderer::process(symbolizers const& syms, +bool svg_renderer::process(rule::symbolizers const& syms, Feature const& feature, proj_transform const& prj_trans) { @@ -60,7 +60,7 @@ bool svg_renderer::process(symbolizers const& syms, return true; }; -template bool svg_renderer >::process(symbolizers const& syms, +template bool svg_renderer >::process(rule::symbolizers const& syms, Feature const& feature, proj_transform const& prj_trans);