Import OSM GeoJSON when extended data is requested

Make use of QGeoJSON and import the Nominatim-returned geojson
in geocode requests. Useful to get the shape of the geocode results.

[ChangeLog] GeoJSON returned in Nominatim
queries is now converted into the corresponding geoshapes using
QGeoJson.

Change-Id: Ie260e82d99363d55ed094e8dbf214d68c2ccadef
Fixes: QTBUG-74248
Reviewed-by: Andy Shaw <andy.shaw@qt.io>

1 files changed, 6 insertions, 1 deletions

diff --git a/src/plugins/geoservices/osm/qgeocodereplyosm.cpp b/src/plugins/geoservices/osm/qgeocodereplyosm.cpp
index 885ba397..b4733d69 100644
--- a/src/plugins/geoservices/osm/qgeocodereplyosm.cpp
+++ b/src/plugins/geoservices/osm/qgeocodereplyosm.cpp
@@ -46,6 +46,7 @@
 #include <QtPositioning/QGeoAddress>
 #include <QtPositioning/QGeoLocation>
 #include <QtPositioning/QGeoRectangle>
+#include <QtLocation/private/qgeojson_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -112,8 +113,12 @@ static void injectExtra(QGeoLocation &location, const QJsonObject &object)
                                                QStringLiteral("class") };
 
     for (const auto k: extraKeys) {
-        if (object.contains(k))
+        if (object.contains(k)) {
             extra[k] = object.value(k).toVariant();
+            if (k == QStringLiteral("geojson"))
+                extra[QStringLiteral("geojson_model")] =
+                        QGeoJson::importGeoJson(QJsonDocument::fromVariant(extra[k]));
+        }
     }
 
     location.setExtendedAttributes(extra);