added a marker to show a location on the map

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

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index c12c0525bea7258981ffbcac7e6847669ea029be..8f0f804412daac1e7d59e55ec930ed3d0f801839 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 = []
 
-    if params[:query][:postcode] 
+    unless params[:query][:postcode].empty? 
       postcode = params[:query][:postcode].upcase
       escaped_postcode = postcode.sub(/\s/,'%20')
 
@@ -23,7 +23,7 @@ class GeocoderController < ApplicationController
           data = resp.body.split(/, /) # lat,long,town,state,zip
           lat = data[0] 
           lon = data[1]
-          redirect_to "/index.html?lat=#{lat}&lon=#{lon}&zoom=14"
+          redirect_to "/index.html?mlat=#{lat}&mlon=#{lon}&zoom=14"
           return
         end
       elsif postcode.match(/^([A-Z]{1,2}\d+[A-Z]?\s*\d[A-Z]{2})/)
@@ -35,7 +35,7 @@ class GeocoderController < ApplicationController
           data = dataline.split(/,/) # easting,northing,postcode,lat,long
           lat = data[3] 
           lon = data[4]
-          redirect_to "/index.html?lat=#{lat}&lon=#{lon}&zoom=14"
+          redirect_to "/index.html?mlat=#{lat}&mlon=#{lon}&zoom=14"
           return
         end
       elsif postcode.match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d/)
@@ -48,7 +48,7 @@ class GeocoderController < ApplicationController
           data_lon = resp.body.slice(/longt>.*?</)
           lat = data_lat.split(/[<>]/)[1]
           lon = data_lon.split(/[<>]/)[1]
-          redirect_to "/index.html?lat=#{lat}&lon=#{lon}&zoom=14"
+          redirect_to "/index.html?mlat=#{lat}&mlon=#{lon}&zoom=14"
           return
         end
       elsif postcode.match(/(GIR 0AA|[A-PR-UWYZ]([0-9]{1,2}|([A-HK-Y][0-9]|[A-HK-Y][0-9]([0-9]|[ABEHMNPRV-Y]))|[0-9][A-HJKS-UW]) [0-9][ABD-HJLNP-UW-Z]{2})
@@ -59,16 +59,16 @@ class GeocoderController < ApplicationController
             resp = http.get("/geocode?postcode=#{postcode}")
             lat = resp.body.scan(/[4-6][0-9]\.?[0-9]+/)
             lon = resp.body.scan(/[-+][0-9]\.?[0-9]+/)
-            redirect_to "/index.html?lat=#{lat}&lon=#{lon}&zoom=14"
+            redirect_to "/index.html?mlat=#{lat}&mlon=#{lon}&zoom=14"
             return
           end
         rescue
           redirect_to "/index.html"
           #redirect to somewhere else
         end
-        redirect_to "/index.html?lat=#{lat}&lon=#{lon}&zoom=14"
+        redirect_to "/index.html?mlat=#{lat}&mlon=#{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|
@@ -83,13 +83,13 @@ class GeocoderController < ApplicationController
           data_lon = resp.body.slice(/lng>.*?</)
           lat = data_lat.split(/[<>]/)[1]
           lon = data_lon.split(/[<>]/)[1]
-          redirect_to "/index.html?lat=#{lat}&lon=#{lon}&zoom=14"
+          redirect_to "/index.html?mlat=#{lat}&mlon=#{lon}&zoom=14"
         end
+      else
+        # Some other postcode / zip file
+        redirect_to "/index.html?error=unknown_postcode_or_zip"
+        return
       end
-    else
-      # Some other postcode / zip file
-      redirect_to "/index.html?error=unknown_postcode_or_zip"
-      return
     end
 
     if params[:query][:place_name]