Merge pull request #1898 from lonvia/show-housenumber-with-housename

[nominatim.git] / utils / query.php

diff --git a/utils/query.php b/utils/query.php
old mode 100755 (executable)
new mode 100644 (file)
index 06d7f13..956bb56
--- a/utils/query.php
+++ b/utils/query.php
@@ -1,52 +1,71 @@
-#!/usr/bin/php -Cq
 <?php
 
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-cmd.php');
 require_once(CONST_BasePath.'/lib/Geocode.php');
 require_once(CONST_BasePath.'/lib/ParameterParser.php');
 ini_set('memory_limit', '800M');
 
-$aCMDOptions = array(
-    "Query database from command line. Returns search result as JSON.",
-    array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
-    array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet 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('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('nodedupe', '', 0, 1, 0, 0, 'bool', 'Do not remove duplicate results'),
-    array('limit', '', 0, 1, 1, 1, 'int', 'Maximum number of results returned (default: 10)'),
-    array('exclude_place_ids', '', 0, 1, 1, 1, 'string', 'Comma-separated list of place ids to exclude from results'),
-    array('featureType', '', 0, 1, 1, 1, 'string', 'Restrict results to certain features (country, state,city,settlement)'),
-    array('countrycodes', '', 0, 1, 1, 1, 'string', 'Comma-separated list of countries to restrict search to'),
-    array('viewbox', '', 0, 1, 1, 1, 'string', 'Prefer results in given view box')
-);
-getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
+$aCMDOptions
+= array(
+   'Query database from command line. Returns search result as JSON.',
+   array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
+   array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
+   array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
 
-$oDB =& getDB();
-$oParams = new ParameterParser($aCMDResult);
+   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'),
 
-if ($oParams->getBool('search'))
-{
-    if (isset($aCMDResult['nodedupe'])) $aCMDResult['dedupe'] = 'false';
+   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('nodedupe', '', 0, 1, 0, 0, 'bool', 'Do not remove duplicate results'),
+   array('limit', '', 0, 1, 1, 1, 'int', 'Maximum number of results returned (default: 10)'),
+   array('exclude_place_ids', '', 0, 1, 1, 1, 'string', 'Comma-separated list of place ids to exclude from results'),
+   array('featureType', '', 0, 1, 1, 1, 'string', 'Restrict results to certain features (country, state,city,settlement)'),
+   array('countrycodes', '', 0, 1, 1, 1, 'string', 'Comma-separated list of countries to restrict search to'),
+   array('viewbox', '', 0, 1, 1, 1, 'string', 'Prefer results in given view box')
+  );
+getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
-    $oGeocode = new Geocode($oDB);
+$oDB = new Nominatim\DB;
+$oDB->connect();
 
-    $oGeocode->setLanguagePreference($oParams->getPreferredLanguages(false));
-    $oGeocode->loadParamArray($oParams);
-    $oGeocode->setQuery($aCMDResult['search']);
+if (isset($aCMDResult['nodedupe'])) $aCMDResult['dedupe'] = 'false';
 
-    $aSearchResults = $oGeocode->lookup();
+$oParams = new Nominatim\ParameterParser($aCMDResult);
 
-    if (version_compare(phpversion(), "5.4.0", '<'))
-        echo json_encode($aSearchResults);
-    else
-        echo json_encode($aSearchResults, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)."\n";
-}
-else
-{
+$aSearchParams = array(
+                     'search',
+                     'amenity',
+                     'street',
+                     'city',
+                     'county',
+                     'state',
+                     'country',
+                     'postalcode'
+                 );
+
+if (!$oParams->hasSetAny($aSearchParams)) {
     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";