mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Subsurface-mobile: do send decimal GPS to Google

Browse source 
Sending nicely readable formatted coordinates to Google Maps does not
result in a correctly positioned map. Google likes unreadable
decimal format.

Little hacky solution. Added a gps_decimal attribute, populate that
with the standard function for format a coordinate to string, but
reset the preferences value temporarly so that it always converts it
to decimal style.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2017-03-21 17:52:29 +01:00 • committed by Dirk Hohndel
parent 6e38619970
commit d6003209d6
4 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/subsurface-qt/DiveObjectHelper.cpp
View file

@ -109,6 +109,18 @@ QString DiveObjectHelper::gps() const
struct dive_site *ds = get_dive_site_by_uuid(m_dive->dive_site_uuid);
return ds ? QString(printGPSCoords(ds->latitude.udeg, ds->longitude.udeg)) : QString();
}
QString DiveObjectHelper::gps_decimal() const
{
bool savep = prefs.coordinates_traditional;
QString val;
prefs.coordinates_traditional = false;
val = gps();
prefs.coordinates_traditional = savep;
return(val);
}
QString DiveObjectHelper::duration() const
{
return get_dive_duration_string(m_dive->duration.seconds, QObject::tr("h:"), QObject::tr("min"));

2
core/subsurface-qt/DiveObjectHelper.h
View file

@ -18,6 +18,7 @@ class DiveObjectHelper : public QObject {
Q_PROPERTY(int timestamp READ timestamp CONSTANT)
Q_PROPERTY(QString location READ location CONSTANT)
Q_PROPERTY(QString gps READ gps CONSTANT)
Q_PROPERTY(QString gps_decimal READ gps_decimal CONSTANT)
Q_PROPERTY(QString duration READ duration CONSTANT)
Q_PROPERTY(bool noDive READ noDive CONSTANT)
Q_PROPERTY(QString depth READ depth CONSTANT)
@ -60,6 +61,7 @@ public:
QString time() const;
QString location() const;
QString gps() const;
QString gps_decimal() const;
QString duration() const;
bool noDive() const;
QString depth() const;

2
mobile-widgets/qml/DiveDetails.qml
View file

@ -89,7 +89,7 @@ Kirigami.Page {
text: qsTr("Show on map")
iconName: "gps"
onTriggered: {
showMap(diveDetailsListView.currentItem.modelData.dive.gps)
showMap(diveDetailsListView.currentItem.modelData.dive.gps_decimal)
}
}

4
mobile-widgets/qml/DiveDetailsView.qml
View file

@ -53,8 +53,8 @@ Item {
MouseArea {
anchors.fill: parent
onClicked: {
if (dive.gps !== "")
showMap(dive.gps)
if (dive.gps_decimal !== "")
showMap(dive.gps_decimal)
}
}
}