Merge pull request #1535 from Karry/poi-lookup-qt-less

move POILookupModule to client library
Framstag · Dec 10, 2023 · b307c36 · b307c36
2 parents b55efc9 + 09d1a0f
commit b307c36
Show file tree

Hide file tree

Showing 27 changed files with 456 additions and 370 deletions.
diff --git a/Tests/src/HeaderCheck.cpp b/Tests/src/HeaderCheck.cpp
@@ -141,7 +141,9 @@ static const std::set<std::string> allowedDependencies{
     "osmscoutclient => osmscout",
     "osmscoutclient => osmscout.async",
     "osmscoutclient => osmscout.db",
+    "osmscoutclient => osmscout.feature",
     "osmscoutclient => osmscout.io",
+    "osmscoutclient => osmscout.poi",
     "osmscoutclient => osmscout.routing",
     "osmscoutclient => osmscout.util",
     "osmscoutclient => osmscout.location",
@@ -157,7 +159,6 @@ static const std::set<std::string> allowedDependencies{
     "osmscoutclientqt => osmscout.feature",
     "osmscoutclientqt => osmscout.elevation",
     "osmscoutclientqt => osmscout.location",
-    "osmscoutclientqt => osmscout.poi",
     "osmscoutclientqt => osmscout.routing",
     "osmscoutclientqt => osmscout.navigation",
     "osmscoutclientqt => osmscout",

diff --git a/libosmscout-client-qt/CMakeLists.txt b/libosmscout-client-qt/CMakeLists.txt
@@ -2,7 +2,6 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
 set(HEADER_FILES
-    include/osmscoutclientqt/AdminRegionInfo.h
     include/osmscoutclientqt/ClientQtImportExport.h
     include/osmscoutclientqt/ElevationChartWidget.h
     include/osmscoutclientqt/ElevationModule.h
@@ -52,7 +51,6 @@ set(HEADER_FILES
     include/osmscoutclientqt/QtStdConverters.h
     include/osmscoutclientqt/RouteStep.h
     include/osmscoutclientqt/NearPOIModel.h
-    include/osmscoutclientqt/POILookupModule.h
     include/osmscoutclientqt/InstalledMapsModel.h
     include/osmscoutclientqt/Voice.h
     include/osmscoutclientqt/VoiceManager.h
@@ -108,7 +106,6 @@ set(SOURCE_FILES
     src/osmscoutclientqt/QtSettingsStorage.cpp
     src/osmscoutclientqt/QtStdConverters.cpp
     src/osmscoutclientqt/NearPOIModel.cpp
-    src/osmscoutclientqt/POILookupModule.cpp
     src/osmscoutclientqt/InstalledMapsModel.cpp
     src/osmscoutclientqt/Voice.cpp
     src/osmscoutclientqt/VoiceManager.cpp

diff --git a/libosmscout-client-qt/include/meson.build b/libosmscout-client-qt/include/meson.build
@@ -1,7 +1,6 @@
 osmscoutclientqtIncDir = include_directories('.')
 
 osmscoutclientqtHeader = [
-            'osmscoutclientqt/AdminRegionInfo.h',
             'osmscoutclientqt/ClientQtImportExport.h',
             'osmscoutclientqt/ElevationChartWidget.h',
             'osmscoutclientqt/ElevationModule.h',
@@ -50,7 +49,6 @@ osmscoutclientqtHeader = [
             'osmscoutclientqt/TiledMapOverlay.h',
             'osmscoutclientqt/TiledRenderingHelper.h',
             'osmscoutclientqt/NearPOIModel.h',
-            'osmscoutclientqt/POILookupModule.h',
             'osmscoutclientqt/InstalledMapsModel.h',
             'osmscoutclientqt/Voice.h',
             'osmscoutclientqt/VoiceManager.h',

diff --git a/libosmscout-client-qt/include/osmscoutclientqt/LocationEntry.h b/libosmscout-client-qt/include/osmscoutclientqt/LocationEntry.h
@@ -30,8 +30,10 @@
 #include <osmscout/location/LocationDescriptionService.h>
 #include <osmscout/location/LocationService.h>
 
+#include <osmscoutclient/LocationInfo.h>
+#include <osmscoutclient/AdminRegionInfo.h>
+
 #include <osmscoutclientqt/ClientQtImportExport.h>
-#include <osmscoutclientqt/AdminRegionInfo.h>
 
 namespace osmscout {
 
@@ -51,15 +53,8 @@ class OSMSCOUT_CLIENT_QT_API LocationEntry : public QObject
   Q_PROPERTY(double  lat        READ getLat        CONSTANT)
   Q_PROPERTY(double  lon        READ getLon        CONSTANT)
 
-public:
-  enum Type {
-    typeNone,
-    typeObject,
-    typeCoordinate
-  };
-
 private:
-  Type                           type;
+  LocationInfo::Type             type;
   QString                        label;
   QString                        altName; // name in alternative language
   QString                        objectType;
@@ -70,7 +65,7 @@ class OSMSCOUT_CLIENT_QT_API LocationEntry : public QObject
   osmscout::GeoBox               bbox;
 
 public:
-  LocationEntry(Type type,
+  LocationEntry(LocationInfo::Type type,
                 const QString& label,
                 const QString& altName,
                 const QString& objectType,
@@ -84,6 +79,8 @@ class OSMSCOUT_CLIENT_QT_API LocationEntry : public QObject
                 const osmscout::GeoCoord& coord,
                 QObject* parent = nullptr);
 
+  explicit LocationEntry(const LocationInfo &info);
+
   explicit LocationEntry(QObject* parent = nullptr);
 
   //! copy constructor copies Qt ownership
@@ -104,7 +101,7 @@ class OSMSCOUT_CLIENT_QT_API LocationEntry : public QObject
 
   Q_INVOKABLE double distanceTo(double lat, double lon) const;
 
-  Type getType() const;
+  LocationInfo::Type getType() const;
   QString getTypeString() const;
   QString getObjectType() const;
   QString getLabel() const;

diff --git a/libosmscout-client-qt/include/osmscoutclientqt/NearPOIModel.h b/libosmscout-client-qt/include/osmscoutclientqt/NearPOIModel.h
@@ -20,14 +20,18 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
  */
 
+#include <osmscoutclient/POILookupModule.h>
+
 #include <osmscoutclientqt/LocationEntry.h>
-#include <osmscoutclientqt/POILookupModule.h>
 
 #include <osmscoutclientqt/ClientQtImportExport.h>
 
 #include <QObject>
 #include <QAbstractListModel>
 
+#include <functional>
+#include <optional>
+
 namespace osmscout {
 
 #define INVALID_COORD -1000.0
@@ -95,29 +99,37 @@ Q_OBJECT
 
   void SearchingChanged(bool);
 
-  void lookupPOIRequest(int requestId,
-                        osmscout::BreakerRef breaker,
-                        osmscout::GeoCoord searchCenter,
-                        QStringList types,
-                        double maxDistance);
+  void lookupFinished(int requestId);
+  void lookupResult(int requestId, QList<LocationEntry> locations);
 
 public slots:
   void onLookupFinished(int requestId);
   void onLookupResult(int requestId, QList<LocationEntry> locations);
 
 private:
-  bool searching{false};
   int currentRequest{0};
   QList<LocationEntryRef> locations;
   osmscout::GeoCoord searchCenter{INVALID_COORD,INVALID_COORD};
   int resultLimit{100};
-  osmscout::BreakerRef breaker;
+  std::optional<POILookupModule::LookupFuture> future;
   Distance maxDistance{Distance::Of<Kilometer>(1)};
   QStringList types;
 
   POILookupModule *poiModule{nullptr};
   SettingsRef settings;
 
+  Slot<int> lookupFinishedSlot{ std::bind(&NearPOIModel::lookupFinished, this, std::placeholders::_1) };
+
+  Slot<int, POILookupModule::LookupResult> lookupResultSlot {
+    [this](int requestId, const POILookupModule::LookupResult &locationsVector) {
+      QList<LocationEntry> locations;
+      for (const auto &info: locationsVector) {
+        locations << LocationEntry(info);
+      }
+      emit lookupResult(requestId, locations);
+    }
+  };
+
 public:
   NearPOIModel();
   ~NearPOIModel() override;
@@ -134,7 +146,7 @@ public slots:
 
   inline bool isSearching() const
   {
-    return searching;
+    return future.has_value();
   }
 
   inline double GetLat() const

diff --git a/libosmscout-client-qt/include/osmscoutclientqt/OSMScoutQt.h b/libosmscout-client-qt/include/osmscoutclientqt/OSMScoutQt.h
@@ -26,6 +26,7 @@
 
 #include <osmscoutclient/MapManager.h>
 #include <osmscoutclient/DBThread.h>
+#include <osmscoutclient/POILookupModule.h>
 
 #include <osmscoutclientqt/LookupModule.h>
 #include <osmscoutclientqt/MapDownloader.h>
@@ -34,7 +35,6 @@
 #include <osmscoutclientqt/SearchModule.h>
 #include <osmscoutclientqt/StyleModule.h>
 #include <osmscoutclientqt/NavigationModule.h>
-#include <osmscoutclientqt/POILookupModule.h>
 #include <osmscoutclientqt/VoiceManager.h>
 #include <osmscoutclientqt/ElevationModule.h>
 #include <osmscoutclientqt/IconLookup.h>

diff --git a/libosmscout-client-qt/include/osmscoutclientqt/POILookupModule.h b/libosmscout-client-qt/include/osmscoutclientqt/POILookupModule.h
diff --git a/libosmscout-client-qt/include/osmscoutclientqt/QtStdConverters.h b/libosmscout-client-qt/include/osmscoutclientqt/QtStdConverters.h
@@ -42,6 +42,16 @@ extern OSMSCOUT_CLIENT_QT_API QDateTime TimestampToQDateTime(const osmscout::Tim
 
 extern OSMSCOUT_CLIENT_QT_API QList<QDir> PathVectorToQDirList(const std::vector<std::filesystem::path> &paths);
 
+template <typename T>
+QList<T> vectorToQList(const std::vector<T> &vec)
+{
+  QList<T> result;
+  for (const auto &o: vec) {
+    result << o;
+  }
+  return result;
+}
+
 }
 
 #endif //OSMSCOUT_CLIENT_QT_QTSTDCONVERTERS_H
diff --git a/libosmscout-client-qt/include/osmscoutclientqt/StyleModule.h b/libosmscout-client-qt/include/osmscoutclientqt/StyleModule.h
@@ -23,6 +23,7 @@
 #include <QObject>
 #include <QThread>
 #include <QMutex>
+#include <QMap>
 
 #include <osmscoutclient/DBThread.h>
 

diff --git a/libosmscout-client-qt/src/meson.build b/libosmscout-client-qt/src/meson.build
@@ -46,7 +46,6 @@ osmscoutclientqtSrc = [
             'src/osmscoutclientqt/TiledMapOverlay.cpp',
             'src/osmscoutclientqt/TiledRenderingHelper.cpp',
             'src/osmscoutclientqt/NearPOIModel.cpp',
-            'src/osmscoutclientqt/POILookupModule.cpp',
             'src/osmscoutclientqt/InstalledMapsModel.cpp',
             'src/osmscoutclientqt/Voice.cpp',
             'src/osmscoutclientqt/VoiceManager.cpp',