X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/221ca3c1fa985c02243a3c650c828023c1011484..34e3e51456774127d43408b7ab65c24f41373f62:/app/models/trace.rb

diff --git a/app/models/trace.rb b/app/models/trace.rb
index bc47aa8e0..bf3e4ef93 100644
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -5,9 +5,10 @@ class Trace < ActiveRecord::Base
   has_many :tags, :class_name => 'Tracetag', :foreign_key => 'gpx_id', :dependent => :delete_all
   has_many :points, :class_name => 'Tracepoint', :foreign_key => 'gpx_id', :dependent => :delete_all
 
-  scope :visible, where(:visible => true)
-  scope :visible_to, lambda { |u| visible.where("visibility IN ('public', 'identifiable') OR user_id = ?", u) }
-  scope :public, where(:visibility => ["public", "identifiable"])
+  scope :visible, -> { where(:visible => true) }
+  scope :visible_to, ->(u) { visible.where("visibility IN ('public', 'identifiable') OR user_id = ?", u) }
+  scope :visible_to_all, -> { where(:visibility => ["public", "identifiable"]) }
+  scope :tagged, ->(t) { joins(:tags).where(:gpx_file_tags => { :tag => t }) }
 
   validates_presence_of :user_id, :name, :timestamp
   validates_presence_of :description, :on => :create
@@ -62,7 +63,7 @@ class Trace < ActiveRecord::Base
     f.syswrite(data)
     f.close
   end
-  
+
   def icon_picture= (data)
     f = File.new(icon_picture_name, "wb")
     f.syswrite(data)
@@ -77,7 +78,7 @@ class Trace < ActiveRecord::Base
     f.close
     data
   end
-  
+
   def icon_picture
     f = File.new(icon_picture_name, "rb")
     logger.info "icon picture file: '#{f.path}'"
@@ -85,7 +86,7 @@ class Trace < ActiveRecord::Base
     f.close
     data
   end
-  
+
   def large_picture_name
     "#{GPX_IMAGE_DIR}/#{id}.gif"
   end
@@ -111,7 +112,7 @@ class Trace < ActiveRecord::Base
     elsif zipped
       mimetype = "application/x-zip"
     else
-      mimetype = "text/xml"
+      mimetype = "application/gpx+xml"
     end
 
     return mimetype
@@ -191,14 +192,14 @@ class Trace < ActiveRecord::Base
 
   def self.from_xml_node(pt, create=false)
     trace = Trace.new
-    
+
     raise OSM::APIBadXMLError.new("trace", pt, "visibility missing") if pt['visibility'].nil?
     trace.visibility = pt['visibility']
 
     unless create
       raise OSM::APIBadXMLError.new("trace", pt, "ID is required when updating.") if pt['id'].nil?
       trace.id = pt['id'].to_i
-      # .to_i will return 0 if there is no number that can be parsed. 
+      # .to_i will return 0 if there is no number that can be parsed.
       # We want to make sure that there is no id with zero anyway
       raise OSM::APIBadUserInput.new("ID of trace cannot be zero when updating.") if trace.id == 0
     end
@@ -288,10 +289,10 @@ class Trace < ActiveRecord::Base
     end
 
     if gpx.actual_points > 0
-      max_lat = Tracepoint.maximum('latitude', :conditions => ['gpx_id = ?', id])
-      min_lat = Tracepoint.minimum('latitude', :conditions => ['gpx_id = ?', id])
-      max_lon = Tracepoint.maximum('longitude', :conditions => ['gpx_id = ?', id])
-      min_lon = Tracepoint.minimum('longitude', :conditions => ['gpx_id = ?', id])
+      max_lat = Tracepoint.where(:gpx_id => id).maximum(:latitude)
+      min_lat = Tracepoint.where(:gpx_id => id).minimum(:latitude)
+      max_lon = Tracepoint.where(:gpx_id => id).maximum(:longitude)
+      min_lon = Tracepoint.where(:gpx_id => id).minimum(:longitude)
 
       max_lat = max_lat.to_f / 10000000
       min_lat = min_lat.to_f / 10000000