Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #3

Merged
merged 3 commits into from
Nov 25, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
adding function for light per area
  • Loading branch information
= committed Nov 25, 2021
commit cfd87412876dff61ea3a9ce55d694382fce2437f
2 changes: 1 addition & 1 deletion src/NighttimeLights.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ using Dates, ArchGDAL, GeoArrays, DataFrames, Shapefile, GeoInterface, ProgressM
export load_img, load_datacube, save_img, save_datacube,
lat_to_row, row_to_lat, lat_to_row, long_to_column, column_to_long, translate_geometry, Coordinate, CoordinateSystem, image_to_coordinate,
polygon_mask, load_shapefile, mask_area, LAT, EW, NS, MODEL_EW, MODEL_NS, long_apply, cross_apply, apply_mask, view_img, aggregate, aggregate_timeseries, aggregate_dataframe, bias_correction, bias_correction_datacube, outlier_mask, outlier_ts, linear_interpolation,
conventional_cleaning, PatnaikSTT2021, threshold_datacube, background_noise_mask, sparse_cube, mark_nan, make_datacube, load_example, radiance_datacube, clouds_datacube, mumbai_map, TILE1_COORDINATE_SYSTEM, TILE2_COORDINATE_SYSTEM, TILE3_COORDINATE_SYSTEM, TILE4_COORDINATE_SYSTEM, TILE5_COORDINATE_SYSTEM, TILE6_COORDINATE_SYSTEM, FULL_COORDINATE_SYSTEM_COORDINATE_SYSTEM, INDIA_COORDINATE_SYSTEM, MUMBAI_COORDINATE_SYSTEM, coordinate_to_image
conventional_cleaning, PatnaikSTT2021, threshold_datacube, background_noise_mask, sparse_cube, mark_nan, make_datacube, load_example, radiance_datacube, clouds_datacube, mumbai_map, TILE1_COORDINATE_SYSTEM, TILE2_COORDINATE_SYSTEM, TILE3_COORDINATE_SYSTEM, TILE4_COORDINATE_SYSTEM, TILE5_COORDINATE_SYSTEM, TILE6_COORDINATE_SYSTEM, FULL_COORDINATE_SYSTEM_COORDINATE_SYSTEM, INDIA_COORDINATE_SYSTEM, MUMBAI_COORDINATE_SYSTEM, coordinate_to_image, aggregate_per_area_dataframe


include("data_io.jl")
Expand Down
4 changes: 2 additions & 2 deletions src/aggregate.jl
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function aggregate_timeseries(datacube, mask)
datacube = apply_mask(datacube, mask)
lights = []
for i in 1:length(datacube)
push!(lights, sum(ts[i]))
push!(lights, sum(datacube[i]))
end
return Float32.(lights)
end
Expand Down Expand Up @@ -74,7 +74,7 @@ function aggregate_per_area_dataframe(geometry::CoordinateSystem, datacube, shap
@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(geom_polygon)
df[!, shapefile_df[!, attribute][i]] = aggregate_timeseries(datacube, geom_polygon) ./mask_area(geometry, geom_polygon)
i = i + 1
end
return df
Expand Down