Author: ksprotte Date: Wed Jan 23 12:59:59 2008 New Revision: 2397 Modified: branches/bos/projects/bos/m2/geo-utm.lisp Log: changed the API functions of geo-utm to work with lon lat (in that order) Modified: branches/bos/projects/bos/m2/geo-utm.lisp ============================================================================== --- branches/bos/projects/bos/m2/geo-utm.lisp (original) +++ branches/bos/projects/bos/m2/geo-utm.lisp Wed Jan 23 12:59:59 2008 @@ -204,7 +204,7 @@ (* (* x5frac x5poly) (expt x 5.0))) (* (* x7frac x7poly) (expt x 7.0)))))))) -(defun lat-lon-to-utm-x-y (lat lon) +(defun lon-lat-to-utm-x-y (lon lat) "Returns four values X, Y, ZONE and SOUTHHEMI-P." (let* ((lat (float lat 0d0)) (lon (float lon 0d0)) @@ -214,10 +214,10 @@ (setq x (+ (* x utmscale-factor) 500000.0)) (setq y (* y utmscale-factor)) (if (< y 0.0) (block nil (setq y (+ y 1.e7))) nil) - (values x y zone (minusp lat))))) + (list x y zone (minusp lat))))) -(defun utm-x-y-to-lat-lon (x y zone southhemi-p) - "Returns two values LAT and LON." +(defun utm-x-y-to-lon-lat (x y zone southhemi-p) + "Returns two values LON and LAT." (let ((x (float x 0d0)) (y (float y 0d0)) cmeridian) @@ -228,6 +228,6 @@ (setq cmeridian (utmcentral-meridian zone)) (multiple-value-bind (lat lon) (map-xyto-lat-lon x y cmeridian) - (values (rad-to-deg lat) (rad-to-deg lon))))) + (list (rad-to-deg lon) (rad-to-deg lat)))))