Merged 17256:18123 from trunk.

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

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 904e6bf74b2c7163e06a168744ddf3871fddfa68..556cfb36ad4ae53bf04fbadd3097cbdc9bb31dbd 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -3,6 +3,7 @@ class GeocoderController < ApplicationController
   require 'net/http'
   require 'rexml/document'
 
   require 'net/http'
   require 'rexml/document'
 

+  before_filter :authorize_web

   before_filter :set_locale
 
   def search
   before_filter :set_locale
 
   def search


@@ -76,7 +77,7 @@ class GeocoderController < ApplicationController
       data = response.split(/\s*,\s+/) # lat,long,town,state,zip
       @results.push({:lat => data[0], :lon => data[1],
                      :zoom => APP_CONFIG['postcode_zoom'],
       data = response.split(/\s*,\s+/) # lat,long,town,state,zip
       @results.push({:lat => data[0], :lon => data[1],
                      :zoom => APP_CONFIG['postcode_zoom'],

-                     :prefix => "#{data[2]}, #{data[3]}, ",
+                     :prefix => "#{data[2]}, #{data[3]},",

                      :name => data[4]})
     end
 
                      :name => data[4]})
     end
 


@@ -278,7 +279,7 @@ class GeocoderController < ApplicationController
       description = named.elements["description"].to_s
       distance = format_distance(place.attributes["approxdistance"].to_i)
       direction = format_direction((place.attributes["direction"].to_i - 180) % 360)
       description = named.elements["description"].to_s
       distance = format_distance(place.attributes["approxdistance"].to_i)
       direction = format_direction((place.attributes["direction"].to_i - 180) % 360)

-      prefix = "#{distance} #{direction} of #{type} "
+      prefix = t "geocoder.description_osm_namefinder.prefix", :distance => distance, :direction => direction, :type => type

       @results.push({:lat => lat, :lon => lon, :zoom => zoom,
                      :prefix => prefix.capitalize, :name => name,
                      :description => description})
       @results.push({:lat => lat, :lon => lon, :zoom => zoom,
                      :prefix => prefix.capitalize, :name => name,
                      :description => description})