mirror of
https://github.com/subsurface/subsurface.git
synced 2025-01-19 06:15:26 +00:00
Proof of concept for reverse geo location
When reading a pre-v3 XML file, we now do reverse geo lookups on the GPS coordinates and add the country to the dive site notes. Eventually this wants to be a tag (once we implement tags for dive sites). This is going to add quite a bit of delay when people open a V2 XML file - depending on how many distinct GPS fixes they have. In my case with 127 GPS fixes it took about 20 seconds to open the file... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
a081fb34e0
commit
5bf86f6042
2 changed files with 43 additions and 1 deletions
|
@ -1162,6 +1162,7 @@ static void gps_location(char *buffer, struct dive_site *ds)
|
|||
|
||||
/* this is in qthelper.cpp, so including the .h file is a pain */
|
||||
extern const char *printGPSCoords(int lat, int lon);
|
||||
extern void reverseGeoLookup(degrees_t, degrees_t, uint32_t);
|
||||
|
||||
static void gps_in_dive(char *buffer, struct dive *dive)
|
||||
{
|
||||
|
@ -1179,10 +1180,11 @@ static void gps_in_dive(char *buffer, struct dive *dive)
|
|||
} else {
|
||||
fprintf(stderr, "found no uuid in dive, no existing dive site with these coordinates, creating a new divesite without name and above GPS\n");
|
||||
dive->dive_site_uuid = create_dive_site_with_gps("", latitude, longitude);
|
||||
ds = get_dive_site_by_uuid(dive->dive_site_uuid);
|
||||
}
|
||||
} else {
|
||||
fprintf(stderr, "found uuid in dive, checking to see if we should add GPS\n");
|
||||
struct dive_site *ds = get_dive_site_by_uuid(uuid);
|
||||
ds = get_dive_site_by_uuid(uuid);
|
||||
if (dive_site_has_gps_location(ds) &&
|
||||
(latitude.udeg != 0 || longitude.udeg != 0) &&
|
||||
(ds->latitude.udeg != latitude.udeg || ds->longitude.udeg != longitude.udeg)) {
|
||||
|
@ -1198,6 +1200,8 @@ static void gps_in_dive(char *buffer, struct dive *dive)
|
|||
ds->longitude = longitude;
|
||||
}
|
||||
}
|
||||
if (ds && (!ds->notes || strstr(ds->notes, "countrytag:") == NULL))
|
||||
reverseGeoLookup(latitude, longitude, dive->dive_site_uuid);
|
||||
}
|
||||
|
||||
static void add_dive_site(char *buffer, struct dive *dive)
|
||||
|
|
38
qthelper.cpp
38
qthelper.cpp
|
@ -1,6 +1,10 @@
|
|||
#include "qthelper.h"
|
||||
#include "helpers.h"
|
||||
#include "gettextfromc.h"
|
||||
#include "statistics.h"
|
||||
#include "subsurfacewebservices.h"
|
||||
#include "usersurvey.h"
|
||||
#include "membuffer.h"
|
||||
#include <exif.h>
|
||||
#include "file.h"
|
||||
#include <QFile>
|
||||
|
@ -8,6 +12,15 @@
|
|||
#include <QDir>
|
||||
#include <QDebug>
|
||||
#include <QSettings>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonObject>
|
||||
#include <QNetworkReply>
|
||||
#include <QNetworkRequest>
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QUrlQuery>
|
||||
#include <QEventLoop>
|
||||
|
||||
#include <libxslt/documents.h>
|
||||
|
||||
#define translate(_context, arg) trGettext(arg)
|
||||
|
@ -342,3 +355,28 @@ void selectedDivesGasUsed(QVector<QPair<QString, int> > &gasUsedOrdered)
|
|||
}
|
||||
qSort(gasUsedOrdered.begin(), gasUsedOrdered.end(), lessThan);
|
||||
}
|
||||
|
||||
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", UserSurvey::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
Reference in a new issue