Changeset 770

Timestamp:

11/19/08 16:50:12 (21 months ago)

Author:

artem

Message:

+ applied patch avoid_extent from rcoup

Location:

trunk

Files:

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

trunk/include/mapnik/feature_style_processor.hpp

@@ -111 +111 @@
             {
                Envelope<double> const& ext=m_.getCurrentExtent();
+               Envelope<double> bbox(ext);
                projection proj1(lay.srs());
                proj_transform prj_trans(proj0,proj1);
-
-               Envelope<double> layer_ext = lay.envelope();
-               double lx0 = layer_ext.minx();
-               double ly0 = layer_ext.miny();
-               double lz0 = 0.0;
-               double lx1 = layer_ext.maxx();
-               double ly1 = layer_ext.maxy();
-               double lz1 = 0.0;
-               // back project layers extent into main map projection
-               prj_trans.backward(lx0,ly0,lz0);
-               prj_trans.backward(lx1,ly1,lz1);
-               // clip query bbox
-               lx0 = std::max(ext.minx(),lx0);
-               ly0 = std::max(ext.miny(),ly0);
-               lx1 = std::min(ext.maxx(),lx1);
-               ly1 = std::min(ext.maxy(),ly1);
                
-               prj_trans.forward(lx0,ly0,lz0);
-               prj_trans.forward(lx1,ly1,lz1);
-               Envelope<double> bbox(lx0,ly0,lx1,ly1);
+               if (proj0 != proj1) {
+                  Envelope<double> layer_ext = lay.envelope();
+                  double lx0 = layer_ext.minx();
+                  double ly0 = layer_ext.miny();
+                  double lz0 = 0.0;
+                  double lx1 = layer_ext.maxx();
+                  double ly1 = layer_ext.maxy();
+                  double lz1 = 0.0;
+                  // back project layers extent into main map projection
+                  prj_trans.backward(lx0,ly0,lz0);
+                  prj_trans.backward(lx1,ly1,lz1);
+                  // clip query bbox
+                  lx0 = std::max(ext.minx(),lx0);
+                  ly0 = std::max(ext.miny(),ly0);
+                  lx1 = std::min(ext.maxx(),lx1);
+                  ly1 = std::min(ext.maxy(),ly1);
+
+                  prj_trans.forward(lx0,ly0,lz0);
+                  prj_trans.forward(lx1,ly1,lz1);
+                  bbox = Envelope<double>(lx0,ly0,lx1,ly1);
+               }
                double resolution = m_.getWidth()/bbox.width();
                query q(bbox,resolution); //BBOX query

trunk/include/mapnik/projection.hpp

@@ -58 +58 @@
         
         projection& operator=(projection const& rhs);
+        bool operator==(const projection& other) const;
+        bool operator!=(const projection& other) const;
         bool is_initialized() const;
         bool is_geographic() const;

trunk/src/projection.cpp

@@ -53 +53 @@
         return *this;
     }
-        
+    
+    bool projection::operator==(const projection& other) const 
+    {
+        return (params_ == other.params_);
+    }
+    
+    bool projection::operator!=(const projection& other) const 
+    {
+        return !(*this == other);
+    }
+    
     bool projection::is_initialized() const
     {