Tds domains

Makefile.hoot

@@ -12,7 +12,7 @@ SHELL=/bin/bash
 .PHONY: clean-ccache HOOT_VERSION_FILE
 
 # This list is for manually rebuilding the schema files.  The files have been commited to the main GitHub repo
-SCHEMA_FILES= translations/tds71_schema.js translations/tds70_schema.js translations/tds61_schema.js translations/tds40_schema.js translations/mgcp_schema.js translations/mgcp_thematic_schema.js translations/ggdm30_schema.js translations/tds71_thematic_schema.js translations/tds71_full_schema.js translations/tds61_full_schema.js translations/tds70_full_schema.js translations/tds40_full_schema.js translations/ggdm30_full_schema.js translations/etds71_rules.js translations/etds70_rules.js translations/etds61_rules.js translations/etds40_rules.js translations/emgcp_rules.js translations/eggdm30_rules.js translations/etds71_osm_rules.js translations/etds61_osm_rules.js translations/etds40_osm_rules.js translations/emgcp_osm_rules.js translations/eggdm30_osm_rules.js translations/etds70_osm_rules.js
+SCHEMA_FILES= translations/tds71_schema.js translations/tds70_schema.js translations/tds61_schema.js translations/tds40_schema.js translations/mgcp_schema.js translations/mgcp_thematic_schema.js translations/ggdm30_schema.js translations/tds71_thematic_schema.js translations/tds71_thematic_enum_schema.js translations/tds71_full_schema.js translations/tds61_full_schema.js translations/tds70_full_schema.js translations/tds40_full_schema.js translations/ggdm30_full_schema.js translations/etds71_rules.js translations/etds70_rules.js translations/etds61_rules.js translations/etds40_rules.js translations/emgcp_rules.js translations/eggdm30_rules.js translations/etds71_osm_rules.js translations/etds61_osm_rules.js translations/etds40_osm_rules.js translations/emgcp_osm_rules.js translations/eggdm30_osm_rules.js translations/etds70_osm_rules.js
 
 
 -include Makefile.inc
@@ -213,6 +213,11 @@ translations/tds71_thematic_schema.js: scripts/schema/ConvertTDSv71Schema_XML.py
 	mkdir -p $(@D)
 	$< --thematic  $(word 2,$^) > $@ || (rm -f $@ ; exit -1)
 
+# TDSv71 thematic schema with all of the text enumerations is built from and XML file made from a sample FGDB
+translations/tds71_thematic_enum_schema.js: scripts/schema/ConvertTDSv71Schema_XML.py conf/translations/TDSv71.xml.gz
+	mkdir -p $(@D)
+	$< --nocodedvalues --thematic $(word 2,$^) > $@ || (rm -f $@ ; exit -1)
+
 # TDSv71 schema is built from an XML file made from a sample FGDB
 translations/tds71_schema.js: scripts/schema/ConvertTDSv71Schema_XML.py conf/translations/TDSv71.xml.gz
 	mkdir -p $(@D)

conf/core/ConfigOptions.asciidoc

@@ -3639,6 +3639,14 @@ new file/layer.
 When exporting, remove all non-spec attributes from the features. I.e. Do a "clean" export.
 NOTE: This is destructive. It will drop data that is usually kept - OSMTAGS etc
 
+=== ogr.coded.values
+
+* Data Type: bool
+* Default Value: `true`
+
+When exporting, interpret all values to their coded value counterpart. When this value is false,
+the value will be the human-readable value.
+
 === ogr.compare.output
 
 * Data Type: bool

hoot-core/src/main/cpp/hoot/core/io/OgrWriter.cpp

@@ -652,6 +652,9 @@ void OgrWriter::_addFeature(OGRLayer* layer, const std::shared_ptr<Feature>& f,
     const QVariant& v = it.value();
     QByteArray ba = it.key().toUtf8();
 
+    //LOG_DEBUG("Current field: " << ba.constData());
+    //LOG_DEBUG("Current value: " << v.toString());
+
     // If the field DOESN'T exist in the output layer, skip it.
     if (poFeature->GetFieldIndex(ba.constData()) == -1)
     {
@@ -696,7 +699,6 @@ void OgrWriter::_addFeature(OGRLayer* layer, const std::shared_ptr<Feature>& f,
 
         vba.truncate(fieldWidth);
       }
-
       poFeature->SetField(ba.constData(), vba.constData());
       break;
     }

hoot-core/src/main/cpp/hoot/core/io/schema/StringFieldDefinition.h

@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. Maxar
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2015, 2018, 2019, 2020, 2021 Maxar (http://www.maxar.com/)
+ * @copyright Copyright (C) 2015-2024 Maxar (http://www.maxar.com/)
  */
 #ifndef STRINGFIELDDEFINITION_H
 #define STRINGFIELDDEFINITION_H
@@ -45,11 +45,15 @@ class StringFieldDefinition : public FieldDefinition
   bool hasDefaultValue() const override;
   QString toString() const override;
 
+  void addEnumeratedValue(QString v) {_enumeratedValues.insert(v); }
+  bool hasEnumeratedValue(QString v) { return _enumeratedValues.find(v) != _enumeratedValues.end(); }
+
   void setDefaultValue(const QString& v) { _defaultValue = v; }
 
 private:
 
   QString _defaultValue;
+  std::set<QString> _enumeratedValues;
 };
 
 }

hoot-js/src/main/cpp/hoot/js/schema/JavaScriptSchemaTranslator.cpp

@@ -349,6 +349,41 @@ void JavaScriptSchemaTranslator::_parseEnumerations(std::shared_ptr<DoubleFieldD
   }
 }
 
+void JavaScriptSchemaTranslator::_parseEnumerations(std::shared_ptr<StringFieldDefinition> fd, const QVariant& enumerations) const
+{
+  if (enumerations.canConvert(QVariant::List) == false)
+    throw HootException("Expected enumerations to be an array of maps.");
+
+  QVariantList vl = enumerations.toList();
+
+  for (const auto& variant : qAsConst(vl))
+  {
+    if (variant.canConvert(QVariant::Map) == false)
+      throw HootException("Expected enumerations to be an array of maps.");
+
+    QVariantMap vm = variant.toMap();
+    if (vm["name"].canConvert(QVariant::String) == false)
+      throw HootException("Expected each enumeration map to contain a valid value.");
+
+    QString v = vm["name"].toString();
+
+    if (fd->hasEnumeratedValue(v))
+    {
+      if (logWarnCount < Log::getWarnMessageLimit())
+      {
+        LOG_WARN("Enumerated value repeated in enumerations table: " << v);
+      }
+      else if (logWarnCount == Log::getWarnMessageLimit())
+      {
+        LOG_WARN(className() << ": " << Log::LOG_WARN_LIMIT_REACHED_MESSAGE);
+      }
+      logWarnCount++;
+    }
+    else
+      fd->addEnumeratedValue(v);
+  }
+}
+
 void JavaScriptSchemaTranslator::_parseEnumerations(std::shared_ptr<IntegerFieldDefinition> fd,
                                                     const QVariant& enumerations) const
 {
@@ -430,7 +465,7 @@ std::shared_ptr<FieldDefinition> JavaScriptSchemaTranslator::_parseFieldDefiniti
     throw HootException("Error parsing type in column.");
 
   QString type = map["type"].toString().toLower();
-  if (type == "string")
+  if (type == "string" || (type == "enumeration" && !ConfigOptions().getOgrCodedValues()))
   {
     std::shared_ptr<StringFieldDefinition> fd = std::make_shared<StringFieldDefinition>();
 
@@ -444,6 +479,10 @@ std::shared_ptr<FieldDefinition> JavaScriptSchemaTranslator::_parseFieldDefiniti
     if (map.contains(MetadataTags::Length()))
       fd->setWidth(_toInt32(map[MetadataTags::Length()]));
 
+    if (map.contains("enumerations"))
+    {
+      _parseEnumerations(fd, map["enumerations"]);
+    }
     result = fd;
   }
   else if (type == "double" || type == "real")
@@ -582,7 +621,6 @@ std::shared_ptr<Layer> JavaScriptSchemaTranslator::_parseLayer(const QVariant& l
     std::shared_ptr<FieldDefinition> fd = _parseFieldDefinition(variant);
     if (names.find(fd->getName()) != names.end())
       throw HootException("Found multiple fields with the same name. (" + fd->getName() + ")");
-
     dfd->addField(fd);
     names.insert(fd->getName());
   }

hoot-js/src/main/cpp/hoot/js/schema/JavaScriptSchemaTranslator.h

@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. Maxar
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019, 2021, 2022 Maxar (http://www.maxar.com/)
+ * @copyright Copyright (C) 2015-2024 Maxar (http://www.maxar.com/)
  */
 
 #ifndef JAVASCRIPT_SCHEMA_TRANSLATOR_H
@@ -45,6 +45,7 @@ namespace hoot
 
 class FieldDefinition;
 class Layer;
+class StringFieldDefinition;
 class DoubleFieldDefinition;
 class IntegerFieldDefinition;
 class LongIntegerFieldDefinition;
@@ -115,6 +116,7 @@ class JavaScriptSchemaTranslator : public ScriptSchemaTranslator,
   std::vector<TranslatedFeature> _createAllFeatures(const QVariantList& vm) const;
   std::shared_ptr<Feature> _createFeature(const QVariantMap& vm, QString& tableName) const;
 
+  void _parseEnumerations(std::shared_ptr<StringFieldDefinition> fd, const QVariant& enumerations) const;
   void _parseEnumerations(std::shared_ptr<DoubleFieldDefinition> fd, const QVariant& enumerations) const;
   void _parseEnumerations(std::shared_ptr<IntegerFieldDefinition> fd, const QVariant& enumerations) const;
   void _parseEnumerations(std::shared_ptr<LongIntegerFieldDefinition> fd, const QVariant& enumerations) const;