Merge branch 'dev-nhd-ftypes' of https://github.com/NOAA-OWP/cahaba i…

…nto dev-nhd-ftypes
NOAA-OWP · Jan 14, 2021 · 8aa3cc6 · 8aa3cc6
2 parents 378f88e + af7147a
commit 8aa3cc6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/lib/adjust_headwater_streams.py b/lib/adjust_headwater_streams.py
@@ -15,20 +15,6 @@
 
 def adjust_headwaters(huc,nhd_streams,headwaters,headwater_id):
 
-    ## identify nhd headwaters and incoming streams
-    nhd_headwater_streams = nhd_streams.loc[nhd_streams['is_headwater'],:]
-    nhd_headwater_streams = nhd_headwater_streams.explode()
-
-    hw_points = np.zeros(len(nhd_headwater_streams),dtype=object)
-    for index,lineString in enumerate(nhd_headwater_streams.geometry):
-        hw_point = [point for point in zip(*lineString.coords.xy)][-1]
-        hw_points[index] = Point(*hw_point)
-
-    nhd_headwater_points = gpd.GeoDataFrame({'NHDPlusID' : nhd_headwater_streams['NHDPlusID'],
-                                            'geometry' : hw_points},geometry='geometry',crs=PREP_PROJECTION)
-
-    del nhd_headwater_streams
-
     # identify true headwater segments
     if nhd_streams['headwaters_id'].dtype=='int':
         nhd_streams_adj = nhd_streams.loc[(nhd_streams.headwaters_id > 0) & (nhd_streams.downstream_of_headwater == False),:].copy()
@@ -129,7 +115,7 @@ def adjust_headwaters(huc,nhd_streams,headwaters,headwater_id):
 
     del nhd_headwater_streams_adj
 
-    return(nhd_streams, nhd_headwater_points, nhd_headwater_points_adj)
+    return(nhd_streams, nhd_headwater_points_adj)
 
 if __name__ == '__main__':
 

diff --git a/lib/aggregate_vector_inputs.py b/lib/aggregate_vector_inputs.py
@@ -224,7 +224,7 @@ def subset_stream_networks(args, huc):
 
         if len(nwm_headwaters) > 0:
 
-            adj_nhd_streams_fr, nhd_headwater_points_fr, adj_nhd_headwater_points_fr = adjust_headwaters(str(huc),nhd_streams_fr,nwm_headwaters,nwm_headwater_id)
+            adj_nhd_streams_fr, adj_nhd_headwater_points_fr = adjust_headwaters(str(huc),nhd_streams_fr,nwm_headwaters,nwm_headwater_id)
 
             nhd_streams_fr_adjusted_fileName=os.path.join(in_dir,huc,'NHDPlusBurnLineEvent' + str(huc) + '_fr_adjusted.gpkg')
             adj_nhd_headwaters_fr_fileName=os.path.join(in_dir,huc,'nhd' + str(huc) + '_headwaters_adjusted_fr.gpkg')
@@ -247,7 +247,7 @@ def subset_stream_networks(args, huc):
 
         if len(ahps_headwaters) > 0:
 
-            adj_nhd_streams_ms, nhd_headwater_points_ms, adj_nhd_headwater_points_ms = adjust_headwaters(str(huc),nhd_streams_ms,ahps_headwaters,ahps_headwater_id)
+            adj_nhd_streams_ms, adj_nhd_headwater_points_ms = adjust_headwaters(str(huc),nhd_streams_ms,ahps_headwaters,ahps_headwater_id)
 
             nhd_streams_ms_adjusted_fileName=os.path.join(in_dir,huc,'NHDPlusBurnLineEvent' + str(huc) + '_ms_adjusted.gpkg')
             adj_nhd_headwaters_ms_fileName=os.path.join(in_dir,huc,'nhd' + str(huc) + '_headwaters_adjusted_ms.gpkg')