Merge remote-tracking branch 'upstream/master'

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

diff --git a/nominatim/clicmd/args.py b/nominatim/clicmd/args.py
index 5b4beb40ec290e202bda760798072cad07cb7211..433435bc6f37dd1735078f807e599a42d05fdaa7 100644 (file)
--- a/nominatim/clicmd/args.py
+++ b/nominatim/clicmd/args.py
@@ -72,12 +72,11 @@ class NominatimArgs:
     check_database: bool
     migrate: bool
     collect_os_info: bool
     check_database: bool
     migrate: bool
     collect_os_info: bool

-    clean_deleted: bool
+    clean_deleted: str

     analyse_indexing: bool
     target: Optional[str]
     osm_id: Optional[str]
     place_id: Optional[int]
     analyse_indexing: bool
     target: Optional[str]
     osm_id: Optional[str]
     place_id: Optional[int]

-    age: str

 
     # Arguments to 'import'
     osm_file: List[str]
 
     # Arguments to 'import'
     osm_file: List[str]


@@ -88,6 +87,7 @@ class NominatimArgs:
     offline: bool
     ignore_errors: bool
     index_noanalyse: bool
     offline: bool
     ignore_errors: bool
     index_noanalyse: bool

+    prepare_database: bool

 
     # Arguments to 'index'
     boundaries_only: bool
 
     # Arguments to 'index'
     boundaries_only: bool


@@ -102,6 +102,9 @@ class NominatimArgs:
     language: Optional[str]
     restrict_to_country: Optional[str]
 
     language: Optional[str]
     restrict_to_country: Optional[str]
 

+    # Arguments to 'convert'
+    output: Path
+

     # Arguments to 'refresh'
     postcodes: bool
     word_tokens: bool
     # Arguments to 'refresh'
     postcodes: bool
     word_tokens: bool