Implemented changeset tags updating via the update method.

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

diff --git a/app/models/node.rb b/app/models/node.rb
index e58a1d8969cd7d39b3dc891e632e39df63cbde01..faba4ed66d5e37817fc4821c4947d76aecbc03cc 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -53,7 +53,7 @@ class Node < ActiveRecord::Base
     #conditions = keys.join(' AND ')
  
     find_by_area(min_lat, min_lon, max_lat, max_lon,
-                    :conditions => 'visible = 1',
+                    :conditions => {:visible => true},
                     :limit => APP_CONFIG['max_number_of_nodes']+1)  
   end
 
@@ -83,7 +83,7 @@ class Node < ActiveRecord::Base
 
     # version must be present unless creating
     return nil unless create or not pt['version'].nil?
-    node.version = pt['version'].to_i
+    node.version = create ? 0 : pt['version'].to_i
 
     unless create
       if pt['id'] != '0'
@@ -150,13 +150,13 @@ class Node < ActiveRecord::Base
   def delete_with_history!(new_node, user)
     if self.visible
       check_consistency(self, new_node, user)
-      if WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", :conditions => [ "current_ways.visible = 1 AND current_way_nodes.node_id = ?", self.id ])
+      if WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", :conditions => [ "current_ways.visible = ? AND current_way_nodes.node_id = ?", true, self.id ])
         raise OSM::APIPreconditionFailedError.new
-      elsif RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='node' and member_id=? ", self.id])
+      elsif RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = ? AND member_type='node' and member_id=? ", true, self.id])
         raise OSM::APIPreconditionFailedError.new
       else
         self.changeset_id = new_node.changeset_id
-        self.visible = 0
+        self.visible = false
 
         # update the changeset with the deleted position
         changeset.update_bbox!(bbox)
@@ -222,7 +222,10 @@ class Node < ActiveRecord::Base
       user_display_name_cache[self.changeset.user_id] = nil
     end
 
-    el1['user'] = user_display_name_cache[self.changeset.user_id] unless user_display_name_cache[self.changeset.user_id].nil?
+    if not user_display_name_cache[self.changeset.user_id].nil?
+      el1['user'] = user_display_name_cache[self.changeset.user_id]
+      el1['uid'] = self.changeset.user_id.to_s
+    end
 
     self.tags.each do |k,v|
       el2 = XML::Node.new('tag')
@@ -264,6 +267,13 @@ class Node < ActiveRecord::Base
     @tags[k] = v
   end
 
+  ##
+  # are the preconditions OK? this is mainly here to keep the duck
+  # typing interface the same between nodes, ways and relations.
+  def preconditions_ok?
+    in_world?
+  end
+
   ##
   # dummy method to make the interfaces of node, way and relation
   # more consistent.