Merge branch 'krivard/covid_hosp-facility-running-time' of github.com:cmu-delphi/delphi-epidata into krivard/covid_hosp-facility-running-time

Author: krivard

src/acquisition/covid_hosp/common/database.py

@@ -211,8 +211,7 @@ def nan_safe_dtype(dtype, value):
             many_values = []
           except Exception as e:
             if logger:
-              logger.info('error on insert', index=index, values=values)
-              logger.error(e)
+              logger.error('error on insert', publ_date=publication_date, in_lines=(n-5_000, n), index=index, values=values, exception=e)
             raise e
       # insert final batch
       if many_values:

src/acquisition/covid_hosp/common/utils.py

@@ -79,15 +79,15 @@ def limited_string(value):
     return limited_string
 
   GEOCODE_LENGTH = 32
-  GEOCODE_PATTERN = re.compile(r'POINT \(([0-9.-]*) ([0-9.-]*)\)')
+  GEOCODE_PATTERN = re.compile(r'POINT \((-?[0-9.]+) (-?[0-9.]+)\)')
   def limited_geocode(value):
     if len(value) < Utils.GEOCODE_LENGTH:
       return value
-    # otherwise parse and reduce precision to 5
+    # otherwise parse and set precision to 6 decimal places
     m = Utils.GEOCODE_PATTERN.match(value)
     if not m:
       raise CovidHospException(f"Couldn't parse geocode '{value}'")
-    return f'POINT ({" ".join(map(lambda x: f"{float(x):.6f}", m.groups()))})'
+    return f'POINT ({" ".join(f"{float(x):.6f}" for x in m.groups())})'
 
   def issues_to_fetch(metadata, newer_than, older_than, logger=False):
     """