rails_port_0.5: Merge rails_port r4643

diff --cc app/controllers/api_controller.rb
Simple merge

diff --cc app/controllers/node_controller.rb
Simple merge

diff --cc app/controllers/swf_controller.rb
index 6b29d1535e8878608c25930c22f0da719896b026,47ddcf9022068ae31a290a75f692f7cedbc28f03..40969c20fc5984f01aed60969e23c582353f10cf
--- 1/app/controllers/swf_controller.rb
--- 2/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@@ -89,14 -89,13 +89,13 @@@ class SwfController < ApplicationContro
                # - Draw unwayed segments
                
                if params['unwayed']=='true'
-                       sql="SELECT cn1.latitude AS lat1,cn1.longitude AS lon1,"+
-                               "               cn2.latitude AS lat2,cn2.longitude AS lon2 "+
+                       sql="SELECT cn1.latitude*0.0000001 AS lat1,cn1.longitude*0.0000001 AS lon1,"+
+                               "               cn2.latitude*0.0000001 AS lat2,cn2.longitude*0.0000001 AS lon2 "+
                                "  FROM current_segments "+
 -                              "       LEFT OUTER JOIN current_way_segments"+
 +                              "       LEFT OUTER JOIN current_way_nodes"+
                                "       ON segment_id=current_segments.id,"+
                                "       current_nodes AS cn1,current_nodes AS cn2"+
-                               " WHERE (cn1.longitude BETWEEN #{xmin} AND #{xmax})"+
-                               "   AND (cn1.latitude  BETWEEN #{ymin} AND #{ymax})"+
+                               " WHERE "+OSM.sql_for_area(ymin,xmin,ymax,xmax,"cn1.")+
                                "   AND segment_id IS NULL"+
                                "   AND current_segments.visible=1"+
                                "   AND cn1.id=node_a AND cn1.visible=1"+

diff --cc app/controllers/way_controller.rb
Simple merge

diff --cc config/environment.rb
Simple merge