mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Move helper functions around
We had a ton of helper functions in qt-gui.cpp which really didn't make much sense. So I moved them all into qthelper.cpp. Also moved the UserAgent helper that didn't belong in the UpdateHandler to begin with - that's a generic helper used in many places... With this we can successfully build using cmake again. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
62999c866f
commit
ddc01e39e7
9 changed files with 405 additions and 386 deletions
41
divesitehelpers.cpp
Normal file
41
divesitehelpers.cpp
Normal file
|
@ -0,0 +1,41 @@
|
|||
//
|
||||
// infrastructure to deal with dive sites
|
||||
//
|
||||
#include "divesite.h"
|
||||
#include "helpers.h"
|
||||
#include "usersurvey.h"
|
||||
#include "membuffer.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonObject>
|
||||
#include <QNetworkReply>
|
||||
#include <QNetworkRequest>
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QUrlQuery>
|
||||
#include <QEventLoop>
|
||||
|
||||
extern "C" void reverseGeoLookup(degrees_t latitude, degrees_t longitude, uint32_t uuid)
|
||||
{
|
||||
QNetworkRequest request;
|
||||
QNetworkAccessManager *rgl = new QNetworkAccessManager();
|
||||
request.setUrl(QString("http://open.mapquestapi.com/nominatim/v1/reverse.php?format=json&accept-language=%1&lat=%2&lon=%3")
|
||||
.arg(uiLanguage(NULL)).arg(latitude.udeg / 1000000.0).arg(longitude.udeg / 1000000.0));
|
||||
request.setRawHeader("Accept", "text/json");
|
||||
request.setRawHeader("User-Agent", getUserAgent().toUtf8());
|
||||
QNetworkReply *reply = rgl->get(request);
|
||||
QEventLoop loop;
|
||||
QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
|
||||
loop.exec();
|
||||
QJsonParseError errorObject;
|
||||
QJsonDocument jsonDoc = QJsonDocument::fromJson(reply->readAll(), &errorObject);
|
||||
if (errorObject.error != QJsonParseError::NoError) {
|
||||
qDebug() << errorObject.errorString();
|
||||
} else {
|
||||
QJsonObject obj = jsonDoc.object();
|
||||
QJsonObject address = obj.value("address").toObject();
|
||||
qDebug() << "found country:" << address.value("country").toString();
|
||||
struct dive_site *ds = get_dive_site_by_uuid(uuid);
|
||||
ds->notes = add_to_string(ds->notes, "countrytag: %s", address.value("country").toString().toUtf8().data());
|
||||
}
|
||||
}
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue