Made user input parsing more robust in changeset query method. Added tests.

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

diff --git a/app/models/way.rb b/app/models/way.rb
index 4143291c1f47eda44189fe803b855edd3e616612..0c27e54606414e3e0986036a281955b25f13528c 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -27,7 +27,7 @@ class Way < ActiveRecord::Base
       doc = p.parse
 
       doc.find('//osm/way').each do |pt|
       doc = p.parse
 
       doc.find('//osm/way').each do |pt|

-       return Way.from_xml_node(pt, create)
+        return Way.from_xml_node(pt, create)

       end
     rescue
       return nil
       end
     rescue
       return nil


@@ -101,7 +101,10 @@ class Way < 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

 
     # make sure nodes are output in sequence_id order
     ordered_nodes = []
 
     # make sure nodes are output in sequence_id order
     ordered_nodes = []


@@ -113,7 +116,7 @@ class Way < ActiveRecord::Base
         end
       else
         # otherwise, manually go to the db to check things
         end
       else
         # otherwise, manually go to the db to check things

-        if nd.node.visible? and nd.node.visible?
+        if nd.node and nd.node.visible?

           ordered_nodes[nd.sequence_id] = nd.node_id.to_s
         end
       end
           ordered_nodes[nd.sequence_id] = nd.node_id.to_s
         end
       end


@@ -274,7 +277,7 @@ class Way < ActiveRecord::Base
     check_consistency(self, new_way, user)
     if self.visible
       if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",
     check_consistency(self, new_way, user)
     if self.visible
       if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",

-                             :conditions => [ "visible = 1 AND member_type='way' and member_id=? ", self.id])
+                             :conditions => [ "visible = ? AND member_type='way' and member_id=? ", true, self.id])

         raise OSM::APIPreconditionFailedError
       else
         self.changeset_id = new_way.changeset_id
         raise OSM::APIPreconditionFailedError
       else
         self.changeset_id = new_way.changeset_id


@@ -288,22 +291,24 @@ class Way < ActiveRecord::Base
     end
   end
 
     end
   end
 

-  # delete a way and it's nodes that aren't part of other ways, with history
+  # delete a way and its nodes that aren't part of other ways, with history

 
   # FIXME: merge the potlatch code to delete the relations
 
   # FIXME: merge the potlatch code to delete the relations

-  def delete_with_relations_and_nodes_and_history(user)
+  #        and refactor to use delete_with_history!
+  def delete_with_relations_and_nodes_and_history(changeset_id)

     # delete the nodes not used by other ways
     self.unshared_node_ids.each do |node_id|
       n = Node.find(node_id)
     # delete the nodes not used by other ways
     self.unshared_node_ids.each do |node_id|
       n = Node.find(node_id)

-      n.user_id = user.id
+      n.changeset_id = changeset_id

       n.visible = false
       n.save_with_history!
     end
     
       n.visible = false
       n.save_with_history!
     end
     

-    # FIXME needs more information passed in so that the changeset can be updated
-    self.user_id = user.id
-
-    self.delete_with_history(user)
+    self.changeset_id = changeset_id
+    self.tags = []
+    self.nds = []
+    self.visible = false
+    self.save_with_history!

   end
 
   # Find nodes that belong to this way only
   end
 
   # Find nodes that belong to this way only