Changeset a8dd8b9 in tol

Timestamp:

Jan 2, 2010, 4:16:42 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

7618682

Parents:

d0fc203

Message:

UTM zone have latitud and longitud components and both are passed as matrices to encoding-decoding functions

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@1899 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol_pkg/GisTools/GisTools.tol (modified) (9 diffs)

tol_pkg/GisTools/GisTools.tol

@@ -67 +67 @@
 
   ////////////////////////////////////////////////////////////////////////////
-  Real initialice(Real void)
+  Real initialize(Real void)
   ////////////////////////////////////////////////////////////////////////////
   {
@@ -119 +119 @@
       Real _.b = b
     ]];
-    Real aux::initialice(?);
+    Real aux::initialize(?);
     Eval(name+"=aux")
   };
@@ -189 +189 @@
     VMatrix lonlat, //Matrix with two columns, first one is longitud, second 
                     //one is latitude, both meassured in in radians
-    Real zone) //UTM zone
+    VMatrix lonZone) //UTM longitud zone
   ////////////////////////////////////////////////////////////////////////////
   {
     //Central meridian of zone
-    Real long0 = (6*zone-183)*deg2rad;
+    VMatrix long0 = (lonZone*6-183)*deg2rad;
     //longitude of points
-    VMatrix long = ASin(Sin(SubCol(lonlat,[[1]])));
+    VMatrix long = SubCol(lonlat,[[1]]);
     //latitude of points
-    VMatrix lat = ASin(Sin(SubCol(lonlat,[[2]])));
+    VMatrix lat = SubCol(lonlat,[[2]]);
     Real e2 = _.e^2;
     VMatrix e2sinlat2_1 = -(Sin(lat)^2)*e2+1;
@@ -247 +247 @@
     VMatrix lonlat, //Matrix with two columns, first one is longitud, second 
                     //one is latitude, both meassured in degrees
-    Real zone) //UTM zone
-  ////////////////////////////////////////////////////////////////////////////
-  {
-    rad2utm(lonlat*deg2rad,zone)
+    VMatrix lonZone) //UTM longitud zone
+  ////////////////////////////////////////////////////////////////////////////
+  {
+    rad2utm(lonlat*deg2rad,lonZone)
   };
 
@@ -258 +258 @@
   VMatrix utm2rad(
     VMatrix xy, //Matrix with two columns
-    Real zone) //UTM zone
-  ////////////////////////////////////////////////////////////////////////////
-  {
+    VMatrix lonZone, //UTM longitud zone
+    VMatrix latZone) //UTM latitud zone
+  ////////////////////////////////////////////////////////////////////////////
+  {
+  //WriteLn("TRACE zone="<<zone);
     //Central meridian of zone
-    Real long0 = (6*zone-183)*deg2rad;
+    VMatrix long0 = (lonZone*6-183)*deg2rad;
+  //WriteLn("TRACE long0="<<long0);
     //easting of points
     VMatrix x = SubCol(xy,[[1]])-500000;
     //northing of points
-    VMatrix y = SubCol(xy,[[2]]);
+    VMatrix isSouthern = LT(latZone,latZone*0);
+    VMatrix y = 
+    {
+      VMatrix aux = SubCol(xy,[[2]]);
+      IfVMat(isSouthern,-aux+1.E+7,aux)
+    };
     Real e2 = _.e^2;
     Real e4 = _.e^4;
@@ -287 +295 @@
     VMatrix sinfp = Sin(fp);
     VMatrix cosfp = Cos(fp);
-    VMatrix tanfp = sinfp$/cosfp;
+    VMatrix tanfp = Tan(fp);
     VMatrix C1 = (cosfp^2)*_.e.2;
   //WriteLn("TRACE C1="<<VMat2Mat(C1));
@@ -317 +325 @@
     VMatrix long = (Q5 - Q6 + Q7)$/cosfp+long0;
   //WriteLn("TRACE long="<<VMat2Mat(long));
-    long | lat
+    long | IfVMat(isSouthern,-lat,lat)
   };
   ////////////////////////////////////////////////////////////////////////////
@@ -324 +332 @@
   VMatrix utm2deg(
     VMatrix xy, //Matrix with two columns
-    Real zone) //UTM zone
-  ////////////////////////////////////////////////////////////////////////////
-  {
-    utm2rad(xy,zone)/deg2rad
+    VMatrix lonZone, //UTM longitud zone
+    VMatrix latZone) //UTM latitud zone
+  ////////////////////////////////////////////////////////////////////////////
+  {
+    utm2rad(xy,lonZone,latZone)/deg2rad
   }
 };
@@ -643 +652 @@
 
 
+
+