work round typing bug in pyosmium 4.0

[nominatim.git] / src / nominatim_db / clicmd / args.py

diff --git a/src/nominatim_db/clicmd/args.py b/src/nominatim_db/clicmd/args.py
index ab93863d33de93729fc15ec044ab6ebc4fe6c7fc..c74bca6245a40baf3b920a7311c2228d31fa043d 100644 (file)
--- a/src/nominatim_db/clicmd/args.py
+++ b/src/nominatim_db/clicmd/args.py
@@ -10,13 +10,11 @@ Provides custom functions over command-line arguments.
 from typing import Optional, List, Dict, Any, Sequence, Tuple
 import argparse
 import logging
 from typing import Optional, List, Dict, Any, Sequence, Tuple
 import argparse
 import logging

-from functools import reduce

 from pathlib import Path
 
 from pathlib import Path
 

-from nominatim_core.errors import UsageError
-from nominatim_core.config import Configuration
-from nominatim_core.typing import Protocol
-import nominatim_api as napi
+from ..errors import UsageError
+from ..config import Configuration
+from ..typing import Protocol

 
 LOG = logging.getLogger()
 
 
 LOG = logging.getLogger()
 


@@ -139,6 +137,7 @@ class NominatimArgs:
 
     # Arguments to all query functions
     format: str
 
     # Arguments to all query functions
     format: str

+    list_formats: bool

     addressdetails: bool
     extratags: bool
     namedetails: bool
     addressdetails: bool
     extratags: bool
     namedetails: bool


@@ -216,45 +215,3 @@ class NominatimArgs:
                 raise UsageError('Cannot access file.')
 
         return files
                 raise UsageError('Cannot access file.')
 
         return files

-
-
-    def get_geometry_output(self) -> napi.GeometryFormat:
-        """ Get the requested geometry output format in a API-compatible
-            format.
-        """
-        if not self.polygon_output:
-            return napi.GeometryFormat.NONE
-        if self.polygon_output == 'geojson':
-            return napi.GeometryFormat.GEOJSON
-        if self.polygon_output == 'kml':
-            return napi.GeometryFormat.KML
-        if self.polygon_output == 'svg':
-            return napi.GeometryFormat.SVG
-        if self.polygon_output == 'text':
-            return napi.GeometryFormat.TEXT
-
-        try:
-            return napi.GeometryFormat[self.polygon_output.upper()]
-        except KeyError as exp:
-            raise UsageError(f"Unknown polygon output format '{self.polygon_output}'.") from exp
-
-
-    def get_locales(self, default: Optional[str]) -> napi.Locales:
-        """ Get the locales from the language parameter.
-        """
-        if self.lang:
-            return napi.Locales.from_accept_languages(self.lang)
-        if default:
-            return napi.Locales.from_accept_languages(default)
-
-        return napi.Locales()
-
-
-    def get_layers(self, default: napi.DataLayer) -> Optional[napi.DataLayer]:
-        """ Get the list of selected layers as a DataLayer enum.
-        """
-        if not self.layers:
-            return default
-
-        return reduce(napi.DataLayer.__or__,
-                      (napi.DataLayer[s.upper()] for s in self.layers))