Fix breakage.

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

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index b91052266ea92d72105585848593281f9c5c7222..813c0bc7d971155df95b56353211bf9d36814c79 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -33,8 +33,6 @@ class AmfController < ApplicationController
       bytes=getlong(req)                               #  | get total size in bytes
       args=getvalue(req)                               #  | get response (probably an array)
 
-      ActiveRecord::Base.logger.info("  Message: #{message}")
-
       case message
       when 'getpresets';       results[index]=putdata(index,getpresets)
       when 'whichways';                results[index]=putdata(index,whichways(args))
@@ -47,12 +45,15 @@ class AmfController < ApplicationController
     # ------------------
     # Write out response
 
+    RAILS_DEFAULT_LOGGER.info("  Response: start")
     response.headers["Content-Type"]="application/x-amf"
     a,b=results.length.divmod(256)
     ans=0.chr+0.chr+0.chr+0.chr+a.chr+b.chr
     results.each do |k,v|
+      RAILS_DEFAULT_LOGGER.info("  Response: encode #{k}")
       ans+=v
     end
+    RAILS_DEFAULT_LOGGER.info("  Response: end")
     render :text => ans
 
   end
@@ -72,6 +73,8 @@ class AmfController < ApplicationController
     presettype=''
     presetcategory=''
 
+    RAILS_DEFAULT_LOGGER.info("  Message: getpresets")
+
     #          File.open("config/potlatch/presets.txt") do |file|
 
     # Temporary patch to get around filepath problem
@@ -172,10 +175,10 @@ EOF
   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
+    xmax = args[2].to_f+0.01
+    ymax = args[3].to_f+0.01
 
-    ActiveRecord::Base.logger.info("  Bounding Box: #{xmin},#{ymin},#{xmax},#{ymax}")
+    RAILS_DEFAULT_LOGGER.info("  Message: whichways, bbox=#{xmin},#{ymin},#{xmax},#{ymax}")
 
     waylist=WaySegment.find_by_sql("SELECT DISTINCT current_way_segments.id AS wayid"+
        "  FROM current_way_segments,current_segments,current_nodes,current_ways "+
@@ -215,6 +218,8 @@ EOF
     xmin = ymin = 999999
     xmax = ymax = -999999
 
+    RAILS_DEFAULT_LOGGER.info("  Message: getway, id=#{wayid}")
+
     readwayquery(wayid).each {|row|
       xs1=long2coord(row['long1'].to_f,baselong,masterscale); ys1=lat2coord(row['lat1'].to_f,basey,masterscale)
       xs2=long2coord(row['long2'].to_f,baselong,masterscale); ys2=lat2coord(row['lat2'].to_f,basey,masterscale)
@@ -249,6 +254,8 @@ EOF
     ActiveRecord::Base.connection.execute("SET #{db_now}=NOW()")
     originalway=originalway.to_i
 
+    RAILS_DEFAULT_LOGGER.info("  Message: putway, id=#{originalway}")
+
     # -- 3.    read original way into memory
 
     xc={}; yc={}; tagc={}; seg={}
@@ -414,6 +421,9 @@ EOF
 
   def deleteway(args)
     usertoken,way=args
+
+    RAILS_DEFAULT_LOGGER.info("  Message: deleteway, id=#{way}")
+
     uid=getuserid(usertoken); if !uid then return end
        way=way.to_i