osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-11-22 21:28:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Enable debug output on command line
This commit is contained in:
Sarah Hoffmann 2023-05-19 08:55:26 +02:00 committed by GitHub
commit d69411f414
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nominatim/clicmd/api.py
View File

@ -19,6 +19,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 from nominatim.api.v1.helpers import zoom_to_rank
import nominatim.api.logging as loglib
# Do not repeat documentation of subcommand classes. # Do not repeat documentation of subcommand classes.
# pylint: disable=C0111 # pylint: disable=C0111
@ -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'], choices=['xml', 'json', 'jsonv2', 'geojson', 'geocodejson', '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)
@ -161,6 +162,9 @@ class APIReverse:
def run(self, args: NominatimArgs) -> int: def run(self, args: NominatimArgs) -> int:
if args.format == 'debug':
loglib.set_log_output('text')
api = napi.NominatimAPI(args.project_dir) api = napi.NominatimAPI(args.project_dir)
result = api.reverse(napi.Point(args.lon, args.lat), result = api.reverse(napi.Point(args.lon, args.lat),
@ -170,6 +174,10 @@ class APIReverse:
geometry_output=args.get_geometry_output(), geometry_output=args.get_geometry_output(),
geometry_simplification=args.polygon_threshold) geometry_simplification=args.polygon_threshold)
if args.format == 'debug':
print(loglib.get_and_disable())
return 0
if result: if result:
output = api_output.format_result( output = api_output.format_result(
napi.ReverseResults([result]), napi.ReverseResults([result]),
@ -212,8 +220,15 @@ class APILookup:
def run(self, args: NominatimArgs) -> int: def run(self, args: NominatimArgs) -> int:
if args.format == 'debug':
loglib.set_log_output('text')
api = napi.NominatimAPI(args.project_dir) 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] places = [napi.OsmID(o[0], int(o[1:])) for o in args.ids]
results = api.lookup(places, results = api.lookup(places,