Fixed up name search and postcode search

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

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index c12c0525bea7258981ffbcac7e6847669ea029be..6955579ed952e9953db7eb0366d649eaf6d31836 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -7,7 +7,7 @@ class GeocoderController < ApplicationController
   def search
     @postcode_arr = []
 
   def search
     @postcode_arr = []
 

-    if params[:query][:postcode] 
+    unless params[:query][:postcode].empty? 

       postcode = params[:query][:postcode].upcase
       escaped_postcode = postcode.sub(/\s/,'%20')
 
       postcode = params[:query][:postcode].upcase
       escaped_postcode = postcode.sub(/\s/,'%20')
 


@@ -68,7 +68,7 @@ class GeocoderController < ApplicationController
         end
         redirect_to "/index.html?lat=#{lat}&lon=#{lon}&zoom=14"
         #redirect_to "/index.html?error=unknown_postcode_or_zip"
         end
         redirect_to "/index.html?lat=#{lat}&lon=#{lon}&zoom=14"
         #redirect_to "/index.html?error=unknown_postcode_or_zip"

-      else
+      elsif

         # Some other postcode / zip code
         # Throw it at geonames, and see if they have any luck with it
         Net::HTTP.start('ws.geonames.org') do |http|
         # Some other postcode / zip code
         # Throw it at geonames, and see if they have any luck with it
         Net::HTTP.start('ws.geonames.org') do |http|


@@ -85,11 +85,11 @@ class GeocoderController < ApplicationController
           lon = data_lon.split(/[<>]/)[1]
           redirect_to "/index.html?lat=#{lat}&lon=#{lon}&zoom=14"
         end
           lon = data_lon.split(/[<>]/)[1]
           redirect_to "/index.html?lat=#{lat}&lon=#{lon}&zoom=14"
         end

+      else
+        # Some other postcode / zip file
+        redirect_to "/index.html?error=unknown_postcode_or_zip"
+        return

       end
       end

-    else
-      # Some other postcode / zip file
-      redirect_to "/index.html?error=unknown_postcode_or_zip"
-      return

     end
 
     if params[:query][:place_name]  
     end
 
     if params[:query][:place_name]