X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/86b43dc605cd7e02e08b8c63c90ffe41ab26e3d2..32dbf83747e0339d93d6200ff43f73221e9e863c:/nominatim/api/v1/server_glue.py?ds=sidebyside diff --git a/nominatim/api/v1/server_glue.py b/nominatim/api/v1/server_glue.py index b5a4a3ca..ccf8f7d1 100644 --- a/nominatim/api/v1/server_glue.py +++ b/nominatim/api/v1/server_glue.py @@ -8,7 +8,7 @@ Generic part of the server implementation of the v1 API. Combine with the scaffolding provided for the various Python ASGI frameworks. """ -from typing import Optional, Any, Type, Callable, NoReturn, cast +from typing import Optional, Any, Type, Callable, NoReturn, Dict, cast from functools import reduce import abc import math @@ -17,6 +17,7 @@ from nominatim.config import Configuration import nominatim.api as napi import nominatim.api.logging as loglib from nominatim.api.v1.format import dispatch as formatting +from nominatim.api.v1 import helpers CONTENT_TYPE = { 'text': 'text/plain; charset=utf-8', @@ -226,6 +227,34 @@ class ASGIAdaptor(abc.ABC): return fmt + def parse_geometry_details(self, fmt: str) -> Dict[str, Any]: + """ Create details strucutre from the supplied geometry parameters. + """ + numgeoms = 0 + output = napi.GeometryFormat.NONE + if self.get_bool('polygon_geojson', False): + output |= napi.GeometryFormat.GEOJSON + numgeoms += 1 + if fmt not in ('geojson', 'geocodejson'): + if self.get_bool('polygon_text', False): + output |= napi.GeometryFormat.TEXT + numgeoms += 1 + if self.get_bool('polygon_kml', False): + output |= napi.GeometryFormat.KML + numgeoms += 1 + if self.get_bool('polygon_svg', False): + output |= napi.GeometryFormat.SVG + numgeoms += 1 + + if numgeoms > self.config().get_int('POLYGON_OUTPUT_MAX_TYPES'): + self.raise_error('Too many polgyon output options selected.') + + return {'address_details': True, + 'geometry_simplification': self.get_float('polygon_threshold', 0.0), + 'geometry_output': output + } + + async def status_endpoint(api: napi.NominatimAPIAsync, params: ASGIAdaptor) -> Any: """ Server glue for /status endpoint. See API docs for details. """ @@ -258,17 +287,17 @@ async def details_endpoint(api: napi.NominatimAPIAsync, params: ASGIAdaptor) -> debug = params.setup_debugging() - details = napi.LookupDetails(address_details=params.get_bool('addressdetails', False), - linked_places=params.get_bool('linkedplaces', False), - parented_places=params.get_bool('hierarchy', False), - keywords=params.get_bool('keywords', False)) - - if params.get_bool('polygon_geojson', False): - details.geometry_output = napi.GeometryFormat.GEOJSON - locales = napi.Locales.from_accept_languages(params.get_accepted_languages()) - result = await api.lookup(place, details) + result = await api.details(place, + address_details=params.get_bool('addressdetails', False), + linked_places=params.get_bool('linkedplaces', False), + parented_places=params.get_bool('hierarchy', False), + keywords=params.get_bool('keywords', False), + geometry_output = napi.GeometryFormat.GEOJSON + if params.get_bool('polygon_geojson', False) + else napi.GeometryFormat.NONE + ) if debug: return params.build_response(loglib.get_and_disable()) @@ -292,32 +321,11 @@ async def reverse_endpoint(api: napi.NominatimAPIAsync, params: ASGIAdaptor) -> coord = napi.Point(params.get_float('lon'), params.get_float('lat')) locales = napi.Locales.from_accept_languages(params.get_accepted_languages()) - zoom = max(0, min(18, params.get_int('zoom', 18))) - - details = napi.LookupDetails(address_details=True, - geometry_simplification=params.get_float('polygon_threshold', 0.0)) - numgeoms = 0 - if params.get_bool('polygon_geojson', False): - details.geometry_output |= napi.GeometryFormat.GEOJSON - numgeoms += 1 - if fmt not in ('geojson', 'geocodejson'): - if params.get_bool('polygon_text', False): - details.geometry_output |= napi.GeometryFormat.TEXT - numgeoms += 1 - if params.get_bool('polygon_kml', False): - details.geometry_output |= napi.GeometryFormat.KML - numgeoms += 1 - if params.get_bool('polygon_svg', False): - details.geometry_output |= napi.GeometryFormat.SVG - numgeoms += 1 - - if numgeoms > params.config().get_int('POLYGON_OUTPUT_MAX_TYPES'): - params.raise_error('Too many polgyon output options selected.') + details = params.parse_geometry_details(fmt) + details['max_rank'] = helpers.zoom_to_rank(params.get_int('zoom', 18)) + details['layers'] = params.get_layers() - result = await api.reverse(coord, REVERSE_MAX_RANKS[zoom], - params.get_layers() or - napi.DataLayer.ADDRESS | napi.DataLayer.POI, - details) + result = await api.reverse(coord, **details) if debug: return params.build_response(loglib.get_and_disable()) @@ -325,11 +333,7 @@ async def reverse_endpoint(api: napi.NominatimAPIAsync, params: ASGIAdaptor) -> fmt_options = {'locales': locales, 'extratags': params.get_bool('extratags', False), 'namedetails': params.get_bool('namedetails', False), - 'addressdetails': params.get_bool('addressdetails', True), - 'single_result': True} - if fmt == 'xml': - fmt_options['xml_roottag'] = 'reversegeocode' - fmt_options['xml_extra_info'] = {'querystring': 'TODO'} + 'addressdetails': params.get_bool('addressdetails', True)} output = formatting.format_result(napi.ReverseResults([result] if result else []), fmt, fmt_options) @@ -337,26 +341,42 @@ async def reverse_endpoint(api: napi.NominatimAPIAsync, params: ASGIAdaptor) -> return params.build_response(output) -EndpointFunc = Callable[[napi.NominatimAPIAsync, ASGIAdaptor], Any] +async def lookup_endpoint(api: napi.NominatimAPIAsync, params: ASGIAdaptor) -> Any: + """ Server glue for /lookup endpoint. See API docs for details. + """ + fmt = params.parse_format(napi.SearchResults, 'xml') + debug = params.setup_debugging() + locales = napi.Locales.from_accept_languages(params.get_accepted_languages()) + details = params.parse_geometry_details(fmt) -REVERSE_MAX_RANKS = [2, 2, 2, # 0-2 Continent/Sea - 4, 4, # 3-4 Country - 8, # 5 State - 10, 10, # 6-7 Region - 12, 12, # 8-9 County - 16, 17, # 10-11 City - 18, # 12 Town - 19, # 13 Village/Suburb - 22, # 14 Hamlet/Neighbourhood - 25, # 15 Localities - 26, # 16 Major Streets - 27, # 17 Minor Streets - 30 # 18 Building - ] + places = [] + for oid in (params.get('osm_ids') or '').split(','): + oid = oid.strip() + if len(oid) > 1 and oid[0] in 'RNWrnw' and oid[1:].isdigit(): + places.append(napi.OsmID(oid[0], int(oid[1:]))) + if places: + results = await api.lookup(places, **details) + else: + results = napi.SearchResults() + + if debug: + return params.build_response(loglib.get_and_disable()) + + fmt_options = {'locales': locales, + 'extratags': params.get_bool('extratags', False), + 'namedetails': params.get_bool('namedetails', False), + 'addressdetails': params.get_bool('addressdetails', True)} + + output = formatting.format_result(results, fmt, fmt_options) + + return params.build_response(output) + +EndpointFunc = Callable[[napi.NominatimAPIAsync, ASGIAdaptor], Any] ROUTES = [ ('status', status_endpoint), ('details', details_endpoint), - ('reverse', reverse_endpoint) + ('reverse', reverse_endpoint), + ('lookup', lookup_endpoint) ]