Minor cleanup

Author: rustprooflabs

docker/geofabrik.py

@@ -107,8 +107,10 @@ def set_date_from_metadata(pbf_file: str):
     os.environ['PBF_TIMESTAMP'] = meta_timestamp
 
 
-def pbf_download_needed(pbf_file_with_date: str, md5_file_with_date: str,
-                        pgosm_date: str) -> bool:
+def pbf_download_needed(pbf_file_with_date: str,
+                        md5_file_with_date: str,
+                        pgosm_date: str
+                        ) -> bool:
     """Decides if the PBF/MD5 files need to be downloaded.
 
     Parameters
@@ -123,6 +125,8 @@ def pbf_download_needed(pbf_file_with_date: str, md5_file_with_date: str,
     """
     logger = logging.getLogger('pgosm-flex')
     # If the PBF file exists, check for the MD5 file too.
+    logger.debug(f'Checking for PBF File: {pbf_file_with_date}')
+
     if os.path.exists(pbf_file_with_date):
         logger.info(f'PBF File exists {pbf_file_with_date}')
 

docker/helpers.py

@@ -310,7 +310,7 @@ def okay_to_run(self, prior_import: dict) -> bool:
         """
         self.logger.debug(f'Checking if it is okay to run...')
         if self.force:
-            self.logger.warn(f'Using --force, kiss existing data goodbye')
+            self.logger.warning(f'Using --force, kiss existing data goodbye')
             return True
 
         # If no prior imports, do not require force

docker/tests/test_geofabrik.py

@@ -6,7 +6,10 @@
 REGION_US = 'north-america/us'
 SUBREGION_DC = 'district-of-columbia'
 LAYERSET = 'default'
-PGOSM_DATE = '2021-12-02'
+PGOSM_DATE = '2021-01-13'
+
+PBF_FILE_WITH_DATE = f'/app/tests/data/district-of-columbia-{PGOSM_DATE}.osm.pbf'
+MD5_FILE_WITH_DATE = f'/app/tests/data/district-of-columbia-{PGOSM_DATE}.osm.pbf.md5'
 
 
 class GeofabrikTests(unittest.TestCase):
@@ -34,7 +37,7 @@ def test_get_region_filename_returns_subregion_when_exists(self):
     def test_get_region_filename_returns_region_when_subregion_None(self):
         # Override Subregion to None
         helpers.unset_env_vars()
-        helpers.set_env_vars(region='north-america/us',
+        helpers.set_env_vars(region=REGION_US,
                              subregion=None,
                              srid=3857,
                              language=None,
@@ -64,7 +67,6 @@ def test_get_pbf_url_returns_proper_with_region_and_subregion(self):
 
     def test_pbf_download_needed_returns_boolean(self):
         pgosm_date = geofabrik.helpers.get_today()
-        region_filename = geofabrik.get_region_filename()
         expected = bool
         result = geofabrik.pbf_download_needed(pbf_file_with_date='does-not-matter',
                                                md5_file_with_date='not-a-file',
@@ -73,11 +75,9 @@ def test_pbf_download_needed_returns_boolean(self):
 
     def test_pbf_download_needed_returns_true_when_file_not_exists(self):
         pgosm_date = geofabrik.helpers.get_today()
-        region_filename = geofabrik.get_region_filename()
         expected = True
         result = geofabrik.pbf_download_needed(pbf_file_with_date='does-not-matter',
                                                md5_file_with_date='not-a-file',
                                                pgosm_date=pgosm_date)
         self.assertEqual(expected, result)
 
-