X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0ab2db397981e45b5d75f2c65fcc448c958e2f06..6fa8647855b81a2f518c4995969113038187759c:/app/controllers/amf_controller.rb

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index e39a4ceb2..28e2e4b2b 100644
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -1,888 +1,547 @@
+# amf_controller is a semi-standalone API for Flash clients, particularly 
+# Potlatch. All interaction between Potlatch (as a .SWF application) and the 
+# OSM database takes place using this controller. Messages are 
+# encoded in the Actionscript Message Format (AMF).
+#
+# Helper functions are in /lib/potlatch.
+#
+# Author::	editions Systeme D / Richard Fairhurst 2004-2008
+# Licence::	public domain.
+#
+# == 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.
+# 
+# == Debugging
+# 
+# Any method that returns a status code (0 for ok) can also send:
+#	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 do
+# 
+# - Check authentication
+# - Check the right things are being written to the database!
+
 class AmfController < ApplicationController
   require 'stringio'
 
+  include Potlatch
+
   session :off
   before_filter :check_write_availability
 
-  # AMF controller for Potlatch
-  # ---------------------------
-  # All interaction between Potlatch (as a .SWF application) and the 
-  # OSM database takes place using this controller. Messages are 
-  # encoded in the Actionscript Message Format (AMF).
-  #
-  # Public domain. Set your tab width to 4 to read this document. :)
-  # editions Systeme D / Richard Fairhurst 2004-2007
+  # Main AMF handler: processes the raw AMF string (using AMF library) and
+  # calls each action (private method) accordingly.
   
-  # to trap errors (getway_old,putway,putpoi,deleteway only):
-  #   return(-1,"message")		<-- just puts up a dialogue
-  #   return(-2,"message")		<-- also asks the user to e-mail me
-  # to log:
-  #   RAILS_DEFAULT_LOGGER.error("Args: #{args[0]}, #{args[1]}, #{args[2]}, #{args[3]}")
+  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
+
+	# Parse request
+
+	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
 
-  # ====================================================================
-  # Main AMF handler
+	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 '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 'putway';				r=putway(renumberednodes,*args)
+									renumberednodes=r[3]
+									if r[1] != r[2]
+									  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[0],args[1].to_i))
+		when 'putpoi';				results[index]=AMF.putdata(index,putpoi(*args))
+		when 'getpoi';				results[index]=AMF.putdata(index,getpoi(args[0].to_i))
+	  end
+	end
 
-  # ---- talk	process AMF request
+	# Write out response
 
-  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
-
-    # -------------
-    # Parse request
-
-    headers=getint(req)					# Read number of headers
-
-    headers.times do				    # Read each header
-      name=getstring(req)				#  |
-      req.getc                 			#  | skip boolean
-      value=getvalue(req)				#  |
-      header["name"]=value				#  |
-    end
-
-    bodies=getint(req)					# Read number of bodies
-    bodies.times do     				# Read each body
-      message=getstring(req)			#  | get message name
-      index=getstring(req)				#  | get index in response sequence
-      bytes=getlong(req)				#  | get total size in bytes
-      args=getvalue(req)				#  | get response (probably an array)
-
-      case message
-		  when 'getpresets';		results[index]=putdata(index,getpresets)
-		  when 'whichways';			results[index]=putdata(index,whichways(args))
-		  when 'whichways_deleted';	results[index]=putdata(index,whichways_deleted(args))
-		  when 'getway';			results[index]=putdata(index,getway(args))
-		  when 'getway_old';		results[index]=putdata(index,getway_old(args))
-		  when 'getway_history';	results[index]=putdata(index,getway_history(args))
-		  when 'putway';			r=putway(args,renumberednodes)
-		  							renumberednodes=r[3]
-		  							results[index]=putdata(index,r)
-		  when 'deleteway';			results[index]=putdata(index,deleteway(args))
-		  when 'putpoi';			results[index]=putdata(index,putpoi(args))
-		  when 'getpoi';			results[index]=putdata(index,getpoi(args))
-      end
-    end
-
-    # ------------------
-    # Write out response
-
-    RAILS_DEFAULT_LOGGER.info("  Response: start")
-    a,b=results.length.divmod(256)
+	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)
-		end
+	  output.write 0.chr+0.chr+0.chr+0.chr+a.chr+b.chr
+	  results.each do |k,v|
+		output.write(v)
+	  end
 	}
-    RAILS_DEFAULT_LOGGER.info("  Response: end")
-
   end
 
   private
 
-  # ====================================================================
-  # Remote calls
-
-  # ----- getpresets
-  #	      return presets,presetmenus and presetnames arrays
-
-  def getpresets
-    RAILS_DEFAULT_LOGGER.info("  Message: getpresets")
-
-	# Read preset menus
-    presets={}
-    presetmenus={}; presetmenus['point']=[]; presetmenus['way']=[]; presetmenus['POI']=[]
-    presetnames={}; presetnames['point']={}; presetnames['way']={}; presetnames['POI']={}
-    presettype=''
-    presetcategory=''
-
-#	StringIO.open(txt) do |file|
-	File.open("#{RAILS_ROOT}/config/potlatch/presets.txt") do |file|
-      file.each_line {|line|
-        t=line.chomp
-        if (t=~/(\w+)\/(\w+)/) then
-          presettype=$1
-          presetcategory=$2
-          presetmenus[presettype].push(presetcategory)
-          presetnames[presettype][presetcategory]=["(no preset)"]
-        elsif (t=~/^(.+):\s?(.+)$/) then
-          pre=$1; kv=$2
-          presetnames[presettype][presetcategory].push(pre)
-          presets[pre]={}
-          kv.split(',').each {|a|
-            if (a=~/^(.+)=(.*)$/) then presets[pre][$1]=$2 end
-          }
-        end
-      }
-    end
-    
-    # Read colours/styling
-	colours={}; casing={}; areas={}
-	File.open("#{RAILS_ROOT}/config/potlatch/colours.txt") do |file|
-	  file.each_line {|line|
-		t=line.chomp
-		if (t=~/(\w+)\t+([^\t]+)\t+([^\t]+)\t+([^\t]+)/) then
-		  tag=$1
-		  if ($2!='-') then colours[tag]=$2.hex end
-		  if ($3!='-') then casing[tag]=$3.hex end
-		  if ($4!='-') then areas[tag]=$4.hex end
-		end
-	  }
-	end
-    [presets,presetmenus,presetnames,colours,casing,areas]
-  end
+  # Return presets (default tags, localisation etc.):
+  # uses POTLATCH_PRESETS global, set up in OSM::Potlatch.
 
-  # ----- whichways(left,bottom,right,top)
-  #		  return array of ways in current bounding box
-  #		  at present, instead of using correct (=more complex) SQL to find
-  #		  corner-crossing ways, it simply enlarges the bounding box by +/- 0.01
-
-  def whichways(args)
-    xmin = args[0].to_f-0.01
-    ymin = args[1].to_f-0.01
-    xmax = args[2].to_f+0.01
-    ymax = args[3].to_f+0.01
-    baselong    = args[4]
-    basey       = args[5]
-    masterscale = args[6]
-
-    RAILS_DEFAULT_LOGGER.info("  Message: whichways, bbox=#{xmin},#{ymin},#{xmax},#{ymax}")
-
-    waylist = ActiveRecord::Base.connection.select_all("SELECT DISTINCT current_way_nodes.id AS wayid"+
-       "  FROM current_way_nodes,current_nodes,current_ways "+
-       " WHERE current_nodes.id=current_way_nodes.node_id "+
-       "   AND current_nodes.visible=1 "+
-       "   AND current_ways.id=current_way_nodes.id "+
-       "   AND current_ways.visible=1 "+
-       "   AND "+OSM.sql_for_area(ymin, xmin, ymax, xmax, "current_nodes."))
-
-    ways = waylist.collect {|a| a['wayid'].to_i } # get an array of way IDs
-
-    pointlist = ActiveRecord::Base.connection.select_all("SELECT current_nodes.id,current_nodes.latitude*0.0000001 AS lat,current_nodes.longitude*0.0000001 AS lng,current_nodes.tags "+
-       "  FROM current_nodes "+
-       "  LEFT OUTER JOIN current_way_nodes cwn ON cwn.node_id=current_nodes.id "+
-       " WHERE "+OSM.sql_for_area(ymin, xmin, ymax, xmax, "current_nodes.")+
-       "   AND cwn.id IS NULL "+
-       "   AND current_nodes.visible=1")
-
-    points = pointlist.collect {|a| [a['id'],long2coord(a['lng'].to_f,baselong,masterscale),lat2coord(a['lat'].to_f,basey,masterscale),tag2array(a['tags'])]	} # get a list of node ids and their tags
-
-    [ways,points]
+  def getpresets() #:doc:
+	return POTLATCH_PRESETS
   end
 
-  # ----- whichways_deleted(left,bottom,right,top)
-  #		  return array of deleted ways in current bounding box
-  
-  def whichways_deleted(args)
-    xmin = args[0].to_f-0.01
-    ymin = args[1].to_f-0.01
-    xmax = args[2].to_f+0.01
-    ymax = args[3].to_f+0.01
-    baselong    = args[4]
-    basey       = args[5]
-    masterscale = args[6]
+  # Find all the ways, POI nodes (i.e. not part of ways), and relations
+  # in a given bounding box. Nodes are returned in full; ways and relations 
+  # are IDs only. 
 
-	sql=<<-EOF
-		 SELECT DISTINCT current_ways.id 
-		   FROM current_nodes,way_nodes,current_ways 
-		  WHERE #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "current_nodes.")} 
-			AND way_nodes.node_id=current_nodes.id 
-			AND way_nodes.id=current_ways.id 
-			AND current_nodes.visible=0 
-			AND current_ways.visible=0 
-	EOF
-    waylist = ActiveRecord::Base.connection.select_all(sql)
-    ways = waylist.collect {|a| a['id'].to_i }
-	[ways]
-  end
-  
-  # ----- getway (objectname, way, baselong, basey, masterscale)
-  #		  returns objectname, array of co-ordinates, attributes,
-  #				  xmin,xmax,ymin,ymax
-
-  def getway(args)
-    objname,wayid,baselong,basey,masterscale=args
-    wayid = wayid.to_i
-    points = []
-    xmin = ymin =  999999
-    xmax = ymax = -999999
-
-    RAILS_DEFAULT_LOGGER.info("  Message: getway, id=#{wayid}")
-
-    readwayquery(wayid).each {|row|
-      points<<[long2coord(row['longitude'].to_f,baselong,masterscale),lat2coord(row['latitude'].to_f,basey,masterscale),row['id'].to_i,nil,tag2array(row['tags'])]
-      xmin = [xmin,row['longitude'].to_f].min
-      xmax = [xmax,row['longitude'].to_f].max
-      ymin = [ymin,row['latitude'].to_f].min
-      ymax = [ymax,row['latitude'].to_f].max
-    }
-
-    attributes={}
-    attrlist=ActiveRecord::Base.connection.select_all "SELECT k,v FROM current_way_tags WHERE id=#{wayid}"
-    attrlist.each {|a| attributes[a['k'].gsub(':','|')]=a['v'] }
-
-    [objname,points,attributes,xmin,xmax,ymin,ymax]
-  end
-  
-  # -----	getway_old (objectname, way, version, baselong, basey, masterscale)
-  #			returns old version of way
+  def whichways(xmin,ymin,xmax,ymax) #:doc:
+	xmin-=0.01; ymin-=0.01
+	xmax+=0.01; ymax+=0.01
 
-  def getway_old(args)
-    RAILS_DEFAULT_LOGGER.info("  Message: getway_old (server is #{SERVER_URL})")
-	if SERVER_URL=="www.openstreetmap.org" then return -1,"Revert is not currently enabled on the OpenStreetMap server." end
-	
-    objname,wayid,version,baselong,basey,masterscale=args
-    wayid = wayid.to_i
-    version = version.to_i
-    xmin = ymin =  999999
-    xmax = ymax = -999999
-	points=[]
-	if version<0
-	  historic=false
-	  version=getlastversion(wayid,version)
+	if POTLATCH_USE_SQL then
+	  way_ids=sql_find_way_ids_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)
 	else
-	  historic=true
+	  # 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
+
+	  # 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] }
+
+	  # find the relations used by those nodes and ways
+	  relations = nodes_in_area.collect { |node| node.containing_relations.visible }.flatten +
+	              way_ids.collect { |id| Way.find(id).containing_relations.visible }.flatten
+	  relation_ids = relations.collect { |relation| relation.id }.uniq
 	end
-	readwayquery_old(wayid,version,historic).each { |row|
-      points<<[long2coord(row['longitude'].to_f,baselong,masterscale),lat2coord(row['latitude'].to_f,basey,masterscale),row['id'].to_i,row['visible'].to_i,tag2array(row['tags'].to_s)]
-      xmin=[xmin,row['longitude'].to_f].min
-      xmax=[xmax,row['longitude'].to_f].max
-      ymin=[ymin,row['latitude' ].to_f].min
-      ymax=[ymax,row['latitude' ].to_f].max
-	}
 
-	# get tags from this version
-    attributes={}
-    attrlist=ActiveRecord::Base.connection.select_all "SELECT k,v FROM way_tags WHERE id=#{wayid} AND version=#{version}"
-    attrlist.each {|a| attributes[a['k'].gsub(':','|')]=a['v'] }
-	attributes['history']="Retrieved from v"+version.to_s
-
-    [0,objname,points,attributes,xmin,xmax,ymin,ymax,version]
+	[way_ids,points,relation_ids]
   end
 
-  # -----	getway_history (way)
-  #			returns array of previous versions (version,timestamp,visible,user)
-  #			should also show 'created_by'
+  # Find deleted ways in current bounding box (similar to whichways, but ways
+  # with a deleted node only - not POIs or relations).
 
-  def getway_history(wayid)
-	history=[]
-	sql=<<-EOF
-	SELECT version,timestamp,visible,display_name,data_public
-	  FROM ways,users
-	 WHERE ways.id=#{wayid}
-	   AND ways.user_id=users.id
-	   AND ways.visible=1
-	 ORDER BY version DESC
-	EOF
-	histlist=ActiveRecord::Base.connection.select_all(sql)
-	histlist.each { |row|
-		if row['data_public'] then user=row['display_name'] else user='anonymous' end
-		history<<[row['version'],row['timestamp'],row['visible'],user]
-	}
-	[history]
+  def whichways_deleted(xmin,ymin,xmax,ymax) #:doc:
+	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 )
+	way_ids = nodes_in_area.collect { |node| node.ways_via_history_ids }.flatten.uniq
+	[way_ids]
   end
 
-  # -----	putway (user token, way, array of co-ordinates, array of attributes,
-  #					baselong, basey, masterscale)
-  #			returns current way ID, new way ID, hash of renumbered nodes,
-  #					xmin,xmax,ymin,ymax
-
-  def putway(args,renumberednodes)
-    RAILS_DEFAULT_LOGGER.info("  putway started")
-    usertoken,originalway,points,attributes,oldversion,baselong,basey,masterscale=args
-    uid=getuserid(usertoken)
-    if !uid then return -1,"You are not logged in, so the way could not be saved." end
-
-    RAILS_DEFAULT_LOGGER.info("  putway authenticated happily")
-    db_uqn='unin'+(rand*100).to_i.to_s+uid.to_s+originalway.to_i.abs.to_s+Time.new.to_i.to_s	# temp uniquenodes table name, typically 51 chars
-    db_now='@now'+(rand*100).to_i.to_s+uid.to_s+originalway.to_i.abs.to_s+Time.new.to_i.to_s	# 'now' variable name, typically 51 chars
-    ActiveRecord::Base.connection.execute("SET #{db_now}=NOW()")
-    originalway=originalway.to_i
-	oldversion=oldversion.to_i
-	
-    RAILS_DEFAULT_LOGGER.info("  Message: putway, id=#{originalway}")
+  # Get a way including nodes and tags.
+  # Returns 0 (success), a Potlatch-style array of points, and a hash of tags.
 
-	# -- Temporary check for null IDs
-	
-	points.each do |a|
-	  if a[2]==0 or a[2].nil? then return -2,"Server error - node with id 0 found in way #{originalway}." end
+  def getway(wayid) #:doc:
+	if POTLATCH_USE_SQL then
+	  points=sql_get_nodes_in_way(wayid)
+	  tags=sql_get_tags_in_way(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
+	  points = []
+	  way = Way.find(wayid)
+	  way.nodes.each do |node|
+	    points << [node.lon, node.lat, node.id, nil, node.tags_as_hash]
+	  end
+	  tags=way.tags
 	end
+	[wayid,points,tags]
+  end
 
-    # -- 3.	read original way into memory
-
-    xc={}; yc={}; tagc={}; vc={}
-    if originalway>0
-      way=originalway
-	  if oldversion==0
-	    readwayquery(way).each { |row|
-		  id=row['id'].to_i
-		  xc[id]=row['longitude'].to_f
-		  yc[id]=row['latitude' ].to_f
-		  tagc[id]=row['tags']
-		  vc[id]=1
-		}
-	  else
-	    readwayquery_old(way,oldversion,true).each { |row|
-		  id=row['id'].to_i
-		  if (id>0) then
-			xc[id]=row['longitude'].to_f
-			yc[id]=row['latitude' ].to_f
-			tagc[id]=row['tags']
-			vc[id]=row['visible'].to_i
-		  end
-		}
-	  end
-      ActiveRecord::Base.connection.update("UPDATE current_ways SET timestamp=#{db_now},user_id=#{uid},visible=1 WHERE id=#{way}")
-    else
-      way=ActiveRecord::Base.connection.insert("INSERT INTO current_ways (user_id,timestamp,visible) VALUES (#{uid},#{db_now},1)")
-    end
-
-    # -- 4.	get version by inserting new row into ways
-
-    version=ActiveRecord::Base.connection.insert("INSERT INTO ways (id,user_id,timestamp,visible) VALUES (#{way},#{uid},#{db_now},1)")
-
-    # -- 5. compare nodes and update xmin,xmax,ymin,ymax
-
-    xmin=ymin= 999999
-    xmax=ymax=-999999
-    insertsql=''
-	nodelist=[]
-
-    points.each_index do |i|
-      xs=coord2long(points[i][0],masterscale,baselong)
-      ys=coord2lat(points[i][1],masterscale,basey)
-      xmin=[xs,xmin].min; xmax=[xs,xmax].max
-      ymin=[ys,ymin].min; ymax=[ys,ymax].max
-      node=points[i][2].to_i
-	  tagstr=array2tag(points[i][4])
-      tagsql="'"+sqlescape(tagstr)+"'"
-      lat=(ys * 10000000).round
-      long=(xs * 10000000).round
-      tile=QuadTile.tile_for_point(ys, xs)
-
-      # compare node
-      if node<0
-        # new node - create
-		if renumberednodes[node.to_s].nil?
-          newnode=ActiveRecord::Base.connection.insert("INSERT INTO current_nodes (   latitude,longitude,timestamp,user_id,visible,tags,tile) VALUES (           #{lat},#{long},#{db_now},#{uid},1,#{tagsql},#{tile})")
-                  ActiveRecord::Base.connection.insert("INSERT INTO nodes         (id,latitude,longitude,timestamp,user_id,visible,tags,tile) VALUES (#{newnode},#{lat},#{long},#{db_now},#{uid},1,#{tagsql},#{tile})")
-          points[i][2]=newnode
-          nodelist.push(newnode)
-          renumberednodes[node.to_s]=newnode.to_s
-		else
-          points[i][2]=renumberednodes[node.to_s].to_i
-		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 
+  # at the time, generating a new id if it's still visible and has been moved/
+  # retagged.
 
-      elsif xc.has_key?(node)
-		nodelist.push(node)
-        # old node from original way - update
-        if (xs!=xc[node] or (ys/0.0000001).round!=(yc[node]/0.0000001).round or tagstr!=tagc[node] or vc[node]==0)
-          ActiveRecord::Base.connection.insert("INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tags,tile) VALUES (#{node},#{lat},#{long},#{db_now},#{uid},1,#{tagsql},#{tile})")
-          ActiveRecord::Base.connection.update("UPDATE current_nodes SET latitude=#{lat},longitude=#{long},timestamp=#{db_now},user_id=#{uid},tags=#{tagsql},visible=1,tile=#{tile} WHERE id=#{node}")
-        end
-      else
-        # old node, created in another way and now added to this way
-      end
-    end
-
-
-	# -- 6a. delete any nodes not in modified way
-
-    createuniquenodes(way,db_uqn,nodelist)	# nodes which appear in this way but no other
-
-    sql=<<-EOF
-	INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tile)  
-	SELECT DISTINCT cn.id,cn.latitude,cn.longitude,#{db_now},#{uid},0,cn.tile
-	  FROM current_nodes AS cn,#{db_uqn}
-	 WHERE cn.id=node_id
-    EOF
-    ActiveRecord::Base.connection.insert(sql)
-
-    sql=<<-EOF
-      UPDATE current_nodes AS cn, #{db_uqn}
-         SET cn.timestamp=#{db_now},cn.visible=0,cn.user_id=#{uid} 
-       WHERE cn.id=node_id
-    EOF
-    ActiveRecord::Base.connection.update(sql)
-
-	deleteuniquenoderelations(db_uqn,uid,db_now)
-    ActiveRecord::Base.connection.execute("DROP TABLE #{db_uqn}")
-
-	#	6b. insert new version of route into way_nodes
-
-    insertsql =''
-    currentsql=''
-    sequence  =1
-    points.each do |p|
-      if insertsql !='' then insertsql +=',' end
-      if currentsql!='' then currentsql+=',' end
-      insertsql +="(#{way},#{p[2]},#{sequence},#{version})"
-      currentsql+="(#{way},#{p[2]},#{sequence})"
-      sequence  +=1
-    end
-
-    ActiveRecord::Base.connection.execute("DELETE FROM current_way_nodes WHERE id=#{way}");
-    ActiveRecord::Base.connection.insert( "INSERT INTO         way_nodes (id,node_id,sequence_id,version) VALUES #{insertsql}");
-    ActiveRecord::Base.connection.insert( "INSERT INTO current_way_nodes (id,node_id,sequence_id        ) VALUES #{currentsql}");
-
-    # -- 7. insert new way tags
-
-    insertsql =''
-    currentsql=''
-    attributes.each do |k,v|
-      if v=='' or v.nil? then next end
-      if v[0,6]=='(type ' then next end
-      if insertsql !='' then insertsql +=',' end
-      if currentsql!='' then currentsql+=',' end
-      insertsql +="(#{way},'"+sqlescape(k.gsub('|',':'))+"','"+sqlescape(v)+"',#{version})"
-      currentsql+="(#{way},'"+sqlescape(k.gsub('|',':'))+"','"+sqlescape(v)+"')"
-    end
-
-    ActiveRecord::Base.connection.execute("DELETE FROM current_way_tags WHERE id=#{way}")
-    if (insertsql !='') then ActiveRecord::Base.connection.insert("INSERT INTO way_tags (id,k,v,version) VALUES #{insertsql}" ) end
-    if (currentsql!='') then ActiveRecord::Base.connection.insert("INSERT INTO current_way_tags (id,k,v) VALUES #{currentsql}") end
-
-    [0,originalway,way,renumberednodes,xmin,xmax,ymin,ymax]
+  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
+	else
+	  old_way = OldWay.find(:first, :conditions => ['id=? AND version=?', id, version])
+	  points = old_way.get_nodes_revert
+	end
+	old_way.tags['history']="Retrieved from v#{old_way.version}"
+	[0,id,points,old_way.tags,old_way.version]
   end
+  
+  # Find history of a way. Returns an array of previous versions.
 
-  # -----	putpoi (user token, id, x,y,tag array,visible,baselong,basey,masterscale)
-  #			returns current id, new id
-  #			if new: add new row to current_nodes and nodes
-  #			if old: add new row to nodes, update current_nodes
-
-  def putpoi(args)
-    usertoken,id,x,y,tags,visible,baselong,basey,masterscale=args
-    uid=getuserid(usertoken)
-    if !uid then return -1,"You are not logged in, so the point could not be saved." end
-
-    db_now='@now'+(rand*100).to_i.to_s+uid.to_s+id.to_i.abs.to_s+Time.new.to_i.to_s	# 'now' variable name, typically 51 chars
-    ActiveRecord::Base.connection.execute("SET #{db_now}=NOW()")
-
-    id=id.to_i
-    visible=visible.to_i
-	if visible==0 then
-		# if deleting, check node hasn't become part of a way 
-		inway=ActiveRecord::Base.connection.select_one("SELECT cw.id FROM current_ways cw,current_way_nodes cwn WHERE cw.id=cwn.id AND cw.visible=1 AND cwn.node_id=#{id} LIMIT 1")
-		unless inway.nil? then return -1,"The point has since become part of a way, so you cannot save it as a POI." end
-		deleteitemrelations(id,'node',uid,db_now)
+  def getway_history(wayid) #:doc:
+	history=[]
+	way=Way.find(wayid)
+	way.old_ways.each do |old_way|
+	  if old_way.user.data_public then user=old_way.user.display_name else user='anonymous' end
+	  history<<[old_way.version,old_way.timestamp.strftime("%d %b %Y, %H:%M"),old_way.visible ? 1 : 0,user]
 	end
-
-    x=coord2long(x.to_f,masterscale,baselong)
-    y=coord2lat(y.to_f,masterscale,basey)
-    tagsql="'"+sqlescape(array2tag(tags))+"'"
-    lat=(y * 10000000).round
-    long=(x * 10000000).round
-    tile=QuadTile.tile_for_point(y, x)
-	
-    if (id>0) then
-        ActiveRecord::Base.connection.insert("INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tags,tile) VALUES (#{id},#{lat},#{long},#{db_now},#{uid},#{visible},#{tagsql},#{tile})");
-        ActiveRecord::Base.connection.update("UPDATE current_nodes SET latitude=#{lat},longitude=#{long},timestamp=#{db_now},user_id=#{uid},visible=#{visible},tags=#{tagsql},tile=#{tile} WHERE id=#{id}");
-        newid=id
-    else
-        newid=ActiveRecord::Base.connection.insert("INSERT INTO current_nodes (latitude,longitude,timestamp,user_id,visible,tags,tile) VALUES (#{lat},#{long},#{db_now},#{uid},#{visible},#{tagsql},#{tile})");
-              ActiveRecord::Base.connection.update("INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tags,tile) VALUES (#{newid},#{lat},#{long},#{db_now},#{uid},#{visible},#{tagsql},#{tile})");
-    end
-    [0,id,newid]
+	[history]
   end
 
-  # -----	getpoi (id,baselong,basey,masterscale)
-  #			returns id,x,y,tag array
+  # Get a relation with all tags and members.
+  # Returns:
+  # 0. relation id,
+  # 1. hash of tags,
+  # 2. list of members.
   
-  def getpoi(args)
-	id,baselong,basey,masterscale=args; id=id.to_i
-	poi=ActiveRecord::Base.connection.select_one("SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lng,tags "+
-		"FROM current_nodes WHERE visible=1 AND id=#{id}")
-	if poi.nil? then return [nil,nil,nil,''] end
-	[id,
-	 long2coord(poi['lng'].to_f,baselong,masterscale),
-	 lat2coord(poi['lat'].to_f,basey,masterscale),
-	 tag2array(poi['tags'])]
+  def getrelation(relid) #:doc:
+	rel = Relation.find(relid)
+	[relid,rel.tags,rel.members]
   end
 
-  # -----	deleteway (user token, way, nodes to keep)
-  #			returns way ID only
+  # Save a relation.
+  # Returns
+  # 0. 0 (success),
+  # 1. original relation id (unchanged),
+  # 2. new relation id.
 
-  def deleteway(args)
-    usertoken,way=args
+  def putrelation(renumberednodes, renumberedways, usertoken,relid,tags,members,visible) #:doc:
+	uid=getuserid(usertoken)
+	if !uid then return -1,"You are not logged in, so the point could not be saved." end
 
-    RAILS_DEFAULT_LOGGER.info("  Message: deleteway, id=#{way}")
-    uid=getuserid(usertoken)
-    if !uid then return -1,"You are not logged in, so the way could not be deleted." end
+	relid = relid.to_i
+	visible = visible.to_i
 
-    way=way.to_i
-    db_uqn='unin'+(rand*100).to_i.to_s+uid.to_s+way.to_i.abs.to_s+Time.new.to_i.to_s	# temp uniquenodes table name, typically 51 chars
-    db_now='@now'+(rand*100).to_i.to_s+uid.to_s+way.to_i.abs.to_s+Time.new.to_i.to_s	# 'now' variable name, typically 51 chars
-    ActiveRecord::Base.connection.execute("SET #{db_now}=NOW()")
-
-    # - delete any otherwise unused nodes
-  
-    createuniquenodes(way,db_uqn,[])
-
-#	unless (preserve.empty?) then
-#		ActiveRecord::Base.connection.execute("DELETE FROM #{db_uqn} WHERE node_id IN ("+preserve.join(',')+")")
-#	end
-
-    sql=<<-EOF
-	INSERT INTO nodes (id,latitude,longitude,timestamp,user_id,visible,tile)
-	SELECT DISTINCT cn.id,cn.latitude,cn.longitude,#{db_now},#{uid},0,cn.tile
-	  FROM current_nodes AS cn,#{db_uqn}
-	 WHERE cn.id=node_id
-    EOF
-    ActiveRecord::Base.connection.insert(sql)
-
-    sql=<<-EOF
-      UPDATE current_nodes AS cn, #{db_uqn}
-         SET cn.timestamp=#{db_now},cn.visible=0,cn.user_id=#{uid} 
-       WHERE cn.id=node_id
-    EOF
-    ActiveRecord::Base.connection.update(sql)
-
-	deleteuniquenoderelations(db_uqn,uid,db_now)
-    ActiveRecord::Base.connection.execute("DROP TABLE #{db_uqn}")
-
-    # - delete way
-	
-    ActiveRecord::Base.connection.insert("INSERT INTO ways (id,user_id,timestamp,visible) VALUES (#{way},#{uid},#{db_now},0)")
-    ActiveRecord::Base.connection.update("UPDATE current_ways SET user_id=#{uid},timestamp=#{db_now},visible=0 WHERE id=#{way}")
-    ActiveRecord::Base.connection.execute("DELETE FROM current_way_nodes WHERE id=#{way}")
-    ActiveRecord::Base.connection.execute("DELETE FROM current_way_tags WHERE id=#{way}")
-	deleteitemrelations(way,'way',uid,db_now)
-    [0,way]
-end
+	# create a new relation, or find the existing one
+	if relid <= 0
+	  rel = Relation.new
+	else
+	  rel = Relation.find(relid)
+	end
 
+	# check the members are all positive, and correctly type
+	typedmembers = []
+	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'
+		if mid < 0
+		  return -2, "Negative ID unresolved"
+		end
+	  end
+	  typedmembers << [m[0], mid, m[2]]
+	end
 
+	# assign new contents
+	rel.members = typedmembers
+	rel.tags = tags
+	rel.visible = visible
+	rel.user_id = uid
 
-# ====================================================================
-# Support functions for remote calls
+	# check it then save it
+	# BUG: the following is commented out because it always fails on my
+	#  install. I think it's a Rails bug.
 
-def readwayquery(id)
-  ActiveRecord::Base.connection.select_all "SELECT latitude*0.0000001 AS latitude,longitude*0.0000001 AS longitude,current_nodes.id,tags "+
-      "    FROM current_way_nodes,current_nodes "+
-      "   WHERE current_way_nodes.id=#{id} "+
-      "     AND current_way_nodes.node_id=current_nodes.id "+
-      "     AND current_nodes.visible=1 "+
-      "   ORDER BY sequence_id"
-end
+	#if !rel.preconditions_ok?
+	#  return -2, "Relation preconditions failed"
+	#else
+	  rel.save_with_history!
+	#end
 
-def getlastversion(id,version)
-  row=ActiveRecord::Base.connection.select_one("SELECT version FROM ways WHERE id=#{id} AND visible=1 ORDER BY version DESC LIMIT 1")
-  row['version']
-end
-
-def readwayquery_old(id,version,historic)
-  # Node handling on undelete (historic=false):
-  # - always use the node specified, even if it's moved
-  
-  # Node handling on revert (historic=true):
-  # - if it's a visible node, use a new node id (i.e. not mucking up the old one)
-  #   which means the SWF needs to allocate new ids
-  # - if it's an invisible node, we can reuse the old node id
-
-  # get node list from specified version of way,
-  # and the _current_ lat/long/tags of each node
-
-  row=ActiveRecord::Base.connection.select_one("SELECT timestamp FROM ways WHERE version=#{version} AND id=#{id}")
-  waytime=row['timestamp']
-
-  sql=<<-EOF
-	SELECT cn.id,visible,latitude*0.0000001 AS latitude,longitude*0.0000001 AS longitude,tags 
-	  FROM way_nodes wn,current_nodes cn 
-	 WHERE wn.version=#{version} 
-	   AND wn.id=#{id} 
-	   AND wn.node_id=cn.id 
-	 ORDER BY sequence_id
-  EOF
-  rows=ActiveRecord::Base.connection.select_all(sql)
-
-  # if historic (full revert), get the old version of each node
-  # - if it's in another way now, generate a new id
-  # - if it's not in another way, use the old ID
-  if historic then
-	rows.each_index do |i|
-	  sql=<<-EOF
-	  SELECT latitude*0.0000001 AS latitude,longitude*0.0000001 AS longitude,tags,cwn.id AS currentway 
-	    FROM nodes n
-   LEFT JOIN current_way_nodes cwn
-		  ON cwn.node_id=n.id
-	   WHERE n.id=#{rows[i]['id']} 
-	     AND n.timestamp<="#{waytime}" 
-		 AND cwn.id!=#{id} 
-	   ORDER BY n.timestamp DESC 
-	   LIMIT 1
-	  EOF
-	  row=ActiveRecord::Base.connection.select_one(sql)
-	  unless row.nil? then
-	    nx=row['longitude'].to_f
-	    ny=row['latitude'].to_f
-	    if (row['currentway'] && (nx!=rows[i]['longitude'].to_f or ny!=rows[i]['latitude'].to_f or row['tags']!=rows[i]['tags'])) then rows[i]['id']=-1 end
-		rows[i]['longitude']=nx
-		rows[i]['latitude' ]=ny
-		rows[i]['tags'     ]=row['tags']
-	  end
-    end
+	[0,relid,rel.id]
   end
-  rows
-end
 
-def createuniquenodes(way,uqn_name,nodelist)
-	# Find nodes which appear in this way but no others
-	sql=<<-EOF
-	CREATE TEMPORARY TABLE #{uqn_name}
-					SELECT a.node_id
-					  FROM (SELECT DISTINCT node_id FROM current_way_nodes
-							WHERE id=#{way}) a
-				 LEFT JOIN current_way_nodes b
-						ON b.node_id=a.node_id
-					   AND b.id!=#{way}
-					 WHERE b.node_id IS NULL
-	EOF
-	unless nodelist.empty? then
-	  sql+="AND a.node_id NOT IN ("+nodelist.join(',')+")"
-	end
-	ActiveRecord::Base.connection.execute(sql)
-end
+  # Save a way to the database, including all nodes. Any nodes in the previous
+  # version and no longer used are deleted.
+  # 
+  # Returns:
+  # 0. '0' (code for success),
+  # 1. original way id (unchanged),
+  # 2. new way id,
+  # 3. hash of renumbered nodes (old id=>new id)
 
+  def putway(renumberednodes,usertoken,originalway,points,attributes) #:doc:
 
+	# -- Initialise and carry out checks
+	
+	uid=getuserid(usertoken)
+	if !uid then return -1,"You are not logged in, so the way could not be saved." end
+	originalway=originalway.to_i
 
-# ====================================================================
-# Relations handling
-# deleteuniquenoderelations(uqn_name,uid,db_now)
-# deleteitemrelations(way|node,'way'|'node',uid,db_now)
+	points.each do |a|
+	  if a[2]==0 or a[2].nil? then return -2,"Server error - node with id 0 found in way #{originalway}." end
+	  if a[1]==90 then return -2,"Server error - node with lat -90 found in way #{originalway}." end
+	end
 
-def deleteuniquenoderelations(uqn_name,uid,db_now)
-	sql=<<-EOF
-	SELECT node_id,cr.id FROM #{uqn_name},current_relation_members crm,current_relations cr 
-	 WHERE crm.member_id=node_id 
-	   AND crm.member_type='node' 
-	   AND crm.id=cr.id 
-	   AND cr.visible=1
-	EOF
+	if points.length<2 then return -2,"Server error - way is only #{points.length} points long." end
 
-	relnodes=ActiveRecord::Base.connection.select_all(sql)
-	relnodes.each do |a|
-		removefromrelation(a['node_id'],'node',a['id'],uid,db_now)
-	end
-end
+	# -- Get unique nodes
 
-def deleteitemrelations(objid,type,uid,db_now)
-	sql=<<-EOF
-	SELECT cr.id FROM current_relation_members crm,current_relations cr 
-	 WHERE crm.member_id=#{objid} 
-	   AND crm.member_type='#{type}' 
-	   AND crm.id=cr.id 
-	   AND cr.visible=1
-	EOF
-	
-	relways=ActiveRecord::Base.connection.select_all(sql)
-	relways.each do |a|
-		removefromrelation(objid,type,a['id'],uid,db_now)
+	if originalway<0
+	  way=Way.new
+	  uniques=[]
+	else
+	  way=Way.find(originalway)
+	  uniques=way.unshared_node_ids
 	end
-end
 
-def removefromrelation(objid,type,relation,uid,db_now)
-	rver=ActiveRecord::Base.connection.insert("INSERT INTO relations (id,user_id,timestamp,visible) VALUES (#{relation},#{uid},#{db_now},1)")
-
-	tagsql=<<-EOF
-	INSERT INTO relation_tags (id,k,v,version) 
-	SELECT id,k,v,#{rver} FROM current_relation_tags 
-	 WHERE id=#{relation} 
-	EOF
-	ActiveRecord::Base.connection.insert(tagsql)
+	# -- Compare nodes and save changes to any that have changed
+
+	nodes=[]
+
+	points.each do |n|
+	  lon=n[0].to_f
+	  lat=n[1].to_f
+	  id =n[2].to_i
+	  savenode=false
+	  if renumberednodes[id]
+	    id=renumberednodes[id]
+	  elsif id<0
+		# Create new node
+		node=Node.new
+		savenode=true
+	  else
+		node=Node.find(id)
+		if (!fpcomp(lat,node.lat) or !fpcomp(lon,node.lon) or \
+			Tags.join(n[4])!=node.tags or node.visible==0)
+		  savenode=true
+		end
+	  end
+	  if savenode
+		node.user_id=uid
+	    node.lat=lat; node.lon=lon
+	    node.tags=Tags.join(n[4])
+	    node.visible=true
+	    node.save_with_history!
+		if id!=node.id
+		  renumberednodes[id]=node.id
+		  id=node.id
+	    end
+	  end
+	  uniques=uniques-[id]
+	  nodes.push(id)
+	end
 
-	membersql=<<-EOF
-	INSERT INTO relation_members (id,member_type,member_id,member_role,version) 
-	SELECT id,member_type,member_id,member_role,#{rver} FROM current_relation_members 
-	 WHERE id=#{relation} 
-	   AND (member_id!=#{objid} OR member_type!='#{type}')
-	EOF
-	ActiveRecord::Base.connection.insert(membersql)
+	# -- Delete any unique nodes
 	
-	ActiveRecord::Base.connection.update("UPDATE current_relations SET user_id=#{uid},timestamp=#{db_now} WHERE id=#{relation}")
-	ActiveRecord::Base.connection.execute("DELETE FROM current_relation_members WHERE id=#{relation} AND member_type='#{type}' AND member_id=#{objid}")
-end
+	uniques.each do |n|
+	  deleteitemrelations(n,'node')
+	  node=Node.find(n)
+	  node.user_id=uid
+	  node.visible=false
+	  node.save_with_history!
+	end
 
+	# -- Save revised way
 
-def sqlescape(a)
-  a.gsub(/[\000-\037]/,"").gsub("'","''").gsub(92.chr) {92.chr+92.chr}
-end
+	way.tags=attributes
+	way.nds=nodes
+	way.user_id=uid
+	way.visible=true
+	way.save_with_history!
 
-def tag2array(a)
-  tags={}
-  Tags.split(a) do |k, v|
-    tags[k.gsub(':','|')]=v
+	[0,originalway,way.id,renumberednodes]
   end
-  tags
-end
 
-def array2tag(a)
-  tags = []
-  a.each do |k,v|
-    if v=='' then next end
-    if v[0,6]=='(type ' then next end
-    tags << [k.gsub('|',':'), v]
-  end
-  return Tags.join(tags)
-end
+  # Save POI to the database.
+  # Refuses save if the node has since become part of a way.
+  # Returns:
+  # 0. 0 (success),
+  # 1. original node id (unchanged),
+  # 2. new node id.
+
+  def putpoi(usertoken,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
+
+	id=id.to_i
+	visible=(visible.to_i==1)
+
+	if (id>0) then
+	  node=Node.find(id)
+	  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
+	else
+	  node=Node.new
+	end
 
-def getuserid(token)
-  if (token =~ /^(.+)\+(.+)$/) then
-    user = User.authenticate(:username => $1, :password => $2)
-  else
-    user = User.authenticate(:token => token)
+	node.user_id = uid
+	node.latitude = (lat*10000000).round
+	node.longitude = (lon*10000000).round
+	node.tags = Tags.join(tags)
+	node.visible=visible
+	node.save_with_history!
+	newid=node.id
+	[0,id,newid]
   end
 
-  return user ? user.id : nil;
-end
+  # Read POI from database
+  # (only called on revert: POIs are usually read by whichways).
+  #
+  # Returns array of id, long, lat, hash of tags.
 
+  def getpoi(id) #:doc:
+	n = Node.find(id)
+	if n
+	  return [n.id, n.lon, n.lat, n.tags_as_hash]
+	else
+	  return [nil,nil,nil,'']
+	end
+  end
 
+  # Delete way and all constituent nodes. Also removes from any relations.
+  # Returns 0 (success), unchanged way id.
 
-# ====================================================================
-# AMF read subroutines
+  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
 
-# -----	getint		return two-byte integer
-# -----	getlong		return four-byte long
-# -----	getstring	return string with two-byte length
-# ----- getdouble	return eight-byte double-precision float
-# ----- getobject	return object/hash
-# ----- getarray	return numeric array
+	# 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
 
-def getint(s)
-  s.getc*256+s.getc
-end
+	way.delete_with_relations_and_nodes_and_history(user)  
+	return [0,way_id]
+  end
 
-def getlong(s)
-  ((s.getc*256+s.getc)*256+s.getc)*256+s.getc
-end
 
-def getstring(s)
-  len=s.getc*256+s.getc
-  s.read(len)
-end
+  # ====================================================================
+  # Support functions
 
-def getdouble(s)
-  a=s.read(8).unpack('G')			# G big-endian, E little-endian
-  a[0]
-end
+  # Remove a node or way from all relations
 
-def getarray(s)
-  len=getlong(s)
-  arr=[]
-  for i in (0..len-1)
-    arr[i]=getvalue(s)
+  def deleteitemrelations(objid,type) #:doc:
+	relationids = RelationMember.find(:all, :conditions => ['member_type=? and member_id=?', type, objid]).collect { |ws| ws.id }.uniq
+	relationids.each do |relid|
+	  rel=Relation.find(relid)
+	  rel.members.delete_if {|x| x[0]==type and x[1]==objid}
+	  rel.save_with_history!
+	end
   end
-  arr
-end
 
-def getobject(s)
-  arr={}
-  while (key=getstring(s))
-    if (key=='') then break end
-    arr[key]=getvalue(s)
-  end
-  s.getc		# skip the 9 'end of object' value
-  arr
-end
+  # Break out node tags into a hash
+  # (should become obsolete as of API 0.6)
 
-# -----	getvalue	parse and get value
-
-def getvalue(s)
-  case s.getc
-	when 0;	return getdouble(s)			# number
-	when 1;	return s.getc				# boolean
-	when 2;	return getstring(s)			# string
-	when 3;	return getobject(s)			# object/hash
-	when 5;	return nil					# null
-	when 6;	return nil					# undefined
-	when 8;	s.read(4)					# mixedArray
-			return getobject(s)			#  |
-	when 10;return getarray(s)			# array
-	else;	return nil					# error
+  def tagstring_to_hash(a) #:doc:
+	tags={}
+	Tags.split(a) do |k, v|
+	  tags[k]=v
+	end
+	tags
   end
-end
-
-# ====================================================================
-# AMF write subroutines
 
-# -----	putdata		envelope data into AMF writeable form
-# -----	encodevalue	pack variables as AMF
+  # Authenticate token
+  # (could be removed if no-one uses the username+password form)
 
-def putdata(index,n)
-  d =encodestring(index+"/onResult")
-  d+=encodestring("null")
-  d+=[-1].pack("N")
-  d+=encodevalue(n)
-end
+  def getuserid(token) #:doc:
+	if (token =~ /^(.+)\+(.+)$/) then
+	  user = User.authenticate(:username => $1, :password => $2)
+	else
+	  user = User.authenticate(:token => token)
+	end
 
-def encodevalue(n)
-  case n.class.to_s
-  when 'Array'
-    a=10.chr+encodelong(n.length)
-    n.each do |b|
-      a+=encodevalue(b)
-    end
-    a
-  when 'Hash'
-    a=3.chr
-    n.each do |k,v|
-      a+=encodestring(k)+encodevalue(v)
-    end
-    a+0.chr+0.chr+9.chr
-  when 'String'
-    2.chr+encodestring(n)
-  when 'Bignum','Fixnum','Float'
-    0.chr+encodedouble(n)
-  when 'NilClass'
-    5.chr
-  else
-    RAILS_DEFAULT_LOGGER.error("Unexpected Ruby type for AMF conversion: "+n.class.to_s)
+	return user ? user.id : nil;
   end
-end
-
-# -----	encodestring	encode string with two-byte length
-# -----	encodedouble	encode number as eight-byte double precision float
-# -----	encodelong		encode number as four-byte long
 
-def encodestring(n)
-  a,b=n.size.divmod(256)
-  a.chr+b.chr+n
-end
-
-def encodedouble(n)
-  [n].pack('G')
-end
-
-def encodelong(n)
-  [n].pack('N')
-end
-
-# ====================================================================
-# Co-ordinate conversion
-
-def lat2coord(a,basey,masterscale)
-  -(lat2y(a)-basey)*masterscale+250
-end
+  # Compare two floating-point numbers to within 0.0000001
 
-def long2coord(a,baselong,masterscale)
-  (a-baselong)*masterscale+350
-end
-
-def lat2y(a)
-  180/Math::PI * Math.log(Math.tan(Math::PI/4+a*(Math::PI/180)/2))
-end
+  def fpcomp(a,b) #:doc:
+	return ((a/0.0000001).round==(b/0.0000001).round)
+  end
 
-def coord2lat(a,masterscale,basey)
-  y2lat((a-250)/-masterscale+basey)
-end
 
-def coord2long(a,masterscale,baselong)
-  (a-350)/masterscale+baselong
-end
+  # ====================================================================
+  # Alternative SQL queries for getway/whichways
 
-def y2lat(a)
-  180/Math::PI * (2*Math.atan(Math.exp(a*Math::PI/180))-Math::PI/2)
-end
+  def sql_find_way_ids_in_area(xmin,ymin,xmax,ymax)
+	sql=<<-EOF
+  SELECT DISTINCT current_way_nodes.id AS wayid
+		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 
+		 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 }
+  end
+	
+  def sql_find_pois_in_area(xmin,ymin,xmax,ymax)
+	sql=<<-EOF
+		  SELECT current_nodes.id,current_nodes.latitude*0.0000001 AS lat,current_nodes.longitude*0.0000001 AS lon,current_nodes.tags 
+			FROM current_nodes 
+ LEFT OUTER JOIN current_way_nodes cwn ON cwn.node_id=current_nodes.id 
+		   WHERE current_nodes.visible=1
+			 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'])] }
+  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 
+		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' 
+	   WHERE #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "cn.")}
+	EOF
+	unless way_ids.empty?
+	  sql+=<<-EOF
+	   UNION
+	  SELECT DISTINCT cr.id AS relid
+		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
+  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 
+		  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
+	  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'])]
+	end
+	points
+  end
+	
+  def sql_get_tags_in_way(wayid)
+	tags={}
+	ActiveRecord::Base.connection.select_all("SELECT k,v FROM current_way_tags WHERE id=#{wayid.to_i}").each do |row|
+	  tags[row['k']]=row['v']
+	end
+	tags
+  end
 
 end