Skip to content

Commit

Permalink
Merge pull request #532 from mtmail/PSR2-namespaces
Browse files Browse the repository at this point in the history 
add namespaces, method visibility according to PSR2 standard
  • Loading branch information
@lonvia
lonvia committed Sep 16, 2016
2 parents d437a14 + 6238ae6 commit bf77b44
Show file tree
Hide file tree
Showing 12 changed files with 86 additions and 77 deletions.
65 changes: 34 additions & 31 deletions lib/Geocode.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

namespace Nominatim;

require_once(CONST_BasePath.'/lib/PlaceLookup.php');
require_once(CONST_BasePath.'/lib/ReverseGeocode.php');

Expand Down Expand Up @@ -49,67 +52,67 @@ class Geocode
protected $aStructuredQuery = false;


function Geocode(&$oDB)
public function __construct(&$oDB)
{
$this->oDB =& $oDB;
}

function setReverseInPlan($bReverse)
public function setReverseInPlan($bReverse)
{
$this->bReverseInPlan = $bReverse;
}

function setLanguagePreference($aLangPref)
public function setLanguagePreference($aLangPref)
{
$this->aLangPrefOrder = $aLangPref;
}

function getIncludeAddressDetails()
public function getIncludeAddressDetails()
{
return $this->bIncludeAddressDetails;
}

function getIncludeExtraTags()
public function getIncludeExtraTags()
{
return $this->bIncludeExtraTags;
}

function getIncludeNameDetails()
public function getIncludeNameDetails()
{
return $this->bIncludeNameDetails;
}

function setIncludePolygonAsPoints($b = true)
public function setIncludePolygonAsPoints($b = true)
{
$this->bIncludePolygonAsPoints = $b;
}

function setIncludePolygonAsText($b = true)
public function setIncludePolygonAsText($b = true)
{
$this->bIncludePolygonAsText = $b;
}

function setIncludePolygonAsGeoJSON($b = true)
public function setIncludePolygonAsGeoJSON($b = true)
{
$this->bIncludePolygonAsGeoJSON = $b;
}

function setIncludePolygonAsKML($b = true)
public function setIncludePolygonAsKML($b = true)
{
$this->bIncludePolygonAsKML = $b;
}

function setIncludePolygonAsSVG($b = true)
public function setIncludePolygonAsSVG($b = true)
{
$this->bIncludePolygonAsSVG = $b;
}

function setPolygonSimplificationThreshold($f)
public function setPolygonSimplificationThreshold($f)
{
$this->fPolygonSimplificationThreshold = $f;
}

function setLimit($iLimit = 10)
public function setLimit($iLimit = 10)
{
if ($iLimit > 50) $iLimit = 50;
if ($iLimit < 1) $iLimit = 1;
Expand All @@ -118,18 +121,18 @@ function setLimit($iLimit = 10)
$this->iLimit = $iLimit + min($iLimit, 10);
}

function getExcludedPlaceIDs()
public function getExcludedPlaceIDs()
{
return $this->aExcludePlaceIDs;
}

function getViewBoxString()
public function getViewBoxString()
{
if (!$this->aViewBox) return null;
return $this->aViewBox[0].','.$this->aViewBox[3].','.$this->aViewBox[2].','.$this->aViewBox[1];
}

function setFeatureType($sFeatureType)
public function setFeatureType($sFeatureType)
{
switch ($sFeatureType) {
case 'country':
Expand All @@ -147,13 +150,13 @@ function setFeatureType($sFeatureType)
}
}

function setRankRange($iMin, $iMax)
public function setRankRange($iMin, $iMax)
{
$this->iMinAddressRank = $iMin;
$this->iMaxAddressRank = $iMax;
}

function setRoute($aRoutePoints, $fRouteWidth)
public function setRoute($aRoutePoints, $fRouteWidth)
{
$this->aViewBox = false;

Expand All @@ -173,7 +176,7 @@ function setRoute($aRoutePoints, $fRouteWidth)
$this->sViewboxLargeSQL .= ','.($fRouteWidth/30).')';
}

function setViewbox($aViewbox)
public function setViewbox($aViewbox)
{
$this->aViewBox = array_map('floatval', $aViewbox);

Expand All @@ -189,24 +192,24 @@ function setViewbox($aViewbox)
$this->sViewboxLargeSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".$aBigViewBox[0].",".$aBigViewBox[1]."),ST_Point(".$aBigViewBox[2].",".$aBigViewBox[3].")),4326)";
}

function setNearPoint($aNearPoint, $fRadiusDeg = 0.1)
public function setNearPoint($aNearPoint, $fRadiusDeg = 0.1)
{
$this->aNearPoint = array((float)$aNearPoint[0], (float)$aNearPoint[1], (float)$fRadiusDeg);
}

function setQuery($sQueryString)
public function setQuery($sQueryString)
{
$this->sQuery = $sQueryString;
$this->aStructuredQuery = false;
}

function getQueryString()
public function getQueryString()
{
return $this->sQuery;
}


function loadParamArray($oParams)
public function loadParamArray($oParams)
{
$this->bIncludeAddressDetails
= $oParams->getBool('addressdetails', $this->bIncludeAddressDetails);
Expand Down Expand Up @@ -275,7 +278,7 @@ function loadParamArray($oParams)
}
}

function setQueryFromParams($oParams)
public function setQueryFromParams($oParams)
{
// Search query
$sQuery = $oParams->getString('q');
Expand All @@ -295,7 +298,7 @@ function setQueryFromParams($oParams)
}
}

function loadStructuredAddressElement($sValue, $sKey, $iNewMinAddressRank, $iNewMaxAddressRank, $aItemListValues)
public function loadStructuredAddressElement($sValue, $sKey, $iNewMinAddressRank, $iNewMaxAddressRank, $aItemListValues)
{
$sValue = trim($sValue);
if (!$sValue) return false;
Expand All @@ -308,7 +311,7 @@ function loadStructuredAddressElement($sValue, $sKey, $iNewMinAddressRank, $iNew
return true;
}

function setStructuredQuery($sAmentiy = false, $sStreet = false, $sCity = false, $sCounty = false, $sState = false, $sCountry = false, $sPostalCode = false)
public function setStructuredQuery($sAmentiy = false, $sStreet = false, $sCity = false, $sCounty = false, $sState = false, $sCountry = false, $sPostalCode = false)
{
$this->sQuery = false;

Expand Down Expand Up @@ -336,7 +339,7 @@ function setStructuredQuery($sAmentiy = false, $sStreet = false, $sCity = false,
}
}

function fallbackStructuredQuery()
public function fallbackStructuredQuery()
{
if (!$this->aStructuredQuery) return false;

Expand All @@ -357,7 +360,7 @@ function fallbackStructuredQuery()
return false;
}

function getDetails($aPlaceIDs)
public function getDetails($aPlaceIDs)
{
//$aPlaceIDs is an array with key: placeID and value: tiger-housenumber, if found, else -1
if (sizeof($aPlaceIDs) == 0) return array();
Expand Down Expand Up @@ -488,7 +491,7 @@ function getDetails($aPlaceIDs)
return $aSearchResults;
}

function getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases)
public function getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases)
{
/*
Calculate all searches using aValidTokens i.e.
Expand Down Expand Up @@ -742,7 +745,7 @@ class: general object class (corresponds to tag key of primary OSM tag)
*/


function lookup()
public function lookup()
{
if (!$this->sQuery && !$this->aStructuredQuery) return false;

Expand Down Expand Up @@ -1464,7 +1467,7 @@ function lookup()
}
} else {
// Just interpret as a reverse geocode
$oReverse = new ReverseGeocode($this->oDB);
$oReverse = new Nominatim\ReverseGeocode($this->oDB);
$oReverse->setZoom(18);

$aLookup = $oReverse->lookup(
Expand Down
18 changes: 10 additions & 8 deletions lib/ParameterParser.php
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
<?php

namespace Nominatim;

class ParameterParser
{
private $aParams;


function __construct($aParams = null)
public function __construct($aParams = null)
{
$this->aParams = ($aParams === null) ? $_GET : $aParams;
}

function getBool($sName, $bDefault = false)
public function getBool($sName, $bDefault = false)
{
if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
return $bDefault;
Expand All @@ -19,7 +21,7 @@ function getBool($sName, $bDefault = false)
return (bool) $this->aParams[$sName];
}

function getInt($sName, $bDefault = false)
public function getInt($sName, $bDefault = false)
{
if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
return $bDefault;
Expand All @@ -32,7 +34,7 @@ function getInt($sName, $bDefault = false)
return (int) $this->aParams[$sName];
}

function getFloat($sName, $bDefault = false)
public function getFloat($sName, $bDefault = false)
{
if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
return $bDefault;
Expand All @@ -45,7 +47,7 @@ function getFloat($sName, $bDefault = false)
return (float) $this->aParams[$sName];
}

function getString($sName, $bDefault = false)
public function getString($sName, $bDefault = false)
{
if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
return $bDefault;
Expand All @@ -54,7 +56,7 @@ function getString($sName, $bDefault = false)
return $this->aParams[$sName];
}

function getSet($sName, $aValues, $sDefault = false)
public function getSet($sName, $aValues, $sDefault = false)
{
if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
return $sDefault;
Expand All @@ -67,7 +69,7 @@ function getSet($sName, $aValues, $sDefault = false)
return $this->aParams[$sName];
}

function getStringList($sName, $aDefault = false)
public function getStringList($sName, $aDefault = false)
{
$sValue = $this->getString($sName);

Expand All @@ -78,7 +80,7 @@ function getStringList($sName, $aDefault = false)
return $aDefault;
}

function getPreferredLanguages($sFallback = null)
public function getPreferredLanguages($sFallback = null)
{
if ($sFallback === null && isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
$sFallback = $_SERVER["HTTP_ACCEPT_LANGUAGE"];
Expand Down
Loading

0 comments on commit bf77b44

Please sign in to comment.