hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

add library directories to config

Browse Source 
Allows to reduce the number of parameters in functions that take
the config anyway.
This commit is contained in:
Sarah Hoffmann
2021-04-19 09:06:42 +02:00
parent 830e3be1e6
commit 995ba2c7c2
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nominatim/cli.py
View File

@@ -84,6 +84,11 @@ class CommandlineParser:
args.config = Configuration(args.project_dir, args.config_dir, args.config = Configuration(args.project_dir, args.config_dir,
environ=kwargs.get('environ', os.environ)) environ=kwargs.get('environ', os.environ))
args.config.set_libdirs(module=args.module_dir,
osm2pgsql=args.osm2pgsql_path,
php=args.phplib_dir,
sql=args.sqllib_dir,
data=args.data_dir)
log = logging.getLogger() log = logging.getLogger()
log.warning('Using project directory: %s', str(args.project_dir)) log.warning('Using project directory: %s', str(args.project_dir))

10
nominatim/config.py
View File

@@ -39,6 +39,16 @@ class Configuration:
self._config['NOMINATIM_ADDRESS_LEVEL_CONFIG'] = \ self._config['NOMINATIM_ADDRESS_LEVEL_CONFIG'] = \
str(config_dir / 'address-levels.json') str(config_dir / 'address-levels.json')
class _LibDirs: # pylint: disable=too-few-public-methods
pass
self.lib_dir = _LibDirs()
def set_libdirs(self, **kwargs):
""" Set paths to library functions and data.
"""
for key, value in kwargs.items():
setattr(self.lib_dir, key, Path(value).resolve())
def __getattr__(self, name): def __getattr__(self, name):
name = 'NOMINATIM_' + name name = 'NOMINATIM_' + name