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

Merge pull request #5158 from dogmaphobic/Typos 

Fix Mapbox capitalization.
QGC4.4
Gus Grubba 8 years ago committed by GitHub
parent
225952877d b5e7b4d92e
commit
6237ab4b28
12 changed files with 118 additions and 118 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. 38
      src/QtLocationPlugin/QGCMapEngine.cpp
  2. 112
      src/QtLocationPlugin/QGCMapUrlEngine.cpp
  3. 28
      src/QtLocationPlugin/QGCMapUrlEngine.h
  4. 6
      src/QtLocationPlugin/QGeoMapReplyQGC.cpp
  5. 2
      src/QtLocationPlugin/QGeoMapReplyQGC.h
  6. 30
      src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp
  7. 6
      src/QtLocationPlugin/QMLControl/OfflineMap.qml
  8. 6
      src/Settings/App.SettingsGroup.json
  9. 2
      src/Settings/AppSettings.cc
  10. 2
      src/Settings/FlightMap.SettingsGroup.json
  11. 2
      src/Settings/FlightMapSettings.cc
  12. 2
      src/Settings/FlightMapSettings.h

38
src/QtLocationPlugin/QGCMapEngine.cpp
Unescape View File

@ -64,24 +64,24 @@ stQGeoTileCacheQGCMapTypes kMapTypes[] = {
#define NUM_MAPS (sizeof(kMapTypes) / sizeof(stQGeoTileCacheQGCMapTypes)) #define NUM_MAPS (sizeof(kMapTypes) / sizeof(stQGeoTileCacheQGCMapTypes))
stQGeoTileCacheQGCMapTypes kMapBoxTypes[] = { stQGeoTileCacheQGCMapTypes kMapboxTypes[] = {
{"MapBox Street Map", UrlFactory::MapBoxStreets}, {"Mapbox Street Map", UrlFactory::MapboxStreets},
{"MapBox Satellite Map", UrlFactory::MapBoxSatellite}, {"Mapbox Satellite Map", UrlFactory::MapboxSatellite},
{"MapBox High Contrast Map",UrlFactory::MapBoxHighContrast}, {"Mapbox High Contrast Map",UrlFactory::MapboxHighContrast},
{"MapBox Light Map", UrlFactory::MapBoxLight}, {"Mapbox Light Map", UrlFactory::MapboxLight},
{"MapBox Dark Map", UrlFactory::MapBoxDark}, {"Mapbox Dark Map", UrlFactory::MapboxDark},
{"MapBox Hybrid Map", UrlFactory::MapBoxHybrid}, {"Mapbox Hybrid Map", UrlFactory::MapboxHybrid},
{"MapBox Wheat Paste Map", UrlFactory::MapBoxWheatPaste}, {"Mapbox Wheat Paste Map", UrlFactory::MapboxWheatPaste},
{"MapBox Streets Basic Map",UrlFactory::MapBoxStreetsBasic}, {"Mapbox Streets Basic Map",UrlFactory::MapboxStreetsBasic},
{"MapBox Comic Map", UrlFactory::MapBoxComic}, {"Mapbox Comic Map", UrlFactory::MapboxComic},
{"MapBox Outdoors Map", UrlFactory::MapBoxOutdoors}, {"Mapbox Outdoors Map", UrlFactory::MapboxOutdoors},
{"MapBox Run, Byke and Hike Map", UrlFactory::MapBoxRunBikeHike}, {"Mapbox Run, Byke and Hike Map", UrlFactory::MapboxRunBikeHike},
{"MapBox Pencil Map", UrlFactory::MapBoxPencil}, {"Mapbox Pencil Map", UrlFactory::MapboxPencil},
{"MapBox Pirates Map", UrlFactory::MapBoxPirates}, {"Mapbox Pirates Map", UrlFactory::MapboxPirates},
{"MapBox Emerald Map", UrlFactory::MapBoxEmerald} {"Mapbox Emerald Map", UrlFactory::MapboxEmerald}
}; };
#define NUM_MAPBOXMAPS (sizeof(kMapBoxTypes) / sizeof(stQGeoTileCacheQGCMapTypes)) #define NUM_MAPBOXMAPS (sizeof(kMapboxTypes) / sizeof(stQGeoTileCacheQGCMapTypes))
stQGeoTileCacheQGCMapTypes kEsriTypes[] = { stQGeoTileCacheQGCMapTypes kEsriTypes[] = {
{"Esri Street Map", UrlFactory::EsriWorldStreet}, {"Esri Street Map", UrlFactory::EsriWorldStreet},
@ -329,8 +329,8 @@ QGCMapEngine::getTypeFromName(const QString& name)
return kMapTypes[i].type; return kMapTypes[i].type;
} }
for(i = 0; i < NUM_MAPBOXMAPS; i++) { for(i = 0; i < NUM_MAPBOXMAPS; i++) {
if(name.compare(kMapBoxTypes[i].name, Qt::CaseInsensitive) == 0) if(name.compare(kMapboxTypes[i].name, Qt::CaseInsensitive) == 0)
return kMapBoxTypes[i].type; return kMapboxTypes[i].type;
} }
for(i = 0; i < NUM_ESRIMAPS; i++) { for(i = 0; i < NUM_ESRIMAPS; i++) {
if(name.compare(kEsriTypes[i].name, Qt::CaseInsensitive) == 0) if(name.compare(kEsriTypes[i].name, Qt::CaseInsensitive) == 0)
@ -349,7 +349,7 @@ QGCMapEngine::getMapNameList()
} }
if(!qgcApp()->toolbox()->settingsManager()->appSettings()->mapboxToken()->rawValue().toString().isEmpty()) { if(!qgcApp()->toolbox()->settingsManager()->appSettings()->mapboxToken()->rawValue().toString().isEmpty()) {
for(size_t i = 0; i < NUM_MAPBOXMAPS; i++) { 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()) { if(!qgcApp()->toolbox()->settingsManager()->appSettings()->esriToken()->rawValue().toString().isEmpty()) {

112
src/QtLocationPlugin/QGCMapUrlEngine.cpp
Unescape View File

@ -100,20 +100,20 @@ UrlFactory::getImageFormat(MapType type, const QByteArray& image)
case MapQuestSat: case MapQuestSat:
case OpenStreetMap: case OpenStreetMap:
*/ */
case MapBoxStreets: case MapboxStreets:
case MapBoxLight: case MapboxLight:
case MapBoxDark: case MapboxDark:
case MapBoxSatellite: case MapboxSatellite:
case MapBoxHybrid: case MapboxHybrid:
case MapBoxWheatPaste: case MapboxWheatPaste:
case MapBoxStreetsBasic: case MapboxStreetsBasic:
case MapBoxComic: case MapboxComic:
case MapBoxOutdoors: case MapboxOutdoors:
case MapBoxRunBikeHike: case MapboxRunBikeHike:
case MapBoxPencil: case MapboxPencil:
case MapBoxPirates: case MapboxPirates:
case MapBoxEmerald: case MapboxEmerald:
case MapBoxHighContrast: case MapboxHighContrast:
case GoogleSatellite: case GoogleSatellite:
case BingSatellite: case BingSatellite:
case BingHybrid: case BingHybrid:
@ -323,65 +323,65 @@ UrlFactory::_getURL(MapType type, int x, int y, int zoom, QNetworkAccessManager*
case EsriTerrain: 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); 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 MapboxStreets:
case MapBoxLight: case MapboxLight:
case MapBoxDark: case MapboxDark:
case MapBoxSatellite: case MapboxSatellite:
case MapBoxHybrid: case MapboxHybrid:
case MapBoxWheatPaste: case MapboxWheatPaste:
case MapBoxStreetsBasic: case MapboxStreetsBasic:
case MapBoxComic: case MapboxComic:
case MapBoxOutdoors: case MapboxOutdoors:
case MapBoxRunBikeHike: case MapboxRunBikeHike:
case MapBoxPencil: case MapboxPencil:
case MapBoxPirates: case MapboxPirates:
case MapBoxEmerald: case MapboxEmerald:
case MapBoxHighContrast: case MapboxHighContrast:
{ {
QString mapBoxToken = qgcApp()->toolbox()->settingsManager()->appSettings()->mapboxToken()->rawValue().toString(); QString mapBoxToken = qgcApp()->toolbox()->settingsManager()->appSettings()->mapboxToken()->rawValue().toString();
if(!mapBoxToken.isEmpty()) { if(!mapBoxToken.isEmpty()) {
QString server = "https://api.mapbox.com/v4/"; QString server = "https://api.mapbox.com/v4/";
switch(type) { switch(type) {
case MapBoxStreets: case MapboxStreets:
server += "mapbox.streets"; server += "mapbox.streets";
break; break;
case MapBoxLight: case MapboxLight:
server += "mapbox.light"; server += "mapbox.light";
break; break;
case MapBoxDark: case MapboxDark:
server += "mapbox.dark"; server += "mapbox.dark";
break; break;
case MapBoxSatellite: case MapboxSatellite:
server += "mapbox.satellite"; server += "mapbox.satellite";
break; break;
case MapBoxHybrid: case MapboxHybrid:
server += "mapbox.streets-satellite"; server += "mapbox.streets-satellite";
break; break;
case MapBoxWheatPaste: case MapboxWheatPaste:
server += "mapbox.wheatpaste"; server += "mapbox.wheatpaste";
break; break;
case MapBoxStreetsBasic: case MapboxStreetsBasic:
server += "mapbox.streets-basic"; server += "mapbox.streets-basic";
break; break;
case MapBoxComic: case MapboxComic:
server += "mapbox.comic"; server += "mapbox.comic";
break; break;
case MapBoxOutdoors: case MapboxOutdoors:
server += "mapbox.outdoors"; server += "mapbox.outdoors";
break; break;
case MapBoxRunBikeHike: case MapboxRunBikeHike:
server += "mapbox.run-bike-hike"; server += "mapbox.run-bike-hike";
break; break;
case MapBoxPencil: case MapboxPencil:
server += "mapbox.pencil"; server += "mapbox.pencil";
break; break;
case MapBoxPirates: case MapboxPirates:
server += "mapbox.pirates"; server += "mapbox.pirates";
break; break;
case MapBoxEmerald: case MapboxEmerald:
server += "mapbox.emerald"; server += "mapbox.emerald";
break; break;
case MapBoxHighContrast: case MapboxHighContrast:
server += "mapbox.high-contrast"; server += "mapbox.high-contrast";
break; break;
default: default:
@ -546,30 +546,30 @@ UrlFactory::averageSizeForType(MapType type)
return AVERAGE_BING_STREET_MAP; return AVERAGE_BING_STREET_MAP;
case GoogleSatellite: case GoogleSatellite:
return AVERAGE_GOOGLE_SAT_MAP; return AVERAGE_GOOGLE_SAT_MAP;
case MapBoxSatellite: case MapboxSatellite:
return AVERAGE_MAPBOX_SAT_MAP; return AVERAGE_MAPBOX_SAT_MAP;
case BingHybrid: case BingHybrid:
case BingSatellite: case BingSatellite:
return AVERAGE_BING_SAT_MAP; return AVERAGE_BING_SAT_MAP;
case GoogleTerrain: case GoogleTerrain:
return AVERAGE_GOOGLE_TERRAIN_MAP; return AVERAGE_GOOGLE_TERRAIN_MAP;
case MapBoxStreets: case MapboxStreets:
case MapBoxStreetsBasic: case MapboxStreetsBasic:
case MapBoxRunBikeHike: case MapboxRunBikeHike:
return AVERAGE_MAPBOX_STREET_MAP; return AVERAGE_MAPBOX_STREET_MAP;
case GoogleLabels: case GoogleLabels:
case MapBoxDark: case MapboxDark:
case MapBoxLight: case MapboxLight:
case MapBoxOutdoors: case MapboxOutdoors:
case MapBoxPencil: case MapboxPencil:
case OpenStreetMap: case OpenStreetMap:
case GoogleHybrid: case GoogleHybrid:
case MapBoxComic: case MapboxComic:
case MapBoxEmerald: case MapboxEmerald:
case MapBoxHighContrast: case MapboxHighContrast:
case MapBoxHybrid: case MapboxHybrid:
case MapBoxPirates: case MapboxPirates:
case MapBoxWheatPaste: case MapboxWheatPaste:
default: default:
break; break;
} }

28
src/QtLocationPlugin/QGCMapUrlEngine.h
Unescape View File

@ -55,20 +55,20 @@ public:
MapQuestSat = 701, MapQuestSat = 701,
*/ */
MapBoxStreets = 6000, MapboxStreets = 6000,
MapBoxLight = 6001, MapboxLight = 6001,
MapBoxDark = 6002, MapboxDark = 6002,
MapBoxSatellite = 6003, MapboxSatellite = 6003,
MapBoxHybrid = 6004, MapboxHybrid = 6004,
MapBoxWheatPaste = 6005, MapboxWheatPaste = 6005,
MapBoxStreetsBasic = 6006, MapboxStreetsBasic = 6006,
MapBoxComic = 6007, MapboxComic = 6007,
MapBoxOutdoors = 6008, MapboxOutdoors = 6008,
MapBoxRunBikeHike = 6009, MapboxRunBikeHike = 6009,
MapBoxPencil = 6010, MapboxPencil = 6010,
MapBoxPirates = 6011, MapboxPirates = 6011,
MapBoxEmerald = 6012, MapboxEmerald = 6012,
MapBoxHighContrast = 6013, MapboxHighContrast = 6013,
EsriWorldStreet = 7000, EsriWorldStreet = 7000,
EsriWorldSatellite = 7001, EsriWorldSatellite = 7001,

6
src/QtLocationPlugin/QGeoMapReplyQGC.cpp
Unescape View File

@ -62,12 +62,12 @@ QGeoTiledMapReplyQGC::QGeoTiledMapReplyQGC(QNetworkAccessManager *networkManager
, _networkManager(networkManager) , _networkManager(networkManager)
{ {
if(_request.url().isEmpty()) { if(_request.url().isEmpty()) {
if(!_badMapBox.size()) { if(!_badMapbox.size()) {
QFile b(":/res/notile.png"); QFile b(":/res/notile.png");
if(b.open(QFile::ReadOnly)) if(b.open(QFile::ReadOnly))
_badMapBox = b.readAll(); _badMapbox = b.readAll();
} }
setMapImageData(_badMapBox); setMapImageData(_badMapbox);
setMapImageFormat("png"); setMapImageFormat("png");
setFinished(true); setFinished(true);
setCached(false); setCached(false);

2
src/QtLocationPlugin/QGeoMapReplyQGC.h
Unescape View File

@ -75,7 +75,7 @@ private:
QNetworkReply* _reply; QNetworkReply* _reply;
QNetworkRequest _request; QNetworkRequest _request;
QNetworkAccessManager* _networkManager; QNetworkAccessManager* _networkManager;
QByteArray _badMapBox; QByteArray _badMapbox;
QByteArray _badTile; QByteArray _badTile;
QTimer _timer; QTimer _timer;
static int _requestCount; static int _requestCount;

30
src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp
Unescape View File

@ -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::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::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 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 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::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::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::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::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 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::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::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 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 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::CustomMap, "Mapbox Emerald Map", "Mapbox Emerald Map", false, false, UrlFactory::MapboxEmerald);
setSupportedMapTypes(mapTypes); setSupportedMapTypes(mapTypes);

6
src/QtLocationPlugin/QMLControl/OfflineMap.qml
Unescape View File

@ -277,7 +277,7 @@ QGCView {
} }
Item { width: 1; height: 1; visible: _mapboxFact ? _mapboxFact.visible : false } 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 { FactTextField {
fact: _mapboxFact fact: _mapboxFact
visible: _mapboxFact ? _mapboxFact.visible : false visible: _mapboxFact ? _mapboxFact.visible : false
@ -285,7 +285,7 @@ QGCView {
width: ScreenTools.defaultFontPixelWidth * 30 width: ScreenTools.defaultFontPixelWidth * 30
} }
QGCLabel { 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 visible: _mapboxFact ? _mapboxFact.visible : false
font.pointSize: _adjustableFontPointSize font.pointSize: _adjustableFontPointSize
} }
@ -299,7 +299,7 @@ QGCView {
width: ScreenTools.defaultFontPixelWidth * 30 width: ScreenTools.defaultFontPixelWidth * 30
} }
QGCLabel { 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 visible: _esriFact ? _esriFact.visible : false
font.pointSize: _adjustableFontPointSize font.pointSize: _adjustableFontPointSize
} }

6
src/Settings/App.SettingsGroup.json
Unescape View File

@ -124,9 +124,9 @@
"defaultValue": "" "defaultValue": ""
}, },
{ {
"name": "MapBoxToken", "name": "MapboxToken",
"shortDescription": "Access token to MapBox maps", "shortDescription": "Access token to Mapbox maps",
"longDescription": "Your personal access token for MapBox maps", "longDescription": "Your personal access token for Mapbox maps",
"type": "string", "type": "string",
"defaultValue": "" "defaultValue": ""
}, },

2
src/Settings/AppSettings.cc
Unescape View File

@ -31,7 +31,7 @@ const char* AppSettings::indoorPaletteName = "StyleIs
const char* AppSettings::showLargeCompassName = "ShowLargeCompass"; const char* AppSettings::showLargeCompassName = "ShowLargeCompass";
const char* AppSettings::savePathName = "SavePath"; const char* AppSettings::savePathName = "SavePath";
const char* AppSettings::autoLoadMissionsName = "AutoLoadMissions"; const char* AppSettings::autoLoadMissionsName = "AutoLoadMissions";
const char* AppSettings::mapboxTokenName = "MapBoxToken"; const char* AppSettings::mapboxTokenName = "MapboxToken";
const char* AppSettings::esriTokenName = "EsriToken"; const char* AppSettings::esriTokenName = "EsriToken";
const char* AppSettings::parameterFileExtension = "params"; const char* AppSettings::parameterFileExtension = "params";

2
src/Settings/FlightMap.SettingsGroup.json
Unescape View File

@ -3,7 +3,7 @@
"name": "MapProvider", "name": "MapProvider",
"shortDescription": "Currently selected map provider for flight maps", "shortDescription": "Currently selected map provider for flight maps",
"type": "uint32", "type": "uint32",
"enumStrings": "Bing,Google,Statkart,MapBox,Esri", "enumStrings": "Bing,Google,Statkart,Mapbox,Esri",
"enumValues": "0,1,2,3,4", "enumValues": "0,1,2,3,4",
"defaultValue": 0 "defaultValue": 0
}, },

2
src/Settings/FlightMapSettings.cc
Unescape View File

@ -38,7 +38,7 @@ FlightMapSettings::FlightMapSettings(QObject* parent)
_excludeProvider(mapProviderGoogle); _excludeProvider(mapProviderGoogle);
#endif #endif
if(qgcApp()->toolbox()->settingsManager()->appSettings()->mapboxToken()->rawValue().toString().isEmpty()) { if(qgcApp()->toolbox()->settingsManager()->appSettings()->mapboxToken()->rawValue().toString().isEmpty()) {
_excludeProvider(mapProviderMapBox); _excludeProvider(mapProviderMapbox);
} }
if(qgcApp()->toolbox()->settingsManager()->appSettings()->esriToken()->rawValue().toString().isEmpty()) { if(qgcApp()->toolbox()->settingsManager()->appSettings()->esriToken()->rawValue().toString().isEmpty()) {
_excludeProvider(mapProviderEsri); _excludeProvider(mapProviderEsri);

2
src/Settings/FlightMapSettings.h
Unescape View File

@ -24,7 +24,7 @@ public:
mapProviderBing, mapProviderBing,
mapProviderGoogle, mapProviderGoogle,
mapProviderStarkart, mapProviderStarkart,
mapProviderMapBox, mapProviderMapbox,
mapProviderEsri mapProviderEsri
} MapProvider_t; } MapProvider_t;

Write Preview
Loading…
Cancel
Save