Merged in f5soh/librepilot/LP-572_OPMap_WP_setup (pull request #487)

LP-572 Waypoint setup more usable

Approved-by: Lalanne Laurent <f5soh@free.fr>

Author: f5soh

ground/gcs/src/libs/opmapcontrol/src/core/providerstrings.cpp

@@ -41,7 +41,7 @@ ProviderStrings::ProviderStrings()
 {
     // Google version strings
     VersionGoogleMap = "m@301";
-    QString version    = "713";
+    QString version    = "794";
     QString envVersion = qgetenv("GCS_GOOGLE_SAT_VERSION").constData();
     VersionGoogleSatellite = (envVersion.toInt() > version.toInt()) ? envVersion : version;
     VersionGoogleLabels    = "h@301";

ground/gcs/src/libs/opmapcontrol/src/core/urlfactory.cpp

@@ -214,7 +214,7 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
     break;
     case MapType::GoogleSatellite:
     {
-        QString server  = "khm";
+        QString server  = "khms";
         QString request = "kh";
         QString sec1    = ""; // after &x=...
         QString sec2    = ""; // after &zoom=...

ground/gcs/src/libs/opmapcontrol/src/mapwidget/homeitem.cpp

@@ -73,7 +73,12 @@ QRectF HomeItem::boundingRect() const
     if (pic.width() > localsafearea * 2 && !toggleRefresh) {
         return QRectF(-pic.width() / 2, -pic.height() / 2, pic.width(), pic.height());
     } else {
-        return QRectF(-localsafearea, -localsafearea, localsafearea * 2, localsafearea * 2);
+        // FIXME: LP-573 For some reason when boundingRect is defined normally,
+        // return QRectF(-localsafearea, -localsafearea, localsafearea * 2, localsafearea * 2);
+        // the previous safearea circle and Home (both at previous/smaller size) still drawed
+        // into the corner of boudingRect area when zoom in.
+        // Current workaround is done expanding x100 the boundingRect returned.
+        return QRectF(-localsafearea * 100, -localsafearea * 100, localsafearea * 200, localsafearea * 200);
     }
 }
 
@@ -98,6 +103,12 @@ void HomeItem::RefreshPos()
     toggleRefresh = false;
 }
 
+void HomeItem::SetHomePic(QString HomePic)
+{
+    pic.load(":/markers/images/" + HomePic);
+    pic = pic.scaled(30, 30, Qt::IgnoreAspectRatio);
+}
+
 void HomeItem::setOpacitySlot(qreal opacity)
 {
     setOpacity(opacity);

ground/gcs/src/libs/opmapcontrol/src/mapwidget/homeitem.h

@@ -102,6 +102,7 @@ class HomeItem : public QObject, public QGraphicsItem {
     QPainterPath shape() const;
 public slots:
     void RefreshPos();
+    void SetHomePic(QString HomePic);
     void setOpacitySlot(qreal opacity);
 signals:
     void homePositionChanged(internals::PointLatLng coord, float);