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 51e49849f52fc39afce089a826561a6d14cbc385..6e1b364d4794dbfef7ebeca2166e354078f1c604 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -10,10 +10,16 @@
 #
 # == General structure
 #
 #
 # == General structure
 #

-# Apart from the talk method (which distributes the requests from the
-# AMF message), each method generally takes arguments in the order they were 
-# sent by the Potlatch SWF. Do not assume typing has been preserved. Methods 
-# all return an array to the SWF.
+# Apart from the amf_read and amf_write methods (which distribute the requests
+# from the AMF message), each method generally takes arguments in the order 
+# they were sent by the Potlatch SWF. Do not assume typing has been preserved. 
+# Methods all return an array to the SWF.
+#
+# == API 0.6
+#
+# Note that this requires a patched version of composite_primary_keys 1.1.0
+# (see http://groups.google.com/group/compositekeys/t/a00e7562b677e193) 
+# if you are to run with POTLATCH_USE_SQL=false .

 # 
 # == Debugging
 # 
 # 
 # == Debugging
 # 


@@ -28,19 +34,21 @@ class AmfController < ApplicationController
 
   include Potlatch
 
 
   include Potlatch
 

+  # Help methods for checking boundary sanity and area size
+  include MapBoundary
+

   session :off
   before_filter :check_write_availability
 
   session :off
   before_filter :check_write_availability
 

-  # Main AMF handler: processes the raw AMF string (using AMF library) and
+  # Main AMF handlers: process the raw AMF string (using AMF library) and

   # calls each action (private method) accordingly.
   # calls each action (private method) accordingly.

+  # ** FIXME: refactor to reduce duplication of code across read/write

   
   

-  def talk
-       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
-       renumberednodes={}                                                      # Shared across repeated putways
-       renumberedways={}                                                       # Shared across repeated putways
+  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

 
        # Parse request
 
 
        # Parse request
 


@@ -59,6 +67,7 @@ class AmfController < ApplicationController
          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)
          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())
 
          case message
                when 'getpresets';                      results[index]=AMF.putdata(index,getpresets())


@@ -69,6 +78,38 @@ class AmfController < ApplicationController
                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 '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))
+         end
+       end
+    logger.info("encoding AMF results")
+    sendresponse(results)
+  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
+
+       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]
                when 'putway';                          r=putway(renumberednodes,*args)
                                                                        renumberednodes=r[3]
                                                                        if r[1] != r[2]


@@ -76,26 +117,43 @@ class AmfController < ApplicationController
                                                                        end
                                                                        results[index]=AMF.putdata(index,r)
                when 'putrelation';                     results[index]=AMF.putdata(index,putrelation(renumberednodes, renumberedways, *args))
                                                                        end
                                                                        results[index]=AMF.putdata(index,r)
                when 'putrelation';                     results[index]=AMF.putdata(index,putrelation(renumberednodes, renumberedways, *args))

-               when 'findrelations';           results[index]=AMF.putdata(index,findrelations(*args))
-               when 'deleteway';                       results[index]=AMF.putdata(index,deleteway(args[0],args[1].to_i))
+               when 'deleteway';                       results[index]=AMF.putdata(index,deleteway(*args))

                when 'putpoi';                          results[index]=AMF.putdata(index,putpoi(*args))
                when 'putpoi';                          results[index]=AMF.putdata(index,putpoi(*args))

-               when 'getpoi';                          results[index]=AMF.putdata(index,getpoi(*args))
+               when 'startchangeset';          results[index]=AMF.putdata(index,startchangeset(*args))

          end
        end
          end
        end

+    sendresponse(results)
+  end

 
 

-       # Write out response
+  private

 
 

-       a,b=results.length.divmod(256)
-       render :content_type => "application/x-amf", :text => proc { |response, output| 
-         output.write 0.chr+0.chr+0.chr+0.chr+a.chr+b.chr
-         results.each do |k,v|
-               output.write(v)
+  # Start new changeset
+  
+  def startchangeset(usertoken, cstags, closeid, closecomment)
+       uid = getuserid(usertoken)
+       if !uid then return -1,"You are not logged in, so Potlatch can't write any changes to the database." end
+
+       # 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

-       }
+       end
+       
+       # open a new changeset
+       cs = Changeset.new
+       cs.tags = cstags
+       cs.user_id = uid
+       cs.created_at = Time.now
+       cs.save_with_tags!
+       return [0,cs.id]

   end
 
   end
 

-  private
-

   # Return presets (default tags, localisation etc.):
   # uses POTLATCH_PRESETS global, set up in OSM::Potlatch.
 
   # Return presets (default tags, localisation etc.):
   # uses POTLATCH_PRESETS global, set up in OSM::Potlatch.
 


@@ -110,27 +168,38 @@ class AmfController < ApplicationController
   def whichways(xmin, ymin, xmax, ymax) #:doc:
        xmin -= 0.01; ymin -= 0.01
        xmax += 0.01; ymax += 0.01
   def whichways(xmin, ymin, xmax, ymax) #:doc:
        xmin -= 0.01; ymin -= 0.01
        xmax += 0.01; ymax += 0.01

+    
+    # 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."]
+    end

 
        if POTLATCH_USE_SQL then
 
        if POTLATCH_USE_SQL then

-         way_ids = sql_find_way_ids_in_area(xmin, ymin, xmax, ymax)
+         ways = sql_find_ways_in_area(xmin, ymin, xmax, ymax)

          points = sql_find_pois_in_area(xmin, ymin, xmax, ymax)
          points = sql_find_pois_in_area(xmin, ymin, xmax, ymax)

-         relation_ids = sql_find_relations_in_area_and_ways(xmin, ymin, xmax, ymax, way_ids)
+         relations = sql_find_relations_in_area_and_ways(xmin, ymin, xmax, ymax, ways.collect {|x| x[0]})

        else
          # find the way ids in an area
        else
          # find the way ids in an area

-         nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax, :conditions => "current_nodes.visible = 1", :include => :ways)
-         way_ids = nodes_in_area.collect { |node| node.way_ids }.flatten.uniq
+         nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax, :conditions => ["current_nodes.visible = ?", true], :include => :ways)
+         ways = nodes_in_area.collect { |node| 
+               node.ways.collect { |w| [w.id,w.version] }.flatten
+         }.uniq
+         ways.delete([])

 
          # 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_as_hash] }
+         points = nodes_not_used_in_area.collect { |n| [n.id, n.lon, n.lat, n.tags] }

 
          # find the relations used by those nodes and ways
 
          # find the relations used by those nodes and ways

-         relations = Relation.find_for_nodes(nodes_in_area.collect { |n| n.id }, :conditions => "visible = 1") +
-                  Relation.find_for_ways(way_ids, :conditions => "visible = 1")
-         relation_ids = relations.collect { |relation| relation.id }.uniq
+         relations = Relation.find_for_nodes(nodes_in_area.collect { |n| n.id }, :conditions => {:visible => true}) +
+                  Relation.find_for_ways(ways.collect { |w| w[0] }, :conditions => {:visible => true})
+         relations = relations.collect { |relation| [relation.id,relation.version] }.uniq

        end
 
        end
 

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

   end
 
   # Find deleted ways in current bounding box (similar to whichways, but ways
   end
 
   # Find deleted ways in current bounding box (similar to whichways, but ways


@@ -140,90 +209,159 @@ class AmfController < ApplicationController
        xmin -= 0.01; ymin -= 0.01
        xmax += 0.01; ymax += 0.01
 
        xmin -= 0.01; ymin -= 0.01
        xmax += 0.01; ymax += 0.01
 

-       nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax, :conditions => "current_nodes.visible = 0 AND current_ways.visible = 0", :include => :ways_via_history)
+    # 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."]
+    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 = 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.

-  # Returns 0 (success), a Potlatch-style array of points, and a hash of tags.
+  # Returns the way id, a Potlatch-style array of points, a hash of tags, and the version number.

 
   def getway(wayid) #:doc:
        if POTLATCH_USE_SQL then
          points = sql_get_nodes_in_way(wayid)
          tags = sql_get_tags_in_way(wayid)
 
   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)

        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
        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

-         way = Way.find(wayid)
+      begin
+           way = Way.find(wayid)
+      rescue ActiveRecord::RecordNotFound
+        return [wayid,[],{}]
+      end
+
+      # check case where way has been deleted or doesn't exist
+      return [wayid,[],{}] if way.nil? or !way.visible
+

          points = way.nodes.collect do |node|
          points = way.nodes.collect do |node|

-               [node.lon, node.lat, node.id, nil, node.tags_as_hash]
+               nodetags=node.tags
+               nodetags.delete('created_by')
+               [node.lon, node.lat, node.id, nodetags]

          end
          tags = way.tags
          end
          tags = way.tags

+         version = way.version

        end
 
        end
 

-       [wayid, points, tags]
+       [wayid, points, tags, version]

   end
 
   # Get an old version of a way, and all constituent nodes.
   #
   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, 
-  # even if it's moved.  For revert (version=1+), uses the node in existence 
+  # For undelete (version<0), always uses the most recent version of each node, 
+  # even if it's moved.  For revert (version >= 0), uses the node in existence 

   # at the time, generating a new id if it's still visible and has been moved/
   # retagged.
   # at the time, generating a new id if it's still visible and has been moved/
   # retagged.

+  #
+  # Returns:
+  # 0. success code, 
+  # 1. id, 
+  # 2. array of points, 
+  # 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, version) #:doc:
        if version < 0

-         old_way = OldWay.find(:first, :conditions => ['visible = 1 AND id = ?', id], :order => 'version DESC')
-         points = old_way.get_nodes_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 => ['id = ? AND version = ?', id, version])
        else
          old_way = OldWay.find(:first, :conditions => ['id = ? AND version = ?', id, version])

-         points = old_way.get_nodes_revert
+         points = old_way.get_nodes_revert unless old_way.nil?

        end
 
        end
 

-       old_way.tags['history'] = "Retrieved from v#{old_way.version}"
-
-       [0, id, points, old_way.tags, old_way.version]
+    if old_way.nil?
+      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)]
+    end

   end
   
   # Find history of a way. Returns 'way', id, and 
   # an array of previous versions.
 
   def getway_history(wayid) #:doc:
   end
   
   # Find history of a way. Returns 'way', id, and 
   # an array of previous versions.
 
   def getway_history(wayid) #:doc:

-       history = Way.find(wayid).old_ways.reverse.collect do |old_way|
-         user = old_way.user.data_public? ? old_way.user.display_name : 'anonymous'
-         uid  = old_way.user.data_public? ? old_way.user.id : 0
-         [old_way.version, old_way.timestamp.strftime("%d %b %Y, %H:%M"), old_way.visible ? 1 : 0, user, uid]
-       end
+    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]
+         end

 
 

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

   end
 
   # Find history of a node. Returns 'node', id, and 
   # an array of previous versions.
 
   def getnode_history(nodeid) #:doc:
   end
 
   # Find history of a node. Returns 'node', id, and 
   # an array of previous versions.
 
   def getnode_history(nodeid) #:doc:

-       history = Node.find(nodeid).old_nodes.reverse.collect do |old_node|
-         user = old_node.user.data_public? ? old_node.user.display_name : 'anonymous'
-         uid  = old_node.user.data_public? ? old_node.user.id : 0
-         [old_node.timestamp.to_i, old_node.timestamp.strftime("%d %b %Y, %H:%M"), old_node.visible ? 1 : 0, user, uid]
-       end
+    begin
+         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]
+         end

 
 

-       ['node',nodeid,history]
+         return ['node',nodeid,history]
+    rescue ActiveRecord::RecordNotFound
+      return ['node', nodeid, []]
+    end
+  end
+
+  # Find GPS traces with specified name/id.
+  # Returns array listing GPXs, each one comprising id, name and description.
+  
+  def findgpx(searchterm, usertoken)
+       uid = getuserid(usertoken)
+       if !uid then return -1,"You must be logged in to search for GPX traces." end
+
+       gpxs = []
+       if searchterm.to_i>0 then
+         gpx = Trace.find(searchterm.to_i, :conditions => ["visible=? AND (public=? OR user_id=?)",true,true,uid] )
+         if gpx then
+           gpxs.push([gpx.id, gpx.name, gpx.description])
+         end
+       else
+         Trace.find(:all, :limit => 21, :conditions => ["visible=? AND (public=? OR user_id=?) AND MATCH(name) AGAINST (?)",true,true,uid,searchterm] ).each do |gpx|
+               gpxs.push([gpx.id, gpx.name, gpx.description])
+         end
+       end
+       gpxs

   end
 
   # Get a relation with all tags and members.
   # Returns:
   # 0. relation id,
   # 1. hash of tags,
   end
 
   # Get a relation with all tags and members.
   # Returns:
   # 0. relation id,
   # 1. hash of tags,

-  # 2. list of members.
+  # 2. list of members,
+  # 3. version.

   
   def getrelation(relid) #:doc:
   
   def getrelation(relid) #:doc:

-       rel = Relation.find(relid)
+    begin
+         rel = Relation.find(relid)
+    rescue ActiveRecord::RecordNotFound
+      return [relid, {}, []]
+    end

 
 

-       [relid, rel.tags, rel.members]
+    return [relid, {}, [], nil] if rel.nil? or !rel.visible
+       [relid, rel.tags, rel.members, rel.version]

   end
 
   # Find relations with specified name/id.
   end
 
   # Find relations with specified name/id.


@@ -252,16 +390,17 @@ class AmfController < ApplicationController
   # 1. original relation id (unchanged),
   # 2. new relation id.
 
   # 1. original relation id (unchanged),
   # 2. new relation id.
 

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

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

-       visible = visible.to_i
+       visible = (visible.to_i != 0)

 
        # create a new relation, or find the existing one
        if relid <= 0
          rel = Relation.new
 
        # create a new relation, or find the existing one
        if relid <= 0
          rel = Relation.new

+         rel.version = 0

        else
          rel = Relation.find(relid)
        end
        else
          rel = Relation.find(relid)
        end


@@ -273,18 +412,17 @@ class AmfController < ApplicationController
          if mid < 0
                mid = renumberednodes[mid] if m[0] == 'node'
                mid = renumberedways[mid] if m[0] == 'way'
          if mid < 0
                mid = renumberednodes[mid] if m[0] == 'node'
                mid = renumberedways[mid] if m[0] == 'way'

-               if mid < 0
-                 return -2, "Negative ID unresolved"
-               end

          end
          end

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

        end
 
        # assign new contents
        rel.members = typedmembers
        rel.tags = tags
        rel.visible = visible
        end
 
        # assign new contents
        rel.members = typedmembers
        rel.tags = tags
        rel.visible = visible

-       rel.user_id = uid
+       rel.changeset_id = changeset

 
        # check it then save it
        # BUG: the following is commented out because it always fails on my
 
        # check it then save it
        # BUG: the following is commented out because it always fails on my


@@ -306,9 +444,10 @@ class AmfController < ApplicationController
   # 0. '0' (code for success),
   # 1. original way id (unchanged),
   # 2. new way id,
   # 0. '0' (code for success),
   # 1. original way id (unchanged),
   # 2. new way id,

-  # 3. hash of renumbered nodes (old id=>new id)
+  # 3. hash of renumbered nodes (old id=>new id),
+  # 4. version

 
 

-  def putway(renumberednodes, usertoken, originalway, points, attributes) #:doc:
+  def putway(renumberednodes, usertoken, changeset, originalway, points, attributes) #:doc:

 
        # -- Initialise and carry out checks
        
 
        # -- Initialise and carry out checks
        


@@ -328,6 +467,7 @@ class AmfController < ApplicationController
 
        if originalway < 0
          way = Way.new
 
        if originalway < 0
          way = Way.new

+         way.version = 0       # otherwise +=1 breaks

          uniques = []
        else
          way = Way.find(originalway)
          uniques = []
        else
          way = Way.find(originalway)


@@ -349,20 +489,23 @@ class AmfController < ApplicationController
          elsif id < 0
                # Create new node
                node = Node.new
          elsif id < 0
                # Create new node
                node = Node.new

+               node.version = 0        # otherwise +=1 breaks

                savenode = true
          else
                node = Node.find(id)
                savenode = true
          else
                node = Node.find(id)

+               nodetags=node.tags
+               nodetags.delete('created_by')

                if !fpcomp(lat, node.lat) or !fpcomp(lon, node.lon) or
                if !fpcomp(lat, node.lat) or !fpcomp(lon, node.lon) or

-                  Tags.join(n[4]) != node.tags or !node.visible?
+                  n[4] != nodetags or !node.visible?

                  savenode = true
                end
          end
 
          if savenode
                  savenode = true
                end
          end
 
          if savenode

-               node.user_id = uid
+               node.changeset_id = changeset

            node.lat = lat
         node.lon = lon
            node.lat = lat
         node.lon = lon

-           node.tags = Tags.join(n[4])
+           node.tags = n[4]

            node.visible = true
            node.save_with_history!
 
            node.visible = true
            node.save_with_history!
 


@@ -382,20 +525,22 @@ class AmfController < ApplicationController
          deleteitemrelations(n, 'node')
 
          node = Node.find(n)
          deleteitemrelations(n, 'node')
 
          node = Node.find(n)

-         node.user_id = uid
+         node.changeset_id = changeset

          node.visible = false
          node.save_with_history!
        end
 
        # -- Save revised way
 
          node.visible = false
          node.save_with_history!
        end
 
        # -- Save revised way
 

-       way.tags = attributes
-       way.nds = nodes
-       way.user_id = uid
-       way.visible = true
-       way.save_with_history!
+       if way.tags!=attributes or way.nds!=nodes or !way.visible?
+         way.tags = attributes
+         way.nds = nodes
+         way.changeset_id = changeset
+         way.visible = true
+         way.save_with_history!
+       end

 
 

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

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


@@ -403,9 +548,10 @@ class AmfController < ApplicationController
   # Returns:
   # 0. 0 (success),
   # 1. original node id (unchanged),
   # Returns:
   # 0. 0 (success),
   # 1. original node id (unchanged),

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

 
 

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

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


@@ -421,53 +567,55 @@ class AmfController < ApplicationController
          end
        else
          node = Node.new
          end
        else
          node = Node.new

+         node.version = 0

        end
 
        end
 

-       node.user_id = uid
+       node.changeset_id = changeset

        node.lat = lat
        node.lon = lon
        node.lat = lat
        node.lon = lon

-       node.tags = Tags.join(tags)
+       node.tags = tags

        node.visible = visible
        node.save_with_history!
 
        node.visible = visible
        node.save_with_history!
 

-       [0, id, node.id]
+       [0, id, node.id, node.version]

   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.
+  # Returns array of id, long, lat, hash of tags, version.

 
 

-  def getpoi(id,timestamp) #:doc:
-       if timestamp>0 then
-         n = OldNode.find(id, :conditions=>['UNIX_TIMESTAMP(timestamp)=?',timestamp])
+  def getpoi(id,version) #:doc:
+       if version>0 then
+         n = OldNode.find(id, :conditions=>['version=?',version])

        else
          n = Node.find(id)
        end
 
        if n
        else
          n = Node.find(id)
        end
 
        if n

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

        else
        else

-         return [nil, nil, nil, '']
+         return [nil, nil, nil, {}, nil]

        end
   end
 
   # Delete way and all constituent nodes. Also removes from any relations.
   # Returns 0 (success), unchanged way id.
 
        end
   end
 
   # Delete way and all constituent nodes. Also removes from any relations.
   # Returns 0 (success), unchanged way id.
 

-  def deleteway(usertoken, way_id) #:doc:
-       uid = getuserid(usertoken)
-       if !uid then return -1,"You are not logged in, so the way could not be deleted." end
+  def deleteway(usertoken, changeset_id, way_id) #:doc:
+       if !getuserid(usertoken) then return -1,"You are not logged in, so the way could not be deleted." end
+
+       way_id = way_id.to_i

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

-       user = User.find(uid)

        way = Way.find(way_id)
        way.unshared_node_ids.each do |n|
          deleteitemrelations(n, 'node')
        end
        way = Way.find(way_id)
        way.unshared_node_ids.each do |n|
          deleteitemrelations(n, 'node')
        end

+       deleteitemrelations(way_id, 'way')

 
 

-       way.delete_with_relations_and_nodes_and_history(user)  
+       way.delete_with_relations_and_nodes_and_history(changeset_id.to_i)

 
        [0, way_id]
   end
 
        [0, way_id]
   end


@@ -501,10 +649,10 @@ class AmfController < ApplicationController
   end
 
   # Authenticate token
   end
 
   # Authenticate token

-  # (could be removed if no-one uses the username+password form)
+  # (can also be of form user:pass)

 
   def getuserid(token) #:doc:
 
   def getuserid(token) #:doc:

-       if (token =~ /^(.+)\+(.+)$/) then
+       if (token =~ /^(.+)\:(.+)$/) then

          user = User.authenticate(:username => $1, :password => $2)
        else
          user = User.authenticate(:token => token)
          user = User.authenticate(:username => $1, :password => $2)
        else
          user = User.authenticate(:token => token)


@@ -519,40 +667,63 @@ class AmfController < ApplicationController
        return ((a/0.0000001).round==(b/0.0000001).round)
   end
 
        return ((a/0.0000001).round==(b/0.0000001).round)
   end
 

+  # Send AMF response
+  
+  def sendresponse(results)
+       a,b=results.length.divmod(256)
+       render :content_type => "application/x-amf", :text => proc { |response, output| 
+         # ** move amf writing loop into here - 
+         # basically we read the messages in first (into an array of some sort),
+         # then iterate through that array within here, and do all the AMF writing
+         output.write 0.chr+0.chr+0.chr+0.chr+a.chr+b.chr
+         results.each do |k,v|
+               output.write(v)
+         end
+       }
+  end
+

 
   # ====================================================================
   # Alternative SQL queries for getway/whichways
 
 
   # ====================================================================
   # Alternative SQL queries for getway/whichways
 

-  def sql_find_way_ids_in_area(xmin,ymin,xmax,ymax)
+  def sql_find_ways_in_area(xmin,ymin,xmax,ymax)

        sql=<<-EOF
        sql=<<-EOF

-  SELECT DISTINCT current_way_nodes.id AS wayid
+  SELECT DISTINCT current_ways.id AS wayid,current_ways.version AS version

                FROM current_way_nodes
   INNER JOIN current_nodes ON current_nodes.id=current_way_nodes.node_id
   INNER JOIN current_ways  ON current_ways.id =current_way_nodes.id
                FROM current_way_nodes
   INNER JOIN current_nodes ON current_nodes.id=current_way_nodes.node_id
   INNER JOIN current_ways  ON current_ways.id =current_way_nodes.id

-          WHERE current_nodes.visible=1 
-                AND current_ways.visible=1 
+          WHERE current_nodes.visible=TRUE 
+                AND current_ways.visible=TRUE 

                 AND #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "current_nodes.")}
        EOF
                 AND #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "current_nodes.")}
        EOF

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

   end
        
   def sql_find_pois_in_area(xmin,ymin,xmax,ymax)
   end
        
   def sql_find_pois_in_area(xmin,ymin,xmax,ymax)

+       pois=[]

        sql=<<-EOF
        sql=<<-EOF

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

                        FROM current_nodes 
  LEFT OUTER JOIN current_way_nodes cwn ON cwn.node_id=current_nodes.id 
                        FROM current_nodes 
  LEFT OUTER JOIN current_way_nodes cwn ON cwn.node_id=current_nodes.id 

-                  WHERE current_nodes.visible=1
+                  WHERE current_nodes.visible=TRUE

                         AND cwn.id IS NULL
                         AND #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "current_nodes.")}
        EOF
                         AND cwn.id IS NULL
                         AND #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "current_nodes.")}
        EOF

-       return ActiveRecord::Base.connection.select_all(sql).collect { |n| [n['id'].to_i,n['lon'].to_f,n['lat'].to_f,tagstring_to_hash(n['tags'])] }
+       ActiveRecord::Base.connection.select_all(sql).each do |row|
+         poitags={}
+         ActiveRecord::Base.connection.select_all("SELECT k,v FROM current_node_tags WHERE id=#{row['id']}").each do |n|
+               poitags[n['k']]=n['v']
+         end
+         pois << [row['id'].to_i, row['lon'].to_f, row['lat'].to_f, poitags, row['version'].to_i]
+       end
+       pois

   end
        
   def sql_find_relations_in_area_and_ways(xmin,ymin,xmax,ymax,way_ids)
        # ** It would be more Potlatchy to get relations for nodes within ways
        #    during 'getway', not here
        sql=<<-EOF
   end
        
   def sql_find_relations_in_area_and_ways(xmin,ymin,xmax,ymax,way_ids)
        # ** It would be more Potlatchy to get relations for nodes within ways
        #    during 'getway', not here
        sql=<<-EOF

-         SELECT DISTINCT cr.id AS relid 
+         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' 
                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' 


@@ -561,28 +732,33 @@ class AmfController < ApplicationController
        unless way_ids.empty?
          sql+=<<-EOF
           UNION
        unless way_ids.empty?
          sql+=<<-EOF
           UNION

-         SELECT DISTINCT cr.id AS relid
+         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' 
                 AND crm.member_id IN (#{way_ids.join(',')})
          EOF
        end
                FROM current_relations cr
   INNER JOIN current_relation_members crm ON crm.id=cr.id
           WHERE crm.member_type='way' 
                 AND crm.member_id IN (#{way_ids.join(',')})
          EOF
        end

-       return ActiveRecord::Base.connection.select_all(sql).collect { |a| a['relid'].to_i }.uniq
+       return 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,tags 
+               SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,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 
                  FROM current_way_nodes,current_nodes 
                 WHERE current_way_nodes.id=#{wayid.to_i} 
                   AND current_way_nodes.node_id=current_nodes.id 

-                  AND current_nodes.visible=1
+                  AND current_nodes.visible=TRUE

          ORDER BY sequence_id
          EOF
        ActiveRecord::Base.connection.select_all(sql).each do |row|
          ORDER BY sequence_id
          EOF
        ActiveRecord::Base.connection.select_all(sql).each do |row|

-         points << [row['lon'].to_f,row['lat'].to_f,row['id'].to_i,nil,tagstring_to_hash(row['tags'])]
+         nodetags={}
+         ActiveRecord::Base.connection.select_all("SELECT k,v FROM current_node_tags WHERE id=#{row['id']}").each do |n|
+               nodetags[n['k']]=n['v']
+         end
+         nodetags.delete('created_by')
+         points << [row['lon'].to_f,row['lat'].to_f,row['id'].to_i,nodetags]

        end
        points
   end
        end
        points
   end


@@ -595,6 +771,9 @@ class AmfController < ApplicationController
        tags
   end
 
        tags
   end
 

+  def sql_get_way_version(wayid)
+    ActiveRecord::Base.connection.select_one("SELECT version FROM current_ways WHERE id=#{wayid.to_i}")
+  end

 end
 
 # Local Variables:
 end
 
 # Local Variables: