source: issm/oecreview/Archive/14312-15392/ISSM-15148-15149.diff@ 15393

Index: ../trunk-jpl/src/m/plot/plot_googlemaps.m
===================================================================
--- ../trunk-jpl/src/m/plot/plot_googlemaps.m   (revision 15148)
+++ ../trunk-jpl/src/m/plot/plot_googlemaps.m   (revision 15149)
@@ -15,8 +15,8 @@
        error('buildgridded error message: gridded not supported for 3d meshes, project on a layer');
 end
 
-if ~any(isnan(md.radaroverlay.x)) & ~any(isnan(md.radaroverlay.y)) & ~any(isnan(md.radaroverlay.pwr)) &...
-               size(md.radaroverlay.pwr,3)==3 & all(size(md.radaroverlay.x)==size(md.radaroverlay.pwr)),
+if ~any(isnan(md.radaroverlay.x(:))) & ~any(isnan(md.radaroverlay.y(:))) & ~any(isnan(md.radaroverlay.pwr(:))) ...
+               & size(md.radaroverlay.pwr,3)==3 & size(md.radaroverlay.x,2)==size(md.radaroverlay.pwr,2),
        disp('plot_googlemaps info: the RGB image held by the model is being used');
 else
        disp('Extracting image from Google maps...');
@@ -81,8 +81,6 @@
 if ~isnan(data_min),
        options=changefieldvalue(options,'caxis',[data_min data_max]); % force caxis so that the colorbar is ready
 end
-options=addfielddefault(options,'xlim',xlim);        % default xlim
-options=addfielddefault(options,'ylim',ylim);        % default ylim
 options=addfielddefault(options,'axis','xy equal off'); % default axis
 applyoptions(md,data,options);
 end
Index: ../trunk-jpl/src/m/plot/googlemaps.m
===================================================================
--- ../trunk-jpl/src/m/plot/googlemaps.m        (revision 15148)
+++ ../trunk-jpl/src/m/plot/googlemaps.m        (revision 15149)
@@ -2,6 +2,7 @@
 %GOOGLEMAPS - Extract image from Google maps for given region
 %
 %   Usage:
+%       md = googlemaps(md)
 %       md = googlemaps(md,ullat,ullon,lrlat,lrlon)
 %       md = googlemaps(md,ullat,ullon,lrlat,lrlon,options)
 %
@@ -12,10 +13,7 @@
 %      - zoom: zoom level, between 1 and 21 (default dynamically calculated)
 
 %Parse inputs
-if nargin<5,
-       help googlemaps
-       error('Wrong usage');
-elseif nargin==5,
+if nargin<=5,
        options=pairoptions;
 else
        options=varargin{:};
@@ -23,7 +21,23 @@
                options=pairoptions(varargin{:});
        end
 end
+if nargin==1,
+       %Get xlim and ylim (used to extract Google maps image)
+       xlim=getfieldvalue(options,'xlim',[min(md.mesh.x) max(md.mesh.x)]);
+       ylim=getfieldvalue(options,'ylim',[min(md.mesh.y) max(md.mesh.y)]);
+       [latlist lonlist]= xy2ll(...
+               [linspace(xlim(1),xlim(2),100) linspace(xlim(2),xlim(2),100) linspace(xlim(2),xlim(1),100) linspace(xlim(1),xlim(1),100)],...
+               [linspace(ylim(1),ylim(1),100) linspace(ylim(1),ylim(2),100) linspace(ylim(2),ylim(2),100) linspace(ylim(2),ylim(1),100)],...
+               +1,45,70);
 
+       %Image corners in lat/long
+       ullat = max(latlist); ullon = min(lonlist);
+       lrlat = min(latlist); lrlon = max(lonlist);
+elseif nargin>1 & nargin<5,
+       help googlemaps
+       error('Wrong usage');
+end
+
 %Find optimal zoom
 if exist(options,'zoom'),
        zoom = getfieldvalue(options,'zoom');