Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor

This commit is contained in:
Emil Axelsson
2017-04-04 14:26:17 +02:00
25 changed files with 137 additions and 55 deletions
@@ -243,6 +243,8 @@ std::string TemporalTileProvider::getGdalDatasetXML(TimeKey timeKey) {
//size_t numChars = std::string(URL_TIME_PLACEHOLDER).length();
size_t numChars = strlen(URL_TIME_PLACEHOLDER);
ghoul_assert(pos != std::string::npos, "Invalid dataset file");
// @FRAGILE: This will only find the first instance. Dangerous if that instance is
// commented out ---abock
std::string timeSpecifiedXml = xmlTemplate.replace(pos, numChars, timeKey);
return timeSpecifiedXml;
}