Added tranlations to trace/_trace

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

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 0e9e7bcc1598df1ffd54f447f18afa75d6fbae1a..03dbeb0b35d53206753972cc3da8f3422f15d3cc 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -3,6 +3,8 @@ class Trace < ActiveRecord::Base
 
   validates_presence_of :user_id, :name, :timestamp
   validates_presence_of :description, :on => :create
 
   validates_presence_of :user_id, :name, :timestamp
   validates_presence_of :description, :on => :create

+  validates_length_of :name, :maximum => 255
+  validates_length_of :description, :maximum => 255

 #  validates_numericality_of :latitude, :longitude
   validates_inclusion_of :public, :inserted, :in => [ true, false]
   
 #  validates_numericality_of :latitude, :longitude
   validates_inclusion_of :public, :inserted, :in => [ true, false]
   


@@ -58,18 +60,16 @@ class Trace < ActiveRecord::Base
     data
   end
   
     data
   end
   

-  # FIXME change to permanent filestore area

   def large_picture_name
   def large_picture_name

-    "/home/osm/icons/#{id}.gif"
+    "#{GPX_IMAGE_DIR}/#{id}.gif"

   end
 
   end
 

-  # FIXME change to permanent filestore area

   def icon_picture_name
   def icon_picture_name

-    "/home/osm/icons/#{id}_icon.gif"
+    "#{GPX_IMAGE_DIR}/#{id}_icon.gif"

   end
 
   def trace_name
   end
 
   def trace_name

-    "/home/osm/gpx/#{id}.gpx"
+    "#{GPX_TRACE_DIR}/#{id}.gpx"

   end
 
   def mime_type
   end
 
   def mime_type


@@ -158,7 +158,7 @@ class Trace < ActiveRecord::Base
       elsif bzipped
         system("bunzip2 -c #{trace_name} > #{tmpfile.path}")
       elsif zipped
       elsif bzipped
         system("bunzip2 -c #{trace_name} > #{tmpfile.path}")
       elsif zipped

-        system("unzip -p #{trace_name} > #{tmpfile.path}")
+        system("unzip -p #{trace_name} -x '__MACOSX/*' > #{tmpfile.path}")

       end
 
       tmpfile.unlink
       end
 
       tmpfile.unlink


@@ -174,7 +174,7 @@ class Trace < ActiveRecord::Base
   def import
     logger.info("GPX Import importing #{name} (#{id}) from #{user.email}")
 
   def import
     logger.info("GPX Import importing #{name} (#{id}) from #{user.email}")
 

-    gpx = OSM::GPXImporter.new(self.xml_file)
+    gpx = GPX::File.new(self.xml_file)

 
     f_lat = 0
     f_lon = 0
 
     f_lat = 0
     f_lon = 0


@@ -183,24 +183,24 @@ class Trace < ActiveRecord::Base
     # 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 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])
+    if Tracepoint.find(:first, :conditions => ['gpx_id = ?', self.id])

       Tracepoint.delete_all(['gpx_id = ?', self.id])
     end
 
     gpx.points do |point|
       if first
       Tracepoint.delete_all(['gpx_id = ?', self.id])
     end
 
     gpx.points do |point|
       if first

-        f_lat = point['latitude']
-        f_lon = point['longitude']
+        f_lat = point.latitude
+        f_lon = point.longitude

         first = false
       end
 
       tp = Tracepoint.new
         first = false
       end
 
       tp = Tracepoint.new

-      tp.lat = point['latitude'].to_f
-      tp.lon = point['longitude'].to_f
-      tp.altitude = point['altitude'].to_f
-      tp.timestamp = point['timestamp']
+      tp.lat = point.latitude
+      tp.lon = point.longitude
+      tp.altitude = point.altitude
+      tp.timestamp = point.timestamp

       tp.gpx_id = id
       tp.gpx_id = id

-      tp.trackid = point['segment'].to_i
+      tp.trackid = point.segment

       tp.save!
     end
 
       tp.save!
     end
 


@@ -217,8 +217,8 @@ class Trace < ActiveRecord::Base
 
       self.latitude = f_lat
       self.longitude = f_lon
 
       self.latitude = f_lat
       self.longitude = f_lon

-      self.large_picture = gpx.get_picture(min_lat, min_lon, max_lat, max_lon, gpx.actual_points)
-      self.icon_picture = gpx.get_icon(min_lat, min_lon, max_lat, max_lon)
+      self.large_picture = gpx.picture(min_lat, min_lon, max_lat, max_lon, gpx.actual_points)
+      self.icon_picture = gpx.icon(min_lat, min_lon, max_lat, max_lon)

       self.size = gpx.actual_points
       self.inserted = true
       self.save!
       self.size = gpx.actual_points
       self.inserted = true
       self.save!