[Linpha-cvs] SF.net SVN: linpha: [4850] trunk/linpha2/lib

[<bz...@us...>]

Revision: 4850
          http://linpha.svn.sourceforge.net/linpha/?rev=4850&view=rev
Author:   bzrudi
Date:     2008-02-02 08:43:14 -0800 (Sat, 02 Feb 2008)

Log Message:
-----------
add ele/alt attribute

Modified Paths:
--------------
    trunk/linpha2/lib/classes/linpha.metadata.class.php
    trunk/linpha2/lib/modules/module.geodata.php
    trunk/linpha2/lib/plugins/maps/xml_parser.class.php

Modified: trunk/linpha2/lib/classes/linpha.metadata.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.metadata.class.php	2008-02-02 15:05:22 UTC (rev 4849)
+++ trunk/linpha2/lib/classes/linpha.metadata.class.php	2008-02-02 16:43:14 UTC (rev 4850)
@@ -29,8 +29,8 @@
  */
 class LinMetaData
 {
-    public $defined_fields, $available_fields;
-    protected $objMetaTool;
+    public $defined_fields, $available_fields, $objMetaTool;
+    
     private $cachedFieldNames, $cachedFieldIds, $cachedSelectedFieldNames;
 
     /**

Modified: trunk/linpha2/lib/modules/module.geodata.php
===================================================================
--- trunk/linpha2/lib/modules/module.geodata.php	2008-02-02 15:05:22 UTC (rev 4849)
+++ trunk/linpha2/lib/modules/module.geodata.php	2008-02-02 16:43:14 UTC (rev 4850)
@@ -24,7 +24,7 @@
 $GPXData = new LinXmlParser('/tmp/sample.gpx');
 $array_with_gpx = $GPXData->readXmlFile();
 $track_times = $GPXData->getGpxTimeRange($array_with_gpx);
-$image_times = $GPXData->getImageTimeRange(41); //parent_id linpha_photos
+$image_times = $GPXData->getImageTimeRange(6); //parent_id linpha_photos
 
 echo "<br>***OFFSET CHECKING***";
 

Modified: trunk/linpha2/lib/plugins/maps/xml_parser.class.php
===================================================================
--- trunk/linpha2/lib/plugins/maps/xml_parser.class.php	2008-02-02 15:05:22 UTC (rev 4849)
+++ trunk/linpha2/lib/plugins/maps/xml_parser.class.php	2008-02-02 16:43:14 UTC (rev 4850)
@@ -435,7 +435,8 @@
             $trkdata[$this->date2unixTime($value['time'])] =
             array("time" => $this->date2unixTime($value['time']),
                             "lat" => $value['trkpt']['lat'], 
-                            "lon" => $value['trkpt']['lon']);
+                            "lon" => $value['trkpt']['lon'],
+                            "ele" => $value['ele']);
         }
         
         echo "<br>***CALLING TRACKPOINT RADAR***<br>";
@@ -477,7 +478,8 @@
             
             $this->writeGpsData2File($image_filename, 
                     $trkdata[$image_time]['lat'], 
-                    $trkdata[$image_time]['lon']);
+                    $trkdata[$image_time]['lon'],
+                    $trkdata[$image_time]['ele']);
             
             return false;
         }
@@ -490,7 +492,8 @@
             
             $this->writeGpsData2File($image_filename, 
                     $trkdata[$image_time + $offset]['lat'], 
-                    $trkdata[$image_time + $offset]['lon']);
+                    $trkdata[$image_time + $offset]['lon'],
+                    $trkdata[$image_time + $offset]['ele']);
             
             return false;
         }
@@ -502,7 +505,8 @@
                  "".$trkdata[$image_time - $offset]['lon']."<br><br>";
             $this->writeGpsData2File($image_filename, 
                     $trkdata[$image_time - $offset]['lat'], 
-                    $trkdata[$image_time - $offset]['lon']);
+                    $trkdata[$image_time - $offset]['lon'],
+                    $trkdata[$image_time - $offset]['ele']);
             
             return false;
         }
@@ -517,13 +521,14 @@
     /**
      * Write GPS data to file
      */
-    private function writeGpsData2File($filename, $lat, $lon)
+    private function writeGpsData2File($filename, $lat, $lon, $ele)
     {
         echo "Trying to write GPS data to files - ***SIMULATION***<br>";
         echo "Trying file: ".$filename."<br>";
         
         ($lon > 0) ? $lonref = "E" : $latref = "W";
         ($lat > 0) ? $latref = "N" : $latref = "S";
+        ($ele > 0) ? $eleref = "0" : $eleref = "1";
         
         echo "Latref ".$latref." Longref ".$lonref."<br><br>";
         
@@ -532,12 +537,15 @@
         $filename = LINPHA_DIR."/$filename";
         $return = "";
         $meta = "";
-        $parameters = "-GPSLongitudeRef = ".$lonref." " .
-                        "-GPSLongitude = ".$lon." " .
-                        "-GPSLatitudeRef = ".$latref." " .
-                        "-GPSLatitude = ".$lat." ";   
-        
-        //LinFilesys::linExec($this->exiftool.' '.$parameters.' "'.$filename.'"', $meta, $return);        
+        $parameters = "-GPSLongitudeRef='$lonref' " .
+                        "-GPSLongitude='$lon' " .
+                        "-GPSLatitudeRef='$latref' " .
+                        "-GPSLatitude='$lat' " .
+                        "-GPSAltitudeRef='$eleref' " .
+                        "-GPSAltitude='$ele' ";   
+       
+        //exec(LINPHA_DIR.'/lib/exiftool/exiftool'." $parameters $filename");
+        //LinFilesys::linExec($metaData->objMetaTool.' '.$parameters.' "'.$filename.'"', $meta, $return);        
     }
 }// end class
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.