diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-01-11 16:50:51 +0100 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-01-26 14:45:55 +0000 |
| commit | 12b62e04e4c17ddeaeaae46ec09af2eb7244e840 (patch) | |
| tree | 1034de34bde68db66f449b2810fb8505da432e28 /tests | |
| parent | c03576000da714a73626f985e84b6084c9deb4fd (diff) | |
| download | qtlocation-12b62e04e4c17ddeaeaae46ec09af2eb7244e840.tar.gz | |
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 <alexander.blasche@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative_ui/tst_map_error.qml | 10 |
1 files changed, 8 insertions, 2 deletions
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() |