Use QGeoShapes properly throughout the module

Adds proper support to other valid shapes and use ::boundingGeoRectangle
where appropriate.

Change-Id: Ibba4cb18f5cca08df62d15b76fa0e1f249dc6fbb
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

1 files changed, 1 insertions, 19 deletions

diff --git a/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp b/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp
index dcf02b13..16632b67 100644
--- a/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp
+++ b/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp
@@ -134,25 +134,7 @@ QPlaceSearchReply *QPlaceManagerEngineOsm::search(const QPlaceSearchRequest &req
 
     //queryItems.addQueryItem(QStringLiteral("accept-language"), QStringLiteral("en"));
 
-    QGeoRectangle boundingBox;
-    QGeoShape searchArea = request.searchArea();
-    switch (searchArea.type()) {
-    case QGeoShape::CircleType: {
-        QGeoCircle c(searchArea);
-        qreal radius = c.radius();
-        if (radius < 0)
-            radius = 50000;
-
-        boundingBox = QGeoRectangle(c.center().atDistanceAndAzimuth(radius, -45),
-                                    c.center().atDistanceAndAzimuth(radius, 135));
-        break;
-    }
-    case QGeoShape::RectangleType:
-        boundingBox = searchArea;
-        break;
-    default:
-        ;
-    }
+    QGeoRectangle boundingBox = request.searchArea().boundingGeoRectangle();
 
     if (!boundingBox.isEmpty()) {
         queryItems.addQueryItem(QStringLiteral("bounded"), QStringLiteral("1"));