Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / api / __init__.py

diff --git a/nominatim/api/__init__.py b/nominatim/api/__init__.py
index 0a91e28185b33a4c4bcfa51200e7a55fbec7540d..9e3d6a1dcfc9496df468b050b480c5c492c7d6dc 100644 (file)
--- a/nominatim/api/__init__.py
+++ b/nominatim/api/__init__.py
@@ -16,6 +16,7 @@ import from this file, not from the source files directly.
 
 from .core import (NominatimAPI as NominatimAPI,
                    NominatimAPIAsync as NominatimAPIAsync)
 
 from .core import (NominatimAPI as NominatimAPI,
                    NominatimAPIAsync as NominatimAPIAsync)

+from .connection import (SearchConnection as SearchConnection)

 from .status import (StatusResult as StatusResult)
 from .types import (PlaceID as PlaceID,
                     OsmID as OsmID,
 from .status import (StatusResult as StatusResult)
 from .types import (PlaceID as PlaceID,
                     OsmID as OsmID,


@@ -23,7 +24,6 @@ from .types import (PlaceID as PlaceID,
                     Point as Point,
                     Bbox as Bbox,
                     GeometryFormat as GeometryFormat,
                     Point as Point,
                     Bbox as Bbox,
                     GeometryFormat as GeometryFormat,

-                    LookupDetails as LookupDetails,

                     DataLayer as DataLayer)
 from .results import (SourceTable as SourceTable,
                       AddressLine as AddressLine,
                     DataLayer as DataLayer)
 from .results import (SourceTable as SourceTable,
                       AddressLine as AddressLine,


@@ -32,5 +32,7 @@ from .results import (SourceTable as SourceTable,
                       WordInfos as WordInfos,
                       DetailedResult as DetailedResult,
                       ReverseResult as ReverseResult,
                       WordInfos as WordInfos,
                       DetailedResult as DetailedResult,
                       ReverseResult as ReverseResult,

-                      ReverseResults as ReverseResults)
+                      ReverseResults as ReverseResults,
+                      SearchResult as SearchResult,
+                      SearchResults as SearchResults)

 from .localization import (Locales as Locales)
 from .localization import (Locales as Locales)