X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/81021a108151270e1aef4570ded6f7aeed901722..c3424e9cfb2542dedbf545a76d4ddb591c59df3d:/app/models/trace.rb

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 11f912b69..baf2ea7d2 100644
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -1,10 +1,10 @@
 class Trace < ActiveRecord::Base
   set_table_name 'gpx_files'
 
-  validates_presence_of :user_id, :name, :public, :timestamp
+  validates_presence_of :user_id, :name, :timestamp
   validates_presence_of :description, :on => :create
 #  validates_numericality_of :latitude, :longitude
-  validates_inclusion_of :inserted, :in => [ true, false]
+  validates_inclusion_of :public, :inserted, :in => [ true, false]
   
   belongs_to :user
   has_many :tags, :class_name => 'Tracetag', :foreign_key => 'gpx_id', :dependent => :delete_all
@@ -12,7 +12,13 @@ class Trace < ActiveRecord::Base
 
   def destroy
     super
-    FileUtils.rm_f(trace_name, icon_picture_name, large_picture_name)
+    FileUtils.rm_f(trace_name)
+    FileUtils.rm_f(icon_picture_name)
+    FileUtils.rm_f(large_picture_name)
+  end
+
+  def tagstring
+    return tags.collect {|tt| tt.tag}.join(" ")
   end
 
   def tagstring=(s)
@@ -66,6 +72,57 @@ class Trace < ActiveRecord::Base
     "/home/osm/gpx/#{id}.gpx"
   end
 
+  def mime_type
+    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
     el1 = XML::Node.new 'gpx_file'
     el1['id'] = self.id.to_s
@@ -84,13 +141,27 @@ 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'
-      filetype = `file -b #{trace_name}`.chomp
-      gzipped = filetype =~ /^gzip/
-      zipped = filetype =~ /^Zip/
+      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 gzipped
+      if tarred and gzipped then
+        filename = tempfile = "/tmp/#{rand}"
+        system("tar -zxOf #{trace_name} > #{filename}")
+      elsif tarred and bzipped then
+        filename = tempfile = "/tmp/#{rand}"
+        system("tar -jxOf #{trace_name} > #{filename}")
+      elsif tarred
+        filename = tempfile = "/tmp/#{rand}"
+        system("tar -xOf #{trace_name} > #{filename}")
+      elsif gzipped
         filename = tempfile = "/tmp/#{rand}"
         system("gunzip -c #{trace_name} > #{filename}")
+      elsif bzipped
+        filename = tempfile = "/tmp/#{rand}"
+        system("bunzip2 -c #{trace_name} > #{filename}")
       elsif zipped
         filename = tempfile = "/tmp/#{rand}"
         system("unzip -p #{trace_name} > #{filename}")
@@ -104,7 +175,12 @@ class Trace < ActiveRecord::Base
       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
@@ -114,10 +190,9 @@ class Trace < ActiveRecord::Base
 
         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.user_id = user.id
         tp.gpx_id = id
         tp.trackid = point['segment'].to_i
         tp.save!
@@ -129,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_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
@@ -140,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.save
+        self.save!
       end
 
       logger.info "done trace #{id}"