Changeset 789

Timestamp:

01/12/09 19:35:45 (19 months ago)

Author:

artem

Message:

+ applied intersection patch from randomjunk - #127

Location:

trunk

Files:

• include/mapnik/feature_style_processor.hpp (modified) (1 diff)
• src/envelope.cpp (modified) (1 diff)

trunk/include/mapnik/feature_style_processor.hpp

@@ -126 +126 @@
                   prj_trans.backward(lx0,ly0,lz0);
                   prj_trans.backward(lx1,ly1,lz1);
+
+                  // if no intersection then nothing to do for layer
+                  if ( lx0 > ext.maxx() || lx1 < ext.minx() || ly0 > ext.maxy() || ly1 < ext.miny() )
+                  {
+                     return;
+                  }
+                  
                   // clip query bbox
                   lx0 = std::max(ext.minx(),lx0);

trunk/src/envelope.cpp

@@ -240 +240 @@
     Envelope<T> Envelope<T>::intersect(const EnvelopeType& other) const
     {
-
-        T x0=std::max(minx_,other.minx_);
-        T y0=std::max(miny_,other.miny_);
-
-        T x1=std::min(maxx_,other.maxx_);
-        T y1=std::min(maxy_,other.maxy_);
-
-        return Envelope<T>(x0,y0,x1,y1);
+        if (intersects(other)) {
+            T x0=std::max(minx_,other.minx_);
+            T y0=std::max(miny_,other.miny_);
+
+            T x1=std::min(maxx_,other.maxx_);
+            T y1=std::min(maxy_,other.maxy_);
+
+            return Envelope<T>(x0,y0,x1,y1);
+        } else {
+            return Envelope<T>();
+        }
     }