Permalink
Browse files

Clean up directory structure.

  • Loading branch information...
1 parent fa62234 commit bbedec3437f7ce7e0b9559fdbddbb51e67f87e3f @herm herm committed Sep 15, 2012
Showing with 90 additions and 1,320 deletions.
  1. +7 −7 bindings/python/mapnik_text_placement.cpp
  2. +1 −1 include/build.py
  3. +3 −2 include/mapnik/font_engine_freetype.hpp
  4. +0 −170 include/mapnik/placement_finder.hpp
  5. 0 include/mapnik/{ → text}/formatting/base.hpp
  6. +1 −1 include/mapnik/{ → text}/formatting/expression_format.hpp
  7. +2 −2 include/mapnik/{ → text}/formatting/format.hpp
  8. +1 −1 include/mapnik/{ → text}/formatting/list.hpp
  9. +1 −1 include/mapnik/{ → text}/formatting/registry.hpp
  10. +1 −1 include/mapnik/{ → text}/formatting/text.hpp
  11. +1 −1 include/mapnik/text/placement_finder.hpp
  12. +2 −2 include/mapnik/{text_placements → text/placements}/base.hpp
  13. +1 −1 include/mapnik/{text_placements → text/placements}/dummy.hpp
  14. +1 −1 include/mapnik/{text_placements → text/placements}/list.hpp
  15. +1 −1 include/mapnik/{text_placements → text/placements}/registry.hpp
  16. +1 −1 include/mapnik/{text_placements → text/placements}/simple.hpp
  17. 0 include/mapnik/{ → text}/symbolizer_helpers.hpp
  18. +1 −1 include/mapnik/{ → text}/text_properties.hpp
  19. +2 −2 include/mapnik/text_symbolizer.hpp
  20. +1 −1 src/agg/process_shield_symbolizer.cpp
  21. +1 −1 src/agg/process_text_symbolizer.cpp
  22. +17 −17 src/build.py
  23. +1 −1 src/cairo_renderer.cpp
  24. +1 −1 src/font_engine_freetype.cpp
  25. +1 −1 src/grid/process_shield_symbolizer.cpp
  26. +1 −1 src/grid/process_text_symbolizer.cpp
  27. +6 −5 src/load_map.cpp
  28. +1 −1 src/metawriter.cpp
  29. +1 −1 src/metawriter_inmem.cpp
  30. +0 −1,062 src/placement_finder.cpp
  31. +3 −3 src/save_map.cpp
  32. +3 −3 src/{ → text}/formatting/base.cpp
  33. +2 −2 src/{ → text}/formatting/expression.cpp
  34. +1 −1 src/{ → text}/formatting/format.cpp
  35. +1 −1 src/{ → text}/formatting/list.cpp
  36. +4 −4 src/{ → text}/formatting/registry.cpp
  37. +2 −2 src/{ → text}/formatting/text.cpp
  38. +1 −1 src/text/layout.cpp
  39. +1 −1 src/text/placement_finder.cpp
  40. +1 −1 src/{text_placements → text/placements}/base.cpp
  41. +1 −1 src/{text_placements → text/placements}/dummy.cpp
  42. +1 −1 src/{text_placements → text/placements}/list.cpp
  43. +4 −4 src/{text_placements → text/placements}/registry.cpp
  44. +1 −1 src/{text_placements → text/placements}/simple.cpp
  45. +1 −1 src/text/renderer.cpp
  46. +1 −1 src/{ → text}/symbolizer_helpers.cpp
  47. +2 −2 src/{ → text}/text_properties.cpp
  48. +1 −1 src/text_symbolizer.cpp
  49. +1 −1 src/xml_tree.cpp
@@ -22,13 +22,13 @@
#include <boost/python.hpp>
#include <boost/python/stl_iterator.hpp>
-#include <mapnik/text_properties.hpp>
-#include <mapnik/text_placements/simple.hpp>
-#include <mapnik/text_placements/list.hpp>
-#include <mapnik/formatting/text.hpp>
-#include <mapnik/formatting/list.hpp>
-#include <mapnik/formatting/format.hpp>
-#include <mapnik/formatting/expression_format.hpp>
+#include <mapnik/text/text_properties.hpp>
+#include <mapnik/text/placements/simple.hpp>
+#include <mapnik/text/placements/list.hpp>
+#include <mapnik/text/formatting/text.hpp>
+#include <mapnik/text/formatting/list.hpp>
+#include <mapnik/text/formatting/format.hpp>
+#include <mapnik/text/formatting/expression_format.hpp>
#include <mapnik/text/layout.hpp>
#include <mapnik/expression_string.hpp>
#include <mapnik/text_symbolizer.hpp>
View
@@ -4,7 +4,7 @@
Import('env')
base = './mapnik/'
-subdirs = ['','svg','wkt','grid','json','util','text_placements','formatting']
+subdirs = ['','svg','wkt','grid','json','util','text','text/placements','text/formatting']
#if env['SVG_RENDERER']:
# subdirs.append('svg/output')
@@ -37,9 +37,10 @@ extern "C"
#include FT_STROKER_H
}
-//// boost
+// boost
#include <boost/shared_ptr.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
+#include <boost/optional.hpp>
#ifdef MAPNIK_THREADSAFE
#include <boost/thread/mutex.hpp>
#endif
@@ -111,7 +112,7 @@ class MAPNIK_DECL face_manager : private boost::noncopyable
face_ptr get_face(std::string const& name);
face_set_ptr get_face_set(std::string const& name);
face_set_ptr get_face_set(font_set const& fset);
- face_set_ptr get_face_set(std::string const& name, font_set const& fset);
+ face_set_ptr get_face_set(std::string const& name, boost::optional<font_set> fset);
stroker_ptr get_stroker() { return stroker_; }
@@ -1,170 +0,0 @@
-/*****************************************************************************
- *
- * 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_PLACEMENT_FINDER_HPP
-#define MAPNIK_PLACEMENT_FINDER_HPP
-
-// mapnik
-#include <mapnik/geometry.hpp>
-#include <mapnik/text_properties.hpp>
-//#include <mapnik/text_placements/base.hpp>
-#include <mapnik/symbolizer_helpers.hpp>
-#include <mapnik/label_collision_detector.hpp>
-#include <mapnik/ctrans.hpp>
-
-
-// agg
-#include "agg_conv_clip_polyline.h"
-
-
-// stl
-#include <queue>
-
-namespace mapnik
-{
-
-class text_placement_info;
-class string_info;
-class text_path;
-
-typedef agg::conv_clip_polyline<geometry_type> clipped_geometry_type;
-typedef coord_transform<CoordTransform,clipped_geometry_type> ClippedPathType;
-typedef coord_transform<CoordTransform,geometry_type> PathType;
-
-typedef label_collision_detector4 DetectorType;
-
-
-template <typename DetectorT>
-class placement_finder : boost::noncopyable
-{
-public:
- placement_finder(Feature const& feature,
- text_placement_info const& placement_info,
- string_info const& info,
- DetectorT & detector,
- box2d<double> const& extent);
-
- /** Try place a single label at the given point. */
- void find_point_placement(double pos_x, double pos_y, double angle=0.0);
-
- /** Iterate over the given path, placing point labels with respect to label_spacing. */
- template <typename T>
- void find_point_placements(T & path);
-
- /** Iterate over the given path, placing line-following labels with respect to label_spacing. */
- template <typename T>
- void find_line_placements(T & path);
-
- /** Add placements to detector. */
- void update_detector();
-
- /** Remove old placements. */
- void clear_placements();
-
- inline placements_type const& get_results() { return placements_; }
-
- std::vector<box2d<double> > & additional_boxes() { return additional_boxes_;}
- std::vector<box2d<double> > const& additional_boxes() const { return additional_boxes_;}
-
- void set_collect_extents(bool collect) { collect_extents_ = collect; }
- bool get_collect_extents() const { return collect_extents_; }
-
- box2d<double> const& get_extents() const { return extents_; }
-
-private:
- ///Helpers for find_line_placement
-
- ///Returns a possible placement on the given line, does not test for collisions
- //index: index of the node the current line ends on
- //distance: distance along the given index that the placement should start at, this includes the offset,
- // as such it may be > or < the length of the current line, so this must be checked for
- //orientation: if set to != 0 the placement will be attempted with the given orientation
- // otherwise it will autodetect the orientation.
- // If >= 50% of the characters end up upside down, it will be retried the other way.
- // RETURN: 1/-1 depending which way up the string ends up being.
- std::auto_ptr<text_path> get_placement_offset(std::vector<vertex2d> const& path_positions,
- std::vector<double> const& path_distances,
- int & orientation, unsigned index, double distance);
-
- ///Tests whether the given text_path be placed without a collision
- // Returns true if it can
- // NOTE: This edits p.envelopes so it can be used afterwards (you must clear it otherwise)
- bool test_placement(std::auto_ptr<text_path> const& current_placement, int orientation);
-
- ///Does a line-circle intersect calculation
- // NOTE: Follow the strict pre conditions
- // Pre Conditions: x1,y1 is within radius distance of cx,cy. x2,y2 is outside radius distance of cx,cy
- // This means there is exactly one intersect point
- // Result is returned in ix, iy
- void find_line_circle_intersection(
- double cx, double cy, double radius,
- double x1, double y1, double x2, double y2,
- double & ix, double & iy);
-
- void find_line_breaks();
- void init_string_size();
- void init_alignment();
- void adjust_position(text_path *current_placement);
- void add_line(double width, double height, bool first_line);
-
- ///General Internals
- DetectorT & detector_;
- box2d<double> const& dimensions_;
- string_info const& info_;
- text_symbolizer_properties const& p;
- text_placement_info const& pi;
- /** Length of the longest line after linebreaks.
- * Before find_line_breaks() this is the total length of the string.
- */
- double string_width_;
- /** Height of the string after linebreaks.
- * Before find_line_breaks() this is the total length of the string.
- */
- double string_height_;
- /** Height of the tallest font in the first line not including line spacing.
- * Used to determine the correct offset for the first line.
- */
- double first_line_space_;
- vertical_alignment_e valign_;
- horizontal_alignment_e halign_;
- justify_alignment_e jalign_;
- std::vector<unsigned> line_breaks_;
- std::vector<std::pair<double, double> > line_sizes_;
- std::queue< box2d<double> > envelopes_;
- /** Used to return all placements found. */
- placements_type placements_;
- /** Bounding box of all texts placed. */
- box2d<double> extents_;
- /** Collect a bounding box of all texts placed. */
- bool collect_extents_;
-
- /** Additional boxes to take into account when finding placement.
- * Used for finding line placements where multiple placements are returned.
- * Boxes are relative to starting point of current placement.
- * Only used for point placements!
- */
- std::vector<box2d<double> > additional_boxes_;
-};
-}
-
-
-#endif // MAPNIK_PLACEMENT_FINDER_HPP
@@ -23,7 +23,7 @@
#ifndef FORMATTING_EXPRESSION_HPP
#define FORMATTING_EXPRESSION_HPP
-#include <mapnik/formatting/base.hpp>
+#include <mapnik/text/formatting/base.hpp>
#include <mapnik/expression.hpp>
namespace mapnik {
@@ -23,8 +23,8 @@
#ifndef FORMATTING_FORMAT_HPP
#define FORMATTING_FORMAT_HPP
-#include <mapnik/formatting/base.hpp>
-#include <mapnik/text_properties.hpp>
+#include <mapnik/text/formatting/base.hpp>
+#include <mapnik/text/text_properties.hpp>
namespace mapnik {
namespace formatting {
@@ -22,7 +22,7 @@
#ifndef FORMATTING_LIST_HPP
#define FORMATTING_LIST_HPP
-#include <mapnik/formatting/base.hpp>
+#include <mapnik/text/formatting/base.hpp>
namespace mapnik {
namespace formatting {
@@ -24,7 +24,7 @@
// mapnik
#include <mapnik/utils.hpp>
-#include <mapnik/formatting/base.hpp>
+#include <mapnik/text/formatting/base.hpp>
// boost
#include <boost/utility.hpp>
@@ -22,7 +22,7 @@
#ifndef FORMATTING_TEXT_HPP
#define FORMATTING_TEXT_HPP
-#include <mapnik/formatting/base.hpp>
+#include <mapnik/text/formatting/base.hpp>
namespace mapnik {
namespace formatting {
@@ -26,7 +26,7 @@
#include <mapnik/box2d.hpp>
#include <mapnik/pixel_position.hpp>
#include <mapnik/text/layout.hpp>
-#include <mapnik/text_placements/base.hpp>
+#include <mapnik/text/placements/base.hpp>
#include <mapnik/text/placements_list.hpp>
#include <mapnik/text/rotation.hpp>
@@ -25,8 +25,8 @@
// mapnik
#include <mapnik/config.hpp>
-#include <mapnik/text_properties.hpp>
-#include <mapnik/formatting/base.hpp>
+#include <mapnik/text/text_properties.hpp>
+#include <mapnik/text/formatting/base.hpp>
namespace mapnik
{
@@ -24,7 +24,7 @@
// mapnik
#include <mapnik/config.hpp>
-#include <mapnik/text_placements/base.hpp>
+#include <mapnik/text/placements/base.hpp>
// boost
#include <boost/concept_check.hpp>
@@ -21,7 +21,7 @@
*****************************************************************************/
#ifndef TEXT_PLACEMENTS_LIST_HPP
#define TEXT_PLACEMENTS_LIST_HPP
-#include <mapnik/text_placements/base.hpp>
+#include <mapnik/text/placements/base.hpp>
namespace mapnik {
@@ -24,7 +24,7 @@
// mapnik
#include <mapnik/utils.hpp>
-#include <mapnik/text_placements/base.hpp>
+#include <mapnik/text/placements/base.hpp>
// boost
#include <boost/utility.hpp>
@@ -24,7 +24,7 @@
#define MAPNIK_TEXT_PLACEMENTS_SIMPLE_HPP
// mapnik
-#include <mapnik/text_placements/base.hpp>
+#include <mapnik/text/placements/base.hpp>
namespace mapnik {
@@ -28,7 +28,7 @@
#include <mapnik/font_set.hpp>
#include <mapnik/enumeration.hpp>
#include <mapnik/expression.hpp>
-#include <mapnik/formatting/base.hpp>
+#include <mapnik/text/formatting/base.hpp>
#include <mapnik/pixel_position.hpp>
// stl
@@ -27,8 +27,8 @@
#include <mapnik/color.hpp>
#include <mapnik/font_set.hpp>
#include <mapnik/symbolizer.hpp>
-#include <mapnik/text_placements/base.hpp>
-#include <mapnik/text_placements/dummy.hpp>
+#include <mapnik/text/placements/base.hpp>
+#include <mapnik/text/placements/dummy.hpp>
// boost
#include <boost/shared_ptr.hpp>
@@ -22,7 +22,7 @@
// mapnik
#include <mapnik/agg_renderer.hpp>
-#include <mapnik/symbolizer_helpers.hpp>
+#include <mapnik/text/symbolizer_helpers.hpp>
#include <mapnik/text/renderer.hpp>
namespace mapnik {
@@ -22,7 +22,7 @@
// mapnik
#include <mapnik/agg_renderer.hpp>
-#include <mapnik/symbolizer_helpers.hpp>
+#include <mapnik/text/symbolizer_helpers.hpp>
#include <mapnik/text/renderer.hpp>
#include <boost/foreach.hpp>
Oops, something went wrong.

0 comments on commit bbedec3

Please sign in to comment.