mirror of
https://github.com/osm-search/Nominatim.git
synced 2026-03-13 06:14:07 +00:00
fix more missing braces on one-liners
This commit is contained in:
@@ -40,7 +40,9 @@ $oDB->connect();
|
|||||||
$fPostgresVersion = $oDB->getPostgresVersion();
|
$fPostgresVersion = $oDB->getPostgresVersion();
|
||||||
|
|
||||||
$aDSNInfo = Nominatim\DB::parseDSN(getSetting('DATABASE_DSN'));
|
$aDSNInfo = Nominatim\DB::parseDSN(getSetting('DATABASE_DSN'));
|
||||||
if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
|
if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) {
|
||||||
|
$aDSNInfo['port'] = 5432;
|
||||||
|
}
|
||||||
|
|
||||||
// cache memory to be used by osm2pgsql, should not be more than the available memory
|
// cache memory to be used by osm2pgsql, should not be more than the available memory
|
||||||
$iCacheMemory = (isset($aResult['osm2pgsql-cache'])?$aResult['osm2pgsql-cache']:2000);
|
$iCacheMemory = (isset($aResult['osm2pgsql-cache'])?$aResult['osm2pgsql-cache']:2000);
|
||||||
|
|||||||
@@ -62,11 +62,15 @@ if (!$aResult['search-only']) {
|
|||||||
$oPlaceLookup->setLanguagePreference(array('en'));
|
$oPlaceLookup->setLanguagePreference(array('en'));
|
||||||
|
|
||||||
echo 'Warm reverse: ';
|
echo 'Warm reverse: ';
|
||||||
if ($bVerbose) echo "\n";
|
if ($bVerbose) {
|
||||||
|
echo "\n";
|
||||||
|
}
|
||||||
for ($i = 0; $i < 1000; $i++) {
|
for ($i = 0; $i < 1000; $i++) {
|
||||||
$fLat = rand(-9000, 9000) / 100;
|
$fLat = rand(-9000, 9000) / 100;
|
||||||
$fLon = rand(-18000, 18000) / 100;
|
$fLon = rand(-18000, 18000) / 100;
|
||||||
if ($bVerbose) echo "$fLat, $fLon = ";
|
if ($bVerbose) {
|
||||||
|
echo "$fLat, $fLon = ";
|
||||||
|
}
|
||||||
|
|
||||||
$oLookup = $oReverseGeocode->lookup($fLat, $fLon);
|
$oLookup = $oReverseGeocode->lookup($fLat, $fLon);
|
||||||
$aSearchResults = $oLookup ? $oPlaceLookup->lookup(array($oLookup->iId => $oLookup)) : null;
|
$aSearchResults = $oLookup ? $oPlaceLookup->lookup(array($oLookup->iId => $oLookup)) : null;
|
||||||
@@ -79,10 +83,14 @@ if (!$aResult['reverse-only']) {
|
|||||||
$oGeocode = new Nominatim\Geocode($oDB);
|
$oGeocode = new Nominatim\Geocode($oDB);
|
||||||
|
|
||||||
echo 'Warm search: ';
|
echo 'Warm search: ';
|
||||||
if ($bVerbose) echo "\n";
|
if ($bVerbose) {
|
||||||
|
echo "\n";
|
||||||
|
}
|
||||||
$sSQL = 'SELECT word FROM word WHERE word is not null ORDER BY search_name_count DESC LIMIT 1000';
|
$sSQL = 'SELECT word FROM word WHERE word is not null ORDER BY search_name_count DESC LIMIT 1000';
|
||||||
foreach ($oDB->getCol($sSQL) as $sWord) {
|
foreach ($oDB->getCol($sSQL) as $sWord) {
|
||||||
if ($bVerbose) echo "$sWord = ";
|
if ($bVerbose) {
|
||||||
|
echo "$sWord = ";
|
||||||
|
}
|
||||||
|
|
||||||
$oGeocode->setLanguagePreference(array('en'));
|
$oGeocode->setLanguagePreference(array('en'));
|
||||||
$oGeocode->setQuery($sWord);
|
$oGeocode->setQuery($sWord);
|
||||||
|
|||||||
@@ -221,6 +221,8 @@ function closestHouseNumber($aRow)
|
|||||||
if (!function_exists('array_key_last')) {
|
if (!function_exists('array_key_last')) {
|
||||||
function array_key_last(array $array)
|
function array_key_last(array $array)
|
||||||
{
|
{
|
||||||
if (!empty($array)) return key(array_slice($array, -1, 1, true));
|
if (!empty($array)) {
|
||||||
|
return key(array_slice($array, -1, 1, true));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,8 +16,12 @@ function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array())
|
|||||||
|
|
||||||
if ($sType == 'reverse') {
|
if ($sType == 'reverse') {
|
||||||
$sOutQuery = (isset($_GET['lat'])?$_GET['lat']:'').'/';
|
$sOutQuery = (isset($_GET['lat'])?$_GET['lat']:'').'/';
|
||||||
if (isset($_GET['lon'])) $sOutQuery .= $_GET['lon'];
|
if (isset($_GET['lon'])) {
|
||||||
if (isset($_GET['zoom'])) $sOutQuery .= '/'.$_GET['zoom'];
|
$sOutQuery .= $_GET['lon'];
|
||||||
|
}
|
||||||
|
if (isset($_GET['zoom'])) {
|
||||||
|
$sOutQuery .= '/'.$_GET['zoom'];
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
$sOutQuery = $sQuery;
|
$sOutQuery = $sQuery;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,10 +8,12 @@ if (file_exists($phpPhraseSettingsFile) && !file_exists($jsonPhraseSettingsFile)
|
|||||||
|
|
||||||
$data = array();
|
$data = array();
|
||||||
|
|
||||||
if (isset($aTagsBlacklist))
|
if (isset($aTagsBlacklist)) {
|
||||||
$data['blackList'] = $aTagsBlacklist;
|
$data['blackList'] = $aTagsBlacklist;
|
||||||
if (isset($aTagsWhitelist))
|
}
|
||||||
|
if (isset($aTagsWhitelist)) {
|
||||||
$data['whiteList'] = $aTagsWhitelist;
|
$data['whiteList'] = $aTagsWhitelist;
|
||||||
|
}
|
||||||
|
|
||||||
$jsonFile = fopen($jsonPhraseSettingsFile, 'w');
|
$jsonFile = fopen($jsonPhraseSettingsFile, 'w');
|
||||||
fwrite($jsonFile, json_encode($data));
|
fwrite($jsonFile, json_encode($data));
|
||||||
|
|||||||
@@ -15,7 +15,9 @@ if (empty($aPlace)) {
|
|||||||
'properties' => array()
|
'properties' => array()
|
||||||
);
|
);
|
||||||
|
|
||||||
if (isset($aPlace['place_id'])) $aFilteredPlaces['properties']['place_id'] = $aPlace['place_id'];
|
if (isset($aPlace['place_id'])) {
|
||||||
|
$aFilteredPlaces['properties']['place_id'] = $aPlace['place_id'];
|
||||||
|
}
|
||||||
$sOSMType = formatOSMType($aPlace['osm_type']);
|
$sOSMType = formatOSMType($aPlace['osm_type']);
|
||||||
if ($sOSMType) {
|
if ($sOSMType) {
|
||||||
$aFilteredPlaces['properties']['osm_type'] = $sOSMType;
|
$aFilteredPlaces['properties']['osm_type'] = $sOSMType;
|
||||||
|
|||||||
Reference in New Issue
Block a user