From 96ce2262f8083756ea846d8b2c59fcc87f94b54c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 29 Dec 2009 14:30:15 -0800
Subject: [PATCH] If we got an identified location at ajax check time,
 renormalize lat/lon and naming. This'll match other displays of the names
 more consistently (Opera Plaza, San Francisco, CA, US instead of Opera Plaza,
 US)

---
 actions/geocode.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/actions/geocode.php b/actions/geocode.php
index 7fd696baf9..9671d2c276 100644
--- a/actions/geocode.php
+++ b/actions/geocode.php
@@ -52,7 +52,12 @@ class GeocodeAction extends Action
         }
         $this->lat = $this->trimmed('lat');
         $this->lon = $this->trimmed('lon');
-        $this->location = Location::fromLatLon($this->lat, $this->lon);
+        $location = Location::fromLatLon($this->lat, $this->lon);
+        if ($location) {
+            $this->location = Location::fromId($location->location_id, $location->location_ns);
+            $this->lat = $this->location->lat;
+            $this->lon = $this->location->lon;
+        }
         return true;
     }