hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2735 from lonvia/geocodejson-type-reverse

Browse Source 
Also fix type output in geocodejson for reverse
This commit is contained in:
Sarah Hoffmann
2022-06-01 22:14:06 +02:00
committed by GitHub
parent 8a0e3e2f3d 218c56f9a6
commit 4b0d9f71e8
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib-php/template/address-geocodejson.php
View File

@@ -36,7 +36,7 @@ if (empty($aPlace)) {
$aFilteredPlaces['properties']['geocoding']['osm_id'] = $aPlace['osm_id']; $aFilteredPlaces['properties']['geocoding']['osm_id'] = $aPlace['osm_id'];
} }
$aFilteredPlaces['properties']['geocoding']['type'] = $aPlace['type']; $aFilteredPlaces['properties']['geocoding']['type'] = addressRankToGeocodeJsonType($aPlace['rank_address']);
$aFilteredPlaces['properties']['geocoding']['accuracy'] = (int) $fDistance; $aFilteredPlaces['properties']['geocoding']['accuracy'] = (int) $fDistance;

12
nominatim/config.py
View File

@@ -86,14 +86,14 @@ class Configuration:
Values of '1', 'yes' and 'true' are accepted as truthy values, Values of '1', 'yes' and 'true' are accepted as truthy values,
everything else is interpreted as false. everything else is interpreted as false.
""" """
return self.__getattr__(name).lower() in ('1', 'yes', 'true') return getattr(self, name).lower() in ('1', 'yes', 'true')
def get_int(self, name): def get_int(self, name):
""" Return the given configuration parameter as an int. """ Return the given configuration parameter as an int.
""" """
try: try:
return int(self.__getattr__(name)) return int(getattr(self, name))
except ValueError as exp: except ValueError as exp:
LOG.fatal("Invalid setting NOMINATIM_%s. Needs to be a number.", name) LOG.fatal("Invalid setting NOMINATIM_%s. Needs to be a number.", name)
raise UsageError("Configuration error.") from exp raise UsageError("Configuration error.") from exp
@@ -105,7 +105,7 @@ class Configuration:
will be stripped before returning them. On empty values None will be stripped before returning them. On empty values None
is returned. is returned.
""" """
raw = self.__getattr__(name) raw = getattr(self, name)
return [v.strip() for v in raw.split(',')] if raw else None return [v.strip() for v in raw.split(',')] if raw else None
@@ -116,7 +116,7 @@ class Configuration:
into an absolute path with the project directory as root path. into an absolute path with the project directory as root path.
If the configuration is unset, a falsy value is returned. If the configuration is unset, a falsy value is returned.
""" """
value = self.__getattr__(name) value = getattr(self, name)
if value: if value:
value = Path(value) value = Path(value)
@@ -152,7 +152,7 @@ class Configuration:
name of the standard styles automatically into a file in the name of the standard styles automatically into a file in the
config style. config style.
""" """
style = self.__getattr__('IMPORT_STYLE') style = getattr(self, 'IMPORT_STYLE')
if style in ('admin', 'street', 'address', 'full', 'extratags'): if style in ('admin', 'street', 'address', 'full', 'extratags'):
return self.config_dir / f'import-{style}.style' return self.config_dir / f'import-{style}.style'
@@ -214,7 +214,7 @@ class Configuration:
a regular file. a regular file.
""" """
if config is not None: if config is not None:
cfg_filename = self.__getattr__(config) cfg_filename = getattr(self, config)
if cfg_filename: if cfg_filename:
cfg_filename = Path(cfg_filename) cfg_filename = Path(cfg_filename)