From 1b7cc3393a6a039d4adcf955b3a79fe3c5cc6f47 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 30 Jan 2010 12:43:00 -0500
Subject: Use passed-in lat long in geocode.php

Don't rewrite the lat-long for a location in geocode.php.
---
 actions/geocode.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'actions/geocode.php')

diff --git a/actions/geocode.php b/actions/geocode.php
index 9671d2c27..7fd696baf 100644
--- a/actions/geocode.php
+++ b/actions/geocode.php
@@ -52,12 +52,7 @@ class GeocodeAction extends Action
         }
         $this->lat = $this->trimmed('lat');
         $this->lon = $this->trimmed('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;
-        }
+        $this->location = Location::fromLatLon($this->lat, $this->lon);
         return true;
     }
 
-- 
cgit v1.2.3-54-g00ecf


From def5d56ce1582c785cbff7d49103493b293838bb Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 30 Jan 2010 12:47:21 -0500
Subject: add lat, lon, location and remove closing tag from geocode.php

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

(limited to 'actions/geocode.php')

diff --git a/actions/geocode.php b/actions/geocode.php
index 7fd696baf..e883c6ce4 100644
--- a/actions/geocode.php
+++ b/actions/geocode.php
@@ -42,6 +42,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 class GeocodeAction extends Action
 {
+    var $lat = null;
+    var $lon = null;
+    var $location = null;
+
     function prepare($args)
     {
         parent::prepare($args);
@@ -90,4 +94,3 @@ class GeocodeAction extends Action
         return true;
     }
 }
-?>
-- 
cgit v1.2.3-54-g00ecf