X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/64146b4f3614854e6a0f8430f27261fe0a0ca26c..083500f056f5b995f1979f88b37793046d9e4d37:/app/models/relation.rb diff --git a/app/models/relation.rb b/app/models/relation.rb index 42ac3d6dc..202db12da 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -275,7 +275,7 @@ class Relation < ActiveRecord::Base def fix_placeholders!(id_map, placeholder_id = nil) members.map! do |type, id, role| old_id = id.to_i - if old_id < 0 + if old_id.negative? new_id = id_map[type.downcase.to_sym][old_id] raise OSM::APIBadUserInput, "Placeholder #{type} not found for reference #{old_id} in relation #{self.id.nil? ? placeholder_id : self.id}." if new_id.nil? @@ -381,7 +381,7 @@ class Relation < ActiveRecord::Base # reasonable on the assumption that adding or removing members doesn't # materially change the rest of the relation. any_relations = - changed_members.collect { |_id, type| type == "relation" } + changed_members.collect { |type, _id, _role| type == "Relation" } .inject(false) { |acc, elem| acc || elem } update_members = if tags_changed || any_relations