Changeset 169 for trunk/globals

Timestamp:

09/04/2006 02:50:13 PM (5 years ago)

Author:

cirrus

Message:

add: XML statistics
change: gmap API v2 used (custom map support is currently broken)

Location:

trunk/globals

Files:

• classes/srtm.php (modified) (1 diff)
• functions.php (modified) (2 diffs)

trunk/globals/classes/srtm.php

@@ -29 +29 @@
         
         function get_elevation($lat, $lon, $round=TRUE) {
-        $y = $lat;
-        $x = $lon;
+                $y = $lat;
+                $x = $lon;
         
-        $filename = $this->data_path.'N'.(integer)$lat.'E'.((integer)$lon<100?'0'.(integer)$lon:(integer)$lon).'.hgt';
+                $filename = $this->data_path.'N'.(integer)$lat.'E'.((integer)$lon<100?'0'.(integer)$lon:(integer)$lon).'.hgt';
         
-        if ($lat == '' || $lon == '' || !file_exists($filename)) return FALSE;
+                if ($lat == '' || $lon == '' || !file_exists($filename))
+                        return FALSE;
         
-        $file = fopen($filename, 'r');
-        $offset = ( (integer)(($x - (integer)$x) * 1200) * 2 + (1200 - (integer)(($y - (integer)$y) * 1200)) * 2402 );
-        fseek($file, $offset);
-        $h1 = bytes2int(strrev(fread($file, 2)));
-        $h2 = bytes2int(strrev(fread($file, 2)));
-        fseek($file, $offset-2402);
-        $h3 = bytes2int(strrev(fread($file, 2)));
-        $h4 = bytes2int(strrev(fread($file, 2)));
-        fclose($file);
+                $file = fopen($filename, 'r');
+                $offset = ( (integer)(($x - (integer)$x) * 1200) * 2 + (1200 - (integer)(($y - (integer)$y) * 1200)) * 2402 );
+                fseek($file, $offset);
+                $h1 = bytes2int(strrev(fread($file, 2)));
+                $h2 = bytes2int(strrev(fread($file, 2)));
+                fseek($file, $offset-2402);
+                $h3 = bytes2int(strrev(fread($file, 2)));
+                $h4 = bytes2int(strrev(fread($file, 2)));
+                fclose($file);
         
-        $m = max($h1, $h2, $h3, $h4);
-        for($i=1;$i<=4;$i++) {
-                $c = 'h'.$i;
-                if ($$c == -32768) $$c = $m;
+                $m = max($h1, $h2, $h3, $h4);
+                for($i=1;$i<=4;$i++) {
+                        $c = 'h'.$i;
+                        if ($$c == -32768)
+                                $$c = $m;
+                }
+        
+                $fx = ($lon - (integer)($lon * 1200) / 1200) * 1200;
+                $fy = ($lat - (integer)($lat * 1200) / 1200) * 1200;
+        
+                // normalizing data
+                $elevation = ($h1 * (1 - $fx) + $h2 * $fx) * (1 - $fy) + ($h3 * (1 - $fx) + $h4 * $fx) * $fy;
+                if ($round)
+                        $elevation = round($elevation);
+                return $elevation;
         }
-        
-        $fx = ($lon - (integer)($lon * 1200) / 1200) * 1200;
-        $fy = ($lat - (integer)($lat * 1200) / 1200) * 1200;
-        
-        // normalizing data
-        $elevation = ($h1 * (1 - $fx) + $h2 * $fx) * (1 - $fy) + ($h3 * (1 - $fx) + $h4 * $fx) * $fy;
-        if ($round) $elevation = round($elevation);
-        return $elevation;
-        }
-        
+
 }
 

trunk/globals/functions.php

@@ -96 +96 @@
         global $qs_vars;
         $o = array();
+        if(get('show_map') == "no") $o = array_merge($o,array("show_map" => "no"));
         if ($cur_qs == TRUE) {
                 parse_str(get_qs(), $qs);
@@ -344 +345 @@
         if ($gmap_key == '') return FALSE;
 
-        $main->html->head->add_script("text/javascript", "http://".$vars['gmap']['server']."/maps?file=api&v=1&key=".$gmap_key);
+        $main->html->head->add_script("text/javascript", "http://".$vars['gmap']['server']."/maps?file=api&v=2&key=".$gmap_key);
         $main->html->head->add_script("text/javascript", $javascript);
         $main->html->head->add_extra(