check database results before using variable

[nominatim.git] / lib / PlaceLookup.php

diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php
index e00163378a3d48a8555864f4a8f1d75f1fec3b22..6da82fd8225bd9cdb31366f22f8724262926fe61 100644 (file)
--- a/lib/PlaceLookup.php
+++ b/lib/PlaceLookup.php
@@ -46,10 +46,15 @@
                        $sSQL .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
                        $sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
                        $sSQL .= " get_name_by_language(name, ARRAY['ref']) as ref,";
                        $sSQL .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
                        $sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
                        $sSQL .= " get_name_by_language(name, ARRAY['ref']) as ref,";

-                       $sSQL .= " st_y(centroid) as lat, st_x(centroid) as lon";
+                       $sSQL .= " (case when centroid is null then st_y(st_centroid(geometry)) else st_y(centroid) end) as lat,";
+                       $sSQL .= " (case when centroid is null then st_x(st_centroid(geometry)) else st_x(centroid) end) as lon";

                        $sSQL .= " from placex where place_id = ".(int)$this->iPlaceID;
                        $aPlace = $this->oDB->getRow($sSQL);
 
                        $sSQL .= " from placex where place_id = ".(int)$this->iPlaceID;
                        $aPlace = $this->oDB->getRow($sSQL);
 

+                       if (PEAR::IsError($aPlace))
+                       {
+                               failInternalError("Could not lookup place.", $sSQL, $aPlace);
+                       }

                        if (!$aPlace['place_id']) return null;
 
                        if ($this->bAddressDetails)
                        if (!$aPlace['place_id']) return null;
 
                        if ($this->bAddressDetails)