[OSM-dev] Minute Diffs Broken

Matt Amos zerebubuth at gmail.com
Wed May 6 00:50:36 BST 2009


On Tue, May 5, 2009 at 10:53 PM, Frederik Ramm <frederik at remote.org> wrote:
> I was trying to say that you don't have to look them up. You get the
> member ids/types of the new relation, remove from that list the member
> ids/types of the old relation, and then look up only the remaining
> members, if any.

implemented. it passes the tests, but i thought i'd run it by the list
in case i've missed something dumb.

dunno if it makes anything faster at this point...

cheers,

matt

Index: app/models/relation.rb
===================================================================
--- app/models/relation.rb      (revision 14928)
+++ app/models/relation.rb      (working copy)
@@ -256,7 +256,7 @@

   def update_from(new_relation, user)
     check_consistency(self, new_relation, user)
-    unless new_relation.preconditions_ok?
+    unless new_relation.preconditions_ok?(self.members)
       raise OSM::APIPreconditionFailedError.new("Cannot update
relation #{self.id}: data or member data is invalid.")
     end
     self.changeset_id = new_relation.changeset_id
@@ -277,7 +277,7 @@
     save_with_history!
   end

-  def preconditions_ok?
+  def preconditions_ok?(good_members = [])
     # These are hastables that store an id in the index of all
     # the nodes/way/relations that have already been added.
     # If the member is valid and visible then we add it to the
@@ -286,6 +286,10 @@
     # relation, then the hash table nodes would contain:
     # => {50=>true, 1=>true}
     elements = { :node => Hash.new, :way => Hash.new, :relation => Hash.new }
+
+    # pre-set all existing members to good
+    good_members.each { |m| elements[m[0].downcase.to_sym][m[1]] = true }
+
     self.members.each do |m|
       # find the hash for the element type or die
       hash = elements[m[0].downcase.to_sym] or return false




More information about the dev mailing list