X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/386b4c82da79999046fe899339ed264bfc5d7fa6..41383c05cd65a36c518f9adce55cfec2a9be00d0:/nominatim/api/types.py diff --git a/nominatim/api/types.py b/nominatim/api/types.py index d6e80496..e93015fc 100644 --- a/nominatim/api/types.py +++ b/nominatim/api/types.py @@ -17,6 +17,7 @@ from struct import unpack from binascii import unhexlify from nominatim.errors import UsageError +from nominatim.api.localization import Locales # pylint: disable=no-member,too-many-boolean-expressions,too-many-instance-attributes @@ -315,8 +316,8 @@ class DataLayer(enum.Flag): for reverse and forward search. """ ADDRESS = enum.auto() - """ The address layer contains all places that have a fully qualified - address that includes a house number (or a house name equivalent, + """ The address layer contains all places relevant for addresses: + fully qualified addresses with a house number (or a house name equivalent, for some addresses) and places that can be part of an address like roads, cities, states. """ @@ -386,7 +387,7 @@ TParam = TypeVar('TParam', bound='LookupDetails') # pylint: disable=invalid-name @dataclasses.dataclass class LookupDetails: - """ Collection of parameters that define the amount of details + """ Collection of parameters that define which kind of details are returned with a lookup or details result. """ geometry_output: GeometryFormat = GeometryFormat.NONE @@ -413,6 +414,9 @@ class LookupDetails: 0.0 means the original geometry is kept. The higher the value, the more the geometry gets simplified. """ + locales: Locales = Locales() + """ Preferred languages for localization of results. + """ @classmethod def from_kwargs(cls: Type[TParam], kwargs: Dict[str, Any]) -> TParam: @@ -534,11 +538,13 @@ class SearchDetails(LookupDetails): or (self.bounded_viewbox and self.viewbox is not None and self.near is not None and self.viewbox.contains(self.near)) - or self.layers is not None and not self.layers) + or (self.layers is not None and not self.layers) + or (self.max_rank <= 4 and + self.layers is not None and not self.layers & DataLayer.ADDRESS)) def layer_enabled(self, layer: DataLayer) -> bool: - """ Check if the given layer has been choosen. Also returns + """ Check if the given layer has been chosen. Also returns true when layer restriction has been disabled completely. """ return self.layers is None or bool(self.layers & layer)