Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:mapnik/mapnik

  • Loading branch information...
commit 67a96355a8daf12687912685f77db65f92e68a2a 2 parents af5f0cb + ad8e4e4
@springmeyer springmeyer authored
View
130 bindings/python/mapnik/__init__.py
@@ -712,114 +712,78 @@ def name(self, name):
@property
def text_size(self):
- warnings.warn("'text_size' is deprecated, use format.text_size",
- DeprecationWarning, 2)
return self.format.text_size
@text_size.setter
def text_size(self, text_size):
- warnings.warn("'text_size' is deprecated, use format.text_size",
- DeprecationWarning, 2)
self.format.text_size = text_size
@property
def face_name(self):
- warnings.warn("'face_name' is deprecated, use format.face_name",
- DeprecationWarning, 2)
return self.format.face_name
@face_name.setter
def face_name(self, face_name):
- warnings.warn("'face_name' is deprecated, use format.face_name",
- DeprecationWarning, 2)
self.format.face_name = face_name
-
@property
def fontset(self):
- warnings.warn("'fontset' is deprecated, use format.fontset",
- DeprecationWarning, 2)
return self.format.fontset
@fontset.setter
def fontset(self, fontset):
- warnings.warn("'fontset' is deprecated, use format.fontset",
- DeprecationWarning, 2)
self.format.fontset = fontset
-
@property
def character_spacing(self):
- warnings.warn("'character_spacing' is deprecated, use format.character_spacing",
- DeprecationWarning, 2)
return self.format.character_spacing
@character_spacing.setter
def character_spacing(self, character_spacing):
- warnings.warn("'character_spacing' is deprecated, use format.character_spacing",
- DeprecationWarning, 2)
self.format.character_spacing = character_spacing
-
@property
def line_spacing(self):
- warnings.warn("'line_spacing' is deprecated, use format.line_spacing",
- DeprecationWarning, 2)
return self.format.line_spacing
@line_spacing.setter
def line_spacing(self, line_spacing):
- warnings.warn("'line_spacing' is deprecated, use format.line_spacing",
- DeprecationWarning, 2)
self.format.line_spacing = line_spacing
-
@property
def text_opacity(self):
- warnings.warn("'text_opacity' is deprecated, use format.text_opacity",
- DeprecationWarning, 2)
return self.format.text_opacity
@text_opacity.setter
def text_opacity(self, text_opacity):
- warnings.warn("'text_opacity' is deprecated, use format.text_opacity",
- DeprecationWarning, 2)
self.format.text_opacity = text_opacity
-
@property
def wrap_char(self):
- warnings.warn("'wrap_char' is deprecated, use format.wrap_char",
- DeprecationWarning, 2)
return self.format.wrap_char
@wrap_char.setter
def wrap_char(self, wrap_char):
- warnings.warn("'wrap_char' is deprecated, use format.wrap_char",
- DeprecationWarning, 2)
self.format.wrap_char = wrap_char
@property
def wrap_character(self):
- warnings.warn("'wrap_character' is deprecated, use format.wrap_character",
- DeprecationWarning, 2)
return self.format.wrap_character
@wrap_char.setter
def wrap_character(self, wrap_character):
- warnings.warn("'wrap_char' is deprecated, use format.wrap_character",
- DeprecationWarning, 2)
self.format.wrap_character = wrap_character
@property
def wrap_before(self):
+<<<<<<< HEAD
warnings.warn("'wrap_before' is deprecated, use format.wrap_before",
DeprecationWarning, 2)
return self.format.wrap_before
@@ -829,298 +793,218 @@ def wrap_before(self, wrap_before):
warnings.warn("'wrap_before' is deprecated, use format.wrap_before",
DeprecationWarning, 2)
self.format.wrap_before = wrap_before
+=======
+ return self.properties.wrap_before
+ @wrap_before.setter
+ def wrap_before(self, wrap_before):
+ self.properties.wrap_before = wrap_before
+>>>>>>> 78f0c97... Remove deprecation warnings.
@property
def text_transform(self):
- warnings.warn("'text_transform' is deprecated, use format.text_transform",
- DeprecationWarning, 2)
return self.format.text_transform
@text_transform.setter
def text_transform(self, text_transform):
- warnings.warn("'text_transform' is deprecated, use format.text_transform",
- DeprecationWarning, 2)
self.format.text_transform = text_transform
-
@property
def fill(self):
- warnings.warn("'fill' is deprecated, use format.fill",
- DeprecationWarning, 2)
return self.format.fill
@fill.setter
def fill(self, fill):
- warnings.warn("'fill' is deprecated, use format.fill",
- DeprecationWarning, 2)
self.format.fill = fill
-
@property
def halo_fill(self):
- warnings.warn("'halo_fill' is deprecated, use format.halo_fill",
- DeprecationWarning, 2)
return self.format.halo_fill
@halo_fill.setter
def halo_fill(self, halo_fill):
- warnings.warn("'halo_fill' is deprecated, use format.halo_fill",
- DeprecationWarning, 2)
self.format.halo_fill = halo_fill
@property
def halo_radius(self):
- warnings.warn("'halo_radius' is deprecated, use format.halo_radius",
- DeprecationWarning, 2)
return self.format.halo_radius
@halo_radius.setter
def halo_radius(self, halo_radius):
- warnings.warn("'halo_radius' is deprecated, use format.halo_radius",
- DeprecationWarning, 2)
self.format.halo_radius = halo_radius
@property
def label_placement(self):
- warnings.warn("'label_placement' is deprecated, use properties.label_placement",
- DeprecationWarning, 2)
return self.properties.label_placement
@label_placement.setter
def label_placement(self, label_placement):
- warnings.warn("'label_placement' is deprecated, use properties.label_placement",
- DeprecationWarning, 2)
self.properties.label_placement = label_placement
@property
def horizontal_alignment(self):
- warnings.warn("'horizontal_alignment' is deprecated, use properties.horizontal_alignment",
- DeprecationWarning, 2)
return self.properties.horizontal_alignment
@horizontal_alignment.setter
def horizontal_alignment(self, horizontal_alignment):
- warnings.warn("'horizontal_alignment' is deprecated, use properties.horizontal_alignment",
- DeprecationWarning, 2)
self.properties.horizontal_alignment = horizontal_alignment
@property
def justify_alignment(self):
- warnings.warn("'justify_alignment' is deprecated, use properties.justify_alignment",
- DeprecationWarning, 2)
return self.properties.justify_alignment
@justify_alignment.setter
def justify_alignment(self, justify_alignment):
- warnings.warn("'justify_alignment' is deprecated, use properties.justify_alignment",
- DeprecationWarning, 2)
self.properties.justify_alignment = justify_alignment
@property
def vertical_alignment(self):
- warnings.warn("'vertical_alignment' is deprecated, use properties.vertical_alignment",
- DeprecationWarning, 2)
return self.properties.vertical_alignment
@vertical_alignment.setter
def vertical_alignment(self, vertical_alignment):
- warnings.warn("'vertical_alignment' is deprecated, use properties.vertical_alignment",
- DeprecationWarning, 2)
self.properties.vertical_alignment = vertical_alignment
@property
def orientation(self):
- warnings.warn("'orientation' is deprecated, use properties.orientation",
- DeprecationWarning, 2)
return self.properties.orientation
@orientation.setter
def orientation(self, orientation):
- warnings.warn("'orientation' is deprecated, use properties.orientation",
- DeprecationWarning, 2)
self.properties.orientation = orientation
@property
def displacement(self):
- warnings.warn("'displacement' is deprecated, use properties.displacement",
- DeprecationWarning, 2)
return self.properties.displacement
@displacement.setter
def displacement(self, displacement):
- warnings.warn("'displacement' is deprecated, use properties.displacement",
- DeprecationWarning, 2)
self.properties.displacement = displacement
@property
def label_spacing(self):
- warnings.warn("'label_spacing' is deprecated, use properties.label_spacing",
- DeprecationWarning, 2)
return self.properties.label_spacing
@label_spacing.setter
def label_spacing(self, label_spacing):
- warnings.warn("'label_spacing' is deprecated, use properties.label_spacing",
- DeprecationWarning, 2)
self.properties.label_spacing = label_spacing
@property
def label_position_tolerance(self):
- warnings.warn("'label_position_tolerance' is deprecated, use properties.label_position_tolerance",
- DeprecationWarning, 2)
return self.properties.label_position_tolerance
@label_position_tolerance.setter
def label_position_tolerance(self, label_position_tolerance):
- warnings.warn("'label_position_tolerance' is deprecated, use properties.label_position_tolerance",
- DeprecationWarning, 2)
self.properties.label_position_tolerance = label_position_tolerance
@property
def avoid_edges(self):
- warnings.warn("'avoid_edges' is deprecated, use properties.avoid_edges",
- DeprecationWarning, 2)
return self.properties.avoid_edges
@avoid_edges.setter
def avoid_edges(self, avoid_edges):
- warnings.warn("'avoid_edges' is deprecated, use properties.avoid_edges",
- DeprecationWarning, 2)
self.properties.avoid_edges = avoid_edges
@property
def minimum_distance(self):
- warnings.warn("'minimum_distance' is deprecated, use properties.minimum_distance",
- DeprecationWarning, 2)
return self.properties.minimum_distance
@minimum_distance.setter
def minimum_distance(self, minimum_distance):
- warnings.warn("'minimum_distance' is deprecated, use properties.minimum_distance",
- DeprecationWarning, 2)
self.properties.minimum_distance = minimum_distance
@property
def minimum_padding(self):
- warnings.warn("'minimum_padding' is deprecated, use properties.minimum_padding",
- DeprecationWarning, 2)
return self.properties.minimum_padding
@minimum_padding.setter
def minimum_padding(self, minimum_padding):
- warnings.warn("'minimum_padding' is deprecated, use properties.minimum_padding",
- DeprecationWarning, 2)
self.properties.minimum_padding = minimum_padding
@property
def minimum_path_length(self):
- warnings.warn("'minimum_path_length' is deprecated, use properties.minimum_path_length",
- DeprecationWarning, 2)
return self.properties.minimum_path_length
@minimum_path_length.setter
def minimum_path_length(self, minimum_path_length):
- warnings.warn("'minimum_path_length' is deprecated, use properties.minimum_path_length",
- DeprecationWarning, 2)
self.properties.minimum_path_length = minimum_path_length
@property
def maximum_angle_char_delta(self):
- warnings.warn("'maximum_angle_char_delta' is deprecated, use properties.maximum_angle_char_delta",
- DeprecationWarning, 2)
return self.properties.maximum_angle_char_delta
@maximum_angle_char_delta.setter
def maximum_angle_char_delta(self, maximum_angle_char_delta):
- warnings.warn("'maximum_angle_char_delta' is deprecated, use properties.maximum_angle_char_delta",
- DeprecationWarning, 2)
self.properties.maximum_angle_char_delta = maximum_angle_char_delta
@property
def force_odd_labels(self):
- warnings.warn("'force_odd_labels' is deprecated, use properties.force_odd_labels",
- DeprecationWarning, 2)
return self.properties.force_odd_labels
@force_odd_labels.setter
def force_odd_labels(self, force_odd_labels):
- warnings.warn("'force_odd_labels' is deprecated, use properties.force_odd_labels",
- DeprecationWarning, 2)
self.properties.force_odd_labels = force_odd_labels
@property
def allow_overlap(self):
- warnings.warn("'allow_overlap' is deprecated, use properties.allow_overlap",
- DeprecationWarning, 2)
return self.properties.allow_overlap
@allow_overlap.setter
def allow_overlap(self, allow_overlap):
- warnings.warn("'allow_overlap' is deprecated, use properties.allow_overlap",
- DeprecationWarning, 2)
self.properties.allow_overlap = allow_overlap
@property
def text_ratio(self):
- warnings.warn("'text_ratio' is deprecated, use properties.text_ratio",
- DeprecationWarning, 2)
return self.properties.text_ratio
@text_ratio.setter
def text_ratio(self, text_ratio):
- warnings.warn("'text_ratio' is deprecated, use properties.text_ratio",
- DeprecationWarning, 2)
self.properties.text_ratio = text_ratio
@property
def wrap_width(self):
- warnings.warn("'wrap_width' is deprecated, use properties.wrap_width",
- DeprecationWarning, 2)
return self.properties.wrap_width
@wrap_width.setter
def wrap_width(self, wrap_width):
- warnings.warn("'wrap_width' is deprecated, use properties.wrap_width",
- DeprecationWarning, 2)
self.properties.wrap_width = wrap_width
View
3  include/mapnik/agg_renderer.hpp
@@ -106,6 +106,9 @@ class MAPNIK_DECL agg_renderer : public feature_style_processor<agg_renderer<T>
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*/,
View
39 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 <mapnik/config.hpp>
+#include <mapnik/symbolizer.hpp>
+
+namespace mapnik
+{
+
+struct MAPNIK_DECL debug_symbolizer :
+ public symbolizer_base
+{
+ debug_symbolizer() : symbolizer_base() {}
+};
+}
+
+#endif // DEBUG_SYMBOLIZER_HPP
View
10 include/mapnik/rule.hpp
@@ -34,6 +34,7 @@
#include <mapnik/shield_symbolizer.hpp>
#include <mapnik/text_symbolizer.hpp>
#include <mapnik/markers_symbolizer.hpp>
+#include <mapnik/debug_symbolizer.hpp>
#include <mapnik/feature.hpp>
#include <mapnik/expression.hpp>
#include <mapnik/expression_string.hpp>
@@ -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<point_symbolizer,
line_symbolizer,
line_pattern_symbolizer,
@@ -117,7 +124,8 @@ typedef boost::variant<point_symbolizer,
shield_symbolizer,
text_symbolizer,
building_symbolizer,
- markers_symbolizer> symbolizer;
+ markers_symbolizer,
+ debug_symbolizer> symbolizer;
class rule
{
View
64 src/agg/process_debug_symbolizer.cpp
@@ -0,0 +1,64 @@
+/*****************************************************************************
+ *
+ * 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 <mapnik/agg_renderer.hpp>
+#include <mapnik/graphics.hpp>
+
+namespace mapnik {
+
+void draw_rect(image_32 &pixmap, box2d<double> 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<x1; x++)
+ {
+ pixmap.setPixel(x, y0, color1);
+ pixmap.setPixel(x, y1, color1);
+ }
+ for (double y=y0; y<y1; y++)
+ {
+ pixmap.setPixel(x0, y, color1);
+ pixmap.setPixel(x1, y, color1);
+ }
+}
+
+template <typename T>
+void agg_renderer<T>::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<image_32>::process(debug_symbolizer const&,
+ mapnik::feature_impl &,
+ proj_transform const&);
+}
+
View
1  src/build.py
@@ -258,6 +258,7 @@ def ldconfig(*args,**kwargs):
agg/process_raster_symbolizer.cpp
agg/process_shield_symbolizer.cpp
agg/process_markers_symbolizer.cpp
+ agg/process_debug_symbolizer.cpp
"""
)
View
13 src/load_map.cpp
@@ -106,6 +106,7 @@ class map_parser : boost::noncopyable {
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);
@@ -1489,6 +1494,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)
{
Please sign in to comment.
Something went wrong with that request. Please try again.