X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/bef5cea48e3ead13185e01958f7a3a80d185b11e..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 fb91a0cd..ccf8f7d1 100644 --- a/nominatim/api/v1/server_glue.py +++ b/nominatim/api/v1/server_glue.py @@ -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', @@ -319,10 +320,9 @@ async def reverse_endpoint(api: napi.NominatimAPIAsync, params: ASGIAdaptor) -> debug = params.setup_debugging() 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 = params.parse_geometry_details(fmt) - details['max_rank'] = REVERSE_MAX_RANKS[zoom] + details['max_rank'] = helpers.zoom_to_rank(params.get_int('zoom', 18)) details['layers'] = params.get_layers() result = await api.reverse(coord, **details) @@ -374,22 +374,6 @@ async def lookup_endpoint(api: napi.NominatimAPIAsync, params: ASGIAdaptor) -> A EndpointFunc = Callable[[napi.NominatimAPIAsync, ASGIAdaptor], Any] -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 - ] - - ROUTES = [ ('status', status_endpoint), ('details', details_endpoint),