hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-11 13:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove unused functions in Geocode

Browse Source
This commit is contained in:
Sarah Hoffmann
2016-07-26 23:01:42 +02:00
parent d594bb238b
commit 0a95bdc5f5
2 changed files with 16 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/Geocode.php
View File

@@ -63,11 +63,6 @@
$this->aLangPrefOrder = $aLangPref; $this->aLangPrefOrder = $aLangPref;
} }
function setIncludeAddressDetails($bAddressDetails = true)
{
$this->bIncludeAddressDetails = (bool)$bAddressDetails;
}
function getIncludeAddressDetails() function getIncludeAddressDetails()
{ {
return $this->bIncludeAddressDetails; return $this->bIncludeAddressDetails;
@@ -88,21 +83,11 @@
$this->bIncludePolygonAsPoints = $b; $this->bIncludePolygonAsPoints = $b;
} }
function getIncludePolygonAsPoints()
{
return $this->bIncludePolygonAsPoints;
}
function setIncludePolygonAsText($b = true) function setIncludePolygonAsText($b = true)
{ {
$this->bIncludePolygonAsText = $b; $this->bIncludePolygonAsText = $b;
} }
function getIncludePolygonAsText()
{
return $this->bIncludePolygonAsText;
}
function setIncludePolygonAsGeoJSON($b = true) function setIncludePolygonAsGeoJSON($b = true)
{ {
$this->bIncludePolygonAsGeoJSON = $b; $this->bIncludePolygonAsGeoJSON = $b;
@@ -123,11 +108,6 @@
$this->fPolygonSimplificationThreshold = $f; $this->fPolygonSimplificationThreshold = $f;
} }
function setDeDupe($bDeDupe = true)
{
$this->bDeDupe = (bool)$bDeDupe;
}
function setLimit($iLimit = 10) function setLimit($iLimit = 10)
{ {
if ($iLimit > 50) $iLimit = 50; if ($iLimit > 50) $iLimit = 50;
@@ -137,32 +117,11 @@
$this->iLimit = $this->iFinalLimit + min($this->iFinalLimit, 10); $this->iLimit = $this->iFinalLimit + min($this->iFinalLimit, 10);
} }
function setOffset($iOffset = 0)
{
$this->iOffset = $iOffset;
}
function setFallback($bFallback = true)
{
$this->bFallback = (bool)$bFallback;
}
function setExcludedPlaceIDs($a)
{
// TODO: force to int
$this->aExcludePlaceIDs = $a;
}
function getExcludedPlaceIDs() function getExcludedPlaceIDs()
{ {
return $this->aExcludePlaceIDs; return $this->aExcludePlaceIDs;
} }
function setBounded($bBoundedSearch = true)
{
$this->bBoundedSearch = (bool)$bBoundedSearch;
}
function setViewBox($fLeft, $fBottom, $fRight, $fTop) function setViewBox($fLeft, $fBottom, $fRight, $fTop)
{ {
$this->aViewBox = array($fLeft, $fBottom, $fRight, $fTop); $this->aViewBox = array($fLeft, $fBottom, $fRight, $fTop);
@@ -174,11 +133,6 @@
return $this->aViewBox[0].','.$this->aViewBox[3].','.$this->aViewBox[2].','.$this->aViewBox[1]; return $this->aViewBox[0].','.$this->aViewBox[3].','.$this->aViewBox[2].','.$this->aViewBox[1];
} }
function setRoute($aRoutePoints)
{
$this->aRoutePoints = $aRoutePoints;
}
function setFeatureType($sFeatureType) function setFeatureType($sFeatureType)
{ {
switch($sFeatureType) switch($sFeatureType)
@@ -200,8 +154,8 @@
function setRankRange($iMin, $iMax) function setRankRange($iMin, $iMax)
{ {
$this->iMinAddressRank = (int)$iMin; $this->iMinAddressRank = $iMin;
$this->iMaxAddressRank = (int)$iMax; $this->iMaxAddressRank = $iMax;
} }
function setNearPoint($aNearPoint, $fRadiusDeg = 0.1) function setNearPoint($aNearPoint, $fRadiusDeg = 0.1)
@@ -209,11 +163,6 @@
$this->aNearPoint = array((float)$aNearPoint[0], (float)$aNearPoint[1], (float)$fRadiusDeg); $this->aNearPoint = array((float)$aNearPoint[0], (float)$aNearPoint[1], (float)$fRadiusDeg);
} }
function setCountryCodesList($aCountryCodes)
{
$this->aCountryCodes = $aCountryCodes;
}
function setQuery($sQueryString) function setQuery($sQueryString)
{ {
$this->sQuery = $sQueryString; $this->sQuery = $sQueryString;

30
website/search.php
View File

@@ -32,6 +32,7 @@
if ($sOutputFormat == 'html') if ($sOutputFormat == 'html')
{ {
$oGeocode->setIncludePolygonAsText(getParamBool('polygon')); $oGeocode->setIncludePolygonAsText(getParamBool('polygon'));
$bAsText = false;
} }
else else
{ {
@@ -84,22 +85,20 @@
include(CONST_BasePath.'/lib/template/search-batch-json.php'); include(CONST_BasePath.'/lib/template/search-batch-json.php');
exit; exit;
} }
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 else
{ {
if (!getParamString('q') && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/') $oGeocode->setQueryFromParams($_GET);
{
$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); $hLog = logStart($oDB, 'search', $oGeocode->getQueryString(), $aLangPrefOrder);
@@ -113,13 +112,12 @@
} }
logEnd($oDB, $hLog, sizeof($aSearchResults)); logEnd($oDB, $hLog, sizeof($aSearchResults));
$bAsText = $oGeocode->getIncludePolygonAsText();
$sQuery = $oGeocode->getQueryString(); $sQuery = $oGeocode->getQueryString();
$sViewBox = $oGeocode->getViewBoxString(); $sViewBox = $oGeocode->getViewBoxString();
$bShowPolygons = (isset($_GET['polygon']) && $_GET['polygon']); $bShowPolygons = (isset($_GET['polygon']) && $_GET['polygon']);
$aExcludePlaceIDs = $oGeocode->getExcludedPlaceIDs(); $aExcludePlaceIDs = $oGeocode->getExcludedPlaceIDs();
$sMoreURL = CONST_Website_BaseURL.'search.php?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$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 (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) $sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"];
if ($bShowPolygons) $sMoreURL .= '&polygon=1'; if ($bShowPolygons) $sMoreURL .= '&polygon=1';
if ($oGeocode->getIncludeAddressDetails()) $sMoreURL .= '&addressdetails=1'; if ($oGeocode->getIncludeAddressDetails()) $sMoreURL .= '&addressdetails=1';