Relation Tag testing. Also sort the belong_to/has_many for user/changeset/old_way.

[rails.git] / app / controllers / amf_controller.rb

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 1fa433c9e198d49f8e6c9e623530af55bde24396..6e1b364d4794dbfef7ebeca2166e354078f1c604 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -135,6 +135,14 @@ class AmfController < ApplicationController
 
        # close previous changeset and add comment
        if closeid
 
        # close previous changeset and add comment
        if closeid

+         cs = Changeset.find(closeid)
+         cs.open = false
+         if closecomment.empty?
+               cs.save!
+         else
+           cs.tags['comment']=closecomment
+           cs.save_with_tags!
+         end

        end
        
        # open a new changeset
        end
        
        # open a new changeset


@@ -206,14 +214,13 @@ class AmfController < ApplicationController
     begin
       check_boundaries(xmin, ymin, xmax, ymax)
     rescue Exception => err
     begin
       check_boundaries(xmin, ymin, xmax, ymax)
     rescue Exception => err

-      # FIXME: report an error rather than just return an empty result
-      return [[]]
+      return [-2,"Sorry - I can't get the map for that area."]

     end
 
        nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax, :conditions => ["current_ways.visible = ?", false], :include => :ways_via_history)
        way_ids = nodes_in_area.collect { |node| node.ways_via_history_ids }.flatten.uniq
 
     end
 
        nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax, :conditions => ["current_ways.visible = ?", false], :include => :ways_via_history)
        way_ids = nodes_in_area.collect { |node| node.ways_via_history_ids }.flatten.uniq
 

-       [way_ids]
+       [0,way_ids]

   end
 
   # Get a way including nodes and tags.
   end
 
   # Get a way including nodes and tags.