Rename xml processing methods with an update_ prefix

They behave differently from the other from_xml methods on other models.

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 4e10a6c0cc87cca968216c10d4bb686b4ed93efb..41c488e0fdbe601422d1b7be6daf5e0b0a7fce73 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -263,7 +263,7 @@ class TraceController < ApplicationController
     trace = Trace.visible.find(params[:id])
 
     if trace.user == current_user
-      trace.from_xml(request.raw_post)
+      trace.update_from_xml(request.raw_post)
       trace.save!
 
       head :ok

diff --git a/app/models/trace.rb b/app/models/trace.rb
index b7b96c65e6ea4b1dd4e94823dab2dd377d42bd07..160060a6d9126b07c7366ab82a547f335ba883fe 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -172,12 +172,12 @@ class Trace < ActiveRecord::Base
     el1
   end
 
-  def from_xml(xml, create = false)
+  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 from_xml_node(pt, create)
+      return update_from_xml_node(pt, create)
     end
 
     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)
   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?
     self.visibility = pt["visibility"]