[27032] | 1 | Index: ../trunk-jpl/src/m/coordsystems/ll2xy.m
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/m/coordsystems/ll2xy.m (revision 26957)
|
---|
| 4 | +++ ../trunk-jpl/src/m/coordsystems/ll2xy.m (revision 26958)
|
---|
| 5 | @@ -39,6 +39,20 @@
|
---|
| 6 | error('bad usage');
|
---|
| 7 | end
|
---|
| 8 |
|
---|
| 9 | +%Move to CoordTransform now...
|
---|
| 10 | +if exist('CoordTransform_matlab')==3
|
---|
| 11 | + disp('Calling CoordTransform instead, make sure to change your MATLAB script');
|
---|
| 12 | + if sgn==+1
|
---|
| 13 | + assert(delta==45); assert(slat ==70);
|
---|
| 14 | + [x y]=CoordTransform(lat,lon,'EPSG:4326','EPSG:3413');
|
---|
| 15 | + return;
|
---|
| 16 | + else
|
---|
| 17 | + assert(delta==0); assert(slat ==71);
|
---|
| 18 | + [x y]=CoordTransform(lat,lon,'EPSG:4326','EPSG:3031');
|
---|
| 19 | + return;
|
---|
| 20 | + end
|
---|
| 21 | +end
|
---|
| 22 | +
|
---|
| 23 | % Conversion constant from degrees to radians
|
---|
| 24 | cde = 57.29577951;
|
---|
| 25 | % Radius of the earth in meters
|
---|
| 26 | Index: ../trunk-jpl/src/m/coordsystems/xy2ll.m
|
---|
| 27 | ===================================================================
|
---|
| 28 | --- ../trunk-jpl/src/m/coordsystems/xy2ll.m (revision 26957)
|
---|
| 29 | +++ ../trunk-jpl/src/m/coordsystems/xy2ll.m (revision 26958)
|
---|
| 30 | @@ -35,6 +35,20 @@
|
---|
| 31 | error('bad usage');
|
---|
| 32 | end
|
---|
| 33 |
|
---|
| 34 | +%Move to CoordTransform now...
|
---|
| 35 | +if exist('CoordTransform_matlab')==3
|
---|
| 36 | + disp('Calling CoordTransform instead, make sure to change your MATLAB script');
|
---|
| 37 | + if sgn==+1
|
---|
| 38 | + assert(delta==45); assert(slat ==70);
|
---|
| 39 | + [lat lon]=CoordTransform(x, y,'EPSG:3413','EPSG:4326');
|
---|
| 40 | + return;
|
---|
| 41 | + else
|
---|
| 42 | + assert(delta==0); assert(slat ==71);
|
---|
| 43 | + [lat lon]=CoordTransform(x, y,'EPSG:3031','EPSG:4326');
|
---|
| 44 | + return;
|
---|
| 45 | + end
|
---|
| 46 | +end
|
---|
| 47 | +
|
---|
| 48 | if nargout~=3 & nargout~=2,
|
---|
| 49 | help xy2ll
|
---|
| 50 | error('bad usage');
|
---|