CLI: get valid --format values via autodiscover

This commit is contained in:
marc tobias 2024-04-08 18:07:49 +02:00
parent 78c19bc006
commit 28444d9435

View File

@ -17,6 +17,7 @@ from nominatim.clicmd.args import NominatimArgs
import nominatim.api as napi import nominatim.api as napi
import nominatim.api.v1 as api_output import nominatim.api.v1 as api_output
from nominatim.api.v1.helpers import zoom_to_rank, deduplicate_results from nominatim.api.v1.helpers import zoom_to_rank, deduplicate_results
from nominatim.api.v1.format import dispatch as formatting
import nominatim.api.logging as loglib import nominatim.api.logging as loglib
# Do not repeat documentation of subcommand classes. # Do not repeat documentation of subcommand classes.
@ -44,7 +45,7 @@ EXTRADATA_PARAMS = (
def _add_api_output_arguments(parser: argparse.ArgumentParser) -> None: def _add_api_output_arguments(parser: argparse.ArgumentParser) -> None:
group = parser.add_argument_group('Output arguments') group = parser.add_argument_group('Output arguments')
group.add_argument('--format', default='jsonv2', group.add_argument('--format', default='jsonv2',
choices=['xml', 'json', 'jsonv2', 'geojson', 'geocodejson', 'debug'], choices=formatting.list_formats(napi.SearchResults) + ['debug'],
help='Format of result') help='Format of result')
for name, desc in EXTRADATA_PARAMS: for name, desc in EXTRADATA_PARAMS:
group.add_argument('--' + name, action='store_true', help=desc) group.add_argument('--' + name, action='store_true', help=desc)