Changeset 15149

Timestamp:

05/29/13 16:02:42 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: some fixed

Location:

issm/trunk-jpl/src/m/plot

Files:

• googlemaps.m (modified) (3 diffs)
• plot_googlemaps.m (modified) (2 diffs)

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

@@ -3 +3 @@
 %
 %   Usage:
+%       md = googlemaps(md)
 %       md = googlemaps(md,ullat,ullon,lrlat,lrlon)
 %       md = googlemaps(md,ullat,ullon,lrlat,lrlon,options)
@@ -13 +14 @@
 
 %Parse inputs
-if nargin<5,
-        help googlemaps
-        error('Wrong usage');
-elseif nargin==5,
+if nargin<=5,
         options=pairoptions;
 else
@@ -23 +21 @@
                 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
 

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

@@ -16 +16 @@
 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
@@ -82 +82 @@
         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);