geocif 0.1.56__tar.gz → 0.1.58__tar.gz

{geocif-0.1.56/geocif.egg-info → geocif-0.1.58}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geocif
-Version: 0.1.56
+Version: 0.1.58
 Summary: Models to visualize and forecast crop conditions and yields
 Home-page: https://ritviksahajpal.github.io/yield_forecasting/
 Author: Ritvik Sahajpal

{geocif-0.1.56 → geocif-0.1.58}/geocif/analysis.py

@@ -872,9 +872,7 @@ class Geoanalysis:
         # Get the ML section
         df_ml = self.df_config[self.df_config["Section"] == "ML"]
 
-        self.countries = ast.literal_eval(
-            df_ml[df_ml["Option"] == "countries"]["Value"].values[0]
-        )
+        self.countries = ["malawi"]
         for country in self.countries:
             df = self.df_config[self.df_config["Section"] == country]
 
@@ -959,10 +957,11 @@ class RegionalMapper(Geoanalysis):
         self.read_data()
 
         self.clean_data()
-        self.plot_heatmap()
-        self.plot_kde()
-        self.plot_mape_map()
-        self.plot_mape_by_year()
+        if not self.df_regional.empty and self.df_regional_by_year.empty:
+            self.plot_heatmap()
+            self.plot_kde()
+            self.plot_mape_map()
+            self.plot_mape_by_year()
 
     def read_data(self):
         """Read data from the database."""
@@ -1207,13 +1206,13 @@ def run(path_config_files=[Path("../config/geocif.txt")]):
 
     df = pd.concat(frames)
 
-    """ Map regional error metrics """
-    #mapper = RegionalMapper(path_config_files, logger, parser)
-    #mapper.map_regional()
-
     """ For each country, plot yields, conditions, anomalies, etc. """
     obj.map(df)
 
+    """ Map regional error metrics """
+    mapper = RegionalMapper(path_config_files, logger, parser)
+    mapper.map_regional()
+
 
 if __name__ == "__main__":
     run()

{geocif-0.1.56 → geocif-0.1.58}/geocif/viz/plot.py

@@ -390,11 +390,9 @@ def plot_df_shpfile(
                 )
                 _name_country.append(cntr.replace(" ", "_").lower())
 
-            extent = [10.7, 33.9, -35.8, 5.4]
-               # (
-               # rgeo.get_country_lat_lon_extent(
-               # _name_country, buffer=1.0
-            #))  # left, right, bottom, top
+            extent = rgeo.get_country_lat_lon_extent(
+                _name_country, buffer=1.0
+            )  # left, right, bottom, top
             # Hack: Add space to the top for adding title
             extent[3] = extent[3] + 2
             # Add some space to the bottom for adding legend and colorbar

{geocif-0.1.56 → geocif-0.1.58/geocif.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geocif
-Version: 0.1.56
+Version: 0.1.58
 Summary: Models to visualize and forecast crop conditions and yields
 Home-page: https://ritviksahajpal.github.io/yield_forecasting/
 Author: Ritvik Sahajpal

{geocif-0.1.56 → geocif-0.1.58}/setup.py

@@ -50,6 +50,6 @@ setup(
     test_suite="tests",
     tests_require=test_requirements,
     url="https://ritviksahajpal.github.io/yield_forecasting/",
-    version="0.1.56",
+    version="0.1.58",
     zip_safe=False,
 )