update core library

- improve search for villages without named street, simple "Village <house number>" phrase is working now - rewrite of high-level asynchronous modules without Qt, it may be useful for developers targeting other platforms
Karry · Dec 11, 2023 · d09e323 · d09e323
1 parent da4aa28
commit d09e323
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/dependencies/libosmscout b/dependencies/libosmscout
diff --git a/rpm/harbour-osmscout.changes.in b/rpm/harbour-osmscout.changes.in
@@ -614,3 +614,4 @@
 * 2023-xx-xx Lukáš Karas <[email protected]> 2.33
 - delete partially downloaded database before new download - it avoids "Directory already exists" error
 - fix translations related to opening hours
+- improve search for villages without named street, simple "Village <house number>" phrase is working now
diff --git a/src/CollectionModel.cpp b/src/CollectionModel.cpp
@@ -355,7 +355,7 @@ QVariant CollectionModel::data(const QModelIndex &index, int role) const
       case WaypointTypeRole: return waypointType(waypoint.data.symbol);
       case LocationObjectRole:
         // QML will take ownership
-        return QVariant::fromValue(new osmscout::LocationEntry(osmscout::LocationEntry::typeObject,
+        return QVariant::fromValue(new osmscout::LocationEntry(osmscout::LocationInfo::Type::typeObject,
                                                                QString::fromStdString(waypoint.data.name.value_or(""s)),
                                                                "",
                                                                waypointType(waypoint.data.symbol),

diff --git a/src/CollectionTrackModel.cpp b/src/CollectionTrackModel.cpp
@@ -218,7 +218,7 @@ QObject *CollectionTrackModel::getBBox() const
   }
 
   // QML will take ownership
-  return new LocationEntry(LocationEntry::Type::typeNone,
+  return new LocationEntry(LocationInfo::Type::typeNone,
                            "bbox",
                            "",
                            "bbox",

diff --git a/src/NearWaypointModel.cpp b/src/NearWaypointModel.cpp
@@ -20,8 +20,8 @@
 #include "NearWaypointModel.h"
 
 #include <osmscout/util/Geometry.h>
+#include <osmscoutclient/AdminRegionInfo.h>
 #include <osmscoutclientqt/LocationEntry.h>
-#include <osmscoutclientqt/AdminRegionInfo.h>
 
 NearWaypointModel::NearWaypointModel()
 {
@@ -125,7 +125,7 @@ QObject* NearWaypointModel::get(int row) const
 
   // QML will take ownership
   return new osmscout::LocationEntry(
-    osmscout::LocationEntry::typeObject,
+    osmscout::LocationInfo::Type::typeObject,
     QString::fromStdString(waypoint.data.name ? waypoint.data.name.value() : waypoint.data.coord.GetDisplayText()),
     "",
     "",
+2 −2		Demos/src/LocationLookup.cpp
+2 −1		Tests/src/HeaderCheck.cpp
+0 −3		libosmscout-client-qt/CMakeLists.txt
+0 −2		libosmscout-client-qt/include/meson.build
+8 −11		libosmscout-client-qt/include/osmscoutclientqt/LocationEntry.h
+21 −9		libosmscout-client-qt/include/osmscoutclientqt/NearPOIModel.h
+1 −1		libosmscout-client-qt/include/osmscoutclientqt/OSMScoutQt.h
+0 −70		libosmscout-client-qt/include/osmscoutclientqt/POILookupModule.h
+0 −1		libosmscout-client-qt/include/osmscoutclientqt/PlaneMapRenderer.h
+10 −0		libosmscout-client-qt/include/osmscoutclientqt/QtStdConverters.h
+1 −0		libosmscout-client-qt/include/osmscoutclientqt/StyleModule.h
+0 −1		libosmscout-client-qt/src/meson.build
+27 −9		libosmscout-client-qt/src/osmscoutclientqt/LocationEntry.cpp
+4 −4		libosmscout-client-qt/src/osmscoutclientqt/LocationInfoModel.cpp
+6 −6		libosmscout-client-qt/src/osmscoutclientqt/LookupModule.cpp
+19 −24		libosmscout-client-qt/src/osmscoutclientqt/NearPOIModel.cpp
+2 −5		libosmscout-client-qt/src/osmscoutclientqt/OSMScoutQt.cpp
+1 −1		libosmscout-client-qt/src/osmscoutclientqt/OverlayObject.cpp
+0 −188		libosmscout-client-qt/src/osmscoutclientqt/POILookupModule.cpp
+5 −5		libosmscout-client-qt/src/osmscoutclientqt/SearchLocationModel.cpp
+6 −6		libosmscout-client-qt/src/osmscoutclientqt/SearchModule.cpp
+4 −0		libosmscout-client/CMakeLists.txt
+3 −0		libosmscout-client/include/meson.build
+10 −24		libosmscout-client/include/osmscoutclient/AdminRegionInfo.h
+55 −0		libosmscout-client/include/osmscoutclient/LocationInfo.h
+74 −0		libosmscout-client/include/osmscoutclient/POILookupModule.h
+1 −0		libosmscout-client/src/meson.build
+187 −0		libosmscout-client/src/osmscoutclient/POILookupModule.cpp
+11 −0		libosmscout/include/osmscout/async/AsyncWorker.h
+12 −2		libosmscout/src/osmscout/location/LocationService.cpp
-Original file line number
+Diff line change
@@ Expand Up / @@ -218,7 +218,7 @@ QObject *CollectionTrackModel::getBBox() const @@
       }
       // QML will take ownership
-      return new LocationEntry(LocationEntry::Type::typeNone,
+      return new LocationEntry(LocationInfo::Type::typeNone,
                                "bbox",
                                "",
                                "bbox",
@@ Expand Down @@