From 327829e0d722cc069d36ff6ac4992d89f133a273 Mon Sep 17 00:00:00 2001
From: Daniel Hardesty Lewis <dhl@tacc.utexas.edu>
Date: Tue, 5 Oct 2021 13:26:34 -0500
Subject: [PATCH] updated LidarIndex class

---
 src/dem2basin/.dem2basin.py.swp | Bin 159744 -> 163840 bytes
 src/dem2basin/dem2basin.py      |  46 +++++++++++++++++++++++---------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/dem2basin/.dem2basin.py.swp b/src/dem2basin/.dem2basin.py.swp
index cfea8b7adc495ceae035ba0701d0a66cf27e5650..de7f052195dd5b828847bf321ca915799f9eab88 100644
GIT binary patch
delta 1950
zcmZwIe@xV690%~{c{t?9-Elt%4iV)GD1^ctXu%*$3Q|$a2yimZIFBO^4h{~mQM02Z
zIn93HQ#`JwqB9Udf^K@Qg34x_TRG^DwgiOC*>J6ym9A{n`?)*JHlOWv_k5oppYQWL
z-|u~{eI}y4Ju-27)~4bolw9)z1VvBCmj||58{Q`aH=dkFs%o5_<4cB%Ms+mR8=^l+
zX$BuQBvKO}H#|!Vc(&1$o+js^SOQ-}uL@LX@LE0B?kzFCsr^t<y`?><CFBo~x6^aO
zP~wuCQG`suIP8TwutFs)hd<>EZ~4$MZPz57&(r!B^WR5)@+N<Jc}5#HkC2qGK(qp3
z=%%|pKWhk?fpc&ecES#*h54X|b68j_tcM8rD3XvSP~g`HLI%JA>tG373@79i?1MtM
ziCbQQ5pcpLumG0gA!AsRfXAR5%3wLf!FQpAj6yeb!8>4wVn~I*aeyOm4EBH%DqtNf
zh1n27zJ)U|2)n@zMGy_4A!&r%W;iq$g1xW?ED#42Zs74u^WmmMzUr*b`_~a2^^Nz?
z_n5$^iEDandL>wrlaq<8a_b9eVX}e-(W$1f(WuC4S?(H?bkCWK1LN)<E9?30mbONF
zzVe*i)o5+tC515=bD{1%A<#NEMy@G#ZeW$eZMU_!+-*d*@RBX*BIyz}88$eotZt>z
z>b5tu1iB8{mPN=hW$sqHSsb>o7;!$6>4e$L48pmB#f1jOHI=4ub5(+_*?%c#<jduX
z?g1KW%2%3O+;=);XSJ)fp-L1y$l^rjG+iACBBrNllAx0`POVfsoOZK+3QyRd7wKP^
z|5A)>WQC%#oP~=$=~T;a?Kc>ewdIA)fzdKJ3eV>WV!e~42P41YWJSShLJrFm|2SE)
ze_#Gp^6@^Cc%+`CYUSMLYaF&3rKQHsXZgZN*%CMq;i+d2>xgWSB_FNUdO4N5-ZqNc
z^-P^zwpsaarE(CFAF`~myWI9_I}X-nSLTK(*}~Jna_+n;t^vB4zuTkXn!bf1>L8uR
zXO72<W&3E9H@9z$`hFXv`Xo;*e&BBeQ-Ud&F|O(e`2ad#7i@!PAQyf?Quq-DpdXIH
zPFM{qAq!F<8N%QKVt)-o!TY?5ZyS^V)sjWz2c(2ScnuzhTSy7tz!|9Z9T}tNBl-8e
z3;4+%wQx<)`$h2tjSsdM#rhLeBR-p?VgKu2D=IqhG_Ut+(5&aPz0q^sIyp0>xz=@e
z%%#S_u_}snht=V<Zg)5x!TxCRaSqi4BdL8@zy@}DhN{}NuOk&zAU(-knjs98th8Dt
zP9uDQz4by3EQAZ#mdu1tffh!wwL`EIED!_Nk^PRsR>%VtTt)aU*acRQw~LDKQdLnn
zA8S&H#tgi-qsv)}xHd%-#G@;j#fMrf6Ipf4Bo@@M7@wz(bu(XW1M8w5YZW0Y5JQdF
za@m&P^S+Gd+6!&a0vT`#`<Q}Jcp2JZ8x%n(T*JP;g0t{BbV4gU4NGAb`y7K)Z~!_q
zq}2acun8A2z~Bltei6JN52O)RK{lj8DokRrr=c0PKoMlZB2Y)-F!CaB7@B*e(&Kzp
xTc`+~r1yz~6Et0Xasr2RX@Z91SD_OdC#hDv)K6a&1yj^45(nr*;>Z+@{}-{axpe>l

delta 793
zcmYk&Pe@cz6vy#%U*o^g$$27KSk03(DXdH)BQgtHG>d|iw9@iVYU!wDQU)#@sK{0-
zPZ}zUCZr^^)JHv|QmKX1N`>eTsS{B|ZA=PV6!jh4bl}6gi+kTW=jZo3{h=67MP{LQ
zkCDB8lTdDvHRnsppL9#_+}=p3JYLs1kv6bvI9{b$i`;!m8RmfQQK{yHUaE@BjR{FH
zvEg@=ZZ#&fyE;S0pyB9n9dL;ZA^b<()cZYY9~O%|z*Tg>i?uM|!FO&yviA3PyUeY_
zUouu1|JBhGb*Jkanv5KyIK8r}zM;InDm^2;vgXvn$#RX%hg`W15j$d`Wl=!CsV=q(
z|D1^v8Nn4a<0J~<!B2*tMGp>PJN`OFKH?2tV+buch+GIh#fXgIDeABd2L42gyh0aR
zqNP~MIOHJ{DNq=V66r%bF5n2fNXFMlk@uKH8!F&I6lU4&EndQou#{t`!yIpPTfc+T
zk%2qCYPI#QXPsvMxToAHt=E~-%QoTsQ~88zCSIfy&B%uX!z6zV)!2<+B=#B4@fbnW
zVh3`u3`;RbdcC-XW2nYqY=MfCl`>EBZ<xjup5YSO;Io6{>V?z3Kc)6*fx#?oLm;O{
zTW*#XC)*=6+KhS_QVze%W`_c<hj%andYM+RIhhfcV2lyYq68~2N!xSCLIlFynh<`T
u8B12jon++<-1cdyfg3(8$;{77G&{N-_FbPgs+qyAL{mGHZPzwvm(@R7E~ZKV

diff --git a/src/dem2basin/dem2basin.py b/src/dem2basin/dem2basin.py
index 3db0187..5b7c6eb 100644
--- a/src/dem2basin/dem2basin.py
+++ b/src/dem2basin/dem2basin.py
@@ -854,7 +854,6 @@ def index_fathom_files(
 ):
     """
     Georeference Fathom 3m raster dataset, with option to associate by HUC
-    assign Manning’s n roughness value by each flowline’s stream order
     
     :param fathom_parent_directory: str or pathlib.PurePath of Fathom3m parent
         directory, expected to contain a directory named 'dem' under which the
@@ -1009,32 +1008,55 @@ def __init__(
 
     def index_lidar_files(
         self,
-        hucs,
-        lidar_availability_file,
         lidar_parent_directory,
+        hucs,
+        availability_file,
         new_availability_file = None,
         drop_index_columns = True
     ):
-    ## TODO: divide into:
-    ##   - correcting the LIDAR availability file, and
-    ##   - applying HUCs column attribute
+        """
+        Georeference TX Lidar 1m raster dataset, with option to associate by HUC
+        
+        :param lidar_parent_directory: str or pathlib.PurePath of TX Lidar
+            parent directory, expected to contain a directory named 'dem' under
+            which the filenames are found
+        :type lidar_parent_directory: Union[str,pathlib.PurePath]
+        :param hucs: filename, pathlib.PurePath, or geopandas.GeoDataFrame of 
+            HUCs. If provided, modifies output geopandas.GeoDataFrame to
+            intersect availability file with HUCs, usually resulting in repeated
+            filename rows for adjacent HUCs.
+        :type hucs: Union[str,pathlib.PurePath,geopandas.GeoDataFrame]
+        :param availability_file: input filename of existing Lidar
+            availability file.
+        :type availability_file: str
+        :param new_availability_file: output filename of availability with
+            found. Defaults to None.
+        :type new_availability_file: str
+        :param drop_index_columns: boolean whether to drop columns names
+            'index', 'index_left', or 'index_right' from output. Defaults to
+            True.
+        :type drop_index_columns: bool
+        :return: geopandas.GeoDataFrame with filenames found in the Lidar parent
+            directory
+        :rtype: geopandas.GeoDataFrame
+        """
+        ## TODO: divide into:
+        ##   - correcting the LIDAR availability file, and
+        ##   - applying HUCs column attribute
     
         availability = gpd.read_file(lidar_availability_file,mask=hucs)
         availability = availability[availability['demname']!='No Data Exist']
-#        availability.drop(
-#            columns = ['tilename','las_size_m','laz_size_m'],
-#            inplace = True
-#        )
 
         if drop_index_columns:
             availability = _drop_index_columns(availability)
+
         availability = gpd.sjoin(
             availability,
             hucs[['HUC','geometry']].to_crs(availability.crs),
             how = 'inner',
             op = 'intersects'
         )
-        #availability.rename(columns={'index_right':'index_shape'},inplace=True)
+
         filetypes = ('*.img', '*.dem', '*.tif')
         lidardatafiles = []
         for filetype in filetypes:
@@ -1056,6 +1078,7 @@ def index_lidar_files(
                 'pathlower': lidardatafileslower
             }
         )
+
         availability['path'] = availability[['dirname','demname']].apply(
             lambda row: os.path.join(
                 os.path.join(*Path(lidar_parent_directory).parts),
@@ -1070,7 +1093,6 @@ def index_lidar_files(
         )
         availability = availability.merge(lidardatafiles,on='pathlower')
         availability.drop(
-#            columns = ['demname','dirname','path','pathlower'],
             columns = ['path','pathlower'],
             inplace = True
         )