diff --git a/src/QtLocationPlugin/QGCMapEngine.cpp b/src/QtLocationPlugin/QGCMapEngine.cpp index 0478283..cb2b277 100644 --- a/src/QtLocationPlugin/QGCMapEngine.cpp +++ b/src/QtLocationPlugin/QGCMapEngine.cpp @@ -64,24 +64,24 @@ stQGeoTileCacheQGCMapTypes kMapTypes[] = { #define NUM_MAPS (sizeof(kMapTypes) / sizeof(stQGeoTileCacheQGCMapTypes)) -stQGeoTileCacheQGCMapTypes kMapBoxTypes[] = { - {"MapBox Street Map", UrlFactory::MapBoxStreets}, - {"MapBox Satellite Map", UrlFactory::MapBoxSatellite}, - {"MapBox High Contrast Map",UrlFactory::MapBoxHighContrast}, - {"MapBox Light Map", UrlFactory::MapBoxLight}, - {"MapBox Dark Map", UrlFactory::MapBoxDark}, - {"MapBox Hybrid Map", UrlFactory::MapBoxHybrid}, - {"MapBox Wheat Paste Map", UrlFactory::MapBoxWheatPaste}, - {"MapBox Streets Basic Map",UrlFactory::MapBoxStreetsBasic}, - {"MapBox Comic Map", UrlFactory::MapBoxComic}, - {"MapBox Outdoors Map", UrlFactory::MapBoxOutdoors}, - {"MapBox Run, Byke and Hike Map", UrlFactory::MapBoxRunBikeHike}, - {"MapBox Pencil Map", UrlFactory::MapBoxPencil}, - {"MapBox Pirates Map", UrlFactory::MapBoxPirates}, - {"MapBox Emerald Map", UrlFactory::MapBoxEmerald} +stQGeoTileCacheQGCMapTypes kMapboxTypes[] = { + {"Mapbox Street Map", UrlFactory::MapboxStreets}, + {"Mapbox Satellite Map", UrlFactory::MapboxSatellite}, + {"Mapbox High Contrast Map",UrlFactory::MapboxHighContrast}, + {"Mapbox Light Map", UrlFactory::MapboxLight}, + {"Mapbox Dark Map", UrlFactory::MapboxDark}, + {"Mapbox Hybrid Map", UrlFactory::MapboxHybrid}, + {"Mapbox Wheat Paste Map", UrlFactory::MapboxWheatPaste}, + {"Mapbox Streets Basic Map",UrlFactory::MapboxStreetsBasic}, + {"Mapbox Comic Map", UrlFactory::MapboxComic}, + {"Mapbox Outdoors Map", UrlFactory::MapboxOutdoors}, + {"Mapbox Run, Byke and Hike Map", UrlFactory::MapboxRunBikeHike}, + {"Mapbox Pencil Map", UrlFactory::MapboxPencil}, + {"Mapbox Pirates Map", UrlFactory::MapboxPirates}, + {"Mapbox Emerald Map", UrlFactory::MapboxEmerald} }; -#define NUM_MAPBOXMAPS (sizeof(kMapBoxTypes) / sizeof(stQGeoTileCacheQGCMapTypes)) +#define NUM_MAPBOXMAPS (sizeof(kMapboxTypes) / sizeof(stQGeoTileCacheQGCMapTypes)) stQGeoTileCacheQGCMapTypes kEsriTypes[] = { {"Esri Street Map", UrlFactory::EsriWorldStreet}, @@ -329,8 +329,8 @@ QGCMapEngine::getTypeFromName(const QString& name) return kMapTypes[i].type; } for(i = 0; i < NUM_MAPBOXMAPS; i++) { - if(name.compare(kMapBoxTypes[i].name, Qt::CaseInsensitive) == 0) - return kMapBoxTypes[i].type; + if(name.compare(kMapboxTypes[i].name, Qt::CaseInsensitive) == 0) + return kMapboxTypes[i].type; } for(i = 0; i < NUM_ESRIMAPS; i++) { if(name.compare(kEsriTypes[i].name, Qt::CaseInsensitive) == 0) @@ -349,7 +349,7 @@ QGCMapEngine::getMapNameList() } if(!qgcApp()->toolbox()->settingsManager()->appSettings()->mapboxToken()->rawValue().toString().isEmpty()) { for(size_t i = 0; i < NUM_MAPBOXMAPS; i++) { - mapList << kMapBoxTypes[i].name; + mapList << kMapboxTypes[i].name; } } if(!qgcApp()->toolbox()->settingsManager()->appSettings()->esriToken()->rawValue().toString().isEmpty()) { diff --git a/src/QtLocationPlugin/QGCMapUrlEngine.cpp b/src/QtLocationPlugin/QGCMapUrlEngine.cpp index 4fb6e7a..b429cd5 100644 --- a/src/QtLocationPlugin/QGCMapUrlEngine.cpp +++ b/src/QtLocationPlugin/QGCMapUrlEngine.cpp @@ -100,20 +100,20 @@ UrlFactory::getImageFormat(MapType type, const QByteArray& image) case MapQuestSat: case OpenStreetMap: */ - case MapBoxStreets: - case MapBoxLight: - case MapBoxDark: - case MapBoxSatellite: - case MapBoxHybrid: - case MapBoxWheatPaste: - case MapBoxStreetsBasic: - case MapBoxComic: - case MapBoxOutdoors: - case MapBoxRunBikeHike: - case MapBoxPencil: - case MapBoxPirates: - case MapBoxEmerald: - case MapBoxHighContrast: + case MapboxStreets: + case MapboxLight: + case MapboxDark: + case MapboxSatellite: + case MapboxHybrid: + case MapboxWheatPaste: + case MapboxStreetsBasic: + case MapboxComic: + case MapboxOutdoors: + case MapboxRunBikeHike: + case MapboxPencil: + case MapboxPirates: + case MapboxEmerald: + case MapboxHighContrast: case GoogleSatellite: case BingSatellite: case BingHybrid: @@ -323,65 +323,65 @@ UrlFactory::_getURL(MapType type, int x, int y, int zoom, QNetworkAccessManager* case EsriTerrain: return QString("http://server.arcgisonline.com/ArcGIS/rest/services/World_Terrain_Base/MapServer/tile/%1/%2/%3").arg(zoom).arg(y).arg(x); - case MapBoxStreets: - case MapBoxLight: - case MapBoxDark: - case MapBoxSatellite: - case MapBoxHybrid: - case MapBoxWheatPaste: - case MapBoxStreetsBasic: - case MapBoxComic: - case MapBoxOutdoors: - case MapBoxRunBikeHike: - case MapBoxPencil: - case MapBoxPirates: - case MapBoxEmerald: - case MapBoxHighContrast: + case MapboxStreets: + case MapboxLight: + case MapboxDark: + case MapboxSatellite: + case MapboxHybrid: + case MapboxWheatPaste: + case MapboxStreetsBasic: + case MapboxComic: + case MapboxOutdoors: + case MapboxRunBikeHike: + case MapboxPencil: + case MapboxPirates: + case MapboxEmerald: + case MapboxHighContrast: { QString mapBoxToken = qgcApp()->toolbox()->settingsManager()->appSettings()->mapboxToken()->rawValue().toString(); if(!mapBoxToken.isEmpty()) { QString server = "https://api.mapbox.com/v4/"; switch(type) { - case MapBoxStreets: + case MapboxStreets: server += "mapbox.streets"; break; - case MapBoxLight: + case MapboxLight: server += "mapbox.light"; break; - case MapBoxDark: + case MapboxDark: server += "mapbox.dark"; break; - case MapBoxSatellite: + case MapboxSatellite: server += "mapbox.satellite"; break; - case MapBoxHybrid: + case MapboxHybrid: server += "mapbox.streets-satellite"; break; - case MapBoxWheatPaste: + case MapboxWheatPaste: server += "mapbox.wheatpaste"; break; - case MapBoxStreetsBasic: + case MapboxStreetsBasic: server += "mapbox.streets-basic"; break; - case MapBoxComic: + case MapboxComic: server += "mapbox.comic"; break; - case MapBoxOutdoors: + case MapboxOutdoors: server += "mapbox.outdoors"; break; - case MapBoxRunBikeHike: + case MapboxRunBikeHike: server += "mapbox.run-bike-hike"; break; - case MapBoxPencil: + case MapboxPencil: server += "mapbox.pencil"; break; - case MapBoxPirates: + case MapboxPirates: server += "mapbox.pirates"; break; - case MapBoxEmerald: + case MapboxEmerald: server += "mapbox.emerald"; break; - case MapBoxHighContrast: + case MapboxHighContrast: server += "mapbox.high-contrast"; break; default: @@ -546,30 +546,30 @@ UrlFactory::averageSizeForType(MapType type) return AVERAGE_BING_STREET_MAP; case GoogleSatellite: return AVERAGE_GOOGLE_SAT_MAP; - case MapBoxSatellite: + 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: + case MapboxStreets: + case MapboxStreetsBasic: + case MapboxRunBikeHike: return AVERAGE_MAPBOX_STREET_MAP; case GoogleLabels: - case MapBoxDark: - case MapBoxLight: - case MapBoxOutdoors: - case MapBoxPencil: + case MapboxDark: + case MapboxLight: + case MapboxOutdoors: + case MapboxPencil: case OpenStreetMap: case GoogleHybrid: - case MapBoxComic: - case MapBoxEmerald: - case MapBoxHighContrast: - case MapBoxHybrid: - case MapBoxPirates: - case MapBoxWheatPaste: + case MapboxComic: + case MapboxEmerald: + case MapboxHighContrast: + case MapboxHybrid: + case MapboxPirates: + case MapboxWheatPaste: default: break; } diff --git a/src/QtLocationPlugin/QGCMapUrlEngine.h b/src/QtLocationPlugin/QGCMapUrlEngine.h index ecd841e..b9791ff 100644 --- a/src/QtLocationPlugin/QGCMapUrlEngine.h +++ b/src/QtLocationPlugin/QGCMapUrlEngine.h @@ -55,20 +55,20 @@ public: MapQuestSat = 701, */ - MapBoxStreets = 6000, - MapBoxLight = 6001, - MapBoxDark = 6002, - MapBoxSatellite = 6003, - MapBoxHybrid = 6004, - MapBoxWheatPaste = 6005, - MapBoxStreetsBasic = 6006, - MapBoxComic = 6007, - MapBoxOutdoors = 6008, - MapBoxRunBikeHike = 6009, - MapBoxPencil = 6010, - MapBoxPirates = 6011, - MapBoxEmerald = 6012, - MapBoxHighContrast = 6013, + MapboxStreets = 6000, + MapboxLight = 6001, + MapboxDark = 6002, + MapboxSatellite = 6003, + MapboxHybrid = 6004, + MapboxWheatPaste = 6005, + MapboxStreetsBasic = 6006, + MapboxComic = 6007, + MapboxOutdoors = 6008, + MapboxRunBikeHike = 6009, + MapboxPencil = 6010, + MapboxPirates = 6011, + MapboxEmerald = 6012, + MapboxHighContrast = 6013, EsriWorldStreet = 7000, EsriWorldSatellite = 7001, diff --git a/src/QtLocationPlugin/QGeoMapReplyQGC.cpp b/src/QtLocationPlugin/QGeoMapReplyQGC.cpp index 0747eb4..2c88231 100644 --- a/src/QtLocationPlugin/QGeoMapReplyQGC.cpp +++ b/src/QtLocationPlugin/QGeoMapReplyQGC.cpp @@ -62,12 +62,12 @@ QGeoTiledMapReplyQGC::QGeoTiledMapReplyQGC(QNetworkAccessManager *networkManager , _networkManager(networkManager) { if(_request.url().isEmpty()) { - if(!_badMapBox.size()) { + if(!_badMapbox.size()) { QFile b(":/res/notile.png"); if(b.open(QFile::ReadOnly)) - _badMapBox = b.readAll(); + _badMapbox = b.readAll(); } - setMapImageData(_badMapBox); + setMapImageData(_badMapbox); setMapImageFormat("png"); setFinished(true); setCached(false); diff --git a/src/QtLocationPlugin/QGeoMapReplyQGC.h b/src/QtLocationPlugin/QGeoMapReplyQGC.h index 132c5d2..dcde1f0 100644 --- a/src/QtLocationPlugin/QGeoMapReplyQGC.h +++ b/src/QtLocationPlugin/QGeoMapReplyQGC.h @@ -75,7 +75,7 @@ private: QNetworkReply* _reply; QNetworkRequest _request; QNetworkAccessManager* _networkManager; - QByteArray _badMapBox; + QByteArray _badMapbox; QByteArray _badTile; QTimer _timer; static int _requestCount; diff --git a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp index 33751da..b4c9714 100644 --- a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp +++ b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp @@ -132,23 +132,23 @@ QGeoTiledMappingManagerEngineQGC::QGeoTiledMappingManagerEngineQGC(const QVarian */ /* - * 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. + * 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. */ - mapTypes << QGeoMapType(QGeoMapType::StreetMap, "MapBox Street Map", "MapBox Street Map", false, false, UrlFactory::MapBoxStreets); - mapTypes << QGeoMapType(QGeoMapType::SatelliteMapDay, "MapBox Satellite Map", "MapBox Satellite Map", false, false, UrlFactory::MapBoxSatellite); - mapTypes << QGeoMapType(QGeoMapType::CustomMap, "MapBox High Contrast Map", "MapBox High Contrast Map", false, false, UrlFactory::MapBoxHighContrast); - mapTypes << QGeoMapType(QGeoMapType::CustomMap, "MapBox Light Map", "MapBox Light Map", false, false, UrlFactory::MapBoxLight); - mapTypes << QGeoMapType(QGeoMapType::CustomMap, "MapBox Dark Map", "MapBox Dark Map", false, false, UrlFactory::MapBoxDark); - mapTypes << QGeoMapType(QGeoMapType::HybridMap, "MapBox Hybrid Map", "MapBox Hybrid Map", false, false, UrlFactory::MapBoxHybrid); - mapTypes << QGeoMapType(QGeoMapType::CustomMap, "MapBox Wheat Paste Map", "MapBox Wheat Paste Map", false, false, UrlFactory::MapBoxWheatPaste); - mapTypes << QGeoMapType(QGeoMapType::StreetMap, "MapBox Streets Basic Map", "MapBox Streets Basic Map", false, false, UrlFactory::MapBoxStreetsBasic); - mapTypes << QGeoMapType(QGeoMapType::CustomMap, "MapBox Comic Map", "MapBox Comic Map", false, false, UrlFactory::MapBoxComic); - mapTypes << QGeoMapType(QGeoMapType::CustomMap, "MapBox Outdoors Map", "MapBox Outdoors Map", false, false, UrlFactory::MapBoxOutdoors); - mapTypes << QGeoMapType(QGeoMapType::CycleMap, "MapBox Run, Byke and Hike Map", "MapBox Run, Byke and Hike Map", false, false, UrlFactory::MapBoxRunBikeHike); - mapTypes << QGeoMapType(QGeoMapType::CustomMap, "MapBox Pencil Map", "MapBox Pencil Map", false, false, UrlFactory::MapBoxPencil); - mapTypes << QGeoMapType(QGeoMapType::CustomMap, "MapBox Pirates Map", "MapBox Pirates Map", false, false, UrlFactory::MapBoxPirates); - mapTypes << QGeoMapType(QGeoMapType::CustomMap, "MapBox Emerald Map", "MapBox Emerald Map", false, false, UrlFactory::MapBoxEmerald); + mapTypes << QGeoMapType(QGeoMapType::StreetMap, "Mapbox Street Map", "Mapbox Street Map", false, false, UrlFactory::MapboxStreets); + mapTypes << QGeoMapType(QGeoMapType::SatelliteMapDay, "Mapbox Satellite Map", "Mapbox Satellite Map", false, false, UrlFactory::MapboxSatellite); + mapTypes << QGeoMapType(QGeoMapType::CustomMap, "Mapbox High Contrast Map", "Mapbox High Contrast Map", false, false, UrlFactory::MapboxHighContrast); + mapTypes << QGeoMapType(QGeoMapType::CustomMap, "Mapbox Light Map", "Mapbox Light Map", false, false, UrlFactory::MapboxLight); + mapTypes << QGeoMapType(QGeoMapType::CustomMap, "Mapbox Dark Map", "Mapbox Dark Map", false, false, UrlFactory::MapboxDark); + mapTypes << QGeoMapType(QGeoMapType::HybridMap, "Mapbox Hybrid Map", "Mapbox Hybrid Map", false, false, UrlFactory::MapboxHybrid); + mapTypes << QGeoMapType(QGeoMapType::CustomMap, "Mapbox Wheat Paste Map", "Mapbox Wheat Paste Map", false, false, UrlFactory::MapboxWheatPaste); + mapTypes << QGeoMapType(QGeoMapType::StreetMap, "Mapbox Streets Basic Map", "Mapbox Streets Basic Map", false, false, UrlFactory::MapboxStreetsBasic); + mapTypes << QGeoMapType(QGeoMapType::CustomMap, "Mapbox Comic Map", "Mapbox Comic Map", false, false, UrlFactory::MapboxComic); + mapTypes << QGeoMapType(QGeoMapType::CustomMap, "Mapbox Outdoors Map", "Mapbox Outdoors Map", false, false, UrlFactory::MapboxOutdoors); + mapTypes << QGeoMapType(QGeoMapType::CycleMap, "Mapbox Run, Byke and Hike Map", "Mapbox Run, Byke and Hike Map", false, false, UrlFactory::MapboxRunBikeHike); + mapTypes << QGeoMapType(QGeoMapType::CustomMap, "Mapbox Pencil Map", "Mapbox Pencil Map", false, false, UrlFactory::MapboxPencil); + mapTypes << QGeoMapType(QGeoMapType::CustomMap, "Mapbox Pirates Map", "Mapbox Pirates Map", false, false, UrlFactory::MapboxPirates); + mapTypes << QGeoMapType(QGeoMapType::CustomMap, "Mapbox Emerald Map", "Mapbox Emerald Map", false, false, UrlFactory::MapboxEmerald); setSupportedMapTypes(mapTypes); diff --git a/src/QtLocationPlugin/QMLControl/OfflineMap.qml b/src/QtLocationPlugin/QMLControl/OfflineMap.qml index 662b6c9..b5a42c1 100644 --- a/src/QtLocationPlugin/QMLControl/OfflineMap.qml +++ b/src/QtLocationPlugin/QMLControl/OfflineMap.qml @@ -277,7 +277,7 @@ QGCView { } Item { width: 1; height: 1; visible: _mapboxFact ? _mapboxFact.visible : false } - QGCLabel { text: qsTr("MapBox Access Token"); visible: _mapboxFact ? _mapboxFact.visible : false } + QGCLabel { text: qsTr("Mapbox Access Token"); visible: _mapboxFact ? _mapboxFact.visible : false } FactTextField { fact: _mapboxFact visible: _mapboxFact ? _mapboxFact.visible : false @@ -285,7 +285,7 @@ QGCView { width: ScreenTools.defaultFontPixelWidth * 30 } QGCLabel { - text: qsTr("With an access token, you can use MapBox Maps.") + text: qsTr("To enable Mapbox maps, enter your access token.") visible: _mapboxFact ? _mapboxFact.visible : false font.pointSize: _adjustableFontPointSize } @@ -299,7 +299,7 @@ QGCView { width: ScreenTools.defaultFontPixelWidth * 30 } QGCLabel { - text: qsTr("With an access token, you can use Esri Maps.") + text: qsTr("To enable Esri maps, enter your access token.") visible: _esriFact ? _esriFact.visible : false font.pointSize: _adjustableFontPointSize } diff --git a/src/Settings/App.SettingsGroup.json b/src/Settings/App.SettingsGroup.json index 976d9cd..e5338eb 100644 --- a/src/Settings/App.SettingsGroup.json +++ b/src/Settings/App.SettingsGroup.json @@ -124,9 +124,9 @@ "defaultValue": "" }, { - "name": "MapBoxToken", - "shortDescription": "Access token to MapBox maps", - "longDescription": "Your personal access token for MapBox maps", + "name": "MapboxToken", + "shortDescription": "Access token to Mapbox maps", + "longDescription": "Your personal access token for Mapbox maps", "type": "string", "defaultValue": "" }, diff --git a/src/Settings/AppSettings.cc b/src/Settings/AppSettings.cc index 14d964a..5cae039 100644 --- a/src/Settings/AppSettings.cc +++ b/src/Settings/AppSettings.cc @@ -31,7 +31,7 @@ const char* AppSettings::indoorPaletteName = "StyleIs const char* AppSettings::showLargeCompassName = "ShowLargeCompass"; const char* AppSettings::savePathName = "SavePath"; const char* AppSettings::autoLoadMissionsName = "AutoLoadMissions"; -const char* AppSettings::mapboxTokenName = "MapBoxToken"; +const char* AppSettings::mapboxTokenName = "MapboxToken"; const char* AppSettings::esriTokenName = "EsriToken"; const char* AppSettings::parameterFileExtension = "params"; diff --git a/src/Settings/FlightMap.SettingsGroup.json b/src/Settings/FlightMap.SettingsGroup.json index 915dbb4..c3e30e5 100644 --- a/src/Settings/FlightMap.SettingsGroup.json +++ b/src/Settings/FlightMap.SettingsGroup.json @@ -3,7 +3,7 @@ "name": "MapProvider", "shortDescription": "Currently selected map provider for flight maps", "type": "uint32", - "enumStrings": "Bing,Google,Statkart,MapBox,Esri", + "enumStrings": "Bing,Google,Statkart,Mapbox,Esri", "enumValues": "0,1,2,3,4", "defaultValue": 0 }, diff --git a/src/Settings/FlightMapSettings.cc b/src/Settings/FlightMapSettings.cc index ece0be3..c814f85 100644 --- a/src/Settings/FlightMapSettings.cc +++ b/src/Settings/FlightMapSettings.cc @@ -38,7 +38,7 @@ FlightMapSettings::FlightMapSettings(QObject* parent) _excludeProvider(mapProviderGoogle); #endif if(qgcApp()->toolbox()->settingsManager()->appSettings()->mapboxToken()->rawValue().toString().isEmpty()) { - _excludeProvider(mapProviderMapBox); + _excludeProvider(mapProviderMapbox); } if(qgcApp()->toolbox()->settingsManager()->appSettings()->esriToken()->rawValue().toString().isEmpty()) { _excludeProvider(mapProviderEsri); diff --git a/src/Settings/FlightMapSettings.h b/src/Settings/FlightMapSettings.h index 5b23734..e849bfe 100644 --- a/src/Settings/FlightMapSettings.h +++ b/src/Settings/FlightMapSettings.h @@ -24,7 +24,7 @@ public: mapProviderBing, mapProviderGoogle, mapProviderStarkart, - mapProviderMapBox, + mapProviderMapbox, mapProviderEsri } MapProvider_t;