X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/00e3a752c9a749d2e2a0b8a406dd1b7e8e204765..a96b6a1289e3a595b2d3753a1a038abc3f19721a:/nominatim/clicmd/api.py diff --git a/nominatim/clicmd/api.py b/nominatim/clicmd/api.py index a59002a9..e8450e6b 100644 --- a/nominatim/clicmd/api.py +++ b/nominatim/clicmd/api.py @@ -7,17 +7,17 @@ """ Subcommand definitions for API calls from the command line. """ -from typing import Mapping, Dict +from typing import Dict, Any import argparse import logging import json import sys -from nominatim.tools.exec_utils import run_api_script -from nominatim.errors import UsageError 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, deduplicate_results +import nominatim.api.logging as loglib # Do not repeat documentation of subcommand classes. # pylint: disable=C0111 @@ -25,6 +25,7 @@ import nominatim.api.v1 as api_output LOG = logging.getLogger() STRUCTURED_QUERY = ( + ('amenity', 'name and/or type of POI'), ('street', 'housenumber and street'), ('city', 'city, town or village'), ('county', 'county'), @@ -43,7 +44,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) @@ -53,23 +54,12 @@ def _add_api_output_arguments(parser: argparse.ArgumentParser) -> None: group.add_argument('--polygon-output', choices=['geojson', 'kml', 'svg', 'text'], help='Output geometry of results as a GeoJSON, KML, SVG or WKT') - group.add_argument('--polygon-threshold', type=float, metavar='TOLERANCE', + group.add_argument('--polygon-threshold', type=float, default = 0.0, + metavar='TOLERANCE', help=("Simplify output geometry." "Parameter is difference tolerance in degrees.")) -def _run_api(endpoint: str, args: NominatimArgs, params: Mapping[str, object]) -> int: - script_file = args.project_dir / 'website' / (endpoint + '.php') - - if not script_file.exists(): - LOG.error("Cannot find API script file.\n\n" - "Make sure to run 'nominatim' from the project directory \n" - "or use the option --project-dir.") - raise UsageError("API script not found.") - - return run_api_script(endpoint, args.project_dir, - phpcgi_bin=args.phpcgi_path, params=params) - class APISearch: """\ Execute a search query. @@ -94,7 +84,7 @@ class APISearch: help='Limit search results to one or more countries') group.add_argument('--exclude_place_ids', metavar='ID,..', help='List of search object to be excluded') - group.add_argument('--limit', type=int, + group.add_argument('--limit', type=int, default=10, help='Limit the number of returned results') group.add_argument('--viewbox', metavar='X1,Y1,X2,Y2', help='Preferred area to find search results') @@ -107,30 +97,56 @@ class APISearch: def run(self, args: NominatimArgs) -> int: - params: Dict[str, object] + if args.format == 'debug': + loglib.set_log_output('text') + + api = napi.NominatimAPI(args.project_dir) + + params: Dict[str, Any] = {'max_results': args.limit + min(args.limit, 10), + 'address_details': True, # needed for display name + 'geometry_output': args.get_geometry_output(), + 'geometry_simplification': args.polygon_threshold, + 'countries': args.countrycodes, + 'excluded': args.exclude_place_ids, + 'viewbox': args.viewbox, + 'bounded_viewbox': args.bounded, + 'locales': args.get_locales(api.config.DEFAULT_LANGUAGE) + } + if args.query: - params = dict(q=args.query) + results = api.search(args.query, **params) + else: + results = api.search_address(amenity=args.amenity, + street=args.street, + city=args.city, + county=args.county, + state=args.state, + postalcode=args.postalcode, + country=args.country, + **params) + + if args.dedupe and len(results) > 1: + results = deduplicate_results(results, args.limit) + + if args.format == 'debug': + print(loglib.get_and_disable()) + return 0 + + output = api_output.format_result( + results, + args.format, + {'extratags': args.extratags, + 'namedetails': args.namedetails, + 'addressdetails': args.addressdetails}) + if args.format != 'xml': + # reformat the result, so it is pretty-printed + json.dump(json.loads(output), sys.stdout, indent=4, ensure_ascii=False) else: - params = {k: getattr(args, k) for k, _ in STRUCTURED_QUERY if getattr(args, k)} - - for param, _ in EXTRADATA_PARAMS: - if getattr(args, param): - params[param] = '1' - for param in ('format', 'countrycodes', 'exclude_place_ids', 'limit', 'viewbox'): - if getattr(args, param): - params[param] = getattr(args, param) - if args.lang: - params['accept-language'] = args.lang - if args.polygon_output: - params['polygon_' + args.polygon_output] = '1' - if args.polygon_threshold: - params['polygon_threshold'] = args.polygon_threshold - if args.bounded: - params['bounded'] = '1' - if not args.dedupe: - params['dedupe'] = '0' - - return _run_api('search', args, params) + sys.stdout.write(output) + sys.stdout.write('\n') + + return 0 + class APIReverse: """\ @@ -150,26 +166,51 @@ class APIReverse: help='Longitude of coordinate to look up (in WGS84)') group.add_argument('--zoom', type=int, help='Level of detail required for the address') + group.add_argument('--layer', metavar='LAYER', + choices=[n.name.lower() for n in napi.DataLayer if n.name], + action='append', required=False, dest='layers', + help='OSM id to lookup in format (may be repeated)') _add_api_output_arguments(parser) def run(self, args: NominatimArgs) -> int: - params = dict(lat=args.lat, lon=args.lon, format=args.format) - if args.zoom is not None: - params['zoom'] = args.zoom + if args.format == 'debug': + loglib.set_log_output('text') - for param, _ in EXTRADATA_PARAMS: - if getattr(args, param): - params[param] = '1' - if args.lang: - params['accept-language'] = args.lang - if args.polygon_output: - params['polygon_' + args.polygon_output] = '1' - if args.polygon_threshold: - params['polygon_threshold'] = args.polygon_threshold + api = napi.NominatimAPI(args.project_dir) + + result = api.reverse(napi.Point(args.lon, args.lat), + max_rank=zoom_to_rank(args.zoom or 18), + layers=args.get_layers(napi.DataLayer.ADDRESS | napi.DataLayer.POI), + address_details=True, # needed for display name + geometry_output=args.get_geometry_output(), + geometry_simplification=args.polygon_threshold, + locales=args.get_locales(api.config.DEFAULT_LANGUAGE)) + + if args.format == 'debug': + print(loglib.get_and_disable()) + return 0 + + if result: + output = api_output.format_result( + napi.ReverseResults([result]), + args.format, + {'extratags': args.extratags, + 'namedetails': args.namedetails, + 'addressdetails': args.addressdetails}) + if args.format != 'xml': + # reformat the result, so it is pretty-printed + json.dump(json.loads(output), sys.stdout, indent=4, ensure_ascii=False) + else: + sys.stdout.write(output) + sys.stdout.write('\n') + + return 0 + + LOG.error("Unable to geocode.") + return 42 - return _run_api('reverse', args, params) class APILookup: @@ -192,19 +233,37 @@ class APILookup: def run(self, args: NominatimArgs) -> int: - params: Dict[str, object] = dict(osm_ids=','.join(args.ids), format=args.format) + if args.format == 'debug': + loglib.set_log_output('text') - for param, _ in EXTRADATA_PARAMS: - if getattr(args, param): - params[param] = '1' - if args.lang: - params['accept-language'] = args.lang - if args.polygon_output: - params['polygon_' + args.polygon_output] = '1' - if args.polygon_threshold: - params['polygon_threshold'] = args.polygon_threshold + 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, + address_details=True, # needed for display name + geometry_output=args.get_geometry_output(), + geometry_simplification=args.polygon_threshold or 0.0, + locales=args.get_locales(api.config.DEFAULT_LANGUAGE)) + + output = api_output.format_result( + results, + args.format, + {'extratags': args.extratags, + 'namedetails': args.namedetails, + 'addressdetails': args.addressdetails}) + if args.format != 'xml': + # reformat the result, so it is pretty-printed + json.dump(json.loads(output), sys.stdout, indent=4, ensure_ascii=False) + else: + sys.stdout.write(output) + sys.stdout.write('\n') - return _run_api('lookup', args, params) + return 0 class APIDetails: @@ -263,21 +322,17 @@ class APIDetails: api = napi.NominatimAPI(args.project_dir) - details = napi.LookupDetails(address_details=args.addressdetails, - linked_places=args.linkedplaces, - parented_places=args.hierarchy, - keywords=args.keywords) - if args.polygon_geojson: - details.geometry_output = napi.GeometryFormat.GEOJSON - - if args.lang: - locales = napi.Locales.from_accept_languages(args.lang) - elif api.config.DEFAULT_LANGUAGE: - locales = napi.Locales.from_accept_languages(api.config.DEFAULT_LANGUAGE) - else: - locales = napi.Locales() + locales = args.get_locales(api.config.DEFAULT_LANGUAGE) + result = api.details(place, + address_details=args.addressdetails, + linked_places=args.linkedplaces, + parented_places=args.hierarchy, + keywords=args.keywords, + geometry_output=napi.GeometryFormat.GEOJSON + if args.polygon_geojson + else napi.GeometryFormat.NONE, + locales=locales) - result = api.lookup(place, details) if result: output = api_output.format_result( @@ -286,7 +341,7 @@ class APIDetails: {'locales': locales, 'group_hierarchy': args.group_hierarchy}) # reformat the result, so it is pretty-printed - json.dump(json.loads(output), sys.stdout, indent=4) + json.dump(json.loads(output), sys.stdout, indent=4, ensure_ascii=False) sys.stdout.write('\n') return 0