X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5cbd4038edb32b0304bd766e70fc680ea447b52b..9bd634405b29b80df1101f07cea99e35e05cf961:/lib/osm.rb diff --git a/lib/osm.rb b/lib/osm.rb index 89333763f..841cce17b 100644 --- a/lib/osm.rb +++ b/lib/osm.rb @@ -1,14 +1,14 @@ # The OSM module provides support functions for OSM. module OSM - require 'time' - require 'rexml/parsers/sax2parser' - require 'rexml/text' - require 'xml/libxml' + require "time" + require "rexml/parsers/sax2parser" + require "rexml/text" + require "xml/libxml" if defined?(SystemTimer) Timer = SystemTimer else - require 'timeout' + require "timeout" Timer = Timeout end @@ -63,7 +63,8 @@ module OSM # Raised when to delete an already-deleted object. class APIAlreadyDeletedError < APIError def initialize(object = "object", object_id = "") - @object, @object_id = object, object_id + @object = object + @object_id = object_id end attr_reader :object, :object_id @@ -171,7 +172,8 @@ module OSM # the changeset ID that the diff was uploaded to. class APIChangesetMismatchError < APIError def initialize(provided, allowed) - @provided, @allowed = provided, allowed + @provided = provided + @allowed = allowed end def status @@ -203,7 +205,9 @@ module OSM # they should. class APIBadXMLError < APIError def initialize(model, xml, message = "") - @model, @xml, @message = model, xml, message + @model = model + @xml = xml + @message = message end def status @@ -218,7 +222,10 @@ module OSM # Raised when the provided version is not equal to the latest in the db. class APIVersionMismatchError < APIError def initialize(id, type, provided, latest) - @id, @type, @provided, @latest = id, type, provided, latest + @id = id + @type = type + @provided = provided + @latest = latest end attr_reader :provided, :latest, :id, :type @@ -236,7 +243,9 @@ module OSM # this is now forbidden by the API. class APIDuplicateTagsError < APIError def initialize(type, id, tag_key) - @type, @id, @tag_key = type, id, tag_key + @type = type + @id = id + @tag_key = tag_key end attr_reader :type, :id, :tag_key @@ -254,7 +263,9 @@ module OSM # This prevents ways from being to long and difficult to work with class APITooManyWayNodesError < APIError def initialize(id, provided, max) - @id, @provided, @max = id, provided, max + @id = id + @provided = provided + @max = max end attr_reader :id, :provided, :max @@ -464,12 +475,12 @@ module OSM lonradius = PI end - minlat = (@lat - latradius) * 180 / PI - maxlat = (@lat + latradius) * 180 / PI - minlon = (@lon - lonradius) * 180 / PI - maxlon = (@lon + lonradius) * 180 / PI + minlat = [(@lat - latradius) * 180 / PI, -90].max + maxlat = [(@lat + latradius) * 180 / PI, 90].min + minlon = [(@lon - lonradius) * 180 / PI, -180].max + maxlon = [(@lon + lonradius) * 180 / PI, 180].min - { :minlat => minlat, :maxlat => maxlat, :minlon => minlon, :maxlon => maxlon } + BoundingBox.new(minlon, minlat, maxlon, maxlat) end # get the SQL to use to calculate distance @@ -482,42 +493,36 @@ module OSM def get_xml_doc doc = XML::Document.new doc.encoding = XML::Encoding::UTF_8 - root = XML::Node.new 'osm' - root['version'] = API_VERSION.to_s - root['generator'] = GENERATOR - root['copyright'] = COPYRIGHT_OWNER - root['attribution'] = ATTRIBUTION_URL - root['license'] = LICENSE_URL + root = XML::Node.new "osm" + root["version"] = API_VERSION.to_s + root["generator"] = GENERATOR + root["copyright"] = COPYRIGHT_OWNER + root["attribution"] = ATTRIBUTION_URL + root["license"] = LICENSE_URL doc.root = root doc end end def self.ip_to_country(ip_address) - Timer.timeout(4) do - ipinfo = Quova::IpInfo.new(ip_address) - - if ipinfo.status == Quova::SUCCESS - country = ipinfo.country_code - else - Net::HTTP.start('api.hostip.info') do |http| - country = http.get("/country.php?ip=#{ip_address}").body - country = "GB" if country == "UK" - end - end + ipinfo = geoip_database.country(ip_address) if defined?(GEOIP_DATABASE) - return country.upcase + if ipinfo + country = ipinfo.country_code2 + else + country = http_client.get("https://api.hostip.info/country.php?ip=#{ip_address}").body + country = "GB" if country == "UK" end - return nil + country rescue StandardError - return nil + nil end def self.ip_location(ip_address) code = OSM.ip_to_country(ip_address) - if code && country = Country.find_by_code(code) + if code && country = Country.find(code) return { :minlon => country.min_lon, :minlat => country.min_lat, :maxlon => country.max_lon, :maxlat => country.max_lat } end @@ -527,14 +532,14 @@ module OSM # Parse a float, raising a specified exception on failure def self.parse_float(str, klass, *args) Float(str) - rescue + rescue StandardError raise klass.new(*args) end # Construct a random token of a given length def self.make_token(length = 30) - chars = 'abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789' - token = '' + chars = "abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" + token = "" length.times do token += chars[(rand * chars.length).to_i].chr @@ -548,13 +553,24 @@ module OSM tilesql = QuadTile.sql_for_area(bbox, prefix) bbox = bbox.to_scaled - "#{tilesql} AND #{prefix}latitude BETWEEN #{bbox.min_lat} AND #{bbox.max_lat} " + + "#{tilesql} AND #{prefix}latitude BETWEEN #{bbox.min_lat} AND #{bbox.max_lat} " \ "AND #{prefix}longitude BETWEEN #{bbox.min_lon} AND #{bbox.max_lon}" end + # Return the terms and conditions text for a given country def self.legal_text_for_country(country_code) - file_name = File.join(Rails.root, "config", "legales", country_code.to_s + ".yml") - file_name = File.join(Rails.root, "config", "legales", DEFAULT_LEGALE + ".yml") unless File.exist? file_name + file_name = Rails.root.join("config", "legales", country_code.to_s + ".yml") + file_name = Rails.root.join("config", "legales", DEFAULT_LEGALE + ".yml") unless File.exist? file_name YAML.load_file(file_name) end + + # Return the HTTP client to use + def self.http_client + @http_client ||= Faraday.new + end + + # Return the GeoIP database handle + def self.geoip_database + @geoip_database ||= GeoIP.new(GEOIP_DATABASE) if defined?(GEOIP_DATABASE) + end end