From d09e323af238533e75a11c6b169ae3ca5b65b023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Karas?= Date: Mon, 11 Dec 2023 20:08:29 +0100 Subject: [PATCH] update core library - improve search for villages without named street, simple "Village " phrase is working now - rewrite of high-level asynchronous modules without Qt, it may be useful for developers targeting other platforms --- dependencies/libosmscout | 2 +- rpm/harbour-osmscout.changes.in | 1 + src/CollectionModel.cpp | 2 +- src/CollectionTrackModel.cpp | 2 +- src/NearWaypointModel.cpp | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dependencies/libosmscout b/dependencies/libosmscout index 08d5fdedd..b9d85f502 160000 --- a/dependencies/libosmscout +++ b/dependencies/libosmscout @@ -1 +1 @@ -Subproject commit 08d5fdedd3446afeb41766b11dfa911be04cba6b +Subproject commit b9d85f502ea9d40a4068b50db1b2c7d3f1cedc5c diff --git a/rpm/harbour-osmscout.changes.in b/rpm/harbour-osmscout.changes.in index e688a7fa7..bfdf9f232 100644 --- a/rpm/harbour-osmscout.changes.in +++ b/rpm/harbour-osmscout.changes.in @@ -614,3 +614,4 @@ * 2023-xx-xx Lukáš Karas 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 " phrase is working now diff --git a/src/CollectionModel.cpp b/src/CollectionModel.cpp index ef42db2c8..722fc763f 100644 --- 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 index 31f04756f..da600df77 100644 --- 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 index 2634f6ac0..7a1355194 100644 --- a/src/NearWaypointModel.cpp +++ b/src/NearWaypointModel.cpp @@ -20,8 +20,8 @@ #include "NearWaypointModel.h" #include +#include #include -#include 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()), "", "",