New improved geocoder with extra added AJAX and OSM Namefinder support.
This commit is contained in:
Tom Hughes
parent
e8809a10f5
commit
397db07d65
8 changed files with 342 additions and 251 deletions
|
|
@ -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
|
||||
end
|
||||
@query = params[:query]
|
||||
@results = Array.new
|
||||
|
||||
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>.*?</)
|
||||
data_lon = resp.body.slice(/longt>.*?</)
|
||||
lat = data_lat.split(/[<>]/)[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>.*?</).split(/[<>]/)[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>.*?</)
|
||||
data_lon = resp.body.slice(/lng>.*?</)
|
||||
lat = data_lat.split(/[<>]/)[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"
|
||||
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
|
||||
|
||||
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
|
||||
private
|
||||
|
||||
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_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 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 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
|
||||
|
|
|
|||
|
|
@ -1,19 +1,15 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<%= javascript_include_tag 'site.js' %>
|
||||
<!--[if lt IE 7]><%= javascript_include_tag 'pngfix.js' %><![endif]--> <!-- thanks, microsoft! -->
|
||||
<%= stylesheet_link_tag 'site.css' %>
|
||||
<%= javascript_include_tag 'prototype' %>
|
||||
<%= javascript_include_tag 'site' %>
|
||||
<!--[if lt IE 7]><%= javascript_include_tag 'pngfix' %><![endif]--> <!-- thanks, microsoft! -->
|
||||
<%= 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" }) %>
|
||||
<title>OpenStreetMap<%= ' | '+@title if @title %></title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<% if params[:controller] == 'site' and params[:action] == 'index' %>
|
||||
<div id="map" style="border: 1px solid black; position: absolute; right: 5px; bottom: 5px; left: 200px; top: 70px;"></div>
|
||||
<% end %>
|
||||
|
||||
<div id="content">
|
||||
<% if flash[:notice] %>
|
||||
<div id="notice"><%= flash[:notice] %></div>
|
||||
|
|
|
|||
|
|
@ -1,20 +1,35 @@
|
|||
<div id="geocoder">
|
||||
<% 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 %>
|
||||
<% content_for "optionals" do %>
|
||||
<div class="optionalbox">
|
||||
<span class="oboxheader">Search</span>
|
||||
<% form_remote_tag(:update => :search_results_content,
|
||||
:loading => "openSearchResults()",
|
||||
:url => { :controller => :geocoder, :action => :search } ) do %>
|
||||
<%= text_field_tag :query, nil, :size => 16 %>
|
||||
<% end %>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
<!--
|
||||
function openSearchResults() {
|
||||
$("search_results").style.display = "block";
|
||||
$("search_results_content").innerHTML = "<p class='search_results_entry'>Searching...</p>";
|
||||
<%= onopen %>
|
||||
}
|
||||
|
||||
<div id="geocoder-attribution">
|
||||
Geolocation provided by <a href="http://npemap.org.uk/">npemap.org.uk</a>,
|
||||
<a href="http://geocoder.us/">geocoder.us</a>, <a href="http://geocoder.ca/">geocoder.ca</a> and <a href="http://www.geonames.org/">geonames.org</a>
|
||||
</div>
|
||||
<div id="postcode-helper">
|
||||
Enter a postcode or zip code, eg: SW15 6JH, 95472
|
||||
</div>
|
||||
<div id="placename-helper">
|
||||
Enter a place-name, eg:Essen
|
||||
function closeSearchResults() {
|
||||
$("search_results").style.display = "none";
|
||||
<%= onclose %>
|
||||
}
|
||||
// -->
|
||||
</script>
|
||||
<% end %>
|
||||
|
||||
<div id="search_results">
|
||||
<table class="search_results_title" width="100%">
|
||||
<tr>
|
||||
<td align="left">Search Results</td>
|
||||
<td align="right"><a href="javascript:closeSearchResults()">Close</a></td>
|
||||
</tr>
|
||||
</table>
|
||||
<div id="search_results_content">
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
essential database maintenance work is carried out.
|
||||
</p>
|
||||
<% 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 %>
|
||||
|
||||
<div id="mapcontent">You need a Flash player to use Potlatch, the
|
||||
<div id="map">You need a Flash player to use Potlatch, the
|
||||
OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>.
|
||||
|
||||
<a href="http://wiki.openstreetmap.org/index.php/Editing">Several other options</a> are also available
|
||||
|
|
@ -27,6 +27,7 @@
|
|||
</div>
|
||||
<script type="text/javascript" src="/javascripts/swfobject.js"></script>
|
||||
<script type="text/javascript">
|
||||
var brokenContentSize = $("content").offsetWidth == 0;
|
||||
var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "700", "600", "6", "#FFFFFF");
|
||||
|
||||
function doSWF(lat,lon,sc) {
|
||||
|
|
@ -34,9 +35,45 @@
|
|||
fo.addVariable('long',lon);
|
||||
fo.addVariable('scale',sc);
|
||||
fo.addVariable('token','<%= @user.token %>');
|
||||
fo.write("mapcontent");
|
||||
fo.write("map");
|
||||
}
|
||||
|
||||
doSWF(<%= lat %>,<%= lon %>,<%= zoom %>);
|
||||
|
||||
function setPosition(lat, lon, zoom) {
|
||||
doSWF(lat, lon, zoom);
|
||||
}
|
||||
|
||||
function resizeContent() {
|
||||
var content = $("content");
|
||||
var rightMargin = parseInt(getStyle(content, "right"));
|
||||
var bottomMargin = parseInt(getStyle(content, "bottom"));
|
||||
|
||||
content.style.width = document.documentElement.clientWidth - content.offsetLeft - rightMargin;
|
||||
content.style.height = document.documentElement.clientHeight - content.offsetTop - bottomMargin;
|
||||
}
|
||||
|
||||
function resizeMap() {
|
||||
var search_results_width = $("search_results").offsetWidth;
|
||||
|
||||
if (search_results_width > 0) {
|
||||
search_results_width = search_results_width + 5
|
||||
}
|
||||
|
||||
$("map").style.left = (search_results_width) + "px";
|
||||
$("map").style.width = ($("content").offsetWidth - search_results_width) + "px";
|
||||
$("map").style.height = ($("content").offsetHeight - 2) + "px";
|
||||
}
|
||||
|
||||
function handleResize() {
|
||||
if (brokenContentSize) {
|
||||
resizeContent();
|
||||
}
|
||||
|
||||
resizeMap();
|
||||
}
|
||||
|
||||
window.onresize = handleResize;
|
||||
window.onload = handleResize;
|
||||
</script>
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
<%= render :partial => 'search' %>
|
||||
<%= render :partial => 'search', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
|
||||
|
||||
<div id="map"></div>
|
||||
|
||||
<% if params['mlon'] and params['mlat'] %>
|
||||
<% marker = true %>
|
||||
|
|
@ -44,14 +46,13 @@
|
|||
<script src="http://www.mappam.com/javascripts/mappam.js" type="text/javascript"></script>
|
||||
<% end %>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
<!--
|
||||
var ie = navigator.appName.indexOf("Microsoft Internet Explorer") != -1;
|
||||
var brokenContentSize = $("content").offsetWidth == 0;
|
||||
var map;
|
||||
|
||||
function init(){
|
||||
var map = createMap("map");
|
||||
map = createMap("map");
|
||||
|
||||
<% if bbox %>
|
||||
var min = lonLatToMercator(new OpenLayers.LonLat(<%= minlon %>, <%= minlat %>));
|
||||
|
|
@ -89,11 +90,14 @@
|
|||
}
|
||||
<% end %>
|
||||
|
||||
document.getElementById('map_OpenLayers_ViewPort').style.position = 'absolute';
|
||||
if ( ie ) {
|
||||
handleResize();
|
||||
}
|
||||
}
|
||||
handleResize();
|
||||
}
|
||||
|
||||
function setPosition(lat, lon, zoom) {
|
||||
var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat));
|
||||
|
||||
map.setCenter(centre, zoom);
|
||||
}
|
||||
|
||||
function updateLocation() {
|
||||
var lonlat = mercatorToLonLat(map.getCenter());
|
||||
|
|
@ -105,69 +109,40 @@
|
|||
document.cookie = "location=" + lonlat.lon + "," + lonlat.lat + "," + zoom + "," + layers;
|
||||
}
|
||||
|
||||
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;
|
||||
function resizeContent() {
|
||||
var content = $("content");
|
||||
var rightMargin = parseInt(getStyle(content, "right"));
|
||||
var bottomMargin = parseInt(getStyle(content, "bottom"));
|
||||
|
||||
content.style.width = document.documentElement.clientWidth - content.offsetLeft - rightMargin;
|
||||
content.style.height = document.documentElement.clientHeight - content.offsetTop - bottomMargin;
|
||||
}
|
||||
|
||||
function resizeMap() {
|
||||
var centre = map.getCenter();
|
||||
var zoom = map.getZoom();
|
||||
var search_results_width = $("search_results").offsetWidth;
|
||||
|
||||
if (search_results_width > 0) {
|
||||
search_results_width = search_results_width + 5
|
||||
}
|
||||
|
||||
$("map").style.left = (search_results_width) + "px";
|
||||
$("map").style.width = ($("content").offsetWidth - search_results_width) + "px";
|
||||
$("map").style.height = ($("content").offsetHeight - 2) + "px";
|
||||
|
||||
map.setCenter(centre, zoom);
|
||||
}
|
||||
|
||||
function handleResize() {
|
||||
var el = document.getElementById( 'map' );
|
||||
var left = getStyle( el, 'left' );
|
||||
var top = getStyle( el, 'top' );
|
||||
var bottom = getStyle( el, 'bottom' );
|
||||
var right = getStyle( el, 'right' );
|
||||
var width = el.old_width;
|
||||
var height;
|
||||
if( ! width ) {
|
||||
width = getStyle( el, 'width' );
|
||||
if (brokenContentSize) {
|
||||
resizeContent();
|
||||
}
|
||||
var height = el.old_height;
|
||||
if( ! height ) {
|
||||
height = getStyle( el, 'height' );
|
||||
}
|
||||
var pwidth, pheight;
|
||||
if( el.offsetParent.nodeName == 'BODY' || el.offsetParent.nodeName == 'HTML' ) {
|
||||
if( typeof( window.innerWidth ) == 'number' ) {
|
||||
pwidth = window.innerWidth;
|
||||
pheight = window.innerHeight;
|
||||
} else if( document.documentElement &&
|
||||
( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
|
||||
pwidth = document.documentElement.clientWidth;
|
||||
pheight = document.documentElement.clientHeight;
|
||||
} else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
|
||||
pwidth = document.body.clientWidth;
|
||||
pheight = document.body.clientHeight;
|
||||
}
|
||||
} else {
|
||||
pwidth = el.offsetParent.offsetWidth;
|
||||
pheight = el.offsetParent.offsetHeight;
|
||||
}
|
||||
if( left != 'auto' && right != 'auto' && width == 'auto' ) {
|
||||
el.old_width = width;
|
||||
var new_width = (pwidth - el.offsetLeft - parseInt( right ) );
|
||||
el.style.width = new_width + 'px';
|
||||
}
|
||||
if( top != 'auto' && bottom != 'auto' && height == 'auto' ) {
|
||||
el.old_height = height;
|
||||
var new_height = (pheight - el.offsetTop - parseInt( bottom ) );
|
||||
el.style.height = new_height + 'px';
|
||||
}
|
||||
map.updateSize();
|
||||
el.style.display = 'none';
|
||||
setTimeout( function() { el.style.display = ''; }, 200 );
|
||||
}
|
||||
|
||||
if ( ie ) {
|
||||
window.onresize = handleResize;
|
||||
|
||||
resizeMap();
|
||||
}
|
||||
|
||||
window.onresize = handleResize;
|
||||
window.onload = init;
|
||||
// -->
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue