Mapbox Sailfish test

Github issue #181
micuintus · Apr 24, 2019 · 3866c3b · 3866c3b
1 parent 62232f4
commit 3866c3b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/qml/components-Sailfish/Map.qml b/qml/components-Sailfish/Map.qml
@@ -1,6 +1,21 @@
 import QtLocation 5.0
+import MapboxMap 1.0
+import QtPositioning 5.3
 
-Map {
+MapboxMap {
+    id: map
+     MapboxMapGestureArea {
+        map: map
+}
+      center: QtPositioning.coordinate(60.170448, 24.942046)
+            zoomLevel: 4.0
+            minimumZoomLevel: 0
+            maximumZoomLevel: 20
+            pixelRatio: 3.0
+
+            accessToken: "pk.eyJ1IjoibWljdSIsImEiOiJjaXdxd2MzcW4wMDBrMnlxZHc1cmtzdnhjIn0.a2u7IrIYN1kGCue-BU8zEg"
+            cacheDatabaseMaximalSize: 20*1024*1024
+            cacheDatabasePath: "/tmp/mbgl-cache.db"
 
-    plugin : Plugin { name: "osm" }
+    styleUrl: "mapbox://styles/mapbox/outdoors-v10"
 }
diff --git a/qml/pages/VenueMapOverviewPage.qml b/qml/pages/VenueMapOverviewPage.qml
@@ -69,9 +69,6 @@ BVApp.Page {
         // remove once SFOS is on QtLocation > 5.6
         property bool dirty: false
 
-        gesture {
-            enabled: true
-        }
 
         // Work around QTBUG-47366;
         // remove once SFOS is on QtLocation > 5.6
@@ -98,7 +95,7 @@ BVApp.Page {
                 anchorPoint.x: venueMarkerImage.width / 2
                 anchorPoint.y: venueMarkerImage.height
 
-                coordinate: QtPositioning.coordinate(model.latCoord, model.longCoord)
+                coordinate: QtPositioning.coordinate(model.latCoord ? model.latCoord : 0, model.longCoord)
 
                 sourceItem: BVApp.IconButton {
                     id: venueMarkerImage
@@ -119,7 +116,7 @@ BVApp.Page {
         }
 
         Component.onCompleted: {
-            addMapItem(currentPosition);
+            // addMapItem(currentPosition);
             centerAndZoom();
         }
 

diff --git a/qml/pages/VenueMapPage.qml b/qml/pages/VenueMapPage.qml
@@ -49,10 +49,6 @@ Rectangle {
         id: map
         anchors.fill: parent
 
-        // user shall not move the map, but click to open the coordinates in the dedicated map app.
-        gesture {
-            enabled: false
-        }
 
         Component.onCompleted: {
             addMapItem(venueMarker)