Merge branch 'dev' into 'feature/web'

# Conflicts:
#   data/parcours2.json
#   mainwindow.cpp
#   mainwindow.h
#   step.cpp
#   step.h

step.cpp

@@ -64,6 +64,16 @@ Step::Step() {
 }
 
 
+QList<QString> Step::getPersonnage() const
+{
+    return personnage;
+}
+
+QList<QString> Step::getTexte() const
+{
+    return texte;
+}
+
 Step::Step( QJsonObject &in)
 {
     title = in["title"].toString();
@@ -71,7 +81,7 @@ Step::Step( QJsonObject &in)
     QString gps = in["GPS"].toString();
     QStringList parts = gps.split(" ", Qt::SkipEmptyParts);
 
-    QChar latDir = parts[0][0];  // c'est le premier QChar du QString t'as capté
+    QChar latDir = parts[0][0];
     int latDeg = parts[1].toInt();
     float latMin = parts[2].toFloat();
     setLatitude(latDeg, latMin, latDir);
@@ -110,3 +120,25 @@ void Step::setLongitude(int degree, float minute, QChar EW)
     if (EW.toUpper() == 'W')
         longitude = -longitude;
 }
+
+QString Step::toGPSFormat(){
+    int latDeg = static_cast<int>(latitude);
+    float latMin = (latitude - latDeg) * 60.0;
+    QChar latDir = latitude >= 0 ? 'N' : 'S';
+    latDeg = abs(latDeg);
+
+    int lonDeg = static_cast<int>(longitude);
+    float lonMin = (longitude - lonDeg) * 60.0;
+    QChar lonDir = longitude >= 0 ? 'E' : 'W';
+    lonDeg = abs(lonDeg);
+
+    QString gpsString = QString("%1 %2 %3 %4 %5 %6")
+            .arg(latDir)
+            .arg(latDeg, 2)
+            .arg(latMin, 5, 'f', 3)
+            .arg(lonDir)
+            .arg(lonDeg, 2)
+            .arg(lonMin, 5, 'f', 3);
+
+    return gpsString;
+}