Add the author name to RSS feeds.

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

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 480dc5419b2b5cf9c4e17c0f5eb6c55408eb74df..69c35e0e3c23e2fc36ba254946d69bb2dbb79f8d 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -9,7 +9,7 @@ class GeocoderController < ApplicationController
 
     if @query.match(/^\d{5}(-\d{4})?$/)
       @results.push search_us_postcode(@query)
 
     if @query.match(/^\d{5}(-\d{4})?$/)
       @results.push search_us_postcode(@query)

-    elsif @query.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})/i)
+    elsif @query.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])\s*[0-9][ABD-HJLNP-UW-Z]{2})/i)

       @results.push search_uk_postcode(@query)
     elsif @query.match(/[A-Z]\d[A-Z]\s*\d[A-Z]\d/i)
       @results.push search_ca_postcode(@query)
       @results.push search_uk_postcode(@query)
     elsif @query.match(/[A-Z]\d[A-Z]\s*\d[A-Z]\d/i)
       @results.push search_ca_postcode(@query)


@@ -31,7 +31,8 @@ private
     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 => 12,
     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 => 12,

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

     end
 
     return { :source => "Geocoder.us", :url => "http://geocoder.us/", :results => results }
     end
 
     return { :source => "Geocoder.us", :url => "http://geocoder.us/", :results => results }


@@ -50,7 +51,7 @@ private
       dataline = response.split(/\n/)[1]
       data = dataline.split(/,/) # easting,northing,postcode,lat,long
       results.push({:lat => data[3], :lon => data[4], :zoom => 12,
       dataline = response.split(/\n/)[1]
       data = dataline.split(/,/) # easting,northing,postcode,lat,long
       results.push({:lat => data[3], :lon => data[4], :zoom => 12,

-                    :description => data[2].gsub(/'/, "")})
+                    :name => data[2].gsub(/'/, "")})

     end
 
     return { :source => "NPEMap / FreeThePostcode", :url => "http://www.npemap.org.uk/", :results => results }
     end
 
     return { :source => "NPEMap / FreeThePostcode", :url => "http://www.npemap.org.uk/", :results => results }


@@ -69,7 +70,7 @@ private
       results.push({:lat => response.get_text("geodata/latt").to_s,
                     :lon => response.get_text("geodata/longt").to_s,
                     :zoom => 12,
       results.push({:lat => response.get_text("geodata/latt").to_s,
                     :lon => response.get_text("geodata/longt").to_s,
                     :zoom => 12,

-                    :description => query.upcase})
+                    :name => query.upcase})

     end
 
     return { :source => "Geocoder.CA", :url => "http://geocoder.ca/", :results => results }
     end
 
     return { :source => "Geocoder.CA", :url => "http://geocoder.ca/", :results => results }


@@ -91,16 +92,24 @@ private
       place = named.elements["place/named"] || named.elements["nearestplaces/named"]
       type = named.attributes["info"].to_s.capitalize
       name = named.attributes["name"].to_s
       place = named.elements["place/named"] || named.elements["nearestplaces/named"]
       type = named.attributes["info"].to_s.capitalize
       name = named.attributes["name"].to_s

+      description = named.elements["description"].to_s
+      if name.empty?
+        prefix = ""
+        name = type
+      else
+        prefix = "#{type} "
+      end

       if place
         distance = format_distance(place.attributes["approxdistance"].to_i)
         direction = format_direction(place.attributes["direction"].to_i)
         placename = place.attributes["name"].to_s
       if place
         distance = format_distance(place.attributes["approxdistance"].to_i)
         direction = format_direction(place.attributes["direction"].to_i)
         placename = place.attributes["name"].to_s

-        results.push({:lat => lat, :lon => lon, :zoom => zoom,
-                      :description => "#{type} #{name}, #{distance} #{direction} of #{placename}"})
+        suffix = ", #{distance} #{direction} of #{placename}"

       else
       else

-        results.push({:lat => lat, :lon => lon, :zoom => zoom,
-                      :description => "#{type} #{name}"})
+        suffix = ""

       end
       end

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

     end
 
     return { :source => "OpenStreetMap Namefinder", :url => "http://www.frankieandshadow.com/osm/", :results => results }
     end
 
     return { :source => "OpenStreetMap Namefinder", :url => "http://www.frankieandshadow.com/osm/", :results => results }


@@ -121,7 +130,8 @@ private
       name = geoname.get_text("name").to_s
       country = geoname.get_text("countryName").to_s
       results.push({:lat => lat, :lon => lon, :zoom => 12,
       name = geoname.get_text("name").to_s
       country = geoname.get_text("countryName").to_s
       results.push({:lat => lat, :lon => lon, :zoom => 12,

-                    :description => "#{name}, #{country}"})
+                    :name => name,
+                    :suffix => ", #{country}"})

     end
 
     return { :source => "GeoNames", :url => "http://www.geonames.org/", :results => results }
     end
 
     return { :source => "GeoNames", :url => "http://www.geonames.org/", :results => results }