Localisation updates from https://translatewiki.net.

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index cd3a2156c82b5bfa89f46567776f233d0c48ac41..e4835a76b57745a86ce83b1205bf05243af74894 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -532,7 +532,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 +553,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
 


@@ -569,11 +569,6 @@ module OSM
     @http_client ||= Faraday.new
   end
 
     @http_client ||= Faraday.new
   end
 

-  # Set the HTTP client to use
-  def self.http_client=(client)
-    @http_client = client
-  end
-

   # Return the GeoIP database handle
   def self.geoip_database
     @geoip_database ||= GeoIP.new(GEOIP_DATABASE) if defined?(GEOIP_DATABASE)
   # Return the GeoIP database handle
   def self.geoip_database
     @geoip_database ||= GeoIP.new(GEOIP_DATABASE) if defined?(GEOIP_DATABASE)