Potlatch 1.1 (server code)

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

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 94b09c6fcc084154c22c127c602fa9128562a911..0b5e3a3ce39d90a6c50b2bb76fd6d2766fe8df5f 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -43,7 +43,6 @@ class AmfController < ApplicationController
   # Help methods for checking boundary sanity and area size
   include MapBoundary
 
-  session :off
   before_filter :check_api_writable
 
   # Main AMF handlers: process the raw AMF string (using AMF library) and
@@ -128,14 +127,13 @@ class AmfController < ApplicationController
           case message
             when 'putway';         orn=renumberednodes.dup
                                    r=putway(renumberednodes,*args)
-                                   renumberednodes=r[4].dup
-                                   r[4].delete_if { |k,v| orn.has_key?(k) }
+                                   r[4]=renumberednodes.reject { |k,v| orn.has_key?(k) }
                                    if r[2] != r[3] then renumberedways[r[2]] = r[3] 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[2] != r[3] then renumberednodes[r[2]] = r[3] end
+                                   if r[2] != r[3] then renumberednodes[r[2]] = r[3] end
                                    results[index]=AMF.putdata(index,r)
             when 'startchangeset'; results[index]=AMF.putdata(index,startchangeset(*args))
            end
@@ -304,7 +302,7 @@ class AmfController < ApplicationController
   end
 
   # Get a way including nodes and tags.
-  # Returns the way id, a Potlatch-style array of points, a hash of tags, and the version number.
+  # Returns the way id, a Potlatch-style array of points, a hash of tags, the version number, and the user ID.
 
   def getway(wayid) #:doc:
     amf_handle_error_with_timeout("'getway' #{wayid}") do
@@ -312,6 +310,7 @@ class AmfController < ApplicationController
         points = sql_get_nodes_in_way(wayid)
         tags = sql_get_tags_in_way(wayid)
         version = sql_get_way_version(wayid)
+        uid = sql_get_way_user(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
@@ -328,9 +327,10 @@ class AmfController < ApplicationController
         end
         tags = way.tags
         version = way.version
+        uid = way.changeset.user.id
       end
 
-      [0, '', wayid, points, tags, version]
+      [0, '', wayid, points, tags, version, uid]
     end
   end
   
@@ -417,7 +417,8 @@ class AmfController < ApplicationController
       # 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] }
+      revdates.collect! {|d| [d.succ.strftime("%d %b %Y, %H:%M:%S")] + revusers[d.to_i] }
+      revdates.uniq!
 
       return ['way', wayid, revdates]
     rescue ActiveRecord::RecordNotFound
@@ -430,7 +431,7 @@ class AmfController < ApplicationController
   def getnode_history(nodeid) #:doc:
     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)
+        [old_node.timestamp.succ.strftime("%d %b %Y, %H:%M:%S")] + change_user(old_node)
       end
       return ['node', nodeid, history]
     rescue ActiveRecord::RecordNotFound
@@ -589,13 +590,22 @@ class AmfController < ApplicationController
   # 
   # Returns:
   # 0. '0' (code for success),
-  # 1. original way id (unchanged),
-  # 2. new way id,
-  # 3. hash of renumbered nodes (old id=>new id),
-  # 4. way version,
-  # 5. hash of node versions (node=>version)
+  # 1. message,
+  # 2. original way id (unchanged),
+  # 3. new way id,
+  # 4. hash of renumbered nodes (old id=>new id),
+  # 5. way version,
+  # 6. hash of node versions (node=>version)
 
   def putway(renumberednodes, usertoken, changeset_id, wayversion, originalway, pointlist, attributes, nodes, deletednodes) #:doc:
+
+logger.info("renumberednodes is #{renumberednodes.inspect}")
+logger.info("wayversion is #{wayversion}")
+logger.info("pointlist is #{pointlist.inspect}")
+logger.info("sendnodes is #{nodes.inspect}")
+logger.info("deletednodes is #{deletednodes.inspect}")
+
+
     amf_handle_error("'putway' #{originalway}") do
       # -- Initialise
        
@@ -749,10 +759,11 @@ class AmfController < ApplicationController
 
   def getpoi(id,timestamp) #:doc:
     amf_handle_error("'getpoi' #{id}") do
+      id = id.to_i
       n = Node.find(id)
       v = n.version
       unless timestamp == ''
-        n = OldNode.find(id, :conditions=>['timestamp=?',DateTime.strptime(timestamp, "%d %b %Y, %H:%M:%S")])
+        n = OldNode.find(:first, :conditions => ['id = ? AND timestamp <= ?', id, timestamp], :order => 'timestamp DESC')
       end
 
       if n
@@ -938,7 +949,11 @@ class AmfController < ApplicationController
   end
 
   def sql_get_way_version(wayid)
-    ActiveRecord::Base.connection.select_one("SELECT version FROM current_ways WHERE id=#{wayid.to_i}")
+    ActiveRecord::Base.connection.select_one("SELECT version FROM current_ways WHERE id=#{wayid.to_i}")['version']
+  end
+
+  def sql_get_way_user(wayid)
+    ActiveRecord::Base.connection.select_one("SELECT user FROM current_ways,changesets WHERE current_ways.id=#{wayid.to_i} AND current_ways.changeset=changesets.id")['user']
   end
 end