geocif 0.2.50__tar.gz → 0.2.52__tar.gz

{geocif-0.2.50/geocif.egg-info → geocif-0.2.52}/PKG-INFO

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

{geocif-0.2.50 → geocif-0.2.52}/geocif/analysis.py

@@ -761,27 +761,6 @@ class Geoanalysis:
                     #     loc_legend="lower left",
                     # )
 
-                    """ Predicted Yield """
-                    fname = f"map_{fname_prefix}_{self.crop}_{time_period}_{year}_predicted_yield.png"
-                    plot.plot_df_shpfile(
-                        self.dg,  # dataframe containing adm1 name and polygon
-                        df_harvest_year,  # dataframe containing information that will be mapped
-                        merge_col="Country Region",  # Column on which to merge
-                        name_country=countries,  # Plot global map
-                        name_col="Predicted Yield (tn per ha)",  # Which column to plot
-                        dir_out=self.dir_plot / str(year),  # Output directory
-                        fname=fname,  # Output file name
-                        label=f"Predicted Yield (Mg/ha)\n{self.crop.title()}, {year}",
-                        vmin=df_harvest_year[self.predicted].min(),
-                        vmax=df_harvest_year[self.predicted].max(),
-                        cmap=pal.scientific.sequential.Bamako_20_r,
-                        series="sequential",
-                        show_bg=False,
-                        annotate_regions=self.annotate_regions,
-                        annotate_region_column=annotate_region_column,
-                        loc_legend="lower left",
-                    )
-
                     # Make map of predicted yield by country
                     for country in countries:
                         df_country = df_model[df_model["Country"] == country.lower().replace(" ", "_")]

{geocif-0.2.50 → geocif-0.2.52}/geocif/viz/plot.py

@@ -220,25 +220,7 @@ def plot_df_shpfile(
     ################################################
     # Plot scalebar
     ################################################
-    if name_country != "world":
-        from matplotlib_scalebar.scalebar import ScaleBar
-        from shapely.geometry.point import Point
-        import geopandas as gp
-
-        points = gp.GeoSeries(
-            [Point(-73.5, 40.5), Point(-74.5, 40.5)], crs=4326
-        )  # Geographic WGS 84 - degrees
-        points = points.to_crs(32619)  # Projected WGS 84 - meters
-        distance_meters = points[0].distance(points[1])
-        ax.add_artist(
-            ScaleBar(
-                distance_meters,
-                box_alpha=0.75,
-                frameon=False,
-                location="lower right",
-                font_properties={"family": "serif", "size": "xx-small"},
-            )
-        )
+   
 
     # Add title to map plot
     if title:
@@ -301,7 +283,7 @@ def plot_df_shpfile(
 
             norm = BoundaryNorm(ticks, ncolors=cmap.mpl_colormap.N, clip=True)
             cbaxes = inset_axes(
-                ax, width="60%", height="3%", loc=loc_legend, borderpad=0.25
+                ax, width="75%", height="3%", loc=loc_legend, borderpad=0.25
             )
             sm = plt.cm.ScalarMappable(norm=norm, cmap=cmap.mpl_colormap)
             # sm._A = []
@@ -328,7 +310,7 @@ def plot_df_shpfile(
             # plt.setp(cb.ax.xaxis.get_ticklines(), alpha=0.6)
             # Do not show first and last tick label
             ticks[0] = ""
-            ticks[-1] = ""
+            # ticks[-1] = ""
             cb.ax.set_title(
                 label, fontsize=8, fontweight="semibold", fontfamily="Arial"
             )

{geocif-0.2.50 → geocif-0.2.52/geocif.egg-info}/PKG-INFO

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

{geocif-0.2.50 → geocif-0.2.52}/setup.py

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