X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a46ecae7570abafcfe350d881f614db7159c5487..6ca22de4f2c68e4b14a6e2f0938a8657c33adc31:/app/controllers/geocoder_controller.rb diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index 3431fb8d3..da5245687 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -49,6 +49,7 @@ class GeocoderController < ApplicationController :zoom => params[:zoom], :name => "#{lat}, #{lon}") end + if lon >= -90 && lon <= 90 && lat >= -180 && lat <= 180 @results.push(:lat => lon, :lon => lat, :zoom => params[:zoom], @@ -61,7 +62,6 @@ class GeocoderController < ApplicationController else render :action => "results" end - else # Coordinates in a query have come with markers for latitude and longitude. if lat < -90 || lat > 90 @@ -305,7 +305,9 @@ class GeocoderController < ApplicationController params.merge!(dms_to_decdeg(latlon)).delete(:query) elsif latlon = query.match(/^\s*([+-]?\d+(\.\d*)?)\s*[\s,]\s*([+-]?\d+(\.\d*)?)\s*$/) - params.merge!(:lat => latlon[1].to_f, :lon => latlon[3].to_f, :latlon_digits => true).delete(:query) + params.merge!(:lat => latlon[1].to_f, :lon => latlon[3].to_f).delete(:query) + + params[:latlon_digits] = true unless params[:whereami] end end