From bb2de72aab4b914baa19750a634d259ffa695972 Mon Sep 17 00:00:00 2001
From: Frank Warmerdam <warmerdam@pobox.com>
Date: Sat, 14 Dec 2002 20:35:43 +0000
Subject: implement units support for geocentric coordinates

git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1060 4e78687f-474d-0410-85f9-8d5e500ac6b2
---
 src/pj_transform.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'src')

diff --git a/src/pj_transform.c b/src/pj_transform.c
index 1b4092b8..0e649bae 100644
--- a/src/pj_transform.c
+++ b/src/pj_transform.c
@@ -30,6 +30,9 @@
  ******************************************************************************
  *
  * $Log$
+ * Revision 1.8  2002/12/14 20:35:43  warmerda
+ * implement units support for geocentric coordinates
+ *
  * Revision 1.7  2002/12/14 20:14:35  warmerda
  * added geocentric support
  *
@@ -108,6 +111,15 @@ int pj_transform( PJ *srcdefn, PJ *dstdefn, long point_count, int point_offset,
             return PJD_ERR_GEOCENTRIC;
         }
 
+        if( srcdefn->to_meter != 1.0 )
+        {
+            for( i = 0; i < point_count; i++ )
+            {
+                x[point_offset*i] *= srcdefn->to_meter;
+                y[point_offset*i] *= srcdefn->to_meter;
+            }
+        }
+
         pj_geocentric_to_geodetic( srcdefn->a, srcdefn->es,
                                    point_count, point_offset, x, y, z );
     }
@@ -163,6 +175,15 @@ int pj_transform( PJ *srcdefn, PJ *dstdefn, long point_count, int point_offset,
 
         pj_geodetic_to_geocentric( dstdefn->a, dstdefn->es,
                                    point_count, point_offset, x, y, z );
+
+        if( dstdefn->fr_meter != 1.0 )
+        {
+            for( i = 0; i < point_count; i++ )
+            {
+                x[point_offset*i] *= dstdefn->fr_meter;
+                y[point_offset*i] *= dstdefn->fr_meter;
+            }
+        }
     }
 
 /* -------------------------------------------------------------------- */
-- 
cgit v1.2.3