X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/52e5fa6ad78f375cec5a207a123a4aa3939c8ddf..eed9de548363fc705af1bab13c8d5a06cdd62a11:/app/controllers/geocoder_controller.rb

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index c55c85833..ced95dce6 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -26,7 +26,7 @@ class GeocoderController < ApplicationController
       @sources.push "osm_nominatim"
     else
       @sources.push "osm_nominatim"
-      @sources.push "geonames"
+      @sources.push "geonames" if defined?(GEONAMES_USERNAME)
     end
   end
 
@@ -132,84 +132,6 @@ class GeocoderController < ApplicationController
     render :action => "error"
   end
 
-  def search_osm_namefinder
-    # get query parameters
-    query = params[:query]
-
-    # create result array
-    @results = Array.new
-
-    # ask OSM namefinder
-    response = fetch_xml("http://gazetteer.openstreetmap.org/namefinder/search.xml?find=#{escape_query(query)}")
-
-    # parse the response
-    response.elements.each("searchresults/named") do |named|
-      lat = named.attributes["lat"].to_s
-      lon = named.attributes["lon"].to_s
-      zoom = named.attributes["zoom"].to_s
-      place = named.elements["place/named"] || named.elements["nearestplaces/named"]
-      type = named.attributes["info"].to_s.capitalize
-      name = named.attributes["name"].to_s
-      description = named.elements["description"].to_s
-
-      if name.empty?
-        prefix = ""
-        name = type
-      else
-        prefix =  t "geocoder.search_osm_namefinder.prefix", :type => type
-      end
-
-      if place
-        distance = format_distance(place.attributes["approxdistance"].to_i)
-        direction = format_direction(place.attributes["direction"].to_i)
-        placename = format_name(place.attributes["name"].to_s)
-        suffix = t "geocoder.search_osm_namefinder.suffix_place", :distance => distance, :direction => direction, :placename => placename
-
-        if place.attributes["rank"].to_i <= 30
-          parent = nil
-          parentrank = 0
-          parentscore = 0
-
-          place.elements.each("nearestplaces/named") do |nearest|
-            nearestrank = nearest.attributes["rank"].to_i
-            nearestscore = nearestrank / nearest.attributes["distance"].to_f
-
-            if nearestrank > 30 and
-               ( nearestscore > parentscore or
-                 ( nearestscore == parentscore and nearestrank > parentrank ) )
-              parent = nearest
-              parentrank = nearestrank
-              parentscore = nearestscore
-            end
-          end
-
-          if parent
-            parentname = format_name(parent.attributes["name"].to_s)
-
-            if  place.attributes["info"].to_s == "suburb"
-              suffix = t "geocoder.search_osm_namefinder.suffix_suburb", :suffix => suffix, :parentname => parentname
-            else
-              parentdistance = format_distance(parent.attributes["approxdistance"].to_i)
-              parentdirection = format_direction(parent.attributes["direction"].to_i)
-              suffix = t "geocoder.search_osm_namefinder.suffix_parent", :suffix => suffix, :parentdistance => parentdistance, :parentdirection => parentdirection, :parentname => parentname
-            end
-          end
-        end
-      else
-        suffix = ""
-      end
-
-      @results.push({:lat => lat, :lon => lon, :zoom => zoom,
-                     :prefix => prefix, :name => name, :suffix => suffix,
-                     :description => description})
-    end
-
-    render :action => "results"
-  rescue Exception => ex
-    @error = "Error contacting gazetteer.openstreetmap.org: #{ex.to_s}"
-    render :action => "error"
-  end
-
   def search_osm_nominatim
     # get query parameters
     query = params[:query]
@@ -272,7 +194,7 @@ class GeocoderController < ApplicationController
     @results = Array.new
 
     # ask geonames.org
-    response = fetch_xml("http://ws.geonames.org/search?q=#{escape_query(query)}&maxRows=20")
+    response = fetch_xml("http://api.geonames.org/search?q=#{escape_query(query)}&maxRows=20&username=#{GEONAMES_USERNAME}")
 
     # parse the response
     response.elements.each("geonames/geoname") do |geoname|
@@ -299,42 +221,6 @@ class GeocoderController < ApplicationController
     @sources.push({ :name => "geonames" })
   end
 
-  def description_osm_namefinder
-    # get query parameters
-    lat = params[:lat]
-    lon = params[:lon]
-    types = params[:types]
-    max = params[:max]
-
-    # create result array
-    @results = Array.new
-
-    # ask OSM namefinder
-    response = fetch_xml("http://gazetteer.openstreetmap.org/namefinder/search.xml?find=#{types}+near+#{lat},#{lon}&max=#{max}")
-
-    # parse the response
-    response.elements.each("searchresults/named") do |named|
-      lat = named.attributes["lat"].to_s
-      lon = named.attributes["lon"].to_s
-      zoom = named.attributes["zoom"].to_s
-      place = named.elements["place/named"] || named.elements["nearestplaces/named"]
-      type = named.attributes["info"].to_s
-      name = named.attributes["name"].to_s
-      description = named.elements["description"].to_s
-      distance = format_distance(place.attributes["approxdistance"].to_i)
-      direction = format_direction((place.attributes["direction"].to_i - 180) % 360)
-      prefix = t "geocoder.description_osm_namefinder.prefix", :distance => distance, :direction => direction, :type => type
-      @results.push({:lat => lat, :lon => lon, :zoom => zoom,
-                     :prefix => prefix.capitalize, :name => name,
-                     :description => description})
-    end
-
-    render :action => "results"
-  rescue Exception => ex
-    @error = "Error contacting gazetteer.openstreetmap.org: #{ex.to_s}"
-    render :action => "error"
-  end
-
   def description_osm_nominatim
     # get query parameters
     lat = params[:lat]
@@ -344,7 +230,7 @@ class GeocoderController < ApplicationController
     # create result array
     @results = Array.new
 
-    # ask OSM namefinder
+    # ask nominatim
     response = fetch_xml("#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{request.user_preferred_languages.join(',')}")
 
     # parse the response