Brat: metadata values as strings, fix unpacking project nodes

Riverscapes · Sep 8, 2021 · 22fb53d · 22fb53d
1 parent 594d9ef
commit 22fb53d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/lib/commons/rscommons/database.py b/lib/commons/rscommons/database.py
@@ -67,8 +67,8 @@ def create_database(huc: str, db_path: str, metadata: Dict[str, str], epsg: int,
     # We need to create a projection for this DB
     db_srs = osr.SpatialReference()
     db_srs.ImportFromEPSG(int(epsg))
-    metadata['gdal_srs_proj4'] = db_srs.ExportToProj4()
-    metadata['gdal_srs_axis_mapping_strategy'] = osr.OAMS_TRADITIONAL_GIS_ORDER
+    metadata['gdal_srs_proj4'] = str(db_srs.ExportToProj4())
+    metadata['gdal_srs_axis_mapping_strategy'] = str(osr.OAMS_TRADITIONAL_GIS_ORDER)
 
     if not os.path.isfile(schema_path):
         raise Exception('Unable to find database schema file at {}'.format(schema_path))

diff --git a/packages/brat/sqlbrat/brat_build.py b/packages/brat/sqlbrat/brat_build.py
@@ -114,7 +114,7 @@ def brat_build(huc: int, flowlines: Path, dem: Path, slope: Path, hillshade: Pat
     project.add_project_raster(proj_nodes['Inputs'], LayerTypes['HILLSHADE'], hillshade)
     project.add_project_raster(proj_nodes['Inputs'], LayerTypes['SLOPE'], slope)
     project.add_project_geopackage(proj_nodes['Inputs'], LayerTypes['INPUTS'])
-    db_node, _db_path = project.add_project_geopackage(proj_nodes['Outputs'], LayerTypes['OUTPUTS'])
+    db_node, _db_path, *_ = project.add_project_geopackage(proj_nodes['Outputs'], LayerTypes['OUTPUTS'])
 
     inputs_gpkg_path = os.path.join(output_folder, LayerTypes['INPUTS'].rel_path)
     intermediates_gpkg_path = os.path.join(output_folder, LayerTypes['INTERMEDIATES'].rel_path)
@@ -153,12 +153,12 @@ def brat_build(huc: int, flowlines: Path, dem: Path, slope: Path, hillshade: Pat
 
     db_metadata = {
         'BRAT_Build_DateTime': datetime.datetime.now().isoformat(),
-        'Streamside_Buffer': streamside_buffer,
-        'Riparian_Buffer': riparian_buffer,
-        'Reach_Codes': reach_codes,
-        'Canal_Codes': canal_codes,
-        'Max_Waterbody': max_waterbody,
-        'Elevation_Buffer': elevation_buffer
+        'Streamside_Buffer': str(streamside_buffer),
+        'Riparian_Buffer': str(riparian_buffer),
+        'Reach_Codes': ','.join(reach_codes),
+        'Canal_Codes': ','.join(canal_codes),
+        'Max_Waterbody': str(max_waterbody),
+        'Elevation_Buffer': str(elevation_buffer)
     }
 
     # Execute the SQL to create the lookup tables in the output geopackage