Cleanup notebook and example data

GloUrb · May 6, 2024 · a5174c4 · a5174c4
1 parent c7209b1
commit a5174c4
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 124 deletions.
diff --git a/example_data/Yamuna_segm_2km_UTF8.qmd b/example_data/Yamuna_segm_2km_UTF8.qmd
diff --git a/example_data/jrc_indicators.csv b/example_data/jrc_indicators.csv
diff --git a/example_data/Lhasa_RC_DGO2km_updated.cpg → example_data/lhasa_dgo_2km.cpg b/example_data/Lhasa_RC_DGO2km_updated.cpg → example_data/lhasa_dgo_2km.cpg
diff --git a/example_data/Lhasa_RC_DGO2km_updated.dbf → example_data/lhasa_dgo_2km.dbf b/example_data/Lhasa_RC_DGO2km_updated.dbf → example_data/lhasa_dgo_2km.dbf
diff --git a/example_data/Lhasa_RC_DGO2km_updated.prj → example_data/lhasa_dgo_2km.prj b/example_data/Lhasa_RC_DGO2km_updated.prj → example_data/lhasa_dgo_2km.prj
diff --git a/example_data/Lhasa_RC_DGO2km_updated.shp → example_data/lhasa_dgo_2km.shp b/example_data/Lhasa_RC_DGO2km_updated.shp → example_data/lhasa_dgo_2km.shp
diff --git a/example_data/Lhasa_RC_DGO2km_updated.shx → example_data/lhasa_dgo_2km.shx b/example_data/Lhasa_RC_DGO2km_updated.shx → example_data/lhasa_dgo_2km.shx
diff --git a/example_data/metrics.csv b/example_data/metrics.csv
diff --git a/example_data/properties.csv b/example_data/properties.csv
diff --git a/example_data/Yamuna_segm_2km_UTF8.cpg → example_data/yamuna_dgo_2km.cpg b/example_data/Yamuna_segm_2km_UTF8.cpg → example_data/yamuna_dgo_2km.cpg
diff --git a/example_data/Yamuna_segm_2km_UTF8.dbf → example_data/yamuna_dgo_2km.dbf b/example_data/Yamuna_segm_2km_UTF8.dbf → example_data/yamuna_dgo_2km.dbf
diff --git a/example_data/Yamuna_segm_2km_UTF8.prj → example_data/yamuna_dgo_2km.prj b/example_data/Yamuna_segm_2km_UTF8.prj → example_data/yamuna_dgo_2km.prj
diff --git a/example_data/Yamuna_segm_2km_UTF8.shp → example_data/yamuna_dgo_2km.shp b/example_data/Yamuna_segm_2km_UTF8.shp → example_data/yamuna_dgo_2km.shp
diff --git a/example_data/Yamuna_segm_2km_UTF8.shx → example_data/yamuna_dgo_2km.shx b/example_data/Yamuna_segm_2km_UTF8.shx → example_data/yamuna_dgo_2km.shx
diff --git a/glourbee/assets_management.py b/glourbee/assets_management.py
@@ -7,6 +7,7 @@
 import pandas as pd
 import geopandas as gpd
 
+from typing import Union
 from urllib.request import urlretrieve
 from time import sleep
 from datetime import datetime
@@ -261,16 +262,15 @@ class MetricsDataset(GlourbEEDataset):
     def __init__(self, 
                  ee_project_name: str = 'ee-glourb', 
                  asset_uuid: str = None,
-                 parent_zones = None):
-
-        assert isinstance(parent_zones, (ExtractionZones, str)), 'Parent zones should be provided as glourbee ExtractionZones or uuid.'
+                 parent_zones: Union[str, ExtractionZones] = None):
 
         if isinstance(parent_zones, str):
             self.gee_dir = f'projects/{ee_project_name}/assets/extraction_zones/{parent_zones}/{asset_uuid}'
             self.parent_zones = ExtractionZones(asset_uuid=parent_zones)
             super().__init__(ee_project_name, asset_uuid)
         else:
-            self.gee_dir = f'projects/{self.ee_project_name}/assets/extraction_zones/{parent_zones.asset_uuid}/{asset_uuid}'
+            self.parent_zones = parent_zones
+            self.gee_dir = f'projects/{ee_project_name}/assets/extraction_zones/{parent_zones.asset_uuid}/{asset_uuid}'
             super().__init__(ee_project_name, asset_uuid)
 
         self.len = self.parent_zones.len
@@ -399,4 +399,4 @@ def uploadDGOs(dgo_shapefile_path, simplify_tolerance=15, ee_project_name='ee-gl
     raise DeprecationWarning('This function is deprecated. Use ExtractionZones.upload_to_gee() method instead.')
 
 def downloadMetrics(metrics, output_file, ee_project_name='ee-glourb'):
-    raise DeprecationWarning('This function is deprecated. Use MetricsDataset.download() method instead.')
+    raise DeprecationWarning('This function is deprecated. Use MetricsDataset.download() method instead.')