Changeset 3015 for trunk

Timestamp:

11/19/14 13:23:30 (10 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-4362

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Fix for the issue on sdgrid that resulting map extent expands or shrinks when cell size is calculated by the task.
A cause of the issue is that the task always takes 10% margin when it calculates cell size automatically. In this fix, margin is set to 1 pixel.

File:

• trunk/src/STGrid.cpp (modified) (2 diffs)

trunk/src/STGrid.cpp

@@ -1136 +1136 @@
   Double wx = max( abs(xmax-center_(0)), abs(xmin-center_(0)) ) * 2 ;
   Double wy = max( abs(ymax-center_(1)), abs(ymin-center_(1)) ) * 2 ;
-  // take 10% margin
-  wx *= 1.10 ;
-  wy *= 1.10 ;
 
   Quantum<Double> qcellx ;
@@ -1172 +1169 @@
         wy = 0.00290888 ;
       }
-      qcellx = Quantum<Double>( wx/nx_*cos(center_[1]), "rad" ) ;
-      qcelly = Quantum<Double>( wy/ny_, "rad" ) ;
+      if (nx_ > 1) {
+        qcellx = Quantum<Double>(wx / (nx_ - 1) * cos(center_[1]), "rad");
+      }
+      else {
+        qcellx = Quantum<Double>( 1.1f * wx / nx_ * cos(center_[1]), "rad" );
+      }
+      if (ny_ > 1) {
+        qcelly = Quantum<Double>(wy / (ny_ - 1), "rad");
+      }
+      else {
+        qcelly = Quantum<Double>( 1.1f * wy / ny_, "rad" );
+      }
     }
   }