Work around Qt Bug QTBUG-54552

gschwann · Nov 2, 2016 · b08753c · b08753c
1 parent 087211b
commit b08753c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/src/MapComponent.qml b/src/MapComponent.qml
@@ -125,18 +125,14 @@ BaseView {
         property MarkerLabel markerLabel
 
         readonly property int markerSize: Theme.buttonHeight / map.scale
-        readonly property real defaultZoomLevel: 16
 
-        center: QtPositioning.coordinate(47.0666667, 15.45)
         onCenterChanged: {
             if (autoUpdatePois) {
                 markerLoader.setLocation(center.latitude, center.longitude);
             }
             appCore.currentMapPosition = center;
         }
 
-        zoomLevel: defaultZoomLevel
-
         onZoomLevelChanged: {
             root.updateRadius();
         }

diff --git a/src/main.qml b/src/main.qml
@@ -196,9 +196,6 @@ Item {
         }
     }
 
-    //    PositionSource
-    property variant locationGraz: QtPositioning.coordinate(47.0666667, 15.45)
-
     Loader {
         id: shutDownDialog
 
@@ -272,17 +269,16 @@ Item {
 
                     visible: parent.splitScreen || !details.visible
 
-                    Settings {
-                        id: settings
-                        property alias lastSeenLat: mapOfEurope.center.latitude
-                        property alias lastSeenLon: mapOfEurope.center.longitude
-                        property alias lastZoomLevel: mapOfEurope.zoomLevel
-                    }
-
-                    center: locationGraz
+                    center: QtPositioning.coordinate(settings.lastSeenLat, settings.lastSeenLon)
+                    zoomLevel: settings.lastZoomLevel
                     Component.onCompleted: {
                         root.mainMap = mapOfEurope;
                     }
+                    Component.onDestruction: {
+                        settings.lastSeenLat = mapOfEurope.center.latitude
+                        settings.lastSeenLon = mapOfEurope.center.longitude
+                        settings.lastZoomLevel = mapOfEurope.zoomLevel
+                    }
                 }
 
                 Loader {
@@ -321,4 +317,11 @@ Item {
             }
         }
     }
+
+    Settings {
+        id: settings
+        property double lastSeenLat: 47.0666667 // graz
+        property double lastSeenLon: 15.45
+        property double lastZoomLevel: 16 // default zoom level
+    }
 }