Use correct link for users with no location

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

diff --git a/app/models/way.rb b/app/models/way.rb
index d0d1e2a2e43836a52018a93213a2cc463850e4a8..7bb82b281bc4e10603ea2ffc29eee928c4ff9709 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -52,19 +52,21 @@ class Way < ApplicationRecord
   scope :invisible, -> { where(:visible => false) }
 
   # Read in xml as text and return it's Way object representation
   scope :invisible, -> { where(:visible => false) }
 
   # Read in xml as text and return it's Way object representation

-  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/way")

 
 

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

     end
     end

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

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

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

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


@@ -111,12 +113,10 @@ class Way < ApplicationRecord
   end
 
   def tags
   end
 
   def tags

-    @tags ||= Hash[way_tags.collect { |t| [t.k, t.v] }]
+    @tags ||= way_tags.collect { |t| [t.k, t.v] }.to_h

   end
 
   end
 

-  attr_writer :nds
-
-  attr_writer :tags
+  attr_writer :nds, :tags

 
   def add_nd_num(n)
     @nds ||= []
 
   def add_nd_num(n)
     @nds ||= []