diff --git a/prepare_layers/make_food_current_map.py b/prepare_layers/make_food_current_map.py index f8d4011..0b7e876 100644 --- a/prepare_layers/make_food_current_map.py +++ b/prepare_layers/make_food_current_map.py @@ -9,12 +9,13 @@ from queue import Queue from typing import NamedTuple from osgeo import gdal -gdal.SetCacheMax(4 * 1024 * 1024 * 1024) import numpy as np import yirgacheffe as yg from yirgacheffe.layers import RasterLayer +gdal.SetCacheMax(4 * 1024 * 1024 * 1024) + NULL_CODE = 0 CROP_CODE = 1401 PASTURE_CODE = 1402 diff --git a/prepare_species/common.py b/prepare_species/common.py index ee357e9..6869d77 100644 --- a/prepare_species/common.py +++ b/prepare_species/common.py @@ -211,7 +211,7 @@ def tidy_reproject_save( target_crs = src_crs #pyproj.CRS.from_string(target_projection) graw = gdf.loc[0].copy() - grow = aoh.tidy_data(graw) + grow = aoh.tidy_data(graw) # type: ignore output_path = output_directory_path / f"{grow.id_no}_{grow.season}.geojson" res = gpd.GeoDataFrame(grow.to_frame().transpose(), crs=src_crs, geometry="geometry") res_projected = res.to_crs(target_crs) @@ -266,7 +266,7 @@ def process_and_save( if len(geometries_breeding) == 0: logger.debug("Dropping %s as no breeding geometries", id_no) return - report.has_breeding_geoemetry = True + report.has_breeding_geometry = True geometry_breeding = shapely.union_all(geometries_breeding) geometries_seasons_non_breeding = set(geometries.keys()) @@ -275,7 +275,7 @@ def process_and_save( if len(geometries_non_breeding) == 0: logger.debug("Dropping %s as no non-breeding geometries", id_no) return - report.has_nonbreeding_geoemetry = True + report.has_nonbreeding_geometry = True geometry_non_breeding = shapely.union_all(geometries_non_breeding) habitats_seasons_breeding = set(habitats.keys()) @@ -286,7 +286,7 @@ def process_and_save( if len(habitats_breeding) == 0: logger.debug("Dropping %s as no breeding habitats", id_no) return - report.has_breeding_habitats = True + report.has_breeding_habitat = True habitats_seasons_non_breeding = set(habitats.keys()) habitats_seasons_non_breeding.discard(2) @@ -296,7 +296,7 @@ def process_and_save( if len(habitats_non_breeding) == 0: logger.debug("Dropping %s as no non-breeding habitats", id_no) return - report.has_nonbreeding_habitats = True + report.has_nonbreeding_habitat = True gdf = gpd.GeoDataFrame( [[ diff --git a/usecases/query_deltap_psql.py b/usecases/query_deltap_psql.py index b2c539f..bfb4604 100644 --- a/usecases/query_deltap_psql.py +++ b/usecases/query_deltap_psql.py @@ -131,7 +131,7 @@ def query_deltap( e = RasterLayer.empty_raster_layer_like(mask, filename=os.path.join(outputs_path, f"{row.Rsrv_Code}_mask.tif")) mask.save(e) - query_deltap_per_project(row.Rsrv_Code, row.geometry, mask, corpus, outputs_path) + query_deltap_per_project(str(row.Rsrv_Code), row.geometry, mask, corpus, outputs_path) def main() -> None: