Changeset 490 for trunk/include/mapnik/placement_finder.hpp

Timestamp:

07/02/07 09:39:08 (3 years ago)

Author:

vspader

Message:

Added minimum_distance property to text symbolizers. This prevents the same label from appearing within N pixels (across features).
Shield symbolizer is now a subclass of text symbolizer.
Some small improvements to text rendering.
Fixed up placement finder for horizontal placement.
Cleaned up placement finder.

Files:

• trunk/include/mapnik/placement_finder.hpp (modified) (5 diffs)

trunk/include/mapnik/placement_finder.hpp

@@ -50 +50 @@
          typedef  coord_transform2<CoordTransform,geometry_type> path_type;
          
-         //For shields
-         placement(string_info *info_, 
-                   CoordTransform *ctrans_, 
-                   const proj_transform *proj_trans_, 
-                   geometry_ptr geom_, 
-                   std::pair<double, double> dimensions_);
-    
-         //For text
+         template <typename SymbolizerT>
          placement(string_info *info_, 
                    CoordTransform *ctrans_, 
                    const proj_transform *proj_trans_, 
                    geometry_ptr geom_,
-                   position const& displacement,
-                   label_placement_e placement_);
+                   SymbolizerT sym);
          
          ~placement();
         
+         //helpers
+         std::pair<double, double> get_position_at_distance(double target_distance);
+         double get_total_distance();
+         void clear_envelopes();
+    
          unsigned path_size() const;
+
          string_info *info;
     
          CoordTransform *ctrans;
          const proj_transform *proj_trans;
+         geometry_ptr geom;
+         path_type shape_path;
 
-         geometry_ptr geom;
+         double total_distance_; //cache for distance
+    
          position displacement_;
          label_placement_e label_placement;
-         std::pair<double, double> dimensions;
 
-         bool has_dimensions;
-    
-         path_type shape_path;
          std::queue< Envelope<double> > envelopes;
     
@@ -88 +85 @@
          // caching output
          placement_element current_placement;
-    
-         //helpers
-         std::pair<double, double> get_position_at_distance(double target_distance);
-         double get_total_distance();
-         void clear_envelopes();
-    
-         double total_distance_; //cache for distance
     
          int wrap_width;
@@ -104 +94 @@
 
          double max_char_angle_delta;
+         double minimum_distance;
     
          bool avoid_edges;
+
+         bool has_dimensions;
+         std::pair<double, double> dimensions;
    };
 
@@ -116 +110 @@
          //e is the dimensions of the map, buffer is the buffer used for collission detection.
          placement_finder(DetectorT & detector,Envelope<double> const& e);
-         bool find_placements(placement *p);
+         void find_placements(placement *p);
          void clear();
          
@@ -124 +118 @@
          bool build_path_follow(placement *p, double target_distance);
          bool build_path_horizontal(placement *p, double target_distance);
+         std::vector<double> get_ideal_placements(placement *p);
          void update_detector(placement *p);
+         DetectorT & detector_;
          Envelope<double> dimensions_;
-         DetectorT & detector_;
    };  
 }