various gpx bits

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

diff --git a/app/models/trace.rb b/app/models/trace.rb
index e98b0c67ca33afe2e9358a4832d5597d8e9fbee6..0d9e8861d1d8bbb4c94222a28a835270705626bd 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -7,6 +7,7 @@ class Trace < ActiveRecord::Base
   
   belongs_to :user
   has_many :tags, :class_name => 'Tracetag', :foreign_key => 'gpx_id', :dependent => :destroy
+  has_many :points, :class_name => 'Tracepoint', :foreign_key => 'gpx_id', :dependent => :destroy
 
   def tagstring=(s)
     self.tags = s.split().collect {|tag|
@@ -47,12 +48,12 @@ class Trace < ActiveRecord::Base
   
   # FIXME change to permanent filestore area
   def large_picture_name
-    "/tmp/#{id}.gif"
+    "/home/osm/icons/#{id}.gif"
   end
 
   # FIXME change to permanent filestore area
   def icon_picture_name
-    "/tmp/#{id}_icon.gif"
+    "/home/osm/icons/#{id}_icon.gif"
   end
 
   def to_xml_node
@@ -62,7 +63,8 @@ class Trace < ActiveRecord::Base
     el1['lat'] = self.latitude.to_s
     el1['lon'] = self.longitude.to_s
     el1['user'] = self.user.display_name
-    el1['public'] = self.user.public
+    el1['public'] = self.public.to_s
+    el1['pending'] = (!self.inserted).to_s
     el1['timestamp'] = self.timestamp.xmlschema
     return el1
   end