Merge remote-tracking branch 'upstream/pull/3077'

[rails.git] / app / models / relation.rb

diff --git a/app/models/relation.rb b/app/models/relation.rb
index dc2b71ac4193f292ea6febf9e9df8176cc606647..5ed838e107ea270671c7551d440ad0e014be6aae 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -17,7 +17,7 @@
 #  current_relations_changeset_id_fkey  (changeset_id => changesets.id)
 #
 
 #  current_relations_changeset_id_fkey  (changeset_id => changesets.id)
 #
 

-class Relation < ActiveRecord::Base
+class Relation < ApplicationRecord

   require "xml/libxml"
 
   include ConsistencyValidations
   require "xml/libxml"
 
   include ConsistencyValidations


@@ -54,19 +54,21 @@ class Relation < ActiveRecord::Base
 
   TYPES = %w[node way relation].freeze
 
 
   TYPES = %w[node way relation].freeze
 

-  def self.from_xml(xml, create = false)
+  def self.from_xml(xml, create: false)

     p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR)
     doc = p.parse
     p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR)
     doc = p.parse

+    pt = doc.find_first("//osm/relation")

 
 

-    doc.find("//osm/relation").each do |pt|
-      return Relation.from_xml_node(pt, create)
+    if pt
+      Relation.from_xml_node(pt, :create => create)
+    else
+      raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/relation element.")

     end
     end

-    raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/relation element.")

   rescue LibXML::XML::Error, ArgumentError => e
     raise OSM::APIBadXMLError.new("relation", xml, e.message)
   end
 
   rescue LibXML::XML::Error, ArgumentError => e
     raise OSM::APIBadXMLError.new("relation", xml, e.message)
   end
 

-  def self.from_xml_node(pt, create = false)
+  def self.from_xml_node(pt, create: false)

     relation = Relation.new
 
     raise OSM::APIBadXMLError.new("relation", pt, "Version is required when updating") unless create || !pt["version"].nil?
     relation = Relation.new
 
     raise OSM::APIBadXMLError.new("relation", pt, "Version is required when updating") unless create || !pt["version"].nil?


@@ -121,31 +123,6 @@ class Relation < ActiveRecord::Base
     relation
   end
 
     relation
   end
 

-  def to_xml
-    doc = OSM::API.new.get_xml_doc
-    doc.root << to_xml_node
-    doc
-  end
-
-  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
-    el = XML::Node.new "relation"
-    el["id"] = id.to_s
-
-    add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
-
-    relation_members.each do |member|
-      member_el = XML::Node.new "member"
-      member_el["type"] = member.member_type.downcase
-      member_el["ref"] = member.member_id.to_s
-      member_el["role"] = member.member_role
-      el << member_el
-    end
-
-    add_tags_to_xml_node(el, relation_tags)
-
-    el
-  end
-

   # FIXME: is this really needed?
   def members
     @members ||= relation_members.map do |member|
   # FIXME: is this really needed?
   def members
     @members ||= relation_members.map do |member|


@@ -157,9 +134,7 @@ class Relation < ActiveRecord::Base
     @tags ||= Hash[relation_tags.collect { |t| [t.k, t.v] }]
   end
 
     @tags ||= Hash[relation_tags.collect { |t| [t.k, t.v] }]
   end
 

-  attr_writer :members
-
-  attr_writer :tags
+  attr_writer :members, :tags

 
   def add_member(type, id, role)
     @members ||= []
 
   def add_member(type, id, role)
     @members ||= []