cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweak the namefinder results a bit more.

Browse source
This commit is contained in:
Tom Hughes 2008-04-10 08:07:09 +00:00
parent 373a3b0577
commit 0f28e0581e
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/controllers/geocoder_controller.rb
View file

@ -146,17 +146,18 @@ private
if place.attributes["rank"].to_i <= 30 if place.attributes["rank"].to_i <= 30
parent = nil parent = nil
parentrank = 0 parentrank = 0
parentdistance = 0 parentscore = 0
place.elements.each("nearestplaces/named") do |nearest| place.elements.each("nearestplaces/named") do |nearest|
nearestrank = nearest.attributes["rank"].to_i nearestrank = nearest.attributes["rank"].to_i
nearestdistance = nearest.attributes["distance"].to_f nearestscore = nearestrank / nearest.attributes["distance"].to_f
if nearestrank > parentrank or if nearestrank > 30 and
( nearestrank == parentrank and nearestdistance < parentdistance ) ( nearestscore > parentscore or
( nearestscore == parentscore and nearestrank > parentrank ) )
parent = nearest parent = nearest
parentrank = nearestrank parentrank = nearestrank
parentdistance = nearestdistance parentscore = nearestscore
end end
end end
@ -166,7 +167,9 @@ private
if place.attributes["info"].to_s == "suburb" if place.attributes["info"].to_s == "suburb"
suffix = "#{suffix}, #{parentname}" suffix = "#{suffix}, #{parentname}"
else else
suffix = "#{suffix} (near #{parentname})" parentdistance = format_distance(parent.attributes["approxdistance"].to_i)
parentdirection = format_direction(parent.attributes["direction"].to_i)
suffix = "#{suffix} (#{parentdistance} #{parentdirection} of #{parentname})"
end end
end end
end end