+ impl process for point_symbolizer

include/mapnik/metawriter_renderer.hpp

@@ -60,11 +60,9 @@ public:
     void start_style_processing(feature_type_style const& st);
     void end_style_processing(feature_type_style const& st);
        
-    /*
     void process(point_symbolizer const& sym,
                  mapnik::feature_ptr const& feature,
                  proj_transform const& prj_trans);    
-    */
     void process(line_symbolizer const& sym,
                  mapnik::feature_ptr const& feature,
                  proj_transform const& prj_trans);

src/build.py

@@ -279,6 +279,7 @@ source += Split(
     """
     metawriter/metawriter_renderer.cpp
     metawriter/process_line_symbolizer.cpp
+    metawriter/process_point_symbolizer.cpp
     """)
 
 if env['SVG_RENDERER']: # svg backend

src/metawriter/process_point_symbolizer.cpp

@@ -0,0 +1,95 @@
+/*****************************************************************************
+ *
+ * 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/image_util.hpp>
+#include <mapnik/marker.hpp>
+#include <mapnik/marker_cache.hpp>
+#include <mapnik/point_symbolizer.hpp>
+#include <mapnik/metawriter_renderer.hpp>
+#include <mapnik/metawriter_factory.hpp>
+
+// stl
+#include <string>
+
+// boost
+#include <boost/make_shared.hpp>
+
+namespace mapnik {
+
+void metawriter_renderer::process(point_symbolizer const& sym,
+                              mapnik::feature_ptr const& feature,
+                              proj_transform const& prj_trans)
+{
+    std::string filename = path_processor_type::evaluate(*sym.get_filename(), *feature);
+
+    boost::optional<mapnik::marker_ptr> marker;
+    if ( !filename.empty() )
+    {
+        marker = marker_cache::instance()->find(filename, true);
+    }
+    else
+    {
+        marker.reset(boost::make_shared<mapnik::marker>());
+    }
+
+    if (marker)
+    {
+        box2d<double> const& bbox = (*marker)->bounding_box();
+        coord2d const center = bbox.center();
+
+        agg::trans_affine tr;
+        evaluate_transform(tr, *feature, sym.get_image_transform());
+
+        agg::trans_affine_translation const recenter(-center.x, -center.y);
+        agg::trans_affine const recenter_tr = recenter * tr;
+        box2d<double> label_ext = bbox * recenter_tr;
+
+        for (unsigned i=0; i<feature->num_geometries(); ++i)
+        {
+            geometry_type const& geom = feature->get_geometry(i);
+            double x;
+            double y;
+            double z=0;
+            if (sym.get_point_placement() == CENTROID_POINT_PLACEMENT)
+                geom.label_position(&x, &y);
+            else
+                geom.label_interior_position(&x, &y);
+
+            prj_trans.backward(x,y,z);
+            t_.forward(&x,&y);
+            label_ext.re_center(x,y);
+
+            if (sym.get_allow_overlap() ||
+                detector_->has_placement(label_ext))
+            {                
+                if (!sym.get_ignore_placement())
+                    detector_->insert(label_ext);
+                metawriter_with_properties writer = sym.get_metawriter();
+                add_box(writer.first, label_ext,*feature, t_, writer.second);
+            }
+        }
+    }
+}
+}
+
+