Make the search box 17% longer, yay!

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

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index eed63c7a44fd5de3ab2ba1c9340ff6b0549bc921..29e7648afed5878eecbcdc05bb43a2d2b869e47c 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -17,15 +17,15 @@ class GeocoderController < ApplicationController
       @sources.push "latlon"
     elsif @query.match(/^\d{5}(-\d{4})?$/)
       @sources.push "us_postcode"
       @sources.push "latlon"
     elsif @query.match(/^\d{5}(-\d{4})?$/)
       @sources.push "us_postcode"

+      @sources.push "osm_nominatim"

     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)
       @sources.push "uk_postcode"
       @sources.push "osm_nominatim"
     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)
       @sources.push "uk_postcode"
       @sources.push "osm_nominatim"

-      @sources.push "osm_namefinder"

     elsif @query.match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i)
       @sources.push "ca_postcode"
     elsif @query.match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i)
       @sources.push "ca_postcode"

+      @sources.push "osm_nominatim"

     else
       @sources.push "osm_nominatim"
     else
       @sources.push "osm_nominatim"

-      @sources.push "osm_namefinder"

       @sources.push "geonames"
     end
 
       @sources.push "geonames"
     end
 


@@ -57,7 +57,7 @@ class GeocoderController < ApplicationController
       render :action => "error"
     else
       @results.push({:lat => lat, :lon => lon,
       render :action => "error"
     else
       @results.push({:lat => lat, :lon => lon,

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

                      :name => "#{lat}, #{lon}"})
 
       render :action => "results"
                      :name => "#{lat}, #{lon}"})
 
       render :action => "results"


@@ -78,7 +78,7 @@ class GeocoderController < ApplicationController
     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],
     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 => APP_CONFIG['postcode_zoom'],
+                     :zoom => POSTCODE_ZOOM,

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


@@ -104,7 +104,7 @@ class GeocoderController < ApplicationController
       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 = APP_CONFIG['postcode_zoom'] - postcode.count("#")
+      zoom = 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


@@ -127,7 +127,7 @@ class GeocoderController < ApplicationController
     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 => APP_CONFIG['postcode_zoom'],
+                     :zoom => POSTCODE_ZOOM,

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


@@ -228,31 +228,39 @@ class GeocoderController < ApplicationController
       viewbox = "&viewbox=#{minlon},#{maxlat},#{maxlon},#{minlat}"
     end
 
       viewbox = "&viewbox=#{minlon},#{maxlat},#{maxlon},#{minlat}"
     end
 

+    # get objects to excude
+    if params[:exclude]
+      exclude = "&exclude_place_ids=#{params[:exclude].join(',')}"
+    end
+
+    # ask nominatim
+    response = fetch_xml("#{NOMINATIM_URL}search?format=xml&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{request.user_preferred_languages.join(',')}")
+

     # create result array
     @results = Array.new
 
     # create result array
     @results = Array.new
 

-    # ask nominatim
-    response = fetch_xml("http://nominatim.openstreetmap.org/search?format=xml&q=#{escape_query(query)}#{viewbox}&accept-language=#{request.user_preferred_languages.join(',')}")
+    # create parameter hash for "more results" link
+    @more_params = params.reverse_merge({ :exclude => [] })
+
+    # extract the results from the response
+    results =  response.elements["searchresults"]

 
     # parse the response
 
     # parse the response

-    response.elements.each("searchresults/place") do |place|
+    results.elements.each("place") do |place|

       lat = place.attributes["lat"].to_s
       lon = place.attributes["lon"].to_s
       klass = place.attributes["class"].to_s
       lat = place.attributes["lat"].to_s
       lon = place.attributes["lon"].to_s
       klass = place.attributes["class"].to_s

-      type = place.attributes["type"].to_s.gsub("_", " ")
+      type = place.attributes["type"].to_s

       name = place.attributes["display_name"].to_s
       min_lat,max_lat,min_lon,max_lon = place.attributes["boundingbox"].to_s.split(",")
       name = place.attributes["display_name"].to_s
       min_lat,max_lat,min_lon,max_lon = place.attributes["boundingbox"].to_s.split(",")

-
-      if klass == "highway" and ["trunk","primary","secondary","tertiary","unclassified","residential"].include?(type)
-        prefix = t 'geocoder.search_osm_nominatim.prefix_highway', :type => type.capitalize
-      else
-        prefix = t 'geocoder.search_osm_nominatim.prefix_other', :type => type.capitalize
-      end
+      prefix_name = t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.gsub("_", " ").capitalize
+      prefix = t "geocoder.search_osm_nominatim.prefix_format", :name => prefix_name

 
       @results.push({:lat => lat, :lon => lon,
                      :min_lat => min_lat, :max_lat => max_lat,
                      :min_lon => min_lon, :max_lon => max_lon,
                      :prefix => prefix, :name => name})
 
       @results.push({:lat => lat, :lon => lon,
                      :min_lat => min_lat, :max_lat => max_lat,
                      :min_lon => min_lon, :max_lon => max_lon,
                      :prefix => prefix, :name => name})

+      @more_params[:exclude].push(place.attributes["place_id"].to_s)

     end
 
     render :action => "results"
     end
 
     render :action => "results"


@@ -278,7 +286,7 @@ class GeocoderController < ApplicationController
       name = geoname.get_text("name").to_s
       country = geoname.get_text("countryName").to_s
       @results.push({:lat => lat, :lon => lon,
       name = geoname.get_text("name").to_s
       country = geoname.get_text("countryName").to_s
       @results.push({:lat => lat, :lon => lon,

-                     :zoom => APP_CONFIG['geonames_zoom'],
+                     :zoom => GEONAMES_ZOOM,

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


@@ -293,9 +301,6 @@ class GeocoderController < ApplicationController
     @sources = Array.new
 
     @sources.push({ :name => "osm_nominatim" })
     @sources = Array.new
 
     @sources.push({ :name => "osm_nominatim" })

-    @sources.push({ :name => "osm_namefinder", :types => "cities", :max => 2 })
-    @sources.push({ :name => "osm_namefinder", :types => "towns", :max => 4 })
-    @sources.push({ :name => "osm_namefinder", :types => "places", :max => 10 })

     @sources.push({ :name => "geonames" })
 
     render :update do |page|
     @sources.push({ :name => "geonames" })
 
     render :update do |page|


@@ -350,11 +355,11 @@ class GeocoderController < ApplicationController
     @results = Array.new
 
     # ask OSM namefinder
     @results = Array.new
 
     # ask OSM namefinder

-    response = fetch_xml("http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{request.user_preferred_languages.join(',')}")
+    response = fetch_xml("#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{request.user_preferred_languages.join(',')}")

 
     # parse the response
 
     # parse the response

-    response.elements.each("reversegeocode") do |result|
-      description = result.get_text("result").to_s
+    response.elements.each("reversegeocode/result") do |result|
+      description = result.get_text.to_s

 
       @results.push({:prefix => "#{description}"})
     end
 
       @results.push({:prefix => "#{description}"})
     end