hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

add structured search to command-line query tool

Browse Source
This commit is contained in:
Sarah Hoffmann
2020-02-19 10:20:18 +01:00
parent 02ffa752ea
commit cbddfcde5b
2 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ParameterParser.php
View File

@@ -118,4 +118,15 @@ class ParameterParser
$aLangPrefOrder['type'] = 'type'; $aLangPrefOrder['type'] = 'type';
return $aLangPrefOrder; return $aLangPrefOrder;
} }
public function hasSetAny($aParams)
{
foreach ($aParams as $sParam) {
if ($this->getBool($sParam)) {
return true;
}
}
return false;
}
} }

48
utils/query.php
View File

@@ -13,6 +13,13 @@ $aCMDOptions
array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'), array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
array('search', '', 0, 1, 1, 1, 'string', 'Search for given term or coordinate'), array('search', '', 0, 1, 1, 1, 'string', 'Search for given term or coordinate'),
array('country', '', 0, 1, 1, 1, 'string', 'Structured search: country'),
array('state', '', 0, 1, 1, 1, 'string', 'Structured search: state'),
array('county', '', 0, 1, 1, 1, 'string', 'Structured search: county'),
array('city', '', 0, 1, 1, 1, 'string', 'Structured search: city'),
array('street', '', 0, 1, 1, 1, 'string', 'Structured search: street'),
array('amenity', '', 0, 1, 1, 1, 'string', 'Structured search: amenity'),
array('postalcode', '', 0, 1, 1, 1, 'string', 'Structured search: postal code'),
array('accept-language', '', 0, 1, 1, 1, 'string', 'Preferred language order for showing search results'), array('accept-language', '', 0, 1, 1, 1, 'string', 'Preferred language order for showing search results'),
array('bounded', '', 0, 1, 0, 0, 'bool', 'Restrict results to given viewbox'), array('bounded', '', 0, 1, 0, 0, 'bool', 'Restrict results to given viewbox'),
@@ -28,20 +35,37 @@ getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
$oDB = new Nominatim\DB; $oDB = new Nominatim\DB;
$oDB->connect(); $oDB->connect();
if (isset($aCMDResult['nodedupe'])) $aCMDResult['dedupe'] = 'false';
$oParams = new Nominatim\ParameterParser($aCMDResult); $oParams = new Nominatim\ParameterParser($aCMDResult);
if ($oParams->getBool('search')) { $aSearchParams = array(
if (isset($aCMDResult['nodedupe'])) $aCMDResult['dedupe'] = 'false'; 'search',
'amenity',
'street',
'city',
'county',
'state',
'country',
'postalcode'
);
$oGeocode = new Nominatim\Geocode($oDB); if (!$oParams->hasSetAny($aSearchParams)) {
$oGeocode->setLanguagePreference($oParams->getPreferredLanguages(false));
$oGeocode->loadParamArray($oParams);
$oGeocode->setQuery($aCMDResult['search']);
$aSearchResults = $oGeocode->lookup();
echo json_encode($aSearchResults, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)."\n";
} else {
showUsage($aCMDOptions, true); showUsage($aCMDOptions, true);
return 1;
} }
$oGeocode = new Nominatim\Geocode($oDB);
$oGeocode->setLanguagePreference($oParams->getPreferredLanguages(false));
$oGeocode->loadParamArray($oParams);
if ($oParams->getBool('search')) {
$oGeocode->setQuery($aCMDResult['search']);
} else {
$oGeocode->setQueryFromParams($oParams);
}
$aSearchResults = $oGeocode->lookup();
echo json_encode($aSearchResults, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)."\n";