X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0e9e6e6f8f15e6dbdd208cd741386562e2aceee8..dc931c4ac47b340c9a2a8d855fa57a290e838260:/app/controllers/geocoder_controller.rb

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 8d29ad505..34d8efdbc 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -7,24 +7,22 @@ class GeocoderController < ApplicationController
 
   before_filter :authorize_web
   before_filter :set_locale
-  before_filter :convert_latlon, :only => [:search]
 
   def search
-    @query = params[:query]
-    @sources = Array.new
+    normalize_params
 
-    @query.sub(/^\s+/, "")
-    @query.sub(/\s+$/, "")
-
-    if @query.match(/^[+-]?\d+(\.\d*)?\s*[\s,]\s*[+-]?\d+(\.\d*)?$/)
+    @sources = []
+    if params[:lat] && params[:lon]
       @sources.push "latlon"
-    elsif @query.match(/^\d{5}(-\d{4})?$/)
+      @sources.push "osm_nominatim_reverse"
+      @sources.push "geonames_reverse"
+    elsif params[:query].match(/^\d{5}(-\d{4})?$/)
       @sources.push "us_postcode"
       @sources.push "osm_nominatim"
-    elsif @query.match(/^(GIR 0AA|[A-PR-UWYZ]([0-9]{1,2}|([A-HK-Y][0-9]|[A-HK-Y][0-9]([0-9]|[ABEHMNPRV-Y]))|[0-9][A-HJKS-UW])\s*[0-9][ABD-HJLNP-UW-Z]{2})$/i)
+    elsif params[:query].match(/^(GIR 0AA|[A-PR-UWYZ]([0-9]{1,2}|([A-HK-Y][0-9]|[A-HK-Y][0-9]([0-9]|[ABEHMNPRV-Y]))|[0-9][A-HJKS-UW])\s*[0-9][ABD-HJLNP-UW-Z]{2})$/i)
       @sources.push "uk_postcode"
       @sources.push "osm_nominatim"
-    elsif @query.match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i)
+    elsif params[:query].match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i)
       @sources.push "ca_postcode"
       @sources.push "osm_nominatim"
     else
@@ -34,19 +32,8 @@ class GeocoderController < ApplicationController
   end
 
   def search_latlon
-    # get query parameters
-    query = params[:query]
-
-    # create result array
-    @results = Array.new
-
-    # decode the location
-    if m = query.match(/^\s*([+-]?\d+(\.\d*)?)\s*[\s,]\s*([+-]?\d+(\.\d*)?)\s*$/)
-      lat = m[1].to_f
-      lon = m[3].to_f
-    end
-
-    # generate results
+    lat = params[:lat].to_f
+    lon = params[:lon].to_f
     if lat < -90 or lat > 90
       @error = "Latitude #{lat} out of range"
       render :action => "error"
@@ -54,9 +41,9 @@ class GeocoderController < ApplicationController
       @error = "Longitude #{lon} out of range"
       render :action => "error"
     else
-      @results.push({:lat => lat, :lon => lon,
-                     :zoom => POSTCODE_ZOOM,
-                     :name => "#{lat}, #{lon}"})
+      @results = [{:lat => lat, :lon => lon,
+                   :zoom => params[:zoom],
+                   :name => "#{lat}, #{lon}"}]
 
       render :action => "results"
     end
@@ -224,14 +211,7 @@ class GeocoderController < ApplicationController
     render :action => "error"
   end
 
-  def description
-    @sources = Array.new
-
-    @sources.push({ :name => "osm_nominatim" })
-    @sources.push({ :name => "geonames" })
-  end
-
-  def description_osm_nominatim
+  def search_osm_nominatim_reverse
     # get query parameters
     lat = params[:lat]
     lon = params[:lon]
@@ -245,9 +225,16 @@ class GeocoderController < ApplicationController
 
     # parse the response
     response.elements.each("reversegeocode/result") do |result|
+      lat = result.attributes["lat"].to_s
+      lon = result.attributes["lon"].to_s
+      object_type = result.attributes["osm_type"]
+      object_id = result.attributes["osm_id"]
       description = result.get_text.to_s
 
-      @results.push({:prefix => "#{description}"})
+      @results.push({:lat => lat, :lon => lon,
+                     :zoom => zoom,
+                     :name => description,
+                     :type => object_type, :id => object_id})
     end
 
     render :action => "results"
@@ -256,7 +243,7 @@ class GeocoderController < ApplicationController
     render :action => "error"
   end
 
-  def description_geonames
+  def search_geonames_reverse
     # get query parameters
     lat = params[:lat]
     lon = params[:lon]
@@ -271,7 +258,10 @@ class GeocoderController < ApplicationController
     response.elements.each("geonames/countrySubdivision") do |geoname|
       name = geoname.get_text("adminName1").to_s
       country = geoname.get_text("countryName").to_s
-      @results.push({:prefix => "#{name}, #{country}"})
+      @results.push({:lat => lat, :lon => lon,
+                     :zoom => GEONAMES_ZOOM,
+                     :name => name,
+                     :suffix => ", #{country}"})
     end
 
     render :action => "results"
@@ -323,25 +313,29 @@ private
     return URI.escape(query, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]", false, 'N'))
   end
 
-  def convert_latlon
-    @query = params[:query]
+  def normalize_params
+    query = params[:query]
+    return unless query
+
+    query.strip!
 
-    if latlon = @query.match(/^([NS])\s*(\d{1,3}(\.\d*)?)\W*([EW])\s*(\d{1,3}(\.\d*)?)$/).try(:captures) # [NSEW] decimal degrees
-      params[:query] = nsew_to_decdeg(latlon)
-    elsif latlon = @query.match(/^(\d{1,3}(\.\d*)?)\s*([NS])\W*(\d{1,3}(\.\d*)?)\s*([EW])$/).try(:captures) # decimal degrees [NSEW]
-      params[:query] = nsew_to_decdeg(latlon)
+    if latlon = query.match(/^([NS])\s*(\d{1,3}(\.\d*)?)\W*([EW])\s*(\d{1,3}(\.\d*)?)$/).try(:captures) # [NSEW] decimal degrees
+      params.merge!(nsew_to_decdeg(latlon)).delete(:query)
+    elsif latlon = query.match(/^(\d{1,3}(\.\d*)?)\s*([NS])\W*(\d{1,3}(\.\d*)?)\s*([EW])$/).try(:captures) # decimal degrees [NSEW]
+      params.merge!(nsew_to_decdeg(latlon)).delete(:query)
 
-    elsif latlon = @query.match(/^([NS])\s*(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?\W*([EW])\s*(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?$/).try(:captures) # [NSEW] degrees, decimal minutes
-      params[:query] = ddm_to_decdeg(latlon)
-    elsif latlon = @query.match(/^(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?\s*([NS])\W*(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?\s*([EW])$/).try(:captures) # degrees, decimal minutes [NSEW]
-      params[:query] = ddm_to_decdeg(latlon)
+    elsif latlon = query.match(/^([NS])\s*(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?\W*([EW])\s*(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?$/).try(:captures) # [NSEW] degrees, decimal minutes
+      params.merge!(ddm_to_decdeg(latlon)).delete(:query)
+    elsif latlon = query.match(/^(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?\s*([NS])\W*(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?\s*([EW])$/).try(:captures) # degrees, decimal minutes [NSEW]
+      params.merge!(ddm_to_decdeg(latlon)).delete(:query)
 
-    elsif latlon = @query.match(/^([NS])\s*(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]?\W*([EW])\s*(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]?$/).try(:captures) # [NSEW] degrees, minutes, decimal seconds
-      params[:query] = dms_to_decdeg(latlon)
-    elsif latlon = @query.match(/^(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]\s*([NS])\W*(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]?\s*([EW])$/).try(:captures) # degrees, minutes, decimal seconds [NSEW]
-      params[:query] = dms_to_decdeg(latlon)
-    else
-      return
+    elsif latlon = query.match(/^([NS])\s*(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]?\W*([EW])\s*(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]?$/).try(:captures) # [NSEW] degrees, minutes, decimal seconds
+      params.merge!(dms_to_decdeg(latlon)).delete(:query)
+    elsif latlon = query.match(/^(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]\s*([NS])\W*(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]?\s*([EW])$/).try(:captures) # degrees, minutes, decimal seconds [NSEW]
+      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}).delete(:query)
     end
   end
 
@@ -354,7 +348,7 @@ private
       captures[0].downcase != 's' ? lat = captures[1].to_f : lat = -(captures[1].to_f)
       captures[3].downcase != 'w' ? lon = captures[4].to_f : lon = -(captures[4].to_f)
     end
-    return "#{lat}, #{lon}"
+    {:lat => lat, :lon => lon}
   end
 
   def ddm_to_decdeg(captures)
@@ -366,7 +360,7 @@ private
       captures[0].downcase != 's' ? lat = captures[1].to_f + captures[2].to_f/60 : lat = -(captures[1].to_f + captures[2].to_f/60)
       captures[4].downcase != 'w' ? lon = captures[5].to_f + captures[6].to_f/60 : lon = -(captures[5].to_f + captures[6].to_f/60)
     end
-    return "#{lat}, #{lon}"
+    {:lat => lat, :lon => lon}
   end
 
   def dms_to_decdeg(captures)
@@ -378,7 +372,7 @@ private
       captures[0].downcase != 's' ? lat = captures[1].to_f + (captures[2].to_f + captures[3].to_f/60)/60 : lat = -(captures[1].to_f + (captures[2].to_f + captures[3].to_f/60)/60)
       captures[5].downcase != 'w' ? lon = captures[6].to_f + (captures[7].to_f + captures[8].to_f/60)/60 : lon = -(captures[6].to_f + (captures[7].to_f + captures[8].to_f/60)/60)
     end
-    return "#{lat}, #{lon}"
+    {:lat => lat, :lon => lon}
   end
 
 end