Use bounding box information to zoom to search results when possible.

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 66c2ae41788387b6871e5618de3c5403ba68503d..9f90980bfcf1b32b78e1ebd6896bba023859f775 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -223,7 +223,7 @@ class GeocoderController < ApplicationController
     @results = Array.new
 
     # ask OSM namefinder
-    response = fetch_xml("http://katie.openstreetmap.org/~twain/?format=xml&q=#{escape_query(query)}")
+    response = fetch_xml("http://katie.openstreetmap.org/~twain/?format=xml&polygon=true&q=#{escape_query(query)}")
 
     # parse the response
     response.elements.each("searchresults/place") do |place|
@@ -233,6 +233,7 @@ class GeocoderController < ApplicationController
       klass = place.attributes["class"].to_s
       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(",")
 
       if klass == "highway"
         prefix = t 'geocoder.search_osm_twain.prefix_highway', :type => type.capitalize
@@ -241,6 +242,8 @@ class GeocoderController < ApplicationController
       end
 
       @results.push({:lat => lat, :lon => lon, :zoom => zoom,
+                     :min_lat => min_lat, :max_lat => max_lat,
+                     :min_lon => min_lon, :max_lon => max_lon,
                      :prefix => prefix, :name => name})
     end
 
@@ -277,7 +280,7 @@ class GeocoderController < ApplicationController
     @error = "Error contacting ws.geonames.org: #{ex.to_s}"
     render :action => "error"
   end
-  
+
   def description
     @sources = Array.new
 

diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb
index e7d0ddf6c1d9cc8c27610ecc8d395a249036c6ca..254412b5114c1646ff6488e97c29776fc299697b 100644 (file)
--- a/app/helpers/geocoder_helper.rb
+++ b/app/helpers/geocoder_helper.rb
@@ -6,7 +6,13 @@ module GeocoderHelper
     html = ""
     html << result[:prefix] if result[:prefix]
     html << " " if result[:prefix] and result[:name]
-    html << link_to_function(result[:name],"setPosition(#{result[:lat]}, #{result[:lon]}, #{result[:zoom]})", html_options)  if result[:name]
+
+    if result[:min_lon] and result[:min_lat] and result[:max_lon] and result[:max_lat]
+      html << link_to_function(result[:name],"setPosition(#{result[:lat]}, #{result[:lon]}, #{result[:zoom]}, #{result[:min_lon]}, #{result[:min_lat]}, #{result[:max_lon]}, #{result[:max_lat]})", html_options)  if result[:name]
+    else
+      html << link_to_function(result[:name],"setPosition(#{result[:lat]}, #{result[:lon]}, #{result[:zoom]})", html_options)  if result[:name]
+    end
+
     html << result[:suffix] if result[:suffix]
     return html
   end

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 40a7a3fbca52e085932194a983ba3ee4ef383e03..12cc1d275e4d7c0817f7bb4a5dd369bd0c93f72f 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -191,10 +191,16 @@ end
     return getMapCenter();
   }
 
-  function setPosition(lat, lon, zoom) {
+  function setPosition(lat, lon, zoom, min_lon, min_lat, max_lon, max_lat) {
     var centre = new OpenLayers.LonLat(lon, lat);
 
-    setMapCenter(centre, zoom);
+    if (min_lon && min_lat && max_lon && max_lat) {
+      var bbox = new OpenLayers.Bounds(min_lon, min_lat, max_lon, max_lat);
+
+      setMapExtent(bbox);
+    } else {
+      setMapCenter(centre, zoom);
+    }
 
     if (marker)
       removeMarkerFromMap(marker);