From 2b0c18d333282f6db6acb7130678a270e22522ea Mon Sep 17 00:00:00 2001 From: Sri Charan Chittineni Date: Mon, 9 Mar 2026 05:01:47 +0000 Subject: [PATCH] modify import paths to helpers.py --- src/nominatim_api/v1/format.py | 2 +- src/nominatim_api/v1/format_json.py | 13 +++---------- src/nominatim_api/v1/format_xml.py | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/nominatim_api/v1/format.py b/src/nominatim_api/v1/format.py index 9cb79154..c90301a9 100644 --- a/src/nominatim_api/v1/format.py +++ b/src/nominatim_api/v1/format.py @@ -19,7 +19,7 @@ from ..localization import Locales from ..result_formatting import FormatDispatcher from .classtypes import ICONS from . import format_json, format_xml -from .format_json import _add_admin_level +from .helpers import _add_admin_level from .. import logging as loglib from ..server import content_types as ct diff --git a/src/nominatim_api/v1/format_json.py b/src/nominatim_api/v1/format_json.py index 1128e592..2b4a6ca8 100644 --- a/src/nominatim_api/v1/format_json.py +++ b/src/nominatim_api/v1/format_json.py @@ -7,22 +7,15 @@ """ Helper functions for output of results in json formats. """ -from typing import Mapping, Any, Optional, Tuple, Dict, Union, List +from typing import Mapping, Any, Optional, Tuple, Union, List from ..utils.json_writer import JsonWriter -from ..results import AddressLines, ReverseResults, SearchResults, BaseResult +from ..results import AddressLines, ReverseResults, SearchResults from . import classtypes as cl +from .helpers import _add_admin_level from ..types import EntranceDetails -def _add_admin_level(result: BaseResult) -> Optional[Dict[str, str]]: - tags = result.extratags - if result.category == ('boundary', 'administrative') and result.admin_level < 15: - tags = dict(tags) if tags else {} - tags['admin_level'] = str(result.admin_level) - return tags - - def _write_osm_id(out: JsonWriter, osm_object: Optional[Tuple[str, int]]) -> None: if osm_object is not None: out.keyval_not_none('osm_type', cl.OSM_TYPE_NAME.get(osm_object[0], None))\ diff --git a/src/nominatim_api/v1/format_xml.py b/src/nominatim_api/v1/format_xml.py index e4cde139..19bea01d 100644 --- a/src/nominatim_api/v1/format_xml.py +++ b/src/nominatim_api/v1/format_xml.py @@ -14,7 +14,7 @@ import xml.etree.ElementTree as ET from ..results import AddressLines, ReverseResult, ReverseResults, \ SearchResult, SearchResults from . import classtypes as cl -from .format_json import _add_admin_level +from .helpers import _add_admin_level from ..types import EntranceDetails