summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@codesorcery.net>2015-02-16 09:52:36 -0800
committerJustin R. Miller <incanus@codesorcery.net>2015-02-16 09:52:36 -0800
commit6e41664cb033ee5edf6ae5ac66ed518d9f0d1f89 (patch)
treea70192b174ea6dc69b1fa0b13f9a33358a9110e5 /linux
parentea31ad99a56f1e0afbcc7862ddc62dffd16bc5bb (diff)
downloadqtlocation-mapboxgl-6e41664cb033ee5edf6ae5ac66ed518d9f0d1f89.tar.gz
fixes #476 & #853: pixel/meter/latlng conversion routines in core & iOS
Diffstat (limited to 'linux')
-rw-r--r--linux/main.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/linux/main.cpp b/linux/main.cpp
index 12f77ffe58..6688905ea9 100644
--- a/linux/main.cpp
+++ b/linux/main.cpp
@@ -72,7 +72,7 @@ int main(int argc, char *argv[]) {
// Load settings
mbgl::Settings_JSON settings;
- map.setLonLatZoom(settings.longitude, settings.latitude, settings.zoom);
+ map.setLatLngZoom(mbgl::LatLng(settings.latitude, settings.longitude), settings.zoom);
map.setBearing(settings.bearing);
map.setDebug(settings.debug);
@@ -94,7 +94,10 @@ int main(int argc, char *argv[]) {
int ret = view->run();
// Save settings
- map.getLonLatZoom(settings.longitude, settings.latitude, settings.zoom);
+ mbgl::LatLng latLng = map.getLatLng();
+ settings.latitude = latLng.latitude;
+ settings.longitude = latLng.longitude;
+ settings.zoom = map.getZoom();
settings.bearing = map.getBearing();
settings.debug = map.getDebug();
settings.save();