Merge pull request #417 from KNMI/config_interval_liveupdate

Interval can now be used to configure the advertised time resolution for liveupdate

adagucserverEC/LayerTypeLiveUpdate/LayerTypeLiveUpdate.cpp

@@ -105,16 +105,24 @@ int layerTypeLiveUpdateConfigureWMSLayerForGetCapabilities(MetadataLayer *metada
     metadataLayer->layerMetadata.title.copy(metadataLayer->dataSource->cfgLayer->Name[0]->value.c_str());
   }
   CTime timeInstance;
+
+  CT::string timeResolution = "PT10M";
+
+  for (auto dim : metadataLayer->layer->Dimension) {
+    if (dim->value.equals("time") && !dim->attr.interval.empty()) {
+      timeResolution = dim->attr.interval;
+    }
+  }
+
   timeInstance.init("seconds since 1970", "standard");
   double epochTime = timeInstance.getEpochTimeFromDateString(CTime::currentDateTime());
   // CTime::Date cdate = timeInstance.getDate(epochTime);
-  double startTimeOffset = timeInstance.quantizeTimeToISO8601(epochTime - 3600 * 24 * 365, "PT10M", "low");
-  double stopTimeOffset = timeInstance.quantizeTimeToISO8601(epochTime, "PT10M", "low");
+  double startTimeOffset = timeInstance.quantizeTimeToISO8601(epochTime - 3600 * 24 * 365, timeResolution.c_str(), "low");
+  double stopTimeOffset = timeInstance.quantizeTimeToISO8601(epochTime, timeResolution.c_str(), "low");
   CT::string startTime = timeInstance.dateToISOString(timeInstance.offsetToDate(startTimeOffset));
   CT::string stopTime = timeInstance.dateToISOString(timeInstance.offsetToDate(stopTimeOffset));
-  CT::string resTime = "PT10M";
   LayerMetadataDim dim = {
-      .serviceName = "time", .cdfName = "time", .units = "ISO8601", .values = startTime + "/" + stopTime + "/" + resTime, .defaultValue = stopTime, .hasMultipleValues = true, .hidden = false};
+      .serviceName = "time", .cdfName = "time", .units = "ISO8601", .values = startTime + "/" + stopTime + "/" + timeResolution, .defaultValue = stopTime, .hasMultipleValues = true, .hidden = false};
   metadataLayer->layerMetadata.dimList.push_back(dim);
 
   return 0;

adagucserverEC/utils/LayerMetadataStore.cpp

@@ -3,6 +3,7 @@
 #include <json_adaguc.h>
 #include <CDBFactory.h>
 #include "XMLGenUtils.h"
+#include <LayerTypeLiveUpdate/LayerTypeLiveUpdate.h>
 
 int getDimensionListAsJson(MetadataLayer *metadataLayer, json &dimListJson) {
   try {
@@ -107,14 +108,6 @@ int storemetadataLayerIntoMetadataDb(MetadataLayer *metadataLayer) {
   return 0;
 }
 
-int loadmetadataLayerFromMetadataDb(MetadataLayer *metadataLayer) {
-  loadLayerMetadataStructFromMetadataDb(metadataLayer);
-  loadLayerDimensionListFromMetadataDb(metadataLayer);
-  loadLayerProjectionAndExtentListFromMetadataDb(metadataLayer);
-  loadLayerStyleListFromMetadataDb(metadataLayer);
-  return 0;
-}
-
 CT::string getLayerMetadataFromDb(MetadataLayer *metadataLayer, CT::string metadataKey) {
   CT::string layerName = metadataLayer->dataSource->getLayerName();
   CT::string datasetName = metadataLayer->dataSource->srvParams->datasetLocation;
@@ -172,6 +165,10 @@ int storeLayerMetadataStructIntoMetadataDb(MetadataLayer *metadataLayer) {
 }
 
 int loadLayerMetadataStructFromMetadataDb(MetadataLayer *metadataLayer) {
+  if (metadataLayer->dataSource->dLayerType == CConfigReaderLayerTypeCascaded || (metadataLayer->dataSource->dLayerType == CConfigReaderLayerTypeLiveUpdate)) {
+    layerTypeLiveUpdateConfigureWMSLayerForGetCapabilities(metadataLayer);
+    return 0;
+  }
   if (!metadataLayer->readFromDb) {
     return 1;
   }
@@ -289,10 +286,10 @@ int storeLayerStyleListIntoMetadataDb(MetadataLayer *metadataLayer) {
 }
 
 int loadLayerStyleListFromMetadataDb(MetadataLayer *metadataLayer) {
-  if (metadataLayer->dataSource->dLayerType == CConfigReaderLayerTypeCascaded ||
-      (metadataLayer->dataSource->dLayerType == CConfigReaderLayerTypeLiveUpdate) && metadataLayer->dataSource->cfgLayer->DataPostProc.empty()) {
+  if (metadataLayer->dataSource->dLayerType == CConfigReaderLayerTypeCascaded) {
     return 0;
   }
+
   if (!metadataLayer->readFromDb) {
     return 1;
   }

data/config/datasets/adaguc.tests.solarterminator.xml

@@ -22,6 +22,7 @@
     <DataPostProc algorithm="solarterminator"/>
     <Variable>solarterminator</Variable>
     <Styles>soltstyle</Styles>
+    <Dimension interval="PT10M">time</Dimension>
   </Layer>
 
 

doc/configuration/Dimension.md

@@ -53,3 +53,4 @@ This will convert the following inputs to internal dates:
 -   2015-01-21T15:18:36Z --> 2015-01-21T15:20:00Z
 -   2015-01-21T15:21:01Z --> 2015-01-21T15:20:00Z
 
+

doc/configuration/Layer.md

@@ -66,10 +66,13 @@ This layer type displays a GetMap image with the current time per second for the
   -->
   <Layer type="liveupdate">
     <Name>liveupdate</Name>
+    <Dimension interval="PT1S">time</Dimension>
   </Layer>
 </Configuration>
 ```
 
+Note, default interval is PT10M for the liveupdate, you can overide this with the interval attribute in the dimension.
+
 <img src='2024-02-14-liveupdate-layer.png' />
 
 If you configure the ```solarterminator``` data postprocessor, the liveupdate layer will display a GetMap image showing the areas where it is day, night, and different twilight levels (values from 0 to 4). The solar terminator algorithm is based on the calculations presented in the book *Astronomical Algorithms* (1991) by Jean Meeus. 
@@ -102,6 +105,7 @@ More information on how to configure this type of layer can be found [here](../t
     <DataPostProc algorithm="solarterminator"/>
     <Variable>solarterminator</Variable>
     <Styles>soltstyle</Styles>
+    <Dimension interval="PT10M">time</Dimension>
   </Layer>
 </Configuration>
 ```

doc/tutorials/Configure_solar_terminator.md

@@ -45,6 +45,7 @@ Create the following file at the filepath `$ADAGUC_DATASET_DIR/solt.xml`
     <DataPostProc algorithm="solarterminator"/>
     <Variable>solarterminator</Variable>
     <Styles>soltstyle</Styles>
+    <Dimension interval="PT10M">time</Dimension>
   </Layer>