From 7043d34c0f9a1837e70c68a20874f2c573870048 Mon Sep 17 00:00:00 2001 From: ikause Date: Wed, 6 Jun 2012 15:31:38 +0300 Subject: Organizer - fix for not storing location-longitude information MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I65f87748f5f3b021dadb3cd5cf64586f66417b9b Reviewed-by: Päivi Rajala --- src/organizer/details/qorganizeritemdetails.cpp | 2 +- .../tst_qorganizeritemdetails.cpp | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/organizer/details/qorganizeritemdetails.cpp b/src/organizer/details/qorganizeritemdetails.cpp index 4f994bed8..41715acaa 100644 --- a/src/organizer/details/qorganizeritemdetails.cpp +++ b/src/organizer/details/qorganizeritemdetails.cpp @@ -497,7 +497,7 @@ double QOrganizerItemLocation::longitude() const */ void QOrganizerItemLocation::setLongitude(double longitude) { - if (longitude >= -180 && longitude >= 180) + if (longitude >= -180 && longitude <= 180) setValue(FieldLongitude, longitude); } diff --git a/tests/auto/organizer/qorganizeritemdetails/tst_qorganizeritemdetails.cpp b/tests/auto/organizer/qorganizeritemdetails/tst_qorganizeritemdetails.cpp index 6e9ebd820..d66767202 100644 --- a/tests/auto/organizer/qorganizeritemdetails/tst_qorganizeritemdetails.cpp +++ b/tests/auto/organizer/qorganizeritemdetails/tst_qorganizeritemdetails.cpp @@ -206,13 +206,25 @@ void tst_QOrganizerItemDetails::location() { QOrganizerItemLocation l1; QOrganizerItem oi; - QVERIFY(l1.isEmpty()); - l1.setLatitude(0.12345); + + l1.setLatitude(89.999); QVERIFY(!l1.isEmpty()); - QVERIFY(l1.latitude() == 0.12345); - l1.setValue(QOrganizerItemLocation::FieldLongitude, 0.54321); - QVERIFY(l1.longitude() == 0.54321); + QVERIFY(l1.latitude() == 89.999); + l1.setValue(QOrganizerItemLocation::FieldLatitude, -89.12345); + QVERIFY(l1.value(QOrganizerItemLocation::FieldLatitude) == -89.12345); + l1.setLatitude(-90.12345); + l1.setLatitude(91); + QVERIFY(l1.latitude() == -89.12345); + + l1.setLongitude(179); + QVERIFY(l1.longitude() == 179); + l1.setValue(QOrganizerItemLocation::FieldLongitude, -179.54321); + QVERIFY(l1.value(QOrganizerItemLocation::FieldLongitude) == -179.54321); + l1.setLongitude(180.1); + l1.setLongitude(-180.1); + QVERIFY(l1.longitude() == -179.54321); + l1.setLabel("test"); QVERIFY(l1.label() == QString("test")); -- cgit v1.2.3