Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	tests/auto/declarative_ui/tst_map.qml

Change-Id: If408b8242b39f78926b5373393f3b1f65b262499

2 files changed, 47 insertions, 6 deletions

diff --git a/tests/auto/declarative_ui/tst_map.qml b/tests/auto/declarative_ui/tst_map.qml
index 755da268..a6c10c22 100644
--- a/tests/auto/declarative_ui/tst_map.qml
+++ b/tests/auto/declarative_ui/tst_map.qml
@@ -30,6 +30,7 @@ import QtQuick 2.0
 import QtTest 1.0
 import QtPositioning 5.5
 import QtLocation 5.10
+import QtLocation.Test 5.6
 
 Item {
     width:100
@@ -55,6 +56,10 @@ Item {
     property variant coordinate3: QtPositioning.coordinate(50, 50, 0)
     property variant coordinate4: QtPositioning.coordinate(80, 80, 0)
     property variant coordinate5: QtPositioning.coordinate(20, 180)
+    property variant coordinateCenterVisibleRegion: QtPositioning.coordinate(27, 77)
+    property variant coordinateVisible1: QtPositioning.coordinate(28, 77)
+    property variant coordinateVisible2: QtPositioning.coordinate(33, 79.1)
+    property variant coordinateVisible3: QtPositioning.coordinate(27, 80.5)
     property variant invalidCoordinate: QtPositioning.coordinate()
     property variant altitudelessCoordinate: QtPositioning.coordinate(50, 50)
     property bool allMapsReady: mapZoomOnCompleted.mapReady
@@ -84,6 +89,9 @@ Item {
         }
     }
 
+    Map { id: mapVisibleRegion; width: 800; height: 600;
+        center: coordinateCenterVisibleRegion; plugin: testPlugin; zoomLevel: 1.0 }
+
     Map {id: map; plugin: testPlugin; center: coordinate1; width: 100; height: 100}
     SignalSpy {id: mapCenterSpy; target: map; signalName: 'centerChanged'}
 
@@ -148,6 +156,39 @@ Item {
             compare(map.center.latitude, 12)
         }
 
+        function test_map_visible_region()
+        {
+            mapVisibleRegion.zoomLevel = 1.0
+            wait(50)
+            verify(mapVisibleRegion.visibleRegion.contains(coordinateVisible1))
+            verify(mapVisibleRegion.visibleRegion.contains(coordinateVisible2))
+            verify(mapVisibleRegion.visibleRegion.contains(coordinateVisible3))
+
+            mapVisibleRegion.zoomLevel = 1.88
+            verify(LocationTestHelper.waitForPolished(mapVisibleRegion))
+            verify(mapVisibleRegion.visibleRegion.contains(coordinateVisible1))
+            verify(mapVisibleRegion.visibleRegion.contains(coordinateVisible2))
+            verify(mapVisibleRegion.visibleRegion.contains(coordinateVisible3))
+
+            mapVisibleRegion.zoomLevel = 2.12
+            verify(LocationTestHelper.waitForPolished(mapVisibleRegion))
+            verify(mapVisibleRegion.visibleRegion.contains(coordinateVisible1))
+            verify(mapVisibleRegion.visibleRegion.contains(coordinateVisible2))
+            verify(mapVisibleRegion.visibleRegion.contains(coordinateVisible3))
+
+            mapVisibleRegion.zoomLevel = 2.5
+            verify(LocationTestHelper.waitForPolished(mapVisibleRegion))
+            verify(mapVisibleRegion.visibleRegion.contains(coordinateVisible1))
+            verify(mapVisibleRegion.visibleRegion.contains(coordinateVisible2))
+            verify(mapVisibleRegion.visibleRegion.contains(coordinateVisible3))
+
+            mapVisibleRegion.zoomLevel = 2.7
+            verify(LocationTestHelper.waitForPolished(mapVisibleRegion))
+            verify(mapVisibleRegion.visibleRegion.contains(coordinateVisible1))
+            verify(mapVisibleRegion.visibleRegion.contains(coordinateVisible2))
+            verify(mapVisibleRegion.visibleRegion.contains(coordinateVisible3))
+        }
+
         function test_map_parameters()
         {
             // coordinate is set at map element declaration
diff --git a/tests/auto/declarative_ui/tst_map_flick.qml b/tests/auto/declarative_ui/tst_map_flick.qml
index 84ffa429..c153411f 100644
--- a/tests/auto/declarative_ui/tst_map_flick.qml
+++ b/tests/auto/declarative_ui/tst_map_flick.qml
@@ -105,7 +105,7 @@ Item {
             map.gesture.enabled = true
             map.gesture.panEnabled = true
             map.gesture.flickDeceleration = 500
-            map.zoomLevel = 0
+            map.zoomLevel = 9 // or flicking diagonally won't work
             map.disableOnPanStartedWithNoGesture = false
             map.disableOnFlickStartedWithNoGesture = false
             map.disableOnPanStartedWithDisabled = false
@@ -238,12 +238,12 @@ Item {
         {
             map.center.latitude = 50
             map.center.longitude = 50
-            mousePress(page, 2, 2)
-            var pos;
-            for (var i = 0; i < 50; i += 5) {
+            var pos = 5
+            mousePress(page, pos, pos)
+            for (var i = pos; i < 50; i += 5) {
+                pos = i
                 wait(20)
-                mouseMove(page, i, i, 0, Qt.LeftButton);
-                pos = i;
+                mouseMove(page, pos, pos, 0, Qt.LeftButton);
             }
             mouseRelease(page, pos, pos)
             verify(map.center.latitude > 50)