X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/92feab9112e64b8aab280cb90d5a5fef75646e3b..f6c7ed601159aca360da09948f1544172ddf1a41:/app/models/node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index 537872459..81b910f37 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"
 
@@ -82,8 +83,8 @@ class Node < ActiveRecord::Base
     
     raise OSM::APIBadXMLError.new("node", pt, "lat missing") if pt['lat'].nil?
     raise OSM::APIBadXMLError.new("node", pt, "lon missing") if pt['lon'].nil?
-    node.lat = pt['lat'].to_f
-    node.lon = pt['lon'].to_f
+    node.lat = OSM.parse_float(pt['lat'], OSM::APIBadXMLError, "node", pt, "lat not a number")
+    node.lon = OSM.parse_float(pt['lon'], OSM::APIBadXMLError, "node", pt, "lon not a number")
     raise OSM::APIBadXMLError.new("node", pt, "Changeset id is missing") if pt['changeset'].nil?
     node.changeset_id = pt['changeset'].to_i
 
@@ -200,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