fix typo in argument to details CLI command

[nominatim.git] / nominatim / clicmd / api.py

diff --git a/nominatim/clicmd/api.py b/nominatim/clicmd/api.py
index b899afad15f36e1bb4f7ea574427d8185aa4ff78..e2b903c73defa60d2444aa44b1dca59a9b572946 100644 (file)
--- a/nominatim/clicmd/api.py
+++ b/nominatim/clicmd/api.py
@@ -14,6 +14,9 @@ import logging
 from nominatim.tools.exec_utils import run_api_script
 from nominatim.errors import UsageError
 from nominatim.clicmd.args import NominatimArgs
 from nominatim.tools.exec_utils import run_api_script
 from nominatim.errors import UsageError
 from nominatim.clicmd.args import NominatimArgs

+from nominatim.api import NominatimAPI
+from nominatim.apicmd.status import StatusResult
+import nominatim.result_formatter.v1 as formatting

 
 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111
 
 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111


@@ -248,9 +251,9 @@ class APIDetails:
         if args.node:
             params = dict(osmtype='N', osmid=args.node)
         elif args.way:
         if args.node:
             params = dict(osmtype='N', osmid=args.node)
         elif args.way:

-            params = dict(osmtype='W', osmid=args.node)
+            params = dict(osmtype='W', osmid=args.way)

         elif args.relation:
         elif args.relation:

-            params = dict(osmtype='R', osmid=args.node)
+            params = dict(osmtype='R', osmid=args.relation)

         else:
             params = dict(place_id=args.place_id)
         if args.object_class:
         else:
             params = dict(place_id=args.place_id)
         if args.object_class:


@@ -264,7 +267,7 @@ class APIDetails:
 
 
 class APIStatus:
 
 
 class APIStatus:

-    """\
+    """

     Execute API status query.
 
     This command works exactly the same as if calling the /status endpoint on
     Execute API status query.
 
     This command works exactly the same as if calling the /status endpoint on


@@ -274,10 +277,13 @@ class APIStatus:
     """
 
     def add_args(self, parser: argparse.ArgumentParser) -> None:
     """
 
     def add_args(self, parser: argparse.ArgumentParser) -> None:

+        formats = formatting.create(StatusResult).list_formats()

         group = parser.add_argument_group('API parameters')
         group = parser.add_argument_group('API parameters')

-        group.add_argument('--format', default='text', choices=['text', 'json'],
+        group.add_argument('--format', default=formats[0], choices=formats,

                            help='Format of result')
 
 
     def run(self, args: NominatimArgs) -> int:
                            help='Format of result')
 
 
     def run(self, args: NominatimArgs) -> int:

-        return _run_api('status', args, dict(format=args.format))
+        status = NominatimAPI(args.project_dir).status()
+        print(formatting.create(StatusResult).format(status, args.format))
+        return 0