Changed other queries to use the new interface.

diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp
index 624838c..b14b8f7 100644 (file)
--- a/src/situareservice/situareservice.cpp
+++ b/src/situareservice/situareservice.cpp
@@ -138,16 +138,20 @@ void SituareService::credentialsReady(const FacebookCredentials &credentials)
     m_credentials = credentials;
 }
 
-void SituareService::fetchLocations()
+QString SituareService::degreesToString(double degrees)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-//    QString cookie = formCookie(API_KEY, m_credentials.expires(), m_credentials.userID(),
-//                                m_credentials.sessionKey(), m_credentials.sessionSecret(),
-//                                m_credentials.sig(), EN_LOCALE);
+    // one scene pixel is about 5.4e-6 degrees, the integer part is max three digits and one
+    // additional digit is added for maximum precision
+    const int PRECISION = 10;
+
+    return QString::number(degrees, 'f', PRECISION);
+}
 
-//    QUrl url = formUrl(SITUARE_URL, GET_LOCATIONS);
-//    sendRequest(url, COOKIE, cookie);
+void SituareService::fetchLocations()
+{
+    qDebug() << __PRETTY_FUNCTION__;
 
     QHash<QString, QString> parameters;
     parameters.insert("extra_user_data", NORMAL_SIZE_PROFILE_IMAGE);
@@ -508,15 +512,12 @@ void SituareService::reverseGeo(const GeoCoordinate &coordinates)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QString cookie = formCookie(API_KEY, m_credentials.expires(),m_credentials.userID(),
-                                m_credentials.sessionKey(), m_credentials.sessionSecret(),
-                                m_credentials.sig(), EN_LOCALE);
-
-    QString urlParameters = formUrlParameters(coordinates);
-    urlParameters.append(JSON_FORMAT);
-    QUrl url = formUrl(SITUARE_URL, REVERSE_GEO, urlParameters);
+    QHash<QString, QString> parameters;
+    parameters.insert("lat", degreesToString(coordinates.latitude()));
+    parameters.insert("lon", degreesToString(coordinates.longitude()));
+    parameters.insert("format", "json");
 
-    sendRequest(url, COOKIE, cookie);
+    buildRequest(REVERSE_GEO, parameters);
 }
 
 void SituareService::sendRequest(const QUrl &url, const QString &cookieType, const QString &cookie)
@@ -565,12 +566,11 @@ void SituareService::updateLocation(const GeoCoordinate &coordinates, const QStr
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QString urlParameters = formUrlParameters(coordinates, status, publish);
-    QUrl url = formUrl(SITUARE_URL, UPDATE_LOCATION, urlParameters);
-
-    QString cookie = formCookie(API_KEY, m_credentials.expires(), m_credentials.userID(),
-                                m_credentials.sessionKey(), m_credentials.sessionSecret(),
-                                m_credentials.sig(), EN_LOCALE);
+    QHash<QString, QString> parameters;
+    parameters.insert("lat", degreesToString(coordinates.latitude()));
+    parameters.insert("lon", degreesToString(coordinates.longitude()));
+    parameters.insert("publish", publish ? "true" : "false");
+    parameters.insert("data", status); ///< @todo if !empty ???
 
-    sendRequest(url, COOKIE, cookie);
+    buildRequest(UPDATE_LOCATION, parameters);
 }

diff --git a/src/situareservice/situareservice.h b/src/situareservice/situareservice.h
index d38bd4b..5e97115 100644 (file)
--- a/src/situareservice/situareservice.h
+++ b/src/situareservice/situareservice.h
@@ -121,6 +121,8 @@ private:
 
     void appendAccessToken(QString &requestUrl);
 
+    QString degreesToString(double degrees);
+
     /**
     * @brief Forms a http cookie
     *