`http://localhost:8088/status.php` and you should see the message `OK`.
You can also run a search query, e.g. `http://localhost:8088/search.php?q=Berlin`.
+Note that search query is not supported for reverse-only imports. You can run a
+reverse query, e.g. `http://localhost:8088/reverse.php?lat=27.1750090510034&lon=78.04209025`.
+
To run Nominatim via webservers like Apache or nginx, please read the
[Deployment chapter](Deployment.md).
--- /dev/null
+<?php
+
+require_once(CONST_LibDir.'/init-website.php');
+require_once(CONST_LibDir.'/ParameterParser.php');
+
+$oParams = new Nominatim\ParameterParser();
+
+// Format for output
+$sOutputFormat = $oParams->getSet('format', array('xml', 'json', 'jsonv2', 'geojson', 'geocodejson'), 'jsonv2');
+set_exception_handler_by_format($sOutputFormat);
+
+throw new Exception('Reverse-only import does not support forward searching.', 404);
if args.website:
webdir = args.project_dir / 'website'
LOG.warning('Setting up website directory at %s', webdir)
- refresh.setup_website(webdir, args.config)
-
+ with connect(args.config.get_libpq_dsn()) as conn:
+ refresh.setup_website(webdir, args.config, conn)
return 0
webdir = args.project_dir / 'website'
LOG.warning('Setup website at %s', webdir)
- refresh.setup_website(webdir, args.config)
+ with connect(args.config.get_libpq_dsn()) as conn:
+ refresh.setup_website(webdir, args.config, conn)
with connect(args.config.get_libpq_dsn()) as conn:
try:
conn.commit()
-def setup_website(basedir, config):
+def setup_website(basedir, config, conn):
""" Create the website script stubs.
"""
if not basedir.exists():
template += "\nrequire_once('{}/website/{{}}');\n".format(config.lib_dir.php)
+ search_name_table_exists = bool(conn and conn.table_exists('search_name'))
+
for script in WEBSITE_SCRIPTS:
- (basedir / script).write_text(template.format(script), 'utf-8')
+ if not search_name_table_exists and script == 'search.php':
+ (basedir / script).write_text(template.format('reverse-only-search.php'), 'utf-8')
+ else:
+ (basedir / script).write_text(template.format(script), 'utf-8')
from nominatim import cli
from nominatim.config import Configuration
+from nominatim.db.connection import _Connection
from nominatim.tools import refresh
from nominatim.tokenizer import factory as tokenizer_factory
from steps.utils import run_script
dbargs['user'] = self.db_user
if self.db_pass:
dbargs['password'] = self.db_pass
- conn = psycopg2.connect(**dbargs)
+ conn = psycopg2.connect(connection_factory=_Connection, **dbargs)
return conn
def next_code_coverage_file(self):
self.website_dir.cleanup()
self.website_dir = tempfile.TemporaryDirectory()
+
+ try:
+ conn = self.connect_database(dbname)
+ except:
+ conn = False
refresh.setup_website(Path(self.website_dir.name) / 'website',
- self.get_test_config())
+ self.get_test_config(), conn)
def get_test_config(self):
""" Setup a test against a fresh, empty test database.
"""
self.setup_template_db()
- self.write_nominatim_config(self.test_db)
conn = self.connect_database(self.template_db)
conn.set_isolation_level(0)
cur = conn.cursor()
cur.execute('DROP DATABASE IF EXISTS {}'.format(self.test_db))
cur.execute('CREATE DATABASE {} TEMPLATE = {}'.format(self.test_db, self.template_db))
conn.close()
+ self.write_nominatim_config(self.test_db)
context.db = self.connect_database(self.test_db)
context.db.autocommit = True
psycopg2.extras.register_hstore(context.db, globally=False)
@pytest.fixture
def test_script(envdir):
def _create_file(code):
- outfile = envdir / 'php' / 'website' / 'search.php'
+ outfile = envdir / 'php' / 'website' / 'reverse-only-search.php'
outfile.write_text('<?php\n{}\n'.format(code), 'utf-8')
return _create_file
-def run_website_script(envdir, config):
+def run_website_script(envdir, config, conn):
config.lib_dir.php = envdir / 'php'
config.project_dir = envdir
- refresh.setup_website(envdir, config)
+ refresh.setup_website(envdir, config, conn)
proc = subprocess.run(['/usr/bin/env', 'php', '-Cq',
envdir / 'search.php'], check=False)
@pytest.mark.parametrize("setting,retval", (('yes', 10), ('no', 20)))
def test_setup_website_check_bool(def_config, monkeypatch, envdir, test_script,
- setting, retval):
+ setting, retval, temp_db_conn):
monkeypatch.setenv('NOMINATIM_CORS_NOACCESSCONTROL', setting)
test_script('exit(CONST_NoAccessControl ? 10 : 20);')
- assert run_website_script(envdir, def_config) == retval
+ assert run_website_script(envdir, def_config, temp_db_conn) == retval
@pytest.mark.parametrize("setting", (0, 10, 99067))
-def test_setup_website_check_int(def_config, monkeypatch, envdir, test_script, setting):
+def test_setup_website_check_int(def_config, monkeypatch, envdir, test_script, setting,
+ temp_db_conn):
monkeypatch.setenv('NOMINATIM_LOOKUP_MAX_COUNT', str(setting))
test_script('exit(CONST_Places_Max_ID_count == {} ? 10 : 20);'.format(setting))
- assert run_website_script(envdir, def_config) == 10
+ assert run_website_script(envdir, def_config, temp_db_conn) == 10
-def test_setup_website_check_empty_str(def_config, monkeypatch, envdir, test_script):
+def test_setup_website_check_empty_str(def_config, monkeypatch, envdir, test_script,
+ temp_db_conn):
monkeypatch.setenv('NOMINATIM_DEFAULT_LANGUAGE', '')
test_script('exit(CONST_Default_Language === false ? 10 : 20);')
- assert run_website_script(envdir, def_config) == 10
+ assert run_website_script(envdir, def_config, temp_db_conn) == 10
-def test_setup_website_check_str(def_config, monkeypatch, envdir, test_script):
+def test_setup_website_check_str(def_config, monkeypatch, envdir, test_script,
+ temp_db_conn):
monkeypatch.setenv('NOMINATIM_DEFAULT_LANGUAGE', 'ffde 2')
test_script('exit(CONST_Default_Language === "ffde 2" ? 10 : 20);')
- assert run_website_script(envdir, def_config) == 10
+ assert run_website_script(envdir, def_config, temp_db_conn) == 10
projects / nominatim.git / commitdiff