bring back area bboxes for nodes

[nominatim.git] / lib / PlaceLookup.php

diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php
index ed2f494d45c41bbc66b3c2dc66a5012f158360c1..84c68a99d8f503e89cf772524fa58553c38c405a 100644 (file)
--- a/lib/PlaceLookup.php
+++ b/lib/PlaceLookup.php
@@ -5,6 +5,8 @@
 
                protected $iPlaceID;
 
+               protected $bIsTiger = false;
+
                protected $aLangPrefOrder = array();
 
                protected $bAddressDetails = false;
@@ -35,6 +37,11 @@
                        $this->iPlaceID = $this->oDB->getOne($sSQL);
                }
 
+               function setIsTiger($b = false)
+               {
+                       $this->bIsTiger = $b;
+               }
+
                function lookup()
                {
                        if (!$this->iPlaceID) return null;
@@ -46,10 +53,32 @@
                        $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;
+
+
+                       if ($this->bIsTiger)
+                       {
+                               $sSQL = "select place_id,partition, 'T' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, housenumber, null as street, null as isin, postcode,";
+                               $sSQL .= " 'us' as country_code, null as extratags, parent_place_id, null as linked_place_id, 30 as rank_address, 30 as rank_search,";
+                               $sSQL .= " coalesce(null,0.75-(30::float/40)) as importance, null as indexed_status, null as indexed_date, null as wikipedia, 'us' as calculated_country_code, ";
+                               $sSQL .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
+                               $sSQL .= " null as placename,";
+                               $sSQL .= " null as ref,";
+                               $sSQL .= " st_y(centroid) as lat,";
+                               $sSQL .= " st_x(centroid) as lon";
+                               $sSQL .= " from location_property_tiger 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)
@@ -58,6 +87,7 @@
                                $aPlace['aAddress'] = $aAddress;
                        }
 
+
                        $aClassType = getClassTypes();
                        $sAddressType = '';
                        $sClassType = $aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level'];
@@ -124,7 +154,7 @@
                                {
                                        $sTypeLabel = strtolower(isset($aTypeLabel['simplelabel'])?$aTypeLabel['simplelabel']:$aTypeLabel['label']);
                                        $sTypeLabel = str_replace(' ','_',$sTypeLabel);
-                                       if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]))
+                                       if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]) || $aLine['class'] == 'place')
                                        {
                                                $aAddress[$sTypeLabel] = $aLine['localname']?$aLine['localname']:$aLine['housenumber'];
                                        }