X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/328d47e506972fededfa1080967224928c36a4cf..b875d14b7cd13432b0683ca548b341dcd8bddf80:/app/models/node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index 2f3001a49..cf7aedae8 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -2,9 +2,10 @@ class Node < ActiveRecord::Base
   require 'xml/libxml'
 
   include GeoRecord
+  include ConsistencyValidations
 
   set_table_name 'current_nodes'
-  
+
   validates_presence_of :changeset_id, :timestamp
   validates_inclusion_of :visible, :in => [ true, false ]
   validates_numericality_of :latitude, :longitude
@@ -52,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
 
@@ -74,20 +75,25 @@ class Node < ActiveRecord::Base
   def self.from_xml_node(pt, create=false)
     node = Node.new
     
-    node.version = pt['version']
     node.lat = pt['lat'].to_f
     node.lon = pt['lon'].to_f
     node.changeset_id = pt['changeset'].to_i
 
     return nil unless node.in_world?
 
+    # version must be present unless creating
+    return nil unless create or not pt['version'].nil?
+    node.version = create ? 0 : pt['version'].to_i
+
     unless create
       if pt['id'] != '0'
         node.id = pt['id'].to_i
       end
     end
 
-    node.visible = pt['visible'] and pt['visible'] == 'true'
+    # visible if it says it is, or as the default if the attribute
+    # is missing.
+    node.visible = pt['visible'].nil? or pt['visible'] == 'true'
 
     if create
       node.timestamp = Time.now
@@ -106,6 +112,12 @@ class Node < ActiveRecord::Base
     return node
   end
 
+  ##
+  # the bounding box around a node
+  def bbox
+    [ longitude, latitude, longitude, latitude ]
+  end
+
   def save_with_history!
     t = Time.now
     Node.transaction do
@@ -128,19 +140,28 @@ class Node < ActiveRecord::Base
       old_node = OldNode.from_node(self)
       old_node.timestamp = t
       old_node.save_with_dependencies!
+
+      # save the changeset in case of bounding box updates
+      changeset.save!
     end
   end
 
-  def delete_with_history(user)
+  # Should probably be renamed delete_from to come in line with update
+  def delete_with_history!(new_node, user)
     if self.visible
-      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 ])
-	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])
-	raise OSM::APIPreconditionFailedError.new
+      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 = ? 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 = ? AND member_type='node' and member_id=? ", true, self.id])
+        raise OSM::APIPreconditionFailedError.new
       else
-	self.user_id = user.id
-	self.visible = 0
-	save_with_history!
+        self.changeset_id = new_node.changeset_id
+        self.visible = false
+
+        # update the changeset with the deleted position
+        changeset.update_bbox!(bbox)
+
+        save_with_history!
       end
     else
       raise OSM::APIAlreadyDeletedError.new
@@ -148,16 +169,32 @@ class Node < ActiveRecord::Base
   end
 
   def update_from(new_node, user)
-    if new_node.version != version
-      raise OSM::APIVersionMismatchError.new(new_node.version, version)
-    end
+    check_consistency(self, new_node, user)
+
+    # update changeset with *old* position first
+    changeset.update_bbox!(bbox);
 
-    # FIXME logic need looked at
-    self.changeset_id = user.id
+    # FIXME logic needs to be double checked
+    self.changeset_id = new_node.changeset_id
     self.latitude = new_node.latitude 
     self.longitude = new_node.longitude
     self.tags = new_node.tags
     self.visible = true
+
+    # update changeset with *new* position
+    changeset.update_bbox!(bbox);
+
+    save_with_history!
+  end
+  
+  def create_with_history(user)
+    check_create_consistency(self, user)
+    self.version = 0
+    self.visible = true
+
+    # update the changeset to include the new location
+    changeset.update_bbox!(bbox)
+
     save_with_history!
   end
 
@@ -172,7 +209,9 @@ class Node < ActiveRecord::Base
     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
+    
     user_display_name_cache = {} if user_display_name_cache.nil?
 
     if user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id)
@@ -194,7 +233,6 @@ class Node < ActiveRecord::Base
 
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
-    el1['version'] = self.version.to_s
     return el1
   end
 
@@ -218,7 +256,19 @@ class Node < ActiveRecord::Base
 
   def add_tag_key_val(k,v)
     @tags = Hash.new unless @tags
+
+    # duplicate tags are now forbidden, so we can't allow values
+    # in the hash to be overwritten.
+    raise OSM::APIDuplicateTagsError.new if @tags.include? k
+
     @tags[k] = v
   end
 
+  ##
+  # dummy method to make the interfaces of node, way and relation
+  # more consistent.
+  def fix_placeholders!(id_map)
+    # nodes don't refer to anything, so there is nothing to do here
+  end
+
 end