Skip to content

Commit

Permalink
Added extra metadata entries
Browse files Browse the repository at this point in the history
  • Loading branch information
@maartenplieger
maartenplieger committed Sep 24, 2024
1 parent e9aa622 commit 560c888
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 24 deletions.
15 changes: 8 additions & 7 deletions adagucserverEC/CXMLGen.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ int CXMLGen::getWMS_1_0_0_Capabilities(CT::string *XMLDoc, std::vector<MetadataL
// Dims
for (auto dim : layer->layerMetadata.dimList) {
if (dim.hidden) continue;
XMLDoc->printconcat("<Dimension name=\"%s\" units=\"%s\"/>\n", dim.name.c_str(), dim.units.c_str());
XMLDoc->printconcat("<Extent name=\"%s\" default=\"%s\" multipleValues=\"%d\" nearestValue=\"0\">", dim.name.c_str(), dim.defaultValue.c_str(), 1);
XMLDoc->printconcat("<Dimension name=\"%s\" units=\"%s\"/>\n", dim.serviceName.c_str(), dim.units.c_str());
XMLDoc->printconcat("<Extent name=\"%s\" default=\"%s\" multipleValues=\"%d\" nearestValue=\"0\">", dim.serviceName.c_str(), dim.defaultValue.c_str(), 1);
XMLDoc->concat(dim.values.c_str());
XMLDoc->concat("</Extent>\n");
}
Expand Down Expand Up @@ -237,8 +237,8 @@ int CXMLGen::getWMS_1_1_1_Capabilities(CT::string *XMLDoc, std::vector<MetadataL
// Dims
for (auto dim : layer->layerMetadata.dimList) {
if (dim.hidden) continue;
XMLDoc->printconcat("<Dimension name=\"%s\" units=\"%s\"/>\n", dim.name.c_str(), dim.units.c_str());
XMLDoc->printconcat("<Extent name=\"%s\" default=\"%s\" multipleValues=\"%d\" nearestValue=\"0\">", dim.name.c_str(), dim.defaultValue.c_str(), 1);
XMLDoc->printconcat("<Dimension name=\"%s\" units=\"%s\"/>\n", dim.serviceName.c_str(), dim.units.c_str());
XMLDoc->printconcat("<Extent name=\"%s\" default=\"%s\" multipleValues=\"%d\" nearestValue=\"0\">", dim.serviceName.c_str(), dim.defaultValue.c_str(), 1);
XMLDoc->concat(dim.values.c_str());
XMLDoc->concat("</Extent>\n");
}
Expand Down Expand Up @@ -649,11 +649,12 @@ int CXMLGen::getWMS_1_3_0_Capabilities(CT::string *XMLDoc, std::vector<MetadataL
// Dims
for (auto dim : layer->layerMetadata.dimList) {
if (dim.hidden) continue;
if (dim.name.indexOf("time") != -1) {
XMLDoc->printconcat("<Dimension name=\"%s\" units=\"%s\" default=\"%s\" multipleValues=\"%d\" nearestValue=\"0\" current=\"1\">", dim.name.c_str(), dim.units.c_str(),
if (dim.serviceName.indexOf("time") != -1) {
XMLDoc->printconcat("<Dimension name=\"%s\" units=\"%s\" default=\"%s\" multipleValues=\"%d\" nearestValue=\"0\" current=\"1\">", dim.serviceName.c_str(), dim.units.c_str(),
dim.defaultValue.c_str(), 1);
} else {
XMLDoc->printconcat("<Dimension name=\"%s\" units=\"%s\" default=\"%s\" multipleValues=\"%d\" nearestValue=\"0\" >", dim.name.c_str(), dim.units.c_str(), dim.defaultValue.c_str(), 1);
XMLDoc->printconcat("<Dimension name=\"%s\" units=\"%s\" default=\"%s\" multipleValues=\"%d\" nearestValue=\"0\" >", dim.serviceName.c_str(), dim.units.c_str(),
dim.defaultValue.c_str(), 1);
}
XMLDoc->concat(dim.values.c_str());
XMLDoc->concat("</Dimension>\n");
Expand Down
3 changes: 2 additions & 1 deletion adagucserverEC/LayerTypeLiveUpdate/LayerTypeLiveUpdate.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ int layerTypeLiveUpdateConfigureWMSLayerForGetCapabilities(MetadataLayer *metada
CT::string startTime = timeInstance.dateToISOString(timeInstance.offsetToDate(startTimeOffset));
CT::string stopTime = timeInstance.dateToISOString(timeInstance.offsetToDate(stopTimeOffset));
CT::string resTime = "PT1S";
LayerMetadataDim dim = {.name = "time", .units = "ISO8601", .values = startTime + "/" + stopTime + "/" + resTime, .defaultValue = stopTime, .hasMultipleValues = true, .hidden = false};
LayerMetadataDim dim = {
.serviceName = "time", .cdfName = "time", .units = "ISO8601", .values = startTime + "/" + stopTime + "/" + resTime, .defaultValue = stopTime, .hasMultipleValues = true, .hidden = false};
metadataLayer->layerMetadata.dimList.push_back(dim);

return 0;
Expand Down
5 changes: 3 additions & 2 deletions adagucserverEC/Types/LayerMetadataType.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
#include <CDataSource.h>

struct LayerMetadataDim {
CT::string name;
CT::string serviceName;
CT::string cdfName;
CT::string units;
CT::string values;
CT::string defaultValue;
Expand All @@ -15,7 +16,7 @@ struct LayerMetadataDim {
};

struct LayerMetadataProjection {
LayerMetadataProjection(const CT::string& name, const double bbox[]) {
LayerMetadataProjection(const CT::string &name, const double bbox[]) {
this->name = name;
for (size_t j = 0; j < 4; j++) {
this->dfBBOX[j] = bbox[j];
Expand Down
12 changes: 7 additions & 5 deletions adagucserverEC/utils/LayerMetadataStore.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ int getDimensionListAsJson(MetadataLayer *metadataLayer, json &dimListJson) {
item["defaultValue"] = dimension.defaultValue.c_str();
item["hasMultipleValues"] = dimension.hasMultipleValues;
item["hidden"] = dimension.hidden;
item["name"] = dimension.name.c_str();
item["serviceName"] = dimension.serviceName.c_str();
item["cdfName"] = dimension.cdfName.c_str();
item["units"] = dimension.units.c_str();
item["values"] = dimension.values.c_str();
dimListJson[dimension.name.c_str()] = item;
dimListJson[dimension.serviceName.c_str()] = item;
}
} catch (json::exception &e) {
CDBWarning("Unable to build json structure");
Expand All @@ -26,7 +27,7 @@ int getDimensionListAsJson(MetadataLayer *metadataLayer, json &dimListJson) {

int getLayerBaseMetadataAsJson(MetadataLayer *metadataLayer, json &layerMetadataItem) {
try {
layerMetadataItem["name"] = metadataLayer->layerMetadata.name;
layerMetadataItem["layername"] = metadataLayer->layerMetadata.name;
layerMetadataItem["title"] = metadataLayer->layerMetadata.title;
layerMetadataItem["group"] = metadataLayer->layerMetadata.group;
layerMetadataItem["abstract"] = metadataLayer->layerMetadata.abstract;
Expand Down Expand Up @@ -181,7 +182,7 @@ int loadLayerMetadataStructFromMetadataDb(MetadataLayer *metadataLayer) {
}
json a;
auto i = a.parse(layerMetadataAsJson.c_str());
metadataLayer->layerMetadata.name = i["name"].get<std::string>().c_str();
metadataLayer->layerMetadata.name = i["layername"].get<std::string>().c_str();
metadataLayer->layerMetadata.title = i["title"].get<std::string>().c_str();
metadataLayer->layerMetadata.group = i["group"].get<std::string>().c_str();
metadataLayer->layerMetadata.abstract = i["abstract"].get<std::string>().c_str();
Expand Down Expand Up @@ -366,7 +367,8 @@ int loadLayerDimensionListFromMetadataDb(MetadataLayer *metadataLayer) {
auto dimensionProperties = d.value();

LayerMetadataDim dimension = {
.name = dimensionProperties["name"].get<std::string>().c_str(),
.serviceName = dimensionProperties["serviceName"].get<std::string>().c_str(),
.cdfName = dimensionProperties["cdfName"].get<std::string>().c_str(),
.units = dimensionProperties["units"].get<std::string>().c_str(),
.values = dimensionProperties["values"].get<std::string>().c_str(),
.defaultValue = dimensionProperties["defaultValue"].get<std::string>().c_str(),
Expand Down
20 changes: 12 additions & 8 deletions adagucserverEC/utils/XMLGenUtils.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,11 @@ int populateMetadataLayerStruct(MetadataLayer *metadataLayer, bool readFromDB) {

std::map<std::string, LayerMetadataProjection> projectionMap;
// Make a unique list of projections
for (const auto& p : metadataLayer->layerMetadata.projectionList) {
for (const auto &p : metadataLayer->layerMetadata.projectionList) {
projectionMap.emplace(p.name.c_str(), p);
}
metadataLayer->layerMetadata.projectionList.clear();
for (const auto& p : projectionMap) {
for (const auto &p : projectionMap) {
metadataLayer->layerMetadata.projectionList.push_back(p.second);
}

Expand Down Expand Up @@ -169,7 +169,8 @@ int getDimsForLayer(MetadataLayer *metadataLayer) {
CT::string fileDate = CDirReader::getFileDate(metadataLayer->layer->FilePath[0]->value.c_str());

LayerMetadataDim dim;
dim.name.copy("time");
dim.serviceName.copy("time");
dim.cdfName.copy("time");
dim.units.copy("ISO8601");
dim.values.copy(fileDate.c_str());
dim.defaultValue.copy(fileDate.c_str());
Expand All @@ -188,7 +189,8 @@ int getDimsForLayer(MetadataLayer *metadataLayer) {
// Create a new dim to store in the layer
LayerMetadataDim dim;
dim.hidden = false;
dim.name.copy(metadataLayer->dataSource->cfgLayer->Dimension[i]->value.c_str());
dim.serviceName.copy(metadataLayer->dataSource->cfgLayer->Dimension[i]->value.c_str());
dim.cdfName.copy(metadataLayer->dataSource->cfgLayer->Dimension[i]->attr.name.c_str());

// Get the tablename
CT::string tableName;
Expand Down Expand Up @@ -404,14 +406,15 @@ int getDimsForLayer(MetadataLayer *metadataLayer) {
// if(srvParam->requestType==REQUEST_WMS_GETCAPABILITIES)
{

dim.name.copy(metadataLayer->dataSource->cfgLayer->Dimension[i]->value.c_str());
dim.serviceName.copy(metadataLayer->dataSource->cfgLayer->Dimension[i]->value.c_str());
dim.cdfName.copy(metadataLayer->dataSource->cfgLayer->Dimension[i]->attr.name.c_str());

// Try to get units from the variable
dim.units.copy("NA");
if (metadataLayer->dataSource->cfgLayer->Dimension[i]->attr.units.empty()) {
CT::string units;
try {
metadataLayer->dataSource->getDataObject(0)->cdfObject->getVariable(dim.name.c_str())->getAttribute("units")->getDataAsString(&units);
metadataLayer->dataSource->getDataObject(0)->cdfObject->getVariable(dim.cdfName.c_str())->getAttribute("units")->getDataAsString(&units);
dim.units.copy(&units);
} catch (int e) {
}
Expand Down Expand Up @@ -518,7 +521,8 @@ int getDimsForLayer(MetadataLayer *metadataLayer) {
if (metadataLayer->dataSource->cfgLayer->Dimension[i]->attr.units.empty() == false) {
dimUnits.copy(metadataLayer->dataSource->cfgLayer->Dimension[i]->attr.units.c_str());
}
dim.name.copy(metadataLayer->dataSource->cfgLayer->Dimension[i]->value.c_str());
dim.serviceName.copy(metadataLayer->dataSource->cfgLayer->Dimension[i]->value.c_str());
dim.cdfName.copy(metadataLayer->dataSource->cfgLayer->Dimension[i]->attr.name.c_str());
dim.units.copy(dimUnits.c_str());
dim.hasMultipleValues = 0;
// metadataLayer->dataSource->cfgLayer->Dimension[i]->attr.defaultV.c_str()
Expand Down Expand Up @@ -689,7 +693,7 @@ int getStylesForLayer(MetadataLayer *metadataLayer) {
bool compareStringCase(const std::string &s1, const std::string &s2) { return strcmp(s1.c_str(), s2.c_str()) < 0; }

bool compareProjection(const LayerMetadataProjection &p1, const LayerMetadataProjection &p2) { return strcmp(p1.name.c_str(), p2.name.c_str()) < 0; }
bool compareDim(const LayerMetadataDim &p2, const LayerMetadataDim &p1) { return strcmp(p1.name.c_str(), p2.name.c_str()) < 0; }
bool compareDim(const LayerMetadataDim &p2, const LayerMetadataDim &p1) { return strcmp(p1.serviceName.c_str(), p2.serviceName.c_str()) < 0; }

int getTitleForLayer(MetadataLayer *metadataLayer) {
#ifdef CXMLGEN_DEBUG
Expand Down
Loading

0 comments on commit 560c888

Please sign in to comment.