Minor fix (integer => bigint) to one of the migrations so that they will run fully...

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

diff --git a/app/models/node.rb b/app/models/node.rb
index 2f3001a49a8c627c571f45bd2ed2c68711026a8f..67efeca2c1a471f2e78d3bc9e6b1ef0d7b3244d5 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -2,9 +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
   validates_presence_of :changeset_id, :timestamp
   validates_inclusion_of :visible, :in => [ true, false ]
   validates_numericality_of :latitude, :longitude


@@ -74,20 +75,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 = 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


@@ -131,16 +137,18 @@ class Node < ActiveRecord::Base
     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

+      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 = 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
+        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

       else
       else

-       self.user_id = user.id
-       self.visible = 0
-       save_with_history!
+        self.changeset_id = new_node.changeset_id
+        self.visible = 0
+        save_with_history!

       end
     else
       raise OSM::APIAlreadyDeletedError.new
       end
     else
       raise OSM::APIAlreadyDeletedError.new


@@ -148,18 +156,23 @@ 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)
-    end
+    check_consistency(self, new_node, user)

 
 

-    # 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
     save_with_history!
   end
     self.latitude = new_node.latitude 
     self.longitude = new_node.longitude
     self.tags = new_node.tags
     self.visible = true
     save_with_history!
   end

+  
+  def create_with_history(user)
+    check_create_consistency(self, user)
+    self.version = 0
+    self.visible = true
+    save_with_history!
+  end

 
   def to_xml
     doc = OSM::API.new.get_xml_doc
 
   def to_xml
     doc = OSM::API.new.get_xml_doc


@@ -172,7 +185,9 @@ class Node < ActiveRecord::Base
     el1['id'] = self.id.to_s
     el1['lat'] = self.lat.to_s
     el1['lon'] = self.lon.to_s
     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)
     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 +209,6 @@ class Node < ActiveRecord::Base
 
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
 
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema

-    el1['version'] = self.version.to_s

     return el1
   end
 
     return el1
   end
 


@@ -218,7 +232,19 @@ 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
 

+  ##
+  # 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