Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

This commit is contained in:
Emil Axelsson
2017-12-04 10:52:12 +01:00
175 changed files with 5984 additions and 4556 deletions

View File

@@ -502,16 +502,11 @@ std::string GlobeBrowsingModule::layerTypeNamesList() {
void GlobeBrowsingModule::loadWMSCapabilities(std::string name, std::string globe,
std::string url)
{
auto downloadFunction = [](const std::string& url) {
auto downloadFunction = [](const std::string& downloadUrl) {
GDALDatasetH dataset = GDALOpen(
url.c_str(),
downloadUrl.c_str(),
GA_ReadOnly
);
// GDAL_OF_READONLY | GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR,
// nullptr,
// nullptr,
// nullptr
//);
char** subDatasets = GDALGetMetadata(dataset, "SUBDATASETS");
int nSubdatasets = CSLCount(subDatasets);