cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename xml processing methods with an update_ prefix

Browse source 
They behave differently from the other from_xml methods on other models.
This commit is contained in:
Andy Allan 2017-08-30 11:40:54 +01:00
parent c647aa3d4d
commit b4be5596f5
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/trace_controller.rb
View file

@ -263,7 +263,7 @@ class TraceController < ApplicationController
trace = Trace.visible.find(params[:id]) trace = Trace.visible.find(params[:id])
if trace.user == current_user if trace.user == current_user
trace.from_xml(request.raw_post) trace.update_from_xml(request.raw_post)
trace.save! trace.save!
head :ok head :ok

6
app/models/trace.rb
View file

@ -172,12 +172,12 @@ class Trace < ActiveRecord::Base
el1 el1
end end
def from_xml(xml, create = false) def update_from_xml(xml, create = false)
p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR) p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR)
doc = p.parse doc = p.parse
doc.find("//osm/gpx_file").each do |pt| doc.find("//osm/gpx_file").each do |pt|
return from_xml_node(pt, create) return update_from_xml_node(pt, create)
end end
raise 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.")
@ -185,7 +185,7 @@ class Trace < ActiveRecord::Base
raise OSM::APIBadXMLError.new("trace", xml, ex.message) raise OSM::APIBadXMLError.new("trace", xml, ex.message)
end end
def from_xml_node(pt, create = false) def update_from_xml_node(pt, create = false)
raise OSM::APIBadXMLError.new("trace", pt, "visibility missing") if pt["visibility"].nil? raise OSM::APIBadXMLError.new("trace", pt, "visibility missing") if pt["visibility"].nil?
self.visibility = pt["visibility"] self.visibility = pt["visibility"]