X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bed9cd00ed166ce346da4b8a9b654ddf86e64e70..b38684e59eef299e82f5858fe1e14f6cf2aaa10a:/lib/osm.rb diff --git a/lib/osm.rb b/lib/osm.rb index f372979a8..f3a625c4e 100644 --- a/lib/osm.rb +++ b/lib/osm.rb @@ -13,6 +13,10 @@ module OSM def render_opts { :text => "Generic API Error", :status => :internal_server_error, :content_type => "text/plain" } end + + def to_s + "Generic API Error" + end end # Raised when an API object is not found. @@ -31,12 +35,22 @@ module OSM def render_opts { :text => "Precondition failed: #{@message}", :status => :precondition_failed, :content_type => "text/plain" } end + + def to_s + "Precondition failed: #{@message}" + end end # Raised when to delete an already-deleted object. class APIAlreadyDeletedError < APIError + def initialize(object = "object", object_id = "") + @object, @object_id = object, object_id + end + + attr_reader :object, :object_id + def render_opts - { :text => "The object has already been deleted", :status => :gone, :content_type => "text/plain" } + { :text => "The #{object} with the id #{object_id} has already been deleted", :status => :gone, :content_type => "text/plain" } end end @@ -65,6 +79,10 @@ module OSM def render_opts { :text => "You need to supply a changeset to be able to make a change", :status => :conflict, :content_type => "text/plain" } end + + def to_s + "You need to supply a changeset to be able to make a change" + end end # Raised when a diff is uploaded containing many changeset IDs which don't match @@ -119,6 +137,10 @@ module OSM ", server had: " + latest.to_s + " of " + type + " " + id.to_s, :status => :conflict, :content_type => "text/plain" } end + + def to_s + "Version mismatch: Provided " + provided.to_s + ", server had: " + latest.to_s + " of " + type + " " + id.to_s + end end # raised when a two tags have a duplicate key string in an element. @@ -163,6 +185,30 @@ module OSM end end + ## + # raised when an API call is made using a method not supported on that URI + class APIBadMethodError < APIError + def initialize(supported_method) + @supported_method = supported_method + end + + def render_opts + { :text => "Only method #{@supported_method} is supported on this URI.", :status => :method_not_allowed } + end + end + + ## + # raised when an API call takes too long + class APITimeoutError < APIError + def render_opts + { :text => "Request timed out", :status => :request_timeout } + end + + def to_s + "Request timed out" + end + end + # Helper methods for going to/from mercator and lat/lng. class Mercator include Math @@ -340,16 +386,8 @@ module OSM Net::HTTP.start('api.hostip.info') do |http| country = http.get("/country.php?ip=#{ip_address}").body country = "GB" if country == "UK" - Net::HTTP.start('ws.geonames.org') do |http| - xml = REXML::Document.new(http.get("/countryInfo?country=#{country}").body) - xml.elements.each("geonames/country") do |ele| - minlon = ele.get_text("bBoxWest").to_s - minlat = ele.get_text("bBoxSouth").to_s - maxlon = ele.get_text("bBoxEast").to_s - maxlat = ele.get_text("bBoxNorth").to_s - return { :minlon => minlon, :minlat => minlat, :maxlon => maxlon, :maxlat => maxlat } - end - end + country = Country.find_by_code(country) + return { :minlon => country.min_lon, :minlat => country.min_lat, :maxlon => country.max_lon, :maxlat => country.max_lat } end end