zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix Image format bing/google

QGC4.4
Pierre TILAK 6 years ago
parent
89753977dc
commit
863c0ffce2
7 changed files with 30 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/QtLocationPlugin/BingMapProvider.cpp
  2. 10
      src/QtLocationPlugin/BingMapProvider.h
  3. 14
      src/QtLocationPlugin/GoogleMapProvider.cpp
  4. 18
      src/QtLocationPlugin/GoogleMapProvider.h
  5. 4
      src/QtLocationPlugin/QGCMapEngine.cpp
  6. 38
      src/QtLocationPlugin/QGCMapUrlEngine.cpp
  7. 20
      src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp

4
src/QtLocationPlugin/BingMapProvider.cpp
Unescape View File

@ -5,9 +5,9 @@
#endif #endif
#include "QGCMapEngine.h" #include "QGCMapEngine.h"
BingMapProvider::BingMapProvider(quint32 averageSize, BingMapProvider::BingMapProvider(QString imageFormat, quint32 averageSize,
QGeoMapType::MapStyle mapType, QObject* parent) QGeoMapType::MapStyle mapType, QObject* parent)
: MapProvider(QString("https://www.bing.com/maps/"), QString("png"), : MapProvider(QString("https://www.bing.com/maps/"), imageFormat,
averageSize, mapType, parent) {} averageSize, mapType, parent) {}
BingMapProvider::~BingMapProvider() {} BingMapProvider::~BingMapProvider() {}

10
src/QtLocationPlugin/BingMapProvider.h
Unescape View File

@ -12,8 +12,8 @@
class BingMapProvider : public MapProvider { class BingMapProvider : public MapProvider {
Q_OBJECT Q_OBJECT
public: public:
BingMapProvider(quint32 averageSize, QGeoMapType::MapStyle mapType, BingMapProvider(QString imageFormat, quint32 averageSize,
QObject* parent); QGeoMapType::MapStyle mapType, QObject* parent);
~BingMapProvider(); ~BingMapProvider();
@ -35,7 +35,7 @@ class BingRoadMapProvider : public BingMapProvider {
Q_OBJECT Q_OBJECT
public: public:
BingRoadMapProvider(QObject* parent) BingRoadMapProvider(QObject* parent)
: BingMapProvider(AVERAGE_BING_STREET_MAP, QGeoMapType::StreetMap, : BingMapProvider(QString("png"), AVERAGE_BING_STREET_MAP, QGeoMapType::StreetMap,
parent) {} parent) {}
protected: protected:
@ -50,7 +50,7 @@ class BingSatelliteMapProvider : public BingMapProvider {
Q_OBJECT Q_OBJECT
public: public:
BingSatelliteMapProvider(QObject* parent) BingSatelliteMapProvider(QObject* parent)
: BingMapProvider(AVERAGE_BING_SAT_MAP, QGeoMapType::SatelliteMapDay, : BingMapProvider(QString("jpg"), AVERAGE_BING_SAT_MAP, QGeoMapType::SatelliteMapDay,
parent) {} parent) {}
protected: protected:
@ -65,7 +65,7 @@ class BingHybridMapProvider : public BingMapProvider {
Q_OBJECT Q_OBJECT
public: public:
BingHybridMapProvider(QObject* parent) BingHybridMapProvider(QObject* parent)
: BingMapProvider(AVERAGE_BING_SAT_MAP, QGeoMapType::HybridMap, : BingMapProvider(QString("jpg"),AVERAGE_BING_SAT_MAP, QGeoMapType::HybridMap,
parent) {} parent) {}
protected: protected:

14
src/QtLocationPlugin/GoogleMapProvider.cpp
Unescape View File

@ -5,10 +5,11 @@
#endif #endif
#include "QGCMapEngine.h" #include "QGCMapEngine.h"
GoogleMapProvider::GoogleMapProvider(QString imageFormat, quint32 averageSize,
GoogleMapProvider::GoogleMapProvider(quint32 averageSize, QGeoMapType::MapStyle mapType ,QObject* parent) QGeoMapType::MapStyle mapType,
: MapProvider(QString("https://www.google.com/maps/preview"), QObject* parent)
QString("png"), averageSize, mapType, parent), : MapProvider(QString("https://www.google.com/maps/preview"), imageFormat,
averageSize, mapType, parent),
_googleVersionRetrieved(false), _googleReply(nullptr) { _googleVersionRetrieved(false), _googleReply(nullptr) {
// Google version strings // Google version strings
@ -122,8 +123,9 @@ void GoogleMapProvider::_tryCorrectGoogleVersions(
} }
} }
QString GoogleStreetMapProvider::_getURL(int x, int y, int zoom, QString
QNetworkAccessManager* networkManager) { GoogleStreetMapProvider::_getURL(int x, int y, int zoom,
QNetworkAccessManager* networkManager) {
// http://mt1.google.com/vt/lyrs=m // http://mt1.google.com/vt/lyrs=m
QString server = "mt"; QString server = "mt";
QString request = "vt"; QString request = "vt";

18
src/QtLocationPlugin/GoogleMapProvider.h
Unescape View File

@ -12,8 +12,8 @@
class GoogleMapProvider : public MapProvider { class GoogleMapProvider : public MapProvider {
Q_OBJECT Q_OBJECT
public: public:
GoogleMapProvider(quint32 averageSize, QGeoMapType::MapStyle mapType, GoogleMapProvider(QString imageFormat, quint32 averageSize,
QObject* parent); QGeoMapType::MapStyle mapType, QObject* parent);
~GoogleMapProvider(); ~GoogleMapProvider();
@ -67,8 +67,8 @@ class GoogleStreetMapProvider : public GoogleMapProvider {
Q_OBJECT Q_OBJECT
public: public:
GoogleStreetMapProvider(QObject* parent) GoogleStreetMapProvider(QObject* parent)
: GoogleMapProvider(AVERAGE_GOOGLE_STREET_MAP, QGeoMapType::StreetMap, : GoogleMapProvider(QString("png"), AVERAGE_GOOGLE_STREET_MAP,
parent) {} QGeoMapType::StreetMap, parent) {}
protected: protected:
QString _getURL(int x, int y, int zoom, QString _getURL(int x, int y, int zoom,
@ -82,7 +82,7 @@ class GoogleSatelliteMapProvider : public GoogleMapProvider {
Q_OBJECT Q_OBJECT
public: public:
GoogleSatelliteMapProvider(QObject* parent) GoogleSatelliteMapProvider(QObject* parent)
: GoogleMapProvider(AVERAGE_GOOGLE_SAT_MAP, : GoogleMapProvider(QString("jpg"), AVERAGE_GOOGLE_SAT_MAP,
QGeoMapType::SatelliteMapDay, parent) {} QGeoMapType::SatelliteMapDay, parent) {}
protected: protected:
@ -97,8 +97,8 @@ class GoogleLabelsMapProvider : public GoogleMapProvider {
Q_OBJECT Q_OBJECT
public: public:
GoogleLabelsMapProvider(QObject* parent) GoogleLabelsMapProvider(QObject* parent)
: GoogleMapProvider(AVERAGE_TILE_SIZE, QGeoMapType::CustomMap, parent) { : GoogleMapProvider(QString("png"), AVERAGE_TILE_SIZE,
} QGeoMapType::CustomMap, parent) {}
protected: protected:
QString _getURL(int x, int y, int zoom, QString _getURL(int x, int y, int zoom,
@ -112,8 +112,8 @@ class GoogleTerrainMapProvider : public GoogleMapProvider {
Q_OBJECT Q_OBJECT
public: public:
GoogleTerrainMapProvider(QObject* parent) GoogleTerrainMapProvider(QObject* parent)
: GoogleMapProvider(AVERAGE_GOOGLE_TERRAIN_MAP, QGeoMapType::TerrainMap, : GoogleMapProvider(QString("png"), AVERAGE_GOOGLE_TERRAIN_MAP,
parent) {} QGeoMapType::TerrainMap, parent) {}
protected: protected:
QString _getURL(int x, int y, int zoom, QString _getURL(int x, int y, int zoom,

4
src/QtLocationPlugin/QGCMapEngine.cpp
Unescape View File

@ -287,14 +287,14 @@ QGCMapEngine::cacheTile(QString type, const QString& hash, const QByteArray& ima
QString QString
QGCMapEngine::getTileHash(QString type, int x, int y, int z) QGCMapEngine::getTileHash(QString type, int x, int y, int z)
{ {
return QString().sprintf("%09d%08d%08d%03d", getQGCMapEngine()->urlFactory()->getIdFromType(type), x, y, z); return QString().sprintf("%010d%08d%08d%03d", getQGCMapEngine()->urlFactory()->getIdFromType(type), x, y, z);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
QString QString
QGCMapEngine::hashToType(const QString& hash) QGCMapEngine::hashToType(const QString& hash)
{ {
QString type = hash.mid(0,9); QString type = hash.mid(0,10);
return urlFactory()->getTypeFromId(type.toInt()); return urlFactory()->getTypeFromId(type.toInt());
} }

38
src/QtLocationPlugin/QGCMapUrlEngine.cpp
Unescape View File

@ -428,46 +428,14 @@ UrlFactory::_getURL(QString type, int x, int y, int zoom, QNetworkAccessManager*
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
quint32 UrlFactory::averageSizeForType(QString type) { quint32 UrlFactory::averageSizeForType(QString type) {
qDebug() << "UrlFactory::averageSizeForType for" << type;
if (_providersTable.find(type) != _providersTable.end()) { if (_providersTable.find(type) != _providersTable.end()) {
return _providersTable[type]->getAverageSize(); return _providersTable[type]->getAverageSize();
} }
qDebug() << "UrlFactory::averageSizeForType " << type qCDebug(QGCMapUrlEngineLog) << "UrlFactory::averageSizeForType " << type
<< " Not registered"; << " Not registeret";
// switch (type) {
// case GoogleMap:
// return AVERAGE_GOOGLE_STREET_MAP;
// case BingMap:
// return AVERAGE_BING_STREET_MAP;
// case GoogleSatellite:
// return AVERAGE_GOOGLE_SAT_MAP;
// case MapboxSatellite:
// return AVERAGE_MAPBOX_SAT_MAP;
// case BingHybrid:
// case BingSatellite:
// return AVERAGE_BING_SAT_MAP;
// case GoogleTerrain:
// return AVERAGE_GOOGLE_TERRAIN_MAP;
// case MapboxStreets:
// case MapboxStreetsBasic:
// case MapboxRunBikeHike:
// return AVERAGE_MAPBOX_STREET_MAP;
// case AirmapElevation: // case AirmapElevation:
// return AVERAGE_AIRMAP_ELEV_SIZE; // return AVERAGE_AIRMAP_ELEV_SIZE;
// case GoogleLabels:
// case MapboxDark:
// case MapboxLight:
// case MapboxOutdoors:
// case MapboxPencil:
// case OpenStreetMap:
// case GoogleHybrid:
// case MapboxComic:
// case MapboxEmerald:
// case MapboxHighContrast:
// case MapboxHybrid:
// case MapboxPirates:
// case MapboxWheatPaste:
// default: // default:
// break; // break;
// } // }

20
src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp
Unescape View File

@ -126,25 +126,7 @@ QGeoTiledMappingManagerEngineQGC::QGeoTiledMappingManagerEngineQGC(const QVarian
// QGCGEOMAPTYPE(QGeoMapType::SatelliteMapDay, "MapQuest Satellite Map", "MapQuest satellite map", false, false, UrlFactory::MapQuestSat), // QGCGEOMAPTYPE(QGeoMapType::SatelliteMapDay, "MapQuest Satellite Map", "MapQuest satellite map", false, false, UrlFactory::MapQuestSat),
// */ // */
// //
// /*
// * These are OK as you need your own token for accessing it. Out-of-the box, QGC does not even offer these unless you enter a proper Mapbox token.
// */
//
// QGCGEOMAPTYPE(QGeoMapType::StreetMap, "Mapbox Street Map", "Mapbox Street Map", false, false, UrlFactory::MapboxStreets),
// QGCGEOMAPTYPE(QGeoMapType::SatelliteMapDay, "Mapbox Satellite Map", "Mapbox Satellite Map", false, false, UrlFactory::MapboxSatellite),
// QGCGEOMAPTYPE(QGeoMapType::CustomMap, "Mapbox High Contrast Map", "Mapbox High Contrast Map", false, false, UrlFactory::MapboxHighContrast),
// QGCGEOMAPTYPE(QGeoMapType::CustomMap, "Mapbox Light Map", "Mapbox Light Map", false, false, UrlFactory::MapboxLight),
// QGCGEOMAPTYPE(QGeoMapType::CustomMap, "Mapbox Dark Map", "Mapbox Dark Map", false, false, UrlFactory::MapboxDark),
// QGCGEOMAPTYPE(QGeoMapType::HybridMap, "Mapbox Hybrid Map", "Mapbox Hybrid Map", false, false, UrlFactory::MapboxHybrid),
// QGCGEOMAPTYPE(QGeoMapType::CustomMap, "Mapbox Wheat Paste Map", "Mapbox Wheat Paste Map", false, false, UrlFactory::MapboxWheatPaste),
// QGCGEOMAPTYPE(QGeoMapType::StreetMap, "Mapbox Streets Basic Map", "Mapbox Streets Basic Map", false, false, UrlFactory::MapboxStreetsBasic),
// QGCGEOMAPTYPE(QGeoMapType::CustomMap, "Mapbox Comic Map", "Mapbox Comic Map", false, false, UrlFactory::MapboxComic),
// QGCGEOMAPTYPE(QGeoMapType::CustomMap, "Mapbox Outdoors Map", "Mapbox Outdoors Map", false, false, UrlFactory::MapboxOutdoors),
// QGCGEOMAPTYPE(QGeoMapType::CycleMap, "Mapbox Run, Byke and Hike Map", "Mapbox Run, Byke and Hike Map", false, false, UrlFactory::MapboxRunBikeHike),
// QGCGEOMAPTYPE(QGeoMapType::CustomMap, "Mapbox Pencil Map", "Mapbox Pencil Map", false, false, UrlFactory::MapboxPencil),
// QGCGEOMAPTYPE(QGeoMapType::CustomMap, "Mapbox Pirates Map", "Mapbox Pirates Map", false, false, UrlFactory::MapboxPirates),
// QGCGEOMAPTYPE(QGeoMapType::CustomMap, "Mapbox Emerald Map", "Mapbox Emerald Map", false, false, UrlFactory::MapboxEmerald),
// });
//-- Users (QML code) can define a different user agent //-- Users (QML code) can define a different user agent
if (parameters.contains(QStringLiteral("useragent"))) { if (parameters.contains(QStringLiteral("useragent"))) {

Write Preview
Loading…
Cancel
Save