X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5a8c4faf3ebf4e80bd41b2f281bc3c23309739d5..898cc828dd1f1167f85abbf35c8e3f0ed640ac1e:/app/models/node.rb diff --git a/app/models/node.rb b/app/models/node.rb index 96d927b2c..2f528076e 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -3,6 +3,7 @@ class Node < ActiveRecord::Base include GeoRecord include ConsistencyValidations + include NotRedactable self.table_name = "current_nodes" @@ -106,6 +107,10 @@ class Node < ActiveRecord::Base # and set manually before the actual delete node.visible = true + # Start with no tags + node.tags = Hash.new + + # Add in any tags from the XML pt.find('tag').each do |tag| raise OSM::APIBadXMLError.new("node", pt, "tag is missing key") if tag['k'].nil? raise OSM::APIBadXMLError.new("node", pt, "tag is missing value") if tag['v'].nil? @@ -196,11 +201,14 @@ class Node < ActiveRecord::Base def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) el1 = XML::Node.new 'node' el1['id'] = self.id.to_s - el1['lat'] = self.lat.to_s - el1['lon'] = self.lon.to_s el1['version'] = self.version.to_s el1['changeset'] = self.changeset_id.to_s + if self.visible? + el1['lat'] = self.lat.to_s + el1['lon'] = self.lon.to_s + end + if changeset_cache.key?(self.changeset_id) # use the cache if available else