Re-factored the source to use the new coordinate classes

[situare] / src / situareservice / situareservice.cpp

diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp
index c046ebb..5a497d4 100644 (file)
--- a/src/situareservice/situareservice.cpp
+++ b/src/situareservice/situareservice.cpp
@@ -76,7 +76,7 @@ void SituareService::fetchLocations()
     sendRequest(url, COOKIE, cookie);
 }
 
-void SituareService::reverseGeo(const QPointF &coordinates)
+void SituareService::reverseGeo(const GeoCoordinate &coordinates)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
@@ -91,7 +91,7 @@ void SituareService::reverseGeo(const QPointF &coordinates)
     sendRequest(url, COOKIE, cookie);
 }
 
-void SituareService::updateLocation(const QPointF &coordinates, const QString &status,
+void SituareService::updateLocation(const GeoCoordinate &coordinates, const QString &status,
                                     const bool &publish)
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -188,7 +188,7 @@ QUrl SituareService::formUrl(const QString &baseUrl, const QString &phpScript,
     return url;
 }
 
-QString SituareService::formUrlParameters(const QPointF &coordinates, QString status,
+QString SituareService::formUrlParameters(const GeoCoordinate &coordinates, QString status,
                                           QString publish)
 {
     QString parameters;
@@ -196,11 +196,11 @@ QString SituareService::formUrlParameters(const QPointF &coordinates, QString st
     parameters.append(QUESTION_MARK);
     parameters.append(LATITUDE);
     parameters.append(EQUAL_MARK);
-    parameters.append(QString::number(coordinates.y()));
+    parameters.append(QString::number(coordinates.latitude()));
     parameters.append(AMBERSAND_MARK);
     parameters.append(LONGTITUDE);
     parameters.append(EQUAL_MARK);
-    parameters.append(QString::number(coordinates.x()));
+    parameters.append(QString::number(coordinates.longitude()));
 
     if(publish.compare(PUBLISH_TRUE) == 0) {
         parameters.append(AMBERSAND_MARK);
@@ -287,7 +287,7 @@ void SituareService::credentialsReady(const FacebookCredentials &credentials)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_credentials = credentials;    
+    m_credentials = credentials;
 }
 
 void SituareService::parseUserData(const QByteArray &jsonReply)
@@ -314,7 +314,7 @@ void SituareService::parseUserData(const QByteArray &jsonReply)
             QVariant userVariant = result.value("user");
             QMap<QString, QVariant> userMap = userVariant.toMap();
 
-            QPointF coordinates(userMap["longitude"].toReal(), userMap["latitude"].toReal());
+            GeoCoordinate coordinates(userMap["latitude"].toReal(), userMap["longitude"].toReal());
 
             QUrl imageUrl = userMap[NORMAL_SIZE_PROFILE_IMAGE].toUrl();
 
@@ -326,8 +326,8 @@ void SituareService::parseUserData(const QByteArray &jsonReply)
             QString address = userMap["address"].toString();
             if(address.isEmpty()) {
                 QStringList location;
-                location.append(QString::number(coordinates.y()));
-                location.append(QString::number(coordinates.x()));
+                location.append(QString::number(coordinates.latitude()));
+                location.append(QString::number(coordinates.longitude()));
                 address = location.join(", ");
             }
 
@@ -342,7 +342,7 @@ void SituareService::parseUserData(const QByteArray &jsonReply)
               QVariant distance = friendMap["distance"];
               QMap<QString, QVariant> distanceMap = distance.toMap();
 
-              QPointF coordinates(friendMap["longitude"].toReal(), friendMap["latitude"].toReal());
+              GeoCoordinate coordinates(friendMap["latitude"].toReal(),friendMap["longitude"].toReal());
 
               QUrl imageUrl = friendMap["profile_pic"].toUrl();
 
@@ -354,8 +354,8 @@ void SituareService::parseUserData(const QByteArray &jsonReply)
               QString address = friendMap["address"].toString();
               if(address.isEmpty()) {
                   QStringList location;
-                  location.append(QString::number(coordinates.y()));
-                  location.append(QString::number(coordinates.x()));
+                  location.append(QString::number(coordinates.latitude()));
+                  location.append(QString::number(coordinates.longitude()));
                   address = location.join(", ");
               }