From 12b62e04e4c17ddeaeaae46ec09af2eb7244e840 Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Wed, 11 Jan 2017 16:50:51 +0100 Subject: Make QDeclarativeGeoMap::setVisibleRegion support all QGeoShapes This patch uses QGeoShape::boundingGeoRectangle to set the visible region, supporting the new QGeoShapes, simplifying the logic in ::fitViewportToGeoShape, and not requiring updates if new QGeoShapes are added. Change-Id: I4f4c21bc0b62aae9432024d8f20db774d191255b Reviewed-by: Alex Blasche --- tests/auto/declarative_ui/tst_map_error.qml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/auto/declarative_ui/tst_map_error.qml b/tests/auto/declarative_ui/tst_map_error.qml index c978e0cf..35613f63 100644 --- a/tests/auto/declarative_ui/tst_map_error.qml +++ b/tests/auto/declarative_ui/tst_map_error.qml @@ -192,10 +192,16 @@ Item { { map_no_plugin.visibleRegion = QtPositioning.circle(coordinate,1000) verify(map_no_plugin.center != coordinate) - verify(map_no_plugin.visibleRegion == QtPositioning.circle(coordinate,1000)) + verify(map_no_plugin.visibleRegion.contains(coordinate.atDistanceAndAzimuth(1000,0)) == true) + verify(map_no_plugin.visibleRegion.contains(coordinate.atDistanceAndAzimuth(1000,90)) == true) + verify(map_no_plugin.visibleRegion.contains(coordinate.atDistanceAndAzimuth(1000,180)) == true) + verify(map_no_plugin.visibleRegion.contains(coordinate.atDistanceAndAzimuth(1000,270)) == true) map_error_plugin.visibleRegion = QtPositioning.circle(coordinate,1000) verify(map_error_plugin.center != coordinate) - verify(map_no_plugin.visibleRegion == QtPositioning.circle(coordinate,1000)) + verify(map_error_plugin.visibleRegion.contains(coordinate.atDistanceAndAzimuth(1000,0)) == true) + verify(map_error_plugin.visibleRegion.contains(coordinate.atDistanceAndAzimuth(1000,90)) == true) + verify(map_error_plugin.visibleRegion.contains(coordinate.atDistanceAndAzimuth(1000,180)) == true) + verify(map_error_plugin.visibleRegion.contains(coordinate.atDistanceAndAzimuth(1000,270)) == true) } function test_map_activeMapType() -- cgit v1.2.1