safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

add namespaces, method visibility according to PSR2 standard

Browse Source
This commit is contained in:
Marc Tobias Metten
2016-09-16 02:27:36 +02:00
parent e1be3d9f48
commit 6238ae6032
12 changed files with 86 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/query.php
View File

@@ -28,12 +28,12 @@ $aCMDOptions
getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
$oDB =& getDB();
$oParams = new ParameterParser($aCMDResult);
$oParams = new Nominatim\ParameterParser($aCMDResult);
if ($oParams->getBool('search')) {
if (isset($aCMDResult['nodedupe'])) $aCMDResult['dedupe'] = 'false';
$oGeocode = new Geocode($oDB);
$oGeocode = new Nominatim\Geocode($oDB);
$oGeocode->setLanguagePreference($oParams->getPreferredLanguages(false));
$oGeocode->loadParamArray($oParams);

6
utils/warm.php
View File

@@ -25,9 +25,9 @@ $oDB =& getDB();
$bVerbose = $aResult['verbose'];
if (!$aResult['search-only']) {
$oReverseGeocode = new ReverseGeocode($oDB);
$oReverseGeocode = new Nominatim\ReverseGeocode($oDB);
$oReverseGeocode->setZoom(20);
$oPlaceLookup = new PlaceLookup($oDB);
$oPlaceLookup = new Nominatim\PlaceLookup($oDB);
$oPlaceLookup->setIncludeAddressDetails(true);
$oPlaceLookup->setLanguagePreference(array('en'));
@@ -53,7 +53,7 @@ if (!$aResult['search-only']) {
}
if (!$aResult['reverse-only']) {
$oGeocode =& new Geocode($oDB);
$oGeocode =& new Nominatim\Geocode($oDB);
echo "Warm search: ";
if ($bVerbose) echo "\n";