<?php
@define('CONST_ConnectionBucket_PageType', 'Search');
- require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+ 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/Geocode.php');
ini_set('memory_limit', '200M');
$oDB =& getDB();
- // Display defaults
- $fLat = CONST_Default_Lat;
- $fLon = CONST_Default_Lon;
- $iZoom = CONST_Default_Zoom;
- $sSuggestionURL = false;
-
- $oGeocode =& new Geocode($oDB);
+ $oGeocode = new Geocode($oDB);
$aLangPrefOrder = getPreferredLanguages();
$oGeocode->setLanguagePreference($aLangPrefOrder);
- if (isset($aLangPrefOrder['name:de'])) $oGeocode->setReverseInPlan(true);
- if (isset($aLangPrefOrder['name:ru'])) $oGeocode->setReverseInPlan(true);
- if (isset($aLangPrefOrder['name:ja'])) $oGeocode->setReverseInPlan(true);
- if (isset($aLangPrefOrder['name:pl'])) $oGeocode->setReverseInPlan(true);
-
- function loadParamsToGeocode($oGeocode, $aParams, $bBatch = false)
+ if (CONST_Search_ReversePlanForAll
+ || isset($aLangPrefOrder['name:de'])
+ || isset($aLangPrefOrder['name:ru'])
+ || isset($aLangPrefOrder['name:ja'])
+ || isset($aLangPrefOrder['name:pl']))
{
- if (isset($aParams['addressdetails'])) $oGeocode->setIncludeAddressDetails((bool)$aParams['addressdetails']);
- if (isset($aParams['bounded'])) $oGeocode->setBounded((bool)$aParams['bounded']);
- if (isset($aParams['dedupe'])) $oGeocode->setDedupe((bool)$aParams['dedupe']);
-
- if (isset($aParams['limit'])) $oGeocode->setLimit((int)$aParams['limit']);
- if (isset($aParams['offset'])) $oGeocode->setOffset((int)$aParams['offset']);
-
- // List of excluded Place IDs - used for more acurate pageing
- if (isset($aParams['exclude_place_ids']) && $aParams['exclude_place_ids'])
- {
- foreach(explode(',',$aParams['exclude_place_ids']) as $iExcludedPlaceID)
- {
- $iExcludedPlaceID = (int)$iExcludedPlaceID;
- if ($iExcludedPlaceID) $aExcludePlaceIDs[$iExcludedPlaceID] = $iExcludedPlaceID;
- }
- $oGeocode->setExcludedPlaceIds($aExcludePlaceIDs);
- }
-
- // Only certain ranks of feature
- if (isset($aParams['featureType'])) $oGeocode->setFeatureType($aParams['featureType']);
- if (isset($aParams['featuretype'])) $oGeocode->setFeatureType($aParams['featuretype']);
-
- // Country code list
- if (isset($aParams['countrycodes']))
- {
- $aCountryCodes = array();
- foreach(explode(',',$aParams['countrycodes']) as $sCountryCode)
- {
- if (preg_match('/^[a-zA-Z][a-zA-Z]$/', $sCountryCode))
- {
- $aCountryCodes[] = strtolower($sCountryCode);
- }
- }
- $oGeocode->setCountryCodesList($aCountryCodes);
- }
-
- if (isset($aParams['viewboxlbrt']) && $aParams['viewboxlbrt'])
- {
- $aCoOrdinatesLBRT = explode(',',$aParams['viewboxlbrt']);
- $oGeocode->setViewBox($aCoOrdinatesLBRT[0], $aCoOrdinatesLBRT[1], $aCoOrdinatesLBRT[2], $aCoOrdinatesLBRT[3]);
- }
- else if (isset($aParams['viewbox']) && $aParams['viewbox'])
- {
- $aCoOrdinatesLTRB = explode(',',$aParams['viewbox']);
- $oGeocode->setViewBox($aCoOrdinatesLTRB[0], $aCoOrdinatesLTRB[3], $aCoOrdinatesLTRB[2], $aCoOrdinatesLTRB[1]);
- }
-
- if (isset($aParams['route']) && $aParams['route'] && isset($aParams['routewidth']) && $aParams['routewidth'])
- {
- $aPoints = explode(',',$aParams['route']);
- if (sizeof($aPoints) % 2 != 0)
- {
- userError("Uneven number of points");
- exit;
- }
- $fPrevCoord = false;
- $aRoute = array();
- foreach($aPoints as $i => $fPoint)
- {
- if ($i%2)
- {
- $aRoute[] = array((float)$fPoint, $fPrevCoord);
- }
- else
- {
- $fPrevCoord = (float)$fPoint;
- }
- }
- $oGeocode->setRoute($aRoute);
- }
-
- // Search query
- $sQuery = (isset($aParams['q'])?trim($aParams['q']):'');
- if (!$sQuery && !$bBatch && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
- {
- $sQuery = substr($_SERVER['PATH_INFO'], 1);
-
- // reverse order of '/' separated string
- $aPhrases = explode('/', $sQuery);
- $aPhrases = array_reverse($aPhrases);
- $sQuery = join(', ',$aPhrases);
- }
- if (!$sQuery)
- {
- $oGeocode->setStructuredQuery(@$aParams['amenity'], @$aParams['street'], @$aParams['city'], @$aParams['county'], @$aParams['state'], @$aParams['country'], @$aParams['postalcode']);
- $oGeocode->setReverseInPlan(false);
- }
- else
- {
- $oGeocode->setQuery($sQuery);
- }
-
+ $oGeocode->setReverseInPlan(true);
}
// Format for output
- $sOutputFormat = 'html';
- if (isset($_GET['format']) && ($_GET['format'] == 'html' || $_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2'))
- {
- $sOutputFormat = $_GET['format'];
- }
+ $sOutputFormat = getParamSet('format', array('html', 'xml', 'json', 'jsonv2'), 'html');
// Show / use polygons
if ($sOutputFormat == 'html')
{
- if (isset($_GET['polygon'])) $oGeocode->setIncludePolygonAsText((bool)$_GET['polygon']);
+ $oGeocode->setIncludePolygonAsText(getParamBool('polygon'));
}
else
{
- $bAsPoints = (boolean)isset($_GET['polygon']) && $_GET['polygon'];
- $bAsGeoJSON = (boolean)isset($_GET['polygon_geojson']) && $_GET['polygon_geojson'];
- $bAsKML = (boolean)isset($_GET['polygon_kml']) && $_GET['polygon_kml'];
- $bAsSVG = (boolean)isset($_GET['polygon_svg']) && $_GET['polygon_svg'];
- $bAsText = (boolean)isset($_GET['polygon_text']) && $_GET['polygon_text'];
+ $bAsPoints = getParamBool('polygon');
+ $bAsGeoJSON = getParamBool('polygon_geojson');
+ $bAsKML = getParamBool('polygon_kml');
+ $bAsSVG = getParamBool('polygon_svg');
+ $bAsText = getParamBool('polygon_text');
if ( ( ($bAsGeoJSON?1:0)
- + ($bAsKML?1:0)
- + ($bAsSVG?1:0)
- + ($bAsText?1:0)
- + ($bAsPoints?1:0)
- ) > CONST_PolygonOutput_MaximumTypes)
+ + ($bAsKML?1:0)
+ + ($bAsSVG?1:0)
+ + ($bAsText?1:0)
+ + ($bAsPoints?1:0)
+ ) > CONST_PolygonOutput_MaximumTypes)
{
if (CONST_PolygonOutput_MaximumTypes)
{
$oGeocode->setIncludePolygonAsSVG($bAsSVG);
}
- loadParamsToGeocode($oGeocode, $_GET, false);
+ // Polygon simplification threshold (optional)
+ $oGeocode->setPolygonSimplificationThreshold(getParamFloat('polygon_threshold', 0.0));
+
+ $oGeocode->loadParamArray($_GET);
if (CONST_Search_BatchMode && isset($_GET['batch']))
{
foreach($aBatch as $aBatchParams)
{
$oBatchGeocode = clone $oGeocode;
- loadParamsToGeocode($oBatchGeocode, $aBatchParams, true);
+ $oBatchGeocode->loadParamArray($aBatchParams);
+ $oBatchGeocode->setQueryFromParams($aBatchParams);
$aSearchResults = $oBatchGeocode->lookup();
$aBatchResults[] = $aSearchResults;
}
include(CONST_BasePath.'/lib/template/search-batch-json.php');
exit;
}
+ else
+ {
+ if (!getParamString('q') && isset($_SERVER['PATH_INFO']) && $_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);
+ $oGeocode->setQuery($sQuery);
+ }
+ else
+ {
+ $oGeocode->setQueryFromParams($_GET);
+ }
+ }
$hLog = logStart($oDB, 'search', $oGeocode->getQueryString(), $aLangPrefOrder);
$aSearchResults = $oGeocode->lookup();
if ($aSearchResults === false) $aSearchResults = array();
- $sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
-
+ if ($sOutputFormat=='html')
+ {
+ $sDataDate = $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));
$bAsText = $oGeocode->getIncludePolygonAsText();
$bShowPolygons = (isset($_GET['polygon']) && $_GET['polygon']);
$aExcludePlaceIDs = $oGeocode->getExcludedPlaceIDs();
- $sMoreURL = CONST_Website_BaseURL.'search?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$oGeocode->getExcludedPlaceIDs());
+ $sMoreURL = CONST_Website_BaseURL.'search.php?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$oGeocode->getExcludedPlaceIDs());
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);
projects / nominatim.git / blobdiff