Merge pull request #1670 from lonvia/permalinks-for-tiger-and-interpolation

[nominatim.git] / website / lookup.php

diff --git a/website/lookup.php b/website/lookup.php
index ae76df2fe4b0cad0c5d746977f4a30009296e58f..39a17ebdb693efd1706ee9f3f758d1b1c050f6db 100644 (file)
--- a/website/lookup.php
+++ b/website/lookup.php
@@ -9,13 +9,14 @@ ini_set('memory_limit', '200M');
 $oParams = new Nominatim\ParameterParser();
 
 // Format for output
 $oParams = new Nominatim\ParameterParser();
 
 // Format for output

-$sOutputFormat = $oParams->getSet('format', array('xml', 'json', 'geojson'), 'xml');
+$sOutputFormat = $oParams->getSet('format', array('xml', 'json', 'jsonv2', 'geojson', 'geocodejson'), 'xml');

 set_exception_handler_by_format($sOutputFormat);
 
 // Preferred language
 $aLangPrefOrder = $oParams->getPreferredLanguages();
 
 set_exception_handler_by_format($sOutputFormat);
 
 // Preferred language
 $aLangPrefOrder = $oParams->getPreferredLanguages();
 

-$oDB =& getDB();
+$oDB = new Nominatim\DB();
+$oDB->connect();

 
 $hLog = logStart($oDB, 'place', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
 
 $hLog = logStart($oDB, 'place', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 


@@ -48,8 +49,22 @@ foreach ($aOsmIds as $sItem) {
             $oResult = $oPlace;
             unset($oResult['aAddress']);
             if (isset($oPlace['aAddress'])) $oResult['address'] = $oPlace['aAddress'];
             $oResult = $oPlace;
             unset($oResult['aAddress']);
             if (isset($oPlace['aAddress'])) $oResult['address'] = $oPlace['aAddress'];

-            unset($oResult['langaddress']);
-            $oResult['name'] = $oPlace['langaddress'];
+            if ($sOutputFormat != 'geocodejson') {
+                unset($oResult['langaddress']);
+                $oResult['name'] = $oPlace['langaddress'];
+            }
+
+            $aOutlineResult = $oPlaceLookup->getOutlines(
+                $oPlace['place_id'],
+                $oPlace['lon'],
+                $oPlace['lat'],
+                Nominatim\ClassTypes\getProperty($oPlace, 'defdiameter', 0.0001)
+            );
+
+            if ($aOutlineResult) {
+                $oResult = array_merge($oResult, $aOutlineResult);
+            }
+

             $aSearchResults[] = $oResult;
         }
     }
             $aSearchResults[] = $oResult;
         }
     }