Some improvements to the error messages that are returned by the api.

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

diff --git a/app/models/node.rb b/app/models/node.rb
index a25a19f703e14f266031264d2c3f566ea93255a3..f2fe341aecc2bf6fcc3b82701201fb11eb48f03b 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -2,14 +2,10 @@ class Node < ActiveRecord::Base
   require 'xml/libxml'
 
   include GeoRecord
   require 'xml/libxml'
 
   include GeoRecord

+  include ConsistencyValidations

 
   set_table_name 'current_nodes'
 
 
   set_table_name 'current_nodes'
 

-  validates_presence_of :changeset_id, :timestamp
-  validates_inclusion_of :visible, :in => [ true, false ]
-  validates_numericality_of :latitude, :longitude
-  validate :validate_position
-

   belongs_to :changeset
 
   has_many :old_nodes, :foreign_key => :id
   belongs_to :changeset
 
   has_many :old_nodes, :foreign_key => :id


@@ -25,6 +21,15 @@ class Node < ActiveRecord::Base
   has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
   has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder
 
   has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
   has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder
 

+  validates_presence_of :id, :on => :update
+  validates_presence_of :timestamp,:version,  :changeset_id
+  validates_uniqueness_of :id
+  validates_inclusion_of :visible, :in => [ true, false ]
+  validates_numericality_of :latitude, :longitude, :changeset_id, :version, :integer_only => true
+  validates_numericality_of :id, :on => :update, :integer_only => true
+  validate :validate_position
+  validates_associated :changeset
+

   # Sanity check the latitude and longitude and add an error if it's broken
   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?
   # Sanity check the latitude and longitude and add an error if it's broken
   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?


@@ -52,7 +57,7 @@ class Node < ActiveRecord::Base
     #conditions = keys.join(' AND ')
  
     find_by_area(min_lat, min_lon, max_lat, max_lon,
     #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
 
                     :limit => APP_CONFIG['max_number_of_nodes']+1)  
   end
 


@@ -74,20 +79,25 @@ class Node < ActiveRecord::Base
   def self.from_xml_node(pt, create=false)
     node = Node.new
     
   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?
 
     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
 
     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
 
     if create
       node.timestamp = Time.now


@@ -106,6 +116,12 @@ class Node < ActiveRecord::Base
     return node
   end
 
     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
   def save_with_history!
     t = Time.now
     Node.transaction do


@@ -128,18 +144,30 @@ class Node < ActiveRecord::Base
       old_node = OldNode.from_node(self)
       old_node.timestamp = t
       old_node.save_with_dependencies!
       old_node = OldNode.from_node(self)
       old_node.timestamp = t
       old_node.save_with_dependencies!

+
+      # tell the changeset we updated one element only
+      changeset.add_changes! 1
+
+      # save the changeset in case of bounding box updates
+      changeset.save!

     end
   end
 
     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 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 ])
+      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
         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
         raise OSM::APIPreconditionFailedError.new
       else

-        self.user_id = user.id
-        self.visible = 0
+        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
         save_with_history!
       end
     else


@@ -148,20 +176,32 @@ class Node < ActiveRecord::Base
   end
 
   def update_from(new_node, user)
   end
 
   def update_from(new_node, user)

-    if new_node.version != version
-      raise OSM::APIVersionMismatchError.new(new_node.version, version)
-    elsif new_node.changeset.user_id != user.id
-      raise OSM::APIUserChangesetMismatchError.new
-    elsif not new_node.changeset.open?
-      raise OSM::APIChangesetAlreadyClosedError.new
-    end
+    check_consistency(self, new_node, user)
+
+    # update changeset with *old* position first
+    changeset.update_bbox!(bbox);

 
 

-    # FIXME logic need looked at
+    # 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
     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
 
     save_with_history!
   end
 


@@ -189,7 +229,10 @@ class Node < ActiveRecord::Base
       user_display_name_cache[self.changeset.user_id] = nil
     end
 
       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')
 
     self.tags.each do |k,v|
       el2 = XML::Node.new('tag')


@@ -223,7 +266,26 @@ class Node < ActiveRecord::Base
 
   def add_tag_key_val(k,v)
     @tags = Hash.new unless @tags
 
   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
 
     @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.
+  def fix_placeholders!(id_map)
+    # nodes don't refer to anything, so there is nothing to do here
+  end
+

 end
 end