List all objects that are blocking a delete, in a well defined order

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

diff --git a/app/models/way.rb b/app/models/way.rb
index 8788bd671b1e2ffdd9b1c9bd82c8f371edabc45a..23475785c88f1ecc069268f6df85dd2e76fd730c 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -25,6 +25,9 @@ class Way < ActiveRecord::Base
   validates_numericality_of :id, :on => :update, :integer_only => true
   validates_associated :changeset
 
   validates_numericality_of :id, :on => :update, :integer_only => true
   validates_associated :changeset
 

+  scope :visible, where(:visible => true)
+  scope :invisible, where(:visible => false)
+

   # Read in xml as text and return it's Way object representation
   def self.from_xml(xml, create=false)
     begin
   # Read in xml as text and return it's Way object representation
   def self.from_xml(xml, create=false)
     begin


@@ -34,6 +37,7 @@ class Way < ActiveRecord::Base
       doc.find('//osm/way').each do |pt|
         return Way.from_xml_node(pt, create)
       end
       doc.find('//osm/way').each do |pt|
         return Way.from_xml_node(pt, create)
       end

+      raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/way element.")

     rescue LibXML::XML::Error, ArgumentError => ex
       raise OSM::APIBadXMLError.new("way", xml, ex.message)
     end
     rescue LibXML::XML::Error, ArgumentError => ex
       raise OSM::APIBadXMLError.new("way", xml, ex.message)
     end


@@ -233,8 +237,8 @@ class Way < ActiveRecord::Base
 
   def preconditions_ok?(old_nodes = [])
     return false if self.nds.empty?
 
   def preconditions_ok?(old_nodes = [])
     return false if self.nds.empty?

-    if self.nds.length > APP_CONFIG['max_number_of_way_nodes']
-      raise OSM::APITooManyWayNodesError.new(self.nds.length, APP_CONFIG['max_number_of_way_nodes'])
+    if self.nds.length > MAX_NUMBER_OF_WAY_NODES
+      raise OSM::APITooManyWayNodesError.new(self.id, self.nds.length, MAX_NUMBER_OF_WAY_NODES)

     end
 
     # check only the new nodes, for efficiency - old nodes having been checked last time and can't
     end
 
     # check only the new nodes, for efficiency - old nodes having been checked last time and can't


@@ -264,10 +268,9 @@ class Way < ActiveRecord::Base
     Way.transaction do
       self.lock!
       check_consistency(self, new_way, user)
     Way.transaction do
       self.lock!
       check_consistency(self, new_way, user)

-      rel = RelationMember.find(:first, :joins => :relation,
-                             :conditions => [ "visible = ? AND member_type='Way' and member_id=? ", true, self.id])
-      raise OSM::APIPreconditionFailedError.new("Way #{self.id} still used by relation #{rel.relation.id}.") if rel
-      
+      rels = Relation.joins(:relation_members).where(:visible => true, :current_relation_members => { :member_type => "Way", :member_id => id }).order(:id)
+      raise OSM::APIPreconditionFailedError.new("Way #{self.id} is still used by relations #{rels.collect { |r| r.id }.join(",")}.") unless rels.empty?
+

       self.changeset_id = new_way.changeset_id
       self.changeset = new_way.changeset
 
       self.changeset_id = new_way.changeset_id
       self.changeset = new_way.changeset