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 debd91197ce1e3c253da0ea87639658118ea2bd1..9e3d6a1dcfc9496df468b050b480c5c492c7d6dc 100644 (file)
--- a/nominatim/api/__init__.py
+++ b/nominatim/api/__init__.py
@@ -16,15 +16,23 @@ 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,
                     PlaceRef as PlaceRef,
 from .status import (StatusResult as StatusResult)
 from .types import (PlaceID as PlaceID,
                     OsmID as OsmID,
                     PlaceRef as PlaceRef,

+                    Point as Point,
+                    Bbox as Bbox,

                     GeometryFormat as GeometryFormat,
                     GeometryFormat as GeometryFormat,

-                    LookupDetails as LookupDetails)
+                    DataLayer as DataLayer)

 from .results import (SourceTable as SourceTable,
                       AddressLine as AddressLine,
                       AddressLines as AddressLines,
                       WordInfo as WordInfo,
                       WordInfos as WordInfos,
 from .results import (SourceTable as SourceTable,
                       AddressLine as AddressLine,
                       AddressLines as AddressLines,
                       WordInfo as WordInfo,
                       WordInfos as WordInfos,

-                      SearchResult as SearchResult)
+                      DetailedResult as DetailedResult,
+                      ReverseResult as ReverseResult,
+                      ReverseResults as ReverseResults,
+                      SearchResult as SearchResult,
+                      SearchResults as SearchResults)
+from .localization import (Locales as Locales)