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 => %w(public identifiable)) }
+ scope :visible_to_all, -> { where(:visibility => %w[public identifiable]) }
scope :tagged, ->(t) { joins(:tags).where(:gpx_file_tags => { :tag => t }) }
validates :user, :presence => true, :associated => true
validates :name, :presence => true, :length => 1..255
validates :description, :presence => { :on => :create }, :length => 1..255
validates :timestamp, :presence => true
- validates :visibility, :inclusion => %w(private public trackable identifiable)
+ validates :visibility, :inclusion => %w[private public trackable identifiable]
def destroy
super
end
def tagstring=(s)
- if s.include? ","
- self.tags = s.split(/\s*,\s*/).select { |tag| tag !~ /^\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
+ self.tags = if s.include? ","
+ s.split(/\s*,\s*/).reject { |tag| tag =~ /^\s*$/ }.collect do |tag|
+ tt = Tracetag.new
+ tt.tag = tag
+ tt
+ end
+ else
+ # do as before for backwards compatibility:
+ s.split.collect do |tag|
+ tt = Tracetag.new
+ tt.tag = tag
+ tt
+ end
+ end
end
def public?
def large_picture
f = File.new(large_picture_name, "rb")
- logger.info "large picture file: '#{f.path}', bytes: #{File.size(f.path)}"
data = f.sysread(File.size(f.path))
- logger.info "have read data, bytes: '#{data.length}'"
f.close
data
end
def icon_picture
f = File.new(icon_picture_name, "rb")
- logger.info "icon picture file: '#{f.path}'"
data = f.sysread(File.size(f.path))
f.close
data
end
def mime_type
- filetype = `/usr/bin/file -bz #{trace_name}`.chomp
+ filetype = `/usr/bin/file -Lbz #{trace_name}`.chomp
gzipped = filetype =~ /gzip compressed/
bzipped = filetype =~ /bzip2 compressed/
zipped = filetype =~ /Zip archive/
+ tarred = filetype =~ /tar archive/
- if gzipped
- mimetype = "application/x-gzip"
- elsif bzipped
- mimetype = "application/x-bzip2"
- elsif zipped
- mimetype = "application/x-zip"
- else
- mimetype = "application/gpx+xml"
- end
+ mimetype = if gzipped
+ "application/x-gzip"
+ elsif bzipped
+ "application/x-bzip2"
+ elsif zipped
+ "application/x-zip"
+ elsif tarred
+ "application/x-tar"
+ else
+ "application/gpx+xml"
+ end
mimetype
end
def extension_name
- filetype = `/usr/bin/file -bz #{trace_name}`.chomp
+ filetype = `/usr/bin/file -Lbz #{trace_name}`.chomp
gzipped = filetype =~ /gzip compressed/
bzipped = filetype =~ /bzip2 compressed/
zipped = filetype =~ /Zip archive/
tarred = filetype =~ /tar archive/
- if tarred && gzipped
- extension = ".tar.gz"
- elsif tarred && bzipped
- extension = ".tar.bz2"
- elsif tarred
- extension = ".tar"
- elsif gzipped
- extension = ".gpx.gz"
- elsif bzipped
- extension = ".gpx.bz2"
- elsif zipped
- extension = ".zip"
- else
- extension = ".gpx"
- end
+ extension = if tarred && gzipped
+ ".tar.gz"
+ elsif tarred && bzipped
+ ".tar.bz2"
+ elsif tarred
+ ".tar"
+ elsif gzipped
+ ".gpx.gz"
+ elsif bzipped
+ ".gpx.bz2"
+ elsif zipped
+ ".zip"
+ else
+ ".gpx"
+ end
extension
end
el1["lon"] = longitude.to_s if inserted
el1["user"] = user.display_name
el1["visibility"] = visibility
- el1["pending"] = (!inserted).to_s
+ el1["pending"] = inserted ? "false" : "true"
el1["timestamp"] = timestamp.xmlschema
el2 = XML::Node.new "description"
el1
end
- # Read in xml as text and return it's Node object representation
- def self.from_xml(xml, create = false)
- p = XML::Parser.string(xml)
+ def update_from_xml(xml, create = false)
+ p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR)
doc = p.parse
doc.find("//osm/gpx_file").each do |pt|
- return Trace.from_xml_node(pt, create)
+ return update_from_xml_node(pt, create)
end
- fail OSM::APIBadXMLError.new("trace", xml, "XML doesn't contain an osm/gpx_file element.")
+ raise OSM::APIBadXMLError.new("trace", xml, "XML doesn't contain an osm/gpx_file element.")
rescue LibXML::XML::Error, ArgumentError => ex
raise OSM::APIBadXMLError.new("trace", xml, ex.message)
end
- def self.from_xml_node(pt, create = false)
- trace = Trace.new
-
- fail OSM::APIBadXMLError.new("trace", pt, "visibility missing") if pt["visibility"].nil?
- trace.visibility = pt["visibility"]
+ def update_from_xml_node(pt, create = false)
+ raise OSM::APIBadXMLError.new("trace", pt, "visibility missing") if pt["visibility"].nil?
+ self.visibility = pt["visibility"]
unless create
- fail OSM::APIBadXMLError.new("trace", pt, "ID is required when updating.") if pt["id"].nil?
- trace.id = pt["id"].to_i
+ raise OSM::APIBadXMLError.new("trace", pt, "ID is required when updating.") if pt["id"].nil?
+ id = pt["id"].to_i
# .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
- fail OSM::APIBadUserInput.new("ID of trace cannot be zero when updating.") if trace.id == 0
+ raise OSM::APIBadUserInput, "ID of trace cannot be zero when updating." if id.zero?
+ raise OSM::APIBadUserInput, "The id in the url (#{self.id}) is not the same as provided in the xml (#{id})" unless self.id == id
end
# We don't care about the time, as it is explicitly set on create/update/delete
# We don't care about the visibility as it is implicit based on the action
# and set manually before the actual delete
- trace.visible = true
+ self.visible = true
description = pt.find("description").first
- fail OSM::APIBadXMLError.new("trace", pt, "description missing") if description.nil?
- trace.description = description.content
+ raise OSM::APIBadXMLError.new("trace", pt, "description missing") if description.nil?
+ self.description = description.content
- pt.find("tag").each do |tag|
- trace.tags.build(:tag => tag.content)
+ self.tags = pt.find("tag").collect do |tag|
+ Tracetag.new(:tag => tag.content)
end
-
- trace
end
def xml_file
# TODO: *nix specific, could do to work on windows... would be functionally inferior though - check for '.gz'
- filetype = `/usr/bin/file -bz #{trace_name}`.chomp
+ filetype = `/usr/bin/file -Lbz #{trace_name}`.chomp
gzipped = filetype =~ /gzip compressed/
bzipped = filetype =~ /bzip2 compressed/
zipped = filetype =~ /Zip archive/
elsif bzipped
system("bunzip2 -c #{trace_name} > #{tmpfile.path}")
elsif zipped
- system("unzip -p #{trace_name} -x '__MACOSX/*' > #{tmpfile.path}")
+ system("unzip -p #{trace_name} -x '__MACOSX/*' > #{tmpfile.path} 2> /dev/null")
end
tmpfile.unlink
f_lon = 0
first = true
- # 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.where(:gpx_id => id).exists?
- Tracepoint.delete_all(:gpx_id => id)
- end
+ # If there are any existing points for this trace then delete them
+ Tracepoint.where(:gpx_id => id).delete_all
gpx.points do |point|
if first
self.icon_picture = gpx.icon(min_lat, min_lon, max_lat, max_lon)
self.size = gpx.actual_points
self.inserted = true
- self.save!
+ save!
end
logger.info "done trace #{id}"
projects / rails.git / blobdiff