Use association names with :joins instead of writing the SQL for the

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

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 80472fe254c3dbb0f876050d209b6f77b4ed39f9..c175212e2afa0c875789b2ef2e7bc7a691cad102 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -27,7 +27,10 @@
 #      return(-1,"message")            <-- just puts up a dialogue
 #      return(-2,"message")            <-- also asks the user to e-mail me
 # 
 #      return(-1,"message")            <-- just puts up a dialogue
 #      return(-2,"message")            <-- also asks the user to e-mail me
 # 

-# To write to the Rails log, use RAILS_DEFAULT_LOGGER.info("message").
+# To write to the Rails log, use logger.info("message").
+
+# Remaining issues:
+# * version conflict when POIs and ways are reverted

 
 class AmfController < ApplicationController
   require 'stringio'
 
 class AmfController < ApplicationController
   require 'stringio'


@@ -38,91 +41,102 @@ class AmfController < ApplicationController
   include MapBoundary
 
   session :off
   include MapBoundary
 
   session :off

-  before_filter :check_write_availability
+  before_filter :check_api_writable

 
   # Main AMF handlers: process the raw AMF string (using AMF library) and
   # calls each action (private method) accordingly.
   # ** FIXME: refactor to reduce duplication of code across read/write
   
   def amf_read
 
   # Main AMF handlers: process the raw AMF string (using AMF library) and
   # calls each action (private method) accordingly.
   # ** FIXME: refactor to reduce duplication of code across read/write
   
   def amf_read

-    req=StringIO.new(request.raw_post+0.chr)# Get POST data as request
-                              # (cf http://www.ruby-forum.com/topic/122163)
-    req.read(2)                                                                # Skip version indicator and client ID
-    results={}                                                         # Results of each body
+    if request.post?
+      req=StringIO.new(request.raw_post+0.chr)# Get POST data as request
+                                # (cf http://www.ruby-forum.com/topic/122163)
+      req.read(2)                                                              # Skip version indicator and client ID
+      results={}                                                               # Results of each body

 
 

-    # Parse request
+      # Parse request

 
 

-    headers=AMF.getint(req)                                    # Read number of headers
+      headers=AMF.getint(req)                          # Read number of headers

 
 

-    headers.times do                                           # Read each header
-      name=AMF.getstring(req)                          #  |
-      req.getc                                                         #  | skip boolean
-      value=AMF.getvalue(req)                          #  |
-      header["name"]=value                                     #  |
-    end
+      headers.times do                                 # Read each header
+        name=AMF.getstring(req)                                #  |
+        req.getc                                       #  | skip boolean
+        value=AMF.getvalue(req)                                #  |
+        header["name"]=value                           #  |
+      end

 
 

-    bodies=AMF.getint(req)                                     # Read number of bodies
-    bodies.times do                                                    # Read each body
-      message=AMF.getstring(req)                       #  | get message name
-      index=AMF.getstring(req)                         #  | get index in response sequence
-      bytes=AMF.getlong(req)                           #  | get total size in bytes
-      args=AMF.getvalue(req)                           #  | get response (probably an array)
-      logger.info "Executing AMF #{message}:#{index}"
-
-      case message
-        when 'getpresets';                     results[index]=AMF.putdata(index,getpresets())
-        when 'whichways';                      results[index]=AMF.putdata(index,whichways(*args))
-        when 'whichways_deleted';      results[index]=AMF.putdata(index,whichways_deleted(*args))
-        when 'getway';                         results[index]=AMF.putdata(index,getway(args[0].to_i))
-        when 'getrelation';                    results[index]=AMF.putdata(index,getrelation(args[0].to_i))
-        when 'getway_old';                     results[index]=AMF.putdata(index,getway_old(args[0].to_i,args[1].to_i))
-        when 'getway_history';         results[index]=AMF.putdata(index,getway_history(args[0].to_i))
-        when 'getnode_history';                results[index]=AMF.putdata(index,getnode_history(args[0].to_i))
-        when 'findgpx';                                results[index]=AMF.putdata(index,findgpx(*args))
-        when 'findrelations';          results[index]=AMF.putdata(index,findrelations(*args))
-        when 'getpoi';                         results[index]=AMF.putdata(index,getpoi(*args))
+      bodies=AMF.getint(req)                           # Read number of bodies
+      bodies.times do                                  # Read each body
+        message=AMF.getstring(req)                     #  | get message name
+        index=AMF.getstring(req)                       #  | get index in response sequence
+        bytes=AMF.getlong(req)                         #  | get total size in bytes
+        args=AMF.getvalue(req)                         #  | get response (probably an array)
+        logger.info("Executing AMF #{message}:#{index}")
+
+        case message
+          when 'getpresets';           results[index]=AMF.putdata(index,getpresets())
+          when 'whichways';            results[index]=AMF.putdata(index,whichways(*args))
+          when 'whichways_deleted';    results[index]=AMF.putdata(index,whichways_deleted(*args))
+          when 'getway';               r=AMF.putdata(index,getway(args[0].to_i))
+                                        results[index]=r
+          when 'getrelation';          results[index]=AMF.putdata(index,getrelation(args[0].to_i))
+          when 'getway_old';           results[index]=AMF.putdata(index,getway_old(args[0].to_i,args[1]))
+          when 'getway_history';       results[index]=AMF.putdata(index,getway_history(args[0].to_i))
+          when 'getnode_history';      results[index]=AMF.putdata(index,getnode_history(args[0].to_i))
+          when 'findgpx';              results[index]=AMF.putdata(index,findgpx(*args))
+          when 'findrelations';                results[index]=AMF.putdata(index,findrelations(*args))
+          when 'getpoi';               results[index]=AMF.putdata(index,getpoi(*args))
+        end

       end
       end

+      logger.info("encoding AMF results")
+      sendresponse(results)
+    else
+      render :nothing => true, :status => :method_not_allowed

     end
     end

-    logger.info("encoding AMF results")
-    sendresponse(results)

   end
 
   def amf_write
   end
 
   def amf_write

-    req=StringIO.new(request.raw_post+0.chr)
-    req.read(2)
-    results={}
-    renumberednodes={}                                         # Shared across repeated putways
-    renumberedways={}                                          # Shared across repeated putways
-
-    headers=AMF.getint(req)                                    # Read number of headers
-    headers.times do                                           # Read each header
-      name=AMF.getstring(req)                          #  |
-      req.getc                                                         #  | skip boolean
-      value=AMF.getvalue(req)                          #  |
-      header["name"]=value                                     #  |
-    end
+    if request.post?
+      req=StringIO.new(request.raw_post+0.chr)
+      req.read(2)
+      results={}
+      renumberednodes={}                               # Shared across repeated putways
+      renumberedways={}                                        # Shared across repeated putways
+
+      headers=AMF.getint(req)                          # Read number of headers
+      headers.times do                                 # Read each header
+        name=AMF.getstring(req)                                #  |
+        req.getc                                       #  | skip boolean
+        value=AMF.getvalue(req)                                #  |
+        header["name"]=value                           #  |
+      end

 
 

-    bodies=AMF.getint(req)                                     # Read number of bodies
-    bodies.times do                                                    # Read each body
-      message=AMF.getstring(req)                       #  | get message name
-      index=AMF.getstring(req)                         #  | get index in response sequence
-      bytes=AMF.getlong(req)                           #  | get total size in bytes
-      args=AMF.getvalue(req)                           #  | get response (probably an array)
-
-      case message
-        when 'putway';                         r=putway(renumberednodes,*args)
-                                                                       renumberednodes=r[3]
-                                                                       if r[1] != r[2] then renumberedways[r[1]] = r[2] end
-                                                                       results[index]=AMF.putdata(index,r)
-        when 'putrelation';                    results[index]=AMF.putdata(index,putrelation(renumberednodes, renumberedways, *args))
-        when 'deleteway';                      results[index]=AMF.putdata(index,deleteway(*args))
-        when 'putpoi';                         r=putpoi(*args)
-                                                                       if r[1] != r[2] then renumberednodes[r[1]] = r[2] end
-                                                               results[index]=AMF.putdata(index,r)
-        when 'startchangeset';         results[index]=AMF.putdata(index,startchangeset(*args))
+      bodies=AMF.getint(req)                           # Read number of bodies
+      bodies.times do                                  # Read each body
+        message=AMF.getstring(req)                     #  | get message name
+        index=AMF.getstring(req)                       #  | get index in response sequence
+        bytes=AMF.getlong(req)                         #  | get total size in bytes
+        args=AMF.getvalue(req)                         #  | get response (probably an array)
+
+        logger.info("Executing AMF #{message}:#{index}")
+        case message
+          when 'putway';                       r=putway(renumberednodes,*args)
+                                               renumberednodes=r[3]
+                                               if r[1] != r[2] then renumberedways[r[1]] = r[2] end
+                                               results[index]=AMF.putdata(index,r)
+          when 'putrelation';                  results[index]=AMF.putdata(index,putrelation(renumberednodes, renumberedways, *args))
+          when 'deleteway';                    results[index]=AMF.putdata(index,deleteway(*args))
+          when 'putpoi';                       r=putpoi(*args)
+                                               if r[1] != r[2] then renumberednodes[r[1]] = r[2] end
+                                               results[index]=AMF.putdata(index,r)
+          when 'startchangeset';               results[index]=AMF.putdata(index,startchangeset(*args))
+        end

       end
       end

+      logger.info("encoding AMF results")
+      sendresponse(results)
+    else
+      render :nothing => true, :status => :method_not_allowed

     end
     end

-    sendresponse(results)

   end
 
   private
   end
 
   private


@@ -152,7 +166,7 @@ class AmfController < ApplicationController
     cs.tags = cstags
     cs.user_id = user.id
     # smsm1 doesn't like the next two lines and thinks they need to be abstracted to the model more/better
     cs.tags = cstags
     cs.user_id = user.id
     # smsm1 doesn't like the next two lines and thinks they need to be abstracted to the model more/better

-    cs.created_at = Time.now
+    cs.created_at = Time.now.getutc

     cs.closed_at = cs.created_at + Changeset::IDLE_TIMEOUT
     cs.save_with_tags!
     return [0,cs.id]
     cs.closed_at = cs.created_at + Changeset::IDLE_TIMEOUT
     cs.save_with_tags!
     return [0,cs.id]


@@ -180,8 +194,9 @@ class AmfController < ApplicationController
   # used in any way, rel is any relation which refers to either a way
   # or node that we're returning.
   def whichways(xmin, ymin, xmax, ymax) #:doc:
   # used in any way, rel is any relation which refers to either a way
   # or node that we're returning.
   def whichways(xmin, ymin, xmax, ymax) #:doc:

-    xmin -= 0.01; ymin -= 0.01
-    xmax += 0.01; ymax += 0.01
+    enlarge = [(xmax-xmin)/8,0.01].min
+    xmin -= enlarge; ymin -= enlarge
+    xmax += enlarge; ymax += enlarge

     
     # check boundary is sane and area within defined
     # see /config/application.yml
     
     # check boundary is sane and area within defined
     # see /config/application.yml


@@ -202,7 +217,7 @@ class AmfController < ApplicationController
 
       # find the node ids in an area that aren't part of ways
       nodes_not_used_in_area = nodes_in_area.select { |node| node.ways.empty? }
 
       # find the node ids in an area that aren't part of ways
       nodes_not_used_in_area = nodes_in_area.select { |node| node.ways.empty? }

-      points = nodes_not_used_in_area.collect { |n| [n.id, n.lon, n.lat, n.tags, n.version] }
+      points = nodes_not_used_in_area.collect { |n| [n.id, n.lon, n.lat, n.tags, n.version] }.uniq

 
       # find the relations used by those nodes and ways
       relations = Relation.find_for_nodes(nodes_in_area.collect { |n| n.id }, :conditions => {:visible => true}) +
 
       # find the relations used by those nodes and ways
       relations = Relation.find_for_nodes(nodes_in_area.collect { |n| n.id }, :conditions => {:visible => true}) +


@@ -210,25 +225,26 @@ class AmfController < ApplicationController
       relations = relations.collect { |relation| [relation.id,relation.version] }.uniq
     end
 
       relations = relations.collect { |relation| [relation.id,relation.version] }.uniq
     end
 

-    [0,ways, points, relations]
+    [0, ways, points, relations]

 
   rescue Exception => err
 
   rescue Exception => err

-    [-2,"Sorry - I can't get the map for that area."]
+    [-2,"Sorry - I can't get the map for that area. The server said: #{err}"]

   end
 
   # Find deleted ways in current bounding box (similar to whichways, but ways
   # with a deleted node only - not POIs or relations).
 
   def whichways_deleted(xmin, ymin, xmax, ymax) #:doc:
   end
 
   # Find deleted ways in current bounding box (similar to whichways, but ways
   # with a deleted node only - not POIs or relations).
 
   def whichways_deleted(xmin, ymin, xmax, ymax) #:doc:

-    xmin -= 0.01; ymin -= 0.01
-    xmax += 0.01; ymax += 0.01
+    enlarge = [(xmax-xmin)/8,0.01].min
+    xmin -= enlarge; ymin -= enlarge
+    xmax += enlarge; ymax += enlarge

 
     # check boundary is sane and area within defined
     # see /config/application.yml
     begin
       check_boundaries(xmin, ymin, xmax, ymax)
     rescue Exception => err
 
     # check boundary is sane and area within defined
     # see /config/application.yml
     begin
       check_boundaries(xmin, ymin, xmax, ymax)
     rescue Exception => err

-      return [-2,"Sorry - I can't get the map for that area."]
+      return [-2,"Sorry - I can't get the map for that area. The server said: #{err}"]

     end
 
     nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax, :conditions => ["current_ways.visible = ?", false], :include => :ways_via_history)
     end
 
     nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax, :conditions => ["current_ways.visible = ?", false], :include => :ways_via_history)


@@ -242,15 +258,15 @@ class AmfController < ApplicationController
 
   def getway(wayid) #:doc:
     if POTLATCH_USE_SQL then
 
   def getway(wayid) #:doc:
     if POTLATCH_USE_SQL then

-      points = sql_get_nodes_in_way(wayid)
-      tags = sql_get_tags_in_way(wayid)
-      version = sql_get_way_version(wayid)
+        points = sql_get_nodes_in_way(wayid)
+        tags = sql_get_tags_in_way(wayid)
+        version = sql_get_way_version(wayid)

       else
         # Ideally we would do ":include => :nodes" here but if we do that
         # then rails only seems to return the first copy of a node when a
         # way includes a node more than once
         begin
       else
         # Ideally we would do ":include => :nodes" here but if we do that
         # then rails only seems to return the first copy of a node when a
         # way includes a node more than once
         begin

-          way = Way.find(wayid)
+          way = Way.find(wayid, :include => { :nodes => :node_tags })

         rescue ActiveRecord::RecordNotFound
           return [wayid,[],{}]
         end
         rescue ActiveRecord::RecordNotFound
           return [wayid,[],{}]
         end


@@ -269,7 +285,7 @@ class AmfController < ApplicationController
 
     [wayid, points, tags, version]
   end
 
     [wayid, points, tags, version]
   end

-
+  

   # Get an old version of a way, and all constituent nodes.
   #
   # For undelete (version<0), always uses the most recent version of each node, 
   # Get an old version of a way, and all constituent nodes.
   #
   # For undelete (version<0), always uses the most recent version of each node, 


@@ -284,57 +300,101 @@ class AmfController < ApplicationController
   # 3. hash of tags, 
   # 4. version, 
   # 5. is this the current, visible version? (boolean)
   # 3. hash of tags, 
   # 4. version, 
   # 5. is this the current, visible version? (boolean)

-
-  def getway_old(id, version) #:doc:
-    if version < 0
+  
+  def getway_old(id, timestamp) #:doc:
+    if timestamp == ''
+      # undelete

       old_way = OldWay.find(:first, :conditions => ['visible = ? AND id = ?', true, id], :order => 'version DESC')
       points = old_way.get_nodes_undelete unless old_way.nil?
     else
       old_way = OldWay.find(:first, :conditions => ['visible = ? AND id = ?', true, id], :order => 'version DESC')
       points = old_way.get_nodes_undelete unless old_way.nil?
     else

-      old_way = OldWay.find(:first, :conditions => ['id = ? AND version = ?', id, version])
-      points = old_way.get_nodes_revert unless old_way.nil?
+      begin
+        # revert
+        timestamp = DateTime.strptime(timestamp.to_s, "%d %b %Y, %H:%M:%S")
+        old_way = OldWay.find(:first, :conditions => ['id = ? AND timestamp <= ?', id, timestamp], :order => 'timestamp DESC')
+        unless old_way.nil?
+          points = old_way.get_nodes_revert(timestamp)
+          if !old_way.visible
+            return [-1, "Sorry, the way was deleted at that time - please revert to a previous version."]
+          end
+        end
+      rescue ArgumentError
+        # thrown by date parsing method. leave old_way as nil for
+        # the superb error handler below.
+      end

     end
 
     if old_way.nil?
     end
 
     if old_way.nil?

+      # *** FIXME: shouldn't this be returning an error?

       return [-1, id, [], {}, -1,0]
     else
       curway=Way.find(id)
       old_way.tags['history'] = "Retrieved from v#{old_way.version}"
       return [-1, id, [], {}, -1,0]
     else
       curway=Way.find(id)
       old_way.tags['history'] = "Retrieved from v#{old_way.version}"

-      return [0, id, points, old_way.tags, old_way.version, (curway.version==old_way.version and curway.visible)]
+      return [0, id, points, old_way.tags, curway.version, (curway.version==old_way.version and curway.visible)]

     end
   end
   
     end
   end
   

-  # Find history of a way. Returns 'way', id, and 
-  # an array of previous versions.
+  # Find history of a way.
+  # Returns 'way', id, and an array of previous versions:
+  # - formerly [old_way.version, old_way.timestamp.strftime("%d %b %Y, %H:%M"), old_way.visible ? 1 : 0, user, uid]
+  # - now [timestamp,user,uid]
+  #
+  # Heuristic: Find all nodes that have ever been part of the way; 
+  # get a list of their revision dates; add revision dates of the way;
+  # sort and collapse list (to within 2 seconds); trim all dates before the 
+  # start date of the way.

 
   def getway_history(wayid) #:doc:
 
   def getway_history(wayid) #:doc:

+

     begin
     begin

-      history = Way.find(wayid).old_ways.reverse.collect do |old_way|
-        user_object = old_way.changeset.user
-        user = user_object.data_public? ? user_object.display_name : 'anonymous'
-        uid  = user_object.data_public? ? user_object.id : 0
-        [old_way.version, old_way.timestamp.strftime("%d %b %Y, %H:%M"), old_way.visible ? 1 : 0, user, uid]
+      # Find list of revision dates for way and all constituent nodes
+      revdates=[]
+      revusers={}
+      Way.find(wayid).old_ways.collect do |a|
+        revdates.push(a.timestamp)
+        unless revusers.has_key?(a.timestamp.to_i) then revusers[a.timestamp.to_i]=change_user(a) end
+        a.nds.each do |n|
+          Node.find(n).old_nodes.collect do |o|
+            revdates.push(o.timestamp)
+            unless revusers.has_key?(o.timestamp.to_i) then revusers[o.timestamp.to_i]=change_user(o) end
+          end
+        end

       end
       end

-
-      return ['way',wayid,history]
+      waycreated=revdates[0]
+      revdates.uniq!
+      revdates.sort!
+         revdates.reverse!
+
+      # Remove any dates (from nodes) before first revision date of way
+      revdates.delete_if { |d| d<waycreated }
+      # Remove any elements where 2 seconds doesn't elapse before next one
+      revdates.delete_if { |d| revdates.include?(d+1) or revdates.include?(d+2) }
+      # Collect all in one nested array
+      revdates.collect! {|d| [d.strftime("%d %b %Y, %H:%M:%S")] + revusers[d.to_i] }
+
+      return ['way',wayid,revdates]

     rescue ActiveRecord::RecordNotFound
       return ['way', wayid, []]
     end
   end
     rescue ActiveRecord::RecordNotFound
       return ['way', wayid, []]
     end
   end

-
-  # Find history of a node. Returns 'node', id, and 
-  # an array of previous versions.
+  
+  # Find history of a node. Returns 'node', id, and an array of previous versions as above.

 
   def getnode_history(nodeid) #:doc:
 
   def getnode_history(nodeid) #:doc:

-    history = Node.find(nodeid).old_nodes.reverse.collect do |old_node|
-      user_object = old_node.changeset.user
-      user = user_object.data_public? ? user_object.display_name : 'anonymous'
-      uid  = user_object.data_public? ? user_object.id : 0
-      [old_node.version, old_node.timestamp.strftime("%d %b %Y, %H:%M"), old_node.visible ? 1 : 0, user, uid]
+    begin 
+      history = Node.find(nodeid).old_nodes.reverse.collect do |old_node|
+        [old_node.timestamp.strftime("%d %b %Y, %H:%M:%S")] + change_user(old_node)
+      end
+      return ['node', nodeid, history]
+    rescue ActiveRecord::RecordNotFound
+      return ['node', nodeid, []]

     end
     end

-    
-    return ['node',nodeid,history]
-  rescue ActiveRecord::RecordNotFound
-    return ['node', nodeid, []]
+  end
+
+  def change_user(obj)
+    user_object = obj.changeset.user
+    user = user_object.data_public? ? user_object.display_name : 'anonymous'
+    uid  = user_object.data_public? ? user_object.id : 0
+    [user,uid]

   end
 
   # Find GPS traces with specified name/id.
   end
 
   # Find GPS traces with specified name/id.


@@ -384,12 +444,12 @@ class AmfController < ApplicationController
     if searchterm.to_i>0 then
       rel = Relation.find(searchterm.to_i)
       if rel and rel.visible then
     if searchterm.to_i>0 then
       rel = Relation.find(searchterm.to_i)
       if rel and rel.visible then

-        rels.push([rel.id, rel.tags, rel.members])
+        rels.push([rel.id, rel.tags, rel.members, rel.version])

       end
     else
       RelationTag.find(:all, :limit => 11, :conditions => ["match(v) against (?)", searchterm] ).each do |t|
       if t.relation.visible then
       end
     else
       RelationTag.find(:all, :limit => 11, :conditions => ["match(v) against (?)", searchterm] ).each do |t|
       if t.relation.visible then

-             rels.push([t.relation.id, t.relation.tags, t.relation.members])
+             rels.push([t.relation.id, t.relation.tags, t.relation.members, t.relation.version])

            end
          end
        end
            end
          end
        end


@@ -400,9 +460,10 @@ class AmfController < ApplicationController
   # Returns
   # 0. 0 (success),
   # 1. original relation id (unchanged),
   # Returns
   # 0. 0 (success),
   # 1. original relation id (unchanged),

-  # 2. new relation id.
+  # 2. new relation id,
+  # 3. version.

 
 

-  def putrelation(renumberednodes, renumberedways, usertoken, changeset, version, relid, tags, members, visible) #:doc:
+  def putrelation(renumberednodes, renumberedways, usertoken, changeset_id, version, relid, tags, members, visible) #:doc:

     user = getuser(usertoken)
     if !user then return -1,"You are not logged in, so the relation could not be saved." end
 
     user = getuser(usertoken)
     if !user then return -1,"You are not logged in, so the relation could not be saved." end
 


@@ -424,8 +485,8 @@ class AmfController < ApplicationController
       members.each do |m|
         mid = m[1].to_i
         if mid < 0
       members.each do |m|
         mid = m[1].to_i
         if mid < 0

-          mid = renumberednodes[mid] if m[0] == 'node'
-          mid = renumberedways[mid] if m[0] == 'way'
+          mid = renumberednodes[mid] if m[0] == 'Node'
+          mid = renumberedways[mid] if m[0] == 'Way'

         end
         if mid
           typedmembers << [m[0], mid, m[2]]
         end
         if mid
           typedmembers << [m[0], mid, m[2]]


@@ -436,26 +497,25 @@ class AmfController < ApplicationController
       new_relation.members = typedmembers
       new_relation.tags = tags
       new_relation.visible = visible
       new_relation.members = typedmembers
       new_relation.tags = tags
       new_relation.visible = visible

-      new_relation.changeset_id = changeset
+      new_relation.changeset_id = changeset_id

       new_relation.version = version
 
       new_relation.version = version
 

-
-      if id <= 0
-        # We're creating the node
+      if relid <= 0
+        # We're creating the relation

         new_relation.create_with_history(user)
       elsif visible
         new_relation.create_with_history(user)
       elsif visible

-        # We're updating the node
+        # We're updating the relation

         relation.update_from(new_relation, user)
       else
         relation.update_from(new_relation, user)
       else

-        # We're deleting the node
+        # We're deleting the relation

         relation.delete_with_history!(new_relation, user)
       end
     end # transaction
       
         relation.delete_with_history!(new_relation, user)
       end
     end # transaction
       

-    if id <= 0
+    if relid <= 0

       return [0, relid, new_relation.id, new_relation.version]
     else
       return [0, relid, new_relation.id, new_relation.version]
     else

-      return [0, relid, relation.id, relation.version]
+      return [0, relid, relid, relation.version]

     end
   rescue OSM::APIChangesetAlreadyClosedError => ex
     return [-1, "The changeset #{ex.changeset.id} was closed at #{ex.changeset.closed_at}."]
     end
   rescue OSM::APIChangesetAlreadyClosedError => ex
     return [-1, "The changeset #{ex.changeset.id} was closed at #{ex.changeset.closed_at}."]


@@ -463,12 +523,12 @@ class AmfController < ApplicationController
     # Really need to check to see whether this is a server load issue, and the 
     # last version was in the same changeset, or belongs to the same user, then
     # we can return something different
     # Really need to check to see whether this is a server load issue, and the 
     # last version was in the same changeset, or belongs to the same user, then
     # we can return something different

-    return [-3, "You have taken too long to edit, please reload the area."]
+    return [-3, "Sorry, someone else has changed this relation since you started editing. Please click the 'Edit' tab to reload the area. The server said: #{ex}"]

   rescue OSM::APIAlreadyDeletedError => ex
   rescue OSM::APIAlreadyDeletedError => ex

-    return [-1, "The object has already been deleted"]
+    return [-1, "The relation has already been deleted."]

   rescue OSM::APIError => ex
     # Some error that we don't specifically catch
   rescue OSM::APIError => ex
     # Some error that we don't specifically catch

-    return [-2, "Something really bad happened :-()"]
+    return [-2, "An unusual error happened (in 'putrelation' #{relid}). The server said: #{ex}"]

   end
 
   # Save a way to the database, including all nodes. Any nodes in the previous
   end
 
   # Save a way to the database, including all nodes. Any nodes in the previous


@@ -482,7 +542,8 @@ class AmfController < ApplicationController
   # 4. way ID
   # 5. list of nodes in way
   # 6. hash of way tags
   # 4. way ID
   # 5. list of nodes in way
   # 6. hash of way tags

-  # 7. array of nodes to change (each one is [lon,lat,id,version,tags])
+  # 7. array of nodes to change (each one is [lon,lat,id,version,tags]),
+  # 8. hash of nodes to delete (id->version).

   # 
   # Returns:
   # 0. '0' (code for success),
   # 
   # Returns:
   # 0. '0' (code for success),


@@ -492,7 +553,7 @@ class AmfController < ApplicationController
   # 4. way version,
   # 5. hash of node versions (node=>version)
 
   # 4. way version,
   # 5. hash of node versions (node=>version)
 

-  def putway(renumberednodes, usertoken, changeset, version, originalway, pointlist, attributes, nodes) #:doc:
+  def putway(renumberednodes, usertoken, changeset_id, wayversion, originalway, pointlist, attributes, nodes, deletednodes) #:doc:

 
     # -- Initialise
        
 
     # -- Initialise
        


@@ -501,22 +562,13 @@ class AmfController < ApplicationController
     if pointlist.length < 2 then return -2,"Server error - way is only #{points.length} points long." end
 
     originalway = originalway.to_i
     if pointlist.length < 2 then return -2,"Server error - way is only #{points.length} points long." end
 
     originalway = originalway.to_i

-       pointlist.collect! {|a| a.to_i }
+       pointlist.collect! {|a| a.to_i }

 
     way=nil    # this is returned, so scope it outside the transaction
     nodeversions = {}
     Way.transaction do
 
 
     way=nil    # this is returned, so scope it outside the transaction
     nodeversions = {}
     Way.transaction do
 

-      # -- Get unique nodes
-
-      if originalway <= 0
-        uniques = []
-      else
-        way = Way.find(originalway)
-        uniques = way.unshared_node_ids
-      end
-
-      #-- Update each changed node
+      # -- Update each changed node

 
       nodes.each do |a|
         lon = a[0].to_f
 
       nodes.each do |a|
         lon = a[0].to_f


@@ -528,7 +580,7 @@ class AmfController < ApplicationController
         if renumberednodes[id] then id = renumberednodes[id] end
 
         node = Node.new
         if renumberednodes[id] then id = renumberednodes[id] end
 
         node = Node.new

-        node.changeset_id = changeset
+        node.changeset_id = changeset_id

         node.lat = lat
         node.lon = lon
         node.tags = a[4]
         node.lat = lat
         node.lon = lon
         node.tags = a[4]


@@ -547,50 +599,58 @@ class AmfController < ApplicationController
         end
       end
 
         end
       end
 

-      # -- Delete any unique nodes no longer used
-
-      uniques=uniques-pointlist
-      uniques.each do |n|
-        node = Node.find(n)
-        new_node = Node.new
-        new_node.changeset_id = changeset
-        new_node.version = version
-        node.delete_with_history!(new_node, user)
-      end
-

       # -- Save revised way
 
       # -- Save revised way
 

-         pointlist.collect! {|a|
-               renumberednodes[a] ? renumberednodes[a]:a
-         } # renumber nodes
+           pointlist.collect! {|a|
+                   renumberednodes[a] ? renumberednodes[a]:a
+           } # renumber nodes

       new_way = Way.new
       new_way.tags = attributes
       new_way.nds = pointlist
       new_way = Way.new
       new_way.tags = attributes
       new_way.nds = pointlist

-      new_way.changeset_id = changeset
-      new_way.version = version
+      new_way.changeset_id = changeset_id
+      new_way.version = wayversion

       if originalway <= 0
         new_way.create_with_history(user)
         way=new_way    # so we can get way.id and way.version
       if originalway <= 0
         new_way.create_with_history(user)
         way=new_way    # so we can get way.id and way.version

-      elsif way.tags!=attributes or way.nds!=pointlist or !way.visible?
-        way.update_from(new_way, user)
+      else
+             way = Way.find(originalway)
+                 if way.tags!=attributes or way.nds!=pointlist or !way.visible?
+           way.update_from(new_way, user)
+        end
+      end
+
+      # -- Delete unwanted nodes
+
+      deletednodes.each do |id,v|
+        node = Node.find(id.to_i)
+        new_node = Node.new
+        new_node.changeset_id = changeset_id
+        new_node.version = v.to_i
+        begin
+          node.delete_with_history!(new_node, user)
+        rescue OSM::APIPreconditionFailedError => ex
+          # We don't do anything here as the node is being used elsewhere
+          # and we don't want to delete it
+        end

       end
       end

+

     end # transaction
 
     end # transaction
 

-    [0, originalway, way.id, renumberednodes, way.version, nodeversions]
+    [0, originalway, way.id, renumberednodes, way.version, nodeversions, deletednodes]

   rescue OSM::APIChangesetAlreadyClosedError => ex
     return [-2, "Sorry, your changeset #{ex.changeset.id} has been closed (at #{ex.changeset.closed_at})."]
   rescue OSM::APIVersionMismatchError => ex
     # Really need to check to see whether this is a server load issue, and the 
     # last version was in the same changeset, or belongs to the same user, then
     # we can return something different
   rescue OSM::APIChangesetAlreadyClosedError => ex
     return [-2, "Sorry, your changeset #{ex.changeset.id} has been closed (at #{ex.changeset.closed_at})."]
   rescue OSM::APIVersionMismatchError => ex
     # Really need to check to see whether this is a server load issue, and the 
     # last version was in the same changeset, or belongs to the same user, then
     # we can return something different

-    return [-3, "Sorry, someone else has changed this way since you started editing - please reload the area"]
+    return [-3, "Sorry, someone else has changed this way since you started editing. Click the 'Edit' tab to reload the area. The server said: #{ex}"]

   rescue OSM::APITooManyWayNodesError => ex
     return [-1, "You have tried to upload a really long way with #{ex.provided} points: only #{ex.max} are allowed."]
   rescue OSM::APIAlreadyDeletedError => ex
   rescue OSM::APITooManyWayNodesError => ex
     return [-1, "You have tried to upload a really long way with #{ex.provided} points: only #{ex.max} are allowed."]
   rescue OSM::APIAlreadyDeletedError => ex

-    return [-1, "The object has already been deleted."]
+    return [-1, "The point has already been deleted."]

   rescue OSM::APIError => ex
     # Some error that we don't specifically catch
   rescue OSM::APIError => ex
     # Some error that we don't specifically catch

-    return [-2, "Something really bad happened :-(."]
+    return [-2, "An unusual error happened (in 'putway' #{originalway}). The server said: #{ex}"]

   end
 
   # Save POI to the database.
   end
 
   # Save POI to the database.


@@ -601,7 +661,7 @@ class AmfController < ApplicationController
   # 2. new node id,
   # 3. version.
 
   # 2. new node id,
   # 3. version.
 

-  def putpoi(usertoken, changeset, version, id, lon, lat, tags, visible) #:doc:
+  def putpoi(usertoken, changeset_id, version, id, lon, lat, tags, visible) #:doc:

     user = getuser(usertoken)
     if !user then return -1,"You are not logged in, so the point could not be saved." end
 
     user = getuser(usertoken)
     if !user then return -1,"You are not logged in, so the point could not be saved." end
 


@@ -615,13 +675,12 @@ class AmfController < ApplicationController
 
         if !visible then
           unless node.ways.empty? then return -1,"The point has since become part of a way, so you cannot save it as a POI." end
 
         if !visible then
           unless node.ways.empty? then return -1,"The point has since become part of a way, so you cannot save it as a POI." end

-          deleteitemrelations(id, 'node')

         end
       end
       # We always need a new node, based on the data that has been sent to us
       new_node = Node.new
 
         end
       end
       # We always need a new node, based on the data that has been sent to us
       new_node = Node.new
 

-      new_node.changeset_id = changeset
+      new_node.changeset_id = changeset_id

       new_node.version = version
       new_node.lat = lat
       new_node.lon = lon
       new_node.version = version
       new_node.lat = lat
       new_node.lon = lon


@@ -649,28 +708,28 @@ class AmfController < ApplicationController
     # Really need to check to see whether this is a server load issue, and the 
     # last version was in the same changeset, or belongs to the same user, then
     # we can return something different
     # Really need to check to see whether this is a server load issue, and the 
     # last version was in the same changeset, or belongs to the same user, then
     # we can return something different

-    return [-3, "You have taken too long to edit, please reload the area"]
+    return [-3, "Sorry, someone else has changed this point since you started editing. Please click the 'Edit' tab to reload the area. The server said: #{ex}"]

   rescue OSM::APIAlreadyDeletedError => ex
   rescue OSM::APIAlreadyDeletedError => ex

-    return [-1, "The object has already been deleted"]
+    return [-1, "The point has already been deleted"]

   rescue OSM::APIError => ex
     # Some error that we don't specifically catch
   rescue OSM::APIError => ex
     # Some error that we don't specifically catch

-    return [-2, "Something really bad happened :-()"]
+    return [-2, "An unusual error happened (in 'putpoi' #{id}). The server said: #{ex}"]

   end
 
   # Read POI from database
   # (only called on revert: POIs are usually read by whichways).
   #
   end
 
   # Read POI from database
   # (only called on revert: POIs are usually read by whichways).
   #

-  # Returns array of id, long, lat, hash of tags, version.
+  # Returns array of id, long, lat, hash of tags, (current) version.

 
 

-  def getpoi(id,version) #:doc:
-    if version>0 then
-        n = OldNode.find(id, :conditions=>['version=?',version])
-    else
-      n = Node.find(id)
+  def getpoi(id,timestamp) #:doc:
+    n = Node.find(id)
+    v = n.version
+    unless timestamp == ''
+      n = OldNode.find(id, :conditions=>['timestamp=?',DateTime.strptime(timestamp, "%d %b %Y, %H:%M:%S")])

     end
 
     if n
     end
 
     if n

-      return [n.id, n.lon, n.lat, n.tags, n.version]
+      return [n.id, n.lon, n.lat, n.tags, v]

     else
       return [nil, nil, nil, {}, nil]
     end
     else
       return [nil, nil, nil, {}, nil]
     end


@@ -686,7 +745,7 @@ class AmfController < ApplicationController
   # of the nodes have been changed by someone else then, there is a problem!
   # Returns 0 (success), unchanged way id.
 
   # of the nodes have been changed by someone else then, there is a problem!
   # Returns 0 (success), unchanged way id.
 

-  def deleteway(usertoken, changeset_id, way_id, way_version, node_id_version) #:doc:
+  def deleteway(usertoken, changeset_id, way_id, way_version, deletednodes) #:doc:

     user = getuser(usertoken)
     unless user then return -1,"You are not logged in, so the way could not be deleted." end
       
     user = getuser(usertoken)
     unless user then return -1,"You are not logged in, so the way could not be deleted." end
       


@@ -694,27 +753,29 @@ class AmfController < ApplicationController
     # Need a transaction so that if one item fails to delete, the whole delete fails.
     Way.transaction do
 
     # Need a transaction so that if one item fails to delete, the whole delete fails.
     Way.transaction do
 

-      # FIXME: would be good not to make two history entries when removing
-      #                 two nodes from the same relation
+      # -- Delete the way
+

       old_way = Way.find(way_id)
       old_way = Way.find(way_id)

-      #old_way.unshared_node_ids.each do |n|
-      #  deleteitemrelations(n, 'node')
-      #end
-      #deleteitemrelations(way_id, 'way')
-
-   
-      #way.delete_with_relations_and_nodes_and_history(changeset_id.to_i)
-      old_way.unshared_node_ids.each do |node_id|
-        # delete the node
-        node = Node.find(node_id)
-        delete_node = Node.new
-        delete_node.version = node_id_version[node_id]
-        node.delete_with_history!(delete_node, user)
-      end
-      # delete the way

       delete_way = Way.new
       delete_way.version = way_version
       delete_way = Way.new
       delete_way.version = way_version

+      delete_way.changeset_id = changeset_id

       old_way.delete_with_history!(delete_way, user)
       old_way.delete_with_history!(delete_way, user)

+
+      # -- Delete unwanted nodes
+
+      deletednodes.each do |id,v|
+        node = Node.find(id.to_i)
+        new_node = Node.new
+        new_node.changeset_id = changeset_id
+        new_node.version = v.to_i
+        begin
+          node.delete_with_history!(new_node, user)
+        rescue OSM::APIPreconditionFailedError => ex
+          # We don't do anything with the exception as the node is in use
+          # elsewhere and we don't want to delete it
+        end
+      end
+

     end # transaction
     [0, way_id]
   rescue OSM::APIChangesetAlreadyClosedError => ex
     end # transaction
     [0, way_id]
   rescue OSM::APIChangesetAlreadyClosedError => ex


@@ -723,54 +784,18 @@ class AmfController < ApplicationController
     # Really need to check to see whether this is a server load issue, and the 
     # last version was in the same changeset, or belongs to the same user, then
     # we can return something different
     # Really need to check to see whether this is a server load issue, and the 
     # last version was in the same changeset, or belongs to the same user, then
     # we can return something different

-    return [-3, "You have taken too long to edit, please reload the area"]
+    return [-3, "Sorry, someone else has changed this way since you started editing. Please click the 'Edit' tab to reload the area."]

   rescue OSM::APIAlreadyDeletedError => ex
   rescue OSM::APIAlreadyDeletedError => ex

-    return [-1, "The object has already been deleted"]
+    return [-1, "The way has already been deleted."]

   rescue OSM::APIError => ex
     # Some error that we don't specifically catch
   rescue OSM::APIError => ex
     # Some error that we don't specifically catch

-    return [-2, "Something really bad happened :-()"]
+    return [-2, "An unusual error happened (in 'deleteway' #{way_id}). The server said: #{ex}"]

   end
 
 
   # ====================================================================
   # Support functions
 
   end
 
 
   # ====================================================================
   # Support functions
 

-  # delete a way and its nodes that aren't part of other ways
-  # this functionality used to be in the model, however it is specific to amf
-  # controller
-  #def delete_unshared_nodes(changeset_id, way_id)
-  
-  # Remove a node or way from all relations
-  # FIXME needs version, changeset, and user
-  # Fixme make sure this doesn't depend on anything and delete this, as potlatch 
-  # itself should remove the relations first
-  def deleteitemrelations(objid, type, version) #:doc:
-    relations = RelationMember.find(:all, 
-                                                                       :conditions => ['member_type = ? and member_id = ?', type, objid], 
-                                                                       :include => :relation).collect { |rm| rm.relation }.uniq
-
-    relations.each do |rel|
-      rel.members.delete_if { |x| x[0] == type and x[1] == objid }
-      # FIXME need to create the new relation
-      new_rel = Relation.new
-      new_rel.version = version
-      new_rel.members = members
-      new_rel.changeset = changeset
-      rel.delete_with_history(new_rel, user)
-    end
-  end
-
-  # Break out node tags into a hash
-  # (should become obsolete as of API 0.6)
-
-  def tagstring_to_hash(a) #:doc:
-    tags={}
-    Tags.split(a) do |k, v|
-      tags[k]=v
-    end
-    tags
-  end
-

   # Authenticate token
   # (can also be of form user:pass)
   # When we are writing to the api, we need the actual user model, 
   # Authenticate token
   # (can also be of form user:pass)
   # When we are writing to the api, we need the actual user model, 


@@ -844,7 +869,7 @@ class AmfController < ApplicationController
       SELECT DISTINCT cr.id AS relid,cr.version AS version 
       FROM current_relations cr
       INNER JOIN current_relation_members crm ON crm.id=cr.id 
       SELECT DISTINCT cr.id AS relid,cr.version AS version 
       FROM current_relations cr
       INNER JOIN current_relation_members crm ON crm.id=cr.id 

-      INNER JOIN current_nodes cn ON crm.member_id=cn.id AND crm.member_type='node' 
+      INNER JOIN current_nodes cn ON crm.member_id=cn.id AND crm.member_type='Node' 

        WHERE #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "cn.")}
       EOF
     unless way_ids.empty?
        WHERE #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "cn.")}
       EOF
     unless way_ids.empty?


@@ -853,17 +878,17 @@ class AmfController < ApplicationController
         SELECT DISTINCT cr.id AS relid,cr.version AS version
         FROM current_relations cr
         INNER JOIN current_relation_members crm ON crm.id=cr.id
         SELECT DISTINCT cr.id AS relid,cr.version AS version
         FROM current_relations cr
         INNER JOIN current_relation_members crm ON crm.id=cr.id

-         WHERE crm.member_type='way' 
+         WHERE crm.member_type='Way' 

          AND crm.member_id IN (#{way_ids.join(',')})
         EOF
     end
          AND crm.member_id IN (#{way_ids.join(',')})
         EOF
     end

-    return ActiveRecord::Base.connection.select_all(sql).collect { |a| [a['relid'].to_i,a['version'].to_i] }
+    ActiveRecord::Base.connection.select_all(sql).collect { |a| [a['relid'].to_i,a['version'].to_i] }

   end
        
   def sql_get_nodes_in_way(wayid)
     points=[]
     sql=<<-EOF
   end
        
   def sql_get_nodes_in_way(wayid)
     points=[]
     sql=<<-EOF

-      SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,current_nodes.id 
+      SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,current_nodes.id,current_nodes.version 

       FROM current_way_nodes,current_nodes 
        WHERE current_way_nodes.id=#{wayid.to_i} 
                   AND current_way_nodes.node_id=current_nodes.id 
       FROM current_way_nodes,current_nodes 
        WHERE current_way_nodes.id=#{wayid.to_i} 
                   AND current_way_nodes.node_id=current_nodes.id 


@@ -876,7 +901,7 @@ class AmfController < ApplicationController
         nodetags[n['k']]=n['v']
       end
       nodetags.delete('created_by')
         nodetags[n['k']]=n['v']
       end
       nodetags.delete('created_by')

-      points << [row['lon'].to_f,row['lat'].to_f,row['id'].to_i,nodetags]
+      points << [row['lon'].to_f,row['lat'].to_f,row['id'].to_i,nodetags,row['version'].to_i]

     end
     points
   end
     end
     points
   end