Move geocoder constants to application configuration to avoid test warnings.

[rails.git] / app / controllers / geocoder_controller.rb

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 18812689b4c2c8318d792993e6366987bdde479a..72f008db2eab47778444697eb71f5797c120662e 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -3,9 +3,6 @@ class GeocoderController < ApplicationController
   require 'net/http'
   require 'rexml/document'
 
   require 'net/http'
   require 'rexml/document'
 

-  POSTCODE_ZOOM = 15
-  GEONAMES_ZOOM = 12
-

   def search
     query = params[:query]
     results = Array.new
   def search
     query = params[:query]
     results = Array.new


@@ -64,7 +61,8 @@ private
     # parse the response
     unless response.match(/couldn't find this zip/)
       data = response.split(/\s*,\s+/) # lat,long,town,state,zip
     # parse the response
     unless response.match(/couldn't find this zip/)
       data = response.split(/\s*,\s+/) # lat,long,town,state,zip

-      results.push({:lat => data[0], :lon => data[1], :zoom => POSTCODE_ZOOM,
+      results.push({:lat => data[0], :lon => data[1],
+                    :zoom => APP_CONFIG['postcode_zoom'],

                     :prefix => "#{data[2]}, #{data[3]}, ",
                     :name => data[4]})
     end
                     :prefix => "#{data[2]}, #{data[3]}, ",
                     :name => data[4]})
     end


@@ -85,7 +83,7 @@ private
       dataline = response.split(/\n/)[1]
       data = dataline.split(/,/) # easting,northing,postcode,lat,long
       postcode = data[2].gsub(/'/, "")
       dataline = response.split(/\n/)[1]
       data = dataline.split(/,/) # easting,northing,postcode,lat,long
       postcode = data[2].gsub(/'/, "")

-      zoom = POSTCODE_ZOOM - postcode.count("#")
+      zoom = APP_CONFIG['postcode_zoom'] - postcode.count("#")

       results.push({:lat => data[3], :lon => data[4], :zoom => zoom,
                     :name => postcode})
     end
       results.push({:lat => data[3], :lon => data[4], :zoom => zoom,
                     :name => postcode})
     end


@@ -105,7 +103,7 @@ private
     if response.get_elements("geodata/error").empty?
       results.push({:lat => response.get_text("geodata/latt").to_s,
                     :lon => response.get_text("geodata/longt").to_s,
     if response.get_elements("geodata/error").empty?
       results.push({:lat => response.get_text("geodata/latt").to_s,
                     :lon => response.get_text("geodata/longt").to_s,

-                    :zoom => POSTCODE_ZOOM,
+                    :zoom => APP_CONFIG['postcode_zoom'],

                     :name => query.upcase})
     end
 
                     :name => query.upcase})
     end
 


@@ -199,7 +197,8 @@ private
       lon = geoname.get_text("lng").to_s
       name = geoname.get_text("name").to_s
       country = geoname.get_text("countryName").to_s
       lon = geoname.get_text("lng").to_s
       name = geoname.get_text("name").to_s
       country = geoname.get_text("countryName").to_s

-      results.push({:lat => lat, :lon => lon, :zoom => GEONAMES_ZOOM,
+      results.push({:lat => lat, :lon => lon,
+                    :zoom => APP_CONFIG['geonames_zoom'],

                     :name => name,
                     :suffix => ", #{country}"})
     end
                     :name => name,
                     :suffix => ", #{country}"})
     end