b

App/mainwindow.cpp

@@ -90,7 +90,7 @@ MainWindow::MainWindow(QWidget *parent)
     map->setAttribute(Qt::WA_AlwaysStackOnTop);
 
     //QString maptype = myinifile->ReadIni("GCS.ini","Map","Type");
-    map->SetMapType(mapcontrol::Helper::MapTypeFromString("BingSatellite"));
+    map->SetMapType(mapcontrol::Helper::MapTypeFromString("GoogleSatellite"));
     map->setWPLock(true);
     map->setFocus();
     map->setMouseTracking(true);

Skin/Skin.pro

@@ -7,7 +7,18 @@
 
 QT       -= gui
 
-TARGET = Skin
+# Capture whether this is a release/debug build.
+CONFIG(debug, debug|release) {
+    # Target name.
+    TARGET = Skind
+}
+CONFIG(release, debug|release) {
+    # Target name.
+    TARGET = Skin
+}
+
+
+
 TEMPLATE = lib
 
 DEFINES += SKIN_LIBRARY

opmap/core/cache.cpp

@@ -57,11 +57,7 @@ QString Cache::CacheLocation()
 Cache::Cache()//修改地址
 {
     if (cache.isNull() | cache.isEmpty()) {
-//        cache = QDir::homePath() + "/mapscache/";
-        // cache = QDir::currentPath() + "/mapscache/";
         cache = QDir::currentPath() + "/maps/";
-        //cache = "./maps/";
-//        cache = Utils::PathUtils().GetStoragePath() + "mapscache" + QDir::separator();
 #ifdef DEBUG_GetGeocoderFromCache
     qDebug() << cache;
 #endif

opmap/core/providerstrings.cpp

@@ -39,7 +39,7 @@ ProviderStrings::ProviderStrings()
 {
     // Google version strings
     VersionGoogleMap       = "h@249000000";
-    VersionGoogleSatellite = "145";
+    VersionGoogleSatellite = "865";
     VersionGoogleLabels    = "h@221000000";
     VersionGoogleTerrain   = "t@132,r@249000000";
     SecGoogleWord = "Galileo";

opmap/core/urlfactory.cpp

@@ -191,13 +191,14 @@ 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=...
         GetSecGoogleWords(pos, sec1, sec2);
         TryCorrectGoogleVersions();
-        return QString("http://%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://%1%2.google.com/%3/v=%4?x=%5&y=%6&z=%7").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleSatellite).arg(pos.X()).arg(pos.Y()).arg(zoom);
+                     //https://khms0.google.com/kh/v=865?x=15&y=5&z=4
     }
     break;
     case MapType::GoogleLabels:

qNavigationWidget/qnavigationwidget.pro

@@ -4,9 +4,18 @@ QT    += serialport
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
+# Capture whether this is a release/debug build.
+CONFIG(debug, debug|release) {
+    # Target name.
+    TARGET = qNavigationd
+}
+CONFIG(release, debug|release) {
+    # Target name.
+    TARGET = qNavigation
+}
+
 
 
-TARGET = qNavigation
 TEMPLATE = lib
 
 DEFINES += QNAVGATION_LIBRARY