X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9c01c4cb639775f4f93f477546124247a33f80d2..868ce8d467210564211f6ed68f5f40fdd444ded5:/app/controllers/swf_controller.rb diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb index 084a7d57a..47ddcf902 100644 --- a/app/controllers/swf_controller.rb +++ b/app/controllers/swf_controller.rb @@ -89,14 +89,13 @@ class SwfController < ApplicationController # - 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"+ " 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"+