Changeset 705 for trunk/src/map.cpp

Timestamp:

06/29/08 06:59:28 (6 months ago)

Author:

artem

Message:

applied aspect ratio patch from Frederik Ramm

Files:

• trunk/src/map.cpp (modified) (4 diffs)

trunk/src/map.cpp

@@ -35 +35 @@
         : width_(400),
           height_(400),
-          srs_("+proj=latlong +datum=WGS84") {}
+          srs_("+proj=latlong +datum=WGS84"),
+          aspectFixMode_(GROW_BBOX) {}
     
     Map::Map(int width,int height, std::string const& srs)
         : width_(width),
           height_(height),
-          srs_(srs) {}
+          srs_(srs),
+          aspectFixMode_(GROW_BBOX) {}
    
     Map::Map(const Map& rhs)
@@ -49 +51 @@
           styles_(rhs.styles_),
           layers_(rhs.layers_),
+          aspectFixMode_(rhs.aspectFixMode_),
           currentExtent_(rhs.currentExtent_) {}
     
@@ -60 +63 @@
         styles_=rhs.styles_;
         layers_=rhs.layers_;
+        aspectFixMode_=rhs.aspectFixMode_;
         return *this;
     }
@@ -296 +300 @@
         double ratio1 = (double) width_ / (double) height_;
         double ratio2 = currentExtent_.width() / currentExtent_.height();
-         
-        if (ratio2 > ratio1)
-        {
-            currentExtent_.height(currentExtent_.width() / ratio1);
-        }
-        else if (ratio2 < ratio1)
-        {
-            currentExtent_.width(currentExtent_.height() * ratio1);
-        }       
+        if (ratio1 == ratio2) return;
+
+        switch(aspectFixMode_) 
+        {
+            case ADJUST_BBOX_HEIGHT:
+                currentExtent_.height(currentExtent_.width() / ratio1);
+                break;
+            case ADJUST_BBOX_WIDTH:
+                currentExtent_.width(currentExtent_.height() * ratio1);
+                break;
+            case ADJUST_CANVAS_HEIGHT:
+                height_ = int (width_ / ratio2 + 0.5); 
+                break;
+            case ADJUST_CANVAS_WIDTH:
+                width_ = int (height_ * ratio2 + 0.5); 
+                break;
+            case GROW_BBOX:
+                if (ratio2 > ratio1)
+                   currentExtent_.height(currentExtent_.width() / ratio1);
+                else 
+                   currentExtent_.width(currentExtent_.height() * ratio1);
+                break;  
+            case SHRINK_BBOX:
+                if (ratio2 < ratio1)
+                   currentExtent_.height(currentExtent_.width() / ratio1);
+                else 
+                   currentExtent_.width(currentExtent_.height() * ratio1);
+                break;  
+            case GROW_CANVAS:
+                if (ratio2 > ratio1)
+                    width_ = (int) (height_ * ratio2 + 0.5);
+                else
+                    height_ = int (width_ / ratio2 + 0.5); 
+                break;
+            case SHRINK_CANVAS:
+                if (ratio2 > ratio1)
+                    height_ = int (width_ / ratio2 + 0.5); 
+                else
+                    width_ = (int) (height_ * ratio2 + 0.5);
+                break;
+        }
     }