Changeset 2271

Timestamp:

09/22/09 13:38:39 (16 years ago)

Author:

Eric.Larour

Message:

More flexible mapll and mapxy.
New change of axis: stereomap

Location:

issm/trunk/src/m/utils/LatLong

Files:

• ll2xy.m (modified) (1 diff)
• mapll.m (modified) (4 diffs)
• mapxy.m (modified) (3 diffs)
• stereomap.m (added)

issm/trunk/src/m/utils/LatLong/ll2xy.m

@@ -11 +11 @@
 re = 6378137.0;         % WGS84
 e2 = 0.00669437999015;  % WGS84
-sn=-1.0;        % because it's southern hemisphere
+sn=+1.0;        % because it's southern hemisphere
 
 a=re;

issm/trunk/src/m/utils/LatLong/mapll.m

@@ -1 @@
-function  [x,y]=mapll(lat,lon,hem);
+function  [x,y]=mapll(lat,lon,hem,varargin);
 %MAPLL - convert latitude and longitude into x and y
 %
@@ -10 +10 @@
 %   See also MAPXY, LL2XY
 
+%check number of arguments.
+if ~((nargin==3) | (nargin==5)),
+        mapllerrorusage();
+end
+
+%hem: must be either 's' or 'n'
+if ~ischar(hem),
+        error('mapll error message: hemisphere argument should be ''n'' or ''s''');
+end
+
+%check hem is either 'n' or 's': 
+if ~(hem=='s' | hem=='n'),
+        error('mapll error message: hem should be ''s'' or ''n''');
+end
+
+%set sn: 
+if hem=='s',
+        slat=71;
+        sn=-1.0;
+        xlam=0;
+else
+        slat=70;
+        sn=1.0;
+        xlam=45;
+end
+
+%set defaults for standard parallels and centre meridians.
+if nargin==5,
+        slat=varargin{1};
+        xlam=varargin{2};
+end
+
+
 %some corrections
 lon=lon+360;       % to have 0<lon<360
@@ -17 +50 @@
 e2= 0.00669437999015;
 e=sqrt(e2);
-
-%Standard parallel - latitude with no distortion = -71.
-if hem==1,
-        %Northern hemisphere
-        sn=1;
-        slat=70;
-        xlam=45;
-else
-        %Southern Hemisphere
-        sn=-1.0;
-        slat=71;
-        xlam=0;
-end
 
 lat=sn*lat*pi/180;
@@ -48 +68 @@
 x= rho*sn.*sin((lon+xlam));
 y=-rho*sn.*cos((lon+xlam));
+
+end
+
+function mapllerrorusage(),
+        help mapll
+end

issm/trunk/src/m/utils/LatLong/mapxy.m

@@ -1 @@
-function [alat,alon]=mapxy(x,y,hem);
+function [alat,alon]=mapxy(x,y,hem,varargin);
 %MAPXY - compute latitude and longitude from x and y
 %
@@ -9 +9 @@
 %   See also MAPLL, LL2XY
 
+%check number of arguments.
+if ~((nargin==3) | (nargin==5)),
+        mapxyerrorusage();
+end
+
+%hem: must be either 's' or 'n'
+if ~ischar(hem),
+        error('mapxy error message: hemisphere argument should be ''n'' or ''s''');
+end
+
+%check hem is either 'n' or 's': 
+if ~(hem=='s' | hem=='n'),
+        error('mapxy error message: hem should be ''s'' or ''n''');
+end
+
+%set sn: 
+if hem=='s',
+        slat=71;
+        sn=-1.0;
+        xlam=0;
+else
+        slat=70;
+        sn=1.0;
+        xlam=45;
+end
+
+%set defaults for standard parallels and centre meridians.
+if nargin==5,
+        slat=varargin{1};
+        xlam=varargin{2};
+end
+
 re = 6378137;
 e2 = 0.00669437999015;
 
 e=sqrt(e2);
-
-%Standard parallel = latitude with no distortion
-slat=71;
-sn=-1.0;
-xlam=0;
-
-if hem ==1,
-   slat=70;
-        sn=1;
-        xlam=45;
-end
 
 slat=slat/180*pi;
@@ -54 +75 @@
    alon(indice)=alon(indice)-360;
 end
+
+
+end
+        
+
+function mapxyerrorusage()
+        help mapxy
+end