Merge pull request #910 from mavlink/mapfixes

Mapfixes

libs/opmapcontrol/src/core/urlfactory.cpp

@@ -210,7 +210,8 @@ namespace core {
                 QString sec2 = ""; // after &zoom=...
                 GetSecGoogleWords(pos,  sec1,  sec2);
                 TryCorrectGoogleVersions();
-                return QString("https://%1%2.google.com/%3/v=%4&hl=%5&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleSatellite).arg(language).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
+                //this does not yield good results in practice return QString("https://%1%2.google.com/%3/v=%4&hl=%5&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleSatellite).arg(language).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
+                return QString("http://mt1.google.com/vt/lyrs=y&x=%1%2&y=%3&z=%4").arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom);
             }
             break;
         case MapType::GoogleLabels:

libs/opmapcontrol/src/internals/tilematrix.cpp

@@ -100,7 +100,7 @@ void TileMatrix::Clear()
 void TileMatrix::ClearPointsNotIn(QList<Point>list)
 {
     removals.clear();
-    mutex.lock();
+    QMutexLocker lock(&mutex);
     foreach(Point p, matrix.keys())
     {
         if(!list.contains(p))
@@ -108,17 +108,14 @@ void TileMatrix::ClearPointsNotIn(QList<Point>list)
             removals.append(p);
         }
     }
-    mutex.unlock();
     foreach(Point p,removals)
     {
-        Tile* t=TileAt(p);
+        Tile* t=matrix.value(p, 0);
         if(t!=0)
         {
-            mutex.lock();
             delete t;
             t=0;
             matrix.remove(p);
-            mutex.unlock();
         }
 
     }

src/ui/PrimaryFlightDisplay.cc

@@ -453,7 +453,7 @@ void PrimaryFlightDisplay::drawTextCenterBottom (
     font.setPixelSize(pixelSize);
     painter.setFont(font);
 
-    QFontMetrics metrics = QFontMetrics(font);
+    QFontMetrics metrics(font);
     QRect bounds = metrics.boundingRect(text);
     int flags = Qt::AlignCenter;
     painter.drawText(x - bounds.width()/2, y, bounds.width(), bounds.height(), flags, text);