Skip to content

Commit

Permalink
remove measurements from make_geocube, deal with depreciation warning (
Browse files Browse the repository at this point in the history
…#149)

* remove measurements from make_geocube, deal with depreciation warning

* Save new PDF of paper

* Save new PDF of paper

* remove comment

* Save new PDF of paper

---------

Co-authored-by: erexer <erexer@users.noreply.github.com>
  • Loading branch information
erexer and erexer authored Jan 31, 2024
1 parent be6c8be commit c92e892
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions naturf/output.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ def raster_to_numpy(aggregate_rasters: xr.Dataset) -> np.ndarray:

parameters = list(aggregate_rasters.keys())
parameters.remove("building_count")
rows = aggregate_rasters.dims["y"]
cols = aggregate_rasters.dims["x"]
rows = aggregate_rasters.sizes["y"]
cols = aggregate_rasters.sizes["x"]
master = np.zeros((132, rows, cols), dtype=np.float32)
i = 0
for parameter in parameters:
Expand All @@ -232,15 +232,12 @@ def rasterize_parameters(merge_parameters: gpd.GeoDataFrame) -> xr.Dataset:
"""

merge_parameters["building_count"] = 1
measurements = merge_parameters.columns[merge_parameters.columns != Settings.GEOMETRY_FIELD]
resolution = Settings.DEFAULT_OUTPUT_RESOLUTION
fill = Settings.DEFAULT_FILL_VALUE
vector_data = merge_parameters.set_geometry(Settings.GEOMETRY_FIELD).rename_geometry("geometry")

return make_geocube(
vector_data=merge_parameters.rename(
columns={Settings.GEOMETRY_FIELD: "geometry"}
).set_geometry("geometry"),
measurements=measurements,
vector_data=vector_data,
resolution=resolution,
fill=fill,
rasterize_function=partial(rasterize_image, all_touched=True, merge_alg=MergeAlg.add),
Expand Down
Binary file modified paper/paper.pdf
Binary file not shown.

0 comments on commit c92e892

Please sign in to comment.