X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c9035594152ac7caa5fd06b1334b031a39ce5ab3..689bcbd6ea1bb83f815075f1f4cc53b8dc1f6393:/src/nominatim_db/clicmd/args.py?ds=sidebyside diff --git a/src/nominatim_db/clicmd/args.py b/src/nominatim_db/clicmd/args.py index aa95dbb9..488ecd18 100644 --- a/src/nominatim_db/clicmd/args.py +++ b/src/nominatim_db/clicmd/args.py @@ -10,15 +10,16 @@ Provides custom functions over command-line arguments. from typing import Optional, List, Dict, Any, Sequence, Tuple import argparse import logging -from functools import reduce from pathlib import Path -from nominatim_core.errors import UsageError -from nominatim_core.config import Configuration -from nominatim_core.typing import Protocol +from ..errors import UsageError +from ..config import Configuration +from ..typing import Protocol + LOG = logging.getLogger() + class Subcommand(Protocol): """ Interface to be implemented by classes implementing a CLI subcommand. @@ -138,6 +139,7 @@ class NominatimArgs: # Arguments to all query functions format: str + list_formats: bool addressdetails: bool extratags: bool namedetails: bool @@ -178,7 +180,6 @@ class NominatimArgs: polygon_geojson: bool group_hierarchy: bool - def osm2pgsql_options(self, default_cache: int, default_threads: int) -> Dict[str, Any]: """ Return the standard osm2pgsql options that can be derived @@ -196,9 +197,8 @@ class NominatimArgs: slim_index=self.config.TABLESPACE_OSM_INDEX, main_data=self.config.TABLESPACE_PLACE_DATA, main_index=self.config.TABLESPACE_PLACE_INDEX - ) - ) - + ) + ) def get_osm_file_list(self) -> Optional[List[Path]]: """ Return the --osm-file argument as a list of Paths or None