X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/df11677afd55ef592330a05c43ed4baa81b60572..b8a7d956bfe177e5b576ba6cfc9cb8a7eff5ec83:/app/models/node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index acd251918..29b1d0b0a 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -57,7 +57,7 @@ class Node < GeoRecord
       doc = p.parse
 
       doc.find('//osm/node').each do |pt|
-	return Node.from_xml_node(pt, create)
+        return Node.from_xml_node(pt, create)
       end
     rescue
       return nil
@@ -75,7 +75,7 @@ class Node < GeoRecord
 
     unless create
       if pt['id'] != '0'
-	node.id = pt['id'].to_i
+        node.id = pt['id'].to_i
       end
     end
 
@@ -85,7 +85,7 @@ class Node < GeoRecord
       node.timestamp = Time.now
     else
       if pt['timestamp']
-	node.timestamp = Time.parse(pt['timestamp'])
+        node.timestamp = Time.parse(pt['timestamp'])
       end
     end
 
@@ -109,11 +109,11 @@ class Node < GeoRecord
       tags = self.tags
       NodeTag.delete_all(['id = ?', self.id])
       tags.each do |k,v|
-	tag = NodeTag.new
-	tag.k = k 
-	tag.v = v 
-	tag.id = self.id
-	tag.save!
+        tag = NodeTag.new
+        tag.k = k 
+        tag.v = v 
+        tag.id = self.id
+        tag.save!
       end 
 
       # Create an OldNode
@@ -140,6 +140,10 @@ class Node < GeoRecord
   end
 
   def update_from(new_node, user)
+    if new_node.version != version
+      raise OSM::APIVersionMismatchError.new(new_node.version, version)
+    end
+
     self.user_id = user.id
     self.latitude = new_node.latitude 
     self.longitude = new_node.longitude
@@ -186,11 +190,7 @@ class Node < GeoRecord
   end
 
   def tags_as_hash
-    hash = {}
-    Tags.split(self.tags) do |k,v|
-      hash[k] = v
-    end
-    hash
+    return tags
   end
 
   def tags