Make trace API a proper CRUD API like other object types
This commit is contained in:
parent
9caa2046ca
commit
71f1554212
5 changed files with 203 additions and 35 deletions
|
@ -169,6 +169,52 @@ class Trace < ActiveRecord::Base
|
|||
return el1
|
||||
end
|
||||
|
||||
# Read in xml as text and return it's Node object representation
|
||||
def self.from_xml(xml, create=false)
|
||||
begin
|
||||
p = XML::Parser.string(xml)
|
||||
doc = p.parse
|
||||
|
||||
doc.find('//osm/gpx_file').each do |pt|
|
||||
return Trace.from_xml_node(pt, create)
|
||||
end
|
||||
|
||||
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
|
||||
end
|
||||
|
||||
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.
|
||||
# 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
|
||||
|
||||
# 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
|
||||
|
||||
description = pt.find('description').first
|
||||
raise OSM::APIBadXMLError.new("trace", pt, "description missing") if description.nil?
|
||||
trace.description = description.content
|
||||
|
||||
pt.find('tag').each do |tag|
|
||||
trace.tags.build(:tag => tag.content)
|
||||
end
|
||||
|
||||
return 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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue