From 397db07d65eec20de92f8c5220a4d41fc7d7ae7b Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 7 Aug 2007 17:09:37 +0000 Subject: [PATCH] New improved geocoder with extra added AJAX and OSM Namefinder support. --- app/controllers/geocoder_controller.rb | 256 +++++++++++++------------ app/views/layouts/site.rhtml | 12 +- app/views/site/_search.rhtml | 49 +++-- app/views/site/edit.rhtml | 43 ++++- app/views/site/index.rhtml | 105 ++++------ config/routes.rb | 4 +- public/javascripts/site.js | 14 ++ public/stylesheets/site.css | 108 +++++++---- 8 files changed, 341 insertions(+), 250 deletions(-) diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index 4ce31baf4..9349eaca4 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -1,134 +1,150 @@ class GeocoderController < ApplicationController - layout 'site' - require 'uri' require 'net/http' require 'rexml/document' def search - if params[:postcode] and not params[:postcode].empty? - check_postcode(params[:postcode]) - elsif params[:query][:postcode] and not params[:query][:postcode].empty? - check_postcode(params[:query][:postcode]) - elsif params[:query][:place_name] - redirect_to :controller => 'geocoder', :action => 'results', :params => {:place_name => params[:query][:place_name]} - end + @query = params[:query] + @results = Array.new + + 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) + @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) + else + @results.push search_osm_namefinder(@query) + @results.push search_geonames(@query) + end + end + +private + + def search_us_postcode(query) + results = Array.new + + # ask geocoder.us (they have a non-commercial use api) + response = fetch_text("http://rpc.geocoder.us/service/csv?zip=#{URI.escape(query)}") + + # parse the response + 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]}"}) + end + + return { :source => "Geocoder.us", :url => "http://geocoder.us/", :results => results } + rescue Exception => ex + return { :source => "Geocoder.us", :url => "http://geocoder.us/", :error => "Error contacting rpc.geocoder.us: #{ex.to_s}" } + end + + def search_uk_postcode(query) + results = Array.new + + # ask npemap.org.uk to do a combined npemap + freethepostcode search + response = fetch_text("http://www.npemap.org.uk/cgi/geocoder.fcgi?format=text&postcode=#{URI.escape(query)}") + + # parse the response + unless response.match(/Error/) + 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(/'/, "")}) + end + + return { :source => "NPEMap / FreeThePostcode", :url => "http://www.npemap.org.uk/", :results => results } + rescue Exception => ex + return { :source => "NPEMap / FreeThePostcode", :url => "http://www.npemap.org.uk/", :error => "Error contacting www.npemap.org.uk: #{ex.to_s}" } + end + + def search_ca_postcode(query) + results = Array.new + + # ask geocoder.ca (note - they have a per-day limit) + response = fetch_xml("http://geocoder.ca/?geoit=XML&postal=#{URI.escape(query)}") + + # parse the response + unless response.get_elements("geodata/error") + results.push({:lat => response.get_text("geodata/latt").to_s, + :lon => response.get_text("geodata/longt").to_s, + :zoom => 12, + :description => query.upcase}) + end + + return { :source => "Geocoder.CA", :url => "http://geocoder.ca/", :results => results } + rescue Exception => ex + return { :source => "Geocoder.CA", :url => "http://geocoder.ca/", :error => "Error contacting geocoder.ca: #{ex.to_s}" } end - def check_postcode(p) - - @postcode_arr = [] - postcode = p.upcase - escaped_postcode = postcode.sub(/\s/,'%20') - - begin - if postcode.match(/(^\d{5}$)|(^\d{5}-\d{4}$)/) - # Its a zip code - ask geocoder.us - # (They have a non commerical use api) - Net::HTTP.start('rpc.geocoder.us') do |http| - resp = http.get("/service/csv?zip=#{postcode}") - if resp.body.match(/couldn't find this zip/) - redirect_to :controller => params[:next_controller], :action => params[:next_action], :error => "invalid_zip_code" - return - end - data = resp.body.split(/, /) # lat,long,town,state,zip - lat = data[0] - lon = data[1] - redirect_to :controller => params[:next_controller], :action => params[:next_action], :mlat => lat, :mlon => lon, :zoom => 14 - return - end - elsif postcode.match(/^([A-Z]{1,2}\d+[A-Z]?\s*\d[A-Z]{2})/) - # It matched our naive UK postcode regexp - # Ask npemap to do a combined npemap + freethepostcode search - Net::HTTP.start('www.npemap.org.uk') do |http| - resp = http.get("/cgi/geocoder.fcgi?format=text&postcode=#{escaped_postcode}") - dataline = resp.body.split(/\n/)[1] - data = dataline.split(/,/) # easting,northing,postcode,lat,long - lat = data[3] - lon = data[4] - redirect_to :controller => params[:next_controller], :action => params[:next_action], :mlat => lat, :mlon => lon, :zoom => 14 - return - end - elsif postcode.match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d/) - # It's a canadian postcode - # Ask geocoder.ca (note - they have a per-day limit) - postcode = postcode.sub(/\s/,'') - Net::HTTP.start('geocoder.ca') do |http| - resp = http.get("?geoit=XML&postal=#{postcode}") - data_lat = resp.body.slice(/latt>.*?.*?]/)[1] - lon = data_lon.split(/[<>]/)[1] - redirect_to :controller => params[:next_controller], :action => params[:next_action], :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}) - /) - #its a UK postcode - begin - Net::HTTP.start('www.freethepostcode.org') do |http| - 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 :controller => params[:next_controller], :action => params[:next_action], :mlat => lat, :mlon => lon, :zoom => 14 - return - end - rescue - redirect_to :controller => params[:next_controller], :action => params[:next_action], :error => "invalid_postcode" - #redirect to somewhere else - end - 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| - resp = http.get("/postalCodeSearch?postalcode=#{escaped_postcode}&maxRows=1") - hits = resp.body.slice(/totalResultsCount>.*?]/)[1] - if hits == "0" - # Geonames doesn't know, it's probably wrong - redirect_to :controller => params[:next_controller], :action => params[:next_action], :error => "invalid_postcode_or_zip" - return - end - data_lat = resp.body.slice(/lat>.*?.*?]/)[1] - lon = data_lon.split(/[<>]/)[1] - redirect_to :controller => params[:next_controller], :action => params[:next_action], :mlat => lat, :mlon => lon, :zoom => 14 - end - else - # Some other postcode / zip file - redirect_to :controller => params[:next_controller], :action => params[:next_action], :error => "invalid_postcode_or_zip" - return - end - rescue - #Its likely that an api is down - redirect_to :controller => params[:next_controller], :action => params[:next_action], :error => "api_down" + def search_osm_namefinder(query) + results = Array.new + + # ask OSM namefinder + response = fetch_xml("http://www.frankieandshadow.com/osm/search.xml?find=#{URI.escape(query)}") + + # parse the response + response.elements.each("searchresults/named") do |named| + lat = named.attributes["lat"].to_s + lon = named.attributes["lon"].to_s + zoom = named.attributes["zoom"].to_s + place = named.elements["place/named"] || named.elements["nearestplaces/named"] + type = named.attributes["info"].to_s.capitalize + name = named.attributes["name"].to_s + 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}"}) end + + return { :source => "OpenStreetMap Namefinder", :url => "http://www.frankieandshadow.com/osm/", :results => results } + rescue Exception => ex + return { :source => "OpenStreetMap Namefinder", :url => "http://www.frankieandshadow.com/osm/", :error => "Error contacting www.frankieandshadow.com: #{ex.to_s}" } end - def results - @place_name = params[:place_name] - res_hash = {} - @res_ary = [] - begin - Net::HTTP.start('ws.geonames.org') do |http| - res = http.get("/search?q=#{URI.escape(@place_name)}&maxRows=10") - xml = REXML::Document.new(res.body) - xml.elements.each("geonames/geoname") do |ele| - res_hash = {} - ele.elements.each("name"){ |n| res_hash['name'] = n.text } - ele.elements.each("countryCode"){ |n| res_hash['countrycode'] = n.text } - ele.elements.each("countryName"){ |n| res_hash['countryname'] = n.text } - ele.elements.each("lat"){ |n| res_hash['lat'] = n.text } - ele.elements.each("lng"){ |n| res_hash['lon']= n.text } - @res_ary << res_hash - end - end - - flash.delete(:notice) - rescue Timeout::Error - flash[:notice] = "Timed out waiting for results from ws.geonames.org" - rescue Exception => ex - flash[:notice] = "Error contacting ws.geonames.org: #{ex.to_s}" + def search_geonames(query) + results = Array.new + + # ask geonames.org + response = fetch_xml("http://ws.geonames.org/search?q=#{URI.escape(query)}&maxRows=20") + + # parse the response + response.elements.each("geonames/geoname") do |geoname| + lat = geoname.get_text("lat").to_s + lon = geoname.get_text("lng").to_s + 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}"}) end + + return { :source => "GeoNames", :url => "http://www.geonames.org/", :results => results } + rescue Exception => ex + return { :source => "GeoNames", :url => "http://www.geonames.org/", :error => "Error contacting ws.geonames.org: #{ex.to_s}" } + end + + def fetch_text(url) + return Net::HTTP.get(URI.parse(url)) + end + + def fetch_xml(url) + return REXML::Document.new(fetch_text(url)) + end + + def format_distance(distance) + return "less than 1km" if distance == 0 + return "about #{distance}km" + end + + def format_direction(bearing) + return "south-west" if bearing >= 22.5 and bearing < 67.5 + return "south" if bearing >= 67.5 and bearing < 112.5 + return "south-east" if bearing >= 112.5 and bearing < 157.5 + return "east" if bearing >= 157.5 and bearing < 202.5 + return "north-east" if bearing >= 202.5 and bearing < 247.5 + return "north" if bearing >= 247.5 and bearing < 292.5 + return "north-west" if bearing >= 292.5 and bearing < 337.5 + return "west" end end diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 601e7b0bd..673e12706 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,19 +1,15 @@ - <%= javascript_include_tag 'site.js' %> - - <%= stylesheet_link_tag 'site.css' %> + <%= javascript_include_tag 'prototype' %> + <%= javascript_include_tag 'site' %> + + <%= stylesheet_link_tag 'site' %> <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Placename Search", :href => "/opensearch/osm.xml" }) %> <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Postcode Search", :href => "/opensearch/osm-postcode.xml" }) %> OpenStreetMap<%= ' | '+@title if @title %> - - <% if params[:controller] == 'site' and params[:action] == 'index' %> -
- <% end %> -
<% if flash[:notice] %>
<%= flash[:notice] %>
diff --git a/app/views/site/_search.rhtml b/app/views/site/_search.rhtml index 83411f54d..2b2fc6e31 100644 --- a/app/views/site/_search.rhtml +++ b/app/views/site/_search.rhtml @@ -1,20 +1,35 @@ -
- <% form_tag :controller => 'geocoder', :action => 'search' do %> - <%= hidden_field_tag 'next_controller', @controller.controller_name %> - <%= hidden_field_tag 'next_action', @controller.action_name %> - <%= text_field 'query', 'postcode' %> - <%= text_field 'query', 'place_name'%> - <%= submit_tag 'Search' %> - <% end %> - -
- Geolocation provided by npemap.org.uk, - geocoder.us, geocoder.ca and geonames.org -
-
- Enter a postcode or zip code, eg: SW15 6JH, 95472 +<% content_for "optionals" do %> +
+ Search + <% form_remote_tag(:update => :search_results_content, + :loading => "openSearchResults()", + :url => { :controller => :geocoder, :action => :search } ) do %> + <%= text_field_tag :query, nil, :size => 16 %> + <% end %>
-
- Enter a place-name, eg:Essen + +<% end %> + +
+ + + + + +
Search ResultsClose
+
diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml index 576c5a5bb..08d6133c4 100644 --- a/app/views/site/edit.rhtml +++ b/app/views/site/edit.rhtml @@ -3,7 +3,7 @@ essential database maintenance work is carried out.

<% else %> -<%= render :partial => 'search' %> +<%= render :partial => 'search', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> <% if params['mlon'] and params['mlat'] %> <% lon = params['mlon'] %> @@ -19,7 +19,7 @@ <% zoom = params['zoom'] || '12' %> <% end %> -
You need a Flash player to use Potlatch, the +
You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can download Flash Player from Adobe.com. Several other options are also available @@ -27,6 +27,7 @@
<% end %> diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml index febb1fdb9..000df6c1a 100644 --- a/app/views/site/index.rhtml +++ b/app/views/site/index.rhtml @@ -1,4 +1,6 @@ -<%= render :partial => 'search' %> +<%= render :partial => 'search', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> + +
<% if params['mlon'] and params['mlat'] %> <% marker = true %> @@ -44,14 +46,13 @@ <% end %> - diff --git a/config/routes.rb b/config/routes.rb index 7de1f8b42..9dc61e00c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -97,9 +97,7 @@ ActionController::Routing::Routes.draw do |map| map.connect '/test/populate/:table/:count', :controller => 'test', :action => 'populate', :from => 1 # geocoder - map.connect '/geocoder/search/', :controller => 'geocoder', :action => 'search' - map.connect '/geocoder/results/', :controller => 'geocoder', :action => 'results' - map.connect '/postcode/:postcode/', :controller => 'geocoder', :action => 'search' + map.connect '/geocoder/search', :controller => 'geocoder', :action => 'search' # messages diff --git a/public/javascripts/site.js b/public/javascripts/site.js index bb7439f9a..55d33d992 100644 --- a/public/javascripts/site.js +++ b/public/javascripts/site.js @@ -70,3 +70,17 @@ function setArgs(url, args) { return url.replace(/\?.*$/, "") + "?" + queryitems.join("&"); } + +function getStyle(el, property) { + var style; + + if (el.currentStyle) { + style = el.currentStyle[property]; + } else if( window.getComputedStyle ) { + style = document.defaultView.getComputedStyle(el,null).getPropertyValue(property); + } else { + style = el.style[property]; + } + + return style; +} diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css index 194eee874..2fe7710fd 100644 --- a/public/stylesheets/site.css +++ b/public/stylesheets/site.css @@ -66,8 +66,8 @@ body { #greeting { float: right; padding-right: 10px; - padding-top: 5px; - padding-bottom: 7px; + padding-top: 2px; + padding-bottom: 3px; font-size: 13px; background: url('/images/tab_bottom.gif') repeat-x bottom; } @@ -163,14 +163,13 @@ body { #content { - /* width: 700px; */ padding: 0; - /*padding-left: 1em;*/ margin: 0; position: absolute; left: 192px; + right: 10px; top: 35px; - background: none; + bottom: 10px; line-height: 1.2em; text-align: left; } @@ -302,34 +301,6 @@ hides rule from IE5-Mac \*/ font-size: 10px; } -#geocoder { - font-size: 12px; - padding-top: 5px; - padding-left: 14px; - padding-bottom: 15px; - width: 700px; -} - -#placename-helper{ - font-size: 9px; - position:absolute; top:20px; left: 250px; - color: gray; -} - -#postcode-helper{ - font-size: 9px; - position:absolute; top:20px; left: 20px; - color: gray; -} - -#geocoder-attribution{ - font-size: 9px; - position:absolute; top:26px; left: 450px; - line-height: 8px; - color: gray; -} - - .gpxsummary { font-size: 12px; @@ -363,7 +334,19 @@ hides rule from IE5-Mac \*/ } .oboxheader { - font-size: 18px; + font-size: 14px; + font-weight: bold; + line-height: 1.4em; + text-align: top; +} + +.optionalbox form { + margin: 0px; + padding: 0px; +} + +.optionalbox input { + width: 100%; } .rsssmall { @@ -400,6 +383,63 @@ hides rule from IE5-Mac \*/ cursor: pointer; } +#map { + position: absolute; + border: 1px solid black; + margin: 0px; + padding: 0px; + left: 0px; + right: 2px; + top: 0px; + bottom: 0px; +} + +#search_results { + display: none; + position: absolute; + border: 1px solid black; + margin: 0px; + padding: 0px; + width: 30%; + left: 0px; + top: 0px; + bottom: 0px; +} + +#search_results_content { + overflow: auto; + position: absolute; + top: 29px; + bottom: 0px; + left: 0px; + right: 0px; +} + +.search_results_title { + margin: 0px; + padding: 3px 6px 3px 6px; + height: 29px; + border-bottom: 1px solid black; + background: #bbb; +} + +.search_results_heading { + margin: 0px; + padding: 3px 6px 3px 6px; + border: 1px solid #ccc; + background: #ddd; +} + +.search_results_entry { + margin: 0px; + padding: 2px 6px 2px 6px; +} + +.search_results_error { + margin: 0px; + padding: 2px 6px 0px 6px; + color: #f00; +} /* rails error field stuff */ -- 2.43.2