diff --git a/include/agg_renderer.hpp b/include/agg_renderer.hpp index c276055b2..6a58fd961 100644 --- a/include/agg_renderer.hpp +++ b/include/agg_renderer.hpp @@ -23,7 +23,6 @@ #include "feature_style_processor.hpp" #include -//#include "agg_font_freetype.h" #include "font_engine_freetype.hpp" namespace mapnik @@ -35,8 +34,8 @@ namespace mapnik agg_renderer(Map const& m, T & pixmap); void start_map_processing(); void end_map_processing(); - void start_layer_processing(); - void end_layer_processing(); + void start_layer_processing(Layer const& lay); + void end_layer_processing(Layer const& lay); void process(point_symbolizer const& sym,Feature const& feature); void process(line_symbolizer const& sym,Feature const& feature); void process(line_pattern_symbolizer const& sym,Feature const& feature); diff --git a/include/feature_style_processor.hpp b/include/feature_style_processor.hpp index 3ce2645ce..5568f5da1 100644 --- a/include/feature_style_processor.hpp +++ b/include/feature_style_processor.hpp @@ -58,8 +58,10 @@ namespace mapnik void apply() { timer clock; - Processor & p = static_cast(*this); + + p.start_map_processing(); + std::vector::const_iterator itr = m_.layers().begin(); while (itr != m_.layers().end()) { @@ -70,11 +72,16 @@ namespace mapnik } ++itr; } + + p.end_map_processing(); + clock.stop(); + } private: void apply_to_layer(Layer const& lay,Processor & p) { + p.start_layer_processing(lay); datasource *ds=lay.datasource().get(); if (ds) { @@ -87,7 +94,6 @@ namespace mapnik { std::set names; attribute_collector collector(names); - //property_index indexer(names); std::vector if_rules; std::vector else_rules; @@ -104,10 +110,8 @@ namespace mapnik if (ruleIter->active(scale)) { active_rules=true; - //filter_ptr& filter=const_cast(ruleIter->get_filter()); - //filter->accept(collector); ruleIter->accept(collector); - //filter->accept(indexer); + if (ruleIter->has_else_filter()) { else_rules.push_back(const_cast(&(*ruleIter))); @@ -171,6 +175,7 @@ namespace mapnik } } } + p.end_layer_processing(lay); } Map const& m_; diff --git a/src/agg_renderer.cpp b/src/agg_renderer.cpp index 2334025c4..f6459ed2a 100644 --- a/src/agg_renderer.cpp +++ b/src/agg_renderer.cpp @@ -102,13 +102,13 @@ namespace mapnik } template - void agg_renderer::start_layer_processing() + void agg_renderer::start_layer_processing(Layer const& lay) { - std::cout << "start layer processing" << std::endl; + std::cout << "start layer processing : " << lay.name() << std::endl; } template - void agg_renderer::end_layer_processing() + void agg_renderer::end_layer_processing(Layer const&) { std::cout << "end layer processing" << std::endl; }