wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better handling of null responses from geonames.org

Browse Source
This commit is contained in:
Evan Prodromou 2010-01-30 12:40:11 -05:00
parent 8318f195a2
commit a1c9874a61
1 changed files with 62 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
plugins/GeonamesPlugin.php
View File

@ -71,7 +71,7 @@ class GeonamesPlugin extends Plugin
$loc = $this->getCache(array('name' => $name, $loc = $this->getCache(array('name' => $name,
'language' => $language)); 'language' => $language));
if (!empty($loc)) { if ($loc !== false) {
$location = $loc; $location = $loc;
return false; return false;
} }
@ -87,12 +87,20 @@ class GeonamesPlugin extends Plugin
return true; return true;
} }
if (count($geonames) == 0) {
// no results
$this->setCache(array('name' => $name,
'language' => $language),
null);
return true;
}
$n = $geonames[0]; $n = $geonames[0];
$location = new Location(); $location = new Location();
$location->lat = (string)$n->lat; $location->lat = $this->canonical($n->lat);
$location->lon = (string)$n->lng; $location->lon = $this->canonical($n->lng);
$location->names[$language] = (string)$n->name; $location->names[$language] = (string)$n->name;
$location->location_id = (string)$n->geonameId; $location->location_id = (string)$n->geonameId;
$location->location_ns = self::LOCATION_NS; $location->location_ns = self::LOCATION_NS;
@ -125,7 +133,7 @@ class GeonamesPlugin extends Plugin
$loc = $this->getCache(array('id' => $id)); $loc = $this->getCache(array('id' => $id));
if (!empty($loc)) { if ($loc !== false) {
$location = $loc; $location = $loc;
return false; return false;
} }
@ -157,8 +165,9 @@ class GeonamesPlugin extends Plugin
$location->location_id = (string)$last->geonameId; $location->location_id = (string)$last->geonameId;
$location->location_ns = self::LOCATION_NS; $location->location_ns = self::LOCATION_NS;
$location->lat = (string)$last->lat; $location->lat = $this->canonical($last->lat);
$location->lon = (string)$last->lng; $location->lon = $this->canonical($last->lng);
$location->names[$language] = implode(', ', array_reverse($parts)); $location->names[$language] = implode(', ', array_reverse($parts));
$this->setCache(array('id' => (string)$last->geonameId), $this->setCache(array('id' => (string)$last->geonameId),
@ -186,13 +195,15 @@ class GeonamesPlugin extends Plugin
function onLocationFromLatLon($lat, $lon, $language, &$location) function onLocationFromLatLon($lat, $lon, $language, &$location)
{ {
$lat = rtrim($lat, "0"); // Make sure they're canonical
$lon = rtrim($lon, "0");
$lat = $this->canonical($lat);
$lon = $this->canonical($lon);
$loc = $this->getCache(array('lat' => $lat, $loc = $this->getCache(array('lat' => $lat,
'lon' => $lon)); 'lon' => $lon));
if (!empty($loc)) { if ($loc !== false) {
$location = $loc; $location = $loc;
return false; return false;
} }
@ -207,6 +218,14 @@ class GeonamesPlugin extends Plugin
return true; return true;
} }
if (count($geonames) == 0) {
// no results
$this->setCache(array('lat' => $lat,
'lon' => $lon),
null);
return true;
}
$n = $geonames[0]; $n = $geonames[0];
$parts = array(); $parts = array();
@ -225,8 +244,8 @@ class GeonamesPlugin extends Plugin
$location->location_id = (string)$n->geonameId; $location->location_id = (string)$n->geonameId;
$location->location_ns = self::LOCATION_NS; $location->location_ns = self::LOCATION_NS;
$location->lat = (string)$lat; $location->lat = $this->canonical($n->lat);
$location->lon = (string)$lon; $location->lon = $this->canonical($n->lng);
$location->names[$language] = implode(', ', $parts); $location->names[$language] = implode(', ', $parts);
@ -264,7 +283,7 @@ class GeonamesPlugin extends Plugin
$n = $this->getCache(array('id' => $id, $n = $this->getCache(array('id' => $id,
'language' => $language)); 'language' => $language));
if (!empty($n)) { if ($n !== false) {
$name = $n; $name = $n;
return false; return false;
} }
@ -278,6 +297,13 @@ class GeonamesPlugin extends Plugin
return false; return false;
} }
if (count($geonames) == 0) {
$this->setCache(array('id' => $id,
'language' => $language),
null);
return false;
}
$parts = array(); $parts = array();
foreach ($geonames as $level) { foreach ($geonames as $level) {
@ -412,17 +438,29 @@ class GeonamesPlugin extends Plugin
throw new Exception("HTTP error code " . $result->code); throw new Exception("HTTP error code " . $result->code);
} }
$document = new SimpleXMLElement($result->getBody()); $body = $result->getBody();
if (empty($document)) { if (empty($body)) {
throw new Exception("No results in response"); throw new Exception("Empty HTTP body in response");
}
// This will throw an exception if the XML is mal-formed
$document = new SimpleXMLElement($body);
// No children, usually no results
$children = $document->children();
if (count($children) == 0) {
return array();
} }
if (isset($document->status)) { if (isset($document->status)) {
throw new Exception("Error #".$document->status['value']." ('".$document->status['message']."')"); throw new Exception("Error #".$document->status['value']." ('".$document->status['message']."')");
} }
// Array of elements // Array of elements, >0 elements
return $document->geoname; return $document->geoname;
} }
@ -438,4 +476,12 @@ class GeonamesPlugin extends Plugin
'names for locations based on user-provided lat/long pairs.')); 'names for locations based on user-provided lat/long pairs.'));
return true; return true;
} }
function canonical($coord)
{
$coord = rtrim($coord, "0");
$coord = rtrim($coord, ".");
return $coord;
}
} }