X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fcebfd1fe76f3e1076ccd0340916ae5af08f36ab..eac7348ad2793cb3ad72c68bef84ff863af92d5f:/app/controllers/geocoder_controller.rb?ds=sidebyside diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index f8821ec36..aaa8d17ef 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -17,11 +17,13 @@ class GeocoderController < ApplicationController @sources.push "latlon" elsif @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) @sources.push "uk_postcode" @sources.push "osm_nominatim" elsif @query.match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i) @sources.push "ca_postcode" + @sources.push "osm_nominatim" else @sources.push "osm_nominatim" @sources.push "geonames" @@ -355,8 +357,8 @@ class GeocoderController < ApplicationController response = fetch_xml("http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{request.user_preferred_languages.join(',')}") # parse the response - response.elements.each("reversegeocode") do |result| - description = result.get_text("result").to_s + response.elements.each("reversegeocode/result") do |result| + description = result.get_text.to_s @results.push({:prefix => "#{description}"}) end