Merge pull request #3064 from lonvia/clicmd-debug-output

Enable debug output on command line

diff --git a/nominatim/clicmd/api.py b/nominatim/clicmd/api.py
index 82ebb2c109af3b6a8582e83422140cd3b7359dc6..fef6bdf6ae1d9a3075e0997d5062778081d423c0 100644 (file)
--- a/nominatim/clicmd/api.py
+++ b/nominatim/clicmd/api.py
@@ -19,6 +19,7 @@ from nominatim.clicmd.args import NominatimArgs
 import nominatim.api as napi
 import nominatim.api.v1 as api_output
 from nominatim.api.v1.helpers import zoom_to_rank
+import nominatim.api.logging as loglib
 
 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111
@@ -44,7 +45,7 @@ EXTRADATA_PARAMS = (
 def _add_api_output_arguments(parser: argparse.ArgumentParser) -> None:
     group = parser.add_argument_group('Output arguments')
     group.add_argument('--format', default='jsonv2',
-                       choices=['xml', 'json', 'jsonv2', 'geojson', 'geocodejson'],
+                       choices=['xml', 'json', 'jsonv2', 'geojson', 'geocodejson', 'debug'],
                        help='Format of result')
     for name, desc in EXTRADATA_PARAMS:
         group.add_argument('--' + name, action='store_true', help=desc)
@@ -161,6 +162,9 @@ class APIReverse:
 
 
     def run(self, args: NominatimArgs) -> int:
+        if args.format == 'debug':
+            loglib.set_log_output('text')
+
         api = napi.NominatimAPI(args.project_dir)
 
         result = api.reverse(napi.Point(args.lon, args.lat),
@@ -170,6 +174,10 @@ class APIReverse:
                              geometry_output=args.get_geometry_output(),
                              geometry_simplification=args.polygon_threshold)
 
+        if args.format == 'debug':
+            print(loglib.get_and_disable())
+            return 0
+
         if result:
             output = api_output.format_result(
                         napi.ReverseResults([result]),
@@ -212,8 +220,15 @@ class APILookup:
 
 
     def run(self, args: NominatimArgs) -> int:
+        if args.format == 'debug':
+            loglib.set_log_output('text')
+
         api = napi.NominatimAPI(args.project_dir)
 
+        if args.format == 'debug':
+            print(loglib.get_and_disable())
+            return 0
+
         places = [napi.OsmID(o[0], int(o[1:])) for o in args.ids]
 
         results = api.lookup(places,