Bit more work on the contributor terms page - still very much a work-in-progress.

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index f36deb0a80906fa185e3c62764727c29604fb436..50e31a7ff8a3c3679833184aae7568470dba0fd3 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -37,7 +37,7 @@ module OSM
     end
 
     def status
     end
 
     def status

-      :precondition_failed    
+      :precondition_failed

     end
 
     def to_s
     end
 
     def to_s


@@ -50,13 +50,13 @@ module OSM
     def initialize(object = "object", object_id = "")
       @object, @object_id = object, object_id
     end
     def initialize(object = "object", object_id = "")
       @object, @object_id = object, object_id
     end

-    
+

     attr_reader :object, :object_id
 
     def status
       :gone
     end
     attr_reader :object, :object_id
 
     def status
       :gone
     end

-    
+

     def to_s
       "The #{object} with the id #{object_id} has already been deleted"
     end
     def to_s
       "The #{object} with the id #{object_id} has already been deleted"
     end


@@ -89,7 +89,7 @@ module OSM
       "The changeset #{@changeset.id} was closed at #{@changeset.closed_at}"
     end
   end
       "The changeset #{@changeset.id} was closed at #{@changeset.closed_at}"
     end
   end

-  
+

   # Raised when a change is expecting a changeset, but the changeset doesn't exist
   class APIChangesetMissingError < APIError
     def status
   # Raised when a change is expecting a changeset, but the changeset doesn't exist
   class APIChangesetMissingError < APIError
     def status


@@ -116,7 +116,7 @@ module OSM
       "Changeset mismatch: Provided #{@provided} but only #{@allowed} is allowed"
     end
   end
       "Changeset mismatch: Provided #{@provided} but only #{@allowed} is allowed"
     end
   end

-  
+

   # Raised when a diff upload has an unknown action. You can only have create,
   # modify, or delete
   class APIChangesetActionInvalid < APIError
   # Raised when a diff upload has an unknown action. You can only have create,
   # modify, or delete
   class APIChangesetActionInvalid < APIError


@@ -127,7 +127,7 @@ module OSM
     def status
       :bad_request
     end
     def status
       :bad_request
     end

-    
+

     def to_s
       "Unknown action #{@provided}, choices are create, modify, delete"
     end
     def to_s
       "Unknown action #{@provided}, choices are create, modify, delete"
     end


@@ -183,20 +183,20 @@ module OSM
       "Element #{@type}/#{@id} has duplicate tags with key #{@tag_key}"
     end
   end
       "Element #{@type}/#{@id} has duplicate tags with key #{@tag_key}"
     end
   end

-  
+

   # Raised when a way has more than the configured number of way nodes.
   # 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
     end
   # Raised when a way has more than the configured number of way nodes.
   # 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
     end

-    
+

     attr_reader :id, :provided, :max
 
     def status
       :bad_request
     end
     attr_reader :id, :provided, :max
 
     def status
       :bad_request
     end

-    
+

     def to_s
       "You tried to add #{provided} nodes to way #{id}, however only #{max} are allowed"
     end
     def to_s
       "You tried to add #{provided} nodes to way #{id}, however only #{max} are allowed"
     end


@@ -327,11 +327,18 @@ module OSM
     # get the worst case bounds for a given radius from the base position
     def bounds(radius)
       latradius = 2 * asin(sqrt(sin(radius / 6372.795 / 2) ** 2))
     # get the worst case bounds for a given radius from the base position
     def bounds(radius)
       latradius = 2 * asin(sqrt(sin(radius / 6372.795 / 2) ** 2))

-      lonradius = 2 * asin(sqrt(sin(radius / 6372.795 / 2) ** 2 / cos(@lat) ** 2))
+
+      begin
+        lonradius = 2 * asin(sqrt(sin(radius / 6372.795 / 2) ** 2 / cos(@lat) ** 2))
+      rescue Errno::EDOM
+        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
       maxlat = (@lat + latradius) * 180 / PI
       minlon = (@lon - lonradius) * 180 / PI
       maxlon = (@lon + lonradius) * 180 / PI

+

       return { :minlat => minlat, :maxlat => maxlat, :minlon => minlon, :maxlon => maxlon }
     end
 
       return { :minlat => minlat, :maxlat => maxlat, :minlon => minlon, :maxlon => maxlon }
     end
 


@@ -439,14 +446,20 @@ module OSM
     end
   end
 
     end
   end
 

-  def self.IPLocation(ip_address)
+  def self.IPToCountry(ip_address)

     Timeout::timeout(4) do
     Timeout::timeout(4) do

-      Net::HTTP.start('api.hostip.info') do |http|
-        country = http.get("/country.php?ip=#{ip_address}").body
-        country = "GB" if country == "UK"
-        country = Country.find_by_code(country)
-        return { :minlon => country.min_lon, :minlat => country.min_lat, :maxlon => country.max_lon, :maxlat => country.max_lat }
+      ipinfo = Quova::IpInfo.new(ip_address)
+
+      if ipinfo.status == Quova::Success then
+        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
       end

+      
+      return country.upcase

     end
 
     return nil
     end
 
     return nil


@@ -454,6 +467,18 @@ module OSM
     return nil
   end
 
     return nil
   end
 

+  def self.IPLocation(ip_address)
+    code = OSM.IPToCountry(ip_address)
+
+    unless code.nil?
+      country = Country.find_by_code(code)
+
+      return { :minlon => country.min_lon, :minlat => country.min_lat, :maxlon => country.max_lon, :maxlat => country.max_lat }
+    end
+
+    return nil
+  end
+

   # Construct a random token of a given length
   def self.make_token(length = 30)
     chars = 'abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
   # Construct a random token of a given length
   def self.make_token(length = 30)
     chars = 'abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'


@@ -483,5 +508,10 @@ module OSM
     return "#{tilesql} AND #{prefix}latitude BETWEEN #{minlat} AND #{maxlat} AND #{prefix}longitude BETWEEN #{minlon} AND #{maxlon}"
   end
 
     return "#{tilesql} AND #{prefix}latitude BETWEEN #{minlat} AND #{maxlat} AND #{prefix}longitude BETWEEN #{minlon} AND #{maxlon}"
   end
 

+  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", "GB.yml") unless File.exist? file_name
+    YAML::load_file(file_name)
+  end

 
 end
 
 end