Skip to content
This repository
Browse code

Revert "finish moving symbolizers out of rule"

This reverts commit 20a3178.
  • Loading branch information...
commit ccda92fed13f7c99b5be7bde19783d8b5db9ce25 1 parent 1f11aeb
Dane Springmeyer springmeyer authored
5 bindings/python/mapnik_rule.cpp
@@ -32,7 +32,6 @@
32 32 #include <mapnik/expression_string.hpp>
33 33
34 34 using mapnik::rule;
35   -using mapnik::symbolizers;
36 35 using mapnik::expr_node;
37 36 using mapnik::expression_ptr;
38 37 using mapnik::Feature;
@@ -63,8 +62,8 @@ void export_rule()
63 62 implicitly_convertible<text_symbolizer,symbolizer>();
64 63 implicitly_convertible<markers_symbolizer,symbolizer>();
65 64
66   - class_<symbolizers>("Symbolizers",init<>("TODO"))
67   - .def(vector_indexing_suite<symbolizers>())
  65 + class_<rule::symbolizers>("Symbolizers",init<>("TODO"))
  66 + .def(vector_indexing_suite<rule::symbolizers>())
68 67 ;
69 68
70 69 class_<rule>("Rule",init<>("default constructor"))
2  demo/viewer/styles_model.cpp
@@ -323,7 +323,7 @@ StyleModel::StyleModel(boost::shared_ptr<mapnik::Map> map, QObject * parent)
323 323 for ( ; itr2 != rules.end();++itr2)
324 324 {
325 325 node* rule_n = style_n->add_child(new node(rule_node(QString("Rule"),*itr2),style_n));
326   - mapnik::symbolizers::const_iterator itr3 = (*itr2).begin();
  326 + mapnik::rule::symbolizers::const_iterator itr3 = (*itr2).begin();
327 327 for ( ; itr3 !=itr2->end();++itr3)
328 328 {
329 329 rule_n->add_child(new node(symbolizer_node(*itr3),rule_n));
2  include/mapnik/agg_renderer.hpp
@@ -110,7 +110,7 @@ class MAPNIK_DECL agg_renderer : public feature_style_processor<agg_renderer<T>
110 110 feature_impl & feature,
111 111 proj_transform const& prj_trans);
112 112
113   - inline bool process(symbolizers const& /*syms*/,
  113 + inline bool process(rule::symbolizers const& /*syms*/,
114 114 mapnik::feature_impl & /*feature*/,
115 115 proj_transform const& /*prj_trans*/)
116 116 {
4 include/mapnik/attribute_collector.hpp
@@ -220,8 +220,8 @@ class attribute_collector : public boost::noncopyable
220 220 template <typename RuleType>
221 221 void operator() (RuleType const& r)
222 222 {
223   - symbolizers const& symbols = r.get_symbolizers();
224   - symbolizers::const_iterator symIter=symbols.begin();
  223 + typename RuleType::symbolizers const& symbols = r.get_symbolizers();
  224 + typename RuleType::symbolizers::const_iterator symIter=symbols.begin();
225 225 symbolizer_attributes s_attr(names_);
226 226 while (symIter != symbols.end())
227 227 {
2  include/mapnik/cairo_renderer.hpp
@@ -111,7 +111,7 @@ class MAPNIK_DECL cairo_renderer_base : private boost::noncopyable
111 111 void process(markers_symbolizer const& sym,
112 112 mapnik::feature_impl & feature,
113 113 proj_transform const& prj_trans);
114   - inline bool process(symbolizers const& /*syms*/,
  114 + inline bool process(rule::symbolizers const& /*syms*/,
115 115 mapnik::feature_impl & /*feature*/,
116 116 proj_transform const& /*prj_trans*/)
117 117 {
12 include/mapnik/feature_style_processor_impl.hpp
@@ -398,9 +398,9 @@ void feature_style_processor<Processor>::apply_to_layer(layer const& lay, Proces
398 398 ds->type() == datasource::Raster &&
399 399 ds->params().get<double>("filter_factor",0.0) == 0.0)
400 400 {
401   - symbolizers const& symbols = r.get_symbolizers();
402   - symbolizers::const_iterator symIter = symbols.begin();
403   - symbolizers::const_iterator symEnd = symbols.end();
  401 + rule::symbolizers const& symbols = r.get_symbolizers();
  402 + rule::symbolizers::const_iterator symIter = symbols.begin();
  403 + rule::symbolizers::const_iterator symEnd = symbols.end();
404 404 while (symIter != symEnd)
405 405 {
406 406 // if multiple raster symbolizers, last will be respected
@@ -548,7 +548,7 @@ void feature_style_processor<Processor>::render_style(
548 548
549 549 do_else=false;
550 550 do_also=true;
551   - symbolizers const& symbols = r->get_symbolizers();
  551 + rule::symbolizers const& symbols = r->get_symbolizers();
552 552
553 553 // if the underlying renderer is not able to process the complete set of symbolizers,
554 554 // process one by one.
@@ -577,7 +577,7 @@ void feature_style_processor<Processor>::render_style(
577 577
578 578 p.painted(true);
579 579
580   - symbolizers const& symbols = r->get_symbolizers();
  580 + rule::symbolizers const& symbols = r->get_symbolizers();
581 581 // if the underlying renderer is not able to process the complete set of symbolizers,
582 582 // process one by one.
583 583 if(!p.process(symbols,*feature,prj_trans))
@@ -599,7 +599,7 @@ void feature_style_processor<Processor>::render_style(
599 599
600 600 p.painted(true);
601 601
602   - symbolizers const& symbols = r->get_symbolizers();
  602 + rule::symbolizers const& symbols = r->get_symbolizers();
603 603 // if the underlying renderer is not able to process the complete set of symbolizers,
604 604 // process one by one.
605 605 if(!p.process(symbols,*feature,prj_trans))
2  include/mapnik/grid/grid_renderer.hpp
@@ -98,7 +98,7 @@ class MAPNIK_DECL grid_renderer : public feature_style_processor<grid_renderer<T
98 98 void process(markers_symbolizer const& sym,
99 99 mapnik::feature_impl & feature,
100 100 proj_transform const& prj_trans);
101   - inline bool process(symbolizers const& /*syms*/,
  101 + inline bool process(rule::symbolizers const& /*syms*/,
102 102 mapnik::feature_impl & /*feature*/,
103 103 proj_transform const& /*prj_trans*/)
104 104 {
2  include/mapnik/svg/output/svg_renderer.hpp
@@ -88,7 +88,7 @@ class MAPNIK_DECL svg_renderer : public feature_style_processor<svg_renderer<Out
88 88 * @brief Overload that process the whole set of symbolizers of a rule.
89 89 * @return true, meaning that this renderer can process multiple symbolizers.
90 90 */
91   - bool process(symbolizers const& syms,
  91 + bool process(rule::symbolizers const& syms,
92 92 Feature const& feature,
93 93 proj_transform const& prj_trans);
94 94
4 src/save_map.cpp
@@ -543,8 +543,8 @@ void serialize_rule( ptree & style_node, const rule & r, bool explicit_defaults)
543 543 max_scale.put_value( r.get_max_scale() );
544 544 }
545 545
546   - symbolizers::const_iterator begin = r.get_symbolizers().begin();
547   - symbolizers::const_iterator end = r.get_symbolizers().end();
  546 + rule::symbolizers::const_iterator begin = r.get_symbolizers().begin();
  547 + rule::symbolizers::const_iterator end = r.get_symbolizers().end();
548 548 serialize_symbolizer serializer( rule_node, explicit_defaults);
549 549 std::for_each( begin, end , boost::apply_visitor( serializer ));
550 550 }
4 src/svg/output/process_symbolizers.cpp
@@ -26,7 +26,7 @@
26 26 namespace mapnik {
27 27
28 28 template <typename OutputIterator>
29   -bool svg_renderer<OutputIterator>::process(symbolizers const& syms,
  29 +bool svg_renderer<OutputIterator>::process(rule::symbolizers const& syms,
30 30 Feature const& feature,
31 31 proj_transform const& prj_trans)
32 32 {
@@ -60,7 +60,7 @@ bool svg_renderer<OutputIterator>::process(symbolizers const& syms,
60 60 return true;
61 61 };
62 62
63   -template bool svg_renderer<std::ostream_iterator<char> >::process(symbolizers const& syms,
  63 +template bool svg_renderer<std::ostream_iterator<char> >::process(rule::symbolizers const& syms,
64 64 Feature const& feature,
65 65 proj_transform const& prj_trans);
66 66

0 comments on commit ccda92f

Please sign in to comment.
Something went wrong with that request. Please try again.