Add support for commenting on, and replying to, diary entries.

[rails.git] / app / models / trace.rb

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 2d4e9ef8ab12381a92b22cd13d7ae2b2ca6b47cb..baf2ea7d27592dba4c88baebbfd734f1a8c0ed17 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -73,7 +73,54 @@ class Trace < ActiveRecord::Base
   end
 
   def mime_type
   end
 
   def mime_type

-    return `file -bi #{trace_name}`.chomp
+    filetype = `/usr/bin/file -bz #{trace_name}`.chomp
+    gzipped = filetype =~ /gzip compressed/
+    bzipped = filetype =~ /bzip2 compressed/
+    zipped = filetype =~ /Zip archive/
+
+    if gzipped then
+      mimetype = "application/x-gzip"
+    elsif bzipped then
+      mimetype = "application/x-bzip2"
+    elsif zipped
+      mimetype = "application/x-zip"
+    else
+      mimetype = "text/xml"
+    end
+
+    return mimetype
+  end
+
+  def extension_name
+    filetype = `/usr/bin/file -bz #{trace_name}`.chomp
+    gzipped = filetype =~ /gzip compressed/
+    bzipped = filetype =~ /bzip2 compressed/
+    zipped = filetype =~ /Zip archive/
+    tarred = filetype =~ /tar archive/
+
+    if tarred and gzipped then
+      extension = ".tar.gz"
+    elsif tarred and bzipped then
+      extension = ".tar.bz2"
+    elsif tarred
+      extension = ".tar"
+    elsif gzipped
+      extension = ".gpx.gz"
+    elsif bzipped
+      extension = ".gpx.bz2"
+    elsif zipped
+      extension = ".zip"
+    else
+      extension = ".gpx"
+    end
+
+    return extension
+  end
+
+  def to_xml
+    doc = OSM::API.new.get_xml_doc
+    doc.root << to_xml_node()
+    return doc

   end
 
   def to_xml_node
   end
 
   def to_xml_node


@@ -94,7 +141,7 @@ class Trace < ActiveRecord::Base
       logger.info("GPX Import importing #{name} (#{id}) from #{user.email}")
 
       # TODO *nix specific, could do to work on windows... would be functionally inferior though - check for '.gz'
       logger.info("GPX Import importing #{name} (#{id}) from #{user.email}")
 
       # TODO *nix specific, could do to work on windows... would be functionally inferior though - check for '.gz'

-      filetype = `file -bz #{trace_name}`.chomp
+      filetype = `/usr/bin/file -bz #{trace_name}`.chomp

       gzipped = filetype =~ /gzip compressed/
       bzipped = filetype =~ /bzip2 compressed/
       zipped = filetype =~ /Zip archive/
       gzipped = filetype =~ /gzip compressed/
       bzipped = filetype =~ /bzip2 compressed/
       zipped = filetype =~ /Zip archive/


@@ -128,7 +175,12 @@ class Trace < ActiveRecord::Base
       f_lon = 0
       first = true
 
       f_lon = 0
       first = true
 

-      Tracepoint.delete_all(['gpx_id = ?', self.id])
+      # If there are any existing points for this trace then delete
+      # them - we check for existing points first to avoid locking
+      # the table in the common case where there aren't any.
+      if Tracepoint.exists?(['gpx_id = ?', self.id])
+        Tracepoint.delete_all(['gpx_id = ?', self.id])
+      end

 
       gpx.points do |point|
         if first
 
       gpx.points do |point|
         if first


@@ -138,10 +190,9 @@ class Trace < ActiveRecord::Base
 
         tp = Tracepoint.new
         tp.lat = point['latitude'].to_f
 
         tp = Tracepoint.new
         tp.lat = point['latitude'].to_f

-        tp.lng = point['longitude'].to_f
+        tp.lon = point['longitude'].to_f

         tp.altitude = point['altitude'].to_f
         tp.timestamp = point['timestamp']
         tp.altitude = point['altitude'].to_f
         tp.timestamp = point['timestamp']

-        tp.user_id = user.id

         tp.gpx_id = id
         tp.trackid = point['segment'].to_i
         tp.save!
         tp.gpx_id = id
         tp.trackid = point['segment'].to_i
         tp.save!


@@ -153,10 +204,10 @@ class Trace < ActiveRecord::Base
         max_lon = Tracepoint.maximum('longitude', :conditions => ['gpx_id = ?', id])
         min_lon = Tracepoint.minimum('longitude', :conditions => ['gpx_id = ?', id])
 
         max_lon = Tracepoint.maximum('longitude', :conditions => ['gpx_id = ?', id])
         min_lon = Tracepoint.minimum('longitude', :conditions => ['gpx_id = ?', id])
 

-        max_lat = max_lat.to_f / 1000000
-        min_lat = min_lat.to_f / 1000000
-        max_lon = max_lon.to_f / 1000000
-        min_lon = min_lon.to_f / 1000000
+        max_lat = max_lat.to_f / 10000000
+        min_lat = min_lat.to_f / 10000000
+        max_lon = max_lon.to_f / 10000000
+        min_lon = min_lon.to_f / 10000000

 
         self.latitude = f_lat
         self.longitude = f_lon
 
         self.latitude = f_lat
         self.longitude = f_lon


@@ -164,7 +215,7 @@ class Trace < ActiveRecord::Base
         self.icon_picture = gpx.get_icon(min_lat, min_lon, max_lat, max_lon)
         self.size = gpx.actual_points
         self.inserted = true
         self.icon_picture = gpx.get_icon(min_lat, min_lon, max_lat, max_lon)
         self.size = gpx.actual_points
         self.inserted = true

-        self.save
+        self.save!

       end
 
       logger.info "done trace #{id}"
       end
 
       logger.info "done trace #{id}"