Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / lookup.php

diff --git a/website/lookup.php b/website/lookup.php
index 39a17ebdb693efd1706ee9f3f758d1b1c050f6db..737edc62985d6c795a755f40c0b7b6501efd7306 100644 (file)
--- a/website/lookup.php
+++ b/website/lookup.php
@@ -1,9 +1,9 @@
 <?php
 
 <?php
 

-require_once(CONST_BasePath.'/lib/init-website.php');
-require_once(CONST_BasePath.'/lib/log.php');
-require_once(CONST_BasePath.'/lib/PlaceLookup.php');
-require_once(CONST_BasePath.'/lib/output.php');
+require_once(CONST_LibDir.'/init-website.php');
+require_once(CONST_LibDir.'/log.php');
+require_once(CONST_LibDir.'/PlaceLookup.php');
+require_once(CONST_LibDir.'/output.php');

 ini_set('memory_limit', '200M');
 
 $oParams = new Nominatim\ParameterParser();
 ini_set('memory_limit', '200M');
 
 $oParams = new Nominatim\ParameterParser();


@@ -15,7 +15,7 @@ set_exception_handler_by_format($sOutputFormat);
 // Preferred language
 $aLangPrefOrder = $oParams->getPreferredLanguages();
 
 // Preferred language
 $aLangPrefOrder = $oParams->getPreferredLanguages();
 

-$oDB = new Nominatim\DB();
+$oDB = new Nominatim\DB(CONST_Database_DSN);

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


@@ -58,7 +58,7 @@ foreach ($aOsmIds as $sItem) {
                 $oPlace['place_id'],
                 $oPlace['lon'],
                 $oPlace['lat'],
                 $oPlace['place_id'],
                 $oPlace['lon'],
                 $oPlace['lat'],

-                Nominatim\ClassTypes\getProperty($oPlace, 'defdiameter', 0.0001)
+                Nominatim\ClassTypes\getDefRadius($oPlace)

             );
 
             if ($aOutlineResult) {
             );
 
             if ($aOutlineResult) {


@@ -81,5 +81,7 @@ $bShowPolygons = '';
 $aExcludePlaceIDs = array();
 $sMoreURL = '';
 
 $aExcludePlaceIDs = array();
 $sMoreURL = '';
 

+logEnd($oDB, $hLog, 1);
+

 $sOutputTemplate = ($sOutputFormat == 'jsonv2') ? 'json' : $sOutputFormat;
 $sOutputTemplate = ($sOutputFormat == 'jsonv2') ? 'json' : $sOutputFormat;

-include(CONST_BasePath.'/lib/template/search-'.$sOutputTemplate.'.php');
+include(CONST_LibDir.'/template/search-'.$sOutputTemplate.'.php');