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

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

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

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

@@ -1,6 +1,6 @@
 [project]
 name = "tunned-geobr"
-version = "0.2.5"
+version = "0.2.7"
 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.5 → tunned_geobr-0.2.7}/tunned_geobr/__init__.py

@@ -1,4 +1,4 @@
-from .read_state_direct import read_state
+from .read_state_direct import read_state_direct
 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
+from .read_municipality_direct import read_municipality_direct
 from .read_weighting_area import read_weighting_area
 from .read_neighborhood import read_neighborhood
 from .read_health_region import read_health_region
@@ -65,7 +65,6 @@ from .read_water_bodies_ana import read_water_bodies_ana
 from .read_pan_strategic_areas import read_pan_strategic_areas
 from .read_geographic_regions import read_geographic_regions
 from .read_biosphere_reserves import read_biosphere_reserves
-from .read_census_tract_2022 import read_census_tract_2022
 from .read_neighborhoods_2022 import read_neighborhoods_2022
 from .read_baze_sites import read_baze_sites
 from .read_existent_eolic import read_existent_eolic

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/list_geobr.py

@@ -25,17 +25,13 @@ def list_geobr():
         {"Function": "read_country", "Geography": "Country", "Years": "All", "Source": "IBGE"},
         {"Function": "read_region", "Geography": "Region", "Years": "All", "Source": "IBGE"},
         {"Function": "read_state", "Geography": "State", "Years": "All", "Source": "IBGE"},
-        {"Function": "read_state_direct", "Geography": "State", "Years": "All", "Source": "IBGE"},
         {"Function": "read_meso_region", "Geography": "Meso region", "Years": "1991, 2000, 2010, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020", "Source": "IBGE"},
         {"Function": "read_micro_region", "Geography": "Micro region", "Years": "1991, 2000, 2010, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020", "Source": "IBGE"},
         {"Function": "read_immediate_region", "Geography": "Immediate region", "Years": "2017, 2019, 2020", "Source": "IBGE"},
         {"Function": "read_intermediate_region", "Geography": "Intermediate region", "Years": "2017, 2019, 2020", "Source": "IBGE"},
         {"Function": "read_municipality", "Geography": "Municipality", "Years": "All", "Source": "IBGE"},
-        {"Function": "read_municipality_direct", "Geography": "Municipality", "Years": "All", "Source": "IBGE"},
         {"Function": "read_weighting_area", "Geography": "Census weighting area", "Years": "2010", "Source": "IBGE"},
-        {"Function": "read_census_tract", "Geography": "Census tract", "Years": "2000, 2010", "Source": "IBGE"},
-        {"Function": "read_census_tract_2022", "Geography": "Census tract 2022", "Years": "2022", "Source": "IBGE"},
-        {"Function": "read_statistical_grid", "Geography": "Statistical grid", "Years": "2010", "Source": "IBGE"},
+        {"Function": "read_census_tract", "Geography": "Census tract 2022", "Years": "2022", "Source": "IBGE"},
         {"Function": "read_comparable_areas", "Geography": "Comparable areas", "Years": "1872, 1900, 1911, 1920, 1933, 1940, 1950, 1960, 1970, 1980, 1991, 2000, 2010", "Source": "IBGE"},
         {"Function": "read_health_region", "Geography": "Health region", "Years": "1991, 1994, 1997, 2001, 2005, 2013", "Source": "DataSUS"},
         {"Function": "read_metro_area", "Geography": "Metropolitan area", "Years": "All", "Source": "IBGE"},

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_ama_anemometric_towers.py

@@ -7,7 +7,7 @@ import warnings
 import shutil
 
 
-def read_ama_anemometric_towers(simplified=True, verbose=False):
+def read_ama_anemometric_towers(simplified=False, verbose=False):
     """Download data for AMA Anemometric Towers in Brazil.
 
     This function downloads, processes, and returns data for AMA Anemometric Towers
@@ -45,10 +45,8 @@ def read_ama_anemometric_towers(simplified=True, verbose=False):
         response.raise_for_status()
         response_json = response.json()
 
-        if "value" not in response_json or not response_json["value"]:
-            raise ValueError("No data found in the response")
 
-        download_url = response_json["value"]["itemUrl"]
+        download_url = response_json['results'][0]['value']['url']
         
         if verbose:
             print(f"Download URL: {download_url}")
@@ -74,12 +72,13 @@ def read_ama_anemometric_towers(simplified=True, verbose=False):
                 zip_ref.extractall(temp_dir)
             
             # Find the shapefile
-            shp_files = [f for f in os.listdir(temp_dir) if f.endswith(".shp")]
+            zip_dir = os.path.join(temp_dir, 'zipfolder')
+            shp_files = [f for f in os.listdir(zip_dir) if f.endswith(".shp")]
             
             if not shp_files:
                 raise FileNotFoundError("No shapefile found in the downloaded zip file")
             
-            shp_path = os.path.join(temp_dir, shp_files[0])
+            shp_path = os.path.join(zip_dir, shp_files[0])
             
             if verbose:
                 print(f"Reading shapefile from {shp_path}")
@@ -117,3 +116,6 @@ def read_ama_anemometric_towers(simplified=True, verbose=False):
     except Exception as e:
         warnings.warn(f"Unexpected error: {e}")
         return None
+
+if __name__ == '__main__':
+    read_ama_anemometric_towers()

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_areas_under_contract.py

@@ -86,8 +86,9 @@ def read_areas_under_contract(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")
@@ -96,7 +97,7 @@ def read_areas_under_contract(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)

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_biodiesel_plants.py

@@ -85,8 +85,9 @@ def read_biodiesel_plants(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_biodiesel_plants(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)

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_biomes.py

@@ -1,7 +1,7 @@
 from geobr.utils import select_metadata, download_gpkg
 
 
-def read_biomes(year=2019, simplified=True, verbose=False):
+def read_biomes(year=2019, simplified=False, verbose=False):
     """ Download official data of Brazilian biomes as an sf object.
     
      This data set includes  polygons of all biomes present in Brazilian territory and coastal area.

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_biomethane_plants.py

@@ -85,8 +85,9 @@ def read_biomethane_plants(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_biomethane_plants(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)

tunned_geobr-0.2.5/tunned_geobr/read_census_tract_2022.py → tunned_geobr-0.2.7/tunned_geobr/read_census_tract.py

@@ -5,7 +5,7 @@ import requests
 import subprocess
 from io import BytesIO
 
-def read_census_tract_2022(simplified=False):
+def read_census_tract(simplified=False):
     """Download Brazilian Census Tracts data from IBGE (2022 Census).
     
     This function downloads and processes the Brazilian Census Tracts data
@@ -97,5 +97,3 @@ def read_census_tract_2022(simplified=False):
         
     return gdf
 
-if __name__ == '__main__':
-    read_census_tract_2022()

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_comparable_areas.py

@@ -2,7 +2,7 @@ from geobr.utils import select_metadata, download_gpkg
 
 
 def read_comparable_areas(
-    start_year=1970, end_year=2010, simplified=True, verbose=False
+    start_year=1970, end_year=2010, simplified=False, verbose=False
 ):
     r"""Download spatial data of historically comparable municipalities
 

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_compression_stations.py

@@ -85,8 +85,9 @@ def read_compression_stations(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_compression_stations(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)

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_conservation_units.py

@@ -1,7 +1,7 @@
 from geobr.utils import select_metadata, download_gpkg
 
 
-def read_conservation_units(date=201909, simplified=True, verbose=False):
+def read_conservation_units(date=201909, simplified=False, verbose=False):
     """ Download official data of Brazilian conservation untis as an sf object.
     
      This data set covers the whole of Brazil and it includes the polygons of all conservation untis present in Brazilian

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_country.py

@@ -1,7 +1,7 @@
 from geobr.utils import select_metadata, download_gpkg
 
 
-def read_country(year=2010, simplified=True, verbose=False):
+def read_country(year=2010, simplified=False, verbose=False):
     """ Download shape file of Brazil as sf objects. Data at scale 1:250,000, using Geodetic reference system "SIRGAS2000" and CRS(4674)
     
      @param year Year of the data (defaults to 2010)

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_disaster_risk_area.py

@@ -1,7 +1,7 @@
 from geobr.utils import select_metadata, download_gpkg
 
 
-def read_disaster_risk_area(year=2010, simplified=True, verbose=False):
+def read_disaster_risk_area(year=2010, simplified=False, verbose=False):
     """ Download official data of disaster risk areas as an sf object.
     
      This function reads the the official data of disaster risk areas in Brazil. It specifically focuses

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_drainage_ducts.py

@@ -85,8 +85,9 @@ def read_drainage_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_drainage_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)

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_etanol_plants.py

@@ -85,8 +85,9 @@ def read_etanol_plants(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_etanol_plants(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)

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_existent_biomass_ute.py

@@ -85,8 +85,9 @@ def read_existent_biomass_ute(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_existent_biomass_ute(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)
@@ -126,3 +127,6 @@ def read_existent_biomass_ute(simplified=False, verbose=False):
     
     except Exception as e:
         raise Exception(f"Failed to download or process existing biomass thermoelectric power plants data: {str(e)}")
+
+if __name__ == '__main__':
+    read_existent_biomass_ute()

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_existent_fossile_ute.py

@@ -85,8 +85,9 @@ def read_existent_fossile_ute(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_existent_fossile_ute(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)
@@ -120,9 +121,12 @@ def read_existent_fossile_ute(simplified=False, verbose=False):
                     gdf = gdf[cols_available]
             
             if verbose:
-                print("Finished processing existing fossil thermoelectric power plants data")
+                print("Finished processing existing biomass thermoelectric power plants data")
             
             return gdf
     
     except Exception as e:
         raise Exception(f"Failed to download or process existing fossil thermoelectric power plants data: {str(e)}")
+
+if __name__ == '__main__': 
+    read_existent_fossile_ute()

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_existent_nuclear_ute.py

@@ -85,8 +85,9 @@ def read_existent_nuclear_ute(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_existent_nuclear_ute(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_existent_nuclear_ute(simplified=False, verbose=False):
                 
                 # Select only the most important columns
                 # Adjust these columns based on the actual data structure
-                cols_to_keep = ['NOME', 'POTENCIA', 'PROPRIETAR', 'UF', 'MUNICIPIO', 'geometry']
+                cols_to_keep = ['NOME', 'POTENCIA', 'COMBUSTIVE', 'PROPRIETAR', '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_existent_nuclear_ute(simplified=False, verbose=False):
                     gdf = gdf[cols_available]
             
             if verbose:
-                print("Finished processing existing nuclear thermoelectric power plants data")
+                print("Finished processing existing biomass thermoelectric power plants data")
             
             return gdf
     

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_existent_substations.py

@@ -85,8 +85,9 @@ def read_existent_substations(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_existent_substations(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_existent_substations(simplified=False, verbose=False):
                 
                 # Select only the most important columns
                 # Adjust these columns based on the actual data structure
-                cols_to_keep = ['NOME', 'TENSAO', 'PROPRIETAR', 'UF', 'MUNICIPIO', 'geometry']
+                cols_to_keep = ['NOME', 'POTENCIA', 'COMBUSTIVE', 'PROPRIETAR', '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_existent_substations(simplified=False, verbose=False):
                     gdf = gdf[cols_available]
             
             if verbose:
-                print("Finished processing existing electrical substations data")
+                print("Finished processing existing biomass thermoelectric power plants data")
             
             return gdf
     

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_existent_transmission_lines.py

@@ -67,7 +67,7 @@ def read_existent_transmission_lines(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, "transmission_lines.zip")
+            zip_path = os.path.join(temp_dir, "existent_lt.zip")
             if verbose:
                 print("Downloading zip file")
             
@@ -85,8 +85,9 @@ def read_existent_transmission_lines(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_existent_transmission_lines(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_existent_transmission_lines(simplified=False, verbose=False):
                 
                 # Select only the most important columns
                 # Adjust these columns based on the actual data structure
-                cols_to_keep = ['NOME', 'TENSAO', 'EXTENSAO', 'PROPRIETAR', 'UF', 'geometry']
+                cols_to_keep = ['NOME', 'POTENCIA', 'COMBUSTIVE', 'PROPRIETAR', '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_existent_transmission_lines(simplified=False, verbose=False):
                     gdf = gdf[cols_available]
             
             if verbose:
-                print("Finished processing existing transmission lines data")
+                print("Finished processing existing biomass thermoelectric power plants data")
             
             return gdf
     

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_exploration_production_environment.py

@@ -7,7 +7,7 @@ import warnings
 import shutil
 
 
-def read_exploration_production_environment(simplified=True, verbose=False):
+def read_exploration_production_environment(simplified=False, verbose=False):
     """Download data for Exploration and Production Environment in Brazil.
 
     This function downloads, processes, and returns data for Exploration and Production Environment
@@ -45,10 +45,7 @@ def read_exploration_production_environment(simplified=True, verbose=False):
         response.raise_for_status()
         response_json = response.json()
 
-        if "value" not in response_json or not response_json["value"]:
-            raise ValueError("No data found in the response")
-
-        download_url = response_json["value"]["itemUrl"]
+        download_url = response_json['results'][0]['value']['url']
         
         if verbose:
             print(f"Download URL: {download_url}")
@@ -74,12 +71,13 @@ def read_exploration_production_environment(simplified=True, verbose=False):
                 zip_ref.extractall(temp_dir)
             
             # Find the shapefile
-            shp_files = [f for f in os.listdir(temp_dir) if f.endswith(".shp")]
+            zip_dir = os.path.join(temp_dir, 'zipfolder')
+            shp_files = [f for f in os.listdir(zip_dir) if f.endswith(".shp")]
             
             if not shp_files:
                 raise FileNotFoundError("No shapefile found in the downloaded zip file")
             
-            shp_path = os.path.join(temp_dir, shp_files[0])
+            shp_path = os.path.join(zip_dir, shp_files[0])
             
             if verbose:
                 print(f"Reading shapefile from {shp_path}")
@@ -99,7 +97,7 @@ def read_exploration_production_environment(simplified=True, verbose=False):
                 essential_cols = ["geometry"]
                 
                 # Add any other essential columns that exist in the dataset
-                for col in ["NOME", "DESCRICAO", "TIPO", "AREA_KM2"]:
+                for col in ["NOME", "MUNICIPIO", "UF", "ALTURA", "SITUACAO"]:
                     if col in gdf.columns:
                         essential_cols.append(col)
                 

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_federal_union_areas.py

@@ -86,8 +86,9 @@ def read_federal_union_areas(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")
@@ -96,7 +97,7 @@ def read_federal_union_areas(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)

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_fuel_bases.py

@@ -85,8 +85,9 @@ def read_fuel_bases(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_fuel_bases(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)

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_gas_distribution_pipelines.py

@@ -85,8 +85,9 @@ def read_gas_distribution_pipelines(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_gas_distribution_pipelines(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)

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_gas_transport_pipelines.py

@@ -85,8 +85,9 @@ def read_gas_transport_pipelines(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_gas_transport_pipelines(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)

{tunned_geobr-0.2.5 → tunned_geobr-0.2.7}/tunned_geobr/read_glp_bases.py

@@ -85,8 +85,9 @@ def read_glp_bases(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_glp_bases(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)