-
Notifications
You must be signed in to change notification settings - Fork 130
Add option in raster plot to crop around centroids #1047
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
Add option in raster plot to crop around centroids #1047
Conversation
Example 1: plot_intensity with floods in France
Results:
Example 2: some return period maps with few centroids
|
climada/engine/impact.py
Outdated
mask_relative_distance: float, optional | ||
Relative distance (with respect to maximal map extent in longitude or latitude) to data | ||
points above which plot should not display values. For instance, to only plot values | ||
at the centroids, use mask_relative_distance=0.01. If None, the plot is not masked. | ||
Default is None. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧐 This parameter is really hard to describe. I've read it repeatedly and still need the example images to understand it.
For me it would be probably easier if it was written in a more "positive" way, something like
mask_relative_distance: float, optional | |
Relative distance (with respect to maximal map extent in longitude or latitude) to data | |
points above which plot should not display values. For instance, to only plot values | |
at the centroids, use mask_relative_distance=0.01. If None, the plot is not masked. | |
Default is None. | |
mask_relative_distance: float, optional | |
Only regions are plotted that are closer to any of the data points than this distance, | |
relative to overall plot size. For instance, to only plot values | |
at the centroids, use mask_relative_distance=0.01. If None, the plot is not masked. | |
Default is None. |
Though I'm not sure, whether it's better like that.
Then: don't meant to be fuzzy but the parameter name is a somewhat awkward, don't you think?
Is it not rather relative_mask_distance
? Or just mask_distance
? Or what about plotting_range
? (as in only plot stuff within this plotting range)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
agreed, I will change the description and the parameter name to mask_distance
. Thanks!
🙌 🎉 Only don't like the name and description too much. |
if np.any(np.isnan(x) for x in grid_im): | ||
if np.isnan(grid_im).any(): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume, this is the fix for the bug?
When does it occur? (How can it be reproduced?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, the idea was that whenever grid_im has a NaN we want to include a small legend (because we plot nan values in gray). np.any(np.isnan(x) for x in grid_im)
from before did not actually output a bool but a generator, such that this if condition was always True
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ValentinGebhart Thanks! You don't happen to have an example that you could point me to?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure. This would be an example where we want the legend (see PR #1038):
import numpy as np
from climada.hazard import Hazard
from climada.util import HAZ_DEMO_H5 # CLIMADA's Python file
haz_tc_fl = Hazard.from_hdf5(HAZ_DEMO_H5) # Historic tropical cyclones in Florida from 1990 to 2004
haz_tc_fl.check() # Use always the check() method to see if the hazard has been loaded correctly
centroids_mask = np.array(
[ (i + j > 10) for j in range(50) for i in range(50)]
)
haz_tc_fl.centroids = haz_tc_fl.centroids.select(sel_cen=centroids_mask)
haz_tc_fl.intensity = haz_tc_fl.intensity[:, -2434:]
return_periods, label, column_label = haz_tc_fl.local_return_period([30, 40])
from climada.util.plot import plot_from_gdf
plot_from_gdf(return_periods, colorbar_name=label, title_subplots=column_label)
and here we do not want the legend but in the current develop version it would be printed as well.
haz_tc_fl.plot_intensity(event=0)
Thank you @emanuel-schmid for the review and the positive feedback! I would leave the default for now so people are not too confused but happy to adapt that in the future. |
As I said, not for me to judge. But I find the default plots atm are actually more confusing than a sudden change. |
I'd also agree with that but there might be other opinions about changing this plot by default @spjuhel @peanutfun @chahank ? |
I agree with Emanuel the plots are much clearer. (But it is not a strong opinion) |
I also agree that adding a default |
Thanks for the feedback! I changed the default to @emanuel-schmid from my side this would be ready to merge. Thanks! |
commit f312a58 Merge: 2995735 2ed84e5 Author: Samuel Juhel <[email protected]> Date: Wed Jun 4 15:36:52 2025 +0200 Merge pull request #977 from CLIMADA-project/feature/documentation-restructuring Restructuring of the documentation commit 2ed84e5 Author: spjuhel <[email protected]> Date: Mon Jun 2 16:37:15 2025 +0200 doc(rst,changelog): fixes trailing, updates changelog commit 8797d60 Author: spjuhel <[email protected]> Date: Mon Jun 2 16:32:03 2025 +0200 doc(rst): better margin commit 7d466a1 Merge: fccc4a0 2995735 Author: spjuhel <[email protected]> Date: Mon Jun 2 16:29:06 2025 +0200 Merge remote-tracking branch 'origin/develop' into feature/documentation-restructuring commit fccc4a0 Author: spjuhel <[email protected]> Date: Mon Jun 2 16:15:45 2025 +0200 doc(notebooks and rst files): Applies changes from review, fixes some url commit f8611bb Author: spjuhel <[email protected]> Date: Mon Jun 2 16:10:56 2025 +0200 doc(docstring): Fixes too short header specifier commit 15aeeab Author: spjuhel <[email protected]> Date: Mon Jun 2 16:09:53 2025 +0200 doc(changelog): Fixes right arrow and minor bugs, typos. commit 9b1f7ac Author: Samuel Juhel <[email protected]> Date: Mon Jun 2 10:07:40 2025 +0200 Apply suggestions from code review Co-authored-by: Lukas Riedel <[email protected]> commit 2995735 Author: Emanuel Schmid <[email protected]> Date: Wed May 28 11:56:09 2025 +0200 Update URLs for WISC data (#944) * storm_europe: wisc.climate.copernicus.eu has moved to cds.climate.copernicus.eu * storm europe: update links * Add data links and improve docs of StormEurope --------- Co-authored-by: Lukas Riedel <[email protected]> commit 3d34cd9 Author: Samuel Juhel <[email protected]> Date: Wed May 28 11:45:47 2025 +0200 Implement equality methods for impf and impfset (#1027) * Implement equality methods for impf and impfset * Update tests --------- Co-authored-by: Lukas Riedel <[email protected]> commit ac13a72 Author: spjuhel <[email protected]> Date: Mon May 19 15:24:16 2025 +0200 Addresses env setup for develop/review commit d7cae4f Author: spjuhel <[email protected]> Date: Mon May 19 14:37:14 2025 +0200 improves Developer Guide index commit af793bc Author: Valentin Gebhart <[email protected]> Date: Fri May 16 17:40:51 2025 +0200 Add option in raster plot to crop around centroids (#1047) * add option to crop raster plots around centroids * update docstrings * change name of keyword parameter * change keyword name and improve docstring descriptions * updated changelog * change default value of mask parameter and update changelog commit 1a6df8e Author: Emanuel Schmid <[email protected]> Date: Fri May 16 12:59:44 2025 +0200 Avoid pickling shapely object in Exposures.write_hdf5 (#1051) * refactor Exposures.write_hdf5 and .from_hdf5: use wkb instead of pickle for geometry serialization * refactor Exposures.write_hdf5 * change of plan: just pickle geometries in wkb format * Update climada/entity/exposures/base.py Co-authored-by: Lukas Riedel <[email protected]> * abandon shapely pickling * simplify wkb columns collection * simplify wkb conversion * cosmetics --------- Co-authored-by: Lukas Riedel <[email protected]> commit 51b66fa Author: Emanuel Schmid <[email protected]> Date: Fri May 9 14:53:33 2025 +0200 Remove geopandas.datasets (#1052) Use cartopy.io.shapereader for loading natural earth data instead of geopandas commit a5a3fef Author: emanuel-schmid <[email protected]> Date: Tue Apr 29 13:01:13 2025 +0200 fix test_data_api commit d8b8e9a Author: Emanuel Schmid <[email protected]> Date: Thu Apr 24 15:16:06 2025 +0200 Raise ValueError in download_world_bank_indicator (#1050) * Fix worldbank fallback by raising a ValueError instead of a RuntimeError commit 4d2d690 Author: Lukas Riedel <[email protected]> Date: Wed Apr 16 09:41:20 2025 +0200 Remove pandas-datareader (#1033) * Remove pandas-datareader Use JSON/pandas solution for downloading World Bank indicator data. * Add function `download_world_bank_indicator`. * Add unit test. * Update requirements. * Update CHANGELOG.md * Remove stray print and fix comments * Switch to compatible Petals target branch for testing REVERT THIS! * Fix linter warnings - Add timeout parameter to requests call - Remove unused import * #168 is merged Co-authored-by: Lukas Riedel <[email protected]> * Apply suggestions from code review Use single list instead of nested lists Co-authored-by: Emanuel Schmid <[email protected]> * Update reading WB data * Fall back to parsing dates if conversion to ints fails. * Throw a ValueError if no data is available. --------- Co-authored-by: emanuel-schmid <[email protected]> Co-authored-by: Emanuel Schmid <[email protected]> commit a2d2297 Author: emanuel-schmid <[email protected]> Date: Mon Apr 7 16:21:48 2025 +0200 remove shapely 2.0 pin commit 6dc20ab Merge: eda7e40 2c34d49 Author: Samuel Juhel <[email protected]> Date: Mon Apr 7 14:44:24 2025 +0200 Merge pull request #1026 from CLIMADA-project/feature/improve_ee_import Better handling of optional dependency import for earth-engine commit 2c34d49 Author: emanuel-schmid <[email protected]> Date: Mon Apr 7 10:57:51 2025 +0200 pylint commit 3db15c5 Author: emanuel-schmid <[email protected]> Date: Mon Apr 7 10:35:04 2025 +0200 fix obvious errors commit 176db2d Merge: f2c27a7 eda7e40 Author: emanuel-schmid <[email protected]> Date: Mon Apr 7 10:08:30 2025 +0200 Merge branch 'develop' into feature/improve_ee_import commit eda7e40 Author: Emanuel Schmid <[email protected]> Date: Fri Apr 4 16:12:38 2025 +0200 Explicit arguments in TropCyclone.apply_climate_scenario_knu (#991) * trop_cyclone.apply_climate_scenario_knu: make yearly_steps argument explicit * changelog * readthedocs: explicit configuration file commit 004651b Merge: 3cfbe05 08ec51b Author: emanuel-schmid <[email protected]> Date: Fri Apr 4 12:45:23 2025 +0200 Merge branch 'main' into develop # Conflicts: # CHANGELOG.md # climada/_version.py # setup.py commit 08ec51b Author: Lukas Riedel <[email protected]> Date: Fri Apr 4 12:06:06 2025 +0200 Update GitHub infrastructure (#1036) * Increase fetch depth to avoid missing the commit The target commit might not be the latest of the target branch. * Add CODEOWNERS file * dependencies: pin shapley version down to 2.0 --------- Co-authored-by: emanuel-schmid <[email protected]> commit 3cfbe05 Merge: 5aeebea cc9b33a Author: Valentin Gebhart <[email protected]> Date: Thu Apr 3 18:20:05 2025 +0200 Merge pull request #1038 from CLIMADA-project/hotfix/plot_NaN_on_grid Hotfix: plot NaNs in geo_im_from_array commit cc9b33a Author: Valentin Gebhart <[email protected]> Date: Thu Apr 3 17:45:09 2025 +0200 update changelog commit 01eb0bd Author: Valentin Gebhart <[email protected]> Date: Thu Apr 3 17:34:59 2025 +0200 changed docstring and small optimization commit 94bc45d Author: Valentin Gebhart <[email protected]> Date: Thu Apr 3 12:09:45 2025 +0200 added edgecolor commit 3ddc5d9 Author: Valentin Gebhart <[email protected]> Date: Thu Apr 3 12:03:35 2025 +0200 adapted NaN plot handling and include legend commit 5aeebea Author: Lukas Riedel <[email protected]> Date: Wed Apr 2 10:18:31 2025 +0200 Add links to new CLIMADA webpage to docs (#1021) commit ead106c Author: Valentin Gebhart <[email protected]> Date: Mon Mar 31 17:24:48 2025 +0200 added section to local exceedance tutorial commit 8680668 Merge: 95052b2 25e4332 Author: luseverin <[email protected]> Date: Mon Mar 24 14:37:55 2025 +0100 Merge pull request #1029 from CLIMADA-project/feature/update_euler_guide_petals Add instructions to install climada petals on Euler commit 25e4332 Author: luseverin <[email protected]> Date: Mon Mar 24 13:54:05 2025 +0100 Update changelog commit 31cb34a Author: luseverin <[email protected]> Date: Mon Mar 24 11:23:58 2025 +0000 Specify how to work with a specific branch if needed commit 5b00f36 Author: luseverin <[email protected]> Date: Mon Mar 24 12:11:00 2025 +0100 Correct few typos and rephrase Co-authored-by: Lukas Riedel <[email protected]> commit 3b45cf9 Author: luseverin <[email protected]> Date: Fri Mar 21 19:17:15 2025 +0100 Add instructions to install climada petals on Euler commit 95052b2 Author: Lukas Riedel <[email protected]> Date: Wed Mar 19 10:34:15 2025 +0100 Upgrade to Python 3.12 (#870) * Upgrade to Python 3.12 * Increment supported Python versions in setup.py. * Update GitHub workflow testing matrix. * Upgrade eccodes and cfgrib versions * Add prominent information on Python versions --------- Co-authored-by: emanuel-schmid <[email protected]> commit a8a3c78 Author: emanuel-schmid <[email protected]> Date: Wed Mar 19 10:07:25 2025 +0100 fix broken plot test commit 5517c89 Author: Nicolas Colombi <[email protected]> Date: Wed Mar 19 09:11:33 2025 +0100 Revert "change logo with QR code, the logo was ugly on the page" This reverts commit 5752673. commit 004a31f Author: Nicolas Colombi <[email protected]> Date: Wed Mar 19 08:49:49 2025 +0100 fix indent last dropdown getting started commit 8062f0e Merge: 5752673 88e305e Author: Nicolas Colombi <[email protected]> Date: Wed Mar 19 08:46:04 2025 +0100 Merge branch 'feature/documentation-restructuring' of https://github.com/CLIMADA-project/climada_python into feature/documentation-restructuring commit 5752673 Author: Nicolas Colombi <[email protected]> Date: Wed Mar 19 08:45:25 2025 +0100 change logo with QR code commit 88e305e Author: spjuhel <[email protected]> Date: Wed Mar 19 08:35:07 2025 +0100 Tidying up after develop merged commit 9dcc2a3 Author: Nicolas Colombi <[email protected]> Date: Wed Mar 19 08:24:14 2025 +0100 add links and images to getting started commit 898240d Merge: 6282eb7 ba6457c Author: spjuhel <[email protected]> Date: Tue Mar 18 18:28:47 2025 +0100 Merge branch 'develop' into feature/documentation-restructuring commit 6282eb7 Author: spjuhel <[email protected]> Date: Tue Mar 18 14:00:15 2025 +0100 Improves How to navigate page commit 2ef5bd7 Author: spjuhel <[email protected]> Date: Tue Mar 18 14:00:01 2025 +0100 This file is not used anymore commit fdcb215 Author: spjuhel <[email protected]> Date: Tue Mar 18 13:59:41 2025 +0100 Avoids section navigation in Changelog commit a666977 Author: spjuhel <[email protected]> Date: Tue Mar 18 13:58:27 2025 +0100 Final touch on urls commit 9a0ea1f Merge: 2d81ae1 f2c27a7 Author: spjuhel <[email protected]> Date: Tue Mar 18 12:01:39 2025 +0100 Merge branch 'feature/improve_ee_import' into feature/documentation-restructuring commit f2c27a7 Author: spjuhel <[email protected]> Date: Tue Mar 18 11:57:23 2025 +0100 implements improvement commit 2d81ae1 Author: spjuhel <[email protected]> Date: Tue Mar 18 11:42:20 2025 +0100 Removes some errors messages from documentation build (see details) Several attributes of Centroids became properties and were doctringed twice, I removed the attribute docstring and improved the properties ones. commit fb7cd37 Author: spjuhel <[email protected]> Date: Tue Mar 18 11:41:35 2025 +0100 Adds some near final touch commit f4d851d Merge: 9962555 7b1a6bb Author: spjuhel <[email protected]> Date: Tue Mar 18 10:21:38 2025 +0100 Merge branch 'develop' into feature/documentation-restructuring commit 9962555 Author: spjuhel <[email protected]> Date: Tue Mar 18 10:08:32 2025 +0100 backtracking .md file hack commit 4102232 Author: spjuhel <[email protected]> Date: Mon Mar 17 17:50:35 2025 +0100 url fixing WIP commit 400eb73 Author: spjuhel <[email protected]> Date: Mon Mar 17 10:47:14 2025 +0100 wip on urls commit b442167 Author: Samuel Juhel <[email protected]> Date: Mon Mar 17 09:22:27 2025 +0100 Update urls in install.rst commit 304afb4 Author: climada <[email protected]> Date: Thu Mar 13 16:07:52 2025 +0000 'Automated update v6.0.1' commit bbf53a8 Merge: 3314b0b 7459ab8 Author: emanuel-schmid <[email protected]> Date: Thu Mar 13 16:40:23 2025 +0100 Merge branch 'develop' commit 3314b0b Merge: a0f6d7d edfce31 Author: emanuel-schmid <[email protected]> Date: Thu Mar 13 11:30:00 2025 +0100 Merge branch 'develop' # Conflicts: # climada/_version.py # setup.py commit e0d4e7e Author: Valentin Gebhart <[email protected]> Date: Tue Mar 11 16:44:31 2025 +0100 readd the navigation in getting started commit 97b108b Author: Nicolas Colombi <[email protected]> Date: Mon Mar 10 13:08:53 2025 +0100 getting started commit 68d2f3d Author: Samuel Juhel <[email protected]> Date: Wed Mar 5 16:43:57 2025 +0100 Updates index.rst install title commit 2302e91 Author: Samuel Juhel <[email protected]> Date: Wed Mar 5 16:38:36 2025 +0100 Updates impact.rst with landing content commit 754417f Author: Samuel Juhel <[email protected]> Date: Wed Mar 5 16:26:53 2025 +0100 Updates exposures.rst with some landing content commit c95b7df Author: Samuel Juhel <[email protected]> Date: Wed Mar 5 16:19:50 2025 +0100 Updates hazard.rst with some landing content commit 7c850a5 Author: Samuel Juhel <[email protected]> Date: Wed Mar 5 16:17:25 2025 +0100 Updates User Guide landing page commit 029b81d Author: Samuel Juhel <[email protected]> Date: Wed Mar 5 15:12:37 2025 +0100 Adds link to new website in top bar commit a0f6d7d Author: climada <[email protected]> Date: Mon Mar 3 14:11:00 2025 +0000 'Automated update v6.0.0' commit 18d3f6a Merge: f2dd9b8 51d1e82 Author: emanuel-schmid <[email protected]> Date: Mon Mar 3 14:32:56 2025 +0100 Merge branch 'develop' commit f2dd9b8 Author: Emanuel Schmid <[email protected]> Date: Mon Mar 3 14:24:50 2025 +0100 Fix Author List on Zenodo (#1011) * add .zenodo.json file * fix affiliation * update affiliation B.G. commit 8bb1011 Merge: 5fba3ab 0c462e8 Author: emanuel-schmid <[email protected]> Date: Mon Mar 3 11:37:15 2025 +0100 Merge branch 'develop' commit 5fba3ab Merge: e4a3cfd d0a6752 Author: emanuel-schmid <[email protected]> Date: Mon Mar 3 11:33:19 2025 +0100 Merge branch 'develop' into 'main' (towards release 6.0) commit 993ec4a Author: Samuel Juhel <[email protected]> Date: Mon Feb 24 09:33:47 2025 +0100 Update website link Co-authored-by: Emanuel Schmid <[email protected]> commit eec2487 Author: Valentin Gebhart <[email protected]> Date: Fri Feb 7 18:15:33 2025 +0100 fixed compiling headers issues commit c0681bd Author: Valentin Gebhart <[email protected]> Date: Fri Feb 7 16:58:56 2025 +0100 fixed white space commit ca6b749 Author: Valentin Gebhart <[email protected]> Date: Fri Feb 7 16:42:23 2025 +0100 updated conda installation instructions for different OS commit ef1c452 Author: spjuhel <[email protected]> Date: Tue Feb 4 13:46:39 2025 +0100 forgot moving 10min climada notebook file commit c7f76c6 Author: spjuhel <[email protected]> Date: Tue Feb 4 13:43:15 2025 +0100 Title level fixing and 10min to clim back in userguide commit f934609 Author: spjuhel <[email protected]> Date: Tue Feb 4 13:48:41 2025 +0100 Reworks getting-started section commit e958b7c Author: spjuhel <[email protected]> Date: Tue Feb 4 13:40:33 2025 +0100 More linkref fixing commit e534253 Author: spjuhel <[email protected]> Date: Tue Feb 4 13:37:50 2025 +0100 Restructures development guide with subsections - Fixes links in development guide - Minor renaming commit 17e1a96 Author: Valentin Gebhart <[email protected]> Date: Tue Feb 4 09:23:22 2025 +0100 fixed typos commit f584983 Merge: 1125d36 ac2c997 Author: Valentin Gebhart <[email protected]> Date: Mon Feb 3 21:51:23 2025 +0100 Merge branch 'feature/documentation-restructuring' of github.com:CLIMADA-project/climada_python into feature/documentation-restructuring commit 1125d36 Author: Valentin Gebhart <[email protected]> Date: Mon Feb 3 21:51:20 2025 +0100 add some warnings and info to mamba installation commit ac2c997 Author: spjuhel <[email protected]> Date: Mon Feb 3 14:42:26 2025 +0100 moves pages around commit 26c1063 Author: spjuhel <[email protected]> Date: Mon Feb 3 14:16:23 2025 +0100 fixes ``sphinx.configuration`` key is missing see https://about.readthedocs.com/blog/2024/12/deprecate-config-files-without-sphinx-or-mkdocs-config/ commit 225a734 Author: Valentin Gebhart <[email protected]> Date: Mon Feb 3 11:25:58 2025 +0100 add data flow and workflow to dev intro commit ac6b540 Author: Valentin Gebhart <[email protected]> Date: Mon Feb 3 10:51:57 2025 +0100 split climada dev and git intro commit bae24b5 Author: Valentin Gebhart <[email protected]> Date: Tue Jan 21 15:52:06 2025 +0100 first version of 10min CLIMADA intro commit 62dfd29 Author: Valentin Gebhart <[email protected]> Date: Mon Jan 6 16:18:01 2025 +0100 added draft for 10min intro commit 2dce78d Author: spjuhel <[email protected]> Date: Wed Dec 4 19:18:28 2024 +0100 changes conda to mamba commit 567a492 Author: spjuhel <[email protected]> Date: Wed Dec 4 19:02:44 2024 +0100 renames folder to match new naming commit efef761 Author: spjuhel <[email protected]> Date: Wed Dec 4 19:02:07 2024 +0100 creates the new toctrees to start seeing content commit 80c0694 Author: spjuhel <[email protected]> Date: Wed Dec 4 18:58:51 2024 +0100 improves navbar header rendering commit 8b5227c Author: spjuhel <[email protected]> Date: Wed Dec 4 18:58:06 2024 +0100 fixes docstrings indentations errors commit 1d05166 Author: spjuhel <[email protected]> Date: Fri Nov 15 09:02:01 2024 +0100 adds sphinx-design dependency commit de6d4bd Author: spjuhel <[email protected]> Date: Fri Nov 15 08:42:23 2024 +0100 Revert "Revert "Merge branch 'feature/documentation-restructuring' into develop"" This reverts commit b8cc3c4. commit e4a3cfd Author: climada <[email protected]> Date: Fri Jul 19 07:57:49 2024 +0000 'Automated update v5.0.0' commit 54cc800 Merge: 8f89ce1 70ddc93 Author: emanuel-schmid <[email protected]> Date: Thu Jul 18 18:20:02 2024 +0200 Merge branch 'develop' commit 8f89ce1 Author: Lukas Riedel <[email protected]> Date: Fri Jun 21 13:55:32 2024 +0200 Fix links in pull request template (#901)
commit f312a58 Merge: 2995735 2ed84e5 Author: Samuel Juhel <[email protected]> Date: Wed Jun 4 15:36:52 2025 +0200 Merge pull request #977 from CLIMADA-project/feature/documentation-restructuring Restructuring of the documentation commit 2ed84e5 Author: spjuhel <[email protected]> Date: Mon Jun 2 16:37:15 2025 +0200 doc(rst,changelog): fixes trailing, updates changelog commit 8797d60 Author: spjuhel <[email protected]> Date: Mon Jun 2 16:32:03 2025 +0200 doc(rst): better margin commit 7d466a1 Merge: fccc4a0 2995735 Author: spjuhel <[email protected]> Date: Mon Jun 2 16:29:06 2025 +0200 Merge remote-tracking branch 'origin/develop' into feature/documentation-restructuring commit fccc4a0 Author: spjuhel <[email protected]> Date: Mon Jun 2 16:15:45 2025 +0200 doc(notebooks and rst files): Applies changes from review, fixes some url commit f8611bb Author: spjuhel <[email protected]> Date: Mon Jun 2 16:10:56 2025 +0200 doc(docstring): Fixes too short header specifier commit 15aeeab Author: spjuhel <[email protected]> Date: Mon Jun 2 16:09:53 2025 +0200 doc(changelog): Fixes right arrow and minor bugs, typos. commit 9b1f7ac Author: Samuel Juhel <[email protected]> Date: Mon Jun 2 10:07:40 2025 +0200 Apply suggestions from code review Co-authored-by: Lukas Riedel <[email protected]> commit 2995735 Author: Emanuel Schmid <[email protected]> Date: Wed May 28 11:56:09 2025 +0200 Update URLs for WISC data (#944) * storm_europe: wisc.climate.copernicus.eu has moved to cds.climate.copernicus.eu * storm europe: update links * Add data links and improve docs of StormEurope --------- Co-authored-by: Lukas Riedel <[email protected]> commit 3d34cd9 Author: Samuel Juhel <[email protected]> Date: Wed May 28 11:45:47 2025 +0200 Implement equality methods for impf and impfset (#1027) * Implement equality methods for impf and impfset * Update tests --------- Co-authored-by: Lukas Riedel <[email protected]> commit ac13a72 Author: spjuhel <[email protected]> Date: Mon May 19 15:24:16 2025 +0200 Addresses env setup for develop/review commit d7cae4f Author: spjuhel <[email protected]> Date: Mon May 19 14:37:14 2025 +0200 improves Developer Guide index commit af793bc Author: Valentin Gebhart <[email protected]> Date: Fri May 16 17:40:51 2025 +0200 Add option in raster plot to crop around centroids (#1047) * add option to crop raster plots around centroids * update docstrings * change name of keyword parameter * change keyword name and improve docstring descriptions * updated changelog * change default value of mask parameter and update changelog commit 1a6df8e Author: Emanuel Schmid <[email protected]> Date: Fri May 16 12:59:44 2025 +0200 Avoid pickling shapely object in Exposures.write_hdf5 (#1051) * refactor Exposures.write_hdf5 and .from_hdf5: use wkb instead of pickle for geometry serialization * refactor Exposures.write_hdf5 * change of plan: just pickle geometries in wkb format * Update climada/entity/exposures/base.py Co-authored-by: Lukas Riedel <[email protected]> * abandon shapely pickling * simplify wkb columns collection * simplify wkb conversion * cosmetics --------- Co-authored-by: Lukas Riedel <[email protected]> commit 51b66fa Author: Emanuel Schmid <[email protected]> Date: Fri May 9 14:53:33 2025 +0200 Remove geopandas.datasets (#1052) Use cartopy.io.shapereader for loading natural earth data instead of geopandas commit a5a3fef Author: emanuel-schmid <[email protected]> Date: Tue Apr 29 13:01:13 2025 +0200 fix test_data_api commit d8b8e9a Author: Emanuel Schmid <[email protected]> Date: Thu Apr 24 15:16:06 2025 +0200 Raise ValueError in download_world_bank_indicator (#1050) * Fix worldbank fallback by raising a ValueError instead of a RuntimeError commit 4d2d690 Author: Lukas Riedel <[email protected]> Date: Wed Apr 16 09:41:20 2025 +0200 Remove pandas-datareader (#1033) * Remove pandas-datareader Use JSON/pandas solution for downloading World Bank indicator data. * Add function `download_world_bank_indicator`. * Add unit test. * Update requirements. * Update CHANGELOG.md * Remove stray print and fix comments * Switch to compatible Petals target branch for testing REVERT THIS! * Fix linter warnings - Add timeout parameter to requests call - Remove unused import * #168 is merged Co-authored-by: Lukas Riedel <[email protected]> * Apply suggestions from code review Use single list instead of nested lists Co-authored-by: Emanuel Schmid <[email protected]> * Update reading WB data * Fall back to parsing dates if conversion to ints fails. * Throw a ValueError if no data is available. --------- Co-authored-by: emanuel-schmid <[email protected]> Co-authored-by: Emanuel Schmid <[email protected]> commit a2d2297 Author: emanuel-schmid <[email protected]> Date: Mon Apr 7 16:21:48 2025 +0200 remove shapely 2.0 pin commit 6dc20ab Merge: eda7e40 2c34d49 Author: Samuel Juhel <[email protected]> Date: Mon Apr 7 14:44:24 2025 +0200 Merge pull request #1026 from CLIMADA-project/feature/improve_ee_import Better handling of optional dependency import for earth-engine commit 2c34d49 Author: emanuel-schmid <[email protected]> Date: Mon Apr 7 10:57:51 2025 +0200 pylint commit 3db15c5 Author: emanuel-schmid <[email protected]> Date: Mon Apr 7 10:35:04 2025 +0200 fix obvious errors commit 176db2d Merge: f2c27a7 eda7e40 Author: emanuel-schmid <[email protected]> Date: Mon Apr 7 10:08:30 2025 +0200 Merge branch 'develop' into feature/improve_ee_import commit eda7e40 Author: Emanuel Schmid <[email protected]> Date: Fri Apr 4 16:12:38 2025 +0200 Explicit arguments in TropCyclone.apply_climate_scenario_knu (#991) * trop_cyclone.apply_climate_scenario_knu: make yearly_steps argument explicit * changelog * readthedocs: explicit configuration file commit 004651b Merge: 3cfbe05 08ec51b Author: emanuel-schmid <[email protected]> Date: Fri Apr 4 12:45:23 2025 +0200 Merge branch 'main' into develop # Conflicts: # CHANGELOG.md # climada/_version.py # setup.py commit 08ec51b Author: Lukas Riedel <[email protected]> Date: Fri Apr 4 12:06:06 2025 +0200 Update GitHub infrastructure (#1036) * Increase fetch depth to avoid missing the commit The target commit might not be the latest of the target branch. * Add CODEOWNERS file * dependencies: pin shapley version down to 2.0 --------- Co-authored-by: emanuel-schmid <[email protected]> commit 3cfbe05 Merge: 5aeebea cc9b33a Author: Valentin Gebhart <[email protected]> Date: Thu Apr 3 18:20:05 2025 +0200 Merge pull request #1038 from CLIMADA-project/hotfix/plot_NaN_on_grid Hotfix: plot NaNs in geo_im_from_array commit cc9b33a Author: Valentin Gebhart <[email protected]> Date: Thu Apr 3 17:45:09 2025 +0200 update changelog commit 01eb0bd Author: Valentin Gebhart <[email protected]> Date: Thu Apr 3 17:34:59 2025 +0200 changed docstring and small optimization commit 94bc45d Author: Valentin Gebhart <[email protected]> Date: Thu Apr 3 12:09:45 2025 +0200 added edgecolor commit 3ddc5d9 Author: Valentin Gebhart <[email protected]> Date: Thu Apr 3 12:03:35 2025 +0200 adapted NaN plot handling and include legend commit 5aeebea Author: Lukas Riedel <[email protected]> Date: Wed Apr 2 10:18:31 2025 +0200 Add links to new CLIMADA webpage to docs (#1021) commit ead106c Author: Valentin Gebhart <[email protected]> Date: Mon Mar 31 17:24:48 2025 +0200 added section to local exceedance tutorial commit 8680668 Merge: 95052b2 25e4332 Author: luseverin <[email protected]> Date: Mon Mar 24 14:37:55 2025 +0100 Merge pull request #1029 from CLIMADA-project/feature/update_euler_guide_petals Add instructions to install climada petals on Euler commit 25e4332 Author: luseverin <[email protected]> Date: Mon Mar 24 13:54:05 2025 +0100 Update changelog commit 31cb34a Author: luseverin <[email protected]> Date: Mon Mar 24 11:23:58 2025 +0000 Specify how to work with a specific branch if needed commit 5b00f36 Author: luseverin <[email protected]> Date: Mon Mar 24 12:11:00 2025 +0100 Correct few typos and rephrase Co-authored-by: Lukas Riedel <[email protected]> commit 3b45cf9 Author: luseverin <[email protected]> Date: Fri Mar 21 19:17:15 2025 +0100 Add instructions to install climada petals on Euler commit 95052b2 Author: Lukas Riedel <[email protected]> Date: Wed Mar 19 10:34:15 2025 +0100 Upgrade to Python 3.12 (#870) * Upgrade to Python 3.12 * Increment supported Python versions in setup.py. * Update GitHub workflow testing matrix. * Upgrade eccodes and cfgrib versions * Add prominent information on Python versions --------- Co-authored-by: emanuel-schmid <[email protected]> commit a8a3c78 Author: emanuel-schmid <[email protected]> Date: Wed Mar 19 10:07:25 2025 +0100 fix broken plot test commit 5517c89 Author: Nicolas Colombi <[email protected]> Date: Wed Mar 19 09:11:33 2025 +0100 Revert "change logo with QR code, the logo was ugly on the page" This reverts commit 5752673. commit 004a31f Author: Nicolas Colombi <[email protected]> Date: Wed Mar 19 08:49:49 2025 +0100 fix indent last dropdown getting started commit 8062f0e Merge: 5752673 88e305e Author: Nicolas Colombi <[email protected]> Date: Wed Mar 19 08:46:04 2025 +0100 Merge branch 'feature/documentation-restructuring' of https://github.com/CLIMADA-project/climada_python into feature/documentation-restructuring commit 5752673 Author: Nicolas Colombi <[email protected]> Date: Wed Mar 19 08:45:25 2025 +0100 change logo with QR code commit 88e305e Author: spjuhel <[email protected]> Date: Wed Mar 19 08:35:07 2025 +0100 Tidying up after develop merged commit 9dcc2a3 Author: Nicolas Colombi <[email protected]> Date: Wed Mar 19 08:24:14 2025 +0100 add links and images to getting started commit 898240d Merge: 6282eb7 ba6457c Author: spjuhel <[email protected]> Date: Tue Mar 18 18:28:47 2025 +0100 Merge branch 'develop' into feature/documentation-restructuring commit 6282eb7 Author: spjuhel <[email protected]> Date: Tue Mar 18 14:00:15 2025 +0100 Improves How to navigate page commit 2ef5bd7 Author: spjuhel <[email protected]> Date: Tue Mar 18 14:00:01 2025 +0100 This file is not used anymore commit fdcb215 Author: spjuhel <[email protected]> Date: Tue Mar 18 13:59:41 2025 +0100 Avoids section navigation in Changelog commit a666977 Author: spjuhel <[email protected]> Date: Tue Mar 18 13:58:27 2025 +0100 Final touch on urls commit 9a0ea1f Merge: 2d81ae1 f2c27a7 Author: spjuhel <[email protected]> Date: Tue Mar 18 12:01:39 2025 +0100 Merge branch 'feature/improve_ee_import' into feature/documentation-restructuring commit f2c27a7 Author: spjuhel <[email protected]> Date: Tue Mar 18 11:57:23 2025 +0100 implements improvement commit 2d81ae1 Author: spjuhel <[email protected]> Date: Tue Mar 18 11:42:20 2025 +0100 Removes some errors messages from documentation build (see details) Several attributes of Centroids became properties and were doctringed twice, I removed the attribute docstring and improved the properties ones. commit fb7cd37 Author: spjuhel <[email protected]> Date: Tue Mar 18 11:41:35 2025 +0100 Adds some near final touch commit f4d851d Merge: 9962555 7b1a6bb Author: spjuhel <[email protected]> Date: Tue Mar 18 10:21:38 2025 +0100 Merge branch 'develop' into feature/documentation-restructuring commit 9962555 Author: spjuhel <[email protected]> Date: Tue Mar 18 10:08:32 2025 +0100 backtracking .md file hack commit 4102232 Author: spjuhel <[email protected]> Date: Mon Mar 17 17:50:35 2025 +0100 url fixing WIP commit 400eb73 Author: spjuhel <[email protected]> Date: Mon Mar 17 10:47:14 2025 +0100 wip on urls commit b442167 Author: Samuel Juhel <[email protected]> Date: Mon Mar 17 09:22:27 2025 +0100 Update urls in install.rst commit 304afb4 Author: climada <[email protected]> Date: Thu Mar 13 16:07:52 2025 +0000 'Automated update v6.0.1' commit bbf53a8 Merge: 3314b0b 7459ab8 Author: emanuel-schmid <[email protected]> Date: Thu Mar 13 16:40:23 2025 +0100 Merge branch 'develop' commit 3314b0b Merge: a0f6d7d edfce31 Author: emanuel-schmid <[email protected]> Date: Thu Mar 13 11:30:00 2025 +0100 Merge branch 'develop' # Conflicts: # climada/_version.py # setup.py commit e0d4e7e Author: Valentin Gebhart <[email protected]> Date: Tue Mar 11 16:44:31 2025 +0100 readd the navigation in getting started commit 97b108b Author: Nicolas Colombi <[email protected]> Date: Mon Mar 10 13:08:53 2025 +0100 getting started commit 68d2f3d Author: Samuel Juhel <[email protected]> Date: Wed Mar 5 16:43:57 2025 +0100 Updates index.rst install title commit 2302e91 Author: Samuel Juhel <[email protected]> Date: Wed Mar 5 16:38:36 2025 +0100 Updates impact.rst with landing content commit 754417f Author: Samuel Juhel <[email protected]> Date: Wed Mar 5 16:26:53 2025 +0100 Updates exposures.rst with some landing content commit c95b7df Author: Samuel Juhel <[email protected]> Date: Wed Mar 5 16:19:50 2025 +0100 Updates hazard.rst with some landing content commit 7c850a5 Author: Samuel Juhel <[email protected]> Date: Wed Mar 5 16:17:25 2025 +0100 Updates User Guide landing page commit 029b81d Author: Samuel Juhel <[email protected]> Date: Wed Mar 5 15:12:37 2025 +0100 Adds link to new website in top bar commit a0f6d7d Author: climada <[email protected]> Date: Mon Mar 3 14:11:00 2025 +0000 'Automated update v6.0.0' commit 18d3f6a Merge: f2dd9b8 51d1e82 Author: emanuel-schmid <[email protected]> Date: Mon Mar 3 14:32:56 2025 +0100 Merge branch 'develop' commit f2dd9b8 Author: Emanuel Schmid <[email protected]> Date: Mon Mar 3 14:24:50 2025 +0100 Fix Author List on Zenodo (#1011) * add .zenodo.json file * fix affiliation * update affiliation B.G. commit 8bb1011 Merge: 5fba3ab 0c462e8 Author: emanuel-schmid <[email protected]> Date: Mon Mar 3 11:37:15 2025 +0100 Merge branch 'develop' commit 5fba3ab Merge: e4a3cfd d0a6752 Author: emanuel-schmid <[email protected]> Date: Mon Mar 3 11:33:19 2025 +0100 Merge branch 'develop' into 'main' (towards release 6.0) commit 993ec4a Author: Samuel Juhel <[email protected]> Date: Mon Feb 24 09:33:47 2025 +0100 Update website link Co-authored-by: Emanuel Schmid <[email protected]> commit eec2487 Author: Valentin Gebhart <[email protected]> Date: Fri Feb 7 18:15:33 2025 +0100 fixed compiling headers issues commit c0681bd Author: Valentin Gebhart <[email protected]> Date: Fri Feb 7 16:58:56 2025 +0100 fixed white space commit ca6b749 Author: Valentin Gebhart <[email protected]> Date: Fri Feb 7 16:42:23 2025 +0100 updated conda installation instructions for different OS commit ef1c452 Author: spjuhel <[email protected]> Date: Tue Feb 4 13:46:39 2025 +0100 forgot moving 10min climada notebook file commit c7f76c6 Author: spjuhel <[email protected]> Date: Tue Feb 4 13:43:15 2025 +0100 Title level fixing and 10min to clim back in userguide commit f934609 Author: spjuhel <[email protected]> Date: Tue Feb 4 13:48:41 2025 +0100 Reworks getting-started section commit e958b7c Author: spjuhel <[email protected]> Date: Tue Feb 4 13:40:33 2025 +0100 More linkref fixing commit e534253 Author: spjuhel <[email protected]> Date: Tue Feb 4 13:37:50 2025 +0100 Restructures development guide with subsections - Fixes links in development guide - Minor renaming commit 17e1a96 Author: Valentin Gebhart <[email protected]> Date: Tue Feb 4 09:23:22 2025 +0100 fixed typos commit f584983 Merge: 1125d36 ac2c997 Author: Valentin Gebhart <[email protected]> Date: Mon Feb 3 21:51:23 2025 +0100 Merge branch 'feature/documentation-restructuring' of github.com:CLIMADA-project/climada_python into feature/documentation-restructuring commit 1125d36 Author: Valentin Gebhart <[email protected]> Date: Mon Feb 3 21:51:20 2025 +0100 add some warnings and info to mamba installation commit ac2c997 Author: spjuhel <[email protected]> Date: Mon Feb 3 14:42:26 2025 +0100 moves pages around commit 26c1063 Author: spjuhel <[email protected]> Date: Mon Feb 3 14:16:23 2025 +0100 fixes ``sphinx.configuration`` key is missing see https://about.readthedocs.com/blog/2024/12/deprecate-config-files-without-sphinx-or-mkdocs-config/ commit 225a734 Author: Valentin Gebhart <[email protected]> Date: Mon Feb 3 11:25:58 2025 +0100 add data flow and workflow to dev intro commit ac6b540 Author: Valentin Gebhart <[email protected]> Date: Mon Feb 3 10:51:57 2025 +0100 split climada dev and git intro commit bae24b5 Author: Valentin Gebhart <[email protected]> Date: Tue Jan 21 15:52:06 2025 +0100 first version of 10min CLIMADA intro commit 62dfd29 Author: Valentin Gebhart <[email protected]> Date: Mon Jan 6 16:18:01 2025 +0100 added draft for 10min intro commit 2dce78d Author: spjuhel <[email protected]> Date: Wed Dec 4 19:18:28 2024 +0100 changes conda to mamba commit 567a492 Author: spjuhel <[email protected]> Date: Wed Dec 4 19:02:44 2024 +0100 renames folder to match new naming commit efef761 Author: spjuhel <[email protected]> Date: Wed Dec 4 19:02:07 2024 +0100 creates the new toctrees to start seeing content commit 80c0694 Author: spjuhel <[email protected]> Date: Wed Dec 4 18:58:51 2024 +0100 improves navbar header rendering commit 8b5227c Author: spjuhel <[email protected]> Date: Wed Dec 4 18:58:06 2024 +0100 fixes docstrings indentations errors commit 1d05166 Author: spjuhel <[email protected]> Date: Fri Nov 15 09:02:01 2024 +0100 adds sphinx-design dependency commit de6d4bd Author: spjuhel <[email protected]> Date: Fri Nov 15 08:42:23 2024 +0100 Revert "Revert "Merge branch 'feature/documentation-restructuring' into develop"" This reverts commit b8cc3c4. commit e4a3cfd Author: climada <[email protected]> Date: Fri Jul 19 07:57:49 2024 +0000 'Automated update v5.0.0' commit 54cc800 Merge: 8f89ce1 70ddc93 Author: emanuel-schmid <[email protected]> Date: Thu Jul 18 18:20:02 2024 +0200 Merge branch 'develop' commit 8f89ce1 Author: Lukas Riedel <[email protected]> Date: Fri Jun 21 13:55:32 2024 +0200 Fix links in pull request template (#901)
Changes proposed in this PR:
geo_im_from_array
such that the user can input a (relative) distance above which plot locations that are further away than this distance from any centroids are masked (ie, no values plotted). This option is then available in all function that callgeo_im_from_array
, i.e.,_event_plot
,hazard.plot_intensity
,hazard.plot_fraction
,plot_from_gdf
,hazard.plot_rp_intensity
,impact.plot_rp_imp
geo_im_from_array
PR Author Checklist
develop
)PR Reviewer Checklist