Update to iD v2.14.3

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 370f0f30009c2a09cafa3ba7ea5847a21636c372..1951e3c31287f82d1bc15929a17573834e3a0c6e 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -475,12 +475,12 @@ module OSM
         lonradius = PI
       end
 
         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
     end
 
     # get the SQL to use to calculate distance


@@ -494,14 +494,20 @@ module OSM
       doc = XML::Document.new
       doc.encoding = XML::Encoding::UTF_8
       root = XML::Node.new "osm"
       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
+      xml_root_attributes.each do |k, v|
+        root[k] = v
+      end

       doc.root = root
       doc
     end
       doc.root = root
       doc
     end

+
+    def xml_root_attributes
+      { "version" => API_VERSION.to_s,
+        "generator" => GENERATOR,
+        "copyright" => COPYRIGHT_OWNER,
+        "attribution" => ATTRIBUTION_URL,
+        "license" => LICENSE_URL }
+    end

   end
 
   def self.ip_to_country(ip_address)
   end
 
   def self.ip_to_country(ip_address)


@@ -510,13 +516,13 @@ module OSM
     if ipinfo
       country = ipinfo.country_code2
     else
     if ipinfo
       country = ipinfo.country_code2
     else

-      country = http_client.get("http://api.hostip.info/country.php?ip=#{ip_address}").body
+      country = http_client.get("https://api.hostip.info/country.php?ip=#{ip_address}").body

       country = "GB" if country == "UK"
     end
 
       country = "GB" if country == "UK"
     end
 

-    return country
+    country

   rescue StandardError
   rescue StandardError

-    return nil
+    nil

   end
 
   def self.ip_location(ip_address)
   end
 
   def self.ip_location(ip_address)


@@ -532,7 +538,7 @@ module OSM
   # Parse a float, raising a specified exception on failure
   def self.parse_float(str, klass, *args)
     Float(str)
   # 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
 
     raise klass.new(*args)
   end
 


@@ -553,14 +559,14 @@ module OSM
     tilesql = QuadTile.sql_for_area(bbox, prefix)
     bbox = bbox.to_scaled
 
     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)
       "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
 
     YAML.load_file(file_name)
   end