# coding: utf-8
class GeocoderController < ApplicationController
- require 'cgi'
- require 'uri'
- require 'net/http'
- require 'rexml/document'
+ require "cgi"
+ require "uri"
+ require "rexml/document"
- before_filter :authorize_web
- before_filter :set_locale
- before_filter :require_oauth, :only => [:search]
+ before_action :authorize_web
+ before_action :set_locale
+ before_action :require_oauth, :only => [:search]
def search
normalize_params
else
prefix_name = t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.gsub("_", " ").capitalize
end
- if klass == 'boundary' && type == 'administrative'
+ if klass == "boundary" && type == "administrative"
rank = (place.attributes["place_rank"].to_i + 1) / 2
prefix_name = t "geocoder.search_osm_nominatim.admin_levels.level#{rank}", :default => prefix_name
end
end
render :action => "results"
- # rescue StandardError => ex
- # @error = "Error contacting nominatim.openstreetmap.org: #{ex.to_s}"
- # render :action => "error"
+ rescue StandardError => ex
+ @error = "Error contacting nominatim.openstreetmap.org: #{ex}"
+ render :action => "error"
end
def search_geonames
render :action => "results"
rescue StandardError => ex
- @error = "Error contacting ws.geonames.org: #{ex}"
+ @error = "Error contacting api.geonames.org: #{ex}"
render :action => "error"
end
render :action => "results"
rescue StandardError => ex
- @error = "Error contacting ws.geonames.org: #{ex}"
+ @error = "Error contacting api.geonames.org: #{ex}"
render :action => "error"
end
private
def fetch_text(url)
- Net::HTTP.get(URI.parse(url))
+ OSM.http_client.get(URI.parse(url)).body
end
def fetch_xml(url)
REXML::Document.new(fetch_text(url))
end
- def format_distance(distance)
- t("geocoder.distance", :count => distance)
- end
-
- def format_direction(bearing)
- return t("geocoder.direction.south_west") if bearing >= 22.5 && bearing < 67.5
- return t("geocoder.direction.south") if bearing >= 67.5 && bearing < 112.5
- return t("geocoder.direction.south_east") if bearing >= 112.5 && bearing < 157.5
- return t("geocoder.direction.east") if bearing >= 157.5 && bearing < 202.5
- return t("geocoder.direction.north_east") if bearing >= 202.5 && bearing < 247.5
- return t("geocoder.direction.north") if bearing >= 247.5 && bearing < 292.5
- return t("geocoder.direction.north_west") if bearing >= 292.5 && bearing < 337.5
- t("geocoder.direction.west")
- end
-
- def format_name(name)
- name.gsub(/( *\[[^\]]*\])*$/, "")
- end
-
- def count_results(results)
- count = 0
-
- results.each do |source|
- count += source[:results].length if source[:results]
- end
-
- count
- end
-
def escape_query(query)
- URI.escape(query, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]", false, 'N'))
+ URI.escape(query, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]", false, "N"))
end
def normalize_params
def nsew_to_decdeg(captures)
begin
Float(captures[0])
- captures[2].downcase != 's' ? lat = captures[0].to_f : lat = -(captures[0].to_f)
- captures[5].downcase != 'w' ? lon = captures[3].to_f : lon = -(captures[3].to_f)
+ captures[2].downcase != "s" ? lat = captures[0].to_f : lat = -(captures[0].to_f)
+ captures[5].downcase != "w" ? lon = captures[3].to_f : lon = -(captures[3].to_f)
rescue
- 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)
+ 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
{ :lat => lat, :lon => lon }
end
def ddm_to_decdeg(captures)
begin
Float(captures[0])
- captures[3].downcase != 's' ? lat = captures[0].to_f + captures[1].to_f / 60 : lat = -(captures[0].to_f + captures[1].to_f / 60)
- captures[7].downcase != 'w' ? lon = captures[4].to_f + captures[5].to_f / 60 : lon = -(captures[4].to_f + captures[5].to_f / 60)
+ captures[3].downcase != "s" ? lat = captures[0].to_f + captures[1].to_f / 60 : lat = -(captures[0].to_f + captures[1].to_f / 60)
+ captures[7].downcase != "w" ? lon = captures[4].to_f + captures[5].to_f / 60 : lon = -(captures[4].to_f + captures[5].to_f / 60)
rescue
- 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)
+ 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
{ :lat => lat, :lon => lon }
end
def dms_to_decdeg(captures)
begin
Float(captures[0])
- captures[4].downcase != 's' ? lat = captures[0].to_f + (captures[1].to_f + captures[2].to_f / 60) / 60 : lat = -(captures[0].to_f + (captures[1].to_f + captures[2].to_f / 60) / 60)
- captures[9].downcase != 'w' ? lon = captures[5].to_f + (captures[6].to_f + captures[7].to_f / 60) / 60 : lon = -(captures[5].to_f + (captures[6].to_f + captures[7].to_f / 60) / 60)
+ captures[4].downcase != "s" ? lat = captures[0].to_f + (captures[1].to_f + captures[2].to_f / 60) / 60 : lat = -(captures[0].to_f + (captures[1].to_f + captures[2].to_f / 60) / 60)
+ captures[9].downcase != "w" ? lon = captures[5].to_f + (captures[6].to_f + captures[7].to_f / 60) / 60 : lon = -(captures[5].to_f + (captures[6].to_f + captures[7].to_f / 60) / 60)
rescue
- 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)
+ 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
{ :lat => lat, :lon => lon }
end
projects / rails.git / blobdiff