X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8dbaf76e7cbdaa3aa0c6a9ac8d1fb886c1fe9fcd..655dc6787e9092a004b582b52ff8e9ccd0d40bb3:/app/models/trace.rb

diff --git a/app/models/trace.rb b/app/models/trace.rb
index a0ec22dee..7f2607b0f 100644
--- 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_length_of :name, :maximum => 255
+  validates_length_of :description, :maximum => 255
 #  validates_numericality_of :latitude, :longitude
   validates_inclusion_of :public, :inserted, :in => [ true, false]
   
@@ -18,15 +20,24 @@ class Trace < ActiveRecord::Base
   end
 
   def tagstring
-    return tags.collect {|tt| tt.tag}.join(" ")
+    return tags.collect {|tt| tt.tag}.join(", ")
   end
 
   def tagstring=(s)
-    self.tags = s.split().collect {|tag|
-      tt = Tracetag.new
-      tt.tag = tag
-      tt
-    }
+    if s.include?','
+      self.tags = s.split(/\s*,\s*/).collect {|tag|
+        tt = Tracetag.new
+        tt.tag = tag
+        tt
+      }
+    else
+      #do as before for backwards compatibility:
+      self.tags = s.split().collect {|tag|
+        tt = Tracetag.new
+        tt.tag = tag
+        tt
+      }
+    end
   end
   
   def large_picture= (data)
@@ -58,18 +69,16 @@ class Trace < ActiveRecord::Base
     data
   end
   
-  # FIXME change to permanent filestore area
   def large_picture_name
-    "/home/osm/icons/#{id}.gif"
+    "#{GPX_IMAGE_DIR}/#{id}.gif"
   end
 
-  # FIXME change to permanent filestore area
   def icon_picture_name
-    "/home/osm/icons/#{id}_icon.gif"
+    "#{GPX_IMAGE_DIR}/#{id}_icon.gif"
   end
 
   def trace_name
-    "/home/osm/gpx/#{id}.gpx"
+    "#{GPX_TRACE_DIR}/#{id}.gpx"
   end
 
   def mime_type