Use pandas string accessors for slightly cleaner code

NREL · Jun 30, 2022 · 51f1f44 · 51f1f44
1 parent 71a766c
commit 51f1f44
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/reVX/setbacks/base.py b/reVX/setbacks/base.py
@@ -271,6 +271,9 @@ def _parse_regulations(self, regulations_fpath):
             logger.error(msg)
             raise RuntimeError(msg)
 
+        feature_types = regulations['Feature Type'].str.strip().str.lower()
+        regulations['Feature Type'] = feature_types
+
         return regulations.to_crs(crs=self.crs)
 
     def _parse_county_regulations(self, regulations):

diff --git a/reVX/setbacks/parcel_setbacks.py b/reVX/setbacks/parcel_setbacks.py
@@ -97,7 +97,7 @@ def _parse_regulations(self, regulations_fpath):
         """
         regulations = super()._parse_regulations(regulations_fpath)
 
-        mask = regulations['Feature Type'].apply(str.strip) == 'Property Line'
+        mask = regulations['Feature Type'] == 'property line'
         regulations = regulations.loc[mask]
 
         return regulations

diff --git a/reVX/setbacks/water_setbacks.py b/reVX/setbacks/water_setbacks.py
@@ -29,7 +29,7 @@ def _parse_regulations(self, regulations_fpath):
         """
         regulations = super()._parse_regulations(regulations_fpath)
 
-        feats = regulations['Feature Type'].apply(str.strip).apply(str.lower)
-        regulations = regulations.loc[feats == 'water']
+        mask = regulations['Feature Type'] == 'water'
+        regulations = regulations.loc[mask]
 
         return regulations
diff --git a/reVX/setbacks/wind_setbacks.py b/reVX/setbacks/wind_setbacks.py
@@ -413,7 +413,7 @@ def _parse_regulations(self, regulations_fpath):
         """
         regulations = super()._parse_regulations(regulations_fpath)
 
-        mask = ((regulations['Feature Type'] == 'Structures')
+        mask = ((regulations['Feature Type'] == 'structures')
                 & (regulations['Comment'] != 'Occupied Community Buildings'))
         regulations = regulations.loc[mask]
 
@@ -522,7 +522,7 @@ def _parse_regulations(self, regulations_fpath):
         """
         regulations = super()._parse_regulations(regulations_fpath)
 
-        feature_types = {'Roads', 'Highways', 'Highways 111'}
+        feature_types = {'roads', 'highways', 'highways 111'}
         mask = regulations['Feature Type'].isin(feature_types)
         regulations = regulations.loc[mask]
 
@@ -585,7 +585,7 @@ def _parse_regulations(self, regulations_fpath):
         """
         regulations = super()._parse_regulations(regulations_fpath)
 
-        mask = regulations['Feature Type'] == 'Transmission'
+        mask = regulations['Feature Type'] == 'transmission'
         regulations = regulations.loc[mask]
 
         return regulations
@@ -617,7 +617,7 @@ def _parse_regulations(self, regulations_fpath):
         sup = super(TransmissionWindSetbacks, self)
         regulations = sup._parse_regulations(regulations_fpath)
 
-        mask = regulations['Feature Type'] == 'Railroads'
+        mask = regulations['Feature Type'] == 'railroads'
         regulations = regulations.loc[mask]
 
         return regulations
diff --git a/tests/test_setbacks.py b/tests/test_setbacks.py
@@ -222,7 +222,7 @@ def test_local_parcels(max_workers, regulations_fpath):
 
     regulations = pd.read_csv(regulations_fpath)
     property_lines = (
-        regulations['Feature Type'].apply(str.strip) == 'Property Line'
+        regulations['Feature Type'].str.strip() == 'Property Line'
     )
     counties_should_have_exclusions = set(
         regulations[property_lines].FIPS.unique()
@@ -294,7 +294,7 @@ def test_local_water(max_workers, regulations_fpath, expected_sum):
         counties_with_exclusions = set(exc['cnty_fips'][np.where(test)])
 
     regulations = pd.read_csv(regulations_fpath)
-    feats = regulations['Feature Type'].apply(str.strip).apply(str.lower)
+    feats = regulations['Feature Type'].str.strip().str.lower()
     counties_should_have_exclusions = set(
         regulations[feats == 'water'].FIPS.unique()
     )