tunned-geobr 0.2.5__py3-none-any.whl → 0.2.7__py3-none-any.whl

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/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/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/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/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/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)

tunned_geobr/read_health_region.py

@@ -2,7 +2,7 @@ from geobr.utils import select_metadata, download_gpkg
 
 
 def read_health_region(year=2013, macro=False, simplified=True, verbose=False):
-    """Download official data of Brazilian health regions as an sf object.
+    """Download official data of Brazilian health regions ascii(object) an sf object.
 
     Health regions are used to guide the the regional and state planning of health services.
     Macro health regions, in particular, are used to guide the planning of high complexity

tunned_geobr/read_hydroelectric_feasibility_studies.py

@@ -7,7 +7,7 @@ import warnings
 import shutil
 
 
-def read_hydroelectric_feasibility_studies(simplified=True, verbose=False):
+def read_hydroelectric_feasibility_studies(simplified=False, verbose=False):
     """Download data for Hydroelectric Feasibility Studies in Brazil.
 
     This function downloads, processes, and returns data for Hydroelectric Feasibility Studies
@@ -45,10 +45,7 @@ def read_hydroelectric_feasibility_studies(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_hydroelectric_feasibility_studies(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_hydroelectric_feasibility_studies(simplified=True, verbose=False):
                 essential_cols = ["geometry"]
                 
                 # Add any other essential columns that exist in the dataset
-                for col in ["NOME", "BACIA", "RIO", "POTENCIA", "AREA_KM2"]:
+                for col in ["NOME", "MUNICIPIO", "UF", "ALTURA", "SITUACAO"]:
                     if col in gdf.columns:
                         essential_cols.append(col)
                 
@@ -117,3 +115,6 @@ def read_hydroelectric_feasibility_studies(simplified=True, verbose=False):
     except Exception as e:
         warnings.warn(f"Unexpected error: {e}")
         return None
+
+if __name__ == '__main__':
+    read_hydroelectric_feasibility_studies()

tunned_geobr/read_hydroelectric_inventory_aai_studies.py

@@ -7,7 +7,7 @@ import warnings
 import shutil
 
 
-def read_hydroelectric_inventory_aai_studies(simplified=True, verbose=False):
+def read_hydroelectric_inventory_aai_studies(simplified=False, verbose=False):
     """Download data for Hydroelectric Inventory and AAI Studies in Brazil.
 
     This function downloads, processes, and returns data for Hydroelectric Inventory and AAI Studies
@@ -45,10 +45,7 @@ def read_hydroelectric_inventory_aai_studies(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_hydroelectric_inventory_aai_studies(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_hydroelectric_inventory_aai_studies(simplified=True, verbose=False):
                 essential_cols = ["geometry"]
                 
                 # Add any other essential columns that exist in the dataset
-                for col in ["NOME", "BACIA", "RIO", "TIPO", "SITUACAO", "AREA_KM2"]:
+                for col in ["NOME", "MUNICIPIO", "UF", "ALTURA", "SITUACAO"]:
                     if col in gdf.columns:
                         essential_cols.append(col)
                 
@@ -117,3 +115,6 @@ def read_hydroelectric_inventory_aai_studies(simplified=True, verbose=False):
     except Exception as e:
         warnings.warn(f"Unexpected error: {e}")
         return None
+
+if __name__ == '__main__':
+    read_hydroelectric_inventory_aai_studies()

tunned_geobr/read_immediate_region.py

@@ -2,7 +2,7 @@ from geobr.utils import select_metadata, download_gpkg, change_type_list, test_o
 
 
 def read_immediate_region(
-    code_immediate="all", year=2017, simplified=True, verbose=False
+    code_immediate="all", year=2017, simplified=False, verbose=False
 ):
     """ Download shape files of Brazil's Immediate Geographic Areas as sf objects
     

tunned_geobr/read_indigenous_land.py

@@ -1,7 +1,7 @@
 from geobr.utils import select_metadata, download_gpkg
 
 
-def read_indigenous_land(date=201907, simplified=True, verbose=False):
+def read_indigenous_land(date=201907, simplified=False, verbose=False):
     """ Download official data of indigenous lands as an sf object.
     
      The data set covers the whole of Brazil and it includes indigenous lands from all ethnicities and

tunned_geobr/read_intermediate_region.py

@@ -2,7 +2,7 @@ from geobr.utils import select_metadata, download_gpkg
 
 
 def read_intermediate_region(
-    code_intermadiate="all", year=2019, simplified=True, verbose=False
+    code_intermadiate="all", year=2019, simplified=False, verbose=False
 ):
     r"""Download spatial data of Brazil's Intermediate Geographic Areas
 

tunned_geobr/read_isolated_systems.py

@@ -85,8 +85,9 @@ def read_isolated_systems(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_isolated_systems(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_isolated_systems(simplified=False, verbose=False):
                 
                 # Select only the most important columns
                 # Adjust these columns based on the actual data structure
-                cols_to_keep = ['NOME', '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_isolated_systems(simplified=False, verbose=False):
                     gdf = gdf[cols_available]
             
             if verbose:
-                print("Finished processing isolated electrical systems data")
+                print("Finished processing existing biomass thermoelectric power plants data")
             
             return gdf
     

tunned_geobr/read_meso_region.py

@@ -1,7 +1,7 @@
 from geobr.utils import select_metadata, download_gpkg
 
 
-def read_meso_region(code_meso="all", year=2010, simplified=True, verbose=False):
+def read_meso_region(code_meso="all", year=2010, simplified=False, verbose=False):
     """Download shape files of meso region as sf objects. Data at scale 1:250,000, using Geodetic reference system "SIRGAS2000" and CRS(4674)
 
      Data at scale 1:250,000, using Geodetic reference system "SIRGAS2000" and CRS(4674)

tunned_geobr/read_metro_area.py

@@ -1,7 +1,7 @@
 from geobr.utils import select_metadata, download_gpkg
 
 
-def read_metro_area(year=2018, simplified=True, verbose=False):
+def read_metro_area(year=2018, simplified=False, verbose=False):
     """ Download shape files of official metropolitan areas in Brazil as an sf object.
     
      The function returns the shapes of municipalities grouped by their respective metro areas.

tunned_geobr/read_micro_region.py

@@ -1,7 +1,7 @@
 from geobr.utils import select_metadata, download_gpkg
 
 
-def read_micro_region(code_micro="all", year=2010, simplified=True, verbose=False):
+def read_micro_region(code_micro="all", year=2010, simplified=False, verbose=False):
     """Download shape files of micro region as sf objects
 
      Data at scale 1:250,000, using Geodetic reference system "SIRGAS2000" and CRS(4674)

tunned_geobr/read_municipality.py

@@ -1,83 +1,127 @@
-from geobr.utils import select_metadata, download_gpkg
-
-
-def read_municipality(code_muni="all", year=2010, simplified=True, verbose=False):
-    """Download shape files of Brazilian municipalities as sf objects.
-
-     Data at scale 1:250,000, using Geodetic reference system "SIRGAS2000" and CRS(4674)
-
+import geopandas as gpd
+import tempfile
+import os
+import requests
+from zipfile import ZipFile
+from io import BytesIO
+
+def read_municipality(code_muni="all", simplified=False):
+    """Download shapefiles of Brazilian municipalities as geopandas objects.
+
+    This function downloads and processes municipality data directly from IBGE (Brazilian Institute of Geography and Statistics).
+    Data uses Geodetic reference system "SIRGAS2000" and CRS(4674).
+    
     Parameters
     ----------
-    code_muni:
+    code_muni : str, optional
         The 7-digit code of a municipality. If the two-digit code or a two-letter uppercase abbreviation of
         a state is passed, (e.g. 33 or "RJ") the function will load all municipalities of that state.
-        If code_muni="all", all municipalities of the country will be loaded.
-    year : int, optional
-        Year of the data, by default 2010
-    simplified: boolean, by default True
-        Data 'type', indicating whether the function returns the 'original' dataset
-        with high resolution or a dataset with 'simplified' borders (Default)
-    verbose : bool, optional
-        by default False
+        If code_muni="all", all municipalities of the country will be loaded (Default).
+    simplified : boolean, by default True
+        If True, returns a simplified version of the dataset with fewer columns
 
     Returns
     -------
     gpd.GeoDataFrame
-        Metadata and geopackage of selected states
-
-    Raises
-    ------
-    Exception
-        If parameters are not found or not well defined
+        Geodataframe with municipality boundaries
 
     Example
     -------
-    >>> from geobr import read_municipality
+    >>> from tunned_geobr import read_municipality
 
-    # Read specific meso region at a given year
-    >>> df = read_municipality(code_muni=1200179, year=2018)
+    # Read all municipalities
+    >>> municipalities = read_municipality()
 
-    # Read all meso regions of a state at a given year
-    >>> df = read_municipality(code_muni=12, year=2017)
-    >>> df = read_municipality(code_muni="AM", year=2000)
+    # Read all municipalities in a state by code
+    >>> state_municipalities = read_municipality(code_muni=33)
 
-    # Read all meso regions of the country at a given year
-    >>> df = read_municipality(code_muni="all", year=2010)
+    # Read all municipalities in a state by abbreviation
+    >>> state_municipalities = read_municipality(code_muni="RJ")
+    
+    # Read specific municipality by code
+    >>> municipality = read_municipality(code_muni=3304557)
     """
-
-    metadata = select_metadata("municipality", year=year, simplified=simplified)
-
-    if year < 1992:
-
-        return download_gpkg(metadata)
-
-    if code_muni == "all":
-
-        if verbose:
-            print("Loading data for the whole country. This might take a few minutes.")
-
-        return download_gpkg(metadata)
-
-    metadata = metadata[
-        metadata[["code", "code_abbrev"]].apply(
-            lambda x: str(code_muni)[:2] in str(x["code"])
-            or str(code_muni)[:2]  # if number e.g. 12
-            in str(x["code_abbrev"]),  # if UF e.g. RO
-            1,
-        )
-    ]
-
-    if not len(metadata):
-        raise Exception("Invalid Value to argument code_muni.")
-
-    gdf = download_gpkg(metadata)
-
-    if len(str(code_muni)) == 2:
-        return gdf
-
-    elif code_muni in gdf["code_muni"].tolist():
-        return gdf.query(f"code_muni == {code_muni}")
-
-    else:
-        raise Exception("Invalid Value to argument code_muni.")
+    
+    url = "https://geoftp.ibge.gov.br/organizacao_do_territorio/malhas_territoriais/malhas_municipais/municipio_2023/Brasil/BR_Municipios_2023.zip"
+    
+    try:
+        # Download the zip file
+        response = requests.get(url)
+        if response.status_code != 200:
+            raise Exception("Failed to download municipality data from IBGE")
+            
+        # Create a temporary directory
+        with tempfile.TemporaryDirectory() as temp_dir:
+            # Extract the zip file
+            with ZipFile(BytesIO(response.content)) as zip_ref:
+                zip_ref.extractall(temp_dir)
+            
+            # Find the shapefile
+            shp_files = []
+            for root, dirs, files in os.walk(temp_dir):
+                shp_files.extend([os.path.join(root, f) for f in files if f.endswith('.shp')])
+            
+            if not shp_files:
+                raise Exception("No shapefile found in the downloaded data")
+                
+            # Read the shapefile
+            gdf = gpd.read_file(shp_files[0])
+            
+            # Convert to SIRGAS 2000 (EPSG:4674) if not already
+            if gdf.crs is None or gdf.crs.to_epsg() != 4674:
+                gdf = gdf.to_crs(4674)
+            
+            # Filter by code_muni if not "all"
+            if code_muni != "all":
+                if isinstance(code_muni, int) or code_muni.isdigit():
+                    if len(str(code_muni)) == 7:
+                        # Filter by municipality code
+                        gdf = gdf[gdf['CD_MUN'] == str(code_muni)]
+                    elif len(str(code_muni)) == 2:
+                        # Filter by state code
+                        gdf = gdf[gdf['CD_MUN'].str.startswith(str(code_muni).zfill(2))]
+                elif isinstance(code_muni, str) and len(code_muni) == 2:
+                    # Filter by state abbreviation - need to get state code first
+                    state_url = "https://geoftp.ibge.gov.br/organizacao_do_territorio/malhas_territoriais/malhas_municipais/municipio_2023/Brasil/BR_UF_2023.zip"
+                    state_response = requests.get(state_url)
+                    
+                    if state_response.status_code == 200:
+                        with tempfile.TemporaryDirectory() as state_temp_dir:
+                            with ZipFile(BytesIO(state_response.content)) as zip_ref:
+                                zip_ref.extractall(state_temp_dir)
+                            
+                            state_shp_files = []
+                            for root, dirs, files in os.walk(state_temp_dir):
+                                state_shp_files.extend([os.path.join(root, f) for f in files if f.endswith('.shp')])
+                            
+                            if state_shp_files:
+                                state_gdf = gpd.read_file(state_shp_files[0])
+                                state_code = state_gdf[state_gdf['SIGLA_UF'] == code_muni.upper()]['CD_UF'].values
+                                
+                                if len(state_code) > 0:
+                                    gdf = gdf[gdf['CD_MUN'].str.startswith(state_code[0])]
+                
+                if len(gdf) == 0:
+                    raise Exception(f"No data found for code_muni={code_muni}")
+            
+            if simplified:
+                # Keep only the most relevant columns
+                columns_to_keep = [
+                    'geometry',
+                    'CD_MUN',      # Municipality code
+                    'NM_MUN',      # Municipality name
+                    'SIGLA_UF',    # State abbreviation
+                    'AREA_KM2'     # Area in square kilometers
+                ]
+                
+                # Filter columns that actually exist in the dataset
+                existing_columns = ['geometry'] + [col for col in columns_to_keep[1:] if col in gdf.columns]
+                gdf = gdf[existing_columns]
+    
+    except Exception as e:
+        raise Exception(f"Error downloading municipality data: {str(e)}")
+        
     return gdf
+
+if __name__ == '__main__':
+    read_municipality()

tunned_geobr/read_municipality_direct.py

@@ -5,7 +5,7 @@ import requests
 from zipfile import ZipFile
 from io import BytesIO
 
-def read_municipality(code_muni="all", simplified=True):
+def read_municipality_direct(code_muni="all", simplified=False):
     """Download shapefiles of Brazilian municipalities as geopandas objects.
 
     This function downloads and processes municipality data directly from IBGE (Brazilian Institute of Geography and Statistics).

tunned_geobr/read_neighborhood.py

@@ -1,7 +1,7 @@
 from geobr.utils import select_metadata, download_gpkg
 
 
-def read_neighborhood(year=2010, simplified=True, verbose=False):
+def read_neighborhood(year=2010, simplified=False, verbose=False):
     """ Download neighborhood limits of Brazilian municipalities as a geopandas geodataframe object
     
     Parameters

tunned_geobr/read_og_basement.py

@@ -7,7 +7,7 @@ import warnings
 import shutil
 
 
-def read_og_basement(simplified=True, verbose=False):
+def read_og_basement(simplified=False, verbose=False):
     """Download data for Oil and Gas Basement in Brazil.
 
     This function downloads, processes, and returns data for Oil and Gas Basement
@@ -45,10 +45,7 @@ def read_og_basement(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_og_basement(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_og_basement(simplified=True, verbose=False):
                 essential_cols = ["geometry"]
                 
                 # Add any other essential columns that exist in the dataset
-                for col in ["NOME", "DESCRICAO", "AREA_KM2"]:
+                for col in ["NOME", "MUNICIPIO", "UF", "ALTURA", "SITUACAO"]:
                     if col in gdf.columns:
                         essential_cols.append(col)
                 
@@ -117,3 +115,6 @@ def read_og_basement(simplified=True, verbose=False):
     except Exception as e:
         warnings.warn(f"Unexpected error: {e}")
         return None
+
+if __name__ == '__main__':
+    read_og_basement()