removed old comments that were specific to release 0.9.1, changed name of variable that was specific to IWP dataset within clip to footprint step

Author: julietcohen

pdgstaging/ConfigManager.py

@@ -275,9 +275,7 @@ class ConfigManager():
                     the intersecting polygons to be considered a duplicate. If
                     False, then the overlap_tolerance proportion must be True
                     for only one of the intersecting polygons to be considered
-                    a duplicate. Default is True. Note that with release 0.9.0, 
-                    the 'neighbor' method has been not been thoroughly tested 
-                    and should not be applied to input data.
+                    a duplicate. Default is True.
                 - deduplicate_centroid_tolerance : float, optional
                     For the 'neighbor' deduplication method only. The maximum
                     distance between the centroids of two polygons to be
@@ -299,8 +297,8 @@ class ConfigManager():
                 - deduplicate_clip_to_footprint : bool, optional
                     For the 'footprints' deduplication method only. If True,
                     then polygons that fall outside the bounds of the
-                    associated footprint will be removed. Default is True for
-                    release version 0.9.0, but will be false for future releases.
+                    associated footprint will be removed. Default is True for this
+                    release, but will be false for future releases.
                 - deduplicate_clip_method: str, optional
                     For the 'footprints' deduplication method only, when
                     deduplicate_clip_to_footprint is True. The method to use to

pdgstaging/Deduplicator.py

@@ -478,8 +478,8 @@ def deduplicate_by_footprint(
     return_intersections : bool, optional
         If true, the polygons that represent the intersections between
         footprints will be returned. Default is False. Not currently available
-        in this release 0.9.0. return_intersections is to be integrated again 
-        in future releases.
+        in this release. return_intersections is to be integrated again 
+        in a future release.
     prop_duplicated : str, optional
         Defaults to "staging_duplicated". The column name / property to use to 
         flag duplicates.
@@ -494,7 +494,7 @@ def deduplicate_by_footprint(
         `intersections` represents the polygon area where the footprints overlap. 
         It has not been integrated into the function again since the deduplication 
         approach changed from returning a dictionary to returning a labeled GDF.
-        This will be integrated again in releases after 0.9.0.
+        This will be integrated again in a future release.
     """
 
     logger.info(f"Executing footprint deduplication.")

pdgstaging/TileStager.py

@@ -130,8 +130,7 @@ def stage(self, path):
 
         if (gdf is not None) and (len(gdf) > 0):
             gdf = self.simplify_geoms(gdf)
-            # clip to footprint before CRS of IWP data is transformed
-            # to EPSG:4326
+            # If clipping to footprint, do so before CRS is transformed
             gdf = self.clip_to_footprint(gdf, path)
             gdf = self.set_crs(gdf)
             self.grid = self.make_tms_grid(gdf)
@@ -177,19 +176,19 @@ def clip_to_footprint(self, gdf, path):
             fp = self.get_data(fp_path)
             logger.info(f' Checking CRSs of polygons and footprint.')
 
-            iwp_crs = gdf.crs
+            data_crs = gdf.crs
             fp_crs = fp.crs
 
-            if iwp_crs == fp_crs:
-                logger.info(f" CRSs match. They are both {iwp_crs}.")
+            if data_crs == fp_crs:
+                logger.info(f" CRSs match. They are both {data_crs}.")
             else:
-                logger.info(f" CRSs do not match.\n IWP's CRS is {iwp_crs}."
+                logger.info(f" CRSs do not match.\n Data's CRS is {data_crs}."
                             f" Footprint's CRS is {fp_crs}.")
                 # transform the footprint to the CRS of the polygon data
-                fp.to_crs(iwp_crs, inplace = True)
+                fp.to_crs(data_crs, inplace = True)
                 # check again
                 fp_crs_transformed = fp.crs
-                if iwp_crs == fp_crs_transformed:
+                if data_crs == fp_crs_transformed:
                     logger.info("Footprint CRS has been transformed to CRS of polygons.")
                 else:
                     logger.error("Failed to transform footprint CRS to CRS of polygons.")
@@ -505,8 +504,8 @@ def save_tiles(self, gdf=None):
                     # no polygons will be labeled as duplicates or not.
                     # If deduplicating by footprint: 
                     # neither file has been clipped to footprint
-                    logger.info(f"Tile exists but dedup is not set to occur, so just "
-                                f"appending the polygons.")
+                    logger.info(f"Tile exists but dedup is not set to occur, so"
+                                f" appending polygons.")
 
                     # Append to existing tile
                     mode = 'a'