Merge branch 'place-in-addressdetails' of https://github.com/lonvia/Nominatim

[nominatim.git] / lib / PlaceLookup.php

diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php
index 3f1bdda8d8c5a670cc1e8a6b88acf360b9aaab0c..e00163378a3d48a8555864f4a8f1d75f1fec3b22 100644 (file)
--- a/lib/PlaceLookup.php
+++ b/lib/PlaceLookup.php
@@ -41,7 +41,8 @@
 
                        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]";
 
-                       $sSQL = "select placex.*,";
+                       $sSQL = "select placex.place_id, partition, osm_type, osm_id, class, type, admin_level, housenumber, street, isin, postcode, country_code, extratags, parent_place_id, linked_place_id, rank_address, rank_search, ";
+                       $sSQL .= " coalesce(importance,0.75-(rank_search::float/40)) as importance, indexed_status, indexed_date, wikipedia, calculated_country_code, ";
                        $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,";
@@ -53,7 +54,7 @@
 
                        if ($this->bAddressDetails)
                        {
-                               $aAddress = getAddressDetails($this->oDB, $sLanguagePrefArraySQL, $this->iPlaceID, $aPlace['calculated_country_code']);
+                               $aAddress = $this->getAddressNames();
                                $aPlace['aAddress'] = $aAddress;
                        }
 
@@ -76,5 +77,62 @@
 
                        return $aPlace;
                }
+
+               function getAddressDetails($bAll = false)
+               {
+                       if (!$this->iPlaceID) return null;
+
+                       $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]";
+
+                       $sSQL = "select *,get_name_by_language(name,$sLanguagePrefArraySQL) as localname from get_addressdata(".$this->iPlaceID.")";
+                       if (!$bAll) $sSQL .= " WHERE isaddress OR type = 'country_code'";
+                       $sSQL .= " order by rank_address desc,isaddress desc";
+
+                       $aAddressLines = $this->oDB->getAll($sSQL);
+                       if (PEAR::IsError($aAddressLines))
+                       {
+                               var_dump($aAddressLines);
+                               exit;
+                       }
+                       return $aAddressLines;
+               }
+
+               function getAddressNames()
+               {
+                       $aAddressLines = $this->getAddressDetails(false);;
+
+                       $aAddress = array();
+                       $aFallback = array();
+                       $aClassType = getClassTypes();
+                       foreach($aAddressLines as $aLine)
+                       {
+                               $bFallback = false;
+                               $aTypeLabel = false;
+                               if (isset($aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']])) $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']];
+                               elseif (isset($aClassType[$aLine['class'].':'.$aLine['type']])) $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type']];
+                               elseif (isset($aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))]))
+                               {
+                                       $aTypeLabel = $aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))];
+                                       $bFallback = true;
+                               }
+                               else
+                               {
+                                       $aTypeLabel = array('simplelabel'=>'address'.$aLine['rank_address']);
+                                       $bFallback = true;
+                               }
+                               if ($aTypeLabel && ((isset($aLine['localname']) && $aLine['localname']) || (isset($aLine['housenumber']) && $aLine['housenumber'])))
+                               {
+                                       $sTypeLabel = strtolower(isset($aTypeLabel['simplelabel'])?$aTypeLabel['simplelabel']:$aTypeLabel['label']);
+                                       $sTypeLabel = str_replace(' ','_',$sTypeLabel);
+                                       if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]) || $aLine['class'] == 'place')
+                                       {
+                                               $aAddress[$sTypeLabel] = $aLine['localname']?$aLine['localname']:$aLine['housenumber'];
+                                       }
+                                       $aFallback[$sTypeLabel] = $bFallback;
+                               }
+                       }
+                       return $aAddress;
+               }
+
        }
 ?>