Merge remote-tracking branch 'mtmail/mobile-responsive'

[nominatim.git] / lib / PlaceLookup.php

diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php
index 2169983aeb70de272202b041d3ed75d53760348d..c5129fee31006d47a011251a82a08237458703a3 100644 (file)
--- a/lib/PlaceLookup.php
+++ b/lib/PlaceLookup.php
@@ -5,12 +5,16 @@
 
                protected $iPlaceID;
 
 
                protected $iPlaceID;
 

-               protected $bIsTiger = false;
+               protected $sType = false;

 
                protected $aLangPrefOrder = array();
 
                protected $bAddressDetails = false;
 
 
                protected $aLangPrefOrder = array();
 
                protected $bAddressDetails = false;
 

+               protected $bExtraTags = false;
+
+               protected $bNameDetails = false;
+

                function PlaceLookup(&$oDB)
                {
                        $this->oDB =& $oDB;
                function PlaceLookup(&$oDB)
                {
                        $this->oDB =& $oDB;


@@ -26,6 +30,22 @@
                        $this->bAddressDetails = $bAddressDetails;
                }
 
                        $this->bAddressDetails = $bAddressDetails;
                }
 

+               function setIncludeExtraTags($bExtraTags = false)
+               {
+                       if ((float) CONST_Postgresql_Version > 9.2)
+                       {
+                               $this->bExtraTags = $bExtraTags;
+                       }
+               }
+
+               function setIncludeNameDetails($bNameDetails = false)
+               {
+                       if ((float) CONST_Postgresql_Version > 9.2)
+                       {
+                               $this->bNameDetails = $bNameDetails;
+                       }
+               }
+

                function setPlaceID($iPlaceID)
                {
                        $this->iPlaceID = $iPlaceID;
                function setPlaceID($iPlaceID)
                {
                        $this->iPlaceID = $iPlaceID;


@@ -37,9 +57,16 @@
                        $this->iPlaceID = $this->oDB->getOne($sSQL);
                }
 
                        $this->iPlaceID = $this->oDB->getOne($sSQL);
                }
 

-               function setIsTiger($b = false)
+               function lookupPlace($details)

                {
                {

-                       $this->bIsTiger = $b;
+                       if (isset($details['place_id'])) $this->iPlaceID = $details['place_id'];
+                       if (isset($details['type'])) $this->sType = $details['type'];
+                       if (isset($details['osm_type']) && isset($details['osm_id']))
+                       {
+                               $this->setOSMID($details['osm_type'], $details['osm_id']);
+                       }
+
+                       return $this->lookup();

                }
 
                function lookup()
                }
 
                function lookup()


@@ -48,28 +75,33 @@
 
                        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]";
 
 
                        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]";
 

-                       $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,";
-                       $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)
+                       if ($this->sType == 'tiger')

                        {
                                $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 = "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(0,0.75-(30::float/40)) as importance, null as indexed_status, null as indexed_date, null as wikipedia, 'us' as calculated_country_code, ";
+                               $sSQL .= " 'us' as country_code, 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 .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
                                $sSQL .= " null as placename,";
                                $sSQL .= " null as ref,";

+                               if ($this->bExtraTags) $sSQL .= " null as extra,";
+                               if ($this->bNameDetails) $sSQL .= " null as names,";

                                $sSQL .= " st_y(centroid) as lat,";
                                $sSQL .= " st_x(centroid) as lon";
                                $sSQL .= " from location_property_tiger where place_id = ".(int)$this->iPlaceID;
                        }
                                $sSQL .= " st_y(centroid) as lat,";
                                $sSQL .= " st_x(centroid) as lon";
                                $sSQL .= " from location_property_tiger where place_id = ".(int)$this->iPlaceID;
                        }

+                       else
+                       {
+                               $sSQL = "select placex.place_id, partition, osm_type, osm_id, class, type, admin_level, housenumber, street, isin, postcode, country_code, 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,";
+                               if ($this->bExtraTags) $sSQL .= " hstore_to_json(extratags) as extra,";
+                               if ($this->bNameDetails) $sSQL .= " hstore_to_json(name) as names,";
+                               $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);
 
 
                        $aPlace = $this->oDB->getRow($sSQL);
 


@@ -87,6 +119,29 @@
                                $aPlace['aAddress'] = $aAddress;
                        }
 
                                $aPlace['aAddress'] = $aAddress;
                        }
 

+                       if ($this->bExtraTags)
+                       {
+                               if ($aPlace['extra'])
+                               {
+                                       $aPlace['sExtraTags'] = json_decode($aPlace['extra']);
+                               }
+                               else
+                               {
+                                       $aPlace['sExtraTags'] = (object) array();
+                               }
+                       }
+
+                       if ($this->bNameDetails)
+                       {
+                               if ($aPlace['names'])
+                               {
+                                       $aPlace['sNameDetails'] = json_decode($aPlace['names']);
+                               }
+                               else
+                               {
+                                       $aPlace['sNameDetails'] = (object) array();
+                               }
+                       }

 
                        $aClassType = getClassTypes();
                        $sAddressType = '';
 
                        $aClassType = getClassTypes();
                        $sAddressType = '';


@@ -129,7 +184,7 @@
 
                function getAddressNames()
                {
 
                function getAddressNames()
                {

-                       $aAddressLines = $this->getAddressDetails(false);;
+                       $aAddressLines = $this->getAddressDetails(false);

 
                        $aAddress = array();
                        $aFallback = array();
 
                        $aAddress = array();
                        $aFallback = array();