Changeset 693

Timestamp:

04/12/08 11:22:27 (9 months ago)

Author:

tom

Message:

Revert previous fix for #89 and add a new improved fix that enhances the
value class to have a proper null type and do comparisions SQL style so
that null is neither equal nor not equal to other things.

Location:

trunk

Files:

• bindings/python/mapnik_feature.cpp (modified) (1 diff)
• include/mapnik/feature.hpp (modified) (1 diff)
• include/mapnik/value.hpp (modified) (15 diffs)
• src/agg_renderer.cpp (modified) (2 diffs)
• src/cairo_renderer.cpp (modified) (2 diffs)

trunk/bindings/python/mapnik_feature.cpp

@@ -47 +47 @@
             {
                return ::PyUnicode_FromWideChar((wchar_t*)s.getBuffer(),implicit_cast<ssize_t>(s.length()));
+            }
+            
+            PyObject * operator() (mapnik::value_null const& s) const
+            {
+               return NULL;
             }
       };

trunk/include/mapnik/feature.hpp

@@ -121 +121 @@
          }
           
-         bool exists(const std::string &k) const
-         {
-            return props_.find(k) != props_.end();
-         }
-
          std::string to_string() const
          {

trunk/include/mapnik/value.hpp

@@ -40 +40 @@
 namespace mapnik  {
    
-   typedef boost::variant<bool,int,double,UnicodeString> value_base;
+   struct value_null
+   {
+   };
+   
+   typedef boost::variant<value_null,bool,int,double,UnicodeString> value_base;
    
    namespace impl {
@@ -47 +51 @@
       {
             template <typename T, typename U>
-            bool operator() (const T &, const U & ) const
+            bool operator() (const T &, const U &) const
             {
                return false;
@@ -73 +77 @@
                return  lhs == rhs;
             }
+
+            bool operator() (value_null, value_null) const
+            {
+               return false;
+            }
       };
       
+      struct not_equals
+         : public boost::static_visitor<bool>
+      {
+            template <typename T, typename U>
+            bool operator() (const T &, const U &) const
+            {
+               return true;
+            }
+        
+            template <typename T>
+            bool operator() (T lhs, T rhs) const
+            {
+               return lhs != rhs;
+            }
+            
+            bool operator() (int lhs, double rhs) const
+            {
+               return  lhs != rhs;
+            }
+        
+            bool operator() (double lhs, int rhs) const
+            {
+               return  lhs != rhs;
+            }
+        
+            bool operator() (UnicodeString const& lhs, 
+                             UnicodeString const& rhs) const
+            {
+               return  lhs != rhs;
+            }
+
+            bool operator() (value_null, value_null) const
+            {
+               return false;
+            }
+
+            template <typename T>
+            bool operator() (value_null, const T &) const
+            {
+               return false;
+            }
+
+            template <typename T>
+            bool operator() (const T &, value_null) const
+            {
+               return false;
+            }
+      };
+
       struct greater_than
          : public boost::static_visitor<bool>
       {
             template <typename T, typename U>
-            bool operator()( const T &, const U & ) const
-            {
-               return false;
-            }
-        
-            template <typename T>
-            bool operator()( T lhs, T rhs ) const
+            bool operator()(const T &, const U &) const
+            {
+               return false;
+            }
+        
+            template <typename T>
+            bool operator()(T lhs, T rhs) const
             {
                return lhs > rhs;
@@ -103 +161 @@
             {
                return  lhs > rhs;
+            }
+
+            bool operator() (value_null, value_null) const
+            {
+               return false;
             }
       };
@@ -110 +173 @@
       { 
             template <typename T, typename U>
-            bool operator()( const T &, const U & ) const
+            bool operator()(const T &, const U &) const
             {
                return false;
@@ -131 +194 @@
             }
         
-            bool operator() (UnicodeString const& lhs, UnicodeString const& rhs ) const
+            bool operator() (UnicodeString const& lhs, UnicodeString const& rhs) const
             {
                return lhs >= rhs;
+            }
+
+            bool operator() (value_null, value_null) const
+            {
+               return false;
             }
       };
@@ -141 +209 @@
       { 
             template <typename T, typename U>
-            bool operator()( const T &, const U & ) const
-            {
-               return false;
-            }
-        
-            template <typename T>
-            bool operator()( T  lhs,T  rhs) const
+            bool operator()(const T &, const U &) const
+            {
+               return false;
+            }
+        
+            template <typename T>
+            bool operator()(T lhs, T rhs) const
             {
                return lhs < rhs;
@@ -162 +230 @@
             }
         
-            bool operator()( UnicodeString const& lhs, 
-                             UnicodeString const& rhs ) const
+            bool operator()(UnicodeString const& lhs, 
+                            UnicodeString const& rhs ) const
             {
                return lhs < rhs;
+            }
+
+            bool operator() (value_null, value_null) const
+            {
+               return false;
             }
       };
@@ -173 +246 @@
       { 
             template <typename T, typename U>
-            bool operator()( const T &, const U & ) const
-            {
-               return false;
-            }
-        
-            template <typename T>
-            bool operator()(T lhs, T rhs ) const
+            bool operator()(const T &, const U &) const
+            {
+               return false;
+            }
+        
+            template <typename T>
+            bool operator()(T lhs, T rhs) const
             {
                return lhs <= rhs;
@@ -195 +268 @@
         
             template <typename T>
-            bool operator()( UnicodeString const& lhs, 
-                             UnicodeString const& rhs ) const
+            bool operator()(UnicodeString const& lhs, 
+                            UnicodeString const& rhs ) const
             {
                return lhs <= rhs;
+            }
+
+            bool operator() (value_null, value_null) const
+            {
+               return false;
             }
       };
@@ -387 +465 @@
                return ss.str();
             }
-      };
+            
+            std::string operator() (value_null const& val) const
+            {
+               return "";
+            }
+       };
 
       struct to_unicode : public boost::static_visitor<UnicodeString>
@@ -411 +494 @@
                out << std::setprecision(16) << val;
                return UnicodeString(out.str().c_str());
+            }
+            
+            UnicodeString operator() (value_null const& val) const
+            {
+               return UnicodeString("");
             }
       };
@@ -456 +544 @@
                return ss.str();
             }
+
+            std::string operator() (value_null const& val) const
+            {
+               return "null";
+            }
       };
    }
-    
+
    class value
    {
@@ -469 +562 @@
       public:
          value ()
-            : base_(0) {}
+            : base_(value_null()) {}
         
          template <typename T> value(T _val_)
@@ -481 +574 @@
          bool operator!=(value const& other) const
          {
-            return !(boost::apply_visitor(impl::equals(),base_,other.base_));
+            return boost::apply_visitor(impl::not_equals(),base_,other.base_);
          }
         

trunk/src/agg_renderer.cpp

@@ -457 +457 @@
    {
       typedef  coord_transform2<CoordTransform,geometry2d> path_type;
-      if (feature.exists(sym.get_name()))
-      {
-         UnicodeString text = feature[sym.get_name()].to_unicode();
-         boost::shared_ptr<ImageData32> const& data = sym.get_image();
-         if (text.length() > 0 && data)
-         {
-            face_ptr face = font_manager_.get_face(sym.get_face_name());
-            if (face)
+      UnicodeString text = feature[sym.get_name()].to_unicode();
+      boost::shared_ptr<ImageData32> const& data = sym.get_image();
+      if (text.length() > 0 && data)
+      {
+         face_ptr face = font_manager_.get_face(sym.get_face_name());
+         if (face)
+         {
+            text_renderer<mapnik::Image32> ren(pixmap_,face);
+            ren.set_pixel_size(sym.get_text_size());
+            ren.set_fill(sym.get_fill());
+            
+            string_info info(text);
+            face->get_string_info(info);
+            
+            placement_finder<label_collision_detector4> finder(detector_);
+            
+            unsigned num_geom = feature.num_geometries();
+            for (unsigned i=0;i<num_geom;++i)
             {
-               text_renderer<mapnik::Image32> ren(pixmap_,face);
-               ren.set_pixel_size(sym.get_text_size());
-               ren.set_fill(sym.get_fill());
-            
-               string_info info(text);
-               face->get_string_info(info);
-            
-               placement_finder<label_collision_detector4> finder(detector_);
-            
-               unsigned num_geom = feature.num_geometries();
-               for (unsigned i=0;i<num_geom;++i)
-               {
-                  geometry2d const& geom = feature.get_geometry(i);
-                  if (geom.num_points() > 0) // don't bother with empty geometries
-                  {
-                     path_type path(t_,geom,prj_trans);
-                     placement text_placement(info, sym);
-                     text_placement.avoid_edges = sym.get_avoid_edges();
-                     finder.find_point_placements<path_type>(text_placement,path);
+               geometry2d const& geom = feature.get_geometry(i);
+               if (geom.num_points() > 0) // don't bother with empty geometries 
+               {    
+                  path_type path(t_,geom,prj_trans);
+                  placement text_placement(info, sym);
+                  text_placement.avoid_edges = sym.get_avoid_edges();
+                  finder.find_point_placements<path_type>(text_placement,path);
                   
-                     for (unsigned int ii = 0; ii < text_placement.placements.size(); ++ ii)
-                     {
-                        int w = data->width();
-                        int h = data->height();
+                  for (unsigned int ii = 0; ii < text_placement.placements.size(); ++ ii)
+                  { 
+                     int w = data->width();
+                     int h = data->height();
                      
-                        double x = text_placement.placements[ii].starting_x;
-                        double y = text_placement.placements[ii].starting_y;
+                     double x = text_placement.placements[ii].starting_x;
+                     double y = text_placement.placements[ii].starting_y;
                      
-                        int px=int(x - (w/2));
-                        int py=int(y - (h/2));
+                     int px=int(x - (w/2));
+                     int py=int(y - (h/2));
                      
-                        pixmap_.set_rectangle_alpha(px,py,*data);
+                     pixmap_.set_rectangle_alpha(px,py,*data);
                      
-                        Envelope<double> dim = ren.prepare_glyphs(&text_placement.placements[ii]);
+                     Envelope<double> dim = ren.prepare_glyphs(&text_placement.placements[ii]);
                         
-                        ren.render(x,y);
-                     }
+                     ren.render(x,y);
                   }
                }
@@ -669 +666 @@
    {
       typedef  coord_transform2<CoordTransform,geometry2d> path_type;
-
-      if (feature.exists(sym.get_name()))
-      {
-         UnicodeString text = feature[sym.get_name()].to_unicode();
-         if ( text.length() > 0 )
-         {
-            Color const& fill  = sym.get_fill();
-            face_ptr face = font_manager_.get_face(sym.get_face_name());
-            if (face)
+      
+      UnicodeString text = feature[sym.get_name()].to_unicode();
+      if ( text.length() > 0 )
+      {
+         Color const& fill  = sym.get_fill();
+         face_ptr face = font_manager_.get_face(sym.get_face_name());
+         if (face)
+         {
+            text_renderer<mapnik::Image32> ren(pixmap_,face);
+            ren.set_pixel_size(sym.get_text_size());
+            ren.set_fill(fill);
+            ren.set_halo_fill(sym.get_halo_fill());
+            ren.set_halo_radius(sym.get_halo_radius());
+           
+            placement_finder<label_collision_detector4> finder(detector_);
+           
+            string_info info(text);
+            face->get_string_info(info);
+            unsigned num_geom = feature.num_geometries();
+            for (unsigned i=0;i<num_geom;++i)
             {
-               text_renderer<mapnik::Image32> ren(pixmap_,face);
-               ren.set_pixel_size(sym.get_text_size());
-               ren.set_fill(fill);
-               ren.set_halo_fill(sym.get_halo_fill());
-               ren.set_halo_radius(sym.get_halo_radius());
-           
-               placement_finder<label_collision_detector4> finder(detector_);
-           
-               string_info info(text);
-               face->get_string_info(info);
-               unsigned num_geom = feature.num_geometries();
-               for (unsigned i=0;i<num_geom;++i)
+               geometry2d const& geom = feature.get_geometry(i);
+               if (geom.num_points() > 0) // don't bother with empty geometries 
                {
-                  geometry2d const& geom = feature.get_geometry(i);
-                  if (geom.num_points() > 0) // don't bother with empty geometries
+                  path_type path(t_,geom,prj_trans);
+                  placement text_placement(info,sym);  
+                  if (sym.get_label_placement() == POINT_PLACEMENT) 
                   {
-                     path_type path(t_,geom,prj_trans);
-                     placement text_placement(info,sym);
-                     if (sym.get_label_placement() == POINT_PLACEMENT)
-                     {
-                        double label_x, label_y, z=0.0;
-                        geom.label_position(&label_x, &label_y);
-                        prj_trans.backward(label_x,label_y, z);
-                        t_.forward(&label_x,&label_y);
-                        finder.find_point_placement(text_placement,label_x,label_y);
-                     }
-                     else //LINE_PLACEMENT
-                     {
-                        finder.find_line_placements<path_type>(text_placement,path);
-                     }
+                     double label_x, label_y, z=0.0;
+                     geom.label_position(&label_x, &label_y);
+                     prj_trans.backward(label_x,label_y, z);
+                     t_.forward(&label_x,&label_y);
+                     finder.find_point_placement(text_placement,label_x,label_y);
+                  }
+                  else //LINE_PLACEMENT
+                  {
+                     finder.find_line_placements<path_type>(text_placement,path);
+                  }
                   
-                     for (unsigned int ii = 0; ii < text_placement.placements.size(); ++ii)
-                     {
-                        double x = text_placement.placements[ii].starting_x;
-                        double y = text_placement.placements[ii].starting_y;
-                        Envelope<double> dim = ren.prepare_glyphs(&text_placement.placements[ii]);
-                        ren.render(x,y);
-                     }
+                  for (unsigned int ii = 0; ii < text_placement.placements.size(); ++ii)
+                  {
+                     double x = text_placement.placements[ii].starting_x;
+                     double y = text_placement.placements[ii].starting_y;
+                     Envelope<double> dim = ren.prepare_glyphs(&text_placement.placements[ii]);
+                     ren.render(x,y);
                   }
                }
-            }
-            else
-            {
-               throw config_error("Unable to find specified font face '" + sym.get_face_name() + "'");
-            }
+            }  
+         }
+         else
+         {
+            throw config_error("Unable to find specified font face '" + sym.get_face_name() + "'");
          }
       }

trunk/src/cairo_renderer.cpp

@@ -751 +751 @@
       typedef coord_transform2<CoordTransform,geometry2d> path_type;
 
-      if (feature.exists(sym.get_name()))
-      {
-         UnicodeString text = feature[sym.get_name()].to_unicode();
-         boost::shared_ptr<ImageData32> const& data = sym.get_image();
-
-         if (text.length() > 0 && data)
-         {
-            cairo_face_ptr face = face_manager_.get_face(sym.get_face_name());
-
-            if (face)
-            {
-               cairo_context context(context_);
-
-               context.set_font_face(face);
-
-               string_info info(text);
-
-               face->get_string_info(sym.get_text_size(), info);
-
-               placement_finder<label_collision_detector4> finder(detector_);
-
-               for (unsigned i = 0; i < feature.num_geometries(); ++i)
-               {
-                  geometry2d const& geom = feature.get_geometry(i);
-
-                  if (geom.num_points() > 0) // don't bother with empty geometries
+      UnicodeString text = feature[sym.get_name()].to_unicode();
+      boost::shared_ptr<ImageData32> const& data = sym.get_image();
+
+      if (text.length() > 0 && data)
+      {
+         cairo_face_ptr face = face_manager_.get_face(sym.get_face_name());
+
+         if (face)
+         {
+            cairo_context context(context_);
+
+            context.set_font_face(face);
+
+            string_info info(text);
+
+            face->get_string_info(sym.get_text_size(), info);
+
+            placement_finder<label_collision_detector4> finder(detector_);
+
+            for (unsigned i = 0; i < feature.num_geometries(); ++i)
+            {
+               geometry2d const& geom = feature.get_geometry(i);
+
+               if (geom.num_points() > 0) // don't bother with empty geometries
+               {
+                  path_type path(t_, geom, prj_trans);
+                  placement text_placement(info, sym);
+
+                  text_placement.avoid_edges = sym.get_avoid_edges();
+                  finder.find_point_placements<path_type>(text_placement, path);
+
+                  for (unsigned int ii = 0; ii < text_placement.placements.size(); ++ ii)
                   {
-                     path_type path(t_, geom, prj_trans);
-                     placement text_placement(info, sym);
-
-                     text_placement.avoid_edges = sym.get_avoid_edges();
-                     finder.find_point_placements<path_type>(text_placement, path);
-
-                     for (unsigned int ii = 0; ii < text_placement.placements.size(); ++ ii)
-                     {
-                        double shield_x = text_placement.placements[ii].starting_x - data->width() / 2;
-                        double shield_y = text_placement.placements[ii].starting_y - data->height() / 2;
-
-                        context.add_image(shield_x, shield_y, *data);
-                        context.add_text(sym, text_placement.placements[ii], face);
-                     }
+                     double shield_x = text_placement.placements[ii].starting_x - data->width() / 2;
+                     double shield_y = text_placement.placements[ii].starting_y - data->height() / 2;
+
+                     context.add_image(shield_x, shield_y, *data);
+                     context.add_text(sym, text_placement.placements[ii], face);
                   }
                }
@@ -928 +925 @@
       typedef coord_transform2<CoordTransform,geometry2d> path_type;
 
-      if (feature.exists(sym.get_name()))
-      {
-         UnicodeString text = feature[sym.get_name()].to_unicode();
-
-         if (text.length() > 0)
-         {
-            cairo_face_ptr face = face_manager_.get_face(sym.get_face_name());
-
-            if (face)
-            {
-               cairo_context context(context_);
-
-               context.set_font_face(face);
-
-               string_info info(text);
-
-               face->get_string_info(sym.get_text_size(), info);
-
-               placement_finder<label_collision_detector4> finder(detector_);
-
-               for (unsigned i = 0; i < feature.num_geometries(); ++i)
-               {
-                  geometry2d const& geom = feature.get_geometry(i);
-
-                  if (geom.num_points() > 0) // don't bother with empty geometries
+      UnicodeString text = feature[sym.get_name()].to_unicode();
+
+      if (text.length() > 0)
+      {
+         cairo_face_ptr face = face_manager_.get_face(sym.get_face_name());
+
+         if (face)
+         {
+            cairo_context context(context_);
+
+            context.set_font_face(face);
+
+            string_info info(text);
+
+            face->get_string_info(sym.get_text_size(), info);
+
+            placement_finder<label_collision_detector4> finder(detector_);
+
+      &n