diff --git a/include/mapnik/agg_renderer.hpp b/include/mapnik/agg_renderer.hpp index 2ce89a290..7bbaee16a 100644 --- a/include/mapnik/agg_renderer.hpp +++ b/include/mapnik/agg_renderer.hpp @@ -107,6 +107,9 @@ public: void process(markers_symbolizer const& sym, mapnik::feature_impl & feature, proj_transform const& prj_trans); + void process(debug_symbolizer const& sym, + feature_impl & feature, + proj_transform const& prj_trans); inline bool process(rule::symbolizers const& /*syms*/, mapnik::feature_impl & /*feature*/, diff --git a/include/mapnik/debug_symbolizer.hpp b/include/mapnik/debug_symbolizer.hpp new file mode 100644 index 000000000..d25c5c701 --- /dev/null +++ b/include/mapnik/debug_symbolizer.hpp @@ -0,0 +1,39 @@ +/***************************************************************************** + * + * This file is part of Mapnik (c++ mapping toolkit) + * + * Copyright (C) 2011 Artem Pavlenko + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + *****************************************************************************/ + +#ifndef MAPNIK_DEBUG_SYMBOLIZER_HPP +#define MAPNIK_DEBUG_SYMBOLIZER_HPP + +#include +#include + +namespace mapnik +{ + +struct MAPNIK_DECL debug_symbolizer : + public symbolizer_base +{ + debug_symbolizer() : symbolizer_base() {} +}; +} + +#endif // DEBUG_SYMBOLIZER_HPP diff --git a/include/mapnik/rule.hpp b/include/mapnik/rule.hpp index 104f763e7..ffdae2328 100644 --- a/include/mapnik/rule.hpp +++ b/include/mapnik/rule.hpp @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -108,6 +109,12 @@ inline bool operator==(markers_symbolizer const& lhs, return (&lhs == &rhs); } +inline bool operator==(debug_symbolizer const& lhs, + debug_symbolizer const& rhs) +{ + return (&lhs == &rhs); +} + typedef boost::variant symbolizer; + markers_symbolizer, + debug_symbolizer> symbolizer; class rule { diff --git a/src/agg/process_debug_symbolizer.cpp b/src/agg/process_debug_symbolizer.cpp new file mode 100644 index 000000000..96672ba2f --- /dev/null +++ b/src/agg/process_debug_symbolizer.cpp @@ -0,0 +1,66 @@ +/***************************************************************************** + * + * This file is part of Mapnik (c++ mapping toolkit) + * + * Copyright (C) 2011 Artem Pavlenko + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + *****************************************************************************/ + +// mapnik +#include +#include +#include +#include "agg_renderer_primitives.h" + +namespace mapnik { + +void draw_rect(image_32 &pixmap, box2d const& box) +{ + double x0 = box.minx(); + double x1 = box.maxx(); + double y0 = box.miny(); + double y1 = box.maxy(); + unsigned color1 = 0xff0000ff; + for (double x=x0; x +void agg_renderer::process(debug_symbolizer const& sym, + mapnik::feature_impl & feature, + proj_transform const& prj_trans) +{ + label_collision_detector4::query_iterator itr = detector_->begin(), end = detector_->end(); + for (;itr!=end; itr++) + { + draw_rect(pixmap_, itr->box); + } +} + +template void agg_renderer::process(debug_symbolizer const&, + mapnik::feature_impl &, + proj_transform const&); +} + diff --git a/src/build.py b/src/build.py index 3c358ace7..5f8525d2e 100644 --- a/src/build.py +++ b/src/build.py @@ -263,6 +263,7 @@ source += Split( agg/process_raster_symbolizer.cpp agg/process_shield_symbolizer.cpp agg/process_markers_symbolizer.cpp + agg/process_debug_symbolizer.cpp """ ) diff --git a/src/load_map.cpp b/src/load_map.cpp index 221c0b88f..881e8379e 100644 --- a/src/load_map.cpp +++ b/src/load_map.cpp @@ -109,6 +109,7 @@ private: void parse_building_symbolizer(rule & rule, xml_node const& sym); void parse_raster_symbolizer(rule & rule, xml_node const& sym); void parse_markers_symbolizer(rule & rule, xml_node const& sym); + void parse_debug_symbolizer(rule & rule, xml_node const& sym); void parse_raster_colorizer(raster_colorizer_ptr const& rc, xml_node const& node); bool parse_stroke(stroke & strk, xml_node const & sym); @@ -806,6 +807,10 @@ void map_parser::parse_rule(feature_type_style & style, xml_node const& r) { parse_markers_symbolizer(rule, *symIter); } + else if (symIter->is("DebugSymbolizer")) + { + parse_debug_symbolizer(rule, *symIter); + } } style.add_rule(rule); @@ -1536,6 +1541,14 @@ void map_parser::parse_raster_symbolizer(rule & rule, xml_node const & sym) } } +void map_parser::parse_debug_symbolizer(rule & rule, xml_node const & sym) +{ + debug_symbolizer symbol; + + parse_symbolizer_base(symbol, sym); + rule.append(symbol); +} + void map_parser::parse_raster_colorizer(raster_colorizer_ptr const& rc, xml_node const& node) {