<?php
-@define('CONST_ConnectionBucket_PageType', 'Search');
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
-require_once(CONST_BasePath.'/lib/init-website.php');
-require_once(CONST_BasePath.'/lib/log.php');
-require_once(CONST_BasePath.'/lib/Geocode.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.'/Geocode.php');
+require_once(CONST_LibDir.'/output.php');
ini_set('memory_limit', '200M');
-$oDB =& getDB();
-$oParams = new ParameterParser();
+$oDB = new Nominatim\DB(CONST_Database_DSN);
+$oDB->connect();
+$oParams = new Nominatim\ParameterParser();
-$oGeocode = new Geocode($oDB);
+$oGeocode = new Nominatim\Geocode($oDB);
$aLangPrefOrder = $oParams->getPreferredLanguages();
$oGeocode->setLanguagePreference($aLangPrefOrder);
-if (CONST_Search_ReversePlanForAll
- || isset($aLangPrefOrder['name:de'])
- || isset($aLangPrefOrder['name:ru'])
- || isset($aLangPrefOrder['name:ja'])
- || isset($aLangPrefOrder['name:pl'])
-) {
- $oGeocode->setReverseInPlan(true);
-}
-
// Format for output
-$sOutputFormat = $oParams->getSet('format', array('html', 'xml', 'json', 'jsonv2'), 'html');
-
-// Show / use polygons
-if ($sOutputFormat == 'html') {
- $oGeocode->setIncludePolygonAsText($oParams->getBool('polygon'));
- $bAsText = false;
-} else {
- $bAsPoints = $oParams->getBool('polygon');
- $bAsGeoJSON = $oParams->getBool('polygon_geojson');
- $bAsKML = $oParams->getBool('polygon_kml');
- $bAsSVG = $oParams->getBool('polygon_svg');
- $bAsText = $oParams->getBool('polygon_text');
- if (( ($bAsGeoJSON?1:0)
- + ($bAsKML?1:0)
- + ($bAsSVG?1:0)
- + ($bAsText?1:0)
- + ($bAsPoints?1:0)
- ) > CONST_PolygonOutput_MaximumTypes
- ) {
- if (CONST_PolygonOutput_MaximumTypes) {
- userError("Select only ".CONST_PolygonOutput_MaximumTypes." polgyon output option");
- } else {
- userError("Polygon output is disabled");
- }
- exit;
- }
- $oGeocode->setIncludePolygonAsPoints($bAsPoints);
- $oGeocode->setIncludePolygonAsText($bAsText);
- $oGeocode->setIncludePolygonAsGeoJSON($bAsGeoJSON);
- $oGeocode->setIncludePolygonAsKML($bAsKML);
- $oGeocode->setIncludePolygonAsSVG($bAsSVG);
-}
-
-// Polygon simplification threshold (optional)
-$oGeocode->setPolygonSimplificationThreshold($oParams->getFloat('polygon_threshold', 0.0));
+$sOutputFormat = $oParams->getSet('format', array('xml', 'json', 'jsonv2', 'geojson', 'geocodejson'), 'jsonv2');
+set_exception_handler_by_format($sOutputFormat);
-$oGeocode->loadParamArray($oParams);
+$oGeocode->loadParamArray($oParams, null);
if (CONST_Search_BatchMode && isset($_GET['batch'])) {
$aBatch = json_decode($_GET['batch'], true);
$aBatchResults = array();
foreach ($aBatch as $aBatchParams) {
$oBatchGeocode = clone $oGeocode;
- $oBatchParams = new ParameterParser($aBatchParams);
+ $oBatchParams = new Nominatim\ParameterParser($aBatchParams);
$oBatchGeocode->loadParamArray($oBatchParams);
$oBatchGeocode->setQueryFromParams($oBatchParams);
$aSearchResults = $oBatchGeocode->lookup();
$aBatchResults[] = $aSearchResults;
}
- include(CONST_BasePath.'/lib/template/search-batch-json.php');
+ include(CONST_LibDir.'/template/search-batch-json.php');
exit;
}
$oGeocode->setQueryFromParams($oParams);
if (!$oGeocode->getQueryString()
- && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/') {
+ && isset($_SERVER['PATH_INFO'])
+ && strlen($_SERVER['PATH_INFO']) > 0
+ && $_SERVER['PATH_INFO'][0] == '/'
+) {
$sQuery = substr(rawurldecode($_SERVER['PATH_INFO']), 1);
// reverse order of '/' separated string
$aPhrases = explode('/', $sQuery);
$aPhrases = array_reverse($aPhrases);
- $sQuery = join(', ',$aPhrases);
+ $sQuery = join(', ', $aPhrases);
$oGeocode->setQuery($sQuery);
}
$hLog = logStart($oDB, 'search', $oGeocode->getQueryString(), $aLangPrefOrder);
$aSearchResults = $oGeocode->lookup();
-if ($aSearchResults === false) $aSearchResults = array();
-if ($sOutputFormat=='html') {
- $sDataDate = chksql($oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1"));
-}
-logEnd($oDB, $hLog, sizeof($aSearchResults));
+logEnd($oDB, $hLog, count($aSearchResults));
$sQuery = $oGeocode->getQueryString();
-$sViewBox = $oGeocode->getViewBoxString();
-$bShowPolygons = (isset($_GET['polygon']) && $_GET['polygon']);
-$aExcludePlaceIDs = $oGeocode->getExcludedPlaceIDs();
-
-$sMoreURL = CONST_Website_BaseURL.'search.php?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$aExcludePlaceIDs);
-if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) $sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"];
-if ($bShowPolygons) $sMoreURL .= '&polygon=1';
-if ($oGeocode->getIncludeAddressDetails()) $sMoreURL .= '&addressdetails=1';
-if ($oGeocode->getIncludeExtraTags()) $sMoreURL .= '&extratags=1';
-if ($oGeocode->getIncludeNameDetails()) $sMoreURL .= '&namedetails=1';
-if ($sViewBox) $sMoreURL .= '&viewbox='.urlencode($sViewBox);
-if (isset($_GET['nearlat']) && isset($_GET['nearlon'])) $sMoreURL .= '&nearlat='.(float)$_GET['nearlat'].'&nearlon='.(float)$_GET['nearlon'];
-$sMoreURL .= '&q='.urlencode($sQuery);
+
+$aMoreParams = $oGeocode->getMoreUrlParams();
+$aMoreParams['format'] = $sOutputFormat;
+if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+ $aMoreParams['accept-language'] = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+}
+
+if (isset($_SERVER['REQUEST_SCHEME'])
+ && isset($_SERVER['SERVER_NAME'])
+ && isset($_SERVER['DOCUMENT_URI'])
+) {
+ $sMoreURL = $_SERVER['REQUEST_SCHEME'].'://'
+ .$_SERVER['SERVER_NAME'].$_SERVER['DOCUMENT_URI'].'/?'
+ .http_build_query($aMoreParams);
+} else {
+ $sMoreURL = '/search.php'.http_build_query($aMoreParams);
+}
if (CONST_Debug) exit;
-include(CONST_BasePath.'/lib/template/search-'.$sOutputFormat.'.php');
+$sOutputTemplate = ($sOutputFormat == 'jsonv2') ? 'json' : $sOutputFormat;
+include(CONST_LibDir.'/template/search-'.$sOutputTemplate.'.php');
projects / nominatim.git / blobdiff