Changeset 15208

Timestamp:

06/06/13 20:22:02 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: better consistency with bottom

File:

• issm/trunk-jpl/src/m/plot/googlemaps.m (modified) (4 diffs)

issm/trunk-jpl/src/m/plot/googlemaps.m

@@ -62 +62 @@
         zoom = getfieldvalue(options,'zoom');
 else
-        zoom    = optimalzoom(ullat,ullon,lrlat,lrlon);
+        zoom    = 11;%ptimalzoom(ullat,ullon,lrlat,lrlon);
         display(['googlemaps info: default zoom level ' num2str(zoom)]);
 end
 scale   = 1;
 maxsize = 640;
+bottom  = 120;
 
 %convert all these coordinates to pixels
@@ -78 +79 @@
 %calculate rows and columns
 cols = ceil(dx/maxsize);
-rows = ceil(dy/maxsize);
+rows = ceil(dy/(maxsize-bottom));
 
 %calculate pixel dimensions of each small image
-bottom = 120;
 width   = ceil(dx/cols);
 height  = ceil(dy/rows);
@@ -90 +90 @@
 for x=0:cols-1,
         for y=0:rows-1,
-                dxn = width * (0.5 + x);
+                dxn = width  * (0.5 + x);
                 dyn = height * (0.5 + y);
                 [latn, lonn] = pixelstolatlon(ulx + dxn, uly - dyn - bottom/2, zoom);
@@ -109 +109 @@
                 indx2 = min(floor(dx),floor(x*width)+size(X,2));
                 indy1 = floor(y*height)+1;
-                [floor(dy),floor(y*height)+size(X,1)]
-                [height heightplus]
                 indy2 = min(floor(dy),floor(y*height)+size(X,1));
                 final(indy1:indy2,indx1:indx2,:)=X(1:indy2-indy1+1,1:indx2-indx1+1,:);