bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

build_shapes: default to no tolerance in polygon simplification (#1137)

Browse Source
This commit is contained in:
Fabian Neumann 2024-07-09 11:07:15 +02:00 committed by GitHub
parent 31753143f5
commit b6d11bba6f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/release_notes.rst
View File

@ -10,6 +10,8 @@ Release Notes
Upcoming Release Upcoming Release
================ ================
* In simplifying polygons in :mod:`build_shapes` default to no tolerance.
* Set non-zero capital_cost for methanol stores to avoid unrealistic storage sizes * Set non-zero capital_cost for methanol stores to avoid unrealistic storage sizes
* Set p_nom = p_nom_min for generators with baseyear == grouping_year in add_existing_baseyear. This has no effect on the optimization but helps n.statistics to correctly report already installed capacities. * Set p_nom = p_nom_min for generators with baseyear == grouping_year in add_existing_baseyear. This has no effect on the optimization but helps n.statistics to correctly report already installed capacities.

6
scripts/build_shapes.py
View File

@ -91,7 +91,7 @@ def _get_country(target, **keys):
return np.nan return np.nan
def _simplify_polys(polys, minarea=0.1, tolerance=0.01, filterremote=True): def _simplify_polys(polys, minarea=0.1, tolerance=None, filterremote=True):
if isinstance(polys, MultiPolygon): if isinstance(polys, MultiPolygon):
polys = sorted(polys.geoms, key=attrgetter("area"), reverse=True) polys = sorted(polys.geoms, key=attrgetter("area"), reverse=True)
mainpoly = polys[0] mainpoly = polys[0]
@ -106,7 +106,9 @@ def _simplify_polys(polys, minarea=0.1, tolerance=0.01, filterremote=True):
) )
else: else:
polys = mainpoly polys = mainpoly
return polys.simplify(tolerance=tolerance) if tolerance is not None:
polys = polys.simplify(tolerance=tolerance)
return polys
def countries(naturalearth, country_list): def countries(naturalearth, country_list):