tunned-geobr 0.2.7__tar.gz → 0.2.10__tar.gz

{tunned_geobr-0.2.7 → tunned_geobr-0.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tunned-geobr
-Version: 0.2.7
+Version: 0.2.10
 Summary: Fork personalizado do geobr com funcionalidades extras como download de dados da ANM
 Author: Anderson Stolfi
 License: MIT

{tunned_geobr-0.2.7 → tunned_geobr-0.2.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tunned-geobr"
-version = "0.2.7"
+version = "0.2.10"
 description = "Fork personalizado do geobr com funcionalidades extras como download de dados da ANM"
 readme = "README.md"
 requires-python = "<4.0,>=3.9"

{tunned_geobr-0.2.7 → tunned_geobr-0.2.10}/tunned_geobr/__init__.py

@@ -1,4 +1,4 @@
-from .read_state_direct import read_state_direct
+from .read_state import read_state
 from .read_amazon import read_amazon
 from .read_biomes import read_biomes
 from .read_country import read_country
@@ -16,7 +16,7 @@ from .list_geobr import list_geobr
 from .read_census_tract import read_census_tract
 from .read_meso_region import read_meso_region
 from .read_micro_region import read_micro_region
-from .read_municipality_direct import read_municipality_direct
+from .read_municipality import read_municipality
 from .read_weighting_area import read_weighting_area
 from .read_neighborhood import read_neighborhood
 from .read_health_region import read_health_region

{tunned_geobr-0.2.7 → tunned_geobr-0.2.10}/tunned_geobr/read_gnl_terminals.py

@@ -85,8 +85,9 @@ def read_gnl_terminals(simplified=False, verbose=False):
             with zipfile.ZipFile(zip_path, 'r') as zip_ref:
                 zip_ref.extractall(temp_dir)
             
+            zip_dir = os.path.join(temp_dir,'zipfolder')
             # Find the shapefile in the extracted files
-            shp_files = [f for f in os.listdir(temp_dir) if f.endswith('.shp')]
+            shp_files = [f for f in os.listdir(zip_dir) if f.endswith('.shp')]
             
             if not shp_files:
                 raise Exception("No shapefile found in the downloaded zip file")
@@ -95,7 +96,7 @@ def read_gnl_terminals(simplified=False, verbose=False):
             if verbose:
                 print("Reading shapefile")
             
-            shp_path = os.path.join(temp_dir, shp_files[0])
+            shp_path = os.path.join(zip_dir, shp_files[0])
             gdf = gpd.read_file(shp_path)
             
             # Convert to SIRGAS 2000 (EPSG:4674)
@@ -111,7 +112,7 @@ def read_gnl_terminals(simplified=False, verbose=False):
                 
                 # Select only the most important columns
                 # Adjust these columns based on the actual data structure
-                cols_to_keep = ['NOME', 'EMPRESA', 'CAPACIDADE', 'TIPO', 'UF', 'MUNICIPIO', 'geometry']
+                cols_to_keep = ['NOME', 'EMPRESA', 'TIPO', 'CAPACIDADE', 'UF', 'MUNICIPIO', 'geometry']
                 cols_available = [col for col in cols_to_keep if col in gdf.columns]
                 
                 if not cols_available:
@@ -120,7 +121,7 @@ def read_gnl_terminals(simplified=False, verbose=False):
                     gdf = gdf[cols_available]
             
             if verbose:
-                print("Finished processing GNL terminals data")
+                print("Finished processing oil and derivatives terminals data")
             
             return gdf
     

{tunned_geobr-0.2.7 → tunned_geobr-0.2.10}/tunned_geobr/read_natural_gas_delivery_points.py

@@ -67,7 +67,7 @@ def read_natural_gas_delivery_points(simplified=False, verbose=False):
         # Create a temporary directory to store the downloaded files
         with tempfile.TemporaryDirectory() as temp_dir:
             # Download the zip file
-            zip_path = os.path.join(temp_dir, "gas_delivery_points.zip")
+            zip_path = os.path.join(temp_dir, "delivery_points.zip")
             if verbose:
                 print("Downloading zip file")
             
@@ -85,8 +85,9 @@ def read_natural_gas_delivery_points(simplified=False, verbose=False):
             with zipfile.ZipFile(zip_path, 'r') as zip_ref:
                 zip_ref.extractall(temp_dir)
             
+            zip_dir = os.path.join(temp_dir,'zipfolder')
             # Find the shapefile in the extracted files
-            shp_files = [f for f in os.listdir(temp_dir) if f.endswith('.shp')]
+            shp_files = [f for f in os.listdir(zip_dir) if f.endswith('.shp')]
             
             if not shp_files:
                 raise Exception("No shapefile found in the downloaded zip file")
@@ -95,7 +96,7 @@ def read_natural_gas_delivery_points(simplified=False, verbose=False):
             if verbose:
                 print("Reading shapefile")
             
-            shp_path = os.path.join(temp_dir, shp_files[0])
+            shp_path = os.path.join(zip_dir, shp_files[0])
             gdf = gpd.read_file(shp_path)
             
             # Convert to SIRGAS 2000 (EPSG:4674)
@@ -111,7 +112,7 @@ def read_natural_gas_delivery_points(simplified=False, verbose=False):
                 
                 # Select only the most important columns
                 # Adjust these columns based on the actual data structure
-                cols_to_keep = ['NOME', 'TIPO', 'UF', 'MUNICIPIO', 'geometry']
+                cols_to_keep = ['NOME', 'EMPRESA', 'TIPO', 'CAPACIDADE', 'UF', 'MUNICIPIO', 'geometry']
                 cols_available = [col for col in cols_to_keep if col in gdf.columns]
                 
                 if not cols_available:
@@ -120,7 +121,7 @@ def read_natural_gas_delivery_points(simplified=False, verbose=False):
                     gdf = gdf[cols_available]
             
             if verbose:
-                print("Finished processing natural gas delivery points data")
+                print("Finished processing oil and derivatives terminals data")
             
             return gdf
     

{tunned_geobr-0.2.7 → tunned_geobr-0.2.10}/tunned_geobr/read_natural_gas_processing_hub.py

@@ -67,7 +67,7 @@ def read_natural_gas_processing_hub(simplified=False, verbose=False):
         # Create a temporary directory to store the downloaded files
         with tempfile.TemporaryDirectory() as temp_dir:
             # Download the zip file
-            zip_path = os.path.join(temp_dir, "gas_processing_hubs.zip")
+            zip_path = os.path.join(temp_dir, "processing_hubs.zip")
             if verbose:
                 print("Downloading zip file")
             
@@ -85,8 +85,9 @@ def read_natural_gas_processing_hub(simplified=False, verbose=False):
             with zipfile.ZipFile(zip_path, 'r') as zip_ref:
                 zip_ref.extractall(temp_dir)
             
+            zip_dir = os.path.join(temp_dir,'zipfolder')
             # Find the shapefile in the extracted files
-            shp_files = [f for f in os.listdir(temp_dir) if f.endswith('.shp')]
+            shp_files = [f for f in os.listdir(zip_dir) if f.endswith('.shp')]
             
             if not shp_files:
                 raise Exception("No shapefile found in the downloaded zip file")
@@ -95,7 +96,7 @@ def read_natural_gas_processing_hub(simplified=False, verbose=False):
             if verbose:
                 print("Reading shapefile")
             
-            shp_path = os.path.join(temp_dir, shp_files[0])
+            shp_path = os.path.join(zip_dir, shp_files[0])
             gdf = gpd.read_file(shp_path)
             
             # Convert to SIRGAS 2000 (EPSG:4674)
@@ -111,7 +112,7 @@ def read_natural_gas_processing_hub(simplified=False, verbose=False):
                 
                 # Select only the most important columns
                 # Adjust these columns based on the actual data structure
-                cols_to_keep = ['NOME', 'EMPRESA', 'CAPACIDADE', 'UF', 'MUNICIPIO', 'geometry']
+                cols_to_keep = ['NOME', 'EMPRESA', 'TIPO', 'CAPACIDADE', 'UF', 'MUNICIPIO', 'geometry']
                 cols_available = [col for col in cols_to_keep if col in gdf.columns]
                 
                 if not cols_available:
@@ -120,7 +121,7 @@ def read_natural_gas_processing_hub(simplified=False, verbose=False):
                     gdf = gdf[cols_available]
             
             if verbose:
-                print("Finished processing natural gas processing hubs data")
+                print("Finished processing oil and derivatives terminals data")
             
             return gdf
     

{tunned_geobr-0.2.7 → tunned_geobr-0.2.10}/tunned_geobr/read_pio_ducts.py

@@ -85,8 +85,9 @@ def read_pio_ducts(simplified=False, verbose=False):
             with zipfile.ZipFile(zip_path, 'r') as zip_ref:
                 zip_ref.extractall(temp_dir)
             
+            zip_dir = os.path.join(temp_dir,'zipfolder')
             # Find the shapefile in the extracted files
-            shp_files = [f for f in os.listdir(temp_dir) if f.endswith('.shp')]
+            shp_files = [f for f in os.listdir(zip_dir) if f.endswith('.shp')]
             
             if not shp_files:
                 raise Exception("No shapefile found in the downloaded zip file")
@@ -95,7 +96,7 @@ def read_pio_ducts(simplified=False, verbose=False):
             if verbose:
                 print("Reading shapefile")
             
-            shp_path = os.path.join(temp_dir, shp_files[0])
+            shp_path = os.path.join(zip_dir, shp_files[0])
             gdf = gpd.read_file(shp_path)
             
             # Convert to SIRGAS 2000 (EPSG:4674)
@@ -111,7 +112,7 @@ def read_pio_ducts(simplified=False, verbose=False):
                 
                 # Select only the most important columns
                 # Adjust these columns based on the actual data structure
-                cols_to_keep = ['NOME', 'EMPRESA', 'EXTENSAO', 'DIAMETRO', 'UF', 'geometry']
+                cols_to_keep = ['NOME', 'EMPRESA', 'TIPO', 'CAPACIDADE', 'UF', 'MUNICIPIO', 'geometry']
                 cols_available = [col for col in cols_to_keep if col in gdf.columns]
                 
                 if not cols_available:
@@ -120,7 +121,7 @@ def read_pio_ducts(simplified=False, verbose=False):
                     gdf = gdf[cols_available]
             
             if verbose:
-                print("Finished processing PIO ducts data")
+                print("Finished processing oil and derivatives terminals data")
             
             return gdf