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

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

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 502637c2a69b8926fc84a4dac6b2403f152574d4..5cdfeb994544444f08edb72cc4f8ba42fead569d 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -106,6 +106,7 @@ class Changeset < ActiveRecord::Base
     pt.find("tag").each do |tag|
       raise OSM::APIBadXMLError.new("changeset", pt, "tag is missing key") if tag["k"].nil?
       raise OSM::APIBadXMLError.new("changeset", pt, "tag is missing value") if tag["v"].nil?
     pt.find("tag").each do |tag|
       raise OSM::APIBadXMLError.new("changeset", pt, "tag is missing key") if tag["k"].nil?
       raise OSM::APIBadXMLError.new("changeset", pt, "tag is missing value") if tag["v"].nil?

+

       cs.add_tag_keyval(tag["k"], tag["v"])
     end
 
       cs.add_tag_keyval(tag["k"], tag["v"])
     end
 


@@ -207,7 +208,7 @@ class Changeset < ActiveRecord::Base
 
     user_display_name_cache = {} if user_display_name_cache.nil?
 
 
     user_display_name_cache = {} if user_display_name_cache.nil?
 

-    if user_display_name_cache && user_display_name_cache.key?(user_id)
+    if user_display_name_cache&.key?(user_id)

       # use the cache if available
     elsif user.data_public?
       user_display_name_cache[user_id] = user.display_name
       # use the cache if available
     elsif user.data_public?
       user_display_name_cache[user_id] = user.display_name


@@ -232,6 +233,7 @@ class Changeset < ActiveRecord::Base
     bbox.to_unscaled.add_bounds_to(el1, "_") if bbox.complete?
 
     el1["comments_count"] = comments.length.to_s
     bbox.to_unscaled.add_bounds_to(el1, "_") if bbox.complete?
 
     el1["comments_count"] = comments.length.to_s

+    el1["changes_count"] = num_changes.to_s

 
     if include_discussion
       el2 = XML::Node.new("discussion")
 
     if include_discussion
       el2 = XML::Node.new("discussion")