Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / steps / queries.py

diff --git a/test/bdd/steps/queries.py b/test/bdd/steps/queries.py
index 76ce9810829f61ae2fb8bbb0b9d4ec2a15ee713f..4e6ec1ff5ab02c6d3556cd17877ca48376c370d6 100644 (file)
--- a/test/bdd/steps/queries.py
+++ b/test/bdd/steps/queries.py
@@ -297,7 +297,8 @@ def query_cmd(context, query, dups):
     """
     cmd = ['/usr/bin/env', 'php']
     cmd.append(os.path.join(context.nominatim.build_dir, 'utils', 'query.php'))
     """
     cmd = ['/usr/bin/env', 'php']
     cmd.append(os.path.join(context.nominatim.build_dir, 'utils', 'query.php'))

-    cmd.extend(['--search', query])
+    if query:
+        cmd.extend(['--search', query])

     # add more parameters in table form
     if context.table:
         for h in context.table.headings:
     # add more parameters in table form
     if context.table:
         for h in context.table.headings:


@@ -455,8 +456,12 @@ def website_lookup_request(context, fmt, query):
 
     if fmt == 'json ':
         outfmt = 'json'
 
     if fmt == 'json ':
         outfmt = 'json'

+    elif fmt == 'jsonv2 ':
+        outfmt = 'json'

     elif fmt == 'geojson ':
         outfmt = 'geojson'
     elif fmt == 'geojson ':
         outfmt = 'geojson'

+    elif fmt == 'geocodejson ':
+        outfmt = 'geocodejson'

     else:
         outfmt = 'xml'
 
     else:
         outfmt = 'xml'