Remove find_placements, build_path_follow, build_path_horizontal.

Add new find_point_placements to cover the gap left.
Change shield symbolizer to use find_point_placements.
Results are the same as before, but with much less duplicate code.

include/mapnik/placement_finder.hpp

@@ -87,26 +87,21 @@ namespace mapnik
       public:
          placement_finder(DetectorT & detector);
 
-         template <typename T>
-         void find_placements(placement & p, T & path);
-
+         //Try place a single label at the given point
          void find_point_placement(placement & p, double, double);
 
+         //Iterate over the given path, placing point labels with respect to label_spacing
          template <typename T>
-         void find_line_placement(placement & p, T & path);
+         void find_point_placements(placement & p, T & path);
 
-         void clear();
-
-      private:
+         //Iterate over the given path, placing line-following labels with respect to label_spacing
          template <typename T>
-         bool build_path_follow(placement & p, double target_distance, T & path);
+         void find_line_placements(placement & p, T & path);
 
-         template <typename T>
-         bool build_path_horizontal(placement & p, double target_distance, T & path);
-
-         void get_ideal_placements(placement & p, double distance, std::vector<double>&);
+         void clear();
 
-         //Helpers for find_line_placement
+      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
@@ -133,6 +128,7 @@ namespace mapnik
             const double &x1, const double &y1, const double &x2, const double &y2, 
             double &ix, double &iy);
 
+         ///General Internals
 
          void update_detector(placement & p);
 

src/agg_renderer.cpp

@@ -464,7 +464,7 @@ namespace mapnik
                   path_type path(t_,geom,prj_trans);
                   placement text_placement(info, sym);
                   text_placement.avoid_edges = sym.get_avoid_edges();
-                  finder.find_placements<path_type>(text_placement,path);
+                  finder.find_point_placements<path_type>(text_placement,path);
 
                   for (unsigned int ii = 0; ii < text_placement.placements.size(); ++ ii)
                   { 
@@ -683,7 +683,7 @@ namespace mapnik
                   }
                   else //LINE_PLACEMENT
                   {
-                     finder.find_line_placement<path_type>(text_placement,path);
+                     finder.find_line_placements<path_type>(text_placement,path);
                   }
 
                   for (unsigned int ii = 0; ii < text_placement.placements.size(); ++ii)