[Meshdb-cvs] www/db2 view.php,1.16.2.2,1.16.2.3

[<le...@pr...>]

Update of /cvsroot/meshdb/www/db2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19083

Modified Files:
      Tag: leonard-dev
	view.php 
Log Message:
track r1.17: Use the configured altitude and shift files when running elev.

Index: view.php
===================================================================
RCS file: /cvsroot/meshdb/www/db2/view.php,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -d -r1.16.2.2 -r1.16.2.3
--- view.php	7 Nov 2004 05:50:06 -0000	1.16.2.2
+++ view.php	8 Nov 2004 14:16:15 -0000	1.16.2.3
@@ -108,7 +108,7 @@
 	}
 
 	function elev($loc1, $loc2) {
-            global $ZONE;
+            global $ZONE, $SHIFTFILE, $ALTFILE;
 
 	    $e1 = doubleval($loc1["e"]);
 	    $n1 = doubleval($loc1["n"]);
@@ -119,8 +119,12 @@
 	    $h2 = doubleval($loc2["h"]);
 
 	    $info = split(" ",
-		          mybacktick("$BINDIR/elev -z ${ZONE} -a $e1 $n1 $h1"
-		                                       ." -b $e2 $n2 $h2"));
+		          mybacktick("$BINDIR/elev"
+                                     ." -z ${ZONE}"
+                                     ." -S ${SHIFTFILE}"
+                                     ." -A ${ALTFILE}"
+                                     ." -a $e1 $n1 $h1"
+                                     ." -b $e2 $n2 $h2"));
 
             $distance = $info[0];
             $bearing1 = doubleval($info[1]) * 180 / M_PI;