sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Factored common renderer code from SVG renderer.

Browse source
This commit is contained in:
Matt Amos 2013-12-06 14:14:14 +00:00
parent 4f871d1fc7
commit a9627f835b
3 changed files with 9 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/mapnik/svg/output/svg_renderer.hpp
View file

@ -37,6 +37,7 @@
#include <mapnik/image_compositing.hpp> // for composite_mode_e
#include <mapnik/pixel_position.hpp>
#include <mapnik/request.hpp>
#include <mapnik/renderer_common.hpp>
// boost
#include <boost/variant/static_visitor.hpp>
@ -154,17 +155,10 @@ public:
private:
OutputIterator& output_iterator_;
const int width_;
const int height_;
double scale_factor_;
CoordTransform t_;
svg::path_output_attributes path_attributes_;
freetype_engine font_engine_;
face_manager<freetype_engine> font_manager_;
std::shared_ptr<label_collision_detector4> detector_;
svg::svg_generator<OutputIterator> generator_;
box2d<double> query_extent_;
bool painted_;
renderer_common common_;
/*!
* @brief Visitor that makes the calls to process each symbolizer when stored in a boost::variant.

2
src/svg/output/process_symbolizers.cpp
View file

@ -76,7 +76,7 @@ bool svg_renderer<OutputIterator>::process(rule::symbolizers const& syms,
geometry_type & geom = feature.get_geometry(i);
if(geom.size() > 0)
{
path_type path(t_, geom, prj_trans);
path_type path(common_.t_, geom, prj_trans);
generator_.generate_path(path, path_attributes_);
}
}

26
src/svg/output/svg_renderer.cpp
View file

@ -38,32 +38,18 @@ template <typename T>
svg_renderer<T>::svg_renderer(Map const& m, T & output_iterator, double scale_factor, unsigned offset_x, unsigned offset_y) :
feature_style_processor<svg_renderer>(m, scale_factor),
output_iterator_(output_iterator),
width_(m.width()),
height_(m.height()),
scale_factor_(scale_factor),
t_(m.width(),m.height(),m.get_current_extent(),offset_x,offset_y),
font_engine_(),
font_manager_(font_engine_),
detector_(std::make_shared<label_collision_detector4>(box2d<double>(-m.buffer_size(), -m.buffer_size(), m.width() + m.buffer_size() ,m.height() + m.buffer_size()))),
generator_(output_iterator),
query_extent_(),
painted_(false)
painted_(false),
common_(m, offset_x, offset_y, m.width(), m.height(), scale_factor)
{}
template <typename T>
svg_renderer<T>::svg_renderer(Map const& m, request const& req, T & output_iterator, double scale_factor, unsigned offset_x, unsigned offset_y) :
feature_style_processor<svg_renderer>(m, scale_factor),
output_iterator_(output_iterator),
width_(req.width()),
height_(req.height()),
scale_factor_(scale_factor),
t_(req.width(),req.height(),req.extent(),offset_x,offset_y),
font_engine_(),
font_manager_(font_engine_),
detector_(std::make_shared<label_collision_detector4>(box2d<double>(-req.buffer_size(), -req.buffer_size(), req.width() + req.buffer_size() ,req.height() + req.buffer_size()))),
generator_(output_iterator),
query_extent_(),
painted_(false)
painted_(false),
common(req, offset_x, offset_y, req.width(), req.height(), scale_factor)
{}
template <typename T>
@ -80,14 +66,14 @@ void svg_renderer<T>::start_map_processing(Map const& map)
// generate SVG root element opening tag.
// the root element defines the size of the image,
// which is taken from the map's dimensions.
svg::root_output_attributes root_attributes(width_, height_);
svg::root_output_attributes root_attributes(common_.width_, common_.height_);
generator_.generate_opening_root(root_attributes);
boost::optional<color> const& bgcolor = map.background();
if(bgcolor)
{
// generate background color as a rectangle that spans the whole image.
svg::rect_output_attributes bg_attributes(0, 0, width_, height_, *bgcolor);
svg::rect_output_attributes bg_attributes(0, 0, common_.width_, common_.height_, *bgcolor);
generator_.generate_rect(bg_attributes);
}
}