all GenericPoints/Samples attributes are optional

DOI-USGS · Sep 29, 2023 · 82a2579 · 82a2579
1 parent d7b7357
commit 82a2579
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 21 deletions.
diff --git a/Scripts/GeMS_Definition.py b/Scripts/GeMS_Definition.py
@@ -97,31 +97,58 @@
         ["Definition", "String", "NoNulls", 3000],
     ],
     # as-needed tables and feature classes
+    # "GenericPoints": [
+    #     ["Type", "String", "NoNulls", defaultLength],
+    #     ["Symbol", "String", "NullsOK", defaultLength],
+    #     ["Label", "String", "NullsOK", IDLength],
+    #     ["LocationConfidenceMeters", "Single", "NoNulls"],
+    #     ["PlotAtScale", "Single", "NoNulls"],
+    #     ["StationsID", "String", "Optional", IDLength],
+    #     ["MapUnit", "String", "NullsOK", mapUnitLength],
+    #     ["LocationSourceID", "String", "NoNulls", IDLength],
+    #     ["DataSourceID", "String", "NoNulls", IDLength],
+    #     ["Notes", "String", "Optional", defaultLength],
+    # ],
     "GenericPoints": [
-        ["Type", "String", "NoNulls", defaultLength],
-        ["Symbol", "String", "NullsOK", defaultLength],
-        ["Label", "String", "NullsOK", IDLength],
-        ["LocationConfidenceMeters", "Single", "NoNulls"],
-        ["PlotAtScale", "Single", "NoNulls"],
+        ["Type", "String", "Optional", defaultLength],
+        ["Symbol", "String", "Optional", defaultLength],
+        ["Label", "String", "Optional", IDLength],
+        ["LocationConfidenceMeters", "Single", "Optional"],
+        ["PlotAtScale", "Single", "Optional"],
         ["StationsID", "String", "Optional", IDLength],
-        ["MapUnit", "String", "NullsOK", mapUnitLength],
-        ["LocationSourceID", "String", "NoNulls", IDLength],
-        ["DataSourceID", "String", "NoNulls", IDLength],
+        ["MapUnit", "String", "Optional", mapUnitLength],
+        ["LocationSourceID", "String", "Optional", IDLength],
+        ["DataSourceID", "String", "Optional", IDLength],
         ["Notes", "String", "Optional", defaultLength],
     ],
+    # "GenericSamples": [
+    #     ["Type", "String", "NoNulls", defaultLength],
+    #     ["Symbol", "String", "NullsOK", defaultLength],
+    #     ["Label", "String", "NullsOK", IDLength],
+    #     ["FieldSampleID", "String", "NullsOK", defaultLength],
+    #     ["AlternateSampleID", "String", "NullsOK", defaultLength],
+    #     ["MaterialAnalyzed", "String", "NullsOK", defaultLength],
+    #     ["LocationConfidenceMeters", "Single", "NoNulls"],
+    #     ["PlotAtScale", "Single", "NoNulls"],
+    #     ["StationsID", "String", "Optional", IDLength],
+    #     ["MapUnit", "String", "NoNulls", mapUnitLength],
+    #     ["LocationSourceID", "String", "NoNulls", IDLength],
+    #     ["DataSourceID", "String", "NoNulls", IDLength],
+    #     ["Notes", "String", "Optional", defaultLength],
+    # ],
     "GenericSamples": [
-        ["Type", "String", "NoNulls", defaultLength],
-        ["Symbol", "String", "NullsOK", defaultLength],
-        ["Label", "String", "NullsOK", IDLength],
-        ["FieldSampleID", "String", "NullsOK", defaultLength],
-        ["AlternateSampleID", "String", "NullsOK", defaultLength],
-        ["MaterialAnalyzed", "String", "NullsOK", defaultLength],
-        ["LocationConfidenceMeters", "Single", "NoNulls"],
-        ["PlotAtScale", "Single", "NoNulls"],
+        ["Type", "String", "Optional", defaultLength],
+        ["Symbol", "String", "Optional", defaultLength],
+        ["Label", "String", "Optional", IDLength],
+        ["FieldSampleID", "String", "Optional", defaultLength],
+        ["AlternateSampleID", "String", "Optional", defaultLength],
+        ["MaterialAnalyzed", "String", "Optional", defaultLength],
+        ["LocationConfidenceMeters", "Single", "Optional"],
+        ["PlotAtScale", "Single", "Optional"],
         ["StationsID", "String", "Optional", IDLength],
-        ["MapUnit", "String", "NoNulls", mapUnitLength],
-        ["LocationSourceID", "String", "NoNulls", IDLength],
-        ["DataSourceID", "String", "NoNulls", IDLength],
+        ["MapUnit", "String", "Optional", mapUnitLength],
+        ["LocationSourceID", "String", "Optional", IDLength],
+        ["DataSourceID", "String", "Optional", IDLength],
         ["Notes", "String", "Optional", defaultLength],
     ],
     "OrientationPoints": [

diff --git a/Scripts/GeMS_ValidateDatabase.py b/Scripts/GeMS_ValidateDatabase.py
@@ -85,10 +85,11 @@
 from osgeo import ogr
 
 # for debugging
-# from importlib import reload
+from importlib import reload
+
 # reload(guf)
 # reload(tp)
-# reload(gdef)
+reload(gdef)
 
 # values dictionary gets sent to report_template.jinja errors_template.jinja
 val = {}