Merge pull request #7 from xKDR/dev

Dev
xKDR · Feb 25, 2022 · e09e57a · e09e57a
2 parents 961d141 + 9e341fa
commit e09e57a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/aggregate.jl b/src/aggregate.jl
@@ -62,14 +62,14 @@ shapefile_df = load_shapefile("assets/mumbai_map/mumbai_districts.shp")
 aggregate_per_area_dataframe(MUMBAI_COORDINATE_SYSTEM, rand_datacube, shapefile_df, "District")
 ```
 """
-function aggregate_per_area_dataframe(geometry::CoordinateSystem, datacube, shapefile_df, attribute)
+function aggregate_per_area_dataframe(geometry::CoordinateSystem, datacube, shapefile_df, attribute, res = 15)
  datacube = Array{Float32}(datacube)
  datacube = sparse_cube(datacube)
  df = DataFrame()
  @showprogress for i in 1:length(shapefile_df[:, 1])
  shapefile_row = shapefile_df[i, :]
  geom_polygon = polygon_mask(geometry, shapefile_row)
- df[!, shapefile_df[!, attribute][i]] = aggregate_timeseries(datacube, geom_polygon) ./mask_area(geometry, geom_polygon)
+ df[!, shapefile_df[!, attribute][i]] = aggregate_timeseries(datacube, geom_polygon) ./mask_area(geometry, geom_polygon, res)
  i = i + 1
  end
  return df

diff --git a/src/data_io.jl b/src/data_io.jl
@@ -18,7 +18,7 @@ load_img("example.tif")
 """
 function load_img(filepath, top_left, bottom_right)
  img = load_img(filepath)
- img = img[top_left[1]:bottom_right[1], top_left[2]:bottom_right[2]]
+ img = img[top_left[1]+1:bottom_right[1], top_left[2]+1:bottom_right[2]]
  GC.gc()
  return img
 end