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.

Sign up for GitHub

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

Jump to bottom

Feature/set geometry bis #912

Merged
merged 241 commits into from
Jul 17, 2024
Merged

Feature/set geometry bis #912

merged 241 commits into from
Jul 17, 2024

Conversation

emanuel-schmid
Copy link
Collaborator

Changes proposed in this PR:

  • ignore the scheduler argument in u_coord.set_df_geometry_points and always use the gpd.points_from_xy method

PR Author Checklist

PR Reviewer Checklist

Chahan Kropf added 30 commits April 27, 2023 14:58
Add geodataframe to centroids: first commit
8cf5e0a
Merge branch 'develop' into feature/centroids_as_gdf
e2a2a05
Remove raster methods, obsolete methods, and fix some.
89b4051
Remove test for removed methods
70ea2fb
Fix from geodataframe method
e34bc0f
Remove set meta to lat lon
02b4a8b
Update all I/O methods
5ede9bd
Remove area pixel
98a898e
Add method to compute the area per pixel (not attribute)
c77a2d9
Make get_area_pixel
913c0f1
Remove not often used dist_coast and elevation
5ec2859
Remove unused meta
e2ac9b7
Change Centroids call to new signature
5dd4ffe
Remove vector - raster hazard methods
950a722
Restore legacy excell reader
923b066
Remove clear method
abfff60
Remove clear test
8e360e6
Update read/write centroids in hazard
73c4392
Support empty on land or region id
0dc0abb
Check for empty region id
c2f626a
Set region id correctly
bdf77d2
Remove scheduler
cf0128d
Add docstring
4f40def
Add legacy read hdf5
5f520fb
Replace incorrect dot product
7c24df0
Remove meta in assign centroids
e4bb789
Remove matlab test file
3df5a4b
Update set lat/lon
7206446
Update test with init
d4d5e02
Add note on method
a94d7af
@emanuel-schmid emanuel-schmid requested a review from peanutfun July 9, 2024 15:54
emanuel-schmid and others added 3 commits July 9, 2024 18:02
@emanuel-schmid
simplification
fe378cd
@emanuel-schmid
Merge branch 'feature/set_geometry' of github.com:CLIMADA-project/cli…
e4b7274 
…mada_python into feature/set_geometry

# Conflicts:
#	climada/util/coordinates.py
@emanuel-schmid
cosmetics
4230a43
@emanuel-schmid emanuel-schmid changed the base branch from main to develop July 9, 2024 16:18
@emanuel-schmid
Merge branch 'feature/set_geometry_bis' into develop
8ab26c6 
# Conflicts:
#	climada/util/coordinates.py
@emanuel-schmid @peanutfun
lint
b5978d0 
Co-authored-by: Lukas Riedel <34276446+peanutfun@users.noreply.github.com>
peanutfun
peanutfun requested changes Jul 10, 2024
View reviewed changes
Copy link
Member

@peanutfun peanutfun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for removing the dask part! 🙌 I have two suggestions for improving the docstring and the deprecation warning

climada/util/coordinates.py Outdated Show resolved Hide resolved
climada/util/coordinates.py Outdated Show resolved Hide resolved
@emanuel-schmid emanuel-schmid merged commit 4e4f817 into develop Jul 17, 2024
18 checks passed
@emanuel-schmid emanuel-schmid deleted the feature/set_geometry_bis branch July 17, 2024 12:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peanutfun peanutfun peanutfun requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@emanuel-schmid @peanutfun @tovogt @sarah-hlsn @idetring @chahank