elev stochastic downselect should return gid not index

docs/source/whatsnew/releases/v0.5.0.rst

@@ -46,7 +46,11 @@ Now, either of the following options work.
     def myfunc(...):
         ....
 
+Bug Fixes
+-------------
+- fixed an issue where pvdeg.geospatial.elevation_stochastic_downselect would return metadata row indicies which were downselected instead of named gids.
+
 
 Contributors
 -----------
-- Tobin Ford (:ghuser:`tobin-ford`)
+- Tobin Ford (:ghuser:`tobin-ford`)

pvdeg/geospatial.py

@@ -1071,7 +1071,9 @@ def elevation_stochastic_downselect(
         a=len(coords), p=normalized_weights / np.sum(normalized_weights), size=m
     )
 
-    return np.unique(selected_indicies)
+    return meta_df.index.values[np.unique(selected_indicies)]
+    #return meta_df.iloc[np.unique(selected_indicies)].index.values
+    #return np.unique(selected_indicies)
 
 
 def interpolate_analysis(

pvdeg/scenario.py

@@ -1320,7 +1320,7 @@ def downselect_CONUS(
     ) -> None:
         """Downselect US to contiguous US geospatial data"""
 
-        geo_weather, geo_meta = self.geospatial_data()
+        geo_weather, geo_meta = self.get_geospatial_data()
 
         geo_meta = geo_meta[geo_meta['state'] != "Alaska"]
         geo_meta = geo_meta[geo_meta['state'] != "Hawaii"]
@@ -1497,7 +1497,7 @@ def classify_mountains_weights(
         return
 
     def classify_feature(
-        self,
+       self,
         feature_name=None,
         resolution="10m",
         radius=None,
@@ -1594,7 +1594,7 @@ def downselect_elevation_stochastic(
             normalization=normalization,
         )
 
-        self.meta_data = self.meta_data.iloc[gids]
+        self.meta_data = self.meta_data.loc[gids]
         return
 
     def gid_downsample(self, downsample_factor: int) -> None:
@@ -1895,7 +1895,6 @@ def plot(self):
         Not Usable in GeospatialScenario class instance, only in Scenario instance.
         """
         # python has no way to hide a parent class method in the child, so this only exists to prevent access
-        #
         raise AttributeError(
             "The 'plot' method is not accessible in GeospatialScenario, only in Scenario"
         )
@@ -1928,7 +1927,7 @@ def plot_coords(
             the most extreme coordinates for the United States coastline information.
         size : float
             matplotlib scatter point size. Without any downsampling NSRDB
-            points will siginficantly overlap.
+            points will siginficantly overlap and plot may appear as a solid color.
 
         Returns:
         --------
@@ -1938,7 +1937,7 @@ def plot_coords(
         fig = plt.figure(figsize=(15, 10))
         ax = plt.axes(projection=ccrs.PlateCarree())
 
-        if (coord_1 and coord_2) or (coords != None):
+        if (coord_1 and coord_2) or (coords is not None):
             utilities._plot_bbox_corners(
                 ax=ax, coord_1=coord_1, coord_2=coord_2, coords=coords
             )
@@ -2151,7 +2150,7 @@ def _ipython_display_(self):
             <p><strong>self.gids:</strong> {self.gids}</p>
             <div>
                 <h3>self.results</h3>
-                {self.format_results() if self.results else None}
+                {self.format_results() if self.results else ''}
             </div>
             <div>
                 <h3>Geospatial Work</h3>
@@ -2169,6 +2168,10 @@ def _ipython_display_(self):
                 <h3>self.meta_data</h3>
                 {self.format_geo_meta()}
             </div>
+            <div>
+                <h3>self.kdtree</h3>
+                {self.kdtree or ''}
+            </div>
             <div>
                 <h3>self.dask_client</h3>
                 {self.format_dask_link()}

pvdeg/store.py

@@ -3,7 +3,7 @@
 import pandas as pd
 import numpy as np
 import dask.array as da    
-import zarr
+#import zarr
 import os
 
 from pvdeg import METOROLOGICAL_DOWNLOAD_PATH
@@ -285,4 +285,4 @@ def _create_sample_sheet(fill_value, latitude: float=999, longitude: float=999,
         dim = sheet_ds[var].dims
         sheet_ds[var] = (dim, dummy_da)
 
-    return sheet_ds, meta_df
+    return sheet_ds, meta_df