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

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

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 3a0793972a4b78c0f9224c3eb15b2c7829e607bd..b3d87fc0947be767264db9300b5426b909375415 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -53,7 +53,7 @@ class Trace < ApplicationRecord
 
   def tagstring=(s)
     self.tags = if s.include? ","
-                  s.split(/\s*,\s*/).reject { |tag| tag =~ /^\s*$/ }.collect do |tag|
+                  s.split(/\s*,\s*/).grep_v(/^\s*$/).collect do |tag|
                     tt = Tracetag.new
                     tt.tag = tag
                     tt
@@ -162,13 +162,13 @@ class Trace < ApplicationRecord
     end
   end
 
-  def update_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
     pt = doc.find_first("//osm/gpx_file")
 
     if pt
-      update_from_xml_node(pt, create)
+      update_from_xml_node(pt, :create => create)
     else
       raise OSM::APIBadXMLError.new("trace", xml, "XML doesn't contain an osm/gpx_file element.")
     end
@@ -176,7 +176,7 @@ class Trace < ApplicationRecord
     raise OSM::APIBadXMLError.new("trace", xml, e.message)
   end
 
-  def update_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"]