Merge pull request #39 from umr-dbs/gdal_handle_netcdf_subdataset

gdal source: handle netcdf subdataset and log

Author: ChristianBeilschmidt

src/operators/source/gdal_source.cpp

@@ -7,6 +7,7 @@
 #include "util/gdal_source_datasets.h"
 #include "util/gdal_dataset_importer.h"
 #include "util/configuration.h"
+#include "util/log.h"
 
 /**
  * Operator that loads raster data via gdal. Loads them from imported GDAL dataset, import via GDAL dataset importer.
@@ -103,8 +104,10 @@ std::unique_ptr<GenericRaster> RasterGDALSourceOperator::getRaster(const QueryRe
 
     if (gdalParams.isMember("channels")) {
         datasetJson = gdalParams;
+        Log::debug("getRaster: Using gdalParams.");
     } else {
         datasetJson = GDALSourceDataSets::getDataSetDescription(sourcename);
+        Log::debug("getRaster: Using getDataSetDescription.");
     }
 
 	GDALTimesnap::GDALDataLoadingInfo loadingInfo = GDALTimesnap::getDataLoadingInfo(datasetJson, channel, rect);
@@ -318,6 +321,7 @@ std::unique_ptr<GenericRaster> RasterGDALSourceOperator::loadDataset(const GDALT
 	GDAL::init();
 	std::string fileName = loadingInfo.fileName;
     injectParameters(fileName, qrect, tools);
+    Log::debug(concat("loadDataset: using filename: ", fileName.c_str()));
 
 	auto dataset = (GDALDataset *) GDALOpen(fileName.c_str(), GA_ReadOnly);
 

src/util/gdal_timesnap.cpp

@@ -1,5 +1,7 @@
 #include "gdal_timesnap.h"
 #include <boost/filesystem.hpp>
+#include "util/concat.h"
+#include "util/log.h"
 
 constexpr int MAX_FILE_NAME_LENGTH = 255;
 
@@ -110,14 +112,24 @@ GDALTimesnap::GDALDataLoadingInfo GDALTimesnap::getDataLoadingInfo(Json::Value d
 {
     // get parameters
     Json::Value channelJson = datasetJson["channels"][channel];
-
+    
+    // get parameters
 	std::string time_format = channelJson.get("time_format", datasetJson.get("time_format", "")).asString();
 	std::string time_start 	= channelJson.get("time_start", datasetJson.get("time_start", "")).asString();
 	std::string time_end 	= channelJson.get("time_end", datasetJson.get("time_end", "")).asString();
 
     std::string path 	 = channelJson.get("path", datasetJson.get("path", "")).asString();
     std::string fileName = channelJson.get("file_name", datasetJson.get("file_name", "")).asString();
 
+    Log::debug(
+        concat("getDataLoadingInfo: time_format: ", time_format,
+            ", time_start: ", time_start,
+            ", time_end: ", time_end,
+            ", path: ", path,
+            ", fileName: ", fileName
+        )
+    );
+    
     channel = channelJson.get("channel", channel).asInt();
 
     // resolve time
@@ -200,6 +212,8 @@ GDALTimesnap::GDALDataLoadingInfo GDALTimesnap::getDataLoadingInfo(Json::Value d
         size_t placeholderPos = fileName.find(placeholder);
 
         fileName = fileName.replace(placeholderPos, placeholder.length(), snappedTimeString);
+        Log::debug(concat("getDataLoadingInfo: resulting time fileName: ", fileName.c_str()));
+
     }
 
 
@@ -220,7 +234,17 @@ GDALTimesnap::GDALDataLoadingInfo GDALTimesnap::getDataLoadingInfo(Json::Value d
 
     boost::filesystem::path file_path(path);
     file_path /= fileName;
-	return GDALDataLoadingInfo(file_path.string(), channel,
+	std::string dataset_file_path = file_path.string();
+    Log::debug(concat("getDataLoadingInfo: file_path: ", file_path)); 
+
+    // Handle NetCDF subdatasets
+    if (channelJson.isMember("netcdf_subdataset") || datasetJson.isMember("netcdf_subdataset")) {
+        std::string netcdf_subdataset = channelJson.get("netcdf_subdataset", datasetJson.get("netcdf_subdataset", "")).asString();
+        dataset_file_path = concat("NETCDF:", dataset_file_path, ":", netcdf_subdataset);
+        Log::debug(concat("getDataLoadingInfo: found NETCDF subdataset: ", netcdf_subdataset, ". Resulting path: ", dataset_file_path));
+    }
+
+	return GDALDataLoadingInfo(dataset_file_path, channel,
                                TemporalReference(TIMETYPE_UNIX, time_start_mapping, time_end_mapping),
                                crsId, nodata, unit);
 }