X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/52f755cb27dd7dad2fe65a3deb5d4591c6675dec..8f7f02b025f59db466fdb22ea3686cb6c5adc400:/app/models/trace.rb
diff --git a/app/models/trace.rb b/app/models/trace.rb
index 1e8f25a83..4d71b4b29 100644
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -38,6 +38,7 @@ class Trace < ApplicationRecord
scope :visible_to, ->(u) { visible.where(:visibility => %w[public identifiable]).or(visible.where(:user => u)) }
scope :visible_to_all, -> { where(:visibility => %w[public identifiable]) }
scope :tagged, ->(t) { joins(:tags).where(:gpx_file_tags => { :tag => t }) }
+ scope :imported, -> { where(:inserted => true) }
has_one_attached :file, :service => Settings.trace_file_storage
has_one_attached :image, :service => Settings.trace_image_storage
@@ -80,16 +81,16 @@ class Trace < ApplicationRecord
:content_type => content_type(attachable.path),
:identify => false)
else
- super(attachable)
+ super
end
end
def public?
- visibility == "public" || visibility == "identifiable"
+ %w[public identifiable].include?(visibility)
end
def trackable?
- visibility == "trackable" || visibility == "identifiable"
+ %w[trackable identifiable].include?(visibility)
end
def identifiable?
@@ -202,7 +203,7 @@ class Trace < ApplicationRecord
logger.info("GPX Import importing #{name} (#{id}) from #{user.email}")
file.open do |file|
- gpx = GPX::File.new(file.path)
+ gpx = GPX::File.new(file.path, :maximum_points => Settings.max_trace_size)
f_lat = 0
f_lon = 0